From 601b69a21876b856d8e98da8de71e7704a785645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 30 Dec 2012 15:22:40 +0100
Subject: [PATCH 0001/3789] Setting the stdenv compiler to gcc 4.7.

---
 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 f8bda788333..b53609666f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1884,7 +1884,7 @@ let
 
   gambit = callPackage ../development/compilers/gambit { };
 
-  gcc = gcc46;
+  gcc = gcc47;
 
   gcc295 = wrapGCC (import ../development/compilers/gcc/2.95 {
     inherit fetchurl stdenv noSysDirs;
-- 
GitLab


From 8067f1469947d7eddec3d797edf39475ac1b1768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 31 Dec 2012 10:13:55 +0100
Subject: [PATCH 0002/3789] Fixing the gcc47 build in stdenv

gcc 4.7 wants an explicit reference to the system include directory,
and that's guessed through 'stdenv ? glibc'.
---
 pkgs/stdenv/linux/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index e4a8bd77076..e8e089695c0 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -214,6 +214,9 @@ rec {
       cloog = pkgs.cloog.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
       ppl = pkgs.ppl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
     };
+    extraAttrs = {
+      glibc = stdenvLinuxGlibc;   # Required by gcc47 build
+    };
     inherit fetchurl;
   };
 
-- 
GitLab


From bbc494644f1c10bb7ecf60dd6bd5cf72cb98e223 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 5 Jan 2013 22:14:59 +0400
Subject: [PATCH 0003/3789] ARMv7 seems to need special ARM unpacking
 procedure, too

---
 pkgs/stdenv/linux/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 5d9a0cf750a..45ba2c58811 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -58,9 +58,10 @@ rec {
     builder = bootstrapFiles.sh;
 
     args =
-      if (system == "armv5tel-linux" || system == "armv6l-linux")
-      then [ ./scripts/unpack-bootstrap-tools-arm.sh ]
-      else [ ./scripts/unpack-bootstrap-tools.sh ];
+      if (system == "armv5tel-linux" || system == "armv6l-linux" 
+        || system == "armv7l-linux")
+      then ./scripts/unpack-bootstrap-tools-arm.sh
+      else ./scripts/unpack-bootstrap-tools.sh;
 
     inherit (bootstrapFiles) bzip2 mkdir curl cpio;
 
-- 
GitLab


From 21e57a0d08e054813385773402b0dd568c8f6f9e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 5 Jan 2013 22:49:31 +0400
Subject: [PATCH 0004/3789] Not all parenthesis are extraneous, after all

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

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 45ba2c58811..21867be0b44 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -58,10 +58,10 @@ rec {
     builder = bootstrapFiles.sh;
 
     args =
-      if (system == "armv5tel-linux" || system == "armv6l-linux" 
-        || system == "armv7l-linux")
-      then ./scripts/unpack-bootstrap-tools-arm.sh
-      else ./scripts/unpack-bootstrap-tools.sh;
+      if system == "armv5tel-linux" || system == "armv6l-linux" 
+        || system == "armv7l-linux"
+      then [ ./scripts/unpack-bootstrap-tools-arm.sh ]
+      else [ ./scripts/unpack-bootstrap-tools.sh ];
 
     inherit (bootstrapFiles) bzip2 mkdir curl cpio;
 
-- 
GitLab


From ed2f075930f3f7280136c7863dbc5efc3df94b51 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 5 Jan 2013 23:28:22 +0400
Subject: [PATCH 0005/3789] ARMv7l fails in strange way with ARMv5 bootstrap
 but works with ARMv6 bootstrap

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

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 21867be0b44..c2e2045cbd1 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -17,7 +17,7 @@ rec {
     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/armv5tel
+    else if system == "armv7l-linux" then import ./bootstrap/armv6l
     else if system == "mips64el-linux" then import ./bootstrap/loongson2f
     else abort "unsupported platform for the pure Linux stdenv";
 
-- 
GitLab


From b7e2799d329cf366de1d90291632f95259c7514d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Jan 2013 15:52:42 +0100
Subject: [PATCH 0006/3789] gmp: version 5.1.0 has the cpu-id patch applied
 already

---
 pkgs/development/libraries/gmp/5.1.0.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gmp/5.1.0.nix b/pkgs/development/libraries/gmp/5.1.0.nix
index 88d639e621b..270788198f6 100644
--- a/pkgs/development/libraries/gmp/5.1.0.nix
+++ b/pkgs/development/libraries/gmp/5.1.0.nix
@@ -4,13 +4,10 @@ stdenv.mkDerivation rec {
   name = "gmp-5.1.0";
 
   src = fetchurl {
-    urls = [ "mirror://gnu/gmp/${name}.tar.bz2"
-      "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ];
+    urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ];
     sha256 = "15n7xxgasbxdch8ii8z9ic6fxc2ysk3q8iavf55abjp5iylspnfz";
   };
 
-  patches = [ ./ignore-bad-cpuid.patch ];
-
   nativeBuildInputs = [ m4 ];
 
   configureFlags =
-- 
GitLab


From 996da754e4444197176c3ed0f2be02141b48954f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Jan 2013 16:15:16 +0100
Subject: [PATCH 0007/3789] gmp: switch default version back to 5.0.5

The 5.1.0 version breaks the build of virtually every package that uses the C++
wrappers for gmp (such as mpfr, ppl, etc).
---
 pkgs/development/libraries/gmp/5.0.5.nix | 55 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  4 +-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/gmp/5.0.5.nix

diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix
new file mode 100644
index 00000000000..62acc974caa
--- /dev/null
+++ b/pkgs/development/libraries/gmp/5.0.5.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, m4, cxx ? true }:
+
+stdenv.mkDerivation rec {
+  name = "gmp-5.0.5";
+
+  src = fetchurl {
+    url = "mirror://gnu/gmp/${name}.tar.bz2";
+    sha256 = "1jfymbr90mpn0zw5sg001llqnvf2462y77vgjknrmfs1rjn8ln0z";
+  };
+
+  nativeBuildInputs = [ m4 ];
+
+  configureFlags =
+    # 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" ] else [ "--disable-cxx" ]);
+
+  doCheck = true;
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "GMP, the GNU multiple precision arithmetic library";
+
+    longDescription =
+      '' GMP is a free library for arbitrary precision arithmetic, operating
+         on signed integers, rational numbers, and floating point numbers.
+         There is no practical limit to the precision except the ones implied
+         by the available memory in the machine GMP runs on.  GMP has a rich
+         set of functions, and the functions have a regular interface.
+
+         The main target applications for GMP are cryptography applications
+         and research, Internet security applications, algebra systems,
+         computational algebra research, etc.
+
+         GMP is carefully designed to be as fast as possible, both for small
+         operands and for huge operands.  The speed is achieved by using
+         fullwords as the basic arithmetic type, by using fast algorithms,
+         with highly optimised assembly code for the most common inner loops
+         for a lot of CPUs, and by a general emphasis on speed.
+
+         GMP is faster than any other bignum library.  The advantage for GMP
+         increases with the operand sizes for many operations, since GMP uses
+         asymptotically faster algorithms.
+      '';
+
+    homepage = http://gmplib.org/;
+    license = "LGPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f61e43158d..6ebb71ee147 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3768,7 +3768,9 @@ let
   # The GHC bootstrap binaries link against libgmp.so.3, which is in GMP 4.x.
   gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { };
 
-  gmp5 = callPackage ../development/libraries/gmp/5.1.0.nix { };
+  gmp5 = callPackage ../development/libraries/gmp/5.0.5.nix { };
+
+  gmp51 = callPackage ../development/libraries/gmp/5.1.0.nix { };
 
   gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { };
 
-- 
GitLab


From 82e852160bc170ecd91b56343cdaf6d6c55ce1fb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Jan 2013 16:15:28 +0100
Subject: [PATCH 0008/3789] all-packages.nix: strip trailing whitespace

---
 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 6ebb71ee147..eca8e9c3b94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -415,9 +415,9 @@ let
     inherit pkgs;
     pkgs_i686 = pkgsi686Linux;
   };
-  
+
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
-  
+
   titaniumenv = import ../development/mobile/titaniumenv {
     inherit pkgs;
     pkgs_i686 = pkgsi686Linux;
-- 
GitLab


From c77946fa70ec3a6a8c7fb3f28e15e230ed55e915 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Jan 2013 17:03:03 +0100
Subject: [PATCH 0009/3789] ppl: update to version 0.12.1

---
 pkgs/development/libraries/ppl/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index b24b4e06cb9..ca37881ae95 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -1,13 +1,13 @@
 { fetchurl, stdenv, gmpxx, perl, gnum4 }:
 
-let version = "0.11.2"; in
+let version = "0.12.1"; in
 
 stdenv.mkDerivation rec {
   name = "ppl-${version}";
 
   src = fetchurl {
     url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2";
-    sha256 = "1sxviip4yk6gp453pid5scy1ba66dzdpr02i1416yk7lkv0x3yz3";
+    sha256 = "165iy8bmkgszs0v8lkb1mzwp53x4vkcc7m1xdpv8w77qf93ya8j0";
   };
 
   nativeBuildInputs = [ perl gnum4 ];
@@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
+    homepage = "http://www.cs.unipr.it/ppl/";
     description = "PPL: The Parma Polyhedra Library";
+    license = "GPLv3+";
 
     longDescription = ''
       The Parma Polyhedra Library (PPL) provides numerical abstractions
@@ -40,10 +42,6 @@ stdenv.mkDerivation rec {
       version of the simplex algorithm.
     '';
 
-    homepage = http://www.cs.unipr.it/ppl/;
-
-    license = "GPLv3+";
-
     maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
-- 
GitLab


From 0728c65af6860052dcd25365559283aecfef36ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Jan 2013 17:04:20 +0100
Subject: [PATCH 0010/3789] mpfr: update to version 3.1.1

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

diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index faa2e1b1a71..db5af11a670 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, gmp}:
 
 stdenv.mkDerivation (rec {
-  name = "mpfr-3.1.0";
+  name = "mpfr-3.1.1";
 
   src = fetchurl {
     url = "mirror://gnu/mpfr/${name}.tar.bz2";
-    sha256 = "105nx8qqx5x8f4rlplr2wk4cyv61iw5j3jgi2k21rpb8s6xbp9vl";
+    sha256 = "1zfmmk4p26b67qpmh787p3dfxa71yd9mi02c4q45yf687pqw6rkv";
   };
 
   buildInputs = [ gmp ];
-- 
GitLab


From 9b003f066815a1f43a6ef52720b47c4e5107a403 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Jan 2013 17:04:44 +0100
Subject: [PATCH 0011/3789] mpc: update to version 1.0.1

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

diff --git a/pkgs/development/libraries/mpc/default.nix b/pkgs/development/libraries/mpc/default.nix
index 3824e3d3755..e5d212dc269 100644
--- a/pkgs/development/libraries/mpc/default.nix
+++ b/pkgs/development/libraries/mpc/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
-  name = "mpc-0.9";
+  name = "mpc-1.0.1";
 
   src = fetchurl {
     url = "http://www.multiprecision.org/mpc/download/${name}.tar.gz";
-    sha1 = "229722d553030734d49731844abfef7617b64f1a";
+    sha1 = "vxg0rkyn4cs40wr2cp6bbcyr1nnijzlc";
   };
 
   buildInputs = [ gmp mpfr ];
-- 
GitLab


From eebc0c6965f5581d3a31aa63d5e91ad3d3a7deaa Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 13 Jan 2013 11:27:29 +0100
Subject: [PATCH 0012/3789] gmp: add back the cpuid patch to 5.0.5

it was lost during 5.0.5 -> 5.1.0 -> 5.1.0 w/o patch -> 5.0.5 w/o patch
---
 pkgs/development/libraries/gmp/5.0.5.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix
index 62acc974caa..dba5cafdf57 100644
--- a/pkgs/development/libraries/gmp/5.0.5.nix
+++ b/pkgs/development/libraries/gmp/5.0.5.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1jfymbr90mpn0zw5sg001llqnvf2462y77vgjknrmfs1rjn8ln0z";
   };
 
+  patches = [ ./ignore-bad-cpuid.patch ];
+
   nativeBuildInputs = [ m4 ];
 
   configureFlags =
-- 
GitLab


From 755dac3c6d50ad43abf22503a327a876db26ed81 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 13 Jan 2013 11:33:45 +0100
Subject: [PATCH 0013/3789] buildNativeInputs -> nativeBuildInputs

---
 pkgs/applications/editors/zile/default.nix   | 2 +-
 pkgs/development/libraries/eigen/2.0.nix     | 8 ++++----
 pkgs/development/tools/phantomjs/default.nix | 2 +-
 pkgs/tools/graphics/argyllcms/default.nix    | 2 +-
 pkgs/tools/misc/youtube-dl/default.nix       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index ea2000b57db..5929f4c76c8 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ help2man perl ];
 
   # `help2man' wants to run Zile, which fails when cross-compiling.
-  crossAttrs.buildNativeInputs = [];
+  crossAttrs.nativeBuildInputs = [];
 
   # Tests can't be run because most of them rely on the ability to
   # fiddle with the terminal.
diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix
index 6884aca16fc..9cf0a3c350c 100644
--- a/pkgs/development/libraries/eigen/2.0.nix
+++ b/pkgs/development/libraries/eigen/2.0.nix
@@ -5,15 +5,15 @@ let
 in
 stdenv.mkDerivation {
   name = "eigen-${v}";
-  
+
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
     name = "eigen-${v}.tar.bz2";
     sha256 = "1akcb4g5hvc664gfc6sxb6f6jrm55fgks6017wg0smyvmm6k09v0";
   };
-  
-  buildNativeInputs = [ cmake ];
-  
+
+  nativeBuildInputs = [ cmake ];
+
   meta = with stdenv.lib; {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix
index 33b99e12de5..5d9433cc5ca 100644
--- a/pkgs/development/tools/phantomjs/default.nix
+++ b/pkgs/development/tools/phantomjs/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
             sha256 = "1m14czhi3b388didn0a881glsx8bnsg9gnxgj5lghr4l5mgqyrd7";
           };
 
-  buildNativeInputs = stdenv.lib.optional (stdenv.system == "x86_64-linux") upx;
+  nativeBuildInputs = stdenv.lib.optional (stdenv.system == "x86_64-linux") upx;
 
   buildPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
     upx -d bin/phantomjs
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index 08cd012e079..934a27ef25b 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
       -ljpeg -ltiff ;
   '';
 
-  buildNativeInputs = [ jam unzip ];
+  nativeBuildInputs = [ jam unzip ];
 
   preConfigure = ''
     cp ${jamTop} Jamtop
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 52c8e493fdc..40f19dc89e0 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ python ];
-  buildNativeInputs = [ pandoc zip ];
+  nativeBuildInputs = [ pandoc zip ];
 
   patchPhase = ''
     rm youtube-dl
-- 
GitLab


From cf42601f92c400b81c0db4b0c932075290811cc7 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Wed, 20 Feb 2013 09:18:26 +0000
Subject: [PATCH 0014/3789] Coreutils update and Illumos compatibility fixes.

- GNU Coreutils 8.21
- Add is64Bit checks to stdenv for Solaris.
- Fix OpenSSL Illumos build.
---
 pkgs/development/libraries/openssl/default.nix |  4 +++-
 pkgs/stdenv/generic/default.nix                |  6 ++++--
 pkgs/tools/misc/coreutils/default.nix          | 12 ++++++++----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 640b99df547..55beb8bbc53 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -53,7 +53,9 @@ stdenv.mkDerivation {
   # On x86_64-darwin, "./config" misdetects the system as
   # "darwin-i386-cc".  So specify the system type explicitly.
   configureScript =
-    if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config";
+    if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc"
+    else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc"
+    else "./config";
 
   configureFlags = "shared --libdir=lib --openssldir=etc/ssl" +
     stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS";
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 6f5e5d34582..843bf580b6a 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -114,11 +114,13 @@ let
         isx86_64 = result.system == "x86_64-linux"
                || result.system == "x86_64-darwin"
                || result.system == "x86_64-freebsd"
-               || result.system == "x86_64-openbsd";
+               || result.system == "x86_64-openbsd"
+               || result.system == "x86_64-solaris";
         is64bit = result.system == "x86_64-linux"
                 || result.system == "x86_64-darwin"
                 || result.system == "x86_64-freebsd"
-                || result.system == "x86_64-openbsd";
+                || result.system == "x86_64-openbsd"
+                || result.system == "x86_64-solaris";
         isMips = result.system == "mips-linux"
                 || result.system == "mips64el-linux";
         isArm = result.system == "armv5tel-linux"
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 9fd1d86ff82..733c4218d83 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -6,12 +6,12 @@
 assert aclSupport -> acl != null;
 assert selinuxSupport -> libselinux != null && libsepol != null;
 
-stdenv.mkDerivation rec {
-  name = "coreutils-8.20";
+stdenv.mkDerivation (rec {
+  name = "coreutils-8.21";
 
   src = fetchurl {
     url = "mirror://gnu/coreutils/${name}.tar.xz";
-    sha256 = "1cly97xdy3v4nbbx631k43smqw0nnpn651kkprs0yyl2cj3pkjyv";
+    sha256 = "064f512185iysqqcvhnhaf3bfmzrvcgs7n405qsyp99zmfyl9amd";
   };
 
   nativeBuildInputs = [ perl ];
@@ -67,4 +67,8 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
-
+  # May have some issues with root compilation because the bootstrap tool
+  # cannot be used as a login shell for now.
+// stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux" || stdenv.isSunOS) {
+  FORCE_UNSAFE_CONFIGURE = 1;
+})
-- 
GitLab


From bcaea92a1217f6adb79bdb400f2bfffef97955ed Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Wed, 20 Feb 2013 09:20:07 +0000
Subject: [PATCH 0015/3789] Attempt at getting GCC 4.7 compiled on Illumos...

No success yet :-(
---
 .../development/compilers/gcc/4.7/default.nix | 19 ++++++++++++++-----
 pkgs/development/libraries/cloog/default.nix  |  4 ++--
 .../development/libraries/gettext/default.nix |  2 ++
 pkgs/development/libraries/isl/default.nix    |  4 ++--
 pkgs/development/libraries/mpc/default.nix    |  4 ++--
 pkgs/development/libraries/mpfr/default.nix   |  6 +++---
 pkgs/development/libraries/ppl/default.nix    |  8 +++++---
 pkgs/stdenv/default.nix                       |  1 +
 pkgs/stdenv/native/default.nix                |  1 +
 pkgs/tools/archivers/cpio/default.nix         |  4 ++--
 pkgs/tools/misc/coreutils/default.nix         |  1 +
 pkgs/top-level/all-packages.nix               |  4 ++--
 12 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix
index 62a86751a71..6e8e5d86cc5 100644
--- a/pkgs/development/compilers/gcc/4.7/default.nix
+++ b/pkgs/development/compilers/gcc/4.7/default.nix
@@ -279,19 +279,25 @@ stdenv.mkDerivation ({
 
   configureFlagsArray = stdenv.lib.optionals
     (ppl != null && ppl ? dontDisableStatic && ppl.dontDisableStatic)
-        [ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ];
+        [ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ]; 
 
   # 'iant' at #go-nuts@freenode, gccgo maintainer, said that
   # they have a bug in 4.7.1 if adding "--disable-static"
   dontDisableStatic = langGo;
 
   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 --with-gnu-ld "
+      else ""}
+    --enable-lto
     ${if enableMultilib then "" else "--disable-multilib"}
     ${if enableShared then "" else "--disable-shared"}
-    ${if enablePlugin then "--enable-plugin" else ""}
-    ${if ppl != null then "--with-ppl=${ppl}" else ""}
+    ${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
+    ${if ppl != null then "--with-ppl=${ppl} --disable-ppl-version-check" else ""}
     ${if cloog != null then
-      "--with-cloog=${cloog} --enable-cloog-backend=isl"
+      "--with-cloog=${cloog} --disable-cloog-version-check --enable-cloog-backend=isl"
       else ""}
     ${if langJava then
       "--with-ecj-jar=${javaEcj} " +
@@ -406,7 +412,9 @@ stdenv.mkDerivation ({
   # Needed for the cross compilation to work
   AR = "ar";
   LD = "ld";
-  CC = "gcc";
+  # 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
@@ -496,6 +504,7 @@ stdenv.mkDerivation ({
   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/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix
index ab5737b20ed..c3878ef4b78 100644
--- a/pkgs/development/libraries/cloog/default.nix
+++ b/pkgs/development/libraries/cloog/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gmp, isl }:
 
 stdenv.mkDerivation rec {
-  name = "cloog-0.16.3";
+  name = "cloog-0.18.0";
 
   src = fetchurl {
     url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${name}.tar.gz";
-    sha256 = "0lzbsszfzsr0jfwkccfbsvx913d2yc45dqwa472plmxkhbwykmc9";
+    sha256 = "1c4aa8dde7886be9cbe0f9069c334843b21028f61d344a2d685f88cb1dcf2228";
   };
 
   buildInputs = [ gmp ];
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 5468c9f2336..113093a8067 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation (rec {
 
   patches = [ ./no-gets.patch ];
 
+  LDFLAGS = if stdenv.isSunOS then "-lsec -lavl" else "";
+
   configureFlags = [ "--disable-csharp" ]
      ++ (stdenv.lib.optionals stdenv.isCygwin
           [ # We have a static libiconv, so we can only build the static lib.
diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix
index aaec37eae8f..9097df78de3 100644
--- a/pkgs/development/libraries/isl/default.nix
+++ b/pkgs/development/libraries/isl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "isl-0.07"; # CLooG 0.16.3 fails to build with ISL 0.08.
+  name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08.
 
   src = fetchurl {
     urls = [
         "http://www.kotnet.org/~skimo/isl/${name}.tar.bz2"
         "ftp://ftp.linux.student.kuleuven.be/pub/people/skimo/isl/${name}.tar.bz2"
       ];
-    sha256 = "0kpxmvhrwwdygqqafqzjf9xiksq7paac2x24g9jhr3f9ajj3zkyx";
+    sha256 = "095f4b54c88ca13a80d2b025d9c551f89ea7ba6f6201d701960bfe5c1466a98d";
   };
 
   buildInputs = [ gmp ];
diff --git a/pkgs/development/libraries/mpc/default.nix b/pkgs/development/libraries/mpc/default.nix
index 3824e3d3755..586658556db 100644
--- a/pkgs/development/libraries/mpc/default.nix
+++ b/pkgs/development/libraries/mpc/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
-  name = "mpc-0.9";
+  name = "mpc-1.0.1";
 
   src = fetchurl {
     url = "http://www.multiprecision.org/mpc/download/${name}.tar.gz";
-    sha1 = "229722d553030734d49731844abfef7617b64f1a";
+    sha256 = "ed5a815cfea525dc778df0cb37468b9c1b554aaf30d9328b1431ca705b7400ff";
   };
 
   buildInputs = [ gmp mpfr ];
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index faa2e1b1a71..802fd93f8cf 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, gmp}:
 
 stdenv.mkDerivation (rec {
-  name = "mpfr-3.1.0";
+  name = "mpfr-3.1.1";
 
   src = fetchurl {
     url = "mirror://gnu/mpfr/${name}.tar.bz2";
-    sha256 = "105nx8qqx5x8f4rlplr2wk4cyv61iw5j3jgi2k21rpb8s6xbp9vl";
+    sha256 = "1zfmmk4p26b67qpmh787p3dfxa71yd9mi02c4q45yf687pqw6rkv";
   };
 
   buildInputs = [ gmp ];
@@ -39,7 +39,7 @@ stdenv.mkDerivation (rec {
 
 //
 
-(stdenv.lib.optionalAttrs stdenv.isFreeBSD {
+(stdenv.lib.optionalAttrs (stdenv.isSunOS or stdenv.isFreeBSD) {
    /* Work around a FreeBSD bug that otherwise leads to segfaults in
       the test suite:
         http://hydra.bordeaux.inria.fr/build/34862
diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index b24b4e06cb9..0e1948b2fd0 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -1,13 +1,13 @@
 { fetchurl, stdenv, gmpxx, perl, gnum4 }:
 
-let version = "0.11.2"; in
+let version = "1.0"; in
 
 stdenv.mkDerivation rec {
   name = "ppl-${version}";
 
   src = fetchurl {
     url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2";
-    sha256 = "1sxviip4yk6gp453pid5scy1ba66dzdpr02i1416yk7lkv0x3yz3";
+    sha256 = "c169e962b8a0f7b7bcde5c5e0e2235248f1d78b155dfad684591d1a57e330b54";
   };
 
   nativeBuildInputs = [ perl gnum4 ];
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-watchdog";
 
+  patches = [ ./upstream-based.patch ];
+
   # Beware!  It took ~6 hours to compile PPL and run its tests on a 1.2 GHz
   # x86_64 box.  Nevertheless, being a dependency of GCC, it probably ought
   # to be tested.
@@ -40,7 +42,7 @@ stdenv.mkDerivation rec {
       version of the simplex algorithm.
     '';
 
-    homepage = http://www.cs.unipr.it/ppl/;
+    homepage = http://bugseng.com/products/ppl/;
 
     license = "GPLv3+";
 
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index ca90b46192e..a2723f5575c 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -62,5 +62,6 @@ rec {
     if stdenvType == "powerpc-linux" then /* stdenvLinux */ stdenvNative else
     if stdenvType == "i686-mingw" then stdenvMinGW else
     if stdenvType == "x86_64-darwin" then stdenvNix else
+    if stdenvType == "x86_64-solaris" then stdenvNix else
     stdenvNative;
 }
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 524b2a53337..f303e47fd5d 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -9,6 +9,7 @@ rec {
   path =
     (if system == "i686-solaris" then [ "/usr/gnu" ] else []) ++
     (if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++
+    (if system == "x86_64-solaris" then [ "/opt/local/gnu" ] else []) ++
     ["/" "/usr" "/usr/local"];
 
   prehookBase = ''
diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
index 1700f03d7bd..525a64f9b82 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "cpio-2.9";
   
   src = fetchurl {
-    url = mirror://gnu/cpio/cpio-2.9.tar.bz2;
-    sha256 = "01s7f9hg8kgpis96j99hgkiqgdy53pm7qi7bhm3fzx58jfk5z6mv";
+    url = mirror://gnu/cpio/cpio-2.11.tar.bz2;
+    sha256 = "bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd";
   };
 
   patches = [
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 733c4218d83..69892cbfd73 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation (rec {
 
   enableParallelBuilding = true;
 
+  LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lmp -lmd -lnsl -lsocket -lresolv";
   NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol";
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d9d534c412..22436952061 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1938,7 +1938,7 @@ let
 
   gambit = callPackage ../development/compilers/gambit { };
 
-  gcc = gcc46;
+  gcc = gcc47;
 
   gcc33 = wrapGCC (import ../development/compilers/gcc/3.3 {
     inherit fetchurl stdenv noSysDirs;
@@ -3761,7 +3761,7 @@ let
   # The GHC bootstrap binaries link against libgmp.so.3, which is in GMP 4.x.
   gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { };
 
-  gmp5 = callPackage ../development/libraries/gmp/5.0.5.nix { };
+  gmp5 = callPackage ../development/libraries/gmp/5.1.1.nix { };
 
   gmp51 = callPackage ../development/libraries/gmp/5.1.1.nix { };
 
-- 
GitLab


From 15e865ac09c93093c9cada2f247b14dba084c71a Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Sat, 23 Feb 2013 13:59:59 +0000
Subject: [PATCH 0016/3789] GCC 4.7.2 + updated libraries compiles on
 Illumos/SmartOS!

- Add solaris native ld support to GCC build wrapper
- Add solaris ld wrapper that fixes -L argument order
---
 pkgs/build-support/gcc-wrapper/builder.sh     | 21 +++++++++-
 pkgs/build-support/gcc-wrapper/default.nix    |  1 +
 .../gcc-wrapper/ld-solaris-wrapper.sh         | 40 ++++++++++++++++++
 pkgs/development/compilers/gcc/4.7/builder.sh |  5 ++-
 .../development/compilers/gcc/4.7/default.nix | 25 ++++++++---
 .../development/libraries/gettext/default.nix |  2 +-
 pkgs/development/libraries/mpfr/default.nix   | 24 +++++------
 .../libraries/ppl/upstream-based.patch        | 42 +++++++++++++++++++
 pkgs/stdenv/nix/default.nix                   |  1 +
 pkgs/tools/misc/coreutils/default.nix         |  4 +-
 10 files changed, 141 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/build-support/gcc-wrapper/ld-solaris-wrapper.sh
 create mode 100644 pkgs/development/libraries/ppl/upstream-based.patch

diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh
index ed7ad0a50b7..e7c3400e9f7 100644
--- a/pkgs/build-support/gcc-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-wrapper/builder.sh
@@ -66,13 +66,23 @@ else
     echo "$gccCFlags" > $out/nix-support/gcc-cflags
     
     gccPath="$gcc/bin"
-    ldPath="$binutils/bin"
+    # On Illumos/Solaris we might prefer native ld
+    if test -n "$nativePrefix"; then
+      ldPath="$nativePrefix/bin"
+    else
+      ldPath="$binutils/bin"
+    fi;
 fi
 
 
 doSubstitute() {
     local src=$1
     local dst=$2
+    local ld="$ldPath/ld"
+    if $ld -V 2>&1 |grep Solaris; then
+      # Use Solaris specific linker wrapper
+      ld="$out/bin/ld-solaris"
+    fi
     # Can't use substitute() here, because replace may not have been
     # built yet (in the bootstrap).
     sed \
@@ -85,7 +95,7 @@ doSubstitute() {
         -e "s^@binutils@^$binutils^g" \
         -e "s^@coreutils@^$coreutils^g" \
         -e "s^@libc@^$libc^g" \
-        -e "s^@ld@^$ldPath/ld^g" \
+        -e "s^@ld@^$ld^g" \
         < "$src" > "$dst" 
 }
 
@@ -174,6 +184,13 @@ ln -s $ldPath/as $out/bin/as
 doSubstitute "$ldWrapper" "$out/bin/ld"
 chmod +x "$out/bin/ld"
 
+# Copy solaris ld wrapper if needed
+if $ldPath/ld -V 2>&1 |grep Solaris; then
+  # Use Solaris specific linker wrapper
+  sed -e "s^@ld@^$ldPath/ld^g" < "$ldSolarisWrapper" > "$out/bin/ld-solaris"
+  chmod +x "$out/bin/ld-solaris"
+fi
+
 
 # Emit a setup hook.  Also store the path to the original GCC and
 # Glibc.
diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
index 87617621e64..aa4f6a3944e 100644
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@@ -36,6 +36,7 @@ stdenv.mkDerivation {
   gnatWrapper = ./gnat-wrapper.sh;
   gnatlinkWrapper = ./gnatlink-wrapper.sh;
   ldWrapper = ./ld-wrapper.sh;
+  ldSolarisWrapper = ./ld-solaris-wrapper.sh;
   utils = ./utils.sh;
   addFlags = ./add-flags;
   
diff --git a/pkgs/build-support/gcc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-solaris-wrapper.sh
new file mode 100644
index 00000000000..5a7b92b5ad7
--- /dev/null
+++ b/pkgs/build-support/gcc-wrapper/ld-solaris-wrapper.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+set -u
+
+# I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'(
+# Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3
+#   but still no success.
+cmd="@ld@ -z ignore"
+
+args=("$@");
+
+# This loop makes sure all -L arguments are before -l arguments, or ld may complain it cannot find a library.
+# GNU binutils does not have this problem:
+#   http://stackoverflow.com/questions/5817269/does-the-order-of-l-and-l-options-in-the-gnu-linker-matter
+i=0;
+while [[ $i -lt $# ]]; do
+    case "${args[$i]}" in
+        -L)  cmd="$cmd ${args[$i]} ${args[($i+1)]}"; i=($i+1); ;;
+        -L*) cmd="$cmd ${args[$i]}" ;;
+        *)   ;;
+    esac
+    i=($i+1);
+done
+
+i=0;
+while [[ $i -lt $# ]]; do
+    case "${args[$i]}" in
+        -L)  i=($i+1); ;;
+        -L*) ;;
+        *)   cmd="$cmd ${args[$i]}" ;;
+    esac
+    i=($i+1);
+done
+
+# Trace:
+set -x
+exec $cmd
+
+exit 0
diff --git a/pkgs/development/compilers/gcc/4.7/builder.sh b/pkgs/development/compilers/gcc/4.7/builder.sh
index 37400fba5bf..dc6fdd93561 100644
--- a/pkgs/development/compilers/gcc/4.7/builder.sh
+++ b/pkgs/development/compilers/gcc/4.7/builder.sh
@@ -155,7 +155,7 @@ if test -n "$targetConfig"; then
     dontStrip=1
 fi
 
-
+providedPreConfigure="$preConfigure";
 preConfigure() {
     if test -n "$newlibSrc"; then
         tar xvf "$newlibSrc" -C ..
@@ -188,6 +188,9 @@ preConfigure() {
         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
diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix
index 6e8e5d86cc5..d97f8aaf5c6 100644
--- a/pkgs/development/compilers/gcc/4.7/default.nix
+++ b/pkgs/development/compilers/gcc/4.7/default.nix
@@ -277,19 +277,34 @@ stdenv.mkDerivation ({
     ++ (optional stdenv.isDarwin gnused)
     ;
 
-  configureFlagsArray = stdenv.lib.optionals
-    (ppl != null && ppl ? dontDisableStatic && ppl.dontDisableStatic)
-        [ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ]; 
+  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"
+      ''}
+    '';
 
   # 'iant' at #go-nuts@freenode, gccgo maintainer, said that
   # they have a bug in 4.7.1 if adding "--disable-static"
-  dontDisableStatic = langGo;
+  dontDisableStatic = langGo || staticCompiler;
 
   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 --with-gnu-ld "
+      " --with-gnu-as --without-gnu-ld "
       else ""}
     --enable-lto
     ${if enableMultilib then "" else "--disable-multilib"}
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 113093a8067..e88308bb2e9 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation (rec {
 
   patches = [ ./no-gets.patch ];
 
-  LDFLAGS = if stdenv.isSunOS then "-lsec -lavl" else "";
+  LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else "";
 
   configureFlags = [ "--disable-csharp" ]
      ++ (stdenv.lib.optionals stdenv.isCygwin
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index 802fd93f8cf..6fbb6253ee5 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, gmp}:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "mpfr-3.1.1";
 
   src = fetchurl {
@@ -35,16 +35,14 @@ stdenv.mkDerivation (rec {
     maintainers = [ stdenv.lib.maintainers.ludo ];
     platforms = stdenv.lib.platforms.all;
   };
-}
 
-//
-
-(stdenv.lib.optionalAttrs (stdenv.isSunOS or stdenv.isFreeBSD) {
-   /* Work around a FreeBSD bug that otherwise leads to segfaults in
-      the test suite:
-        http://hydra.bordeaux.inria.fr/build/34862
-        http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00015.html
-        http://www.freebsd.org/cgi/query-pr.cgi?pr=161344
-    */
-   configureFlags = [ "--disable-thread-safe" ];
- }))
+  configureFlags =
+    /* Work around a FreeBSD bug that otherwise leads to segfaults in
+        the test suite:
+          http://hydra.bordeaux.inria.fr/build/34862
+          http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00015.html
+          http://www.freebsd.org/cgi/query-pr.cgi?pr=161344
+      */
+    stdenv.lib.optional (stdenv.isSunOS or stdenv.isFreeBSD) "--disable-thread-safe" ++
+    stdenv.lib.optional stdenv.is64bit "--with-pic";
+}
diff --git a/pkgs/development/libraries/ppl/upstream-based.patch b/pkgs/development/libraries/ppl/upstream-based.patch
new file mode 100644
index 00000000000..551050f67bf
--- /dev/null
+++ b/pkgs/development/libraries/ppl/upstream-based.patch
@@ -0,0 +1,42 @@
+https://bugs.gentoo.org/show_bug.cgi?id=447928
+--- ppl-1.0/src/p_std_bits.cc.org	2012-12-30 00:37:03.033948083 +0100
++++ ppl-1.0/src/mp_std_bits.cc	2012-12-30 00:44:12.893019313 +0100
+@@ -25,6 +25,9 @@
+ #include "ppl-config.h"
+ #include "mp_std_bits.defs.hh"
+ 
++#if __GNU_MP_VERSION < 5 \
++  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
++
+ const bool std::numeric_limits<mpz_class>::is_specialized;
+ const int std::numeric_limits<mpz_class>::digits;
+ const int std::numeric_limits<mpz_class>::digits10;
+@@ -70,3 +73,6 @@
+ const bool std::numeric_limits<mpq_class>::traps;
+ const bool std::numeric_limits<mpq_class>::tininess_before;
+ const std::float_round_style std::numeric_limits<mpq_class>::round_style;
++
++#endif // __GNU_MP_VERSION < 5
++       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
+--- ppl-1.0/src/mp_std_bits.defs.hh.org	2012-12-30 00:37:03.037948187 +0100
++++ ppl-1.0/src/mp_std_bits.defs.hh	2012-12-30 00:42:32.002424189 +0100
+@@ -38,6 +38,9 @@
+ #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
+ void swap(mpq_class& x, mpq_class& y);
+ 
++#if __GNU_MP_VERSION < 5 \
++  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
++
+ namespace std {
+ 
+ #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
+@@ -164,6 +167,9 @@
+ 
+ } // namespace std
+ 
++#endif // __GNU_MP_VERSION < 5
++       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
++
+ #include "mp_std_bits.inlines.hh"
+ 
+ #endif // !defined(PPL_mp_std_bits_defs_hh)
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index d0f7d60f101..b16c51f7580 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -23,6 +23,7 @@ import ../generic rec {
 
   gcc = import ../../build-support/gcc-wrapper {
     nativeTools = false;
+    nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr";
     nativeLibc = true;
     inherit stdenv;
     binutils =
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 69892cbfd73..1ed3fc928f0 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -49,8 +49,8 @@ stdenv.mkDerivation (rec {
 
   enableParallelBuilding = true;
 
-  LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lmp -lmd -lnsl -lsocket -lresolv";
-  NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol";
+  NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol" +
+                stdenv.lib.optionalString stdenv.isSunOS "-lmp -lmd -lnsl -lsocket -lresolv -luutil -lnvpair -lidmap -lavl -lsec";
 
   meta = {
     homepage = http://www.gnu.org/software/coreutils/;
-- 
GitLab


From 867ea1f8fe74e50be63ecc0ade7d5cfe685e47a3 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Tue, 26 Feb 2013 09:06:20 +0000
Subject: [PATCH 0017/3789] Update to PCRE 8.32 with JIT enabled

---
 pkgs/development/libraries/pcre/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index e59c249348a..69ed4c85313 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }:
 
 stdenv.mkDerivation rec {
-  name = "pcre-8.31";
+  name = "pcre-8.32";
 
   src = fetchurl {
     url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
-    sha256 = "5778a02535473c7ee7838ea598c19f451e63cf5eec0bf0307a688301c9078c3c";
+    sha256 = "a913fb9bd058ef380a2d91847c3c23fcf98e92dc3b47cd08a53c021c5cde0f55";
   };
 
   # The compiler on Darwin crashes with an internal error while building the
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
   # problem. In case we ever update the Darwin GCC version, the exception for
   # that platform ought to be removed.
   configureFlags = ''
+    --enable-jit
     ${if unicodeSupport then "--enable-unicode-properties" else ""}
     ${if !cplusplusSupport then "--disable-cpp" else ""}
   '' + stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-O0";
-- 
GitLab


From c019cdb7615ebc89e5a84e5b1fb873139b356b42 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Tue, 26 Feb 2013 09:08:00 +0000
Subject: [PATCH 0018/3789] Update CPIO to 2.11

---
 pkgs/tools/archivers/cpio/default.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
index 525a64f9b82..919484fa915 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -1,22 +1,13 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "cpio-2.9";
+  name = "cpio-2.11";
   
   src = fetchurl {
     url = mirror://gnu/cpio/cpio-2.11.tar.bz2;
     sha256 = "bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd";
   };
 
-  patches = [
-    # Make it compile on GCC 4.3.
-    (fetchurl {
-      name = "cpio-2.9-gnu-inline.patch";
-      url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/app-arch/cpio/files/cpio-2.9-gnu-inline.patch?rev=1.1";
-      sha256 = "1167hrq64h9lh3qhgasm2rivfzkkgx6fik92b017qfa0q61ff8c3";
-    })
-  ];
-
   meta = {
     homepage = http://www.gnu.org/software/cpio/;
     description = "A program to create or extract from cpio archives";
-- 
GitLab


From fcce211c8ee3e65344b7af52a97f2f2bfceca41e Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Tue, 26 Feb 2013 09:19:11 +0000
Subject: [PATCH 0019/3789] Fix GZip build on Illumos

---
 pkgs/tools/compression/gzip/default.nix       |  4 ++++
 .../compression/gzip/skip-some-tests.patch    | 21 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/compression/gzip/skip-some-tests.patch

diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index d15b26f48b6..c1e86b5d2f6 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "0wx1nqk709kx75cwp2axachnbxryp4gyl06qxn5nl95184w0mhls";
   };
 
+  doCheck = true;
+
+  patches = [ ./skip-some-tests.patch ];
+
   meta = {
     homepage = http://www.gnu.org/software/gzip/;
     description = "Gzip, the GNU zip compression program";
diff --git a/pkgs/tools/compression/gzip/skip-some-tests.patch b/pkgs/tools/compression/gzip/skip-some-tests.patch
new file mode 100644
index 00000000000..ebcda684ef7
--- /dev/null
+++ b/pkgs/tools/compression/gzip/skip-some-tests.patch
@@ -0,0 +1,21 @@
+Skip tests requiring Perl and less (more).
+Also zgrep-signal skipping fails with weird Bad file number error on illumos.
+--- gzip-1.5/tests/Makefile.in.orig	2013-02-23 15:15:08.017048868 +0000
++++ gzip-1.5/tests/Makefile.in	2013-02-23 15:15:32.756197039 +0000
+@@ -1421,7 +1421,6 @@
+   trailing-nul				\
+   zdiff					\
+   zgrep-f				\
+-  zgrep-signal				\
+   znew-k
+ 
+ EXTRA_DIST = \
+@@ -1441,8 +1440,6 @@
+   zfgrep	\
+   zforce	\
+   zgrep		\
+-  zless		\
+-  zmore		\
+   znew
+ 
+ TESTS_ENVIRONMENT = \
-- 
GitLab


From 82240c899adc77ac6cdddf9f1dafc4eedcf60cd4 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Tue, 26 Feb 2013 09:23:16 +0000
Subject: [PATCH 0020/3789] Fix GMP build on Illumos.

- Use smaller xz sources instead of bz2 sources.
---
 pkgs/development/libraries/gmp/5.1.1.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gmp/5.1.1.nix b/pkgs/development/libraries/gmp/5.1.1.nix
index 0261f833962..d9c67274f25 100644
--- a/pkgs/development/libraries/gmp/5.1.1.nix
+++ b/pkgs/development/libraries/gmp/5.1.1.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   name = "gmp-5.1.1";
 
   src = fetchurl {
-    urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ];
-    sha256 = "1bdgf04k2i12pfivxgjq68iarz3ngix9hpzbmkgijrdk92gpgm50";
+    urls = [ "mirror://gnu/gmp/${name}.tar.xz" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.xz" ];
+    sha256 = "1hili06lcf0clg5qfvz7knm6pmj6ab54yhsvskp1mdny5xw4vmjb";
   };
 
   nativeBuildInputs = [ m4 ];
@@ -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" ] else [ "--disable-cxx" ])
+    ++ (if stdenv.is64bit then [ "--with-pic" ] else []);
 
   doCheck = true;
 
-- 
GitLab


From c041dbb1d2ca5d52dd837564a4b73d48c52175a7 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Wed, 27 Feb 2013 18:15:57 +0100
Subject: [PATCH 0021/3789] Fix libxslt build on Illumos.

---
 .../development/libraries/libxslt/default.nix |  6 +-
 .../libraries/libxslt/patch-ah.patch          | 69 +++++++++++++++++++
 2 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/libxslt/patch-ah.patch

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index d3b7769754e..56acc841c60 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,15 +1,17 @@
 { stdenv, fetchurl, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "libxslt-1.1.27";
+  name = "libxslt-1.1.28";
 
   src = fetchurl {
     url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz";
-    sha256 = "09ky3vhlaahvsb0q9gp6h3as53pfj70gincirachjqzj46jdka5n";
+    sha256 = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c";
   };
 
   buildInputs = [ libxml2 ];
 
+  patches = stdenv.lib.optionals stdenv.isSunOS [ ./patch-ah.patch ];
+
   postInstall = ''
     mkdir -p $out/nix-support
     ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/
diff --git a/pkgs/development/libraries/libxslt/patch-ah.patch b/pkgs/development/libraries/libxslt/patch-ah.patch
new file mode 100644
index 00000000000..ea75b01178e
--- /dev/null
+++ b/pkgs/development/libraries/libxslt/patch-ah.patch
@@ -0,0 +1,69 @@
+$NetBSD: patch-ah,v 1.3 2012/11/27 12:17:51 adam Exp $
+
+Fix syms file for stricter solaris ld
+
+--- libxslt-1.1.28/libxslt/libxslt.syms.orig	2012-11-27 12:04:43.000000000 +0000
++++ libxslt-1.1.28/libxslt/libxslt.syms
+@@ -107,7 +107,7 @@ LIBXML2_1.0.11 {
+   xsltFreeCompMatchList;
+   xsltFreeTemplateHashes;
+   xsltGetTemplate;
+-  xsltMatchPattern;
++# xsltMatchPattern;
+   xsltTestCompMatchList;
+ 
+ # preproc
+@@ -407,7 +407,7 @@ LIBXML2_1.1.18 {
+     global:
+ 
+ # xsltInternals
+-  xsltConstNamespaceNameXSLT; # variable
++# xsltConstNamespaceNameXSLT; # variable
+   xsltExtensionInstructionResultFinalize;
+   xsltExtensionInstructionResultRegister;
+   xsltInitCtxtKey;
+@@ -416,24 +416,24 @@ LIBXML2_1.1.18 {
+   xsltInit;
+ 
+ # xsltInternals
+-  xsltParseAnyXSLTElem;
+-  xsltParseSequenceConstructor;
+-  xsltPointerListAddSize;
+-  xsltPointerListClear;
+-  xsltPointerListCreate;
+-  xsltPointerListFree;
++# xsltParseAnyXSLTElem;
++# xsltParseSequenceConstructor;
++# xsltPointerListAddSize;
++# xsltPointerListClear;
++# xsltPointerListCreate;
++# xsltPointerListFree;
+   xsltRegisterLocalRVT;
+   xsltReleaseRVT;
+-  xsltRestoreDocumentNamespaces;
++# xsltRestoreDocumentNamespaces;
+ 
+ # extensions
+-  xsltStyleStylesheetLevelGetExtData;
++# xsltStyleStylesheetLevelGetExtData;
+ 
+ # xsltInternals
+ # xsltTransStorageAdd; removed in 1.1.28
+ # xsltTransStorageRemove; removed in 1.1.28
+   xsltUninit;
+-  xsltXSLTAttrMarker; # variable
++# xsltXSLTAttrMarker; # variable
+ } LIBXML2_1.1.9;
+ 
+ LIBXML2_1.1.20 {
+@@ -476,6 +476,10 @@ LIBXML2_1.1.26 {
+ 
+ # transform
+   xsltProcessOneNode;
++
++# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local")
++    local:
++  *;
+ } LIBXML2_1.1.25;
+ 
+ LIBXML2_1.1.27 {
-- 
GitLab


From 8ae2a89cabb83428d5217ac8623b70935317c1b1 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Tue, 26 Feb 2013 12:03:23 +0000
Subject: [PATCH 0022/3789] Update glib and dbus - and make them compile on
 Illumos.

---
 pkgs/development/libraries/dbus/default.nix |  4 ++--
 pkgs/development/libraries/glib/2.34.x.nix  | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 5716ac6648a..fa06a5269d3 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }:
 
 let
-  version = "1.6.4";
+  version = "1.6.8";
 
   src = fetchurl {
     url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
-    sha256 = "1wacqyfkcpayg7f8rvx9awqg275n5pksxq5q7y21lxjx85x6pfjz";
+    sha256 = "fc1370ef38abeeb13f55c905ec002e60705fb0bfde3b8d21c8d6eb8056c11bac";
   };
 
   patches = [ ./ignore-missing-includedirs.patch ];
diff --git a/pkgs/development/libraries/glib/2.34.x.nix b/pkgs/development/libraries/glib/2.34.x.nix
index 69ed44aecca..e11e3bcb317 100644
--- a/pkgs/development/libraries/glib/2.34.x.nix
+++ b/pkgs/development/libraries/glib/2.34.x.nix
@@ -12,11 +12,11 @@
 #       $out/bin/gtester-report' to postInstall if this is solved
 
 stdenv.mkDerivation (rec {
-  name = "glib-2.34.0";
+  name = "glib-2.34.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/2.34/${name}.tar.xz";
-    sha256 = "f69b112f8848be35139d9099b62bc81649241f78f6a775516f0d4c9b47f65144";
+    sha256 = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7";
   };
 
   # configure script looks for d-bus but it is only needed for tests
@@ -26,7 +26,11 @@ stdenv.mkDerivation (rec {
 
   propagatedBuildInputs = [ pcre zlib libffi ];
 
-  configureFlags = "--with-pcre=system --disable-fam";
+  configureFlags = "--with-pcre=system --disable-fam" +
+                   (stdenv.lib.optionalString (libiconvOrNull != null) " --with-libiconv=gnu") +
+                   (stdenv.lib.optionalString stdenv.isSunOS " --disable-modular-tests");
+
+  CPPFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-DBSD_COMP";
 
   enableParallelBuilding = true;
 
-- 
GitLab


From 029864b08dd6b57d0cab1ecb35b2a78673ab192c Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Tue, 26 Feb 2013 12:05:27 +0000
Subject: [PATCH 0023/3789] Update disnix.

---
 pkgs/tools/package-management/disnix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index 9c17b9b78f7..42e55b35fc0 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.3pre32254";
+  name = "disnix-0.3pre34664";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/2368541/download/4/disnix-0.3pre32254.tar.gz;
-    sha256 = "1jznx4mb6vwpzzpbk4c16j73hjgng7v1nraq8yya7f7m1s2gyhcw";
+    url = http://hydra.nixos.org/build/4072223/download/4/disnix-0.3pre34664.tar.gz;
+    sha256 = "4e20a73c17061428ea66abd6004aaaa71b273ac88fca8e569a2262ae1f246c52";
   };
   
   buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]
-- 
GitLab


From a611683b44f8fe53950f21bd9a813281e07754e5 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Thu, 28 Feb 2013 13:37:32 +0000
Subject: [PATCH 0024/3789] Illumos: Fix dbus group policy checking only
 looking at user's primary group.

D-Bus simply gives up when getgrouplist is not available.
 Added a dirty patch with getgrouplist.c from OpenBSD:
 https://github.com/duosecurity/duo_unix/blob/master/compat/getgrouplist.c
---
 pkgs/development/libraries/dbus/default.nix   |   4 +-
 .../dbus/implement-getgrouplist.patch         | 108 ++++++++++++++++++
 2 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/dbus/implement-getgrouplist.patch

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index fa06a5269d3..7510801cd79 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -8,9 +8,9 @@ let
     sha256 = "fc1370ef38abeeb13f55c905ec002e60705fb0bfde3b8d21c8d6eb8056c11bac";
   };
 
-  patches = [ ./ignore-missing-includedirs.patch ];
+  patches = [ ./ignore-missing-includedirs.patch ./implement-getgrouplist.patch ];
 
-  configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp";
+  configureFlags = "--enable-embedded-tests --localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp";
 
 in rec {
 
diff --git a/pkgs/development/libraries/dbus/implement-getgrouplist.patch b/pkgs/development/libraries/dbus/implement-getgrouplist.patch
new file mode 100644
index 00000000000..e3a4a25cb72
--- /dev/null
+++ b/pkgs/development/libraries/dbus/implement-getgrouplist.patch
@@ -0,0 +1,108 @@
+Compatibility patch for Illumos/Solaris and possibly other platforms.
+Implements getgrouplist when not provided by OS.
+Without it, only the user's primary group is used in authentication!
+--- 	1970-01-01 00:00:00.000000000 +0000
++++ dbus-1.6.8/dbus/getgrouplist.c	2013-02-28 13:10:51.081792722 +0000
+@@ -0,0 +1,89 @@
++/*	$OpenBSD: getgrouplist.c,v 1.12 2005/08/08 08:05:34 espie Exp $ */
++/*
++ * Copyright (c) 1991, 1993
++ *	The Regents of the University of California.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. Neither the name of the University nor the names of its contributors
++ *    may be used to endorse or promote products derived from this software
++ *    without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ */
++
++/* OPENBSD ORIGINAL: lib/libc/gen/getgrouplist.c */
++
++/*
++ * get credential
++ */
++#include <sys/types.h>
++#include <string.h>
++#include <unistd.h>
++#include <grp.h>
++
++int
++getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
++{
++	struct group *grp;
++	int i, ngroups;
++	int ret, maxgroups;
++	int bail;
++
++	ret = 0;
++	ngroups = 0;
++	maxgroups = *grpcnt;
++
++	/*
++	 * install primary group
++	 */
++	if (ngroups >= maxgroups) {
++		*grpcnt = ngroups;
++		return (-1);
++	}
++	groups[ngroups++] = agroup;
++
++	/*
++	 * Scan the group file to find additional groups.
++	 */
++	setgrent();
++	while ((grp = getgrent())) {
++		if (grp->gr_gid == agroup)
++			continue;
++		for (bail = 0, i = 0; bail == 0 && i < ngroups; i++)
++			if (groups[i] == grp->gr_gid)
++				bail = 1;
++		if (bail)
++			continue;
++		for (i = 0; grp->gr_mem[i]; i++) {
++			if (!strcmp(grp->gr_mem[i], uname)) {
++				if (ngroups >= maxgroups) {
++					ret = -1;
++					goto out;
++				}
++				groups[ngroups++] = grp->gr_gid;
++				break;
++			}
++		}
++	}
++out:
++	endgrent();
++	*grpcnt = ngroups;
++	return (ret);
++}
+--- dbus-1.6.8/dbus/dbus-sysdeps-unix.c.orig	2013-02-28 13:08:52.171215237 +0000
++++ dbus-1.6.8/dbus/dbus-sysdeps-unix.c	2013-02-28 13:13:52.224615146 +0000
+@@ -21,6 +21,10 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+  *
+  */
++#ifndef HAVE_GETGROUPLIST
++#include "getgrouplist.c"
++#define HAVE_GETGROUPLIST
++#endif
+ 
+ #include <config.h>
+ 
-- 
GitLab


From cbfc76d5caa73dff89a3388fe2ed18b3214face3 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Thu, 28 Feb 2013 14:52:14 +0000
Subject: [PATCH 0025/3789] Add SmartOS native GCC path.

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

diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index f303e47fd5d..715bc02758b 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -113,7 +113,7 @@ rec {
     name = "gcc-native";
     nativeTools = true;
     nativeLibc = true;
-    nativePrefix = if system == "i686-solaris" then "/usr/gnu" else "/usr";
+    nativePrefix = if system == "i686-solaris" then "/usr/gnu" else if system == "x86_64-solaris" then "/opt/local/gcc47" else "/usr";
     stdenv = stdenvBoot0;
   };
 
-- 
GitLab


From 9baf9e98d191de0fc39678a0b1bc051ee48d6fa6 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Thu, 28 Feb 2013 15:53:47 +0100
Subject: [PATCH 0026/3789] Fix Perl builds on Illumos.

---
 pkgs/development/interpreters/perl/5.14/default.nix   |  3 ++-
 .../interpreters/perl/5.14/ld-shared.patch            | 11 +++++++++++
 pkgs/development/interpreters/perl/5.16/default.nix   |  1 +
 .../interpreters/perl/5.16/ld-shared.patch            | 11 +++++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/perl/5.14/ld-shared.patch
 create mode 100644 pkgs/development/interpreters/perl/5.16/ld-shared.patch

diff --git a/pkgs/development/interpreters/perl/5.14/default.nix b/pkgs/development/interpreters/perl/5.14/default.nix
index ac19900bcfc..70a030e0308 100644
--- a/pkgs/development/interpreters/perl/5.14/default.nix
+++ b/pkgs/development/interpreters/perl/5.14/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
   patches = 
     [ # Do not look in /usr etc. for dependencies.
       ./no-sys-dirs.patch
-    ] 
+    ]
+    ++ stdenv.lib.optional stdenv.isSunOS  ./ld-shared.patch
     ++ stdenv.lib.optional stdenv.isDarwin ./no-libutil.patch;
 
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
diff --git a/pkgs/development/interpreters/perl/5.14/ld-shared.patch b/pkgs/development/interpreters/perl/5.14/ld-shared.patch
new file mode 100644
index 00000000000..b1834ff7a1f
--- /dev/null
+++ b/pkgs/development/interpreters/perl/5.14/ld-shared.patch
@@ -0,0 +1,11 @@
+--- perl-5.14.2/hints/solaris_2.sh.orig	2013-02-14 19:29:49.453988140 +0000
++++ perl-5.14.2/hints/solaris_2.sh	2013-02-14 19:30:31.681631019 +0000
+@@ -568,7 +568,7 @@
+ #		    ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
+ #		fi
+ 		ldflags="$ldflags -m64"
+-		lddlflags="$lddlflags -G -m64"
++		lddlflags="$lddlflags -shared -m64"
+ 		;;
+ 	    *)
+ 		getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index 288de63b4ae..153da2c9d05 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
     [ # Do not look in /usr etc. for dependencies.
       ./no-sys-dirs.patch
     ]
+    ++ stdenv.lib.optional stdenv.isSunOS  ./ld-shared.patch
     ++ stdenv.lib.optional stdenv.isDarwin ./no-libutil.patch;
 
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
diff --git a/pkgs/development/interpreters/perl/5.16/ld-shared.patch b/pkgs/development/interpreters/perl/5.16/ld-shared.patch
new file mode 100644
index 00000000000..be45230c8a7
--- /dev/null
+++ b/pkgs/development/interpreters/perl/5.16/ld-shared.patch
@@ -0,0 +1,11 @@
+--- perl-5.16.2/hints/solaris_2.sh.orig	2013-02-14 19:29:49.453988140 +0000
++++ perl-5.16.2/hints/solaris_2.sh	2013-02-14 19:30:31.681631019 +0000
+@@ -568,7 +568,7 @@
+ #		    ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
+ #		fi
+ 		ldflags="$ldflags -m64"
+-		lddlflags="$lddlflags -G -m64"
++		lddlflags="$lddlflags -shared -m64"
+ 		;;
+ 	    *)
+ 		getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
-- 
GitLab


From 99a14f378c7fb6f24b2ce98d834c1394bb176bc4 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Thu, 28 Feb 2013 16:20:03 +0100
Subject: [PATCH 0027/3789] Fix ncurses build on Illumos.

---
 .../development/libraries/ncurses/default.nix |  4 +-
 pkgs/development/libraries/ncurses/patch-ac   | 40 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/ncurses/patch-ac

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 569d7fe2a32..378abb81295 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -8,7 +8,7 @@ let
      <http://mail.python.org/pipermail/python-bugs-list/2006-September/035362.html>,
      but this is left as an exercise to the reader.
      So disable them for now.  */
-  cxx = stdenv.system != "i686-solaris";
+  cxx = !stdenv.isSunOS;
 in
 stdenv.mkDerivation (rec {
   name = "ncurses-5.9";
@@ -23,6 +23,8 @@ stdenv.mkDerivation (rec {
     ${if unicode then "--enable-widec" else ""}${if cxx then "" else "--without-cxx-binding"}
   '';
 
+  patches = [ ./patch-ac ];
+
   selfNativeBuildInput = true;
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/ncurses/patch-ac b/pkgs/development/libraries/ncurses/patch-ac
new file mode 100644
index 00000000000..73578f8a367
--- /dev/null
+++ b/pkgs/development/libraries/ncurses/patch-ac
@@ -0,0 +1,40 @@
+$NetBSD: patch-ac,v 1.18 2011/11/01 14:47:46 hans Exp $
+
+--- ncurses-5.9/configure.orig	2011-02-21 01:40:36.000000000 +0000
++++ ncurses-5.9/configure
+@@ -7096,6 +7096,13 @@ sco*) #(vi
+ 	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
+ 	;;
+ solaris2.1[0-9]) #(vi
++	case "$GCC_VERSION" in 
++		4.[67].*)
++			cf_XOPEN_SOURCE=600
++			cf_add_cflags=-std=c99
++			CPPFLAGS="$CPPFLAGS -std=c99"
++			;;
++	esac
+ 	cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 	;;
+ solaris2.[1-9]) #(vi
+@@ -9640,12 +9647,7 @@ case ".$MANPAGE_RENAMES" in #(vi
+ .no) #(vi
+   ;;
+ .|.yes)
+-  # Debian 'man' program?
+-  if test -f /etc/debian_version ; then
+-    MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames
+-  else
+     MANPAGE_RENAMES=no
+-  fi
+   ;;
+ esac
+ 
+@@ -18449,7 +18444,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+ 
+-CPPFLAGS="$CPPFLAGS -I. -I../include"
++CPPFLAGS="-I. -I../include $CPPFLAGS"
+ if test "$srcdir" != "."; then
+ 	CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
+ fi
-- 
GitLab


From fe3a8b6859302393c77ee6626f4a65a0a3831eca Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Thu, 28 Feb 2013 16:28:14 +0100
Subject: [PATCH 0028/3789] gnutar root build: Nix on Illumos doesn't support
 build users yet.

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

diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 51d5d35fe80..828d0677bb8 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   # May have some issues with root compilation because the bootstrap tool
   # cannot be used as a login shell for now.
-  FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux") "1";
+  FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1";
 
   meta = {
     homepage = http://www.gnu.org/software/tar/;
-- 
GitLab


From 5dcc019dc0fa88caa071b457c77f1d1ccbfaa380 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Thu, 28 Feb 2013 16:35:01 +0100
Subject: [PATCH 0029/3789] Update bison to 2.7

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

diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix
index b397a22443a..4e4539059a6 100644
--- a/pkgs/development/tools/parsing/bison/default.nix
+++ b/pkgs/development/tools/parsing/bison/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, m4, perl }:
 
 stdenv.mkDerivation rec {
-  name = "bison-2.6.5";
+  name = "bison-2.7";
 
   src = fetchurl {
     url = "mirror://gnu/bison/${name}.tar.xz";
-    sha256 = "8640d5b51aad462db6863711f333a9159836853e0b1e79fdef708c6efb5cd52b";
+    sha256 = "1zd77ilmpv5mi3kr55jrj6ncqlcnyhpianhrwzak2q28cv2cbn23";
   };
 
   nativeBuildInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl;
-- 
GitLab


From ecba7e947eb8cc1500dd1a91b544567d595a37e2 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Thu, 28 Feb 2013 16:38:43 +0100
Subject: [PATCH 0030/3789] Update Git to 1.8.1.3 and fix build on Illumos.

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

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 87fa119252c..62880424b59 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.8.1";
+  version = "1.8.1.3";
 
   svn = subversionClient.override { perlBindings = true; };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha1 = "wfj2pbqf9l56014dm330wb13qgcwx3dc";
+    sha256 = "1waz35cwgcwhgmgzmc4s00yd2vivhy77p49crgqsl0nqpxyj8lrp";
   };
 
   patches = [ ./docbook2texi.patch ];
@@ -32,7 +32,8 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optionals guiSupport [tcl tk];
 
   makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
-      + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1");
+      + (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 "");
 
   # FIXME: "make check" requires Sparse; the Makefile must be tweaked
   # so that `SPARSE_FLAGS' corresponds to the current architecture...
-- 
GitLab


From 5436ca4d87dda0687435147b5657bd0540b9f668 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Thu, 28 Feb 2013 16:42:03 +0100
Subject: [PATCH 0031/3789] Update gettext to 0.18.2

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

diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index e88308bb2e9..074c1b9c49f 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation (rec {
-  name = "gettext-0.18.1.1";
+  name = "gettext-0.18.2";
   
   src = fetchurl {
     url = "mirror://gnu/gettext/${name}.tar.gz";
-    sha256 = "1sa3ch12qxa4h3ya6hkz119yclcccmincl9j20dhrdx5mykp3b4k";
+    sha256 = "516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c";
   };
 
   patches = [ ./no-gets.patch ];
-- 
GitLab


From e33b77d84d1c4dabc18a439e39c9f084e7c566fb Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Thu, 28 Feb 2013 16:49:46 +0100
Subject: [PATCH 0032/3789] Fix gnugrep build on Illumos.

---
 pkgs/tools/text/gnugrep/default.nix           |  2 ++
 pkgs/tools/text/gnugrep/test-localeconv.patch | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/tools/text/gnugrep/test-localeconv.patch

diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index 98a737339d2..fde9123adf2 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation {
   buildInputs = [ pcre ]
     ++ stdenv.lib.optional (libiconv != null) libiconv;
 
+  patches = [ ./test-localeconv.patch ];
+
   NIX_LDFLAGS = stdenv.lib.optionalString (libiconv != null) "-L${libiconv}/lib -liconv";
 
   doCheck = !stdenv.isDarwin;
diff --git a/pkgs/tools/text/gnugrep/test-localeconv.patch b/pkgs/tools/text/gnugrep/test-localeconv.patch
new file mode 100644
index 00000000000..f5efaf22221
--- /dev/null
+++ b/pkgs/tools/text/gnugrep/test-localeconv.patch
@@ -0,0 +1,18 @@
+--- grep-2.14/gnulib-tests/test-localeconv.c.orig	2013-02-15 18:41:50.213433059 +0000
++++ grep-2.14/gnulib-tests/test-localeconv.c	2013-02-15 18:50:33.964751303 +0000
+@@ -37,13 +37,13 @@
+ 
+     ASSERT (STREQ (l->decimal_point, "."));
+     ASSERT (STREQ (l->thousands_sep, ""));
+-#if !defined __FreeBSD__
++#if !(defined __FreeBSD__ || defined __sun)
+     ASSERT (STREQ (l->grouping, ""));
+ #endif
+ 
+     ASSERT (STREQ (l->mon_decimal_point, ""));
+     ASSERT (STREQ (l->mon_thousands_sep, ""));
+-#if !defined __FreeBSD__
++#if !(defined __FreeBSD__ || defined __sun)
+     ASSERT (STREQ (l->mon_grouping, ""));
+ #endif
+     ASSERT (STREQ (l->positive_sign, ""));
-- 
GitLab


From ef85e97b518ffbf5913f5ba1e44cce8337b2a886 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Thu, 28 Feb 2013 16:50:58 +0100
Subject: [PATCH 0033/3789] Update gnused to 4.2.2

---
 pkgs/tools/text/gnused/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index 66fcb3d1929..65a1c131de1 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "gnused-4.2.1";
+  name = "gnused-4.2.2";
 
   src = fetchurl {
-    url = mirror://gnu/sed/sed-4.2.1.tar.gz;
-    sha256 = "0q1hzjvr6pzhaagidg7pj76k1fzz5nl15np7p72w9zcpw0f58ww7";
+    url = mirror://gnu/sed/sed-4.2.2.tar.gz;
+    sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7";
   };
 
   meta = {
-- 
GitLab


From 66798d7aaf79fdb4eca7c1f04f092544b4afa4a6 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Thu, 28 Feb 2013 17:03:42 +0100
Subject: [PATCH 0034/3789] gettext: Remove old patch. Enable xz compression.

---
 .../development/libraries/gettext/default.nix |  8 ++--
 .../libraries/gettext/no-gets.patch           | 42 -------------------
 2 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 pkgs/development/libraries/gettext/no-gets.patch

diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 074c1b9c49f..c9596d66ee2 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libiconv }:
+{ stdenv, fetchurl, libiconv, xz }:
 
 stdenv.mkDerivation (rec {
   name = "gettext-0.18.2";
@@ -8,11 +8,9 @@ stdenv.mkDerivation (rec {
     sha256 = "516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c";
   };
 
-  patches = [ ./no-gets.patch ];
-
   LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else "";
 
-  configureFlags = [ "--disable-csharp" ]
+  configureFlags = [ "--disable-csharp" "--with-xz" ]
      ++ (stdenv.lib.optionals stdenv.isCygwin
           [ # We have a static libiconv, so we can only build the static lib.
             "--disable-shared" "--enable-static"
@@ -32,7 +30,7 @@ stdenv.mkDerivation (rec {
     fi
   '';
 
-  buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
+  buildInputs = [ xz ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
   
   enableParallelBuilding = true;
       
diff --git a/pkgs/development/libraries/gettext/no-gets.patch b/pkgs/development/libraries/gettext/no-gets.patch
deleted file mode 100644
index 9daa48eae64..00000000000
--- a/pkgs/development/libraries/gettext/no-gets.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-hack until gzip pulls a newer gnulib version
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
-
---- a/gettext-tools/libgettextpo/stdio.in.h
-+++ b/gettext-tools/libgettextpo/stdio.in.h
-@@ -125,7 +125,6 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
---- a/gettext-tools/gnulib-lib/stdio.in.h
-+++ b/gettext-tools/gnulib-lib/stdio.in.h
-@@ -125,7 +125,6 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
---- a/gettext-runtime/gnulib-lib/stdio.in.h
-+++ b/gettext-runtime/gnulib-lib/stdio.in.h
-@@ -125,7 +125,6 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
-- 
GitLab


From 58e6277d77088629b72b2bf9a02f46edb4208c36 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Thu, 28 Feb 2013 18:53:50 +0000
Subject: [PATCH 0035/3789] Allow GNU Patch tests to run with non-bash shell.
 Fix gnused url.

---
 pkgs/tools/text/gnupatch/bashishms.patch | 67 ++++++++++++++++++++++++
 pkgs/tools/text/gnupatch/default.nix     |  5 +-
 pkgs/tools/text/gnused/default.nix       |  2 +-
 3 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/text/gnupatch/bashishms.patch

diff --git a/pkgs/tools/text/gnupatch/bashishms.patch b/pkgs/tools/text/gnupatch/bashishms.patch
new file mode 100644
index 00000000000..1a2cfbd8e4a
--- /dev/null
+++ b/pkgs/tools/text/gnupatch/bashishms.patch
@@ -0,0 +1,67 @@
+http://lists.gnu.org/archive/html/bug-patch/2012-11/msg00001.html
+Tested on Illumos, where ksh is /bin/sh.
+
+--- patch-2.7.1/tests/test-lib.sh
++++ patch-2.7.1/tests/test-lib.sh
+@@ -118,7 +118,7 @@
+ }
+ 
+ if test -z "`echo -n`"; then
+-    if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then
++    if (eval 'test -n "${BASH_LINENO[0]}"') 2>/dev/null; then
+ 	eval '
+ 	    _start_test() {
+ 		echo -n "[${BASH_LINENO[2]}] $* -- "
+
+--- patch-2.7.1/tests/crlf-handling
++++ patch-2.7.1/tests/crlf-handling
+@@ -14,7 +14,7 @@
+ use_tmpdir
+ 
+ lf2crlf() {
+-    while read l; do echo -e "$l\r"; done
++    while read l; do printf "%s\r\n" "$l"; done
+ }
+ 
+ echo 1 > a
+
+--- patch-2.7.1/tests/merge
++++ patch-2.7.1/tests/merge
+@@ -32,18 +32,20 @@
+     shift
+     done > a.sed
+     echo "$body" | sed -f a.sed > b
+-    shift
+-    while test $# -gt 0 ; do
+-	echo "$1"
++    if test $# -gt 0 ; then
+ 	shift
+-    done > b.sed
++    while test $# -gt 0 ; do
++	echo "$1"
++	shift
++    done
++    fi > b.sed
+     echo "$body" | sed -f b.sed > c
+     rm -f a.sed b.sed
+     output=`diff -u a b | patch $ARGS -f c`
+     status=$?
+     echo "$output" | sed -e '/^$/d' -e '/^patching file c$/d'
+     cat c
+-    test $status == 0 || echo "Status: $status"
++    test $status = 0 || echo "Status: $status"
+ }
+ 
+ x() {
+
+--- patch-2.7.1/tests/read-only-files
++++ patch-2.7.1/tests/read-only-files
+@@ -16,7 +16,7 @@
+
+ : > read-only
+ chmod a-w read-only
+-if : 2> /dev/null > read-only; then
++if (: > read-only) 2> /dev/null; then
+     echo "Files with read-only permissions are writable" \
+         "(probably running as superuser)" >&2
+     exit 77
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix
index c8c336ad202..83430a87105 100644
--- a/pkgs/tools/text/gnupatch/default.nix
+++ b/pkgs/tools/text/gnupatch/default.nix
@@ -14,8 +14,9 @@ stdenv.mkDerivation rec {
     configureFlags = [ "ac_cv_func_strnlen_working=yes" ];
   };
 
-  # Tests fail on FreeBSD due to a Bashism in the tests.
-  doCheck = !stdenv.isFreeBSD;
+  patches = [ ./bashishms.patch ];
+
+  doCheck = true;
 
   meta = {
     description = "GNU Patch, a program to apply differences to files";
diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index 65a1c131de1..d16ce1e0a29 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gnused-4.2.2";
 
   src = fetchurl {
-    url = mirror://gnu/sed/sed-4.2.2.tar.gz;
+    url = mirror://gnu/sed/sed-4.2.2.tar.bz2;
     sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7";
   };
 
-- 
GitLab


From 242b4d23a71b9d2193d590da31448c26b15ba534 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Thu, 28 Feb 2013 16:45:36 +0100
Subject: [PATCH 0036/3789] Update less to version 451

---
 pkgs/tools/misc/less/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index b22e7521764..d038abbfc81 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses}:
  
 stdenv.mkDerivation {
-  name = "less-436";
+  name = "less-451";
  
   src = fetchurl {
-    url = http://www.greenwoodsoftware.com/less/less-436.tar.gz;
-    sha256 = "1lilcx6qrfr2dqahv7r10j9h2v86w5sb7m8wrx2sza9ifkq6z8ap";
+    url = http://www.greenwoodsoftware.com/less/less-451.tar.gz;
+    sha256 = "9fe8287c647afeafb4149c5dedaeacfd20971ed7c26c7553794bb750536b5f57";
   };
  
   buildInputs = [ncurses];
-- 
GitLab


From d09269a22eed2e844b046c31899887aa6c1fb42d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 Mar 2013 20:38:15 +0100
Subject: [PATCH 0037/3789] Use the same directory layout for user-installed
 Haskell libraries that GHC uses for its core libraries, so that these files
 integrate seamlessly into one profile, living right next to each other. This
 change is eventually going to simply our with-packages wrapper quite a bit.

---
 pkgs/build-support/cabal/default.nix               | 4 ++--
 pkgs/development/compilers/ghc/ghc-get-packages.sh | 2 +-
 pkgs/development/compilers/ghc/with-packages.nix   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index c1b8d6d5fea..2eedd315830 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -121,7 +121,7 @@
               done
 
               echo "configure flags: $extraConfigureFlags $configureFlags"
-              ./Setup configure --verbose --prefix="$out" $extraConfigureFlags $configureFlags
+              ./Setup configure --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' --libsubdir='$pkgid' $extraConfigureFlags $configureFlags
 
               eval "$postConfigure"
             '';
@@ -156,7 +156,7 @@
 
               ensureDir $out/bin # necessary to get it added to PATH
 
-              local confDir=$out/lib/ghc-pkgs/ghc-${ghc.ghc.version}
+              local confDir=$out/lib/ghc-${ghc.ghc.version}/package.conf.d
               local installedPkgConf=$confDir/${self.fname}.installedconf
               local pkgConf=$confDir/${self.fname}.conf
               ensureDir $confDir
diff --git a/pkgs/development/compilers/ghc/ghc-get-packages.sh b/pkgs/development/compilers/ghc/ghc-get-packages.sh
index 9ed1455d232..71e58e66a5e 100755
--- a/pkgs/development/compilers/ghc/ghc-get-packages.sh
+++ b/pkgs/development/compilers/ghc/ghc-get-packages.sh
@@ -12,7 +12,7 @@ fi
 PATH="$2:$PATH"
 IFS=":"
 for p in $PATH; do
-  PkgDir="$p/../lib/ghc-pkgs/ghc-$version"
+  PkgDir="$p/../lib/ghc-$version/package.conf.d"
   for i in $PkgDir/*.installedconf; do
     # output takes place here
     test -f $i && echo -n " $prefix$i"
diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix
index 99e91901d00..28a639246ce 100644
--- a/pkgs/development/compilers/ghc/with-packages.nix
+++ b/pkgs/development/compilers/ghc/with-packages.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     echo "Linking selected packages and dependencies:"
 
     for currentPath in ${stdenv.lib.concatStringsSep " " allPackages}; do
-      currentPkgDir="$currentPath/lib/ghc-pkgs/ghc-${ghc.version}"
+      currentPkgDir="$currentPath/lib/ghc-${ghc.version}/package.conf.d/"
       # Check if current path is a Cabal package for the current GHC
       if test -d $currentPkgDir; then
         echo -n "Linking $currentPath "
-- 
GitLab


From 90fc42c2f2bef844f5689b5939bcf760a23e4a63 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 Mar 2013 21:11:31 +0100
Subject: [PATCH 0038/3789] pkgs/development/compilers/ghc/with-packages.nix:
 simply this wrapper on top of buildenv

---
 .../compilers/ghc/with-packages.nix           | 130 ++++--------------
 1 file changed, 23 insertions(+), 107 deletions(-)

diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix
index 28a639246ce..74a8253b838 100644
--- a/pkgs/development/compilers/ghc/with-packages.nix
+++ b/pkgs/development/compilers/ghc/with-packages.nix
@@ -1,122 +1,38 @@
-{stdenv, ghc, packages ? [], makeWrapper}:
+{ stdenv, ghc, packages, buildEnv, makeWrapper }:
 
-stdenv.mkDerivation rec {
-  name = "haskell-env-${ghc.name}";
-
-  allPackages = stdenv.lib.closePropagation packages;
-  buildInputs = allPackages ++ [makeWrapper];
-  propagatedBuildInputs = packages;
-
-  unpackPhase = "true";
-
-  installPhase = ''
-    numversion=$(${ghc}/bin/ghc --numeric-version)
-    majorversion=''${numversion%%.*}
-    minorversion=''${numversion#*.}
-    minorversion=''${minorversion%%.*}
-
-    if [[ $majorversion -gt 6 ]] && [[ $minorversion -gt 4 ]]; then
-      globalConf="--global-package-db"
-    else
-      globalConf="--global-conf"
-    fi
-
-    originalTopDir="${ghc}/lib/ghc-${ghc.version}"
-    originalPkgDir="$originalTopDir/package.conf.d"
-    linkedTopDir="$out/lib"
-    linkedPkgDir="$linkedTopDir/package.conf.d"
-
-    mkdir -p $out/bin
-    mkdir -p $linkedTopDir
-    mkdir -p $linkedPkgDir
-
-    echo "Linking GHC core libraries:"
-
-    echo -n "Linking $originalTopDir "
-    for f in "$originalTopDir/"*; do
-      if test -f $f; then
-        ln -s $f $linkedTopDir
-        echo -n .
-      fi
-    done
-    echo
+assert packages != [];
 
-    echo -n "Linking $originalPkgDir "
-    for f in "$originalPkgDir/"*.conf; do
-      ln -s $f $linkedPkgDir
-      echo -n .
-    done
-    echo
-
-    echo "Linking selected packages and dependencies:"
-
-    for currentPath in ${stdenv.lib.concatStringsSep " " allPackages}; do
-      currentPkgDir="$currentPath/lib/ghc-${ghc.version}/package.conf.d/"
-      # Check if current path is a Cabal package for the current GHC
-      if test -d $currentPkgDir; then
-        echo -n "Linking $currentPath "
-        for f in "$currentPath/bin/"*; do
-          ln -s $f $out/bin
-          echo -n .
-        done
-        for f in "$currentPath/etc/bash_completion.d/"*; do
-          mkdir -p $out/etc/bash_completion.d
-          ln -s $f $out/etc/bash_completion.d/
-          echo -n .
-        done
-        for s in 1 2 3 4 5 6 7 8 9; do
-          for f in "$currentPath/share/man/man$s/"*; do
-            mkdir -p $out/share/man/man$s
-            ln -sv $f $out/share/man/man$s/
-            echo -n .
-          done
-        done
-        for f in "$currentPath/share/emacs/site-lisp/"*; do
-          mkdir -p $out/share/emacs/site-lisp
-          ln -s $f $out/share/emacs/site-lisp/
-          echo -n .
-        done
-        for f in "$currentPkgDir/"*.conf; do
-          ln -s $f $linkedPkgDir
-          echo -n .
-        done
-        echo
-      fi
-    done
-
-    echo -n "Generating package cache "
-    ${ghc}/bin/ghc-pkg $globalConf $linkedPkgDir recache
-    echo .
-
-    echo -n "Generating wrappers "
+let
+  ghc761OrLater = stdenv.lib.versionOlder "7.6.1" ghc.version;
+  packageDBFlag = if ghc761OrLater then "--package-db" else "--package-conf";
+  libDir        = "$out/lib/ghc-${ghc.version}";
+  packageCfgDir = "${libDir}/package.conf.d";
+in
+buildEnv {
+  name = "haskell-env-${ghc.name}";
+  paths = stdenv.lib.closePropagation (packages ++ [ghc]);
+  postBuild = ''
+    . ${makeWrapper}/nix-support/setup-hook
 
     for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do
-      # The NIX env-vars are picked up by our patched version of ghc-paths.
-      makeWrapper ${ghc}/bin/$prg $out/bin/$prg \
-        --add-flags "-B$linkedTopDir" \
-        --set "NIX_GHC"        "$out/bin/ghc"     \
-        --set "NIX_GHCPKG"     "$out/bin/ghc-pkg" \
-        --set "NIX_GHC_LIBDIR" "$linkedTopDir"
-      echo -n .
+      rm -f $out/bin/$prg
+      makeWrapper ${ghc}/bin/$prg $out/bin/$prg         \
+        --add-flags '"-B$NIX_GHC_LIBDIR"'               \
+        --set "NIX_GHC"        "$out/bin/ghc"           \
+        --set "NIX_GHCPKG"     "$out/bin/ghc-pkg"       \
+        --set "NIX_GHC_LIBDIR" "${libDir}"
     done
 
     for prg in runghc runhaskell; do
+      rm -f $out/bin/$prg
       makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "-f $out/bin/ghc"
-      echo -n .
     done
 
     for prg in ghc-pkg ghc-pkg-${ghc.version}; do
-      makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "$globalConf $linkedPkgDir"
-      echo -n .
+      rm -f $out/bin/$prg
+      makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag} ${packageCfgDir}"
     done
 
-    for prg in hp2ps hpc hasktags hsc2hs haddock haddock-${ghc.version}; do
-      if test -x ${ghc}/bin/$prg -a ! -x $out/bin/$prg; then
-        ln -s ${ghc}/bin/$prg $out/bin/$prg && echo -n .
-      fi
-    done
-    echo
+    $out/bin/ghc-pkg recache
   '';
-
-  meta = ghc.meta;
 }
-- 
GitLab


From 7cb4d92bec10e893574507d0b6afcd367ac74c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 17 Mar 2013 10:15:03 +0100
Subject: [PATCH 0039/3789] amule: update and fix build on gcc47

---
 pkgs/tools/networking/p2p/amule/default.nix |  8 +++++---
 pkgs/tools/networking/p2p/amule/gcc47.patch | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/networking/p2p/amule/gcc47.patch

diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index eafa51fb4f2..3347ad010c7 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@@ -12,17 +12,19 @@ let
   edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag;
 in 
 mkDerivation rec {
-  name = "aMule-2.2.6";
+  name = "aMule-2.3.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/amule/${name}.tar.bz2";
-    sha256 = "08l1931hcg1ia8yvhgx70hx64mknjnfn6l78m0ja44w13mgjpqvc";
+    url = "mirror://sourceforge/amule/${name}.tar.xz";
+    sha256 = "0hvpx3c005nvxsfand5bwfxxiq3mv0mpykajfm2lkygjh1rw2383";
   };
 
   buildInputs =
     [ zlib wxGTK perl cryptopp libupnp gettext pkgconfig makeWrapper ]
     ++ lib.optional httpServer libpng;
 
+  patches = [ ./gcc47.patch ]; # from Gentoo
+
   configureFlags = ''
     --with-crypto-prefix=${cryptopp}
     --disable-debug
diff --git a/pkgs/tools/networking/p2p/amule/gcc47.patch b/pkgs/tools/networking/p2p/amule/gcc47.patch
new file mode 100644
index 00000000000..e776dda3240
--- /dev/null
+++ b/pkgs/tools/networking/p2p/amule/gcc47.patch
@@ -0,0 +1,21 @@
+# http://code.google.com/p/amule/source/detail?r=10772
+diff -ur aMule-2.3.1.orig//src/ObservableQueue.h aMule-2.3.1/src/ObservableQueue.h
+--- aMule-2.3.1.orig//src/ObservableQueue.h	2012-04-22 19:40:05.560084120 +0200
++++ aMule-2.3.1/src/ObservableQueue.h	2012-04-22 19:40:32.479085322 +0200
+@@ -331,14 +331,14 @@
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STARTING ), o );
++	this->NotifyObservers( EventType( EventType::STARTING ), o );
+ }
+ 
+ 
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STOPPING ), o );
++	this->NotifyObservers( EventType( EventType::STOPPING ), o );
+ }
+ 
+ 
\ No newline at end of file
-- 
GitLab


From 99da34c204eba62a66e111e4b92b38053cd49162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 17 Mar 2013 10:26:44 +0100
Subject: [PATCH 0040/3789] elfutils: fix build via update

---
 pkgs/development/tools/misc/elfutils/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 5a1a19068a7..ef1e7e781fa 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -3,20 +3,20 @@
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
   name = "elfutils-${version}";
-  version = "0.152";
-  
+  version = "0.155";
+
   src = fetchurl {
     urls = [
-      "https://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2"
+      "http://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "19mlgxyzcwiv64ynj2cibgkiw4qkm3n37kizvy6555dsmlaqfybq";
+    sha256 = "1n0fsg2q961i0lj355w2ad3cmp7d1jjcdhrfhmlgsvs14r2lli38";
   };
 
   patches = [
     (fetchurl {
-      url = https://fedorahosted.org/releases/e/l/elfutils/0.152/elfutils-portability.patch;
-      sha256 = "0q318w4cvvqv9ps4xcwphapj1gl31isgjyya4y9sm72qj68n61p0";
+      url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/elfutils-portability.patch";
+      sha256 = "0w8i94x9hqirgs2lwcd1g36s77r5svh4j1fgcrd6lx5w18vch0di";
     }) ];
 
   # We need bzip2 in NativeInputs because otherwise we can't unpack the src,
-- 
GitLab


From c78bad69e1349713adec91ac07fd842ee0ff5925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 17 Mar 2013 11:01:49 +0100
Subject: [PATCH 0041/3789] gsl: attempt to fix

ToDo: there may be more impurities than this processor-feature test.
---
 pkgs/development/libraries/gsl/default.nix    |  4 +++
 .../libraries/gsl/disable-fma.patch           | 32 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/libraries/gsl/disable-fma.patch

diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 474d2f97dd0..0eefda50c20 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "18qf6jzz1r3mzb5qynywv4xx3z9g61hgkbpkdrhbgqh2g7jhgfc5";
   };
 
+  # ToDo: there might be more impurities than FMA support check
+  patches = [ ./disable-fma.patch ]; # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
+  patchFlags = "-p0";
+
   doCheck = true;
 
   meta = {
diff --git a/pkgs/development/libraries/gsl/disable-fma.patch b/pkgs/development/libraries/gsl/disable-fma.patch
new file mode 100644
index 00000000000..d5c0d620863
--- /dev/null
+++ b/pkgs/development/libraries/gsl/disable-fma.patch
@@ -0,0 +1,32 @@
+--- configure.ac        2011-09-22 16:13:22 +0000
++++ configure.ac        2011-11-26 23:55:24 +0000
+@@ -381,6 +381,28 @@
+ AC_SUBST(HAVE_DARWIN_IEEE_INTERFACE)
+ AC_SUBST(HAVE_DARWIN86_IEEE_INTERFACE)
+ 
++dnl check for compiler flags to disable use of FMA
++save_cflags="$CFLAGS"
++AC_CACHE_CHECK([for compiler flags to disable use of FMA], ac_cv_c_fma_flags,
++[
++if test X"$GCC" = Xyes; then
++    fma_flags='-ffp-contract=off'
++else
++    fma_flags=
++fi
++if test X"$fma_flags" != X; then
++  CFLAGS="$fma_flags $CFLAGS"
++  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int foo;]])],[ac_cv_c_fma_flags="$fma_flags"],[ac_cv_c_fma_flags="none"])
++else
++  ac_cv_c_fma_flags="none"
++fi])
++
++if test "$ac_cv_c_fma_flags" != "none" ; then
++   CFLAGS="$ac_cv_c_fma_flags $save_cflags"
++else
++   CFLAGS="$save_cflags"
++fi
++
+ dnl Check for IEEE control flags
+ 
+ save_cflags="$CFLAGS"
+
-- 
GitLab


From c3cefc669cd11fd5942661e142aeb20c155cc130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 17 Mar 2013 12:02:55 +0100
Subject: [PATCH 0042/3789] asc: fix build for gcc47

---
 pkgs/games/asc/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix
index 86cf929aede..bf2fb1e89c2 100644
--- a/pkgs/games/asc/default.nix
+++ b/pkgs/games/asc/default.nix
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "1r011l4gsliky6szjvda8xzyhkkc50ahrr7p14911v5ydar0w3hh";
   };
 
+  configureFlags = [ "--disable-paragui" "--disable-paraguitest" ];
+
+  NIX_CFLAGS_COMPILE = "-fpermissive"; # I'm too lazy to catch all gcc47-related problems
+
   buildInputs = [
     SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat freetype
     libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng
-- 
GitLab


From 3c472d53aaa1bc11e3f927364cd0cdde0df0f50f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 17 Mar 2013 12:37:39 +0100
Subject: [PATCH 0043/3789] sword: fix build with gcc47 via a patch from Gentoo

---
 pkgs/development/libraries/sword/default.nix |  2 +-
 pkgs/development/libraries/sword/gcc47.patch | 35 ++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create 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 3486981463f..f62bc2eb11d 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig icu cluceneCore curl ];
 
   # because curl/types.h disappeared since at least curl 7.21.7
-  patches = [ ./dont_include_curl_types_h.patch ];
+  patches = [ ./dont_include_curl_types_h.patch ./gcc47.patch ];
 
   prePatch = ''
     patchShebangs .;
diff --git a/pkgs/development/libraries/sword/gcc47.patch b/pkgs/development/libraries/sword/gcc47.patch
new file mode 100644
index 00000000000..7b55de75b64
--- /dev/null
+++ b/pkgs/development/libraries/sword/gcc47.patch
@@ -0,0 +1,35 @@
+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;
-- 
GitLab


From 6c21cde68df8495fce97c5250f408bf303120854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 17 Mar 2013 20:36:47 +0100
Subject: [PATCH 0044/3789] blobby: minor update, making it build

---
 pkgs/games/blobby/default.nix   | 17 +++++++++++------
 pkgs/top-level/all-packages.nix |  4 +---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index b9f5f5d7e2a..93b69cee98e 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -1,14 +1,19 @@
-{stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boost, zip, zlib}:
+{ stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boostHeaders
+, zip, zlib/*, lua5, tinyxml*/ }:
+
 stdenv.mkDerivation rec {
-  version = "2.0-RC1";
-  name = "blobby-volley-${version}";
+  version = "1.0rc3";
+  name = "blobby-volley-2-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0RC1/blobby2-linux-1.0rc1.tar.gz";
-    sha256 = "1cb56bd31vqkc12cmzp43q2aai99505isq2mii95jp0rzdqks4fy";
+    url = "mirror://sourceforge/blobby/blobby2-linux-${version}.tar.gz";
+    sha256 = "10f50b2ygw8cb9mp33wpdwv9p6lc10qlwc1xd44bbcby1d9v5ga5";
   };
 
-  buildInputs = [SDL SDL_image mesa cmake physfs boost zip zlib];
+  buildInputs = [
+    SDL SDL_image mesa cmake physfs boostHeaders
+    zip zlib # lua5 tinyxml # ToDo: use shared libs?
+  ];
 
   preConfigure = ''
     sed -re '1i#include <cassert>' -i src/CrossCorrelation.h
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b679c6c4d52..61142934345 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8153,9 +8153,7 @@ let
 
   blackshadeselite = callPackage ../games/blackshadeselite { };
 
-  blobby = callPackage ../games/blobby {
-    boost = boost149;
-  };
+  blobby = callPackage ../games/blobby { };
 
   bsdgames = callPackage ../games/bsdgames { };
 
-- 
GitLab


From 3836ef7d66fd84224a53f1771219b8ecb30ef0e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 18 Mar 2013 18:20:54 +0100
Subject: [PATCH 0045/3789] gmp: revert to using bz2 sources

Bootstrapping of stdenv can't handle anything else.
---
 pkgs/development/libraries/gmp/5.1.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gmp/5.1.1.nix b/pkgs/development/libraries/gmp/5.1.1.nix
index d9c67274f25..2f9ff516523 100644
--- a/pkgs/development/libraries/gmp/5.1.1.nix
+++ b/pkgs/development/libraries/gmp/5.1.1.nix
@@ -3,9 +3,9 @@
 stdenv.mkDerivation rec {
   name = "gmp-5.1.1";
 
-  src = fetchurl {
-    urls = [ "mirror://gnu/gmp/${name}.tar.xz" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.xz" ];
-    sha256 = "1hili06lcf0clg5qfvz7knm6pmj6ab54yhsvskp1mdny5xw4vmjb";
+  src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv
+    urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ];
+    sha256 = "1bdgf04k2i12pfivxgjq68iarz3ngix9hpzbmkgijrdk92gpgm50";
   };
 
   nativeBuildInputs = [ m4 ];
-- 
GitLab


From 907602d5b8f8e0637f5e80537fdbc4aa7195372f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 19 Mar 2013 22:16:57 +0100
Subject: [PATCH 0046/3789] dbus: several fixes

- disable the tests as (they warn) they make the library insecure
- add libX11 (was missing something)
- dirty hack around the "incomplete struct ucred" problem
	(feel free to find a better solution, I tried almost 1h)
---
 pkgs/development/libraries/dbus/default.nix    |  9 ++++++---
 .../libraries/dbus/ucred-dirty-hack.patch      | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/dbus/ucred-dirty-hack.patch

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 7510801cd79..a9ec076a543 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -8,9 +8,12 @@ let
     sha256 = "fc1370ef38abeeb13f55c905ec002e60705fb0bfde3b8d21c8d6eb8056c11bac";
   };
 
-  patches = [ ./ignore-missing-includedirs.patch ./implement-getgrouplist.patch ];
+  patches = [
+    ./ignore-missing-includedirs.patch ./implement-getgrouplist.patch
+    ./ucred-dirty-hack.patch
+  ];
 
-  configureFlags = "--enable-embedded-tests --localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp";
+  configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp";
 
 in rec {
 
@@ -19,7 +22,7 @@ in rec {
 
     nativeBuildInputs = [ pkgconfig ];
 
-    buildInputs = [ expat ];
+    buildInputs = [ expat libX11 ];
 
     # FIXME: dbus has optional systemd integration when checking
     # at_console policies.  How to enable this without introducing a
diff --git a/pkgs/development/libraries/dbus/ucred-dirty-hack.patch b/pkgs/development/libraries/dbus/ucred-dirty-hack.patch
new file mode 100644
index 00000000000..a07abcc15fb
--- /dev/null
+++ b/pkgs/development/libraries/dbus/ucred-dirty-hack.patch
@@ -0,0 +1,18 @@
+diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
+index b4ecc96..267984a 100644
+--- a/dbus/dbus-sysdeps-unix.c
++++ b/dbus/dbus-sysdeps-unix.c
+@@ -1635,6 +1635,13 @@ write_credentials_byte (int             server_fd,
+     }
+ }
+ 
++struct ucred
++{
++  pid_t pid;			/* PID of sending process.  */
++  uid_t uid;			/* UID of sending process.  */
++  gid_t gid;			/* GID of sending process.  */
++};
++
+ /**
+  * Reads a single byte which must be nul (an error occurs otherwise),
+  * and reads unix credentials if available. Clears the credentials
-- 
GitLab


From 111c8db50038341b09c8561f750c6d56e46de869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 19 Mar 2013 22:34:33 +0100
Subject: [PATCH 0047/3789] ctl: fix build with gcc47

---
 pkgs/development/libraries/ctl/default.nix |  8 ++++----
 pkgs/development/libraries/ctl/gcc47.patch | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/ctl/gcc47.patch

diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix
index 950fe1baf08..1020ba3502e 100644
--- a/pkgs/development/libraries/ctl/default.nix
+++ b/pkgs/development/libraries/ctl/default.nix
@@ -8,12 +8,12 @@ stdenv.mkDerivation {
     sha256 = "16lzgbpxdyhykdwndj1i9vx3h4bfkxqqcrvasvgg70gb5raxj0mj";
   };
 
-  patches = [ ./patch.patch ];
-  
+  patches = [ ./patch.patch ./gcc47.patch ];
+
   propagatedBuildInputs = [ ilmbase ];
-  
+
   configureFlags = "--with-ilmbase-prefix=${ilmbase}";
-  
+
   #configurePhase = "
     #export CXXFLAGS=\"-I${ilmbase}/include -L${ilmbase}/lib\"
     #echo $CXXFLAGS
diff --git a/pkgs/development/libraries/ctl/gcc47.patch b/pkgs/development/libraries/ctl/gcc47.patch
new file mode 100644
index 00000000000..1aa4be4fe6d
--- /dev/null
+++ b/pkgs/development/libraries/ctl/gcc47.patch
@@ -0,0 +1,15 @@
+ https://bugs.gentoo.org/426368
+ 
+ IlmCtl/CtlInterpreter.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/IlmCtl/CtlInterpreter.cpp
++++ b/IlmCtl/CtlInterpreter.cpp
+@@ -64,6 +64,7 @@
+ #include <fstream>
+ #include <algorithm>
+ #include <cassert>
++#include <unistd.h>
+ 
+ #ifdef WIN32
+     #include <io.h>
-- 
GitLab


From 32a503a5d34d22987d4c2a723a0155da543043bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 20 Mar 2013 23:01:36 +0100
Subject: [PATCH 0048/3789] cpio: fix build without gets

---
 pkgs/tools/archivers/cpio/default.nix   |  4 +++-
 pkgs/tools/archivers/cpio/no-gets.patch | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/archivers/cpio/no-gets.patch

diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
index 919484fa915..ec873507c85 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -2,12 +2,14 @@
 
 stdenv.mkDerivation {
   name = "cpio-2.11";
-  
+
   src = fetchurl {
     url = mirror://gnu/cpio/cpio-2.11.tar.bz2;
     sha256 = "bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd";
   };
 
+  patches = [ ./no-gets.patch ];
+
   meta = {
     homepage = http://www.gnu.org/software/cpio/;
     description = "A program to create or extract from cpio archives";
diff --git a/pkgs/tools/archivers/cpio/no-gets.patch b/pkgs/tools/archivers/cpio/no-gets.patch
new file mode 100644
index 00000000000..f7a9be324df
--- /dev/null
+++ b/pkgs/tools/archivers/cpio/no-gets.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/424974
+
+hack until gzip pulls a newer gnulib version
+
+From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Thu, 29 Mar 2012 13:30:41 -0600
+Subject: [PATCH] stdio: don't assume gets any more
+
+Gnulib intentionally does not have a gets module, and now that C11
+and glibc have dropped it, we should be more proactive about warning
+any user on a platform that still has a declaration of this dangerous
+interface.
+
+--- a/gnu/stdio.in.h
++++ b/gnu/stdio.in.h
+@@ -125,7 +125,6 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
-- 
GitLab


From 365dc528720ae1f70c63bf7cec4af40f8a3eaf93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 20 Mar 2013 23:25:43 +0100
Subject: [PATCH 0049/3789] protobuf: fix via update

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

diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix
index 57dc58bdfa1..bba8481780a 100644
--- a/pkgs/development/libraries/protobuf/default.nix
+++ b/pkgs/development/libraries/protobuf/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "protobuf-2.4.1";
+  name = "protobuf-2.5.0";
 
   src = fetchurl {
     url = "http://protobuf.googlecode.com/files/${name}.tar.bz2";
-    sha256 = "1gxhfhk37jyjq1z4y3d4bz4i1fk2an5ydhk5kjzlp0rhfcs5516g";
+    sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk";
   };
 
   buildInputs = [ zlib ];
-- 
GitLab


From d91df9a4bdc4977e6ac81a550307f02bdc623ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 20 Mar 2013 23:36:17 +0100
Subject: [PATCH 0050/3789] krb5: fix build via update

---
 pkgs/development/libraries/kerberos/krb5.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 38272165a28..b8aaa020972 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "krb5";
-  version = "1.10";
+  version = "1.11.1";
   name = "${pname}-${version}";
   webpage = http://web.mit.edu/kerberos/;
 in
@@ -11,8 +11,8 @@ stdenv.mkDerivation (rec {
   inherit name;
 
   src = fetchurl {
-    url = "${webpage}/dist/krb5/1.10/${name}-signed.tar";
-    sha256 = "1pa4m6538drb51gsqxbbxlsnc9fm9ccid9m2s3pv3di5l0a7l8bg";
+    url = "${webpage}/dist/krb5/1.11/${name}-signed.tar";
+    sha256 = "0s07sbwrj3c61gc29g016csim04azb9h74rf5595fxzqlzv0y8rs";
   };
 
   buildInputs = [ perl ncurses yacc ];
@@ -23,9 +23,11 @@ stdenv.mkDerivation (rec {
     cd ${name}/src
   '';
 
-  meta = { 
-      description = "MIT Kerberos 5";
-      homepage = webpage;
-      license = "MPL";
+  #doCheck = true; # report: No suitable file for testing purposes
+
+  meta = {
+    description = "MIT Kerberos 5";
+    homepage = webpage;
+    license = "MPL";
   };
 })
-- 
GitLab


From d210a4a8fa247406f0b0dfe2247cab13316b7da8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Mar 2013 00:08:24 +0100
Subject: [PATCH 0051/3789] goldendict: fix build with gcc47

---
 pkgs/applications/misc/goldendict/default.nix |  2 +-
 pkgs/applications/misc/goldendict/gcc47.patch | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/misc/goldendict/gcc47.patch

diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index f7b8a511bc6..717d0a012a2 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     cd ${name}-src
     tar xf ${src}
   '';
-  patches = [ ./goldendict-paths.diff ];
+  patches = [ ./goldendict-paths.diff ./gcc47.patch ];
   patchFlags = "-p 0";
   configurePhase = ''
     qmake
diff --git a/pkgs/applications/misc/goldendict/gcc47.patch b/pkgs/applications/misc/goldendict/gcc47.patch
new file mode 100644
index 00000000000..311dad4f648
--- /dev/null
+++ b/pkgs/applications/misc/goldendict/gcc47.patch
@@ -0,0 +1,40 @@
+From b00d081da20b9a6b257573c6b23a6bc640c4dab1 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Fri, 20 Jul 2012 03:27:38 +1000
+Subject: [PATCH] Fix build with GCC 4.7 by adding missing includes.
+
+---
+ processwrapper.cc                       | 4 ++++
+ qtsingleapplication/src/qtlocalpeer.cpp | 1 +
+ 2 files changed, 5 insertions(+)
+
+diff --git processwrapper.cc processwrapper.cc
+index f7f3f19..86b985d 100644
+--- processwrapper.cc
++++ processwrapper.cc
+@@ -2,6 +2,10 @@
+ 
+ #include <QtCore>
+ 
++#if defined(Q_OS_UNIX)
++#include <unistd.h>
++#endif
++
+ #ifdef Q_OS_WIN32
+ 
+ #include <windows.h>
+diff --git qtsingleapplication/src/qtlocalpeer.cpp qtsingleapplication/src/qtlocalpeer.cpp
+index 382d182..506c142 100644
+--- qtsingleapplication/src/qtlocalpeer.cpp
++++ qtsingleapplication/src/qtlocalpeer.cpp
+@@ -50,6 +50,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+ 
+ namespace QtLP_Private {
+-- 
+1.7.11.1
+
-- 
GitLab


From 9c893c793141c773630f825462ef458206d668b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Mar 2013 10:13:06 +0100
Subject: [PATCH 0052/3789] blobby: merge changes from master into
 stdenv-updates

---
 pkgs/games/blobby/default.nix   | 17 ++++++-----------
 pkgs/top-level/all-packages.nix |  4 +++-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index 93b69cee98e..b9f5f5d7e2a 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -1,19 +1,14 @@
-{ stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boostHeaders
-, zip, zlib/*, lua5, tinyxml*/ }:
-
+{stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boost, zip, zlib}:
 stdenv.mkDerivation rec {
-  version = "1.0rc3";
-  name = "blobby-volley-2-${version}";
+  version = "2.0-RC1";
+  name = "blobby-volley-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/blobby/blobby2-linux-${version}.tar.gz";
-    sha256 = "10f50b2ygw8cb9mp33wpdwv9p6lc10qlwc1xd44bbcby1d9v5ga5";
+    url = "mirror://sourceforge/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0RC1/blobby2-linux-1.0rc1.tar.gz";
+    sha256 = "1cb56bd31vqkc12cmzp43q2aai99505isq2mii95jp0rzdqks4fy";
   };
 
-  buildInputs = [
-    SDL SDL_image mesa cmake physfs boostHeaders
-    zip zlib # lua5 tinyxml # ToDo: use shared libs?
-  ];
+  buildInputs = [SDL SDL_image mesa cmake physfs boost zip zlib];
 
   preConfigure = ''
     sed -re '1i#include <cassert>' -i src/CrossCorrelation.h
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2759d0ab88..7cf1ecf198c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8169,7 +8169,9 @@ let
 
   blackshadeselite = callPackage ../games/blackshadeselite { };
 
-  blobby = callPackage ../games/blobby { };
+  blobby = callPackage ../games/blobby {
+    boost = boost149;
+  };
 
   bsdgames = callPackage ../games/bsdgames { };
 
-- 
GitLab


From fc176178674789f44332c1c5f1b7c043b8dbddfc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Mar 2013 10:26:02 +0100
Subject: [PATCH 0053/3789] blobby: update to 2.0rc3 (which is called 1.0rc3 on
 the server for some reason)

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

diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index b9f5f5d7e2a..5c10154998d 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boost, zip, zlib}:
 stdenv.mkDerivation rec {
-  version = "2.0-RC1";
+  version = "2.0-rc3";
   name = "blobby-volley-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0RC1/blobby2-linux-1.0rc1.tar.gz";
-    sha256 = "1cb56bd31vqkc12cmzp43q2aai99505isq2mii95jp0rzdqks4fy";
+    url = "mirror://sourceforge/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0RC3/blobby2-linux-1.0rc3.tar.gz";
+    sha256 = "10f50b2ygw8cb9mp33wpdwv9p6lc10qlwc1xd44bbcby1d9v5ga5";
   };
 
   buildInputs = [SDL SDL_image mesa cmake physfs boost zip zlib];
-- 
GitLab


From b69a86ed43969e3a9fd0ce09c2507b6c361c7c2d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Mar 2013 10:34:22 +0100
Subject: [PATCH 0054/3789] gfortran: update to version 4.7

Removed gfortran 4.2, 4.5, and 4.6 because they don't build anymore anyway.
---
 pkgs/top-level/all-packages.nix | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7cf1ecf198c..47afc680c03 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2212,15 +2212,7 @@ let
       stdenv = allStdenvs.stdenvNative;
     });
 
-  gfortran = gfortran46;
-
-  gfortran42 = wrapGCC (gcc42.gcc.override {
-    name = "gfortran";
-    langFortran = true;
-    langCC = false;
-    langC = false;
-    inherit gmp mpfr;
-  });
+  gfortran = gfortran47;
 
   gfortran43 = wrapGCC (gcc43.gcc.override {
     name = "gfortran";
@@ -2238,15 +2230,7 @@ let
     profiledCompiler = false;
   });
 
-  gfortran45 = wrapGCC (gcc45_real.gcc.override {
-    name = "gfortran";
-    langFortran = true;
-    langCC = false;
-    langC = false;
-    profiledCompiler = false;
-  });
-
-  gfortran46 = wrapGCC (gcc46_real.gcc.override {
+  gfortran47 = wrapGCC (gcc47.gcc.override {
     name = "gfortran";
     langFortran = true;
     langCC = false;
-- 
GitLab


From 459234db2067055801d13ed2ba36879c3de67180 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Mar 2013 16:25:50 +0100
Subject: [PATCH 0055/3789] ghc-with-packages: include only derivations in the
 generated environment that have a ghc attribute

This predicate filters out packages that weren't created by the Cabal builder.
Doing that greatly reduces the likelihood of file collisions in the generated
environment, because Haskell packages tend to have a lot of propagated build
inputs.

For example, both zeromq 2.x and 3.x use the same names for their header files.
Users of haskell-zeromq don't need those headers, so we just don't include them
in the generated environment to avoid the collision that would otherwise occur
when haskell-zeromq 2.x and 3.x are installed into the same environment.
---
 pkgs/development/compilers/ghc/with-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix
index 74a8253b838..afdaea44d5b 100644
--- a/pkgs/development/compilers/ghc/with-packages.nix
+++ b/pkgs/development/compilers/ghc/with-packages.nix
@@ -10,7 +10,7 @@ let
 in
 buildEnv {
   name = "haskell-env-${ghc.name}";
-  paths = stdenv.lib.closePropagation (packages ++ [ghc]);
+  paths = stdenv.lib.filter (x: x ? ghc) (stdenv.lib.closePropagation (packages ++ [ghc]));
   postBuild = ''
     . ${makeWrapper}/nix-support/setup-hook
 
-- 
GitLab


From 264ac17a0f2296b559a6d83b83e7112220c42666 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Mar 2013 16:26:18 +0100
Subject: [PATCH 0056/3789] ghc-with-packages: set NIX_GHC_XXX variables for
 runhaskell and runghc, too

---
 pkgs/development/compilers/ghc/with-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix
index afdaea44d5b..979b2480586 100644
--- a/pkgs/development/compilers/ghc/with-packages.nix
+++ b/pkgs/development/compilers/ghc/with-packages.nix
@@ -25,7 +25,11 @@ buildEnv {
 
     for prg in runghc runhaskell; do
       rm -f $out/bin/$prg
-      makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "-f $out/bin/ghc"
+      makeWrapper ${ghc}/bin/$prg $out/bin/$prg         \
+        --add-flags "-f $out/bin/ghc"                   \
+        --set "NIX_GHC"        "$out/bin/ghc"           \
+        --set "NIX_GHCPKG"     "$out/bin/ghc-pkg"       \
+        --set "NIX_GHC_LIBDIR" "${libDir}"
     done
 
     for prg in ghc-pkg ghc-pkg-${ghc.version}; do
-- 
GitLab


From 0e1dfe702d28df2842aef1c9b8e83a36d4fe1b54 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Mar 2013 12:58:10 +0100
Subject: [PATCH 0057/3789] pkgs/build-support/cabal: strip unnecessary
 --extra-lib-dir arguments for haskell packages

Packages that are registered in the ghc-pkg database don't need any
extra flags passed for Cabal to recognize them.
---
 pkgs/build-support/cabal/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 765beceb2a4..6d615e1d0c8 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -115,7 +115,9 @@
                 fi
                 for d in lib{,64}; do
                   if [ -d "$p/$d" ]; then
-                    extraConfigureFlags+=" --extra-lib-dir=$p/$d"
+                    if [ ! -d "$p/$d/ghc-pkgs" ]; then
+                      extraConfigureFlags+=" --extra-lib-dir=$p/$d"
+                    fi
                   fi
                 done
               done
-- 
GitLab


From 270b8589051a7fc96620fdf411df0451ebf159d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Mar 2013 14:25:51 +0100
Subject: [PATCH 0058/3789] pkgs/build-support/cabal: updated recognition of
 Haskell packages for the directory new layout used in the stdenv-updates
 branch

---
 pkgs/build-support/cabal/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 6d615e1d0c8..dd1c2a76d19 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -110,14 +110,16 @@
               done
 
               for p in $extraBuildInputs $propagatedNativeBuildInputs; do
+                if [ -d "$p/lib/ghc-${ghc.ghc.version}/package.conf.d" ]; then
+                  # Haskell packages don't need any extra configuration.
+                  continue;
+                fi
                 if [ -d "$p/include" ]; then
                   extraConfigureFlags+=" --extra-include-dir=$p/include"
                 fi
                 for d in lib{,64}; do
                   if [ -d "$p/$d" ]; then
-                    if [ ! -d "$p/$d/ghc-pkgs" ]; then
-                      extraConfigureFlags+=" --extra-lib-dir=$p/$d"
-                    fi
+                    extraConfigureFlags+=" --extra-lib-dir=$p/$d"
                   fi
                 done
               done
-- 
GitLab


From 73b0fa87201d90275e1d28bd0e8a4a6473b27a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 29 Mar 2013 01:34:28 +0100
Subject: [PATCH 0059/3789] perl: modify patch for better purity

This probably solves problems on some platforms that expose /usr and
/lib during build, see #386.
---
 .../interpreters/perl/5.16/no-sys-dirs.patch  | 113 ++++++++++++++----
 1 file changed, 93 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch
index 54ffb28e206..883b24889c3 100644
--- a/pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch
+++ b/pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch
@@ -1,7 +1,8 @@
-diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure
---- perl-5.14.2-orig/Configure	2011-09-26 11:44:34.000000000 +0200
-+++ perl-5.14.2/Configure	2012-01-20 17:05:23.089223129 +0100
-@@ -106,15 +106,7 @@
+diff --git a/Configure b/Configure
+index fdbbf20..ba1fd07 100755
+--- a/Configure
++++ b/Configure
+@@ -106,15 +106,7 @@ if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' ) 2>&1 >/dev/null ; then
  fi
  
  : Proper PATH setting
@@ -18,7 +19,7 @@ diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure
  
  for p in $paths
  do
-@@ -1311,8 +1303,7 @@
+@@ -1323,8 +1315,7 @@ archobjs=''
  archname=''
  : Possible local include directories to search.
  : Set locincpth to "" in a hint file to defeat local include searches.
@@ -28,8 +29,8 @@ diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure
  :
  : no include file wanted by default
  inclwanted=''
-@@ -1328,17 +1319,12 @@
- archobjs=''
+@@ -1335,17 +1326,12 @@ DEBUGGING=''
+ 
  libnames=''
  : change the next line if compiling for Xenix/286 on Xenix/386
 -xlibpth='/usr/lib/386 /lib/386'
@@ -49,7 +50,7 @@ diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure
  
  : Private path used by Configure to find libraries.  Its value
  : is prepended to libpth. This variable takes care of special
-@@ -1371,8 +1357,6 @@
+@@ -1380,8 +1366,6 @@ libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun"
  libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
  : We probably want to search /usr/shlib before most other libraries.
  : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
@@ -58,7 +59,7 @@ diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure
  : Do not use vfork unless overridden by a hint file.
  usevfork=false
  
-@@ -2380,7 +2364,6 @@
+@@ -2389,7 +2373,6 @@ uname
  zip
  "
  pth=`echo $PATH | sed -e "s/$p_/ /g"`
@@ -66,7 +67,7 @@ diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure
  for file in $loclist; do
  	eval xxx=\$$file
  	case "$xxx" in
-@@ -4785,7 +4768,7 @@
+@@ -4708,7 +4691,7 @@ $rm -f testcpp.c testcpp.out
  : Set private lib path
  case "$plibpth" in
  '') if ./mips; then
@@ -75,7 +76,7 @@ diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure
  	fi;;
  esac
  case "$libpth" in
-@@ -8390,13 +8373,8 @@
+@@ -8354,13 +8337,8 @@ esac
  echo " "
  case "$sysman" in
  '') 
@@ -91,7 +92,7 @@ diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure
  	;;
  esac
  if $test -d "$sysman"; then
-@@ -19721,9 +19699,10 @@
+@@ -19742,9 +19720,10 @@ $rm_try tryp
  case "$full_ar" in
  '') full_ar=$ar ;;
  esac
@@ -103,10 +104,11 @@ diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure
  
  : see what type gids are declared as in the kernel
  echo " "
-diff -ru -x '*~' perl-5.14.2-orig/ext/Errno/Errno_pm.PL perl-5.14.2/ext/Errno/Errno_pm.PL
---- perl-5.14.2-orig/ext/Errno/Errno_pm.PL	2011-09-26 11:44:34.000000000 +0200
-+++ perl-5.14.2/ext/Errno/Errno_pm.PL	2012-01-20 17:02:07.938138311 +0100
-@@ -137,11 +137,7 @@
+diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
+index 439f254..2cdfdb0 100644
+--- a/ext/Errno/Errno_pm.PL
++++ b/ext/Errno/Errno_pm.PL
+@@ -137,11 +137,7 @@ sub get_files {
  	if ($dep =~ /(\S+errno\.h)/) {
  	     $file{$1} = 1;
  	}
@@ -119,10 +121,11 @@ diff -ru -x '*~' perl-5.14.2-orig/ext/Errno/Errno_pm.PL perl-5.14.2/ext/Errno/Er
  	# Some Linuxes have weird errno.hs which generate
  	# no #file or #line directives
  	my $linux_errno_h = -e '/usr/include/errno.h' ?
-diff -ru -x '*~' perl-5.14.2-orig/hints/freebsd.sh perl-5.14.2/hints/freebsd.sh
---- perl-5.14.2-orig/hints/freebsd.sh	2011-09-19 15:18:22.000000000 +0200
-+++ perl-5.14.2/hints/freebsd.sh	2012-01-20 17:10:37.267924044 +0100
-@@ -118,21 +118,21 @@
+diff --git a/hints/freebsd.sh b/hints/freebsd.sh
+index a67c0bb..0f07ca5 100644
+--- a/hints/freebsd.sh
++++ b/hints/freebsd.sh
+@@ -119,21 +119,21 @@ case "$osvers" in
          objformat=`/usr/bin/objformat`
          if [ x$objformat = xaout ]; then
              if [ -e /usr/lib/aout ]; then
@@ -150,3 +153,73 @@ diff -ru -x '*~' perl-5.14.2-orig/hints/freebsd.sh perl-5.14.2/hints/freebsd.sh
         ldflags="-Wl,-E "
          lddlflags="-shared "
          cccdlflags='-DPIC -fPIC'
+diff --git a/hints/linux.sh b/hints/linux.sh
+index 688c68d..c12f5f5 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -60,17 +60,6 @@ libswanted="$*"
+ # Debian 4.0 puts ndbm in the -lgdbm_compat library.
+ libswanted="$libswanted gdbm_compat"
+ 
+-# If you have glibc, then report the version for ./myconfig bug reporting.
+-# (Configure doesn't need to know the specific version since it just uses
+-# gcc to load the library for all tests.)
+-# We don't use __GLIBC__ and  __GLIBC_MINOR__ because they
+-# are insufficiently precise to distinguish things like
+-# libc-2.0.6 and libc-2.0.7.
+-if test -L /lib/libc.so.6; then
+-    libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'`
+-    libc=/lib/$libc
+-fi
+-
+ # Configure may fail to find lstat() since it's a static/inline
+ # function in <sys/stat.h>.
+ d_lstat=define
+@@ -154,24 +143,6 @@ case "$optimize" in
+     ;;
+ esac
+ 
+-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries
+-# (such as -lm) in /lib or /usr/lib.  So we have to ask gcc to tell us
+-# where to look.  We don't want gcc's own libraries, however, so we
+-# filter those out.
+-# This could be conditional on Unbuntu, but other distributions may
+-# follow suit, and this scheme seems to work even on rather old gcc's.
+-# This unconditionally uses gcc because even if the user is using another
+-# compiler, we still need to find the math library and friends, and I don't
+-# know how other compilers will cope with that situation.
+-# Morever, if the user has their own gcc earlier in $PATH than the system gcc,
+-# we don't want its libraries. So we try to prefer the system gcc
+-# Still, as an escape hatch, allow Configure command line overrides to
+-# plibpth to bypass this check.
+-if [ -x /usr/bin/gcc ] ; then
+-    gcc=/usr/bin/gcc
+-else
+-    gcc=gcc
+-fi
+ 
+ case "$plibpth" in
+ '') plibpth=`LANG=C LC_ALL=C $gcc -print-search-dirs | grep libraries |
+@@ -345,22 +316,6 @@ sparc*)
+ 	;;
+ esac
+ 
+-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than
+-# true libraries. The scripts cause binding against static
+-# version of -lgdbm which is a bad idea. So if we have 'nm'
+-# make sure it can read the file
+-# NI-S 2003/08/07
+-if [ -r /usr/lib/libndbm.so  -a  -x /usr/bin/nm ] ; then
+-   if /usr/bin/nm /usr/lib/libndbm.so >/dev/null 2>&1 ; then
+-    echo 'Your shared -lndbm seems to be a real library.'
+-   else
+-    echo 'Your shared -lndbm is not a real library.'
+-    set `echo X "$libswanted "| sed -e 's/ ndbm / /'`
+-    shift
+-    libswanted="$*"
+-   fi
+-fi
+-
+ 
+ # This script UU/usethreads.cbu will get 'called-back' by Configure
+ # after it has prompted the user for whether to use threads.
-- 
GitLab


From ff92538aec929d4fcc41b5172d034d6696c5db73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 29 Mar 2013 01:36:00 +0100
Subject: [PATCH 0060/3789] perl: enable doCheck, almost all tests work for me

---
 pkgs/development/interpreters/perl/5.16/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index 153da2c9d05..c18dbc2b1f1 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -60,5 +60,17 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
+  # some network-related tests don't work, mostly probably due to our sandboxing
+  postPatch = ''
+    for test in lib/Net/hostent.t dist/IO/t/{io_multihomed.t,io_sock.t} \
+      t/porting/{maintainers.t,regen.t}
+    do
+      rm "$test"
+      pat=`echo "$test" | sed 's,/,\\\\/,g'` # just escape slashes
+      sed "/^$pat/d" -i MANIFEST
+    done
+  '';
+  doCheck = true;
+
   passthru.libPrefix = "lib/perl5/site_perl";
 }
-- 
GitLab


From 84df617be3a7ec578957b4d06ac9446c657c2182 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 13:37:15 +0200
Subject: [PATCH 0061/3789] icu: update to version 51.1

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

diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index 0474b79a847..335730e8e0d 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -2,23 +2,22 @@
 
 let
   pname = "icu4c";
-  version = "4.8.1";
+  version = "51.1";
 in
-
 stdenv.mkDerivation {
   name = pname + "-" + version;
-  
+
   src = fetchurl {
     url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
       + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
-    sha256 = "13zq190gl54zr84f0k48w9knarjsb966jkailyy06yhqjipcv90r";
+    sha256 = "0sv6hgkm92pm27zgjxgk284lcxxbsl0syi40ckw2b7yj7d8sxrc7";
   };
 
   postUnpack = "
     sourceRoot=\${sourceRoot}/source
     echo Source root reset to \${sourceRoot}
   ";
-  
+
   configureFlags = "--disable-debug";
 
   meta = {
-- 
GitLab


From e5c3614d52b882d348526722edf3770a8a709864 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Apr 2013 14:06:56 +0200
Subject: [PATCH 0062/3789] pkgs/build-support/cabal: fix spelling of the
 --extra-{include,lib}-dirs options to Cabal

It's quite amazing that we've managed to pass incorrectly spelled command line
flags to Cabal for ages without ever noticing. :-)

The search path options --extra-{include,lib}-dirs are usually unnecessary,
because the build environment is set up such that gcc and ld find those headers
and libraries automatically, i.e. without needing extra flags. The bubble burst
on MacOS X, though, where the build of haskell-text-icu couldn't find the icu
library without manually setting DYLD_LIBRARY_PATH in that build. Fortunately,
cabal takes care of that issue if a correctly spelled --extra-lib-dirs flag is
passed.
---
 pkgs/build-support/cabal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index dd1c2a76d19..4466b7b19b8 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -115,11 +115,11 @@
                   continue;
                 fi
                 if [ -d "$p/include" ]; then
-                  extraConfigureFlags+=" --extra-include-dir=$p/include"
+                  extraConfigureFlags+=" --extra-include-dirs=$p/include"
                 fi
                 for d in lib{,64}; do
                   if [ -d "$p/$d" ]; then
-                    extraConfigureFlags+=" --extra-lib-dir=$p/$d"
+                    extraConfigureFlags+=" --extra-lib-dirs=$p/$d"
                   fi
                 done
               done
-- 
GitLab


From 21cd5376b4a351079c094cd5409bf981066801b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 1 Apr 2013 23:31:00 +0200
Subject: [PATCH 0063/3789] perl: disable one more test

It worked for me, but fails on hydra (probably not very pure).
---
 pkgs/development/interpreters/perl/5.16/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index c18dbc2b1f1..8047413de3a 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -60,17 +60,21 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
+  doCheck = true;
   # some network-related tests don't work, mostly probably due to our sandboxing
+  testsToSkip = ''
+    lib/Net/hostent.t \
+    dist/IO/t/{io_multihomed.t,io_sock.t} \
+    t/porting/{maintainers.t,regen.t} \
+    cpan/Socket/t/getnameinfo.t
+  '';
   postPatch = ''
-    for test in lib/Net/hostent.t dist/IO/t/{io_multihomed.t,io_sock.t} \
-      t/porting/{maintainers.t,regen.t}
-    do
+    for test in ${testsToSkip}; do
       rm "$test"
       pat=`echo "$test" | sed 's,/,\\\\/,g'` # just escape slashes
       sed "/^$pat/d" -i MANIFEST
     done
   '';
-  doCheck = true;
 
   passthru.libPrefix = "lib/perl5/site_perl";
 }
-- 
GitLab


From 5e202a2221a8bcb34eeaee1966e9ad2f66dda163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 2 Apr 2013 09:20:58 +0200
Subject: [PATCH 0064/3789] perl: fix bash syntax

I thought I could make a small syntax change without trying, I was being
foolish.
---
 pkgs/development/interpreters/perl/5.16/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index 8047413de3a..fa9b9f0fbef 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -66,10 +66,11 @@ stdenv.mkDerivation rec {
     lib/Net/hostent.t \
     dist/IO/t/{io_multihomed.t,io_sock.t} \
     t/porting/{maintainers.t,regen.t} \
-    cpan/Socket/t/getnameinfo.t
-  '';
+    cpan/Socket/t/getnameinfo.t \
+  '' + " ";
   postPatch = ''
     for test in ${testsToSkip}; do
+      echo "Removing test" $test
       rm "$test"
       pat=`echo "$test" | sed 's,/,\\\\/,g'` # just escape slashes
       sed "/^$pat/d" -i MANIFEST
-- 
GitLab


From 322c2f36a3b1e4909ee81921b9f361a080fc85fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 2 Apr 2013 10:39:20 +0200
Subject: [PATCH 0065/3789] perl: attempt to fix on FreeBSD by disabling two
 tests

---
 pkgs/development/interpreters/perl/5.16/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index fa9b9f0fbef..62873f7b57a 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -67,6 +67,9 @@ stdenv.mkDerivation rec {
     dist/IO/t/{io_multihomed.t,io_sock.t} \
     t/porting/{maintainers.t,regen.t} \
     cpan/Socket/t/getnameinfo.t \
+  '' + stdenv.lib.optionalString (stdenv.isFreeBSD) ''
+    cpan/CPANPLUS/t/04_CPANPLUS-Module.t
+    cpan/CPANPLUS/t/20_CPANPLUS-Dist-MM.t
   '' + " ";
   postPatch = ''
     for test in ${testsToSkip}; do
-- 
GitLab


From d021eb6e12d31fb4da0fe44534442269124ae094 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Apr 2013 11:33:59 +0200
Subject: [PATCH 0066/3789] Fix release-small.nix

---
 pkgs/top-level/release-small.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index faefdc5a0c3..0fa311746b1 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -1,19 +1,19 @@
 /* A small release file, with few packages to be built.  The aim is to reduce
-   the load on Hydra when testing the `stdenv-updates' branch.
+   the load on Hydra when testing the `stdenv-updates' branch. */
 
+{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
+}:
 
-   This file will be evaluated by hydra with a call like this:
-   hydra_eval_jobs --gc-roots-dir \
-     /nix/var/nix/gcroots/per-user/hydra/hydra-roots --argstr \
-     system i686-linux --argstr system x86_64-linux --arg \
-     nixpkgs "{outPath = ./}" .... release.nix
-
-   Hydra can be installed with "nix-env -i hydra".  */
-with (import ./release-lib.nix);
+with import ./release-lib.nix {
+  supportedSystems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ];
+};
 
 {
 
-  tarball = import ./make-tarball.nix;
+  tarball = import ./make-tarball.nix {
+    inherit nixpkgs;
+    officialRelease = false;
+  };
 
 } // (mapTestOn (rec {
 
-- 
GitLab


From 2660b9115fc254b32a8eaa927f87ff8195d1dec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 2 Apr 2013 21:18:14 +0200
Subject: [PATCH 0067/3789] perl: fix bad syntax in FreeBSD commit

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

diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index 62873f7b57a..de2839e82ed 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -68,8 +68,8 @@ stdenv.mkDerivation rec {
     t/porting/{maintainers.t,regen.t} \
     cpan/Socket/t/getnameinfo.t \
   '' + stdenv.lib.optionalString (stdenv.isFreeBSD) ''
-    cpan/CPANPLUS/t/04_CPANPLUS-Module.t
-    cpan/CPANPLUS/t/20_CPANPLUS-Dist-MM.t
+    cpan/CPANPLUS/t/04_CPANPLUS-Module.t \
+    cpan/CPANPLUS/t/20_CPANPLUS-Dist-MM.t \
   '' + " ";
   postPatch = ''
     for test in ${testsToSkip}; do
-- 
GitLab


From 4cdcd4e74fd61fad30e7e32cef2df00309e82f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 3 Apr 2013 15:13:11 +0200
Subject: [PATCH 0068/3789] libproxy: update to build with gcc47, add glib

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

diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 8461bfef439..7085236feb5 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -1,10 +1,14 @@
-{stdenv, fetchurl, cmake, zlib}:
+{ stdenv, fetchurl, pkgconfig, cmake, zlib, glib }:
 
 stdenv.mkDerivation rec {
-  name = "libproxy-0.4.7";
+  name = "libproxy-0.4.11";
   src = fetchurl {
     url = "http://libproxy.googlecode.com/files/${name}.tar.gz";
-    sha256 = "15rp97g3s2xkc842p5qfm8kx3p4awvrwrpl6w71a76qk224abq4g";
+    sha256 = "0jw6454gxjykmbnbh544axi8hzz9gmm4jz1y5gw1hdqnakg36gyw";
   };
-  buildInputs = [cmake zlib];
+
+  nativeBuildInputs = [ pkgconfig cmake ];
+  propagatedBuildInputs = [ zlib ]
+    # now some optional deps, but many more are possible
+    ++ [ glib ];
 }
-- 
GitLab


From 642b07f9887482c973609d7421b7965ec37a5873 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Apr 2013 13:55:20 +0200
Subject: [PATCH 0069/3789] gcc: add version 4.8.0

---
 .../compilers/gcc/4.8/arm-eabi.patch          | 230 ++++++++
 pkgs/development/compilers/gcc/4.8/builder.sh | 245 ++++++++
 .../development/compilers/gcc/4.8/default.nix | 525 ++++++++++++++++++
 .../compilers/gcc/4.8/gfortran-driving.patch  |  20 +
 .../compilers/gcc/4.8/gnat-cflags.patch       |  33 ++
 .../gcc/4.8/java-jvgenmain-link.patch         |  17 +
 .../compilers/gcc/4.8/libstdc++-target.patch  |  32 ++
 .../compilers/gcc/4.8/no-sys-dirs.patch       |  41 ++
 pkgs/top-level/all-packages.nix               |  26 +
 9 files changed, 1169 insertions(+)
 create mode 100644 pkgs/development/compilers/gcc/4.8/arm-eabi.patch
 create mode 100644 pkgs/development/compilers/gcc/4.8/builder.sh
 create mode 100644 pkgs/development/compilers/gcc/4.8/default.nix
 create mode 100644 pkgs/development/compilers/gcc/4.8/gfortran-driving.patch
 create mode 100644 pkgs/development/compilers/gcc/4.8/gnat-cflags.patch
 create mode 100644 pkgs/development/compilers/gcc/4.8/java-jvgenmain-link.patch
 create mode 100644 pkgs/development/compilers/gcc/4.8/libstdc++-target.patch
 create mode 100644 pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch

diff --git a/pkgs/development/compilers/gcc/4.8/arm-eabi.patch b/pkgs/development/compilers/gcc/4.8/arm-eabi.patch
new file mode 100644
index 00000000000..63b017062b5
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.8/arm-eabi.patch
@@ -0,0 +1,230 @@
+Index: gcc-4_7-branch/libstdc++-v3/configure.host
+===================================================================
+--- gcc-4_7-branch/libstdc++-v3/configure.host	(revision 194579)
++++ gcc-4_7-branch/libstdc++-v3/configure.host	(revision 194580)
+@@ -340,7 +340,7 @@
+         fi
+     esac
+     case "${host}" in
+-      arm*-*-linux-*eabi)
++      arm*-*-linux-*eabi*)
+ 	port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
+ 	;;
+     esac
+Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
+===================================================================
+--- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	(revision 194579)
++++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	(revision 194580)
+@@ -1,5 +1,5 @@
+ // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
+-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
+ //
+Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
+===================================================================
+--- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	(revision 194579)
++++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	(revision 194580)
+@@ -1,5 +1,5 @@
+ // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
+-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
+ //
+Index: gcc-4_7-branch/libjava/configure.ac
+===================================================================
+--- gcc-4_7-branch/libjava/configure.ac	(revision 194579)
++++ gcc-4_7-branch/libjava/configure.ac	(revision 194580)
+@@ -931,7 +931,7 @@
+     # on Darwin -single_module speeds up loading of the dynamic libraries.
+     extra_ldflags_libjava=-Wl,-single_module
+     ;;
+-arm*linux*eabi)
++arm*-*-linux*eabi*)
+     # Some of the ARM unwinder code is actually in libstdc++.  We
+     # could in principle replicate it in libgcj, but it's better to
+     # have a dependency on libstdc++.
+Index: gcc-4_7-branch/libjava/configure
+===================================================================
+--- gcc-4_7-branch/libjava/configure	(revision 194579)
++++ gcc-4_7-branch/libjava/configure	(revision 194580)
+@@ -20542,7 +20542,7 @@
+     # on Darwin -single_module speeds up loading of the dynamic libraries.
+     extra_ldflags_libjava=-Wl,-single_module
+     ;;
+-arm*linux*eabi)
++arm*-*-linux*eabi*)
+     # Some of the ARM unwinder code is actually in libstdc++.  We
+     # could in principle replicate it in libgcj, but it's better to
+     # have a dependency on libstdc++.
+Index: gcc-4_7-branch/libgcc/config.host
+===================================================================
+--- gcc-4_7-branch/libgcc/config.host	(revision 194579)
++++ gcc-4_7-branch/libgcc/config.host	(revision 194580)
+@@ -327,7 +327,7 @@
+ arm*-*-linux*)			# ARM GNU/Linux with ELF
+ 	tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix"
+ 	case ${host} in
+-	arm*-*-linux-*eabi)
++	arm*-*-linux-*eabi*)
+ 	  tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
+ 	  tm_file="$tm_file arm/bpabi-lib.h"
+ 	  unwind_header=config/arm/unwind-arm.h
+Index: gcc-4_7-branch/gcc/doc/install.texi
+===================================================================
+--- gcc-4_7-branch/gcc/doc/install.texi	(revision 194579)
++++ gcc-4_7-branch/gcc/doc/install.texi	(revision 194580)
+@@ -3222,7 +3222,7 @@
+ @heading @anchor{arm-x-eabi}arm-*-eabi
+ ARM-family processors.  Subtargets that use the ELF object format
+ require GNU binutils 2.13 or newer.  Such subtargets include:
+-@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi}
++@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi*}
+ and @code{arm-*-rtemseabi}.
+ 
+ @html
+Index: gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c	(revision 194580)
+@@ -1,4 +1,4 @@
+-/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi } } } */
++/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi* } } } */
+ 
+ void *foo (void)
+ {
+Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C	(revision 194580)
+@@ -7,10 +7,10 @@
+ // enum-size attributes should only be emitted if there are values of
+ // enum type that can escape the compilation unit, gcc cannot currently
+ // detect this; if this facility is added then this linker option should
+-// not be needed.  arm-*-linux*eabi should be a good approximation to
++// not be needed.  arm-*-linux*eabi* should be a good approximation to
+ // those platforms where the EABI supplement defines enum values to be
+ // 32 bits wide.
+-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ #include <limits.h>
+ 
+Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C	(revision 194580)
+@@ -9,10 +9,10 @@
+ // enum-size attributes should only be emitted if there are values of
+ // enum type that can escape the compilation unit, gcc cannot currently
+ // detect this; if this facility is added then this linker option should
+-// not be needed.  arm-*-linux*eabi should be a good approximation to
++// not be needed.  arm-*-linux*eabi* should be a good approximation to
+ // those platforms where the EABI supplement defines enum values to be
+ // 32 bits wide.
+-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ enum E { 
+   a = -312
+Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C	(revision 194580)
+@@ -7,10 +7,10 @@
+ // enum-size attributes should only be emitted if there are values of
+ // enum type that can escape the compilation unit, gcc cannot currently
+ // detect this; if this facility is added then this linker option should
+-// not be needed.  arm-*-linux*eabi should be a good approximation to
++// not be needed.  arm-*-linux*eabi* should be a good approximation to
+ // those platforms where the EABI supplement defines enum values to be
+ // 32 bits wide.
+-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ // GROUPS passed enums
+   extern "C" int printf (const char *, ...);
+Index: gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp	(revision 194580)
+@@ -3818,7 +3818,7 @@
+ 		}
+ 	    } ""
+ 	}]
+-    } elseif { [istarget arm*-*-linux-gnueabi] } {
++    } elseif { [istarget arm*-*-linux-gnueabi*] } {
+ 	return [check_runtime sync_longlong_runtime {
+ 	    #include <stdlib.h>
+ 	    int main ()
+@@ -3860,7 +3860,7 @@
+ 	     || [istarget i?86-*-*]
+ 	     || [istarget x86_64-*-*]
+ 	     || [istarget alpha*-*-*] 
+-	     || [istarget arm*-*-linux-gnueabi] 
++	     || [istarget arm*-*-linux-gnueabi*] 
+ 	     || [istarget bfin*-*linux*]
+ 	     || [istarget hppa*-*linux*]
+ 	     || [istarget s390*-*-*] 
+@@ -3890,7 +3890,7 @@
+ 	     || [istarget i?86-*-*]
+ 	     || [istarget x86_64-*-*]
+ 	     || [istarget alpha*-*-*] 
+-	     || [istarget arm*-*-linux-gnueabi] 
++	     || [istarget arm*-*-linux-gnueabi*] 
+ 	     || [istarget hppa*-*linux*]
+ 	     || [istarget s390*-*-*] 
+ 	     || [istarget powerpc*-*-*]
+Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90	(revision 194580)
+@@ -1,6 +1,6 @@
+ ! { dg-do run }
+ ! { dg-options "-fshort-enums" }
+-! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ ! Program to test enumerations when option -fshort-enums is given
+ 
+ program main
+Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90	(revision 194580)
+@@ -1,7 +1,7 @@
+ ! { dg-do run }
+ ! { dg-additional-sources enum_10.c }
+ ! { dg-options "-fshort-enums -w" }
+-! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ ! Make sure short enums are indeed interoperable with the
+ ! corresponding C type.
+ 
+Index: gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in
+===================================================================
+--- gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in	(revision 194579)
++++ gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in	(revision 194580)
+@@ -1866,7 +1866,7 @@
+   LIBRARY_VERSION := $(LIB_VERSION)
+ endif
+ 
+-ifeq ($(strip $(filter-out arm% linux-gnueabi,$(arch) $(osys)-$(word 4,$(targ)))),)
++ifeq ($(strip $(filter-out arm%-linux,$(arch)-$(osys)) $(if $(findstring eabi,$(word 4,$(targ))),,$(word 4,$(targ)))),)
+   LIBGNAT_TARGET_PAIRS = \
+   a-intnam.ads<a-intnam-linux.ads \
+   s-inmaop.adb<s-inmaop-posix.adb \
+Index: gcc-4_7-branch/gcc/config.gcc
+===================================================================
+--- gcc-4_7-branch/gcc/config.gcc	(revision 194579)
++++ gcc-4_7-branch/gcc/config.gcc	(revision 194580)
+@@ -855,7 +855,7 @@
+ 	esac
+ 	tmake_file="${tmake_file} arm/t-arm"
+ 	case ${target} in
+-	arm*-*-linux-*eabi)
++	arm*-*-linux-*eabi*)
+ 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
+ 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
+ 	    # Define multilib configuration for arm-linux-androideabi.
diff --git a/pkgs/development/compilers/gcc/4.8/builder.sh b/pkgs/development/compilers/gcc/4.8/builder.sh
new file mode 100644
index 00000000000..dc6fdd93561
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.8/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.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
new file mode 100644
index 00000000000..b260c1e97ef
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -0,0 +1,525 @@
+{ 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.8.0";
+
+    # Whether building a cross-compiler for GNU/Hurd.
+    crossGNU = cross != null && cross.config == "i586-pc-gnu";
+
+    patches = []
+      ++ optional stdenv.isArm [ ./arm-eabi.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.lib.attrByPath [ "platform" "gcc" "arch" ] null stdenv;
+        gccCpu = stdenv.lib.attrByPath [ "platform" "gcc" "cpu" ] null stdenv;
+        gccAbi = stdenv.lib.attrByPath [ "platform" "gcc" "abi" ] null stdenv;
+        gccFpu = stdenv.lib.attrByPath [ "platform" "gcc" "fpu" ] null stdenv;
+        gccFloat = stdenv.lib.attrByPath [ "platform" "gcc" "float" ] null stdenv;
+        gccMode = stdenv.lib.attrByPath [ "platform" "gcc" "mode" ] null stdenv;
+        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");
+    crossConfigureFlags = let
+        gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross;
+        gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross;
+        gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross;
+        gccFpu = stdenv.lib.attrByPath [ "gcc" "fpu" ] null cross;
+        gccFloat = stdenv.lib.attrByPath [ "gcc" "float" ] null cross;
+        gccMode = stdenv.lib.attrByPath [ "gcc" "mode" ] null cross;
+        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
+          " --with-headers=${libcCross}/include" +
+          " --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" +
+            (if cross.config == "x86_64-w64-mingw32" then
+              # To keep ABI compatibility with upstream mingw-w64
+              " --enable-fully-dynamic-string"
+              else "")
+            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 = "0b6cp9d1sas3vq6dj3zrgd134p9b569fqhbixb9cl7mp698zwdxh";
+  };
+
+  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"
+      ''}
+    '';
+
+  # 'iant' at #go-nuts@freenode, gccgo maintainer, said that
+  # they have a bug in 4.7.1 if adding "--disable-static"
+  dontDisableStatic = langGo || staticCompiler;
+
+  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 "" 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-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 (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.lib.attrByPath [ "gcc" "arch" ] null stdenv.cross;
+    xgccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null stdenv.cross;
+    xgccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null stdenv.cross;
+    xgccFpu = stdenv.lib.attrByPath [ "gcc" "fpu" ] null stdenv.cross;
+    xgccFloat = stdenv.lib.attrByPath [ "gcc" "float" ] null stdenv.cross;
+    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 &&
+                                                 hasAttr "propagatedBuildInputs" libcCross)
+                                        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; };
+
+  /* From gccinstall.info:
+     "parallel make is currently not supported since collisions in profile
+     collecting may occur"
+  */
+  enableParallelBuilding = !profiledCompiler;
+
+  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 ++ optionals (langAda == false && libelf == null) [ "i686-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.8/gfortran-driving.patch b/pkgs/development/compilers/gcc/4.8/gfortran-driving.patch
new file mode 100644
index 00000000000..70708886b40
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.8/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.8/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.8/gnat-cflags.patch
new file mode 100644
index 00000000000..bf2acf065e9
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.8/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.8/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.8/java-jvgenmain-link.patch
new file mode 100644
index 00000000000..2612e8bfbbb
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.8/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.8/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.8/libstdc++-target.patch
new file mode 100644
index 00000000000..fb622b39580
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.8/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.8/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch
new file mode 100644
index 00000000000..79901703cb8
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.8/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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba17cf99ae3..c3af959ac48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2237,6 +2237,32 @@ let
     binutilsCross = null;
   }));
 
+  gcc48_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 {
+    inherit noSysDirs;
+    # I'm not sure if profiling with enableParallelBuilding helps a lot.
+    # We can enable it back some day. This makes the *gcc* builds faster now.
+    profiledCompiler = false;
+
+    # 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;
+  }));
+
+  gcc48_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 {
+    stripped = false;
+
+    inherit noSysDirs;
+    cross = null;
+    libcCross = null;
+    binutilsCross = null;
+  }));
+
   gccApple =
     assert stdenv.isDarwin;
     wrapGCC (makeOverridable (import ../development/compilers/gcc/4.2-apple64) {
-- 
GitLab


From e12e62001bef98b4983579c505d772e8362a590b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Apr 2013 13:42:26 +0200
Subject: [PATCH 0070/3789] perl: Update to 5.16.3, 5.14.4

CVE-2013-1667
---
 pkgs/development/interpreters/perl/5.14/default.nix | 4 ++--
 pkgs/development/interpreters/perl/5.16/default.nix | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/perl/5.14/default.nix b/pkgs/development/interpreters/perl/5.14/default.nix
index 70a030e0308..dd4e7acf71f 100644
--- a/pkgs/development/interpreters/perl/5.14/default.nix
+++ b/pkgs/development/interpreters/perl/5.14/default.nix
@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "perl-5.14.2";
+  name = "perl-5.14.4";
 
   src = fetchurl {
     url = "mirror://cpan/src/${name}.tar.gz";
-    sha256 = "1ls8cpbgnlaxfydyyqgr7pxj1hkxh9pzcdgr3dv42zdxffakb234";
+    sha256 = "1js47zzna3v38fjnirf2vq6y0rjp8m86ysj5vagzgkig956d8gw0";
   };
 
   patches = 
diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index de2839e82ed..2e9540f0006 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "perl-5.16.2";
+  name = "perl-5.16.3";
 
   src = fetchurl {
     url = "mirror://cpan/src/${name}.tar.gz";
-    sha256 = "03nh8bqnjsdd5izjv3n2yfcxw4ck0llwww36jpbjbjgixwpqpy4f";
+    sha256 = "1dpd9lhc4723wmsn4dsn4m320qlqgyw28bvcbhnfqp2nl3f0ikv9";
   };
 
   patches =
@@ -61,16 +61,18 @@ stdenv.mkDerivation rec {
   setupHook = ./setup-hook.sh;
 
   doCheck = true;
+
   # some network-related tests don't work, mostly probably due to our sandboxing
   testsToSkip = ''
     lib/Net/hostent.t \
     dist/IO/t/{io_multihomed.t,io_sock.t} \
     t/porting/{maintainers.t,regen.t} \
     cpan/Socket/t/getnameinfo.t \
-  '' + stdenv.lib.optionalString (stdenv.isFreeBSD) ''
+  '' + stdenv.lib.optionalString stdenv.isFreeBSD ''
     cpan/CPANPLUS/t/04_CPANPLUS-Module.t \
     cpan/CPANPLUS/t/20_CPANPLUS-Dist-MM.t \
   '' + " ";
+
   postPatch = ''
     for test in ${testsToSkip}; do
       echo "Removing test" $test
-- 
GitLab


From a1a845876314d4244315d809df99dee41d000011 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Apr 2013 10:21:41 +0200
Subject: [PATCH 0071/3789] pkgs/top-level/release-small.nix: make
 'supportedSystems' an argument to this expression

---
 pkgs/top-level/release-small.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index a2a10ab7561..516141fa003 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -2,11 +2,10 @@
    the load on Hydra when testing the `stdenv-updates' branch. */
 
 { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
+, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ]
 }:
 
-with import ./release-lib.nix {
-  supportedSystems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ];
-};
+with import ./release-lib.nix { inherit supportedSystems; };
 
 {
 
-- 
GitLab


From 8a9e83057b93ac08f7fb3a8e330709fb7549a643 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Apr 2013 15:16:38 +0200
Subject: [PATCH 0072/3789] all-packages.nix: strip trailing whitespace

---
 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 75b823eba3d..9ab4f310f72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7707,7 +7707,7 @@ let
   ratpoison = callPackage ../applications/window-managers/ratpoison { };
 
   rawtherapee = callPackage ../applications/graphics/rawtherapee {
-    fftw = fftw.override {float = true;}; 
+    fftw = fftw.override {float = true;};
   };
 
   rcs = callPackage ../applications/version-management/rcs { };
@@ -8005,7 +8005,7 @@ let
 
   wings = callPackage ../applications/graphics/wings {
     erlang = erlangR14B04;
-    esdl = esdl.override { erlang = erlangR14B04; }; 
+    esdl = esdl.override { erlang = erlangR14B04; };
   };
 
   wmname = callPackage ../applications/misc/wmname { };
-- 
GitLab


From b4ac9a4c9f0fa399448d5b96c765788c92435ed7 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 7 Apr 2013 12:22:40 +0200
Subject: [PATCH 0073/3789] python: 2.7.3 -> 2.7.4

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

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 9fb2ab377df..7dc4708e3cf 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -9,11 +9,11 @@ with stdenv.lib;
 let
 
   majorVersion = "2.7";
-  version = "${majorVersion}.3";
+  version = "${majorVersion}.4";
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
-    sha256 = "0g3672il41rcfjk7sphfqdsa6qf53y8g3ai8yk1sslxi3khmfr3j";
+    sha256 = "0nd3x4j2w8pi9ac3pawrzb5i3s88hw0aasr08dprdv7q81fp0pq3";
   };
 
   patches =
-- 
GitLab


From 70f0d79d063c665a9fd46d5bd38391f940f0430f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 7 Apr 2013 21:52:24 +0200
Subject: [PATCH 0074/3789] perl: remove one more unreliable test, fixes #454

---
 pkgs/development/interpreters/perl/5.16/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index 2e9540f0006..c838bb35ab5 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     lib/Net/hostent.t \
     dist/IO/t/{io_multihomed.t,io_sock.t} \
     t/porting/{maintainers.t,regen.t} \
-    cpan/Socket/t/getnameinfo.t \
+    cpan/Socket/t/get{name,addr}info.t \
   '' + stdenv.lib.optionalString stdenv.isFreeBSD ''
     cpan/CPANPLUS/t/04_CPANPLUS-Module.t \
     cpan/CPANPLUS/t/20_CPANPLUS-Dist-MM.t \
-- 
GitLab


From e9b30710a4c23378b6fcf5908f6e1bfef35892c1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Apr 2013 15:15:57 +0200
Subject: [PATCH 0075/3789] Switch stdenv to GCC 4.8.0.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1f9449f57a..82dfd0dd481 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1998,7 +1998,7 @@ let
 
   gambit = callPackage ../development/compilers/gambit { };
 
-  gcc = gcc47;
+  gcc = gcc48;
 
   gcc33 = wrapGCC (import ../development/compilers/gcc/3.3 {
     inherit fetchurl stdenv noSysDirs;
@@ -2051,6 +2051,8 @@ let
 
   gcc47 = gcc47_real;
 
+  gcc48 = gcc48_real;
+
   gcc45_realCross = lib.addMetaAttrs { platforms = []; }
     (makeOverridable (import ../development/compilers/gcc/4.5) {
       inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
-- 
GitLab


From e4f9d6b396b57ff0d9f918e252195e84d81faf48 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Apr 2013 08:48:34 +0200
Subject: [PATCH 0076/3789] gmp-4.3.2.nix: disable test suite to fix the build

The test t-lucnum_ui fails (on Linux/x86_64) when built with GCC 4.8.
Newer versions of GMP don't have that issue anymore.
---
 pkgs/development/libraries/gmp/4.3.2.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix
index df7bd0ea3b9..f003979c701 100644
--- a/pkgs/development/libraries/gmp/4.3.2.nix
+++ b/pkgs/development/libraries/gmp/4.3.2.nix
@@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
 
   configureFlags = if cxx then "--enable-cxx" else "--disable-cxx";
 
-  doCheck = true;
+  # The test t-lucnum_ui fails (on Linux/x86_64) when built with GCC 4.8.
+  # Newer versions of GMP don't have that issue anymore.
+  doCheck = false;
 
   meta = {
     description = "GMP, the GNU multiple precision arithmetic library";
-- 
GitLab


From 3e208067eae985271899471c4b26f720167a3640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 10 Apr 2013 08:59:59 +0200
Subject: [PATCH 0077/3789] gcc48: turn on PGO on x86*, see #445

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82dfd0dd481..0dbffda27d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2241,9 +2241,9 @@ let
 
   gcc48_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 {
     inherit noSysDirs;
-    # I'm not sure if profiling with enableParallelBuilding helps a lot.
-    # We can enable it back some day. This makes the *gcc* builds faster now.
-    profiledCompiler = false;
+
+    # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
+    profiledCompiler = with stdenv; (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
-- 
GitLab


From 4c62d0d144b6c287fb5a629afb94632cfaaab34b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 10 Apr 2013 14:46:50 +0200
Subject: [PATCH 0078/3789] gcc42: fix build via a patch from arch

---
 pkgs/development/compilers/gcc/4.2/default.nix    |  6 +++---
 .../development/compilers/gcc/4.2/siginfo_t.patch | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/compilers/gcc/4.2/siginfo_t.patch

diff --git a/pkgs/development/compilers/gcc/4.2/default.nix b/pkgs/development/compilers/gcc/4.2/default.nix
index 68a174cc579..69cac159d4a 100644
--- a/pkgs/development/compilers/gcc/4.2/default.nix
+++ b/pkgs/development/compilers/gcc/4.2/default.nix
@@ -30,11 +30,11 @@ stdenv.mkDerivation {
       url = "mirror://gnu/gcc/gcc-${version}/gcc-fortran-${version}.tar.bz2";
       sha256 = "013yqiqhdavgxzjryvylgf3lcnknmw89fx41jf2v4899srn0bhkg";
     });
-    
+
   patches =
-    [./pass-cxxcpp.patch]
+    [./pass-cxxcpp.patch ./siginfo_t.patch]
     ++ optional noSysDirs [./no-sys-dirs.patch];
-    
+
   inherit noSysDirs profiledCompiler staticCompiler;
 
   buildInputs = [gmp mpfr texinfo];
diff --git a/pkgs/development/compilers/gcc/4.2/siginfo_t.patch b/pkgs/development/compilers/gcc/4.2/siginfo_t.patch
new file mode 100644
index 00000000000..bfb9f975372
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.2/siginfo_t.patch
@@ -0,0 +1,15 @@
+https://bbs.archlinux.org/viewtopic.php?id=144949
+--- a/gcc/config/i386/linux-unwind.h	2011-01-03 20:52:22.000000000 +0000
++++ b/gcc/config/i386/linux-unwind.h	2012-07-06 12:23:51.562859470 +0100
+@@ -133,9 +133,9 @@
+     {
+       struct rt_sigframe {
+ 	int sig;
+-	struct siginfo *pinfo;
++	siginfo_t *pinfo;
+ 	void *puc;
+-	struct siginfo info;
++	siginfo_t info;
+ 	struct ucontext uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
-- 
GitLab


From d7be1e84d0800bfa83a25c001c128de1fe89c02e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 10 Apr 2013 15:28:54 +0200
Subject: [PATCH 0079/3789] ruby19: fix build via a patch-level update

---
 pkgs/development/interpreters/ruby/ruby-19.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix
index b954d7e6bf0..fc9d6d3de6b 100644
--- a/pkgs/development/interpreters/ruby/ruby-19.nix
+++ b/pkgs/development/interpreters/ruby/ruby-19.nix
@@ -14,12 +14,12 @@ in
 
 stdenv.mkDerivation rec {
   version = with passthru; "${majorVersion}.${minorVersion}-p${patchLevel}";
-  
+
   name = "ruby-${version}";
-  
+
   src = fetchurl {
     url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2";
-    sha256 = "1ymq5lhp3fz0j3cs65521aihcnivbfrn76in900ccxd0msgfmld9";
+    sha256 = "14c3lp9w7hq3jcmbakw2ngrzd7c81fgqm6skpxwni5k2vzgk8wss";
   };
 
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     ++ (op yamlSupport libyaml);
 
   enableParallelBuilding = true;
-    
+
   configureFlags = ["--enable-shared" "--enable-pthread"];
 
   installFlags = stdenv.lib.optionalString docSupport "install-doc";
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   passthru = rec {
     majorVersion = "1.9";
     minorVersion = "3";
-    patchLevel = "194";
+    patchLevel = "392";
     libPath = "lib/ruby/${majorVersion}";
     gemPath = "lib/ruby/gems/${majorVersion}";
   };
-- 
GitLab


From 2b56b020c7e68727e6ffcd15818802076e608fc1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 19 Apr 2013 14:14:40 +0200
Subject: [PATCH 0080/3789] alex, happy: fix build for gcc 4.8.0

Alex and happy use CPP to generate some internal template files, but the code
is unprepared for the output from CPP 4.8.0, which generates LINE pragmas that
contain more information than they thought it would.
---
 pkgs/development/tools/parsing/alex/2.3.1.nix        |  1 +
 pkgs/development/tools/parsing/alex/2.3.2.nix        |  1 +
 pkgs/development/tools/parsing/alex/2.3.3.nix        |  1 +
 pkgs/development/tools/parsing/alex/2.3.5.nix        |  1 +
 .../alex/adapt-crazy-perl-regex-for-cpp-4.8.0.patch  | 12 ++++++++++++
 pkgs/development/tools/parsing/happy/1.18.4.nix      |  1 +
 pkgs/development/tools/parsing/happy/1.18.5.nix      |  1 +
 pkgs/development/tools/parsing/happy/1.18.6.nix      |  1 +
 pkgs/development/tools/parsing/happy/1.18.8.nix      |  1 +
 .../happy/adapt-crazy-perl-regex-for-cpp-4.8.0.patch | 12 ++++++++++++
 10 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/tools/parsing/alex/adapt-crazy-perl-regex-for-cpp-4.8.0.patch
 create mode 100644 pkgs/development/tools/parsing/happy/adapt-crazy-perl-regex-for-cpp-4.8.0.patch

diff --git a/pkgs/development/tools/parsing/alex/2.3.1.nix b/pkgs/development/tools/parsing/alex/2.3.1.nix
index 92db61e08a2..7be36a2bf3c 100644
--- a/pkgs/development/tools/parsing/alex/2.3.1.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.1.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildTools = [ perl ];
   doCheck = false;
+  patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ];
   meta = {
     homepage = "http://www.haskell.org/alex/";
     description = "Alex is a tool for generating lexical analysers in Haskell";
diff --git a/pkgs/development/tools/parsing/alex/2.3.2.nix b/pkgs/development/tools/parsing/alex/2.3.2.nix
index 2ec395d463f..d05daf83ee0 100644
--- a/pkgs/development/tools/parsing/alex/2.3.2.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.2.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildTools = [ perl ];
   doCheck = false;
+  patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ];
   meta = {
     homepage = "http://www.haskell.org/alex/";
     description = "Alex is a tool for generating lexical analysers in Haskell";
diff --git a/pkgs/development/tools/parsing/alex/2.3.3.nix b/pkgs/development/tools/parsing/alex/2.3.3.nix
index 920c5fd9cc2..fe8ed57189d 100644
--- a/pkgs/development/tools/parsing/alex/2.3.3.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.3.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildTools = [ perl ];
   doCheck = false;
+  patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ];
   meta = {
     homepage = "http://www.haskell.org/alex/";
     description = "Alex is a tool for generating lexical analysers in Haskell";
diff --git a/pkgs/development/tools/parsing/alex/2.3.5.nix b/pkgs/development/tools/parsing/alex/2.3.5.nix
index 3635b248787..366988d8d14 100644
--- a/pkgs/development/tools/parsing/alex/2.3.5.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.5.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildTools = [ perl ];
   doCheck = false;
+  patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ];
   meta = {
     homepage = "http://www.haskell.org/alex/";
     description = "Alex is a tool for generating lexical analysers in Haskell";
diff --git a/pkgs/development/tools/parsing/alex/adapt-crazy-perl-regex-for-cpp-4.8.0.patch b/pkgs/development/tools/parsing/alex/adapt-crazy-perl-regex-for-cpp-4.8.0.patch
new file mode 100644
index 00000000000..1e5942bfbef
--- /dev/null
+++ b/pkgs/development/tools/parsing/alex/adapt-crazy-perl-regex-for-cpp-4.8.0.patch
@@ -0,0 +1,12 @@
+diff -ubr alex-2.3.5-orig/Setup.lhs alex-2.3.5/Setup.lhs
+--- alex-2.3.5-orig/Setup.lhs	2013-04-19 12:00:15.812606335 +0000
++++ alex-2.3.5/Setup.lhs	2013-04-19 12:05:41.635450321 +0000
+@@ -25,7 +25,7 @@
+ -- hack to turn cpp-style '# 27 "GenericTemplate.hs"' into 
+ -- '{-# LINE 27 "GenericTemplate.hs" #-}'.
+ crazy_perl_regexp =
+- "s/^#\\s+(\\d+)\\s+(\"[^\"]*\")/{-# LINE \\1 \\2 #-}/g;s/\\$(Id:.*)\\$/\\1/g"
++ "s/^#\\s+(\\d+)\\s+(\"[^\"]*\").*/{-# LINE \\1 \\2 #-}/g;s/\\$(Id:.*)\\$/\\1/g"
+ 
+ myPostBuild _ flags _ lbi = do
+   let runProgram p = rawSystemProgramConf (buildVerbose flags) p (withPrograms lbi)
diff --git a/pkgs/development/tools/parsing/happy/1.18.4.nix b/pkgs/development/tools/parsing/happy/1.18.4.nix
index cc5c60a3d43..12eb1837635 100644
--- a/pkgs/development/tools/parsing/happy/1.18.4.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.4.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [ mtl ];
   buildTools = [ perl ];
+  patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ];
   meta = {
     homepage = "http://www.haskell.org/happy/";
     description = "Happy is a parser generator for Haskell";
diff --git a/pkgs/development/tools/parsing/happy/1.18.5.nix b/pkgs/development/tools/parsing/happy/1.18.5.nix
index 41532651c99..5cee8d7fc78 100644
--- a/pkgs/development/tools/parsing/happy/1.18.5.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.5.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [ mtl ];
   buildTools = [ perl ];
+  patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ];
   meta = {
     homepage = "http://www.haskell.org/happy/";
     description = "Happy is a parser generator for Haskell";
diff --git a/pkgs/development/tools/parsing/happy/1.18.6.nix b/pkgs/development/tools/parsing/happy/1.18.6.nix
index 60b8d253659..c50eee13fd0 100644
--- a/pkgs/development/tools/parsing/happy/1.18.6.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.6.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [ mtl ];
   buildTools = [ perl ];
+  patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ];
   meta = {
     homepage = "http://www.haskell.org/happy/";
     description = "Happy is a parser generator for Haskell";
diff --git a/pkgs/development/tools/parsing/happy/1.18.8.nix b/pkgs/development/tools/parsing/happy/1.18.8.nix
index b1ba0b165dd..1caf80a94bd 100644
--- a/pkgs/development/tools/parsing/happy/1.18.8.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.8.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [ mtl ];
   buildTools = [ perl ];
+  patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ];
   meta = {
     homepage = "http://www.haskell.org/happy/";
     description = "Happy is a parser generator for Haskell";
diff --git a/pkgs/development/tools/parsing/happy/adapt-crazy-perl-regex-for-cpp-4.8.0.patch b/pkgs/development/tools/parsing/happy/adapt-crazy-perl-regex-for-cpp-4.8.0.patch
new file mode 100644
index 00000000000..8bc4db0f405
--- /dev/null
+++ b/pkgs/development/tools/parsing/happy/adapt-crazy-perl-regex-for-cpp-4.8.0.patch
@@ -0,0 +1,12 @@
+diff -ubr happy-1.18.6-orig/Setup.lhs happy-1.18.6/Setup.lhs
+--- happy-1.18.6-orig/Setup.lhs	2013-04-19 14:17:10.865999210 +0200
++++ happy-1.18.6/Setup.lhs	2013-04-19 14:17:15.285214809 +0200
+@@ -25,7 +25,7 @@
+ -- hack to turn cpp-style '# 27 "GenericTemplate.hs"' into 
+ -- '{-# LINE 27 "GenericTemplate.hs" #-}'.
+ crazy_perl_regexp =
+- "s/^#\\s+(\\d+)\\s+(\"[^\"]*\")/{-# LINE \\1 \\2 #-}/g;s/\\$(Id:.*)\\$/\\1/g"
++ "s/^#\\s+(\\d+)\\s+(\"[^\"]*\").*/{-# LINE \\1 \\2 #-}/g;s/\\$(Id:.*)\\$/\\1/g"
+ 
+ myPostBuild _ flags _ lbi = do
+   let runProgram p = rawSystemProgramConf (buildVerbose flags) p (withPrograms lbi)
-- 
GitLab


From 4dd05a51ed5c57f0f1d88715423fc0d525cf8de0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 20 Apr 2013 23:26:09 +0200
Subject: [PATCH 0081/3789] ghc-binary: don't refer to /bin/sh

---
 pkgs/development/compilers/ghc/6.10.1-binary.nix | 4 ++--
 pkgs/development/compilers/ghc/6.10.2-binary.nix | 4 ++--
 pkgs/development/compilers/ghc/6.12.1-binary.nix | 4 ++--
 pkgs/development/compilers/ghc/7.0.4-binary.nix  | 4 ++--
 pkgs/development/compilers/ghc/7.4.2-binary.nix  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/ghc/6.10.1-binary.nix b/pkgs/development/compilers/ghc/6.10.1-binary.nix
index dd79ef9c8e7..e7d4d3c1946 100644
--- a/pkgs/development/compilers/ghc/6.10.1-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.1-binary.nix
@@ -36,10 +36,10 @@ stdenv.mkDerivation rec {
      ''
       mkdir "$TMP/bin"
       for i in strip; do
-        echo '#!/bin/sh' >> "$TMP/bin/$i"
+        echo '#! ${stdenv.shell}' > "$TMP/bin/$i"
         chmod +x "$TMP/bin/$i"
-        PATH="$TMP/bin:$PATH"
       done
+      PATH="$TMP/bin:$PATH"
      '' +
     # On Linux, use patchelf to modify the executables so that they can
     # find editline/gmp.
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index 7effff83c69..5af89e38c21 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -30,10 +30,10 @@ stdenv.mkDerivation rec {
      ''
       mkdir "$TMP/bin"
       for i in strip; do
-        echo '#!/bin/sh' >> "$TMP/bin/$i"
+        echo '#! ${stdenv.shell}' > "$TMP/bin/$i"
         chmod +x "$TMP/bin/$i"
-        PATH="$TMP/bin:$PATH"
       done
+      PATH="$TMP/bin:$PATH"
      '' +
     # On Linux, use patchelf to modify the executables so that they can
     # find editline/gmp.
diff --git a/pkgs/development/compilers/ghc/6.12.1-binary.nix b/pkgs/development/compilers/ghc/6.12.1-binary.nix
index 6f3411da4af..da4658c3829 100644
--- a/pkgs/development/compilers/ghc/6.12.1-binary.nix
+++ b/pkgs/development/compilers/ghc/6.12.1-binary.nix
@@ -28,10 +28,10 @@ stdenv.mkDerivation rec {
      ''
       mkdir "$TMP/bin"
       for i in strip; do
-        echo '#!/bin/sh' >> "$TMP/bin/$i"
+        echo '#! ${stdenv.shell}' > "$TMP/bin/$i"
         chmod +x "$TMP/bin/$i"
-        PATH="$TMP/bin:$PATH"
       done
+      PATH="$TMP/bin:$PATH"
      '' +
     # We have to patch the GMP paths for the integer-gmp package.
      ''
diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix
index 455d552b91a..2c9b11f2b65 100644
--- a/pkgs/development/compilers/ghc/7.0.4-binary.nix
+++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix
@@ -38,10 +38,10 @@ stdenv.mkDerivation rec {
      ''
       mkdir "$TMP/bin"
       for i in strip; do
-        echo '#!/bin/sh' >> "$TMP/bin/$i"
+        echo '#! ${stdenv.shell}' > "$TMP/bin/$i"
         chmod +x "$TMP/bin/$i"
-        PATH="$TMP/bin:$PATH"
       done
+      PATH="$TMP/bin:$PATH"
      '' +
     # We have to patch the GMP paths for the integer-gmp package.
      ''
diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix
index 59eb957a45f..7000081e5db 100644
--- a/pkgs/development/compilers/ghc/7.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix
@@ -38,10 +38,10 @@ stdenv.mkDerivation rec {
      ''
       mkdir "$TMP/bin"
       for i in strip; do
-        echo '#!/bin/sh' >> "$TMP/bin/$i"
+        echo '#! ${stdenv.shell}' > "$TMP/bin/$i"
         chmod +x "$TMP/bin/$i"
-        PATH="$TMP/bin:$PATH"
       done
+      PATH="$TMP/bin:$PATH"
      '' +
     # We have to patch the GMP paths for the integer-gmp package.
      ''
-- 
GitLab


From 431b774cc0b6984e6910b690136d6c2a60cf0afe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 20 Apr 2013 23:20:47 +0200
Subject: [PATCH 0082/3789] ghc: greatly simplify the GHC compiler wrapper

The wrapper script accumulated some cruft over the last couple of months
because we did changes in freaky ways to avoid triggering re-builds of all
Haskell packages. Most of these kludges have been thrown out now.

This patch doesn't change the behavior of the wrapper except for one thing: the
internal helper scripts "ghc-get-packages.sh" and "ghc-packages.sh" are no
longer installed in the bin directory of the generated derivation.
---
 pkgs/build-support/cabal/default.nix          |  2 +-
 .../compilers/ghc/ghc-get-packages.sh         | 21 -----
 pkgs/development/compilers/ghc/wrapper.nix    | 93 ++++++++++++-------
 pkgs/top-level/haskell-packages.nix           | 10 --
 4 files changed, 59 insertions(+), 67 deletions(-)
 delete mode 100755 pkgs/development/compilers/ghc/ghc-get-packages.sh

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 7064908f334..dfac8a4b292 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -144,7 +144,7 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
 
               ./Setup build
 
-              export GHC_PACKAGE_PATH=$(ghc-packages)
+              export GHC_PACKAGE_PATH=$(${ghc.GHCPackages})
               [ -n "$noHaddock" ] || ./Setup haddock
 
               eval "$postBuild"
diff --git a/pkgs/development/compilers/ghc/ghc-get-packages.sh b/pkgs/development/compilers/ghc/ghc-get-packages.sh
deleted file mode 100755
index 71e58e66a5e..00000000000
--- a/pkgs/development/compilers/ghc/ghc-get-packages.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-# Usage:
-#  $1: version of GHC
-#  $2: invocation path of GHC
-#  $3: prefix
-version="$1"
-if test -z "$3"; then
-  prefix="-package-conf "
-else
-  prefix="$3"
-fi
-PATH="$2:$PATH"
-IFS=":"
-for p in $PATH; do
-  PkgDir="$p/../lib/ghc-$version/package.conf.d"
-  for i in $PkgDir/*.installedconf; do
-    # output takes place here
-    test -f $i && echo -n " $prefix$i"
-  done
-done
-test -f "$2/../lib/ghc-$version/package.conf" && echo -n " $prefix$2/../lib/ghc-$version/package.conf"
diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix
index 55fd16be5ed..24deb89c2ec 100644
--- a/pkgs/development/compilers/ghc/wrapper.nix
+++ b/pkgs/development/compilers/ghc/wrapper.nix
@@ -1,10 +1,53 @@
-{ stdenv, ghc, makeWrapper, coreutils, forUserEnv ? false }:
+{ stdenv, ghc, makeWrapper, coreutils, writeScript }:
 
 let
   ghc761OrLater = !stdenv.lib.versionOlder ghc.version "7.6.1";
   packageDBFlag = if ghc761OrLater then "-package-db" else "-package-conf";
+
+  GHCGetPackages = writeScript "ghc-get-packages.sh" ''
+    #! ${stdenv.shell}
+    # Usage:
+    #  $1: version of GHC
+    #  $2: invocation path of GHC
+    #  $3: prefix
+    version="$1"
+    if test -z "$3"; then
+      prefix="${packageDBFlag} "
+    else
+      prefix="$3"
+    fi
+    PATH="$2:$PATH"
+    IFS=":"
+    for p in $PATH; do
+      PkgDir="$p/../lib/ghc-$version/package.conf.d"
+      for i in "$PkgDir/"*.installedconf; do
+        # output takes place here
+        test -f $i && echo -n " $prefix$i"
+      done
+    done
+    test -f "$2/../lib/ghc-$version/package.conf" && echo -n " $prefix$2/../lib/ghc-$version/package.conf"
+  '';
+
+  GHCPackages = writeScript "ghc-packages.sh" ''
+    #! ${stdenv.shell} -e
+    declare -A GHC_PACKAGES_HASH # using bash4 hashs to get uniq paths
+
+    for arg in $(${GHCGetPackages} ${ghc.version} "$(dirname $0)"); do
+      case "$arg" in
+        ${packageDBFlag}) ;;
+        *)
+          CANONICALIZED="$(${coreutils}/bin/readlink -f -- "$arg")"
+          GHC_PACKAGES_HASH["$CANONICALIZED"]= ;;
+      esac
+    done
+
+    for path in ''${!GHC_PACKAGES_HASH[@]}; do
+      echo -n "$path:"
+    done
+  '';
+
 in
-stdenv.mkDerivation ({
+stdenv.mkDerivation {
   name = "ghc-${ghc.version}-wrapper";
 
   buildInputs = [makeWrapper];
@@ -12,53 +55,33 @@ stdenv.mkDerivation ({
 
   unpackPhase = "true";
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/bin
-    cp $GHCGetPackages $out/bin/ghc-get-packages.sh
-    chmod 755 $out/bin/ghc-get-packages.sh
     for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do
-      makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\")"
+      makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$(${GHCGetPackages} ${ghc.version} \"\$(dirname \$0)\")"
     done
     for prg in runghc runhaskell; do
-      makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" \" ${packageDBFlag} --ghc-arg=\")"
+      makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$(${GHCGetPackages} ${ghc.version} \"\$(dirname \$0)\" \" ${packageDBFlag} --ghc-arg=\")"
     done
     for prg in ghc-pkg ghc-pkg-${ghc.version}; do
-      makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" -${packageDBFlag}=)"
+      makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$(${GHCGetPackages} ${ghc.version} \"\$(dirname \$0)\" -${packageDBFlag}=)"
     done
     for prg in hp2ps hpc hasktags hsc2hs; do
       test -x $ghc/bin/$prg && ln -s $ghc/bin/$prg $out/bin/$prg
     done
-    cat >> $out/bin/ghc-packages << EOF
-    #! /bin/bash -e
-    declare -A GHC_PACKAGES_HASH # using bash4 hashs to get uniq paths
-
-    for arg in \$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\"); do
-      case "\$arg" in
-        ${packageDBFlag}) ;;
-        *)
-          CANONICALIZED="\$(${stdenv.lib.optionalString stdenv.isDarwin "${coreutils}/bin/"}readlink -f "\$arg")"
-          GHC_PACKAGES_HASH["\$CANONICALIZED"]= ;;
-      esac
-    done
 
-    for path in \''${!GHC_PACKAGES_HASH[@]}; do
-      echo -n "\$path:"
-    done
-    EOF
-    chmod +x $out/bin/ghc-packages
     mkdir -p $out/nix-support
     ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
-  '';
 
-  GHCGetPackages = ./ghc-get-packages.sh;
+    mkdir -p $out/share/doc
+    ln -s $ghc/lib $out/lib
+    ln -s $ghc/share/doc/ghc $out/share/doc/ghc-${ghc.version}
+
+    runHook postInstall
+  '';
 
-  inherit ghc;
+  inherit ghc GHCGetPackages GHCPackages;
   inherit (ghc) meta;
   ghcVersion = ghc.version;
-} // (stdenv.lib.optionalAttrs ghc761OrLater { preFixup = "sed -i -e 's|-package-conf|${packageDBFlag}|' $out/bin/ghc-get-packages.sh"; })
-  // (stdenv.lib.optionalAttrs forUserEnv {
-       postFixup= ''
-         ln -s $ghc/lib $out/lib;
-         mkdir -p $out/share/doc
-         ln -s $ghc/share/doc/ghc $out/share/doc/ghc-${ghc.version}
-       '';
-     }))
+}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3bf5d3d7f74..7c6c237b194 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -89,16 +89,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     ghc = ghc; # refers to ghcPlain
   };
 
-  # The normal GHC wrapper doesn't create links to the documentation in
-  # ~/.nix-profile. Having this second wrapper allows us to remedy the
-  # situation without re-building all Haskell packages. At the next
-  # stdenv-updates merge, this second wrapper will go away.
-
-  ghcUserEnvWrapper = pkgs.appendToName "new" (callPackage ../development/compilers/ghc/wrapper.nix {
-    ghc = ghc; # refers to ghcPlain
-    forUserEnv = true;
-  });
-
   # An experimental wrapper around ghcPlain that does not automatically
   # pick up packages from the profile, but instead has a fixed set of packages
   # in its global database. The set of packages can be specified as an
-- 
GitLab


From 3e3f70713ffe68a6ee63a8d4a8bd2552e32916d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 30 Apr 2013 09:15:15 +0200
Subject: [PATCH 0083/3789] zlib: minor update 1.2.7 -> 1.2.8

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

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index ec47c35c153..0d4abaf25e0 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, static ? false }:
 
-let version = "1.2.7"; in
+let version = "1.2.8"; in
 
 stdenv.mkDerivation rec {
   name = "zlib-${version}";
-  
+
   src = fetchurl {
     urls =
       [ "http://www.zlib.net/${name}.tar.gz"  # old versions vanish from here
         "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz"
       ];
-    sha256 = "1i96gsdvxqb6skp9a58bacf1wxamwi9m9pg4yn7cpf7g7239r77s";
+    sha256 = "039agw5rqvqny92cpkrfn243x2gd4xn13hs3xi6isk55d2vqqr9n";
   };
 
   configureFlags = if static then "" else "--shared";
-- 
GitLab


From 6b78544addd4f46f7ad073fb7de83d0bb8b8de30 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 4 May 2013 19:38:46 -0400
Subject: [PATCH 0084/3789] binutils: enable gold by default

This doesn't change the default but makes gold available to packages
that might want to use it.

Required switching to the gzipped tarball for bison, as xz isn't
available in the early bootstrap.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/tools/misc/binutils/default.nix | 2 +-
 pkgs/development/tools/parsing/bison/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index e1afceebaa2..ad3b4ae2b27 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null }:
+{ stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? true, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null }:
 
 let basename = "binutils-2.23.1"; in
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix
index 4e4539059a6..c1de3315bee 100644
--- a/pkgs/development/tools/parsing/bison/default.nix
+++ b/pkgs/development/tools/parsing/bison/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   name = "bison-2.7";
 
   src = fetchurl {
-    url = "mirror://gnu/bison/${name}.tar.xz";
-    sha256 = "1zd77ilmpv5mi3kr55jrj6ncqlcnyhpianhrwzak2q28cv2cbn23";
+    url = "mirror://gnu/bison/${name}.tar.gz";
+    sha256 = "0cd8s2g7zjshya7kwjc9rh3drsssl4hiq4sccnkgf0nn9wvygfqr";
   };
 
   nativeBuildInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c43449d1956..ec7a2a90715 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3093,9 +3093,9 @@ let
     inherit noSysDirs;
   };
 
-  binutils_gold = lowPrio (callPackage ../development/tools/misc/binutils {
+  binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils {
     inherit noSysDirs;
-    gold = true;
+    gold = false;
   });
 
   binutilsCross = lowPrio (forceNativeDrv (import ../development/tools/misc/binutils {
-- 
GitLab


From 986f36194650e2a41451cbfb9f29ce1c66a62df3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 5 May 2013 11:30:34 -0400
Subject: [PATCH 0085/3789] linux/bootstrap: Use <nix/fetchurl> to get the
 static binaries

Since nix-1.4, nix's corepkgs contain a fetchurl suitable for
downloading the bootstrap binaries. Doing this will allow us to have a
nixpkgs with no in-tree binaries without breaking the purity of the
bootstrap (though for now, they are fetched in-tree until the binaries
are added to nixos.org somewhere). As an additional small benefit, the
in-tree binaries do not have to be hashed on every instantiation as they
do now.

The fetchurl in nix-1.2 and 1.3 isn't able to make binaries executable,
so it can't be used for this case. In that case, attempting to build the
bootstrap will show a message asking the user to manually download each
file and add it to the store with nix-store --add (but the hash is
ultimately the same, of course).

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../linux/bootstrap/armv5tel/default.nix      | 69 ++++++++++++++++--
 .../stdenv/linux/bootstrap/armv6l/default.nix | 10 +--
 pkgs/stdenv/linux/bootstrap/i686/default.nix  | 70 +++++++++++++++++--
 .../linux/bootstrap/loongson2f/default.nix    | 70 +++++++++++++++++--
 .../linux/bootstrap/powerpc/default.nix       | 64 +++++++++++++++--
 5 files changed, 249 insertions(+), 34 deletions(-)

diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix b/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
index 3a8a03e5a54..342a612d218 100644
--- a/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
@@ -1,10 +1,65 @@
-{
-  sh = ./sh;
-  bzip2 = ./bzip2;
-  mkdir = ./mkdir;
-  cpio = ./cpio;
-  ln = ./ln;
-  curl = ./curl.bz2;
+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 {
+  sh = fetch {
+    file = "sh";
+    sha256 = "1kv3gc8h209rjc5i0rzzc4pjxq23kzq25iff89in05c9vl20mn4n";
+  };
+
+  bzip2 = fetch {
+    file = "bzip2";
+    sha256 = "090jrj099wl33q0iq092iljilam39pv8acli59m2af0fa9z0d9f0";
+  };
+
+  mkdir = fetch {
+    file = "mkdir";
+    sha256 = "01s8myfvi559dsxvbanxw71vxzjv49k4gi1qh0ak6l0qx0xq602b";
+  };
+
+  cpio = fetch {
+    file = "cpio";
+    sha256 = "07snc8l0mn84w2xrvdmc5yfpmlbrvl2bar8wipbpvm43nzz2qbzs";
+  };
+
+  ln = fetch {
+    file = "ln";
+    sha256 = "0m9fz02bashpfgwfkxmrp4wa8a5r3il52bclvf6z36vsam0vx56d";
+  };
+
+  curl = fetch {
+    file = "curl.bz2";
+    sha256 = "19yqdjqi31zlnqn8ss2ml60iq2a1vrwfw6dmvjqp6qbxmh7yb8n8";
+  };
 
   bootstrapTools = {
     url = "http://nixos.org/tarballs/stdenv-linux/armv5tel/r18744/bootstrap-tools.cpio.bz2";
diff --git a/pkgs/stdenv/linux/bootstrap/armv6l/default.nix b/pkgs/stdenv/linux/bootstrap/armv6l/default.nix
index ecda6be8bd3..542f74de49f 100644
--- a/pkgs/stdenv/linux/bootstrap/armv6l/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/armv6l/default.nix
@@ -1,11 +1,7 @@
-{
-  sh = ../armv5tel/sh;
-  bzip2 = ../armv5tel/bzip2;
-  mkdir = ../armv5tel/mkdir;
-  cpio = ../armv5tel/cpio;
-  ln = ../armv5tel/ln;
-  curl = ../armv5tel/curl.bz2;
+# Use the static tools for armv5tel-linux.
+(import ../armv5tel) //
 
+{
   bootstrapTools = {
     # Built from make-bootstrap-tools-crosspi.nix
     # nixpkgs rev eb0422e4c1263a65a9b2b954fe10a1e03d67db3e
diff --git a/pkgs/stdenv/linux/bootstrap/i686/default.nix b/pkgs/stdenv/linux/bootstrap/i686/default.nix
index 1d709766bfd..0dee92d2249 100644
--- a/pkgs/stdenv/linux/bootstrap/i686/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/i686/default.nix
@@ -1,10 +1,66 @@
-{
-  sh = ./sh;
-  bzip2 = ./bzip2;
-  mkdir = ./mkdir;
-  cpio = ./cpio;
-  ln = ./ln;
-  curl = ./curl.bz2;
+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 {
+  sh = fetch {
+    file = "sh";
+    sha256 = "1l6sdhyqjlh4m5gj3pfpi8aisp1m012lpwxfcc4v1x8g429mflmy";
+  };
+
+  bzip2 = fetch {
+    file = "bzip2";
+    sha256 = "1p5nkrdn52jm6rsx8x3wwjpsh83f2qsjl1qckkgnkplwhj23zjp7";
+  };
+
+  mkdir = fetch {
+    file = "mkdir";
+    sha256 = "02ff7i9ph9ahiapsg2v9c3pwr7sl73sk4n7ic112ljkrgwkail33";
+  };
+
+  cpio = fetch {
+    file = "cpio";
+    sha256 = "046if3aqqramyhrn2yxrjf4bfkl8x1bcqxhvi7ml9nrv9smx8irg";
+  };
+
+  ln = fetch {
+    file = "ln";
+    sha256 = "06vr474i3x55p0rnqa87yx7dzf4qdfpfg201mks39id43cjm9f8j";
+  };
+
+  curl = fetch {
+    file = "curl.bz2";
+    sha256 = "1v0yfb4gcdyqpl2fxlxjh337r28c23iqm7vwck4p4643xd55di7q";
+  };
 
   bootstrapTools = {
     url = http://nixos.org/tarballs/stdenv-linux/i686/r24519/bootstrap-tools.cpio.bz2;
diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix b/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix
index b0ad8d6545d..4d7594f02ad 100644
--- a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix
@@ -1,10 +1,66 @@
-{
-  sh = ./sh;
-  bzip2 = ./bzip2;
-  mkdir = ./mkdir;
-  cpio = ./cpio;
-  ln = ./ln;
-  curl = ./curl.bz2;
+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 {
+  sh = fetch {
+    file = "sh";
+    sha256 = "02jjl49wdq85pgh61aqf78yaknn9mi3rcspbpk7hs9c4mida2rhf";
+  };
+
+  bzip2 = fetch {
+    file = "bzip2";
+    sha256 = "1qn27y3amj9c6mnjk2kyb59y0d2w4yv16z9apaxx91hyq19gf29z";
+  };
+
+  mkdir = fetch {
+    file = "mkdir";
+    sha256 = "1vbp2bv9hkyb2fwl8hjrffpywn1wrl1kc4yrwi2lirawlnc6kymh";
+  };
+
+  cpio = fetch {
+    file = "cpio";
+    sha256 = "0mqxwdx0sl7skxx6049mk35l7d0fnibqsv174284kdp4p7iixwa0";
+  };
+
+  ln = fetch {
+    file = "ln";
+    sha256 = "05lwx8qvga3yv8xhs8bjgsfygsfrcxsfck0lxw6gsdckx25fgi7s";
+  };
+
+  curl = fetch {
+    file = "curl.bz2";
+    sha256 = "0iblnz4my54gryac04i64fn3ksi9g3dx96yjq93fj39z6kx6151c";
+  };
 
   bootstrapTools = {
     url = "http://nixos.org/tarballs/stdenv-linux/loongson2f/r22849/cross-bootstrap-tools.cpio.bz2";
diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/default.nix b/pkgs/stdenv/linux/bootstrap/powerpc/default.nix
index 61f7f863512..59fa47561dd 100644
--- a/pkgs/stdenv/linux/bootstrap/powerpc/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/powerpc/default.nix
@@ -1,9 +1,61 @@
-{
-  bash = ./bash;
-  bzip2 = ./bzip2;
-  cp = ./cp;
-  curl = ./curl.bz2;
-  tar = ./tar.bz2;
+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://nixos.org/tarballs/stdenv-linux/powerpc/r9828/static-tools.tar.bz2;
-- 
GitLab


From 303c3a9fbf7fd5a95f7aab7a00b4a9ba92a8e304 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 26 May 2013 13:22:55 +0200
Subject: [PATCH 0086/3789] unzip: add bzip2 as native build input

Signed-off-by: Domen Kozar <domen@dev.si>
---
 pkgs/tools/archivers/unzip/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index 8309a2102ab..f939c968c44 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation ({
     sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83";
   };
 
+  nativeBuildInputs = [ bzip2 ];
   buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec;
 
   makefile = "unix/Makefile";
-- 
GitLab


From 8326038d2b59886a8d0ec55762e919033ba909fc Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Fri, 24 May 2013 00:56:00 +0200
Subject: [PATCH 0087/3789] Add ncursesw compatibility link also for includes

This is needed for the ncurses cabal package to compile.  It uses
include/ncursesw/curses.h, without trying include/curses.h first.  The
files are provided through include/ncursesw on a clean Debian too, in
the unicode case (when the libncursesw5-dev is installed).

Signed-off-by: Domen Kozar <domen@dev.si>
---
 pkgs/development/libraries/ncurses/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 378abb81295..8d20a7339b7 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation (rec {
         ln -svf lib''${lib}w.so.5 $out/lib/lib$lib.so.5
       fi
     done;
+    ln -svf . $out/include/ncursesw
   '' else "";
 
   meta = {
-- 
GitLab


From f7ef08e5cd986f89c3ac4baf3d1dab3bce2b1b4c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 May 2013 16:22:45 +0200
Subject: [PATCH 0088/3789] experimental/cmake-improvement

set CMAKE_LIBRARY_PATH, CMAKE_INCLUDE_PATH based on NIX_CFLAGS_COMPILE and
NIX_LDFLAGS so that cmake's find_library like functions find all the libraries
gcc knows about thanks to the gcc wrapper

This is particular useful with myEnvFun which then also sets those CMAKE_* env
variables.`

Because setup.sh has to change this causes many rebuilds - thus it should be
included in a stdenv-update like branch

Also cmake builds in parallel perfectly fine

update cmake to latest minor number, I didn't change the patches,
just reapplied them manually recordin a new patch
---
 .../tools/build-managers/cmake/default.nix    |  6 +-
 .../build-managers/cmake/search-path.patch    | 72 ++++++++++---------
 .../tools/build-managers/cmake/setup-hook.sh  | 17 +++++
 pkgs/stdenv/generic/setup.sh                  |  4 ++
 4 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index d66149a9509..d4e5fa00a51 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -7,7 +7,7 @@ with stdenv.lib;
 let
   os = stdenv.lib.optionalString;
   majorVersion = "2.8";
-  minorVersion = "9";
+  minorVersion = "11";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -18,9 +18,11 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "1yg68ng732cfm5c0h91chqwhg06zdh45bybm353kd1myk5rwqgfw";
+    sha256 = "1rgfgzigmc0b2z5330r3ncf003k4bhqwfxbskv0q5ylp2xkd7l10";
   };
 
+  enableParallelBuilding = true;
+
   patches =
     # Don't search in non-Nix locations such as /usr, but do search in
     # Nixpkgs' Glibc.
diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch
index ef8a9eef7c1..31c85d6f522 100644
--- a/pkgs/development/tools/build-managers/cmake/search-path.patch
+++ b/pkgs/development/tools/build-managers/cmake/search-path.patch
@@ -1,41 +1,43 @@
-diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/Linux.cmake cmake-2.8.5/Modules/Platform/Linux.cmake
---- cmake-2.8.5-orig/Modules/Platform/Linux.cmake	2011-07-08 14:21:44.000000000 +0200
-+++ cmake-2.8.5/Modules/Platform/Linux.cmake	2011-07-21 19:45:00.000000000 +0200
-@@ -36,13 +36,13 @@
+diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
+index fe8e003..378512c 100644
+--- a/Modules/Platform/Linux.cmake
++++ b/Modules/Platform/Linux.cmake
+@@ -36,13 +36,13 @@ else()
    # checking the platform every time.  This option is advanced enough
    # that only package maintainers should need to adjust it.  They are
    # capable of providing a setting on the command line.
--  IF(EXISTS "/etc/debian_version")
--    SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
+-  if(EXISTS "/etc/debian_version")
+-    set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
 -      "Install .so files without execute permission.")
--  ELSE(EXISTS "/etc/debian_version")
-+  #IF(EXISTS "/etc/debian_version")
-+  #  SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
-+  #    "Install .so files without execute permission.")
-+  #ELSE(EXISTS "/etc/debian_version")
-     SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
+-  else()
++  # if(EXISTS "/etc/debian_version")
++  #   set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
++  #     "Install .so files without execute permission.")
++  # else()
+     set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
        "Install .so files without execute permission.")
--  ENDIF(EXISTS "/etc/debian_version")
-+  #ENDIF(EXISTS "/etc/debian_version")
- ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
+-  endif()
++  # endif()
+ endif()
  
  # Match multiarch library directory names.
-@@ -52,6 +52,6 @@
+@@ -52,6 +52,6 @@ include(Platform/UnixPaths)
  
  # Debian has lib64 paths only for compatibility so they should not be
  # searched.
--IF(EXISTS "/etc/debian_version")
--  SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
--ENDIF(EXISTS "/etc/debian_version")
-+#IF(EXISTS "/etc/debian_version")
-+#  SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
-+#ENDIF(EXISTS "/etc/debian_version")
-diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/Modules/Platform/UnixPaths.cmake
---- cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake	2011-07-08 14:21:44.000000000 +0200
-+++ cmake-2.8.5/Modules/Platform/UnixPaths.cmake	2011-07-21 19:50:52.000000000 +0200
-@@ -33,55 +33,18 @@
+-if(EXISTS "/etc/debian_version")
+-  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+-endif()
++# if(EXISTS "/etc/debian_version")
++#  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
++#endif()
+diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
+index ccb2663..39834e6 100644
+--- a/Modules/Platform/UnixPaths.cmake
++++ b/Modules/Platform/UnixPaths.cmake
+@@ -33,55 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
  # search types.
- LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
    # Standard
 -  /usr/local /usr /
 -
@@ -47,7 +49,7 @@ diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/M
 -  )
 -
 -# List common include file locations not under the common prefixes.
--LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
 -  # Windows API on Cygwin
 -  /usr/include/w32api
 -
@@ -56,11 +58,11 @@ diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/M
 -
 -  # Other
 -  /usr/pkg/include
--  /opt/csw/include /opt/include  
+-  /opt/csw/include /opt/include
 -  /usr/openwin/include
 -  )
 -
--LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
 -  # Windows API on Cygwin
 -  /usr/lib/w32api
 -
@@ -69,25 +71,25 @@ diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/M
 -
 -  # Other
 -  /usr/pkg/lib
--  /opt/csw/lib /opt/lib 
+-  /opt/csw/lib /opt/lib
 -  /usr/openwin/lib
 -  )
 -
--LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
 -  /usr/pkg/bin
 +  "@glibc@"
    )
  
- LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
 -  /lib /usr/lib /usr/lib32 /usr/lib64
 +  "@glibc@/lib"
    )
  
- LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
+ list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
 -  /usr/include
 +  "@glibc@/include"
    )
- LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
+ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
 -  /usr/include
 +  "@glibc@/include"
    )
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index 175e538e519..d324d1f1815 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -56,3 +56,20 @@ if [ -n "$crossConfig" ]; then
 else
     envHooks+=(addCMakeParams)
 fi
+
+make_cmake_find_libs(){
+  for flag in $NIX_CFLAGS_COMPILE $NIX_LDFLAGS; do
+    case $flag in
+      -I*)
+        export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag:2}"
+        ;;
+      -L*)
+        export CMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH${CMAKE_LIBRARY_PATH:+:}${flag:2}"
+        ;;
+    esac
+  done
+}
+
+# not using setupHook, because it could be a setupHook adding additional
+# include flags to NIX_CFLAGS_COMPILE
+postHooks+=(make_cmake_find_libs)
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index a474b6a8eaf..a80a5ab743c 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -862,6 +862,10 @@ genericBuild() {
     stopNest
 }
 
+for i in "${postHooks[@]}"; do
+    $i
+done
+
 
 # Execute the post-hook.
 runHook postHook
-- 
GitLab


From d4bcbbaba699af5fc96daae4c2afa627ca53f8a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 1 Jun 2013 12:41:34 +0200
Subject: [PATCH 0089/3789] gcc: update from 4.8.0 to 4.8.1

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

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index b260c1e97ef..1435277c105 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -52,7 +52,7 @@ assert langGo -> langCC;
 with stdenv.lib;
 with builtins;
 
-let version = "4.8.0";
+let version = "4.8.1";
 
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
@@ -200,7 +200,7 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "0b6cp9d1sas3vq6dj3zrgd134p9b569fqhbixb9cl7mp698zwdxh";
+    sha256 = "04sqn0ds17ys8l6zn7vyyvjz1a7hsk4zb0381vlw9wnr7az48nsl";
   };
 
   inherit patches;
-- 
GitLab


From 2a0479fc4817b9dee1c153e646d87cb9799073e2 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Thu, 16 May 2013 06:52:52 +0200
Subject: [PATCH 0090/3789] glibc: Enable kernels down to 2.6.32 (required for
 RHEL 6).

---
 pkgs/development/libraries/glibc/2.17/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix
index 413a0d7aae8..23ec1c46ad7 100644
--- a/pkgs/development/libraries/glibc/2.17/common.nix
+++ b/pkgs/development/libraries/glibc/2.17/common.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation ({
        then "--enable-profile"
        else "--disable-profile")
     ] ++ stdenv.lib.optionals (cross == null && kernelHeaders != null) [
-      "--enable-kernel=2.6.35"
+      "--enable-kernel=2.6.32"
     ] ++ stdenv.lib.optionals (cross != null) [
       (if cross.withTLS then "--with-tls" else "--without-tls")
       (if cross.float == "soft" then "--without-fp" else "--with-fp")
-- 
GitLab


From aa2044099d33b62f0d194d46264c0be3de06bea0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Jun 2013 22:16:05 +0200
Subject: [PATCH 0091/3789] glibc: add "/run/current-system/sw/bin" to the
 default search path returned by "getconf CS_PATH"

---
 pkgs/development/libraries/glibc/2.17/common.nix            | 5 +++++
 .../glibc/2.17/fix_path_attribute_in_getconf.patch          | 6 ++++++
 2 files changed, 11 insertions(+)
 create mode 100644 pkgs/development/libraries/glibc/2.17/fix_path_attribute_in_getconf.patch

diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix
index 23ec1c46ad7..1bc439b5e9b 100644
--- a/pkgs/development/libraries/glibc/2.17/common.nix
+++ b/pkgs/development/libraries/glibc/2.17/common.nix
@@ -55,6 +55,11 @@ stdenv.mkDerivation ({
          rfc3484_sort: Assertion `src->results[i].native == -1 ||
          src->results[i].native == a2_native' failed." crashes. */
       ./glibc-rh739743.patch
+
+      /* The command "getconf CS_PATH" returns the default search path
+         "/bin:/usr/bin", which is inappropriate on NixOS machines. This
+         patch extends the search path by "/run/current-system/sw/bin". */
+      ./fix_path_attribute_in_getconf.patch
     ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/glibc/2.17/fix_path_attribute_in_getconf.patch b/pkgs/development/libraries/glibc/2.17/fix_path_attribute_in_getconf.patch
new file mode 100644
index 00000000000..714e49db560
--- /dev/null
+++ b/pkgs/development/libraries/glibc/2.17/fix_path_attribute_in_getconf.patch
@@ -0,0 +1,6 @@
+diff -ubr glibc-2.17-orig/sysdeps/unix/confstr.h glibc-2.17/sysdeps/unix/confstr.h
+--- glibc-2.17-orig/sysdeps/unix/confstr.h	2013-06-03 22:01:44.829726968 +0200
++++ glibc-2.17/sysdeps/unix/confstr.h	2013-06-03 22:04:39.469376740 +0200
+@@ -1 +1 @@
+-#define	CS_PATH	"/bin:/usr/bin"
++#define	CS_PATH	"/run/current-system/sw/bin:/bin:/usr/bin"
-- 
GitLab


From a3cc98019306d017452379899d784a6037a537c1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Jun 2013 11:55:52 +0200
Subject: [PATCH 0092/3789] groff: explicitly disable X11 support in configure
 to avoid impure builds

Without this flag, the configure script will find /usr/X11 on host system and
assume that it can build with X11 support.
---
 pkgs/tools/text/groff/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index 90c5ef0ba81..6a11882fdc9 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ ghostscript ];
   nativeBuildInputs = [ perl ];
 
+  # Builds running without a chroot environment may detect the presence
+  # of /usr/X11 in the host system, leading to an impure build of the
+  # package. To avoid this issue, X11 support is explicitly disabled.
+  # Note: If we ever want to *enable* X11 support, then we'll probably
+  # have to pass "--with-appresdir", too.
+  configureFlags = "--without-x";
+
   doCheck = true;
 
   crossAttrs = {
-- 
GitLab


From b08e12b37ae9470c9d8eb8438c21adb8ddbae19e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Jun 2013 10:19:15 +0200
Subject: [PATCH 0093/3789] Revert "Merge pull request #567 from
 MarcWeber/submit/cmake-improvement"

This reverts commit abc7591aaf3912d819401241d7d2339fb96441f3, reversing changes
made to 6b1ebeccf2c9d9e8f68d7e21a1e55b5d91577683, because they broke half the
packages in stdenv-updates: http://hydra.nixos.org/eval/927013 has further
details.
---
 .../tools/build-managers/cmake/default.nix    |  6 +-
 .../build-managers/cmake/search-path.patch    | 72 +++++++++----------
 .../tools/build-managers/cmake/setup-hook.sh  | 17 -----
 pkgs/stdenv/generic/setup.sh                  |  4 --
 4 files changed, 37 insertions(+), 62 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index d4e5fa00a51..d66149a9509 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -7,7 +7,7 @@ with stdenv.lib;
 let
   os = stdenv.lib.optionalString;
   majorVersion = "2.8";
-  minorVersion = "11";
+  minorVersion = "9";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -18,11 +18,9 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "1rgfgzigmc0b2z5330r3ncf003k4bhqwfxbskv0q5ylp2xkd7l10";
+    sha256 = "1yg68ng732cfm5c0h91chqwhg06zdh45bybm353kd1myk5rwqgfw";
   };
 
-  enableParallelBuilding = true;
-
   patches =
     # Don't search in non-Nix locations such as /usr, but do search in
     # Nixpkgs' Glibc.
diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch
index 31c85d6f522..ef8a9eef7c1 100644
--- a/pkgs/development/tools/build-managers/cmake/search-path.patch
+++ b/pkgs/development/tools/build-managers/cmake/search-path.patch
@@ -1,43 +1,41 @@
-diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
-index fe8e003..378512c 100644
---- a/Modules/Platform/Linux.cmake
-+++ b/Modules/Platform/Linux.cmake
-@@ -36,13 +36,13 @@ else()
+diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/Linux.cmake cmake-2.8.5/Modules/Platform/Linux.cmake
+--- cmake-2.8.5-orig/Modules/Platform/Linux.cmake	2011-07-08 14:21:44.000000000 +0200
++++ cmake-2.8.5/Modules/Platform/Linux.cmake	2011-07-21 19:45:00.000000000 +0200
+@@ -36,13 +36,13 @@
    # checking the platform every time.  This option is advanced enough
    # that only package maintainers should need to adjust it.  They are
    # capable of providing a setting on the command line.
--  if(EXISTS "/etc/debian_version")
--    set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
+-  IF(EXISTS "/etc/debian_version")
+-    SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
 -      "Install .so files without execute permission.")
--  else()
-+  # if(EXISTS "/etc/debian_version")
-+  #   set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
-+  #     "Install .so files without execute permission.")
-+  # else()
-     set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
+-  ELSE(EXISTS "/etc/debian_version")
++  #IF(EXISTS "/etc/debian_version")
++  #  SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
++  #    "Install .so files without execute permission.")
++  #ELSE(EXISTS "/etc/debian_version")
+     SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
        "Install .so files without execute permission.")
--  endif()
-+  # endif()
- endif()
+-  ENDIF(EXISTS "/etc/debian_version")
++  #ENDIF(EXISTS "/etc/debian_version")
+ ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
  
  # Match multiarch library directory names.
-@@ -52,6 +52,6 @@ include(Platform/UnixPaths)
+@@ -52,6 +52,6 @@
  
  # Debian has lib64 paths only for compatibility so they should not be
  # searched.
--if(EXISTS "/etc/debian_version")
--  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
--endif()
-+# if(EXISTS "/etc/debian_version")
-+#  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
-+#endif()
-diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
-index ccb2663..39834e6 100644
---- a/Modules/Platform/UnixPaths.cmake
-+++ b/Modules/Platform/UnixPaths.cmake
-@@ -33,55 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
+-IF(EXISTS "/etc/debian_version")
+-  SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+-ENDIF(EXISTS "/etc/debian_version")
++#IF(EXISTS "/etc/debian_version")
++#  SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
++#ENDIF(EXISTS "/etc/debian_version")
+diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/Modules/Platform/UnixPaths.cmake
+--- cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake	2011-07-08 14:21:44.000000000 +0200
++++ cmake-2.8.5/Modules/Platform/UnixPaths.cmake	2011-07-21 19:50:52.000000000 +0200
+@@ -33,55 +33,18 @@
  # search types.
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+ LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
    # Standard
 -  /usr/local /usr /
 -
@@ -49,7 +47,7 @@ index ccb2663..39834e6 100644
 -  )
 -
 -# List common include file locations not under the common prefixes.
--list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+-LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
 -  # Windows API on Cygwin
 -  /usr/include/w32api
 -
@@ -58,11 +56,11 @@ index ccb2663..39834e6 100644
 -
 -  # Other
 -  /usr/pkg/include
--  /opt/csw/include /opt/include
+-  /opt/csw/include /opt/include  
 -  /usr/openwin/include
 -  )
 -
--list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+-LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
 -  # Windows API on Cygwin
 -  /usr/lib/w32api
 -
@@ -71,25 +69,25 @@ index ccb2663..39834e6 100644
 -
 -  # Other
 -  /usr/pkg/lib
--  /opt/csw/lib /opt/lib
+-  /opt/csw/lib /opt/lib 
 -  /usr/openwin/lib
 -  )
 -
--list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+-LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
 -  /usr/pkg/bin
 +  "@glibc@"
    )
  
- list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
 -  /lib /usr/lib /usr/lib32 /usr/lib64
 +  "@glibc@/lib"
    )
  
- list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
+ LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
 -  /usr/include
 +  "@glibc@/include"
    )
- list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
+ LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
 -  /usr/include
 +  "@glibc@/include"
    )
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index d324d1f1815..175e538e519 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -56,20 +56,3 @@ if [ -n "$crossConfig" ]; then
 else
     envHooks+=(addCMakeParams)
 fi
-
-make_cmake_find_libs(){
-  for flag in $NIX_CFLAGS_COMPILE $NIX_LDFLAGS; do
-    case $flag in
-      -I*)
-        export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag:2}"
-        ;;
-      -L*)
-        export CMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH${CMAKE_LIBRARY_PATH:+:}${flag:2}"
-        ;;
-    esac
-  done
-}
-
-# not using setupHook, because it could be a setupHook adding additional
-# include flags to NIX_CFLAGS_COMPILE
-postHooks+=(make_cmake_find_libs)
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index a80a5ab743c..a474b6a8eaf 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -862,10 +862,6 @@ genericBuild() {
     stopNest
 }
 
-for i in "${postHooks[@]}"; do
-    $i
-done
-
 
 # Execute the post-hook.
 runHook postHook
-- 
GitLab


From 83ec7aa92fab68b44f6e8a27b7398c19e49a307d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Jun 2013 14:05:46 +0200
Subject: [PATCH 0094/3789] python: Remove --with-wctype-functions flag

This causes functions like string.upper() to misbehave on non-ASCII
characters.  Upstream also advises against it:

  http://bugs.python.org/issue9210
  http://bugs.python.org/issue11309
---
 pkgs/development/interpreters/python/2.6/default.nix | 2 +-
 pkgs/development/interpreters/python/2.7/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index f264e4179e7..38060e9af33 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -45,7 +45,7 @@ let
     C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
     LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
 
-    configureFlags = "--enable-shared --with-threads --enable-unicode --with-wctype-functions";
+    configureFlags = "--enable-shared --with-threads --enable-unicode";
 
     preConfigure =
       ''
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 7dc4708e3cf..78aaf4d7fdf 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -56,7 +56,7 @@ let
     C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
     LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
 
-    configureFlags = "--enable-shared --with-threads --enable-unicode --with-wctype-functions";
+    configureFlags = "--enable-shared --with-threads --enable-unicode";
 
     preConfigure = "${ensurePurity}" + optionalString stdenv.isCygwin
       ''
-- 
GitLab


From 7f1e09c35dbf48efb074208790a651693f061c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 22 Jun 2013 13:58:30 +0200
Subject: [PATCH 0095/3789] Re-Revert "Merge pull request #567 from
 MarcWeber/submit/cmake-improvement"

This reverts commit b08e12b37ae9470c9d8eb8438c21adb8ddbae19e.
---
 .../tools/build-managers/cmake/default.nix    |  6 +-
 .../build-managers/cmake/search-path.patch    | 72 ++++++++++---------
 .../tools/build-managers/cmake/setup-hook.sh  | 17 +++++
 pkgs/stdenv/generic/setup.sh                  |  4 ++
 4 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index d66149a9509..d4e5fa00a51 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -7,7 +7,7 @@ with stdenv.lib;
 let
   os = stdenv.lib.optionalString;
   majorVersion = "2.8";
-  minorVersion = "9";
+  minorVersion = "11";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -18,9 +18,11 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "1yg68ng732cfm5c0h91chqwhg06zdh45bybm353kd1myk5rwqgfw";
+    sha256 = "1rgfgzigmc0b2z5330r3ncf003k4bhqwfxbskv0q5ylp2xkd7l10";
   };
 
+  enableParallelBuilding = true;
+
   patches =
     # Don't search in non-Nix locations such as /usr, but do search in
     # Nixpkgs' Glibc.
diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch
index ef8a9eef7c1..31c85d6f522 100644
--- a/pkgs/development/tools/build-managers/cmake/search-path.patch
+++ b/pkgs/development/tools/build-managers/cmake/search-path.patch
@@ -1,41 +1,43 @@
-diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/Linux.cmake cmake-2.8.5/Modules/Platform/Linux.cmake
---- cmake-2.8.5-orig/Modules/Platform/Linux.cmake	2011-07-08 14:21:44.000000000 +0200
-+++ cmake-2.8.5/Modules/Platform/Linux.cmake	2011-07-21 19:45:00.000000000 +0200
-@@ -36,13 +36,13 @@
+diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
+index fe8e003..378512c 100644
+--- a/Modules/Platform/Linux.cmake
++++ b/Modules/Platform/Linux.cmake
+@@ -36,13 +36,13 @@ else()
    # checking the platform every time.  This option is advanced enough
    # that only package maintainers should need to adjust it.  They are
    # capable of providing a setting on the command line.
--  IF(EXISTS "/etc/debian_version")
--    SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
+-  if(EXISTS "/etc/debian_version")
+-    set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
 -      "Install .so files without execute permission.")
--  ELSE(EXISTS "/etc/debian_version")
-+  #IF(EXISTS "/etc/debian_version")
-+  #  SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
-+  #    "Install .so files without execute permission.")
-+  #ELSE(EXISTS "/etc/debian_version")
-     SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
+-  else()
++  # if(EXISTS "/etc/debian_version")
++  #   set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
++  #     "Install .so files without execute permission.")
++  # else()
+     set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
        "Install .so files without execute permission.")
--  ENDIF(EXISTS "/etc/debian_version")
-+  #ENDIF(EXISTS "/etc/debian_version")
- ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
+-  endif()
++  # endif()
+ endif()
  
  # Match multiarch library directory names.
-@@ -52,6 +52,6 @@
+@@ -52,6 +52,6 @@ include(Platform/UnixPaths)
  
  # Debian has lib64 paths only for compatibility so they should not be
  # searched.
--IF(EXISTS "/etc/debian_version")
--  SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
--ENDIF(EXISTS "/etc/debian_version")
-+#IF(EXISTS "/etc/debian_version")
-+#  SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
-+#ENDIF(EXISTS "/etc/debian_version")
-diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/Modules/Platform/UnixPaths.cmake
---- cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake	2011-07-08 14:21:44.000000000 +0200
-+++ cmake-2.8.5/Modules/Platform/UnixPaths.cmake	2011-07-21 19:50:52.000000000 +0200
-@@ -33,55 +33,18 @@
+-if(EXISTS "/etc/debian_version")
+-  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+-endif()
++# if(EXISTS "/etc/debian_version")
++#  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
++#endif()
+diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
+index ccb2663..39834e6 100644
+--- a/Modules/Platform/UnixPaths.cmake
++++ b/Modules/Platform/UnixPaths.cmake
+@@ -33,55 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
  # search types.
- LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
    # Standard
 -  /usr/local /usr /
 -
@@ -47,7 +49,7 @@ diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/M
 -  )
 -
 -# List common include file locations not under the common prefixes.
--LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
 -  # Windows API on Cygwin
 -  /usr/include/w32api
 -
@@ -56,11 +58,11 @@ diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/M
 -
 -  # Other
 -  /usr/pkg/include
--  /opt/csw/include /opt/include  
+-  /opt/csw/include /opt/include
 -  /usr/openwin/include
 -  )
 -
--LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
 -  # Windows API on Cygwin
 -  /usr/lib/w32api
 -
@@ -69,25 +71,25 @@ diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/M
 -
 -  # Other
 -  /usr/pkg/lib
--  /opt/csw/lib /opt/lib 
+-  /opt/csw/lib /opt/lib
 -  /usr/openwin/lib
 -  )
 -
--LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
 -  /usr/pkg/bin
 +  "@glibc@"
    )
  
- LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
 -  /lib /usr/lib /usr/lib32 /usr/lib64
 +  "@glibc@/lib"
    )
  
- LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
+ list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
 -  /usr/include
 +  "@glibc@/include"
    )
- LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
+ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
 -  /usr/include
 +  "@glibc@/include"
    )
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index 175e538e519..d324d1f1815 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -56,3 +56,20 @@ if [ -n "$crossConfig" ]; then
 else
     envHooks+=(addCMakeParams)
 fi
+
+make_cmake_find_libs(){
+  for flag in $NIX_CFLAGS_COMPILE $NIX_LDFLAGS; do
+    case $flag in
+      -I*)
+        export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag:2}"
+        ;;
+      -L*)
+        export CMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH${CMAKE_LIBRARY_PATH:+:}${flag:2}"
+        ;;
+    esac
+  done
+}
+
+# not using setupHook, because it could be a setupHook adding additional
+# include flags to NIX_CFLAGS_COMPILE
+postHooks+=(make_cmake_find_libs)
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index a474b6a8eaf..a80a5ab743c 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -862,6 +862,10 @@ genericBuild() {
     stopNest
 }
 
+for i in "${postHooks[@]}"; do
+    $i
+done
+
 
 # Execute the post-hook.
 runHook postHook
-- 
GitLab


From 3314be6b73f773df1a14f6c81b8076f0bfaf0852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 27 Jun 2013 16:33:24 +0200
Subject: [PATCH 0096/3789] cmake: consistent names, to satisfy comments on
 #567

---
 pkgs/development/tools/build-managers/cmake/setup-hook.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index d324d1f1815..abc0b070a76 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -57,7 +57,7 @@ else
     envHooks+=(addCMakeParams)
 fi
 
-make_cmake_find_libs(){
+makeCmakeFindLibs(){
   for flag in $NIX_CFLAGS_COMPILE $NIX_LDFLAGS; do
     case $flag in
       -I*)
@@ -72,4 +72,4 @@ make_cmake_find_libs(){
 
 # not using setupHook, because it could be a setupHook adding additional
 # include flags to NIX_CFLAGS_COMPILE
-postHooks+=(make_cmake_find_libs)
+postHooks+=(makeCmakeFindLibs)
-- 
GitLab


From 173c9cbb63882f44d254762e84575184ae462b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 27 Jun 2013 16:34:31 +0200
Subject: [PATCH 0097/3789] builder: fail if patch is missing or fails to
 unpack

---
 pkgs/stdenv/generic/setup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index a80a5ab743c..534a1bb27af 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -544,7 +544,8 @@ patchPhase() {
                 uncompress="lzma -d"
                 ;;
         esac
-        $uncompress < $i | patch ${patchFlags:--p1}
+        # "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.)
+        $uncompress < $i 2>&1 | patch ${patchFlags:--p1}
         stopNest
     done
 
-- 
GitLab


From af53fd451f89213c1ecb92ff153c9e8a2d3feaac Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Tue, 25 Jun 2013 22:08:38 -0700
Subject: [PATCH 0098/3789] curl: update to version 7.31.0

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

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 73dcb44269c..54cae1b31d9 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -11,11 +11,11 @@ assert sslSupport -> openssl != null;
 assert scpSupport -> libssh2 != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.30.0";
+  name = "curl-7.31.0";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "04dgm9aqvplsx43n8xin5rkr8mwmc6mdd1gcp80jda5yhw1l273b";
+    sha256 = "021ygqk4gn24iqm0i0xvzldfgqdg18fmvwqia7i5vzzcxj712fx7";
   };
 
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains
-- 
GitLab


From 08882c4700c4f954b616116600d7c13e7f965a63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 28 Jun 2013 08:26:34 +0200
Subject: [PATCH 0099/3789] release-small: fix bad attr dbus_all

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

diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 253d5a1bec7..f50b373cb48 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -198,7 +198,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   zile = linux;
   zip = all;
 
-  dbus_all = {
+  dbus = {
     libs = linux;
     daemon = linux;
     tools = linux;
-- 
GitLab


From f4ec2a3090eb62369ccf164d1bd408023ac3aa06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 30 Jun 2013 08:58:51 +0200
Subject: [PATCH 0100/3789] diffutils: minor stable update 3.2 -> 3.3

---
 pkgs/tools/text/diffutils/default.nix         | 10 ++-
 .../text/diffutils/gets-undeclared.patch      | 71 -------------------
 2 files changed, 4 insertions(+), 77 deletions(-)
 delete mode 100644 pkgs/tools/text/diffutils/gets-undeclared.patch

diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index fc4293ad7cf..f8413b9a0d0 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -1,15 +1,13 @@
 { stdenv, fetchurl, coreutils ? null }:
 
-stdenv.mkDerivation {
-  name = "diffutils-3.2";
+stdenv.mkDerivation rec {
+  name = "diffutils-3.3";
 
   src = fetchurl {
-    url = mirror://gnu/diffutils/diffutils-3.2.tar.gz;
-    sha256 = "1lsf0ln0h3mnm2y0mwgrfk0lyfi7bnm4r886acvdrrsvc7pypaia";
+    url = "mirror://gnu/diffutils/${name}.tar.xz";
+    sha256 = "1761vymxbp4wb5rzjvabhdkskk95pghnn67464byvzb5mfl8jpm2";
   };
 
-  patches = [ ./gets-undeclared.patch ];
-
   /* If no explicit coreutils is given, use the one from stdenv. */
   nativeBuildInputs = [ coreutils ];
 
diff --git a/pkgs/tools/text/diffutils/gets-undeclared.patch b/pkgs/tools/text/diffutils/gets-undeclared.patch
deleted file mode 100644
index b6cdc77caa8..00000000000
--- a/pkgs/tools/text/diffutils/gets-undeclared.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-This patch is needed to allow builds with newer versions of
-the GNU libc (2.16+).
-
-
-commit 66712c23388e93e5c518ebc8515140fa0c807348
-Author: Eric Blake <eblake@redhat.com>
-Date:   Thu Mar 29 13:30:41 2012 -0600
-
-    stdio: don't assume gets any more
-    
-    Gnulib intentionally does not have a gets module, and now that C11
-    and glibc have dropped it, we should be more proactive about warning
-    any user on a platform that still has a declaration of this dangerous
-    interface.
-    
-    * m4/stdio_h.m4 (gl_STDIO_H, gl_STDIO_H_DEFAULTS): Drop gets
-    support.
-    * modules/stdio (Makefile.am): Likewise.
-    * lib/stdio-read.c (gets): Likewise.
-    * tests/test-stdio-c++.cc: Likewise.
-    * m4/warn-on-use.m4 (gl_WARN_ON_USE_PREPARE): Fix comment.
-    * lib/stdio.in.h (gets): Make warning occur in more places.
-    * doc/posix-functions/gets.texi (gets): Update documentation.
-    Reported by Christer Solskogen.
-    
-    Signed-off-by: Eric Blake <eblake@redhat.com>
-
-diff --git a/lib/stdio.in.h b/lib/stdio.in.h
-index aa7b599..c377b6e 100644
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -698,22 +698,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
- # endif
- #endif
- 
--#if @GNULIB_GETS@
--# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
--#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--#   undef gets
--#   define gets rpl_gets
--#  endif
--_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
--_GL_CXXALIAS_RPL (gets, char *, (char *s));
--# else
--_GL_CXXALIAS_SYS (gets, char *, (char *s));
--#  undef gets
--# endif
--_GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
-+   so any use of gets warrants an unconditional warning; besides, C11
-+   removed it.  */
-+#undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
-@@ -1053,9 +1042,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - "
- # endif
- #endif
- 
--/* Some people would argue that sprintf should be handled like gets
--   (for example, OpenBSD issues a link warning for both functions),
--   since both can cause security holes due to buffer overruns.
-+/* Some people would argue that all sprintf uses should be warned about
-+   (for example, OpenBSD issues a link warning for it),
-+   since it can cause security holes due to buffer overruns.
-    However, we believe that sprintf can be used safely, and is more
-    efficient than snprintf in those safe cases; and as proof of our
-    belief, we use sprintf in several gnulib modules.  So this header
-- 
GitLab


From 8902e01cea1059efb35ea8236a2f5d90f09d3adc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Jun 2013 12:38:02 +0200
Subject: [PATCH 0101/3789] linux: use 3.4 as the default (latest longterm)

CC #501
---
 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 4f11ce0b0d3..4d51b8423eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6367,7 +6367,7 @@ let
 
   # The current default kernel / kernel modules.
   linux = linuxPackages.kernel;
-  linuxPackages = linuxPackages_3_2;
+  linuxPackages = linuxPackages_3_4; # should be latest longterm, see #501
 
   # A function to build a manually-configured kernel
   linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix {
-- 
GitLab


From 4a7696589d23e4fc1186e4588c873870cede5118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Jun 2013 16:15:43 +0200
Subject: [PATCH 0102/3789] gzip: update 1.5 -> 1.6, use less in tests now

---
 pkgs/tools/compression/gzip/default.nix           | 12 +++++++-----
 pkgs/tools/compression/gzip/skip-some-tests.patch | 15 +++------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index c1e86b5d2f6..d5ff4d4da6c 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, less }:
 
 stdenv.mkDerivation rec {
-  name = "gzip-1.5";
+  name = "gzip-1.6";
 
   src = fetchurl {
     url = "mirror://gnu/gzip/${name}.tar.xz";
-    sha256 = "0wx1nqk709kx75cwp2axachnbxryp4gyl06qxn5nl95184w0mhls";
+    sha256 = "0ivqnbhiwd12q8hp3qw6rpsrpw2jg5y2mymk8cn22lsx90dfvprp";
   };
 
-  doCheck = true;
-
   patches = [ ./skip-some-tests.patch ];
 
+  buildInputs = [ less ]; # just for tests
+
+  doCheck = true;
+
   meta = {
     homepage = http://www.gnu.org/software/gzip/;
     description = "Gzip, the GNU zip compression program";
diff --git a/pkgs/tools/compression/gzip/skip-some-tests.patch b/pkgs/tools/compression/gzip/skip-some-tests.patch
index ebcda684ef7..74043a3ab56 100644
--- a/pkgs/tools/compression/gzip/skip-some-tests.patch
+++ b/pkgs/tools/compression/gzip/skip-some-tests.patch
@@ -1,20 +1,11 @@
-Skip tests requiring Perl and less (more).
-Also zgrep-signal skipping fails with weird Bad file number error on illumos.
+Skip test requiring more (not found in nixpkgs).
 --- gzip-1.5/tests/Makefile.in.orig	2013-02-23 15:15:08.017048868 +0000
 +++ gzip-1.5/tests/Makefile.in	2013-02-23 15:15:32.756197039 +0000
-@@ -1421,7 +1421,6 @@
-   trailing-nul				\
-   zdiff					\
-   zgrep-f				\
--  zgrep-signal				\
-   znew-k
- 
- EXTRA_DIST = \
-@@ -1441,8 +1440,6 @@
+@@ -1441,8 +1440,7 @@
    zfgrep	\
    zforce	\
    zgrep		\
--  zless		\
+   zless		\
 -  zmore		\
    znew
  
-- 
GitLab


From 48441716453b9ce6ba4af62a5c01dc039ef89603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Jun 2013 16:16:53 +0200
Subject: [PATCH 0103/3789] acl: minor update 2.2.51 -> 2.2.52

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

diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix
index bc0821f39fd..d37d8926fbd 100644
--- a/pkgs/development/libraries/acl/default.nix
+++ b/pkgs/development/libraries/acl/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext, attr }:
 
 stdenv.mkDerivation rec {
-  name = "acl-2.2.51";
+  name = "acl-2.2.52";
 
   src = fetchurl {
     url = "mirror://savannah/acl/${name}.src.tar.gz";
-    sha256 = "09aj30m49ivycl3irram8c3givc0crivjm3ymw0nhfaxrwhlb186";
+    sha256 = "08qd9s3wfhv0ajswsylnfwr5h0d7j9d4rgip855nrh400nxp940p";
   };
 
   nativeBuildInputs = [ gettext ];
-- 
GitLab


From 99b83b397f1221cadc336052e30e9503f511381d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Jun 2013 16:17:41 +0200
Subject: [PATCH 0104/3789] attr: minor update 2.4.46 -> 2.4.47

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

diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index 3c5855ea284..8d87e2ee50d 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "attr-2.4.46";
+  name = "attr-2.4.47";
 
   src = fetchurl {
     url = "mirror://savannah/attr/${name}.src.tar.gz";
-    sha256 = "07qf6kb2zk512az481bbnsk9jycn477xpva1a726n5pzlzf9pmnw";
+    sha256 = "0nd8y0m6awc9ahv0ciiwf8gy54c8d3j51pw9xg7f7cn579jjyxr5";
   };
 
   nativeBuildInputs = [ gettext ];
-- 
GitLab


From 11e380a937ea8416a38c2e10e228c3054f5cd6b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Jun 2013 16:19:56 +0200
Subject: [PATCH 0105/3789] gmp5: minor update 5.1.1 -> 5.1.2 and file rename

---
 pkgs/development/libraries/gmp/{5.1.1.nix => 5.1.x.nix} | 4 ++--
 pkgs/top-level/all-packages.nix                         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/gmp/{5.1.1.nix => 5.1.x.nix} (96%)

diff --git a/pkgs/development/libraries/gmp/5.1.1.nix b/pkgs/development/libraries/gmp/5.1.x.nix
similarity index 96%
rename from pkgs/development/libraries/gmp/5.1.1.nix
rename to pkgs/development/libraries/gmp/5.1.x.nix
index 2f9ff516523..4d63f38127d 100644
--- a/pkgs/development/libraries/gmp/5.1.1.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, m4, cxx ? true }:
 
 stdenv.mkDerivation rec {
-  name = "gmp-5.1.1";
+  name = "gmp-5.1.2";
 
   src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv
     urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ];
-    sha256 = "1bdgf04k2i12pfivxgjq68iarz3ngix9hpzbmkgijrdk92gpgm50";
+    sha256 = "13qv3ihk3ykbh2fkb4z8m0q188y3hq1amsj25fn5hgpgckmdx690";
   };
 
   nativeBuildInputs = [ m4 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d51b8423eb..47374bc2bb6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4024,9 +4024,9 @@ let
   # The GHC bootstrap binaries link against libgmp.so.3, which is in GMP 4.x.
   gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { };
 
-  gmp5 = callPackage ../development/libraries/gmp/5.1.1.nix { };
+  gmp5 = gmp51;
 
-  gmp51 = callPackage ../development/libraries/gmp/5.1.1.nix { };
+  gmp51 = callPackage ../development/libraries/gmp/5.1.x.nix { };
 
   gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { };
 
-- 
GitLab


From 666c12f6459fd9d64bb3bdd31ad24f3d97b8b659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Jun 2013 16:56:20 +0200
Subject: [PATCH 0106/3789] mpfr: only use 3.1.2 and drop 3.1.1

I tried some packages, all seem to compile fine.
---
 pkgs/development/libraries/mpfr/3.1.2.nix   | 51 ---------------------
 pkgs/development/libraries/mpfr/default.nix | 26 +++++------
 pkgs/top-level/all-packages.nix             | 10 ++--
 3 files changed, 17 insertions(+), 70 deletions(-)
 delete mode 100644 pkgs/development/libraries/mpfr/3.1.2.nix

diff --git a/pkgs/development/libraries/mpfr/3.1.2.nix b/pkgs/development/libraries/mpfr/3.1.2.nix
deleted file mode 100644
index fd164cf9105..00000000000
--- a/pkgs/development/libraries/mpfr/3.1.2.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-
-{stdenv, fetchurl, gmp}:
-
-stdenv.mkDerivation (rec {
-  name = "mpfr-3.1.2";
-
-  src = fetchurl {
-    url = "mirror://gnu/mpfr/${name}.tar.bz2";
-    sha256 = "0sqvpfkzamxdr87anzakf9dhkfh15lfmm5bsqajk02h1mxh3zivr";
-  };
-
-  buildInputs = [ gmp ];
-
-  doCheck = true;
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = http://www.mpfr.org/;
-    description = "GNU MPFR, a library for multiple-precision floating-point arithmetic";
-
-    longDescription = ''
-      The GNU MPFR library is a C library for multiple-precision
-      floating-point computations with correct rounding.  MPFR is
-      based on the GMP multiple-precision library.
-
-      The main goal of MPFR is to provide a library for
-      multiple-precision floating-point computation which is both
-      efficient and has a well-defined semantics.  It copies the good
-      ideas from the ANSI/IEEE-754 standard for double-precision
-      floating-point arithmetic (53-bit mantissa).
-    '';
-
-    license = "LGPLv2+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
-
-//
-
-(stdenv.lib.optionalAttrs stdenv.isFreeBSD {
-   /* Work around a FreeBSD bug that otherwise leads to segfaults in
-      the test suite:
-        http://hydra.bordeaux.inria.fr/build/34862
-        http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00015.html
-        http://www.freebsd.org/cgi/query-pr.cgi?pr=161344
-    */
-   configureFlags = [ "--disable-thread-safe" ];
- }))
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index 6fbb6253ee5..8e3281c862a 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -1,15 +1,24 @@
-{stdenv, fetchurl, gmp}:
+{ stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "mpfr-3.1.1";
+  name = "mpfr-3.1.2";
 
   src = fetchurl {
     url = "mirror://gnu/mpfr/${name}.tar.bz2";
-    sha256 = "1zfmmk4p26b67qpmh787p3dfxa71yd9mi02c4q45yf687pqw6rkv";
+    sha256 = "0sqvpfkzamxdr87anzakf9dhkfh15lfmm5bsqajk02h1mxh3zivr";
   };
 
   buildInputs = [ gmp ];
 
+  configureFlags =
+    /* Work around a FreeBSD bug that otherwise leads to segfaults in the test suite:
+          http://hydra.bordeaux.inria.fr/build/34862
+          http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00015.html
+          http://www.freebsd.org/cgi/query-pr.cgi?pr=161344
+      */
+    stdenv.lib.optional (stdenv.isSunOS or stdenv.isFreeBSD) "--disable-thread-safe" ++
+    stdenv.lib.optional stdenv.is64bit "--with-pic";
+
   doCheck = true;
 
   enableParallelBuilding = true;
@@ -35,14 +44,5 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.ludo ];
     platforms = stdenv.lib.platforms.all;
   };
-
-  configureFlags =
-    /* Work around a FreeBSD bug that otherwise leads to segfaults in
-        the test suite:
-          http://hydra.bordeaux.inria.fr/build/34862
-          http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00015.html
-          http://www.freebsd.org/cgi/query-pr.cgi?pr=161344
-      */
-    stdenv.lib.optional (stdenv.isSunOS or stdenv.isFreeBSD) "--disable-thread-safe" ++
-    stdenv.lib.optional stdenv.is64bit "--with-pic";
 }
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47374bc2bb6..6df3b4f4d7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4018,16 +4018,18 @@ let
   gmm = callPackage ../development/libraries/gmm { };
 
   gmp = gmp5;
+  gmp5 = gmp51;
 
   gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; });
 
   # The GHC bootstrap binaries link against libgmp.so.3, which is in GMP 4.x.
   gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { };
 
-  gmp5 = gmp51;
-
   gmp51 = callPackage ../development/libraries/gmp/5.1.x.nix { };
 
+  #GMP ex-satellite, so better keep it near gmp
+  mpfr = callPackage ../development/libraries/mpfr/default.nix { };
+
   gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { };
 
   goffice = callPackage ../development/libraries/goffice {
@@ -4047,10 +4049,6 @@ let
 
   gperftools = callPackage ../development/libraries/gperftools { };
 
-  #GMP ex-satellite, so better keep it near gmp
-  mpfr = callPackage ../development/libraries/mpfr { };
-  mpfr_3_1_2 = callPackage ../development/libraries/mpfr/3.1.2.nix { };
-
   gst_all = {
     inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer;
     gstPluginsBase = pkgs.gst_plugins_base;
-- 
GitLab


From e8bd49f132fb52ca18ba88b5d8b671c16059b507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Jun 2013 17:02:48 +0200
Subject: [PATCH 0107/3789] gawk: update 4.0.2 -> 4.1.0

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

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index eba1dc2ac7f..901f53c5e5c 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libsigsegv }:
 
 stdenv.mkDerivation rec {
-  name = "gawk-4.0.2";
+  name = "gawk-4.1.0";
 
   src = fetchurl {
     url = "mirror://gnu/gawk/${name}.tar.xz";
-    sha256 = "04vd0axif762mf781pj3days6ilv2333b9zi9c50y5mma66g5q91";
+    sha256 = "0hin2hswbbd6kd6i4zzvgciwpl5fba8d2s524z8y5qagyz3x010q";
   };
 
   patches = [];
-- 
GitLab


From f573b58428feaecf2abb338a1ac11d48f824459b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Jun 2013 17:03:45 +0200
Subject: [PATCH 0108/3789] file: minor update 5.12 -> 5.14

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

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 8b141fea826..cbcbbb2bb4a 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "file-5.12";
+  name = "file-5.14";
 
   buildInputs = [ zlib ];
 
   src = fetchurl {
     url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz";
-    sha256 = "08ix4xrvan0k80n0l5lqfmc4azjv5lyhvhwdxny4r09j5smhv78r";
+    sha256 = "1r3zqxr7al5yy2595hd9hxwc14iij021p46d5my3n2lhs0fs06s6";
   };
 
   meta = {
-- 
GitLab


From 8a0931c5c3a8f87c5e5bb7ddc5edb51d4f3e2bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Jun 2013 17:04:15 +0200
Subject: [PATCH 0109/3789] pcre: minor update 8.32 -> 8.33

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

diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 69ed4c85313..b6813070cec 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }:
 
 stdenv.mkDerivation rec {
-  name = "pcre-8.32";
+  name = "pcre-8.33";
 
   src = fetchurl {
     url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
-    sha256 = "a913fb9bd058ef380a2d91847c3c23fcf98e92dc3b47cd08a53c021c5cde0f55";
+    sha256 = "0y04pkrxjvhi30qpnb9ijgn6cjgv3k3lhq2zmw21r0b695x9a0y6";
   };
 
   # The compiler on Darwin crashes with an internal error while building the
-- 
GitLab


From 15f96c840f5ce71da5cb556d1aa76654e6b12dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Jun 2013 17:04:52 +0200
Subject: [PATCH 0110/3789] binutils: minor update 2.23.1 -> .2

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

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index ad3b4ae2b27..35707f55abe 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? true, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null }:
 
-let basename = "binutils-2.23.1"; in
+let basename = "binutils-2.23.2"; in
 stdenv.mkDerivation rec {
   name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}";
 
   src = fetchurl {
     url = "mirror://gnu/binutils/${basename}.tar.bz2";
-    sha256 = "06bs5v5ndb4g5qx96d52lc818gkbskd1m0sz57314v887sqfbcia";
+    sha256 = "15qhbkz3r266xaa52slh857qn3abw7rb2x2jnhpfrafpzrb4x4gy";
   };
 
   patches = [
-- 
GitLab


From c1ef3d28546bee3b53718fc3435eab852f7b1d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Jun 2013 17:06:08 +0200
Subject: [PATCH 0111/3789] texinfo5: add missing xz, use version 5.* by
 default

---
 pkgs/development/tools/misc/texinfo/5.1.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/texinfo/5.1.nix b/pkgs/development/tools/misc/texinfo/5.1.nix
index cca368f619a..cbb10830188 100644
--- a/pkgs/development/tools/misc/texinfo/5.1.nix
+++ b/pkgs/development/tools/misc/texinfo/5.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, perl }:
+{ stdenv, fetchurl, ncurses, perl, xz }:
 
 stdenv.mkDerivation rec {
   name = "texinfo-5.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0864v5i488x3mb3v5p6nhy2kw0mqkzpa3b0453iibj81zlpq078q";
   };
 
-  buildInputs = [ ncurses perl ];
+  buildInputs = [ ncurses perl xz ];
 
   preInstall = ''
     installFlags="TEXMF=$out/texmf";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6df3b4f4d7b..b73d01f7e09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3541,7 +3541,7 @@ let
   texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
   texinfo49 = callPackage ../development/tools/misc/texinfo/4.9.nix { };
   texinfo5 = callPackage ../development/tools/misc/texinfo/5.1.nix { };
-  texinfo = texinfo413;
+  texinfo = texinfo5;
 
   texi2html = callPackage ../development/tools/misc/texi2html { };
 
-- 
GitLab


From 9ce21dab8d7f02a806929eabf98de9380cea0ce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Jun 2013 17:07:11 +0200
Subject: [PATCH 0112/3789] libssh: non-critical security update CVE-2013-0176

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

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index c2b812744c9..a57e2f8d3b8 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, zlib, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "libssh-0.5.3";
+  name = "libssh-0.5.4";
 
   src = fetchurl {
-    url = "https://red.libssh.org/attachments/download/38/${name}.tar.gz";
-    sha256 = "1w6s217vjq0w3v5i0c5ql6m0ki1yz05g9snah3azxfkl9k4schpd";
+    url = "https://red.libssh.org/attachments/download/41/libssh-0.5.4.tar.gz";
+    sha256 = "106a9nzmr8q5kw809p5zdhmjrqv7p6609ai5c1n7xi7pxg52af2z";
   };
 
   buildInputs = [ zlib libgcrypt ];
-- 
GitLab


From 62759ea9804e409322a4f026e21e471881d15bfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Jun 2013 17:10:14 +0200
Subject: [PATCH 0113/3789] libarchive: update 3.0.4 -> 3.1.2, homepage move

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

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 851601fe963..e0f2ba77de2 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -2,11 +2,11 @@
 , sharutils }:
 
 stdenv.mkDerivation rec {
-  name = "libarchive-3.0.4";
+  name = "libarchive-3.1.2";
 
   src = fetchurl {
-    url = "https://github.com/downloads/libarchive/libarchive/${name}.tar.gz";
-    sha256 = "76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac";
+    url = "${meta.homepage}/downloads/${name}.tar.gz";
+    sha256 = "0pixqnrcf35dnqgv0lp7qlcw7k13620qkhgxr288v7p4iz6ym1zb";
   };
 
   buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz ] ++
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       compressions formats including (but not limited to) tar, shar, cpio, zip, and
       compressed with gzip, bzip2, lzma, xz, .. 
     '';
-    homepage = http://libarchive.github.com/;
+    homepage = http://libarchive.org;
     license = stdenv.lib.licenses.bsd3;
     platforms = with stdenv.lib.platforms; all;
     maintainers = with stdenv.lib.maintainers; [ jcumming ];
-- 
GitLab


From 0a44a091217ecd335cd10c06c1ddd29ad599f18c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Jun 2013 17:11:27 +0200
Subject: [PATCH 0114/3789] stdenv: default builder fixes (merge #554)

With a minor fix.
I did some huge rebuilds with this on x86_64-linux, found no problems.
---
 pkgs/stdenv/generic/setup.sh | 50 ++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 534a1bb27af..2938bec30de 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -289,6 +289,9 @@ stripDirs() {
 
     if [ -n "${dirs}" ]; then
         header "stripping (with flags $stripFlags) in $dirs"
+        for dir in $dirs; do
+          test -L "$dir" || chmod -R +rw "$dir"
+        done
         find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $stripFlags || true
         stopNest
     fi
@@ -639,7 +642,7 @@ patchELF() {
         find "$prefix" \( \
             \( -type f -a -name "*.so*" \) -o \
             \( -type f -a -perm +0100 \) \
-            \) -print -exec patchelf --shrink-rpath {} \;
+            \) -print -exec patchelf --shrink-rpath '{}' \;
     fi
     stopNest
 }
@@ -708,16 +711,22 @@ fixupPhase() {
     fi
 
     if [ -z "$dontGzipMan" ]; then
+        echo "gzipping man pages"
         GLOBIGNORE=.:..:*.gz:*.bz2
-        for f in $out/share/man/*/* $out/share/man/*/*/*; do
-            if [ -f $f ]; then
-                if gzip -c $f > $f.gz; then
-                    rm $f
+        for f in "$out"/share/man/*/* "$out"/share/man/*/*/*; do
+            if [ -f "$f" -a ! -L "$f" ]; then
+                if gzip -c "$f" > "$f".gz; then
+                    rm "$f"
                 else
-                    rm $f.gz
+                    rm "$f".gz
                 fi
             fi
         done
+        for f in "$out"/share/man/*/* "$out"/share/man/*/*/*; do
+            if [ -L "$f" -a -f `readlink -f "$f"`.gz ]; then
+              ln -sf `readlink "$f"`.gz "$f"
+            fi
+        done
         unset GLOBIGNORE
     fi
 
@@ -743,23 +752,23 @@ fixupPhase() {
     fi
 
     if [ -n "$propagatedBuildInputs" ]; then
-        mkdir -p "$out/nix-support"
-        echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
+        mkdir -p "$prefix/nix-support"
+        echo "$propagatedBuildInputs" > "$prefix/nix-support/propagated-build-inputs"
     fi
 
     if [ -n "$propagatedNativeBuildInputs" ]; then
-        mkdir -p "$out/nix-support"
-        echo "$propagatedNativeBuildInputs" > "$out/nix-support/propagated-native-build-inputs"
+        mkdir -p "$prefix/nix-support"
+        echo "$propagatedNativeBuildInputs" > "$prefix/nix-support/propagated-native-build-inputs"
     fi
 
     if [ -n "$propagatedUserEnvPkgs" ]; then
-        mkdir -p "$out/nix-support"
-        echo "$propagatedUserEnvPkgs" > "$out/nix-support/propagated-user-env-packages"
+        mkdir -p "$prefix/nix-support"
+        echo "$propagatedUserEnvPkgs" > "$prefix/nix-support/propagated-user-env-packages"
     fi
 
     if [ -n "$setupHook" ]; then
-        mkdir -p "$out/nix-support"
-        substituteAll "$setupHook" "$out/nix-support/setup-hook"
+        mkdir -p "$prefix/nix-support"
+        substituteAll "$setupHook" "$prefix/nix-support/setup-hook"
     fi
 
     runHook postFixup
@@ -844,9 +853,16 @@ genericBuild() {
         showPhaseHeader "$curPhase"
         dumpVars
 
-        # Evaluate the variable named $curPhase if it exists, otherwise the
-        # function named $curPhase.
-        eval "${!curPhase:-$curPhase}"
+        if [ "$curPhase" = fixupPhase ]; then
+          for pref in ${outputs:-out}; do
+            echo "fixup on \$$pref"
+            prefix=${!pref} eval "${!curPhase:-$curPhase}"
+          done
+        else
+          # Evaluate the variable named $curPhase if it exists, otherwise the
+          # function named $curPhase.
+          eval "${!curPhase:-$curPhase}"
+        fi
 
         if [ "$curPhase" = unpackPhase ]; then
             cd "${sourceRoot:-.}"
-- 
GitLab


From 38477f5b0b7985e0e939c2b8e791abed9888afe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 30 Jun 2013 18:48:06 +0200
Subject: [PATCH 0115/3789] gcc43: minor update 4.3.4 -> .6

---
 pkgs/development/compilers/gcc/4.3/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix
index d17f9f19515..295c4a77f2f 100644
--- a/pkgs/development/compilers/gcc/4.3/default.nix
+++ b/pkgs/development/compilers/gcc/4.3/default.nix
@@ -29,7 +29,7 @@ assert langVhdl -> gnat != null;
 with stdenv.lib;
 
 let
-  version = "4.3.4";
+  version = "4.3.6";
 
   crossConfigureFlags =
     "--target=${cross.config}" +
@@ -54,27 +54,27 @@ in
 
 stdenv.mkDerivation ({
   name = "${name}-${version}" + crossNameAddon;
-  
+
   builder = ./builder.sh;
-  
+
   src =
     optional /*langC*/ true (fetchurl {
       url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";
-      sha256 = "1yk80nwyw8vkpw8d3x7lkg3zrv3ngjqlvj0i8zslzgj7a27q729i";
+      sha256 = "0ygrfw3hgp48hkqipbl9lw38f27npigc2sm6f01g9iswpq1igbw6";
     }) ++
     optional langCC (fetchurl {
       url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";
-      sha256 = "0d8pyk5c9zmph25f4fl63vd8vhljj6ildbxpz2hr594g5i6pplpq";
+      sha256 = "105xz3991b57zx3146xwlpchdb2sjmlknclvi1iac2gawm4mhxhf";
     }) ++
     optional langFortran (fetchurl {
       url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2";
-      sha256 = "1xf2njykv1qcgxiqwj693dxjf77ss1rcxirylvnsp5hs89mdlj12";
+      sha256 = "12bqvf53hvhrwjnh101vn9frb5g8cr98cra4f11dzhzs4ppydpi1";
     }) ++
     optional langJava (fetchurl {
       url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2";
-      sha256 = "1v3krhxi3zyaqfj0x8dbxvg67fjp29cr1psyf71r9zf757p3vqsw";
+      sha256 = "03w6jln9gmdv149s774rlw4rzi2zhbqna54r86cd6mql8flmy7fs";
     });
-    
+
   patches =
     [ ./pass-cxxcpp.patch ./libmudflap-cpp.patch ./siginfo_t_fix.patch ]
     ++ optional noSysDirs ./no-sys-dirs.patch
-- 
GitLab


From 2cf7a62f0c0a9151bb81defe5bac09a5f76a0554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 30 Jun 2013 22:25:30 +0200
Subject: [PATCH 0116/3789] gcc: use texinfo4, fix bad mpfr reference

---
 pkgs/top-level/all-packages.nix | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b73d01f7e09..f2b2a3d5db2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2101,12 +2101,14 @@ let
   });
 
   gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.3) {
-    inherit stdenv fetchurl texinfo gmp mpfr noSysDirs;
+    inherit stdenv fetchurl gmp mpfr noSysDirs;
+    texinfo = texinfo4;
     profiledCompiler = true;
   }));
 
   gcc43_realCross = makeOverridable (import ../development/compilers/gcc/4.3) {
-    inherit stdenv fetchurl texinfo gmp mpfr noSysDirs;
+    inherit stdenv fetchurl gmp mpfr noSysDirs;
+    texinfo = texinfo4;
     binutilsCross = binutilsCross;
     libcCross = libcCross;
     profiledCompiler = false;
@@ -2117,8 +2119,9 @@ let
 
   gcc44_realCross = lib.addMetaAttrs { platforms = []; }
     (makeOverridable (import ../development/compilers/gcc/4.4) {
-      inherit stdenv fetchurl texinfo gmp mpfr /* ppl cloogppl */ noSysDirs
+      inherit stdenv fetchurl gmp mpfr /* ppl cloogppl */ noSysDirs
           gettext which;
+      texinfo = texinfo4;
       binutilsCross = binutilsCross;
       libcCross = libcCross;
       profiledCompiler = false;
@@ -2137,8 +2140,9 @@ let
 
   gcc45_realCross = lib.addMetaAttrs { platforms = []; }
     (makeOverridable (import ../development/compilers/gcc/4.5) {
-      inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
+      inherit fetchurl stdenv gmp mpfr mpc libelf zlib
         ppl cloogppl gettext which noSysDirs;
+      texinfo = texinfo4;
       binutilsCross = binutilsCross;
       libcCross = libcCross;
       profiledCompiler = false;
@@ -2225,15 +2229,17 @@ let
   }));
 
   gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.4) {
-    inherit fetchurl stdenv texinfo gmp mpfr /* ppl cloogppl */
+    inherit fetchurl stdenv gmp mpfr /* ppl cloogppl */
       gettext which noSysDirs;
+    texinfo = texinfo4;
     profiledCompiler = true;
   }));
 
   gcc45_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.5) {
-    inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib perl
+    inherit fetchurl stdenv gmp mpfr mpc libelf zlib perl
       ppl cloogppl
       gettext which noSysDirs;
+    texinfo = texinfo4;
     # bootstrapping a profiled compiler does not work in the sheevaplug:
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
     profiledCompiler = !stdenv.isArm;
@@ -2483,7 +2489,8 @@ let
   });
 
   ghdl = wrapGCC (import ../development/compilers/gcc/4.3 {
-    inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gnat;
+    inherit stdenv fetchurl gmp mpfr noSysDirs gnat;
+    texinfo = texinfo4;
     name = "ghdl";
     langVhdl = true;
     langCC = false;
@@ -2494,8 +2501,9 @@ let
 
   # Not officially supported version for ghdl
   ghdl_gcc44 = lowPrio (wrapGCC (import ../development/compilers/gcc/4.4 {
-    inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gnat gettext which
+    inherit stdenv fetchurl gmp mpfr noSysDirs gnat gettext which
       ppl cloogppl;
+    texinfo = texinfo4;
     name = "ghdl";
     langVhdl = true;
     langCC = false;
@@ -2642,7 +2650,6 @@ let
 
   julia = callPackage ../development/compilers/julia {
     liblapack = liblapack.override {shared = true;};
-    mpfr = mpfr_3_1_2;
     fftw = fftw.override {pthreads = true;};
     fftwSinglePrec = fftwSinglePrec.override {pthreads = true;};
   };
@@ -3542,6 +3549,7 @@ let
   texinfo49 = callPackage ../development/tools/misc/texinfo/4.9.nix { };
   texinfo5 = callPackage ../development/tools/misc/texinfo/5.1.nix { };
   texinfo = texinfo5;
+  texinfo4 = texinfo413;
 
   texi2html = callPackage ../development/tools/misc/texi2html { };
 
@@ -9453,7 +9461,8 @@ let
     inherit fetchurl stdenv;
     inherit cups ghostscript glibc patchelf;
     gcc = import ../development/compilers/gcc/4.4 {
-      inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gettext which;
+      inherit stdenv fetchurl gmp mpfr noSysDirs gettext which;
+      texinfo = texinfo4;
       profiledCompiler = true;
     };
   };
-- 
GitLab


From 73183e5c709d8c2e16ccc9161fe93f6139bedc85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 30 Jun 2013 22:28:17 +0200
Subject: [PATCH 0117/3789] gcc44: minor update 4.4.6 -> .7

---
 pkgs/development/compilers/gcc/4.4/default.nix   |  2 +-
 pkgs/development/compilers/gcc/4.4/sources.nix   | 14 +++++++-------
 pkgs/development/compilers/gcc/4.4/update-gcc.sh |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix
index 60e7baa7781..4d896a14e8f 100644
--- a/pkgs/development/compilers/gcc/4.4/default.nix
+++ b/pkgs/development/compilers/gcc/4.4/default.nix
@@ -31,7 +31,7 @@ assert langVhdl     -> gnat != null;
 
 with stdenv.lib;
 
-let version = "4.4.6";
+let version = "4.4.7";
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
       # `configure' time.
diff --git a/pkgs/development/compilers/gcc/4.4/sources.nix b/pkgs/development/compilers/gcc/4.4/sources.nix
index 357cc2634ed..5517e7c3b92 100644
--- a/pkgs/development/compilers/gcc/4.4/sources.nix
+++ b/pkgs/development/compilers/gcc/4.4/sources.nix
@@ -1,26 +1,26 @@
 /* Automatically generated by `update-gcc.sh', do not edit.
-   For GCC 4.4.6.  */
+   For GCC 4.4.7.  */
 { fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }:
 
-assert version == "4.4.6";
+assert version == "4.4.7";
 optional /* langC */ true (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";
-  sha256 = "c2959820de3e42eee6b1d381586992f26430f0083b9a51db31d706080fc9b44a";
+  sha256 = "c4663b7023909a4a075d3c2b2e17f6e082a9625aebfd0ce7f1d7817e44bf5542";
 }) ++
 optional langCC (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";
-  sha256 = "6d5d2dacab9569472e4caa291abe94017a9b19574b9b0d866de7b04702634ddf";
+  sha256 = "1882ff29be51eeb3fb349cbcda9df200a5c3cd20c97dd1d593101e0998b3c469";
 }) ++
 optional langFortran (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2";
-  sha256 = "2b9998716a16b80f4cf843ce81da1cf58ce116e0b85422e3004ce4454e8ff923";
+  sha256 = "545a1e8e97d9364de4408c6a91830f9051ce24b4fbfbfdc56e72c7b4be17ebdd";
 }) ++
 optional langJava (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2";
-  sha256 = "7c8c12eac21d2a5c605ea4d9b7aa52e482354205b801bc93d62603b6f0956b35";
+  sha256 = "3c31ddd80f945b797d8d4ed7761426c26343781c361ec1b33bcea9874cc4c6c0";
 }) ++
 optional langAda (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2";
-  sha256 = "771ef0e90abf61208ce84689bed15391ad249287e36a28e816d6a044035af0c6";
+  sha256 = "fb9f30b85d48838390554b948d137487f0db09ad5f8ba73ca4d7ca35765c6ed8";
 }) ++
 []
diff --git a/pkgs/development/compilers/gcc/4.4/update-gcc.sh b/pkgs/development/compilers/gcc/4.4/update-gcc.sh
index 6b0bbb99330..03297fbadd6 100755
--- a/pkgs/development/compilers/gcc/4.4/update-gcc.sh
+++ b/pkgs/development/compilers/gcc/4.4/update-gcc.sh
@@ -21,7 +21,7 @@ options["g++"]="langCC"
 options["fortran"]="langFortran"
 options["java"]="langJava"
 options["ada"]="langAda"
-options["go"]="langGo"
+#options["go"]="langGo"
 
 cat > "$out"<<EOF
 /* Automatically generated by \`$(basename $0)', do not edit.
@@ -32,7 +32,7 @@ cat > "$out"<<EOF
 assert version == "${version}";
 EOF
 
-for component in core g++ fortran java ada go
+for component in core g++ fortran java ada #go
 do
     dir="ftp.gnu.org/gnu/gcc/gcc-${version}"
     file="gcc-${component}-${version}.tar.bz2"
-- 
GitLab


From 5554533b4aefaf0fb02299a67feb28ec2681a444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 1 Jul 2013 09:20:05 +0200
Subject: [PATCH 0118/3789] libofa: pull debian patches to fix build with new
 gcc

---
 .../libraries/libofa/curl-types.patch         | 13 -------
 pkgs/development/libraries/libofa/default.nix | 17 +++++---
 .../libraries/libofa/gcc-4.x.patch            | 12 ------
 .../libofa/libofa-0.9.3-gcc-4.3.patch         | 36 -----------------
 .../libraries/libofa/libofa-0.9.3-gcc-4.patch | 39 -------------------
 5 files changed, 12 insertions(+), 105 deletions(-)
 delete mode 100644 pkgs/development/libraries/libofa/curl-types.patch
 delete mode 100644 pkgs/development/libraries/libofa/gcc-4.x.patch
 delete mode 100644 pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.3.patch
 delete mode 100644 pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.patch

diff --git a/pkgs/development/libraries/libofa/curl-types.patch b/pkgs/development/libraries/libofa/curl-types.patch
deleted file mode 100644
index acd8d9aeabb..00000000000
--- a/pkgs/development/libraries/libofa/curl-types.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rc libofa-0.9.3/examples/protocol.cpp libofa-0.9.3-new/examples/protocol.cpp
-*** libofa-0.9.3/examples/protocol.cpp	2006-05-10 14:05:42.000000000 -0400
---- libofa-0.9.3-new/examples/protocol.cpp	2011-11-06 09:24:05.653283203 -0500
-***************
-*** 12,18 ****
-  #include <map>
-  #include <expat.h>
-  #include <curl/curl.h>
-- #include <curl/types.h>
-  #include <curl/easy.h>
-  
-  using namespace std;
---- 12,17 ----
diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix
index 6b1ceee40f1..2e2640e8636 100644
--- a/pkgs/development/libraries/libofa/default.nix
+++ b/pkgs/development/libraries/libofa/default.nix
@@ -1,17 +1,24 @@
 { stdenv, fetchurl, expat, curl, fftw }:
 
+let
+  version = "0.9.3";
+  deb_patch = "5";
+in
 stdenv.mkDerivation rec {
-  name = "libofa-0.9.3";
-
-  propagatedBuildInputs = [ expat curl fftw ];
-
-  patches = [ ./libofa-0.9.3-gcc-4.patch ./libofa-0.9.3-gcc-4.3.patch ./gcc-4.x.patch ./curl-types.patch ];
+  name = "libofa-${version}";
 
   src = fetchurl {
     url = "http://musicip-libofa.googlecode.com/files/${name}.tar.gz";
     sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2";
   };
 
+  patches = fetchurl {
+    url = "mirror://debian/pool/main/libo/libofa/libofa_${version}-${deb_patch}.debian.tar.gz";
+    sha256 = "1rfkyz13cm8izm90c1xflp4rvsa24aqs6qpbbbqqcbmvzsj6j9yn";
+  };
+
+  propagatedBuildInputs = [ expat curl fftw ];
+
   meta = {
     homepage = http://code.google.com/musicip-libofa/;
     description = "LibOFA - Library Open Fingerprint Architecture";
diff --git a/pkgs/development/libraries/libofa/gcc-4.x.patch b/pkgs/development/libraries/libofa/gcc-4.x.patch
deleted file mode 100644
index 50f72bb428c..00000000000
--- a/pkgs/development/libraries/libofa/gcc-4.x.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/examples/example.cpp b/examples/example.cpp
-index ef978d5..7d58a0f 100644
---- a/examples/example.cpp
-+++ b/examples/example.cpp
-@@ -10,6 +10,7 @@
- #include "protocol.h"
- 
- #include <string.h>
-+#include <stdio.h>
-  
- AudioData* loadWaveFile(char *file);
- AudioData* loadDataUsingLAME(char *file);
diff --git a/pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.3.patch b/pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.3.patch
deleted file mode 100644
index 7682e371051..00000000000
--- a/pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix build with gcc >=4.3
-diff -ur libofa-0.9.3.orig/examples/example.cpp libofa-0.9.3/examples/example.cpp
---- libofa-0.9.3.orig/examples/example.cpp	2006-05-10 21:05:37.000000000 +0300
-+++ libofa-0.9.3/examples/example.cpp	2008-04-16 15:51:49.000000000 +0300
-@@ -9,6 +9,8 @@
- 
- #include "protocol.h"
- 
-+#include <string.h>
-+ 
- AudioData* loadWaveFile(char *file);
- AudioData* loadDataUsingLAME(char *file);
- 
-Vain hakemistossa libofa-0.9.3/examples: example.cpp.orig
-diff -ur libofa-0.9.3.orig/examples/protocol.cpp libofa-0.9.3/examples/protocol.cpp
---- libofa-0.9.3.orig/examples/protocol.cpp	2006-05-10 21:05:42.000000000 +0300
-+++ libofa-0.9.3/examples/protocol.cpp	2008-04-16 15:51:49.000000000 +0300
-@@ -8,6 +8,7 @@
- -------------------------------------------------------------------*/
- #include <stdio.h>
- #include <stdlib.h>
-+#include <cstring>
- #include <string>
- #include <map>
- #include <expat.h>
-diff -ur libofa-0.9.3.orig/lib/signal_op.cpp libofa-0.9.3/lib/signal_op.cpp
---- libofa-0.9.3.orig/lib/signal_op.cpp	2006-05-10 21:01:12.000000000 +0300
-+++ libofa-0.9.3/lib/signal_op.cpp	2008-04-16 15:51:49.000000000 +0300
-@@ -12,6 +12,7 @@
- // DATE CREATED: 1/12/06
- 
- 
-+#include <cstdlib>
- #include <math.h>
- #include "signal_op.h"
- #include "AFLIB/aflibConverter.h"
diff --git a/pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.patch b/pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.patch
deleted file mode 100644
index 920c383c657..00000000000
--- a/pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/lib/JAMA/tnt_math_utils.h	2006-06-17 01:46:22.000000000 +0300
-+++ b/lib/JAMA/tnt_math_utils.h	2006-06-17 01:47:02.000000000 +0300
-@@ -20,11 +20,20 @@
- namespace TNT
- {
- /**
-+	@returns the absolute value of a real (no-complex) scalar.
-+*/
-+template <class Real>
-+Real abs(const Real &a)
-+{
-+	return  (a > 0 ? a : -a);
-+}
-+/**
- 	@returns hypotenuse of real (non-complex) scalars a and b by 
- 	avoiding underflow/overflow
- 	using (a * sqrt( 1 + (b/a) * (b/a))), rather than
- 	sqrt(a*a + b*b).
- */
-+
- template <class Real>
- Real hypot(const Real &a, const Real &b)
- {
-@@ -56,15 +65,6 @@
- }
- */
- 
--/**
--	@returns the absolute value of a real (no-complex) scalar.
--*/
--template <class Real>
--Real abs(const Real &a)
--{
--	return  (a > 0 ? a : -a);
--}
--
- }
- #endif
- /* MATH_UTILS_H */
-- 
GitLab


From 480bcf9f83768c4b6e17c16c53bddb1133d3d0d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 8 Jul 2013 09:14:23 +0200
Subject: [PATCH 0119/3789] gcj: add 47 and 48, make 47 default

gcj48 doesn't build yet
---
 pkgs/top-level/all-packages.nix | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2b2a3d5db2..3f8d7690001 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2389,7 +2389,7 @@ let
     profiledCompiler = false;
   });
 
-  gcj = gcj45;
+  gcj = gcj47;
 
   gcj44 = wrapGCC (gcc44.gcc.override {
     name = "gcj";
@@ -2433,6 +2433,34 @@ let
       libXrandr xproto renderproto xextproto inputproto randrproto;
   });
 
+  gcj47 = wrapGCC (gcc47.gcc.override {
+    name = "gcj";
+    langJava = true;
+    langFortran = false;
+    langCC = true;
+    langC = false;
+    profiledCompiler = false;
+    inherit zip unzip zlib boehmgc gettext pkgconfig perl;
+    inherit gtk;
+    inherit (gnome) libart_lgpl;
+    inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender
+      libXrandr xproto renderproto xextproto inputproto randrproto;
+  });
+
+  gcj48 = wrapGCC (gcc48.gcc.override {
+    name = "gcj";
+    langJava = true;
+    langFortran = false;
+    langCC = false;
+    langC = false;
+    profiledCompiler = false;
+    inherit zip unzip zlib boehmgc gettext pkgconfig perl;
+    inherit gtk;
+    inherit (gnome) libart_lgpl;
+    inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender
+      libXrandr xproto renderproto xextproto inputproto randrproto;
+  });
+
   gnat = gnat45;
 
   gnat44 = wrapGCC (gcc44.gcc.override {
-- 
GitLab


From 5be89ac73399de1f1aea8371f5e21f493b3d4d45 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Sun, 7 Jul 2013 14:56:15 -0700
Subject: [PATCH 0120/3789] openjdk: Don't statically link C++ runtime, close
 #730.

This fixes a build error (https://github.com/NixOS/nixpkgs/issues/707).
Thanks to
http://mail.openjdk.java.net/pipermail/build-dev/2012-January/005349.html
---
 pkgs/development/compilers/openjdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 0be36379f33..d7e42d38948 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -108,6 +108,7 @@ stdenv.mkDerivation rec {
     "DEVTOOLS_PATH="
     "UNIXCOMMAND_PATH="
     "BOOTDIR=${jdk}"
+    "STATIC_CXX=false"
   ];
 
   configurePhase = ''
-- 
GitLab


From de71c8bdb000a1dd3fe83bda7ae4a1935a149698 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Wed, 10 Jul 2013 23:26:06 -0700
Subject: [PATCH 0121/3789] qca2: Patch for gcc 4.7+ (close #738).

Thanks to
http://lists.pld-linux.org/mailman/pipermail/pld-cvs-commit/Week-of-Mon-20120917/347917.html
---
 pkgs/development/libraries/qca2/default.nix |  2 ++
 pkgs/development/libraries/qca2/gcc47.patch | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/qca2/gcc47.patch

diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix
index 1da9ef193b5..952bdfa29ce 100644
--- a/pkgs/development/libraries/qca2/default.nix
+++ b/pkgs/development/libraries/qca2/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
               EMSA3_SHA512      ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding'
     '';
 
+  patches = [ ./gcc47.patch ];
+
   configureFlags = "--no-separate-debug-info";
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/qca2/gcc47.patch b/pkgs/development/libraries/qca2/gcc47.patch
new file mode 100644
index 00000000000..08711884a57
--- /dev/null
+++ b/pkgs/development/libraries/qca2/gcc47.patch
@@ -0,0 +1,12 @@
+# Thanks to http://lists.pld-linux.org/mailman/pipermail/pld-cvs-commit/Week-of-Mon-20120917/347917.html
+--- qca-2.0.3/src/botantools/botan/botan/secmem.h.orig 2007-04-19 23:26:13.000000000 +0200
++++ qca-2.0.3/src/botantools/botan/botan/secmem.h  2012-09-16 23:28:43.767480490 +0200
+@@ -214,7 +214,7 @@
+ 
+       SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); }
+       SecureVector(const T in[], u32bit n)
+-         { MemoryRegion<T>::init(true); set(in, n); }
++         { MemoryRegion<T>::init(true); this->set(in, n); }
+       SecureVector(const MemoryRegion<T>& in)
+          { MemoryRegion<T>::init(true); set(in); }
+       SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
-- 
GitLab


From dafb31a8e181971ceadb10b3780eb37790e4cb0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 13 Jul 2013 16:22:44 +0200
Subject: [PATCH 0122/3789] Revert "e2fsprogs: Fix manpages", no more need for
 this

This reverts commit 7f4e47383281875c9712e94666917a22ca63e897.
See #523 and #529.
---
 pkgs/tools/filesystems/e2fsprogs/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 712cd32d9c3..b855fce17d0 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
 
   postInstall = "make install-libs";
 
-  dontGzipMan = true; # See issue #523
-
   meta = {
     homepage = http://e2fsprogs.sourceforge.net/;
     description = "Tools for creating and checking ext2/ext3/ext4 filesystems";
-- 
GitLab


From dc8d794208ddca5c544e9102126c5ab93e93b6ea Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Sun, 14 Jul 2013 17:08:26 -0700
Subject: [PATCH 0123/3789] strigi: patch to compile on stdenv-updates (close
 #755)

This patch exports a class with STRIGI_EXPORT that wasn't exported
before.
---
 pkgs/development/libraries/strigi/default.nix        |  2 ++
 .../libraries/strigi/export_bufferedstream.patch     | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/strigi/export_bufferedstream.patch

diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index fc8dc123032..6b8b611d3f7 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
 
+  patches = [ ./export_bufferedstream.patch ];
+
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/development/libraries/strigi/export_bufferedstream.patch b/pkgs/development/libraries/strigi/export_bufferedstream.patch
new file mode 100644
index 00000000000..4c6b34fe1be
--- /dev/null
+++ b/pkgs/development/libraries/strigi/export_bufferedstream.patch
@@ -0,0 +1,12 @@
+diff -u -r strigi-0.7.8/libstreams/include/strigi/bufferedstream.h strigi-0.7.8_new/libstreams/include/strigi/bufferedstream.h
+--- strigi-0.7.8/libstreams/include/strigi/bufferedstream.h	2013-02-05 13:34:57.000000000 -0800
++++ strigi-0.7.8_new/libstreams/include/strigi/bufferedstream.h	2013-07-14 17:01:54.000000000 -0700
+@@ -34,7 +34,7 @@
+  * BufferedStream will do the rest.
+  */
+ template <class T>
+-class BufferedStream : public StreamBase<T> {
++class STRIGI_EXPORT BufferedStream : public StreamBase<T> {
+ private:
+     StreamBuffer<T> buffer;
+     bool finishedWritingToBuffer;
-- 
GitLab


From d8dd23e285275bddff292299b9283a7f7f6a393b Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Tue, 9 Jul 2013 21:34:11 -0700
Subject: [PATCH 0124/3789] luit: configure --disable-selective-werror

Compiling luit failed with "implicit declaration of function
'posix_openpt'".  Following suggestion at
https://bugs.freedesktop.org/show_bug.cgi?id=47792 to fix it.
---
 pkgs/servers/x11/xorg/default.nix                    | 2 +-
 pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 3a523469248..d7b0eb0ed6f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -926,7 +926,7 @@ let
       url = mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2;
       sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h";
     };
-    buildInputs = [pkgconfig libfontenc ];
+    buildInputs = [pkgconfig libfontenc ]; configureFlags = "--disable-selective-werror"; 
   })) // {inherit libfontenc ;};
 
   makedepend = (stdenv.mkDerivation ((if overrides ? makedepend then overrides.makedepend else x: x) {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 04ee5f10961..1d294845f7f 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -177,6 +177,12 @@ while (<>) {
         $extraAttrs{$pkg} = " configureFlags = \"--with-fontrootdir=\$(out)/lib/X11/fonts\"; ";
     }
 
+    if ($tarball =~ /\/luit-/) {
+        # See https://bugs.freedesktop.org/show_bug.cgi?id=47792
+        # Once the bug is fixed upstream, this can be removed.
+        $extraAttrs{$pkg} = " configureFlags = \"--disable-selective-werror\"; ";
+    }
+
     sub process {
         my $requires = shift;
         my $s = shift;
-- 
GitLab


From b5553b7cec004afc53cdf2e0b71119aa1bd9d929 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Tue, 23 Jul 2013 20:30:31 -0700
Subject: [PATCH 0125/3789] luit: fix build with newer gcc (close #734)

---
 pkgs/servers/x11/xorg/default.nix                    | 2 +-
 pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 6 ------
 pkgs/servers/x11/xorg/overrides.nix                  | 6 ++++++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d7b0eb0ed6f..3a523469248 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -926,7 +926,7 @@ let
       url = mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2;
       sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h";
     };
-    buildInputs = [pkgconfig libfontenc ]; configureFlags = "--disable-selective-werror"; 
+    buildInputs = [pkgconfig libfontenc ];
   })) // {inherit libfontenc ;};
 
   makedepend = (stdenv.mkDerivation ((if overrides ? makedepend then overrides.makedepend else x: x) {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 1d294845f7f..04ee5f10961 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -177,12 +177,6 @@ while (<>) {
         $extraAttrs{$pkg} = " configureFlags = \"--with-fontrootdir=\$(out)/lib/X11/fonts\"; ";
     }
 
-    if ($tarball =~ /\/luit-/) {
-        # See https://bugs.freedesktop.org/show_bug.cgi?id=47792
-        # Once the bug is fixed upstream, this can be removed.
-        $extraAttrs{$pkg} = " configureFlags = \"--disable-selective-werror\"; ";
-    }
-
     sub process {
         my $requires = shift;
         my $s = shift;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 22e0096ad65..65e788aa2a1 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -85,6 +85,12 @@ in
     propagatedBuildInputs = [ xorg.libSM ];
   };
 
+  # See https://bugs.freedesktop.org/show_bug.cgi?id=47792
+  # Once the bug is fixed upstream, this can be removed.
+  luit = attrs: attrs // {
+    configureFlags = "--disable-selective-werror";
+  };
+
   compositeproto = attrs: attrs // {
     propagatedBuildInputs = [ xorg.fixesproto ];
   };
-- 
GitLab


From 0b8f1b1448539d4166573769931de48488af7a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 27 Jul 2013 21:27:07 +0200
Subject: [PATCH 0126/3789] mesa: bugfix update, but still can't compile R600

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index de130d465c2..dc533776da0 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -3,7 +3,7 @@
 , libdrm, xorg, wayland, udev, llvm, libffi
 , libvdpau
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
-, enableR600LlvmCompiler ? false # we would need currently unreleased LLVM or patches
+, enableR600LlvmCompiler ? false # current llvm-3.3 + mesa-9.1.5 don't compile this
 , enableExtraFeatures ? false # add ~15 MB to mesa_drivers
 }:
 
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "9.1.3";
+  version = "9.1.5";
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
 stdenv.mkDerivation {
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256="0rnpaambxv5cd6kbfyvv4b8x2rw1xj13a67xbkzmndfh08iaqpcd";
+    sha256="1zclw6rzcj9bra3i9p8ai6ill3422kjbyxrp4nmpva4hzld0vsl9";
   };
 
   prePatch = "patchShebangs .";
-- 
GitLab


From 70edf159970cd83df8ef49301346a07f4d4bf684 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Aug 2013 15:45:21 +0200
Subject: [PATCH 0127/3789] patchPhase: Handle xz compression

---
 pkgs/stdenv/generic/setup.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 2938bec30de..a50596985ec 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -543,6 +543,9 @@ patchPhase() {
             *.bz2)
                 uncompress="bzip2 -d"
                 ;;
+            *.xz)
+                uncompress="xz -d"
+                ;;
             *.lzma)
                 uncompress="lzma -d"
                 ;;
-- 
GitLab


From bef090400e1773ab26eaefdc8f60167c96710f40 Mon Sep 17 00:00:00 2001
From: bbenoist <return_0@live.com>
Date: Tue, 20 Aug 2013 10:17:00 +0200
Subject: [PATCH 0128/3789] cmake: Update to 2.8.11.2

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

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index d4e5fa00a51..67b7358057a 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -7,7 +7,7 @@ with stdenv.lib;
 let
   os = stdenv.lib.optionalString;
   majorVersion = "2.8";
-  minorVersion = "11";
+  minorVersion = "11.2";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "1rgfgzigmc0b2z5330r3ncf003k4bhqwfxbskv0q5ylp2xkd7l10";
+    sha256 = "0qh5dhd7ff08n2h569j7g9m92gb3bz14wvhwjhwl7lgx794cnamk";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From e13720c3c4045a7d80021d6eaabddddb6eeaadf4 Mon Sep 17 00:00:00 2001
From: bbenoist <return_0@live.com>
Date: Tue, 20 Aug 2013 10:26:54 +0200
Subject: [PATCH 0129/3789] cmake: Fix CTest custom commands

This commit is related to:
 - https://github.com/NixOS/nixpkgs/issues/762
 - http://public.kitware.com/Bug/view.php?id=13887
And fixes a bug present in recent CMake versions.

The fix should be integrated in the next CMake release.
---
 .../tools/build-managers/cmake/762-13887.patch  | 17 +++++++++++++++++
 .../tools/build-managers/cmake/default.nix      |  8 ++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/cmake/762-13887.patch

diff --git a/pkgs/development/tools/build-managers/cmake/762-13887.patch b/pkgs/development/tools/build-managers/cmake/762-13887.patch
new file mode 100644
index 00000000000..3ef27a09b5c
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cmake/762-13887.patch
@@ -0,0 +1,17 @@
+diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
+index e7491bb..57b4348 100644
+--- a/Source/CTest/cmCTestTestHandler.cxx
++++ b/Source/CTest/cmCTestTestHandler.cxx
+@@ -1303,10 +1303,9 @@ int cmCTestTestHandler::ExecuteCommands(std::vector<cmStdString>& vec)
+   for ( it = vec.begin(); it != vec.end(); ++it )
+     {
+     int retVal = 0;
+-    std::string cmd = cmSystemTools::ConvertToOutputPath(it->c_str());
+-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << cmd
++    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << *it
+       << std::endl);
+-    if ( !cmSystemTools::RunSingleCommand(cmd.c_str(), 0, &retVal, 0,
++    if ( !cmSystemTools::RunSingleCommand((*it).c_str(), 0, &retVal, 0,
+                                           cmSystemTools::OUTPUT_MERGE
+         /*this->Verbose*/) || retVal != 0 )
+       {
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 67b7358057a..35ae214266d 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -24,9 +24,13 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   patches =
+    # See https://github.com/NixOS/nixpkgs/issues/762
+    # and http://public.kitware.com/Bug/view.php?id=13887
+    # Remove this patch when a CMake release contains the corresponding fix
+    [ ./762-13887.patch ]
     # Don't search in non-Nix locations such as /usr, but do search in
-    # Nixpkgs' Glibc.
-    optional (stdenv ? glibc) ./search-path.patch;
+    # Nixpkgs' Glibc. 
+    ++ optional (stdenv ? glibc) ./search-path.patch;
 
   buildInputs = [ curl expat zlib bzip2 libarchive ]
     ++ optional useNcurses ncurses
-- 
GitLab


From 27905ce17e1b1aed55edbff5856082b8c1b51fc7 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Mon, 26 Aug 2013 11:59:51 +0200
Subject: [PATCH 0130/3789] pkgs/build-support/cabal: set LANG="en_US.UTF-8"
 for the Haddock run

Haskell packages that contain non-ascii characters in their .cabal file
or somewhere else in their haddock documentation fail to compile under
nixpkgs and usually flagged with noHaddock = true. I wanted to do the
same for modularArithmentic, when I realized that we just have to set
the locale to some UTF-8 compatible locale in build-support/cabal to fix
this issue correctly.
---
 pkgs/build-support/cabal/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 6ede3f56923..d57afb7bf9d 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -147,7 +147,11 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
               ./Setup build
 
               export GHC_PACKAGE_PATH=$(${ghc.GHCPackages})
-              [ -n "$noHaddock" ] || ./Setup haddock
+              if [ -n "$noHaddock" ]; then
+                export LANG="en_US.UTF-8"
+                ./Setup haddock
+                unset LANG
+              fi
 
               eval "$postBuild"
             '';
-- 
GitLab


From 8bccfe4d2b101488222025a682bced49cfe32770 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Aug 2013 12:20:12 +0200
Subject: [PATCH 0131/3789] haskell-bytestring-progress: re-enable haddock
 documentation

---
 .../libraries/haskell/bytestring-progress/default.nix            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/bytestring-progress/default.nix b/pkgs/development/libraries/haskell/bytestring-progress/default.nix
index e9bb268b9fc..c73932b3760 100644
--- a/pkgs/development/libraries/haskell/bytestring-progress/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-progress/default.nix
@@ -5,7 +5,6 @@ cabal.mkDerivation (self: {
   version = "1.0.3";
   sha256 = "1v9cl7d4fcchbdrpbgjj4ilg79cj241vzijiifdsgkq30ikv2yxs";
   buildDepends = [ terminalProgressBar time ];
-  noHaddock = true;
   meta = {
     homepage = "http://github.com/acw/bytestring-progress";
     description = "A library for tracking the consumption of a lazy ByteString";
-- 
GitLab


From f735d9801d39ca273f118c31ee6efdae1c81babf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Aug 2013 12:20:12 +0200
Subject: [PATCH 0132/3789] haskell-diagrams: re-enable haddock documentation

---
 pkgs/development/libraries/haskell/diagrams/diagrams.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
index 84d3d9bbf48..bed30e67ea3 100644
--- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix
+++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
@@ -7,7 +7,6 @@ cabal.mkDerivation (self: {
   buildDepends = [
     diagramsContrib diagramsCore diagramsLib diagramsSvg
   ];
-  noHaddock = true;
   jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
-- 
GitLab


From 95042a0923ecca83f308b5b247e5b8156129feda Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Aug 2013 12:20:12 +0200
Subject: [PATCH 0133/3789] haskell-multirec: re-enable haddock documentation

---
 pkgs/development/libraries/haskell/multirec/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix
index a7d7459b455..61de0cace5b 100644
--- a/pkgs/development/libraries/haskell/multirec/default.nix
+++ b/pkgs/development/libraries/haskell/multirec/default.nix
@@ -4,7 +4,6 @@ cabal.mkDerivation (self: {
   pname = "multirec";
   version = "0.7.3";
   sha256 = "0k1wbjsvkl08nwjikflc8yyalk654mf8bvi1rhm28i4na52myi5y";
-  noHaddock = true;
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
     description = "Generic programming for families of recursive datatypes";
-- 
GitLab


From 1b40ae751a444a4a39dff7edc8794f5d44b5cd7d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Aug 2013 12:20:12 +0200
Subject: [PATCH 0134/3789] haskell-wxc: re-enable haddock documentation

---
 pkgs/development/libraries/haskell/wxHaskell/wxc.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
index 74ca4f91d70..b89b39acb50 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
@@ -6,7 +6,6 @@ cabal.mkDerivation (self: {
   sha256 = "1bh20i1rb8ng0ni1v98nm8qv5wni19dvxwf5i3ijxhrxqdq4i7p6";
   buildDepends = [ wxdirect ];
   extraLibraries = [ libX11 mesa wxGTK ];
-  noHaddock = true;
   postInstall = ''
     cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so
   '';
-- 
GitLab


From fb83f8605f3d8a6449fccd53759023f58627fe3b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Aug 2013 12:39:33 +0200
Subject: [PATCH 0135/3789] pkgs/build-support/cabal: add support for running
 specific tests only via 'testTarget'

The dns packages requires this feature, because it ships two test programs: one
of them requires network access (so we cannot run it), but the other test does
not. Setting testTarget appropriately allows us to run only one of the two
suites.
---
 pkgs/build-support/cabal/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index d57afb7bf9d..e8161e2e818 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -80,6 +80,9 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
             # build-depends Cabal fields stated in test-suite stanzas
             testDepends = [];
 
+            # target(s) passed to the cabal test phase as an argument
+            testTarget = "";
+
             # build-tools Cabal field
             buildTools = [];
 
@@ -159,7 +162,7 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
             checkPhase = stdenv.lib.optional self.doCheck ''
               eval "$preCheck"
 
-              ./Setup test
+              ./Setup test ${self.testTarget}
 
               eval "$postCheck"
             '';
-- 
GitLab


From 884a8fc7b591c31ef16979af3f1049b9b9617a6a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Aug 2013 12:40:27 +0200
Subject: [PATCH 0136/3789] haskell-dns: run only the 'spec' test suite, the
 'network' test suite won't succeed on Hydra

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

diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
index e80f4379aa7..85f3a5628b6 100644
--- a/pkgs/development/libraries/haskell/dns/default.nix
+++ b/pkgs/development/libraries/haskell/dns/default.nix
@@ -14,7 +14,7 @@ cabal.mkDerivation (self: {
     attoparsec attoparsecConduit binary blazeBuilder conduit hspec
     iproute mtl network networkConduit random
   ];
-  doCheck = false;
+  testTarget = "spec";
   meta = {
     description = "DNS library in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From 81a647696e9d75830f0c2e6acf6f4f36baade858 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Aug 2013 14:25:51 +0200
Subject: [PATCH 0137/3789] xz: Update to 5.0.5

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

diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index 26c1597f2aa..6d59bd927cf 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "xz-5.0.4";
+  name = "xz-5.0.5";
 
   src = fetchurl {
     url = "http://tukaani.org/xz/${name}.tar.bz2";
-    sha256 = "14nf55b47335aakswqk0kqv1qsh4269rnb757dmkkbd1sdhb1naw";
+    sha256 = "1404i59bp6rzxya0br1q9njdv32z4sggyfrkjr7vq695hk94hv0n";
   };
 
   doCheck = true;
-- 
GitLab


From 2145471304a75f79950ef913c603cf2e2bf51664 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Aug 2013 14:28:56 +0200
Subject: [PATCH 0138/3789] bash: Update to 4.2-p45

---
 pkgs/shells/bash/bash-4.2-patches.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix
index 52392f4b32c..ac6e9e97f18 100644
--- a/pkgs/shells/bash/bash-4.2-patches.nix
+++ b/pkgs/shells/bash/bash-4.2-patches.nix
@@ -43,4 +43,7 @@ patch: [
 (patch "040" "0v5a98ybibwsd4iyh18gy0kc51mx8qn9w2wfpjaiycn7yg5gjrdj")
 (patch "041" "1szmm8xv41hvbzgxfwrj6dg85wa7zy3781nnil428rlzpm8ikk05")
 (patch "042" "017kpdqy6v9sgi2a931wyzpix86n9mkalpm6n9cb45v58lgmraps")
+(patch "043" "0mswgjk3z80qm1mb93jmbql27nbczxk86cw5byf0m29y1y2869nw")
+(patch "044" "1rk6jywzfvg1crvhib1zk37rsps73minhr7l4vcb3vfdkin2vlqh")
+(patch "045" "0vcqn9rb26bahhrarbwhpa0ny0nrf4vyrzh97d44lfcxypqfzdyx")
 ]
-- 
GitLab


From 1f60a7c4bcdbab38260681c77c007d28793d4e4d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Aug 2013 14:50:45 +0200
Subject: [PATCH 0139/3789] less: Update to 458

For some crazy reason, less is a stdenv dependency.
---
 pkgs/tools/misc/less/default.nix | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index d038abbfc81..3183fe2ca38 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -1,13 +1,22 @@
-{stdenv, fetchurl, ncurses}:
- 
-stdenv.mkDerivation {
-  name = "less-451";
- 
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "less-458";
+
   src = fetchurl {
-    url = http://www.greenwoodsoftware.com/less/less-451.tar.gz;
-    sha256 = "9fe8287c647afeafb4149c5dedaeacfd20971ed7c26c7553794bb750536b5f57";
+    url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz";
+    sha256 = "1b7wn1nk8qlzx20jmn9l6zcbw81n9g0w9zzhhzab6m6yks0wfdp5";
+  };
+
+  # Look for ‘sysless’ in /etc.
+  configureFlags = "--sysconfdir=/etc";
+
+  buildInputs = [ ncurses ];
+
+  meta = {
+    homepage = http://www.greenwoodsoftware.com/less/;
+    description = "A more advanced file pager than ‘more’";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
- 
-  buildInputs = [ncurses];
- 
 }
-- 
GitLab


From 8adb1d003e1f20ba814dba97059bf2ad41bcd2db Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Aug 2013 14:52:22 +0200
Subject: [PATCH 0140/3789] ed: Update to 1.9

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

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 3e22cfd0412..88b539d29f5 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "ed-1.7";
+  name = "ed-1.9";
 
   src = fetchurl {
     url = "mirror://gnu/ed/${name}.tar.gz";
-    sha256 = "0c908wb5pm48rjrrfbm5dhrqzys8f1dbvi90dn0vgwjzk80l2hl9";
+    sha256 = "122syihsx2hwzj75mkf5a9ssiky2xby748kp4cc00wzhmp7p5cym";
   };
 
   /* FIXME: Tests currently fail on Darwin:
-- 
GitLab


From 8f3b31464b3de633d38dc4bdd654ab7a212d09a8 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 Aug 2013 10:49:12 +0200
Subject: [PATCH 0141/3789] dbus_cplusplus: fix build with gcc>=4.7, via Gentoo
 patch

---
 pkgs/development/libraries/dbus-cplusplus/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix
index 0a4b80d3f3e..2bd4f814985 100644
--- a/pkgs/development/libraries/dbus-cplusplus/default.nix
+++ b/pkgs/development/libraries/dbus-cplusplus/default.nix
@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw";
   };
 
+  patches = [( fetchurl {
+    url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/dbus-c%2B%2B/files/dbus-c%2B%2B-0.9.0-gcc-4.7.patch;
+    name = "gcc-4.7.patch";
+    sha256 = "0rwcz9pvc13b3yfr0lkifnfz0vb5q6dg240bzgf37ni4s8rpc72g";
+  })];
+
   buildInputs = [ dbus glib gtkmm pkgconfig expat ];
 
   configureFlags = "--disable-ecore";
-- 
GitLab


From b78df59fde1c6f3fd1c3b34e24e9e251c4c0c384 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 Aug 2013 11:38:20 +0200
Subject: [PATCH 0142/3789] coin3d: fix build with newer gcc

---
 pkgs/development/libraries/coin3d/default.nix |  9 +++++
 .../libraries/coin3d/gcc-4.8.patch            | 38 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/libraries/coin3d/gcc-4.8.patch

diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix
index b477a88ed53..5eb93621f41 100644
--- a/pkgs/development/libraries/coin3d/default.nix
+++ b/pkgs/development/libraries/coin3d/default.nix
@@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
     sha256 = "05ylhrcglm81dajbk132l1w892634z2i97x10fm64y1ih72phd2q";
   };
 
+  patches = [
+    (fetchurl {
+      url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch;
+      name = "gcc-4.7.patch";
+      sha256 = "076dyc52swk8qc7ylps53fg6iqmd52x8s7m18i80x49dd109yw20";
+    })
+    ./gcc-4.8.patch # taken from FC-17 source rpm
+  ];
+
   buildInputs = [ mesa ];
 
   meta = {
diff --git a/pkgs/development/libraries/coin3d/gcc-4.8.patch b/pkgs/development/libraries/coin3d/gcc-4.8.patch
new file mode 100644
index 00000000000..be5b8b03b63
--- /dev/null
+++ b/pkgs/development/libraries/coin3d/gcc-4.8.patch
@@ -0,0 +1,38 @@
+From 9f5d96a2b9a71ab539237d2dab4c54fc46fc5c5b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@corsepiu.home>
+Date: Thu, 18 Apr 2013 19:17:06 +0200
+Subject: [PATCH 10/10] GCC-4.8.0 fixes
+
+---
+ src/fonts/freetype.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/fonts/freetype.cpp b/src/fonts/freetype.cpp
+index 760b88b..e705d3a 100644
+--- a/src/fonts/freetype.cpp
++++ b/src/fonts/freetype.cpp
+@@ -32,18 +32,18 @@
+ 
+    20050613 mortene. */
+ 
+-#include "fonts/freetype.h"
+-
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
+ 
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <assert.h>
+ 
+ #include "glue/freetype.h"
+ #include "glue/GLUWrapper.h"
+ 
++#include "fonts/freetype.h"
++
+ /* ************************************************************************* */
+ 
+ #ifdef __cplusplus
+-- 
+1.8.1.4
+
-- 
GitLab


From 2fa5f01bb9c9aee3ad88c1c6fa7c740b21e1a9e7 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 Aug 2013 12:06:47 +0200
Subject: [PATCH 0143/3789] wesnoth: fix build, minor update, parallel builds

Yes, games are the most important things in nixpkgs...
not that I actually plan to play it anytime soon ;-)
---
 pkgs/games/wesnoth/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index b8e53b0cefb..f279127b62b 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -4,20 +4,21 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.10.5";
+  version = "1.10.7";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "1rvlr8c3vzhgd33vzc1hfhiil6d7hc3px8r8p79vmp3kwi3d49zn";
+    sha256 = "0gi5fzij48hmhhqxc370jxvxig5q3d70jiz56rjn8yx514s5lfwa";
   };
 
   buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi
                   cmake freetype libpng pkgconfig lua dbus fontconfig libtool ];
 
-  # Make the package build with the gcc currently available in Nixpkgs.
-  NIX_CFLAGS_COMPILE = "-Wno-ignored-qualifiers";
+  cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme";
-- 
GitLab


From 2c217cc0b19ff4f6d78e6469d77ff2cd5b92c9c3 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 Aug 2013 14:51:35 +0200
Subject: [PATCH 0144/3789] perl: disable tests on Darwin, refactor stdenv.lib
 usage

There was a mysterious error, which I don't have resources to investigate:

Removing test lib/Net/hostent.t
sed: -i: No such file or directory
---
 .../interpreters/perl/5.16/default.nix        | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index c838bb35ab5..60bfacf419b 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -6,6 +6,10 @@ let
 
 in
 
+with {
+  inherit (stdenv.lib) optional optionalString;
+};
+
 stdenv.mkDerivation rec {
   name = "perl-5.16.3";
 
@@ -18,8 +22,8 @@ stdenv.mkDerivation rec {
     [ # Do not look in /usr etc. for dependencies.
       ./no-sys-dirs.patch
     ]
-    ++ stdenv.lib.optional stdenv.isSunOS  ./ld-shared.patch
-    ++ stdenv.lib.optional stdenv.isDarwin ./no-libutil.patch;
+    ++ optional stdenv.isSunOS  ./ld-shared.patch
+    ++ optional stdenv.isDarwin ./no-libutil.patch;
 
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
   # "installstyle" option to ensure that modules are put under
@@ -35,7 +39,7 @@ stdenv.mkDerivation rec {
       "-Dlocincpth=${libc}/include"
       "-Dloclibpth=${libc}/lib"
     ]
-    ++ stdenv.lib.optional (stdenv ? glibc) "-Dusethreads";
+    ++ optional (stdenv ? glibc) "-Dusethreads";
 
   configureScript = "${stdenv.shell} ./Configure";
 
@@ -47,12 +51,12 @@ stdenv.mkDerivation rec {
     ''
       configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
 
-      ${stdenv.lib.optionalString stdenv.isArm ''
+      ${optionalString stdenv.isArm ''
         configureFlagsArray=(-Dldflags="-lm -lrt")
       ''}
     '';
 
-  preBuild = stdenv.lib.optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools))
+  preBuild = optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools))
     ''
       # Make Cwd work on NixOS (where we don't have a /bin/pwd).
       substituteInPlace dist/Cwd/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
@@ -60,7 +64,7 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  doCheck = true;
+  doCheck = !stdenv.isDarwin;
 
   # some network-related tests don't work, mostly probably due to our sandboxing
   testsToSkip = ''
@@ -68,12 +72,12 @@ stdenv.mkDerivation rec {
     dist/IO/t/{io_multihomed.t,io_sock.t} \
     t/porting/{maintainers.t,regen.t} \
     cpan/Socket/t/get{name,addr}info.t \
-  '' + stdenv.lib.optionalString stdenv.isFreeBSD ''
+  '' + optionalString stdenv.isFreeBSD ''
     cpan/CPANPLUS/t/04_CPANPLUS-Module.t \
     cpan/CPANPLUS/t/20_CPANPLUS-Dist-MM.t \
   '' + " ";
 
-  postPatch = ''
+  postPatch = optionalString (!stdenv.isDarwin) /* this failed on Darwin, no idea why */ ''
     for test in ${testsToSkip}; do
       echo "Removing test" $test
       rm "$test"
-- 
GitLab


From 0e1a1748f4ad4736a62b73cc72ad2e96ed4a0a18 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 Aug 2013 15:41:00 +0200
Subject: [PATCH 0145/3789] mu: fix build by using older texinfo

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fa44808e22..0a23116252c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5130,7 +5130,9 @@ let
 
   mtdev = callPackage ../development/libraries/mtdev { };
 
-  mu = callPackage ../tools/networking/mu { };
+  mu = callPackage ../tools/networking/mu {
+    texinfo = texinfo4;
+  };
 
   muparser = callPackage ../development/libraries/muparser { };
 
-- 
GitLab


From 604d201b7c480002cf74f1a8f3fbccebca7a9cfc 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 Aug 2013 16:16:11 +0200
Subject: [PATCH 0146/3789] v8: fix build with newer gcc

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

diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 3fc3138ef52..13c2990c73d 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
       ln -sv ${gyp}/bin/gyp build/gyp/gyp
     '';
 
-    nativeBuildInputs = stdenv.lib.optional (system == "i686-linux") which;
+    nativeBuildInputs = [ which ];
     buildInputs = [ readline python ];
 
     buildFlags = [
@@ -35,6 +35,9 @@ stdenv.mkDerivation {
       "${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 = ''
-- 
GitLab


From 1778200519a18ae00751ab3015d0e665373c32f6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2013 10:40:50 +0200
Subject: [PATCH 0147/3789] perl: re-enable the postPatch hook on Darwin

The problem was that sed(1) variants other than GNU sed require a backup suffix
to the -i option.
---
 pkgs/development/interpreters/perl/5.16/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index 60bfacf419b..4cf809c66ed 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -77,12 +77,12 @@ stdenv.mkDerivation rec {
     cpan/CPANPLUS/t/20_CPANPLUS-Dist-MM.t \
   '' + " ";
 
-  postPatch = optionalString (!stdenv.isDarwin) /* this failed on Darwin, no idea why */ ''
+  postPatch = ''
     for test in ${testsToSkip}; do
       echo "Removing test" $test
       rm "$test"
       pat=`echo "$test" | sed 's,/,\\\\/,g'` # just escape slashes
-      sed "/^$pat/d" -i MANIFEST
+      sed "/^$pat/d" -i.bak MANIFEST
     done
   '';
 
-- 
GitLab


From 71f191bdbaa8b1b9bf6f09c3aa294640b42a0f4d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2013 12:06:39 +0200
Subject: [PATCH 0148/3789] perl: revert "re-enable the postPatch hook on
 Darwin"

This reverts commit 1778200519a18ae00751ab3015d0e665373c32f6.
Apparently, the sed -i syntax is different from what I thought, because
now the build fails on Darwin, saying:

  sed: -i.bak: No such file or directory

See http://hydra.nixos.org/build/5829944/nixlog/1/raw for more details.
---
 pkgs/development/interpreters/perl/5.16/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index 4cf809c66ed..60bfacf419b 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -77,12 +77,12 @@ stdenv.mkDerivation rec {
     cpan/CPANPLUS/t/20_CPANPLUS-Dist-MM.t \
   '' + " ";
 
-  postPatch = ''
+  postPatch = optionalString (!stdenv.isDarwin) /* this failed on Darwin, no idea why */ ''
     for test in ${testsToSkip}; do
       echo "Removing test" $test
       rm "$test"
       pat=`echo "$test" | sed 's,/,\\\\/,g'` # just escape slashes
-      sed "/^$pat/d" -i.bak MANIFEST
+      sed "/^$pat/d" -i MANIFEST
     done
   '';
 
-- 
GitLab


From 1cddbc4bb498341591ed5bc2e7142384036dfdcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 29 Aug 2013 13:56:06 +0200
Subject: [PATCH 0149/3789] ctemplate: minor update to fix build with gcc>=4.7

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

diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix
index 3af7e7e4387..36652f7abc7 100644
--- a/pkgs/development/libraries/libctemplate/default.nix
+++ b/pkgs/development/libraries/libctemplate/default.nix
@@ -12,11 +12,11 @@ stdenv.mkDerivation rec {
   };
 
   pname = "ctemplate";
-  version = "2.0";
+  version = "2.2";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://ctemplate.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0scdqqbp8fy9jiak60dj1051gbyb8xmlm4rdz4h1myxifjagwbfa";
+    sha256 = "0vv8gvyndppm9m5s1i5k0jvwcz41l1vfgg04r7nssdpzyz0cpwq4";
   };
 }
-- 
GitLab


From fa7dcd19318be6ba325f617cd07b6e2fffb42302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 29 Aug 2013 14:04:47 +0200
Subject: [PATCH 0150/3789] ois: fix build with gcc>=4.7 via a Gentoo patch

---
 pkgs/development/libraries/ois/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix
index abf6c7112a5..67df3645eb9 100644
--- a/pkgs/development/libraries/ois/default.nix
+++ b/pkgs/development/libraries/ois/default.nix
@@ -1,4 +1,4 @@
-x@{builderDefsPackage
+x@{builderDefsPackage, fetchurl
   , autoconf, automake, libtool, m4
   , libX11, xproto, libXi, inputproto
   , libXaw, libXmu, libXt
@@ -30,10 +30,17 @@ rec {
   inherit (sourceInfo) name version;
   inherit buildInputs;
 
-  phaseNames = ["doConfigure" "doMakeInstall"];
+  phaseNames = ["doPatch" "doConfigure" "doMakeInstall"];
+
+  patches = [(fetchurl {
+    url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/ois/files/ois-1.3-gcc47.patch;
+    sha256 = "026jw06n42bcrmg0sbdhzc4cqxsnf7fw30a2z9cigd9x282zhii8";
+    name = "gcc47.patch";
+  })];
+  patchFlags = "-p0";
 
   configureCommand = ''sh bootstrap; sh configure'';
-      
+
   meta = {
     description = "Object-oriented C++ input system";
     maintainers = with a.lib.maintainers;
-- 
GitLab


From e7741a007bf91d9aa0c8423deb60b8c01c1ea76a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 29 Aug 2013 14:15:07 +0200
Subject: [PATCH 0151/3789] krb5: minor security update CVE-2002-2443

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

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 2de50c4a304..647a6b03113 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "krb5";
-  version = "1.11.1";
+  version = "1.11.3";
   name = "${pname}-${version}";
   webpage = http://web.mit.edu/kerberos/;
 in
@@ -12,7 +12,7 @@ stdenv.mkDerivation (rec {
 
   src = fetchurl {
     url = "${webpage}/dist/krb5/1.11/${name}-signed.tar";
-    sha256 = "0s07sbwrj3c61gc29g016csim04azb9h74rf5595fxzqlzv0y8rs";
+    sha256 = "1daiaxgkxcryqs37w28v4x1vajqmay4l144d1zd9c2d7jjxr9gcs";
   };
 
   buildInputs = [ perl ncurses yacc ];
-- 
GitLab


From fca031e04ba255ac75b76b63def636e8c735f986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 29 Aug 2013 14:42:14 +0200
Subject: [PATCH 0152/3789] sonic_visualizer: fix build on newer gcc via a
 Gentoo patch

---
 pkgs/applications/audio/sonic-visualiser/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index aeb90c09455..6e15478ff63 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
     url = "http://code.soundsoftware.ac.uk/attachments/download/194/${name}.tar.gz";
     sha256 = "00igf7j6s8xfyxnlkbqma0yby9pknxqzy8cmh0aw95ix80cw56fq";
   };
+  patches = [(fetchurl {
+    url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch;
+    sha256 = "0dhh111crvjvhcjqp7j9jqnvs8zmd6xrcirmzqrrnca1h0vbpkay";
+    name = "gcc47.patch";
+  })];
 
   buildInputs =
     [ libsndfile qt4 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
-- 
GitLab


From d5e22f4b600bd56356fae7f63d5bee04ed93d829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 29 Aug 2013 14:59:25 +0200
Subject: [PATCH 0153/3789] slibGuile: fix build via using older texinfo

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a23116252c..45d7fe6c9cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5458,6 +5458,7 @@ let
 
   slibGuile = callPackage ../development/libraries/slib {
     scheme = guile_1_8;
+    texinfo = texinfo4; # otherwise erros: must be after `@defun' to use `@defunx'
   };
 
   smpeg = callPackage ../development/libraries/smpeg { };
-- 
GitLab


From 646eaa23a12ac074ee35135939dde635506b1bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 29 Aug 2013 15:19:06 +0200
Subject: [PATCH 0154/3789] xorg.xmodmap: fix build via a Gentoo patch

---
 pkgs/servers/x11/xorg/overrides.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 65e788aa2a1..6589c2ff419 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -191,6 +191,13 @@ in
     buildInputs = attrs.buildInputs ++ [args.intltool];
   };
 
+  xmodmap = attrs: attrs // {
+    patches = [(args.fetchurl {
+      url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-apps/xmodmap/files/xmodmap-1.0.7-_GNU_SOURCE.patch;
+      sha256 = "0q3zhy0wy1kkbpagzav8869fais4lw5q5vybgjj7wkmak06c5648";
+      name = "new-gcc.patch";
+    })];
+  };
   xorgserver = with xorg; attrs: attrs // {
     configureFlags = [
       "--enable-xcsecurity" # enable SECURITY extension
-- 
GitLab


From c9f79922829c8b81d518a789431d0bee71f6a2ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 29 Aug 2013 15:19:42 +0200
Subject: [PATCH 0155/3789] stumpwm: fix build via using older texinfo

---
 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 45d7fe6c9cd..a7135ac54d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8489,7 +8489,7 @@ let
   stalonetray = callPackage ../applications/window-managers/stalonetray {};
 
   stumpwm = builderDefsPackage (import ../applications/window-managers/stumpwm) {
-    inherit texinfo;
+    texinfo = texinfo4; # otherwise error: @itemx must follow @item
     clisp = clisp_2_44_1;
   };
 
-- 
GitLab


From 9f541bcdde9cbc718a3ce7bb4fb900a9d671def8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Aug 2013 10:42:40 +0200
Subject: [PATCH 0156/3789] pkgs/build-support/cabal: fix the logic of the
 'noHaddock' flag that was broken in 27905ce17e1b1aed55edbff5856082b8c1b51fc7

---
 pkgs/build-support/cabal/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index e8161e2e818..7f4d431c007 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -150,7 +150,7 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
               ./Setup build
 
               export GHC_PACKAGE_PATH=$(${ghc.GHCPackages})
-              if [ -n "$noHaddock" ]; then
+              if [ -z "$noHaddock" ]; then
                 export LANG="en_US.UTF-8"
                 ./Setup haddock
                 unset LANG
-- 
GitLab


From bf3b9ccee35faf7d0e306b0a522edde280817c68 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 31 Aug 2013 11:00:08 +0200
Subject: [PATCH 0157/3789] pkgs/build-support/cabal: unconditionally set $LANG
 to "en_US.UTF-8" during Haskell builds

Haskell tools like Haddock require a locale to be configured, so do some
regression test suites.
---
 pkgs/build-support/cabal/default.nix | 12 ++++++------
 pkgs/top-level/haskell-packages.nix  |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 7f4d431c007..a1dc68e6484 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -1,6 +1,6 @@
 # generic builder for Cabal packages
 
-{ stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, jailbreakCabal
+{ stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, jailbreakCabal, glibcLocales
 , enableLibraryProfiling ? false
 , enableCheckPhase ? true
 }:
@@ -112,6 +112,10 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
               (stdenv.lib.enableFeature self.enableSplitObjs "split-objs")
             ] ++ stdenv.lib.optional (stdenv.lib.versionOlder "7" ghc.ghcVersion) (stdenv.lib.enableFeature self.doCheck "tests");
 
+            # GHC needs the locale configured during the Haddock phase.
+            LANG = "en_US.UTF-8";
+            LOCALE_ARCHIVE = lib.optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
+
             # compiles Setup and configures
             configurePhase = ''
               eval "$preConfigure"
@@ -150,11 +154,7 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
               ./Setup build
 
               export GHC_PACKAGE_PATH=$(${ghc.GHCPackages})
-              if [ -z "$noHaddock" ]; then
-                export LANG="en_US.UTF-8"
-                ./Setup haddock
-                unset LANG
-              fi
+              test -n "$noHaddock" || ./Setup haddock
 
               eval "$postBuild"
             '';
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 07623af281f..44b61666749 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -105,6 +105,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   cabal = callPackage ../build-support/cabal {
     enableLibraryProfiling = enableLibraryProfiling;
     enableCheckPhase = pkgs.stdenv.lib.versionOlder "7.4" self.ghc.ghcVersion;
+    glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null;
   };
 
   # A variant of the cabal build driver that disables unit testing.
-- 
GitLab


From ed507d70bc645461b78180b256b074955b30fc55 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 31 Aug 2013 11:01:04 +0200
Subject: [PATCH 0158/3789] haskell-modular-arithmetic: re-enable the Haddock
 phase for this package

---
 .../development/libraries/haskell/modular-arithmetic/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
index 7d53d81f7bb..c4a77630e6a 100644
--- a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
+++ b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
@@ -4,7 +4,6 @@ cabal.mkDerivation (self: {
   pname = "modular-arithmetic";
   version = "1.0.1.1";
   sha256 = "14n83kjmz8mqjivjhwxk1zckms5z3gn77yq2hsw2yybzff2vkdkd";
-  noHaddock = true;
   meta = {
     description = "A type for integers modulo some constant";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From 9475e4d50ac6f2d008d8067b18ca6c469fdf953c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 2 Sep 2013 15:45:29 +0200
Subject: [PATCH 0159/3789] llvm (merge amend): fix evaluation

Regular binutils now include gold.
---
 pkgs/development/compilers/llvm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index abd3277d919..9337f965c96 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils_gold }:
+{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils }:
 
 let version = "3.3"; in
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = with stdenv; [
     "-DCMAKE_BUILD_TYPE=Release"
     "-DLLVM_ENABLE_FFI=ON"
-    "-DLLVM_BINUTILS_INCDIR=${binutils_gold}/include"
+    "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
   ] ++ lib.optional (!isDarwin) [ "-DBUILD_SHARED_LIBS=ON" ];
 
   enableParallelBuilding = true;
-- 
GitLab


From c074433fc6f1d4ed9fed7a137ec495ad4e27968d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 2 Sep 2013 15:54:12 +0200
Subject: [PATCH 0160/3789] binutils: add support for x86_64 in i686 builds
 (close #857)

Also some style refactoring around repeating "stdenv.lib.optional*".
The author of the idea is @errge.
---
 .../tools/misc/binutils/default.nix           | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index e15a4502e52..179f28cfea9 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -3,8 +3,11 @@
 , deterministic ? false }:
 
 let basename = "binutils-2.23.2"; in
+
+with { inherit (stdenv.lib) optional optionals optionalString; };
+
 stdenv.mkDerivation rec {
-  name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}";
+  name = basename + optionalString (cross != null) "-${cross.config}";
 
   src = fetchurl {
     url = "mirror://gnu/binutils/${basename}.tar.bz2";
@@ -21,18 +24,18 @@ stdenv.mkDerivation rec {
     # That requires upstream changes for things to work. So we can patch it to
     # get the old behaviour by now.
     ./dtneeded.patch
-  ] ++ (stdenv.lib.optional deterministic ./deterministic.patch);
+  ] ++ optional deterministic ./deterministic.patch;
 
   buildInputs =
     [ zlib ]
-    ++ stdenv.lib.optional gold bison;
+    ++ optional gold bison;
 
   inherit noSysDirs;
 
   preConfigure = ''
     # Clear the default library search path.
     if test "$noSysDirs" = "1"; then
-	echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt
+        echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt
     fi
 
     # Use symlinks instead of hard links to save space ("strip" in the
@@ -46,15 +49,16 @@ stdenv.mkDerivation rec {
   # to the bootstrap-tools libgcc (as uses to happen on arm/mips)
   NIX_CFLAGS_COMPILE = "-static-libgcc";
 
-  configureFlags = "--disable-werror" # needed for dietlibc build
-      + stdenv.lib.optionalString (stdenv.system == "mips64el-linux")
-        " --enable-fix-loongson2f-nop"
-      + stdenv.lib.optionalString (cross != null) " --target=${cross.config}"
-      + stdenv.lib.optionalString gold " --enable-gold --enable-plugins"
-      + stdenv.lib.optionalString deterministic " --enable-deterministic-archives";
+  configureFlags = [ "--disable-werror" ] # needed for dietlibc build
+    ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop"
+    ++ optional (cross != null) "--target=${cross.config}"
+    ++ optionals gold [ "--enable-gold" "--enable-plugins" ]
+    ++ optional deterministic "--enable-deterministic-archives"
+    ++ optional (stdenv.system == "i686-linux") "--enable-targets=x86_64-linux-gnu"
+    ;
 
   enableParallelBuilding = true;
-      
+
   meta = {
     description = "GNU Binutils, tools for manipulating binaries (linker, assembler, etc.)";
 
-- 
GitLab


From 53a6b55945e3c4935b4642cd9548e5f346acecdc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 23:52:43 +0200
Subject: [PATCH 0161/3789] haskell-diagrams: revert "re-enable haddock
 documentation"

This reverts commit f735d9801d39ca273f118c31ee6efdae1c81babf.
---
 pkgs/development/libraries/haskell/diagrams/diagrams.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
index 107ef9ae85a..efa63bdc0b7 100644
--- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix
+++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     diagramsContrib diagramsCore diagramsLib diagramsSvg
   ];
+  noHaddock = true;
   jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
-- 
GitLab


From 7ca2ab26c690787c5f004205c274525368b11862 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:55:54 +0200
Subject: [PATCH 0162/3789] all-packages.nix: update to bison 3.x by default

Let's see what happens.
---
 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 c9537715be9..216969cb1dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3414,8 +3414,8 @@ let
   }));
 
   bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { };
-  bison3 = lowPrio (callPackage ../development/tools/parsing/bison/3.x.nix { });
-  bison = bison2;
+  bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { };
+  bison = bison3;
 
   buildbot = callPackage ../development/tools/build-managers/buildbot {
     inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate;
-- 
GitLab


From 701937b085d35caa87b63384b53fcb69b0d636de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 10:34:37 +0200
Subject: [PATCH 0163/3789] binutils: remove unused flex2535, bc, and dejagnu
 arguments

---
 pkgs/development/tools/misc/binutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 179f28cfea9..39fc28e4942 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, noSysDirs, zlib
-, cross ? null, gold ? true, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null
+, cross ? null, gold ? true, bison ? null
 , deterministic ? false }:
 
 let basename = "binutils-2.23.2"; in
-- 
GitLab


From 2c5851b633f386a1388a5436b42225b0dcbc454a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 10:38:27 +0200
Subject: [PATCH 0164/3789] Break an infinite recursion between flex and bison.

Flex needs bison, but bison's test suite also needs flex, so we use an
untested build of bison to bootstrap flex first.
---
 pkgs/top-level/all-packages.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 216969cb1dd..3cde58bd2ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3552,16 +3552,25 @@ let
 
   flex = flex2535;
 
-  flex2535 = callPackage ../development/tools/parsing/flex/flex-2.5.35.nix { };
+  flex2535 = callPackage ../development/tools/parsing/flex/flex-2.5.35.nix {
+    # Break infinite recursion: bison's test suite needs flex, so we
+    # use an untested bison build to build flex first.
+    yacc = bison.override { flex = null; };
+  };
 
-  flex2534 = callPackage ../development/tools/parsing/flex/flex-2.5.34.nix { };
+  flex2534 = callPackage ../development/tools/parsing/flex/flex-2.5.34.nix {
+    yacc = bison.override { flex = null; };
+  };
 
-  flex2533 = callPackage ../development/tools/parsing/flex/flex-2.5.33.nix { };
+  flex2533 = callPackage ../development/tools/parsing/flex/flex-2.5.33.nix {
+    yacc = bison.override { flex = null; };
+  };
 
   # Note: 2.5.4a is much older than 2.5.35 but happens first when sorting
   # alphabetically, hence the low priority.
   flex254a = lowPrio (import ../development/tools/parsing/flex/flex-2.5.4a.nix {
-    inherit fetchurl stdenv yacc;
+    inherit fetchurl stdenv;
+    yacc = bison.override { flex = null; };
   });
 
   m4 = gnum4;
-- 
GitLab


From 6451264e63917fdccdca3a4ad7ce0d9dd6d106ad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 10:39:56 +0200
Subject: [PATCH 0165/3789] Drop obsolete versions of flex: we only used the
 latest one, 2.5.35.

---
 .../flex/{flex-2.5.35.nix => default.nix}     |  0
 .../tools/parsing/flex/flex-2.5.33.nix        | 20 -------------------
 .../tools/parsing/flex/flex-2.5.34.nix        | 19 ------------------
 .../tools/parsing/flex/flex-2.5.4a.nix        | 12 -----------
 pkgs/top-level/all-packages.nix               | 19 +-----------------
 pkgs/top-level/release-small.nix              |  1 -
 pkgs/top-level/release.nix                    |  1 -
 7 files changed, 1 insertion(+), 71 deletions(-)
 rename pkgs/development/tools/parsing/flex/{flex-2.5.35.nix => default.nix} (100%)
 delete mode 100644 pkgs/development/tools/parsing/flex/flex-2.5.33.nix
 delete mode 100644 pkgs/development/tools/parsing/flex/flex-2.5.34.nix
 delete mode 100644 pkgs/development/tools/parsing/flex/flex-2.5.4a.nix

diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.35.nix b/pkgs/development/tools/parsing/flex/default.nix
similarity index 100%
rename from pkgs/development/tools/parsing/flex/flex-2.5.35.nix
rename to pkgs/development/tools/parsing/flex/default.nix
diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.33.nix b/pkgs/development/tools/parsing/flex/flex-2.5.33.nix
deleted file mode 100644
index 9be98689aea..00000000000
--- a/pkgs/development/tools/parsing/flex/flex-2.5.33.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# !!! this should be moved to default.nix eventually (but I delay
-# doing that since it would cause a rebuild of lots of stuff).
-
-{stdenv, fetchurl, yacc, m4}:
-
-assert yacc != null && m4 != null;
-
-stdenv.mkDerivation {
-  name = "flex-2.5.33";
-  src = fetchurl {
-    url = mirror://sourceforge/flex/flex-2.5.33.tar.bz2;
-    md5 = "343374a00b38d9e39d1158b71af37150";
-  };
-  buildInputs = [yacc];
-  propagatedBuildInputs = [m4];
-
-  meta = {
-    description = "A fast lexical analyser generator";
-  };
-}
diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.34.nix b/pkgs/development/tools/parsing/flex/flex-2.5.34.nix
deleted file mode 100644
index d56cf0c88a2..00000000000
--- a/pkgs/development/tools/parsing/flex/flex-2.5.34.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This should be moved to default.nix eventually (?)
-
-{stdenv, fetchurl, yacc, m4}:
-
-assert yacc != null && m4 != null;
-
-stdenv.mkDerivation {
-  name = "flex-2.5.34";
-  src = fetchurl {
-    url = mirror://sourceforge/flex/flex-2.5.34.tar.bz2;
-    sha256 = "1c8e64f32508841b0441ddfb139c4cfd25fee3728cadb63f5f351c6eb9b224a6";
-  };
-  buildInputs = [yacc];
-  propagatedBuildInputs = [m4];
-
-  meta = {
-    description = "A fast lexical analyser generator";
-  };
-}
diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix b/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix
deleted file mode 100644
index 13bb6834979..00000000000
--- a/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, yacc}:
-
-assert yacc != null;
-
-stdenv.mkDerivation {
-  name = "flex-2.5.4a";
-  src = fetchurl {
-    url = mirror://sourceforge/flex/flex-2.5.4a.tar.gz;
-    md5 = "bd8753d0b22e1f4ec87a553a73021adf";
-  };
-  buildInputs = [yacc];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cde58bd2ad..c7e371e7fd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3550,29 +3550,12 @@ let
 
   checkstyle = callPackage ../development/tools/analysis/checkstyle { };
 
-  flex = flex2535;
-
-  flex2535 = callPackage ../development/tools/parsing/flex/flex-2.5.35.nix {
+  flex = callPackage ../development/tools/parsing/flex {
     # Break infinite recursion: bison's test suite needs flex, so we
     # use an untested bison build to build flex first.
     yacc = bison.override { flex = null; };
   };
 
-  flex2534 = callPackage ../development/tools/parsing/flex/flex-2.5.34.nix {
-    yacc = bison.override { flex = null; };
-  };
-
-  flex2533 = callPackage ../development/tools/parsing/flex/flex-2.5.33.nix {
-    yacc = bison.override { flex = null; };
-  };
-
-  # Note: 2.5.4a is much older than 2.5.35 but happens first when sorting
-  # alphabetically, hence the low priority.
-  flex254a = lowPrio (import ../development/tools/parsing/flex/flex-2.5.4a.nix {
-    inherit fetchurl stdenv;
-    yacc = bison.override { flex = null; };
-  });
-
   m4 = gnum4;
 
   global = callPackage ../development/tools/misc/global { };
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 28d503d85fe..caf1bd60665 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -46,7 +46,6 @@ with import ./release-lib.nix { inherit supportedSystems; };
   file = all;
   findutils = all;
   flex = all;
-  flex2535 = all;
   gcc = all;
   gcc33 = linux;
   gcc34 = linux;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 1aae2ce4ee2..a9a45b9d57a 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -106,7 +106,6 @@ let
       file = all;
       findutils = all;
       flex = all;
-      flex2535 = all;
       fontforge = linux;
       fuse = linux;
       gajim = linux;
-- 
GitLab


From 445aa49c716c6373eca8b2395a10a2481718069e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Sep 2013 10:55:23 +0200
Subject: [PATCH 0166/3789] bison: prefer the tar.gz variant of the sources

Apparently, the bootstrapping stdenv cannot unpack xz-compressed tarfiles.
---
 pkgs/development/tools/parsing/bison/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index 9b1499c1537..ffc68a68f5f 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   name = "bison-3.0";
 
   src = fetchurl {
-    url = "mirror://gnu/bison/${name}.tar.xz";
-    sha256 = "1j14fqgi9wzqgsy4fhkcdrv4hv6rrvhvn84axs520w9b022mbb79";
+    url = "mirror://gnu/bison/${name}.tar.gz";
+    sha256 = "1ll22hcfslyl9n3pgvvphzdp18w9cyic8m0qimfnb8mrs1syrdz5";
   };
 
   nativeBuildInputs = [ m4 ] ++ stdenv.lib.optionals doCheck [perl flex];
-- 
GitLab


From b962caede7767bf4420fcb55224d02a46b6d5b30 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 15 Sep 2013 22:05:16 +0200
Subject: [PATCH 0167/3789] bison-3.x: fix build for good this time

 - Bison 3.x no longer compiles without Perl.

 - Don't try to run the test suite unless flex is available.
---
 pkgs/development/tools/parsing/bison/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index ffc68a68f5f..e80f903db12 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "1ll22hcfslyl9n3pgvvphzdp18w9cyic8m0qimfnb8mrs1syrdz5";
   };
 
-  nativeBuildInputs = [ m4 ] ++ stdenv.lib.optionals doCheck [perl flex];
+  nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optionals doCheck [ flex ];
   propagatedBuildInputs = [ m4 ];
 
-  doCheck = true;
+  doCheck = flex != null;
 
   meta = {
     homepage = "http://www.gnu.org/software/bison/";
-- 
GitLab


From 5bb361dde360e152ced6560727feb0d653707da3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Sep 2013 10:59:26 +0200
Subject: [PATCH 0168/3789] gstreamer: builds only with bison 2.x

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95ff09d7b7b..a08b99818ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4286,7 +4286,9 @@ let
     gstFfmpeg = pkgs.gst_ffmpeg;
   };
 
-  gstreamer = callPackage ../development/libraries/gstreamer/gstreamer {};
+  gstreamer = callPackage ../development/libraries/gstreamer/gstreamer {
+    bison = bison2;
+  };
 
   gst_plugins_base = callPackage ../development/libraries/gstreamer/gst-plugins-base {};
 
-- 
GitLab


From c8b32a6c88b97639463fa81b74513ea0f52e60e6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Sep 2013 10:59:39 +0200
Subject: [PATCH 0169/3789] all-packages.nix: string trailing whitespace

---
 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 a08b99818ef..82bb73f4d8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -266,7 +266,7 @@ let
   buildEnv = import ../build-support/buildenv {
     inherit (pkgs) runCommand perl;
   };
-  
+
   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;
@@ -9169,7 +9169,7 @@ let
   stardust = callPackage ../games/stardust {};
 
   steam = callPackage_i686 ../games/steam {};
-  
+
   steamChrootEnv = callPackage_i686 ../games/steam/chrootenv.nix {
     zenity = gnome2.zenity;
   };
-- 
GitLab


From a08837e9575620d519765e1783318e78e214c574 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Sep 2013 11:01:11 +0200
Subject: [PATCH 0170/3789] cln: update to version 1.3.3 to fix build with gcc
 4.8.x.

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

diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index 66629b0561b..f536e746d0e 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "cln-1.3.1";
+  name = "cln-1.3.3";
 
   src = fetchurl {
     url = "${meta.homepage}${name}.tar.bz2";
-    sha256 = "1sd8jy5vnmww537zq6g6i586ffslm7fjliz04krv6scapgklq6ca";
+    sha256 = "04i6kdjwm4cr5pa70pilifnpvsh430rrlapkgw1x8c5vxkijxz2p";
   };
 
   buildInputs = [ gmp ];
-- 
GitLab


From 613cf7923710a4af5ae992979d020a16cb2625be Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sat, 7 Sep 2013 10:38:36 +1000
Subject: [PATCH 0171/3789] esniper: fix build on darwin

---
 pkgs/applications/networking/esniper/default.nix | 15 +++++++--------
 pkgs/tools/networking/curl/default.nix           | 11 +++++++----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index 8208da621af..50a2764d375 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation {
   name = "esniper-2.28.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/esniper/esniper-2-28-0.tgz";
+    url    = "mirror://sourceforge/esniper/esniper-2-28-0.tgz";
     sha256 = "c2b0ccb757616b32f2d6cf54a4a5e367405fa7bcd6e6ed11835fe4f8a06a016b";
   };
 
-  buildInputs = [openssl curl];
+  buildInputs = [ openssl curl ];
 
   # Add support for CURL_CA_BUNDLE variable.
   patches = [ ./find-ca-bundle.patch ];
@@ -19,12 +19,11 @@ stdenv.mkDerivation {
     chmod 555 "$out/bin/snipe"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Simple, lightweight tool for sniping eBay auctions";
-    homepage = "http://esnipe.rsourceforge.net";
-    license = "GPLv2";
-
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    homepage    = http://esnipe.rsourceforge.net;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ lovek323 simons ];
+    platforms   = platforms.all;
   };
 }
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 74b0d026161..9902c1f1238 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -27,11 +27,13 @@ stdenv.mkDerivation rec {
     optional zlibSupport zlib ++
     optional gssSupport gss ++
     optional c-aresSupport c-ares ++
-    optional sslSupport openssl;
+    optional sslSupport openssl ++
+    optional scpSupport libssh2;
 
   preConfigure = ''
     sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
   '';
+
   configureFlags = [
       ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
       ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )
@@ -67,9 +69,10 @@ stdenv.mkDerivation rec {
     inherit sslSupport openssl;
   };
 
-  meta = {
-    homepage = "http://curl.haxx.se/";
+  meta = with stdenv.lib; {
     description = "A command line tool for transferring files with URL syntax";
-    platforms = stdenv.lib.platforms.all;
+    homepage    = http://curl.haxx.se/;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.all;
   };
 }
-- 
GitLab


From 2c7c65595d4ef4ce35529dd919a8224cdeafd873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 11 Sep 2013 09:25:10 +0200
Subject: [PATCH 0172/3789] Revert "binutils: minor update 2.23.1 -> .2"

This reverts commit 15f96c840f5ce71da5cb556d1aa76654e6b12dae.
See #909.

Conflicts (trivial, auto-resolved):
	pkgs/development/tools/misc/binutils/default.nix
---
 pkgs/development/tools/misc/binutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 39fc28e4942..300922384bd 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -2,7 +2,7 @@
 , cross ? null, gold ? true, bison ? null
 , deterministic ? false }:
 
-let basename = "binutils-2.23.2"; in
+let basename = "binutils-2.23.1"; in
 
 with { inherit (stdenv.lib) optional optionals optionalString; };
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/binutils/${basename}.tar.bz2";
-    sha256 = "15qhbkz3r266xaa52slh857qn3abw7rb2x2jnhpfrafpzrb4x4gy";
+    sha256 = "06bs5v5ndb4g5qx96d52lc818gkbskd1m0sz57314v887sqfbcia";
   };
 
   patches = [
-- 
GitLab


From 7c8ba7557c27c7d636e902dcfd1d4fdd6a64b493 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Sep 2013 19:27:22 +0200
Subject: [PATCH 0173/3789] ghc-7.6.3: cosmetic change to force a re-build

---
 pkgs/development/compilers/ghc/7.6.3.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix
index dc3a912a34a..69ce79496c9 100644
--- a/pkgs/development/compilers/ghc/7.6.3.nix
+++ b/pkgs/development/compilers/ghc/7.6.3.nix
@@ -24,9 +24,7 @@ stdenv.mkDerivation rec {
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '';
 
-  configureFlags = [
-    "--with-gcc=${stdenv.gcc}/bin/gcc"
-  ];
+  configureFlags = "--with-gcc='${stdenv.gcc}/bin/gcc'";
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-- 
GitLab


From 82ad48477c44d62e6a0867be7cdff93658b5d3f0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Sep 2013 21:45:16 +0200
Subject: [PATCH 0174/3789] Fix gfortran 4.7 build: texinfo 5.1 is not
 supported.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82bb73f4d8e..f16e3db38f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2428,6 +2428,7 @@ let
 
   gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 {
     inherit noSysDirs;
+    texinfo = texinfo4;
     # I'm not sure if profiling with enableParallelBuilding helps a lot.
     # We can enable it back some day. This makes the *gcc* builds faster now.
     profiledCompiler = false;
@@ -2445,7 +2446,7 @@ let
 
   gcc47_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 {
     stripped = false;
-
+    texinfo = texinfo4;
     inherit noSysDirs;
     cross = null;
     libcCross = null;
-- 
GitLab


From c3edfa427e7ae0efca7a2843a2ebc0dad5a23484 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Sep 2013 21:45:42 +0200
Subject: [PATCH 0175/3789] gfortran: update to 4.8.1

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f16e3db38f7..af73216027e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2489,7 +2489,7 @@ let
       stdenv = allStdenvs.stdenvNative;
     });
 
-  gfortran = gfortran47;
+  gfortran = gfortran48;
 
   gfortran43 = wrapGCC (gcc43.gcc.override {
     name = "gfortran";
@@ -2515,6 +2515,14 @@ let
     profiledCompiler = false;
   });
 
+  gfortran48 = wrapGCC (gcc48.gcc.override {
+    name = "gfortran";
+    langFortran = true;
+    langCC = false;
+    langC = false;
+    profiledCompiler = false;
+  });
+
   gcj = gcj47;
 
   gcj44 = wrapGCC (gcc44.gcc.override {
-- 
GitLab


From f998111d2c14a18a0435517855f46d1e2190c6e7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 21 Sep 2013 09:51:35 +0200
Subject: [PATCH 0176/3789] ghc-7.6.3: undo commit 7c8ba75

The change was supposed to trigger a re-build to fix a broken GHC binary
on the Hydra build farm, but now it turns out that the cause for the
errors we're seeing isn't GHC: all kinds of (non-Haskell) packages are
broken.
---
 pkgs/development/compilers/ghc/7.6.3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix
index 69ce79496c9..fb711f20251 100644
--- a/pkgs/development/compilers/ghc/7.6.3.nix
+++ b/pkgs/development/compilers/ghc/7.6.3.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '';
 
-  configureFlags = "--with-gcc='${stdenv.gcc}/bin/gcc'";
+  configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc";
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-- 
GitLab


From 8d6b23a60a4630c4f4473ef4979a859830fc9e8d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Sep 2013 16:27:44 +0200
Subject: [PATCH 0177/3789] gnum4: update to version 1.4.17

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

diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index d1b0d0e376e..a69c7f41751 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "gnum4-1.4.16";
+stdenv.mkDerivation rec {
+  name = "gnum4-1.4.17";
 
   src = fetchurl {
-    url = mirror://gnu/m4/m4-1.4.16.tar.bz2;
-    sha256 = "035r7ma272j2cwni2961jp22k6bn3n9xwn3b3qbcn2yrvlghql22";
+    url = "mirror://gnu/m4/${name}.tar.bz2";
+    sha256 = "0w0da1chh12mczxa5lnwzjk9czi3dq6gnnndbpa6w4rj76b1yklf";
   };
 
   doCheck = !stdenv.isDarwin
-- 
GitLab


From ee3dc2d0c9807b135d05b2356f6c23cad99206de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Sep 2013 16:32:26 +0200
Subject: [PATCH 0178/3789] gnum4: fix download URL

---
 pkgs/development/tools/misc/gnum4/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index a69c7f41751..db5b8cbef77 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "gnum4-1.4.17";
 
   src = fetchurl {
-    url = "mirror://gnu/m4/${name}.tar.bz2";
+    url = "mirror://gnu/m4/m4-1.4.17.tar.bz2";
     sha256 = "0w0da1chh12mczxa5lnwzjk9czi3dq6gnnndbpa6w4rj76b1yklf";
   };
 
-- 
GitLab


From e4f6e4b15d082dece20abd4d274d035f599d4cc2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Sep 2013 16:35:54 +0200
Subject: [PATCH 0179/3789] gnum4: drop obsolete patches

---
 pkgs/development/tools/misc/gnum4/default.nix |  2 +-
 .../tools/misc/gnum4/no-gets.patch            | 26 -------------------
 .../tools/misc/gnum4/readlink-EINVAL.patch    | 18 -------------
 3 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/gnum4/no-gets.patch
 delete mode 100644 pkgs/development/tools/misc/gnum4/readlink-EINVAL.patch

diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index db5b8cbef77..75e8e2dfe4f 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     && !stdenv.isSunOS;                    # XXX: `test-setlocale2.sh' fails
 
   # Upstream is aware of it; it may be in the next release.
-  patches = [ ./s_isdir.patch ./readlink-EINVAL.patch ./no-gets.patch ];
+  patches = [ ./s_isdir.patch ];
 
   meta = {
     homepage = http://www.gnu.org/software/m4/;
diff --git a/pkgs/development/tools/misc/gnum4/no-gets.patch b/pkgs/development/tools/misc/gnum4/no-gets.patch
deleted file mode 100644
index 456c08b56c3..00000000000
--- a/pkgs/development/tools/misc/gnum4/no-gets.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-devel/m4/files/m4-1.4.16-no-gets.patch?revision=1.1
-
-https://bugs.gentoo.org/424978
-
-hack until m4 pulls a newer gnulib version
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
-
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -125,7 +125,6 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/pkgs/development/tools/misc/gnum4/readlink-EINVAL.patch b/pkgs/development/tools/misc/gnum4/readlink-EINVAL.patch
deleted file mode 100644
index dd371584a79..00000000000
--- a/pkgs/development/tools/misc/gnum4/readlink-EINVAL.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Newer Linux kernels would return EINVAL instead of ENOENT.
-The patch below, taken from Gnulib, allows the test to pass when
-these Linux versions are in use:
-https://lists.gnu.org/archive/html/bug-gnulib/2011-03/msg00308.html .
-
-diff --git a/tests/test-readlink.h b/tests/test-readlink.h
-index 08d5662..7247fc4 100644
---- a/tests/test-readlink.h
-+++ b/tests/test-readlink.h
-@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char const *, char *, size_t), bool print)
-   ASSERT (errno == ENOENT);
-   errno = 0;
-   ASSERT (func ("", buf, sizeof buf) == -1);
--  ASSERT (errno == ENOENT);
-+  ASSERT (errno == ENOENT || errno == EINVAL);
-   errno = 0;
-   ASSERT (func (".", buf, sizeof buf) == -1);
-   ASSERT (errno == EINVAL);
-- 
GitLab


From 46a7b1ea0a8cfc636207f1f66ac2a95662dd064a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Sep 2013 11:14:27 +0200
Subject: [PATCH 0180/3789] gettext: fix minor errors after merge

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

diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 19a3a0f18b3..eea4e45a946 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -70,11 +70,11 @@ stdenv.mkDerivation (rec {
   };
 }
 
-// optionalAttrs stdenv.isDarwin {
+// stdenv.lib.optionalAttrs stdenv.isDarwin {
   makeFlags = "CFLAGS=-D_FORTIFY_SOURCE=0";
 }
 
-// optionalAttrs stdenv.isCygwin {
+// stdenv.lib.optionalAttrs stdenv.isCygwin {
   patchPhase =
    # Make sure `error.c' gets compiled and is part of `libgettextlib.la'.
    # This fixes:
-- 
GitLab


From 2456150c1e88e6b2909a2ce3385c3b709246739a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Sep 2013 11:14:42 +0200
Subject: [PATCH 0181/3789] gettext: strip trailing whitespace

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

diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index eea4e45a946..4d400a6ea7d 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation (rec {
   name = "gettext-0.18.2";
-  
+
   src = fetchurl {
     url = "mirror://gnu/gettext/${name}.tar.gz";
     sha256 = "516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c";
@@ -31,9 +31,9 @@ stdenv.mkDerivation (rec {
   '';
 
   buildInputs = [ xz ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
-  
+
   enableParallelBuilding = true;
-      
+
   crossAttrs = {
     buildInputs = stdenv.lib.optional (stdenv.gccCross.libc ? libiconv)
       stdenv.gccCross.libc.libiconv.crossDrv;
-- 
GitLab


From 0adae9f822e93b0a7507619426119173d2ec001d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 24 Sep 2013 23:06:49 +0200
Subject: [PATCH 0182/3789] llvm: add support for R600

It will be useful for mesa >= 9.2.*
Also, I want to restart the build on Hydra, as it succeeds for me.
---
 pkgs/development/compilers/llvm/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 9337f965c96..a7129f5cef3 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
     "-DCMAKE_BUILD_TYPE=Release"
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
-  ] ++ lib.optional (!isDarwin) [ "-DBUILD_SHARED_LIBS=ON" ];
+    "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=R600" # for mesa
+  ] ++ lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
 
   enableParallelBuilding = true;
 
-- 
GitLab


From fc991159d874f7671a1d020238ab3085cd6b83cd Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 25 Sep 2013 20:02:41 +0200
Subject: [PATCH 0183/3789] vimPlugins.YouCompleteMe: update to ee12530df0

---
 pkgs/misc/vim-plugins/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index af4363f9217..4064725b830 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 }:
+{ fetchurl, fetchgit, stdenv, python, cmake, vim, perl, ruby, unzip }:
 
 /*
 About Vim and plugins
@@ -110,10 +110,13 @@ in
   };
 
   YouCompleteMe = stdenv.mkDerivation {
-    # REGION AUTO UPDATE: { name="youcompleteme"; type="git"; url="git://github.com/Valloric/YouCompleteMe"; }
-    src = (fetchurl { url = "http://mawercer.de/~nix/repos/youcompleteme-git-97306.tar.bz2"; sha256 = "b9b892f5a723370c2034491dc72a4ca722c6cf1e5de4d60501141bba151bc719"; });
-    name = "youcompleteme-git-97306";
-    # END
+    src = fetchgit {
+      url = "https://github.com/Valloric/YouCompleteMe.git";
+      rev = "ee12530df0574e18289d6daf25ff72bd3c6e94f5";
+      sha256 = "1z93l2v0s078h632jrlhxzs9pg8phnx60qlrrhb3l2nbfk047rgx";
+    };
+
+    name = "youcompleteme-git-ee12530df0";
     buildInputs = [ python cmake ];
 
     configurePhase = ":";
-- 
GitLab


From 8ff38552042a6d7c6572d2013ef9e6715caef770 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 28 Sep 2013 10:36:34 +0200
Subject: [PATCH 0184/3789] texinfo: update to version 5.2

---
 pkgs/development/tools/misc/texinfo/{5.1.nix => 5.2.nix} | 4 ++--
 pkgs/top-level/all-packages.nix                          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/tools/misc/texinfo/{5.1.nix => 5.2.nix} (93%)

diff --git a/pkgs/development/tools/misc/texinfo/5.1.nix b/pkgs/development/tools/misc/texinfo/5.2.nix
similarity index 93%
rename from pkgs/development/tools/misc/texinfo/5.1.nix
rename to pkgs/development/tools/misc/texinfo/5.2.nix
index cbb10830188..31f81cbf3af 100644
--- a/pkgs/development/tools/misc/texinfo/5.1.nix
+++ b/pkgs/development/tools/misc/texinfo/5.2.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, perl, xz }:
 
 stdenv.mkDerivation rec {
-  name = "texinfo-5.1";
+  name = "texinfo-5.2";
 
   src = fetchurl {
     url = "mirror://gnu/texinfo/${name}.tar.xz";
-    sha256 = "0864v5i488x3mb3v5p6nhy2kw0mqkzpa3b0453iibj81zlpq078q";
+    sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
   };
 
   buildInputs = [ ncurses perl xz ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46466f0de1f..5ed8d312747 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3767,9 +3767,9 @@ let
 
   texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
   texinfo49 = callPackage ../development/tools/misc/texinfo/4.9.nix { };
-  texinfo5 = callPackage ../development/tools/misc/texinfo/5.1.nix { };
-  texinfo = texinfo5;
+  texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
   texinfo4 = texinfo413;
+  texinfo = texinfo5;
 
   texi2html = callPackage ../development/tools/misc/texi2html { };
 
-- 
GitLab


From b15c3e49e59a0dc8516480589ee0da385c9ca5d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 28 Sep 2013 10:37:05 +0200
Subject: [PATCH 0185/3789] texinfo: remove obsolete version 4.9

---
 pkgs/development/tools/misc/texinfo/4.9.nix | 10 ----------
 pkgs/top-level/all-packages.nix             |  1 -
 2 files changed, 11 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/texinfo/4.9.nix

diff --git a/pkgs/development/tools/misc/texinfo/4.9.nix b/pkgs/development/tools/misc/texinfo/4.9.nix
deleted file mode 100644
index fd42093e561..00000000000
--- a/pkgs/development/tools/misc/texinfo/4.9.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl, ncurses}:
-
-stdenv.mkDerivation {
-  name = "texinfo-4.9";
-  src = fetchurl {
-    url = mirror://gnu/texinfo/texinfo-4.9.tar.bz2;
-    sha256 = "0h7q9h405m88fjj067brzniiv8306ryl087pgjpmbpd2jci9h6g7";
-  };
-  buildInputs = [ncurses];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ed8d312747..8b2050b3f8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3766,7 +3766,6 @@ let
   tcptrack = callPackage ../development/tools/misc/tcptrack { };
 
   texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
-  texinfo49 = callPackage ../development/tools/misc/texinfo/4.9.nix { };
   texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
   texinfo4 = texinfo413;
   texinfo = texinfo5;
-- 
GitLab


From 2fb919fb5a1ccd2f7b59bd1b7ecc509b6b6ac796 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Oct 2013 18:09:34 +0200
Subject: [PATCH 0186/3789] gmp: update to version 5.1.3

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

diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index eed78855802..a25eabbee86 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, m4, cxx ? true }:
 
 stdenv.mkDerivation rec {
-  name = "gmp-5.1.2";
+  name = "gmp-5.1.3";
 
   src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv
     urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ];
-    sha256 = "13qv3ihk3ykbh2fkb4z8m0q188y3hq1amsj25fn5hgpgckmdx690";
+    sha256 = "0q5i39pxrasgn9qdxzpfbwhh11ph80p57x6hf48m74261d97j83m";
   };
 
   nativeBuildInputs = [ m4 ];
-- 
GitLab


From 3996256c264afa2e73291c7af46969a1a6011f10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 8 Oct 2013 20:47:04 +0200
Subject: [PATCH 0187/3789] gfortan: remove unused versions, use 4.7 by default

4.8 still doesn't build, so let's use 4.7 in the meantime.
---
 pkgs/top-level/all-packages.nix | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08282811d14..ce04004a9db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2512,23 +2512,7 @@ let
       stdenv = allStdenvs.stdenvNative;
     });
 
-  gfortran = gfortran48;
-
-  gfortran43 = wrapGCC (gcc43.gcc.override {
-    name = "gfortran";
-    langFortran = true;
-    langCC = false;
-    langC = false;
-    profiledCompiler = false;
-  });
-
-  gfortran44 = wrapGCC (gcc44.gcc.override {
-    name = "gfortran";
-    langFortran = true;
-    langCC = false;
-    langC = false;
-    profiledCompiler = false;
-  });
+  gfortran = gfortran47; # 48 has problems building ATM
 
   gfortran47 = wrapGCC (gcc47.gcc.override {
     name = "gfortran";
-- 
GitLab


From e855ac5070fa594e1db5ebdf1ea9caef65163c4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 8 Oct 2013 20:52:19 +0200
Subject: [PATCH 0188/3789] gcc: don't use profiling on darwin

Darwin seems to have problems on Hydra, maybe because of this.
---
 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 ce04004a9db..711f1989407 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2480,7 +2480,7 @@ let
     inherit noSysDirs;
 
     # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
-    profiledCompiler = with stdenv; (isi686 || isx86_64);
+    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
-- 
GitLab


From 59a5f6307dbd0cd1d97fc34aba5fc2723f129235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 8 Oct 2013 20:58:34 +0200
Subject: [PATCH 0189/3789] pcre: disable tests for freeBSDs, as we're running
 out of stack

---
 pkgs/development/libraries/pcre/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index b6813070cec..a8a89a4569c 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -18,7 +18,9 @@ stdenv.mkDerivation rec {
     ${if !cplusplusSupport then "--disable-cpp" else ""}
   '' + stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-O0";
 
-  doCheck = !stdenv.isCygwin;                   # XXX: test failure on Cygwin
+  doCheck = with stdenv; !(isCygwin || isFreeBSD);
+    # XXX: test failure on Cygwin
+    # we are running out of stack on both freeBSDs on Hydra
 
   meta = {
     homepage = "http://www.pcre.org/";
-- 
GitLab


From bff31016071e451f8bc8fe2c15196d885687180b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:55:19 +0200
Subject: [PATCH 0190/3789] gnutar: update to version 1.27

---
 pkgs/tools/archivers/gnutar/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 446c8933d5b..173b983d877 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gnutar-1.26";
+  name = "gnutar-1.27";
 
   src = fetchurl {
-    url = "mirror://gnu/tar/tar-1.26.tar.bz2";
-    sha256 = "0hbdkzmchq9ycr2x1pxqdcgdbaxksh8c6ac0jf75jajhcks6jlss";
+    url = "mirror://gnu/tar/tar-1.27.tar.bz2";
+    sha256 = "0yrwmx2f721ahpnki4fnzvnmrd3md3bq417icb4wrjky7k3caf12";
   };
 
   patches = [ ./gets-undeclared.patch ];
-- 
GitLab


From e3b9ec93a0b6a5a568544328664612d376d929b1 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 Oct 2013 13:42:50 +0200
Subject: [PATCH 0191/3789] vigra: fix build with newer gcc via update

This fixes libreoffice build on my machine.
---
 pkgs/development/libraries/vigra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 83b921dd49b..5130abc9a96 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, libtiff, libpng, libjpeg, doxygen, python,
   fftw, fftwSinglePrec, hdf5, boost, numpy }:
 stdenv.mkDerivation rec {
-  name = "vigra-1.8.0";
+  name = "vigra-1.9.0";
 
   src = fetchurl {
     url = "${meta.homepage}/${name}-src.tar.gz";
-    sha256 = "0542qy1bqaq73l7i8aqdhwdbhd6m1wldsn1w2sfyf8yf4398ffpw";
+    sha256 = "00fg64da6dj9k42d90dz6y7x91xw1xqppcla14im74m4afswrgcg";
   };
 
   buildInputs = [ cmake fftw fftwSinglePrec libtiff libpng libjpeg python boost
-- 
GitLab


From 296e2857f7770c3140135e43742214fffa044ad4 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 9 Oct 2013 14:05:08 +0200
Subject: [PATCH 0192/3789] inkscape: remove unused patch

---
 .../graphics/inkscape/libpng-1.5.patch        | 47 -------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 pkgs/applications/graphics/inkscape/libpng-1.5.patch

diff --git a/pkgs/applications/graphics/inkscape/libpng-1.5.patch b/pkgs/applications/graphics/inkscape/libpng-1.5.patch
deleted file mode 100644
index 4c8a7ee5f9b..00000000000
--- a/pkgs/applications/graphics/inkscape/libpng-1.5.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Source: upstream revisions 10061 and 10707
-
---- a/src/sp-image.cpp	2011-02-21 07:59:34 +0000
-+++ b/src/sp-image.cpp	2011-02-21 08:57:28 +0000
-@@ -387,9 +387,13 @@
- 
- #if defined(PNG_iCCP_SUPPORTED)
-                 {
--                    char* name = 0;
-+                    png_charp name = 0;
-                     int compression_type = 0;
--                    char* profile = 0;
-+#if (PNG_LIBPNG_VER < 10500)
-+                    png_charp profile = 0;
-+#else
-+                    png_bytep profile = 0;
-+#endif
-                     png_uint_32 proflen = 0;
-                     if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
- //                                         g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
-
---- a/src/extension/internal/pdfinput/svg-builder.cpp	2011-10-27 04:55:51 +0000
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp	2011-10-29 20:34:00 +0000
-@@ -1481,7 +1481,7 @@
-         return NULL;
-     }
-     // Set error handler
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         return NULL;
-     }
-
---- a/src/helper/png-write.cpp	2011-08-07 10:53:12 +0000
-+++ b/src/helper/png-write.cpp	2011-10-29 20:34:00 +0000
-@@ -166,8 +166,8 @@
-     /* Set error handling.  REQUIRED if you aren't supplying your own
-      * error hadnling functions in the png_create_write_struct() call.
-      */
--    if (setjmp(png_ptr->jmpbuf)) {
--        /* If we get here, we had a problem reading the file */
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-+        // If we get here, we had a problem reading the file
-         fclose(fp);
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         return false;
-
-- 
GitLab


From 1772bcebc1cda290fb6079391dcef3a3e0f2912d Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 9 Oct 2013 14:05:53 +0200
Subject: [PATCH 0193/3789] inkscape: fix typo in upstream sources.

fixes stdenv-updates
---
 pkgs/applications/graphics/inkscape/default.nix       |  4 ++++
 .../graphics/inkscape/spuriouscomma.patch             | 11 +++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/applications/graphics/inkscape/spuriouscomma.patch

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 37905f8a73f..478a0ff7e50 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
 
   patches = [ ./configure-python-libs.patch ];
 
+  postPatch = ''
+    patch -p0 < ${./spuriouscomma.patch}
+  '';
+
   propagatedBuildInputs = [
     # Python is used at run-time to execute scripts, e.g., those from
     # the "Effects" menu.
diff --git a/pkgs/applications/graphics/inkscape/spuriouscomma.patch b/pkgs/applications/graphics/inkscape/spuriouscomma.patch
new file mode 100644
index 00000000000..bc538068f9e
--- /dev/null
+++ b/pkgs/applications/graphics/inkscape/spuriouscomma.patch
@@ -0,0 +1,11 @@
+--- src/widgets/desktop-widget.h~	2011-07-08 13:25:09.000000000 -0500
++++ src/widgets/desktop-widget.h	2013-02-15 16:04:45.806910365 -0600
+@@ -239,7 +239,7 @@
+ private:
+     GtkWidget *tool_toolbox;
+     GtkWidget *aux_toolbox;
+-    GtkWidget *commands_toolbox,;
++    GtkWidget *commands_toolbox;
+     GtkWidget *snap_toolbox;
+ 
+     static void init(SPDesktopWidget *widget);
-- 
GitLab


From ef3cc83d1e2cd391f1d75c4ba642a45d91738775 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 9 Oct 2013 08:15:39 +0200
Subject: [PATCH 0194/3789] zsnes: patches for modern gcc & libpng

builds fine on stdenv-updates now
needs gcc 4.8+, so keep this commit on stdenv-updates until merge
---
 pkgs/misc/emulators/zsnes/default.nix         | 32 +++-----
 .../emulators/zsnes/zsnes-1.51-libpng15.patch | 12 +++
 pkgs/misc/emulators/zsnes/zsnes.patch         | 80 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 106 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/misc/emulators/zsnes/zsnes-1.51-libpng15.patch
 create mode 100644 pkgs/misc/emulators/zsnes/zsnes.patch

diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix
index 0b34fc0f9fe..a2896e70d17 100644
--- a/pkgs/misc/emulators/zsnes/default.nix
+++ b/pkgs/misc/emulators/zsnes/default.nix
@@ -2,33 +2,27 @@
 
 stdenv.mkDerivation {
   name = "zsnes-1.51";
-  
+
   src = fetchurl {
     url = mirror://sourceforge/zsnes/zsnes151src.tar.bz2;
     sha256 = "08s64qsxziv538vmfv38fg1rfrz5k95dss5zdkbfxsbjlbdxwmi8";
   };
 
-  buildInputs = [ nasm SDL zlib libpng ncurses mesa ];
-  
+  # copied from arch linux, fixes gcc-4.8 compatibility
+  patches = [ ./zsnes.patch ];
+
+  postPatch = ''
+    patch -p0 < ${./zsnes-1.51-libpng15.patch}
+  '';
+
   preConfigure = ''
     cd src
-    
-    # Fix for undefined strncasecmp()
-    echo '#include <strings.h>' > tmp.cpp 
-    cat tmp.cpp tools/strutil.h > tools/strutil.h.new
-    mv tools/strutil.h.new tools/strutil.h
-    
-    # Fix for undefined system()
-    echo '#include <stdlib.h>' > tmp.cpp
-    cat tmp.cpp tools/depbuild.cpp > tools/depbuild.cpp.new
-    mv tools/depbuild.cpp.new tools/depbuild.cpp
-    
-    # Fix for lots of undefined strcmp, strncmp etc.
-    echo '#include <string.h>' > tmp.cpp 
-    cat tmp.cpp parsegen.cpp > parsegen.cpp.new
-    mv parsegen.cpp.new parsegen.cpp
   '';
-  
+
+  buildInputs = [ nasm SDL zlib libpng ncurses mesa ];
+
+  configureFlags = "--enable-release";
+
   meta = {
     description = "A Super Nintendo Entertainment System Emulator";
     license = "GPLv2+";
diff --git a/pkgs/misc/emulators/zsnes/zsnes-1.51-libpng15.patch b/pkgs/misc/emulators/zsnes/zsnes-1.51-libpng15.patch
new file mode 100644
index 00000000000..b32c3096754
--- /dev/null
+++ b/pkgs/misc/emulators/zsnes/zsnes-1.51-libpng15.patch
@@ -0,0 +1,12 @@
+Use existing png_set_IHDR() and stop accessing PNG structure members directly
+
+--- src/zip/zpng.c
++++ src/zip/zpng.c
+@@ -129,7 +129,6 @@
+         png_set_IHDR(png_ptr, info_ptr, width, height, 8,
+                      PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
+                      PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+-        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+ 
+         //Allocate an array of scanline pointers
+         row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep));
diff --git a/pkgs/misc/emulators/zsnes/zsnes.patch b/pkgs/misc/emulators/zsnes/zsnes.patch
new file mode 100644
index 00000000000..d5d681ae67a
--- /dev/null
+++ b/pkgs/misc/emulators/zsnes/zsnes.patch
@@ -0,0 +1,80 @@
+diff -aur zsnes_1_51//src/Makefile.in zsnes_1_51_new//src/Makefile.in
+--- zsnes_1_51//src/Makefile.in	2007-01-24 21:54:12.000000000 +0100
++++ zsnes_1_51_new//src/Makefile.in	2010-09-06 00:03:04.715810431 +0200
+@@ -95,7 +95,7 @@
+ %.o: %.cpp
+ 	@CXX@ @CXXFLAGS@ -o $@ -c $<
+ %.o %.h: %.psr $(PSR)
+-	./$(PSR) @PSRFLAGS@ -gcc @CC@ -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $<
++	./$(PSR) @PSRFLAGS@ -gcc "@CC@" -compile -flags "@CFLAGS@ -O1 -D_FORTIFY_SOURCE=0" -cheader $*.h -fname $* $*.o $<
+ 
+ default: main
+ all: main tools
+@@ -133,7 +133,7 @@
+ 
+ include makefile.dep
+ makefile.dep: $(TOOL_D)/depbuild Makefile
+-	$(TOOL_D)/depbuild @CC@ "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
++	$(TOOL_D)/depbuild "@CC@" "@CFLAGS@" "@NASMPATH@" "@NFLAGS@" $(Z_OBJS) > makefile.dep
+ 
+ Makefile: Makefile.in config.status
+ 	./config.status
+diff -aur zsnes_1_51//src/parsegen.cpp zsnes_1_51_new//src/parsegen.cpp
+--- zsnes_1_51//src/parsegen.cpp	2007-10-31 05:30:26.000000000 +0100
++++ zsnes_1_51_new//src/parsegen.cpp	2010-09-05 15:48:36.903333444 +0200
+@@ -19,6 +19,9 @@
+ Config file handler creator by Nach (C) 2005-2007
+ */
+ 
++#include <cstring>
++#include <cstdlib>
++
+ #if !defined(__GNUC__) && !defined(_MSC_VER)
+ #error You are using an unsupported compiler
+ #endif
+@@ -1822,7 +1825,7 @@
+   }
+ }
+ 
+-int main(size_t argc, const char *const *const argv)
++int main(int argc, const char *const *const argv)
+ {
+   const char *cheader_file = 0;
+   bool compile = false;
+diff -aur zsnes_1_51//src/tools/depbuild.cpp zsnes_1_51_new//src/tools/depbuild.cpp
+--- zsnes_1_51//src/tools/depbuild.cpp	2006-12-27 12:04:05.000000000 +0100
++++ zsnes_1_51_new//src/tools/depbuild.cpp	2010-09-05 15:48:36.903333444 +0200
+@@ -183,7 +183,7 @@
+   }
+ }
+ 
+-int main(size_t argc, const char *const *const argv)
++int main(int argc, const char *const *const argv)
+ {
+   if (argc < 5)
+   {
+diff -aur zsnes_1_51//src/tools/strutil.h zsnes_1_51_new//src/tools/strutil.h
+--- zsnes_1_51//src/tools/strutil.h	2006-12-27 12:04:05.000000000 +0100
++++ zsnes_1_51_new//src/tools/strutil.h	2010-09-05 15:48:36.903333444 +0200
+@@ -15,6 +15,9 @@
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#include <cstring>
++#include <cstdlib>
++
+ /*
+ This is part of a toolkit used to assist in ZSNES development
+ */
+diff -u -r zsnes_1_51/src/tools/depbuild.cpp zsnes_1_51-fix/src/tools/depbuild.cpp
+--- zsnes_1_51/src/tools/depbuild.cpp	2006-12-27 12:04:05.000000000 +0100
++++ zsnes_1_51-fix/src/tools/depbuild.cpp	2012-07-14 16:20:17.759886250 +0200
+@@ -26,6 +26,8 @@
+ #include <cstdio>
+ using namespace std;
+ 
++#include <unistd.h>
++
+ #include "fileutil.h"
+ #include "strutil.h"
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 711f1989407..a1cd316ac97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10130,9 +10130,7 @@ let
 
   znc = callPackage ../applications/networking/znc { };
 
-  zsnes = callPackage_i686 ../misc/emulators/zsnes {
-    libpng = libpng12;
-  };
+  zsnes = callPackage_i686 ../misc/emulators/zsnes { };
 
   misc = import ../misc/misc.nix { inherit pkgs stdenv; };
 
-- 
GitLab


From b0f13e99c365983bfd46032d1a15147ff041345a Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 9 Oct 2013 11:48:54 +0200
Subject: [PATCH 0195/3789] wine: doesn't build with bison3

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1cd316ac97..7d129ac55a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10080,7 +10080,9 @@ let
   VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
 
   # Wine cannot be built in 64-bit; use a 32-bit build instead.
-  wine = callPackage_i686 ../misc/emulators/wine { };
+  wine = callPackage_i686 ../misc/emulators/wine {
+    bison = bison2;
+  };
 
   # winetricks is a shell script with no binary components. Safe to just use the current platforms
   # build instead of the i686 specific build.
-- 
GitLab


From 134776e5e97aa92a7bf9e4d9be9bf4b0c2e6060a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 18 Oct 2013 11:13:17 +0200
Subject: [PATCH 0196/3789] gnutar: drop obsolete gets-undeclared.patch

---
 pkgs/tools/archivers/gnutar/default.nix       |  2 --
 .../archivers/gnutar/gets-undeclared.patch    | 26 -------------------
 2 files changed, 28 deletions(-)
 delete mode 100644 pkgs/tools/archivers/gnutar/gets-undeclared.patch

diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 173b983d877..8735702dd33 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "0yrwmx2f721ahpnki4fnzvnmrd3md3bq417icb4wrjky7k3caf12";
   };
 
-  patches = [ ./gets-undeclared.patch ];
-
   # May have some issues with root compilation because the bootstrap tool
   # cannot be used as a login shell for now.
   FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1";
diff --git a/pkgs/tools/archivers/gnutar/gets-undeclared.patch b/pkgs/tools/archivers/gnutar/gets-undeclared.patch
deleted file mode 100644
index 301a09dde12..00000000000
--- a/pkgs/tools/archivers/gnutar/gets-undeclared.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This patch is needed to allow builds with newer versions of
-the GNU libc (2.16+).
-
-This is a backport of this patch:
-
-commit 66712c23388e93e5c518ebc8515140fa0c807348
-Author: Eric Blake <eblake@redhat.com>
-Date:   Thu Mar 29 13:30:41 2012 -0600
-
-    stdio: don't assume gets any more
-    
---- tar-1.26/gnu/stdio.in.h	2012-07-02 14:28:45.000000000 +0200
-+++ tar-1.26/gnu/stdio.in.h	2012-07-02 14:28:50.000000000 +0200
-@@ -160,12 +160,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not
-                  "use gnulib module fflush for portable POSIX compliance");
- #endif
- 
--/* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
--#undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
--
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-- 
GitLab


From e9163ad4c95ff58f0480079d646fa4fb31bcf05a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 18 Oct 2013 18:39:04 +0200
Subject: [PATCH 0197/3789] ghc: configure RPATH that allows ghc's shared
 libraries to find each other

Prior to this patch, libHSrts.so didn't know how to load libffi.so.
See issue #1081 for further details.
---
 pkgs/development/compilers/ghc/7.4.2.nix | 1 +
 pkgs/development/compilers/ghc/7.6.3.nix | 1 +
 pkgs/development/compilers/ghc/head.nix  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix
index 51f3f7f9df4..0bc2a855306 100644
--- a/pkgs/development/compilers/ghc/7.4.2.nix
+++ b/pkgs/development/compilers/ghc/7.4.2.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
   '';
 
   configureFlags=[
diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix
index fb711f20251..427d21660b8 100644
--- a/pkgs/development/compilers/ghc/7.6.3.nix
+++ b/pkgs/development/compilers/ghc/7.6.3.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
   '';
 
   configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc";
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index c9cd71fc2b5..37bcde17232 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
   '';
 
   configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc";
-- 
GitLab


From ea6f711e8ec7208626a084edb81a78ee455a0b67 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 18 Oct 2013 18:46:00 +0200
Subject: [PATCH 0198/3789] isl: update download url

This patch fixes issue #1091.
---
 pkgs/development/libraries/isl/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix
index 9097df78de3..9242af95e27 100644
--- a/pkgs/development/libraries/isl/default.nix
+++ b/pkgs/development/libraries/isl/default.nix
@@ -4,11 +4,8 @@ stdenv.mkDerivation rec {
   name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08.
 
   src = fetchurl {
-    urls = [
-        "http://www.kotnet.org/~skimo/isl/${name}.tar.bz2"
-        "ftp://ftp.linux.student.kuleuven.be/pub/people/skimo/isl/${name}.tar.bz2"
-      ];
-    sha256 = "095f4b54c88ca13a80d2b025d9c551f89ea7ba6f6201d701960bfe5c1466a98d";
+    url = "http://pkgs.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2";
+    sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9";
   };
 
   buildInputs = [ gmp ];
-- 
GitLab


From 82bc91a548ad91241f42cefc528c5d5bffed2f5a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 19 Oct 2013 13:48:33 +0200
Subject: [PATCH 0199/3789] build-support/cabal: add an option to enable shared
 library support

enableSharedLibraries configures Cabal to build of shared libraries. This
option requires that all dependencies of the package have been compiled
for use in shared libraries, too.

enableSharedExecutables configures Cabal to prefer shared libraries when
linking executables.

This patch partly fixes issue #1084.
---
 pkgs/build-support/cabal/default.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index a1dc68e6484..6794a7a4be1 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -2,6 +2,8 @@
 
 { stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, jailbreakCabal, glibcLocales
 , enableLibraryProfiling ? false
+, enableSharedLibraries ? false
+, enableSharedExecutables ? false
 , enableCheckPhase ? true
 }:
 
@@ -42,8 +44,12 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
             # if that is not desired (for applications), name can be set to
             # fname.
             name = if self.isLibrary then
-                     if enableLibraryProfiling then
+                     if enableLibraryProfiling && self.enableSharedLibraries then
+                       "haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}-profiling-shared"
+                     else if enableLibraryProfiling && !self.enableSharedLibraries then
                        "haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}-profiling"
+                     else if !enableLibraryProfiling && self.enableSharedLibraries then
+                       "haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}-shared"
                      else
                        "haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}"
                    else
@@ -107,8 +113,18 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
             # and run any regression test suites the package might have
             doCheck = enableCheckPhase;
 
+            # pass the '--enable-shared' flag to cabal in the configure
+            # stage to enable building shared libraries
+            inherit enableSharedLibraries;
+
+            # pass the '--enable-executable-dynamic' flag to cabal in
+            # the configure stage to enable linking shared libraries
+            inherit enableSharedExecutables;
+
             extraConfigureFlags = [
               (stdenv.lib.enableFeature enableLibraryProfiling "library-profiling")
+              (stdenv.lib.enableFeature self.enableSharedLibraries "shared")
+              (stdenv.lib.enableFeature self.enableSharedExecutables "executable-dynamic")
               (stdenv.lib.enableFeature self.enableSplitObjs "split-objs")
             ] ++ stdenv.lib.optional (stdenv.lib.versionOlder "7" ghc.ghcVersion) (stdenv.lib.enableFeature self.doCheck "tests");
 
-- 
GitLab


From 3ec00b51f802393aeb889e3f85bb9deaeb8bfe84 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 19 Oct 2013 15:10:27 +0200
Subject: [PATCH 0200/3789] gcc: update to 4.8.x branch to 4.8.2

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

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 1435277c105..3e4a9bb030c 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -52,7 +52,7 @@ assert langGo -> langCC;
 with stdenv.lib;
 with builtins;
 
-let version = "4.8.1";
+let version = "4.8.2";
 
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
@@ -200,7 +200,7 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "04sqn0ds17ys8l6zn7vyyvjz1a7hsk4zb0381vlw9wnr7az48nsl";
+    sha256 = "1j6dwgby4g3p3lz7zkss32ghr45zpdidrg8xvazvn91lqxv25p09";
   };
 
   inherit patches;
-- 
GitLab


From 312d081b6a8daf375ebace1c4d3a5af11449c806 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 20 Oct 2013 14:56:31 +0200
Subject: [PATCH 0201/3789] pkgs/build-support/cabal: move current postFixup
 hook into installPhase to free up the postFixup hook for users to override

Builds tend to override pre and post hooks for each phase, so we should not use
them to perform regular build commands that cannot be omitted.
---
 pkgs/build-support/cabal/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 6794a7a4be1..fb3b6b99c4f 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -203,13 +203,11 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
                 GHC_PACKAGE_PATH=$installedPkgConf ghc-pkg --global register $pkgConf --force
               fi
 
-              eval "$postInstall"
-            '';
-
-            postFixup = ''
               if test -f $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
+
+              eval "$postInstall"
             '';
 
             # We inherit stdenv and ghc so that they can be used
-- 
GitLab


From 911ca85240db2e2064ade45bb6464aa542523b80 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 20 Oct 2013 14:58:05 +0200
Subject: [PATCH 0202/3789] pkgs/build-support/cabal: stabilize shared linking
 support

We cannot pass the --{enable,disable}-executable-dynamic flags to GHC
versions prior to 7.4.x.

Building shared libraries via --{enable,disable}-shared is possible in theory
with GHC 6.12.x or later, but doesn't work in practice because our GHC 6.10.x
builds don't provide shared versions of their base libraries. This could
probably be fixed, but it's probably not worth the effort.
---
 pkgs/build-support/cabal/default.nix | 48 ++++++++++++++++++----------
 pkgs/top-level/haskell-packages.nix  | 13 ++++++--
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index fb3b6b99c4f..9b6d8c4e80e 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -4,11 +4,26 @@
 , enableLibraryProfiling ? false
 , enableSharedLibraries ? false
 , enableSharedExecutables ? false
-, enableCheckPhase ? true
+, enableCheckPhase ? stdenv.lib.versionOlder "7.4" ghc.version
 }:
 
-# The Cabal library shipped with GHC versions older than 7.x doesn't accept the --enable-tests configure flag.
-assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
+let
+  enableFeature         = stdenv.lib.enableFeature;
+  versionOlder          = stdenv.lib.versionOlder;
+  optional              = stdenv.lib.optional;
+  optionals             = stdenv.lib.optionals;
+  optionalString        = stdenv.lib.optionalString;
+  filter                = stdenv.lib.filter;
+in
+
+# Cabal shipped with GHC 6.12.4 or earlier doesn't know the "--enable-tests configure" flag.
+assert enableCheckPhase -> versionOlder "7" ghc.version;
+
+# GHC prior to 7.4.x doesn't know the "--enable-executable-dynamic" flag.
+assert enableSharedExecutables -> versionOlder "7.4" ghc.version;
+
+# Our GHC 6.10.x builds do not provide sharable versions of their core libraries.
+assert enableSharedLibraries -> versionOlder "6.12" ghc.version;
 
 {
   mkDerivation =
@@ -25,8 +40,8 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
         # in the interest of keeping hashes stable.
         postprocess =
           x : (removeAttrs x internalAttrs) // {
-                buildInputs           = stdenv.lib.filter (y : ! (y == null)) x.buildInputs;
-                propagatedBuildInputs = stdenv.lib.filter (y : ! (y == null)) x.propagatedBuildInputs;
+                buildInputs           = filter (y : ! (y == null)) x.buildInputs;
+                propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs;
                 doCheck               = enableCheckPhase && x.doCheck;
               };
 
@@ -69,7 +84,7 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
             # but often propagatedBuildInputs is preferable anyway
             buildInputs = [ghc Cabal] ++ self.extraBuildInputs;
             extraBuildInputs = self.buildTools ++
-                               (stdenv.lib.optionals self.doCheck self.testDepends) ++
+                               (optionals self.doCheck self.testDepends) ++
                                (if self.pkgconfigDepends == [] then [] else [pkgconfig]) ++
                                (if self.isLibrary then [] else self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends);
 
@@ -105,8 +120,8 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
             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
-                               || stdenv.lib.versionOlder "7.6.99" ghc.ghcVersion  # -fsplit-ojbs is broken in 7.7 snapshot
+            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
                                );
 
             # pass the '--enable-tests' flag to cabal in the configure stage
@@ -122,21 +137,22 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
             inherit enableSharedExecutables;
 
             extraConfigureFlags = [
-              (stdenv.lib.enableFeature enableLibraryProfiling "library-profiling")
-              (stdenv.lib.enableFeature self.enableSharedLibraries "shared")
-              (stdenv.lib.enableFeature self.enableSharedExecutables "executable-dynamic")
-              (stdenv.lib.enableFeature self.enableSplitObjs "split-objs")
-            ] ++ stdenv.lib.optional (stdenv.lib.versionOlder "7" ghc.ghcVersion) (stdenv.lib.enableFeature self.doCheck "tests");
+              (enableFeature self.enableSplitObjs "split-objs")
+              (enableFeature enableLibraryProfiling "library-profiling")
+              (enableFeature self.enableSharedLibraries "shared")
+              (optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic"))
+              (optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests"))
+            ];
 
             # GHC needs the locale configured during the Haddock phase.
             LANG = "en_US.UTF-8";
-            LOCALE_ARCHIVE = lib.optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
+            LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
 
             # compiles Setup and configures
             configurePhase = ''
               eval "$preConfigure"
 
-              ${lib.optionalString self.jailbreak "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal"}
+              ${optionalString self.jailbreak "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal"}
 
               for i in Setup.hs Setup.lhs; do
                 test -f $i && ghc --make $i
@@ -175,7 +191,7 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
               eval "$postBuild"
             '';
 
-            checkPhase = stdenv.lib.optional self.doCheck ''
+            checkPhase = optional self.doCheck ''
               eval "$preCheck"
 
               ./Setup test ${self.testTarget}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5954fe56797..adb46777001 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -58,7 +58,12 @@
 #
 # For most packages, however, we keep only one version, and use default.nix.
 
-{pkgs, newScope, ghc, prefFun, enableLibraryProfiling ? false, modifyPrio ? (x : x)}:
+{ pkgs, newScope, ghc, prefFun, modifyPrio ? (x : x)
+, enableLibraryProfiling ? false
+, enableSharedLibraries ? true
+, enableSharedExecutables ? false
+, enableCheckPhase ? pkgs.stdenv.lib.versionOlder "7.4" ghc.version
+}:
 
 # We redefine callPackage to take into account the new scope. The optional
 # modifyPrio argument can be set to lowPrio to make all Haskell packages have
@@ -105,8 +110,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   # packages. It isn't the Cabal library, which is spelled "Cabal".
 
   cabal = callPackage ../build-support/cabal {
-    enableLibraryProfiling = enableLibraryProfiling;
-    enableCheckPhase = pkgs.stdenv.lib.versionOlder "7.4" self.ghc.ghcVersion;
+    inherit enableLibraryProfiling;
+    inherit enableSharedLibraries;
+    inherit enableSharedExecutables;
+    inherit enableCheckPhase;
     glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null;
   };
 
-- 
GitLab


From fae8fd8ef16d4f24b8e189e5d7bb89310863bcea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 20 Oct 2013 15:40:22 +0200
Subject: [PATCH 0203/3789] ghc-wrapper: rename 'ghcVersion' attribute to
 'version' for consistency

---
 pkgs/development/compilers/ghc/wrapper.nix             | 3 +--
 pkgs/development/compilers/uhc/default.nix             | 2 +-
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 2 +-
 pkgs/development/tools/documentation/haddock/2.7.2.nix | 2 +-
 pkgs/development/tools/documentation/haddock/2.9.2.nix | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix
index 24deb89c2ec..bcfbd49b98a 100644
--- a/pkgs/development/compilers/ghc/wrapper.nix
+++ b/pkgs/development/compilers/ghc/wrapper.nix
@@ -82,6 +82,5 @@ stdenv.mkDerivation {
   '';
 
   inherit ghc GHCGetPackages GHCPackages;
-  inherit (ghc) meta;
-  ghcVersion = ghc.version;
+  inherit (ghc) meta version;
 }
diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index fa66306721d..31f45086ba0 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -4,7 +4,7 @@
 
 # this check won't be needed anymore after ghc-wrapper is fixed
 # to show ghc-builtin packages in "ghc-pkg list" output.
-let binaryIsBuiltIn = builtins.compareVersions "7.2.1" ghc.ghcVersion != 1;
+let binaryIsBuiltIn = builtins.compareVersions "7.2.1" ghc.version != 1;
 
 in stdenv.mkDerivation {
   name = "uhc-svn-git20120502";
diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 977a15d28e0..accce6f5c86 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -30,7 +30,7 @@ cabal.mkDerivation (self: {
     #!/bin/sh
     COMMAND=\$1
     shift
-    eval exec $out/ghc-mod \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.ghcVersion} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
+    eval exec $out/ghc-mod \$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
   '';
diff --git a/pkgs/development/tools/documentation/haddock/2.7.2.nix b/pkgs/development/tools/documentation/haddock/2.7.2.nix
index 8dd3460b6f8..fd31a96b291 100644
--- a/pkgs/development/tools/documentation/haddock/2.7.2.nix
+++ b/pkgs/development/tools/documentation/haddock/2.7.2.nix
@@ -10,7 +10,7 @@ cabal.mkDerivation (self : {
   doCheck = false;
 
   postInstall = ''
-   wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.ghcVersion} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")"
+   wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")"
   '';
 
   meta = {
diff --git a/pkgs/development/tools/documentation/haddock/2.9.2.nix b/pkgs/development/tools/documentation/haddock/2.9.2.nix
index 61e457426de..fcae14d789e 100644
--- a/pkgs/development/tools/documentation/haddock/2.9.2.nix
+++ b/pkgs/development/tools/documentation/haddock/2.9.2.nix
@@ -10,7 +10,7 @@ cabal.mkDerivation (self : {
   doCheck = false;
 
   postInstall = ''
-   wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.ghcVersion} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")"
+   wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")"
   '';
 
   meta = {
-- 
GitLab


From f7bec094e62a64580fdcd7a46283cea0c94c70a9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 20 Oct 2013 20:18:19 +0200
Subject: [PATCH 0204/3789] haskell-packages.nix: whoops, don't enable shared
 libraries just yet

---
 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 adb46777001..d05769b10e7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -60,7 +60,7 @@
 
 { pkgs, newScope, ghc, prefFun, modifyPrio ? (x : x)
 , enableLibraryProfiling ? false
-, enableSharedLibraries ? true
+, enableSharedLibraries ? false
 , enableSharedExecutables ? false
 , enableCheckPhase ? pkgs.stdenv.lib.versionOlder "7.4" ghc.version
 }:
-- 
GitLab


From 53be8bbdc8d8804570cc47cfec7d2b92256bff2c Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 21 Oct 2013 21:47:14 +0200
Subject: [PATCH 0205/3789] openvpn: add openvpn_learnaddress script

---
 .../openvpn/openvpn_learnaddress.nix          | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/networking/openvpn/openvpn_learnaddress.nix

diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
new file mode 100644
index 00000000000..748f41c9053
--- /dev/null
+++ b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchgit, makeWrapper,  coreutils, gawk, utillinux }:
+
+stdenv.mkDerivation rec {
+  name = "openvpn-learnaddress-19b03c3";
+
+  src = fetchgit {
+    url = https://gist.github.com/4058733.git;
+    rev = "19b03c3beb0190df46ea07bf4b68244acb8eae80";
+    sha256 = "16pcyvyhwsx34i0cjkkx906lmrwdd9gvznvqdwlad4ha8l8f8z42";
+  };
+
+  buildInputs = [ makeWrapper coreutils gawk utillinux ];
+
+  installPhase = ''
+    install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress
+
+    wrapProgram $out/libexec/openvpn/openvpn-learnaddress \
+        --prefix PATH : ${coreutils}/bin:${gawk}/bin:${utillinux}/bin
+  '';
+
+  meta = {
+    description = "Openvpn learn-address script to manage a hosts-like file";
+    homepage = https://gist.github.com/offlinehacker/4058733/;
+    maintainers = [ stdenv.lib.maintainers.offline ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5c1fd11016..1434935f1a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1491,6 +1491,8 @@ let
 
   openvpn = callPackage ../tools/networking/openvpn { };
 
+  openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };
+
   optipng = callPackage ../tools/graphics/optipng { };
 
   oslrd = callPackage ../tools/networking/oslrd { };
-- 
GitLab


From 649b477cc37b70884f7a0c7b1da6559833bbfd82 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sun, 27 Oct 2013 15:36:50 +0100
Subject: [PATCH 0206/3789] isl: Avoid a spurious symbol reference that breaks
 GCC build (#778).

---
 pkgs/development/libraries/isl/default.nix        |  1 +
 pkgs/development/libraries/isl/fix-gcc-build.diff | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/development/libraries/isl/fix-gcc-build.diff

diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix
index 9242af95e27..7711d4f170f 100644
--- a/pkgs/development/libraries/isl/default.nix
+++ b/pkgs/development/libraries/isl/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ gmp ];
+  patches = [ ./fix-gcc-build.diff ];
 
   meta = {
     homepage = http://www.kotnet.org/~skimo/isl/;
diff --git a/pkgs/development/libraries/isl/fix-gcc-build.diff b/pkgs/development/libraries/isl/fix-gcc-build.diff
new file mode 100644
index 00000000000..6fbd1f9d478
--- /dev/null
+++ b/pkgs/development/libraries/isl/fix-gcc-build.diff
@@ -0,0 +1,12 @@
+diff -ru isl-0.11.1/include/isl/int.h isl-0.11.1.new/include/isl/int.h
+--- isl-0.11.1/include/isl/int.h        2012-11-29 09:47:32.000000000 +0100
++++ isl-0.11.1.new/include/isl/int.h    2013-10-27 15:35:31.348553812 +0100
+@@ -14,7 +14,7 @@
+ #include <string.h>
+ #include <gmp.h>
+ #if defined(__cplusplus)
+-#include <iostream>
++#include <ostream>
+ #endif
+ 
+ #if defined(__cplusplus)
-- 
GitLab


From d21d47e228e32f0adf9f41634025bc4f168484cc 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 Oct 2013 20:14:45 +0100
Subject: [PATCH 0207/3789] gfortran: use 4.8 and remove 4.7 (close #1038)

Thanks to @mornfall.
---
 pkgs/top-level/all-packages.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7328a98fc7..ba552ea6b3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2552,15 +2552,7 @@ let
       stdenv = allStdenvs.stdenvNative;
     });
 
-  gfortran = gfortran47; # 48 has problems building ATM
-
-  gfortran47 = wrapGCC (gcc47.gcc.override {
-    name = "gfortran";
-    langFortran = true;
-    langCC = false;
-    langC = false;
-    profiledCompiler = false;
-  });
+  gfortran = gfortran48;
 
   gfortran48 = wrapGCC (gcc48.gcc.override {
     name = "gfortran";
-- 
GitLab


From cf9a57daf389642966e7a83e125ef3a255ff24e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Oct 2013 07:53:38 +0100
Subject: [PATCH 0208/3789] gcj: use 4.8 and drop all others

See/complain on discussion #699.
---
 pkgs/top-level/all-packages.nix | 58 +--------------------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba552ea6b3c..cde66122156 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2562,63 +2562,7 @@ let
     profiledCompiler = false;
   });
 
-  gcj = gcj47;
-
-  gcj44 = wrapGCC (gcc44.gcc.override {
-    name = "gcj";
-    langJava = true;
-    langFortran = false;
-    langCC = true;
-    langC = false;
-    profiledCompiler = false;
-    inherit zip unzip zlib boehmgc gettext pkgconfig;
-    inherit gtk;
-    inherit (gnome) libart_lgpl;
-    inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender
-      libXrandr xproto renderproto xextproto inputproto randrproto;
-  });
-
-  gcj45 = wrapGCC (gcc45.gcc.override {
-    name = "gcj";
-    langJava = true;
-    langFortran = false;
-    langCC = true;
-    langC = false;
-    profiledCompiler = false;
-    inherit zip unzip zlib boehmgc gettext pkgconfig perl;
-    inherit gtk;
-    inherit (gnome) libart_lgpl;
-    inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender
-      libXrandr xproto renderproto xextproto inputproto randrproto;
-  });
-
-  gcj46 = wrapGCC (gcc46.gcc.override {
-    name = "gcj";
-    langJava = true;
-    langFortran = false;
-    langCC = true;
-    langC = false;
-    profiledCompiler = false;
-    inherit zip unzip zlib boehmgc gettext pkgconfig perl;
-    inherit gtk;
-    inherit (gnome) libart_lgpl;
-    inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender
-      libXrandr xproto renderproto xextproto inputproto randrproto;
-  });
-
-  gcj47 = wrapGCC (gcc47.gcc.override {
-    name = "gcj";
-    langJava = true;
-    langFortran = false;
-    langCC = true;
-    langC = false;
-    profiledCompiler = false;
-    inherit zip unzip zlib boehmgc gettext pkgconfig perl;
-    inherit gtk;
-    inherit (gnome) libart_lgpl;
-    inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender
-      libXrandr xproto renderproto xextproto inputproto randrproto;
-  });
+  gcj = gcj48;
 
   gcj48 = wrapGCC (gcc48.gcc.override {
     name = "gcj";
-- 
GitLab


From 7ff9622310c483817aa1fc38abbfbe107fd58f10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Oct 2013 21:40:41 +0100
Subject: [PATCH 0209/3789] xbase: fix build with new gcc via a Gentoo patch

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

diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix
index 847ca6510e5..81447276db7 100644
--- a/pkgs/development/libraries/xbase/default.nix
+++ b/pkgs/development/libraries/xbase/default.nix
@@ -9,7 +9,13 @@ stdenv.mkDerivation {
   };
 
   prePatch = "find . -type f -not -name configure -print0 | xargs -0 chmod -x";
-  patches = [ ./xbase-fixes.patch ];
+  patches = [
+    ./xbase-fixes.patch
+    (fetchurl {
+      url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-gcc47.patch?revision=1.1";
+      sha256 = "1kpcrkkcqdwl609yd0qxlvp743icz3vni13993sz6fkgn5lah8yl";
+    })
+  ];
 
   meta = {
     homepage = http://linux.techass.com/projects/xdb/;
-- 
GitLab


From 16e224b93a5c521e1278e88e8d4e5b82128e3565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Oct 2013 21:59:03 +0100
Subject: [PATCH 0210/3789] gnuplot: fix build via using texinfo4

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cde66122156..69ad9a99adc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -996,6 +996,7 @@ let
   gnuplot = callPackage ../tools/graphics/gnuplot {
     texLive = null;
     lua = null;
+    texinfo = texinfo4; # build errors with gnuplot-4.6.3
 
     # use gccApple to compile on darwin, seems to resolve a malloc error
     stdenv = if stdenv.isDarwin
-- 
GitLab


From b60d44a00a9218eccf1190bcc6bbb6ec929358d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Oct 2013 22:04:34 +0100
Subject: [PATCH 0211/3789] release: remove gcjXX references to fix tarball

---
 pkgs/top-level/release-python.nix | 2 --
 pkgs/top-level/release-small.nix  | 2 +-
 pkgs/top-level/release.nix        | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 2453712584a..05a3ea5fb81 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -372,8 +372,6 @@ let
   gajim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gav = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gcj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  gcj44 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  gcj46 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gcl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gdbCross = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 488feb6f3b1..8a91954fdf5 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -51,7 +51,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   gcc34 = linux;
   gcc42 = linux;
   gcc44 = linux;
-  gcj44 = linux;
+  gcj = linux;
   ghdl = linux;
   glibc = linux;
   glibcLocales = linux;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 4d205f6882a..a3d42f6b68b 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -115,7 +115,7 @@ let
       gcc34 = linux;
       gcc42 = linux;
       gcc44 = linux;
-      gcj44 = linux;
+      gcj = linux;
       ghdl = linux;
       ghostscript = linux;
       ghostscriptX = linux;
-- 
GitLab


From b035c33fe8b216091241b678dee292398caa0302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Nov 2013 11:53:04 +0100
Subject: [PATCH 0212/3789] perl: avoid --no-cpp-precomp on darwin, (close
 #1160)

Taken from https://trac.macports.org/ticket/38913
vcunat renamed the patch
---
 .../interpreters/perl/5.16/cpp-precomp.patch          | 11 +++++++++++
 pkgs/development/interpreters/perl/5.16/default.nix   |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/perl/5.16/cpp-precomp.patch

diff --git a/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch b/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch
new file mode 100644
index 00000000000..231853fe51a
--- /dev/null
+++ b/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch
@@ -0,0 +1,11 @@
+--- a/hints/darwin.sh	2013-05-08 11:13:45.000000000 -0600
++++ b/hints/darwin.sh	2013-05-08 11:15:04.000000000 -0600
+@@ -129,7 +129,7 @@
+ 
+ # Avoid Apple's cpp precompiler, better for extensions
+ if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then
+-    cppflags="${cppflags} -no-cpp-precomp"
++    #cppflags="${cppflags} -no-cpp-precomp"
+ 
+     # This is necessary because perl's build system doesn't
+     # apply cppflags to cc compile lines as it should.
diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index 60bfacf419b..a8c17545303 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       ./no-sys-dirs.patch
     ]
     ++ optional stdenv.isSunOS  ./ld-shared.patch
-    ++ optional stdenv.isDarwin ./no-libutil.patch;
+    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ;
 
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
   # "installstyle" option to ensure that modules are put under
-- 
GitLab


From 0427e7fbf236ca20e9311399dd3e7d369e6a99c6 Mon Sep 17 00:00:00 2001
From: Alex Berg <chexxor@gmail.com>
Date: Wed, 6 Nov 2013 09:32:22 +0800
Subject: [PATCH 0213/3789] Check for SSL Cert value before building with SSL
 support.

---
 nixos/modules/services/web-servers/apache-httpd/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index d21b6da0e77..e94af76661d 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -582,6 +582,12 @@ in
   ###### implementation
 
   config = mkIf config.services.httpd.enable {
+  
+    assertions = [ { assertion = mainCfg.enableSSL == true
+                               -> mainCfg.sslServerCert != null && mainCfg.sslServerCert != ""
+                                    && mainCfg.sslServerKey != null && mainCfg.sslServerKey != "";
+                     message = "SSL is enabled for HTTPD, but sslServerCert and/or sslServerKey haven't been specified."; }
+                 ];
 
     users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") singleton
       { name = "wwwrun";
-- 
GitLab


From df5f4918937d9285eabb862bd0276a87316d8917 Mon Sep 17 00:00:00 2001
From: Alex Berg <chexxor@gmail.com>
Date: Mon, 11 Nov 2013 12:08:36 +0800
Subject: [PATCH 0214/3789] Add HTTPD SSH assertion to check null cert/key.

---
 nixos/modules/services/web-servers/apache-httpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index e94af76661d..6836746f829 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -584,8 +584,8 @@ in
   config = mkIf config.services.httpd.enable {
   
     assertions = [ { assertion = mainCfg.enableSSL == true
-                               -> mainCfg.sslServerCert != null && mainCfg.sslServerCert != ""
-                                    && mainCfg.sslServerKey != null && mainCfg.sslServerKey != "";
+                               -> mainCfg.sslServerCert != null
+                                    && mainCfg.sslServerKey != null;
                      message = "SSL is enabled for HTTPD, but sslServerCert and/or sslServerKey haven't been specified."; }
                  ];
 
-- 
GitLab


From da654ed9a0eb03eb4b861130ca417de80c864792 Mon Sep 17 00:00:00 2001
From: Alex Berg <chexxor@gmail.com>
Date: Mon, 11 Nov 2013 15:18:46 +0800
Subject: [PATCH 0215/3789] Check empty stringfor globalRedirect. It breaks
 RedirectPermanent.

---
 nixos/modules/services/web-servers/apache-httpd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 6836746f829..82e8611e1d6 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -260,7 +260,7 @@ let
 
     '' else ""}
 
-    ${if cfg.globalRedirect != null then ''
+    ${if cfg.globalRedirect != null && cfg.globalRedirect != "" then ''
       RedirectPermanent / ${cfg.globalRedirect}
     '' else ""}
 
-- 
GitLab


From dd2dc699fa789167ce5778501a21adf495f4bf8a Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 7 Nov 2013 11:32:15 +0100
Subject: [PATCH 0216/3789] nixos/network-interfaces: add support for static
 ipv6 addresses

---
 nixos/modules/tasks/network-interfaces.nix | 45 +++++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index d8522b6abba..4afa4d81f00 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -49,6 +49,26 @@ let
         '';
       };
 
+      ipv6Address = mkOption {
+        default = null;
+        example = "2001:1470:fffd:2098::e006";
+        type = types.nullOr types.string;
+        description = ''
+          IPv6 address of the interface.  Leave empty to configure the
+          interface using NDP.
+        '';
+      };
+
+      ipv6prefixLength = mkOption {
+        default = 64;
+        example = 64;
+        type = types.int;
+        description = ''
+          Subnet mask of the interface, specified as the number of
+          bits in the prefix (<literal>64</literal>).
+        '';
+      };
+
       macAddress = mkOption {
         default = null;
         example = "00:11:22:33:44:55";
@@ -322,6 +342,7 @@ in
           (let mask =
                 if i.prefixLength != null then toString i.prefixLength else
                 if i.subnetMask != "" then i.subnetMask else "32";
+               staticIPv6 = cfg.enableIPv6 && i.ipv6Address != null;
           in
           { description = "Configuration of ${i.name}";
             wantedBy = [ "network-interfaces.target" ];
@@ -350,11 +371,31 @@ in
                     echo "configuring interface..."
                     ip -4 addr flush dev "${i.name}"
                     ip -4 addr add "${i.ipAddress}/${mask}" dev "${i.name}"
+                    restart_network_setup=true
+                  else
+                    echo "skipping configuring interface"
+                  fi
+                ''
+              + optionalString (staticIPv6)
+                ''
+                  # Only do a flush/add if it's necessary.  This is
+                  # useful when the Nix store is accessed via this
+                  # interface (e.g. in a QEMU VM test).
+                  if ! ip -6 -o a show dev "${i.name}" | grep "${i.ipv6Address}/${toString i.ipv6prefixLength}"; then
+                    echo "configuring interface..."
+                    ip -6 addr flush dev "${i.name}"
+                    ip -6 addr add "${i.ipv6Address}/${toString i.ipv6prefixLength}" dev "${i.name}"
+                    restart_network_setup=true
+                  else
+                    echo "skipping configuring interface"
+                  fi
+                ''
+              + optionalString (i.ipAddress != null || staticIPv6)
+                ''
+                  if [ restart_network_setup = true ]; then
                     # Ensure that the default gateway remains set.
                     # (Flushing this interface may have removed it.)
                     ${config.systemd.package}/bin/systemctl try-restart --no-block network-setup.service
-                  else
-                    echo "skipping configuring interface"
                   fi
                   ${config.systemd.package}/bin/systemctl start ip-up.target
                 ''
-- 
GitLab


From cee92097c99a67cb57125cddea51e903c1ffaa8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 15 Nov 2013 12:06:14 +0100
Subject: [PATCH 0217/3789] emacs23: fix build via using older texinfo

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e07fba1b138..16a0d173691 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7589,6 +7589,7 @@ let
     # TODO: these packages don't build on Darwin.
     gconf = null /* if stdenv.isDarwin then null else gnome.GConf */;
     librsvg = null /* if stdenv.isDarwin then null else librsvg */;
+    texinfo = texinfo4;
   };
 
   emacs24 = callPackage ../applications/editors/emacs-24 {
-- 
GitLab


From 8685278f11f809af52710f165257fb5808018182 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 13 Sep 2013 16:48:54 +0200
Subject: [PATCH 0218/3789] Add nix-run and myEnvRun

This adds nix-run, which is a thin wrapper around nix-build.
nix-run calls nix-build, and then executes the resulting build.
If no executable artifact is built, nix-runs outputs an error
message.

myEnvRun calls myEnvFun and builds a script that directly runs
the load-env-* script.

Together, nix-run and myEnvRun allows you to set up an environment
that can be loaded in this way:

  envs.nix:
    {
      gcc = myEnvRun {
        name = "gcc";
        buildInputs = [ gcc ];
      };
    }

  $ nix-run -A gcc envs.nix

You end up directly in your environment without having to do
nix-env -i. You will always have a fresh environment and you
don't have to pollute you profile with a lot of env packages.
---
 pkgs/build-support/my-env-run/default.nix |  6 ++
 pkgs/misc/nix-run/default.nix             | 72 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  6 ++
 3 files changed, 84 insertions(+)
 create mode 100644 pkgs/build-support/my-env-run/default.nix
 create mode 100644 pkgs/misc/nix-run/default.nix

diff --git a/pkgs/build-support/my-env-run/default.nix b/pkgs/build-support/my-env-run/default.nix
new file mode 100644
index 00000000000..0fedd0b8c6d
--- /dev/null
+++ b/pkgs/build-support/my-env-run/default.nix
@@ -0,0 +1,6 @@
+{ writeScript, bash, myEnvFun }: args:
+
+let env = myEnvFun args; in writeScript "envrun-${args.name}" ''
+  #!${bash}/bin/bash
+  ${env}/bin/load-env-${args.name}
+''
diff --git a/pkgs/misc/nix-run/default.nix b/pkgs/misc/nix-run/default.nix
new file mode 100644
index 00000000000..ef83ec2a1f3
--- /dev/null
+++ b/pkgs/misc/nix-run/default.nix
@@ -0,0 +1,72 @@
+{ stdenv, bash, writeScript }:
+
+let
+
+  nix-run = writeScript "nix-run" ''
+    #!${bash}/bin/bash
+
+    # Runs nix-build and executes the result
+    # All arguments before "--" are given to nix-build,
+    # and all arguments after "--" are given to the
+    # executed command. stdin is redirected to the executed
+    # command.
+
+    out=$(mktemp)
+    rm "$out"
+
+    # parse args into args1 and args2, separated by --
+    # args1 goes to nix-build, args2 goes to the built command
+    args1=("$@")
+    args2=()
+    for i in "''${!args1[@]}"; do
+      if [ "''${args1[$i]}" == "--" ]; then
+        args2=("''${args1[@]:$((i+1))}")
+        args1=("''${args1[@]:0:$((i))}")
+        break
+      fi
+    done
+
+    if nix-build -o "$out" "''${args1[@]}" >/dev/null; then
+      target=$(readlink -m "$out")
+      unlink "$out"
+      if test -f "$target" && test -x "$target"; then
+        exec "$target" "''${args2[@]}" <&0
+      else
+        echo "nix-run: No executable target produced by nix-build"
+        exit 1
+      fi
+    else
+      echo "nix-run: nix-build failed"
+      exit 1
+    fi
+  '';
+
+in stdenv.mkDerivation {
+  name = "nix-run";
+  phases = [ "installPhase" ];
+  installPhase = ''
+    mkdir -p $out/bin
+    ln -s ${nix-run} $out/bin/nix-run
+  '';
+  meta = {
+    description = ''
+      Wrapper around nix-build that automatically executes the binary
+      produced by the provided Nix expression.
+    '';
+    longDescription = ''
+      nix-run invokes nix-build with any options given to it. It then
+      expects one executable file to be produced by nix-build. If this
+      is the case, that file is executed with any options that is given
+      to nix-run after a <literal>--</literal> option separator. If no
+      executable file is produced by nix-build, nix-run will exit with
+      an error. An example invocation of nix-run is <literal>nix-run -A
+      myattr mynix.nix -- -o opt</literal>. nix-run will then build the
+      attribute <literal>myattr</literal> from the Nix expression given
+      in the file <literal>mynix.nix</literal>. If a single executable
+      file is produced, that file is executed with the option
+      <literal>-o opt</literal>.
+    '';
+    maintainers = [ stdenv.lib.maintainers.rickynils ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1bae1e14df7..47b8be12fa8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10352,6 +10352,12 @@ let
     inherit (stdenv) mkDerivation;
   };
 
+  myEnvRun = import ../build-support/my-env-run {
+    inherit writeScript bash myEnvFun;
+  };
+
+  nix-run = callPackage ../misc/nix-run { };
+
   # patoline requires a rather large ocaml compilation environment.
   # this is why it is build as an environment and not just a normal package.
   # remark : the emacs mode is also installed, but you have to adjust your load-path.
-- 
GitLab


From 29c11ef8a52e791d83170c9cb7b9e8ff00e48bdc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Dec 2013 13:00:02 +0100
Subject: [PATCH 0219/3789] gnutar: update to version 1.27.1

---
 pkgs/tools/archivers/gnutar/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 8735702dd33..6428fbaa9dc 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gnutar-1.27";
+  name = "gnutar-${version}";
+  version = "1.27.1";
 
   src = fetchurl {
-    url = "mirror://gnu/tar/tar-1.27.tar.bz2";
-    sha256 = "0yrwmx2f721ahpnki4fnzvnmrd3md3bq417icb4wrjky7k3caf12";
+    url = "mirror://gnu/tar/tar-${version}.tar.bz2";
+    sha256 = "1iip0fk0wqhxb0jcwphz43r4fxkx1y7mznnhmlvr618jhp7b63wv";
   };
 
   # May have some issues with root compilation because the bootstrap tool
-- 
GitLab


From 7bf209db50be1ce57298320e596e8c8fd817c927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 30 Nov 2013 11:03:35 +0100
Subject: [PATCH 0220/3789] patchShebangs: rewrite ".../bin/env python" to
 /nix/store/.../python

Currently "/usr/bin/env python" is rewritten to "/nix/store/.../env
python". That doesn't really improve anything because the interpreter
still have to be located in $PATH at runtime. The result is that many
nix package expressions do .../bin/env fixup themselves.

Instead of everyone having to do this patching locally, add the
functionality to the standard environment patchShebangs function so that
everyone can benefit.
---
 pkgs/stdenv/generic/setup.sh | 45 ++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index a50596985ec..3cc84c9db5e 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -655,20 +655,57 @@ patchShebangs() {
     # Rewrite all script interpreter file names (`#! /path') under the
     # specified  directory tree to paths found in $PATH.  E.g.,
     # /bin/sh will be rewritten to /nix/store/<hash>-some-bash/bin/sh.
+    # /usr/bin/env gets special treatment so that ".../bin/env python" is
+    # rewritten to /nix/store/<hash>/bin/python.
     # Interpreters that are already in the store are left untouched.
     header "patching script interpreter paths"
     local dir="$1"
     local f
+    local oldPath
+    local newPath
+    local arg0
+    local args
+    local oldInterpreterLine
+    local newInterpreterLine
+
     for f in $(find "$dir" -type f -perm +0100); do
-        local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f")
+        if [ $(head -1 "$f" | head -c +2) != '#!' ]; then
+            # missing shebang => not a script
+            continue
+        fi
+
+        oldInterpreterLine=$(head -1 "$f" | tail -c +3)
+        read oldPath arg0 args <<< "$oldInterpreterLine"
+
+        if $(echo "$oldPath" | grep -q "/bin/env$"); then
+            # Check for unsupported 'env' functionality:
+            # - options: something starting with a '-'
+            # - environment variables: foo=bar
+            if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then
+                echo "unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
+                exit 1
+            fi
+            newPath="$(command -v "$arg0")"
+        else
+            if [ "$oldPath" = "" ]; then
+                # If no interpreter is specified linux will use /bin/sh. Set
+                # oldpath="/bin/sh" so that we get /nix/store/.../sh.
+                oldPath="/bin/sh"
+            fi
+            newPath="$(command -v "$(basename "$oldPath")")"
+            args="$arg0 $args"
+        fi
+
+        newInterpreterLine="$newPath $args"
+
         if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then
-            local newPath=$(type -P $(basename $oldPath) || true)
             if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then
-                echo "$f: interpreter changed from $oldPath to $newPath"
-                sed -i -e "1 s,$oldPath,$newPath," "$f"
+                echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\""
+                sed -i -e "1 s|.*|#\!$newInterpreterLine|" "$f"
             fi
         fi
     done
+
     stopNest
 }
 
-- 
GitLab


From 06c780077ff37a5e57751eacb904931c203ef265 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 3 Dec 2013 11:41:49 +0000
Subject: [PATCH 0221/3789] Removes the ruby18 dependency to klinkstatus

---
 pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix
index 33a4d8c6083..86a8b7c0a19 100644
--- a/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix
+++ b/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix
@@ -1,8 +1,8 @@
-{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost, ruby18 }:
+{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }:
 
 kde {
 
-  buildInputs = [ kdelibs kdepimlibs ruby18 htmlTidy boost ];
+  buildInputs = [ kdelibs kdepimlibs htmlTidy boost ];
 
   meta = {
     description = "A KDE link checker";
-- 
GitLab


From 88c7b4c7fee42c1ae5167fd1e7806d600e4451e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 3 Dec 2013 16:58:49 +0100
Subject: [PATCH 0222/3789] Fix bug introduced in previous commit

When building e.g. perl for the first time there is no perl in PATH yet,
so command -v perl will fail.

This brings back the previous behaviour of silently not patching
shebangs for which there is no available command in PATH.
---
 pkgs/stdenv/generic/setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 3cc84c9db5e..1ed905db363 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -685,14 +685,14 @@ patchShebangs() {
                 echo "unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
                 exit 1
             fi
-            newPath="$(command -v "$arg0")"
+            newPath="$(command -v "$arg0" || true)"
         else
             if [ "$oldPath" = "" ]; then
                 # If no interpreter is specified linux will use /bin/sh. Set
                 # oldpath="/bin/sh" so that we get /nix/store/.../sh.
                 oldPath="/bin/sh"
             fi
-            newPath="$(command -v "$(basename "$oldPath")")"
+            newPath="$(command -v "$(basename "$oldPath")" || true)"
             args="$arg0 $args"
         fi
 
-- 
GitLab


From 4e385fcda73dd437152d42aefdde4bcb79d23c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 7 Dec 2013 21:13:06 +0100
Subject: [PATCH 0223/3789] stdenv/patchShebangs: fix shebang check

patchShebangs has a bug that shows itself on files that have the
executable bit set but have no shebang (i.e. a blank/empty first line).
The shell would then evaluate this:

if [ != '#!' ]; then
  # not evaluated
fi

With proper quoting we get the correct behaviour:

if [ "" != '#!' ]; then
  # this will be evaluated
fi
---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 1ed905db363..84d499696c9 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -669,7 +669,7 @@ patchShebangs() {
     local newInterpreterLine
 
     for f in $(find "$dir" -type f -perm +0100); do
-        if [ $(head -1 "$f" | head -c +2) != '#!' ]; then
+        if [ "$(head -1 "$f" | head -c +2)" != '#!' ]; then
             # missing shebang => not a script
             continue
         fi
-- 
GitLab


From 3227c1d215ce1897bb72ab72333fa1bdd0cd1154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 8 Dec 2013 20:11:40 +0100
Subject: [PATCH 0224/3789] ncurses: fix includedir setting

${out} in configureFlags isn't expanded, so ncursesw5-config ends up
expanding ${out} at *runtime*. Here is the relevant ncursesw5-config
snippet showing how includedir gets its value at runtime.

  bindir="${exec_prefix}/bin"
  includedir="${out}/include"
  libdir="${exec_prefix}/lib"
  datadir="${prefix}/share"
  mandir="${prefix}/man"

When running in a plain shell you get this:
  $ ncursesw5-config --cflags
  -I/include/ncursesw -I/include

And when run in a nix-build shell for e.g. gpsd:
  $ ncursesw5-config --cflags
  -I/nix/store/HASH-gpsd-3.10/include/ncursesw -I/nix/store/HASH-gpsd-3.10/include

This is clearly wrong.

Q: How come this has gone undetected for years?
A: It seems few packages use ncursesw5-config to get the compiler
flags. For example, our python curses module builds its own compiler
flags.

Fix this by moving the --includedir setting to preConfigure where shell
variables are expanded.
---
 pkgs/development/libraries/ncurses/5_4.nix     | 6 +++++-
 pkgs/development/libraries/ncurses/default.nix | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/5_4.nix b/pkgs/development/libraries/ncurses/5_4.nix
index 1cf08bd30c6..fd35a1d4887 100644
--- a/pkgs/development/libraries/ncurses/5_4.nix
+++ b/pkgs/development/libraries/ncurses/5_4.nix
@@ -19,10 +19,14 @@ stdenv.mkDerivation (rec {
   };
 
   configureFlags = ''
-    --with-shared --includedir=''${out}/include --without-debug
+    --with-shared --without-debug
     ${if unicode then "--enable-widec" else ""}${if cxx then "" else "--without-cxx-binding"}
   '';
 
+  preConfigure = ''
+    export configureFlags="$configureFlags --includedir=$out/include"
+  '';
+
   selfNativeBuildInput = true;
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 8d20a7339b7..9ba21e99a78 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -18,12 +18,16 @@ stdenv.mkDerivation (rec {
     sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh";
   };
 
+  patches = [ ./patch-ac ];
+
   configureFlags = ''
-    --with-shared --includedir=''${out}/include --without-debug
+    --with-shared --without-debug
     ${if unicode then "--enable-widec" else ""}${if cxx then "" else "--without-cxx-binding"}
   '';
 
-  patches = [ ./patch-ac ];
+  preConfigure = ''
+    export configureFlags="$configureFlags --includedir=$out/include"
+  '';
 
   selfNativeBuildInput = true;
 
-- 
GitLab


From 3dd9f61d0d81fd40c24f5a97e3cd66bc2d808250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <cpages@aqsense.com>
Date: Tue, 12 Nov 2013 12:38:29 +0100
Subject: [PATCH 0225/3789] rabbitmq-server: update to 3.2.1

---
 pkgs/servers/amqp/rabbitmq-server/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 59788be15d1..c404a56aef2 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "rabbitmq-server-${version}";
 
-  version = "3.0.3";
+  version = "3.2.1";
 
   src = fetchurl {
     url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz";
-    sha256 = "07mp57xvszdrlgw8rgn9r9dpa6vdqdjk7f1dyh6a9sdg8s9fby38";
+    sha256 = "0j9yx64sdgkv0h20zjs65aa2ag6wwv50i6hd3x69m0cc6shzcc0f";
   };
 
   buildInputs =
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       patchShebangs .
     '';
 
-  installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man";
+  installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man DOC_INSTALL_DIR=$(out)/doc";
 
   preInstall =
     ''
-- 
GitLab


From e794dc6a2080e84339c0610d23f36fd517812491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <cpages@aqsense.com>
Date: Fri, 13 Dec 2013 17:10:06 +0100
Subject: [PATCH 0226/3789] rabbitmq-c: add version 0.4.1

---
 .../libraries/rabbitmq-c/default.nix          | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/rabbitmq-c/default.nix

diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix
new file mode 100644
index 00000000000..84a7a9b4ccf
--- /dev/null
+++ b/pkgs/development/libraries/rabbitmq-c/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, openssl, popt, xmlto }:
+
+stdenv.mkDerivation rec {
+  version = "0.4.1";
+  name = "rabbitmq-c-${version}";
+
+  src = fetchurl {
+    name = "${name}.tar.gz";
+    url = "https://github.com/alanxz/rabbitmq-c/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "01m4n043hzhhxky8z67zj3r4gbg3mwcqbwqr9nms9lqbfaa70x93";
+  };
+
+  buildInputs = [ cmake openssl popt xmlto ];
+
+  meta = {
+    description = "RabbitMQ C AMQP client library";
+    homepage = https://github.com/alanxz/rabbitmq-c;
+    license = with stdenv.lib.licenses; mit;
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be875c2a88e..129d9364de9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5575,6 +5575,8 @@ let
 
   qwt = callPackage ../development/libraries/qwt {};
 
+  rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {};
+
   readline = readline6;
 
   readline4 = callPackage ../development/libraries/readline/readline4.nix { };
-- 
GitLab


From d02b0a182819819a7895679126c1665506dbccc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <cpages@aqsense.com>
Date: Fri, 13 Dec 2013 17:33:13 +0100
Subject: [PATCH 0227/3789] libjson-rpc-cpp: minor fixes to the expression.

---
 pkgs/development/libraries/libjson-rpc-cpp/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
index 3dca6a04af7..5e0a8560110 100644
--- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix
+++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, cmake, curl }:
 
 let
-  name = "libjson-rpc-cpp";
+  basename = "libjson-rpc-cpp";
   version = "0.2.1";
 in
 
 stdenv.mkDerivation {
-  name = "${name}-${version}";
+  name = "${basename}-${version}";
 
   src = fetchurl {
-    url = "https://github.com/cinemast/${name}/archive/${version}.tar.gz";
+    url = "https://github.com/cinemast/${basename}/archive/${version}.tar.gz";
     sha256 = "1pc9nn4968qkda8vr4f9dijn2fcldm8i0ymwmql29h4cl5ghdnpw";
   };
 
@@ -23,6 +23,8 @@ stdenv.mkDerivation {
 
   meta = {
     description = "C++ framework for json-rpc (json remote procedure call)";
+    homepage = https://github.com/cinemast/libjson-rpc-cpp;
+    license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From 8b11fb8fcbb6d03680edfaaef32463693bcb04b9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Dec 2013 21:20:49 +0100
Subject: [PATCH 0228/3789] pkgs/build-support/cabal: clean up the code that
 sets rpath for shared executables

---
 pkgs/build-support/cabal/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index d99faf41f88..8984feac167 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -156,7 +156,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
               (optional (versionOlder "7" ghc.version) (enableFeature self.enableStaticLibraries "library-vanilla"))
               (optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic"))
               (optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests"))
-            ] ++ optional self.enableSharedExecutables "--ghc-option=-optl=-Wl,-rpath=$ORIGIN/../lib/${ghc.ghc.name}/${self.pname}-${self.version}";
+            ];
 
             # GHC needs the locale configured during the Haddock phase.
             LANG = "en_US.UTF-8";
@@ -187,6 +187,10 @@ 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
 
-- 
GitLab


From f0ebdd42968f81cff4e156ff3f3cc4692a6ec8ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Dec 2013 21:21:31 +0100
Subject: [PATCH 0229/3789] pkgs/build-support/cabal: add 'buildTarget'
 attribute to allow passing flags to "./Setup build"

---
 pkgs/build-support/cabal/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 8984feac167..cfa6175744f 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -107,6 +107,9 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
             # build-depends Cabal field
             buildDepends = [];
 
+            # target(s) passed to the cabal build phase as an argument
+            buildTarget = "";
+
             # build-depends Cabal fields stated in test-suite stanzas
             testDepends = [];
 
@@ -201,7 +204,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
             buildPhase = ''
               eval "$preBuild"
 
-              ./Setup build
+              ./Setup build ${self.buildTarget}
 
               export GHC_PACKAGE_PATH=$(${ghc.GHCPackages})
               test -n "$noHaddock" || ./Setup haddock
-- 
GitLab


From 42560c78bbf3fdc1e4c45bb6b2d14f02e732bd5c Mon Sep 17 00:00:00 2001
From: Daniel Oertwig <Daniel.Oertwig@gmail.com>
Date: Mon, 16 Dec 2013 18:47:20 +0100
Subject: [PATCH 0230/3789] libxml2 w/o python --with-python=no on all systems

When building libxml2 without python enabled, pass "--with-python=no" to
configure on all systems, not only on FreeBSD. Omitting mentioned
configure option results in building libxml2 WITH python enabled. In
this case, configure is looking for python by itself in system paths.
With a rootless configuration, python includes from the host are accessed.
If those files (Python.h) are not available, building libxml2 fails.
---
 pkgs/development/libraries/libxml2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index b86df4969c2..b235c746e1a 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (rec {
   preInstall = ''substituteInPlace python/libxml2mod.la --replace "${python}" "$out"'';
   installFlags = ''pythondir="$(out)/lib/${python.libPrefix}/site-packages"'';
 
-} // stdenv.lib.optionalAttrs (!pythonSupport && stdenv.isFreeBSD) {
+} // stdenv.lib.optionalAttrs (!pythonSupport) {
   configureFlags = "--with-python=no"; # otherwise build impurity bites us
 })
 
-- 
GitLab


From 3e052e242f8749ede2113deaa68c9994c9939e82 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Dec 2013 12:18:07 +0100
Subject: [PATCH 0231/3789] gfortran48: disable parallel make to avoid apparent
 race condition

See <http://hydra.nixos.org/build/7125754> as an example of a failed build.
---
 pkgs/development/compilers/gcc/4.8/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 3e4a9bb030c..3d42ae2ca3f 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -484,11 +484,15 @@ stdenv.mkDerivation ({
   passthru = { inherit langC langCC langAda langFortran langVhdl
       langGo enableMultilib version; };
 
-  /* From gccinstall.info:
-     "parallel make is currently not supported since collisions in profile
-     collecting may occur"
-  */
-  enableParallelBuilding = !profiledCompiler;
+  /* gccinstall.info says that "parallel make is currently not supported since
+     collisions in profile collecting may occur".
+
+     Parallel make of gfortran is disabled because of an apparent race
+     condition concerning the generation of "bconfig.h". Please try and
+     re-enable parallel make for a later release of gfortran to check whether
+     the error has been fixed.
+   */
+     enableParallelBuilding = !profiledCompiler && !langFortran;
 
   meta = {
     homepage = http://gcc.gnu.org/;
-- 
GitLab


From 9319597b650f69b0ec336bd049bc02b34e4a01c6 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 5 Nov 2013 16:56:56 +0100
Subject: [PATCH 0232/3789] gccgo: add 4.8

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6caacf37e72..a2290a3dc78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2680,6 +2680,13 @@ let
     langGo = true;
   });
 
+  gccgo48 = wrapGCC (gcc48_real.gcc.override {
+    name = "gccgo";
+    langCC = true; #required for go.
+    langC = true;
+    langGo = true;
+  });
+
   ghdl = wrapGCC (import ../development/compilers/gcc/4.3 {
     inherit stdenv fetchurl gmp mpfr noSysDirs gnat;
     texinfo = texinfo4;
-- 
GitLab


From fd8d833a8674853219413746369ae0c48de576e6 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 5 Nov 2013 16:57:11 +0100
Subject: [PATCH 0233/3789] switch default gccgo to 4.8

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2290a3dc78..3c3751e465e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2670,8 +2670,7 @@ let
     inherit fetchurl stdenv;
   });
 
-  # gccgo46 does not work. I set 4.7 then.
-  gccgo = gccgo47;
+  gccgo = gccgo48;
 
   gccgo47 = wrapGCC (gcc47_real.gcc.override {
     name = "gccgo";
-- 
GitLab


From 95f443fda46758ca11c7a63646d07a51fafc030c Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 7 Dec 2013 20:10:55 +0100
Subject: [PATCH 0234/3789] all-packages: remove gcc47 dependencies now gcc48
 is default

I checked these and they built fine
---
 pkgs/top-level/all-packages.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c3751e465e..deed3b7d68e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -535,9 +535,7 @@ let
 
   bochs = callPackage ../applications/virtualization/bochs { };
 
-  boomerang = callPackage ../development/tools/boomerang {
-    stdenv = overrideGCC stdenv gcc47;
-  };
+  boomerang = callPackage ../development/tools/boomerang { };
 
   bootchart = callPackage ../tools/system/bootchart { };
 
@@ -1064,7 +1062,7 @@ let
 
   gtmess = callPackage ../applications/networking/instant-messengers/gtmess { };
 
-  gummiboot = callPackage ../tools/misc/gummiboot { stdenv = overrideGCC stdenv gcc47; };
+  gummiboot = callPackage ../tools/misc/gummiboot { };
 
   gupnp = callPackage ../development/libraries/gupnp {
     inherit (gnome) libsoup;
@@ -2249,7 +2247,7 @@ let
   clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix {
     stdenv = if stdenv.isDarwin
       then stdenvAdapters.overrideGCC stdenv gccApple
-      else stdenvAdapters.overrideGCC stdenv gcc47;
+      else stdenv;
   };
 
   clang = wrapClang clangUnwrapped;
@@ -4411,9 +4409,7 @@ let
 
   gnet = callPackage ../development/libraries/gnet { };
 
-  gnu-efi = callPackage ../development/libraries/gnu-efi {
-    stdenv = overrideGCC stdenv gcc47;
-  };
+  gnu-efi = callPackage ../development/libraries/gnu-efi { };
 
   gnutls = callPackage ../development/libraries/gnutls {
     guileBindings = config.gnutls.guile or true;
-- 
GitLab


From 50253a3e84a9a21a6fd29173d04928a31f53c691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 25 Dec 2013 13:13:02 +0100
Subject: [PATCH 0235/3789] ncurses: install *.pc files (for pkg-config)

To make e.g. "pkg-config --cflags ncursesw" work.

The ncurses expression, when built in unicode/wide char mode, provides
backward compatibility symlinks from lib<name>.so to lib<name>w.so.
Provide similar symlinks for the *.pc files: <name>.pc -> <name>w.pc.
---
 pkgs/development/libraries/ncurses/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 9ba21e99a78..553aa95d834 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -21,12 +21,20 @@ stdenv.mkDerivation (rec {
   patches = [ ./patch-ac ];
 
   configureFlags = ''
-    --with-shared --without-debug
+    --with-shared --without-debug --enable-pc-files
     ${if unicode then "--enable-widec" else ""}${if cxx then "" else "--without-cxx-binding"}
   '';
 
+  # PKG_CONFIG_LIBDIR is where the *.pc files will be installed. If this
+  # directory doesn't exist, the configure script will disable installation of
+  # *.pc files. The configure script usually (on LSB distros) pick $(path of
+  # pkg-config)/../lib/pkgconfig. On NixOS that path doesn't exist and is not
+  # the place we want to put *.pc files from other packages anyway. So we must
+  # tell it explicitly where to install with PKG_CONFIG_LIBDIR.
   preConfigure = ''
     export configureFlags="$configureFlags --includedir=$out/include"
+    export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig"
+    mkdir -p "$PKG_CONFIG_LIBDIR"
   '';
 
   selfNativeBuildInput = true;
@@ -50,6 +58,7 @@ stdenv.mkDerivation (rec {
         echo "INPUT(-l''${lib}w)" > $out/lib/lib$lib.so
         ln -svf lib''${lib}w.a $out/lib/lib$lib.a
         ln -svf lib''${lib}w.so.5 $out/lib/lib$lib.so.5
+        ln -svf ''${lib}w.pc $out/lib/pkgconfig/$lib.pc
       fi
     done;
     ln -svf . $out/include/ncursesw
-- 
GitLab


From 2b2c55e34a767c3d156e4d98ddfcb1785eaa84c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 26 Dec 2013 18:42:10 +0100
Subject: [PATCH 0236/3789] ncurses: add ncurses5-config -> ncursesw5-config
 symlink

We already have backward compatibility symlinks for ncurses libraries
and pkg-config files (when built in unicode/wide mode). The last bit is
to add a symlink from ncurses5-config to ncursesw5-config, which is what
this commit does.
---
 pkgs/development/libraries/ncurses/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 553aa95d834..2e5db48b7df 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -62,6 +62,7 @@ stdenv.mkDerivation (rec {
       fi
     done;
     ln -svf . $out/include/ncursesw
+    ln -svf ncursesw5-config $out/bin/ncurses5-config
   '' else "";
 
   meta = {
-- 
GitLab


From 34a7256820fe8c504ff519377c8ab2a9ac068ebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 27 Dec 2013 12:43:04 +0100
Subject: [PATCH 0237/3789] coreutils: fix build (race condition)

---
 pkgs/tools/misc/coreutils/default.nix    |  2 ++
 pkgs/tools/misc/coreutils/help2man.patch | 40 ++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/tools/misc/coreutils/help2man.patch

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index ebd68ee9cf6..e5f9eb1be2c 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -18,6 +18,8 @@ let
       sha256 = "064f512185iysqqcvhnhaf3bfmzrvcgs7n405qsyp99zmfyl9amd";
     };
 
+    patches = [ ./help2man.patch ];
+
     nativeBuildInputs = [ perl ];
     buildInputs = [ gmp ]
       ++ optional aclSupport acl
diff --git a/pkgs/tools/misc/coreutils/help2man.patch b/pkgs/tools/misc/coreutils/help2man.patch
new file mode 100644
index 00000000000..9f3cbaa40ff
--- /dev/null
+++ b/pkgs/tools/misc/coreutils/help2man.patch
@@ -0,0 +1,40 @@
+Although the above man pages depend on src/md5sum.c as a shared
+source, the build of the man pages directly requires their own
+executables to exist.
+
+* man/local.mk (man/sha1sum.1): Change the dependency from
+'src/md5sum' to 'src/sha1sum'.
+(man/sha224sum.1): s/md5sum/sha224sum/
+(man/sha256sum.1): s/md5sum/sha256sum/
+(man/sha384sum.1): s/md5sum/sha384sum/
+(man/sha512sum.1): s/md5sum/sha512sum/
+
+Reported by Pádraig Brady in
+http://lists.gnu.org/archive/html/coreutils/2013-11/msg00006.html
+---
+ man/local.mk | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/man/local.mk b/man/local.mk
+index 266b780..45dbcb9 100644
+--- a/man/local.mk
++++ b/man/local.mk
+@@ -131,11 +131,11 @@ man/rm.1:        src/rm
+ man/rmdir.1:     src/rmdir
+ man/runcon.1:    src/runcon
+ man/seq.1:       src/seq
+-man/sha1sum.1:   src/md5sum
+-man/sha224sum.1: src/md5sum
+-man/sha256sum.1: src/md5sum
+-man/sha384sum.1: src/md5sum
+-man/sha512sum.1: src/md5sum
++man/sha1sum.1:   src/sha1sum
++man/sha224sum.1: src/sha224sum
++man/sha256sum.1: src/sha256sum
++man/sha384sum.1: src/sha384sum
++man/sha512sum.1: src/sha512sum
+ man/shred.1:     src/shred
+ man/shuf.1:      src/shuf
+ man/sleep.1:     src/sleep
+-- 
+1.8.3.1
-- 
GitLab


From 3f4b14d7937509a431ca7fa61f4b21b3b53fd6f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 27 Dec 2013 21:03:16 +0100
Subject: [PATCH 0238/3789] stdenv/setup.sh: add SHELL to makeFlags (close
 #1354)

---
 pkgs/stdenv/generic/setup.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 84d499696c9..96168da7753 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -109,6 +109,8 @@ runHook preHook
 # Check that the pre-hook initialised SHELL.
 if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi
 
+# see https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
+makeFlags="${makeFlags} SHELL=${SHELL}"
 
 # Hack: run gcc's setup hook.
 envHooks=()
-- 
GitLab


From d978c35ff966b64e7c2e5f251e4ed35a24a3e80d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 28 Dec 2013 08:17:14 +0100
Subject: [PATCH 0239/3789] stdenv/setup.sh: fix previous change...

for the case that there is no makefile. CC #1354
---
 pkgs/stdenv/generic/setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 96168da7753..b7940a069ce 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -109,9 +109,6 @@ runHook preHook
 # Check that the pre-hook initialised SHELL.
 if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi
 
-# see https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
-makeFlags="${makeFlags} SHELL=${SHELL}"
-
 # Hack: run gcc's setup hook.
 envHooks=()
 crossEnvHooks=()
@@ -617,6 +614,9 @@ buildPhase() {
         return
     fi
 
+    # see https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
+    makeFlags="${makeFlags} SHELL=${SHELL}"
+
     echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}"
     make ${makefile:+-f $makefile} \
         ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
-- 
GitLab


From 2265bab69d888abc8e82d31b0ee3fdee409102ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 28 Dec 2013 17:29:38 +0100
Subject: [PATCH 0240/3789] llvm: fix heavily parallel builds

---
 pkgs/development/compilers/llvm/default.nix           | 6 ++++--
 pkgs/development/compilers/llvm/no-rule-aarch64.patch | 8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/no-rule-aarch64.patch

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index a7129f5cef3..62ce2cdab14 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -10,8 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "0y3mfbb5qzcpw3v5qncn69x1hdrrrfirgs82ypi2annhf0g6nxk8";
   };
 
-  # The default rlimits are too low for shared libraries.
-  patches = [ ./more-memory-for-bugpoint.patch ];
+  patches = [
+    ./more-memory-for-bugpoint.patch # The default rlimits are too low for shared libraries.
+    ./no-rule-aarch64.patch # http://llvm.org/bugs/show_bug.cgi?id=16625
+  ];
 
   # libffi was propagated before, but it wasn't even being used, so
   # unless something needs it just an input is fine.
diff --git a/pkgs/development/compilers/llvm/no-rule-aarch64.patch b/pkgs/development/compilers/llvm/no-rule-aarch64.patch
new file mode 100644
index 00000000000..ea7214febe5
--- /dev/null
+++ b/pkgs/development/compilers/llvm/no-rule-aarch64.patch
@@ -0,0 +1,8 @@
+--- llvm/lib/Target/AArch64/Utils/CMakeLists.txt	2013/05/18 04:32:15	182189
++++ llvm/lib/Target/AArch64/Utils/CMakeLists.txt	2013/05/18 08:17:47	182190
+@@ -3,3 +3,5 @@
+ add_llvm_library(LLVMAArch64Utils
+   AArch64BaseInfo.cpp
+   )
++
++add_dependencies(LLVMAArch64Utils AArch64CommonTableGen)
-- 
GitLab


From c24cd76ef6831951fb53e02fd9ef0500925663eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 30 Dec 2013 09:13:13 +0100
Subject: [PATCH 0241/3789] libgcrypt on i686-linux: disable tests (fail on
 Hydra)

I don't know what causes the problem.
The tests do pass on my non-chrooted Fedora build machine.
---
 pkgs/development/libraries/libgcrypt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 997e9cfc5b8..c53b5479b7b 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation (rec {
 
   propagatedBuildInputs = [ libgpgerror ];
 
-  doCheck = true;
+  doCheck = stdenv.system != "i686-linux"; # "basic" test fails after stdenv+glibc-2.18
 
   # For some reason the tests don't find `libgpg-error.so'.
   checkPhase = ''
-- 
GitLab


From 2e4eab1228f2bb390d1948c776e02c68ef49ec0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 30 Dec 2013 21:33:12 +0100
Subject: [PATCH 0242/3789] llvm: update 3.3 -> 3.4

- Drop a patch that no longer applies: the default limit got tripled,
  so I hope it's sufficient now anyway.
- R600 support is no longer experimental and enabled by default.
- A few packages haven't been ported to 3.4 by upstream yet,
  so I will probably re-introduce 3.3 for them
  (so we can merge to master sooner).
---
 pkgs/development/compilers/llvm/default.nix       |  8 ++------
 .../compilers/llvm/more-memory-for-bugpoint.patch | 15 ---------------
 2 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/development/compilers/llvm/more-memory-for-bugpoint.patch

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index bed6bf1fc13..61798351f9b 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -1,18 +1,15 @@
 { stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils_gold }:
 
-let version = "3.3"; in
+let version = "3.4"; in
 
 stdenv.mkDerivation rec {
   name = "llvm-${version}";
 
   src = fetchurl {
     url    = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
-    sha256 = "0y3mfbb5qzcpw3v5qncn69x1hdrrrfirgs82ypi2annhf0g6nxk8";
+    sha256 = "0a169ba045r4apb9cv6ncrwl83l7yiajnzirkcdlhj1cd4nn3995";
   };
 
-  # The default rlimits are too low for shared libraries.
-  patches = [ ./more-memory-for-bugpoint.patch ];
-
   # libffi was propagated before, but it wasn't even being used, so
   # unless something needs it just an input is fine.
   buildInputs = [ perl groff cmake python libffi ]; # ToDo: polly, libc++; enable cxx11?
@@ -25,7 +22,6 @@ stdenv.mkDerivation rec {
     "-DCMAKE_BUILD_TYPE=Release"
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_BINUTILS_INCDIR=${binutils_gold}/include"
-    "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=R600" # for mesa
   ] ++ lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/llvm/more-memory-for-bugpoint.patch b/pkgs/development/compilers/llvm/more-memory-for-bugpoint.patch
deleted file mode 100644
index fa19ce4f587..00000000000
--- a/pkgs/development/compilers/llvm/more-memory-for-bugpoint.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur llvm-3.3.src-orig/tools/bugpoint/bugpoint.cpp llvm-3.3.src/tools/bugpoint/bugpoint.cpp
---- llvm-3.3.src-orig/tools/bugpoint/bugpoint.cpp	2013-01-27 20:35:51.000000000 -0500
-+++ llvm-3.3.src/tools/bugpoint/bugpoint.cpp	2013-06-21 18:29:47.612731499 -0400
-@@ -48,9 +48,9 @@
-                       "is killed (default is 300s), 0 disables timeout"));
- 
- static cl::opt<int>
--MemoryLimit("mlimit", cl::init(-1), cl::value_desc("MBytes"),
-+MemoryLimit("mlimit", cl::init(0), cl::value_desc("MBytes"),
-              cl::desc("Maximum amount of memory to use. 0 disables check."
--                      " Defaults to 100MB (800MB under valgrind)."));
-+                      " Check disabled by default."));
- 
- static cl::opt<bool>
- UseValgrind("enable-valgrind",
-- 
GitLab


From 8f0656c2f733298b21804b233c1d82e1decb48bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 30 Dec 2013 21:33:12 +0100
Subject: [PATCH 0243/3789] mesa: update to 10.0.1, always enable R600

A few TODOs are pending, but of relatively low importance.
---
 pkgs/development/libraries/mesa/default.nix | 32 +++++++++------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index f7ff87b34cc..3db3f41d588 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoconf, automake, libtool
+{ stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook
 , python, libxml2Python, file, expat, makedepend
 , libdrm, xorg, wayland, udev, llvm, libffi
-, libvdpau
+, libvdpau, libelf
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
-, enableR600LlvmCompiler ? true, libelf
 , enableExtraFeatures ? false # not maintained
 }:
 
@@ -24,8 +23,8 @@ else
 */
 
 let
-  version = "9.2.5";
-  # this is the default search path for DRI drivers (note: X server introduces an overriding env var)
+  version = "10.0.1";
+  # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
 with { inherit (stdenv.lib) optional optionals optionalString; };
@@ -35,15 +34,15 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "1w3bxclgwl2hwyxk3za7dbdakb8jsya7afck35cz0v8pxppvjsml";
+    sha256 = "0w1jh8pl4gbzazigsqc5pzc076gckb7b9xgw2w633jlrjn7qdprw";
   };
 
   prePatch = "patchShebangs .";
 
-  patches = [
+  patches = [ # some don't apply -- try without them ATM
     ./static-gallium.patch
-    ./dricore-gallium.patch
-    ./werror-wundef.patch
+   # ./dricore-gallium.patch
+   # ./werror-wundef.patch
   ];
 
   # Change the search path for EGL drivers from $drivers/* to driverLink
@@ -54,8 +53,6 @@ stdenv.mkDerivation {
 
   outputs = ["out" "drivers" "osmesa"];
 
-  preConfigure = "./autogen.sh";
-
   configureFlags = [
     "--with-dri-driverdir=$(drivers)/lib/dri"
     "--with-egl-driver-dir=$(drivers)/lib/egl"
@@ -72,11 +69,9 @@ stdenv.mkDerivation {
     "--enable-osmesa" # used by wine
 
     "--with-dri-drivers=i965,r200,radeon"
-    ("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast"
-      + optionalString enableR600LlvmCompiler ",radeonsi")
+    ("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,radeonsi")
     "--with-egl-platforms=x11,wayland,drm" "--enable-gbm" "--enable-shared-glapi"
   ]
-    ++ optional enableR600LlvmCompiler "--enable-r600-llvm-compiler"
     ++ optional enableTextureFloats "--enable-texture-float"
     ++ optionals enableExtraFeatures [
       "--enable-openvg" "--enable-gallium-egl" # not needed for EGL in Gallium, but OpenVG might be useful
@@ -90,17 +85,16 @@ stdenv.mkDerivation {
     ++ optionals stdenv.isLinux [libdrm]
     ;
   buildInputs = with xorg; [
-    autoconf automake libtool intltool expat libxml2Python llvm
+    autoreconfHook intltool expat libxml2Python llvm
     libXfixes glproto dri2proto libX11 libXext libxcb libXt
-    libffi wayland libvdpau
+    libffi wayland libvdpau libelf
   ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ]
     ++ optional stdenv.isLinux udev
-    ++ optional enableR600LlvmCompiler libelf
     ;
 
   enableParallelBuilding = true;
-  #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672
-  # TODO: best fix this before merging >=9.2 to master
+  #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672,
+    #tests for 10.* fail to link due to some RTTI problem
 
   # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM;
   #   also move libOSMesa to $osmesa, as it's relatively big
-- 
GitLab


From f0419a0bfcd13c7214e6dcb88f540022357dcaac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 30 Dec 2013 22:12:22 +0100
Subject: [PATCH 0244/3789] xorg: update a few sub-packages

---
 pkgs/servers/x11/xorg/default.nix       | 24 ++++++++++++------------
 pkgs/servers/x11/xorg/extra.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 1be17e623f7..ade60990d1a 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -890,11 +890,11 @@ let
   })) // {inherit ;};
 
   libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) {
-    name = "libxcb-1.9.1";
+    name = "libxcb-1.10";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2;
-      sha256 = "0brn7vw66widc5mw7gynwy8dln3gmzym2fqqyzk6k58bxgs5yjnl";
+      url = http://xcb.freedesktop.org/dist/libxcb-1.10.tar.bz2;
+      sha256 = "1dfmyb1zjx6n0zhr4y40mc1crlmj3bfjjhmn0f30ip9nnq2spncq";
     };
     buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
   })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
@@ -1130,11 +1130,11 @@ let
   })) // {inherit ;};
 
   xcbproto = (stdenv.mkDerivation ((if overrides ? xcbproto then overrides.xcbproto else x: x) {
-    name = "xcb-proto-1.8";
+    name = "xcb-proto-1.10";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2;
-      sha256 = "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93";
+      url = http://xcb.freedesktop.org/dist/xcb-proto-1.10.tar.bz2;
+      sha256 = "01dgp802i4ic9wkmpa7g1wm50pp547d3b96jjz2hnxavhpfhvx3y";
     };
     buildInputs = [pkgconfig python ];
   })) // {inherit python ;};
@@ -1280,11 +1280,11 @@ let
   })) // {inherit libX11 xproto libXrandr ;};
 
   xextproto = (stdenv.mkDerivation ((if overrides ? xextproto then overrides.xextproto else x: x) {
-    name = "xextproto-7.2.1";
+    name = "xextproto-7.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xextproto-7.2.1.tar.bz2;
-      sha256 = "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw";
+      url = mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2;
+      sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -1370,11 +1370,11 @@ let
   })) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) {
-    name = "xf86-input-synaptics-1.7.1";
+    name = "xf86-input-synaptics-1.7.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.1.tar.bz2;
-      sha256 = "13mmpcwp1d69w6c458a4fdqgwl24bpvrnq3zd6833chz1rk2an6v";
+      url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.2.tar.bz2;
+      sha256 = "1kbx59zhk3kky0hkklsl8n2lm269am8k5xjpikpn51hdbyjpz5b3";
     };
     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/extra.list b/pkgs/servers/x11/xorg/extra.list
index 2372df2701e..505f0eafc3a 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -1,6 +1,6 @@
 http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
-http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2
-http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2
+http://xcb.freedesktop.org/dist/libxcb-1.10.tar.bz2
+http://xcb.freedesktop.org/dist/xcb-proto-1.10.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 4cf9c0362e0..4a7b72c09fc 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -108,7 +108,7 @@ mirror://xorg/X11R7.7/src/everything/xcursor-themes-1.0.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xdpyinfo-1.3.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xev-1.2.0.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xextproto-7.2.1.tar.bz2
+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
@@ -116,7 +116,7 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2
-mirror://xorg/individual/driver/xf86-input-synaptics-1.7.1.tar.bz2
+mirror://xorg/individual/driver/xf86-input-synaptics-1.7.2.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
-- 
GitLab


From fc2580ad877c94aa603e78f640be3e0229fd0e60 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 2 Jan 2014 11:53:25 +0100
Subject: [PATCH 0245/3789] Removed confnotify-6.0.patch.

I don't think it is a good idea to hardcode this patch in nixpkgs as it is likely that
a patch provided by a user will conflict with this patch. This is for instance the case
with the patch "single_tagset" (http://dwm.suckless.org/patches/single_tagset).
---
 .../window-managers/dwm/confnotify-6.0.patch  | 36 -------------------
 .../window-managers/dwm/default.nix           |  2 +-
 2 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 pkgs/applications/window-managers/dwm/confnotify-6.0.patch

diff --git a/pkgs/applications/window-managers/dwm/confnotify-6.0.patch b/pkgs/applications/window-managers/dwm/confnotify-6.0.patch
deleted file mode 100644
index 5b5e2ebb68a..00000000000
--- a/pkgs/applications/window-managers/dwm/confnotify-6.0.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix SDL fullscreen problems when the resolution changes:
-https://groups.google.com/d/msg/wmii/nJBrSjrnnq8/ZEYWOWE5pj4J
-
-diff -r ec4baab78314 dwm.c
---- a/dwm.c	Mon Dec 19 15:38:30 2011 +0100
-+++ b/dwm.c	Sat Jan 14 12:35:50 2012 +0100
-@@ -397,9 +397,10 @@
- 		showhide(m->stack);
- 	else for(m = mons; m; m = m->next)
- 		showhide(m->stack);
--	if(m)
-+	if(m) {
- 		arrangemon(m);
--	else for(m = mons; m; m = m->next)
-+		restack(m);
-+	} else for(m = mons; m; m = m->next)
- 		arrangemon(m);
- }
- 
-@@ -408,7 +409,6 @@
- 	strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
- 	if(m->lt[m->sellt]->arrange)
- 		m->lt[m->sellt]->arrange(m);
--	restack(m);
- }
- 
- void
-@@ -1827,6 +1827,8 @@
- 		.event_mask = ButtonPressMask|ExposureMask
- 	};
- 	for(m = mons; m; m = m->next) {
-+		if (m->barwin)
-+			continue;
- 		m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
- 		                          CopyFromParent, DefaultVisual(dpy, screen),
- 		                          CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix
index 82eb9e56935..b69dd9d8a49 100644
--- a/pkgs/applications/window-managers/dwm/default.nix
+++ b/pkgs/applications/window-managers/dwm/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   prePatch = ''sed -i "s@/usr/local@$out@" config.mk'';
 
   # Allow users set their own list of patches
-  patches = [ ./confnotify-6.0.patch ] ++ patches;
+  inherit patches;
 
   buildPhase = " make ";
  
-- 
GitLab


From c6b92053c9e38238a29ed78b7ba1e3e5f569fe83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 1 Jan 2014 15:50:02 +0100
Subject: [PATCH 0246/3789] glibc: pull a bug work-around from Arch

This should work around some of our build problems,
e.g. http://hydra.nixos.org/build/7575893/nixlog/1/tail-reload

Cf. #1446
---
 pkgs/development/libraries/glibc/2.18/common.nix   |  2 ++
 .../libraries/glibc/2.18/strstr-sse42-hack.patch   | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/glibc/2.18/strstr-sse42-hack.patch

diff --git a/pkgs/development/libraries/glibc/2.18/common.nix b/pkgs/development/libraries/glibc/2.18/common.nix
index 9e58b2163c6..518615b1739 100644
--- a/pkgs/development/libraries/glibc/2.18/common.nix
+++ b/pkgs/development/libraries/glibc/2.18/common.nix
@@ -67,6 +67,8 @@ stdenv.mkDerivation ({
       ./cve-2013-4332.patch
       ./cve-2013-4458.patch
       ./cve-2013-4788.patch
+
+      ./strstr-sse42-hack.patch
     ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/glibc/2.18/strstr-sse42-hack.patch b/pkgs/development/libraries/glibc/2.18/strstr-sse42-hack.patch
new file mode 100644
index 00000000000..cdf4c025316
--- /dev/null
+++ b/pkgs/development/libraries/glibc/2.18/strstr-sse42-hack.patch
@@ -0,0 +1,14 @@
+https://bugs.archlinux.org/task/36556
+diff --git a/sysdeps/x86_64/multiarch/strstr.c b/sysdeps/x86_64/multiarch/strstr.c
+index cd63b68..03d8b9a 100644
+--- a/sysdeps/x86_64/multiarch/strstr.c
++++ b/sysdeps/x86_64/multiarch/strstr.c
+@@ -86,7 +86,7 @@
+ /* Simple replacement of movdqu to address 4KB boundary cross issue.
+    If EOS occurs within less than 16B before 4KB boundary, we don't
+    cross to next page.  */
+-static __m128i
++static inline __m128i
+ __m128i_strloadu (const unsigned char * p, __m128i zero)
+ {
+   if (__builtin_expect ((int) ((size_t) p & 0xfff) > 0xff0, 0))
-- 
GitLab


From adffa870cf9226179bc56e202aeec7f5815bc4c3 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 3 Jan 2014 01:20:50 +0100
Subject: [PATCH 0247/3789] xf86-video-vmware: xatracker2 patch to build with
 mesa 10

---
 pkgs/servers/x11/xorg/overrides.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 08dc5a92b7d..200e70644a7 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -168,6 +168,10 @@ in
 
   xf86videovmware = attrs: attrs // {
     buildInputs =  attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker
+    patches = [( args.fetchurl {
+      url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xatracker-v2-fixes.patch?h=packages/xf86-video-vmware;
+      sha256 = "1k5a3zf2bzmw84di31b8zfy51n2mqrr01xjfy5nw7395qv5r5cvs";
+    })];
   };
 
   xdriinfo = attrs: attrs // {
-- 
GitLab


From 86802e68ffd1981af92303a7a8a91a2723ca84ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 3 Jan 2014 10:33:03 +0100
Subject: [PATCH 0248/3789] gcc-4.{7,8}: hacky fix for parallel builds

The hash of stdenv is unchanged, as we use profiled compiler,
which has parallel builds disabled (conditional patch).
---
 .../development/compilers/gcc/4.7/default.nix | 17 +++++++---
 .../development/compilers/gcc/4.8/default.nix | 21 ++++++------
 .../compilers/gcc/4.8/parallel-bconfig.patch  | 32 +++++++++++++++++++
 3 files changed, 56 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/compilers/gcc/4.8/parallel-bconfig.patch

diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix
index 951288dc024..6c71a0d640f 100644
--- a/pkgs/development/compilers/gcc/4.7/default.nix
+++ b/pkgs/development/compilers/gcc/4.7/default.nix
@@ -54,7 +54,18 @@ let version = "4.7.3";
     # 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".
+
+     Parallel make of gfortran is disabled because of an apparent race
+     condition concerning the generation of "bconfig.h". Please try and
+     re-enable parallel make for a later release of gfortran to check whether
+     the error has been fixed.
+  */
+    enableParallelBuilding = !profiledCompiler && !langFortran;
+
     patches = []
+      ++ optional enableParallelBuilding ../4.8/parallel-bconfig.patch
       ++ optional stdenv.isArm [ ./arm-eabi.patch ]
       ++ optional (cross != null) ./libstdc++-target.patch
       # ++ optional noSysDirs ./no-sys-dirs.patch
@@ -481,11 +492,7 @@ stdenv.mkDerivation ({
   passthru = { inherit langC langCC langAda langFortran langVhdl
       langGo enableMultilib version; };
 
-  /* From gccinstall.info:
-     "parallel make is currently not supported since collisions in profile
-     collecting may occur"
-  */
-  enableParallelBuilding = !profiledCompiler;
+  inherit enableParallelBuilding;
 
   meta = {
     homepage = http://gcc.gnu.org/;
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 3d42ae2ca3f..67c50d420f5 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -57,7 +57,18 @@ let version = "4.8.2";
     # 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".
+
+     Parallel make of gfortran is disabled because of an apparent race
+     condition concerning the generation of "bconfig.h". Please try and
+     re-enable parallel make for a later release of gfortran to check whether
+     the error has been fixed.
+  */
+    enableParallelBuilding = !profiledCompiler && !langFortran;
+
     patches = []
+      ++ optional enableParallelBuilding ./parallel-bconfig.patch
       ++ optional stdenv.isArm [ ./arm-eabi.patch ]
       ++ optional (cross != null) ./libstdc++-target.patch
       # ++ optional noSysDirs ./no-sys-dirs.patch
@@ -484,15 +495,7 @@ stdenv.mkDerivation ({
   passthru = { inherit langC langCC langAda langFortran langVhdl
       langGo enableMultilib version; };
 
-  /* gccinstall.info says that "parallel make is currently not supported since
-     collisions in profile collecting may occur".
-
-     Parallel make of gfortran is disabled because of an apparent race
-     condition concerning the generation of "bconfig.h". Please try and
-     re-enable parallel make for a later release of gfortran to check whether
-     the error has been fixed.
-   */
-     enableParallelBuilding = !profiledCompiler && !langFortran;
+  inherit enableParallelBuilding;
 
   meta = {
     homepage = http://gcc.gnu.org/;
diff --git a/pkgs/development/compilers/gcc/4.8/parallel-bconfig.patch b/pkgs/development/compilers/gcc/4.8/parallel-bconfig.patch
new file mode 100644
index 00000000000..bc56ac698f5
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.8/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)
+ 
-- 
GitLab


From f4f0d2ecb96ee731cd1091c052afa50f0353bb94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 3 Jan 2014 13:55:41 +0100
Subject: [PATCH 0249/3789] stdenv/setup.sh: fix breakage when shebang contains
 '\'

Some programs, e.g. guile-config, has a shebang that ends in '\':

  #!/usr/bin/guile-1.8 \
  -e main -s
  !#
  ;;;; guile-config --- utility for linking programs with Guile
  ;;;; Jim Blandy <jim@red-bean.com> --- September 1997

This currently breaks patchShebangs:

  $ read oldPath arg0 args <<< 'shebang \'; echo $?
  1
  $ echo $oldPath
  shebang
  $ echo $arg0

  $ echo $args

(And setup.sh/patchShebangs is run with 'set -e' so any command that
return non-zero aborts the build.)

Fix by telling 'read' to not interpret backslashes (with the -r flag):

  $ read -r oldPath arg0 args <<< 'shebang \'; echo $?
  0
  $ echo $oldPath
  shebang
  $ echo $arg0
  \
  $ echo $args

Also needed: escape the escape characters so that sed doesn't interpret
them.
---
 pkgs/stdenv/generic/setup.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index b7940a069ce..58647f1508d 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -677,7 +677,7 @@ patchShebangs() {
         fi
 
         oldInterpreterLine=$(head -1 "$f" | tail -c +3)
-        read oldPath arg0 args <<< "$oldInterpreterLine"
+        read -r oldPath arg0 args <<< "$oldInterpreterLine"
 
         if $(echo "$oldPath" | grep -q "/bin/env$"); then
             # Check for unsupported 'env' functionality:
@@ -703,7 +703,9 @@ patchShebangs() {
         if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then
             if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then
                 echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\""
-                sed -i -e "1 s|.*|#\!$newInterpreterLine|" "$f"
+                # escape the escape chars so that sed doesn't interpret them
+                escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g')
+                sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f"
             fi
         fi
     done
-- 
GitLab


From f78534ca0f8ec63d79370eb2367605579efba088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 4 Jan 2014 12:37:17 +0100
Subject: [PATCH 0250/3789] gcc-4.7: fix the parallel-bconfig patch

I'm sorry I forgot to test the 4.8 patch against 4.7. Now it's ported.
---
 .../development/compilers/gcc/4.7/default.nix |  2 +-
 .../gcc/4.7/parallel-bconfig-4.7.patch        | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/gcc/4.7/parallel-bconfig-4.7.patch

diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix
index 6c71a0d640f..34ea93cf5f0 100644
--- a/pkgs/development/compilers/gcc/4.7/default.nix
+++ b/pkgs/development/compilers/gcc/4.7/default.nix
@@ -65,7 +65,7 @@ let version = "4.7.3";
     enableParallelBuilding = !profiledCompiler && !langFortran;
 
     patches = []
-      ++ optional enableParallelBuilding ../4.8/parallel-bconfig.patch
+      ++ optional enableParallelBuilding ./parallel-bconfig-4.7.patch
       ++ optional stdenv.isArm [ ./arm-eabi.patch ]
       ++ optional (cross != null) ./libstdc++-target.patch
       # ++ optional noSysDirs ./no-sys-dirs.patch
diff --git a/pkgs/development/compilers/gcc/4.7/parallel-bconfig-4.7.patch b/pkgs/development/compilers/gcc/4.7/parallel-bconfig-4.7.patch
new file mode 100644
index 00000000000..bdf0fa4931a
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.7/parallel-bconfig-4.7.patch
@@ -0,0 +1,30 @@
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index 0f6735a..ba93e9b 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -3904,21 +3904,21 @@ build/genflags.o : genflags.c $(RTL_BASE_H) $(OBSTACK_H) $(BCONFIG_H)	\
+   $(SYSTEM_H) coretypes.h $(GTM_H) errors.h $(READ_MD_H) gensupport.h
+ build/gengenrtl.o : gengenrtl.c $(BCONFIG_H) $(SYSTEM_H) rtl.def
+ gengtype-lex.o build/gengtype-lex.o : gengtype-lex.c gengtype.h $(SYSTEM_H)
+-gengtype-lex.o: $(CONFIG_H)
++gengtype-lex.o: $(CONFIG_H) $(BCONFIG_H)
+ 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)
+ 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)
+ 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)
+ build/gengtype.o: $(BCONFIG_H)
+ build/genmddeps.o: genmddeps.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h	\
+   errors.h $(READ_MD_H)
-- 
GitLab


From 5c33b7350ba8709ea8033adb4bde55f7e4505da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Jan 2014 09:42:07 +0100
Subject: [PATCH 0251/3789] webkitgtk, kde.qtcurve: build with default gcc (not
 4.7)

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0fd7946560..c3334ca96f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5837,7 +5837,6 @@ let
     };
 
   webkitgtk = callPackage ../development/libraries/webkitgtk {
-    stdenv = overrideGCC stdenv gcc47;
     libsoup = libsoup_2_44;
     harfbuzz = harfbuzz.override {
       withIcu = true;
@@ -9769,9 +9768,7 @@ let
 
       psi = callPackage ../applications/networking/instant-messengers/psi { };
 
-      qtcurve = callPackage ../misc/themes/qtcurve {
-        stdenv = overrideGCC stdenv gcc47;
-      };
+      qtcurve = callPackage ../misc/themes/qtcurve { };
 
       quassel = callPackage ../applications/networking/irc/quassel { };
 
-- 
GitLab


From 0a2ae78216d6afda43f59b96a4cf264cc3ef2993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Jan 2014 09:43:12 +0100
Subject: [PATCH 0252/3789] asympote: fix build

---
 pkgs/tools/graphics/asymptote/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix           | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index e9f61228bed..b4bb49758a4 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -1,7 +1,7 @@
 a @ {
   freeglut,ghostscriptX,imagemagick,fftw,
   boehmgc,mesa,ncurses,readline,gsl,libsigsegv,
-  python,zlib, perl, texLive, texinfo, lzma,
+  python,zlib, perl, texLive, texinfo, xz,
 
   noDepEntry, fullDepEntry, fetchUrlFromSrcInfo,
   lib,
@@ -20,7 +20,7 @@ let
   buildInputs = with a; [
     freeglut ghostscriptX imagemagick fftw boehmgc
     mesa ncurses readline gsl libsigsegv python zlib
-    perl texLive texinfo lzma
+    perl texLive texinfo xz
   ];
 in
 rec {
@@ -54,7 +54,7 @@ rec {
   '';
 
   extractTexinfoTex = a.fullDepEntry ''
-    lzma -d < ${a.texinfo.src} | tar --wildcards -x texinfo-'*'/doc/texinfo.tex
+    xz -d < ${a.texinfo.src} | tar --wildcards -x texinfo-'*'/doc/texinfo.tex
     cp texinfo-*/doc/texinfo.tex doc/
   '' ["minInit" "addInputs" "doUnpack"];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c3334ca96f4..0fb7e10c33c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -429,9 +429,9 @@ let
   asymptote = builderDefsPackage ../tools/graphics/asymptote {
     inherit freeglut ghostscriptX imagemagick fftw boehmgc
       mesa ncurses readline gsl libsigsegv python zlib perl
-      texinfo lzma;
+      texinfo xz;
     texLive = texLiveAggregationFun {
-      paths = [ texLive texLiveExtra ];
+      paths = [ texLive texLiveExtra texLiveCMSuper ];
     };
   };
 
-- 
GitLab


From d494ed15e774fb0774f145f4a8d5b7de49b102b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Jan 2014 10:42:55 +0100
Subject: [PATCH 0253/3789] celestia: fix build (inspired by Arch)

---
 pkgs/applications/science/astronomy/celestia/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index d7814aa5b78..6f9de9d981f 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -65,6 +65,8 @@ stdenv.mkDerivation {
     )
   '';
 
+  installPhase = ''make DESTDIR="$out" MKDIR_P="mkdir -p" install'';
+
   enableParallelBuilding = true;
 
   meta = {
-- 
GitLab


From 72478f1c8e94385fff388fe6193683e3ef41a1a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Jan 2014 11:03:30 +0100
Subject: [PATCH 0254/3789] gnome2.libgnomeprint: fix build by using bison2

---
 pkgs/desktops/gnome-2/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index c2e1c062e9e..50fd8344c82 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, self, stdenv, gettext, gvfs, libunique, overrides ? {} }:
+{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2, overrides ? {} }:
 let overridden = set // overrides; set = with overridden; {
   # Backward compatibility.
   gtkdoc = self.gtk_doc;
@@ -19,7 +19,9 @@ let overridden = set // overrides; set = with overridden; {
 
   libglade = callPackage ./platform/libglade { };
 
-  libgnomeprint = callPackage ./platform/libgnomeprint { };
+  libgnomeprint = callPackage ./platform/libgnomeprint {
+    bison = bison2;
+  };
 
   libgnomeprintui = callPackage ./platform/libgnomeprintui { };
 
-- 
GitLab


From 552143224a8c0475b116d185a3b67d4cf5e0dfcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Jan 2014 11:19:07 +0100
Subject: [PATCH 0255/3789] net_snmp: fix build by autoreconfing

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

diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix
index a9d1578495a..ad44860e7bd 100644
--- a/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/pkgs/servers/monitoring/net-snmp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file, openssl, perl }:
+{ stdenv, fetchurl, autoreconfHook, file, openssl, perl }:
 
 stdenv.mkDerivation rec {
   name = "net-snmp-5.7.2";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       "--with-persistent-directory=/var/lib/net-snmp"
     ];
 
-  buildInputs = [ file openssl perl ];
+  buildInputs = [ autoreconfHook file openssl perl ];
 
   enableParallelBuilding = true;
 
-- 
GitLab


From 3dd298060a2d7c4ecaf82373a4cfb73aa02ad533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Jan 2014 11:22:04 +0100
Subject: [PATCH 0256/3789] gource: fix build with newer gcc versions
 (-fpermissive)

---
 pkgs/applications/version-management/gource/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index 886ed9a7199..1bbc595d040 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation {
 
   buildInputs = [glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa];
 
+  NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
+
   meta = {
     homepage = "http://code.google.com/p/gource/";
     description = "software version control visualization tool";
-- 
GitLab


From 900c7d29e768fb9f1513f67d8929c5c7243cc77f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Jan 2014 11:29:15 +0100
Subject: [PATCH 0257/3789] ipsecTools: fix build with newer gcc versions
 (warnings)

---
 pkgs/os-specific/linux/ipsec-tools/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix
index b28320c0625..f1faa5c4884 100644
--- a/pkgs/os-specific/linux/ipsec-tools/default.nix
+++ b/pkgs/os-specific/linux/ipsec-tools/default.nix
@@ -18,6 +18,9 @@ stdenv.mkDerivation rec {
 
   patches = [ ./dont-create-localstatedir-during-install.patch ];
 
+  # fix build with newer gcc versions
+  preConfigure = ''substituteInPlace configure --replace "-Werror" "" '';
+
   configureFlags = ''
     --sysconfdir=/etc --localstatedir=/var
     --with-kernel-headers=${linuxHeaders}/include
-- 
GitLab


From 44391881109e4268e00b200267ff0c8459615473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Jan 2014 11:42:22 +0100
Subject: [PATCH 0258/3789] libmsn: fix build with >=gcc-4.7 by a debian patch

---
 pkgs/development/libraries/libmsn/default.nix    |  1 +
 .../libraries/libmsn/fix-ftbfs-gcc4.7.diff       | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff

diff --git a/pkgs/development/libraries/libmsn/default.nix b/pkgs/development/libraries/libmsn/default.nix
index 4ec5e62ea04..77fe3403de7 100644
--- a/pkgs/development/libraries/libmsn/default.nix
+++ b/pkgs/development/libraries/libmsn/default.nix
@@ -6,5 +6,6 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/libmsn/${name}.tar.bz2";
     sha256 = "338369c7455b123e84b9a7a858ac0ed2b1dc32e6529f460fdc01d28869a20fde";
   };
+  patches = [ ./fix-ftbfs-gcc4.7.diff ];
   buildInputs = [ cmake openssl ];
 }
diff --git a/pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff b/pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff
new file mode 100644
index 00000000000..46aeab31c84
--- /dev/null
+++ b/pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff
@@ -0,0 +1,16 @@
+Fix g++ 4.7 build failure
+
+Kudos to Matthias Klose for the patch
+
+Index: libmsn-4.2/msn/util.cpp
+===================================================================
+--- libmsn-4.2.orig/msn/util.cpp	2009-07-22 19:57:10.000000000 +0000
++++ libmsn-4.2/msn/util.cpp	2012-04-16 20:52:18.068767213 +0000
+@@ -25,6 +25,7 @@
+ #include <msn/util.h>
+ #include <sstream>
+ #include <errno.h>
++#include <unistd.h>
+ #include <cctype>
+ #include <fstream>
+ #include <openssl/rand.h>
-- 
GitLab


From 80396084b979bbe45ea191fedf8345587d002e3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Jan 2014 11:48:09 +0100
Subject: [PATCH 0259/3789] kde.krusader: fix build with newer gcc versions
 (-fpermissive)

---
 pkgs/applications/misc/krusader/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index bd86501c30e..83c21da0e54 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
     sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6";
   };
   buildInputs = [ gettext kdelibs kde_baseapps ];
+  NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
   meta = {
     description = "Norton/Total Commander clone for KDE";
     license = "GPL";
-- 
GitLab


From d91e03d422f35d043a234213e7aff4320684453c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Jan 2014 13:09:22 +0100
Subject: [PATCH 0260/3789] k3d: fix build with newer gcc versions
 (-fpermissive)

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

diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index 8920d243dbf..9f31d94ac7f 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fpermissive -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)"
   '';
 
   buildInputs = [
-- 
GitLab


From 0f3155f2460d216b5c130dfdaa5b5fe7092ea8c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Jan 2014 15:20:48 +0100
Subject: [PATCH 0261/3789] mlton: fix build by updating

---
 pkgs/development/compilers/mlton/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index a5ff613a9b4..47c4404a818 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -1,23 +1,26 @@
 { stdenv, fetchurl, gmp }:
 
+let
+  version = "20130715";
+in
 stdenv.mkDerivation rec {
-  name = "mlton-20100608";
+  name = "mlton-${version}";
 
   binSrc =
     if stdenv.system == "i686-linux" then (fetchurl {
-      url = "http://sourceforge.net/projects/mlton/files/mlton/20100608/${name}-1.x86-linux.static.tgz";
-      sha256 = "16qg8df9hg2pmnsblkgxp6bgm7334rsqkxqzskv5fl21wivmnwfw";
+      url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.x86-linux.tgz";
+      sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j";
     })
     else if stdenv.system == "x86_64-linux" then (fetchurl {
-        url = "http://sourceforge.net/projects/mlton/files/mlton/20100608/${name}-1.amd64-linux.static.tgz";
-        sha256 = "0i6ic8f6prl0cigrmf6bj9kqz3plzappxn17lz1rg2v832nfbw9r";
+        url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.amd64-linux.tgz";
+        sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn";
     })
     else throw "Architecture not supported";
 
   codeSrc =
     fetchurl {
-      url = "http://sourceforge.net/projects/mlton/files/mlton/20100608/${name}.src.tgz";
-      sha256 = "0cqb3k6ld9965hyyfyayi510f205vqzd5qqm3crh13nasvq2rjzj";
+      url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}.src.tgz";
+      sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11";
     };
 
   srcs = [ binSrc codeSrc ];
-- 
GitLab


From 10c15d586175a0f636f2a75556a9b17040634b13 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 5 Jan 2014 18:51:57 +0100
Subject: [PATCH 0262/3789] zsnes: manual header magic is no longer needed with
 the gcc-4.8 patch

---
 pkgs/misc/emulators/zsnes/default.nix | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix
index 6ee57e0cddf..c3bced29200 100644
--- a/pkgs/misc/emulators/zsnes/default.nix
+++ b/pkgs/misc/emulators/zsnes/default.nix
@@ -19,25 +19,8 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     cd src
-
     sed -i "/^STRIP/d" configure
-    
-    # Fix for undefined strncasecmp()
-    echo '#include <strings.h>' > tmp.cpp 
-    cat tmp.cpp tools/strutil.h > tools/strutil.h.new
-    mv tools/strutil.h.new tools/strutil.h
-    
-    # Fix for undefined system()
-    echo '#include <stdlib.h>' > tmp.cpp
-    cat tmp.cpp tools/depbuild.cpp > tools/depbuild.cpp.new
-    mv tools/depbuild.cpp.new tools/depbuild.cpp
-    
-    # Fix for lots of undefined strcmp, strncmp etc.
-    echo '#include <string.h>' > tmp.cpp 
-    cat tmp.cpp parsegen.cpp > parsegen.cpp.new
-    mv parsegen.cpp.new parsegen.cpp
   '';
-  
 
   configureFlags = "--enable-release";
 
-- 
GitLab


From 340b6ab649e5d75e7cc75ee7a2181b83fb567088 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 09:40:35 +0100
Subject: [PATCH 0263/3789] openssl: Update to 1.0.1f

CVE-2013-6449, CVE-2013-6450, CVE-2013-4353.
---
 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 55beb8bbc53..7d7ccacd14a 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.1e";
+  name = "openssl-1.0.1f";
 
   opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
     (throw "openssl needs its platform name cross building" null)
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
       "http://www.openssl.org/source/${name}.tar.gz"
       "http://openssl.linux-mirror.org/source/${name}.tar.gz"
     ];
-    sha256 = "1qqskk39jh85fvdn3ycmdqjdf67c0b97dwmmbcysl4gzr3l1akzp";
+    sha256 = "0nnbr70dg67raqsqvlypzxa1v5xsv9gp91f9pavyckfn2w5sihkc";
   };
 
   patches = patchesCross false;
-- 
GitLab


From 369185288a0fed4bc9fcb6183e70907b413a86b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 09:43:39 +0100
Subject: [PATCH 0264/3789] stdenv: Revert special-casing of fixupPhase

Treating fixupPhase specially is really ugly.  Also, it collides with
the work in the multiple-outputs branch (which already has support for
fixing up all outputs).

Partial revert of 0a44a091217ecd335cd10c06c1ddd29ad599f18c.
---
 pkgs/stdenv/generic/setup.sh | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 58647f1508d..2ed2f5d3dd8 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -796,23 +796,23 @@ fixupPhase() {
     fi
 
     if [ -n "$propagatedBuildInputs" ]; then
-        mkdir -p "$prefix/nix-support"
-        echo "$propagatedBuildInputs" > "$prefix/nix-support/propagated-build-inputs"
+        mkdir -p "$out/nix-support"
+        echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
     fi
 
     if [ -n "$propagatedNativeBuildInputs" ]; then
-        mkdir -p "$prefix/nix-support"
-        echo "$propagatedNativeBuildInputs" > "$prefix/nix-support/propagated-native-build-inputs"
+        mkdir -p "$out/nix-support"
+        echo "$propagatedNativeBuildInputs" > "$out/nix-support/propagated-native-build-inputs"
     fi
 
     if [ -n "$propagatedUserEnvPkgs" ]; then
-        mkdir -p "$prefix/nix-support"
-        echo "$propagatedUserEnvPkgs" > "$prefix/nix-support/propagated-user-env-packages"
+        mkdir -p "$out/nix-support"
+        echo "$propagatedUserEnvPkgs" > "$out/nix-support/propagated-user-env-packages"
     fi
 
     if [ -n "$setupHook" ]; then
-        mkdir -p "$prefix/nix-support"
-        substituteAll "$setupHook" "$prefix/nix-support/setup-hook"
+        mkdir -p "$out/nix-support"
+        substituteAll "$setupHook" "$out/nix-support/setup-hook"
     fi
 
     runHook postFixup
@@ -897,16 +897,9 @@ genericBuild() {
         showPhaseHeader "$curPhase"
         dumpVars
 
-        if [ "$curPhase" = fixupPhase ]; then
-          for pref in ${outputs:-out}; do
-            echo "fixup on \$$pref"
-            prefix=${!pref} eval "${!curPhase:-$curPhase}"
-          done
-        else
-          # Evaluate the variable named $curPhase if it exists, otherwise the
-          # function named $curPhase.
-          eval "${!curPhase:-$curPhase}"
-        fi
+        # Evaluate the variable named $curPhase if it exists, otherwise the
+        # function named $curPhase.
+        eval "${!curPhase:-$curPhase}"
 
         if [ "$curPhase" = unpackPhase ]; then
             cd "${sourceRoot:-.}"
-- 
GitLab


From 890461d8af65d803a4250b98129588965381ff75 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 09:48:23 +0100
Subject: [PATCH 0265/3789] stdenv: Update comment

---
 pkgs/stdenv/generic/setup.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 2ed2f5d3dd8..14ebe842344 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -916,12 +916,9 @@ genericBuild() {
     stopNest
 }
 
-for i in "${postHooks[@]}"; do
-    $i
-done
-
 
-# Execute the post-hook.
+# Execute the post-hooks.
+for i in "${postHooks[@]}"; do $i; done
 runHook postHook
 
 
-- 
GitLab


From 2a0047bbef427e7c4c42323778f85e995afdb71d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 09:49:45 +0100
Subject: [PATCH 0266/3789] stdenv: Fix indentation

---
 pkgs/stdenv/generic/setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 14ebe842344..58868e8706a 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -289,7 +289,7 @@ stripDirs() {
     if [ -n "${dirs}" ]; then
         header "stripping (with flags $stripFlags) in $dirs"
         for dir in $dirs; do
-          test -L "$dir" || chmod -R +rw "$dir"
+            test -L "$dir" || chmod -R +rw "$dir"
         done
         find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $stripFlags || true
         stopNest
@@ -768,7 +768,7 @@ fixupPhase() {
         done
         for f in "$out"/share/man/*/* "$out"/share/man/*/*/*; do
             if [ -L "$f" -a -f `readlink -f "$f"`.gz ]; then
-              ln -sf `readlink "$f"`.gz "$f"
+                ln -sf `readlink "$f"`.gz "$f"
             fi
         done
         unset GLOBIGNORE
-- 
GitLab


From bdf34e9059bcfd2039b0c202226287dc3bc495d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 10:26:35 +0100
Subject: [PATCH 0267/3789] gcc: Don't use attrByPath

---
 .../development/compilers/gcc/4.8/default.nix | 52 +++++++++----------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 67c50d420f5..8bd3ee14554 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -102,12 +102,12 @@ let version = "4.8.2";
 
     /* Platform flags */
     platformFlags = let
-        gccArch = stdenv.lib.attrByPath [ "platform" "gcc" "arch" ] null stdenv;
-        gccCpu = stdenv.lib.attrByPath [ "platform" "gcc" "cpu" ] null stdenv;
-        gccAbi = stdenv.lib.attrByPath [ "platform" "gcc" "abi" ] null stdenv;
-        gccFpu = stdenv.lib.attrByPath [ "platform" "gcc" "fpu" ] null stdenv;
-        gccFloat = stdenv.lib.attrByPath [ "platform" "gcc" "float" ] null stdenv;
-        gccMode = stdenv.lib.attrByPath [ "platform" "gcc" "mode" ] null stdenv;
+        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 "";
@@ -115,22 +115,22 @@ let version = "4.8.2";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        (withArch +
+        withArch +
         withCpu +
         withAbi +
         withFpu +
         withFloat +
-        withMode);
+        withMode;
 
     /* Cross-gcc settings */
     crossMingw = (cross != null && cross.libc == "msvcrt");
     crossConfigureFlags = let
-        gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross;
-        gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross;
-        gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross;
-        gccFpu = stdenv.lib.attrByPath [ "gcc" "fpu" ] null cross;
-        gccFloat = stdenv.lib.attrByPath [ "gcc" "float" ] null cross;
-        gccMode = stdenv.lib.attrByPath [ "gcc" "mode" ] null cross;
+        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 "";
@@ -193,8 +193,7 @@ let version = "4.8.2";
             " --enable-nls" +
             " --disable-decimal-float") # No final libdecnumber (it may work only in 386)
           );
-    stageNameAddon = if crossStageStatic then "-stage-static" else
-      "-stage-final";
+    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;
@@ -379,11 +378,11 @@ stdenv.mkDerivation ({
     else "install";
 
   crossAttrs = let
-    xgccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null stdenv.cross;
-    xgccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null stdenv.cross;
-    xgccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null stdenv.cross;
-    xgccFpu = stdenv.lib.attrByPath [ "gcc" "fpu" ] null stdenv.cross;
-    xgccFloat = stdenv.lib.attrByPath [ "gcc" "float" ] null stdenv.cross;
+    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 "";
@@ -443,8 +442,7 @@ stdenv.mkDerivation ({
   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";
+  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
@@ -468,8 +466,7 @@ stdenv.mkDerivation ({
 
                                    # On GNU/Hurd glibc refers to Mach & Hurd
                                    # headers.
-                                   ++ optionals (libcCross != null &&
-                                                 hasAttr "propagatedBuildInputs" libcCross)
+                                   ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" )
                                         libcCross.propagatedBuildInputs)));
 
   LIBRARY_PATH = concatStrings
@@ -492,8 +489,8 @@ stdenv.mkDerivation ({
            " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}")
     else null;
 
-  passthru = { inherit langC langCC langAda langFortran langVhdl
-      langGo enableMultilib version; };
+  passthru =
+    { inherit langC langCC langAda langFortran langVhdl langGo enableMultilib version; };
 
   inherit enableParallelBuilding;
 
@@ -526,7 +523,6 @@ stdenv.mkDerivation ({
   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; }
 )
-- 
GitLab


From f1efeb4b3c459c7cdc77d4bfda55fb82d71477d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 10:28:07 +0100
Subject: [PATCH 0268/3789] Get rid of tabs

---
 pkgs/development/compilers/gcc/4.8/builder.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/builder.sh b/pkgs/development/compilers/gcc/4.8/builder.sh
index dc6fdd93561..b781fa6c7ef 100644
--- a/pkgs/development/compilers/gcc/4.8/builder.sh
+++ b/pkgs/development/compilers/gcc/4.8/builder.sh
@@ -33,7 +33,7 @@ if test "$noSysDirs" = "1"; then
 
         # 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"
@@ -50,10 +50,10 @@ if test "$noSysDirs" = "1"; then
     # bootstrap compiler are optimized and (optionally) contain
     # debugging information (info "(gccinstall) Building").
     if test -n "$dontStrip"; then
-	extraFlags="-O2 -g $extraFlags"
+        extraFlags="-O2 -g $extraFlags"
     else
-	# Don't pass `-g' at all; this saves space while building.
-	extraFlags="-O2 $extraFlags"
+        # Don't pass `-g' at all; this saves space while building.
+        extraFlags="-O2 $extraFlags"
     fi
 
     EXTRA_FLAGS="$extraFlags"
@@ -213,7 +213,7 @@ postInstall() {
     # 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
-- 
GitLab


From c3d31749fbdaaf6bdc697318bf0825da0d34488e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 10:36:15 +0100
Subject: [PATCH 0269/3789] Remove gcc 4.7

There is really no reason to keep it around, given that it was never
the default in Nixpkgs.
---
 .../compilers/gcc/4.7/arm-eabi.patch          | 230 --------
 pkgs/development/compilers/gcc/4.7/builder.sh | 245 --------
 .../development/compilers/gcc/4.7/default.nix | 533 ------------------
 .../compilers/gcc/4.7/gfortran-driving.patch  |  20 -
 .../compilers/gcc/4.7/gnat-cflags.patch       |  33 --
 .../gcc/4.7/java-jvgenmain-link.patch         |  17 -
 .../compilers/gcc/4.7/libstdc++-target.patch  |  32 --
 .../compilers/gcc/4.7/no-sys-dirs.patch       |  41 --
 .../gcc/4.7/parallel-bconfig-4.7.patch        |  30 -
 .../linux/make-bootstrap-tools-crosspi.nix    |   2 +-
 pkgs/top-level/all-packages.nix               |  53 +-
 11 files changed, 7 insertions(+), 1229 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc/4.7/arm-eabi.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.7/builder.sh
 delete mode 100644 pkgs/development/compilers/gcc/4.7/default.nix
 delete mode 100644 pkgs/development/compilers/gcc/4.7/gfortran-driving.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.7/gnat-cflags.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.7/java-jvgenmain-link.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.7/libstdc++-target.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.7/no-sys-dirs.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.7/parallel-bconfig-4.7.patch

diff --git a/pkgs/development/compilers/gcc/4.7/arm-eabi.patch b/pkgs/development/compilers/gcc/4.7/arm-eabi.patch
deleted file mode 100644
index 63b017062b5..00000000000
--- a/pkgs/development/compilers/gcc/4.7/arm-eabi.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-Index: gcc-4_7-branch/libstdc++-v3/configure.host
-===================================================================
---- gcc-4_7-branch/libstdc++-v3/configure.host	(revision 194579)
-+++ gcc-4_7-branch/libstdc++-v3/configure.host	(revision 194580)
-@@ -340,7 +340,7 @@
-         fi
-     esac
-     case "${host}" in
--      arm*-*-linux-*eabi)
-+      arm*-*-linux-*eabi*)
- 	port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
- 	;;
-     esac
-Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
-===================================================================
---- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	(revision 194579)
-+++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	(revision 194580)
-@@ -1,5 +1,5 @@
- // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
--// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
- 
- // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
- //
-Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
-===================================================================
---- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	(revision 194579)
-+++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	(revision 194580)
-@@ -1,5 +1,5 @@
- // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
--// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
- 
- // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
- //
-Index: gcc-4_7-branch/libjava/configure.ac
-===================================================================
---- gcc-4_7-branch/libjava/configure.ac	(revision 194579)
-+++ gcc-4_7-branch/libjava/configure.ac	(revision 194580)
-@@ -931,7 +931,7 @@
-     # on Darwin -single_module speeds up loading of the dynamic libraries.
-     extra_ldflags_libjava=-Wl,-single_module
-     ;;
--arm*linux*eabi)
-+arm*-*-linux*eabi*)
-     # Some of the ARM unwinder code is actually in libstdc++.  We
-     # could in principle replicate it in libgcj, but it's better to
-     # have a dependency on libstdc++.
-Index: gcc-4_7-branch/libjava/configure
-===================================================================
---- gcc-4_7-branch/libjava/configure	(revision 194579)
-+++ gcc-4_7-branch/libjava/configure	(revision 194580)
-@@ -20542,7 +20542,7 @@
-     # on Darwin -single_module speeds up loading of the dynamic libraries.
-     extra_ldflags_libjava=-Wl,-single_module
-     ;;
--arm*linux*eabi)
-+arm*-*-linux*eabi*)
-     # Some of the ARM unwinder code is actually in libstdc++.  We
-     # could in principle replicate it in libgcj, but it's better to
-     # have a dependency on libstdc++.
-Index: gcc-4_7-branch/libgcc/config.host
-===================================================================
---- gcc-4_7-branch/libgcc/config.host	(revision 194579)
-+++ gcc-4_7-branch/libgcc/config.host	(revision 194580)
-@@ -327,7 +327,7 @@
- arm*-*-linux*)			# ARM GNU/Linux with ELF
- 	tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix"
- 	case ${host} in
--	arm*-*-linux-*eabi)
-+	arm*-*-linux-*eabi*)
- 	  tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
- 	  tm_file="$tm_file arm/bpabi-lib.h"
- 	  unwind_header=config/arm/unwind-arm.h
-Index: gcc-4_7-branch/gcc/doc/install.texi
-===================================================================
---- gcc-4_7-branch/gcc/doc/install.texi	(revision 194579)
-+++ gcc-4_7-branch/gcc/doc/install.texi	(revision 194580)
-@@ -3222,7 +3222,7 @@
- @heading @anchor{arm-x-eabi}arm-*-eabi
- ARM-family processors.  Subtargets that use the ELF object format
- require GNU binutils 2.13 or newer.  Such subtargets include:
--@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi}
-+@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi*}
- and @code{arm-*-rtemseabi}.
- 
- @html
-Index: gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c
-===================================================================
---- gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c	(revision 194579)
-+++ gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c	(revision 194580)
-@@ -1,4 +1,4 @@
--/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi } } } */
-+/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi* } } } */
- 
- void *foo (void)
- {
-Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C
-===================================================================
---- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C	(revision 194579)
-+++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C	(revision 194580)
-@@ -7,10 +7,10 @@
- // enum-size attributes should only be emitted if there are values of
- // enum type that can escape the compilation unit, gcc cannot currently
- // detect this; if this facility is added then this linker option should
--// not be needed.  arm-*-linux*eabi should be a good approximation to
-+// not be needed.  arm-*-linux*eabi* should be a good approximation to
- // those platforms where the EABI supplement defines enum values to be
- // 32 bits wide.
--// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
- 
- #include <limits.h>
- 
-Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C
-===================================================================
---- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C	(revision 194579)
-+++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C	(revision 194580)
-@@ -9,10 +9,10 @@
- // enum-size attributes should only be emitted if there are values of
- // enum type that can escape the compilation unit, gcc cannot currently
- // detect this; if this facility is added then this linker option should
--// not be needed.  arm-*-linux*eabi should be a good approximation to
-+// not be needed.  arm-*-linux*eabi* should be a good approximation to
- // those platforms where the EABI supplement defines enum values to be
- // 32 bits wide.
--// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
- 
- enum E { 
-   a = -312
-Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C
-===================================================================
---- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C	(revision 194579)
-+++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C	(revision 194580)
-@@ -7,10 +7,10 @@
- // enum-size attributes should only be emitted if there are values of
- // enum type that can escape the compilation unit, gcc cannot currently
- // detect this; if this facility is added then this linker option should
--// not be needed.  arm-*-linux*eabi should be a good approximation to
-+// not be needed.  arm-*-linux*eabi* should be a good approximation to
- // those platforms where the EABI supplement defines enum values to be
- // 32 bits wide.
--// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
- 
- // GROUPS passed enums
-   extern "C" int printf (const char *, ...);
-Index: gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp
-===================================================================
---- gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp	(revision 194579)
-+++ gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp	(revision 194580)
-@@ -3818,7 +3818,7 @@
- 		}
- 	    } ""
- 	}]
--    } elseif { [istarget arm*-*-linux-gnueabi] } {
-+    } elseif { [istarget arm*-*-linux-gnueabi*] } {
- 	return [check_runtime sync_longlong_runtime {
- 	    #include <stdlib.h>
- 	    int main ()
-@@ -3860,7 +3860,7 @@
- 	     || [istarget i?86-*-*]
- 	     || [istarget x86_64-*-*]
- 	     || [istarget alpha*-*-*] 
--	     || [istarget arm*-*-linux-gnueabi] 
-+	     || [istarget arm*-*-linux-gnueabi*] 
- 	     || [istarget bfin*-*linux*]
- 	     || [istarget hppa*-*linux*]
- 	     || [istarget s390*-*-*] 
-@@ -3890,7 +3890,7 @@
- 	     || [istarget i?86-*-*]
- 	     || [istarget x86_64-*-*]
- 	     || [istarget alpha*-*-*] 
--	     || [istarget arm*-*-linux-gnueabi] 
-+	     || [istarget arm*-*-linux-gnueabi*] 
- 	     || [istarget hppa*-*linux*]
- 	     || [istarget s390*-*-*] 
- 	     || [istarget powerpc*-*-*]
-Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90
-===================================================================
---- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90	(revision 194579)
-+++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90	(revision 194580)
-@@ -1,6 +1,6 @@
- ! { dg-do run }
- ! { dg-options "-fshort-enums" }
--! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
- ! Program to test enumerations when option -fshort-enums is given
- 
- program main
-Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90
-===================================================================
---- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90	(revision 194579)
-+++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90	(revision 194580)
-@@ -1,7 +1,7 @@
- ! { dg-do run }
- ! { dg-additional-sources enum_10.c }
- ! { dg-options "-fshort-enums -w" }
--! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
- ! Make sure short enums are indeed interoperable with the
- ! corresponding C type.
- 
-Index: gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in
-===================================================================
---- gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in	(revision 194579)
-+++ gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in	(revision 194580)
-@@ -1866,7 +1866,7 @@
-   LIBRARY_VERSION := $(LIB_VERSION)
- endif
- 
--ifeq ($(strip $(filter-out arm% linux-gnueabi,$(arch) $(osys)-$(word 4,$(targ)))),)
-+ifeq ($(strip $(filter-out arm%-linux,$(arch)-$(osys)) $(if $(findstring eabi,$(word 4,$(targ))),,$(word 4,$(targ)))),)
-   LIBGNAT_TARGET_PAIRS = \
-   a-intnam.ads<a-intnam-linux.ads \
-   s-inmaop.adb<s-inmaop-posix.adb \
-Index: gcc-4_7-branch/gcc/config.gcc
-===================================================================
---- gcc-4_7-branch/gcc/config.gcc	(revision 194579)
-+++ gcc-4_7-branch/gcc/config.gcc	(revision 194580)
-@@ -855,7 +855,7 @@
- 	esac
- 	tmake_file="${tmake_file} arm/t-arm"
- 	case ${target} in
--	arm*-*-linux-*eabi)
-+	arm*-*-linux-*eabi*)
- 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
- 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
- 	    # Define multilib configuration for arm-linux-androideabi.
diff --git a/pkgs/development/compilers/gcc/4.7/builder.sh b/pkgs/development/compilers/gcc/4.7/builder.sh
deleted file mode 100644
index dc6fdd93561..00000000000
--- a/pkgs/development/compilers/gcc/4.7/builder.sh
+++ /dev/null
@@ -1,245 +0,0 @@
-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.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix
deleted file mode 100644
index 34ea93cf5f0..00000000000
--- a/pkgs/development/compilers/gcc/4.7/default.nix
+++ /dev/null
@@ -1,533 +0,0 @@
-{ 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 # 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;
-
-# 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.7.3";
-
-    # 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".
-
-     Parallel make of gfortran is disabled because of an apparent race
-     condition concerning the generation of "bconfig.h". Please try and
-     re-enable parallel make for a later release of gfortran to check whether
-     the error has been fixed.
-  */
-    enableParallelBuilding = !profiledCompiler && !langFortran;
-
-    patches = []
-      ++ optional enableParallelBuilding ./parallel-bconfig-4.7.patch
-      ++ optional stdenv.isArm [ ./arm-eabi.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.lib.attrByPath [ "platform" "gcc" "arch" ] null stdenv;
-        gccCpu = stdenv.lib.attrByPath [ "platform" "gcc" "cpu" ] null stdenv;
-        gccAbi = stdenv.lib.attrByPath [ "platform" "gcc" "abi" ] null stdenv;
-        gccFpu = stdenv.lib.attrByPath [ "platform" "gcc" "fpu" ] null stdenv;
-        gccFloat = stdenv.lib.attrByPath [ "platform" "gcc" "float" ] null stdenv;
-        gccMode = stdenv.lib.attrByPath [ "platform" "gcc" "mode" ] null stdenv;
-        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");
-    crossConfigureFlags = let
-        gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross;
-        gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross;
-        gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross;
-        gccFpu = stdenv.lib.attrByPath [ "gcc" "fpu" ] null cross;
-        gccFloat = stdenv.lib.attrByPath [ "gcc" "float" ] null cross;
-        gccMode = stdenv.lib.attrByPath [ "gcc" "mode" ] null cross;
-        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
-          " --with-headers=${libcCross}/include" +
-          " --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" +
-            (if cross.config == "x86_64-w64-mingw32" then
-              # To keep ABI compatibility with upstream mingw-w64
-              " --enable-fully-dynamic-string"
-              else "")
-            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 = "1hx9h64ivarlzi4hxvq42as5m9vlr5cyzaaq4gzj4i619zmkfz1g";
-  };
-
-  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 (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"
-      ''}
-    '';
-
-  # 'iant' at #go-nuts@freenode, gccgo maintainer, said that
-  # they have a bug in 4.7.1 if adding "--disable-static"
-  dontDisableStatic = langGo || staticCompiler;
-
-  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 "" 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 ""}
-    ${if cloog != null then
-      "--with-cloog=${cloog} --disable-cloog-version-check --enable-cloog-backend=isl"
-      else ""}
-    ${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-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 (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.lib.attrByPath [ "gcc" "arch" ] null stdenv.cross;
-    xgccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null stdenv.cross;
-    xgccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null stdenv.cross;
-    xgccFpu = stdenv.lib.attrByPath [ "gcc" "fpu" ] null stdenv.cross;
-    xgccFloat = stdenv.lib.attrByPath [ "gcc" "float" ] null stdenv.cross;
-    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 &&
-                                                 hasAttr "propagatedBuildInputs" libcCross)
-                                        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 = [
-      stdenv.lib.maintainers.ludo
-      stdenv.lib.maintainers.viric
-      stdenv.lib.maintainers.shlevy
-    ];
-
-    # 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 ++ optionals (langAda == false && libelf == null) [ "i686-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.7/gfortran-driving.patch b/pkgs/development/compilers/gcc/4.7/gfortran-driving.patch
deleted file mode 100644
index 70708886b40..00000000000
--- a/pkgs/development/compilers/gcc/4.7/gfortran-driving.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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.7/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.7/gnat-cflags.patch
deleted file mode 100644
index bf2acf065e9..00000000000
--- a/pkgs/development/compilers/gcc/4.7/gnat-cflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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.7/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.7/java-jvgenmain-link.patch
deleted file mode 100644
index 2612e8bfbbb..00000000000
--- a/pkgs/development/compilers/gcc/4.7/java-jvgenmain-link.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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.7/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.7/libstdc++-target.patch
deleted file mode 100644
index fb622b39580..00000000000
--- a/pkgs/development/compilers/gcc/4.7/libstdc++-target.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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.7/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.7/no-sys-dirs.patch
deleted file mode 100644
index 79901703cb8..00000000000
--- a/pkgs/development/compilers/gcc/4.7/no-sys-dirs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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.7/parallel-bconfig-4.7.patch b/pkgs/development/compilers/gcc/4.7/parallel-bconfig-4.7.patch
deleted file mode 100644
index bdf0fa4931a..00000000000
--- a/pkgs/development/compilers/gcc/4.7/parallel-bconfig-4.7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/gcc/Makefile.in b/gcc/Makefile.in
-index 0f6735a..ba93e9b 100644
---- a/gcc/Makefile.in
-+++ b/gcc/Makefile.in
-@@ -3904,21 +3904,21 @@ build/genflags.o : genflags.c $(RTL_BASE_H) $(OBSTACK_H) $(BCONFIG_H)	\
-   $(SYSTEM_H) coretypes.h $(GTM_H) errors.h $(READ_MD_H) gensupport.h
- build/gengenrtl.o : gengenrtl.c $(BCONFIG_H) $(SYSTEM_H) rtl.def
- gengtype-lex.o build/gengtype-lex.o : gengtype-lex.c gengtype.h $(SYSTEM_H)
--gengtype-lex.o: $(CONFIG_H)
-+gengtype-lex.o: $(CONFIG_H) $(BCONFIG_H)
- 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)
- 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)
- 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)
- build/gengtype.o: $(BCONFIG_H)
- build/genmddeps.o: genmddeps.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h	\
-   errors.h $(READ_MD_H)
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
index 9b2949e3e36..c4ec02aeb3e 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
@@ -73,7 +73,7 @@ let
   patch = pkgs.patch.crossDrv;
   patchelf = pkgs.patchelf.crossDrv;
   replace = pkgs.replace.crossDrv;
-  gcc = pkgs.gcc47;
+  gcc = pkgs.gcc;
   gmp = pkgs.gmp.crossDrv;
   mpfr = pkgs.mpfr.crossDrv;
   ppl = pkgs.ppl.crossDrv;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0fb7e10c33c..5515d5fd8f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2406,8 +2406,6 @@ let
 
   gcc46 = gcc46_real;
 
-  gcc47 = gcc47_real;
-
   gcc48 = gcc48_real;
 
   gcc45_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
@@ -2435,10 +2433,9 @@ let
       cross = assert crossSystem != null; crossSystem;
     });
 
-  gcc47_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
-    (makeOverridable (import ../development/compilers/gcc/4.7) {
-      inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
-        cloog ppl gettext which noSysDirs;
+  gcc48_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
+    (callPackage ../development/compilers/gcc/4.8 {
+      inherit noSysDirs;
       binutilsCross = binutilsCross;
       libcCross = libcCross;
       profiledCompiler = false;
@@ -2447,7 +2444,7 @@ let
       cross = assert crossSystem != null; crossSystem;
     });
 
-  gcc_realCross = gcc47_realCross;
+  gcc_realCross = gcc48_realCross;
 
   gccCrossStageStatic = let
       isMingw = (stdenv.cross.libc == "msvcrt");
@@ -2559,33 +2556,6 @@ let
       }))
     else throw "Multilib gcc not supported on ‘${system}’";
 
-  gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 {
-    inherit noSysDirs;
-    texinfo = texinfo4;
-    # I'm not sure if profiling with enableParallelBuilding helps a lot.
-    # We can enable it back some day. This makes the *gcc* builds faster now.
-    profiledCompiler = false;
-
-    # 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;
-  }));
-
-  gcc47_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 {
-    stripped = false;
-    texinfo = texinfo4;
-    inherit noSysDirs;
-    cross = null;
-    libcCross = null;
-    binutilsCross = null;
-  }));
-
   gcc48_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 {
     inherit noSysDirs;
 
@@ -2695,13 +2665,6 @@ let
 
   gccgo = gccgo48;
 
-  gccgo47 = wrapGCC (gcc47_real.gcc.override {
-    name = "gccgo";
-    langCC = true; #required for go.
-    langC = true;
-    langGo = true;
-  });
-
   gccgo48 = wrapGCC (gcc48_real.gcc.override {
     name = "gccgo";
     langCC = true; #required for go.
@@ -8602,9 +8565,7 @@ let
 
   ogmtools = callPackage ../applications/video/ogmtools { };
 
-  omxplayer = callPackage ../applications/video/omxplayer {
-    stdenv = overrideGCC stdenv gcc47;
-  };
+  omxplayer = callPackage ../applications/video/omxplayer { };
 
   oneteam = callPackage ../applications/networking/instant-messengers/oneteam {};
 
@@ -9363,9 +9324,7 @@ let
 
   d2x_rebirth = callPackage ../games/d2x-rebirth { };
 
-  eduke32 = callPackage ../games/eduke32 {
-    stdenv = overrideGCC stdenv gcc47;
-  };
+  eduke32 = callPackage ../games/eduke32 { };
 
   egoboo = callPackage ../games/egoboo { };
 
-- 
GitLab


From 035fb0d9c93edeb6285a99bf9094c232a1401f8f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 10:39:15 +0100
Subject: [PATCH 0270/3789] Drop pointless gcc_real variables

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5515d5fd8f6..86591b76eb5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2371,8 +2371,6 @@ let
       cross = assert crossSystem != null; crossSystem;
     });
 
-  gcc45 = gcc45_real;
-
   wrapDeterministicGCCWith = gccWrapper: glibc: baseGCC: gccWrapper {
     nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools;
     nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc;
@@ -2404,10 +2402,6 @@ let
       else null;
   }));
 
-  gcc46 = gcc46_real;
-
-  gcc48 = gcc48_real;
-
   gcc45_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
     (makeOverridable (import ../development/compilers/gcc/4.5) {
       inherit fetchurl stdenv gmp mpfr mpc libelf zlib
@@ -2498,7 +2492,7 @@ let
     profiledCompiler = true;
   }));
 
-  gcc45_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.5) {
+  gcc45 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.5) {
     inherit fetchurl stdenv gmp mpfr mpc libelf zlib perl
       ppl cloogppl
       gettext which noSysDirs;
@@ -2518,7 +2512,7 @@ let
       else null;
   }));
 
-  gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 {
+  gcc46 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 {
     inherit noSysDirs;
 
     # bootstrapping a profiled compiler does not work in the sheevaplug:
@@ -2556,7 +2550,7 @@ let
       }))
     else throw "Multilib gcc not supported on ‘${system}’";
 
-  gcc48_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 {
+  gcc48 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 {
     inherit noSysDirs;
 
     # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
@@ -2633,7 +2627,7 @@ let
     ppl = null;
   });
 
-  gnat45 = wrapGCC (gcc45_real.gcc.override {
+  gnat45 = wrapGCC (gcc45.gcc.override {
     name = "gnat";
     langCC = false;
     langC = true;
@@ -2646,7 +2640,7 @@ let
     ppl = null;
   });
 
-  gnat46 = wrapGCC (gcc46_real.gcc.override {
+  gnat46 = wrapGCC (gcc46.gcc.override {
     name = "gnat";
     langCC = false;
     langC = true;
@@ -2665,7 +2659,7 @@ let
 
   gccgo = gccgo48;
 
-  gccgo48 = wrapGCC (gcc48_real.gcc.override {
+  gccgo48 = wrapGCC (gcc48.gcc.override {
     name = "gccgo";
     langCC = true; #required for go.
     langC = true;
-- 
GitLab


From 4b1d2a50b841e67a78f81a5e47cfdc1fe33330ab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 10:46:59 +0100
Subject: [PATCH 0271/3789] Drop a bunch of old unused gcc cross/debug variants

---
 pkgs/top-level/all-packages.nix | 74 +--------------------------------
 1 file changed, 1 insertion(+), 73 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86591b76eb5..2e94012056e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2347,30 +2347,6 @@ let
     profiledCompiler = true;
   }));
 
-  gcc43_realCross = makeOverridable (import ../development/compilers/gcc/4.3) {
-    inherit stdenv fetchurl gmp mpfr noSysDirs;
-    texinfo = texinfo4;
-    binutilsCross = binutilsCross;
-    libcCross = libcCross;
-    profiledCompiler = false;
-    enableMultilib = true;
-    crossStageStatic = false;
-    cross = assert crossSystem != null; crossSystem;
-  };
-
-  gcc44_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
-    (makeOverridable (import ../development/compilers/gcc/4.4) {
-      inherit stdenv fetchurl gmp mpfr /* ppl cloogppl */ noSysDirs
-          gettext which;
-      texinfo = texinfo4;
-      binutilsCross = binutilsCross;
-      libcCross = libcCross;
-      profiledCompiler = false;
-      enableMultilib = false;
-      crossStageStatic = false;
-      cross = assert crossSystem != null; crossSystem;
-    });
-
   wrapDeterministicGCCWith = gccWrapper: glibc: baseGCC: gccWrapper {
     nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools;
     nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc;
@@ -2402,31 +2378,6 @@ let
       else null;
   }));
 
-  gcc45_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
-    (makeOverridable (import ../development/compilers/gcc/4.5) {
-      inherit fetchurl stdenv gmp mpfr mpc libelf zlib
-        ppl cloogppl gettext which noSysDirs;
-      texinfo = texinfo4;
-      binutilsCross = binutilsCross;
-      libcCross = libcCross;
-      profiledCompiler = false;
-      enableMultilib = false;
-      crossStageStatic = false;
-      cross = assert crossSystem != null; crossSystem;
-    });
-
-  gcc46_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
-    (makeOverridable (import ../development/compilers/gcc/4.6) {
-      inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
-        cloog ppl gettext which noSysDirs;
-      binutilsCross = binutilsCross;
-      libcCross = libcCross;
-      profiledCompiler = false;
-      enableMultilib = false;
-      crossStageStatic = false;
-      cross = assert crossSystem != null; crossSystem;
-    });
-
   gcc48_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
     (callPackage ../development/compilers/gcc/4.8 {
       inherit noSysDirs;
@@ -2531,16 +2482,6 @@ let
     texinfo = texinfo413;
   }));
 
-  # A non-stripped version of GCC.
-  gcc46_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 {
-    stripped = false;
-
-    inherit noSysDirs;
-    cross = null;
-    libcCross = null;
-    binutilsCross = null;
-  }));
-
   gcc46_multi =
     if system == "x86_64-linux" then lowPrio (
       wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override {
@@ -2614,19 +2555,6 @@ let
 
   gnat = gnat45;
 
-  gnat44 = wrapGCC (gcc44.gcc.override {
-    name = "gnat";
-    langCC = false;
-    langC = true;
-    langAda = true;
-    profiledCompiler = false;
-    inherit gnatboot;
-    # We can't use the ppl stuff, because we would have
-    # libstdc++ problems.
-    cloogppl = null;
-    ppl = null;
-  });
-
   gnat45 = wrapGCC (gcc45.gcc.override {
     name = "gnat";
     langCC = false;
@@ -2693,7 +2621,7 @@ let
 
   jhc = callPackage ../development/compilers/jhc {
     inherit (haskellPackages_ghc6123) ghc binary zlib utf8String readline fgl
-    regexCompat HsSyck random;
+      regexCompat HsSyck random;
   };
 
   # Haskell and GHC
-- 
GitLab


From fa158513189cb51b482a3b84ba51a489b3bd3369 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 10:48:14 +0100
Subject: [PATCH 0272/3789] Fix indentation

---
 pkgs/top-level/all-packages.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e94012056e..aec3beb89b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2278,24 +2278,26 @@ let
   clang = wrapClang clangUnwrapped;
 
   libcxxLLVM = callPackage ../development/compilers/llvm { stdenv = libcxxStdenv; };
+
   clangSelf = clangWrapSelf (callPackage ../development/compilers/llvm/clang.nix {
      stdenv = libcxxStdenv;
      llvm = libcxxLLVM;
   });
 
   clangWrapSelf = build: (import ../build-support/clang-wrapper) {
-      clang = build;
-      stdenv = clangStdenv;
-      libc = glibc;
-      binutils = binutils;
-      shell = bash;
-      inherit libcxx coreutils zlib;
-      nativeTools = false;
-      nativeLibc = false;
+    clang = build;
+    stdenv = clangStdenv;
+    libc = glibc;
+    binutils = binutils;
+    shell = bash;
+    inherit libcxx coreutils zlib;
+    nativeTools = false;
+    nativeLibc = false;
   };
 
   #Use this instead of stdenv to build with clang
   clangStdenv = lowPrio (stdenvAdapters.overrideGCC stdenv clang);
+
   libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf clangUnwrapped);
 
   clean = callPackage ../development/compilers/clean { };
-- 
GitLab


From 320209a618221728e022222a2aafee1af72037bb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 13:57:42 +0100
Subject: [PATCH 0273/3789] Merge deterministicStdenv into the default stdenv

This means that (on Linux) strip uses
"--enable-deterministic-archives" and ld uses the
BFD_DETERMINISTIC_OUTPUT flag.
---
 .../tools/misc/binutils/default.nix           |  14 +-
 pkgs/stdenv/generic/setup-repeatable.sh       | 876 ------------------
 pkgs/stdenv/generic/setup.sh                  |   4 +-
 pkgs/stdenv/linux/default.nix                 |   8 +-
 pkgs/top-level/all-packages.nix               |  45 -
 5 files changed, 17 insertions(+), 930 deletions(-)
 delete mode 100644 pkgs/stdenv/generic/setup-repeatable.sh

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 300922384bd..af26ebe2bda 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, noSysDirs, zlib
 , cross ? null, gold ? true, bison ? null
-, deterministic ? false }:
+}:
 
 let basename = "binutils-2.23.1"; in
 
@@ -24,7 +24,10 @@ stdenv.mkDerivation rec {
     # That requires upstream changes for things to work. So we can patch it to
     # get the old behaviour by now.
     ./dtneeded.patch
-  ] ++ optional deterministic ./deterministic.patch;
+
+    # Make binutils output deterministic by default.
+    ./deterministic.patch
+  ];
 
   buildInputs =
     [ zlib ]
@@ -49,13 +52,12 @@ stdenv.mkDerivation rec {
   # to the bootstrap-tools libgcc (as uses to happen on arm/mips)
   NIX_CFLAGS_COMPILE = "-static-libgcc";
 
-  configureFlags = [ "--disable-werror" ] # needed for dietlibc build
+  configureFlags =
+    [ "--enable-deterministic-archives" ]
     ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop"
     ++ optional (cross != null) "--target=${cross.config}"
     ++ optionals gold [ "--enable-gold" "--enable-plugins" ]
-    ++ optional deterministic "--enable-deterministic-archives"
-    ++ optional (stdenv.system == "i686-linux") "--enable-targets=x86_64-linux-gnu"
-    ;
+    ++ optional (stdenv.system == "i686-linux") "--enable-targets=x86_64-linux-gnu";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/stdenv/generic/setup-repeatable.sh b/pkgs/stdenv/generic/setup-repeatable.sh
deleted file mode 100644
index 3b2e0151932..00000000000
--- a/pkgs/stdenv/generic/setup-repeatable.sh
+++ /dev/null
@@ -1,876 +0,0 @@
-# Run the named hook, either by calling the function with that name or
-# by evaluating the variable with that name.  This allows convenient
-# setting of hooks both from Nix expressions (as attributes /
-# environment variables) and from shell scripts (as functions).
-runHook() {
-    local hookName="$1"
-    case "$(type -t $hookName)" in
-        (function|alias|builtin) $hookName;;
-        (file) source $hookName;;
-        (keyword) :;;
-        (*) eval "${!hookName}";;
-    esac
-}
-
-
-exitHandler() {
-    exitCode=$?
-    set +e
-
-    closeNest
-
-    if [ -n "$showBuildStats" ]; then
-        times > "$NIX_BUILD_TOP/.times"
-        local -a times=($(cat "$NIX_BUILD_TOP/.times"))
-        # Print the following statistics:
-        # - user time for the shell
-        # - system time for the shell
-        # - user time for all child processes
-        # - system time for all child processes
-        echo "build time elapsed: " ${times[*]}
-    fi
-
-    if [ $exitCode != 0 ]; then
-        runHook failureHook
-
-        # If the builder had a non-zero exit code and
-        # $succeedOnFailure is set, create the file
-        # `$out/nix-support/failed' to signal failure, and exit
-        # normally.  Otherwise, return the original exit code.
-        if [ -n "$succeedOnFailure" ]; then
-            echo "build failed with exit code $exitCode (ignored)"
-            mkdir -p "$out/nix-support"
-            echo -n $exitCode > "$out/nix-support/failed"
-            exit 0
-        fi
-
-    else
-        runHook exitHook
-    fi
-
-    exit $exitCode
-}
-
-trap "exitHandler" EXIT
-
-
-######################################################################
-# Helper functions that might be useful in setup hooks.
-
-
-addToSearchPathWithCustomDelimiter() {
-    local delimiter=$1
-    local varName=$2
-    local dir=$3
-    if [ -d "$dir" ]; then
-        eval export ${varName}=${!varName}${!varName:+$delimiter}${dir}
-    fi
-}
-
-PATH_DELIMITER=':'
-
-addToSearchPath() {
-    addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@"
-}
-
-
-######################################################################
-# Initialisation.
-
-set -e
-
-[ -z $NIX_GCC ] && NIX_GCC=@gcc@
-
-
-# Wildcard expansions that don't match should expand to an empty list.
-# This ensures that, for instance, "for i in *; do ...; done" does the
-# right thing.
-shopt -s nullglob
-
-
-# Set up the initial path.
-PATH=
-for i in $NIX_GCC @initialPath@; do
-    if [ "$i" = / ]; then i=; fi
-    addToSearchPath PATH $i/bin
-done
-
-if [ "$NIX_DEBUG" = 1 ]; then
-    echo "initial path: $PATH"
-fi
-
-
-# Execute the pre-hook.
-export SHELL=@shell@
-if [ -z "$shell" ]; then export shell=@shell@; fi
-runHook preHook
-
-
-# Check that the pre-hook initialised SHELL.
-if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi
-
-
-# Hack: run gcc's setup hook.
-envHooks=()
-crossEnvHooks=()
-if [ -f $NIX_GCC/nix-support/setup-hook ]; then
-    source $NIX_GCC/nix-support/setup-hook
-fi
-
-
-# Ensure that the given directories exists.
-ensureDir() {
-    local dir
-    for dir in "$@"; do
-        if ! [ -x "$dir" ]; then mkdir -p "$dir"; fi
-    done
-}
-
-installBin() {
-    mkdir -p $out/bin
-    cp "$@" $out/bin
-}
-
-
-# Allow the caller to augment buildInputs (it's not always possible to
-# do this before the call to setup.sh, since the PATH is empty at that
-# point; here we have a basic Unix environment).
-runHook addInputsHook
-
-
-# Recursively find all build inputs.
-findInputs() {
-    local pkg=$1
-    local var=$2
-    local propagatedBuildInputsFile=$3
-
-    case ${!var} in
-        *\ $pkg\ *)
-            return 0
-            ;;
-    esac
-
-    eval $var="'${!var} $pkg '"
-
-    if [ -f $pkg/nix-support/setup-hook ]; then
-        source $pkg/nix-support/setup-hook
-    fi
-
-    if [ -f $pkg/nix-support/$propagatedBuildInputsFile ]; then
-        for i in $(cat $pkg/nix-support/$propagatedBuildInputsFile); do
-            findInputs $i $var $propagatedBuildInputsFile
-        done
-    fi
-}
-
-crossPkgs=""
-for i in $buildInputs $propagatedBuildInputs; do
-    findInputs $i crossPkgs propagated-build-inputs
-done
-
-nativePkgs=""
-for i in $nativeBuildInputs $propagatedNativeBuildInputs; do
-    findInputs $i nativePkgs propagated-native-build-inputs
-done
-
-
-# Set the relevant environment variables to point to the build inputs
-# found above.
-addToNativeEnv() {
-    local pkg=$1
-
-    if [ -d $1/bin ]; then
-        addToSearchPath _PATH $1/bin
-    fi
-
-    # Run the package-specific hooks set by the setup-hook scripts.
-    for i in "${envHooks[@]}"; do
-        $i $pkg
-    done
-}
-
-for i in $nativePkgs; do
-    addToNativeEnv $i
-done
-
-addToCrossEnv() {
-    local pkg=$1
-
-    # Some programs put important build scripts (freetype-config and similar)
-    # into their crossDrv bin path. Intentionally these should go after
-    # the nativePkgs in PATH.
-    if [ -d $1/bin ]; then
-        addToSearchPath _PATH $1/bin
-    fi
-
-    # Run the package-specific hooks set by the setup-hook scripts.
-    for i in "${crossEnvHooks[@]}"; do
-        $i $pkg
-    done
-}
-
-for i in $crossPkgs; do
-    addToCrossEnv $i
-done
-
-
-# Add the output as an rpath.
-if [ "$NIX_NO_SELF_RPATH" != 1 ]; then
-    export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
-    if [ -n "$NIX_LIB64_IN_SELF_RPATH" ]; then
-        export NIX_LDFLAGS="-rpath $out/lib64 $NIX_LDFLAGS"
-    fi
-    if [ -n "$NIX_LIB32_IN_SELF_RPATH" ]; then
-        export NIX_LDFLAGS="-rpath $out/lib32 $NIX_LDFLAGS"
-    fi
-fi
-
-
-# Set the TZ (timezone) environment variable, otherwise commands like
-# `date' will complain (e.g., `Tue Mar 9 10:01:47 Local time zone must
-# be set--see zic manual page 2004').
-export TZ=UTC
-
-
-# Set the prefix.  This is generally $out, but it can be overriden,
-# for instance if we just want to perform a test build/install to a
-# temporary location and write a build report to $out.
-if [ -z "$prefix" ]; then
-    prefix="$out";
-fi
-
-if [ "$useTempPrefix" = 1 ]; then
-    prefix="$NIX_BUILD_TOP/tmp_prefix";
-fi
-
-
-PATH=$_PATH${_PATH:+:}$PATH
-if [ "$NIX_DEBUG" = 1 ]; then
-    echo "final path: $PATH"
-fi
-
-
-# Make GNU Make produce nested output.
-export NIX_INDENT_MAKE=1
-
-
-# Normalize the NIX_BUILD_CORES variable. The value might be 0, which
-# means that we're supposed to try and auto-detect the number of
-# available CPU cores at run-time.
-
-if [ -z "${NIX_BUILD_CORES:-}" ]; then
-  NIX_BUILD_CORES="1"
-elif [ "$NIX_BUILD_CORES" -le 0 ]; then
-  NIX_BUILD_CORES=$(nproc 2>/dev/null || true)
-  if expr >/dev/null 2>&1 "$NIX_BUILD_CORES" : "^[0-9][0-9]*$"; then
-    :
-  else
-    NIX_BUILD_CORES="1"
-  fi
-fi
-export NIX_BUILD_CORES
-
-
-######################################################################
-# Misc. helper functions.
-
-
-stripDirs() {
-    local dirs="$1"
-    local stripFlags="$2"
-    local dirsNew=
-
-    for d in ${dirs}; do
-        if [ -d "$prefix/$d" ]; then
-            dirsNew="${dirsNew} $prefix/$d "
-        fi
-    done
-    dirs=${dirsNew}
-
-    if [ -n "${dirs}" ]; then
-        header "stripping (with flags $stripFlags) in $dirs"
-        find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $stripFlags || true
-        stopNest
-    fi
-}
-
-
-######################################################################
-# Textual substitution functions.
-
-
-substitute() {
-    local input="$1"
-    local output="$2"
-
-    local -a params=("$@")
-
-    local n p pattern replacement varName
-
-    local content="$(cat $input)"
-
-    for ((n = 2; n < ${#params[*]}; n += 1)); do
-        p=${params[$n]}
-
-        if [ "$p" = --replace ]; then
-            pattern="${params[$((n + 1))]}"
-            replacement="${params[$((n + 2))]}"
-            n=$((n + 2))
-        fi
-
-        if [ "$p" = --subst-var ]; then
-            varName="${params[$((n + 1))]}"
-            pattern="@$varName@"
-            replacement="${!varName}"
-            n=$((n + 1))
-        fi
-
-        if [ "$p" = --subst-var-by ]; then
-            pattern="@${params[$((n + 1))]}@"
-            replacement="${params[$((n + 2))]}"
-            n=$((n + 2))
-        fi
-
-        content="${content//"$pattern"/$replacement}"
-    done
-
-    # !!! This doesn't work properly if $content is "-n".
-    echo -n "$content" > "$output".tmp
-    if [ -x "$output" ]; then chmod +x "$output".tmp; fi
-    mv -f "$output".tmp "$output"
-}
-
-
-substituteInPlace() {
-    local fileName="$1"
-    shift
-    substitute "$fileName" "$fileName" "$@"
-}
-
-
-substituteAll() {
-    local input="$1"
-    local output="$2"
-
-    # Select all environment variables that start with a lowercase character.
-    for envVar in $(env | sed "s/^[^a-z].*//" | sed "s/^\([^=]*\)=.*/\1/"); do
-        if [ "$NIX_DEBUG" = "1" ]; then
-            echo "$envVar -> ${!envVar}"
-        fi
-        args="$args --subst-var $envVar"
-    done
-
-    substitute "$input" "$output" $args
-}
-
-
-substituteAllInPlace() {
-    local fileName="$1"
-    shift
-    substituteAll "$fileName" "$fileName" "$@"
-}
-
-
-######################################################################
-# What follows is the generic builder.
-
-
-nestingLevel=0
-
-startNest() {
-    nestingLevel=$(($nestingLevel + 1))
-    echo -en "\033[$1p"
-}
-
-stopNest() {
-    nestingLevel=$(($nestingLevel - 1))
-    echo -en "\033[q"
-}
-
-header() {
-    startNest "$2"
-    echo "$1"
-}
-
-# Make sure that even when we exit abnormally, the original nesting
-# level is properly restored.
-closeNest() {
-    while [ $nestingLevel -gt 0 ]; do
-        stopNest
-    done
-}
-
-
-# This function is useful for debugging broken Nix builds.  It dumps
-# all environment variables to a file `env-vars' in the build
-# directory.  If the build fails and the `-K' option is used, you can
-# then go to the build directory and source in `env-vars' to reproduce
-# the environment used for building.
-dumpVars() {
-    if [ "$noDumpEnvVars" != 1 ]; then
-        export > "$NIX_BUILD_TOP/env-vars"
-    fi
-}
-
-
-# Utility function: return the base name of the given path, with the
-# prefix `HASH-' removed, if present.
-stripHash() {
-    strippedName=$(basename $1);
-    if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
-        strippedName=$(echo "$strippedName" | cut -c34-)
-    fi
-}
-
-
-unpackFile() {
-    curSrc="$1"
-    local cmd
-
-    header "unpacking source archive $curSrc" 3
-
-    case "$curSrc" in
-        *.tar.xz | *.tar.lzma)
-            # Don't rely on tar knowing about .xz.
-            xz -d < $curSrc | tar xf -
-            ;;
-        *.tar | *.tar.* | *.tgz | *.tbz2)
-            # GNU tar can automatically select the decompression method
-            # (info "(tar) gzip").
-            tar xf $curSrc
-            ;;
-        *.zip)
-            unzip -qq $curSrc
-            ;;
-        *)
-            if [ -d "$curSrc" ]; then
-                stripHash $curSrc
-                cp -prd --no-preserve=timestamps $curSrc $strippedName
-            else
-                if [ -z "$unpackCmd" ]; then
-                    echo "source archive $curSrc has unknown type"
-                    exit 1
-                fi
-                runHook unpackCmd
-            fi
-            ;;
-    esac
-
-    stopNest
-}
-
-
-unpackPhase() {
-    runHook preUnpack
-
-    if [ -z "$srcs" ]; then
-        if [ -z "$src" ]; then
-            echo 'variable $src or $srcs should point to the source'
-            exit 1
-        fi
-        srcs="$src"
-    fi
-
-    # To determine the source directory created by unpacking the
-    # source archives, we record the contents of the current
-    # directory, then look below which directory got added.  Yeah,
-    # it's rather hacky.
-    local dirsBefore=""
-    for i in *; do
-        if [ -d "$i" ]; then
-            dirsBefore="$dirsBefore $i "
-        fi
-    done
-
-    # Unpack all source archives.
-    for i in $srcs; do
-        unpackFile $i
-    done
-
-    # Find the source directory.
-    if [ -n "$setSourceRoot" ]; then
-        runHook setSourceRoot
-    elif [ -z "$sourceRoot" ]; then
-        sourceRoot=
-        for i in *; do
-            if [ -d "$i" ]; then
-                case $dirsBefore in
-                    *\ $i\ *)
-                        ;;
-                    *)
-                        if [ -n "$sourceRoot" ]; then
-                            echo "unpacker produced multiple directories"
-                            exit 1
-                        fi
-                        sourceRoot="$i"
-                        ;;
-                esac
-            fi
-        done
-    fi
-
-    if [ -z "$sourceRoot" ]; then
-        echo "unpacker appears to have produced no directories"
-        exit 1
-    fi
-
-    echo "source root is $sourceRoot"
-
-    # By default, add write permission to the sources.  This is often
-    # necessary when sources have been copied from other store
-    # locations.
-    if [ "$dontMakeSourcesWritable" != 1 ]; then
-        chmod -R u+w "$sourceRoot"
-    fi
-
-    runHook postUnpack
-}
-
-
-patchPhase() {
-    runHook prePatch
-
-    for i in $patches; do
-        header "applying patch $i" 3
-        local uncompress=cat
-        case $i in
-            *.gz)
-                uncompress="gzip -d"
-                ;;
-            *.bz2)
-                uncompress="bzip2 -d"
-                ;;
-            *.lzma)
-                uncompress="lzma -d"
-                ;;
-        esac
-        $uncompress < $i | patch ${patchFlags:--p1}
-        stopNest
-    done
-
-    runHook postPatch
-}
-
-
-fixLibtool() {
-    sed -i -e 's^eval sys_lib_.*search_path=.*^^' "$1"
-}
-
-
-configurePhase() {
-    runHook preConfigure
-
-    if [ -z "$configureScript" ]; then
-        configureScript=./configure
-        if ! [ -x $configureScript ]; then
-            echo "no configure script, doing nothing"
-            return
-        fi
-    fi
-
-    if [ -z "$dontFixLibtool" ]; then
-        for i in $(find . -name "ltmain.sh"); do
-            echo "fixing libtool script $i"
-            fixLibtool $i
-        done
-    fi
-
-    if [ -z "$dontAddPrefix" ]; then
-        configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
-    fi
-
-    # Add --disable-dependency-tracking to speed up some builds.
-    if [ -z "$dontAddDisableDepTrack" ]; then
-        if grep -q dependency-tracking $configureScript; then
-            configureFlags="--disable-dependency-tracking $configureFlags"
-        fi
-    fi
-
-    # By default, disable static builds.
-    if [ -z "$dontDisableStatic" ]; then
-        if grep -q enable-static $configureScript; then
-            configureFlags="--disable-static $configureFlags"
-        fi
-    fi
-
-    echo "configure flags: $configureFlags ${configureFlagsArray[@]}"
-    $configureScript $configureFlags "${configureFlagsArray[@]}"
-
-    runHook postConfigure
-}
-
-
-buildPhase() {
-    runHook preBuild
-
-    if [ -z "$makeFlags" ] && ! [ -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile" ]; then
-        echo "no Makefile, doing nothing"
-        return
-    fi
-
-    echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}"
-    make ${makefile:+-f $makefile} \
-        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
-        $makeFlags "${makeFlagsArray[@]}" \
-        $buildFlags "${buildFlagsArray[@]}"
-
-    runHook postBuild
-}
-
-
-checkPhase() {
-    runHook preCheck
-
-    echo "check flags: $makeFlags ${makeFlagsArray[@]} $checkFlags ${checkFlagsArray[@]}"
-    make ${makefile:+-f $makefile} \
-        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
-        $makeFlags "${makeFlagsArray[@]}" \
-        ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" ${checkTarget:-check}
-
-    runHook postCheck
-}
-
-
-patchELF() {
-    # Patch all ELF executables and shared libraries.
-    header "patching ELF executables and libraries"
-    if [ -e "$prefix" ]; then
-        find "$prefix" \( \
-            \( -type f -a -name "*.so*" \) -o \
-            \( -type f -a -perm +0100 \) \
-            \) -print -exec patchelf --shrink-rpath {} \;
-    fi
-    stopNest
-}
-
-
-patchShebangs() {
-    # Rewrite all script interpreter file names (`#! /path') under the
-    # specified  directory tree to paths found in $PATH.  E.g.,
-    # /bin/sh will be rewritten to /nix/store/<hash>-some-bash/bin/sh.
-    # Interpreters that are already in the store are left untouched.
-    header "patching script interpreter paths"
-    local dir="$1"
-    local f
-    for f in $(find "$dir" -type f -perm +0100); do
-        local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f")
-        if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then
-            local newPath=$(type -P $(basename $oldPath) || true)
-            if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then
-                echo "$f: interpreter changed from $oldPath to $newPath"
-                sed -i -e "1 s,$oldPath,$newPath," "$f"
-            fi
-        fi
-    done
-    stopNest
-}
-
-
-installPhase() {
-    runHook preInstall
-
-    mkdir -p "$prefix"
-
-    installTargets=${installTargets:-install}
-    echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
-    make ${makefile:+-f $makefile} $installTargets \
-        $makeFlags "${makeFlagsArray[@]}" \
-        $installFlags "${installFlagsArray[@]}"
-
-    runHook postInstall
-}
-
-
-# The fixup phase performs generic, package-independent, Nix-related
-# stuff, like running patchelf and setting the
-# propagated-build-inputs.  It should rarely be overriden.
-fixupPhase() {
-    runHook preFixup
-
-    # Put man/doc/info under $out/share.
-    forceShare=${forceShare:=man doc info}
-    if [ -n "$forceShare" ]; then
-        for d in $forceShare; do
-            if [ -d "$prefix/$d" ]; then
-                if [ -d "$prefix/share/$d" ]; then
-                    echo "both $d/ and share/$d/ exists!"
-                else
-                    echo "fixing location of $d/ subdirectory"
-                    mkdir -p $prefix/share
-                    if [ -w $prefix/share ]; then
-                        mv -v $prefix/$d $prefix/share
-                        ln -sv share/$d $prefix
-                    fi
-                fi
-            fi
-        done;
-    fi
-
-    if [ -z "$dontGzipMan" ]; then
-        GLOBIGNORE=.:..:*.gz:*.bz2
-        for f in $out/share/man/*/* $out/share/man/*/*/*; do
-            if [ -f $f ]; then
-                if gzip -c -n $f > $f.gz; then
-                    rm $f
-                else
-                    rm $f.gz
-                fi
-            fi
-        done
-        unset GLOBIGNORE
-    fi
-
-    # TODO: strip _only_ ELF executables, and return || fail here...
-    if [ -z "$dontStrip" ]; then
-        stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin}
-        if [ -n "$stripDebugList" ]; then
-            stripDirs "$stripDebugList" "${stripDebugFlags:--S --enable-deterministic-archives}"
-        fi
-
-        stripAllList=${stripAllList:-}
-        if [ -n "$stripAllList" ]; then
-            stripDirs "$stripAllList" "${stripAllFlags:--s --enable-deterministic-archives}"
-        fi
-    fi
-
-    if [ "$havePatchELF" = 1 -a -z "$dontPatchELF" ]; then
-        patchELF "$prefix"
-    fi
-
-    if [ -z "$dontPatchShebangs" ]; then
-        patchShebangs "$prefix"
-    fi
-
-    if [ -n "$propagatedBuildInputs" ]; then
-        mkdir -p "$out/nix-support"
-        echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
-    fi
-
-    if [ -n "$propagatedNativeBuildInputs" ]; then
-        mkdir -p "$out/nix-support"
-        echo "$propagatedNativeBuildInputs" > "$out/nix-support/propagated-native-build-inputs"
-    fi
-
-    if [ -n "$propagatedUserEnvPkgs" ]; then
-        mkdir -p "$out/nix-support"
-        echo "$propagatedUserEnvPkgs" > "$out/nix-support/propagated-user-env-packages"
-    fi
-
-    if [ -n "$setupHook" ]; then
-        mkdir -p "$out/nix-support"
-        substituteAll "$setupHook" "$out/nix-support/setup-hook"
-    fi
-
-    runHook postFixup
-}
-
-
-installCheckPhase() {
-    runHook preInstallCheck
-
-    echo "installcheck flags: $makeFlags ${makeFlagsArray[@]} $installCheckFlags ${installCheckFlagsArray[@]}"
-    make ${makefile:+-f $makefile} \
-        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
-        $makeFlags "${makeFlagsArray[@]}" \
-        $installCheckFlags "${installCheckFlagsArray[@]}" ${installCheckTarget:-installcheck}
-
-    runHook postInstallCheck
-}
-
-
-distPhase() {
-    runHook preDist
-
-    echo "dist flags: $distFlags ${distFlagsArray[@]}"
-    make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist}
-
-    if [ "$dontCopyDist" != 1 ]; then
-        mkdir -p "$out/tarballs"
-
-        # Note: don't quote $tarballs, since we explicitly permit
-        # wildcards in there.
-        cp -pvd ${tarballs:-*.tar.gz} $out/tarballs
-    fi
-
-    runHook postDist
-}
-
-
-showPhaseHeader() {
-    local phase="$1"
-    case $phase in
-        unpackPhase) header "unpacking sources";;
-        patchPhase) header "patching sources";;
-        configurePhase) header "configuring";;
-        buildPhase) header "building";;
-        checkPhase) header "running tests";;
-        installPhase) header "installing";;
-        fixupPhase) header "post-installation fixup";;
-        installCheckPhase) header "running install tests";;
-        *) header "$phase";;
-    esac
-}
-
-
-genericBuild() {
-    header "building $out"
-
-    if [ -n "$buildCommand" ]; then
-        eval "$buildCommand"
-        return
-    fi
-
-    if [ -z "$phases" ]; then
-        phases="$prePhases unpackPhase patchPhase $preConfigurePhases \
-            configurePhase $preBuildPhases buildPhase checkPhase \
-            $preInstallPhases installPhase fixupPhase installCheckPhase \
-            $preDistPhases distPhase $postPhases";
-    fi
-
-    for curPhase in $phases; do
-        if [ "$curPhase" = buildPhase -a -n "$dontBuild" ]; then continue; fi
-        if [ "$curPhase" = checkPhase -a -z "$doCheck" ]; then continue; fi
-        if [ "$curPhase" = installPhase -a -n "$dontInstall" ]; then continue; fi
-        if [ "$curPhase" = fixupPhase -a -n "$dontFixup" ]; then continue; fi
-        if [ "$curPhase" = installCheckPhase -a -z "$doInstallCheck" ]; then continue; fi
-        if [ "$curPhase" = distPhase -a -z "$doDist" ]; then continue; fi
-
-        if [ -n "$tracePhases" ]; then
-            echo
-            echo "@ phase-started $out $curPhase"
-        fi
-
-        showPhaseHeader "$curPhase"
-        dumpVars
-
-        # Evaluate the variable named $curPhase if it exists, otherwise the
-        # function named $curPhase.
-        eval "${!curPhase:-$curPhase}"
-
-        if [ "$curPhase" = unpackPhase ]; then
-            cd "${sourceRoot:-.}"
-        fi
-
-        if [ -n "$tracePhases" ]; then
-            echo
-            echo "@ phase-succeeded $out $curPhase"
-        fi
-
-        stopNest
-    done
-
-    stopNest
-}
-
-
-# Execute the post-hook.
-runHook postHook
-
-
-# Execute the global user hook (defined through the Nixpkgs
-# configuration option ‘stdenv.userHook’).  This can be used to set
-# global compiler optimisation flags, for instance.
-runHook userHook
-
-
-dumpVars
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 58868e8706a..4a5e3bac8fc 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -291,7 +291,7 @@ stripDirs() {
         for dir in $dirs; do
             test -L "$dir" || chmod -R +rw "$dir"
         done
-        find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $stripFlags || true
+        find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags || true
         stopNest
     fi
 }
@@ -759,7 +759,7 @@ fixupPhase() {
         GLOBIGNORE=.:..:*.gz:*.bz2
         for f in "$out"/share/man/*/* "$out"/share/man/*/*/*; do
             if [ -f "$f" -a ! -L "$f" ]; then
-                if gzip -c "$f" > "$f".gz; then
+                if gzip -c -n "$f" > "$f".gz; then
                     rm "$f"
                 else
                     rm "$f".gz
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 3e71ac46739..b1e903ac610 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -268,7 +268,13 @@ rec {
   stdenvLinux = import ../generic rec {
     inherit system config;
 
-    preHook = commonPreHook;
+    preHook =
+      ''
+        # Make "strip" produce deterministic output, by setting
+        # timestamps etc. to a fixed value.
+        commonStripFlags="--enable-deterministic-archives"
+        ${commonPreHook}
+      '';
 
     initialPath =
       ((import ../common-path.nix) {pkgs = stdenvLinuxBoot4Pkgs;})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aec3beb89b1..38791ec46df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2349,37 +2349,6 @@ let
     profiledCompiler = true;
   }));
 
-  wrapDeterministicGCCWith = gccWrapper: glibc: baseGCC: gccWrapper {
-    nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools;
-    nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc;
-    nativePrefix = if stdenv ? gcc then stdenv.gcc.nativePrefix else "";
-    gcc = baseGCC;
-    libc = glibc;
-    shell = bash;
-    binutils = binutils_deterministic;
-    inherit stdenv coreutils zlib;
-  };
-
-  wrapDeterministicGCC = wrapDeterministicGCCWith (import ../build-support/gcc-wrapper) glibc;
-
-  gcc46_deterministic = lowPrio (wrapDeterministicGCC (callPackage ../development/compilers/gcc/4.6 {
-    inherit noSysDirs;
-
-    # bootstrapping a profiled compiler does not work in the sheevaplug:
-    # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
-    profiledCompiler = false;
-
-    # 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;
-  }));
-
   gcc48_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
     (callPackage ../development/compilers/gcc/4.8 {
       inherit noSysDirs;
@@ -2952,15 +2921,6 @@ let
     ocaml = ocaml_3_08_0;
   };
 
-  deterministicStdenv = lowPrio (
-    overrideInStdenv (
-      stdenvAdapters.overrideGCC
-        (stdenvAdapters.overrideSetup stdenv ../stdenv/generic/setup-repeatable.sh )
-      gcc46_deterministic
-    )
-    [ binutils_deterministic ]
-  );
-
   roadsend = callPackage ../development/compilers/roadsend { };
 
   # TODO: the corresponding nix file is missing
@@ -3390,11 +3350,6 @@ let
     inherit noSysDirs;
   };
 
-  binutils_deterministic = lowPrio (callPackage ../development/tools/misc/binutils {
-    inherit noSysDirs;
-    deterministic = true;
-  });
-
   binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils {
     inherit noSysDirs;
     gold = false;
-- 
GitLab


From c17e263ae9138627c50a3b563d6f3861db6c6711 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 14:11:21 +0100
Subject: [PATCH 0274/3789] gzip: Don't depend on less

No need to make stdenv bootstrap more bloated than necessary.
---
 pkgs/tools/compression/gzip/default.nix           |  8 --------
 pkgs/tools/compression/gzip/skip-some-tests.patch | 12 ------------
 2 files changed, 20 deletions(-)
 delete mode 100644 pkgs/tools/compression/gzip/skip-some-tests.patch

diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index 3a134fea9de..eaa1fd5c513 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -8,12 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "0ivqnbhiwd12q8hp3qw6rpsrpw2jg5y2mymk8cn22lsx90dfvprp";
   };
 
-  patches = [ ./skip-some-tests.patch ];
-
-  buildInputs = [ less ]; # just for tests
-
-  doCheck = true;
-
   meta = {
     homepage = http://www.gnu.org/software/gzip/;
     description = "Gzip, the GNU zip compression program";
@@ -31,7 +25,5 @@ stdenv.mkDerivation rec {
       '';
 
     license = "GPLv3+";
-
-    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/compression/gzip/skip-some-tests.patch b/pkgs/tools/compression/gzip/skip-some-tests.patch
deleted file mode 100644
index 74043a3ab56..00000000000
--- a/pkgs/tools/compression/gzip/skip-some-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Skip test requiring more (not found in nixpkgs).
---- gzip-1.5/tests/Makefile.in.orig	2013-02-23 15:15:08.017048868 +0000
-+++ gzip-1.5/tests/Makefile.in	2013-02-23 15:15:32.756197039 +0000
-@@ -1441,8 +1440,7 @@
-   zfgrep	\
-   zforce	\
-   zgrep		\
-   zless		\
--  zmore		\
-   znew
- 
- TESTS_ENVIRONMENT = \
-- 
GitLab


From 320498d5297f28a636d0afe5df3cf768aa472d50 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 14:24:59 +0100
Subject: [PATCH 0275/3789] flex: Clean up expression

---
 pkgs/development/tools/parsing/flex/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index 21180e7d185..8047080a125 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -1,17 +1,16 @@
-# This should be moved to default.nix eventually (?)
-
-{stdenv, fetchurl, yacc, m4}:
-
-assert yacc != null && m4 != null;
+{ stdenv, fetchurl, bison, m4 }:
 
 stdenv.mkDerivation {
   name = "flex-2.5.35";
+
   src = fetchurl {
     url = mirror://sourceforge/flex/flex-2.5.35.tar.bz2;
     sha256 = "0ysff249mwhq0053bw3hxh58djc0gy7vjan2z1krrf9n5d5vvv0b";
   };
-  buildInputs = [yacc];
-  propagatedNativeBuildInputs = [m4];
+
+  buildInputs = [ bison ];
+
+  propagatedNativeBuildInputs = [ m4 ];
 
   crossAttrs = {
     preConfigure = ''
@@ -21,6 +20,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
+    homepage = http://flex.sourceforge.net/;
     description = "A fast lexical analyser generator";
   };
 }
-- 
GitLab


From dfc62c908426920fba9286e66873343a8b1358b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 14:25:42 +0100
Subject: [PATCH 0276/3789] bison: Don't run the tests

All this accomplishes is to make bison depend on flex, which in turn
depends on bison.  (So as a result, during the stdenv bootstrap, bison
gets built 6 (!) times.)
---
 pkgs/development/tools/parsing/bison/3.x.nix | 6 ++----
 pkgs/top-level/all-packages.nix              | 6 +-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index 2e3a4f8d497..284223905f6 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl, flex }:
+{ stdenv, fetchurl, m4, perl }:
 
 stdenv.mkDerivation rec {
   name = "bison-3.0.2";
@@ -8,11 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1vc17y6242jlwp0gdj7wsim3nvc1ws7q3j0v3065nz8g9hd9vwnd";
   };
 
-  nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optionals doCheck [ flex ];
+  nativeBuildInputs = [ m4 perl ];
   propagatedBuildInputs = [ m4 ];
 
-  doCheck = flex != null;
-
   meta = {
     homepage = "http://www.gnu.org/software/bison/";
     description = "GNU Bison, a Yacc-compatible parser generator";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38791ec46df..4f8bb74306a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3500,11 +3500,7 @@ let
 
   checkstyle = callPackage ../development/tools/analysis/checkstyle { };
 
-  flex = callPackage ../development/tools/parsing/flex {
-    # Break infinite recursion: bison's test suite needs flex, so we
-    # use an untested bison build to build flex first.
-    yacc = bison.override { flex = null; };
-  };
+  flex = callPackage ../development/tools/parsing/flex { };
 
   m4 = gnum4;
 
-- 
GitLab


From 4b31f920b64798831bc4c90f5e2f5f795db818fa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 14:55:55 +0100
Subject: [PATCH 0277/3789] binutils: Get rid of a redundant copy of gold

---
 pkgs/development/tools/misc/binutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index af26ebe2bda..d79d276307e 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
     # Use symlinks instead of hard links to save space ("strip" in the
     # fixup phase strips each hard link separately).
-    for i in binutils/Makefile.in gas/Makefile.in ld/Makefile.in; do
+    for i in binutils/Makefile.in gas/Makefile.in ld/Makefile.in gold/Makefile.in; do
         sed -i "$i" -e 's|ln |ln -s |'
     done
   '';
-- 
GitLab


From 1e986d8de3a9e03671eb54be9a54f33bc147cc57 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 15:01:59 +0100
Subject: [PATCH 0278/3789] binutils: Use dynamic instead of shared libraries

This reduces the size of binutils from 29 to 17 MiB.
---
 pkgs/development/tools/misc/binutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index d79d276307e..6db4abbf446 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-static-libgcc";
 
   configureFlags =
-    [ "--enable-deterministic-archives" ]
+    [ "--enable-shared" "--enable-deterministic-archives" ]
     ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop"
     ++ optional (cross != null) "--target=${cross.config}"
     ++ optionals gold [ "--enable-gold" "--enable-plugins" ]
-- 
GitLab


From ffd6557dc603083d35b4bfad7b1f2dcd328b4ad0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 17:44:03 +0100
Subject: [PATCH 0279/3789] patchelf: Update to 0.7

---
 pkgs/development/tools/misc/patchelf/default.nix |  4 ++--
 .../development/tools/misc/patchelf/unstable.nix | 16 ----------------
 pkgs/top-level/all-packages.nix                  |  2 --
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/patchelf/unstable.nix

diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index 857aa1cabcf..8626534c7db 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "patchelf-0.6";
+  name = "patchelf-0.7";
 
   src = fetchurl {
     url = "http://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
-    sha256 = "fc7e7fa95f282fc37a591a802629e0e1ed07bc2a8bf162228d9a69dd76127c01";
+    sha256 = "61b96f455e6ccd1c1d7d159df7199c85ff6e8f9622d795a5420e418acfb8b808";
   };
 
   meta = {
diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
deleted file mode 100644
index aa8418496ea..00000000000
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "patchelf-0.7pre160_1c057cd";
-
-  src = fetchurl {
-    url = http://hydra.nixos.org/build/2961500/download/2/patchelf-0.7pre160_1c057cd.tar.bz2;
-    sha256 = "bbc46169f6b6803410e0072cf57e631481e3d5f1dde234f4eacbccb6562c5f4f";
-  };
-
-  meta = {
-    homepage = http://nixos.org/patchelf.html;
-    license = "GPL";
-    description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f8bb74306a..3dd58e2eb12 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3595,8 +3595,6 @@ let
 
   patchelf = callPackage ../development/tools/misc/patchelf { };
 
-  patchelfUnstable = callPackage ../development/tools/misc/patchelf/unstable.nix { };
-
   peg = callPackage ../development/tools/parsing/peg { };
 
   phantomjs = callPackage ../development/tools/phantomjs { };
-- 
GitLab


From 10ab227126bfab4ad1675b6b95f8c1e7e6370b2d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 17:45:55 +0100
Subject: [PATCH 0280/3789] stdenv: Prepend SHELL=... to makeFlags

If it's appended, the user cannot override SHELL.
---
 pkgs/stdenv/generic/setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 4a5e3bac8fc..12c5801d5eb 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -614,8 +614,8 @@ buildPhase() {
         return
     fi
 
-    # see https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
-    makeFlags="${makeFlags} SHELL=${SHELL}"
+    # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
+    makeFlags="SHELL=$SHELL $makeFlags"
 
     echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}"
     make ${makefile:+-f $makefile} \
-- 
GitLab


From 860c681fb3e97030f43659897552b133943a636a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 17:46:47 +0100
Subject: [PATCH 0281/3789] stdenv-linux: Prevent dependency on bootstrap-tools
 in the final binutils

Binutils nowadays contains ld.gold, which depends on libstdc++.  So it
needs to be built with the new GCC rather than the one from
bootstrap-tools.

Issue #1469.
---
 pkgs/stdenv/linux/default.nix | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index b1e903ac610..bedeea0915d 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -7,7 +7,7 @@
 # The function defaults are for easy testing.
 { system ? builtins.currentSystem
 , allPackages ? import ../../top-level/all-packages.nix
-, platform ? null, config }:
+, platform ? null, config ? {} }:
 
 rec {
 
@@ -166,12 +166,14 @@ rec {
     bootStdenv = stdenvLinuxBoot1;
   };
 
+  binutils1 = stdenvLinuxBoot1Pkgs.binutils.override { gold = false; };
 
-  # 3) 2nd stdenv that we will use to build only the glibc.
+
+  # 3) 2nd stdenv that we will use to build only Glibc.
   stdenvLinuxBoot2 = stdenvBootFun {
     gcc = wrapGCC {
       libc = bootstrapGlibc;
-      binutils = stdenvLinuxBoot1Pkgs.binutils;
+      binutils = binutils1;
       coreutils = bootstrapTools;
     };
     overrides = pkgs: {
@@ -182,7 +184,7 @@ rec {
 
 
   # 4) These are the packages that we can build with the 2nd
-  #    stdenv.  We only need Glibc (in step 5).
+  #    stdenv.
   stdenvLinuxBoot2Pkgs = allPackages {
     inherit system platform;
     bootStdenv = stdenvLinuxBoot2;
@@ -194,12 +196,12 @@ rec {
   stdenvLinuxGlibc = stdenvLinuxBoot2Pkgs.glibc;
 
 
-  # 6) Construct a third stdenv identical to the 2nd, except that
-  #    this one uses the Glibc built in step 3.  It still uses
-  #    the recent binutils and rest of the bootstrap tools, including GCC.
+  # 6) Construct a third stdenv identical to the 2nd, except that this
+  #    one uses the Glibc built in step 5.  It still uses the recent
+  #    binutils and rest of the bootstrap tools, including GCC.
   stdenvLinuxBoot3 = stdenvBootFun {
     gcc = wrapGCC {
-      binutils = stdenvLinuxBoot1Pkgs.binutils;
+      binutils = binutils1;
       coreutils = bootstrapTools;
       libc = stdenvLinuxGlibc;
     };
@@ -231,12 +233,11 @@ rec {
 
 
   # 8) Construct a fourth stdenv identical to the second, except that
-  #    this one uses the dynamically linked GCC and Binutils from step
-  #    5.  The other tools (e.g. coreutils) are still from the
-  #    bootstrap tools.
+  #    this one uses the new GCC from step 7.  The other tools
+  #    (e.g. coreutils) are still from the bootstrap tools.
   stdenvLinuxBoot4 = stdenvBootFun {
     gcc = wrapGCC rec {
-      inherit (stdenvLinuxBoot3Pkgs) binutils;
+      binutils = binutils1;
       coreutils = bootstrapTools;
       libc = stdenvLinuxGlibc;
       gcc = stdenvLinuxBoot3Pkgs.gcc.gcc;
@@ -258,9 +259,9 @@ rec {
   };
 
 
-  # 10) Construct the final stdenv.  It uses the Glibc, GCC and
-  #     Binutils built above, and adds in dynamically linked versions
-  #     of all other tools.
+  # 10) Construct the final stdenv.  It uses the Glibc and GCC, and
+  #     adds in a new binutils that doesn't depend on bootstrap-tools,
+  #     as well as dynamically linked versions of all other tools.
   #
   #     When updating stdenvLinux, make sure that the result has no
   #     dependency (`nix-store -qR') on bootstrapTools or the
@@ -281,8 +282,7 @@ rec {
       ++ [stdenvLinuxBoot4Pkgs.patchelf];
 
     gcc = wrapGCC rec {
-      inherit (stdenvLinuxBoot3Pkgs) binutils;
-      inherit (stdenvLinuxBoot4Pkgs) coreutils;
+      inherit (stdenvLinuxBoot4Pkgs) binutils coreutils;
       libc = stdenvLinuxGlibc;
       gcc = stdenvLinuxBoot4.gcc.gcc;
       shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash";
-- 
GitLab


From a9a3ed108472a987ba892162ce9ab4d24f383eff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jan 2014 17:49:06 +0100
Subject: [PATCH 0282/3789] gzip: Don't depend on stdenv-linux.

Issue #1469.
---
 pkgs/tools/compression/gzip/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index eaa1fd5c513..b1d127635f6 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -8,6 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "0ivqnbhiwd12q8hp3qw6rpsrpw2jg5y2mymk8cn22lsx90dfvprp";
   };
 
+  enableParallelBuilding = true;
+
+  # In stdenv-linux, prevent a dependency on bootstrap-tools.
+  makeFlags = "SHELL=/bin/sh GREP=grep";
+
   meta = {
     homepage = http://www.gnu.org/software/gzip/;
     description = "Gzip, the GNU zip compression program";
-- 
GitLab


From 51713fbbfcaf819f176df8f3ce75f57880aeb690 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Dec 2013 17:21:03 +0100
Subject: [PATCH 0283/3789] gcc-wrapper: Use -isystem instead of -I

This mostly matters for "gcc -MMD", which distinguishes between user
and system header files.
---
 pkgs/build-support/gcc-wrapper/setup-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/gcc-wrapper/setup-hook.sh b/pkgs/build-support/gcc-wrapper/setup-hook.sh
index 513ab8053a7..298ade21d1f 100644
--- a/pkgs/build-support/gcc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/gcc-wrapper/setup-hook.sh
@@ -1,6 +1,6 @@
 addCVars () {
     if test -d $1/include; then
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$1/include"
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $1/include"
     fi
 
     if test -d $1/lib64; then
-- 
GitLab


From e15fc83fc94adcf28b9816ecf6b907e46b9de57b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 11 Jan 2014 07:54:35 -0600
Subject: [PATCH 0284/3789] Don't split paths with spaces

setup.sh uses the anti-pattern `for f in $(find ...); do` in several
places. `find` returns one path per line, but `for` splits its arguments
by words, so paths which contain spaces are incorrectly split! The
correct way is `find ... | while read f; do`
---
 pkgs/stdenv/generic/setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 12c5801d5eb..3dee8dc020b 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -575,7 +575,7 @@ configurePhase() {
     fi
 
     if [ -z "$dontFixLibtool" ]; then
-        for i in $(find . -name "ltmain.sh"); do
+        find . -iname "ltmain.sh" | while read i; do
             echo "fixing libtool script $i"
             fixLibtool $i
         done
@@ -670,7 +670,7 @@ patchShebangs() {
     local oldInterpreterLine
     local newInterpreterLine
 
-    for f in $(find "$dir" -type f -perm +0100); do
+    find "$dir" -type f -perm +0100 | while read f; do
         if [ "$(head -1 "$f" | head -c +2)" != '#!' ]; then
             # missing shebang => not a script
             continue
-- 
GitLab


From 8db8ccb40847d44d997ab578e1079bd62648f275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 11 Jan 2014 19:15:58 +0100
Subject: [PATCH 0285/3789] mesa: bugfix update 10.0.1 -> .2

---
 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 3db3f41d588..aaf15851955 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "10.0.1";
+  version = "10.0.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 = "0w1jh8pl4gbzazigsqc5pzc076gckb7b9xgw2w633jlrjn7qdprw";
+    sha256 = "0zkayy6gl0nwgqg11ga95vl4z0hldcz1b77qzzc1agm5vziah0j5";
   };
 
   prePatch = "patchShebangs .";
-- 
GitLab


From bccc76f290a49c89ac75a8a8829d9e48210c170c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 13 Jan 2014 17:05:07 +0100
Subject: [PATCH 0286/3789] pcre: update to version 8.34

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

diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index a8a89a4569c..51279701d4a 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }:
 
 stdenv.mkDerivation rec {
-  name = "pcre-8.33";
+  name = "pcre-8.34";
 
   src = fetchurl {
     url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
-    sha256 = "0y04pkrxjvhi30qpnb9ijgn6cjgv3k3lhq2zmw21r0b695x9a0y6";
+    sha256 = "0gsqmsp0q0n3q0ba32gkjvgcsdy6nwidqa7sbxkbw817zzhkl15n";
   };
 
   # The compiler on Darwin crashes with an internal error while building the
-- 
GitLab


From 033374d60187442e55644002f20db7fd7111753d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Jan 2014 19:11:46 +0100
Subject: [PATCH 0287/3789] gcc: Fix building 4.5 and 4.6

---
 pkgs/development/compilers/gcc/4.5/default.nix |  2 +-
 pkgs/development/compilers/gcc/4.6/default.nix |  2 +-
 pkgs/top-level/all-packages.nix                | 10 ++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index e63ff7947f6..9713164711f 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -212,7 +212,7 @@ stdenv.mkDerivation ({
     ++ (optional (ppl != null) ppl)
     ++ (optional (cloogppl != null) cloogppl)
     ++ (optional (zlib != null) zlib)
-    ++ (optional (boehmgc != null) boehmgc)
+    ++ (optional langJava boehmgc)
     ++ (optionals langJava [zip unzip])
     ++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs))
     ++ (optionals (cross != null) [binutilsCross])
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
index 35255d0af5b..796fc8fde53 100644
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -434,7 +434,7 @@ stdenv.mkDerivation ({
   passthru = { inherit langC langCC langAda langFortran langVhdl
       langGo version; };
 
-  enableParallelBuilding = !langAda;
+  enableParallelBuilding = false;
 
   inherit (stdenv) is64bit;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e322f6aef9..9c949357ae3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2437,11 +2437,14 @@ let
     profiledCompiler = true;
   }));
 
-  gcc45 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.5) {
+  gcc45 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.5 {
     inherit fetchurl stdenv gmp mpfr mpc libelf zlib perl
-      ppl cloogppl
       gettext which noSysDirs;
     texinfo = texinfo4;
+
+    ppl = null;
+    cloogppl = null;
+
     # bootstrapping a profiled compiler does not work in the sheevaplug:
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
     profiledCompiler = !stdenv.isArm;
@@ -2460,6 +2463,9 @@ let
   gcc46 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 {
     inherit noSysDirs;
 
+    ppl = null;
+    cloog = null;
+
     # bootstrapping a profiled compiler does not work in the sheevaplug:
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
     profiledCompiler = false;
-- 
GitLab


From 29a878d1be84b2a15a928de93090b9edb067ac95 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 13 Jan 2014 22:47:17 +0100
Subject: [PATCH 0288/3789] harfbuzz: update from 0.9.24 to 0.9.25

I see no significant change in the changelog.
---
 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 4cee49bea51..c69a96795d2 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.24";
+  name = "harfbuzz-0.9.25";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "08i46xx92hvz2br2d9hdxjgi0g5jglwf5bdfsandxb0qlgc5vwpd";
+    sha256 = "1vkbdny880d60j3v6lvpc6p8fvj6cl7hma27h796qlk9lnbmjvnw";
   };
 
   configureFlags = [
-- 
GitLab


From 67e391786476537e82a8f7dd2cf3daef801fce15 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 14 Jan 2014 13:36:25 +0100
Subject: [PATCH 0289/3789] gfortran-4.8: re-enable parallel building

86802e68ffd1981af92303a7a8a91a2723ca84ca added a patch that fixes the
race condition with bconfig.h.
---
 pkgs/development/compilers/gcc/4.8/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 8bd3ee14554..fa2e5d8f420 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -59,13 +59,8 @@ let version = "4.8.2";
 
   /* gccinstall.info says that "parallel make is currently not supported since
      collisions in profile collecting may occur".
-
-     Parallel make of gfortran is disabled because of an apparent race
-     condition concerning the generation of "bconfig.h". Please try and
-     re-enable parallel make for a later release of gfortran to check whether
-     the error has been fixed.
   */
-    enableParallelBuilding = !profiledCompiler && !langFortran;
+    enableParallelBuilding = !profiledCompiler;
 
     patches = []
       ++ optional enableParallelBuilding ./parallel-bconfig.patch
-- 
GitLab


From 5ad0728dfc0f1b147e5c0577ec7c2c2a76f0a538 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Jan 2014 14:13:31 +0100
Subject: [PATCH 0290/3789] stdenv: In the fixupPhase, make the output writable
 first

Cherry-picked from 1d11c1dc48a3849f447350681ebba9d8cb97b979 in the
multiple-outputs branch.
---
 pkgs/stdenv/generic/setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 3dee8dc020b..47e90fb0560 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -288,9 +288,6 @@ stripDirs() {
 
     if [ -n "${dirs}" ]; then
         header "stripping (with flags $stripFlags) in $dirs"
-        for dir in $dirs; do
-            test -L "$dir" || chmod -R +rw "$dir"
-        done
         find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags || true
         stopNest
     fi
@@ -735,6 +732,9 @@ installPhase() {
 fixupPhase() {
     runHook preFixup
 
+    # Make sure everything is writable so "strip" et al. work.
+    chmod -R u+w "$prefix"
+
     # Put man/doc/info under $out/share.
     forceShare=${forceShare:=man doc info}
     if [ -n "$forceShare" ]; then
-- 
GitLab


From 7a6255e4e1747550bd811ef00a3e1bc953f11b40 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Jan 2014 14:20:47 +0100
Subject: [PATCH 0291/3789] patchelf: Update to 0.8

This fixes a segfault in building Eclipse and the Android SDK.
---
 pkgs/development/tools/misc/patchelf/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index 8626534c7db..06b5c2ef516 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -1,16 +1,18 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "patchelf-0.7";
+  name = "patchelf-0.8";
 
   src = fetchurl {
     url = "http://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
-    sha256 = "61b96f455e6ccd1c1d7d159df7199c85ff6e8f9622d795a5420e418acfb8b808";
+    sha256 = "c99f84d124347340c36707089ec8f70530abd56e7827c54d506eb4cc097a17e7";
   };
 
   meta = {
     homepage = http://nixos.org/patchelf.html;
     license = "GPL";
     description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.all;
   };
 }
-- 
GitLab


From 86afcccecb02b340c157f07364b7168b4689f048 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Jan 2014 12:13:20 +0100
Subject: [PATCH 0292/3789] sp-compat: Fix build

You can't run fixupPhase before installPhase.

http://hydra.nixos.org/build/8149119
---
 pkgs/tools/text/sgml/opensp/compat.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/sgml/opensp/compat.nix b/pkgs/tools/text/sgml/opensp/compat.nix
index 3e9d9152d36..16498281181 100644
--- a/pkgs/tools/text/sgml/opensp/compat.nix
+++ b/pkgs/tools/text/sgml/opensp/compat.nix
@@ -1,9 +1,9 @@
 { stdenv, opensp }:
 
 stdenv.mkDerivation {
-  name = "sp-compat-${builtins.substring 7 100 opensp.name}";
+  name = "sp-compat-${stdenv.lib.getVersion opensp}";
 
-  phases = [ "fixupPhase" "installPhase" ];
+  phases = [ "installPhase" "fixupPhase" ];
 
   installPhase = ''
     mkdir -pv $out/bin
-- 
GitLab


From 48f87d5d2a0cd3670b77d01c82a089b535237c6a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Jan 2014 12:41:08 +0100
Subject: [PATCH 0293/3789] fixupPhase: Handle the case where $prefix doesn't
 exist

http://hydra.nixos.org/build/8149154
---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 47e90fb0560..3a192b82028 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -733,7 +733,7 @@ fixupPhase() {
     runHook preFixup
 
     # Make sure everything is writable so "strip" et al. work.
-    chmod -R u+w "$prefix"
+    if [ -e "$prefix" ]; then chmod -R u+w "$prefix"; fi
 
     # Put man/doc/info under $out/share.
     forceShare=${forceShare:=man doc info}
-- 
GitLab


From 284833649192072959a335367374fc0a6ec667df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 17 Jan 2014 21:56:11 +0100
Subject: [PATCH 0294/3789] ghc-7.6.3: disable parallel building (fails on
 Hydra)

---
 pkgs/development/compilers/ghc/7.6.3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix
index 427d21660b8..9135741e9f0 100644
--- a/pkgs/development/compilers/ghc/7.6.3.nix
+++ b/pkgs/development/compilers/ghc/7.6.3.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ghc perl gmp ncurses ];
 
-  enableParallelBuilding = true;
+  enableParallelBuilding = false; # the same errors as 7.6.1
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
-- 
GitLab


From 3f9388436b5e029d0a73478659ea9e45135d0c3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 18 Jan 2014 17:06:56 +0100
Subject: [PATCH 0295/3789] tarball/release: change gnat44 (removed) into gnat

---
 pkgs/top-level/release-small.nix | 2 +-
 pkgs/top-level/release.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 8a91954fdf5..213358bc8ce 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -55,7 +55,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   ghdl = linux;
   glibc = linux;
   glibcLocales = linux;
-  gnat44 = linux;
+  gnat = linux;
   gnugrep = all;
   gnum4 = all;
   gnumake = all;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 5ccdb6985f9..c0800c8cad1 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -126,7 +126,7 @@ let
       glibcLocales = linux;
       glxinfo = linux;
       gnash = linux;
-      gnat44 = linux;
+      gnat = linux;
       gnugrep = all;
       gnum4 = all;
       gnumake = all;
-- 
GitLab


From fe8b00e9fa6241f1ea477b1f8a480049ebed1f33 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 18 Jan 2014 11:49:59 -0500
Subject: [PATCH 0296/3789] gnu-efi: Fix build

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/libraries/gnu-efi/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index f741a0b4f34..07c3c668793 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -19,8 +19,8 @@ let version = "3.0u"; in stdenv.mkDerivation {
     platforms = ["x86_64-linux" "i686-linux"];
   };
 
-  buildFlags = [
-    "CC=cc"
+  makeFlags = [
+    "CC=gcc"
     "AS=as"
     "LD=ld"
     "AR=ar"
@@ -29,12 +29,12 @@ let version = "3.0u"; in stdenv.mkDerivation {
   ];
 
   buildPhase = ''
-    make $buildFlags
-    make $buildFlags -C apps clean all
+    make $makeFlags
+    make $makeFlags -C apps clean all
   '';
 
   installPhase = ''
-    make PREFIX="$out" install
+    make PREFIX="$out" $makeFlags install
     mkdir -pv $out/share/gnu-efi
     install -D -m644 apps/*.efi $out/share/gnu-efi
   '';
-- 
GitLab


From 6072a289fc946d76649696f1c4e7f024423a767e Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 18 Jan 2014 19:02:45 +0100
Subject: [PATCH 0297/3789] llvm: no-rule-aarch64.patch is only needed on 3.3

the fix just missed 3.3 but it's in 3.4
see bottom of: http://llvm.org/bugs/show_bug.cgi?id=16625
---
 pkgs/development/compilers/llvm/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index d11105576bf..fc5b5ff8d96 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils, version }:
 
-with { inherit (stdenv.lib) optional; };
+with { inherit (stdenv.lib) optional optionals; };
 
 assert version == "3.4" || version == "3.3";
 
@@ -14,11 +14,10 @@ stdenv.mkDerivation rec {
         else       /*3.3*/     "0y3mfbb5qzcpw3v5qncn69x1hdrrrfirgs82ypi2annhf0g6nxk8";
   };
 
-  patches =
-  	# The default rlimits in 3.3 are too low for shared libraries.
-    optional (version == "3.3") ./more-memory-for-bugpoint.patch
-    ++ [ ./no-rule-aarch64.patch ] # http://llvm.org/bugs/show_bug.cgi?id=16625
-  ;
+  patches = optionals (version == "3.3") [
+    ./more-memory-for-bugpoint.patch # The default rlimits in 3.3 are too low for shared libraries.
+    ./no-rule-aarch64.patch          # http://llvm.org/bugs/show_bug.cgi?id=16625
+  ];
 
   # libffi was propagated before, but it wasn't even being used, so
   # unless something needs it just an input is fine.
-- 
GitLab


From 45a3e8580c56af59ca5982cc1d702cd8d9ed30f9 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 14 Jan 2014 09:44:39 +0100
Subject: [PATCH 0298/3789] mesa: keep llvm versioning outside of expression
 file

---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 40b94e91a11..aaf15851955 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook
 , python, libxml2Python, file, expat, makedepend
-, libdrm, xorg, wayland, udev, llvm_34, libffi
+, libdrm, xorg, wayland, udev, llvm, libffi
 , libvdpau, libelf
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
 , enableExtraFeatures ? false # not maintained
@@ -85,7 +85,7 @@ stdenv.mkDerivation {
     ++ optionals stdenv.isLinux [libdrm]
     ;
   buildInputs = with xorg; [
-    autoreconfHook intltool expat libxml2Python llvm_34
+    autoreconfHook intltool expat libxml2Python llvm
     libXfixes glproto dri2proto libX11 libXext libxcb libXt
     libffi wayland libvdpau libelf
   ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a0ac731cd7..0288d98e11c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5244,7 +5244,9 @@ let
 
   mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
 
-  mesa_original = callPackage ../development/libraries/mesa { };
+  mesa_original = callPackage ../development/libraries/mesa {
+    llvm = llvm_34;
+  };
   mesa_noglu = if stdenv.isDarwin
     then darwinX11AndOpenGL // { driverLink = mesa_noglu; }
     else mesa_original;
-- 
GitLab


From 638e1586cf27a0f7db0bc89130dfe410e699ee98 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Sat, 18 Jan 2014 12:23:59 -0800
Subject: [PATCH 0299/3789] Added darcsum, "a pcl-cvs like interface for
 managing darcs patches".

---
 lib/maintainers.nix                           |  1 +
 .../editors/emacs-modes/darcsum/darcs_context |  7 ++++
 .../editors/emacs-modes/darcsum/default.nix   | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 44 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/darcsum/darcs_context
 create mode 100644 pkgs/applications/editors/emacs-modes/darcsum/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index de8e617b322..45b7b1cfb20 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -24,6 +24,7 @@
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
   ertes = "Ertugrul Söylemez <es@ertes.de>";
+  falsifian = "James Cook <james.cook@utoronto.ca>";
   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/applications/editors/emacs-modes/darcsum/darcs_context b/pkgs/applications/editors/emacs-modes/darcsum/darcs_context
new file mode 100644
index 00000000000..7e9de1ed80b
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/darcsum/darcs_context
@@ -0,0 +1,7 @@
+
+Context:
+
+[TAG 1.3
+Simon Michael <simon@joyful.com>**20131103203640
+ Ignore-this: d12bac373e4aa0e5ffe6c390e1dfe269
+] 
diff --git a/pkgs/applications/editors/emacs-modes/darcsum/default.nix b/pkgs/applications/editors/emacs-modes/darcsum/default.nix
new file mode 100644
index 00000000000..cf2bcc6e30b
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/darcsum/default.nix
@@ -0,0 +1,34 @@
+# To automatically load darcsum when needed, add the following to your emacs init file:
+#
+#   (autoload 'darcsum-changes "darcsum" nil t)
+#   (autoload 'darcsum-whatsnew "darcsum" nil t)
+#   (autoload 'darcsum-view "darcsum" nil t)
+#
+# (These lines were copied from 50darcsum.el in the darcsum repository.)
+
+
+{ fetchdarcs, stdenv }:
+
+stdenv.mkDerivation {
+  name = "darcsum-1.3";
+
+  src = fetchdarcs {
+    url = http://hub.darcs.net/simon/darcsum;
+    context = ./darcs_context;
+    sha256 = "18dyk2apmnjapd604a5njfqwjri1mc7lgjaajy9phicpibgdrwzh";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    install -d "$out/share/emacs/site-lisp"
+    install darcsum.el "$out/share/emacs/site-lisp"
+  '';
+
+  meta = {
+    description = "A pcl-cvs like interface for managing darcs patches.";
+    homepage = "http://hub.darcs.net/simon/darcsum";
+    license = "GPLv2+";
+    maintainers = [ stdenv.lib.maintainers.falsifian ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14fccf3f330..4f5ef9b2e4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7756,6 +7756,8 @@ let
 
     cua = callPackage ../applications/editors/emacs-modes/cua { };
 
+    darcsum = callPackage ../applications/editors/emacs-modes/darcsum { };
+
     # ecb = callPackage ../applications/editors/emacs-modes/ecb { };
 
     jabber = callPackage ../applications/editors/emacs-modes/jabber { };
-- 
GitLab


From 177667eea987898097e854a54962ff90bbf4fa35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 19 Jan 2014 11:47:58 +0100
Subject: [PATCH 0300/3789] xxdiff, qt5: use bison2

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ebd12b7e1c..d831463406c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3743,7 +3743,9 @@ let
 
   xc3sprog = callPackage ../development/tools/misc/xc3sprog { };
 
-  xxdiff = callPackage ../development/tools/misc/xxdiff { };
+  xxdiff = callPackage ../development/tools/misc/xxdiff {
+    bison = bison2;
+  };
 
   yacc = bison;
 
@@ -5378,6 +5380,7 @@ let
     cups = if stdenv.isLinux then cups else null;
     # GNOME dependencies are not used unless gtkStyle == true
     inherit (gnome) libgnomeui GConf gnome_vfs;
+    bison = bison2; # error: too few arguments to function 'int yylex(...
   };
 
   qt5Full = qt5.override {
-- 
GitLab


From da4dbbfd11bdc53482260dc7ffc70e8e263d619f Mon Sep 17 00:00:00 2001
From: Arvin Moezzi <moezzia@gmail.com>
Date: Sun, 19 Jan 2014 22:04:41 +0100
Subject: [PATCH 0301/3789] calibre: upgrade from 1.17.0 to 1.20.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 1e16e22c0fe..7925e865b4a 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-1.17.0";
+  name = "calibre-1.20.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "1g0kwfr0v4hgwik7hpajdvg1ganyi7hlq6wvq4r5218yvdq5mkzn";
+    sha256 = "1i7sybl6in0js8an1zp3mzqv394xnwx79rmv1hj7g6abpsqhjpj7";
   };
 
   inherit python;
-- 
GitLab


From a2d0ec2f4b97b070fb975f35b0f4ddbde566877b Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 20 Jan 2014 11:58:22 +0000
Subject: [PATCH 0302/3789] Update siege to 3.0.5 and add meta information

---
 pkgs/tools/networking/siege/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix
index 23aa3055436..e29433adae3 100644
--- a/pkgs/tools/networking/siege/default.nix
+++ b/pkgs/tools/networking/siege/default.nix
@@ -1,12 +1,18 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, lib }:
 let
-  version = "3.0.2";
+  version = "3.0.5";
   baseName = "siege";
 in stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
   src = fetchurl {
     url = "http://www.joedog.org/pub/siege/${name}.tar.gz";
-    sha256 = "0b86rvcrjxy6h9w32bhpcm1gwmn223mf9f30dfsnaw51w90kn716";
+    sha256 = "16faa6kappg23bdriyiy3ym94rmddpvw8cl8xgv5nxq2v17n4gi8";
+  };
+  meta = {
+    description = "HTTP load tester";
+    maintainers = with lib.maintainers; [ ocharles raskin ];
+    platforms = with lib.platforms; linux;
+    license = with lib.licenses; gpl2Plus;
   };
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 }
-- 
GitLab


From c6be3dbf1d0fbe9e6a026ad05992ea46972ebf01 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 13:29:28 +0100
Subject: [PATCH 0303/3789] scons: add pythonPath attribute to ensure that the
 python-wrapper recognizes this package as providing a python library

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

diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 8139d6e28c7..11d81c3beb7 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation {
   buildPhase = "python setup.py install --prefix=$out --install-data=$out/share --install-lib=$(toPythonPath $out) --symlink-scons -O1";
   installPhase = "for n in $out/bin/*-${version}; do wrapProgram $n --suffix PYTHONPATH ':' \"$(toPythonPath $out)\"; done";
 
+  pythonPath = [];
+
   meta = {
     homepage = "http://scons.org/";
     description = "An improved, cross-platform substitute for Make";
-- 
GitLab


From 4a4950f3233973bfc25c346e2356418cc9e99bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 20 Jan 2014 09:44:59 +0100
Subject: [PATCH 0304/3789] Setting license to elinks.

Disabling guile, due to licence incompatibility.
---
 pkgs/applications/networking/browsers/elinks/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index 142e5a65df6..61db2656a40 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, perl, ncurses, x11, bzip2, zlib, openssl
 , spidermonkey, gpm
-, enableGuile ? true, guile ? null
+, enableGuile ? false, guile ? null   # Incompatible licenses, LGPLv3 - GPLv2
 , enablePython ? false, python ? null
 }:
 
@@ -43,5 +43,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Full-featured text-mode web browser";
     homepage = http://elinks.or.cz;
+    license = "GPLv2";
   };
 }
-- 
GitLab


From 3faf620e8a6b5bce115519714168eff5afe8e332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 20 Jan 2014 13:46:44 +0100
Subject: [PATCH 0305/3789] Updating libvpx to 1.3.0, and making ffmpeg include
 vpx

I don't think there is any reason not to have vpx there. It's
part of webm.
---
 pkgs/development/libraries/ffmpeg/2.x.nix     | 2 +-
 pkgs/development/libraries/libvpx/default.nix | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix
index 4e975ea3d82..dd29e1e9e6b 100644
--- a/pkgs/development/libraries/ffmpeg/2.x.nix
+++ b/pkgs/development/libraries/ffmpeg/2.x.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   speexSupport = config.ffmpeg.speex or true;
   theoraSupport = config.ffmpeg.theora or true;
   vorbisSupport = config.ffmpeg.vorbis or true;
-  vpxSupport = config.ffmpeg.vpx or false;
+  vpxSupport = config.ffmpeg.vpx or true;
   x264Support = config.ffmpeg.x264 or true;
   xvidSupport = config.ffmpeg.xvid or true;
   opusSupport = config.ffmpeg.opus or true;
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 46e73a121fe..677289c5158 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, bash, yasm, which, perl}:
 
-let version = "1.2.0";
+let version = "1.3.0";
 in
 stdenv.mkDerivation rec {
   name = "libvpx-" + version;
 
   src = fetchurl { # sadly, there's no official tarball for this release
-    url = "ftp://ftp.archlinux.org/other/libvpx/libvpx-${version}.tar.xz";
-    sha256 = "02k9ylswgr2hvjqmg422fa9ggym0g94gzwb14nnckly698rvjc50";
+    url = "http://webm.googlecode.com/files/libvpx-v1.3.0.tar.bz2";
+    sha1 = "191b95817aede8c136cc3f3745fb1b8c50e6d5dc";
   };
 
   patchPhase = ''
-- 
GitLab


From 37a44d405536c35a8df42f71d9632468f2ea3a2c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Jan 2014 14:24:05 +0100
Subject: [PATCH 0306/3789] libvpx: Don't install static library

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

diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 677289c5158..aa869b4b19d 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     [ "--disable-install-srcs" "--disable-install-docs" "--disable-examples"
       "--enable-vp8" "--enable-runtime-cpu-detect" "--enable-pic" ]
     # --enable-shared is only supported on ELF
-    ++ stdenv.lib.optional (!stdenv.isDarwin) "--enable-shared";
+    ++ stdenv.lib.optional (!stdenv.isDarwin) "--disable-static --enable-shared";
 
   installPhase = ''
     make quiet=false DIST_DIR=$out install
-- 
GitLab


From 9068ba2bb4183ec5fc250a88fea74f464928b276 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 18 Jan 2014 16:17:29 +0100
Subject: [PATCH 0307/3789] postgresql: Add version 9.3

---
 pkgs/servers/sql/postgresql/9.3.x.nix | 35 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/servers/sql/postgresql/9.3.x.nix

diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
new file mode 100644
index 00000000000..cb33c6f2921
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, zlib, readline }:
+
+let version = "9.3.2"; in
+
+stdenv.mkDerivation rec {
+  name = "postgresql-${version}";
+
+  src = fetchurl {
+    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+    sha256 = "700da51a71857e092f6af1c85fcd86b46d7d5cd2f2ba343cafb1f206c20232d7";
+  };
+
+  buildInputs = [ zlib readline ];
+
+  enableParallelBuilding = true;
+
+  makeFlags = [ "world" ];
+
+  patches = [ ./disable-resolve_symlinks.patch ];
+
+  installTargets = [ "install-world" ];
+
+  LC_ALL = "C";
+
+  passthru = {
+    inherit readline;
+    psqlSchema = "9.3";
+  };
+
+  meta = {
+    homepage = http://www.postgresql.org/;
+    description = "A powerful, open source object-relational database system";
+    license = "bsd";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94e323d356e..72bdda00bfe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6397,6 +6397,8 @@ let
 
   postgresql92 = callPackage ../servers/sql/postgresql/9.2.x.nix { };
 
+  postgresql93 = callPackage ../servers/sql/postgresql/9.3.x.nix { };
+
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
   psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };
-- 
GitLab


From 88904928729ea72e879a5dddfbdddfdb0e61f729 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Jan 2014 14:54:50 +0100
Subject: [PATCH 0308/3789] openjdk: Ugly hack to fix nix-env installation

Nix-env always wants to install all outputs of a derivation, but this
failed for openjdk/openjre because openjdk has some symlinks (such as
bin/java) to openjre.  Also, it prevents installing the openjre
without the openjdk.  So as a workaround, mess with the "outputs"
attribute to fool nix-env.

Also, give openjre a separate name and description.

Fixes #1535.
---
 lib/meta.nix                    | 6 +++---
 pkgs/top-level/all-packages.nix | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/meta.nix b/lib/meta.nix
index 74e9cfb411c..1af31473348 100644
--- a/lib/meta.nix
+++ b/lib/meta.nix
@@ -14,7 +14,7 @@ rec {
        addMetaAttrs {description = "Bla blah";} somePkg
   */
   addMetaAttrs = newAttrs: drv:
-    drv // { meta = (if drv ? meta then drv.meta else {}) // newAttrs; };
+    drv // { meta = (drv.meta or {}) // newAttrs; };
 
 
   /* Change the symbolic name of a package for presentation purposes
@@ -51,7 +51,7 @@ rec {
 
   /* Apply lowPrio to an attrset with derivations
   */
-  lowPrioSet = set: mapDerivationAttrset lowPrio set; 
+  lowPrioSet = set: mapDerivationAttrset lowPrio set;
 
 
   /* Increase the nix-env priority of the package, i.e., this
@@ -63,5 +63,5 @@ rec {
   /* Apply hiPrio to an attrset with derivations
   */
   hiPrioSet = set: mapDerivationAttrset hiPrio set;
-  
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72bdda00bfe..096880a6331 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2851,11 +2851,14 @@ let
     else
       let
         openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { };
-      in callPackage ../development/compilers/openjdk {
+      in (callPackage ../development/compilers/openjdk {
         jdk = openjdkBootstrap;
-      };
+      }) // { outputs = [ "out" ]; };
 
-  openjre = pkgs.openjdk.jre;
+  # FIXME: Need a way to set per-output meta attributes.
+  openjre = (lib.setName "openjre-${lib.getVersion pkgs.openjdk.jre}" (lib.addMetaAttrs
+    { description = "The open-source Java Runtime Environment"; }
+    pkgs.openjdk.jre)) // { outputs = [ "jre" ]; };
 
   jdk = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
     then pkgs.openjdk
-- 
GitLab


From 7b51e24de99405760e64370273cc82251a7db67e Mon Sep 17 00:00:00 2001
From: Ian-Woo Kim <ianwookim@gmail.com>
Date: Mon, 20 Jan 2014 15:41:17 +0100
Subject: [PATCH 0309/3789] add hoodle (pen notetaking program written in
 haskell) to nixpkgs

---
 pkgs/applications/graphics/hoodle/default.nix | 18 +++++++++++++++
 .../libraries/haskell/TypeCompose/default.nix | 15 +++++++++++++
 .../haskell/coroutine-object/default.nix      | 16 ++++++++++++++
 .../haskell/hoodle-builder/default.nix        | 16 ++++++++++++++
 .../libraries/haskell/hoodle-core/default.nix | 22 +++++++++++++++++++
 .../haskell/hoodle-parser/default.nix         | 16 ++++++++++++++
 .../haskell/hoodle-render/default.nix         | 16 ++++++++++++++
 .../haskell/hoodle-types/default.nix          | 17 ++++++++++++++
 .../haskell/transformers-free/default.nix     | 15 +++++++++++++
 .../haskell/xournal-parser/default.nix        | 16 ++++++++++++++
 .../haskell/xournal-types/default.nix         | 16 ++++++++++++++
 pkgs/top-level/haskell-packages.nix           | 22 +++++++++++++++++++
 12 files changed, 205 insertions(+)
 create mode 100644 pkgs/applications/graphics/hoodle/default.nix
 create mode 100644 pkgs/development/libraries/haskell/TypeCompose/default.nix
 create mode 100644 pkgs/development/libraries/haskell/coroutine-object/default.nix
 create mode 100644 pkgs/development/libraries/haskell/hoodle-builder/default.nix
 create mode 100644 pkgs/development/libraries/haskell/hoodle-core/default.nix
 create mode 100644 pkgs/development/libraries/haskell/hoodle-parser/default.nix
 create mode 100644 pkgs/development/libraries/haskell/hoodle-render/default.nix
 create mode 100644 pkgs/development/libraries/haskell/hoodle-types/default.nix
 create mode 100644 pkgs/development/libraries/haskell/transformers-free/default.nix
 create mode 100644 pkgs/development/libraries/haskell/xournal-parser/default.nix
 create mode 100644 pkgs/development/libraries/haskell/xournal-types/default.nix

diff --git a/pkgs/applications/graphics/hoodle/default.nix b/pkgs/applications/graphics/hoodle/default.nix
new file mode 100644
index 00000000000..8f037812eed
--- /dev/null
+++ b/pkgs/applications/graphics/hoodle/default.nix
@@ -0,0 +1,18 @@
+{ cabal, cmdargs, configurator, dyre, hoodleCore, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "hoodle";
+  version = "0.2.2.1";
+  sha256 = "1qkyyzfmprhniwarnq6cdmv1r6605b3h2lsc1rlalxhq6jh5gamd";
+  isLibrary = false;
+  isExecutable = true; 
+  buildDepends = [ cmdargs configurator dyre hoodleCore mtl ];
+  #jailbreak = true;
+  meta = {
+    homepage = "http://ianwookim.org/hoodle";
+    description = "Pen notetaking program written in haskell";
+    license = self.stdenv.lib.licenses.gpl3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ianwookim];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/TypeCompose/default.nix b/pkgs/development/libraries/haskell/TypeCompose/default.nix
new file mode 100644
index 00000000000..35fdd032458
--- /dev/null
+++ b/pkgs/development/libraries/haskell/TypeCompose/default.nix
@@ -0,0 +1,15 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "TypeCompose";
+  version = "0.9.9";
+  sha256 = "0i89r1yaglkcc1fdhn0m4hws5rqcpmkg32ddznch7a3rz1l9gqwg";
+  buildDepends = [ ];
+  meta = {
+    homepage = "https://github.com/conal/TypeCompose";
+    description = "Type composition classes & instances";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/coroutine-object/default.nix b/pkgs/development/libraries/haskell/coroutine-object/default.nix
new file mode 100644
index 00000000000..b023843deb1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/coroutine-object/default.nix
@@ -0,0 +1,16 @@
+{ cabal, cereal, either, lens, mtl, safecopy, transformers, transformersFree, uuid }:
+
+cabal.mkDerivation (self: {
+  pname = "coroutine-object";
+  version = "0.2.0.0";
+  sha256 = "1jl5glnk4ildjrxyxscxd0v7xfqbd9vpv5gaxygsfsbfr1zizp3s";
+  buildDepends = [ cereal either either lens mtl safecopy transformers transformersFree uuid ];
+  #jailbreak = true;
+  meta = {
+    homepage = "http://ianwookim.org/hoodle";
+    description = "Object-oriented programming realization using coroutine";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hoodle-builder/default.nix b/pkgs/development/libraries/haskell/hoodle-builder/default.nix
new file mode 100644
index 00000000000..ecb29fda129
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hoodle-builder/default.nix
@@ -0,0 +1,16 @@
+{ cabal, blazeBuilder, doubleConversion, hoodleTypes, lens, strict}:
+
+cabal.mkDerivation (self: {
+  pname = "hoodle-builder";
+  version = "0.2.2";
+  sha256 = "0gagfpjihf6lafi90r883n9agaj1pw4gygaaxv4xxfsc270855bq";
+  buildDepends = [ blazeBuilder doubleConversion hoodleTypes lens strict ];
+  #jailbreak = true;
+  meta = {
+    homepage = "http://ianwookim.org/hoodle";
+    description = "text builder for hoodle file format";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hoodle-core/default.nix b/pkgs/development/libraries/haskell/hoodle-core/default.nix
new file mode 100644
index 00000000000..724941d2983
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hoodle-core/default.nix
@@ -0,0 +1,22 @@
+{ cabal, Diff, attoparsec, base64Bytestring, cairo, cereal, configurator, 
+  coroutineObject, dbus, dyre, errors, fsnotify, gd, gtk, hoodleBuilder, 
+  hoodleParser, hoodleRender, hoodleTypes, monadLoops, networkSimple,
+  pureMD5, stm, xournalParser }:
+
+cabal.mkDerivation (self: {
+  pname = "hoodle-core";
+  version = "0.13.0.0";
+  sha256 = "1krq7i7kvymjhj9kar2rpy4qkbak8p4n1ifswdnk9r1dw7fr8vdx";
+  buildDepends = [ Diff attoparsec base64Bytestring cairo cereal configurator 
+                   coroutineObject dbus dyre errors fsnotify gd gtk hoodleBuilder
+                   hoodleParser hoodleRender hoodleTypes monadLoops networkSimple
+                   pureMD5 stm xournalParser ];
+  #jailbreak = true;
+  meta = {
+    homepage = "http://ianwookim.org/hoodle";
+    description = "Core library for hoodle";
+    license = self.stdenv.lib.licenses.gpl3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ianwookim];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hoodle-parser/default.nix b/pkgs/development/libraries/haskell/hoodle-parser/default.nix
new file mode 100644
index 00000000000..5cd91e0ca8e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hoodle-parser/default.nix
@@ -0,0 +1,16 @@
+{ cabal, attoparsec, either, hoodleTypes, lens, mtl, strict, text, transformers, xournalTypes }:
+
+cabal.mkDerivation (self: {
+  pname = "hoodle-parser";
+  version = "0.2.2";
+  sha256 = "1m0jf7820hkdq69866hwqd1cc6rv331jrar8ayr28692h09j02rm";
+  buildDepends = [ attoparsec either hoodleTypes lens mtl strict text transformers xournalTypes ];
+  #jailbreak = true;
+  meta = {
+    homepage = "http://ianwookim.org/hoodle";
+    description = "Hoodle file parser";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hoodle-render/default.nix b/pkgs/development/libraries/haskell/hoodle-render/default.nix
new file mode 100644
index 00000000000..e098c3aa9c0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hoodle-render/default.nix
@@ -0,0 +1,16 @@
+{ cabal, base64Bytestring, cairo, gd, hoodleTypes, lens, monadLoops, poppler, strict, svgcairo, uuid }:
+
+cabal.mkDerivation (self: {
+  pname = "hoodle-render";
+  version = "0.3.2";
+  sha256 = "1mmx27g1vqpndk26nz2hy7rckcgg68clvr5x31cqz9f8sifd8rsg";
+  buildDepends = [ base64Bytestring cairo gd hoodleTypes lens monadLoops poppler strict svgcairo uuid];
+  #jailbreak = true;
+  meta = {
+    homepage = "http://ianwookim.org/hoodle";
+    description = "Hoodle file renderer";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hoodle-types/default.nix b/pkgs/development/libraries/haskell/hoodle-types/default.nix
new file mode 100644
index 00000000000..33fa98e068c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hoodle-types/default.nix
@@ -0,0 +1,17 @@
+{ cabal, cereal, lens, mtl, strict, uuid }:
+
+cabal.mkDerivation (self: {
+  pname = "hoodle-types";
+  version = "0.2.2";
+  sha256 = "0dw2ji676nq3idb7izzzfnxzhyngf84wkapc0la43g4w4hzv1zxz";
+  buildDepends = [ cereal lens mtl strict uuid ];
+  #jailbreak = true;
+  meta = {
+    homepage = "http://ianwookim.org/hoodle";
+    description = "Data types for programs for hoodle file format";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/transformers-free/default.nix b/pkgs/development/libraries/haskell/transformers-free/default.nix
new file mode 100644
index 00000000000..bab500a7d5e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/transformers-free/default.nix
@@ -0,0 +1,15 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "transformers-free";
+  version = "1.0.1";
+  sha256 = "0fbzkr7ifvqng8wqi3332vwvmx36f8z167angyskfdd0a5rik2z0";
+  buildDepends = [ transformers ];
+  meta = {
+    homepage = "https://github.com/Gabriel439/Haskell-Transformers-Free-Library";
+    description = "Free monad transformers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/xournal-parser/default.nix b/pkgs/development/libraries/haskell/xournal-parser/default.nix
new file mode 100644
index 00000000000..7b32b5b587f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/xournal-parser/default.nix
@@ -0,0 +1,16 @@
+{ cabal, attoparsec, attoparsecConduit, conduit, lens, mtl, strict, text, transformers, xmlConduit, xmlTypes, xournalTypes, zlibConduit }:
+
+cabal.mkDerivation (self: {
+  pname = "xournal-parser";
+  version = "0.5.0.2";
+  sha256 = "1s9z7s6mcsn4s2krrcb1x63ca1d0rpyzdhb147w9524qw7gvbjin";
+  buildDepends = [ attoparsec attoparsecConduit conduit lens mtl strict text transformers xmlConduit xmlTypes xournalTypes zlibConduit ];
+  #jailbreak = true;
+  meta = {
+    homepage = "http://ianwookim.org/hoodle";
+    description = "Xournal file parser";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/xournal-types/default.nix b/pkgs/development/libraries/haskell/xournal-types/default.nix
new file mode 100644
index 00000000000..34fdb8b0349
--- /dev/null
+++ b/pkgs/development/libraries/haskell/xournal-types/default.nix
@@ -0,0 +1,16 @@
+{ cabal, TypeCompose, cereal, lens, strict }:
+
+cabal.mkDerivation (self: {
+  pname = "xournal-types";
+  version = "0.5.0.2";
+  sha256 = "1z1zxgwnd2bpgmiimil2jnz4xdcvvi59y2qdvqgy42b10db8rvkm";
+  buildDepends = [ TypeCompose cereal lens strict ];
+  #jailbreak = true;
+  meta = {
+    homepage = "http://ianwookim.org/hoodle";
+    description = "Data types for programs for xournal file format";
+    license = self.stdenv.lib.licenses.bsd3;
+    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 cbeeb3b089f..e375084427f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -800,6 +800,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   cookie = callPackage ../development/libraries/haskell/cookie {};
 
+  coroutineObject = callPackage ../development/libraries/haskell/coroutine-object {};
+
   cprngAes = callPackage ../development/libraries/haskell/cprng-aes {};
 
   criterion = callPackage ../development/libraries/haskell/criterion {};
@@ -1325,6 +1327,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hoauth = callPackage ../development/libraries/haskell/hoauth {};
 
+  hoodle = callPackage ../applications/graphics/hoodle {};
+
+  hoodleBuilder = callPackage ../development/libraries/haskell/hoodle-builder {};
+
+  hoodleCore = callPackage ../development/libraries/haskell/hoodle-core {}; 
+
+  hoodleParser = callPackage ../development/libraries/haskell/hoodle-parser {}; 
+
+  hoodleRender = callPackage ../development/libraries/haskell/hoodle-render {}; 
+
+  hoodleTypes = callPackage ../development/libraries/haskell/hoodle-types {}; 
+
   hoogle = callPackage ../development/libraries/haskell/hoogle {};
 
   hopenssl = callPackage ../development/libraries/haskell/hopenssl {};
@@ -2292,6 +2306,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {};
 
+  transformersFree = callPackage ../development/libraries/haskell/transformers-free {};
+
   traverseWithClass = callPackage ../development/libraries/haskell/traverse-with-class {};
 
   trifecta_1_1 = callPackage ../development/libraries/haskell/trifecta/1.1.nix {
@@ -2302,6 +2318,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   tuple = callPackage ../development/libraries/haskell/tuple {};
 
+  TypeCompose = callPackage ../development/libraries/haskell/TypeCompose {};
+
   typeEq = callPackage ../development/libraries/haskell/type-eq {};
 
   typeEquality = callPackage ../development/libraries/haskell/type-equality {};
@@ -2481,6 +2499,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   xmlTypes = callPackage ../development/libraries/haskell/xml-types {};
 
+  xournalParser = callPackage ../development/libraries/haskell/xournal-parser {};
+
+  xournalTypes = callPackage ../development/libraries/haskell/xournal-types {};
+
   xtest = callPackage ../development/libraries/haskell/xtest {};
 
   xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {};
-- 
GitLab


From e217fd9ae8d6c89c25df805e26b6247958c627db Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 20 Jan 2014 12:41:59 +0000
Subject: [PATCH 0310/3789] haskellPackages.tastyRerun: New expression

---
 .../libraries/haskell/tasty-rerun/default.nix | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/tasty-rerun/default.nix

diff --git a/pkgs/development/libraries/haskell/tasty-rerun/default.nix b/pkgs/development/libraries/haskell/tasty-rerun/default.nix
new file mode 100644
index 00000000000..e932a7b9307
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tasty-rerun/default.nix
@@ -0,0 +1,20 @@
+{ cabal, mtl, optparseApplicative, reducers, split, stm, tagged
+, tasty, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "tasty-rerun";
+  version = "1.0.0";
+  sha256 = "0vpgsb5fgvb9mx07zq53slqxxk2vvr2c9c9p1fhrm9qadfirsqc8";
+  buildDepends = [
+    mtl optparseApplicative reducers split stm tagged tasty
+    transformers
+  ];
+  meta = {
+    homepage = "http://github.com/ocharles/tasty-rerun";
+    description = "Run tests by filtering the test tree depending on the result of previous test runs";
+    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 e375084427f..b7187351b3b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2219,6 +2219,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {};
 
+  tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {};
+
   tastySmallcheck = callPackage ../development/libraries/haskell/tasty-smallcheck {};
 
   tastyTh = callPackage ../development/libraries/haskell/tasty-th {};
-- 
GitLab


From b4e17742722a944d76d12e8cb203fe78a0789fde Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:04:59 +0100
Subject: [PATCH 0311/3789] haskell-hoodle: re-generate with cabal2nix

---
 pkgs/applications/graphics/hoodle/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/hoodle/default.nix b/pkgs/applications/graphics/hoodle/default.nix
index 8f037812eed..e553875f756 100644
--- a/pkgs/applications/graphics/hoodle/default.nix
+++ b/pkgs/applications/graphics/hoodle/default.nix
@@ -1,18 +1,20 @@
-{ cabal, cmdargs, configurator, dyre, hoodleCore, mtl }:
+{ cabal, cmdargs, configurator, dyre, filepath, hoodleCore, mtl }:
 
 cabal.mkDerivation (self: {
   pname = "hoodle";
   version = "0.2.2.1";
   sha256 = "1qkyyzfmprhniwarnq6cdmv1r6605b3h2lsc1rlalxhq6jh5gamd";
-  isLibrary = false;
-  isExecutable = true; 
-  buildDepends = [ cmdargs configurator dyre hoodleCore mtl ];
-  #jailbreak = true;
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    cmdargs configurator dyre filepath hoodleCore mtl
+  ];
+  jailbreak = true;
   meta = {
     homepage = "http://ianwookim.org/hoodle";
-    description = "Pen notetaking program written in haskell";
+    description = "Executable for hoodle";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.ianwookim];
+    maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
   };
 })
-- 
GitLab


From ee890f01f824a5f1c8f6be19eeae9dfa99bd2e25 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:05:00 +0100
Subject: [PATCH 0312/3789] haskell-TypeCompose: re-generate with cabal2nix

---
 pkgs/development/libraries/haskell/TypeCompose/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/TypeCompose/default.nix b/pkgs/development/libraries/haskell/TypeCompose/default.nix
index 35fdd032458..b7c1a23d3d5 100644
--- a/pkgs/development/libraries/haskell/TypeCompose/default.nix
+++ b/pkgs/development/libraries/haskell/TypeCompose/default.nix
@@ -4,7 +4,6 @@ cabal.mkDerivation (self: {
   pname = "TypeCompose";
   version = "0.9.9";
   sha256 = "0i89r1yaglkcc1fdhn0m4hws5rqcpmkg32ddznch7a3rz1l9gqwg";
-  buildDepends = [ ];
   meta = {
     homepage = "https://github.com/conal/TypeCompose";
     description = "Type composition classes & instances";
-- 
GitLab


From fecb119e5e8984ae5fd43797bb234916512d4960 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:05:00 +0100
Subject: [PATCH 0313/3789] haskell-coroutine-object: re-generate with
 cabal2nix

---
 .../libraries/haskell/coroutine-object/default.nix    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/coroutine-object/default.nix b/pkgs/development/libraries/haskell/coroutine-object/default.nix
index b023843deb1..ea316fd29e1 100644
--- a/pkgs/development/libraries/haskell/coroutine-object/default.nix
+++ b/pkgs/development/libraries/haskell/coroutine-object/default.nix
@@ -1,13 +1,16 @@
-{ cabal, cereal, either, lens, mtl, safecopy, transformers, transformersFree, uuid }:
+{ cabal, cereal, either, lens, mtl, safecopy, transformers
+, transformersFree, uuid
+}:
 
 cabal.mkDerivation (self: {
   pname = "coroutine-object";
   version = "0.2.0.0";
   sha256 = "1jl5glnk4ildjrxyxscxd0v7xfqbd9vpv5gaxygsfsbfr1zizp3s";
-  buildDepends = [ cereal either either lens mtl safecopy transformers transformersFree uuid ];
-  #jailbreak = true;
+  buildDepends = [
+    cereal either lens mtl safecopy transformers transformersFree uuid
+  ];
+  jailbreak = true;
   meta = {
-    homepage = "http://ianwookim.org/hoodle";
     description = "Object-oriented programming realization using coroutine";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From a1adb429ecaf094f28c6ce00bdfe79a4660245b9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:05:00 +0100
Subject: [PATCH 0314/3789] haskell-hoodle-builder: re-generate with cabal2nix

---
 .../libraries/haskell/hoodle-builder/default.nix       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoodle-builder/default.nix b/pkgs/development/libraries/haskell/hoodle-builder/default.nix
index ecb29fda129..d865de6ec9c 100644
--- a/pkgs/development/libraries/haskell/hoodle-builder/default.nix
+++ b/pkgs/development/libraries/haskell/hoodle-builder/default.nix
@@ -1,13 +1,15 @@
-{ cabal, blazeBuilder, doubleConversion, hoodleTypes, lens, strict}:
+{ cabal, blazeBuilder, doubleConversion, hoodleTypes, lens, strict
+}:
 
 cabal.mkDerivation (self: {
   pname = "hoodle-builder";
   version = "0.2.2";
   sha256 = "0gagfpjihf6lafi90r883n9agaj1pw4gygaaxv4xxfsc270855bq";
-  buildDepends = [ blazeBuilder doubleConversion hoodleTypes lens strict ];
-  #jailbreak = true;
+  buildDepends = [
+    blazeBuilder doubleConversion hoodleTypes lens strict
+  ];
+  jailbreak = true;
   meta = {
-    homepage = "http://ianwookim.org/hoodle";
     description = "text builder for hoodle file format";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From 86e1775cf45416f1157d00c83245aa7947f8450f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:05:00 +0100
Subject: [PATCH 0315/3789] haskell-hoodle-core: re-generate with cabal2nix

---
 .../libraries/haskell/hoodle-core/default.nix | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoodle-core/default.nix b/pkgs/development/libraries/haskell/hoodle-core/default.nix
index 724941d2983..f73733321be 100644
--- a/pkgs/development/libraries/haskell/hoodle-core/default.nix
+++ b/pkgs/development/libraries/haskell/hoodle-core/default.nix
@@ -1,22 +1,31 @@
-{ cabal, Diff, attoparsec, base64Bytestring, cairo, cereal, configurator, 
-  coroutineObject, dbus, dyre, errors, fsnotify, gd, gtk, hoodleBuilder, 
-  hoodleParser, hoodleRender, hoodleTypes, monadLoops, networkSimple,
-  pureMD5, stm, xournalParser }:
+{ cabal, attoparsec, base64Bytestring, binary, cairo, cereal
+, configurator, coroutineObject, dbus, Diff, dyre, either, errors
+, filepath, fsnotify, gd, gtk, hoodleBuilder, hoodleParser
+, hoodleRender, hoodleTypes, lens, libX11, libXi, monadLoops, mtl
+, network, networkInfo, networkSimple, pango, poppler, pureMD5, stm
+, strict, svgcairo, systemFilepath, text, time, transformers
+, transformersFree, uuid, xournalParser
+}:
 
 cabal.mkDerivation (self: {
   pname = "hoodle-core";
   version = "0.13.0.0";
   sha256 = "1krq7i7kvymjhj9kar2rpy4qkbak8p4n1ifswdnk9r1dw7fr8vdx";
-  buildDepends = [ Diff attoparsec base64Bytestring cairo cereal configurator 
-                   coroutineObject dbus dyre errors fsnotify gd gtk hoodleBuilder
-                   hoodleParser hoodleRender hoodleTypes monadLoops networkSimple
-                   pureMD5 stm xournalParser ];
-  #jailbreak = true;
+  buildDepends = [
+    attoparsec base64Bytestring binary cairo cereal configurator
+    coroutineObject dbus Diff dyre either errors filepath fsnotify gd
+    gtk hoodleBuilder hoodleParser hoodleRender hoodleTypes lens
+    monadLoops mtl network networkInfo networkSimple pango poppler
+    pureMD5 stm strict svgcairo systemFilepath text time transformers
+    transformersFree uuid xournalParser
+  ];
+  extraLibraries = [ libX11 libXi ];
+  jailbreak = true;
   meta = {
     homepage = "http://ianwookim.org/hoodle";
     description = "Core library for hoodle";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.ianwookim];
+    maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
   };
 })
-- 
GitLab


From bf487fed15a757a744b8d6a3cd4bd4c158b5f611 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:05:00 +0100
Subject: [PATCH 0316/3789] haskell-hoodle-parser: re-generate with cabal2nix

---
 .../libraries/haskell/hoodle-parser/default.nix       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoodle-parser/default.nix b/pkgs/development/libraries/haskell/hoodle-parser/default.nix
index 5cd91e0ca8e..84d9e93aaa2 100644
--- a/pkgs/development/libraries/haskell/hoodle-parser/default.nix
+++ b/pkgs/development/libraries/haskell/hoodle-parser/default.nix
@@ -1,11 +1,16 @@
-{ cabal, attoparsec, either, hoodleTypes, lens, mtl, strict, text, transformers, xournalTypes }:
+{ cabal, attoparsec, either, hoodleTypes, lens, mtl, strict, text
+, transformers, xournalTypes
+}:
 
 cabal.mkDerivation (self: {
   pname = "hoodle-parser";
   version = "0.2.2";
   sha256 = "1m0jf7820hkdq69866hwqd1cc6rv331jrar8ayr28692h09j02rm";
-  buildDepends = [ attoparsec either hoodleTypes lens mtl strict text transformers xournalTypes ];
-  #jailbreak = true;
+  buildDepends = [
+    attoparsec either hoodleTypes lens mtl strict text transformers
+    xournalTypes
+  ];
+  jailbreak = true;
   meta = {
     homepage = "http://ianwookim.org/hoodle";
     description = "Hoodle file parser";
-- 
GitLab


From b26ab6c8f0c4e3e21dc0acb1b254368ba1a68eb9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:05:00 +0100
Subject: [PATCH 0317/3789] haskell-hoodle-render: re-generate with cabal2nix

---
 .../libraries/haskell/hoodle-render/default.nix      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoodle-render/default.nix b/pkgs/development/libraries/haskell/hoodle-render/default.nix
index e098c3aa9c0..3666ef91398 100644
--- a/pkgs/development/libraries/haskell/hoodle-render/default.nix
+++ b/pkgs/development/libraries/haskell/hoodle-render/default.nix
@@ -1,13 +1,17 @@
-{ cabal, base64Bytestring, cairo, gd, hoodleTypes, lens, monadLoops, poppler, strict, svgcairo, uuid }:
+{ cabal, base64Bytestring, cairo, filepath, gd, hoodleTypes, lens
+, monadLoops, mtl, poppler, strict, svgcairo, uuid
+}:
 
 cabal.mkDerivation (self: {
   pname = "hoodle-render";
   version = "0.3.2";
   sha256 = "1mmx27g1vqpndk26nz2hy7rckcgg68clvr5x31cqz9f8sifd8rsg";
-  buildDepends = [ base64Bytestring cairo gd hoodleTypes lens monadLoops poppler strict svgcairo uuid];
-  #jailbreak = true;
+  buildDepends = [
+    base64Bytestring cairo filepath gd hoodleTypes lens monadLoops mtl
+    poppler strict svgcairo uuid
+  ];
+  jailbreak = true;
   meta = {
-    homepage = "http://ianwookim.org/hoodle";
     description = "Hoodle file renderer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From 22727d9507dac459d6247cdce4ea44ad8913cc8a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:05:00 +0100
Subject: [PATCH 0318/3789] haskell-hoodle-types: re-generate with cabal2nix

---
 pkgs/development/libraries/haskell/hoodle-types/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoodle-types/default.nix b/pkgs/development/libraries/haskell/hoodle-types/default.nix
index 33fa98e068c..55d75231510 100644
--- a/pkgs/development/libraries/haskell/hoodle-types/default.nix
+++ b/pkgs/development/libraries/haskell/hoodle-types/default.nix
@@ -5,13 +5,11 @@ cabal.mkDerivation (self: {
   version = "0.2.2";
   sha256 = "0dw2ji676nq3idb7izzzfnxzhyngf84wkapc0la43g4w4hzv1zxz";
   buildDepends = [ cereal lens mtl strict uuid ];
-  #jailbreak = true;
+  jailbreak = true;
   meta = {
-    homepage = "http://ianwookim.org/hoodle";
     description = "Data types for programs for hoodle file format";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
   };
 })
-
-- 
GitLab


From 4350308ec74de7dfb69451e2b8f449ece19d6009 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:05:00 +0100
Subject: [PATCH 0319/3789] haskell-transformers-free: re-generate with
 cabal2nix

---
 pkgs/development/libraries/haskell/transformers-free/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/transformers-free/default.nix b/pkgs/development/libraries/haskell/transformers-free/default.nix
index bab500a7d5e..da05e122e52 100644
--- a/pkgs/development/libraries/haskell/transformers-free/default.nix
+++ b/pkgs/development/libraries/haskell/transformers-free/default.nix
@@ -6,7 +6,6 @@ cabal.mkDerivation (self: {
   sha256 = "0fbzkr7ifvqng8wqi3332vwvmx36f8z167angyskfdd0a5rik2z0";
   buildDepends = [ transformers ];
   meta = {
-    homepage = "https://github.com/Gabriel439/Haskell-Transformers-Free-Library";
     description = "Free monad transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From 6fd153677ba8f3b02354cef940acdc7c73dbd9bf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:05:00 +0100
Subject: [PATCH 0320/3789] haskell-xournal-parser: re-generate with cabal2nix

---
 .../libraries/haskell/xournal-parser/default.nix     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/xournal-parser/default.nix b/pkgs/development/libraries/haskell/xournal-parser/default.nix
index 7b32b5b587f..d874543a967 100644
--- a/pkgs/development/libraries/haskell/xournal-parser/default.nix
+++ b/pkgs/development/libraries/haskell/xournal-parser/default.nix
@@ -1,11 +1,17 @@
-{ cabal, attoparsec, attoparsecConduit, conduit, lens, mtl, strict, text, transformers, xmlConduit, xmlTypes, xournalTypes, zlibConduit }:
+{ cabal, attoparsec, attoparsecConduit, conduit, lens, mtl, strict
+, text, transformers, xmlConduit, xmlTypes, xournalTypes
+, zlibConduit
+}:
 
 cabal.mkDerivation (self: {
   pname = "xournal-parser";
   version = "0.5.0.2";
   sha256 = "1s9z7s6mcsn4s2krrcb1x63ca1d0rpyzdhb147w9524qw7gvbjin";
-  buildDepends = [ attoparsec attoparsecConduit conduit lens mtl strict text transformers xmlConduit xmlTypes xournalTypes zlibConduit ];
-  #jailbreak = true;
+  buildDepends = [
+    attoparsec attoparsecConduit conduit lens mtl strict text
+    transformers xmlConduit xmlTypes xournalTypes zlibConduit
+  ];
+  jailbreak = true;
   meta = {
     homepage = "http://ianwookim.org/hoodle";
     description = "Xournal file parser";
-- 
GitLab


From 75934cbe0939631eb0de00d3e234421a2bc8ce04 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:05:00 +0100
Subject: [PATCH 0321/3789] haskell-xournal-types: re-generate with cabal2nix

---
 .../libraries/haskell/xournal-types/default.nix            | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/xournal-types/default.nix b/pkgs/development/libraries/haskell/xournal-types/default.nix
index 34fdb8b0349..2281520703f 100644
--- a/pkgs/development/libraries/haskell/xournal-types/default.nix
+++ b/pkgs/development/libraries/haskell/xournal-types/default.nix
@@ -1,13 +1,12 @@
-{ cabal, TypeCompose, cereal, lens, strict }:
+{ cabal, cereal, lens, strict, TypeCompose }:
 
 cabal.mkDerivation (self: {
   pname = "xournal-types";
   version = "0.5.0.2";
   sha256 = "1z1zxgwnd2bpgmiimil2jnz4xdcvvi59y2qdvqgy42b10db8rvkm";
-  buildDepends = [ TypeCompose cereal lens strict ];
-  #jailbreak = true;
+  buildDepends = [ cereal lens strict TypeCompose ];
+  jailbreak = true;
   meta = {
-    homepage = "http://ianwookim.org/hoodle";
     description = "Data types for programs for xournal file format";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From 5333854aa4005dc491559d7d512b3c3ce577d427 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:06:05 +0100
Subject: [PATCH 0322/3789] haskell-cabal2nix: re-generate with cabal2nix

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

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index d0d7e7b39b2..342eb3ecfd1 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.58";
-  sha256 = "0xsp0f87583pcjdfhngbc9465yisk2m3sn6904s0szprkpi2p03x";
+  version = "1.59";
+  sha256 = "1prm07mnnasfn042635kc6h6mymvninic0y9zimii7k4rqblf598";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
-- 
GitLab


From 3d1f6e3a7544dd0a8ca76f6706b85014791bac43 Mon Sep 17 00:00:00 2001
From: Roger Mason <rmason@mun.ca>
Date: Thu, 16 Jan 2014 16:55:04 -0330
Subject: [PATCH 0323/3789] Add fricas, a computer algebra system

---
 .../science/math/fricas/default.nix           | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 pkgs/applications/science/math/fricas/default.nix

diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix
new file mode 100644
index 00000000000..a438fa5102f
--- /dev/null
+++ b/pkgs/applications/science/math/fricas/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }:
+
+stdenv.mkDerivation rec {
+  name = "fricas-1.2.2";
+
+  src = fetchurl {
+    url    = "http://sourceforge.net/projects/fricas/files/fricas/1.2.2/${name}-full.tar.bz2";
+    sha256 = "87db64a1fd4211f3b776793acea931b4271d2e7a28396414c7d7397d833defe1";
+  };
+
+  buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ];
+
+  dontStrip = true;
+
+  meta = {
+    description = "Fricas CAS";
+    homepage    = http://fricas.sourceforge.net/;
+    maintainers = stdenv.lib.maintainers.sprock;
+    platforms   = stdenv.lib.platforms.linux;
+    license     = stdenv.lib.license.bsd3;
+  };
+}
-- 
GitLab


From e9928a1f25e30deaa9e88471e9f09d45ccea0fe4 Mon Sep 17 00:00:00 2001
From: Roger Mason <rmason@mun.ca>
Date: Mon, 13 Jan 2014 17:13:54 -0330
Subject: [PATCH 0324/3789] Add CERN's 'root' Application Framework.

---
 .../science/physics/root/cmake.patch          | 11 +++++++++
 .../science/physics/root/default.nix          | 24 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/science/physics/root/cmake.patch
 create mode 100644 pkgs/applications/science/physics/root/default.nix

diff --git a/pkgs/applications/science/physics/root/cmake.patch b/pkgs/applications/science/physics/root/cmake.patch
new file mode 100644
index 00000000000..b6efd7444fe
--- /dev/null
+++ b/pkgs/applications/science/physics/root/cmake.patch
@@ -0,0 +1,11 @@
+--- cmake/modules/RootBuildOptions.cmake	1969-12-31 20:30:01.000000000 -0330
++++ cmake/modules/RootBuildOptions.cmake	2014-01-10 14:09:29.424937408 -0330
+@@ -149,7 +149,7 @@
+ 
+ #---General Build options----------------------------------------------------------------------
+ # use, i.e. don't skip the full RPATH for the build tree
+-set(CMAKE_SKIP_BUILD_RPATH  FALSE)
++set(CMAKE_SKIP_BUILD_RPATH  TRUE)
+ # when building, don't use the install RPATH already (but later on when installing)
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
+ # add the automatically determined parts of the RPATH
diff --git a/pkgs/applications/science/physics/root/default.nix b/pkgs/applications/science/physics/root/default.nix
new file mode 100644
index 00000000000..f07f7eae0a7
--- /dev/null
+++ b/pkgs/applications/science/physics/root/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, mesa, libX11, gfortran, libXpm, libXft, libXext, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "root_v5.34.14";
+
+  src = fetchurl {
+    url = "ftp://root.cern.ch/root/${name}.source.tar.gz";
+    sha256 = "d5347ba1b614eb083cf08050b784d66a93c125ed89938708da1adb33323dee2b";
+  };
+
+  buildInputs = [ cmake gfortran mesa libX11 libXpm libXft libXext zlib ];
+
+  # CMAKE_INSTALL_RPATH_USE_LINK_PATH is set to FALSE in
+  # <rootsrc>/cmake/modules/RootBuildOptions.cmake.
+  # This patch sets it to TRUE.
+  patches = [ ./cmake.patch ];
+  patchFlags = "-p0";
+
+  meta = {
+    description = "A data analysis framework";
+    #maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.mesaPlatforms;
+  };
+}
-- 
GitLab


From 43d59a9a3bc285f36d50b737121f16b91b7c6f1c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:18:35 +0100
Subject: [PATCH 0325/3789] lib/maintainers.nix: add missing entry for 'sprock'

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index c29259c6386..3c7a399623d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -58,6 +58,7 @@
   shlevy = "Shea Levy <shea@shealevy.com>";
   simons = "Peter Simons <simons@cryp.to>";
   smironov = "Sergey Mironov <ierton@gmail.com>";
+  sprock = "Roger Mason <rmason@mun.ca>";
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
   the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
   tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
-- 
GitLab


From 6475f0d1fe9ac2b22711e97b2ba08b50801926e1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:20:08 +0100
Subject: [PATCH 0326/3789] fricas: clean up meta section

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

diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix
index a438fa5102f..1817c43ed7b 100644
--- a/pkgs/applications/science/math/fricas/default.nix
+++ b/pkgs/applications/science/math/fricas/default.nix
@@ -13,10 +13,11 @@ stdenv.mkDerivation rec {
   dontStrip = true;
 
   meta = {
+    homepage = http://fricas.sourceforge.net/;
     description = "Fricas CAS";
-    homepage    = http://fricas.sourceforge.net/;
+    license = stdenv.lib.licenses.bsd3;
+
+    hydraPlatforms = stdenv.lib.platforms.linux;
     maintainers = stdenv.lib.maintainers.sprock;
-    platforms   = stdenv.lib.platforms.linux;
-    license     = stdenv.lib.license.bsd3;
   };
 }
-- 
GitLab


From baeb19d0ce0f0600e6036c053831dd0a1886cbfd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:24:27 +0100
Subject: [PATCH 0327/3789] root: clean up meta section and move build into
 'science/misc' section

---
 .../science/{physics => misc}/root/cmake.patch             | 0
 .../science/{physics => misc}/root/default.nix             | 7 ++++---
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename pkgs/applications/science/{physics => misc}/root/cmake.patch (100%)
 rename pkgs/applications/science/{physics => misc}/root/default.nix (78%)

diff --git a/pkgs/applications/science/physics/root/cmake.patch b/pkgs/applications/science/misc/root/cmake.patch
similarity index 100%
rename from pkgs/applications/science/physics/root/cmake.patch
rename to pkgs/applications/science/misc/root/cmake.patch
diff --git a/pkgs/applications/science/physics/root/default.nix b/pkgs/applications/science/misc/root/default.nix
similarity index 78%
rename from pkgs/applications/science/physics/root/default.nix
rename to pkgs/applications/science/misc/root/default.nix
index f07f7eae0a7..6f484dc8224 100644
--- a/pkgs/applications/science/physics/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, cmake, mesa, libX11, gfortran, libXpm, libXft, libXext, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "root_v5.34.14";
+  name = "root-${version}";
+  version = "5.34.14";
 
   src = fetchurl {
-    url = "ftp://root.cern.ch/root/${name}.source.tar.gz";
+    url = "ftp://root.cern.ch/root/root_v${version}.source.tar.gz";
     sha256 = "d5347ba1b614eb083cf08050b784d66a93c125ed89938708da1adb33323dee2b";
   };
 
@@ -17,8 +18,8 @@ stdenv.mkDerivation rec {
   patchFlags = "-p0";
 
   meta = {
+    homepage = "http://root.cern.ch/drupal/";
     description = "A data analysis framework";
-    #maintainers = [ stdenv.lib.maintainers.urkud ];
     platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
-- 
GitLab


From 630dc74638b403adda42c8db2a44cbbf814e09c9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:24:56 +0100
Subject: [PATCH 0328/3789] all-packages.nix: move 'science/misc' builds into
 the proper place and add attribute for 'fricas'

---
 pkgs/top-level/all-packages.nix | 40 +++++++++++++++++----------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 096880a6331..0fcfe95a07d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9851,25 +9851,6 @@ let
 
   ### SCIENCE
 
-  celestia = callPackage ../applications/science/astronomy/celestia {
-    lua = lua5_1;
-    inherit (xlibs) libXmu;
-    inherit (pkgs.gnome) gtkglext;
-  };
-
-  xplanet = callPackage ../applications/science/astronomy/xplanet { };
-
-  gravit = callPackage ../applications/science/astronomy/gravit { };
-
-  spyder = callPackage ../applications/science/spyder {
-    inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended
-    inherit (pythonPackages) ipython pep8; # optional
-    inherit pylint;
-  };
-
-  stellarium = callPackage ../applications/science/astronomy/stellarium { };
-
-
   ### SCIENCE/GEOMETRY
 
   drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) {
@@ -10058,6 +10039,8 @@ let
 
   eukleides = callPackage ../applications/science/math/eukleides { };
 
+  fricas = callPackage ../applications/science/math/fricas { };
+
   gap = callPackage ../applications/science/math/gap { };
 
   maxima = callPackage ../applications/science/math/maxima { };
@@ -10103,14 +10086,33 @@ let
 
   boinc = callPackage ../applications/science/misc/boinc { };
 
+  celestia = callPackage ../applications/science/astronomy/celestia {
+    lua = lua5_1;
+    inherit (xlibs) libXmu;
+    inherit (pkgs.gnome) gtkglext;
+  };
+
+  gravit = callPackage ../applications/science/astronomy/gravit { };
+
   golly = callPackage ../applications/science/misc/golly { };
 
+  root = callPackage ../applications/science/misc/root { };
+
   simgrid = callPackage ../applications/science/misc/simgrid { };
 
+  spyder = callPackage ../applications/science/spyder {
+    inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended
+    inherit (pythonPackages) ipython pep8; # optional
+    inherit pylint;
+  };
+
+  stellarium = callPackage ../applications/science/astronomy/stellarium { };
+
   tulip = callPackage ../applications/science/misc/tulip { };
 
   vite = callPackage ../applications/science/misc/vite { };
 
+  xplanet = callPackage ../applications/science/astronomy/xplanet { };
 
   ### MISC
 
-- 
GitLab


From 2991fdca52ce43218f166c706114ab294dd21b3c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 18:26:32 +0100
Subject: [PATCH 0329/3789] root: enable parallel building

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

diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 6f484dc8224..f4de3ba6eea 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
   patches = [ ./cmake.patch ];
   patchFlags = "-p0";
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = "http://root.cern.ch/drupal/";
     description = "A data analysis framework";
-- 
GitLab


From f0740ac2bc5f170e411dda7fd443c18f69584215 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 11:58:44 +0100
Subject: [PATCH 0330/3789] happy: add version 1.19.3

---
 .../development/tools/parsing/happy/1.19.3.nix | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  5 +++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/parsing/happy/1.19.3.nix

diff --git a/pkgs/development/tools/parsing/happy/1.19.3.nix b/pkgs/development/tools/parsing/happy/1.19.3.nix
new file mode 100644
index 00000000000..b1a03fa3b9f
--- /dev/null
+++ b/pkgs/development/tools/parsing/happy/1.19.3.nix
@@ -0,0 +1,18 @@
+{ cabal, mtl, perl }:
+
+cabal.mkDerivation (self: {
+  pname = "happy";
+  version = "1.19.3";
+  sha256 = "1q3hipgcwvrf333wlyqmg4mgf24gwiagddlfyr9zgi4k42p2373x";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ mtl ];
+  buildTools = [ perl ];
+  meta = {
+    homepage = "http://www.haskell.org/happy/";
+    description = "Happy is a parser generator for Haskell";
+    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 b7187351b3b..47631320984 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -176,7 +176,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     cabalInstall = self.cabalInstall_1_18_0_2;
     alex         = self.alex_3_1_3;
     haddock      = self.haddock_2_13_2_1;
-    happy        = self.happy_1_19_2;
+    happy        = self.happy_1_19_3;
     primitive    = self.primitive_0_5_1_0;      # semi-official, but specified
   };
 
@@ -2632,7 +2632,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   happy_1_18_10 = callPackage ../development/tools/parsing/happy/1.18.10.nix {};
   happy_1_18_11 = callPackage ../development/tools/parsing/happy/1.18.11.nix {};
   happy_1_19_2 = callPackage ../development/tools/parsing/happy/1.19.2.nix {};
-  happy = self.happy_1_19_2;
+  happy_1_19_3 = callPackage ../development/tools/parsing/happy/1.19.3.nix {};
+  happy = self.happy_1_19_3;
 
   happyMeta = callPackage ../development/tools/haskell/happy-meta {};
 
-- 
GitLab


From 12bb3d783b0e042b168b850d26815d052a3f59d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 11:59:35 +0100
Subject: [PATCH 0331/3789] haskell-case-insensitive: update to version 1.1.0.3

---
 .../haskell/case-insensitive/{1.1.0.2.nix => 1.1.0.3.nix}   | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/case-insensitive/{1.1.0.2.nix => 1.1.0.3.nix} (84%)

diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix
rename to pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix
index 5fd438e320d..45cc7c11fc2 100644
--- a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix
+++ b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "case-insensitive";
-  version = "1.1.0.2";
-  sha256 = "0200jpz2xs67sw5dczfj8nlz2yp40k05bv3rk1phdc093n13kaww";
+  version = "1.1.0.3";
+  sha256 = "0fr69lfb976gflr8w6d68zn4pz86jfxbb2i49fw3mmam67k5y9bv";
   buildDepends = [ deepseq hashable text ];
   testDepends = [ HUnit testFramework testFrameworkHunit text ];
   meta = {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 47631320984..764955b7210 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     inherit (self) cabal ghc;
     async        = self.async_2_0_1_5;
     attoparsec   = self.attoparsec_0_11_1_0;
-    caseInsensitive = self.caseInsensitive_1_1_0_2;
+    caseInsensitive = self.caseInsensitive_1_1_0_3;
     cgi          = self.cgi_3001_1_8_4;
     fgl          = self.fgl_5_4_2_4;
     GLUT         = self.GLUT_2_5_0_2;
@@ -699,8 +699,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cassava = callPackage ../development/libraries/haskell/cassava {};
 
   caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {};
-  caseInsensitive_1_1_0_2 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.2.nix {};
-  caseInsensitive = self.caseInsensitive_1_1_0_2;
+  caseInsensitive_1_1_0_3 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.3.nix {};
+  caseInsensitive = self.caseInsensitive_1_1_0_3;
 
   cautiousFile = callPackage ../development/libraries/haskell/cautious-file {};
 
-- 
GitLab


From e701d2b062b0e45c413cff7b7b03e63e3b1aed7a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:43:49 +0100
Subject: [PATCH 0332/3789] haskell-aeson: add version 0.7.0.0 (but don't use
 it yet)

---
 .../aeson/{default.nix => 0.6.2.1.nix}        |  0
 .../libraries/haskell/aeson/0.7.0.0.nix       | 26 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++-
 3 files changed, 29 insertions(+), 1 deletion(-)
 rename pkgs/development/libraries/haskell/aeson/{default.nix => 0.6.2.1.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/aeson/0.7.0.0.nix

diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/0.6.2.1.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/aeson/default.nix
rename to pkgs/development/libraries/haskell/aeson/0.6.2.1.nix
diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.0.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.0.nix
new file mode 100644
index 00000000000..41bbdbf5a0b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/aeson/0.7.0.0.nix
@@ -0,0 +1,26 @@
+{ cabal, attoparsec, deepseq, dlist, hashable, HUnit, mtl
+, QuickCheck, scientific, syb, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, text, time, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "aeson";
+  version = "0.7.0.0";
+  sha256 = "14xh7i07ha2hgljq0y0v7f5gkn0pv2zqj8l9j92957mf7f17zwf6";
+  buildDepends = [
+    attoparsec deepseq dlist hashable mtl scientific syb text time
+    unorderedContainers vector
+  ];
+  testDepends = [
+    attoparsec HUnit QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 text time unorderedContainers vector
+  ];
+  doCheck = false;
+  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-packages.nix b/pkgs/top-level/haskell-packages.nix
index 764955b7210..798103153ec 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -522,7 +522,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   abstractPar = callPackage ../development/libraries/haskell/abstract-par {};
 
-  aeson = callPackage ../development/libraries/haskell/aeson {};
+  aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {};
+  aeson_0_7_0_0 = callPackage ../development/libraries/haskell/aeson/0.7.0.0.nix {};
+  aeson = self.aeson_0_6_2_1;
 
   aesonLens = callPackage ../development/libraries/haskell/aeson-lens {};
 
-- 
GitLab


From e6226d7d3c51ffdb1719114847ab123393962d63 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:50 +0100
Subject: [PATCH 0333/3789] haskell-JuicyPixels: update to version 3.1.3

---
 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 485a80dadb3..d8d0ac69bad 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.2";
-  sha256 = "19bal3g3cp4nn8g3zp4yi5g4zw5wnkbi74gcra8mxs4zy99bf8s2";
+  version = "3.1.3";
+  sha256 = "1zyrdd8mhgj0lchsznyhqhxb48ql8fhfqi5qs54qaxan514w6x70";
   buildDepends = [
     binary deepseq mtl primitive transformers vector zlib
   ];
-- 
GitLab


From 0178eba86eb9e59e823c7bd83f67cb544583d845 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:50 +0100
Subject: [PATCH 0334/3789] haskell-base16-bytestring: update to version
 0.1.1.6

---
 .../libraries/haskell/base16-bytestring/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix
index 3f81258f426..3de2bdf60ff 100644
--- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "base16-bytestring";
-  version = "0.1.1.5";
-  sha256 = "1fgd3zdzjfry6jaz8hwhim0p2c35l73cxxambh0ff7p5fqjrlwym";
+  version = "0.1.1.6";
+  sha256 = "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs";
   meta = {
     homepage = "http://github.com/bos/base16-bytestring";
     description = "Fast base16 (hex) encoding and decoding for ByteStrings";
-- 
GitLab


From c5456a7f8914919ca135a4901c0c59091b4b792f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:50 +0100
Subject: [PATCH 0335/3789] haskell-conduit: update to version 1.0.11.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 395b03d2683..98079115607 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.0.10";
-  sha256 = "12vqh747rdldw3n42cxzd77rzb66129dc690n23q5xy7pbhzilfp";
+  version = "1.0.11.1";
+  sha256 = "115iqdhwmnn04bmby2bmbm6pykb2akaca0c3i79nvw1annml65lg";
   buildDepends = [
     liftedBase mmorph monadControl mtl resourcet text transformers
     transformersBase void
-- 
GitLab


From 032ea31c47eb3fafdd3e07ca4b109f894c6782d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:50 +0100
Subject: [PATCH 0336/3789] haskell-cryptohash: update to version 0.11.2

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

diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index 839bf4518a1..b888ce6153a 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.11.1";
-  sha256 = "0ww7bikl8i50m1pwkqp145bfsiy07npnjw48j3il4w2ia0b3axmy";
+  version = "0.11.2";
+  sha256 = "0az2p7lql1lchl85ca26b5sbvhqsv47daavyfqy84qmr3w3wyr28";
   buildDepends = [ byteable ];
   testDepends = [
     byteable HUnit QuickCheck testFramework testFrameworkHunit
-- 
GitLab


From 496b53e44fd617e2af0b9debb2fd1ef4596dd873 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:50 +0100
Subject: [PATCH 0337/3789] haskell-gloss-raster: update to version 1.8.1.2

---
 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 4d1b85669da..4a34c7195c2 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.1";
-  sha256 = "0qqk2fizmv1zdvi8lljxiqdwlmfzni4qzsdvm2jbvgg5qjx9l9qp";
+  version = "1.8.1.2";
+  sha256 = "1cpibilv027rfx7xz957f1d7wy6b5z6dgfjrw425ck497r8gfgp4";
   buildDepends = [ gloss repa ];
   extraLibraries = [ llvm ];
   meta = {
-- 
GitLab


From df89207c9e15d6dec589ccaaba3e23ea7ddbbc3d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:50 +0100
Subject: [PATCH 0338/3789] haskell-gloss: update to version 1.8.1.2

---
 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 0f0777909e8..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.1.1";
-  sha256 = "135rrgzx4xq8279zbsl4538hjn8np4g6409fgva2cb9shw8z5pmj";
+  version = "1.8.1.2";
+  sha256 = "1ky1gckvyww855dy3fzllf1ixbmc3jpdvz85hx719pcygy7qh71m";
   buildDepends = [ bmp GLUT OpenGL ];
   jailbreak = true;
   meta = {
-- 
GitLab


From 3a0f4d4fcd5408981252f75829e532cc908a3ccf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:50 +0100
Subject: [PATCH 0339/3789] haskell-gnuidn: update to version 0.2.1

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

diff --git a/pkgs/development/libraries/haskell/gnuidn/default.nix b/pkgs/development/libraries/haskell/gnuidn/default.nix
index 6ae78cf49b6..9192f6bb29b 100644
--- a/pkgs/development/libraries/haskell/gnuidn/default.nix
+++ b/pkgs/development/libraries/haskell/gnuidn/default.nix
@@ -2,14 +2,14 @@
 
 cabal.mkDerivation (self: {
   pname = "gnuidn";
-  version = "0.2";
-  sha256 = "0xk72p3z1lwlmab0jcf7m48p5pncgz00hb7l96naz1gdkbq7xizd";
+  version = "0.2.1";
+  sha256 = "1jii635wc3j1jnwwx24j9gg9xd91g2iw5967acn74p7db62lqx37";
   buildDepends = [ text ];
   buildTools = [ c2hs ];
   extraLibraries = [ libidn ];
   pkgconfigDepends = [ libidn ];
   meta = {
-    homepage = "http://john-millikin.com/software/bindings/gnuidn/";
+    homepage = "https://john-millikin.com/software/haskell-gnuidn/";
     description = "Bindings for GNU IDN";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From e90fb2442ac8d6806f9dc667c2620e9cebc88dfa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:50 +0100
Subject: [PATCH 0340/3789] haskell-hakyll: update to version 4.4.3.1

---
 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 36e56de639c..d4f6561ff1b 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.4.3.0";
-  sha256 = "1ngjzqgyhdfkzikyg6cicqdb6cpw2bbfr4g73vgmzlg8spy1cyg5";
+  version = "4.4.3.1";
+  sha256 = "0k301mzy8sagrxdzkhz006j1i1zmsx9iy5ais9gif3gxj2sd3b2a";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -26,9 +26,6 @@ cabal.mkDerivation (self: {
     testFrameworkHunit testFrameworkQuickcheck2 text time
   ];
   doCheck = false;
-  patchPhase = ''
-    sed -i -e 's|pandoc-citeproc >=.*,|pandoc-citeproc,|' hakyll.cabal
-  '';
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";
-- 
GitLab


From 19466e48fc2629c49c52d23409bfb6391ab62af3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:51 +0100
Subject: [PATCH 0341/3789] haskell-heist: update to version 0.13.0.5

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

diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix
index 5ce91d68807..9f0eb8981ae 100644
--- a/pkgs/development/libraries/haskell/heist/default.nix
+++ b/pkgs/development/libraries/haskell/heist/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "heist";
-  version = "0.13.0.4";
-  sha256 = "15iixsjlx3zd44dcdxla5pgpl16995pk9g34zjqynmhcj7sfv5as";
+  version = "0.13.0.5";
+  sha256 = "17lpqiidy1s6yzhh865y7dhkcv34p7pxzljpn64yyfa2pc8885dj";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
     filepath hashable MonadCatchIOTransformers mtl random text time
-- 
GitLab


From eaf5b1cde1d097062f69af56cddfe0f40e32f073 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:51 +0100
Subject: [PATCH 0342/3789] haskell-pipes-bytestring: update to version 1.0.3

---
 .../libraries/haskell/pipes-bytestring/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix
index 83f08ecf148..4e085105c20 100644
--- a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-bytestring";
-  version = "1.0.2";
-  sha256 = "09wzmi3xh9n69xsxw0ik4qf2ld1vksca88ggknqbzbnjxq82jjrr";
+  version = "1.0.3";
+  sha256 = "11jiaf5vs0jz8m0x9dlcvflh636131bj4jnlrj3r5nz1v7a64v6b";
   buildDepends = [ pipes pipesParse transformers ];
   meta = {
     description = "ByteString support for pipes";
-- 
GitLab


From c0270c7dfa8f721d2698fd09d75f6cec6da4bf78 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:51 +0100
Subject: [PATCH 0343/3789] haskell-snap: update to version 0.13.2.1

---
 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 28ce546ee16..92c02a27f42 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.0";
-  sha256 = "1jwgl6dmi1ljfqvfjxcsv3q4h9lcqpmxk4zsjkxdx77z201lhm3b";
+  version = "0.13.2.1";
+  sha256 = "0jkjxyw7pcfl8r6gs0amzpkxardncvxsh20m7lad6aqjkcwh8r4l";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 80658f3cfb3f8a01f7fe62b5063082b00184c76c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:51 +0100
Subject: [PATCH 0344/3789] haskell-stm-conduit: update to version 2.2

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

diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index 4ab74d23bc2..7e24db4476a 100644
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stm-conduit";
-  version = "2.1.4";
-  sha256 = "0xl3g96blawy5bkvialq6jxnf4wajxb5fg1sh7p9kvw1gvacqwqk";
+  version = "2.2";
+  sha256 = "14fz8izr8fxi3s78fhz4p5yfdkfcipcfpcj6dn5w0fkcd2hc2a66";
   buildDepends = [
     async conduit liftedAsync liftedBase monadControl monadLoops
     resourcet stm stmChans transformers
-- 
GitLab


From 75672819ea82be8b76a07127ef5c8b2e446ce140 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:51 +0100
Subject: [PATCH 0345/3789] haskell-threepenny-gui: update to version 0.4.0.2

---
 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 11becfeacc7..70f96c8ac9d 100644
--- a/pkgs/development/libraries/haskell/threepenny-gui/default.nix
+++ b/pkgs/development/libraries/haskell/threepenny-gui/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "threepenny-gui";
-  version = "0.4.0.1";
-  sha256 = "18ahfcbzlp0k5ry9fdzdv8jdwv10iplnbbnh2xyr3cqils2yp68m";
+  version = "0.4.0.2";
+  sha256 = "0dx6jrpxvd6ypz314hmq8nngy0wjx3bwx3r9h1c6y70id31lr9pg";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From a58a0b17c9aa07e59e1f8fdc0ee793888a254440 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:51 +0100
Subject: [PATCH 0346/3789] haskell-vector-space-points: update to version
 0.1.3

---
 .../libraries/haskell/vector-space-points/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix
index 2a5c1eb2fc4..2edb15beeda 100644
--- a/pkgs/development/libraries/haskell/vector-space-points/default.nix
+++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vector-space-points";
-  version = "0.1.2.1";
-  sha256 = "0prbmk48xdr2gbxqpv0g89xz5v3k9wps9v2gymkh32jag2lgzi66";
+  version = "0.1.3";
+  sha256 = "0bk2zrccf5bxh14dzhhv89mr755j801ziqyxgv69ksdyxh8hx2qg";
   buildDepends = [ newtype vectorSpace ];
   meta = {
     description = "A type for points, as distinct from vectors";
-- 
GitLab


From 119d4b8d5c46c834d5c22f6da7694d1a181392ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:51 +0100
Subject: [PATCH 0347/3789] haskell-wai-extra: update to version 2.0.3

---
 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 c7b673ecbc9..78d80269254 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.0.2";
-  sha256 = "1va9lds6vziid3kksyp1pl4bz1l02qjybm4x438q5a7n6yxmmd65";
+  version = "2.0.3";
+  sha256 = "18x5jcq4yl33ixl7rb79ncx107bw6y8dmw2gwcmxb93h5yiam7s5";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase
-- 
GitLab


From e7302c891e95bf6e86d6e9bd6ed2e72e04c02507 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:51 +0100
Subject: [PATCH 0348/3789] haskell-yesod-auth: update to version 1.2.5.3

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

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index b261d22ace6..56048aeb627 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.2.5.2";
-  sha256 = "13gvcwgpq4l3d50h855qdcn0k93a8cy918jg577ch3fqhwk70q8g";
+  version = "1.2.5.3";
+  sha256 = "0rpyx9p3si5453166v9paq18nz209w6lxz3hy5nxg1hyihwh8gy9";
   buildDepends = [
     aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
     fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network
-- 
GitLab


From c13a56a036f8dd118436d98053af49abd5803ce1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:51 +0100
Subject: [PATCH 0349/3789] haskell-yesod-form: update to version 1.3.4.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 66b2117ee82..35b55bde887 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.4.2";
-  sha256 = "06qw2hx0iv46xdmkbbw1sgwzvyr82h0v267dxfw19235s9yfzbfg";
+  version = "1.3.4.3";
+  sha256 = "1yf9kvnlkgfdpv44afj2zwdk8jh382lxj56jvafgw1bxa1hsn408";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
     dataDefault emailValidate hamlet network persistent resourcet
-- 
GitLab


From 9c065f77d8fdb816546b9fc9d1c27bc64fa48f26 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 12:44:51 +0100
Subject: [PATCH 0350/3789] haskell-yesod-platform: update to version 1.2.6

---
 .../haskell/yesod-platform/default.nix        | 82 ++++++++++---------
 1 file changed, 42 insertions(+), 40 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix
index 929dd698b7d..0c9c31778ca 100644
--- a/pkgs/development/libraries/haskell/yesod-platform/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix
@@ -2,65 +2,67 @@
 , attoparsecConduit, authenticate, base64Bytestring
 , baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml
 , blazeMarkup, byteable, byteorder, caseInsensitive, cereal
-, certificate, cipherAes, cipherRc4, clientsession, conduit
-, connection, controlMonadLoop, cookie, cprngAes, cryptoApi
-, cryptoCipherTypes, cryptoConduit, cryptohash, cryptohashCryptoapi
-, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom
+, certificate, cipherAes, cipherBlowfish, cipherCamellia, cipherDes
+, cipherRc4, clientsession, conduit, connection, controlMonadLoop
+, cookie, cprngAes, cryptoApi, cryptocipher, cryptoCipherTypes
+, cryptoConduit, cryptohash, cryptohashCryptoapi, cryptoNumbers
+, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom, cryptoRandomApi
 , cssText, dataDefault, dataDefaultClass, dataDefaultInstancesBase
 , dataDefaultInstancesContainers, dataDefaultInstancesDlist
 , dataDefaultInstancesOldLocale, dlist, emailValidate, entropy
-, failure, fastLogger, fileEmbed, filesystemConduit, hamlet, hjsmin
-, hspec, hspecExpectations, htmlConduit, httpAttoparsec, httpClient
-, httpClientConduit, httpClientTls, httpConduit, httpDate
-, httpTypes, languageJavascript, liftedBase, mimeMail, mimeTypes
-, mmorph, monadControl, monadLogger, monadLoops, networkConduit
-, pathPieces, pem, persistent, persistentTemplate, poolConduit
-, primitive, processConduit, publicsuffixlist, pureMD5, pwstoreFast
-, quickcheckIo, resourcePool, resourcet, safe, securemem
-, semigroups, setenv, SHA, shakespeare, shakespeareCss
-, shakespeareI18n, shakespeareJs, shakespeareText, silently
-, simpleSendfile, skein, socks, stmChans, stringsearch
-, systemFileio, systemFilepath, tagged, tagsoup, tagstreamConduit
-, tls, tlsExtra, transformersBase, unixCompat, unorderedContainers
-, utf8Light, utf8String, vector, void, wai, waiAppStatic, waiExtra
-, waiLogger, waiTest, warp, word8, xmlConduit, xmlTypes
-, xssSanitize, yaml, yesod, yesodAuth, yesodCore, yesodForm
-, yesodPersistent, yesodRoutes, yesodStatic, yesodTest
-, zlibBindings, zlibConduit
+, esqueleto, failure, fastLogger, fileEmbed, filesystemConduit
+, hamlet, hjsmin, hspec, hspecExpectations, htmlConduit
+, httpAttoparsec, httpClient, httpClientConduit, httpClientTls
+, httpConduit, httpDate, httpTypes, languageJavascript, liftedBase
+, mimeMail, mimeTypes, mmorph, monadControl, monadLogger
+, monadLoops, networkConduit, pathPieces, pem, persistent
+, persistentTemplate, poolConduit, primitive, processConduit
+, publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo
+, resourcePool, resourcet, safe, scientific, securemem, semigroups
+, setenv, SHA, shakespeare, shakespeareCss, shakespeareI18n
+, shakespeareJs, shakespeareText, silently, simpleSendfile, skein
+, socks, stmChans, stringsearch, systemFileio, systemFilepath
+, tagged, tagsoup, tagstreamConduit, tls, tlsExtra
+, transformersBase, unixCompat, unorderedContainers, utf8Light
+, utf8String, vector, void, wai, waiAppStatic, waiExtra, waiLogger
+, waiTest, warp, warpTls, word8, xmlConduit, xmlTypes, xssSanitize
+, yaml, yesod, yesodAuth, yesodCore, yesodForm, yesodPersistent
+, yesodRoutes, yesodStatic, yesodTest, zlibBindings, zlibConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-platform";
-  version = "1.2.5.3";
-  sha256 = "0k9srgsnz9cgpxhdk04qz27lqp1xm97bprxjv93j1sxny92v6122";
+  version = "1.2.6";
+  sha256 = "15ixhxim14672hl9cl92sbi94yzv6g6zgg07jvkciixg0hd8xr6p";
   buildDepends = [
     aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
     authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
     blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder
-    caseInsensitive cereal certificate cipherAes cipherRc4
-    clientsession conduit connection controlMonadLoop cookie cprngAes
-    cryptoApi cryptoCipherTypes cryptoConduit cryptohash
-    cryptohashCryptoapi cryptoNumbers cryptoPubkey cryptoPubkeyTypes
-    cryptoRandom cssText dataDefault dataDefaultClass
+    caseInsensitive cereal certificate cipherAes cipherBlowfish
+    cipherCamellia cipherDes cipherRc4 clientsession conduit connection
+    controlMonadLoop cookie cprngAes cryptoApi cryptocipher
+    cryptoCipherTypes cryptoConduit cryptohash cryptohashCryptoapi
+    cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom
+    cryptoRandomApi cssText dataDefault dataDefaultClass
     dataDefaultInstancesBase dataDefaultInstancesContainers
     dataDefaultInstancesDlist dataDefaultInstancesOldLocale dlist
-    emailValidate entropy failure fastLogger fileEmbed
+    emailValidate entropy esqueleto failure fastLogger fileEmbed
     filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit
     httpAttoparsec httpClient httpClientConduit httpClientTls
     httpConduit httpDate httpTypes languageJavascript liftedBase
     mimeMail mimeTypes mmorph monadControl monadLogger monadLoops
     networkConduit pathPieces pem persistent persistentTemplate
     poolConduit primitive processConduit publicsuffixlist pureMD5
-    pwstoreFast quickcheckIo resourcePool resourcet safe securemem
-    semigroups setenv SHA shakespeare shakespeareCss shakespeareI18n
-    shakespeareJs shakespeareText silently simpleSendfile skein socks
-    stmChans stringsearch systemFileio systemFilepath tagged tagsoup
-    tagstreamConduit tls tlsExtra transformersBase unixCompat
-    unorderedContainers utf8Light utf8String vector void wai
-    waiAppStatic waiExtra waiLogger waiTest warp word8 xmlConduit
-    xmlTypes xssSanitize yaml yesod yesodAuth yesodCore yesodForm
-    yesodPersistent yesodRoutes yesodStatic yesodTest zlibBindings
-    zlibConduit
+    pwstoreFast quickcheckIo resourcePool resourcet safe scientific
+    securemem semigroups setenv SHA shakespeare shakespeareCss
+    shakespeareI18n shakespeareJs shakespeareText silently
+    simpleSendfile skein socks stmChans stringsearch systemFileio
+    systemFilepath tagged tagsoup tagstreamConduit tls tlsExtra
+    transformersBase unixCompat unorderedContainers utf8Light
+    utf8String vector void wai waiAppStatic waiExtra waiLogger waiTest
+    warp warpTls word8 xmlConduit xmlTypes xssSanitize yaml yesod
+    yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes
+    yesodStatic yesodTest zlibBindings zlibConduit
   ];
   jailbreak = true;
   meta = {
-- 
GitLab


From 8088837dc8f35ef7853787f88bb1db7248900cc4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jan 2014 17:38:55 +0100
Subject: [PATCH 0351/3789] haskell-hakyll: jailbreak to fix build with recent
 version of pandoc-citeproc

---
 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 d4f6561ff1b..ace860bcd1c 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -25,6 +25,9 @@ cabal.mkDerivation (self: {
     snapCore snapServer systemFilepath tagsoup testFramework
     testFrameworkHunit testFrameworkQuickcheck2 text time
   ];
+  patchPhase = ''
+    sed -i -e 's|pandoc-citeproc >=.*,|pandoc-citeproc,|' hakyll.cabal
+  '';
   doCheck = false;
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
-- 
GitLab


From 204ec0cd43d12fd56b3a9d28396321cc56da5fd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Jan 2014 22:11:14 +0100
Subject: [PATCH 0352/3789] stdenv/setup.sh: add .gz extension to links to .gz
 man pages

The links weren't broken since 0a44a09, but man showed garbage.
Tested on several packages (sudo, dosfstools, xz).
---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 3a192b82028..4740c638633 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -768,7 +768,7 @@ fixupPhase() {
         done
         for f in "$out"/share/man/*/* "$out"/share/man/*/*/*; do
             if [ -L "$f" -a -f `readlink -f "$f"`.gz ]; then
-                ln -sf `readlink "$f"`.gz "$f"
+                ln -sf `readlink "$f"`.gz "$f".gz && rm "$f"
             fi
         done
         unset GLOBIGNORE
-- 
GitLab


From fea2266290d64b11a3bf02bda8764eb6e3d8b7a1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 20 Jan 2014 20:19:53 -0500
Subject: [PATCH 0353/3789] llvm: Split llvmFull into separate derivations

Now most packages in the llvm suite are built as separate derivations.
The exceptions are:

* compiler-rt must currently be built with llvm. This increases llvm's
  size by 6 MB
* clang-tools-extra must be built with clang

In addition, the top-level llvm attribute is defaulted to llvm 3.4, and
llvm 3.3 must be accessed by the llvm_33 attribute. This is to make the
out-of-date packages obvious in the hope that eventually all will be
updated to work with 3.4 and 3.3 can be removed. I think we should keep
this policy in the future (latest llvm gets top-level name, the rest are
versioned until they can be removed).

The llvm packages (except libc++, which exception I will try to remove
on the next update) can all be accessed via the llvmPackages attribute,
and there are also aliases for the packages that already existed (llvm,
clang, and dragonegg).

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../emacs-clang-complete-async/default.nix    |  4 +-
 .../llvm/{default.nix => 3.3/llvm.nix}        | 28 +++---
 .../{ => 3.3}/more-memory-for-bugpoint.patch  |  0
 .../llvm/{ => 3.3}/no-rule-aarch64.patch      |  0
 .../llvm/3.4/clang-separate-build.patch       |  8 ++
 pkgs/development/compilers/llvm/3.4/clang.nix | 41 +++++++++
 .../compilers/llvm/3.4/default.nix            | 25 ++++++
 .../compilers/llvm/{ => 3.4}/dragonegg.nix    | 10 +--
 pkgs/development/compilers/llvm/3.4/lld.nix   | 31 +++++++
 pkgs/development/compilers/llvm/3.4/lldb.nix  | 44 +++++++++
 .../llvm/3.4/llvm-separate-build.patch        | 12 +++
 pkgs/development/compilers/llvm/3.4/llvm.nix  | 55 ++++++++++++
 .../llvm/3.4/polly-separate-build.patch       | 12 +++
 pkgs/development/compilers/llvm/3.4/polly.nix | 27 ++++++
 pkgs/development/compilers/llvm/full.nix      | 89 -------------------
 pkgs/development/libraries/libc++/default.nix |  4 +-
 pkgs/top-level/all-packages.nix               | 25 +++---
 17 files changed, 282 insertions(+), 133 deletions(-)
 rename pkgs/development/compilers/llvm/{default.nix => 3.3/llvm.nix} (55%)
 rename pkgs/development/compilers/llvm/{ => 3.3}/more-memory-for-bugpoint.patch (100%)
 rename pkgs/development/compilers/llvm/{ => 3.3}/no-rule-aarch64.patch (100%)
 create mode 100644 pkgs/development/compilers/llvm/3.4/clang-separate-build.patch
 create mode 100644 pkgs/development/compilers/llvm/3.4/clang.nix
 create mode 100644 pkgs/development/compilers/llvm/3.4/default.nix
 rename pkgs/development/compilers/llvm/{ => 3.4}/dragonegg.nix (66%)
 create mode 100644 pkgs/development/compilers/llvm/3.4/lld.nix
 create mode 100644 pkgs/development/compilers/llvm/3.4/lldb.nix
 create mode 100644 pkgs/development/compilers/llvm/3.4/llvm-separate-build.patch
 create mode 100644 pkgs/development/compilers/llvm/3.4/llvm.nix
 create mode 100644 pkgs/development/compilers/llvm/3.4/polly-separate-build.patch
 create mode 100644 pkgs/development/compilers/llvm/3.4/polly.nix
 delete mode 100644 pkgs/development/compilers/llvm/full.nix

diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
index 6d10244a879..b23c6da6123 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
@@ -1,4 +1,4 @@
-{ clangStdenv, fetchgit, llvmFull }:
+{ clangStdenv, fetchgit, llvm, clang }:
 
 clangStdenv.mkDerivation {
   name = "emacs-clang-complete-async-20130218";
@@ -8,7 +8,7 @@ clangStdenv.mkDerivation {
     sha256 = "1c8zqi6axbsb951azz9iqx3j52j30nd9ypv396hvids3g02cirrf";
   };
 
-  buildInputs = [ llvmFull ];
+  buildInputs = [ llvm clang.clang ];
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/3.3/llvm.nix
similarity index 55%
rename from pkgs/development/compilers/llvm/default.nix
rename to pkgs/development/compilers/llvm/3.3/llvm.nix
index 73eb7135ca4..e40014a960c 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/3.3/llvm.nix
@@ -1,27 +1,20 @@
-{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils, version }:
-
-with { inherit (stdenv.lib) optional optionals; };
-
-assert version == "3.4" || version == "3.3";
-
-stdenv.mkDerivation rec {
+{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils }:
+let
+  version = "3.3";
+in stdenv.mkDerivation rec {
   name = "llvm-${version}";
 
   src = fetchurl {
-    url    = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
-    sha256 =
-      if version == "3.4" then "0a169ba045r4apb9cv6ncrwl83l7yiajnzirkcdlhj1cd4nn3995"
-        else       /*3.3*/     "0y3mfbb5qzcpw3v5qncn69x1hdrrrfirgs82ypi2annhf0g6nxk8";
+    url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
+    sha256 = "0y3mfbb5qzcpw3v5qncn69x1hdrrrfirgs82ypi2annhf0g6nxk8";
   };
 
-  patches = optionals (version == "3.3") [
+  patches = [
     ./more-memory-for-bugpoint.patch # The default rlimits in 3.3 are too low for shared libraries.
     ./no-rule-aarch64.patch          # http://llvm.org/bugs/show_bug.cgi?id=16625
   ];
 
-  # libffi was propagated before, but it wasn't even being used, so
-  # unless something needs it just an input is fine.
-  buildInputs = [ perl groff cmake python libffi ]; # ToDo: polly, libc++; enable cxx11?
+  buildInputs = [ perl groff cmake python libffi ];
 
   # hacky fix: created binaries need to be run before installation
   preBuild = let LD = if stdenv.isDarwin then "DYLD" else "LD";
@@ -31,9 +24,8 @@ stdenv.mkDerivation rec {
     "-DCMAKE_BUILD_TYPE=Release"
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
-  ]
-    ++ optional (version == "3.3") "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=R600" # for mesa
-    ++ optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
+    "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=R600" # for mesa
+  ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/compilers/llvm/more-memory-for-bugpoint.patch b/pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/more-memory-for-bugpoint.patch
rename to pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
diff --git a/pkgs/development/compilers/llvm/no-rule-aarch64.patch b/pkgs/development/compilers/llvm/3.3/no-rule-aarch64.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/no-rule-aarch64.patch
rename to pkgs/development/compilers/llvm/3.3/no-rule-aarch64.patch
diff --git a/pkgs/development/compilers/llvm/3.4/clang-separate-build.patch b/pkgs/development/compilers/llvm/3.4/clang-separate-build.patch
new file mode 100644
index 00000000000..5fb67f169f4
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.4/clang-separate-build.patch
@@ -0,0 +1,8 @@
+diff -Naur clang-3.4-orig/tools/extra/CMakeLists.txt clang-3.4/tools/extra/CMakeLists.txt
+--- clang-3.4-orig/tools/extra/CMakeLists.txt	2013-11-07 19:08:23.000000000 -0500
++++ clang-3.4/tools/extra/CMakeLists.txt	2014-01-20 11:47:22.678435223 -0500
+@@ -1,3 +1,4 @@
++include(CheckLibraryExists)
+ check_library_exists(edit el_init "" HAVE_LIBEDIT)
+ 
+ add_subdirectory(clang-apply-replacements)
diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
new file mode 100644
index 00000000000..22a1e112b9d
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetch, cmake, libxml2, libedit, llvm, version }:
+
+stdenv.mkDerivation {
+  name = "clang-${version}";
+
+  unpackPhase = ''
+    unpackFile ${fetch "clang" "06rb4j1ifbznl3gfhl98s7ilj0ns01p7y7zap4p7ynmqnc6pia92"}
+    mv clang-${version} clang
+    sourceRoot=$PWD/clang
+    unpackFile ${fetch "clang-tools-extra" "1d1822mwxxl9agmyacqjw800kzz5x8xr0sdmi8fgx5xfa5sii1ds"}
+    mv clang-tools-extra-${version} $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})
+  '';
+
+  patches = [ ./clang-separate-build.patch ];
+
+  buildInputs = [ cmake libedit libxml2 ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}"
+    "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/"
+    "-DCMAKE_CXX_FLAGS=-std=c++11"
+    "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
+  ];
+
+  passthru.gcc = stdenv.gcc.gcc;
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
+    homepage    = http://llvm.org/;
+    license     = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/3.4/default.nix b/pkgs/development/compilers/llvm/3.4/default.nix
new file mode 100644
index 00000000000..0a8a72f59a9
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.4/default.nix
@@ -0,0 +1,25 @@
+{ newScope, stdenv, isl, fetchurl }:
+let
+  callPackage = newScope (self // { inherit stdenv isl version fetch; });
+
+  version = "3.4";
+
+  fetch = name: sha256: fetchurl {
+    url = "http://llvm.org/releases/${version}/${name}-${version}.src.tar.gz";
+    inherit sha256;
+  };
+
+  self = {
+    llvm = callPackage ./llvm.nix {};
+
+    clang = callPackage ./clang.nix {};
+
+    lld = callPackage ./lld.nix {};
+
+    lldb = callPackage ./lldb.nix {};
+
+    polly = callPackage ./polly.nix {};
+
+    dragonegg = callPackage ./dragonegg.nix {};
+  };
+in self
diff --git a/pkgs/development/compilers/llvm/dragonegg.nix b/pkgs/development/compilers/llvm/3.4/dragonegg.nix
similarity index 66%
rename from pkgs/development/compilers/llvm/dragonegg.nix
rename to pkgs/development/compilers/llvm/3.4/dragonegg.nix
index 38d3546d981..f8ea44793de 100644
--- a/pkgs/development/compilers/llvm/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/3.4/dragonegg.nix
@@ -1,13 +1,9 @@
-{stdenv, fetchurl, llvm, gmp, mpfr, mpc, ncurses, zlib}:
+{stdenv, fetch, llvm, gmp, mpfr, mpc, ncurses, zlib, version}:
 
 stdenv.mkDerivation rec {
-  version = "3.4";
   name = "dragonegg-${version}";
 
-  src = fetchurl {
-    url = "http://llvm.org/releases/${version}/${name}.src.tar.gz";
-    sha256 = "1733czbvby1ww3xkwcwmm0km0bpwhfyxvf56wb0zv5gksp3kbgrl";
-  };
+  src = fetch "dragonegg" "1733czbvby1ww3xkwcwmm0km0bpwhfyxvf56wb0zv5gksp3kbgrl";
 
   # The gcc the plugin will be built for (the same used building dragonegg)
   GCC = "gcc";
@@ -24,7 +20,7 @@ stdenv.mkDerivation rec {
     homepage = http://dragonegg.llvm.org/;
     description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM";
     license = "GPLv2+";
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [viric shlevy];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.4/lld.nix b/pkgs/development/compilers/llvm/3.4/lld.nix
new file mode 100644
index 00000000000..22eb02a0e35
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.4/lld.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetch, cmake, llvm, ncurses, zlib, python, version }:
+
+stdenv.mkDerivation {
+  name = "lld-${version}";
+
+  src = fetch "lld" "1sd4scqynryfrmcc4h0ljgwn2dgjmbbmf38z50ya6l0janpd2nxz";
+
+  preUnpack = ''
+    # !!! Hopefully won't be needed for 3.5
+    unpackFile ${llvm.src}
+    export cmakeFlags="$cmakeFlags -DLLD_PATH_TO_LLVM_SOURCE=$PWD/llvm-${version}"
+  '';
+
+  buildInputs = [ cmake ncurses zlib python ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DCMAKE_CXX_FLAGS=-std=c++11"
+    "-DLLD_PATH_TO_LLVM_BUILD=${llvm}"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A set of modular code for creating linker tools";
+    homepage    = http://llvm.org/;
+    license     = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/3.4/lldb.nix b/pkgs/development/compilers/llvm/3.4/lldb.nix
new file mode 100644
index 00000000000..7b35119a93f
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.4/lldb.nix
@@ -0,0 +1,44 @@
+{ stdenv
+, fetch
+, cmake
+, zlib
+, ncurses
+, swig
+, which
+, libedit
+, llvm
+, clang
+, python
+, version
+}:
+
+stdenv.mkDerivation {
+  name = "lldb-${version}";
+
+  src = fetch "lldb" "0h8cmjrhjhigk7k2qll1pcf6jfgmbdzkzfz2i048pkfg851s0x4g";
+
+  patchPhase = ''
+    sed -i 's|/usr/bin/env||' \
+      scripts/Python/finish-swig-Python-LLDB.sh \
+      scripts/Python/build-swig-Python.sh
+  '';
+
+  buildInputs = [ cmake python which swig ncurses zlib libedit ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DCMAKE_CXX_FLAGS=-std=c++11"
+    "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
+    "-DLLDB_PATH_TO_CLANG_BUILD=${clang}"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A next-generation high-performance debugger";
+    homepage    = http://llvm.org/;
+    license     = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/3.4/llvm-separate-build.patch b/pkgs/development/compilers/llvm/3.4/llvm-separate-build.patch
new file mode 100644
index 00000000000..abfc11513cd
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.4/llvm-separate-build.patch
@@ -0,0 +1,12 @@
+diff -Naur llvm-3.4-orig/cmake/modules/TableGen.cmake llvm-3.4/cmake/modules/TableGen.cmake
+--- llvm-3.4-orig/cmake/modules/TableGen.cmake	2013-10-06 21:00:07.000000000 -0400
++++ llvm-3.4/cmake/modules/TableGen.cmake	2014-01-20 13:06:55.273022149 -0500
+@@ -78,8 +78,6 @@
+ endif()
+ 
+ macro(add_tablegen target project)
+-  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_TOOLS_BINARY_DIR})
+-
+   set(${target}_OLD_LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS})
+   set(LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS} TableGen)
+   add_llvm_utility(${target} ${ARGN})
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
new file mode 100644
index 00000000000..4947bdca2a9
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -0,0 +1,55 @@
+{ stdenv
+, fetch
+, perl
+, groff
+, cmake
+, python
+, libffi
+, binutils
+, libxml2
+, valgrind
+, ncurses
+, version
+}:
+
+let
+  src = fetch "llvm" "0a169ba045r4apb9cv6ncrwl83l7yiajnzirkcdlhj1cd4nn3995";
+in stdenv.mkDerivation rec {
+  name = "llvm-${version}";
+
+  unpackPhase = ''
+    unpackFile ${src}
+    mv llvm-${version} llvm
+    sourceRoot=$PWD/llvm
+    unpackFile ${fetch "compiler-rt" "0p5b6varxdqn7q3n77xym63hhq4qqxd2981pfpa65r1w72qqjz7k"}
+    mv compiler-rt-${version} $sourceRoot/projects/compiler-rt
+  '';
+
+  buildInputs = [ perl groff cmake libxml2 python libffi valgrind ncurses ];
+
+  # hacky fix: created binaries need to be run before installation
+  preBuild = ''
+    mkdir -p $out/
+    ln -sv $PWD/lib $out
+  '';
+  postBuild = "rm -fR $out";
+
+  cmakeFlags = with stdenv; [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DLLVM_ENABLE_FFI=ON"
+    "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
+    "-DCMAKE_CXX_FLAGS=-std=c++11"
+  ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
+
+  enableParallelBuilding = true;
+
+  passthru.src = src;
+
+  meta = {
+    description = "Collection of modular and reusable compiler and toolchain technologies";
+    homepage    = http://llvm.org/;
+    license     = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/3.4/polly-separate-build.patch b/pkgs/development/compilers/llvm/3.4/polly-separate-build.patch
new file mode 100644
index 00000000000..618dd4dc3b1
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.4/polly-separate-build.patch
@@ -0,0 +1,12 @@
+diff -Naur polly-3.4-orig/CMakeLists.txt polly-3.4/CMakeLists.txt
+--- polly-3.4-orig/CMakeLists.txt	2013-11-21 06:51:46.000000000 -0500
++++ polly-3.4/CMakeLists.txt	2014-01-20 18:49:34.907919933 -0500
+@@ -53,7 +53,7 @@
+   execute_process(COMMAND "${LLVM_INSTALL_ROOT}/bin/llvm-config" --cxxflags
+                   OUTPUT_VARIABLE LLVM_CXX_FLAGS
+                   OUTPUT_STRIP_TRAILING_WHITESPACE)
+-  set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS})
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS}")
+ endif(NOT DEFINED LLVM_MAIN_SRC_DIR)
+ 
+ set(POLLY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/pkgs/development/compilers/llvm/3.4/polly.nix b/pkgs/development/compilers/llvm/3.4/polly.nix
new file mode 100644
index 00000000000..61721ffad67
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.4/polly.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetch, cmake, isl, python, gmp, llvm, version }:
+
+stdenv.mkDerivation {
+  name = "polly-${version}";
+
+  src =  fetch "polly" "1rqflmgzg1vzjm0r32c5ck8x3q0qm3g0hh8ggbjazh6x7nvmy6lz";
+
+  patches = [ ./polly-separate-build.patch ];
+
+  buildInputs = [ cmake isl python gmp ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DCMAKE_CXX_FLAGS=-std=c++11"
+    "-DLLVM_INSTALL_ROOT=${llvm}"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A polyhedral optimizer for llvm";
+    homepage    = http://llvm.org/;
+    license     = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/full.nix b/pkgs/development/compilers/llvm/full.nix
deleted file mode 100644
index 9c63502d8cd..00000000000
--- a/pkgs/development/compilers/llvm/full.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{ stdenv
-, fetchurl
-, perl, groff
-, cmake
-, libxml2
-, python
-, libffi
-, zlib
-, ncurses
-, isl
-, gmp
-, doxygen
-, binutils
-, swig
-, which
-, libedit
-, valgrind
-}:
-
-let
-  version = "3.4";
-
-  fetch = name: sha256: fetchurl {
-    url = "http://llvm.org/releases/${version}/${name}-${version}.src.tar.gz";
-    inherit sha256;
-  };
-
-  inherit (stdenv.lib) concatStrings mapAttrsToList;
-in stdenv.mkDerivation {
-  name = "llvm-full-${version}";
-
-  unpackPhase = ''
-    unpackFile ${fetch "llvm" "0a169ba045r4apb9cv6ncrwl83l7yiajnzirkcdlhj1cd4nn3995"}
-    mv llvm-${version} llvm
-    sourceRoot=$PWD/llvm
-    ${concatStrings (mapAttrsToList (name: { location, sha256 }: ''
-      unpackFile ${fetch name sha256}
-      mv ${name}-${version} $sourceRoot/${location}
-    '') {
-      clang = { location = "tools/clang"; sha256 = "06rb4j1ifbznl3gfhl98s7ilj0ns01p7y7zap4p7ynmqnc6pia92"; };
-      clang-tools-extra = { location = "tools/clang/tools/extra"; sha256 = "1d1822mwxxl9agmyacqjw800kzz5x8xr0sdmi8fgx5xfa5sii1ds"; };
-      compiler-rt = { location = "projects/compiler-rt"; sha256 = "0p5b6varxdqn7q3n77xym63hhq4qqxd2981pfpa65r1w72qqjz7k"; };
-      lld = { location = "tools/lld"; sha256 = "1sd4scqynryfrmcc4h0ljgwn2dgjmbbmf38z50ya6l0janpd2nxz"; };
-      lldb = { location = "tools/lldb"; sha256 = "0h8cmjrhjhigk7k2qll1pcf6jfgmbdzkzfz2i048pkfg851s0x4g"; };
-      polly = { location = "tools/polly"; sha256 = "1rqflmgzg1vzjm0r32c5ck8x3q0qm3g0hh8ggbjazh6x7nvmy6lz"; };
-    })}
-    sed -i 's|/usr/bin/env||' \
-      $sourceRoot/tools/lldb/scripts/Python/finish-swig-Python-LLDB.sh \
-      $sourceRoot/tools/lldb/scripts/Python/build-swig-Python.sh
-  '';
-
-  buildInputs = [ perl
-                  groff
-                  cmake
-                  libxml2
-                  python
-                  libffi
-                  zlib
-                  ncurses
-                  isl
-                  gmp
-                  doxygen
-                  swig
-                  which
-                  libedit
-                  valgrind
-                ];
-
-  cmakeFlags = [
-    "-DCMAKE_BUILD_TYPE=Release"
-    "-DLLVM_ENABLE_FFI=ON"
-    "-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}"
-    "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/"
-    "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
-    "-DCMAKE_CXX_FLAGS=-std=c++11"
-  ];
-
-  passthru.gcc = stdenv.gcc.gcc;
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Collection of modular and reusable compiler and toolchain technologies";
-    homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-    platforms   = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix
index 964d3727f8f..70da4462486 100644
--- a/pkgs/development/libraries/libc++/default.nix
+++ b/pkgs/development/libraries/libc++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchsvn, cmake, libcxxabi }:
+{ stdenv, fetchurl, fetchsvn, cmake, libcxxabi, python }:
 
 let
   version = "3.4";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1sqd5qhqj7qnn9zjxx9bv7ky4f7xgmh9sbgd53y1kszhg41217xx";
   };
 
-  buildInputs = [ cmake libcxxabi ];
+  buildInputs = [ cmake libcxxabi python ];
 
   cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release"
                  "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 897fae64af5..d58fda4e52f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2298,12 +2298,9 @@ let
 
   ccl = builderDefsPackage ../development/compilers/ccl {};
 
-  clang = wrapClang llvmFull;
+  clang = wrapClang llvmPackages.clang;
 
-  llvmFullSelf = clangWrapSelf (llvmFull.override {
-
-     stdenv = libcxxStdenv;
-  });
+  clangSelf = clangWrapSelf llvmPackagesSelf.clang;
 
   clangWrapSelf = build: (import ../build-support/clang-wrapper) {
     clang = build;
@@ -2318,7 +2315,7 @@ let
 
   #Use this instead of stdenv to build with clang
   clangStdenv = lowPrio (stdenvAdapters.overrideGCC stdenv clang);
-  libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf llvmFull);
+  libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf llvmPackages.clang);
 
   clean = callPackage ../development/compilers/clean { };
 
@@ -2751,6 +2748,7 @@ let
 
   julia = callPackage ../development/compilers/julia {
     liblapack = liblapack.override {shared = true;};
+    llvm = llvm_33;
   };
 
   lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) {
@@ -2761,17 +2759,14 @@ let
 
   lessc = callPackage ../development/compilers/lessc { };
 
-  llvm = llvm_33;
-  llvm_34 = callPackage ../development/compilers/llvm {
-    version = "3.4";
+  llvm = llvmPackages.llvm;
+  llvm_33 = callPackage ../development/compilers/llvm/3.3/llvm.nix {
     stdenv = if stdenv.isDarwin
       then stdenvAdapters.overrideGCC stdenv gccApple
       else stdenv;
   };
-  llvm_33 = llvm_34.override { version = "3.3"; };
-  llvmFull = callPackage ../development/compilers/llvm/full.nix {
-    isl = isl_0_12;
-  };
+  llvmPackages = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { inherit newScope stdenv fetchurl; isl = isl_0_12; });
+  llvmPackagesSelf = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; });
 
   mentorToolchains = recurseIntoAttrs (
     callPackage_i686 ../development/compilers/mentor {}
@@ -3961,7 +3956,7 @@ let
 
   dssi = callPackage ../development/libraries/dssi {};
 
-  dragonegg = callPackage ../development/compilers/llvm/dragonegg.nix { llvm = llvmFull; };
+  dragonegg = llvmPackages.dragonegg;
 
   dxflib = callPackage ../development/libraries/dxflib {};
 
@@ -5084,7 +5079,7 @@ let
 
   mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
 
-  mesa_original = callPackage ../development/libraries/mesa { };
+  mesa_original = callPackage ../development/libraries/mesa { llvm = llvm_33; };
   mesa_noglu = if stdenv.isDarwin
     then darwinX11AndOpenGL // { driverLink = mesa_noglu; }
     else mesa_original;
-- 
GitLab


From 407c60fdf9d5b6ad97e5b2d24e779815e28d7f3f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 20 Jan 2014 20:33:02 -0500
Subject: [PATCH 0354/3789] Fix tarball

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/compilers/llvm/3.4/clang.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index 22a1e112b9d..6f174a411cb 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -21,11 +21,11 @@ stdenv.mkDerivation {
 
   cmakeFlags = [
     "-DCMAKE_BUILD_TYPE=Release"
-    "-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}"
-    "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/"
     "-DCMAKE_CXX_FLAGS=-std=c++11"
     "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
-  ];
+  ] ++
+  (stdenv.lib.optional (stdenv.gcc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include") ++
+  (stdenv.lib.optional (stdenv.gcc.gcc != null) "-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}");
 
   passthru.gcc = stdenv.gcc.gcc;
 
-- 
GitLab


From 744e9fd81add772c0d6e3a710203799031a09c23 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 20 Jan 2014 20:42:49 -0500
Subject: [PATCH 0355/3789] Don't include llvm self-built packages in nix-env
 -qa/nix-env -i

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 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 d58fda4e52f..1313ad12ba1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2766,7 +2766,7 @@ let
       else stdenv;
   };
   llvmPackages = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { inherit newScope stdenv fetchurl; isl = isl_0_12; });
-  llvmPackagesSelf = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; });
+  llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; };
 
   mentorToolchains = recurseIntoAttrs (
     callPackage_i686 ../development/compilers/mentor {}
-- 
GitLab


From 8ad41b92cfd604e4f5ab487ad0f1784f1fc9773c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 21 Jan 2014 09:59:50 +0100
Subject: [PATCH 0356/3789] nixUnstable: Update to 1.7pre3327_0e2ca26

Also fixes disappeared tarball.
---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index aad734cd619..a340d51fd7d 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.7pre3319_f4013b6";
+  name = "nix-1.7pre3327_0e2ca26";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/7848540/download/5/${name}.tar.xz";
-    sha256 = "0f9095aabe3399436a75162c046fdc1e4d0c1e9a98f7d8ffcd3d910b19c8c265";
+    url = "http://hydra.nixos.org/build/8316406/download/5/${name}.tar.xz";
+    sha256 = "52cc082f4ce8ec3c316f032c0201cc76980df2845b15714e71acb2ef7715f1de";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];
-- 
GitLab


From 28d51a31eeff92677132c84436c0a3536a34bea7 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <sander@conference-compass.com>
Date: Tue, 21 Jan 2014 12:10:53 +0100
Subject: [PATCH 0357/3789] Stick titanium CLI to version 3.2.0, otherwise the
 latest beta version gets installed

---
 pkgs/top-level/node-packages-generated.nix | 922 +++++++++++----------
 pkgs/top-level/node-packages.json          |   2 +-
 2 files changed, 497 insertions(+), 427 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 07bfa153125..9aec47445b5 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -616,14 +616,14 @@
   by-spec."async"."~0.2.9" =
     self.by-version."async"."0.2.9";
   by-spec."aws-sdk"."*" =
-    self.by-version."aws-sdk"."2.0.0-rc7";
-  by-version."aws-sdk"."2.0.0-rc7" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sdk-2.0.0-rc7";
+    self.by-version."aws-sdk"."2.0.0-rc8";
+  by-version."aws-sdk"."2.0.0-rc8" = lib.makeOverridable self.buildNodePackage {
+    name = "aws-sdk-2.0.0-rc8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc7.tgz";
-        name = "aws-sdk-2.0.0-rc7.tgz";
-        sha1 = "4b367185bd093f2681aea2cfb1e3e85a06fa04cd";
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc8.tgz";
+        name = "aws-sdk-2.0.0-rc8.tgz";
+        sha1 = "30583789843db95ecd090b0d73f42be09fbd6cf3";
       })
     ];
     buildInputs =
@@ -636,16 +636,16 @@
     ];
     passthru.names = [ "aws-sdk" ];
   };
-  "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc7";
+  "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc8";
   by-spec."aws-sdk".">=1.2.0 <2" =
-    self.by-version."aws-sdk"."1.17.2";
-  by-version."aws-sdk"."1.17.2" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sdk-1.17.2";
+    self.by-version."aws-sdk"."1.17.3";
+  by-version."aws-sdk"."1.17.3" = lib.makeOverridable self.buildNodePackage {
+    name = "aws-sdk-1.17.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.17.2.tgz";
-        name = "aws-sdk-1.17.2.tgz";
-        sha1 = "1e9c6ae5baa6f3eca29cece19f199040cd01cd30";
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.17.3.tgz";
+        name = "aws-sdk-1.17.3.tgz";
+        sha1 = "fd0ee0e0222b6a2dc313fa59788ae595fe55dffe";
       })
     ];
     buildInputs =
@@ -973,7 +973,7 @@
       self.by-version."bower-config"."0.5.0"
       self.by-version."bower-endpoint-parser"."0.2.1"
       self.by-version."bower-json"."0.4.0"
-      self.by-version."bower-logger"."0.2.1"
+      self.by-version."bower-logger"."0.2.2"
       self.by-version."bower-registry-client"."0.1.6"
       self.by-version."cardinal"."0.4.4"
       self.by-version."chalk"."0.2.1"
@@ -997,7 +997,7 @@
       self.by-version."request"."2.27.0"
       self.by-version."request-progress"."0.3.1"
       self.by-version."retry"."0.6.0"
-      self.by-version."rimraf"."2.2.5"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."semver"."2.1.0"
       self.by-version."stringify-object"."0.1.7"
       self.by-version."sudo-block"."0.2.1"
@@ -1129,7 +1129,24 @@
     passthru.names = [ "bower-logger" ];
   };
   by-spec."bower-logger"."~0.2.1" =
-    self.by-version."bower-logger"."0.2.1";
+    self.by-version."bower-logger"."0.2.2";
+  by-version."bower-logger"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "bower-logger-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.2.tgz";
+        name = "bower-logger-0.2.2.tgz";
+        sha1 = "39be07e979b2fc8e03a94634205ed9422373d381";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bower-logger" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bower-logger" ];
+  };
   by-spec."bower-registry-client"."~0.1.4" =
     self.by-version."bower-registry-client"."0.1.6";
   by-version."bower-registry-client"."0.1.6" = lib.makeOverridable self.buildNodePackage {
@@ -1150,7 +1167,7 @@
       self.by-version."lru-cache"."2.3.1"
       self.by-version."request"."2.27.0"
       self.by-version."request-replay"."0.2.0"
-      self.by-version."rimraf"."2.2.5"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."mkdirp"."0.3.5"
     ];
     peerDependencies = [
@@ -1226,7 +1243,7 @@
     deps = [
       self.by-version."hat"."0.0.3"
       self.by-version."connect"."2.12.0"
-      self.by-version."request"."2.31.0"
+      self.by-version."request"."2.33.0"
     ];
     peerDependencies = [
     ];
@@ -1279,7 +1296,7 @@
       (fetchurl {
         url = "http://registry.npmjs.org/bson/-/bson-0.2.5.tgz";
         name = "bson-0.2.5.tgz";
-        sha1 = "835b266883fc91e00e440efa2a905e9ac8c6c9f9";
+        sha1 = "500d26d883ddc8e02f2c88011627636111c105c5";
       })
     ];
     buildInputs =
@@ -1350,14 +1367,14 @@
     passthru.names = [ "buffers" ];
   };
   by-spec."buffertools"."*" =
-    self.by-version."buffertools"."2.0.0";
-  by-version."buffertools"."2.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "buffertools-2.0.0";
+    self.by-version."buffertools"."2.0.1";
+  by-version."buffertools"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "buffertools-2.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/buffertools/-/buffertools-2.0.0.tgz";
-        name = "buffertools-2.0.0.tgz";
-        sha1 = "925a0333a6b089e86a58c0c25c9dda8d515b25e8";
+        url = "http://registry.npmjs.org/buffertools/-/buffertools-2.0.1.tgz";
+        name = "buffertools-2.0.1.tgz";
+        sha1 = "4611e6430687e7876330285dd1ae7e7e47b47288";
       })
     ];
     buildInputs =
@@ -1368,7 +1385,7 @@
     ];
     passthru.names = [ "buffertools" ];
   };
-  "buffertools" = self.by-version."buffertools"."2.0.0";
+  "buffertools" = self.by-version."buffertools"."2.0.1";
   by-spec."buffertools".">=1.1.1 <2.0.0" =
     self.by-version."buffertools"."1.1.1";
   by-version."buffertools"."1.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -1680,8 +1697,6 @@
     ];
     passthru.names = [ "cheerio" ];
   };
-  by-spec."cheerio"."~0.12.1" =
-    self.by-version."cheerio"."0.12.4";
   by-spec."cheerio"."~0.13.0" =
     self.by-version."cheerio"."0.13.1";
   by-version."cheerio"."0.13.1" = lib.makeOverridable self.buildNodePackage {
@@ -1822,14 +1837,14 @@
     passthru.names = [ "class-extend" ];
   };
   by-spec."clean-css"."2.0.x" =
-    self.by-version."clean-css"."2.0.6";
-  by-version."clean-css"."2.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "clean-css-2.0.6";
+    self.by-version."clean-css"."2.0.7";
+  by-version."clean-css"."2.0.7" = lib.makeOverridable self.buildNodePackage {
+    name = "clean-css-2.0.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.6.tgz";
-        name = "clean-css-2.0.6.tgz";
-        sha1 = "89f98241ec4026500db7ea3b2e725f9ffaa01ed3";
+        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.7.tgz";
+        name = "clean-css-2.0.7.tgz";
+        sha1 = "b973f1370019ad9b05c456ffc4950a6b95cb38f0";
       })
     ];
     buildInputs =
@@ -1842,7 +1857,7 @@
     passthru.names = [ "clean-css" ];
   };
   by-spec."clean-css"."~2.0.0" =
-    self.by-version."clean-css"."2.0.6";
+    self.by-version."clean-css"."2.0.7";
   by-spec."cli"."0.4.x" =
     self.by-version."cli"."0.4.5";
   by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage {
@@ -2175,6 +2190,25 @@
     ];
     passthru.names = [ "colour" ];
   };
+  by-spec."columnify"."0.1.2" =
+    self.by-version."columnify"."0.1.2";
+  by-version."columnify"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "columnify-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/columnify/-/columnify-0.1.2.tgz";
+        name = "columnify-0.1.2.tgz";
+        sha1 = "ab1a1f1e37b26ba4b87c6920fb717fe51c827042";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."columnify" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "columnify" ];
+  };
   by-spec."combined-stream"."~0.0.4" =
     self.by-version."combined-stream"."0.0.4";
   by-version."combined-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -2578,7 +2612,7 @@
     buildInputs =
       (self.nativeDeps."connect-jade-static" or []);
     deps = [
-      self.by-version."jade"."1.1.4"
+      self.by-version."jade"."1.1.5"
     ];
     peerDependencies = [
     ];
@@ -2658,7 +2692,7 @@
     buildInputs =
       (self.nativeDeps."constantinople" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.8"
+      self.by-version."uglify-js"."2.4.11"
     ];
     peerDependencies = [
     ];
@@ -2870,7 +2904,7 @@
     buildInputs =
       (self.nativeDeps."couch-login" or []);
     deps = [
-      self.by-version."request"."2.31.0"
+      self.by-version."request"."2.33.0"
     ];
     peerDependencies = [
     ];
@@ -3295,15 +3329,15 @@
     ];
     passthru.names = [ "debuglog" ];
   };
-  by-spec."decompress"."~0.1.0" =
-    self.by-version."decompress"."0.1.5";
-  by-version."decompress"."0.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "decompress-0.1.5";
+  by-spec."decompress"."~0.1.5" =
+    self.by-version."decompress"."0.1.6";
+  by-version."decompress"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+    name = "decompress-0.1.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/decompress/-/decompress-0.1.5.tgz";
-        name = "decompress-0.1.5.tgz";
-        sha1 = "0925d42a2164bead83f0822a7a2b4ad02e99c76c";
+        url = "http://registry.npmjs.org/decompress/-/decompress-0.1.6.tgz";
+        name = "decompress-0.1.6.tgz";
+        sha1 = "4db64844d80b615b888ca129d12f8accd1e27286";
       })
     ];
     buildInputs =
@@ -3312,10 +3346,10 @@
       self.by-version."adm-zip"."0.4.3"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."mout"."0.6.0"
-      self.by-version."rimraf"."2.2.5"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."stream-combiner"."0.0.4"
       self.by-version."tar"."0.1.19"
-      self.by-version."temp"."0.6.0"
+      self.by-version."tempfile"."0.1.2"
     ];
     peerDependencies = [
     ];
@@ -3665,24 +3699,24 @@
     passthru.names = [ "domutils" ];
   };
   by-spec."download"."~0.1.6" =
-    self.by-version."download"."0.1.7";
-  by-version."download"."0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "download-0.1.7";
+    self.by-version."download"."0.1.10";
+  by-version."download"."0.1.10" = lib.makeOverridable self.buildNodePackage {
+    name = "download-0.1.10";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/download/-/download-0.1.7.tgz";
-        name = "download-0.1.7.tgz";
-        sha1 = "d2a941a878a6d2fdaba60588ffffadab32b788b4";
+        url = "http://registry.npmjs.org/download/-/download-0.1.10.tgz";
+        name = "download-0.1.10.tgz";
+        sha1 = "732065fc96259abd47543c2711467bcf7ed66af5";
       })
     ];
     buildInputs =
       (self.nativeDeps."download" or []);
     deps = [
-      self.by-version."decompress"."0.1.5"
+      self.by-version."decompress"."0.1.6"
       self.by-version."each-async"."0.1.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."request"."2.25.0"
-      self.by-version."through2"."0.1.0"
+      self.by-version."request"."2.31.0"
+      self.by-version."through2"."0.4.0"
     ];
     peerDependencies = [
     ];
@@ -3921,14 +3955,14 @@
   };
   "escape-html" = self.by-version."escape-html"."1.0.1";
   by-spec."escodegen"."*" =
-    self.by-version."escodegen"."1.0.1";
-  by-version."escodegen"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "escodegen-1.0.1";
+    self.by-version."escodegen"."1.1.0";
+  by-version."escodegen"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "escodegen-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.0.1.tgz";
-        name = "escodegen-1.0.1.tgz";
-        sha1 = "84c92c4a07440271b90e6b78e620973bf721226e";
+        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz";
+        name = "escodegen-1.1.0.tgz";
+        sha1 = "c663923f6e20aad48d0c0fa49f31c6d4f49360cf";
       })
     ];
     buildInputs =
@@ -3967,6 +4001,27 @@
   };
   by-spec."escodegen"."1.0.x" =
     self.by-version."escodegen"."1.0.1";
+  by-version."escodegen"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "escodegen-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.0.1.tgz";
+        name = "escodegen-1.0.1.tgz";
+        sha1 = "84c92c4a07440271b90e6b78e620973bf721226e";
+      })
+    ];
+    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."source-map"."0.1.31"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "escodegen" ];
+  };
   by-spec."esprima"."1.0.x" =
     self.by-version."esprima"."1.0.4";
   by-version."esprima"."1.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -4174,7 +4229,7 @@
       self.by-version."node-swt"."0.1.1"
       self.by-version."node-wsfederation"."0.1.1"
       self.by-version."debug"."0.5.0"
-      self.by-version."express"."3.4.7"
+      self.by-version."express"."3.4.8"
     ];
     peerDependencies = [
     ];
@@ -4200,14 +4255,14 @@
     passthru.names = [ "exit" ];
   };
   by-spec."express"."*" =
-    self.by-version."express"."3.4.7";
-  by-version."express"."3.4.7" = lib.makeOverridable self.buildNodePackage {
-    name = "express-3.4.7";
+    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.7.tgz";
-        name = "express-3.4.7.tgz";
-        sha1 = "3b939c47d2aa44dfecf77d50da2123c5bd313366";
+        url = "http://registry.npmjs.org/express/-/express-3.4.8.tgz";
+        name = "express-3.4.8.tgz";
+        sha1 = "aa7a8986de07053337f4bc5ed9a6453d9cc8e2e1";
       })
     ];
     buildInputs =
@@ -4230,7 +4285,7 @@
     ];
     passthru.names = [ "express" ];
   };
-  "express" = self.by-version."express"."3.4.7";
+  "express" = self.by-version."express"."3.4.8";
   by-spec."express"."2.5.11" =
     self.by-version."express"."2.5.11";
   by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage {
@@ -4315,7 +4370,7 @@
     passthru.names = [ "express" ];
   };
   by-spec."express"."3.x" =
-    self.by-version."express"."3.4.7";
+    self.by-version."express"."3.4.8";
   by-spec."express"."~3.1.1" =
     self.by-version."express"."3.1.2";
   by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -4347,9 +4402,9 @@
     passthru.names = [ "express" ];
   };
   by-spec."express"."~3.4" =
-    self.by-version."express"."3.4.7";
+    self.by-version."express"."3.4.8";
   by-spec."express"."~3.4.4" =
-    self.by-version."express"."3.4.7";
+    self.by-version."express"."3.4.8";
   by-spec."express-form"."*" =
     self.by-version."express-form"."0.10.1";
   by-version."express-form"."0.10.1" = lib.makeOverridable self.buildNodePackage {
@@ -4369,7 +4424,7 @@
       self.by-version."async"."0.2.9"
     ];
     peerDependencies = [
-      self.by-version."express"."3.4.7"
+      self.by-version."express"."3.4.8"
     ];
     passthru.names = [ "express-form" ];
   };
@@ -4597,7 +4652,7 @@
     deps = [
       self.by-version."lodash"."2.1.0"
       self.by-version."iconv-lite"."0.2.11"
-      self.by-version."rimraf"."2.2.5"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."glob"."3.2.8"
       self.by-version."minimatch"."0.2.14"
       self.by-version."findup-sync"."0.1.2"
@@ -4738,14 +4793,14 @@
     passthru.names = [ "follow-redirects" ];
   };
   by-spec."forEachAsync"."~2.2" =
-    self.by-version."forEachAsync"."2.2.0";
-  by-version."forEachAsync"."2.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "forEachAsync-2.2.0";
+    self.by-version."forEachAsync"."2.2.1";
+  by-version."forEachAsync"."2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "forEachAsync-2.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/forEachAsync/-/forEachAsync-2.2.0.tgz";
-        name = "forEachAsync-2.2.0.tgz";
-        sha1 = "093b32ce868cb69f5166dcf331fae074adc71cee";
+        url = "http://registry.npmjs.org/forEachAsync/-/forEachAsync-2.2.1.tgz";
+        name = "forEachAsync-2.2.1.tgz";
+        sha1 = "e3723f00903910e1eb4b1db3ad51b5c64a319fec";
       })
     ];
     buildInputs =
@@ -4757,25 +4812,6 @@
     ];
     passthru.names = [ "forEachAsync" ];
   };
-  by-spec."foreach"."~2.0.1" =
-    self.by-version."foreach"."2.0.4";
-  by-version."foreach"."2.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "foreach-2.0.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/foreach/-/foreach-2.0.4.tgz";
-        name = "foreach-2.0.4.tgz";
-        sha1 = "cc5d0d8ae1d46cc9a555c2682f910977859935df";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."foreach" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "foreach" ];
-  };
   by-spec."forever"."*" =
     self.by-version."forever"."0.10.11";
   by-version."forever"."0.10.11" = lib.makeOverridable self.buildNodePackage {
@@ -5098,7 +5134,7 @@
       self.by-version."ncp"."0.4.2"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."jsonfile"."1.0.1"
-      self.by-version."rimraf"."2.2.5"
+      self.by-version."rimraf"."2.2.6"
     ];
     peerDependencies = [
     ];
@@ -5163,7 +5199,7 @@
     buildInputs =
       (self.nativeDeps."fstream" or []);
     deps = [
-      self.by-version."rimraf"."2.2.5"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."graceful-fs"."2.0.1"
       self.by-version."inherits"."2.0.1"
@@ -5271,7 +5307,7 @@
     ];
     passthru.names = [ "generator-karma" ];
   };
-  by-spec."generator-mocha"."~0.1.1" =
+  by-spec."generator-mocha".">=0.1.0" =
     self.by-version."generator-mocha"."0.1.3";
   by-version."generator-mocha"."0.1.3" = lib.makeOverridable self.buildNodePackage {
     name = "generator-mocha-0.1.3";
@@ -5293,21 +5329,22 @@
     passthru.names = [ "generator-mocha" ];
   };
   by-spec."generator-webapp"."*" =
-    self.by-version."generator-webapp"."0.4.6";
-  by-version."generator-webapp"."0.4.6" = lib.makeOverridable self.buildNodePackage {
-    name = "generator-webapp-0.4.6";
+    self.by-version."generator-webapp"."0.4.7";
+  by-version."generator-webapp"."0.4.7" = lib.makeOverridable self.buildNodePackage {
+    name = "generator-webapp-0.4.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.6.tgz";
-        name = "generator-webapp-0.4.6.tgz";
-        sha1 = "6f51516b615aaf807e221a8ac713845fd680648f";
+        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.7.tgz";
+        name = "generator-webapp-0.4.7.tgz";
+        sha1 = "a42b663cbe289358046038229603e8557b6881e5";
       })
     ];
     buildInputs =
       (self.nativeDeps."generator-webapp" or []);
     deps = [
-      self.by-version."yeoman-generator"."0.14.2"
-      self.by-version."cheerio"."0.12.4"
+      self.by-version."yeoman-generator"."0.16.0"
+      self.by-version."cheerio"."0.13.1"
+      self.by-version."chalk"."0.4.0"
     ];
     peerDependencies = [
       self.by-version."yo"."1.1.2"
@@ -5315,7 +5352,7 @@
     ];
     passthru.names = [ "generator-webapp" ];
   };
-  "generator-webapp" = self.by-version."generator-webapp"."0.4.6";
+  "generator-webapp" = self.by-version."generator-webapp"."0.4.7";
   by-spec."getmac"."~1.0.6" =
     self.by-version."getmac"."1.0.6";
   by-version."getmac"."1.0.6" = lib.makeOverridable self.buildNodePackage {
@@ -5707,7 +5744,7 @@
     buildInputs =
       (self.nativeDeps."grunt-contrib-cssmin" or []);
     deps = [
-      self.by-version."clean-css"."2.0.6"
+      self.by-version."clean-css"."2.0.7"
       self.by-version."grunt-lib-contrib"."0.6.1"
     ];
     peerDependencies = [
@@ -5785,28 +5822,29 @@
   };
   "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.1";
   by-spec."grunt-contrib-uglify"."*" =
-    self.by-version."grunt-contrib-uglify"."0.2.7";
-  by-version."grunt-contrib-uglify"."0.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "grunt-contrib-uglify-0.2.7";
+    self.by-version."grunt-contrib-uglify"."0.3.1";
+  by-version."grunt-contrib-uglify"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-contrib-uglify-0.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.2.7.tgz";
-        name = "grunt-contrib-uglify-0.2.7.tgz";
-        sha1 = "e6bda51e0c40a1459f6cead423c65efd725a1bf7";
+        url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.3.1.tgz";
+        name = "grunt-contrib-uglify-0.3.1.tgz";
+        sha1 = "6ce6836d8e8d4078ae2f2758f46d417241516f51";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-uglify" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.8"
+      self.by-version."uglify-js"."2.4.11"
       self.by-version."grunt-lib-contrib"."0.6.1"
+      self.by-version."chalk"."0.4.0"
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.2"
     ];
     passthru.names = [ "grunt-contrib-uglify" ];
   };
-  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.2.7";
+  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.3.1";
   by-spec."grunt-karma"."*" =
     self.by-version."grunt-karma"."0.7.2";
   by-version."grunt-karma"."0.7.2" = lib.makeOverridable self.buildNodePackage {
@@ -5825,7 +5863,7 @@
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.2"
-      self.by-version."karma"."0.11.12"
+      self.by-version."karma"."0.11.13"
     ];
     passthru.names = [ "grunt-karma" ];
   };
@@ -5866,7 +5904,7 @@
     buildInputs =
       (self.nativeDeps."grunt-sed" or []);
     deps = [
-      self.by-version."replace"."0.2.7"
+      self.by-version."replace"."0.2.8"
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.2"
@@ -5889,7 +5927,7 @@
       (self.nativeDeps."guifi-earth" or []);
     deps = [
       self.by-version."coffee-script"."1.6.3"
-      self.by-version."jade"."1.1.4"
+      self.by-version."jade"."1.1.5"
       self.by-version."q"."1.0.0"
       self.by-version."xml2js"."0.4.1"
       self.by-version."msgpack"."0.2.1"
@@ -5941,15 +5979,15 @@
     ];
     passthru.names = [ "handlebars" ];
   };
-  by-spec."handlebars"."1.2.x" =
-    self.by-version."handlebars"."1.2.1";
-  by-version."handlebars"."1.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "handlebars-1.2.1";
+  by-spec."handlebars"."1.3.x" =
+    self.by-version."handlebars"."1.3.0";
+  by-version."handlebars"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "handlebars-1.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/handlebars/-/handlebars-1.2.1.tgz";
-        name = "handlebars-1.2.1.tgz";
-        sha1 = "0a9016379064f8957779bdc2812869120aba9d98";
+        url = "http://registry.npmjs.org/handlebars/-/handlebars-1.3.0.tgz";
+        name = "handlebars-1.3.0.tgz";
+        sha1 = "9e9b130a93e389491322d975cf3ec1818c37ce34";
       })
     ];
     buildInputs =
@@ -6529,9 +6567,9 @@
       (self.nativeDeps."ibrik" or []);
     deps = [
       self.by-version."coffee-script-redux"."2.0.0-beta4"
-      self.by-version."istanbul"."0.2.3"
+      self.by-version."istanbul"."0.2.4"
       self.by-version."optimist"."0.6.0"
-      self.by-version."escodegen"."1.0.1"
+      self.by-version."escodegen"."1.1.0"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."which"."1.0.5"
       self.by-version."estraverse"."1.5.0"
@@ -6561,25 +6599,6 @@
   };
   by-spec."iconv-lite"."~0.2.11" =
     self.by-version."iconv-lite"."0.2.11";
-  by-spec."indexof"."~0.0.1" =
-    self.by-version."indexof"."0.0.1";
-  by-version."indexof"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "indexof-0.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
-        name = "indexof-0.0.1.tgz";
-        sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."indexof" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "indexof" ];
-  };
   by-spec."inherits"."1" =
     self.by-version."inherits"."1.0.0";
   by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -6665,7 +6684,7 @@
     deps = [
       self.by-version."promzard"."0.2.1"
       self.by-version."read"."1.0.5"
-      self.by-version."read-package-json"."1.1.5"
+      self.by-version."read-package-json"."1.1.6"
       self.by-version."semver"."2.2.1"
       self.by-version."glob"."3.2.8"
     ];
@@ -6808,8 +6827,8 @@
       self.by-version."nconf"."0.6.9"
       self.by-version."fs-walk"."0.0.1"
       self.by-version."async"."0.2.9"
-      self.by-version."express"."3.4.7"
-      self.by-version."jade"."1.1.4"
+      self.by-version."express"."3.4.8"
+      self.by-version."jade"."1.1.5"
       self.by-version."passport"."0.1.18"
       self.by-version."passport-http"."0.2.2"
       self.by-version."js-yaml"."3.0.1"
@@ -6825,44 +6844,6 @@
     passthru.names = [ "ironhorse" ];
   };
   "ironhorse" = self.by-version."ironhorse"."0.0.9";
-  by-spec."is"."~0.2.6" =
-    self.by-version."is"."0.2.7";
-  by-version."is"."0.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "is-0.2.7";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/is/-/is-0.2.7.tgz";
-        name = "is-0.2.7.tgz";
-        sha1 = "3b34a2c48f359972f35042849193ae7264b63562";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."is" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "is" ];
-  };
-  by-spec."is-object"."~0.1.2" =
-    self.by-version."is-object"."0.1.2";
-  by-version."is-object"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "is-object-0.1.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/is-object/-/is-object-0.1.2.tgz";
-        name = "is-object-0.1.2.tgz";
-        sha1 = "00efbc08816c33cfc4ac8251d132e10dc65098d7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."is-object" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "is-object" ];
-  };
   by-spec."is-promise"."~1" =
     self.by-version."is-promise"."1.0.0";
   by-version."is-promise"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -6923,14 +6904,14 @@
     passthru.names = [ "isbinaryfile" ];
   };
   by-spec."istanbul"."*" =
-    self.by-version."istanbul"."0.2.3";
-  by-version."istanbul"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "istanbul-0.2.3";
+    self.by-version."istanbul"."0.2.4";
+  by-version."istanbul"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "istanbul-0.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.3.tgz";
-        name = "istanbul-0.2.3.tgz";
-        sha1 = "bbce67c1d540610e7021becda51d7cbbbecc68cc";
+        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.4.tgz";
+        name = "istanbul-0.2.4.tgz";
+        sha1 = "faaaa400f2cf652c3dc8b3d9484b44a5528e3a04";
       })
     ];
     buildInputs =
@@ -6938,7 +6919,7 @@
     deps = [
       self.by-version."esprima"."1.0.4"
       self.by-version."escodegen"."1.0.1"
-      self.by-version."handlebars"."1.2.1"
+      self.by-version."handlebars"."1.3.0"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."nopt"."2.1.2"
       self.by-version."fileset"."0.1.5"
@@ -6953,7 +6934,7 @@
     ];
     passthru.names = [ "istanbul" ];
   };
-  "istanbul" = self.by-version."istanbul"."0.2.3";
+  "istanbul" = self.by-version."istanbul"."0.2.4";
   by-spec."istanbul"."~0.1.45" =
     self.by-version."istanbul"."0.1.46";
   by-version."istanbul"."0.1.46" = lib.makeOverridable self.buildNodePackage {
@@ -6985,14 +6966,14 @@
     passthru.names = [ "istanbul" ];
   };
   by-spec."jade"."*" =
-    self.by-version."jade"."1.1.4";
-  by-version."jade"."1.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "jade-1.1.4";
+    self.by-version."jade"."1.1.5";
+  by-version."jade"."1.1.5" = lib.makeOverridable self.buildNodePackage {
+    name = "jade-1.1.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jade/-/jade-1.1.4.tgz";
-        name = "jade-1.1.4.tgz";
-        sha1 = "7097f9f17577fa4a1f0b399925dba1752b91cbdc";
+        url = "http://registry.npmjs.org/jade/-/jade-1.1.5.tgz";
+        name = "jade-1.1.5.tgz";
+        sha1 = "e884d3d3565807e280f5ba760f68addb176627a3";
       })
     ];
     buildInputs =
@@ -7010,7 +6991,7 @@
     ];
     passthru.names = [ "jade" ];
   };
-  "jade" = self.by-version."jade"."1.1.4";
+  "jade" = self.by-version."jade"."1.1.5";
   by-spec."jade"."0.26.3" =
     self.by-version."jade"."0.26.3";
   by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage {
@@ -7054,7 +7035,7 @@
     passthru.names = [ "jade" ];
   };
   by-spec."jade".">= 0.0.1" =
-    self.by-version."jade"."1.1.4";
+    self.by-version."jade"."1.1.5";
   by-spec."jade"."~0.35.0" =
     self.by-version."jade"."0.35.0";
   by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage {
@@ -7433,14 +7414,14 @@
     passthru.names = [ "junk" ];
   };
   by-spec."karma"."*" =
-    self.by-version."karma"."0.11.12";
-  by-version."karma"."0.11.12" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-0.11.12";
+    self.by-version."karma"."0.11.13";
+  by-version."karma"."0.11.13" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-0.11.13";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.11.12.tgz";
-        name = "karma-0.11.12.tgz";
-        sha1 = "a3474cb3b5e305c7182729a5d98f259c09d2af77";
+        url = "http://registry.npmjs.org/karma/-/karma-0.11.13.tgz";
+        name = "karma-0.11.13.tgz";
+        sha1 = "f63da4f9d14669c6b3d2d9feb7f4406c4cd004c0";
       })
     ];
     buildInputs =
@@ -7454,7 +7435,7 @@
       self.by-version."http-proxy"."0.10.4"
       self.by-version."optimist"."0.6.0"
       self.by-version."coffee-script"."1.6.3"
-      self.by-version."rimraf"."2.2.5"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."q"."0.9.7"
       self.by-version."colors"."0.6.2"
       self.by-version."lodash"."2.4.1"
@@ -7469,15 +7450,15 @@
     ];
     passthru.names = [ "karma" ];
   };
-  "karma" = self.by-version."karma"."0.11.12";
+  "karma" = self.by-version."karma"."0.11.13";
   by-spec."karma".">=0.11.11" =
-    self.by-version."karma"."0.11.12";
+    self.by-version."karma"."0.11.13";
   by-spec."karma".">=0.9" =
-    self.by-version."karma"."0.11.12";
+    self.by-version."karma"."0.11.13";
   by-spec."karma".">=0.9.3" =
-    self.by-version."karma"."0.11.12";
+    self.by-version."karma"."0.11.13";
   by-spec."karma"."~0.11.0" =
-    self.by-version."karma"."0.11.12";
+    self.by-version."karma"."0.11.13";
   by-spec."karma-chrome-launcher"."*" =
     self.by-version."karma-chrome-launcher"."0.1.2";
   by-version."karma-chrome-launcher"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -7494,7 +7475,7 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.12"
+      self.by-version."karma"."0.11.13"
     ];
     passthru.names = [ "karma-chrome-launcher" ];
   };
@@ -7518,7 +7499,7 @@
       self.by-version."dateformat"."1.0.7-1.2.3"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.12"
+      self.by-version."karma"."0.11.13"
     ];
     passthru.names = [ "karma-coverage" ];
   };
@@ -7540,7 +7521,7 @@
       self.by-version."xmlbuilder"."0.4.2"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.12"
+      self.by-version."karma"."0.11.13"
     ];
     passthru.names = [ "karma-junit-reporter" ];
   };
@@ -7561,7 +7542,7 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.12"
+      self.by-version."karma"."0.11.13"
       self.by-version."mocha"."1.17.0"
     ];
     passthru.names = [ "karma-mocha" ];
@@ -7583,7 +7564,7 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.12"
+      self.by-version."karma"."0.11.13"
       self.by-version."requirejs"."2.1.10"
     ];
     passthru.names = [ "karma-requirejs" ];
@@ -7609,7 +7590,7 @@
       self.by-version."saucelabs"."0.1.1"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.12"
+      self.by-version."karma"."0.11.13"
     ];
     passthru.names = [ "karma-sauce-launcher" ];
   };
@@ -7837,9 +7818,9 @@
       (self.nativeDeps."less" or []);
     deps = [
       self.by-version."mime"."1.2.11"
-      self.by-version."request"."2.31.0"
+      self.by-version."request"."2.33.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."clean-css"."2.0.6"
+      self.by-version."clean-css"."2.0.7"
       self.by-version."source-map"."0.1.31"
     ];
     peerDependencies = [
@@ -8766,7 +8747,7 @@
       (self.nativeDeps."mocha-unfunk-reporter" or []);
     deps = [
       self.by-version."jsesc"."0.4.3"
-      self.by-version."unfunk-diff"."0.0.1"
+      self.by-version."unfunk-diff"."0.0.2"
       self.by-version."miniwrite"."0.1.3"
       self.by-version."ministyle"."0.1.3"
     ];
@@ -9589,9 +9570,9 @@
       self.by-version."semver"."2.1.0"
       self.by-version."sprintf"."0.1.3"
       self.by-version."temp"."0.6.0"
-      self.by-version."wrench"."1.5.4"
+      self.by-version."wrench"."1.5.6"
       self.by-version."uglify-js"."2.3.6"
-      self.by-version."xmldom"."0.1.17"
+      self.by-version."xmldom"."0.1.18"
     ];
     peerDependencies = [
     ];
@@ -9640,8 +9621,8 @@
       self.by-version."nopt"."2.1.2"
       self.by-version."npmlog"."0.0.6"
       self.by-version."osenv"."0.0.3"
-      self.by-version."request"."2.31.0"
-      self.by-version."rimraf"."2.2.5"
+      self.by-version."request"."2.33.0"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."semver"."2.2.1"
       self.by-version."tar"."0.1.19"
       self.by-version."which"."1.0.5"
@@ -9651,7 +9632,7 @@
     passthru.names = [ "node-gyp" ];
   };
   "node-gyp" = self.by-version."node-gyp"."0.12.2";
-  by-spec."node-gyp"."~0.12.0" =
+  by-spec."node-gyp"."~0.12.2" =
     self.by-version."node-gyp"."0.12.2";
   by-spec."node-inspector"."*" =
     self.by-version."node-inspector"."0.7.0-1";
@@ -9668,11 +9649,11 @@
       (self.nativeDeps."node-inspector" or []);
     deps = [
       self.by-version."socket.io"."0.9.16"
-      self.by-version."express"."3.4.7"
+      self.by-version."express"."3.4.8"
       self.by-version."async"."0.2.9"
       self.by-version."glob"."3.2.8"
-      self.by-version."rc"."0.3.2"
-      self.by-version."strong-data-uri"."0.1.0"
+      self.by-version."rc"."0.3.3"
+      self.by-version."strong-data-uri"."0.1.1"
       self.by-version."debug"."0.7.4"
     ];
     peerDependencies = [
@@ -9898,14 +9879,14 @@
     passthru.names = [ "nodemailer" ];
   };
   by-spec."nodemon"."*" =
-    self.by-version."nodemon"."1.0.8";
-  by-version."nodemon"."1.0.8" = lib.makeOverridable self.buildNodePackage {
-    name = "nodemon-1.0.8";
+    self.by-version."nodemon"."1.0.13";
+  by-version."nodemon"."1.0.13" = lib.makeOverridable self.buildNodePackage {
+    name = "nodemon-1.0.13";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.8.tgz";
-        name = "nodemon-1.0.8.tgz";
-        sha1 = "fa737c8f0f331ee77c23f993ce3205615f0d27f9";
+        url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.13.tgz";
+        name = "nodemon-1.0.13.tgz";
+        sha1 = "7ff62ddf0ba03b572fbc22901b33d53531034410";
       })
     ];
     buildInputs =
@@ -9918,7 +9899,7 @@
     ];
     passthru.names = [ "nodemon" ];
   };
-  "nodemon" = self.by-version."nodemon"."1.0.8";
+  "nodemon" = self.by-version."nodemon"."1.0.13";
   by-spec."nomnom"."1.6.x" =
     self.by-version."nomnom"."1.6.2";
   by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage {
@@ -9988,9 +9969,9 @@
     name = "nopt-1.0.10";
     src = [
       (fetchurl {
-        url = "https://github.com/Filirom1/nopt/tarball/master#pull-request-in-progress";
+        url = "http://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
         name = "nopt-1.0.10.tgz";
-        sha256 = "94daa53a0ab7668be12931b7b551c924c913d1efef7f2a05e60704c9b90a7bad";
+        sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       })
     ];
     buildInputs =
@@ -10031,14 +10012,14 @@
     passthru.names = [ "normalize-package-data" ];
   };
   by-spec."npm"."*" =
-    self.by-version."npm"."1.3.23";
-  by-version."npm"."1.3.23" = lib.makeOverridable self.buildNodePackage {
-    name = "npm-1.3.23";
+    self.by-version."npm"."1.3.24";
+  by-version."npm"."1.3.24" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-1.3.24";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm/-/npm-1.3.23.tgz";
-        name = "npm-1.3.23.tgz";
-        sha1 = "8463ddbc060169b48890d639c4be9c839b8a0f3d";
+        url = "http://registry.npmjs.org/npm/-/npm-1.3.24.tgz";
+        name = "npm-1.3.24.tgz";
+        sha1 = "d68273a343562aa969320a218f528930356d99de";
       })
     ];
     buildInputs =
@@ -10051,7 +10032,7 @@
       self.by-version."graceful-fs"."2.0.1"
       self.by-version."minimatch"."0.2.14"
       self.by-version."nopt"."2.1.2"
-      self.by-version."rimraf"."2.2.5"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."request"."2.30.0"
       self.by-version."which"."1.0.5"
       self.by-version."tar"."0.1.19"
@@ -10068,7 +10049,7 @@
       self.by-version."npmlog"."0.0.6"
       self.by-version."ansi"."0.2.1"
       self.by-version."npm-registry-client"."0.3.3"
-      self.by-version."read-package-json"."1.1.5"
+      self.by-version."read-package-json"."1.1.6"
       self.by-version."read-installed"."0.2.5"
       self.by-version."glob"."3.2.8"
       self.by-version."init-package-json"."0.0.14"
@@ -10090,14 +10071,15 @@
       self.by-version."ansicolors"."0.3.2"
       self.by-version."ansistyles"."0.1.3"
       self.by-version."path-is-inside"."1.0.0"
+      self.by-version."columnify"."0.1.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm" ];
   };
-  "npm" = self.by-version."npm"."1.3.23";
+  "npm" = self.by-version."npm"."1.3.24";
   by-spec."npm"."~1.3.14" =
-    self.by-version."npm"."1.3.23";
+    self.by-version."npm"."1.3.24";
   by-spec."npm-registry-client"."0.2.27" =
     self.by-version."npm-registry-client"."0.2.27";
   by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage {
@@ -10112,13 +10094,13 @@
     buildInputs =
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
-      self.by-version."request"."2.31.0"
+      self.by-version."request"."2.33.0"
       self.by-version."graceful-fs"."2.0.1"
       self.by-version."semver"."2.0.11"
       self.by-version."slide"."1.1.5"
       self.by-version."chownr"."0.0.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.5"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."retry"."0.6.0"
       self.by-version."couch-login"."0.1.19"
       self.by-version."npmlog"."0.0.6"
@@ -10127,7 +10109,7 @@
     ];
     passthru.names = [ "npm-registry-client" ];
   };
-  by-spec."npm-registry-client"."~0.3.2" =
+  by-spec."npm-registry-client"."~0.3.3" =
     self.by-version."npm-registry-client"."0.3.3";
   by-version."npm-registry-client"."0.3.3" = lib.makeOverridable self.buildNodePackage {
     name = "npm-registry-client-0.3.3";
@@ -10141,13 +10123,13 @@
     buildInputs =
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
-      self.by-version."request"."2.31.0"
+      self.by-version."request"."2.33.0"
       self.by-version."graceful-fs"."2.0.1"
       self.by-version."semver"."2.2.1"
       self.by-version."slide"."1.1.5"
       self.by-version."chownr"."0.0.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.5"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."retry"."0.6.0"
       self.by-version."couch-login"."0.1.19"
       self.by-version."npmlog"."0.0.6"
@@ -10257,7 +10239,7 @@
     ];
     passthru.names = [ "npmconf" ];
   };
-  by-spec."npmconf"."~0.1.2" =
+  by-spec."npmconf"."~0.1.12" =
     self.by-version."npmconf"."0.1.12";
   by-version."npmconf"."0.1.12" = lib.makeOverridable self.buildNodePackage {
     name = "npmconf-0.1.12";
@@ -10284,7 +10266,7 @@
     ];
     passthru.names = [ "npmconf" ];
   };
-  by-spec."npmconf"."~0.1.7" =
+  by-spec."npmconf"."~0.1.2" =
     self.by-version."npmconf"."0.1.12";
   by-spec."npmlog"."*" =
     self.by-version."npmlog"."0.0.6";
@@ -10407,23 +10389,20 @@
     ];
     passthru.names = [ "object-additions" ];
   };
-  by-spec."object-keys"."~0.2.0" =
-    self.by-version."object-keys"."0.2.0";
-  by-version."object-keys"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "object-keys-0.2.0";
+  by-spec."object-keys"."~0.4.0" =
+    self.by-version."object-keys"."0.4.0";
+  by-version."object-keys"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "object-keys-0.4.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/object-keys/-/object-keys-0.2.0.tgz";
-        name = "object-keys-0.2.0.tgz";
-        sha1 = "cddec02998b091be42bf1035ae32e49f1cb6ea67";
+        url = "http://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz";
+        name = "object-keys-0.4.0.tgz";
+        sha1 = "28a6aae7428dd2c3a92f3d95f21335dd204e0336";
       })
     ];
     buildInputs =
       (self.nativeDeps."object-keys" or []);
     deps = [
-      self.by-version."foreach"."2.0.4"
-      self.by-version."indexof"."0.0.1"
-      self.by-version."is"."0.2.7"
     ];
     peerDependencies = [
     ];
@@ -10894,7 +10873,7 @@
       self.by-version."ncp"."0.4.2"
       self.by-version."npmconf"."0.0.24"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.5"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
@@ -11126,14 +11105,14 @@
     passthru.names = [ "proto-list" ];
   };
   by-spec."protobufjs".">= 1.1.4" =
-    self.by-version."protobufjs"."2.0.3";
-  by-version."protobufjs"."2.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "protobufjs-2.0.3";
+    self.by-version."protobufjs"."2.0.4";
+  by-version."protobufjs"."2.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "protobufjs-2.0.4";
     src = [
       (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.3.tgz";
-        name = "protobufjs-2.0.3.tgz";
-        sha1 = "a33bfa95cee12b182ef08c6f3e0a0b296167a67f";
+        url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.4.tgz";
+        name = "protobufjs-2.0.4.tgz";
+        sha1 = "109de55527459ce5bc91d72f1fd86b5a9c7f1058";
       })
     ];
     buildInputs =
@@ -11529,14 +11508,14 @@
   };
   "rbytes" = self.by-version."rbytes"."1.0.0";
   by-spec."rc"."~0.3.0" =
-    self.by-version."rc"."0.3.2";
-  by-version."rc"."0.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "rc-0.3.2";
+    self.by-version."rc"."0.3.3";
+  by-version."rc"."0.3.3" = lib.makeOverridable self.buildNodePackage {
+    name = "rc-0.3.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rc/-/rc-0.3.2.tgz";
-        name = "rc-0.3.2.tgz";
-        sha1 = "cd8f895690f764621ccec110516b225286e8f69f";
+        url = "http://registry.npmjs.org/rc/-/rc-0.3.3.tgz";
+        name = "rc-0.3.3.tgz";
+        sha1 = "2eac52d221dfdf5ba512def3ea27500a68dc3c07";
       })
     ];
     buildInputs =
@@ -11551,7 +11530,7 @@
     passthru.names = [ "rc" ];
   };
   by-spec."rc"."~0.3.1" =
-    self.by-version."rc"."0.3.2";
+    self.by-version."rc"."0.3.3";
   by-spec."read"."1" =
     self.by-version."read"."1.0.5";
   by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -11594,7 +11573,7 @@
     deps = [
       self.by-version."semver"."2.2.1"
       self.by-version."slide"."1.1.5"
-      self.by-version."read-package-json"."1.1.5"
+      self.by-version."read-package-json"."1.1.6"
       self.by-version."graceful-fs"."1.2.3"
     ];
     peerDependencies = [
@@ -11617,7 +11596,7 @@
     deps = [
       self.by-version."semver"."2.2.1"
       self.by-version."slide"."1.1.5"
-      self.by-version."read-package-json"."1.1.5"
+      self.by-version."read-package-json"."1.1.6"
       self.by-version."graceful-fs"."2.0.1"
     ];
     peerDependencies = [
@@ -11625,14 +11604,14 @@
     passthru.names = [ "read-installed" ];
   };
   by-spec."read-package-json"."1" =
-    self.by-version."read-package-json"."1.1.5";
-  by-version."read-package-json"."1.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "read-package-json-1.1.5";
+    self.by-version."read-package-json"."1.1.6";
+  by-version."read-package-json"."1.1.6" = lib.makeOverridable self.buildNodePackage {
+    name = "read-package-json-1.1.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.5.tgz";
-        name = "read-package-json-1.1.5.tgz";
-        sha1 = "f6a7a5820cc958ff02495badc55f7fe49a7677a1";
+        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.6.tgz";
+        name = "read-package-json-1.1.6.tgz";
+        sha1 = "a851dbbaca48ff78a87f890f0a9fdf43b1759d5a";
       })
     ];
     buildInputs =
@@ -11647,8 +11626,8 @@
     ];
     passthru.names = [ "read-package-json" ];
   };
-  by-spec."read-package-json"."~1.1.4" =
-    self.by-version."read-package-json"."1.1.5";
+  by-spec."read-package-json"."~1.1.6" =
+    self.by-version."read-package-json"."1.1.6";
   by-spec."readable-stream"."1.0" =
     self.by-version."readable-stream"."1.0.24";
   by-version."readable-stream"."1.0.24" = lib.makeOverridable self.buildNodePackage {
@@ -11689,6 +11668,8 @@
     ];
     passthru.names = [ "readable-stream" ];
   };
+  by-spec."readable-stream"."~1.0.17" =
+    self.by-version."readable-stream"."1.0.24";
   by-spec."readable-stream"."~1.0.2" =
     self.by-version."readable-stream"."1.0.24";
   by-spec."readable-stream"."~1.1.8" =
@@ -11875,14 +11856,14 @@
     passthru.names = [ "regexp-clone" ];
   };
   by-spec."replace"."~0.2.4" =
-    self.by-version."replace"."0.2.7";
-  by-version."replace"."0.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "replace-0.2.7";
+    self.by-version."replace"."0.2.8";
+  by-version."replace"."0.2.8" = lib.makeOverridable self.buildNodePackage {
+    name = "replace-0.2.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/replace/-/replace-0.2.7.tgz";
-        name = "replace-0.2.7.tgz";
-        sha1 = "e22d08a9e2e6764337bb530166a4dd89c2558fda";
+        url = "http://registry.npmjs.org/replace/-/replace-0.2.8.tgz";
+        name = "replace-0.2.8.tgz";
+        sha1 = "05fadc9800bf0e91459c229e867bdd9eac1a6d3d";
       })
     ];
     buildInputs =
@@ -11897,14 +11878,14 @@
     passthru.names = [ "replace" ];
   };
   by-spec."request"."2" =
-    self.by-version."request"."2.31.0";
-  by-version."request"."2.31.0" = lib.makeOverridable self.buildNodePackage {
-    name = "request-2.31.0";
+    self.by-version."request"."2.33.0";
+  by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.33.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.31.0.tgz";
-        name = "request-2.31.0.tgz";
-        sha1 = "4c8ac967c9a4b9410cb4ba1a61fdb644267eeeff";
+        url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz";
+        name = "request-2.33.0.tgz";
+        sha1 = "5167878131726070ec633752ea230a2379dc65ff";
       })
     ];
     buildInputs =
@@ -11915,7 +11896,7 @@
       self.by-version."forever-agent"."0.5.0"
       self.by-version."node-uuid"."1.4.1"
       self.by-version."mime"."1.2.11"
-      self.by-version."tough-cookie"."0.9.15"
+      self.by-version."tough-cookie"."0.12.1"
       self.by-version."form-data"."0.1.2"
       self.by-version."tunnel-agent"."0.3.0"
       self.by-version."http-signature"."0.10.0"
@@ -11928,9 +11909,9 @@
     passthru.names = [ "request" ];
   };
   by-spec."request"."2 >=2.20.0" =
-    self.by-version."request"."2.31.0";
+    self.by-version."request"."2.33.0";
   by-spec."request"."2 >=2.25.0" =
-    self.by-version."request"."2.31.0";
+    self.by-version."request"."2.33.0";
   by-spec."request"."2.16.2" =
     self.by-version."request"."2.16.2";
   by-version."request"."2.16.2" = lib.makeOverridable self.buildNodePackage {
@@ -12011,9 +11992,9 @@
     passthru.names = [ "request" ];
   };
   by-spec."request".">=2.12.0" =
-    self.by-version."request"."2.31.0";
+    self.by-version."request"."2.33.0";
   by-spec."request"."~2" =
-    self.by-version."request"."2.31.0";
+    self.by-version."request"."2.33.0";
   by-spec."request"."~2.21.0" =
     self.by-version."request"."2.21.0";
   by-version."request"."2.21.0" = lib.makeOverridable self.buildNodePackage {
@@ -12138,6 +12119,37 @@
     ];
     passthru.names = [ "request" ];
   };
+  by-spec."request"."~2.31.0" =
+    self.by-version."request"."2.31.0";
+  by-version."request"."2.31.0" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.31.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.31.0.tgz";
+        name = "request-2.31.0.tgz";
+        sha1 = "4c8ac967c9a4b9410cb4ba1a61fdb644267eeeff";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request" or []);
+    deps = [
+      self.by-version."qs"."0.6.6"
+      self.by-version."json-stringify-safe"."5.0.0"
+      self.by-version."forever-agent"."0.5.0"
+      self.by-version."node-uuid"."1.4.1"
+      self.by-version."mime"."1.2.11"
+      self.by-version."tough-cookie"."0.9.15"
+      self.by-version."form-data"."0.1.2"
+      self.by-version."tunnel-agent"."0.3.0"
+      self.by-version."http-signature"."0.10.0"
+      self.by-version."oauth-sign"."0.3.0"
+      self.by-version."hawk"."1.0.0"
+      self.by-version."aws-sign2"."0.5.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
   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 {
@@ -12293,26 +12305,26 @@
     passthru.names = [ "restify" ];
   };
   by-spec."rethinkdb"."*" =
-    self.by-version."rethinkdb"."1.11.0-1";
-  by-version."rethinkdb"."1.11.0-1" = lib.makeOverridable self.buildNodePackage {
-    name = "rethinkdb-1.11.0-1";
+    self.by-version."rethinkdb"."1.11.0-3";
+  by-version."rethinkdb"."1.11.0-3" = lib.makeOverridable self.buildNodePackage {
+    name = "rethinkdb-1.11.0-3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.11.0-1.tgz";
-        name = "rethinkdb-1.11.0-1.tgz";
-        sha1 = "beab3376b9efa9ecf7f2fbf39c58ce80c8bd5dfd";
+        url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.11.0-3.tgz";
+        name = "rethinkdb-1.11.0-3.tgz";
+        sha1 = "6db00acf53b6fa75b0183b01fa2d7cb24f027881";
       })
     ];
     buildInputs =
       (self.nativeDeps."rethinkdb" or []);
     deps = [
-      self.by-version."protobufjs"."2.0.3"
+      self.by-version."protobufjs"."2.0.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "rethinkdb" ];
   };
-  "rethinkdb" = self.by-version."rethinkdb"."1.11.0-1";
+  "rethinkdb" = self.by-version."rethinkdb"."1.11.0-3";
   by-spec."retry"."0.6.0" =
     self.by-version."retry"."0.6.0";
   by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -12373,14 +12385,14 @@
     passthru.names = [ "rimraf" ];
   };
   by-spec."rimraf"."2" =
-    self.by-version."rimraf"."2.2.5";
-  by-version."rimraf"."2.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "rimraf-2.2.5";
+    self.by-version."rimraf"."2.2.6";
+  by-version."rimraf"."2.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "rimraf-2.2.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.5.tgz";
-        name = "rimraf-2.2.5.tgz";
-        sha1 = "4e5c4f667b121afa806d0c5b58920996f9478aa0";
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz";
+        name = "rimraf-2.2.6.tgz";
+        sha1 = "c59597569b14d956ad29cacc42bdddf5f0ea4f4c";
       })
     ];
     buildInputs =
@@ -12392,9 +12404,9 @@
     passthru.names = [ "rimraf" ];
   };
   by-spec."rimraf"."2.x.x" =
-    self.by-version."rimraf"."2.2.5";
+    self.by-version."rimraf"."2.2.6";
   by-spec."rimraf"."~2" =
-    self.by-version."rimraf"."2.2.5";
+    self.by-version."rimraf"."2.2.6";
   by-spec."rimraf"."~2.0.2" =
     self.by-version."rimraf"."2.0.3";
   by-version."rimraf"."2.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -12438,11 +12450,11 @@
     passthru.names = [ "rimraf" ];
   };
   by-spec."rimraf"."~2.2.0" =
-    self.by-version."rimraf"."2.2.5";
+    self.by-version."rimraf"."2.2.6";
   by-spec."rimraf"."~2.2.2" =
-    self.by-version."rimraf"."2.2.5";
+    self.by-version."rimraf"."2.2.6";
   by-spec."rimraf"."~2.2.5" =
-    self.by-version."rimraf"."2.2.5";
+    self.by-version."rimraf"."2.2.6";
   by-spec."s3http"."*" =
     self.by-version."s3http"."0.0.4";
   by-version."s3http"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -12457,7 +12469,7 @@
     buildInputs =
       (self.nativeDeps."s3http" or []);
     deps = [
-      self.by-version."aws-sdk"."1.17.2"
+      self.by-version."aws-sdk"."1.17.3"
       self.by-version."commander"."2.0.0"
       self.by-version."http-auth"."2.0.7"
       self.by-version."express"."3.4.4"
@@ -12754,6 +12766,25 @@
   by-spec."send"."0.1.4" =
     self.by-version."send"."0.1.4";
   by-spec."sequence"."*" =
+    self.by-version."sequence"."3.0.0";
+  by-version."sequence"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "sequence-3.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sequence/-/sequence-3.0.0.tgz";
+        name = "sequence-3.0.0.tgz";
+        sha1 = "5957d3e03c70e270b2009a8c8bdaa97338a6e170";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sequence" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sequence" ];
+  };
+  by-spec."sequence"."2.x" =
     self.by-version."sequence"."2.2.1";
   by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage {
     name = "sequence-2.2.1";
@@ -12772,8 +12803,6 @@
     ];
     passthru.names = [ "sequence" ];
   };
-  by-spec."sequence".">= 2.2.1" =
-    self.by-version."sequence"."2.2.1";
   by-spec."sha"."~1.2.1" =
     self.by-version."sha"."1.2.3";
   by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -12836,14 +12865,14 @@
     passthru.names = [ "shelljs" ];
   };
   by-spec."should"."*" =
-    self.by-version."should"."2.1.1";
-  by-version."should"."2.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "should-2.1.1";
+    self.by-version."should"."3.0.1";
+  by-version."should"."3.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "should-3.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/should/-/should-2.1.1.tgz";
-        name = "should-2.1.1.tgz";
-        sha1 = "c648b13a8b464465c2f838ea0c93f12e4ae06c6b";
+        url = "http://registry.npmjs.org/should/-/should-3.0.1.tgz";
+        name = "should-3.0.1.tgz";
+        sha1 = "b30fff8968b4701e2ea499de91d9b0ea4d37623e";
       })
     ];
     buildInputs =
@@ -12854,7 +12883,7 @@
     ];
     passthru.names = [ "should" ];
   };
-  "should" = self.by-version."should"."2.1.1";
+  "should" = self.by-version."should"."3.0.1";
   by-spec."sigmund"."~1.0.0" =
     self.by-version."sigmund"."1.0.0";
   by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -13537,14 +13566,14 @@
     passthru.names = [ "strip-ansi" ];
   };
   by-spec."strong-data-uri"."~0.1.0" =
-    self.by-version."strong-data-uri"."0.1.0";
-  by-version."strong-data-uri"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "strong-data-uri-0.1.0";
+    self.by-version."strong-data-uri"."0.1.1";
+  by-version."strong-data-uri"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "strong-data-uri-0.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/strong-data-uri/-/strong-data-uri-0.1.0.tgz";
-        name = "strong-data-uri-0.1.0.tgz";
-        sha1 = "a41235806b8c3bf0f6f324dc57dfe85bbab681a0";
+        url = "http://registry.npmjs.org/strong-data-uri/-/strong-data-uri-0.1.1.tgz";
+        name = "strong-data-uri-0.1.1.tgz";
+        sha1 = "8660241807461d1d2dd247c70563f2f33e66c8ab";
       })
     ];
     buildInputs =
@@ -13557,14 +13586,14 @@
     passthru.names = [ "strong-data-uri" ];
   };
   by-spec."stylus"."*" =
-    self.by-version."stylus"."0.42.0";
-  by-version."stylus"."0.42.0" = lib.makeOverridable self.buildNodePackage {
-    name = "stylus-0.42.0";
+    self.by-version."stylus"."0.42.1";
+  by-version."stylus"."0.42.1" = lib.makeOverridable self.buildNodePackage {
+    name = "stylus-0.42.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stylus/-/stylus-0.42.0.tgz";
-        name = "stylus-0.42.0.tgz";
-        sha1 = "5dc4d50dd205dbb7e6af6bf7f19546da24148e44";
+        url = "http://registry.npmjs.org/stylus/-/stylus-0.42.1.tgz";
+        name = "stylus-0.42.1.tgz";
+        sha1 = "8e5bfec922e8d0037748cd05281d53ca602b6e4f";
       })
     ];
     buildInputs =
@@ -13580,7 +13609,7 @@
     ];
     passthru.names = [ "stylus" ];
   };
-  "stylus" = self.by-version."stylus"."0.42.0";
+  "stylus" = self.by-version."stylus"."0.42.1";
   by-spec."stylus"."0.27.2" =
     self.by-version."stylus"."0.27.2";
   by-version."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage {
@@ -13723,14 +13752,14 @@
     passthru.names = [ "superagent" ];
   };
   by-spec."supertest"."*" =
-    self.by-version."supertest"."0.8.3";
-  by-version."supertest"."0.8.3" = lib.makeOverridable self.buildNodePackage {
-    name = "supertest-0.8.3";
+    self.by-version."supertest"."0.9.0";
+  by-version."supertest"."0.9.0" = lib.makeOverridable self.buildNodePackage {
+    name = "supertest-0.9.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/supertest/-/supertest-0.8.3.tgz";
-        name = "supertest-0.8.3.tgz";
-        sha1 = "7af32af5bd74514f3fabc444facc9858ae438593";
+        url = "http://registry.npmjs.org/supertest/-/supertest-0.9.0.tgz";
+        name = "supertest-0.9.0.tgz";
+        sha1 = "955efa32ad01fb9eecfc6f7c3122699a5843bba4";
       })
     ];
     buildInputs =
@@ -13743,7 +13772,7 @@
     ];
     passthru.names = [ "supertest" ];
   };
-  "supertest" = self.by-version."supertest"."0.8.3";
+  "supertest" = self.by-version."supertest"."0.9.0";
   by-spec."swig"."0.14.x" =
     self.by-version."swig"."0.14.0";
   by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage {
@@ -13865,6 +13894,26 @@
     self.by-version."temp"."0.6.0";
   by-spec."temp"."~0.6.0" =
     self.by-version."temp"."0.6.0";
+  by-spec."tempfile"."~0.1.2" =
+    self.by-version."tempfile"."0.1.2";
+  by-version."tempfile"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "tempfile-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tempfile/-/tempfile-0.1.2.tgz";
+        name = "tempfile-0.1.2.tgz";
+        sha1 = "81d4e51f35856592f3b51d568135791af3b038e0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tempfile" or []);
+    deps = [
+      self.by-version."uuid"."1.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tempfile" ];
+  };
   by-spec."text-table"."~0.1.1" =
     self.by-version."text-table"."0.1.1";
   by-version."text-table"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -13941,22 +13990,22 @@
     ];
     passthru.names = [ "through" ];
   };
-  by-spec."through2"."~0.1.0" =
-    self.by-version."through2"."0.1.0";
-  by-version."through2"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "through2-0.1.0";
+  by-spec."through2"."~0.4.0" =
+    self.by-version."through2"."0.4.0";
+  by-version."through2"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "through2-0.4.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/through2/-/through2-0.1.0.tgz";
-        name = "through2-0.1.0.tgz";
-        sha1 = "54e756cc6a543c72bb5adf55e8a248686b84c9cc";
+        url = "http://registry.npmjs.org/through2/-/through2-0.4.0.tgz";
+        name = "through2-0.4.0.tgz";
+        sha1 = "4c9a96e385ef082a86cce5b915ef512119bc5225";
       })
     ];
     buildInputs =
       (self.nativeDeps."through2" or []);
     deps = [
       self.by-version."readable-stream"."1.0.24"
-      self.by-version."xtend"."2.0.6"
+      self.by-version."xtend"."2.1.2"
     ];
     peerDependencies = [
     ];
@@ -14020,15 +14069,15 @@
     ];
     passthru.names = [ "tinycolor" ];
   };
-  by-spec."titanium"."*" =
-    self.by-version."titanium"."3.2.1-beta";
-  by-version."titanium"."3.2.1-beta" = lib.makeOverridable self.buildNodePackage {
-    name = "titanium-3.2.1-beta";
+  by-spec."titanium"."3.2.0" =
+    self.by-version."titanium"."3.2.0";
+  by-version."titanium"."3.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "titanium-3.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/titanium/-/titanium-3.2.1-beta.tgz";
-        name = "titanium-3.2.1-beta.tgz";
-        sha1 = "3d92e09ea627584f11bec903052c6501f85ee8fa";
+        url = "http://registry.npmjs.org/titanium/-/titanium-3.2.0.tgz";
+        name = "titanium-3.2.0.tgz";
+        sha1 = "97b25af99e99d4543f5cc2c7025b2c2f6199de6e";
       })
     ];
     buildInputs =
@@ -14048,13 +14097,13 @@
       self.by-version."sprintf"."0.1.3"
       self.by-version."temp"."0.6.0"
       self.by-version."winston"."0.6.2"
-      self.by-version."wrench"."1.5.4"
+      self.by-version."wrench"."1.5.6"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "titanium" ];
   };
-  "titanium" = self.by-version."titanium"."3.2.1-beta";
+  "titanium" = self.by-version."titanium"."3.2.0";
   by-spec."tmp"."~0.0.20" =
     self.by-version."tmp"."0.0.23";
   by-version."tmp"."0.0.23" = lib.makeOverridable self.buildNodePackage {
@@ -14094,6 +14143,26 @@
     ];
     passthru.names = [ "touch" ];
   };
+  by-spec."tough-cookie".">=0.12.0" =
+    self.by-version."tough-cookie"."0.12.1";
+  by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage {
+    name = "tough-cookie-0.12.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz";
+        name = "tough-cookie-0.12.1.tgz";
+        sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tough-cookie" or []);
+    deps = [
+      self.by-version."punycode"."1.2.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tough-cookie" ];
+  };
   by-spec."tough-cookie"."~0.9.15" =
     self.by-version."tough-cookie"."0.9.15";
   by-version."tough-cookie"."0.9.15" = lib.makeOverridable self.buildNodePackage {
@@ -14357,14 +14426,14 @@
   by-spec."uglify-js"."~2.3.6" =
     self.by-version."uglify-js"."2.3.6";
   by-spec."uglify-js"."~2.4.0" =
-    self.by-version."uglify-js"."2.4.8";
-  by-version."uglify-js"."2.4.8" = lib.makeOverridable self.buildNodePackage {
-    name = "uglify-js-2.4.8";
+    self.by-version."uglify-js"."2.4.11";
+  by-version."uglify-js"."2.4.11" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-2.4.11";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.8.tgz";
-        name = "uglify-js-2.4.8.tgz";
-        sha1 = "70e33bd9bce9a27b896fd4fead4c7da434fcca09";
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.11.tgz";
+        name = "uglify-js-2.4.11.tgz";
+        sha1 = "ff2c824be664b715c1054e890b4b9027ed45b5c5";
       })
     ];
     buildInputs =
@@ -14532,14 +14601,14 @@
   by-spec."underscore.string"."~2.3.3" =
     self.by-version."underscore.string"."2.3.3";
   by-spec."unfunk-diff"."~0.0.1" =
-    self.by-version."unfunk-diff"."0.0.1";
-  by-version."unfunk-diff"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "unfunk-diff-0.0.1";
+    self.by-version."unfunk-diff"."0.0.2";
+  by-version."unfunk-diff"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "unfunk-diff-0.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/unfunk-diff/-/unfunk-diff-0.0.1.tgz";
-        name = "unfunk-diff-0.0.1.tgz";
-        sha1 = "fd01490b7e53bc268f069f222fda10704c8f1265";
+        url = "http://registry.npmjs.org/unfunk-diff/-/unfunk-diff-0.0.2.tgz";
+        name = "unfunk-diff-0.0.2.tgz";
+        sha1 = "8560d6b5cb3dcb1ed4d541e7fe59cea514697578";
       })
     ];
     buildInputs =
@@ -14567,7 +14636,7 @@
     buildInputs =
       (self.nativeDeps."ungit" or []);
     deps = [
-      self.by-version."express"."3.4.7"
+      self.by-version."express"."3.4.8"
       self.by-version."superagent"."0.15.7"
       self.by-version."lodash"."2.3.0"
       self.by-version."temp"."0.6.0"
@@ -14575,12 +14644,12 @@
       self.by-version."moment"."2.4.0"
       self.by-version."async"."0.2.9"
       self.by-version."ssh2"."0.2.16"
-      self.by-version."rc"."0.3.2"
+      self.by-version."rc"."0.3.3"
       self.by-version."uuid"."1.4.1"
       self.by-version."winston"."0.7.2"
       self.by-version."passport"."0.1.17"
       self.by-version."passport-local"."0.1.6"
-      self.by-version."npm"."1.3.23"
+      self.by-version."npm"."1.3.24"
       self.by-version."semver"."2.2.1"
       self.by-version."forever-monitor"."1.1.0"
       self.by-version."open"."0.0.4"
@@ -14729,7 +14798,7 @@
       self.by-version."i"."0.3.2"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."ncp"."0.4.2"
-      self.by-version."rimraf"."2.2.5"
+      self.by-version."rimraf"."2.2.6"
     ];
     peerDependencies = [
     ];
@@ -14760,6 +14829,8 @@
     ];
     passthru.names = [ "uuid" ];
   };
+  by-spec."uuid"."~1.4.0" =
+    self.by-version."uuid"."1.4.1";
   by-spec."validator"."0.4.x" =
     self.by-version."validator"."0.4.28";
   by-version."validator"."0.4.28" = lib.makeOverridable self.buildNodePackage {
@@ -14934,7 +15005,7 @@
     buildInputs =
       (self.nativeDeps."walk" or []);
     deps = [
-      self.by-version."forEachAsync"."2.2.0"
+      self.by-version."forEachAsync"."2.2.1"
     ];
     peerDependencies = [
     ];
@@ -15113,7 +15184,7 @@
     buildInputs =
       (self.nativeDeps."winser" or []);
     deps = [
-      self.by-version."sequence"."2.2.1"
+      self.by-version."sequence"."3.0.0"
       self.by-version."commander"."2.1.0"
     ];
     peerDependencies = [
@@ -15283,14 +15354,14 @@
     passthru.names = [ "wrench" ];
   };
   by-spec."wrench"."~1.5.0" =
-    self.by-version."wrench"."1.5.4";
-  by-version."wrench"."1.5.4" = lib.makeOverridable self.buildNodePackage {
-    name = "wrench-1.5.4";
+    self.by-version."wrench"."1.5.6";
+  by-version."wrench"."1.5.6" = lib.makeOverridable self.buildNodePackage {
+    name = "wrench-1.5.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wrench/-/wrench-1.5.4.tgz";
-        name = "wrench-1.5.4.tgz";
-        sha1 = "2e8d9d3db3568cc1c001a4c8dceca772e5d21643";
+        url = "http://registry.npmjs.org/wrench/-/wrench-1.5.6.tgz";
+        name = "wrench-1.5.6.tgz";
+        sha1 = "247b7dfe5d7d4374d5e449761fba634190d9b871";
       })
     ];
     buildInputs =
@@ -15302,7 +15373,7 @@
     passthru.names = [ "wrench" ];
   };
   by-spec."wrench"."~1.5.4" =
-    self.by-version."wrench"."1.5.4";
+    self.by-version."wrench"."1.5.6";
   by-spec."ws"."0.4.x" =
     self.by-version."ws"."0.4.31";
   by-version."ws"."0.4.31" = lib.makeOverridable self.buildNodePackage {
@@ -15469,14 +15540,14 @@
     passthru.names = [ "xmlbuilder" ];
   };
   by-spec."xmldom"."~0.1.16" =
-    self.by-version."xmldom"."0.1.17";
-  by-version."xmldom"."0.1.17" = lib.makeOverridable self.buildNodePackage {
-    name = "xmldom-0.1.17";
+    self.by-version."xmldom"."0.1.18";
+  by-version."xmldom"."0.1.18" = lib.makeOverridable self.buildNodePackage {
+    name = "xmldom-0.1.18";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.17.tgz";
-        name = "xmldom-0.1.17.tgz";
-        sha1 = "c5debadc069f0a3967ddfbc01395a4d7cb0d4282";
+        url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.18.tgz";
+        name = "xmldom-0.1.18.tgz";
+        sha1 = "cb0ca87d81106ea4e75f632c9fff044d9cd3394a";
       })
     ];
     buildInputs =
@@ -15525,22 +15596,21 @@
     ];
     passthru.names = [ "xoauth2" ];
   };
-  by-spec."xtend"."~2.0.6" =
-    self.by-version."xtend"."2.0.6";
-  by-version."xtend"."2.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "xtend-2.0.6";
+  by-spec."xtend"."~2.1.1" =
+    self.by-version."xtend"."2.1.2";
+  by-version."xtend"."2.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "xtend-2.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/xtend/-/xtend-2.0.6.tgz";
-        name = "xtend-2.0.6.tgz";
-        sha1 = "5ea657a6dba447069c2e59c58a1138cb0c5e6cee";
+        url = "http://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz";
+        name = "xtend-2.1.2.tgz";
+        sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b";
       })
     ];
     buildInputs =
       (self.nativeDeps."xtend" or []);
     deps = [
-      self.by-version."is-object"."0.1.2"
-      self.by-version."object-keys"."0.2.0"
+      self.by-version."object-keys"."0.4.0"
     ];
     peerDependencies = [
     ];
@@ -15581,7 +15651,7 @@
     deps = [
       self.by-version."cheerio"."0.12.4"
       self.by-version."request"."2.25.0"
-      self.by-version."rimraf"."2.2.5"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."tar"."0.1.19"
       self.by-version."diff"."1.0.8"
       self.by-version."mime"."1.2.11"
@@ -15619,7 +15689,7 @@
       (self.nativeDeps."yeoman-generator" or []);
     deps = [
       self.by-version."cheerio"."0.12.4"
-      self.by-version."rimraf"."2.2.5"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."diff"."1.0.8"
       self.by-version."mime"."1.2.11"
       self.by-version."underscore.string"."2.3.3"
@@ -15636,7 +15706,7 @@
       self.by-version."findup-sync"."0.1.2"
       self.by-version."chalk"."0.3.0"
       self.by-version."text-table"."0.2.0"
-      self.by-version."download"."0.1.7"
+      self.by-version."download"."0.1.10"
       self.by-version."request"."2.27.0"
       self.by-version."file-utils"."0.1.5"
     ];
@@ -15659,7 +15729,7 @@
       (self.nativeDeps."yeoman-generator" or []);
     deps = [
       self.by-version."cheerio"."0.13.1"
-      self.by-version."rimraf"."2.2.5"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."diff"."1.0.8"
       self.by-version."mime"."1.2.11"
       self.by-version."underscore.string"."2.3.3"
@@ -15676,7 +15746,7 @@
       self.by-version."findup-sync"."0.1.2"
       self.by-version."chalk"."0.4.0"
       self.by-version."text-table"."0.2.0"
-      self.by-version."download"."0.1.7"
+      self.by-version."download"."0.1.10"
       self.by-version."request"."2.30.0"
       self.by-version."file-utils"."0.1.5"
       self.by-version."class-extend"."0.1.1"
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 2f9adca15f3..0e6d45bb551 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -114,5 +114,5 @@
 , "rethinkdb"
 , "bower2nix"
 , "fetch-bower"
-, "titanium"
+, { "titanium": "3.2.0" }
 ]
-- 
GitLab


From dbfaeaf0dfc00bb593d73c1998aa83a193824114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 20 Jan 2014 16:38:39 +0100
Subject: [PATCH 0358/3789] add gnome3.libgdata and liboauth

---
 .../gnome-3/core/libgdata/default.nix         | 26 ++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 .../libraries/libgdata/default.nix            | 51 -------------------
 .../libraries/liboauth/default.nix            | 20 ++++++++
 pkgs/top-level/all-packages.nix               |  5 +-
 5 files changed, 51 insertions(+), 53 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/libgdata/default.nix
 delete mode 100644 pkgs/development/libraries/libgdata/default.nix
 create mode 100644 pkgs/development/libraries/liboauth/default.nix

diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/desktops/gnome-3/core/libgdata/default.nix
new file mode 100644
index 00000000000..0808857e115
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/libgdata/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, qoauth
+, 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 qoauth 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/default.nix b/pkgs/desktops/gnome-3/default.nix
index 47656da0992..7f2ed9acb1a 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -61,6 +61,8 @@ rec {
 
   libgee = callPackage ./core/libgee { };
 
+  libgdata = callPackage ./core/libgdata { };
+
   libgxps = callPackage ./core/libgxps { };
 
   libpeas = callPackage ./core/libpeas {};
diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix
deleted file mode 100644
index 368d873e52a..00000000000
--- a/pkgs/development/libraries/libgdata/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-x@{builderDefsPackage
-  , glib, libsoup, libxml2, pkgconfig, intltool, perl
-  , libtasn1, nettle, gmp
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
-
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="libgdata";
-    majorVersion="0.8";
-    minorVersion="1";
-    version="${majorVersion}.${minorVersion}";
-    name="${baseName}-${version}";
-    url="mirror://gnome/sources/${baseName}/${majorVersion}/${name}.tar.bz2";
-    hash="1ffhd1dvjflwjsiba1qdianlzfdlfkjgifmw3c7qs2g6fzkf62q8";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  meta = {
-    description = "GData API library";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.lgpl21Plus;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/${sourceInfo.baseName}";
-    };
-  };
-}) x
-
diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix
new file mode 100644
index 00000000000..5a3b54544b5
--- /dev/null
+++ b/pkgs/development/libraries/liboauth/default.nix
@@ -0,0 +1,20 @@
+{ fetchurl, stdenv, nss, openssl, pkgconfig }:
+
+
+stdenv.mkDerivation rec {
+  name = "liboauth-1.0.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/liboauth/${name}.tar.gz";
+    sha256 = "12wdwq09nba8dzzcgcpbzmgcjr141ky69pm78s15hyyvw4px71sh";
+  };
+
+  buildInputs = [ nss openssl ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    description = "C library implementing the OAuth secure authentication protocol";
+    homepage = http://liboauth.sourceforge.net/;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1313ad12ba1..533d365ac30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1266,6 +1266,8 @@ let
 
   libestr = callPackage ../development/libraries/libestr { };
 
+  liboauth = callPackage ../development/libraries/liboauth { };
+
   libtirpc = callPackage ../development/libraries/ti-rpc { };
 
   libshout = callPackage ../development/libraries/libshout { };
@@ -4615,8 +4617,7 @@ let
 
   libgadu = callPackage ../development/libraries/libgadu { };
 
-  libgdata = (newScope gnome) ../development/libraries/libgdata {};
-  libgdata_0_6 = (newScope gnome) ../development/libraries/libgdata/0.6.nix {};
+  libgdata = gnome3.libgdata;
 
   libgig = callPackage ../development/libraries/libgig { };
 
-- 
GitLab


From 0c9f4cb22ae8da5f2cdacb401bec63f699933bb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 20 Jan 2014 16:40:38 +0100
Subject: [PATCH 0359/3789] evolution-data-server: upgrade and move to gnome3
 namespace

---
 .../core/evolution-data-server/default.nix    | 24 ++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 .../servers/evolution-data-server/default.nix | 57 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 4 files changed, 28 insertions(+), 58 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
 delete mode 100644 pkgs/servers/evolution-data-server/default.nix

diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
new file mode 100644
index 00000000000..cb3db8432b6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -0,0 +1,24 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret
+, p11_kit, db4, nspr, nss, libical, gperf }:
+
+
+stdenv.mkDerivation rec {
+  name = "evolution-data-server-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/evolution-data-server/3.10/${name}.tar.xz";
+    sha256 = "1fgchc1gzrhhzgn4zf9par4yz72m82j871kf7pky458mh4c4sf0g";
+  };
+
+  buildInputs = with gnome3;
+    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret
+      gcr p11_kit db4 nspr nss libgweather libical libgdata gperf ];
+
+  # uoa irrelevant for now
+  configureFlags = "--disable-uoa --with-nspr-includes=${nspr}/include/nspr --with-nss-includes=${nss}/include/nss";
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 7f2ed9acb1a..f83355f0043 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -24,6 +24,8 @@ rec {
 
   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 { };
diff --git a/pkgs/servers/evolution-data-server/default.nix b/pkgs/servers/evolution-data-server/default.nix
deleted file mode 100644
index 3a905a82db8..00000000000
--- a/pkgs/servers/evolution-data-server/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-x@{builderDefsPackage
-  , pkgconfig, flex, bison, libtool, intltool, perl
-  , db4, krb5, openldap, glib, libxml2, GConf
-  , nss, gtk, libgnome, libsoup, gnome_keyring
-  , gtkdoc, sqlite, libgweather, libical, icu
-  , dbus_glib, gperf, nspr, gmp, nettle, libgdata_0_6
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
-
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    url = "mirror://gnome/sources/evolution-data-server/2.32/evolution-data-server-2.32.3.tar.bz2";
-    hash = "744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c";
-    version = "2.32.3";
-    name = "evolution-data-server-${version}";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-
-  configureFlags = [
-    "--with-nspr-includes=${nspr}/include/nspr"
-    "--with-nss-includes=${nss}/include/nss"
-  ];
-      
-  meta = {
-    description = "Evolution Data Server";
-    maintainers = with a.lib.maintainers;
-    [
-      /* I am only interested in it for libebook... */
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    broken = true;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://projects.gnome.org/evolution/download.shtml";
-    };
-  };
-}) x
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 533d365ac30..4e52a0fba34 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7713,8 +7713,9 @@ let
   keepassx = callPackage ../applications/misc/keepassx { };
 
   inherit (gnome3) evince;
+  evolution_data_server = gnome3.evolution_data_server;
+
   keepass = callPackage ../applications/misc/keepass { };
-  evolution_data_server = newScope (gnome) ../servers/evolution-data-server { };
 
   exrdisplay = callPackage ../applications/graphics/exrdisplay {
     fltk = fltk20;
-- 
GitLab


From a3716328e604db49a2db386de0d184fe733e5bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 21 Jan 2014 14:08:22 +0100
Subject: [PATCH 0360/3789] Add mailpile: A modern, fast web-mail client with
 user-friendly encryption and privacy features

---
 .../mailreaders/mailpile/default.nix          | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/mailpile/default.nix

diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
new file mode 100644
index 00000000000..5b18d29d9c1
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchgit, buildPythonPackage, pythonPackages }:
+
+buildPythonPackage rec {
+  name = "mailpile-dev";
+
+  src = fetchgit {
+    url = "https://github.com/pagekite/Mailpile.git";
+    rev = "59b96150822780138ab3567502952caadbc1d73e";
+    sha256 = "2edf82cbe6d3f17ba776fb5a70caa553f646db30ce207ab957038d845a9677e1";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [
+    pillow jinja2 pythonPackages."lxml-2.3.6" python.modules.readline or null];
+
+  meta = with stdenv.lib; {
+    description = "A modern, fast web-mail client with user-friendly encryption and privacy features";
+    homepage = https://www.mailpile.is/;
+    license = [ licenses.asl20 licenses.agpl3 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.iElectric ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e52a0fba34..9d9cfe30578 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1304,6 +1304,8 @@ let
 
   maildrop = callPackage ../tools/networking/maildrop { };
 
+  mailpile = callPackage ../applications/networking/mailreaders/mailpile { };
+
   mailutils = callPackage ../tools/networking/mailutils {
     guile = guile_1_8;
   };
-- 
GitLab


From b4d1d88e42361ff4e184c03811b925704df4897b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 21 Jan 2014 14:09:21 +0100
Subject: [PATCH 0361/3789] enable gobjectintrospection for some libs

---
 pkgs/desktops/gnome-3/core/gnome-menus/default.nix    | 6 ++++--
 pkgs/development/libraries/telepathy/glib/default.nix | 5 +++--
 pkgs/tools/networking/network-manager/default.nix     | 5 +++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
index a8e77a32bdc..0103800b02f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib }:
+{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }:
 let
   version = "3.10.1";
 in
@@ -10,9 +10,11 @@ stdenv.mkDerivation {
     sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
   };
 
+  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
+
   preBuild = "patchShebangs ./scripts";
 
-  buildInputs=[ intltool pkgconfig glib ];
+  buildInputs = [ intltool pkgconfig glib gobjectIntrospection ];
 
   meta = {
     homepage = "http://www.gnome.org";
diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index f44e4cbcd8b..615641a8309 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }:
+{ stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt
+, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "telepathy-glib-0.22.0";
@@ -8,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mqrq2azw70rm50vy21acfnzn8mmh0w7dxh87mwr1lyk0jn1n232";
   };
 
-  propagatedBuildInputs = [dbus_glib glib python];
+  propagatedBuildInputs = [dbus_glib glib python gobjectIntrospection];
 
   buildInputs = [pkgconfig libxslt];
 
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 21739760094..3fb0a729dea 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz
 , udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
-, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll }:
+, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll
+, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "network-manager-${version}";
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
     "--with-kernel-firmware-dir=/run/current-system/firmware"
     "--with-session-tracking=systemd" ];
 
-  buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz bluez5 ];
+  buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz bluez5 gobjectIntrospection ];
 
   propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];
 
-- 
GitLab


From b4acb42a2ce06c8e6f978291e9b021b4b784af17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 21 Jan 2014 14:09:46 +0100
Subject: [PATCH 0362/3789] gnome3.libgdata: remove unneeded dep

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

diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/desktops/gnome-3/core/libgdata/default.nix
index 0808857e115..9a1a45e0d1a 100644
--- a/pkgs/desktops/gnome-3/core/libgdata/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgdata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, qoauth
+{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib
 , gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }:
 
 stdenv.mkDerivation rec {
@@ -9,11 +9,10 @@ stdenv.mkDerivation rec {
     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 qoauth gobjectIntrospection
+    [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection
       liboauth gcr gnome_online_accounts p11_kit openssl ];
       
   meta = with stdenv.lib; {
-- 
GitLab


From 12b6786c659a59185f260a38ed18d05e0e33b505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 21 Jan 2014 14:10:46 +0100
Subject: [PATCH 0363/3789] gnome3.mutter: add optional deps

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

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 5cb865bcefd..e6454aa8e5d 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,5 +1,6 @@
 { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
-, pango, cogl, clutter }:
+, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3
+, libtool }:
 
 
 stdenv.mkDerivation rec {
@@ -13,9 +14,12 @@ stdenv.mkDerivation rec {
   # 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 ];
+      gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra
+      libcanberra_gtk3 zenity libtool ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-- 
GitLab


From 357a7893666ee2d1ca5d974ba4df1ec80e44ee25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 21 Jan 2014 14:11:04 +0100
Subject: [PATCH 0364/3789] gnome3: remove librsvg with gtk2

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

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index f83355f0043..59097b6aeef 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -9,7 +9,6 @@ rec {
 
 #### Overrides of libraries
 
-  librsvg = pkgs.librsvg.override { inherit gtk2; }; # gtk2 mysteriously needed in librsvg for goffice (commented in Gentoo)
   libsoup = pkgs.libsoup_2_44;
 
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
@@ -41,6 +40,7 @@ rec {
   gnome-menus = callPackage ./core/gnome-menus { };
 
   gnome_keyring = callPackage ./core/gnome-keyring { };
+
   libgnome_keyring = callPackage ./core/libgnome-keyring { };
 
   gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
-- 
GitLab


From f5773e1f02267d68fd8ba4d880068db56498f2d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 21 Jan 2014 14:23:27 +0100
Subject: [PATCH 0365/3789] gcc-4.8: Enable Darwin and FreeBSD

---
 pkgs/development/compilers/gcc/4.8/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 01c886739d8..38180990b83 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -509,7 +509,10 @@ stdenv.mkDerivation ({
     # 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 ++ optionals (langAda == false && libelf == null) [ "i686-darwin" ];
+    platforms =
+      stdenv.lib.platforms.linux ++
+      stdenv.lib.platforms.freebsd ++
+      optionals (langAda == false) stdenv.lib.platforms.darwin;
   };
 }
 
-- 
GitLab


From 5d46e7cf28ea39c1b75a918f6a8898b56a4444fb Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 21 Jan 2014 13:58:23 +0100
Subject: [PATCH 0366/3789] ipmiutil: Update from 2.7.3 -> 2.9.2 and simplify

---
 pkgs/tools/system/ipmiutil/default.nix | 69 ++++++++++----------------
 1 file changed, 25 insertions(+), 44 deletions(-)

diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index d5252116f64..9f2afb9a0b2 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -1,55 +1,36 @@
-x@{builderDefsPackage
-  , openssl
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, openssl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="ipmiutil";
-    version="2.7.3";
-    name="${baseName}-${version}";
-    project="${baseName}";
-    url="mirror://sourceforge/project/${project}/${baseName}/${name}.tar.gz";
-    hash="0z6ykz5db4ws7hpi25waf9vznwsh0vp819h5s7s8r054vxslrfpq";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
+stdenv.mkDerivation rec {
+  baseName = "ipmiutil";
+  version = "2.9.2";
+  name = "${baseName}-${version}";
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  src = fetchurl {
+    url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
+    sha256 = "1n7amk8wbx9a9gbm37nyb8v0c37qgp6hv4hn3nln80rr6g98f9n3";
+  };
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "fixMakefile" "doMakeInstall"];
+  buildInputs = [ openssl ];
 
-  fixMakefile = a .fullDepEntry ''
+  preBuild = ''
     sed -e "s@/usr@$out@g" -i Makefile */Makefile */*/Makefile
-    sed -e "s@/etc@$out/etc@g" -i Makefile */Makefile
-    sed -e "s@/var@$out/var@g" -i Makefile */Makefile
-  '' ["minInit" "doConfigure"];
-      
-  meta = {
-    description = "IPMI utilities";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.bsd3;
+    sed -e "s@/etc@$out/etc@g" -i Makefile */Makefile */*/Makefile
+    sed -e "s@/var@$out/var@g" -i Makefile */Makefile */*/Makefile
+  '';
+
+  NIX_CFLAGS_COMPILE = "-fno-stack-protector";
+
+  meta = with stdenv.lib; {
+    description = "An easy-to-use IPMI server management utility";
+    homepage = http://ipmiutil.sourceforge.net/;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
+    license = licenses.bsd3;
   };
+
   passthru = {
     updateInfo = {
       downloadPage = "http://sourceforge.net/projects/ipmiutil/files/ipmiutil/";
     };
   };
-}) x
-
+}
-- 
GitLab


From 6731ed2b86fdc2e62f86f9f077b02ffbe6efa71d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 21 Jan 2014 09:53:21 -0500
Subject: [PATCH 0367/3789] Fix tarball

Hopefully this kind of thing won't be needed with nix 1.7

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/applications/networking/mailreaders/mailpile/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 5b18d29d9c1..9cfbf8c63c2 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "A modern, fast web-mail client with user-friendly encryption and privacy features";
     homepage = https://www.mailpile.is/;
-    license = [ licenses.asl20 licenses.agpl3 ];
+    license = map (getAttr "shortName") [ licenses.asl20 licenses.agpl3 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.iElectric ];
   };
-- 
GitLab


From eb850385183e14d2f870bb46317242b9e216df9e Mon Sep 17 00:00:00 2001
From: Sander van der Burg <sander@conference-compass.com>
Date: Tue, 21 Jan 2014 17:19:26 +0100
Subject: [PATCH 0368/3789] titaniumsdk: Replace deprecated python build tools
 by the new NodeJS based tool

---
 .../mobile/titaniumenv/build-app.nix          | 135 +++++++++---------
 .../mobile/titaniumenv/default.nix            |  26 +++-
 .../examples/kitchensink/default.nix          |   3 +-
 .../mobile/titaniumenv/titaniumsdk.nix        |   2 +
 4 files changed, 99 insertions(+), 67 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 068a9acedda..ef2182135da 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -1,7 +1,7 @@
-{stdenv, androidsdk, titaniumsdk, xcodewrapper, jdk}:
-{ appId, name, appName ? null, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ]
+{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python}:
+{ name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
 , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
-, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosDistribute ? false
+, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null
 }:
 
 assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null;
@@ -15,92 +15,99 @@ let
   };
   
   deleteKeychain = "security delete-keychain $keychainName";
-  
-  _appName = if appName == null then name else appName;
 in
 stdenv.mkDerivation {
   name = stdenv.lib.replaceChars [" "] [""] name;
   inherit src;
   
-  buildInputs = [ jdk ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
+  buildInputs = [ titanium jdk python ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
   
   buildPhase = ''
     export HOME=$TMPDIR
+    
+    ${stdenv.lib.optionalString (tiVersion != null) ''
+      # Replace titanium version by the provided one
+      sed -i -e "s|<sdk-version>[0-9a-zA-Z\.]*</sdk-version>|<sdk-version>${tiVersion}</sdk-version>|" tiapp.xml
+    ''}
+    
+    # Simulate a login
+    mkdir -p $HOME/.titanium
+    cat > $HOME/.titanium/auth_session.json <<EOF
+    { "loggedIn": true }
+    EOF
+    
+    echo "{}" > $TMPDIR/config.json
+    titanium --config-file $TMPDIR/config.json config sdk.defaultInstallLocation ${titaniumsdk}
 
     mkdir -p $out
     
     ${if target == "android" then
-        if release then
-          ''${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute "${_appName}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out''
-        else
-          ''${titaniumsdk}/mobilesdk/*/*/android/builder.py build "${_appName}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}''
-
+        ''
+          titanium config --config-file $TMPDIR/config.json android.sdkPath ${androidsdkComposition}/libexec/android-sdk-*
+          
+          ${if release then
+            ''titanium build --config-file $TMPDIR/config.json --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out''
+          else
+            ''titanium build --config-file $TMPDIR/config.json --force --platform android --target emulator --build-only --output $out''}
+        ''
       else if target == "iphone" then
-        if iosDistribute then ''
-            export HOME=/Users/$(whoami)
-            export keychainName=$(basename $out)
+        ''
+          export NIX_TITANIUM_WORKAROUND="--config-file $TMPDIR/config.json"
+          
+          ${if release then
+            ''
+              export HOME=/Users/$(whoami)
+              export keychainName=$(basename $out)
             
-            # Create a keychain with the component hash name (should always be unique)
-            security create-keychain -p "" $keychainName
-            security default-keychain -s $keychainName
-            security unlock-keychain -p "" $keychainName
-            security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
+              # Create a keychain with the component hash name (should always be unique)
+              security create-keychain -p "" $keychainName
+              security default-keychain -s $keychainName
+              security unlock-keychain -p "" $keychainName
+              security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
 
-            provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Z0-9]\{36\}")
+              provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Z0-9]\{36\}")
    
-            # Ensure that the requested provisioning profile can be found
-            
-            if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ]
-            then
-                mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
-                cp ${iosMobileProvisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
-            fi
+              # Ensure that the requested provisioning profile can be found
+        
+              if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ]
+              then
+                  mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
+                  cp ${iosMobileProvisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
+              fi
             
-            ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 7.0 $(pwd) ${appId} "${_appName}" "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName"
+              # Make a copy of the Titanium SDK and fix its permissions. Without it,
+              # builds using the facebook module fail, because it needs to be writable
             
-            # Remove our generated keychain
+              cp -av ${titaniumsdk} $TMPDIR/titaniumsdk
             
-            ${deleteKeychain}
-          ''
-        else
-            if release then
-              ''
-                export HOME=/Users/$(whoami)
-                export keychainName=$(basename $out)
+              find $TMPDIR/titaniumsdk | while read i
+              do
+                  chmod 755 "$i"
+              done
             
-                # Create a keychain with the component hash name (should always be unique)
-                security create-keychain -p "" $keychainName
-                security default-keychain -s $keychainName
-                security unlock-keychain -p "" $keychainName
-                security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
-
-                provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Z0-9]\{36\}")
-   
-                # Ensure that the requested provisioning profile can be found
+              # Set the SDK to our copy
+              titanium --config-file $TMPDIR/config.json config sdk.defaultInstallLocation $TMPDIR/titaniumsdk
             
-                if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ]
-                then
-                    mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
-                    cp ${iosMobileProvisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
-                fi
+              # Do the actual build
+              titanium build --config-file $TMPDIR/config.json --force --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName --device-family universal --output-dir $out
             
-                ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 7.0 $(pwd) ${appId} "${_appName}" "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName"
+              # Remove our generated keychain
             
-                # Remove our generated keychain
+              ${deleteKeychain}
+            ''
+          else
+            ''
+              # Copy all sources to the output store directory.
+              # Why? Debug application include *.js files, which are symlinked into their
+              # sources. If they are not copied, we have dangling references to the
+              # temp folder.
             
-                ${deleteKeychain}
-          ''
-        else
-          ''
-            # Copy all sources to the output store directory.
-            # Why? Debug application include *.js files, which are symlinked into their
-            # sources. If they are not copied, we have dangling references to the
-            # temp folder.
+              cp -av * $out
+              cd $out
             
-            cp -av * $out
-            cd $out
-            ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 7.0 $(pwd) ${appId} "${_appName}" universal
-          ''
+              titanium build --config-file $TMPDIR/config.json --force --platform ios --target simulator --build-only --device-family universal --output-dir $out
+          ''}
+        ''
 
       else throw "Target: ${target} is not supported!"}
   '';
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index 07dc2f4440d..b77468a0953 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -1,5 +1,25 @@
 {pkgs, pkgs_i686, xcodeVersion ? "5.0"}:
 
+let
+  # We have to use Oracle's JDK. On Darwin, just simply expose the host system's
+  # JDK. According to their docs, OpenJDK is not supported.
+  
+  jdkWrapper = pkgs.stdenv.mkDerivation {
+    name = "jdk-wrapper";
+    buildCommand = ''
+      mkdir -p $out/bin
+      cd $out/bin
+      ln -s /usr/bin/javac
+      ln -s /usr/bin/java
+      ln -s /usr/bin/jarsigner
+      ln -s /usr/bin/jar
+      ln -s /usr/bin/keytool
+    '';
+    setupHook = ''
+      export JAVA_HOME=/usr
+    '';
+  };
+in
 rec {
   androidenv = pkgs.androidenv;
 
@@ -12,7 +32,11 @@ rec {
   };
   
   buildApp = import ./build-app.nix {
-    inherit (pkgs) stdenv jdk;
+    inherit (pkgs) stdenv python;
+    jdk = if pkgs.stdenv.isLinux then pkgs.oraclejdk7
+      else if pkgs.stdenv.isDarwin then jdkWrapper
+      else throw "Platform not supported: ${pkgs.stdenv.system}";
+    inherit (pkgs.nodePackages) titanium;
     inherit (androidenv) androidsdk;
     inherit (xcodeenv) xcodewrapper;
     inherit titaniumsdk;
diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
index 001b91f551d..a5cd156a8ff 100644
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -27,9 +27,8 @@ let
 in
 titaniumenv.buildApp {
   name = "KitchenSink-${target}-${if release then "release" else "debug"}";
-  appName = "KitchenSink";
-  appId = if rename then newBundleId else "com.appcelerator.kitchensink";
   src = if rename then renamedSrc else src;
+  tiVersion = "3.1.4.GA";
   
   inherit target androidPlatformVersions release;
   
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
index abf06a00fc9..fa01dadc775 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
@@ -72,5 +72,7 @@ stdenv.mkDerivation {
   '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
     # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
     sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
+    
+    sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js
   '';
 }
-- 
GitLab


From 95934138bc66a34884313b467cdd5e71321fa254 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Jan 2014 20:07:26 +0100
Subject: [PATCH 0369/3789] gprolog: patch hard-coded path to the temporary
 file /tmp/make.log

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

diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix
index 00c5ef36a38..f2b5a04df98 100644
--- a/pkgs/development/compilers/gprolog/default.nix
+++ b/pkgs/development/compilers/gprolog/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "13miyas47bmijmadm68cbvb21n4s156gjafz7kfx9brk9djfkh0q";
   };
 
+  patchPhase = ''
+    sed -i -e "s|/tmp/make.log|$TMPDIR/make.log|g" src/Pl2Wam/check_boot
+  '';
+
   preConfigure = ''
     cd src
     configureFlagsArray=(
-- 
GitLab


From 7b2c1b854e155bc11fb3a4c52345e06926a71cbd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Jan 2014 20:08:41 +0100
Subject: [PATCH 0370/3789] snx: disown this package

---
 pkgs/tools/networking/snx/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/tools/networking/snx/default.nix b/pkgs/tools/networking/snx/default.nix
index 7a73314d0e3..b4cdd0d0b99 100644
--- a/pkgs/tools/networking/snx/default.nix
+++ b/pkgs/tools/networking/snx/default.nix
@@ -33,8 +33,5 @@ stdenv.mkDerivation rec {
     homepage = "https://www.checkpoint.com/";
     description = "Check Point SSL Network Extender";
     license = "unknown";
-
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
-- 
GitLab


From c1209b5144307da623f9171012cafb3193b272df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Jan 2014 20:18:27 +0100
Subject: [PATCH 0371/3789] emacs-bbdb: update to version 2.36

---
 pkgs/applications/editors/emacs-modes/bbdb/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
index da92c38d078..ed96e689283 100644
--- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix
+++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, emacs, texinfo, ctags}:
 
-stdenv.mkDerivation {
-  name = "bbdb-2.35";
+stdenv.mkDerivation rec {
+  name = "bbdb-2.36";
 
   src = fetchurl {
     # not using mirror:// because it produces a different file
-    url = http://bbdb.sourceforge.net/bbdb-2.35.tar.gz;
-    sha256 = "3fb1316e2ed74d47ca61187fada550e58797467bd9e8ad67343ed16da769f916";
+    url = "http://bbdb.sourceforge.net/${name}.tar.gz";
+    sha256 = "1rmw94l71ahfbynyy0bijfy488q9bl5ksl4zpvg7j9dbmgbh296r";
   };
 
   patches = [ ./install-infodir.patch ];
@@ -28,8 +28,8 @@ stdenv.mkDerivation {
   '';
 
   meta = {
+    homepage = "http://bbdb.sourceforge.net/";
     description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs";
-    homepage = http://bbdb.sourceforge.net/;
     license = "GPL";
   };
 }
-- 
GitLab


From 4e983788cdb14c182964fb9e451e63db4bc12605 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Jan 2014 20:19:21 +0100
Subject: [PATCH 0372/3789] feh: update from 2.8 to 2.9.3

---
 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 0cd34027966..53c8fa5bf76 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.8";
+  name = "feh-2.9.3";
 
   src = fetchurl {
     url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "0zmslchnzvi9ydxj2mgci4x8zpv5mdfkf7kyny3nibbpajibqmrx";
+    sha256 = "1wlhfbglzc1jzsh80s4s1fawclgzyjy2105ffzx2mw9s0c1xds5l";
   };
 
   buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl ];
-- 
GitLab


From ab8c539049899da27fe02790907d0a5a737c987e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Jan 2014 20:20:29 +0100
Subject: [PATCH 0373/3789] gdbm: update from 1.10 to 1.11

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

diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix
index 3b982582b54..2ba49162e2f 100644
--- a/pkgs/development/libraries/gdbm/default.nix
+++ b/pkgs/development/libraries/gdbm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gdbm-1.10";
+  name = "gdbm-1.11";
 
   src = fetchurl {
     url = "mirror://gnu/gdbm/${name}.tar.gz";
-    sha256 = "0h9lfzdjc2yl849y0byg51h6xfjg0y7vg9jnsw3gpfwlbd617y13";
+    sha256 = "1hz3jgh3pd4qzp6jy0l8pd8x01g9abw7csnrlnj1a2sxy122z4cd";
   };
 
   doCheck = true;
-- 
GitLab


From 397550afe5414630713807ea756026707e7bc12d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Jan 2014 20:23:34 +0100
Subject: [PATCH 0374/3789] geoip: update from 1.4.6 to 1.6.0

---
 pkgs/development/libraries/geoip/default.nix         | 7 +++----
 pkgs/development/libraries/geoip/src-for-default.nix | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix
index 86982025416..94c0505bc6f 100644
--- a/pkgs/development/libraries/geoip/default.nix
+++ b/pkgs/development/libraries/geoip/default.nix
@@ -1,5 +1,5 @@
-a :  
-let 
+a :
+let
   s = import ./src-for-default.nix;
   buildInputs = with a; [
     zlib
@@ -14,8 +14,7 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["doConfigure" "doMakeInstall"];
-  goSrcDir = "cd GeoIP-*/";
-      
+
   meta = {
     description = "Geolocation API";
     maintainers = [
diff --git a/pkgs/development/libraries/geoip/src-for-default.nix b/pkgs/development/libraries/geoip/src-for-default.nix
index cb9a5e758fc..1fc4b9b8755 100644
--- a/pkgs/development/libraries/geoip/src-for-default.nix
+++ b/pkgs/development/libraries/geoip/src-for-default.nix
@@ -1,8 +1,8 @@
 rec {
   advertisedUrl="http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.4.6.tar.gz";
   version = "1.4.6";
-  url="http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.4.6.tar.gz";
-  hash = "1i4ixj6ha62qqzsn23qg428cv1zjj2ip7kmas62xgivvgm02kd0n";
-  name = "geoip-1.4.6";
+  url="http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.6.0.tar.gz";
+  hash = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7";
+  name = "geoip-1.6.0";
   
 }
-- 
GitLab


From 3d8b0401c2a202b1cf94240e4464c4888160236d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Jan 2014 20:26:45 +0100
Subject: [PATCH 0375/3789] eukleides: build with texinfo 4.x; version 5
 doesn't succeed

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d9cfe30578..d4cfbe22ffa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9860,7 +9860,9 @@ let
 
   ecm = callPackage ../applications/science/math/ecm { };
 
-  eukleides = callPackage ../applications/science/math/eukleides { };
+  eukleides = callPackage ../applications/science/math/eukleides {
+    texinfo = texinfo4;
+  };
 
   fricas = callPackage ../applications/science/math/fricas { };
 
-- 
GitLab


From 712458c3fca3ed19ae80221897fa3ecddc787337 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Jan 2014 20:29:34 +0100
Subject: [PATCH 0376/3789] all-packages.nix: remove redundant texinfo5
 overrides

Texinfo 5.x is the default version now.
---
 pkgs/top-level/all-packages.nix | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4cfbe22ffa..31290dc9cfa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -813,7 +813,6 @@ let
 
   docbook2x = callPackage ../tools/typesetting/docbook2x {
     inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport;
-    texinfo = texinfo5;
   };
 
   dosfstools = callPackage ../tools/filesystems/dosfstools { };
@@ -1294,7 +1293,7 @@ let
 
   lxc = callPackage ../os-specific/linux/lxc { };
 
-  lzip = callPackage ../tools/compression/lzip { texinfo = texinfo5; };
+  lzip = callPackage ../tools/compression/lzip { };
 
   lzma = xz;
 
@@ -2257,7 +2256,6 @@ let
 
   bashInteractive = appendToName "interactive" (callPackage ../shells/bash {
     interactive = true;
-    texinfo = texinfo5;
   });
 
   bashCompletion = callPackage ../shells/bash-completion { };
@@ -4020,12 +4018,9 @@ let
 
   ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix {
     vpxSupport = !stdenv.isMips;
-    texinfo = texinfo5;
   };
 
-  ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix {
-    texinfo = texinfo5;
-  };
+  ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix { };
 
   ffmpeg = ffmpeg_2;
 
@@ -7576,7 +7571,6 @@ let
     librsvg = null;
     alsaLib = null;
     imagemagick = null;
-    texinfo = texinfo5;
 
     # use clangStdenv on darwin to deal with: unexec: 'my_edata is not in
     # section __data'
@@ -7594,7 +7588,7 @@ let
 
     autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { };
 
-    bbdb = callPackage ../applications/editors/emacs-modes/bbdb { texinfo = texinfo5; };
+    bbdb = callPackage ../applications/editors/emacs-modes/bbdb { };
 
     cedet = callPackage ../applications/editors/emacs-modes/cedet { };
 
@@ -7614,9 +7608,9 @@ let
 
     emacsSessionManagement = callPackage ../applications/editors/emacs-modes/session-management-for-emacs { };
 
-    emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { texinfo = texinfo5; };
+    emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { };
 
-    emms = callPackage ../applications/editors/emacs-modes/emms { texinfo = texinfo5; };
+    emms = callPackage ../applications/editors/emacs-modes/emms { };
 
     ess = callPackage ../applications/editors/emacs-modes/ess { };
 
@@ -7654,7 +7648,7 @@ let
 
     loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { };
 
-    magit = callPackage ../applications/editors/emacs-modes/magit { texinfo = texinfo5; };
+    magit = callPackage ../applications/editors/emacs-modes/magit { };
 
     maudeMode = callPackage ../applications/editors/emacs-modes/maude { };
 
@@ -7664,7 +7658,7 @@ let
 
     # This is usually a newer version of Org-Mode than that found in GNU Emacs, so
     # we want it to have higher precedence.
-    org = hiPrio (callPackage ../applications/editors/emacs-modes/org { texinfo = texinfo5; });
+    org = hiPrio (callPackage ../applications/editors/emacs-modes/org { };
 
     org2blog = callPackage ../applications/editors/emacs-modes/org2blog { };
 
@@ -10170,7 +10164,7 @@ let
 
   texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun {
     paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor
-              texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo5
+              texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo
               texLiveModerntimeline ];
   });
 
-- 
GitLab


From cb21683794269846ba76e66a9c3b1869ad4b817d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Jan 2014 20:35:49 +0100
Subject: [PATCH 0377/3789] ghc: disable parallel building

It sucks, I know, but GHC just doesn't compile reliably when built with
some -j<n> option. :-( We have build errors because of apparent race
conditions all over the place on Hydra. This causes so much trouble for
users that it's not worth keeping this option enabled, IMHO.
---
 pkgs/development/compilers/ghc/7.4.2.nix |  1 -
 pkgs/development/compilers/ghc/7.6.1.nix | 11 -----------
 pkgs/development/compilers/ghc/7.6.2.nix |  1 -
 pkgs/development/compilers/ghc/7.6.3.nix |  1 -
 4 files changed, 14 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix
index 0bc2a855306..d1acb3d09b9 100644
--- a/pkgs/development/compilers/ghc/7.4.2.nix
+++ b/pkgs/development/compilers/ghc/7.4.2.nix
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ghc perl gmp ncurses ];
 
-  enableParallelBuilding = true;
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
diff --git a/pkgs/development/compilers/ghc/7.6.1.nix b/pkgs/development/compilers/ghc/7.6.1.nix
index 99c93c7a980..5a63d30390d 100644
--- a/pkgs/development/compilers/ghc/7.6.1.nix
+++ b/pkgs/development/compilers/ghc/7.6.1.nix
@@ -12,17 +12,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ghc perl gmp ncurses ];
 
-  # My attempts to compile GHC with parallel build support enabled, failed
-  # 4 consecutive times with the following error:
-  #
-  #    building rts/dist/build/AutoApply.debug_o
-  #    building rts/dist/build/AutoApply.thr_o
-  #      rts_dist_HC rts/dist/build/AutoApply.debug_o
-  #    /nix/store/1iigiim5855m8j7pmwf5xrnpf705s4dh-binutils-2.21.1a/bin/ld: cannot find libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers_o_split/gmp-wrappers__1.o
-  #    collect2: ld returned 1 exit status
-  #    make[1]: *** [libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers.p_o] Error 1
-  enableParallelBuilding = false;
-
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
diff --git a/pkgs/development/compilers/ghc/7.6.2.nix b/pkgs/development/compilers/ghc/7.6.2.nix
index ac2810c62b2..45f877ffc7c 100644
--- a/pkgs/development/compilers/ghc/7.6.2.nix
+++ b/pkgs/development/compilers/ghc/7.6.2.nix
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ghc perl gmp ncurses ];
 
-  enableParallelBuilding = true;
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix
index 9135741e9f0..c0933b2a961 100644
--- a/pkgs/development/compilers/ghc/7.6.3.nix
+++ b/pkgs/development/compilers/ghc/7.6.3.nix
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ghc perl gmp ncurses ];
 
-  enableParallelBuilding = false; # the same errors as 7.6.1
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
-- 
GitLab


From a34d00f3b4d1a14bd25cef8417488701310908cf Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 21 Jan 2014 14:39:33 -0500
Subject: [PATCH 0378/3789] Fix tarball

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 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 31290dc9cfa..f188da5ce6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7658,7 +7658,7 @@ let
 
     # This is usually a newer version of Org-Mode than that found in GNU Emacs, so
     # we want it to have higher precedence.
-    org = hiPrio (callPackage ../applications/editors/emacs-modes/org { };
+    org = hiPrio (callPackage ../applications/editors/emacs-modes/org { });
 
     org2blog = callPackage ../applications/editors/emacs-modes/org2blog { };
 
-- 
GitLab


From 6bdafbad9b573720b0e1f42508bff0a614b6871a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 21 Jan 2014 16:11:29 -0500
Subject: [PATCH 0379/3789] Build static libs with gcc

This was the behavior pre stdenv-updates and is needed by some users

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/compilers/gcc/4.8/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 38180990b83..96f1cf87e93 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -306,9 +306,7 @@ stdenv.mkDerivation ({
       ''}
     '';
 
-  # 'iant' at #go-nuts@freenode, gccgo maintainer, said that
-  # they have a bug in 4.7.1 if adding "--disable-static"
-  dontDisableStatic = langGo || staticCompiler;
+  dontDisableStatic = true;
 
   configureFlags = "
     ${if stdenv.isSunOS then
@@ -339,6 +337,7 @@ stdenv.mkDerivation ({
     --disable-libstdcxx-pch
     --without-included-gettext
     --with-system-zlib
+    --enable-static
     --enable-languages=${
       concatStrings (intersperse ","
         (  optional langC        "c"
-- 
GitLab


From c373a49b10c8f854adcbf895916a9b53d33b8db7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 21 Jan 2014 16:12:41 -0500
Subject: [PATCH 0380/3789] Use gcc48_multi for stdenv_32bit

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/all-packages.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f188da5ce6e..f1ab8ef3f9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -247,7 +247,7 @@ let
   # just the plain stdenv.
   stdenv_32bit = lowPrio (
     if system == "x86_64-linux" then
-      overrideGCC stdenv gcc46_multi
+      overrideGCC stdenv gcc48_multi
     else
       stdenv);
 
@@ -2478,15 +2478,6 @@ let
     texinfo = texinfo413;
   }));
 
-  gcc46_multi =
-    if system == "x86_64-linux" then lowPrio (
-      wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.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}’";
-
   gcc48 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 {
     inherit noSysDirs;
 
@@ -2504,6 +2495,15 @@ let
       else null;
   }));
 
+  gcc48_multi =
+    if system == "x86_64-linux" then lowPrio (
+      wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc48.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}’";
+
   gcc48_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 {
     stripped = false;
 
-- 
GitLab


From 5acc2fef255e0ea81f7c6867c48aed4693204550 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Tue, 21 Jan 2014 22:20:21 +0100
Subject: [PATCH 0381/3789] fix keepassx under gcc 4.8

---
 pkgs/applications/misc/keepassx/default.nix  |  2 ++
 pkgs/applications/misc/keepassx/random.patch | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/applications/misc/keepassx/random.patch

diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix
index 375a1ae2419..fc089f4fa5b 100644
--- a/pkgs/applications/misc/keepassx/default.nix
+++ b/pkgs/applications/misc/keepassx/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     qmake PREFIX=$out 
   '';
 
+  patches = [ ./random.patch ];
+
   buildInputs = [ bzip2 qt4 libX11 xextproto libXtst ];
 
   meta = {
diff --git a/pkgs/applications/misc/keepassx/random.patch b/pkgs/applications/misc/keepassx/random.patch
new file mode 100644
index 00000000000..0a0b26f6e8c
--- /dev/null
+++ b/pkgs/applications/misc/keepassx/random.patch
@@ -0,0 +1,13 @@
+--- a/src/lib/random.cpp	2014-01-21 21:15:55.829312723 +0000
++++ b/src/lib/random.cpp	2014-01-21 21:16:36.752535839 +0000
+@@ -28,6 +28,10 @@
+ 	#include <wincrypt.h>
+ 	#include <QSysInfo>
+ #endif
++#ifndef Q_WS_WIN
++	#include <sys/types.h>
++	#include <unistd.h>
++#endif
+ 
+ #include <QCryptographicHash>
+ #include <QCursor>
-- 
GitLab


From d18bc25b95eace4e090771d3e99834157aa32bb2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 21 Jan 2014 20:05:55 -0500
Subject: [PATCH 0382/3789] Rename linuxManualConfig to buildLinux

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 nixos/modules/testing/minimal-kernel.nix       |  2 +-
 pkgs/development/compilers/gcc/4.8/default.nix |  2 +-
 pkgs/os-specific/linux/kernel/generic.nix      |  4 ++--
 pkgs/top-level/all-packages.nix                | 17 +++++++++--------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/testing/minimal-kernel.nix b/nixos/modules/testing/minimal-kernel.nix
index 0418de800c8..0cbca71e132 100644
--- a/nixos/modules/testing/minimal-kernel.nix
+++ b/nixos/modules/testing/minimal-kernel.nix
@@ -5,7 +5,7 @@ let
     (map (builtins.getAttr "configLine") config.system.requiredKernelConfig))
   );
 
-  origKernel = pkgs.linuxManualConfig {
+  origKernel = pkgs.buildLinux {
     inherit (pkgs.linux) src version;
     inherit configfile;
     allowImportFromDerivation = true;
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 96f1cf87e93..aa3bfa09d72 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -315,7 +315,7 @@ stdenv.mkDerivation ({
       " --with-gnu-as --without-gnu-ld "
       else ""}
     --enable-lto
-    ${if enableMultilib then "" else "--disable-multilib"}
+    ${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 ""}
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 42ec3de9369..2e3520c61ce 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, perl, linuxManualConfig
+{ stdenv, perl, buildLinux
 
 , # The kernel source tarball.
   src
@@ -97,7 +97,7 @@ let
     installPhase = "mv .config $out";
   };
 
-  kernel = linuxManualConfig {
+  kernel = buildLinux {
     inherit version modDirVersion src kernelPatches;
 
     configfile = configfile.nativeDrv or configfile;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1ab8ef3f9d..9f7de5e4673 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6550,7 +6550,7 @@ let
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
 
   linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
-    inherit fetchurl stdenv perl linuxManualConfig;
+    inherit fetchurl stdenv perl buildLinux;
     kernelPatches =
       [ kernelPatches.sec_perm_2_6_24
       ];
@@ -6599,7 +6599,7 @@ let
   });
 
   linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
-    inherit fetchurl stdenv perl linuxManualConfig;
+    inherit fetchurl stdenv perl buildLinux;
     kernelPatches =
       [ kernelPatches.sec_perm_2_6_24
       ] ++ lib.optionals ((platform.kernelArch or null) == "mips")
@@ -6617,11 +6617,11 @@ let
   });
 
   linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
-    inherit fetchurl stdenv perl linuxManualConfig;
+    inherit fetchurl stdenv perl buildLinux;
   };
 
   linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) {
-    inherit fetchurl stdenv perl linuxManualConfig;
+    inherit fetchurl stdenv perl buildLinux;
     kernelPatches =
       [
         kernelPatches.sec_perm_2_6_24
@@ -6642,7 +6642,7 @@ let
   });
 
   linux_3_11 = makeOverridable (import ../os-specific/linux/kernel/linux-3.11.nix) {
-    inherit fetchurl stdenv perl linuxManualConfig;
+    inherit fetchurl stdenv perl buildLinux;
     kernelPatches =
       [
         kernelPatches.sec_perm_2_6_24
@@ -6654,7 +6654,7 @@ let
   };
 
   linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) {
-    inherit fetchurl stdenv perl linuxManualConfig;
+    inherit fetchurl stdenv perl buildLinux;
     kernelPatches =
       [
         kernelPatches.sec_perm_2_6_24
@@ -6666,7 +6666,7 @@ let
   };
 
   linux_3_13 = makeOverridable (import ../os-specific/linux/kernel/linux-3.13.nix) {
-    inherit fetchurl stdenv perl linuxManualConfig;
+    inherit fetchurl stdenv perl buildLinux;
     kernelPatches =
       [
         kernelPatches.sec_perm_2_6_24
@@ -6775,7 +6775,8 @@ let
   linuxPackages = linuxPackages_3_10;
 
   # A function to build a manually-configured kernel
-  linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix {
+  linuxManualConfig = builtins.trace "linuxManualConfig is now called buildLinux" pkgs.buildLinux;
+  buildLinux = import ../os-specific/linux/kernel/manual-config.nix {
     inherit (pkgs) stdenv runCommand nettools bc perl kmod writeTextFile ubootChooser;
   };
 
-- 
GitLab


From fd896d09fa385481ee08cb5cf171890f624a548e Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 21 Jan 2014 01:46:44 +0100
Subject: [PATCH 0383/3789] grsecurity: Fix build under new generic kernel
 derivation

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1ab8ef3f9d..6877a71fe2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6557,11 +6557,6 @@ let
   };
 
   grsecurityOverrider = args: {
-    # Install gcc plugins. These are needed for compiling dependant packages.
-    postInstall = ''
-      ${args.postInstall or ""}
-      cp "tools/gcc/"*.so $out/lib/modules/$version/build/tools/gcc/
-    '';
     # 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 ++ [ gmp ];
@@ -6577,10 +6572,12 @@ let
   # config options you need (e.g. by overriding extraConfig). See list of options here:
   # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
   linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
+    modDirVersion = "${linux_3_2.version}-grsec";
     kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_53 kernelPatches.grsec_path ];
   })) (args: grsecurityOverrider args));
 
   linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: {
+    modDirVersion = "${linux_3_12.version}-grsec";
     kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_2 kernelPatches.grsec_path ];
   })) (args: grsecurityOverrider args));
 
-- 
GitLab


From aeda8d63b92dd5059f32b3b79567e714211f1c65 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 20 Jan 2014 02:18:33 +0100
Subject: [PATCH 0384/3789] grsecurity: Update stable and test patches

stable: 3.0-3.2.53-201312021727 -> 3.0-3.2.54-201401191012
test:   3.0-3.12.2-201312021733 -> 3.0-3.12.8-201401191015
---
 pkgs/os-specific/linux/kernel/patches.nix | 20 ++++++++++----------
 pkgs/top-level/all-packages.nix           |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index efa23f67846..8b658a6030e 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -78,25 +78,25 @@ rec {
   };
 
 
-  grsecurity_3_0_3_2_53 =
-    { name = "grsecurity-3.0-3.2.53";
+  grsecurity_3_0_3_2_54 =
+    { name = "grsecurity-3.0-3.2.54";
       patch = fetchurl {
-        url = https://grsecurity.net/stable/grsecurity-3.0-3.2.53-201312021727.patch;
-        sha256 = "1ifndcbpz552d0n2dgb38di8lhqd4x2msshdbdx33jlfdl7mk6x4";
+        url = https://grsecurity.net/stable/grsecurity-3.0-3.2.54-201401191012.patch;
+        sha256 = "10kfdk46fgd1awys8f8520w7kanc4m0ckn28xg36473fi76i6snx";
       };
       features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.53
+      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54
       features.apparmor = true;
     };
 
-  grsecurity_3_0_3_12_2 =
-    { name = "grsecurity-3.0-3.12.2";
+  grsecurity_3_0_3_12_8 =
+    { name = "grsecurity-3.0-3.12.8";
       patch = fetchurl {
-        url = https://grsecurity.net/test/grsecurity-3.0-3.12.2-201312021733.patch;
-        sha256 = "0xcsq6778rk9afg3078d772iflz7p4ahvr6wdq5c4s3jyssam783";
+        url = https://grsecurity.net/test/grsecurity-3.0-3.12.8-201401191015.patch;
+        sha256 = "0dy7daar873jp0afkf48l8ij1ii8cgcc9z5pn50h1fvhc9ap1j4f";
       };
       features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.2
+      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.8
       features.apparmor = true;
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6877a71fe2d..01b153c4ee1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6573,12 +6573,12 @@ let
   # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
   linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
     modDirVersion = "${linux_3_2.version}-grsec";
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_53 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_54 kernelPatches.grsec_path ];
   })) (args: grsecurityOverrider args));
 
   linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: {
     modDirVersion = "${linux_3_12.version}-grsec";
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_2 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_8 kernelPatches.grsec_path ];
   })) (args: grsecurityOverrider args));
 
   linux_3_2_apparmor = lowPrio (linux_3_2.override {
-- 
GitLab


From fd999ed57063786b8239566368cbc94e0843c5f8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 21 Jan 2014 21:06:27 -0500
Subject: [PATCH 0385/3789] Linux: Set passthru attr to contain full passthru

This fixes #1566, thanks @wizeman

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/os-specific/linux/kernel/generic.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 2e3520c61ce..266e3fbd55b 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -120,6 +120,8 @@ let
     features = lib.fold (x: y: (x.features or {}) // y) features kernelPatches;
 
     meta = kernel.meta // extraMeta;
+
+    passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);
   };
 
   nativeDrv = lib.addPassthru kernel.nativeDrv passthru;
-- 
GitLab


From cb9cc87a397f9705559dd566299be665b0457e1c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 21 Jan 2014 21:12:58 -0500
Subject: [PATCH 0386/3789] kernel.passthru: Don't include meta to be
 consistent with stdenv.mkDerivation

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/os-specific/linux/kernel/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 266e3fbd55b..ff0ca0050fb 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -121,7 +121,7 @@ let
 
     meta = kernel.meta // extraMeta;
 
-    passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);
+    passthru = kernel.passthru // (removeAttrs passthru [ "passthru" "meta" ]);
   };
 
   nativeDrv = lib.addPassthru kernel.nativeDrv passthru;
-- 
GitLab


From ca116f76f97f299d6d4683788cdf4fa362a6ad60 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 21 Jan 2014 22:34:41 -0500
Subject: [PATCH 0387/3789] Unmaintain a bunch of packages

Trying to take maintainership more seriously...

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/applications/networking/remote/freerdp/default.nix         | 2 --
 pkgs/applications/networking/remote/freerdp/unstable.nix        | 2 --
 pkgs/applications/window-managers/trayer/default.nix            | 2 --
 pkgs/development/libraries/audiofile/default.nix                | 2 +-
 pkgs/development/libraries/flite/default.nix                    | 1 -
 pkgs/development/libraries/freetds/default.nix                  | 1 -
 pkgs/development/libraries/mtdev/default.nix                    | 2 --
 pkgs/development/libraries/pocketsphinx/default.nix             | 1 -
 pkgs/development/libraries/sbc/default.nix                      | 2 --
 pkgs/development/libraries/sphinxbase/default.nix               | 1 -
 pkgs/games/minecraft/default.nix                                | 2 +-
 pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix | 1 -
 pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix        | 1 -
 pkgs/os-specific/linux/pommed/default.nix                       | 1 -
 pkgs/os-specific/linux/xf86-input-mtrack/default.nix            | 2 --
 pkgs/os-specific/linux/xf86-input-multitouch/default.nix        | 2 --
 pkgs/os-specific/linux/xf86-video-nouveau/default.nix           | 2 --
 pkgs/tools/misc/cunit/default.nix                               | 2 --
 pkgs/tools/misc/grub/2.0x.nix                                   | 2 --
 pkgs/tools/networking/dd-agent/default.nix                      | 2 +-
 pkgs/tools/security/ossec/default.nix                           | 1 -
 pkgs/tools/text/xml/html-xml-utils/default.nix                  | 1 -
 pkgs/top-level/python-packages.nix                              | 1 -
 23 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 8f89d70405a..8785837fbb9 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -61,7 +61,5 @@ stdenv.mkDerivation rec {
     homepage = http://www.freerdp.com/;
 
     license = "free-non-copyleft";
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix
index cce3d23d194..6c133e9dbb4 100644
--- a/pkgs/applications/networking/remote/freerdp/unstable.nix
+++ b/pkgs/applications/networking/remote/freerdp/unstable.nix
@@ -70,8 +70,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.freerdp.com/;
 
     license = "free-non-copyleft";
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
 
diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix
index b8ecf81f7fc..9b9017420c0 100644
--- a/pkgs/applications/window-managers/trayer/default.nix
+++ b/pkgs/applications/window-managers/trayer/default.nix
@@ -20,8 +20,6 @@ stdenv.mkDerivation rec {
 
     description = "A lightweight GTK2-based systray for UNIX desktop";
 
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index 497909cf25c..a5fd80dc0db 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     description = "Library for reading and writing audio files in various formats";
     homepage    = http://www.68k.org/~michael/audiofile/; 
     license     = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ lovek323 shlevy ];
+    maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix
index 6db0dc240ba..85896cdb5e3 100644
--- a/pkgs/development/libraries/flite/default.nix
+++ b/pkgs/development/libraries/flite/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
     description = "A small, fast run-time speech synthesis engine";
     homepage = http://www.speech.cs.cmu.edu/flite/index.html; 
     license = "free-non-copyleft";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
 
diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index b39da46e4a2..0d8fa1bd281 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -13,7 +13,6 @@ stdenv.mkDerivation {
       "Libraries to natively talk to Microsoft SQL Server and Sybase databases";
     homepage = "http://www.freetds.org";
     license = "lgpl";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix
index 854becf6bb5..f92fe373043 100644
--- a/pkgs/development/libraries/mtdev/default.nix
+++ b/pkgs/development/libraries/mtdev/default.nix
@@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
     '';
 
     license = "MIT/X11";
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
 
diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix
index c57b050ebc6..3111f71369a 100644
--- a/pkgs/development/libraries/pocketsphinx/default.nix
+++ b/pkgs/development/libraries/pocketsphinx/default.nix
@@ -16,6 +16,5 @@ stdenv.mkDerivation rec {
     description = "Voice recognition library written in C";
     homepage = http://cmusphinx.sourceforge.net;
     license = "free-non-copyleft";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix
index 12662b9dea9..414f2a13dea 100644
--- a/pkgs/development/libraries/sbc/default.nix
+++ b/pkgs/development/libraries/sbc/default.nix
@@ -16,7 +16,5 @@ stdenv.mkDerivation rec {
     homepage = http://www.bluez.org/;
 
     licenses = stdenv.lib.licenses.gpl2;
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix
index dafa82bad34..1841fcbe4a1 100644
--- a/pkgs/development/libraries/sphinxbase/default.nix
+++ b/pkgs/development/libraries/sphinxbase/default.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation (rec {
     description = "Support Library for Pocketsphinx";
     homepage = http://cmusphinx.sourceforge.net;
     license = "free-non-copyleft";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 } // (stdenv.lib.optionalAttrs multipleOutputs {
   outputs = [ "out" "lib" "headers" ];
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 1f80998da92..6a3d528bde0 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   meta = {
       description = "A sandbox-building game";
       homepage = http://www.minecraft.net;
-      maintainers = [ stdenv.lib.maintainers.page stdenv.lib.maintainers.shlevy ];
+      maintainers = [ stdenv.lib.maintainers.page ];
       license = "unfree-redistributable";
   };
 }
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 b6465c0d794..5019491d3fd 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
     description = "Firmware extractor for cards supported by the b43 kernel module";
     homepage = http://wireless.kernel.org/en/users/Drivers/b43;
     license = "free-non-copyleft";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
 
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
index f941d9275c0..436f40712fc 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
@@ -23,7 +23,6 @@ stdenv.mkDerivation {
     description = "Firmware for cards supported by the b43 kernel module";
     homepage = http://wireless.kernel.org/en/users/Drivers/b43;
     license = stdenv.lib.licenses.unfree;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
 
diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix
index d6c06eca12f..89e9ff66342 100644
--- a/pkgs/os-specific/linux/pommed/default.nix
+++ b/pkgs/os-specific/linux/pommed/default.nix
@@ -75,6 +75,5 @@ stdenv.mkDerivation rec {
     description = "A tool to handle hotkeys on Apple laptop keyboards";
     homepage = http://www.technologeek.org/projects/pommed/index.html;
     license = "gplv2";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
index 4f74ce57ea8..f84088a9302 100644
--- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
@@ -45,8 +45,6 @@ stdenv.mkDerivation {
     description = "An Xorg driver for multitouch trackpads";
 
     license = "gplv2";
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
 
diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
index c5cc5f3b68f..ae24e32a157 100644
--- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
@@ -46,8 +46,6 @@ stdenv.mkDerivation {
     description = "Brings multitouch gestures to the Linux desktop";
 
     license = "gplv2";
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
 
diff --git a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix
index 8ac5cdb6969..3c9707828b3 100644
--- a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix
+++ b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix
@@ -31,7 +31,5 @@ stdenv.mkDerivation rec {
     description = "The xorg driver for nouveau-driven video cards";
 
     license = "gplv2";
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix
index aa586945cb9..35e4c3ab4d4 100644
--- a/pkgs/tools/misc/cunit/default.nix
+++ b/pkgs/tools/misc/cunit/default.nix
@@ -20,8 +20,6 @@ stdenv.mkDerivation rec {
     homepage = http://cunit.sourceforge.net/;
 
     license = "lgpl";
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
 
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 91933224467..ae3fe148764 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -87,8 +87,6 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = with stdenv.lib.maintainers; [ shlevy ];
-
     platforms = if EFIsupport then
       [ "i686-linux" "x86_64-linux" ]
     else
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index ae0007c1f2d..d9fa49320a5 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
       homepage = http://www.datadoghq.com;
 
-      maintainers = [ stdenv.lib.maintainers.shlevy stdenv.lib.maintainers.iElectric ];
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
 
       license = stdenv.lib.licenses.bsd3;
 
diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix
index f6f062011ab..df5bffe3dfb 100644
--- a/pkgs/tools/security/ossec/default.nix
+++ b/pkgs/tools/security/ossec/default.nix
@@ -34,7 +34,6 @@ yes
     description = "Open soruce host-based instrusion detection system";
     homepage = http://www.ossec.net;
     license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
 
diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix
index f52855dfc53..b8f2f4696ae 100644
--- a/pkgs/tools/text/xml/html-xml-utils/default.nix
+++ b/pkgs/tools/text/xml/html-xml-utils/default.nix
@@ -15,6 +15,5 @@ stdenv.mkDerivation rec {
     description = "Utilities for manipulating HTML and XML files";
     homepage = http://www.w3.org/Tools/HTML-XML-utils/;
     license = "free-non-copyleft";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 18d32311173..1b2684c2f3e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1076,7 +1076,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       description = "Code coverage measurement for python";
       homepage = http://nedbatchelder.com/code/coverage/;
       license = pkgs.lib.licenses.bsd3;
-      maintainers = [ stdenv.lib.maintainers.shlevy ];
     };
   };
 
-- 
GitLab


From 96e933a36fb7ca76a34d35fbaebe0e58cb824e1a Mon Sep 17 00:00:00 2001
From: Arvin Moezzi <moezzia@gmail.com>
Date: Wed, 22 Jan 2014 06:40:32 +0100
Subject: [PATCH 0388/3789] rockbox-utility: upgrade 1.3.1 -> 1.4.0

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

diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix
index adb2a456b88..eac12bae381 100644
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/pkgs/tools/misc/rockbox-utility/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation  rec {
   name = "rockbox-utility-${version}";
-  version = "1.3.1";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "http://download.rockbox.org/rbutil/source/RockboxUtility-v${version}-src.tar.bz2";
-    sha256 = "6c04b5c7eaad1762577908dedb9e40f5b0cee675150ae5ba844ea2c9bea294ca";
+    sha256 = "0k3ycga3b0jnj13whwiip2l0gx32l50pnbh7kfima87nq65aaa5w";
   };
 
   buildInputs = [ libusb1 qt4 ];
-- 
GitLab


From 9b538a96f16a7f18f5aa4f1ef082342597cb977e Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 22 Jan 2014 08:42:35 +0200
Subject: [PATCH 0389/3789] nagios-plugins: change source location and homepage
 since the original site has been hijacked.
 https://bugzilla.redhat.com/show_bug.cgi?id=1054340

---
 pkgs/servers/monitoring/nagios/plugins/official/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios/plugins/official/default.nix b/pkgs/servers/monitoring/nagios/plugins/official/default.nix
index 29b1a1db5af..c466813b23b 100644
--- a/pkgs/servers/monitoring/nagios/plugins/official/default.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/official/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "nagios-plugins-1.4.10";
 
   src = fetchurl {
-    url = https://www.nagios-plugins.org/download/nagios-plugins-1.4.10.tar.gz;
+    url = https://www.monitoring-plugins.org/download/nagios-plugins-1.4.10.tar.gz;
     sha256 = "0vm7sjiygxbfc5vbsi1g0dakpvynfzi86fhqx4yxd61brn0g8ghr";
   };
 
@@ -25,8 +25,8 @@ stdenv.mkDerivation {
   buildInputs = [openssh]; # !!! make openssh a runtime dependency only
 
   meta = {
-    description = "Official plugins for Nagios";
-    homepage = http://www.nagios.org/;
+    description = "Plugins for Nagios";
+    homepage = http://www.monitoring-plugins.org;
     license = "GPL";
   };
 }
-- 
GitLab


From 15006a1788657256f7721755f7c7e313bbc767ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 22 Jan 2014 08:06:09 +0100
Subject: [PATCH 0390/3789] mailpile: add spambayes dependency to spam/ham
 emails

---
 .../mailreaders/mailpile/default.nix          |  6 ++--
 pkgs/top-level/python-packages.nix            | 30 +++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 9cfbf8c63c2..d98b3b6be9d 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -5,12 +5,12 @@ buildPythonPackage rec {
 
   src = fetchgit {
     url = "https://github.com/pagekite/Mailpile.git";
-    rev = "59b96150822780138ab3567502952caadbc1d73e";
-    sha256 = "2edf82cbe6d3f17ba776fb5a70caa553f646db30ce207ab957038d845a9677e1";
+    rev = "cbb3bbf1f1da653124e63e11a51a6864dcb534a0";
+    sha256 = "1m2qkhcygidxqnnj2ajsxv8y5wjyp5il3919sl3vyl47gx02xa8j";
   };
 
   propagatedBuildInputs = with pythonPackages; [
-    pillow jinja2 pythonPackages."lxml-2.3.6" python.modules.readline or null];
+    pillow jinja2 spambayes pythonPackages."lxml-2.3.6" python.modules.readline or null];
 
   meta = with stdenv.lib; {
     description = "A modern, fast web-mail client with user-friendly encryption and privacy features";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1b2684c2f3e..9e2e132a9a6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6085,6 +6085,36 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  spambayes = buildPythonPackage rec {
+    name = "spambayes-1.1a6";
+
+    src = fetchurl {
+      url = "mirror://sourceforge/spambayes/${name}.tar.gz";
+      sha256 = "0lqhn2v0avgwxmk4dq9lkwr2g39ls2p6x8hqk5w07wd462cjsx8l";
+    };
+
+    propagatedBuildInputs = [ pydns lockfile ];
+
+    meta = with stdenv.lib; {
+      description = "Statistical anti-spam filter, initially based on the work of Paul Graham";
+      homepage = http://spambayes.sourceforge.net/;
+    };
+  };
+
+  pydns = buildPythonPackage rec {
+    name = "pydns-2.3.6";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pydns/${name}.tar.gz";
+      sha256 = "0qnv7i9824nb5h9psj0rwzjyprwgfiwh5s5raa9avbqazy5hv5pi";
+    };
+
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+    };
+  };
+
   sympy = buildPythonPackage rec {
     name = "sympy-0.7.3";
 
-- 
GitLab


From 5b982bd090c4926cc8132f5e494190547dce42eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 22 Jan 2014 10:46:29 +0100
Subject: [PATCH 0391/3789] nss: patch http location moved, let's keep it in
 filesystem

---
 .../libraries/nss/85_security_load.patch      | 80 +++++++++++++++++++
 pkgs/development/libraries/nss/default.nix    |  9 +--
 2 files changed, 82 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/libraries/nss/85_security_load.patch

diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/pkgs/development/libraries/nss/85_security_load.patch
new file mode 100644
index 00000000000..4268231380c
--- /dev/null
+++ b/pkgs/development/libraries/nss/85_security_load.patch
@@ -0,0 +1,80 @@
+## 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 @@
+     libname = PR_GetLibraryName(NULL, "softokn3");
+     assert(libname != NULL);
+     lib = PR_LoadLibrary(libname);
++    if (!lib)
++        lib = PR_LoadLibrary("/usr/lib/nss/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
+@@ -406,6 +406,13 @@
+ 	 * unload the library if anything goes wrong from here on out...
+ 	 */
+ 	library = PR_LoadLibrary(mod->dllName);
++	if ((library == NULL) &&
++	    !rindex(mod->dllName, PR_GetDirectorySeparator())) {
++            library = PORT_LoadLibraryFromOrigin(my_shlib_name,
++                                      (PRFuncPtr) &softoken_LoadDSO,
++                                      mod->dllName);
++	}
++
+ 	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
+@@ -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 / */
++    }
+     if (c) {
+         size_t referencePathSize = 1 + c - referencePath;
+-        fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 1);
++        fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5);
+         if (fullName) {
+             memcpy(fullName, referencePath, referencePathSize);
+             strcpy(fullName + referencePathSize, name); 
+@@ -81,6 +86,12 @@
+ #endif
+             libSpec.type = PR_LibSpec_Pathname;
+             libSpec.value.pathname = fullName;
++            if ((referencePathSize >= 4) &&
++                (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) {
++                memcpy(fullName + referencePathSize -4, "lib", 3);
++            }
++            strcpy(fullName + referencePathSize, "nss/");
++            strcpy(fullName + referencePathSize + 4, 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 @@
+                                           | PR_LD_ALT_SEARCH_PATH 
+ #endif
+                                           );
++            if (! dlh) {
++                strcpy(fullName + referencePathSize, name);
++                dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL);
++            }
+             PORT_Free(fullName);
+         }
+     }
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 64c07d9cb2e..b352064cee5 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -9,12 +9,6 @@ let
     sha256 = "1k1m8lsgqwxx251943hks1dd13hz1adpqqb0hxwn011by5vmi201";
   };
 
-  secLoadPatch = fetchurl {
-    name = "security_load.patch";
-    urls = http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.3.1-1/85_security_load.patch;
-    sha256 = "041c6v4cxwsy14qr5m9qs0gkv3w24g632cwpz27kacxpa886r1ds";
-  };
-
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
   version = "3.15.3.1";
@@ -32,7 +26,8 @@ in stdenv.mkDerivation rec {
 
   patches =
     [ ./nss-3.15-gentoo-fixups.patch
-      secLoadPatch
+      # from 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
     ];
 
-- 
GitLab


From 37cc0df1bfacaba5beaffb399b80752ab77db25c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Jan 2014 12:43:01 +0100
Subject: [PATCH 0392/3789] silgraphite: fix evaluation errors on Darwin

---
 pkgs/development/libraries/silgraphite/default.nix   | 4 ++--
 pkgs/development/libraries/silgraphite/graphite2.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix
index db018cca465..8e8cdc0ce1c 100644
--- a/pkgs/development/libraries/silgraphite/default.nix
+++ b/pkgs/development/libraries/silgraphite/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   version = "2.3.1";
   name = "silgraphite-2.3.1";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/silgraphite/silgraphite/${version}/${name}.tar.gz";
     sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65";
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An advanced font engine";
     maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index 3212d13ce35..f6aa7c35f39 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An advanced font engine";
     maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From ff8cffed8623e78029572835c51a4535dd16f7f5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Jan 2014 12:44:49 +0100
Subject: [PATCH 0393/3789] subversion: fix evaluation errors on FreeBSD

---
 pkgs/applications/version-management/subversion/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 67346ef8389..7a27611496b 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -77,6 +77,6 @@ stdenv.mkDerivation rec {
     description = "A version control system intended to be a compelling replacement for CVS in the open source community";
     homepage = http://subversion.apache.org/;
     maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
-- 
GitLab


From 35aa1313718187509bf7b5b5ab34a98a10129cef Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Sun, 19 Jan 2014 20:42:38 +0100
Subject: [PATCH 0394/3789] rust: fixed build for i686 and maybe darwin

---
 pkgs/development/compilers/rust/default.nix | 27 +++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index a0c8b50ad3f..02c402094bd 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -1,6 +1,23 @@
 {stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper}:
 
-let snapshotName = "rust-stage0-2014-01-05-a6d3e57-linux-x86_64-aa8fbbacdb1d8a078f3a3fe3478dcbc506bd4090.tar.bz2"; in
+with if stdenv.system == "i686-linux" then {
+  platform = "linux-i386";
+  snapshot = "03e60be1f1b90dddd15f3597bc45ec8d9626b35d";
+  snapshot_sha = "1v1l082gj7d2d4p53xgsxz2k965jcgqhw4cyxmjxc6yh5fw0idx6";
+  target = "i386-unknown-linux-gnu";
+} else if stdenv.system == "x86_64-linux" then {
+  platform = "linux-x86_64";
+  snapshot = "aa8fbbacdb1d8a078f3a3fe3478dcbc506bd4090";
+  snapshot_sha = "17inc23jpznqp0vnskvznm74mm24c1nffhz2bkadhvp2ww0vpjjx";
+  target = "x86_64-unknown-linux-gnu";
+} else if stdenv.system == "x86_64-darwin" then {
+  platform = "macos-x86_64";
+  snapshot = "ec746585cb20d1f9edffec74f6ff8be6e93a75f7";
+  snapshot_sha = "0r8f8x3x8jb1hm40pbgj4i9ll2y5dgjgvj24qg7mp4crbqcqhkd2";
+} else {};
+let snapshotDate = "2014-01-05";
+    snapshotRev = "a6d3e57";
+    snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in
 stdenv.mkDerivation {
   name = "rust-0.9";
 
@@ -12,7 +29,7 @@ stdenv.mkDerivation {
   # 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 = "17inc23jpznqp0vnskvznm74mm24c1nffhz2bkadhvp2ww0vpjjx";
+    sha256 = snapshot_sha;
   };
 
   # Put the snapshot where it is expected
@@ -23,10 +40,10 @@ stdenv.mkDerivation {
 
   # Modify the snapshot compiler so that is can be executed
   preBuild = if stdenv.isLinux then ''
-    make x86_64-unknown-linux-gnu/stage0/bin/rustc
-    patchelf --interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \
+    make ${target}/stage0/bin/rustc
+    patchelf --interpreter ${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker} \
              --set-rpath ${stdenv.gcc.gcc}/lib/ \
-             x86_64-unknown-linux-gnu/stage0/bin/rustc
+             ${target}/stage0/bin/rustc
   '' else null;
 
   # rustc requires cc
-- 
GitLab


From 6eed023894ce51547772f6ba86ebfeae473aeede Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Mon, 20 Jan 2014 17:05:29 +0100
Subject: [PATCH 0395/3789] rust: patched the source to hardcode gcc path

to avoid using a wrapper.
---
 pkgs/development/compilers/rust/default.nix   | 29 +++++++++---
 .../compilers/rust/hardcode_paths.patch       | 44 +++++++++++++++++++
 2 files changed, 66 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/compilers/rust/hardcode_paths.patch

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 02c402094bd..a93bf4af613 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -1,5 +1,19 @@
 {stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper}:
 
+/* Rust's build process has a few quirks :
+
+- It requires some patched in llvm that haven't landed upstream, so it
+  compiles its own llvm. This might change in the future, so at some
+  point we may be able to switch to nix's llvm.
+
+- The Rust compiler is written is Rust, so it requires a bootstrap
+  compiler, which is downloaded during the build. To make the build
+  pure, we download it ourself before and put it where it is
+  expected. Once the language is stable (1.0) , we might want to
+  switch it to use nix's packaged rust compiler.
+
+*/
+
 with if stdenv.system == "i686-linux" then {
   platform = "linux-i386";
   snapshot = "03e60be1f1b90dddd15f3597bc45ec8d9626b35d";
@@ -38,6 +52,14 @@ stdenv.mkDerivation {
     ln -s $snapshot $sourceRoot/dl/${snapshotName}
   '';
 
+  # The compiler requires cc, so we patch the source to tell it where to find it
+  patches = [ ./hardcode_paths.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
@@ -46,13 +68,6 @@ stdenv.mkDerivation {
              ${target}/stage0/bin/rustc
   '' else null;
 
-  # rustc requires cc
-  postInstall = ''
-    for f in $out/bin/*; do
-      wrapProgram $f --prefix PATH : "${stdenv.gcc}/bin"
-    done
-  '';
-
   buildInputs = [ which file perl curl python27 makeWrapper ];
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/compilers/rust/hardcode_paths.patch b/pkgs/development/compilers/rust/hardcode_paths.patch
new file mode 100644
index 00000000000..1500446cea9
--- /dev/null
+++ b/pkgs/development/compilers/rust/hardcode_paths.patch
@@ -0,0 +1,44 @@
+diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
+index 101b2e3..124267f 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 {
+         _ => {},
+     }
+ 
+-    get_system_tool(sess, "cc")
++    ~"@gccPath@"
+ }
+ 
+ pub fn get_ar_prog(sess: Session) -> ~str {
+@@ -737,27 +737,9 @@ pub fn get_ar_prog(sess: Session) -> ~str {
+         None => {}
+     }
+ 
+-    get_system_tool(sess, "ar")
++    ~"@binutilsPath@"
+ }
+ 
+-fn get_system_tool(sess: Session, tool: &str) -> ~str {
+-    match sess.targ_cfg.os {
+-        abi::OsAndroid => match sess.opts.android_cross_path {
+-            Some(ref path) => {
+-                let tool_str = match tool {
+-                    "cc" => "gcc",
+-                    _ => tool
+-                };
+-                format!("{}/bin/arm-linux-androideabi-{}", *path, tool_str)
+-            }
+-            None => {
+-                sess.fatal(format!("need Android NDK path for the '{}' tool \
+-                                    (--android-cross-path)", tool))
+-            }
+-        },
+-        _ => tool.to_owned(),
+-    }
+-}
+ 
+ /// Perform the linkage portion of the compilation phase. This will generate all
+ /// of the requested outputs for this compilation session.
+
+
-- 
GitLab


From 49dd0867a7ef4f39bdd48dda7efb703e1365a3c2 Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Wed, 22 Jan 2014 16:36:05 +0100
Subject: [PATCH 0396/3789] rust: Fixed build

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

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index a93bf4af613..241eddc8068 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation {
   preBuild = if stdenv.isLinux then ''
     make ${target}/stage0/bin/rustc
     patchelf --interpreter ${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker} \
-             --set-rpath ${stdenv.gcc.gcc}/lib/ \
+             --set-rpath ${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/ \
              ${target}/stage0/bin/rustc
   '' else null;
 
-- 
GitLab


From c1811d0304978db69b420ce530fb81b1993e2509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 22 Jan 2014 18:18:52 +0100
Subject: [PATCH 0397/3789] Add pythonPackages.pyramid_chameleon and disable
 tests for zope_testrunner

---
 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 9e2e132a9a6..4bc9c54d719 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1724,6 +1724,27 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   };
 
 
+  pyramid_chameleon = buildPythonPackage rec {
+    name = "pyramid_chameleon-0.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pyramid_chameleon/${name}.tar.gz";
+      md5 = "39b1327a9890f382200bbfde943833d7";
+    };
+
+    propagatedBuildInputs = [
+      chameleon
+      pyramid
+      zope_interface
+      setuptools
+    ];
+
+    meta = with stdenv.lib; {
+      maintainers = [ maintainers.iElectric ];
+    };
+  };
+
+
   pyramid_jinja2 = buildPythonPackage rec {
     name = "pyramid_jinja2-1.9";
 
@@ -7706,6 +7727,9 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
     propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit;
 
+    # a test is failing
+    doCheck = false;
+
     meta = {
       description = "A flexible test runner with layer support";
       homepage = http://pypi.python.org/pypi/zope.testrunner;
-- 
GitLab


From f8afc745bfe95d0086c456a069cf9b26dfbfbb69 Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Wed, 22 Jan 2014 19:20:52 +0100
Subject: [PATCH 0398/3789] rust: fixed i686 build

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

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 241eddc8068..ebdd49479e0 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -18,7 +18,7 @@ with if stdenv.system == "i686-linux" then {
   platform = "linux-i386";
   snapshot = "03e60be1f1b90dddd15f3597bc45ec8d9626b35d";
   snapshot_sha = "1v1l082gj7d2d4p53xgsxz2k965jcgqhw4cyxmjxc6yh5fw0idx6";
-  target = "i386-unknown-linux-gnu";
+  target = "i686-unknown-linux-gnu";
 } else if stdenv.system == "x86_64-linux" then {
   platform = "linux-x86_64";
   snapshot = "aa8fbbacdb1d8a078f3a3fe3478dcbc506bd4090";
-- 
GitLab


From 51de280c0a425fa0ea039a504646a99da3605aca Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 22 Jan 2014 14:23:56 -0500
Subject: [PATCH 0399/3789] nixos X tests: wait for logind to link a session to
 the server

There seems to be some race causing failures if an X command gets in before slim starts the session

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 nixos/lib/test-driver/Machine.pm | 2 ++
 nixos/tests/firefox.nix          | 1 -
 nixos/tests/xfce.nix             | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index a28214ea934..8bef3d67b8d 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -495,6 +495,8 @@ 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");
+            return 0 if $status != 0;
             my ($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1");
             return 1 if $status == 0;
         }
diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index ca634ffcf1e..d6599be13c9 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -16,7 +16,6 @@
       $machine->waitForWindow(qr/Valgrind/);
       $machine->sleep(40); # wait until Firefox has finished loading the page
       $machine->screenshot("screen");
-
     '';
 
 }
diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix
index 9f9692f8a01..50ce54c918b 100644
--- a/nixos/tests/xfce.nix
+++ b/nixos/tests/xfce.nix
@@ -17,6 +17,7 @@
 
   testScript =
     ''
+      $machine->waitForX;
       $machine->waitForWindow(qr/xfce4-panel/);
       $machine->sleep(10);
 
-- 
GitLab


From 42fb68d6a960ddfcbb1d6584593fb22851124901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 22 Jan 2014 21:18:36 +0100
Subject: [PATCH 0400/3789] java: Update to version 7u51

---
 pkgs/development/compilers/jdk/jdk7-linux.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/jdk/jdk7-linux.nix
index 7ef575ba807..e6e8bda02d4 100644
--- a/pkgs/development/compilers/jdk/jdk7-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk7-linux.nix
@@ -35,22 +35,25 @@ let
       "";
 in
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+  patchversion = 51;
+
   name =
-    if installjdk then "jdk-1.7.0_45" else "jre-1.7.0_45";
+    if installjdk then "jdk-1.7.0_${patchversion}" else "jre-1.7.0_${patchversion}";
 
   src =
     if stdenv.system == "i686-linux" then
       requireFile {
-        name = "jdk-7u45-linux-i586.tar.gz";
+        name = "jdk-7u${patchversion}-linux-i586.tar.gz";
         url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
-        sha256 = "1q0nw2rwmavcrssyigq76p1h00hm8kd3rhb5bdv7rbdcs0jxrjsa";
+        sha256 = "1ks2zyx88bxdjcbdgg40mh1i9a83ll9ymxr79rplfvj48ig9d8mk";
       }
     else if stdenv.system == "x86_64-linux" then
+
       requireFile {
-        name = "jdk-7u45-linux-x64.tar.gz";
+        name = "jdk-7u${patchversion}-linux-x64.tar.gz";
         url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
-        sha256 = "06jbz536zycqkdpc7zriay0jidmj9nriqva60afsgpv93kcf9spj";
+        sha256 = "0p7mfjj8fxlghvhcqhwgrifzb32b9y143yw962zk02bfycz7qdkp";
       }
     else
       abort "jdk requires i686-linux or x86_64 linux";
-- 
GitLab


From 3b20a10ae9ca4ebf2e849d043ca959576ebf808a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 22 Jan 2014 15:54:40 -0500
Subject: [PATCH 0401/3789] Fix tarball

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 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 e6e8bda02d4..6e1fec4d18c 100644
--- a/pkgs/development/compilers/jdk/jdk7-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk7-linux.nix
@@ -36,7 +36,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  patchversion = 51;
+  patchversion = "51";
 
   name =
     if installjdk then "jdk-1.7.0_${patchversion}" else "jre-1.7.0_${patchversion}";
-- 
GitLab


From 1d509674244522851ede191d9ff8e58bcecd4278 Mon Sep 17 00:00:00 2001
From: rszibele <rszibele.nospam@example.com>
Date: Thu, 23 Jan 2014 10:35:02 +0100
Subject: [PATCH 0402/3789] Added SciTE 3.3.7.

---
 lib/maintainers.nix                         |  1 +
 pkgs/applications/editors/scite/default.nix | 35 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/editors/scite/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 3c7a399623d..f39a3547938 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -54,6 +54,7 @@
   rob = "Rob Vermaas <rob.vermaas@gmail.com>";
   roconnor = "Russell O'Connor <roconnor@theorem.ca>";
   roelof = "Roelof Wobben <rwobben@hotmail.com>";
+  rszibele = "Richard Szibele <richard_szibele@hotmail.com>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
   shlevy = "Shea Levy <shea@shealevy.com>";
   simons = "Peter Simons <simons@cryp.to>";
diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix
new file mode 100644
index 00000000000..234ee1f065e
--- /dev/null
+++ b/pkgs/applications/editors/scite/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, gtk }:
+
+let
+  version = "3.3.7";
+
+  version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}";
+in stdenv.mkDerivation {
+  name = "scite-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/scintilla/SciTE/${version}/scite${version_short}.tgz";
+    sha256 = "0x7i6yxq50frsjkrp3lc5zy0d1ssq2n91igjn0dmqajpg7kls2dd";
+  };
+
+  buildInputs = [ pkgconfig gtk ];
+  sourceRoot = "scintilla/gtk";
+
+  buildPhase = ''
+    make
+    cd ../../scite/gtk
+    make prefix=$out/
+  '';
+
+  installPhase = ''
+    make install prefix=$out/
+  '';
+
+  meta = {
+    homepage = "http://www.scintilla.org/SciTE.html";
+    description = "SCIntilla based Text Editor";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = stdenv.lib.maintainers.rszibele;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f7de5e4673..3d4c780cca2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8621,6 +8621,8 @@ let
 
   sbagen = callPackage ../applications/misc/sbagen { };
 
+  scite = callPackage ../applications/editors/scite { };
+
   scribus = callPackage ../applications/office/scribus {
     inherit (gnome) libart_lgpl;
   };
-- 
GitLab


From f4af2a8737c0b9059c0e12fa05d400bd46213a52 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jan 2014 10:57:34 +0100
Subject: [PATCH 0403/3789] clang-wrapper: Sync with gcc-wrapper

---
 pkgs/build-support/clang-wrapper/setup-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/clang-wrapper/setup-hook.sh b/pkgs/build-support/clang-wrapper/setup-hook.sh
index 74365a52704..0724d081290 100644
--- a/pkgs/build-support/clang-wrapper/setup-hook.sh
+++ b/pkgs/build-support/clang-wrapper/setup-hook.sh
@@ -1,6 +1,6 @@
 addCVars () {
     if test -d $1/include; then
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$1/include"
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $1/include"
     fi
 
     if test -d $1/lib64; then
-- 
GitLab


From c07559b782acc2a152d6c9705e90bad724e64a2d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jan 2014 11:21:38 +0100
Subject: [PATCH 0404/3789] sudo: Update to 1.8.9p4

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

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index eed69eb9809..6d82744e1f9 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, coreutils, pam, groff }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.9p3";
+  name = "sudo-1.8.9p4";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "1dy549nwplc3d1147fvcl8p8hbrc7sslqldi6229r4pbibng1cd2";
+    sha256 = "19y75bsh4z2kid5jk2r84z7rvmnh90n8cb9fbn9l4rcw83lzjhqr";
   };
 
   postConfigure = ''
-- 
GitLab


From 6a8485af6bd2f4fc13f3e05f364f75b151268bed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jan 2014 11:22:44 +0100
Subject: [PATCH 0405/3789] clang-wrapper: Set $CXX to clang

This is useful for non-Autoconf-based packages, since GNU Make's
default for CXX is "g++".  (The CC default is "cc" so should work fine
with Clang already.)
---
 pkgs/build-support/clang-wrapper/setup-hook.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/clang-wrapper/setup-hook.sh b/pkgs/build-support/clang-wrapper/setup-hook.sh
index 0724d081290..f7687651eaf 100644
--- a/pkgs/build-support/clang-wrapper/setup-hook.sh
+++ b/pkgs/build-support/clang-wrapper/setup-hook.sh
@@ -31,3 +31,6 @@ fi
 if test -n "@coreutils@"; then
     addToSearchPath PATH @coreutils@/bin
 fi
+
+: ${CXX:=clang++}
+export CXX
-- 
GitLab


From f5461b02d5e998fc03bd11d84a0d5be733672959 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jan 2014 11:57:31 +0100
Subject: [PATCH 0406/3789] serf: fix evaluation on FreeBSD (required for
 Subversion)

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

diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index e758fe34c36..b511a841d19 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   buildPhase = ''
     scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr}"/bin/*-config)" \
-        APU="$(echo "${aprutil}"/bin/*-config)" GSSAPI="${krb5}" CC="${stdenv.gcc}/bin/gcc" 
+        APU="$(echo "${aprutil}"/bin/*-config)" GSSAPI="${krb5}" CC="${stdenv.gcc}/bin/gcc"
   '';
 
   installPhase = ''
@@ -40,6 +40,6 @@ stdenv.mkDerivation {
     description = "HTTP client library based on APR";
     license = stdenv.lib.licenses.asl20 ;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
-- 
GitLab


From e0000f8ad1cf4b2f85d56033751c6eb61bc7c073 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 22 Jan 2014 10:57:43 +0100
Subject: [PATCH 0407/3789] ati-drivers: update to 13.12 (close #1569)

This update is mostly effort from @MarcWeber and @vcunat, now tested on real
hardware making sure it works with multiple GPUs and opencl.
---
 pkgs/development/misc/amdadl-sdk/default.nix  |  15 +-
 pkgs/os-specific/linux/ati-drivers/builder.sh |   5 +-
 .../os-specific/linux/ati-drivers/default.nix |  26 +-
 .../linux/ati-drivers/gentoo-patches.patch    | 330 +++---------------
 .../linux/ati-drivers/patch-samples.patch     |  26 ++
 5 files changed, 99 insertions(+), 303 deletions(-)
 create mode 100644 pkgs/os-specific/linux/ati-drivers/patch-samples.patch

diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix
index d311b6b722a..a77e477f572 100644
--- a/pkgs/development/misc/amdadl-sdk/default.nix
+++ b/pkgs/development/misc/amdadl-sdk/default.nix
@@ -1,12 +1,13 @@
-{ fetchurl, stdenv, unzip }:
+{ requireFile, stdenv, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "4.0";
+  version = "6.0";
   name = "amdadl-sdk-${version}";
 
-  src = fetchurl {
-    url = "http://download2-developer.amd.com/amd/GPU/zip/ADL_SDK_${version}.zip";
-    sha256 = "4265ee2f265b69cc39b61e10f79741c1d799f4edb71dce14a7d88509fbec0efa";
+  src = requireFile {
+    name = "ADL_SDK_6.0.zip";
+    url = http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/;
+    sha256 = "429f4fd1edebb030d6366f4e0a877cf105e4383f7dd2ccf54e5aef8f2e4242c9";
   };
 
   buildInputs = [ unzip ];
@@ -17,6 +18,10 @@ stdenv.mkDerivation rec {
     unzip $src
   '';
 
+  patchPhase = ''
+    sed -i -e '/include/a \#include <wchar.h>' include/adl_structures.h || die
+  '';
+
   buildPhase = ''
     #Build adlutil
     cd adlutil
diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh
index 2a20aa29fcc..d1ca1b35452 100644
--- a/pkgs/os-specific/linux/ati-drivers/builder.sh
+++ b/pkgs/os-specific/linux/ati-drivers/builder.sh
@@ -8,7 +8,7 @@ die(){ echo $@; exit 1; }
 
 # custom unpack:
 unzip $src
-run_file=$(echo amd-driver-installer-*)
+run_file=$(echo amd-catalyst-*)
 sh $run_file --extract .
 
 eval "$patchPhase"
@@ -181,6 +181,8 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
   # make xorg use the ati version
   ln -s $out/lib/xorg/modules/extensions/{fglrx/fglrx-libglx.so,libglx.so}
 
+  # libstdc++ and gcc are needed by some libs
+  patchelf --set-rpath $gcc/$lib_arch $out/lib/libatiadlxx.so
 }
 
 { # build samples
@@ -190,6 +192,7 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
   cd samples
   tar xfz ../common/usr/src/ati/fglrx_sample_source.tgz
 
+  eval "$patchPhaseSamples"
 
   ( # build and install fgl_glxgears
     cd fgl_glxgears; 
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index 8f5ecb71205..518ca784d4a 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -13,30 +13,35 @@
 # See http://thread.gmane.org/gmane.linux.distributions.nixos/4145 for a
 # workaround (TODO)
 
-# The gentoo ebuild contains much more magic..
+# The gentoo ebuild contains much more magic and is usually a great resource to
+# find patches :)
 
 # http://wiki.cchtml.com/index.php/Main_Page
 
 # There is one issue left:
 # /usr/lib/dri/fglrx_dri.so must point to /run/opengl-driver/lib/fglrx_dri.so
 
-assert stdenv.system == "x86_64-linux";
+# You eventually have to blacklist radeon module (?)
 
+assert stdenv.system == "x86_64-linux";
 
 stdenv.mkDerivation {
-  name = "ati-drivers-13.4-${kernel.version}";
+  name = "ati-drivers-13.12-${kernel.version}";
 
   builder = ./builder.sh;
 
   inherit libXxf86vm xf86vidmodeproto;
+  gcc = stdenv.gcc.gcc;
 
   src = fetchurl {
-    url = http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-13-4-linux-x86.x86_64.zip;
-    sha256 = "1914ikdich0kg047bqh89ai5z4dyryj5mlw5i46n90fsfiaxa532";
+    url = http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip;
+    sha256 = "1jm0c4rqyjjhyj8a7axf4hz16bcvy8yhnkn45wc2l73xhks36h02";
     curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64";
   };
 
-  patchPhase = "patch -p0 < ${./gentoo-patches.patch}";
+  # most patches are taken from gentoo
+  patchPhase = "patch -p1 < ${./gentoo-patches.patch}";
+  patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}";
 
   buildInputs =
     [ xlibs.libXext xlibs.libX11 xlibs.libXinerama
@@ -61,18 +66,17 @@ stdenv.mkDerivation {
   # without this some applications like blender don't start, but they start
   # with nvidia. This causes them to be symlinked to $out/lib so that they
   # appear in /run/opengl-driver/lib which get's added to LD_LIBRARY_PATH
- extraDRIlibs = [ xorg.libXext ];
+  extraDRIlibs = [ xorg.libXext ];
 
   inherit mesa; # only required to build examples
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "ATI drivers";
     homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx;
-    license = "unfree";
-    maintainers = [stdenv.lib.maintainers.marcweber];
+    license = licenses.unfree;
+    maintainers = with maintainers; [marcweber offline];
     platforms = [ "x86_64-linux" ];
     hydraPlatforms = [];
-    broken = true;
   };
 
   # moved assertions here because the name is evaluated when the NixOS manual is generated
diff --git a/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch b/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch
index ce4871c0658..392c2a8c29e 100644
--- a/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch
+++ b/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch
@@ -1,293 +1,51 @@
-diff -Nur common/lib/modules/fglrx/build_mod/drmP.h common-r1/lib/modules/fglrx/build_mod/drmP.h
---- common/lib/modules/fglrx/build_mod/drmP.h	2013-05-15 09:26:23.555752577 +0300
-+++ common-r1/lib/modules/fglrx/build_mod/drmP.h	2013-05-16 10:39:17.496212055 +0300
-@@ -901,10 +901,6 @@
- int                   DRM(stub_unregister)(int minor);
+diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
+index d3ad3ce..9362b58 100755
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -34,6 +34,11 @@
+ #include <linux/autoconf.h>
+ #endif
  
- 				/* Proc support (drm_proc.h) */
--extern struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev,
--					     int minor,
--					     struct proc_dir_entry *root,
--					     struct proc_dir_entry **dev_root);
- extern int            DRM(proc_cleanup)(int minor,
- 					struct proc_dir_entry *root,
- 					struct proc_dir_entry *dev_root);
-diff -Nur common/lib/modules/fglrx/build_mod/drm_proc.h common-r1/lib/modules/fglrx/build_mod/drm_proc.h
---- common/lib/modules/fglrx/build_mod/drm_proc.h	2013-05-15 09:26:23.555752577 +0300
-+++ common-r1/lib/modules/fglrx/build_mod/drm_proc.h	2013-05-19 02:16:16.584406160 +0300
-@@ -75,61 +75,6 @@
- #define DRM_PROC_ENTRIES (sizeof(DRM(proc_list))/sizeof(DRM(proc_list)[0]))
- 
- /**
-- * Initialize the DRI proc filesystem for a device.
-- *
-- * \param dev DRM device.
-- * \param minor device minor number.
-- * \param root DRI proc dir entry.
-- * \param dev_root resulting DRI device proc dir entry.
-- * \return root entry pointer on success, or NULL on failure.
-- * 
-- * Create the DRI proc root entry "/proc/ati", the device proc root entry
-- * "/proc/ati/%minor%/", and each entry in proc_list as
-- * "/proc/ati/%minor%/%name%".
-- */
--struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev, int minor,
--				      struct proc_dir_entry *root,
--				      struct proc_dir_entry **dev_root)
--{
--	struct proc_dir_entry *ent;
--	int		      i, j;
--	char                  name[64];
--
--	if (!minor) root = create_proc_entry("dri", S_IFDIR, NULL);
--	if (!root) {
--		DRM_ERROR("Cannot create /proc/ati\n");
--		return NULL;
--	}
--
--	sprintf(name, "%d", minor);
--	*dev_root = create_proc_entry(name, S_IFDIR, root);
--	if (!*dev_root) {
--		DRM_ERROR("Cannot create /proc/ati/%s\n", name);
--		return NULL;
--	}
--
--	for (i = 0; i < DRM_PROC_ENTRIES; i++) {
--		ent = create_proc_entry(DRM(proc_list)[i].name,
--					S_IFREG|S_IRUGO, *dev_root);
--		if (!ent) {
--			DRM_ERROR("Cannot create /proc/ati/%s/%s\n",
--				  name, DRM(proc_list)[i].name);
--			for (j = 0; j < i; j++)
--				remove_proc_entry(DRM(proc_list)[i].name,
--						  *dev_root);
--			remove_proc_entry(name, root);
--			if (!minor) remove_proc_entry("dri", NULL);
--			return NULL;
--		}
--		ent->read_proc = DRM(proc_list)[i].f;
--		ent->data      = dev;
--	}
--
--	return root;
--}
--
--
--/**
-  * Cleanup the proc filesystem resources.
-  *
-  * \param minor device minor number.
-diff -Nur common/lib/modules/fglrx/build_mod/firegl_public.c common-r1/lib/modules/fglrx/build_mod/firegl_public.c
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2013-05-15 09:26:23.545752925 +0300
-+++ common-r1/lib/modules/fglrx/build_mod/firegl_public.c	2013-05-19 03:07:10.236552522 +0300
-@@ -583,6 +583,202 @@
-     { "NULL",           NULL,                       NULL} // Terminate List!!!
- };
- 
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-+typedef int (read_proc_t)(char *page, char **start, off_t off, int count, int *eof, void *data);
-+typedef int (write_proc_t)(struct file *file, const char __user *buffer, unsigned long count, void *data);
-+#else
-+#define PDE_DATA(inode) (PDE((inode))->data)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
++#include <linux/uidgid.h>
 +#endif
 +
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-+typedef struct {
-+	read_proc_t *read_func;
-+	write_proc_t *write_func;
-+	void *data;
-+} gentoo_proc_wrapper_t;
-+
-+#define GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC 939750305
-+
-+static ssize_t gentoo_proc_wrapper_read (struct file *myfile, char __user *buffer, size_t count, loff_t *offset) {
-+	int is_eof=0, retval;
-+	char *start, *usebuffer=NULL;
-+	gentoo_proc_wrapper_t* wrapper_data=(gentoo_proc_wrapper_t*)(myfile->private_data);
-+	if (PAGE_SIZE<*offset) {
-+		printk(KERN_ERR "Trying to read beyond 4k on proc\n");
-+		return -EIO;
-+	}
-+	//printk(KERN_NOTICE " call with: dev %p, func %p\n", wrapper_data->data, wrapper_data->read_func);
-+	
-+	usebuffer=kmalloc(2*PAGE_SIZE, GFP_KERNEL);
-+	if (!usebuffer)
-+		return -ENOMEM;
-+	((u32*)usebuffer)[1024]=GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC;
-+
-+	retval=wrapper_data->read_func(usebuffer, &start, *offset, count, &is_eof, wrapper_data->data);
-+
-+	BUG_ON(GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC != ((u32*)usebuffer)[1024]);
-+
-+	if (0 > retval)
-+	{
-+		printk(KERN_ERR "Proc read failed with %d", retval);
-+		goto out;
-+	}
-+
-+	if (copy_to_user(buffer, start, retval)) {
-+		printk(KERN_NOTICE "copy to user failed in amd drivers proc code\n");
-+		retval=-EFAULT;
-+		goto out;
-+	}
-+	*offset+=retval;
-+	
-+out:
-+	if (usebuffer)
-+		kfree(usebuffer);
-+	return retval;
-+}
-+static ssize_t gentoo_proc_wrapper_write (struct file *myfile, const char __user *buffer, size_t count, loff_t *offset) {
-+	gentoo_proc_wrapper_t* wrapper_data=(gentoo_proc_wrapper_t*)(myfile->private_data);
-+	int retval=0;
-+	void *usebuffer=NULL;
-+
-+	BUG_ON(*offset);
-+	if (!wrapper_data->write_func)
-+		return -EPERM;
-+	
-+	usebuffer=kmalloc(count, GFP_KERNEL);
-+	if (!usebuffer)
-+		return -ENOMEM;
-+	if (copy_from_user(usebuffer, buffer, count)) {
-+		printk(KERN_NOTICE "copy from user failed in amd drivers proc code\n");
-+		retval=-EFAULT;
-+		goto out;
-+	}
-+	
-+	retval=wrapper_data->write_func(myfile, buffer, count, wrapper_data->data);
-+	*offset+=retval;
-+out:
-+	if (usebuffer)
-+		kfree(usebuffer);
-+	return retval;
-+}
-+static int gentoo_proc_wrapper_open(struct inode *myinode, struct file *myfile) {
-+	myfile->private_data=PDE_DATA(myinode);
-+	return generic_file_open(myinode, myfile);
-+}
-+struct file_operations gentoo_proc_fops = {
-+	.read=gentoo_proc_wrapper_read,
-+	.write=gentoo_proc_wrapper_write,
-+	.open=gentoo_proc_wrapper_open,
-+};
-+	
-+static void *gentoo_proc_wrapper_data(read_proc_t *reader, write_proc_t *writer, void *mydata) {
-+	gentoo_proc_wrapper_t *retval=kmalloc(sizeof(gentoo_proc_wrapper_t), GFP_KERNEL);
-+	if (!retval)
-+		return retval;
-+	retval->read_func=reader;
-+	retval->write_func=writer;
-+	retval->data=mydata;
-+	return retval;
-+}
-+
-+static struct proc_dir_entry *firegl_proc_init( device_t *dev,
-+                                                int minor,
-+                                                struct proc_dir_entry *root,
-+                                                struct proc_dir_entry **dev_root,
-+                                                kcl_proc_list_t *proc_list ) // proc_list must be terminated!
-+{
-+    struct proc_dir_entry *ent;
-+    char    name[64];
-+    kcl_proc_list_t *list = proc_list;
-+	void *tempdata;
-+    KCL_DEBUG1(FN_FIREGL_PROC, "minor %d, proc_list 0x%08lx\n", minor, (unsigned long)proc_list);
-+    if (!minor)
-+    {
-+        root = proc_mkdir("ati", NULL);
-+    }
-+
-+    if (!root)
-+    {
-+        KCL_DEBUG_ERROR("Cannot create /proc/ati\n");
-+        return NULL;
-+    }
-+
-+    if (minor == 0)
-+    {
-+        // Global major debice number entry
-+		tempdata=gentoo_proc_wrapper_data((read_proc_t*)firegl_major_proc_read, NULL, NULL);
-+		if (!tempdata)
-+			return NULL;
-+        ent = proc_create_data("major", S_IFREG|S_IRUGO, root, &gentoo_proc_fops, tempdata);
-+        if (!ent)
-+        {
-+            remove_proc_entry("ati", NULL);
-+            KCL_DEBUG_ERROR("Cannot create /proc/ati/major\n");
-+            return NULL;
-+        }
-+    }
-+
-+    sprintf(name, "%d", minor);
-+    *dev_root = proc_mkdir(name, root);
-+    if (!*dev_root) {
-+        remove_proc_entry("major", root);
-+        remove_proc_entry("ati", NULL);
-+        KCL_DEBUG_ERROR("Cannot create /proc/ati/%s\n", name);
-+        return NULL;
-+    }
-+
-+    while (list->f || list->fops)
-+    {
-+		struct file_operations *my_fops = &gentoo_proc_fops;
-+        if (list->fops)
-+        {
-+            my_fops = (struct file_operations*)list->fops;
-+			tempdata=(dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev);
-+        }
-+		else {
-+			BUG_ON(!list->f);
-+			tempdata=gentoo_proc_wrapper_data((read_proc_t*)list->f, NULL, (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev) );
-+			if (!tempdata)
-+				return NULL;
-+		}
-+		//printk(KERN_NOTICE "name %s, dev %p, func %p, data %p\n", list->name, (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev), list->f, tempdata);
-+        ent = proc_create_data(list->name, S_IFREG|S_IRUGO, *dev_root, my_fops, tempdata);
-+
-+        if (!ent)
-+        {
-+            KCL_DEBUG_ERROR("Cannot create /proc/ati/%s/%s\n", name, list->name);
-+            while (proc_list != list)
-+            {
-+                remove_proc_entry(proc_list->name, *dev_root);
-+                proc_list++;
-+            }
-+            remove_proc_entry(name, root);
-+            if (!minor)
-+            {
-+                remove_proc_entry("major", root);
-+                remove_proc_entry("ati", NULL);
-+            }
-+            return NULL;
-+        }
-+
-+        list++;
-+    }
 +
-+    if (minor == 0)
-+    {
-+        // Global debug entry, only create it once
-+		tempdata=gentoo_proc_wrapper_data((read_proc_t*)firegl_debug_proc_read_wrap, (write_proc_t*)firegl_debug_proc_write_wrap, dev);
-+		if (!tempdata)
-+			return NULL;
-+        ent=proc_create_data("debug", S_IFREG|S_IRUGO, root, &gentoo_proc_fops, tempdata);
-+		if (!ent)
-+			return NULL;
+ #if !defined(CONFIG_X86) 
+ #if !defined(CONFIG_X86_PC) 
+ #if !defined(CONFIG_X86_XEN) 
+@@ -1543,9 +1548,17 @@ KCL_TYPE_Pid ATI_API_CALL KCL_GetTgid(void)
+ KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void)
+ {
+ #ifdef current_euid
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
++    return __kuid_val(current_euid());
++# else
+     return current_euid();
++# endif
+ #else
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
++    return __kuid_val(current->euid);
++# else
+     return current->euid;
++# endif
+ #endif
+ }
+ 
+
+diff -urN a/common/lib/modules/fglrx/build_mod/kcl_acpi.c common/lib/modules/fglrx/build_mod/kcl_acpi.c
+--- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-12-27 13:32:34.734832283 +0100
++++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-12-27 13:33:31.849831765 +0100
+@@ -1002,7 +1002,11 @@
+ #endif
+     {
+         return KCL_ACPI_ERROR;
+-    }    
 +    }
-+
-+    return root;
-+}
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,1)
++    ((acpi_tbl_table_handler)handler)(hdr);
 +#else
- static struct proc_dir_entry *firegl_proc_init( device_t *dev,
-                                                 int minor,
-                                                 struct proc_dir_entry *root,
-@@ -677,6 +873,7 @@
- 
-     return root;
- }
+     ((acpi_table_handler)handler)(hdr);
 +#endif
- 
- static int firegl_proc_cleanup( int minor,
-                                 struct proc_dir_entry *root,
+     return KCL_ACPI_OK;
+ }
diff --git a/pkgs/os-specific/linux/ati-drivers/patch-samples.patch b/pkgs/os-specific/linux/ati-drivers/patch-samples.patch
new file mode 100644
index 00000000000..8bd24b1d022
--- /dev/null
+++ b/pkgs/os-specific/linux/ati-drivers/patch-samples.patch
@@ -0,0 +1,26 @@
+diff --git a/samples/fgl_glxgears/fgl_glxgears.c b/samples/fgl_glxgears/fgl_glxgears.c
+index 6c8e313..2b8d035 100644
+--- a/samples/fgl_glxgears/fgl_glxgears.c
++++ b/samples/fgl_glxgears/fgl_glxgears.c
+@@ -1096,8 +1096,6 @@ static void event_loop(void)
+                   view_rotx -= 5.0;
+                }
+                else {
+-                  r = XLookupString(&event.xkey, buffer, sizeof(buffer),
+-                                    NULL, NULL);
+                   if (buffer[0] == 27) {
+                      /* escape */
+                      return;
+
+
+diff -Nur a/samples/fgl_glxgears/fgl_glxgears.c b/samples/fgl_glxgears/fgl_glxgears.c
+--- a/samples/fgl_glxgears/fgl_glxgears.c	2012-08-29 09:59:03.000000000 +0300
++++ b/samples/fgl_glxgears/fgl_glxgears.c	2013-09-07 09:26:11.034723135 +0300
+@@ -78,7 +78,6 @@
+ #endif // _WIN32
+ 
+ #define INT_PTR ptrdiff_t
+-#include <GL/glATI.h>
+ 
+ #ifdef _WIN32
+ #include <GL/wglATI.h>
-- 
GitLab


From 230a00f64422007b23c54c4fd8107ae34fd1caa5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jan 2014 13:43:53 +0100
Subject: [PATCH 0408/3789] findbugs: Clean up packaging

Most stuff is now hidden under $out/libexec/findbugs, with only a few
JARs exported via $out/share/java.  Also, the setup hook sets
FINDBUGS_HOME.
---
 .../tools/analysis/findbugs/default.nix       | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix
index 2adaaf3c031..cf60f1af767 100644
--- a/pkgs/development/tools/analysis/findbugs/default.nix
+++ b/pkgs/development/tools/analysis/findbugs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "findbugs-2.0.3";
@@ -13,9 +13,25 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    mkdir -p $out
-    cp -prd bin lib plugin doc $out/
-    rm $out/bin/*.bat
+    d=$out/libexec/findbugs
+    mkdir -p $d $out/bin $out/nix-support
+
+    cp -prd bin lib plugin doc $d/
+    rm $d/bin/*.bat
+    for i in $d/bin/*; do
+      if [ -f $i ]; then ln -s $i $out/bin/; fi
+    done
+
+    # Get rid of unnecessary JARs.
+    rm $d/lib/ant.jar
+
+    # Make some JARs findable.
+    mkdir -p $out/share/java
+    ln -s $d/lib/{findbugs.jar,findbugs-ant.jar} $out/share/java/
+
+    cat <<EOF > $out/nix-support/setup-hook
+    export FINDBUGS_HOME=$d
+    EOF
   '';
 
   meta = {
-- 
GitLab


From 0d0eb44a354de2ff7823d089261b7070b6c33823 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 23 Jan 2014 14:44:21 +0100
Subject: [PATCH 0409/3789] drop myhasktags, current hackage version has
 everything my version had

---
 pkgs/misc/source-and-tags/default.nix  |  9 +++++--
 pkgs/tools/misc/myhasktags/default.nix | 37 --------------------------
 pkgs/top-level/all-packages.nix        |  2 +-
 pkgs/top-level/haskell-packages.nix    |  2 --
 4 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/tools/misc/myhasktags/default.nix

diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix
index ece31bbaa74..981c01e2b4a 100644
--- a/pkgs/misc/source-and-tags/default.nix
+++ b/pkgs/misc/source-and-tags/default.nix
@@ -56,8 +56,13 @@ args: with args; {
                  tagCmd = "
                    srcs=\"`find . -type f -name \"*.*hs\"; find . -type f -name \"*.*hs*\";`\"
                    [ -z \"$srcs\" ] || {
-                    ${toString hasktags}/bin/hasktags-modified --ignore-close-implementation --ctags $srcs
-                    sort tags > \$TAG_FILE
+                    # without this creating tag files for lifted-base fails
+                    export LC_ALL=en_US.UTF-8
+                    export LANG=en_US.UTF-8
+                    ${if args.stdenv.isLinux then "export LOCALE_ARCHIVE=${args.pkgs.glibcLocales}/lib/locale/locale-archive;" else ""}
+ 
+                    ${toString hasktags}/bin/hasktags --ignore-close-implementation --ctags .
+                    mv tags \$TAG_FILE
                    }";
               }
           ];
diff --git a/pkgs/tools/misc/myhasktags/default.nix b/pkgs/tools/misc/myhasktags/default.nix
deleted file mode 100644
index 62d4ee2579f..00000000000
--- a/pkgs/tools/misc/myhasktags/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{fetchurl, stdenv, ghcPlain} :
-
-/* use case:
-
-   packageOverrides = {
-
-    haskellCollection =
-     let hp = haskellPackages;
-         install = [ hp.QuickCheck /* ... * /];
-      in
-      misc.collection {
-        name = "my-haskell-packages-collection";
-        list = install ++ (map (x : sourceWithTagsDerivation (sourceWithTagsFromDerivation (addHasktagsTaggingInfo x) ))
-                            (lib.filter (x : builtins.hasAttr "src" x) install ) );
-      };
-   };
-
-*/
-
-stdenv.mkDerivation {
-  name = "hasktags-modified";
-  version = "0.0"; # Haskell Platform 2009.0.0
-  src = fetchurl {
-    url = http://mawercer.de/~nix/hasktags.hs;
-    sha256 = "0zdin03n357viyyqbn2d029jxd83nyazhaxbxfc8v3jrz5pkwl2c";
-  };
-  phases="buildPhase";
-  buildPhase = ''
-    mkdir -p $out/bin
-    ghc --make $src -o $out/bin/hasktags-modified
-  '';
-  buildInputs = [ ghcPlain ];
-
-  meta = {
-    description = "my patched version of hasktags. Should be merged into hasktags?";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f7de5e4673..701a37f25c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10138,7 +10138,7 @@ let
 
   sourceAndTags = import ../misc/source-and-tags {
     inherit pkgs stdenv unzip lib ctags;
-    hasktags = haskellPackages.myhasktags;
+    hasktags = haskellPackages.hasktags;
   };
 
   splix = callPackage ../misc/cups/drivers/splix { };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 798103153ec..bcd49cd6ddd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2719,8 +2719,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   lhs2tex = callPackage ../tools/typesetting/lhs2tex {};
 
-  myhasktags = callPackage ../tools/misc/myhasktags {};
-
   packunused = callPackage ../development/tools/haskell/packunused {};
 
   splot = callPackage ../development/tools/haskell/splot {};
-- 
GitLab


From 1a24278161835983860d38f77aa62b2e8d481ca1 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <sander@conference-compass.com>
Date: Thu, 23 Jan 2014 15:11:46 +0100
Subject: [PATCH 0410/3789] titaniumsdk: Add additional login simulation for
 the ipa target

---
 pkgs/development/mobile/titaniumenv/build-app.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index ef2182135da..e4029f74ebe 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -84,6 +84,12 @@ stdenv.mkDerivation {
               do
                   chmod 755 "$i"
               done
+              
+              # Simulate a login
+              mkdir -p $HOME/.titanium
+              cat > $HOME/.titanium/auth_session.json <<EOF
+              { "loggedIn": true }
+              EOF
             
               # Set the SDK to our copy
               titanium --config-file $TMPDIR/config.json config sdk.defaultInstallLocation $TMPDIR/titaniumsdk
-- 
GitLab


From b25529a4ad69bbc63e5cd2b609b5c8f86969b0f3 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <sander@conference-compass.com>
Date: Thu, 23 Jan 2014 17:11:16 +0100
Subject: [PATCH 0411/3789] titaniumsdk: colored output makes a web server
 think that logs are in raw format. So disable it

---
 pkgs/development/mobile/titaniumenv/build-app.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index e4029f74ebe..55e9d63d727 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -37,18 +37,18 @@ stdenv.mkDerivation {
     EOF
     
     echo "{}" > $TMPDIR/config.json
-    titanium --config-file $TMPDIR/config.json config sdk.defaultInstallLocation ${titaniumsdk}
+    titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation ${titaniumsdk}
 
     mkdir -p $out
     
     ${if target == "android" then
         ''
-          titanium config --config-file $TMPDIR/config.json android.sdkPath ${androidsdkComposition}/libexec/android-sdk-*
+          titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec/android-sdk-*
           
           ${if release then
-            ''titanium build --config-file $TMPDIR/config.json --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out''
+            ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out''
           else
-            ''titanium build --config-file $TMPDIR/config.json --force --platform android --target emulator --build-only --output $out''}
+            ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only --output $out''}
         ''
       else if target == "iphone" then
         ''
@@ -92,10 +92,10 @@ stdenv.mkDerivation {
               EOF
             
               # Set the SDK to our copy
-              titanium --config-file $TMPDIR/config.json config sdk.defaultInstallLocation $TMPDIR/titaniumsdk
+              titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation $TMPDIR/titaniumsdk
             
               # Do the actual build
-              titanium build --config-file $TMPDIR/config.json --force --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName --device-family universal --output-dir $out
+              titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName --device-family universal --output-dir $out
             
               # Remove our generated keychain
             
@@ -111,7 +111,7 @@ stdenv.mkDerivation {
               cp -av * $out
               cd $out
             
-              titanium build --config-file $TMPDIR/config.json --force --platform ios --target simulator --build-only --device-family universal --output-dir $out
+              titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target simulator --build-only --device-family universal --output-dir $out
           ''}
         ''
 
-- 
GitLab


From f0081dcc02b240ed9a6fd8717ba298b4223622c2 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 23 Jan 2014 20:52:36 +0200
Subject: [PATCH 0412/3789] youtubeDL: update from 2014.01.08 to 2014.01.20

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index f4c59c02364..917b54130b3 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.01.08";
+  version = "2014.01.20";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0a83j62w2k5fdxp3fvs0zr6r81w7jkzzzr8r8wim1yyi6k8cjcwv";
+    sha256 = "1krqkq21pgzkfsw70b0fp7xpxsh1ipgr2bgkf1y30ckf9nkpp9ny";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From f8f8e8d4d2cdbdab68f9d109f9388cbbd8a16d62 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 23 Jan 2014 20:55:24 +0200
Subject: [PATCH 0413/3789] clamav: update from 0.98 to 0.98.1

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

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 8315078c80f..fc43f01b344 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, bzip2, libiconv }:
 stdenv.mkDerivation rec {
   name = "clamav-${version}";
-  version = "0.98";
+  version = "0.98.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz";
-    sha256 = "1dmkaa6sqynv4v74s9izq7m7kk8d78rvwyd123q4gva6gx9m0d0i";
+    sha256 = "1p13n8g3b88cxwxj07if9z1d2cav1ib94v6cq4r4bpacfd6yix9m";
   };
 
   buildInputs = [ zlib bzip2 libiconv ];
-- 
GitLab


From 862ac34bdd2c6092801597b63a5310de871e73b3 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 23 Jan 2014 21:03:52 +0200
Subject: [PATCH 0414/3789] wineUnstable: update from 1.7.10 to 1.7.11

---
 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 5d891c38100..a0f03fa7b99 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.10";
+    version = "1.7.11";
     name = "wine-${version}";
 
     src = fetchurl {
       url = "mirror://sourceforge/wine/${name}.tar.bz2";
-      sha256 = "1nybsp4pga0jhx6rm6ngpa2ixsbj75p8w22r9d70x4zgjx5hw9s4";
+      sha256 = "14sg0kqwawqb5sx4q2kshpb4igjbbr61c7diid15vi4nxmqjfzf0";
     };
 
     gecko = fetchurl {
-- 
GitLab


From 7a211df8496ac0dac6881e3578908a85b2360245 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Thu, 23 Jan 2014 21:10:55 +0200
Subject: [PATCH 0415/3789] wget: update from 1.14 to 1.15

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

diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 5ae85adbec7..c8698215525 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-1.14";
+  name = "wget-1.15";
 
   src = fetchurl {
     url = "mirror://gnu/wget/${name}.tar.xz";
-    sha256 = "0yqllj3nv9p3vqbdm6j4nvpjcwf1y19rq8sd966nrbd2qvvxfq8p";
+    sha256 = "1yw0sk4mrs7bvga3c79rkbhxivmw8cs3b5wq3cglp1f9ai1mz2ni";
   };
 
   patches = stdenv.lib.optional stdenv.isDarwin ./iri-test.patch;
-- 
GitLab


From 04a55b5e14779f3167f0312e9c9cac646036a79c Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Thu, 23 Jan 2014 08:12:36 +0800
Subject: [PATCH 0416/3789] webkitgtk: update to 2.2.4, enable html5 video
 support

---
 pkgs/development/libraries/webkitgtk/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                  | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 766bb715474..8f8551ac9b6 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -2,10 +2,11 @@
 , pkgconfig, which, gettext, gobjectIntrospection
 , gtk2, gtk3, wayland, libwebp, enchant
 , libxml2, libsoup, libsecret, libxslt, harfbuzz
+, gst-plugins-base
 }:
 
 stdenv.mkDerivation rec {
-  name = "webkitgtk-2.2.3";
+  name = "webkitgtk-2.2.4";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "01a69v0aw3bv2zkx6jzk71r3pjlf2xfhxavjnma89kmd78qb7g4l";
+    sha256 = "0x2d9hds5yazwdakkhrh3dk5qxscb169imi056q2qq53zhdyw6jy";
   };
 
   patches = [ ./webcore-svg-libxml-cflags.patch ];
@@ -32,7 +33,6 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--disable-geolocation"
-    "--disable-video"              # TODO: gsteramer-1.0
     "--enable-introspection"
   ];
 
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk2 wayland libwebp enchant
     libxml2 libsecret libxslt harfbuzz
+    gst-plugins-base
   ];
 
   propagatedBuildInputs = [ gtk3 libsoup ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f7de5e4673..05fec252108 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5703,6 +5703,7 @@ let
     harfbuzz = harfbuzz.override {
       withIcu = true;
     };
+    gst-plugins-base = gst_all_1.gst-plugins-base;
   };
 
   wildmidi = callPackage ../development/libraries/wildmidi { };
-- 
GitLab


From 343cd5b1efa7a719b76b6bb40755c5940a4eccba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 23 Jan 2014 22:28:30 +0100
Subject: [PATCH 0417/3789] midori: minor update 0.5.6 -> .7

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

diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index b2ca7c42e76..db9e1c24cb5 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -3,8 +3,11 @@
 , glib_networking, gsettings_desktop_schemas
 }:
 
+let
+  version = "0.5.7";
+in
 stdenv.mkDerivation rec {
-  name = "midori-0.5.6";
+  name = "midori-${version}";
 
   meta = {
     description = "Lightweight WebKitGTK+ web browser";
@@ -15,8 +18,8 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "${meta.homepage}/downloads/midori_0.5.6_all_.tar.bz2";
-    sha256 = "0jpj8cw0dzamzylzslayamjhv0is0xd99dyaql4nyxrkk5fipgn5";
+    url = "${meta.homepage}/downloads/midori_${version}_all_.tar.bz2";
+    sha256 = "0k8bppicgzm97g5x8ahvpw9wvg2f1mq093qp8biwr858m0mbnx98";
   };
 
   buildInputs = [
-- 
GitLab


From 12235ed36e77549dee6251b104dd39c2ab742982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 23 Jan 2014 22:30:07 +0100
Subject: [PATCH 0418/3789] remove .topmsg (close #1578)

---
 nixos/.topmsg | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 nixos/.topmsg

diff --git a/nixos/.topmsg b/nixos/.topmsg
deleted file mode 100644
index 9632e592631..00000000000
--- a/nixos/.topmsg
+++ /dev/null
@@ -1 +0,0 @@
-improvements to vsftpd module
-- 
GitLab


From b187d0e1bdfec635d4e7a3e00abb86b823e3dc27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 23 Jan 2014 22:55:41 +0100
Subject: [PATCH 0419/3789] libusb1: name it libusbx, so it's more clear

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

diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index dfb8f1c54a1..3833e5bffa1 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -4,7 +4,7 @@ let
   version = "1.0.17";
 in
 stdenv.mkDerivation rec {
-  name = "libusb-${version}";
+  name = "libusbx-${version}"; # it's a fork of original libusb1; should be mostly compatible
 
   src = fetchurl {
     url = "mirror://sourceforge/libusbx/libusbx-${version}.tar.bz2";
-- 
GitLab


From 5674fb556b97311a0f1fbdfafa73b85a3edec4cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 23 Jan 2014 23:02:46 +0100
Subject: [PATCH 0420/3789] mesa: try enabling checkPhase again

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index aaf15851955..bd93c41d354 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation {
     ;
 
   enableParallelBuilding = true;
-  #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672,
+  doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672,
     #tests for 10.* fail to link due to some RTTI problem
 
   # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM;
-- 
GitLab


From 69682777851bfc71f949d7b1e26da01fc8ebb82d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jan 2014 23:28:20 +0100
Subject: [PATCH 0421/3789] maude: build with bison 2.x; version 3.x causes
 compiler errors

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05fec252108..6ee74ee90e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3109,7 +3109,9 @@ let
 
   lush2 = callPackage ../development/interpreters/lush {};
 
-  maude = callPackage ../development/interpreters/maude { };
+  maude = callPackage ../development/interpreters/maude {
+    bison = bison2;
+  };
 
   octave = callPackage ../development/interpreters/octave {
     fltk = fltk13;
-- 
GitLab


From 97b519a515952be3ae09c32c36d3c02c7251da18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 24 Jan 2014 00:07:05 +0100
Subject: [PATCH 0422/3789] add most basic README.md

---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 00000000000..1fdbe4ba74b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,10 @@
+Nixpkgs is a collection of packages for [Nix](hhttp://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/#idm139984689550080)
+* [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)
+* [Tests](http://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
+* [Mailing list](http://lists.science.uu.nl/mailman/listinfo/nix-dev)
+* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)
-- 
GitLab


From b73b4bfd61051b4591e52b78be6befc04155a15f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 24 Jan 2014 00:08:00 +0100
Subject: [PATCH 0423/3789] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1fdbe4ba74b..4a220e28ba6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Nixpkgs is a collection of packages for [Nix](hhttp://nixos.org/nix/) package
+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/#idm139984689550080)
-- 
GitLab


From 4caef493beea7fd3ab3de9b60ed7590936003b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 24 Jan 2014 00:40:48 +0100
Subject: [PATCH 0424/3789] Revert "mesa: try enabling checkPhase again"

I'm getting something like https://bugs.freedesktop.org/show_bug.cgi?id=52136

This reverts commit 5674fb556b97311a0f1fbdfafa73b85a3edec4cb.
---
 pkgs/development/libraries/mesa/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index bd93c41d354..aaf15851955 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation {
     ;
 
   enableParallelBuilding = true;
-  doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672,
+  #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672,
     #tests for 10.* fail to link due to some RTTI problem
 
   # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM;
-- 
GitLab


From a86f119dfc25c308d0c92a76009eeb13fb43d27d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jan 2014 22:34:19 +0100
Subject: [PATCH 0425/3789] haskell-either: disable the documentation build on
 GHC 7.4.x or earlier

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

diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
index cec991fab3f..d6853f4cf4c 100644
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ b/pkgs/development/libraries/haskell/either/default.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
     monadControl MonadRandom mtl semigroupoids semigroups transformers
     transformersBase
   ];
+  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.6";
   meta = {
     homepage = "http://github.com/ekmett/either/";
     description = "An either monad transformer";
-- 
GitLab


From 4eefe1a779cf953f92ca1ad58e1f4ade9d278cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 24 Jan 2014 11:14:35 +0100
Subject: [PATCH 0426/3789] mesa: fix build by adding ncurses

After stdenv merge it seems needed, and drivers remain linked against it.

Tests still don't link.
---
 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 aaf15851955..9d720621880 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook
 , python, libxml2Python, file, expat, makedepend
 , libdrm, xorg, wayland, udev, llvm, libffi
-, libvdpau, libelf
+, libvdpau, libelf, ncurses
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
 , enableExtraFeatures ? false # not maintained
 }:
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
   buildInputs = with xorg; [
     autoreconfHook intltool expat libxml2Python llvm
     libXfixes glproto dri2proto libX11 libXext libxcb libXt
-    libffi wayland libvdpau libelf
+    libffi wayland libvdpau libelf ncurses
   ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ]
     ++ optional stdenv.isLinux udev
     ;
-- 
GitLab


From a5b054e18a5c008c7dd809eda5fd1271b586ac8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 24 Jan 2014 10:25:27 +0100
Subject: [PATCH 0427/3789] xfce4-screenshooter: add platforms.linux

---
 pkgs/desktops/xfce/applications/xfce4-screenshooter.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
index c8916bf502c..6e0d9d3e7e7 100644
--- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     homepage = http://goodies.xfce.org/projects/applications/xfce4-screenshooter;
     description = "Xfce screenshooter";
     license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From c4cb65187e97bb451210697c8ce6b1bd0f139cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 24 Jan 2014 14:32:51 +0100
Subject: [PATCH 0428/3789] i3: 4.6 -> 4.7.2

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

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index f6d2dc4cfe5..ebdc7b143c3 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -1,18 +1,18 @@
 { fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil,
   xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl,
-  libXcursor, coreutils, perl, pango }:
+  xcb-util-cursor, coreutils, perl, pango }:
 
 stdenv.mkDerivation rec {
   name = "i3-${version}";
-  version = "4.6";
+  version = "4.7.2";
 
   src = fetchurl {
     url = "http://i3wm.org/downloads/${name}.tar.bz2";
-    sha256 = "1qand44hjqz84f2xzd0mmyk9vpsm7iwz6446s4ivdj6f86213lpm";
+    sha256 = "14zkn5jgm0b7ablvxcxh9gdzq6mjdd6i1kl9dbmifl2a6rg5dr3g";
   };
 
   buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm
-    libstartup_notification libX11 pcre libev yajl libXcursor perl pango ];
+    libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango ];
 
   patchPhase = ''
     patchShebangs .
-- 
GitLab


From 8a5c65abf4d4d25f840e82122ec2c75ff022006d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 24 Jan 2014 14:33:02 +0100
Subject: [PATCH 0429/3789] mailpile: update dev version

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

diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index d98b3b6be9d..bc38defe06c 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -5,8 +5,8 @@ buildPythonPackage rec {
 
   src = fetchgit {
     url = "https://github.com/pagekite/Mailpile.git";
-    rev = "cbb3bbf1f1da653124e63e11a51a6864dcb534a0";
-    sha256 = "1m2qkhcygidxqnnj2ajsxv8y5wjyp5il3919sl3vyl47gx02xa8j";
+    rev = "695a25061a5220d4f0fd6ec3de4ccd9ae4c05a92";
+    sha256 = "0il9idfpnzb1a5cg3p9zrd6fnw2dhrqr6c3gzq1m06snw8jx9fpc";
   };
 
   propagatedBuildInputs = with pythonPackages; [
-- 
GitLab


From f2d61667815e98eda7ee790f5ac3f7870afb86d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 24 Jan 2014 14:33:20 +0100
Subject: [PATCH 0430/3789] python-libarchive: 3.0.4-5 -> 3.1.2-1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4bc9c54d719..4a6681b9f55 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7846,12 +7846,12 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   libarchive = buildPythonPackage rec {
-    version = "3.0.4-5";
+    version = "3.1.2-1";
     name = "libarchive-${version}";
 
     src = fetchurl {
       url = "http://python-libarchive.googlecode.com/files/python-libarchive-${version}.tar.gz";
-      sha256 = "141yx9ym8gvybn67mw0lmgafzsd79rmd9l77lk0k6m2fzclqx1j5";
+      sha256 = "0j4ibc4mvq64ljya9max8832jafi04jciff9ia9qy0xhhlwkcx8x";
     };
 
     propagatedBuildInputs = [ pkgs.libarchive ];
-- 
GitLab


From 287a7e08f36ced7ba9d8372e4fbdac13e2c24d4e Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Fri, 24 Jan 2014 15:51:04 +0100
Subject: [PATCH 0431/3789] add glog 0.3.3

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

diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix
new file mode 100644
index 00000000000..098643ae70f
--- /dev/null
+++ b/pkgs/development/libraries/glog/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "glog-0.3.3";
+  
+  src = fetchurl {
+    url = "http://google-glog.googlecode.com/files/${name}.tar.gz";
+    sha1 = "ed40c26ecffc5ad47c618684415799ebaaa30d65";
+  };
+
+  meta = {
+    homepage = http://code.google.com/p/google-glog/;
+    license = "BSD";
+    description = "The glog library implements application-level logging.";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ee74ee90e1..2f9b0c8ed9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4193,6 +4193,8 @@ let
 
   glm = callPackage ../development/libraries/glm { };
 
+  glog = callPackage ../development/libraries/glog { };
+
   glpk = callPackage ../development/libraries/glpk { };
 
   glsurf = callPackage ../applications/science/math/glsurf {
-- 
GitLab


From 13e13f279b61c35a744888196789187828c32295 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 24 Jan 2014 15:52:19 +0100
Subject: [PATCH 0432/3789] Do not assume a .rev attribute in available in src
 in maven-build.nix

---
 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 39f069cd57f..6b47bb9cae9 100644
--- a/pkgs/build-support/release/maven-build.nix
+++ b/pkgs/build-support/release/maven-build.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation ( rec {
 
     zip=$(ls target/*.zip| head -1)
     releaseName=$(basename $zip .zip)
-    releaseName="$releaseName-r${toString src.rev}"
+    releaseName="$releaseName-r${toString src.rev or "0"}"
     cp $zip $out/release/$releaseName.zip
     
     echo "$releaseName" > $out/nix-support/hydra-release-name
-- 
GitLab


From 7b743fcaab52d423ef2bd9ba95453d6ea55d2e07 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 19 Jan 2014 14:40:51 -0600
Subject: [PATCH 0433/3789] networkmanager: load modules required for PPTP

---
 nixos/modules/services/networking/networkmanager.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 40c20aae4ef..0b079e3567a 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -130,6 +130,8 @@ in {
       message = "You can not use networking.networkmanager with services.networking.wireless";
     }];
 
+    boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections.
+
     environment.etc = [
       { source = ipUpScript;
         target = "NetworkManager/dispatcher.d/01nixos-ip-up";
-- 
GitLab


From 1e3a151d3b620304875ddbe7460b6e955221fb63 Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Fri, 24 Jan 2014 19:23:23 +0100
Subject: [PATCH 0434/3789] hiphopvm: update to commit 1e23dec9f0

---
 .../interpreters/hiphopvm/default.nix         | 26 +++++++++----------
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/interpreters/hiphopvm/default.nix b/pkgs/development/interpreters/hiphopvm/default.nix
index c18c81caff0..ae30d169b50 100644
--- a/pkgs/development/interpreters/hiphopvm/default.nix
+++ b/pkgs/development/interpreters/hiphopvm/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, fetchgit, cmake, boost, libunwind, mysql, libmemcached, pcre
 , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c
-, expat, libcap, oniguruma, libdwarf, libmcrypt, inteltbb, gperftools
-, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam
+, expat, libcap, oniguruma, libdwarf, libmcrypt, inteltbb, gperftools, glog
+, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
 }:
 assert stdenv.system == "x86_64-linux";
 let
   src = fetchgit {
     url = "git://github.com/facebook/hiphop-php.git";
-    rev = "73f1c0ebd9b313f6b3baecd8c8046e0b595b1157";
-    sha256 = "104133c6054bc9ab0288eaa0cea168b6699e537b3ea76ecdc38ee833d93dca09";
+    rev = "1e23dec9f0b1ce8aaa5833d0527a369c8e254ffd";
+    sha256 = "0fblwgq8c3hmamw0m5d1mn8qhyqf14v2zf62cgrkvmbiz6jlrbr6";
   };
 
   libxml2_280 = stdenv.lib.overrideDerivation libxml2 (args: rec { 
@@ -21,37 +21,35 @@ let
 
     patches = [];
   });
- 
-  curlFB = stdenv.lib.overrideDerivation curl (args: { patches = [ "${src}/src/third_party/libcurl-7.22.1.fb-changes.diff" ]; });
 
-  fbPatch = "${src}/src/third_party/libevent-1.4.14.fb-changes.diff";
+  fbPatch = "${src}/hphp/third_party/libevent-1.4.14.fb-changes.diff";
+
   libeventFB = stdenv.lib.overrideDerivation libevent (args: { patches = [fbPatch]; });
 in
 stdenv.mkDerivation {
-  name = "hiphop-php-73f1c0ebd9";
+  name = "hiphop-php-1e23dec9f0";
   inherit src;
   dontUseCmakeBuildDir = true;
   dontUseCmakeConfigure = true;
   USE_HHVM=1;
   preConfigure = ''
-    export HPHP_HOME=$PWD
     export HPHP_LIB=$PWD/bin
     export TBB_INSTALL_DIR=${inteltbb}
     export TBB_ARCH_PLATFORM="intel64/cc4.1.0_libc2.4_kernel2.6.16.21"
-    sed -i 's| DEPRECATED | DEPRECATED_ |' src/runtime/base/runtime_error.h
+    sed 's=/bin/bash=/${stdenv.shell}=g' -i hphp/util/generate-buildinfo.sh
   '';
   NIX_LDFLAGS = "-lpam -L${pam}/lib";
+  MYSQL_INCLUDE_DIR="${mysql}/include/mysql";
   MYSQL_DIR=mysql;
   buildInputs = [ 
-    cmake boost libunwind mysql libmemcached pcre libeventFB gd curlFB
+    cmake boost libunwind mysql libmemcached pcre libeventFB gd curl
     libxml2_280 icu flex bison openssl zlib php expat libcap oniguruma
     libdwarf libmcrypt inteltbb gperftools bzip2 openldap readline
-    libelf uwimap binutils cyrus_sasl pam
+    libelf uwimap binutils cyrus_sasl pam glog libpng
   ];
   installPhase = ''
     mkdir -p $out/bin
-    cp src/hhvm/hhvm $out/bin
-    cp bin/systemlib.php $out/bin
+    cp hphp/hhvm/hhvm $out/bin
   '';
   patches = [./tbb.patch];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f9b0c8ed9a..f0ac3324387 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2670,6 +2670,7 @@ let
   hiphopvm = callPackage ../development/interpreters/hiphopvm {
     libevent = libevent14;
     boost = boost149;
+    stdenv = overrideGCC stdenv gcc48;
   };
 
   falcon = builderDefsPackage (import ../development/interpreters/falcon) {
-- 
GitLab


From a17b090f990e288ddfc96116382526fe3c76543c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Jan 2014 16:07:20 +0100
Subject: [PATCH 0435/3789] junit: Update to 4.11

---
 .../libraries/java/junit/builder.sh           |  6 ----
 .../libraries/java/junit/default.nix          | 33 ++++++++++++++-----
 2 files changed, 25 insertions(+), 14 deletions(-)
 delete mode 100755 pkgs/development/libraries/java/junit/builder.sh

diff --git a/pkgs/development/libraries/java/junit/builder.sh b/pkgs/development/libraries/java/junit/builder.sh
deleted file mode 100755
index a76360ead1e..00000000000
--- a/pkgs/development/libraries/java/junit/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-set -e
-source $stdenv/setup
-
-$unzip/bin/unzip $src
-mkdir -p $out
-mv junit*/* $out
diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix
index 7a6db1ad4b3..888365f789f 100644
--- a/pkgs/development/libraries/java/junit/default.nix
+++ b/pkgs/development/libraries/java/junit/default.nix
@@ -1,17 +1,34 @@
-{stdenv, fetchurl, unzip} :
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "junit-4.8.2";
-  builder = ./builder.sh;
+let
+
+  junit = fetchurl {
+    url = http://search.maven.org/remotecontent?filepath=junit/junit/4.11/junit-4.11.jar;
+    sha256 = "1zh6klzv8w30dx7jg6pkhllk4587av4znflzhxz8x97c7rhf3a4h";
+  };
 
-  src = fetchurl {
-    url = https://github.com/downloads/junit-team/junit/junit4.8.2.zip;
-    sha256 = "01simvc3pmgp27p7vzavmsx5rphm6hqzwrqfkwllhf3812dcqxy6";
+  hamcrest = fetchurl {
+    url = http://search.maven.org/remotecontent?filepath=org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar;
+    sha256 = "1sfqqi8p5957hs9yik44an3lwpv8ln2a6sh9gbgli4vkx68yzzb6";
   };
 
-  inherit unzip;
+in
+
+stdenv.mkDerivation {
+  name = "junit-4.11";
+
+  unpackPhase = "true";
+
+  installPhase =
+    ''
+      mkdir -p $out/share/java
+      ln -s ${junit} $out/share/java/junit.jar
+      ln -s ${hamcrest} $out/share/java/hamcrest-core.jar
+    '';
 
   meta = {
     homepage = http://www.junit.org/;
+    description = "A framework for repeatable tests in Java";
+    license = stdenv.lib.licenses.epl10;
   };
 }
-- 
GitLab


From e07ce3314d4cea1d520d61ef939c17d794545c93 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Jan 2014 16:27:36 +0100
Subject: [PATCH 0436/3789] Fix some "meta.licenses" attributes

---
 pkgs/applications/networking/browsers/icecat-3/default.nix      | 2 +-
 .../networking/browsers/mozilla-plugins/fribid/default.nix      | 2 +-
 .../browsers/mozilla-plugins/mplayerplug-in/default.nix         | 2 +-
 pkgs/development/compilers/ocaml/3.11.2.nix                     | 2 +-
 pkgs/development/compilers/ocaml/3.12.1.nix                     | 2 +-
 pkgs/development/compilers/ocaml/4.00.1.nix                     | 2 +-
 pkgs/development/compilers/ocaml/4.01.0.nix                     | 2 +-
 pkgs/development/compilers/ocaml/ber-metaocaml-003.nix          | 2 +-
 pkgs/development/libraries/cairo/default.nix                    | 2 +-
 pkgs/development/libraries/cairomm/default.nix                  | 2 +-
 pkgs/development/libraries/java/rhino/default.nix               | 2 +-
 pkgs/development/libraries/sbc/default.nix                      | 2 +-
 pkgs/development/libraries/zziplib/default.nix                  | 2 +-
 pkgs/development/ocaml-modules/menhir/default.nix               | 2 +-
 pkgs/development/python-modules/setuptools/default.nix          | 2 +-
 pkgs/development/tools/misc/autogen/default.nix                 | 2 +-
 pkgs/tools/compression/xz/default.nix                           | 2 +-
 pkgs/tools/networking/isync/default.nix                         | 2 +-
 pkgs/tools/networking/maildrop/default.nix                      | 2 +-
 pkgs/tools/networking/mailutils/default.nix                     | 2 +-
 pkgs/top-level/perl-packages.nix                                | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix
index 84269a290e9..ef2c69422b6 100644
--- a/pkgs/applications/networking/browsers/icecat-3/default.nix
+++ b/pkgs/applications/networking/browsers/icecat-3/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation {
     '';
 
     homepage = http://www.gnu.org/software/gnuzilla/;
-    licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
+    license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
 
     maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
index 66bd28424c0..8cda5ad5762 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A browser plugin to manage Swedish BankID:s";
     homepage = http://fribid.se;
-    licenses = [ "GPLv2" "MPLv1" ];
+    license = [ "GPLv2" "MPLv1" ];
     maintainers = [ stdenv.lib.maintainers.edwtjo ];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
index 6ee1735f76c..5b6b2176d47 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A browser plugin that uses mplayer to play digital media from websites";
     homepage = http://mplayerplug-in.sourceforge.net/;
-    licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
+    license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
   };
 }
diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix
index 9c0b3d1d192..cffd7c3f54a 100644
--- a/pkgs/development/compilers/ocaml/3.11.2.nix
+++ b/pkgs/development/compilers/ocaml/3.11.2.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;
-    licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
     description = "Objective Caml, the most popular variant of the Caml language";
 
     longDescription =
diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix
index c719abc4abc..f916f5a7923 100644
--- a/pkgs/development/compilers/ocaml/3.12.1.nix
+++ b/pkgs/development/compilers/ocaml/3.12.1.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;
-    licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
     description = "OCaml, the most popular variant of the Caml language";
 
     longDescription =
diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix
index d7c14e031b3..8662db70c26 100644
--- a/pkgs/development/compilers/ocaml/4.00.1.nix
+++ b/pkgs/development/compilers/ocaml/4.00.1.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;
-    licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
     description = "OCaml, the most popular variant of the Caml language";
 
     longDescription =
diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix
index c11bb7536be..79a7c8cd61f 100644
--- a/pkgs/development/compilers/ocaml/4.01.0.nix
+++ b/pkgs/development/compilers/ocaml/4.01.0.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;
-    licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
     description = "OCaml, the most popular variant of the Caml language";
 
     longDescription =
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
index df3e9e73af5..9c5fa3764ba 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
+++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml";
-    licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
     description = "a conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run";
   };
 }
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 68ba7d1a9b2..6c73b17e6f4 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://cairographics.org/;
 
-    licenses = [ "LGPLv2+" "MPLv1" ];
+    license = [ "LGPLv2+" "MPLv1" ];
 
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix
index e47645737b1..f21abedc1f5 100644
--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/pkgs/development/libraries/cairomm/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://cairographics.org/;
 
-    licenses = [ "LGPLv2+" "MPLv1" ];
+    license = [ "LGPLv2+" "MPLv1" ];
   };
 }
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix
index ec19e381281..42bdba7567c 100644
--- a/pkgs/development/libraries/java/rhino/default.nix
+++ b/pkgs/development/libraries/java/rhino/default.nix
@@ -52,6 +52,6 @@ stdenv.mkDerivation {
 
     homepage = http://www.mozilla.org/rhino/;
 
-    licenses = [ "MPLv1.1" /* or */ "GPLv2+" ];
+    license = [ "MPLv1.1" /* or */ "GPLv2+" ];
   };
 }
diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix
index 414f2a13dea..06411c1f22a 100644
--- a/pkgs/development/libraries/sbc/default.nix
+++ b/pkgs/development/libraries/sbc/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.bluez.org/;
 
-    licenses = stdenv.lib.licenses.gpl2;
+    license = stdenv.lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index 69e53d4e8f6..055a491f460 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       zip/unzip tools.
     '';
 
-    licenses = [ "LGPLv2+" "MPLv1.1" ];
+    license = [ "LGPLv2+" "MPLv1.1" ];
 
     homepage = http://zziplib.sourceforge.net/;
 
diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix
index 249ddc1cf56..d5db6e9c7e0 100644
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
       to OCaml code.  Menhir was designed and implemented by François Pottier
       and Yann Régis-Gianas.
     '';
-    licenses = [ "QPL" /* generator */ "LGPLv2" /* library */ ];
+    license = [ "QPL" /* generator */ "LGPLv2" /* library */ ];
     platforms = ocaml.meta.platforms;
     maintainers = [
       stdenv.lib.maintainers.z77z
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 8ddf0e9329f..e0c3e7837b4 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Utilities to facilitate the installation of Python packages";
     homepage = http://pypi.python.org/pypi/setuptools;
-    licenses = [ "PSF" "ZPL" ];
+    license = [ "PSF" "ZPL" ];
     platforms = platforms.all;
   };    
 }
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 308183cb6fc..a26c1fdd199 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -46,7 +46,7 @@ let version = "5.18"; in
         documentation of program options.
       '';
 
-      licenses = ["GPLv3+" "LGPLv3+" ];
+      license = ["GPLv3+" "LGPLv3+" ];
 
       homepage = http://www.gnu.org/software/autogen/;
 
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index 6d59bd927cf..b644f46dff8 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
          bzip2.
       '';
 
-    licenses = [ "GPLv2+" "LGPLv2.1+" ];
+    license = [ "GPLv2+" "LGPLv2.1+" ];
     maintainers = with stdenv.lib.maintainers; [ sander ];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix
index 9587dfee613..30ee63f257a 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/pkgs/tools/networking/isync/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://isync.sourceforge.net/;
     description = "Free IMAP and MailDir mailbox synchronizer";
-    licenses = [ "GPLv2+" ];
+    license = [ "GPLv2+" ];
 
     maintainers = [ stdenv.lib.maintainers.viric ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix
index b91282c9a2b..991d75c66ae 100644
--- a/pkgs/tools/networking/maildrop/default.nix
+++ b/pkgs/tools/networking/maildrop/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.courier-mta.org/maildrop/;
     description = "Mail filter/mail delivery agent that is used by the Courier Mail Server";
-    licenses = [ "GPLv3" ];
+    license = [ "GPLv3" ];
   };
 }
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index 3a84516cd37..8ebe7df35e7 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       message handling system.
     '';
 
-    licenses = [ "LGPLv3+" /* libraries */  "GPLv3+" /* tools */ ];
+    license = [ "LGPLv3+" /* libraries */  "GPLv3+" /* tools */ ];
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ef2372b5012..6211b91053f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4368,7 +4368,7 @@ let self = _self // overrides; _self = with self; {
         Sigma/Foveon and Sony.
       '';
 
-      licenses = [ "GPLv1+" /* or */ "Artistic" ];
+      license = [ "GPLv1+" /* or */ "Artistic" ];
 
       maintainers = [ ];
       platforms = stdenv.lib.platforms.unix;
-- 
GitLab


From 981cac8e1076ae68563d2ba872f6c1edb0258bb3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Jan 2014 02:29:14 +0100
Subject: [PATCH 0437/3789] openjdk: Hackery to ensure that tools.jar is found

HotSpot uses the absolute path of libjvm.so to determine the java.home
property (ignoring $JAVA_HOME), which is in turn used by
ToolProvider.getSystemJavaCompiler() to load tools.jar.  So we need to
do some trickery to ensure that if java gets invoked from the jdk
output (ratherthan the jre output), it finds libjvm.so in the jdk output.
---
 .../development/compilers/openjdk/default.nix | 19 ++++++++++++++-----
 .../compilers/openjdk/fix-java-home.patch     | 17 +++++++++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/compilers/openjdk/fix-java-home.patch

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 306337fac9c..50f01f41372 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype, cups
-, which, jdk, nettools, libX11, libXt, libXext, libXrender, libXtst, libXi, libXinerama
-, libXcursor, fontconfig, cpio, cacert, perl, setJavaClassPath }:
+, which, jdk, nettools, xorg
+, fontconfig, cpio, cacert, perl, setJavaClassPath }:
 
 let
 
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ unzip procps ant which zip cpio nettools alsaLib
-      libX11 libXt libXext libXrender libXtst libXi libXinerama libXcursor
+      xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst
+      xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir
       fontconfig perl
     ];
 
@@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
       openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk
   '';
 
-  patches = [ ./cppflags-include-fix.patch ];
+  patches = [ ./cppflags-include-fix.patch ./fix-java-home.patch ];
 
   NIX_NO_SELF_RPATH = true;
 
@@ -80,6 +81,9 @@ stdenv.mkDerivation rec {
     mv $out/lib/openjdk/include $out/include
     mv $out/lib/openjdk/man $out/share/man
 
+    # jni.h expects jni_md.h to be in the header search path.
+    ln -s $out/include/linux/*_md.h $out/include/
+
     # Remove some broken manpages.
     rm -rf $out/share/man/ja*
 
@@ -88,10 +92,15 @@ stdenv.mkDerivation rec {
 
     # Move the JRE to a separate output.
     mv $out/lib/openjdk/jre $jre/lib/openjdk/
-    ln -s $jre/lib/openjdk/jre $out/lib/openjdk/jre
+    mkdir $out/lib/openjdk/jre
+    lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
+
+    rm -rf $out/lib/openjdk/jre/bin
+    ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin
 
     # Remove duplicate binaries.
     for i in $(cd $out/lib/openjdk/bin && echo *); do
+      if [ "$i" = java ]; then continue; fi
       if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
         ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
       fi
diff --git a/pkgs/development/compilers/openjdk/fix-java-home.patch b/pkgs/development/compilers/openjdk/fix-java-home.patch
new file mode 100644
index 00000000000..5def344f171
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/fix-java-home.patch
@@ -0,0 +1,17 @@
+diff -ru -x '*~' openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp	2013-09-06 20:22:03.000000000 +0200
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2014-01-24 22:44:08.223857012 +0100
+@@ -2358,12 +2358,10 @@
+                 CAST_FROM_FN_PTR(address, os::jvm_path),
+                 dli_fname, sizeof(dli_fname), NULL);
+   assert(ret, "cannot locate libjvm");
+   char *rp = NULL;
+   if (ret && dli_fname[0] != '\0') {
+-    rp = realpath(dli_fname, buf);
++    snprintf(buf, buflen, "%s", dli_fname);
+   }
+-  if (rp == NULL)
+-    return;
+ 
+   if (Arguments::created_by_gamma_launcher()) {
+     // Support for the gamma launcher.  Typical value for buf is
-- 
GitLab


From 1b598da460db965c9c4d68b711a9b671b2c5f887 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Jan 2014 02:32:39 +0100
Subject: [PATCH 0438/3789] Drop unnecessary setting of java.home

---
 pkgs/development/interpreters/rascal/default.nix             | 2 +-
 pkgs/development/tools/build-managers/apache-ant/default.nix | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix
index d3eb9824989..6818a996d62 100644
--- a/pkgs/development/interpreters/rascal/default.nix
+++ b/pkgs/development/interpreters/rascal/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     ''
       mkdir -p $out/bin
       makeWrapper ${jdk}/bin/java $out/bin/rascal \
-        --add-flags "-Djava.home=$JAVA_HOME -jar ${src}" \
+        --add-flags "-jar ${src}" \
     '';
 
   meta = {
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index 19c664c2ea7..0dfb634c594 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -65,10 +65,6 @@ stdenv.mkDerivation {
 
       LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH"
 
-      if [ -e \$JAVA_HOME/lib/tools.jar ]; then
-          LOCALCLASSPATH="\$JAVA_HOME/lib/tools.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH"
-      fi
-
       exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \
           -Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \
           org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \
-- 
GitLab


From 458d0a92c9bc2339ff434fe651359a6c18888937 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Jan 2014 02:28:19 +0100
Subject: [PATCH 0439/3789] junixsocket: Add

---
 .../libraries/java/junixsocket/default.nix    | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/java/junixsocket/default.nix

diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix
new file mode 100644
index 00000000000..a23de5d98c6
--- /dev/null
+++ b/pkgs/development/libraries/java/junixsocket/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, ant, jdk, junit }:
+
+stdenv.mkDerivation rec {
+  name = "junixsocket-1.3";
+
+  src = fetchurl {
+    url = "http://junixsocket.googlecode.com/files/${name}-src.tar.bz2";
+    sha256 = "0c6p8vmiv5nk8i6g1hgivnl3mpb2k3lhjjz0ss9dlirisfrxf1ym";
+  };
+
+  buildInputs = [ ant jdk junit ];
+
+  preConfigure =
+    ''
+      sed -i 's|/usr/bin/||' build.xml
+    '';
+
+  buildPhase = "ant";
+
+  ANT_ARGS =
+    "-Dskip32=true -Dant.build.javac.source=1.6"
+    + stdenv.lib.optionalString stdenv.isDarwin " -DisMac=true";
+
+  installPhase =
+    ''
+      mkdir -p $out/share/java $out/lib
+      cp -v dist/*.jar $out/share/java
+      cp -v lib-native/*.so lib-native/*.dylib $out/lib/
+    '';
+
+  meta = {
+    description = "A Java/JNI library for using Unix Domain Sockets from Java";
+    homepage = https://code.google.com/p/junixsocket/;
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ee74ee90e1..929fd87e963 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5835,6 +5835,8 @@ let
 
   junit = callPackage ../development/libraries/java/junit { };
 
+  junixsocket = callPackage ../development/libraries/java/junixsocket { };
+
   jzmq = callPackage ../development/libraries/java/jzmq { };
 
   lucene = callPackage ../development/libraries/java/lucene { };
-- 
GitLab


From 433774c6088501f53b36ddac5811ff63784ae75c Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Sat, 25 Jan 2014 03:13:34 +0100
Subject: [PATCH 0440/3789] Add libyubikey (aka yubico-c) package

---
 .../libraries/libyubikey/default.nix          | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/libyubikey/default.nix

diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix
new file mode 100644
index 00000000000..77bf60c4255
--- /dev/null
+++ b/pkgs/development/libraries/libyubikey/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec
+{
+  version = "1.11";
+  name = "libyubikey-${version}";
+
+  src = fetchurl
+  {
+    url = "http://opensource.yubico.com/yubico-c/releases/${name}.tar.gz";
+	sha256 = "19pm4rqsnm9r0n5j26bqkxa1jpimdavzcvg5g7p416vkjhxc6lw9";
+  };
+
+  meta =
+  {
+    homepage = "http://opensource.yubico.com/yubico-c/";
+	description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)";
+	license = "bsd";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ee74ee90e1..f16c5b7cd9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5036,6 +5036,8 @@ let
   libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };
   libyamlcpp03 = callPackage ../development/libraries/libyaml-cpp/0.3.x.nix { };
 
+  libyubikey = callPackage ../development/libraries/libyubikey {};
+
   libzip = callPackage ../development/libraries/libzip { };
 
   libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { };
-- 
GitLab


From 8f9300fb0ee63c2e0ebc0080346c15dbb26a72ee Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Sat, 25 Jan 2014 03:17:06 +0100
Subject: [PATCH 0441/3789] Add ykpers (aka yubikey-personalization) package

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

diff --git a/pkgs/applications/misc/ykpers/default.nix b/pkgs/applications/misc/ykpers/default.nix
new file mode 100644
index 00000000000..70ec351f71b
--- /dev/null
+++ b/pkgs/applications/misc/ykpers/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, libusb1, libyubikey}:
+
+stdenv.mkDerivation rec
+{
+  version = "1.15.0";
+  name = "ykpers-${version}";
+
+  src = fetchurl
+  {
+    url = "http://opensource.yubico.com/yubikey-personalization/releases/${name}.tar.gz";
+	sha256 = "1n4s8kk31q5zh2rm7sj9qmv86yl8ibimdnpvk9ny391a88qlypyd";
+  };
+
+  buildInputs = [pkgconfig libusb1 libyubikey];
+
+  meta =
+  {
+    homepage = "http://opensource.yubico.com/yubikey-personalization/";
+	description = "YubiKey Personalization cross-platform library and tool";
+	license = "bsd";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f16c5b7cd9e..a967115b5ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9119,6 +9119,8 @@ let
 
   qgis = callPackage ../applications/misc/qgis {};
 
+  ykpers = callPackage ../applications/misc/ykpers {};
+
   yoshimi = callPackage ../applications/audio/yoshimi {
     fltk = fltk13;
   };
-- 
GitLab


From 333f5caaf91ce1c28586483774a60bf385e19a32 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Sat, 25 Jan 2014 03:27:12 +0100
Subject: [PATCH 0442/3789] Implement authentication for a LUKS device with a
 yubikey (HMAC-SHA1); supports simple challenge-response and two-factor
 authentication

---
 nixos/modules/system/boot/luksroot.nix | 220 ++++++++++++++++++++++++-
 1 file changed, 218 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index ba357f5d2de..ca4a8c480f8 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
   luks = config.boot.initrd.luks;
 
-  openCommand = { name, device, keyFile, keyFileSize, allowDiscards, ... }: ''
+  openCommand = { name, device, keyFile, keyFileSize, allowDiscards, yubikey, ... }: ''
     # Wait for luksRoot to appear, e.g. if on a usb drive.
     # XXX: copied and adapted from stage-1-init.sh - should be
     # available as a function.
@@ -31,9 +31,141 @@ let
     fi
     ''}
 
+    ${optionalString (luks.yubikeySupport && (yubikey != null)) ''
+    mkdir -p ${yubikey.challenge.mountPoint}
+    mount -t ${yubikey.challenge.fsType} ${toString yubikey.challenge.device} ${yubikey.challenge.mountPoint}
+    response="$(ykchalresp -${toString yubikey.yubikeySlot} "`cat ${yubikey.challenge.mountPoint}${yubikey.challenge.file}`" 2>/dev/null || true)"
+    if [ -z "$response" ]; then
+        echo -n "waiting 10 seconds for yubikey to appear..."
+        for try in $(seq 10); do
+            sleep 1
+            response="$(ykchalresp -${toString yubikey.yubikeySlot} "`cat ${yubikey.challenge.mountPoint}${yubikey.challenge.file}`" 2>/dev/null || true)"
+            if [ ! -z "$response" ]; then break; fi
+            echo -n .
+        done
+        echo "ok"
+    fi
+
+    ${optionalString yubikey.twoFactor ''
+    if [ ! -z "$response" ]; then
+        echo -n "Enter two-factor passphrase: "
+        read -s passphrase
+        current_key="$passphrase$response"
+    fi
+    ''}
+
+    ${optionalString (!yubikey.twoFactor) ''
+    if [ ! -z "$response" ]; then
+        current_key="$response"
+    fi
+    ''}
+    ''}
+
     # open luksRoot and scan for logical volumes
+    ${optionalString ((!luks.yubikeySupport) || (yubikey == null)) ''
     cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} \
       ${optionalString (keyFile != null) "--key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}"}
+    ''}
+
+    ${optionalString (luks.yubikeySupport && (yubikey != null)) ''
+    if [ -z "$response" ]; then
+        cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} \
+          ${optionalString (keyFile != null) "--key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}"}
+    else
+        echo $current_key | cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} --key-file=-
+
+        if [ $? != "0" ]; then
+            for try in $(seq 3); do
+
+                ${optionalString (!yubikey.twoFactor) ''
+                sleep 1
+                ''}
+
+                ${optionalString yubikey.twoFactor ''
+                echo -n "Enter two-factor passphrase: "
+                read -s passphrase
+                current_key="$passphrase$response"
+                ''}
+
+                echo $current_key | cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} --key-file=-
+                if [ $? == "0" ]; then break; fi
+                echo -n .
+            done
+        fi
+
+        mkdir -p ${yubikey.ramfsMountPoint}
+        # A ramfs is used here to ensure that the file used to update
+        # the key slot with cryptsetup will never get swapped out.
+        # Warning: Do NOT replace with tmpfs!
+        mount -t ramfs none ${yubikey.ramfsMountPoint}
+
+        update_failed=false
+        old_challenge=$(cat ${yubikey.challenge.mountPoint}${yubikey.challenge.file})
+
+        new_challenge=$(uuidgen)
+        if [ $? != "0" ]; then
+            for try in $(seq 10); do
+                sleep 1
+                new_challenge=$(uuidgen)
+                if [ $? == "0" ]; then break; fi
+                if [ $try -eq 10 ]; then update_failed=true; fi
+            done
+        fi
+
+        if [ "$update_failed" == false ]; then
+            echo $new_challenge > ${yubikey.challenge.mountPoint}${yubikey.challenge.file}
+            response="$(ykchalresp -${toString yubikey.yubikeySlot} "`cat ${yubikey.challenge.mountPoint}${yubikey.challenge.file}`" 2>/dev/null || true)"
+            if [ -z "$response" ]; then
+                echo -n "waiting 10 seconds for yubikey to appear..."
+                for try in $(seq 10); do
+                    sleep 1
+                    response="$(ykchalresp -${toString yubikey.yubikeySlot} "`cat ${yubikey.challenge.mountPoint}${yubikey.challenge.file}`" 2>/dev/null || true)"
+                    if [ ! -z "$response" ]; then break; fi
+                    echo -n .
+                done
+                echo "ok";
+            fi
+
+            if [ ! -z "$response" ]; then
+                ${optionalString yubikey.twoFactor ''
+                new_key="$passphrase$response"
+                ''}
+
+                ${optionalString (!yubikey.twoFactor) ''
+                new_key="$response"
+                ''}
+
+                echo $new_key > ${yubikey.ramfsMountPoint}/new_key
+
+                echo $current_key | cryptsetup luksChangeKey ${device} --key-file=- --key-slot ${toString yubikey.luksKeySlot} ${yubikey.ramfsMountPoint}/new_key
+                if [ $? != "0" ]; then
+                    for try in $(seq 10); do
+                        sleep 1
+                        echo $current_key | cryptsetup luksChangeKey ${device} --key-file=- --key-slot ${toString yubikey.luksKeySlot} ${yubikey.ramfsMountPoint}/new_key
+                        if [ $? == "0" ]; then break; fi
+                        if [ $try -eq 10 ]; then update_failed=true; fi
+                    done
+
+                fi
+
+                rm -f ${yubikey.ramfsMountPoint}/new_key
+
+                if [ "$update_failed" == true ]; then
+                    echo $old_challenge > ${yubikey.challenge.mountPoint}${yubikey.challenge.file}
+                    echo "Warning: Could not update luks header with new key for ${device}, old challenge restored!"
+                fi
+            else
+              echo $old_challenge > ${yubikey.challenge.mountPoint}${yubikey.challenge.file}
+              echo "Warning: No yubikey present to challenge for ${device}, old challenge restored!"
+            fi
+        else
+            echo "Warning: New challenge could not be obtained for ${device}, old challenge persists!"
+        fi
+
+        umount ${yubikey.ramfsMountPoint}
+        umount ${yubikey.challenge.mountPoint}
+    fi
+    ''}
   '';
 
   isPreLVM = f: f.preLVM;
@@ -139,10 +271,77 @@ in
           '';
         };
 
-      };
+        yubikey = mkOption {
+          default = null;
+          type = types.nullOr types.optionSet;
+          description = "TODO";
+
+          options = {
+            twoFactor = mkOption {
+              default = false;
+              type = types.bool;
+              description = "TODO";
+            };
+
+            yubikeySlot = mkOption {
+              default = 2;
+              type = types.int;
+              description = "TODO";
+            };
+
+            luksKeySlot = mkOption {
+              default = 1;
+              type = types.int;
+              description = "TODO";
+            };
+
+            challenge = mkOption {
+              type = types.optionSet;
+              description = "TODO";
+
+              options = {
+                device = mkOption {
+                  default = /dev/sda1;
+                  type = types.path;
+                  description = "TODO";
+                };
+
+                fsType = mkOption {
+                  default = "vfat";
+                  type = types.string;
+                  description = "TODO";
+                };
+
+                mountPoint = mkOption {
+                  default = "/crypt-challenge";
+                  type = types.string;
+                  description = "TODO";
+                };
+
+                file = mkOption {
+                  default = "/crypt-challenge";
+                  type = types.string;
+                  description = "TODO";
+                };
+              };
+            };
+
+            ramfsMountPoint = mkOption {
+              default = "/crypt-update";
+              type = types.string;
+              description = "TODO";
+            };
+          };
+        };
 
+      };
     };
 
+    boot.initrd.luks.yubikeySupport = mkOption {
+      default = false;
+      type = types.bool;
+      description = "TODO";
+    };
   };
 
   config = mkIf (luks.devices != []) {
@@ -162,10 +361,27 @@ in
         cp -pdvn $lib $out/lib
         cp -pvn $(readlink -f $lib) $out/lib
       done
+      ${optionalString luks.yubikeySupport ''
+      cp -pdv ${pkgs.utillinux}/bin/uuidgen $out/bin
+      for lib in $(ldd $out/bin/uuidgen |grep '=>' |grep /nix/store/ |cut -d' ' -f3); do
+        cp -pdvn $lib $out/lib
+        cp -pvn $(readlink -f $lib) $out/lib
+      done
+
+      cp -pdv ${pkgs.ykpers}/bin/ykchalresp $out/bin
+      for lib in $(ldd $out/bin/ykchalresp |grep '=>' |grep /nix/store/ |cut -d' ' -f3); do
+        cp -pdvn $lib $out/lib
+        cp -pvn $(readlink -f $lib) $out/lib
+      done
+      ''}
     '';
 
     boot.initrd.extraUtilsCommandsTest = ''
       $out/bin/cryptsetup --version
+      ${optionalString luks.yubikeySupport ''
+        $out/bin/uuidgen --version
+        $out/bin/ykchalresp -V
+      ''}
     '';
 
     boot.initrd.preLVMCommands = concatMapStrings openCommand preLVM;
-- 
GitLab


From 97352b1342acb10c525ddb8ca9e5aa15ec21b372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 24 Jan 2014 23:14:31 +0100
Subject: [PATCH 0443/3789] cgal: update from 3.9 to 4.3 (really)

The previous version bump didn't actually do anything; it changed the
version/url but didn't change the hash. For some reason the (new) URL
returned the same old package with the same old hash (or so it seems).

This time the package is really updated, as can be seen from the version
number in $cgal/include/CGAL/version.h.

This change unbreaks openscad.
---
 pkgs/development/libraries/CGAL/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 0b65fcba0cb..77c486350b8 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
   version = "4.3";
   name = "cgal-${version}";
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/29125/CGAL-${version}.tar.gz";
-    sha256 = "193vjhzlf7f2kw6dbg5yw8v0izdvmnrylqzqhw92vml7jjnr8494";
+    url = "https://gforge.inria.fr/frs/download.php/32995/CGAL-${version}.tar.xz";
+    sha256 = "015vw57dmy43bf63mg3916cgcsbv9dahwv24bnmiajyanj2mhiyc";
   };
 
   buildInputs = [cmake boost gmp mpfr ];
-- 
GitLab


From c72ce740bc1ed4887a9ef5f1f31caeac50d2f8e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 24 Jan 2014 23:21:54 +0100
Subject: [PATCH 0444/3789] cgal: expression cleanup

---
 pkgs/development/libraries/CGAL/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 77c486350b8..12273f84566 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,25 +1,24 @@
-{stdenv, fetchurl, cmake, boost, gmp, mpfr
-  }:
+{ stdenv, fetchurl, cmake, boost, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
   version = "4.3";
+
   name = "cgal-${version}";
+
   src = fetchurl {
     url = "https://gforge.inria.fr/frs/download.php/32995/CGAL-${version}.tar.xz";
     sha256 = "015vw57dmy43bf63mg3916cgcsbv9dahwv24bnmiajyanj2mhiyc";
   };
 
-  buildInputs = [cmake boost gmp mpfr ];
+  buildInputs = [ cmake boost gmp mpfr ];
 
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Computational Geometry Algorithms Library";
     homepage = "http://cgal.org/";
-    platforms = with stdenv.lib.platforms;
-      linux;
-    maintainers = with stdenv.lib.maintainers; 
-      [raskin];
+    license = licenses.gpl3Plus; # some parts are GPLv3+, some are LGPLv3+
+    platforms = platforms.linux;
+    maintainers = [ maintainers.raskin ];
   };
 }
-
-- 
GitLab


From 0121ee33d8134b849c4353984c8046e3550e6693 Mon Sep 17 00:00:00 2001
From: Andraz Brodnik <brodul@brodul.org>
Date: Sat, 25 Jan 2014 10:28:27 +0100
Subject: [PATCH 0445/3789] Add the beep-1.3.

---
 pkgs/misc/beep/default.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 pkgs/misc/beep/default.nix

diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix
new file mode 100644
index 00000000000..8f0830be186
--- /dev/null
+++ b/pkgs/misc/beep/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+# this package is working only as root
+# in order to work as a non privileged user you would need to suid the bin
+
+stdenv.mkDerivation {
+  name = "beep-1.3";
+  src = fetchurl {
+    url = http://www.johnath.com/beep/beep-1.3.tar.gz;
+    md5 = "49c340ceb95dbda3f97b2daafac7892a";
+  };
+
+  makeFlags = "INSTALL_DIR=\${out}/bin/ MAN_DIR=\${out}/man/man1/";
+
+  preInstall = ''
+    mkdir -p $out/bin
+    mkdir -p $out/man/man1
+  '';
+  meta = {
+    description = "The advanced PC speaker beeper";
+    homepage = http://www.johnath.com/beep/;
+    license = "GPLv2";
+  };
+}
-- 
GitLab


From 47ac1f38cd6c3311749fdb2950b7741f321395f2 Mon Sep 17 00:00:00 2001
From: Andraz Brodnik <brodul@brodul.org>
Date: Sat, 25 Jan 2014 10:28:54 +0100
Subject: [PATCH 0446/3789] Added beep to top-level.

---
 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 929fd87e963..894605c5a63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9947,6 +9947,8 @@ let
 
   auctex = callPackage ../tools/typesetting/tex/auctex { };
 
+  beep = callPackage ../misc/beep { };
+
   cups = callPackage ../misc/cups { libusb = libusb1; };
 
   cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { };
-- 
GitLab


From 5d3d6b37994f1e564eae00187d9440d85f92197c Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 25 Jan 2014 11:20:25 +0100
Subject: [PATCH 0447/3789] support -Q in nixos-rebuild

---
 nixos/modules/installer/tools/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 5c89394abce..2a1c397553b 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -40,7 +40,7 @@ while [ "$#" -gt 0 ]; do
         repair=1
         extraBuildFlags+=("$i")
         ;;
-      --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair)
+      --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q)
         extraBuildFlags+=("$i")
         ;;
       --max-jobs|-j|--cores|-I)
-- 
GitLab


From 8ab1160079357ecf86cc920eb64f04fcfadef557 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sat, 25 Jan 2014 10:30:06 +0000
Subject: [PATCH 0448/3789] pythonPackages.tarsnapper: New expression

---
 .../python-modules/tarsnapper-path.patch      | 20 +++++++++
 pkgs/top-level/python-packages.nix            | 42 +++++++++++++------
 2 files changed, 50 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/python-modules/tarsnapper-path.patch

diff --git a/pkgs/development/python-modules/tarsnapper-path.patch b/pkgs/development/python-modules/tarsnapper-path.patch
new file mode 100644
index 00000000000..337ad49f971
--- /dev/null
+++ b/pkgs/development/python-modules/tarsnapper-path.patch
@@ -0,0 +1,20 @@
+diff --git a/src/tarsnapper/script.py b/src/tarsnapper/script.py
+index 737ac8d..52cc775 100644
+--- a/src/tarsnapper/script.py
++++ b/src/tarsnapper/script.py
+@@ -48,7 +48,7 @@ class TarsnapBackend(object):
+         """
+         ``arguments`` is a single list of strings.
+         """
+-        call_with = ['tarsnap']
++        call_with = ['@NIXTARSNAPPATH@']
+         for option in self.options:
+             key = option[0]
+             pre = "-" if len(key) == 1 else "--"
+@@ -499,4 +499,4 @@ def run():
+ 
+ 
+ if __name__ == '__main__':
+-    run()
+\ No newline at end of file
++    run()
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a6681b9f55..5718572399f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1029,7 +1029,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "https://github.com/agrover/configshell-fb/archive/v${version}.tar.gz";
       sha256 = "1dd87xvm98nk3jzybb041gjdahi2z9b53pwqhyxcfj4a91y82ndy";
     };
-    
+
     propagatedBuildInputs = [
       pyparsing
       modules.readline
@@ -1871,7 +1871,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "http://pypi.python.org/packages/source/h/hypatia/${name}.tar.gz";
       md5 = "3a67683c578754cd8f23317db6d28ffd";
     };
- 
+
     buildInputs = [ zope_interface zodb3 ];
 
     meta = {
@@ -1887,7 +1887,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "http://pypi.python.org/packages/source/z/zope.copy/${name}.zip";
       md5 = "36aa2c96dec4cfeea57f54da2b733eb9";
     };
- 
+
     buildInputs = [ pkgs.unzip zope_interface zope_location zope_schema ];
 
     meta = {
@@ -1903,7 +1903,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "http://pypi.python.org/packages/source/s/statsd/${name}.tar.gz";
       md5 = "476ef5b9004f6e2cb25c7da440bb53d0";
     };
- 
+
     buildInputs = [ ];
 
     meta = {
@@ -1919,7 +1919,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "http://pypi.python.org/packages/source/p/pyramid_zodbconn/${name}.tar.gz";
       md5 = "22e88cc82cafbbe00274e7378434e5fe";
     };
- 
+
     buildInputs = [ pyramid mock ];
     propagatedBuildInputs = [ zodb3 zodburi ];
 
@@ -1936,7 +1936,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "http://pypi.python.org/packages/source/p/pyramid_mailer/${name}.tar.gz";
       md5 = "43800c7c894097a23140da58e3638c93";
     };
- 
+
     buildInputs = [ pyramid transaction ];
     propagatedBuildInputs = [ repoze_sendmail ];
 
@@ -1953,7 +1953,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "http://pypi.python.org/packages/source/r/repoze.sendmail/${name}.tar.gz";
       md5 = "81d15f1f03cc67d6f56f2091c594ef57";
     };
- 
+
     buildInputs = [ transaction ];
 
     meta = {
@@ -1969,7 +1969,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "http://pypi.python.org/packages/source/z/zodburi/${name}.tar.gz";
       md5 = "52cc13c32ffe4ee7b5f5abc79f70f3c2";
     };
- 
+
     buildInputs = [ zodb3 mock ];
 
     meta = {
@@ -2215,7 +2215,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   };
 
   django = django_1_6;
-  
+
   django_1_6 = buildPythonPackage rec {
     name = "Django-${version}";
     version = "1.6";
@@ -6239,7 +6239,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
 
     # 4 failing tests
-    doCheck = false; 
+    doCheck = false;
 
     buildInputs = [ nose modules.curses ];
 
@@ -6617,7 +6617,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "https://github.com/agrover/targetcli-fb/archive/v${version}.tar.gz";
       sha256 = "1zcm0agdpf866020b43fl8zyyyzz6r74mn1sz4xpaa0pinpwjk42";
     };
-    
+
     propagatedBuildInputs = [
       configshell_fb
       rtslib_fb
@@ -6630,6 +6630,24 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  tarsnapper = buildPythonPackage rec {
+    name = "tarsnapper-0.2.1";
+
+    src = fetchgit {
+      url = https://github.com/miracle2k/tarsnapper.git;
+      rev = "620439bca68892f2ffaba1079a34b18496cc6596";
+    };
+
+    propagatedBuildInputs = [ argparse pyyaml ];
+
+    patches = [ ../development/python-modules/tarsnapper-path.patch ];
+
+    preConfigure = ''
+      substituteInPlace src/tarsnapper/script.py \
+        --replace '@NIXTARSNAPPATH@' '${pkgs.tarsnap}/bin/tarsnap'
+    '';
+  };
+
   taskcoach = buildPythonPackage rec {
     name = "TaskCoach-1.3.22";
 
@@ -7073,7 +7091,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   webtest = buildPythonPackage rec {
     version = "2.0.11";
     name = "webtest-${version}";
-  
+
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.zip";
       md5 = "e51da21da8815cef07f543d8688effea";
-- 
GitLab


From c3b4e87f253dbccfbff1246d17b92b1e8d3b45a7 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sat, 25 Jan 2014 11:24:17 +0000
Subject: [PATCH 0449/3789] haskellPackages.ariadne: Fix dependencies to allow
 building

---
 .../haskell/haskell-names/default.nix         |  1 +
 pkgs/top-level/haskell-packages.nix           | 21 ++++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix
index ac1cf83ac5e..c67f4ccb402 100644
--- a/pkgs/development/libraries/haskell/haskell-names/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-names/default.nix
@@ -25,4 +25,5 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
+  doCheck = false;
 })
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 798103153ec..7aa857fa112 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -548,6 +548,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   ariadne = callPackage ../development/libraries/haskell/ariadne {
     Cabal = self.Cabal_1_18_1_2;
+    haskellPackages = self.haskellPackages.override {
+      Cabal = self.Cabal_1_18_1_2;
+    };
+    haskellNames = self.haskellNames.override {
+      Cabal = self.Cabal_1_18_1_2;
+      haskellPackages = self.haskellPackages.override {
+        Cabal = self.Cabal_1_18_1_2;
+      };
+    };
   };
 
   arithmoi = callPackage ../development/libraries/haskell/arithmoi {};
@@ -613,7 +622,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   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
 
-  binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {};
+  binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {
+    binary = self.binary_0_7_1_0;
+  };
 
   binaryShared = callPackage ../development/libraries/haskell/binary-shared {};
 
@@ -1333,13 +1344,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hoodleBuilder = callPackage ../development/libraries/haskell/hoodle-builder {};
 
-  hoodleCore = callPackage ../development/libraries/haskell/hoodle-core {}; 
+  hoodleCore = callPackage ../development/libraries/haskell/hoodle-core {};
 
-  hoodleParser = callPackage ../development/libraries/haskell/hoodle-parser {}; 
+  hoodleParser = callPackage ../development/libraries/haskell/hoodle-parser {};
 
-  hoodleRender = callPackage ../development/libraries/haskell/hoodle-render {}; 
+  hoodleRender = callPackage ../development/libraries/haskell/hoodle-render {};
 
-  hoodleTypes = callPackage ../development/libraries/haskell/hoodle-types {}; 
+  hoodleTypes = callPackage ../development/libraries/haskell/hoodle-types {};
 
   hoogle = callPackage ../development/libraries/haskell/hoogle {};
 
-- 
GitLab


From 0ff30b792545c7aaa5450490a0457c8fb5c95580 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sat, 25 Jan 2014 11:46:03 +0000
Subject: [PATCH 0450/3789] perlPackages.HTMLFormHandler: Upgrade to 0.40055

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6211b91053f..a9f9638bb7a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3794,7 +3794,7 @@ let self = _self // overrides; _self = with self; {
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
-  };  
+  };
 
   HeapFibonacci = buildPerlPackage {
     name = "Heap-Fibonacci-0.80";
@@ -3871,18 +3871,18 @@ let self = _self // overrides; _self = with self; {
   };
 
   HTMLFormHandler = buildPerlPackage {
-    name = "HTML-FormHandler-0.40025";
+    name = "HTML-FormHandler-0.40055";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40025.tar.gz;
-      sha256 = "0fp8qcbkr19qn1859rpn3ca3b7w1jjyprwlj82dnvfi3b5jf8507";
+      url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40055.tar.gz;
+      sha256 = "47e3cf69e2475cba86356eda340e6622df0525e2d0aa2343aef9f924f13d86cd";
     };
     buildInputs = [ FileShareDirInstall PadWalker TestDifferences TestException TestMemoryCycle ];
-    propagatedBuildInputs = [ aliased ClassLoad DataClone DateTime DateTimeFormatStrptime EmailValid FileShareDir JSON HTMLTree Moose MooseXGetopt MooseXTypes MooseXTypesCommon MooseXTypesLoadableClass namespaceautoclean SubExporter SubName TryTiny ];
+    propagatedBuildInputs = [ ClassLoad DataClone DateTime DateTimeFormatStrptime EmailValid FileShareDir HTMLTree JSON ListAllUtils Moose MooseXGetopt MooseXTypes MooseXTypesCommon MooseXTypesLoadableClass SubExporter SubName TryTiny aliased namespaceautoclean ];
     meta = {
       description = "HTML forms using Moose";
-      license = "perl5";
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
+      license = "perl";
     };
   };
 
@@ -5724,7 +5724,7 @@ let self = _self // overrides; _self = with self; {
     };
     buildInputs = [ TestFatal ];
     propagatedBuildInputs = [ Moose MooseXTypes ];
-    meta = { 
+    meta = {
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
-- 
GitLab


From ee26cdd3892b0d2d12eeb3378fd804e0cb0088d7 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sat, 25 Jan 2014 11:56:02 +0000
Subject: [PATCH 0451/3789] perlPackages.LWPUserAgentMockable: Disable tests

These tests need network connectivity, which isn't available in a
chroot'ed environment (at least, it's not available on Hydra build machines).
---
 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 a9f9638bb7a..1a94eb562d4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4829,6 +4829,10 @@ let self = _self // overrides; _self = with self; {
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
     };
+    # Tests require network connectivity
+    # https://rt.cpan.org/Public/Bug/Display.html?id=63966 is the bug upstream,
+    # which doesn't look like it will get fixed anytime soon.
+    doCheck = false;
   };
 
   LWPxParanoidAgent = buildPerlPackage rec {
-- 
GitLab


From 4d027a44f6223681f848400c17ca5055b7078189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 25 Jan 2014 13:13:51 +0100
Subject: [PATCH 0452/3789] openconnect: update from 5.01 to 5.02
 (CVE-2013-7098)

OpenConnect v5.02 - 2014-01-01:
* Fix XML POST issues with authgroups by falling back to old style login.
* Fix --cookie-on-stdin with cookies from ocserv.
* Fix reconnection to wrong host after redirect.
* Reduce limit of queued packets on DTLS socket, to fix VoIP latency.
* Fix Solaris build breakage due to missing <string.h> includes.
* Include path in <group-access> node.
* Include supporting CA certificates from PKCS#11 tokens (with GnuTLS 3.2.7+).
* Fix possible heap overflow if MTU is increased on reconnection (CVE-2013-7098).
---
 pkgs/tools/networking/openconnect.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openconnect.nix b/pkgs/tools/networking/openconnect.nix
index 2cc52fe981b..c523e0004d7 100644
--- a/pkgs/tools/networking/openconnect.nix
+++ b/pkgs/tools/networking/openconnect.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgconfig, vpnc, openssl, libxml2 } :
 
 stdenv.mkDerivation rec {
-  name = "openconnect-5.01";
+  name = "openconnect-5.02";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz"
     ];
-    sha256 = "1l90ks87iwmy7jprav11lhjr4n18ycy0d9fndspg50p9qd3jlvwi";
+    sha256 = "1y7dn42gd3763sgwv2j72xy9hsikd6y9x142g84kwdbn0y0psgi4";
   };
 
   preConfigure = ''
-- 
GitLab


From 958d6636a7b5bf9e02521ea7342fd057f0328e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 25 Jan 2014 13:30:56 +0100
Subject: [PATCH 0453/3789] networkmanager: fix path to 'openconnect' binary

Without this the openconnect VPN plugin doesn't work:

  NetworkManager[830]: <warn> VPN connection 'Foo VPN' failed to connect: 'Could not find openconnect binary.'.
---
 pkgs/tools/networking/network-manager/openconnect.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix
index 94224fc63bd..ff4c853512d 100644
--- a/pkgs/tools/networking/network-manager/openconnect.nix
+++ b/pkgs/tools/networking/network-manager/openconnect.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
      substituteInPlace "configure" \
        --replace "/sbin/sysctl" "${procps}/sbin/sysctl"
      substituteInPlace "src/nm-openconnect-service.c" \
-       --replace "/sbin/openconnect" "${openconnect}/sbin/openconnect" \
+       --replace "/usr/sbin/openconnect" "${openconnect}/sbin/openconnect" \
        --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe"
   '';
 
-- 
GitLab


From 07a3993e1454f8577ea8d782c98bcf878290b381 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Jan 2014 14:10:25 +0100
Subject: [PATCH 0454/3789] libreoffice: Fix path to Ant

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

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 8aaf1839f92..fd93bda4c96 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -225,7 +225,7 @@ stdenv.mkDerivation rec {
     "--disable-postgresql-sdbc"
     "--with-package-format=native"
     "--with-jdk-home=${jdk}"
-    "--with-ant-home=${ant}"
+    "--with-ant-home=${ant}/lib/ant"
     "--without-afms"
     "--without-fonts"
     "--without-myspell-dicts"
-- 
GitLab


From 83b354e4f98505f30ee7a9a5dccc3d8980c66c3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 25 Jan 2014 15:34:55 +0100
Subject: [PATCH 0455/3789] linuxHeaders: add meta, incl. platforms = linux;

Noted by @mornfall. The built package has ~5 MB uncompressed,
but just the Linux tarball has ~40 MB compressed...
---
 pkgs/os-specific/linux/kernel-headers/3.7.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel-headers/3.7.nix b/pkgs/os-specific/linux/kernel-headers/3.7.nix
index 4371bf7df9c..e6fbf9bb9bc 100644
--- a/pkgs/os-specific/linux/kernel-headers/3.7.nix
+++ b/pkgs/os-specific/linux/kernel-headers/3.7.nix
@@ -62,4 +62,10 @@ stdenv.mkDerivation {
       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;
+  };
 }
-- 
GitLab


From 3718a90806224ceed928d57026d835a28ee85064 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sat, 25 Jan 2014 15:16:54 +0100
Subject: [PATCH 0456/3789] haskell bytestring-progress: Disable haddock to
 avoid a build failure.

---
 .../libraries/haskell/bytestring-progress/default.nix            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/bytestring-progress/default.nix b/pkgs/development/libraries/haskell/bytestring-progress/default.nix
index c73932b3760..f943f4cd729 100644
--- a/pkgs/development/libraries/haskell/bytestring-progress/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-progress/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.0.3";
   sha256 = "1v9cl7d4fcchbdrpbgjj4ilg79cj241vzijiifdsgkq30ikv2yxs";
   buildDepends = [ terminalProgressBar time ];
+  noHaddock = true; # fails to build with a parse error
   meta = {
     homepage = "http://github.com/acw/bytestring-progress";
     description = "A library for tracking the consumption of a lazy ByteString";
-- 
GitLab


From 28f0ec654028cb9701b913f4b8c9a95ce3690dce Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sat, 25 Jan 2014 16:18:09 +0100
Subject: [PATCH 0457/3789] linux-perf: Fix build (unportable shell hack
 broke).

---
 pkgs/os-specific/linux/kernel/perf.diff | 18 ++++++++++++++++++
 pkgs/os-specific/linux/kernel/perf.nix  |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/perf.diff

diff --git a/pkgs/os-specific/linux/kernel/perf.diff b/pkgs/os-specific/linux/kernel/perf.diff
new file mode 100644
index 00000000000..88d0381784f
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/perf.diff
@@ -0,0 +1,18 @@
+--- perf/config/utilities.mak.orig	2014-01-25 14:55:32.573320370 +0000
++++ perf/config/utilities.mak	2014-01-25 15:13:34.174337760 +0000
+@@ -186,9 +186,14 @@
+ endif
+ TRY_CC_MSG=echo "    CHK $(3)" 1>&2;
+ 
++define newline
++
++
++endef
++
+ try-cc = $(shell sh -c						  \
+ 	'TMP="$(OUTPUT)$(TMPOUT).$$$$";				  \
+ 	 $(TRY_CC_MSG)						  \
+-	 echo "$(1)" |						  \
++	 echo -e "$(subst $(newline),\\n,$(1))" | tee _test.c |   \
+ 	 $(CC) -x c - $(2) -o "$$TMP" $(TRY_CC_OUTPUT) && echo y; \
+ 	 rm -f "$$TMP"')
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 3fb18a23472..0a92e39c153 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation {
   preConfigure = ''
     cd tools/perf
     sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
+    patch -p1 < ${./perf.diff}
     [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion
     export makeFlags="DESTDIR=$out $makeFlags"
   '';
-- 
GitLab


From 251fc454ba1419a19c64a893870c5980f7126022 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sat, 25 Jan 2014 15:19:36 +0100
Subject: [PATCH 0458/3789] mpc: (mpd client) Update to 0.25.

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

diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
index bd21550a64c..ae6d9e0c7e6 100755
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/pkgs/applications/audio/mpc/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, mpd_clientlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.23";
+  version = "0.25";
   name = "mpc-${version}";
 
   src = fetchurl {
-    url = "http://www.musicpd.org/download/mpc/0/${name}.tar.bz2";
-    sha256 = "1ir96wfgq5qfdd2s06zfycv38g3bhn3bpndwx9hwf1w507rvifi9";
+    url = "http://www.musicpd.org/download/mpc/0/${name}.tar.xz";
+    sha256 = "095gmik5vrnab5a1g92qiznn48w7499fr0gldp3s6xd26kvs9kvh";
   };
 	
   buildInputs = [ mpd_clientlib ]; 
@@ -24,4 +24,4 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.algorith ];
     platforms = stdenv.lib.platforms.linux;
   };
-}
\ No newline at end of file
+}
-- 
GitLab


From e3fae16a298f3a7741c41df142245a75e6249365 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Tue, 31 Dec 2013 13:27:32 +0100
Subject: [PATCH 0459/3789] emacs: Allow non-GTK X11 builds
 (--with-x-toolkit=lucid).

---
 pkgs/applications/editors/emacs-24/default.nix | 8 +++++---
 pkgs/top-level/all-packages.nix                | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index c558b483e97..6ecee37d21e 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
 , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
 , alsaLib, cairo
-, withX ? !stdenv.isDarwin
+, withX ? !stdenv.isDarwin, withGTK ? true
 }:
 
 assert (libXft != null) -> libpng != null;	# probably a bug
@@ -27,11 +27,13 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isDarwin cairo;
 
   configureFlags =
-    ( if withX then 
+    ( if withX && withGTK then
         [ "--with-x-toolkit=gtk" "--with-xft"]
+      else (if withX then
+        [ "--with-x-toolkit=lucid" "--with-xft" ]
       else
         [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
-          "--with-gif=no" "--with-tiff=no" ] )
+          "--with-gif=no" "--with-tiff=no" ] ) )
     # On NixOS, help Emacs find `crt*.o'.
     ++ stdenv.lib.optional (stdenv ? glibc)
          [ "--with-crt-dir=${stdenv.glibc}/lib" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdabce2debd..69d0f47f460 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7571,7 +7571,7 @@ let
 
   emacs24 = callPackage ../applications/editors/emacs-24 {
     # use override to enable additional features
-    libXaw = if stdenv.isDarwin then xlibs.libXaw else null;
+    libXaw = xlibs.libXaw;
     Xaw3d = null;
     gconf = null;
     librsvg = null;
-- 
GitLab


From ed5bd26574c43246920fdf814e997b86c7b50fff Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sun, 12 Jan 2014 13:22:58 +0100
Subject: [PATCH 0460/3789] STP: Simple Theorem Prover (a SMT solver for
 bitvectors & arrays).

---
 .../science/logic/stp/default.nix             |  23 +++
 .../science/logic/stp/fixbuild.diff           |  45 ++++
 .../science/logic/stp/fixrefs.diff            | 192 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 4 files changed, 262 insertions(+)
 create mode 100644 pkgs/applications/science/logic/stp/default.nix
 create mode 100644 pkgs/applications/science/logic/stp/fixbuild.diff
 create mode 100644 pkgs/applications/science/logic/stp/fixrefs.diff

diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix
new file mode 100644
index 00000000000..cfe96bc6983
--- /dev/null
+++ b/pkgs/applications/science/logic/stp/default.nix
@@ -0,0 +1,23 @@
+{stdenv, cmake, boost, bison, flex, fetchgit, perl, zlib}: 
+stdenv.mkDerivation rec {
+  version = "2014.01.07";
+  name = "stp-${version}";
+  src = fetchgit {
+    url    = "git://github.com/stp/stp";
+    rev    = "3aa11620a823d617fc033d26aedae91853d18635";
+    sha256 = "832520787f57f63cf47364d080f30ad10d6d6e00f166790c19b125be3d6dd45c";
+  };
+  buildInputs = [ cmake boost bison flex perl zlib ];
+  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
+  patchPhase = ''
+      sed -e 's,^export(PACKAGE.*,,' -i CMakeLists.txt
+      patch -p1 < ${./fixbuild.diff}
+      patch -p1 < ${./fixrefs.diff}
+  '';
+  meta = {
+    description = ''Simple Theorem Prover'';
+    maintainers = with stdenv.lib.maintainers; [mornfall];
+    platforms = with stdenv.lib.platforms; linux;
+    license = with stdenv.lib.licenses; mit;
+  };
+}
diff --git a/pkgs/applications/science/logic/stp/fixbuild.diff b/pkgs/applications/science/logic/stp/fixbuild.diff
new file mode 100644
index 00000000000..01782cb4f40
--- /dev/null
+++ b/pkgs/applications/science/logic/stp/fixbuild.diff
@@ -0,0 +1,45 @@
+diff --git a/src/libstp/CMakeLists.txt b/src/libstp/CMakeLists.txt
+index 83bd03a..9c0304b 100644
+--- a/src/libstp/CMakeLists.txt
++++ b/src/libstp/CMakeLists.txt
+@@ -23,6 +23,15 @@ set(stp_lib_targets
+     printer
+ )
+ 
++include_directories(${CMAKE_SOURCE_DIR}/src/AST/)
++include_directories(${CMAKE_BINARY_DIR}/src/AST/)
++
++add_library(globalstp OBJECT
++    ../main/Globals.cpp
++    ${CMAKE_CURRENT_BINARY_DIR}/../main/GitSHA1.cpp
++)
++add_dependencies(globalstp ASTKind_header)
++
+ # Create list of objects and gather list of
+ # associated public headers.
+ set(stp_lib_objects "")
+@@ -31,6 +40,7 @@ foreach(target ${stp_lib_targets})
+     list(APPEND stp_lib_objects $<TARGET_OBJECTS:${target}>)
+ 
+     get_target_property(TARGETS_PUBLIC_HEADERS ${target} PUBLIC_HEADER)
++    set_target_properties(${target} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+     if (EXISTS "${TARGETS_PUBLIC_HEADERS}")
+         list(APPEND stp_public_headers "${TARGETS_PUBLIC_HEADERS}")
+         message("Adding public header(s) ${TARGETS_PUBLIC_HEADERS} to target libstp")
+diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
+index 0735137..73039f5 100644
+--- a/src/main/CMakeLists.txt
++++ b/src/main/CMakeLists.txt
+@@ -3,12 +3,6 @@ include_directories(${CMAKE_BINARY_DIR}/src/AST/)
+ 
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/GitSHA1.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp" @ONLY)
+ 
+-add_library(globalstp OBJECT
+-    Globals.cpp
+-    ${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp
+-)
+-add_dependencies(globalstp ASTKind_header)
+-
+ # -----------------------------------------------------------------------------
+ # Create binary
+ # -----------------------------------------------------------------------------
diff --git a/pkgs/applications/science/logic/stp/fixrefs.diff b/pkgs/applications/science/logic/stp/fixrefs.diff
new file mode 100644
index 00000000000..60ad4949f07
--- /dev/null
+++ b/pkgs/applications/science/logic/stp/fixrefs.diff
@@ -0,0 +1,192 @@
+commit 53b6043e25b2eba264faab845077fbf6736cf22f
+Author: Petr Rockai <me@mornfall.net>
+Date:   Tue Jan 7 13:30:07 2014 +0100
+
+    aig: Comment out unused functions with undefined references in them.
+
+diff --git a/src/extlib-abc/aig/aig/aigPart.c b/src/extlib-abc/aig/aig/aigPart.c
+index a4cc116..5bd5f08 100644
+--- a/src/extlib-abc/aig/aig/aigPart.c
++++ b/src/extlib-abc/aig/aig/aigPart.c
+@@ -869,6 +869,7 @@ Vec_Ptr_t * Aig_ManMiterPartitioned( Aig_Man_t * p1, Aig_Man_t * p2, int nPartSi
+   SeeAlso     []
+ 
+ ***********************************************************************/
++#if 0
+ Aig_Man_t * Aig_ManChoicePartitioned( Vec_Ptr_t * vAigs, int nPartSize )
+ {
+     extern int Cmd_CommandExecute( void * pAbc, char * sCommand );
+@@ -981,6 +982,7 @@ Aig_Man_t * Aig_ManChoicePartitioned( Vec_Ptr_t * vAigs, int nPartSize )
+     Aig_ManMarkValidChoices( pAig );
+     return pAig;
+ }
++#endif
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////
+diff --git a/src/extlib-abc/aig/aig/aigShow.c b/src/extlib-abc/aig/aig/aigShow.c
+index ae8fa8b..f04eedc 100644
+--- a/src/extlib-abc/aig/aig/aigShow.c
++++ b/src/extlib-abc/aig/aig/aigShow.c
+@@ -326,6 +326,7 @@ void Aig_WriteDotAig( Aig_Man_t * pMan, char * pFileName, int fHaig, Vec_Ptr_t *
+   SeeAlso     []
+ 
+ ***********************************************************************/
++#if 0
+ void Aig_ManShow( Aig_Man_t * pMan, int fHaig, Vec_Ptr_t * vBold )
+ {
+     extern void Abc_ShowFile( char * FileNameDot );
+@@ -347,7 +348,7 @@ void Aig_ManShow( Aig_Man_t * pMan, int fHaig, Vec_Ptr_t * vBold )
+     // visualize the file 
+     Abc_ShowFile( FileNameDot );
+ }
+-
++#endif
+ 
+ ////////////////////////////////////////////////////////////////////////
+ ///                       END OF FILE                                ///
+diff --git a/src/extlib-abc/aig/dar/darRefact.c b/src/extlib-abc/aig/dar/darRefact.c
+index d744b4f..23fc3d5 100644
+--- a/src/extlib-abc/aig/dar/darRefact.c
++++ b/src/extlib-abc/aig/dar/darRefact.c
+@@ -340,6 +340,7 @@ printf( "\n" );
+   SeeAlso     []
+ 
+ ***********************************************************************/
++#if 0
+ int Dar_ManRefactorTryCuts( Ref_Man_t * p, Aig_Obj_t * pObj, int nNodesSaved, int Required )
+ {
+     Vec_Ptr_t * vCut;
+@@ -428,6 +429,7 @@ int Dar_ManRefactorTryCuts( Ref_Man_t * p, Aig_Obj_t * pObj, int nNodesSaved, in
+     }
+     return p->GainBest;
+ }
++#endif
+ 
+ /**Function*************************************************************
+ 
+@@ -461,6 +463,7 @@ int Dar_ObjCutLevelAchieved( Vec_Ptr_t * vCut, int nLevelMin )
+   SeeAlso     []
+  
+ ***********************************************************************/
++#if 0
+ int Dar_ManRefactor( Aig_Man_t * pAig, Dar_RefPar_t * pPars )
+ {
+ //    Bar_Progress_t * pProgress;
+@@ -583,6 +586,7 @@ p->timeOther = p->timeTotal - p->timeCuts - p->timeEval;
+     return 1;
+ 
+ }
++#endif
+ 
+ ////////////////////////////////////////////////////////////////////////
+ ///                       END OF FILE                                ///
+diff --git a/src/extlib-abc/aig/dar/darScript.c b/src/extlib-abc/aig/dar/darScript.c
+index e60df00..1b9c24f 100644
+--- a/src/extlib-abc/aig/dar/darScript.c
++++ b/src/extlib-abc/aig/dar/darScript.c
+@@ -64,6 +64,7 @@ Aig_Man_t * Dar_ManRewriteDefault( Aig_Man_t * pAig )
+   SeeAlso     []
+ 
+ ***********************************************************************/
++#if 0
+ Aig_Man_t * Dar_ManRwsat( Aig_Man_t * pAig, int fBalance, int fVerbose )
+ //alias rwsat       "st; rw -l; b -l; rw -l; rf -l"
+ {
+@@ -108,7 +109,7 @@ Aig_Man_t * Dar_ManRwsat( Aig_Man_t * pAig, int fBalance, int fVerbose )
+ 
+     return pAig;
+ }
+-
++#endif
+ 
+ /**Function*************************************************************
+ 
+@@ -121,6 +122,7 @@ Aig_Man_t * Dar_ManRwsat( Aig_Man_t * pAig, int fBalance, int fVerbose )
+   SeeAlso     []
+ 
+ ***********************************************************************/
++#if 0
+ Aig_Man_t * Dar_ManCompress( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, int fVerbose )
+ //alias compress2   "b -l; rw -l; rwz -l; b -l; rwz -l; b -l"
+ {
+@@ -180,6 +182,7 @@ Aig_Man_t * Dar_ManCompress( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, i
+ 
+     return pAig;
+ }
++#endif
+ 
+ /**Function*************************************************************
+ 
+@@ -192,6 +195,7 @@ Aig_Man_t * Dar_ManCompress( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, i
+   SeeAlso     []
+ 
+ ***********************************************************************/
++#if 0
+ Aig_Man_t * Dar_ManCompress2( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, int fVerbose )
+ //alias compress2   "b -l; rw -l; rf -l; b -l; rw -l; rwz -l; b -l; rfz -l; rwz -l; b -l"
+ {
+@@ -285,6 +289,7 @@ Aig_Man_t * Dar_ManCompress2( Aig_Man_t * pAig, int fBalance, int fUpdateLevel,
+     }
+     return pAig;
+ }
++#endif
+ 
+ /**Function*************************************************************
+ 
+@@ -297,6 +302,7 @@ Aig_Man_t * Dar_ManCompress2( Aig_Man_t * pAig, int fBalance, int fUpdateLevel,
+   SeeAlso     []
+ 
+ ***********************************************************************/
++#if 0
+ Vec_Ptr_t * Dar_ManChoiceSynthesis( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, int fVerbose )
+ //alias resyn    "b; rw; rwz; b; rwz; b"
+ //alias resyn2   "b; rw; rf; b; rw; rwz; b; rfz; rwz; b"
+@@ -311,6 +317,7 @@ Vec_Ptr_t * Dar_ManChoiceSynthesis( Aig_Man_t * pAig, int fBalance, int fUpdateL
+     Vec_PtrPush( vAigs, pAig );
+     return vAigs;
+ }
++#endif
+ 
+ /**Function*************************************************************
+ 
+diff --git a/src/extlib-abc/aig/kit/kitAig.c b/src/extlib-abc/aig/kit/kitAig.c
+index de301f2..7e5df0f 100644
+--- a/src/extlib-abc/aig/kit/kitAig.c
++++ b/src/extlib-abc/aig/kit/kitAig.c
+@@ -95,6 +95,7 @@ Aig_Obj_t * Kit_GraphToAig( Aig_Man_t * pMan, Aig_Obj_t ** pFanins, Kit_Graph_t
+   SeeAlso     []
+ 
+ ***********************************************************************/
++#if 0
+ Aig_Obj_t * Kit_TruthToAig( Aig_Man_t * pMan, Aig_Obj_t ** pFanins, unsigned * pTruth, int nVars, Vec_Int_t * vMemory )
+ {
+     Aig_Obj_t * pObj;
+@@ -113,6 +114,7 @@ Aig_Obj_t * Kit_TruthToAig( Aig_Man_t * pMan, Aig_Obj_t ** pFanins, unsigned * p
+     Kit_GraphFree( pGraph );
+     return pObj;
+ }
++#endif
+ 
+ ////////////////////////////////////////////////////////////////////////
+ ///                       END OF FILE                                ///
+diff --git a/src/extlib-abc/aig/kit/kitGraph.c b/src/extlib-abc/aig/kit/kitGraph.c
+index 39ef587..0485c66 100644
+--- a/src/extlib-abc/aig/kit/kitGraph.c
++++ b/src/extlib-abc/aig/kit/kitGraph.c
+@@ -349,6 +349,7 @@ unsigned Kit_GraphToTruth( Kit_Graph_t * pGraph )
+   SeeAlso     []
+ 
+ ***********************************************************************/
++#if 0
+ Kit_Graph_t * Kit_TruthToGraph( unsigned * pTruth, int nVars, Vec_Int_t * vMemory )
+ {
+     Kit_Graph_t * pGraph;
+@@ -365,6 +366,7 @@ Kit_Graph_t * Kit_TruthToGraph( unsigned * pTruth, int nVars, Vec_Int_t * vMemor
+     pGraph = Kit_SopFactor( vMemory, RetValue, nVars, vMemory );
+     return pGraph;
+ }
++#endif
+ 
+ /**Function*************************************************************
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69d0f47f460..e4edb661c2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8711,6 +8711,8 @@ let
 
   stalonetray = callPackage ../applications/window-managers/stalonetray {};
 
+  stp = callPackage ../applications/science/logic/stp {};
+
   stumpwm = lispPackages.stumpwm;
 
   sublime = callPackage ../applications/editors/sublime { };
-- 
GitLab


From 66db1b3a646e73e15458da4ff98347d424454b88 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sat, 27 Oct 2012 23:11:54 +0200
Subject: [PATCH 0461/3789] nixos: Add a dictd service.

---
 nixos/modules/module-list.nix         |  1 +
 nixos/modules/services/misc/dictd.nix | 61 +++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 nixos/modules/services/misc/dictd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 442edd8029d..aa4bada8b28 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -116,6 +116,7 @@
   ./services/mail/spamassassin.nix
   ./services/misc/autofs.nix
   ./services/misc/cgminer.nix
+  ./services/misc/dictd.nix
   ./services/misc/disnix.nix
   ./services/misc/felix.nix
   ./services/misc/folding-at-home.nix
diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix
new file mode 100644
index 00000000000..b84fbb3e128
--- /dev/null
+++ b/nixos/modules/services/misc/dictd.nix
@@ -0,0 +1,61 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.dictd = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the DICT.org dictionary server.
+        '';
+      };
+
+      DBs = mkOption {
+        default = [];
+        # example = [ pkgs.dictDBs.nld2eng ];
+        description = ''List of databases to make available.'';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = let dictdb = pkgs.dictDBCollector { dictlist = map (x: {
+               name = x.name;
+               filename = x; } ) config.services.dictd.DBs; };
+  in mkIf config.services.dictd.enable {
+
+    # get the command line client on system path to make some use of the service
+    environment.systemPackages = [ pkgs.dict ];
+
+    users.extraUsers = singleton
+      { name = "dictd";
+        group = "dictd";
+        description = "DICT.org dictd server";
+        home = "${dictdb}/share/dictd";
+      };
+
+    users.extraGroups = singleton
+      { name = "dictd";
+      };
+
+    jobs.dictd =
+      { description = "DICT.org Dictionary Server";
+        startOn = "startup";
+        environment = { LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; };
+        daemonType = "fork";
+        exec = "${pkgs.dict}/sbin/dictd -s -c ${dictdb}/share/dictd/dictd.conf --locale en_US.UTF-8";
+      };
+  };
+
+}
-- 
GitLab


From fb4ff01e1a7ae20223e18413b93da451ecef652f Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Wed, 1 Jan 2014 20:10:04 +0100
Subject: [PATCH 0462/3789] perl-Devel-SizeMe: A module for dumping heap use
 and structure.

---
 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 1a94eb562d4..46ebabcbc4e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2170,6 +2170,20 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ IOCaptureOutput ];
   };
 
+  DevelSizeMe = buildPerlPackage {
+    name = "Devel-SizeMe-0.19";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TI/TIMB/Devel-SizeMe-0.19.tar.gz;
+      sha256 = "546e31ba83c0bf7cef37b38a462860461850473479d7d4ac6c0dadfb78d54717";
+    };
+    propagatedBuildInputs = [ DBDSQLite DBI DataDumperConcise HTMLParser JSONXS Moo ];
+    meta = {
+      homepage = https://github.com/timbunce/devel-sizeme;
+      description = "Unknown";
+      license = "perl";
+    };
+  };
+
   DBDSQLite = import ../development/perl-modules/DBD-SQLite {
     inherit stdenv fetchurl buildPerlPackage DBI;
     inherit (pkgs) sqlite;
-- 
GitLab


From 853eaaa69ced11c79cdc2cadb7258d29fba8fb77 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sun, 12 Jan 2014 13:22:13 +0100
Subject: [PATCH 0463/3789] perl-Mojolicious: A real-time web framework.

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 46ebabcbc4e..9e609af514b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5294,6 +5294,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  Mojolicious = buildPerlPackage {
+    name = "Mojolicious-4.63";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-4.63.tar.gz;
+      sha256 = "f20f77e86fc560dac1c958e765ed64242dcf6343939ed605b45f2bbe2596d5e9";
+    };
+    meta = {
+      homepage = http://mojolicio.us;
+      description = "Real-time web framework";
+      license = "artistic_2";
+    };
+  };
+
   Moo = buildPerlPackage {
     name = "Moo-1.000007";
     src = fetchurl {
-- 
GitLab


From 031c229cc04c7f6d8f83c33dbf75ff7be706bf07 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Fri, 16 Aug 2013 16:58:15 +0200
Subject: [PATCH 0464/3789] haskell: Add an atto-lisp package.

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

diff --git a/pkgs/development/libraries/haskell/atto-lisp/default.nix b/pkgs/development/libraries/haskell/atto-lisp/default.nix
new file mode 100644
index 00000000000..f7a8edcc3c5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/atto-lisp/default.nix
@@ -0,0 +1,17 @@
+{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, text }:
+
+cabal.mkDerivation (self: {
+  pname = "atto-lisp";
+  version = "0.2.1.1";
+  sha256 = "089chx4g880fbs7gh1mcvfx2xgbqdi1dxdjax6vbw8xiqgw4pzac";
+  jailbreak = true;
+  buildDepends = [
+    attoparsec blazeBuilder blazeTextual deepseq text
+  ];
+  meta = {
+    homepage = "http://github.com/nominolo/atto-lisp";
+    description = "Efficient parsing and serialisation of S-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 a944892f7c1..081caf41d2a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -580,6 +580,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   attempt = callPackage ../development/libraries/haskell/attempt {};
 
+  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_1_0 = callPackage ../development/libraries/haskell/attoparsec/0.11.1.0.nix {};
   attoparsec = self.attoparsec_0_10_4_0;
-- 
GitLab


From 4230c95d5682629291ff090f16a53ccea6af85e3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:48:29 +0100
Subject: [PATCH 0465/3789] Re-generate some Haskell expressions with
 cabal2nix.

---
 pkgs/development/libraries/haskell/atto-lisp/default.nix        | 2 +-
 .../libraries/haskell/bytestring-progress/default.nix           | 2 +-
 pkgs/development/libraries/haskell/haskell-names/default.nix    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/atto-lisp/default.nix b/pkgs/development/libraries/haskell/atto-lisp/default.nix
index f7a8edcc3c5..b1873567691 100644
--- a/pkgs/development/libraries/haskell/atto-lisp/default.nix
+++ b/pkgs/development/libraries/haskell/atto-lisp/default.nix
@@ -4,10 +4,10 @@ cabal.mkDerivation (self: {
   pname = "atto-lisp";
   version = "0.2.1.1";
   sha256 = "089chx4g880fbs7gh1mcvfx2xgbqdi1dxdjax6vbw8xiqgw4pzac";
-  jailbreak = true;
   buildDepends = [
     attoparsec blazeBuilder blazeTextual deepseq text
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/nominolo/atto-lisp";
     description = "Efficient parsing and serialisation of S-Expressions";
diff --git a/pkgs/development/libraries/haskell/bytestring-progress/default.nix b/pkgs/development/libraries/haskell/bytestring-progress/default.nix
index f943f4cd729..e9bb268b9fc 100644
--- a/pkgs/development/libraries/haskell/bytestring-progress/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-progress/default.nix
@@ -5,7 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.0.3";
   sha256 = "1v9cl7d4fcchbdrpbgjj4ilg79cj241vzijiifdsgkq30ikv2yxs";
   buildDepends = [ terminalProgressBar time ];
-  noHaddock = true; # fails to build with a parse error
+  noHaddock = true;
   meta = {
     homepage = "http://github.com/acw/bytestring-progress";
     description = "A library for tracking the consumption of a lazy ByteString";
diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix
index c67f4ccb402..4d5e8388ea2 100644
--- a/pkgs/development/libraries/haskell/haskell-names/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-names/default.nix
@@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
     hseCpp mtl prettyShow tagged tasty tastyGolden traverseWithClass
     uniplate utf8String
   ];
+  doCheck = false;
   meta = {
     homepage = "http://documentup.com/haskell-suite/haskell-names";
     description = "Name resolution library for Haskell";
@@ -25,5 +26,4 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
-  doCheck = false;
 })
-- 
GitLab


From dd409f09d6b114a74c92221427574362d6098b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 25 Jan 2014 17:05:33 +0100
Subject: [PATCH 0466/3789] add ibus

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

diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/development/libraries/ibus/default.nix
new file mode 100644
index 00000000000..6200196d403
--- /dev/null
+++ b/pkgs/development/libraries/ibus/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, makeWrapper, python, glib, intltool, pkgconfig
+, gnome3, dbus, libnotify, isocodes, gobjectIntrospection, wayland }:
+
+stdenv.mkDerivation rec {
+  name = "ibus-${version}";
+  version = "1.5.5";
+
+  src = fetchurl {
+    url = "http://ibus.googlecode.com/files/${name}.tar.gz";
+    sha256 = "1v4a9xv2k26g6ggk4282ynfvh68j2r5hg1cdpvnryfa8c2pkdaq2";
+  };
+
+  configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library";
+
+  buildInputs = [
+    makeWrapper python glib wayland
+    intltool pkgconfig gnome3.gtk2
+    gnome3.gtk3 dbus gnome3.dconf gnome3.gconf
+    libnotify isocodes gobjectIntrospection
+  ];
+
+  preBuild = "patchShebangs ./scripts";
+
+  postInstall  = ''
+    #${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
+    
+    for f in "$out"/bin/*; do
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share"
+    done
+  '';
+
+  meta = {
+    homepage = https://code.google.com/p/ibus/;
+    description = "Intelligent Input Bus for Linux / Unix OS";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4edb661c2b..a36bb3f1295 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3563,6 +3563,8 @@ let
 
   hyenae = callPackage ../tools/networking/hyenae { };
 
+  ibus = callPackage ../development/libraries/ibus { };
+
   iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils {
     inherit (perlPackages) XMLSimple;
   };
-- 
GitLab


From 3ee043da54292305a10c869a56606f5e44663556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sat, 25 Jan 2014 17:54:28 +0100
Subject: [PATCH 0467/3789] pianobooster: patch to build with gcc4.7, wrap it
 so it finds libGL.so.1

Also add linux as a platform.

Patches from:
https://github.com/gbin/gbin-overlay/tree/master/media-sound/pianobooster
---
 .../audio/pianobooster/default.nix            | 15 ++++++-
 .../pianobooster-0.6.4b-cmake-gcc4.7.patch    | 11 +++++
 .../pianobooster-0.6.4b-cmake.patch           | 44 +++++++++++++++++++
 3 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch
 create mode 100644 pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch

diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix
index d5cdffbed95..67848cdc804 100644
--- a/pkgs/applications/audio/pianobooster/default.nix
+++ b/pkgs/applications/audio/pianobooster/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, cmake, qt4 }:
+{ stdenv, fetchurl, alsaLib, cmake, mesa, makeWrapper, qt4 }:
 
 stdenv.mkDerivation  rec {
   name = "pianobooster-${version}";
@@ -9,14 +9,25 @@ stdenv.mkDerivation  rec {
     sha256 = "1xwyap0288xcl0ihjv52vv4ijsjl0yq67scc509aia4plmlm6l35";
   };
 
+  patches = [
+    ./pianobooster-0.6.4b-cmake.patch
+    ./pianobooster-0.6.4b-cmake-gcc4.7.patch
+  ];
+
   preConfigure = "cd src";
 
-  buildInputs = [ alsaLib cmake qt4 ];
+  buildInputs = [ alsaLib cmake makeWrapper mesa qt4 ];
+
+  postInstall = ''
+    wrapProgram $out/bin/pianobooster \
+      --prefix LD_LIBRARY_PATH : ${mesa}/lib
+  '';
 
   meta = with stdenv.lib; {
     description = "A MIDI file player that teaches you how to play the piano";
     homepage = http://pianobooster.sourceforge.net;
     license = licenses.gpl3;
+    platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu ];
   };
 }
diff --git a/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch b/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch
new file mode 100644
index 00000000000..2b1b28c5a84
--- /dev/null
+++ b/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch
@@ -0,0 +1,11 @@
+--- pianobooster-src-0.6.4b/src/CMakeLists.txt.orig	2013-04-06 10:48:02.469532914 -0700
++++ pianobooster-src-0.6.4b/src/CMakeLists.txt	2013-04-06 10:48:12.989532445 -0700
+@@ -203,8 +203,6 @@
+         ${PIANOBOOSTER_UI_HDRS} )
+ ENDIF(WIN32)
+ 
+-SET_TARGET_PROPERTIES(pianobooster PROPERTIES LINK_FLAGS "-mwindows")
+-
+ IF (USE_PCH)
+ ADD_PRECOMPILED_HEADER( pianobooster ${CMAKE_CURRENT_SOURCE_DIR}/precompile/precompile.h )
+ ENDIF (USE_PCH)
diff --git a/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch b/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch
new file mode 100644
index 00000000000..8cdd8738e2b
--- /dev/null
+++ b/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch
@@ -0,0 +1,44 @@
+--- pianobooster-src-0.6.4b/src/CMakeLists.txt.orig
++++ pianobooster-src-0.6.4b/src/CMakeLists.txt
+@@ -2,12 +2,6 @@
+ # for the debug build type cmake -DCMAKE_BUILD_TYPE=Debug
+ SET(CMAKE_BUILD_TYPE Release)
+ SET(CMAKE_VERBOSE_MAKEFILE OFF)
+-SET(USE_FLUIDSYNTH OFF)
+-
+-# The inplace directory is mainly for windows builds
+-# SET(FLUIDSYNTH_INPLACE_DIR C:/download/misc/ljb/fluidsynth-1.0.9)
+-SET(FLUIDSYNTH_INPLACE_DIR /home/louis/build/fluidsynth-1.0.9)
+-
+ 
+ # Testing precompiled headers  it does not work -- leave as OFF.
+ SET(USE_PCH OFF)
+@@ -78,18 +72,7 @@
+     ADD_DEFINITIONS(-DPB_USE_FLUIDSYNTH)
+     MESSAGE("Building using fluidsynth")
+     SET( PB_BASE_SRCS MidiDeviceFluidSynth.cpp )
+-
+-    IF(FLUIDSYNTH_INPLACE_DIR)
+-        INCLUDE_DIRECTORIES(${FLUIDSYNTH_INPLACE_DIR}/include/)
+-        IF(WIN32)
+-            LINK_LIBRARIES( ${FLUIDSYNTH_INPLACE_DIR}/src/.libs/libfluidsynth.dll.a)
+-        ENDIF(WIN32)
+-        IF(UNIX)
+-            LINK_LIBRARIES(${FLUIDSYNTH_INPLACE_DIR}/src/.libs/libfluidsynth.so)
+-        ENDIF(UNIX)
+-    ELSEIF(FLUIDSYNTH_INPLACE_DIR)
+-        LINK_LIBRARIES( fluidsynth)
+-    ENDIF(FLUIDSYNTH_INPLACE_DIR)
++	LINK_LIBRARIES(fluidsynth)
+ ENDIF(USE_FLUIDSYNTH)
+ 
+ 
+@@ -214,8 +197,6 @@
+ INSTALL(TARGETS pianobooster RUNTIME DESTINATION bin)
+ #INSTALL( index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en  SUBDIR kmidimon )
+ 
+-INSTALL( FILES ../README.txt  DESTINATION share/doc/pianobooster )
+-
+ INSTALL ( FILES images/pianobooster.png DESTINATION share/pixmaps )
+ 
+ 
-- 
GitLab


From 2953c39409cfebc6d71d07ebd362db424227baec Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sat, 25 Jan 2014 17:49:00 +0100
Subject: [PATCH 0468/3789] photivo: Update.

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

diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
index 257ee681db6..6e46188a3d0 100644
--- a/pkgs/applications/graphics/photivo/default.nix
+++ b/pkgs/applications/graphics/photivo/default.nix
@@ -2,12 +2,12 @@
   lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }:
 
 stdenv.mkDerivation rec {
-  name = "photivo-2013-05-20";
+  name = "photivo-2014-01-25";
 
   src = fetchhg {
     url = "http://code.google.com/p/photivo/";
-    tag = "6256ff175312";
-    sha256 = "0pyvkijr7wwik21hdp1zwbbyqnhc07kf0m48ih1rws78fq3h86cc";
+    tag = "d687864489da";
+    sha256 = "0f6y18k7db2ci6xn664zcwm1g1k04sdv7gg1yd5jk41bndjb7z8h";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-- 
GitLab


From cf7ee0337760aaee4ce17be28e43f40335865993 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Mon, 22 Jul 2013 14:06:32 +0200
Subject: [PATCH 0469/3789] photivo: Fix paths.

---
 pkgs/applications/graphics/photivo/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
index 6e46188a3d0..7c9ff32ec77 100644
--- a/pkgs/applications/graphics/photivo/default.nix
+++ b/pkgs/applications/graphics/photivo/default.nix
@@ -13,4 +13,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ];
+  patchPhase = '' # kinda icky
+    sed -e '/("@INSTALL@")/d' \
+        -e s,@INSTALL@,$out/share/photivo, \
+        -i Sources/ptSettings.cpp
+  '';
 }
-- 
GitLab


From f03ca20916cdff74a680bc181d1cc21f23a2ce31 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Jan 2014 18:27:53 +0100
Subject: [PATCH 0470/3789] libreoffice: Fix path to the JDK

---
 pkgs/applications/office/libreoffice/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index fd93bda4c96..67cbd7996ff 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -54,7 +54,7 @@ let
 
      buildInputs = [ libtool pkgconfig libxml2 ];
   };
-  
+
   # doesn't work with srcs versioning
   libmspub = stdenv.mkDerivation rec {
      version = "0.0.6";
@@ -66,8 +66,8 @@ let
      };
 
      configureFlags = "--disable-werror";
- 
-     buildInputs = [ zlib libwpd libwpg pkgconfig boost icu ];  
+
+     buildInputs = [ zlib libwpd libwpg pkgconfig boost icu ];
   };
 
   # doesn't exist in srcs
@@ -82,7 +82,7 @@ let
 
      configureFlags = "--with-boost=${boost}";
 
-     buildInputs = [ boost mdds pkgconfig ];  
+     buildInputs = [ boost mdds pkgconfig ];
   };
 
   fetchThirdParty = {name, md5}: fetchurl {
@@ -224,7 +224,7 @@ stdenv.mkDerivation rec {
     "--disable-kde"
     "--disable-postgresql-sdbc"
     "--with-package-format=native"
-    "--with-jdk-home=${jdk}"
+    "--with-jdk-home=${jdk}/lib/openjdk"
     "--with-ant-home=${ant}/lib/ant"
     "--without-afms"
     "--without-fonts"
-- 
GitLab


From c17e6d696882c3e639ec9cf9e25a9abc48317088 Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Sat, 25 Jan 2014 13:46:48 -0500
Subject: [PATCH 0471/3789] Add #include <unisted.h> for sleep and usleep

---
 pkgs/os-specific/linux/alienfx/default.nix  |  3 ++-
 pkgs/os-specific/linux/alienfx/unistd.patch | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/alienfx/unistd.patch

diff --git a/pkgs/os-specific/linux/alienfx/default.nix b/pkgs/os-specific/linux/alienfx/default.nix
index 9924779d92a..93d77819e57 100644
--- a/pkgs/os-specific/linux/alienfx/default.nix
+++ b/pkgs/os-specific/linux/alienfx/default.nix
@@ -14,11 +14,12 @@ stdenv.mkDerivation {
     sha256 = "47501a3b4e08d39edee4cd829ae24259a7e740b9798db76b846fa872989f8fb1";
   };
 
-  patchPhase = ''
+  prePatch = ''
     substituteInPlace Makefile --replace /usr/ $out/
     substituteInPlace Makefile --replace "install -o root -g root" "install"
   '';
  
+  patches = [./unistd.patch];
   buildInputs = [ libusb1 ];
   makeFlags = "build";
   preInstall = ''
diff --git a/pkgs/os-specific/linux/alienfx/unistd.patch b/pkgs/os-specific/linux/alienfx/unistd.patch
new file mode 100644
index 00000000000..546a27892f0
--- /dev/null
+++ b/pkgs/os-specific/linux/alienfx/unistd.patch
@@ -0,0 +1,12 @@
+diff --git a/alienfx.cpp b/alienfx.cpp
+index 5981039..aea8992 100644
+--- a/alienfx.cpp
++++ b/alienfx.cpp
+@@ -13,6 +13,7 @@
+ #include <string.h>
+ #include <iostream>
+ #include <libusb-1.0/libusb.h>
++#include <unistd.h>
+ 
+ using namespace std;
+ 
-- 
GitLab


From 4a17e1be93155dfe697882bf1d34d97bef1f4c5d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 20:54:47 +0100
Subject: [PATCH 0472/3789] youtubeDL: update from 2014.01.20 to 2014.01.23.1

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 917b54130b3..1e8f9fd292d 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.01.20";
+  version = "2014.01.23.1";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1krqkq21pgzkfsw70b0fp7xpxsh1ipgr2bgkf1y30ckf9nkpp9ny";
+    sha256 = "07nzwjw3m63w53fk2chmv4dpq71h4k0kx02x6hzsb28bc89v06nr";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From 5fefec39442dfae2a63fb66f9db7c1197222f0d9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 20:55:01 +0100
Subject: [PATCH 0473/3789] pspp: update from 0.8.1 to 0.8.2

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

diff --git a/pkgs/applications/science/math/pssp/default.nix b/pkgs/applications/science/math/pssp/default.nix
index 587f41fe998..0a9e0e4735d 100644
--- a/pkgs/applications/science/math/pssp/default.nix
+++ b/pkgs/applications/science/math/pssp/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pspp-0.8.1";
+  name = "pspp-0.8.2";
 
   src = fetchurl {
     url = "mirror://gnu/pspp/${name}.tar.gz";
-    sha256 = "0qhxsdbwxd3cn1shc13wxvx2lg32lp4z6sz24kv3jz7p5xfi8j7x";
+    sha256 = "1w7h3dglgx0jlq1wb605b8pgfsk2vr1q2q2rj7bsajh9ihbcsixr";
   };
 
   buildInputs = [ libxml2 readline zlib perl cairo gtk gsl pkgconfig
-- 
GitLab


From f6e18d1d434596268880f7ee65af536ab24fdf5e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 20:55:12 +0100
Subject: [PATCH 0474/3789] popa3d: update from 1.0.2 to 1.0.3

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

diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix
index 25ac0d5f9e3..39ad4383c3d 100644
--- a/pkgs/servers/mail/popa3d/default.nix
+++ b/pkgs/servers/mail/popa3d/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "popa3d-1.0.2";
+  name = "popa3d-1.0.3";
 
   src = fetchurl {
     url = "http://www.openwall.com/popa3d/${name}.tar.gz";
-    sha256 = "0zvspgnlrx4jhhkb5b1p280nsf9d558jijgpvwfyvdp4q4v460z7";
+    sha256 = "1g48cd74sqhl496wmljhq44iyfpghaz363a1ip8nyhpjz7d57f03";
   };
 
   buildInputs = [ openssl ];
-- 
GitLab


From 58f1520726bcb1f23fc9e6e82545b9468e9a3290 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 20:55:24 +0100
Subject: [PATCH 0475/3789] lxc: update from 1.0.0.beta1 to 1.0.0.beta2

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

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 01fd04e2ad6..fd6bb9b0389 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "lxc-1.0.0.beta1";
+  name = "lxc-1.0.0.beta2";
 
   src = fetchurl {
     url = "http://github.com/lxc/lxc/archive/${name}.tar.gz";
-    sha256 = "1ee177c4d2ba5f9cb33c1b36f3c2160ca0b00c9fa527fc53a9c5868345306f03";
+    sha256 = "0w38kxpqrhrgzd057yk8xzi4lx2vzvjkn6iysnj9zibw1bzb5rbk";
   };
 
   buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ];
-- 
GitLab


From a8f8ac72a354235d8d185716c4ee49d65611fc45 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 20:57:17 +0100
Subject: [PATCH 0476/3789] apparmor: build with bison 2.x; version 3.x causes
 compiler errors

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a36bb3f1295..460cf40f0a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6373,6 +6373,7 @@ let
 
   apparmor = callPackage ../os-specific/linux/apparmor {
     inherit (perlPackages) LocaleGettext TermReadKey RpcXML;
+    bison = bison2;
   };
 
   atop = callPackage ../os-specific/linux/atop { };
-- 
GitLab


From b3fe70a5e8d241819a816f6da81fe87f47a7db31 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 20:59:31 +0100
Subject: [PATCH 0477/3789] popa3d: disown this package

---
 pkgs/servers/mail/popa3d/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix
index 39ad4383c3d..3dcfa3a22db 100644
--- a/pkgs/servers/mail/popa3d/default.nix
+++ b/pkgs/servers/mail/popa3d/default.nix
@@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.openwall.com/popa3d/";
-    description = "tiny POP3 daemon with security as the primary goal";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    description = "Tiny POP3 daemon with security as the primary goal";
   };
 }
-- 
GitLab


From c9b581b5d4b337051901de41d19a947fec1d8ae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 25 Jan 2014 20:41:20 +0100
Subject: [PATCH 0478/3789] wayland: update 1.3.0 -> 1.4.0

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

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index e9ad56bdbf1..58631e83217 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }:
 
-let version = "1.3.0"; in
+let version = "1.4.0"; in
 
 stdenv.mkDerivation rec {
   name = "wayland-${version}";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "0vhd8z74r4zmm7hrbb8l450sb6slqkdrvmk4k78sq9lays2pd09f";
+    sha256 = "0n2sbh4xg8xkcjhyi3f4vwcv89krdriyfs0rzdibdj5l2ngkpwqq";
   };
 
   buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ];
-- 
GitLab


From ac07b3d37f430769f13bb6a2fa7203eec4c18d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 25 Jan 2014 20:51:04 +0100
Subject: [PATCH 0479/3789] gtk3: bugfix update 3.10.5 -> .6

---
 pkgs/development/libraries/gtk+/3.x.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index e3237f83b74..651ac0d303b 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -10,27 +10,27 @@ assert cupsSupport -> cups != null;
 
 let
   ver_maj = "3.10";
-  ver_min = "5"; # .6 needs currently unreleased wayland for introspection (wl_proxy_marshal_constructor)
+  ver_min = "6";
 in
 stdenv.mkDerivation rec {
   name = "gtk+-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/${name}.tar.xz";
-    sha256 = "1iyc566r61d3jfdiq5knwbssq5bsqsn8hqzdm30vmw6dx3cgd49i";
+    sha256 = "12i6n2vijglqgc7z5migllhpygg65fqzfgrsknimwynbqmzwa91w";
   };
 
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
 
-  buildInputs = [ wayland libxkbcommon ];
+  buildInputs = [ libxkbcommon ];
   propagatedBuildInputs = with xlibs; with stdenv.lib;
     [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ]
-    ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor ]
+    ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ]
     ++ optional stdenv.isDarwin x11
-    ++ stdenv.lib.optional xineramaSupport libXinerama
-    ++ stdenv.lib.optionals cupsSupport [ cups ];
+    ++ optional xineramaSupport libXinerama
+    ++ optional cupsSupport cups;
 
   postInstall = "rm -rf $out/share/gtk-doc";
 
-- 
GitLab


From c1db67ea99037d6136f7394f6d265d2eec6c4a44 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 13 Jan 2014 22:47:17 +0100
Subject: [PATCH 0480/3789] harfbuzz: update from 0.9.24 to 0.9.25

I see no significant change in the changelog.

(cherry picked from commit 29a878d1be84b2a15a928de93090b9edb067ac95)
---
 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 4cee49bea51..c69a96795d2 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.24";
+  name = "harfbuzz-0.9.25";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "08i46xx92hvz2br2d9hdxjgi0g5jglwf5bdfsandxb0qlgc5vwpd";
+    sha256 = "1vkbdny880d60j3v6lvpc6p8fvj6cl7hma27h796qlk9lnbmjvnw";
   };
 
   configureFlags = [
-- 
GitLab


From f5f802bca36ce735e4755da93db941b07d2f34be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 23 Jan 2014 22:55:41 +0100
Subject: [PATCH 0481/3789] libusb1: name it libusbx, so it's more clear

(cherry picked from commit b187d0e1bdfec635d4e7a3e00abb86b823e3dc27)
---
 pkgs/development/libraries/libusb1/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index dfb8f1c54a1..3833e5bffa1 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -4,7 +4,7 @@ let
   version = "1.0.17";
 in
 stdenv.mkDerivation rec {
-  name = "libusb-${version}";
+  name = "libusbx-${version}"; # it's a fork of original libusb1; should be mostly compatible
 
   src = fetchurl {
     url = "mirror://sourceforge/libusbx/libusbx-${version}.tar.bz2";
-- 
GitLab


From e2a858379d194c63a8acdd700bfad6faa1e541ea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:41 +0100
Subject: [PATCH 0482/3789] haskell-git-annex: update to version 5.20140116

---
 .../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 28b64c118ba..cd25bbfdc6f 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
@@ -14,8 +14,8 @@
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140108";
-  sha256 = "17j1avmg66lda52p93689n4mas46rfbjdvss1rvmdh10cj7hg8jy";
+  version = "5.20140116";
+  sha256 = "18l9nflmnfaqmrq9nvypv2jwn3v2461lb4m0jjpai6aipzl91jw2";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From ea288d47bd3dbbee3932e6555e1354c053a9611a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:41 +0100
Subject: [PATCH 0483/3789] haskell-Elm: update to version 0.11

---
 pkgs/development/compilers/elm/elm.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix
index 0f3c4d2ef64..00c5e2907c6 100644
--- a/pkgs/development/compilers/elm/elm.nix
+++ b/pkgs/development/compilers/elm/elm.nix
@@ -1,12 +1,14 @@
 { cabal, aeson, aesonPretty, binary, blazeHtml, blazeMarkup
-, cmdargs, filepath, HTF, indents, languageEcmascript, mtl, pandoc
-, parsec, text, transformers, unionFind, unorderedContainers
+, cmdargs, filemanip, filepath, HUnit, indents, languageEcmascript
+, mtl, pandoc, parsec, QuickCheck, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2, text, transformers
+, unionFind, unorderedContainers
 }:
 
 cabal.mkDerivation (self: {
   pname = "Elm";
-  version = "0.10.1";
-  sha256 = "1y533vanhrxc14x304ig6q8ch6zih8yqgpfgw4h5vk5fpdmn09a2";
+  version = "0.11";
+  sha256 = "1rg1dbd2ag63in6069p6v88h1yx0snap2gdhz81lk9l66qns3f4s";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -14,7 +16,12 @@ cabal.mkDerivation (self: {
     indents languageEcmascript mtl pandoc parsec text transformers
     unionFind unorderedContainers
   ];
-  testDepends = [ HTF ];
+  testDepends = [
+    aeson binary blazeHtml blazeMarkup cmdargs filemanip filepath HUnit
+    indents languageEcmascript mtl pandoc parsec QuickCheck
+    testFramework testFrameworkHunit testFrameworkQuickcheck2 text
+    transformers unionFind unorderedContainers
+  ];
   doCheck = false;
   meta = {
     homepage = "http://elm-lang.org";
-- 
GitLab


From 2e648757a8f7a3371858b07f6b8de2ced35d394e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:41 +0100
Subject: [PATCH 0484/3789] haskell-Chart-cairo: update to version 1.2

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

diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
index e28ff279083..3b9e6fb4e33 100644
--- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart-cairo";
-  version = "1.1";
-  sha256 = "0pm8iwd83pn5ba0g3231zs7f39cdjr7n7k76cm642n4b0hf93fmb";
+  version = "1.2";
+  sha256 = "08aaf7yb2vry75g15md2012rnmyfrn7awwvba7c38d4h6vm95llg";
   buildDepends = [
     cairo Chart colour dataDefaultClass lens mtl operational time
   ];
-- 
GitLab


From 20929da52cb41b7d2ca0b58ea4f0cf986f991b4a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:41 +0100
Subject: [PATCH 0485/3789] haskell-Chart-gtk: update to version 1.2

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

diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
index 0c2534c4c3b..a2e695a891d 100644
--- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart-gtk";
-  version = "1.1";
-  sha256 = "1394h7jd8pk55396nz1xjisz4v7brqcf9fwdnw9g4q3x1b7dcgs8";
+  version = "1.2";
+  sha256 = "0qq72cf1m2gvcksa1jj5g9qi6b47pmpzh3grhs7kh3m7qyq0a56g";
   buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ];
   meta = {
     homepage = "https://github.com/timbod7/haskell-chart/wiki";
-- 
GitLab


From 0cfd7ed72310c018ef1e019f11b0e95b002d666c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:41 +0100
Subject: [PATCH 0486/3789] haskell-Chart: update to version 1.2

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

diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix
index 50459dfa007..3b08c2d0e2c 100644
--- a/pkgs/development/libraries/haskell/Chart/default.nix
+++ b/pkgs/development/libraries/haskell/Chart/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart";
-  version = "1.1";
-  sha256 = "136s44mbhf3wmg85rr9qr0kv59lq1lfd3l58a5aijpv9vz1isf7p";
+  version = "1.2";
+  sha256 = "0cvp2j2hgsdk93f4rbd8y7s11hlr3zg15qkpxhd7p7sl2k6j2r5x";
   buildDepends = [
     colour dataDefaultClass lens mtl operational time
   ];
-- 
GitLab


From 0a193cc5e13ded927df9cf5d97aad0ac326480ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:41 +0100
Subject: [PATCH 0487/3789] haskell-HTF: update to version 0.11.1.0

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

diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix
index 7abdc9b4730..ddcb8c0e371 100644
--- a/pkgs/development/libraries/haskell/HTF/default.nix
+++ b/pkgs/development/libraries/haskell/HTF/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HTF";
-  version = "0.11.0.1";
-  sha256 = "0c4z76rsmdck60p7p2ypxx0d0r7k2vcb9viqp2yalyxzaaj7a9f5";
+  version = "0.11.1.0";
+  sha256 = "0prijzy852fkr8z58rhba6jvrb27b6lyz2jdgqb7r1jrnkhqmhpq";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 6e0de1670926ec199da633e95635ede4361b465c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:41 +0100
Subject: [PATCH 0488/3789] haskell-JuicyPixels: update to version 3.1.3.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 d8d0ac69bad..9b34bc9672b 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.3";
-  sha256 = "1zyrdd8mhgj0lchsznyhqhxb48ql8fhfqi5qs54qaxan514w6x70";
+  version = "3.1.3.1";
+  sha256 = "03kbvm3y5di274gzz8sr24z9j27rdayx4kkbf5hfvl325ghidhx9";
   buildDepends = [
     binary deepseq mtl primitive transformers vector zlib
   ];
-- 
GitLab


From a1d67d59966bbcbc08d7383f55cf3380a3e42d10 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:41 +0100
Subject: [PATCH 0489/3789] haskell-atomic-primops: update to version 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 b542816f05b..9f1c2eedc66 100644
--- a/pkgs/development/libraries/haskell/atomic-primops/default.nix
+++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix
@@ -1,10 +1,10 @@
-{ cabal, bitsAtomic, Cabal, primitive }:
+{ cabal, Cabal, primitive }:
 
 cabal.mkDerivation (self: {
   pname = "atomic-primops";
-  version = "0.4";
-  sha256 = "01sg0yn25fs0z7dmrvhyp3amay9l028xs570xhy6vvplrji1mxf0";
-  buildDepends = [ bitsAtomic Cabal primitive ];
+  version = "0.5";
+  sha256 = "0pni44gi9sh4l3hxwh7bqadhh6nc7v8w869sv9n45vkxwhhwbk4i";
+  buildDepends = [ Cabal primitive ];
   meta = {
     homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
     description = "A safe approach to CAS and other atomic ops in Haskell";
-- 
GitLab


From 42dd05709cea2b58f4ddaf1056a5fcf2b5299a60 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:41 +0100
Subject: [PATCH 0490/3789] haskell-atto-lisp: update to version 0.2.1.2

---
 .../libraries/haskell/atto-lisp/default.nix           | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/atto-lisp/default.nix b/pkgs/development/libraries/haskell/atto-lisp/default.nix
index b1873567691..4f0bffa5020 100644
--- a/pkgs/development/libraries/haskell/atto-lisp/default.nix
+++ b/pkgs/development/libraries/haskell/atto-lisp/default.nix
@@ -1,12 +1,17 @@
-{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, text }:
+{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, HUnit
+, testFramework, testFrameworkHunit, text
+}:
 
 cabal.mkDerivation (self: {
   pname = "atto-lisp";
-  version = "0.2.1.1";
-  sha256 = "089chx4g880fbs7gh1mcvfx2xgbqdi1dxdjax6vbw8xiqgw4pzac";
+  version = "0.2.1.2";
+  sha256 = "0xl5b0gblab3v2sfaxvx3z96660r9xp1m2n3ri6aph3kldbpkfcg";
   buildDepends = [
     attoparsec blazeBuilder blazeTextual deepseq text
   ];
+  testDepends = [
+    attoparsec HUnit testFramework testFrameworkHunit text
+  ];
   jailbreak = true;
   meta = {
     homepage = "http://github.com/nominolo/atto-lisp";
-- 
GitLab


From 3c3c2c642cabf3bf7b58c84ad58a505ad4d34cc1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:41 +0100
Subject: [PATCH 0491/3789] haskell-blaze-html: update to version 0.7.0.0

---
 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 fd9d364fbb4..ee1b686493c 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.6.1.3";
-  sha256 = "0hjyi3iv2770wicgfjipa901vk7mwr8kknfqvj3v9kzcvb4lq5aq";
+  version = "0.7.0.0";
+  sha256 = "1k8mxq3hmf2s7qab67jz3yaan7wdc4mn5sa00rw5zk4mjh722w86";
   buildDepends = [ blazeBuilder blazeMarkup text ];
   testDepends = [
     blazeBuilder blazeMarkup HUnit QuickCheck testFramework
-- 
GitLab


From 2b039e3f2bf0f1c4cb402d12764dd5af7a34f71d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:41 +0100
Subject: [PATCH 0492/3789] haskell-blaze-markup: update to version 0.6.0.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 638a219cb83..904808b78c8 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.5.2.1";
-  sha256 = "1drq98q70jfbxsdf3b6n5ksr1pcy8h5cgjngg6h3kd6vww3vysdy";
+  version = "0.6.0.0";
+  sha256 = "1f54i570cqbyqkrsq4qd2bky88pdwg9lv84c6aaf2c21552dbvii";
   buildDepends = [ blazeBuilder text ];
   testDepends = [
     blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit
-- 
GitLab


From 2eb23f599b1366aaeaee0eaa94dd7b17bb74ac97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:42 +0100
Subject: [PATCH 0493/3789] haskell-cassava: update to version 0.3.0.1

---
 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 0d402206293..5127ca1c8e8 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.0";
-  sha256 = "0s297664if9zp2y441jihcrmdfgdicjgncyx0rpddlr789vkbs9s";
+  version = "0.3.0.1";
+  sha256 = "1lsbdhdz6hy6lfnhhp36mbjd9m0w8iv50sd9mj0dj9b4izgdav16";
   buildDepends = [
     attoparsec blazeBuilder deepseq text unorderedContainers vector
   ];
-- 
GitLab


From aeb987d68c24442e04be409d00b6034ff600b024 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:42 +0100
Subject: [PATCH 0494/3789] haskell-cipher-aes128: update to version 0.6.4

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

diff --git a/pkgs/development/libraries/haskell/cipher-aes128/default.nix b/pkgs/development/libraries/haskell/cipher-aes128/default.nix
index 8bb093eb0f8..6bae5a99808 100644
--- a/pkgs/development/libraries/haskell/cipher-aes128/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-aes128/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-aes128";
-  version = "0.6.2";
-  sha256 = "0rj56p8rcnvk95jc4fx4pxv25yk85vfad7v0znsgzp2hpw4h4ihb";
+  version = "0.6.4";
+  sha256 = "093zpw86wimniwmd73g3nnbfy530q52kynccssqf7jxafbsw75aa";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ cereal cryptoApi tagged ];
-- 
GitLab


From a1364bb9b1ef7b67d74693279c8f57be992cdfdc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:42 +0100
Subject: [PATCH 0495/3789] haskell-conduit: update to version 1.0.12

---
 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 98079115607..0557fd36236 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.0.11.1";
-  sha256 = "115iqdhwmnn04bmby2bmbm6pykb2akaca0c3i79nvw1annml65lg";
+  version = "1.0.12";
+  sha256 = "025h1nbplq7v1qp74bg647q36n3d56kin700ws7vm922xmvcrjjm";
   buildDepends = [
     liftedBase mmorph monadControl mtl resourcet text transformers
     transformersBase void
-- 
GitLab


From a8e1a6d4d89352e6cf5c7590114ac18bc9d6da15 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:42 +0100
Subject: [PATCH 0496/3789] haskell-digestive-functors-aeson: update to version
 1.1.4

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

diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
index 50ff8b005e4..02b7f35d382 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
@@ -1,13 +1,13 @@
-{ cabal, aeson, aesonLens, digestiveFunctors, HUnit, lens, mtl
+{ cabal, aeson, digestiveFunctors, HUnit, lens, lensAeson, mtl
 , safe, tasty, tastyHunit, text, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-aeson";
-  version = "1.1.3";
-  sha256 = "0194yd2b9irm1gmk3d8awrsrmsr4lml63wr4vm8a92s7w3hdy0db";
+  version = "1.1.4";
+  sha256 = "1rca25zycmz4al5izq8j7h3cggvb4844g3gj3a1686yy38k5rfvn";
   buildDepends = [
-    aeson aesonLens digestiveFunctors lens safe text vector
+    aeson digestiveFunctors lens lensAeson safe text vector
   ];
   testDepends = [
     aeson digestiveFunctors HUnit mtl tasty tastyHunit text
-- 
GitLab


From f00962f10bcb99318c5790572736a27b7e60ae21 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:42 +0100
Subject: [PATCH 0497/3789] haskell-digestive-functors-heist: update to version
 0.8.4.1

---
 .../libraries/haskell/digestive-functors-heist/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
index f979926a42a..418923c453b 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-heist";
-  version = "0.8.4.0";
-  sha256 = "15n8piiqys010in8xp5iszjqsa2ndgk52adqgk2h6q3m5q0jkdb3";
+  version = "0.8.4.1";
+  sha256 = "03bbz5q3asn1iid13xjiv5hdpj5bgr0h9wwp29bnysiw4vrgjax0";
   buildDepends = [
     blazeBuilder digestiveFunctors heist mtl text xmlhtml
   ];
-- 
GitLab


From 312624f22384065e7195949eef7981ca21b20a62 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:42 +0100
Subject: [PATCH 0498/3789] haskell-digestive-functors-snap: update to version
 0.6.1.0

---
 .../libraries/haskell/digestive-functors-snap/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
index 6b20ed6ae89..4c678da12b9 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-snap";
-  version = "0.6.0.1";
-  sha256 = "0y26fqhjb78mv6rzp3x6cbxrq4dqh2dzd81wd5sgsm079j5frjj7";
+  version = "0.6.1.0";
+  sha256 = "07xb8jr70j03kggk55p3zzp07y7amzm7f8hdzry4vff7yx41rxhr";
   buildDepends = [ digestiveFunctors filepath mtl snapCore text ];
   meta = {
     homepage = "http://github.com/jaspervdj/digestive-functors";
-- 
GitLab


From 1cf170a8067161cb878f88afdc0dd96bdc000800 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:42 +0100
Subject: [PATCH 0499/3789] haskell-digestive-functors: update to version
 0.7.0.0

---
 .../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 43f0c4337e7..4abea9429a5 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.6.2.0";
-  sha256 = "1d07ws5s34x9sviq7mfkl6fh1rl28r5x1rmgbkcxil5h6gxn5mi7";
+  version = "0.7.0.0";
+  sha256 = "1zn8vn6xcmp4w39b0k33bp7zsxvnn8g8p26mch4r8ng9ldcb2y8h";
   buildDepends = [ mtl text time ];
   testDepends = [
     HUnit mtl QuickCheck testFramework testFrameworkHunit
-- 
GitLab


From 855b5adf2dd26e60c4fdb7304368783a2fc0338a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:42 +0100
Subject: [PATCH 0500/3789] haskell-github: update to version 0.7.4

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

diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix
index 9db0055922d..0c1d0b3135d 100644
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ b/pkgs/development/libraries/haskell/github/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "github";
-  version = "0.7.3";
-  sha256 = "0cb7smydndigkcib4y8pbsycsqyzg45g5vrglyq1h245rd4j6s37";
+  version = "0.7.4";
+  sha256 = "1yalhixisjv1n9ihik3h6ya25f0066dd422nbpfysj9093hv3a5w";
   buildDepends = [
     aeson attoparsec caseInsensitive conduit dataDefault failure
     hashable HTTP httpConduit httpTypes network text time
-- 
GitLab


From ac1010b3ba63081282ae8c1bc9d6fe4a26f67f56 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:42 +0100
Subject: [PATCH 0501/3789] haskell-hakyll: update to version 4.4.3.2

---
 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 ace860bcd1c..7dfac7b23dc 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.4.3.1";
-  sha256 = "0k301mzy8sagrxdzkhz006j1i1zmsx9iy5ais9gif3gxj2sd3b2a";
+  version = "4.4.3.2";
+  sha256 = "1n597q4pbdka7g06524j0zvjcjpv7fgf6mga1a0kfr012sf9cqz9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -25,9 +25,6 @@ cabal.mkDerivation (self: {
     snapCore snapServer systemFilepath tagsoup testFramework
     testFrameworkHunit testFrameworkQuickcheck2 text time
   ];
-  patchPhase = ''
-    sed -i -e 's|pandoc-citeproc >=.*,|pandoc-citeproc,|' hakyll.cabal
-  '';
   doCheck = false;
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
-- 
GitLab


From c18cc5d6e893cdf975bbf801c930c8444de79eb7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:42 +0100
Subject: [PATCH 0502/3789] haskell-heist: update to version 0.13.0.6

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

diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix
index 9f0eb8981ae..718f2088ff2 100644
--- a/pkgs/development/libraries/haskell/heist/default.nix
+++ b/pkgs/development/libraries/haskell/heist/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "heist";
-  version = "0.13.0.5";
-  sha256 = "17lpqiidy1s6yzhh865y7dhkcv34p7pxzljpn64yyfa2pc8885dj";
+  version = "0.13.0.6";
+  sha256 = "1h34bmcb9bqkagcx3iqnp4l8z8qhngf00mki4hpk905znja6hib9";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
     filepath hashable MonadCatchIOTransformers mtl random text time
-- 
GitLab


From 6a540116e63ebfe0167db1185d5d342a505ce4f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:42 +0100
Subject: [PATCH 0503/3789] haskell-hit: update to version 0.5.2

---
 pkgs/development/libraries/haskell/hit/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix
index 9791478d3e8..fa74f1738b6 100644
--- a/pkgs/development/libraries/haskell/hit/default.nix
+++ b/pkgs/development/libraries/haskell/hit/default.nix
@@ -1,17 +1,17 @@
-{ cabal, attoparsec, blazeBuilder, bytedump, cryptohash, HUnit, mtl
-, parsec, QuickCheck, random, systemFileio, systemFilepath
+{ cabal, attoparsec, bytedump, cryptohash, HUnit, mtl, parsec
+, patience, QuickCheck, random, systemFileio, systemFilepath
 , testFramework, testFrameworkQuickcheck2, time, vector, zlib
 , zlibBindings
 }:
 
 cabal.mkDerivation (self: {
   pname = "hit";
-  version = "0.5.0";
-  sha256 = "05v49l3k8gwn922d5b5xrzdrakh6bw02bp8hd8yc8163jyazk2vx";
+  version = "0.5.2";
+  sha256 = "05f5xm23049ngvsch9cp2snyknk3qknx1jlb42zi0nbv8f1hymnn";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    attoparsec blazeBuilder cryptohash mtl parsec random systemFileio
+    attoparsec cryptohash mtl parsec patience random systemFileio
     systemFilepath time vector zlib zlibBindings
   ];
   testDepends = [
-- 
GitLab


From e7bc87c7d39e1fd032c5d4bdbf4427a68c3cb3d9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:42 +0100
Subject: [PATCH 0504/3789] haskell-hjsmin: update to version 0.1.4.5

---
 .../libraries/haskell/hjsmin/default.nix          | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix
index 008c1766b94..b060d3c6efe 100644
--- a/pkgs/development/libraries/haskell/hjsmin/default.nix
+++ b/pkgs/development/libraries/haskell/hjsmin/default.nix
@@ -1,12 +1,17 @@
-{ cabal, blazeBuilder, Cabal, HUnit, languageJavascript, QuickCheck
-, testFramework, testFrameworkHunit, text
+{ cabal, blazeBuilder, Cabal, HUnit, languageJavascript
+, optparseApplicative, QuickCheck, testFramework
+, testFrameworkHunit, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "hjsmin";
-  version = "0.1.4.4";
-  sha256 = "0hzh2xbv9x013s1lhmgapjd0qx8v7n09rjlfxd9b1h5min00k048";
-  buildDepends = [ blazeBuilder languageJavascript text ];
+  version = "0.1.4.5";
+  sha256 = "0lzqs20kyngbjc7wqq347b1caj0hbf29dvdpxghfpjbrgyvyqh74";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    blazeBuilder languageJavascript optparseApplicative text
+  ];
   testDepends = [
     blazeBuilder Cabal HUnit languageJavascript QuickCheck
     testFramework testFrameworkHunit text
-- 
GitLab


From 1e610c88226d66f3f86abcd879261fb9395a7c1d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:42 +0100
Subject: [PATCH 0505/3789] haskell-hoodle-builder: update to version 0.2.2.0

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

diff --git a/pkgs/development/libraries/haskell/hoodle-builder/default.nix b/pkgs/development/libraries/haskell/hoodle-builder/default.nix
index d865de6ec9c..2d7b60b6943 100644
--- a/pkgs/development/libraries/haskell/hoodle-builder/default.nix
+++ b/pkgs/development/libraries/haskell/hoodle-builder/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hoodle-builder";
-  version = "0.2.2";
-  sha256 = "0gagfpjihf6lafi90r883n9agaj1pw4gygaaxv4xxfsc270855bq";
+  version = "0.2.2.0";
+  sha256 = "0p123jpm39ggbjn1757nfygcgi324knin62cyggbq1hhhglkfxa2";
   buildDepends = [
     blazeBuilder doubleConversion hoodleTypes lens strict
   ];
-- 
GitLab


From 43e713b94ab5c7fed1564733274da70c3ad85fb3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:42 +0100
Subject: [PATCH 0506/3789] haskell-mmorph: update to version 1.0.2

---
 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 702aca476fd..b2c3212bb17 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.1";
-  sha256 = "15a4isvxb4my72hzndgfy66792r9fpkn9vnmr2fnv9d9vl058y14";
+  version = "1.0.2";
+  sha256 = "0d0nn5x7f3yyck10znqa13iihkshq04xgg1d9bn1nvl7kjzicjwh";
   buildDepends = [ transformers ];
   meta = {
     description = "Monad morphisms";
-- 
GitLab


From 4ba8a711a2f677d7c092b22f6392bdddd1b491fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:42 +0100
Subject: [PATCH 0507/3789] haskell-monadcryptorandom: update to version 0.6

---
 .../libraries/haskell/monadcryptorandom/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
index 60236eaad35..bd9261f901e 100644
--- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
+++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monadcryptorandom";
-  version = "0.5.3";
-  sha256 = "1nmkya9mf9y6lhmbhamq2g09pfvfpmicrwab09mcy3ggljdnnfyg";
+  version = "0.6";
+  sha256 = "0gms6xsnr6g5lk36z92yygwmyrl568y1h76ww676wb3qph42xx3x";
   buildDepends = [ cryptoApi mtl tagged transformers ];
   meta = {
     homepage = "https://github.com/TomMD/monadcryptorandom";
-- 
GitLab


From 20ef7553aa648d69b032bb06b98b85027233ae73 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:42 +0100
Subject: [PATCH 0508/3789] haskell-network-conduit: update to version 1.0.1.1

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

diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index c0b8b9dd89e..5dec259f5f5 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit";
-  version = "1.0.1";
-  sha256 = "1argxj87a5rzza061lvvfmix2vrlz62dskj4pwlsq0d22dg8y332";
+  version = "1.0.1.1";
+  sha256 = "1mji8zb0chnnxl7z4dgijls6szfa6c47zmhx0v1dc9k27bnc0mhx";
   buildDepends = [
     conduit liftedBase monadControl network transformers
   ];
-- 
GitLab


From 979c1bfe8934a8bb6791c62fdf9ade476176be00 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:43 +0100
Subject: [PATCH 0509/3789] haskell-stm-conduit: update to version 2.2.1

---
 .../libraries/haskell/stm-conduit/default.nix  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index 7e24db4476a..f05396f8a6d 100644
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -1,19 +1,19 @@
-{ cabal, async, conduit, HUnit, liftedAsync, liftedBase
-, monadControl, monadLoops, QuickCheck, resourcet, stm, stmChans
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, transformers
+{ cabal, async, cereal, cerealConduit, conduit, HUnit, liftedAsync
+, liftedBase, monadControl, monadLoops, QuickCheck, resourcet, stm
+, stmChans, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "stm-conduit";
-  version = "2.2";
-  sha256 = "14fz8izr8fxi3s78fhz4p5yfdkfcipcfpcj6dn5w0fkcd2hc2a66";
+  version = "2.2.1";
+  sha256 = "15ym83c42krx19rw719yqlib1vcg68jmx48rihy5aimc0m5m307b";
   buildDepends = [
-    async conduit liftedAsync liftedBase monadControl monadLoops
-    resourcet stm stmChans transformers
+    async cereal cerealConduit conduit liftedAsync liftedBase
+    monadControl monadLoops resourcet stm stmChans transformers
   ];
   testDepends = [
-    conduit HUnit QuickCheck stm stmChans testFramework
+    conduit HUnit QuickCheck resourcet stm stmChans testFramework
     testFrameworkHunit testFrameworkQuickcheck2 transformers
   ];
   meta = {
-- 
GitLab


From 5f2f85508a70ec37ac5591e0497c5371e2189e44 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:43 +0100
Subject: [PATCH 0510/3789] haskell-tagsoup: update to version 0.13.1

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

diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix
index 5dc83178be0..b51541d56f6 100644
--- a/pkgs/development/libraries/haskell/tagsoup/default.nix
+++ b/pkgs/development/libraries/haskell/tagsoup/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tagsoup";
-  version = "0.13";
-  sha256 = "1pfkcfrmhzxplfkdzb0zj24dfsddw91plqp3mg2gqkv82y8blzk1";
+  version = "0.13.1";
+  sha256 = "0p1mwyjk2bvpavjm1kgdjnahj0q4nhynix3653s0i0kvhw70450k";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ text ];
-- 
GitLab


From 7bef7e8535855adc81fc82a80be32b4afc5075df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:43 +0100
Subject: [PATCH 0511/3789] haskell-tasty-rerun: update to version 1.1.0

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

diff --git a/pkgs/development/libraries/haskell/tasty-rerun/default.nix b/pkgs/development/libraries/haskell/tasty-rerun/default.nix
index e932a7b9307..0b2623c5f67 100644
--- a/pkgs/development/libraries/haskell/tasty-rerun/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-rerun/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-rerun";
-  version = "1.0.0";
-  sha256 = "0vpgsb5fgvb9mx07zq53slqxxk2vvr2c9c9p1fhrm9qadfirsqc8";
+  version = "1.1.0";
+  sha256 = "0nizjmz9z41r1vzxzld760x6ga4lqycwfazhddk570w3x2dzm6p2";
   buildDepends = [
     mtl optparseApplicative reducers split stm tagged tasty
     transformers
-- 
GitLab


From 929bfebb1f7c2661ff10b7dc3ccb179ec927b2cf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:43 +0100
Subject: [PATCH 0512/3789] haskell-wai-extra: update to version 2.0.3.1

---
 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 78d80269254..451efd8a0a7 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.0.3";
-  sha256 = "18x5jcq4yl33ixl7rb79ncx107bw6y8dmw2gwcmxb93h5yiam7s5";
+  version = "2.0.3.1";
+  sha256 = "1ckn90j2zmh77mgpan28v315qipw5v0ji9k3lq1ni9kzjap7pl5a";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase
-- 
GitLab


From 336e599269ecc41ab300b3d4402ad2f610a5b93d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:43 +0100
Subject: [PATCH 0513/3789] haskell-websockets: update to version 0.8.1.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 fa623cf6004..82a745b8725 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.1.1";
-  sha256 = "0mgazf0s9sl53r5smidrfqcx7rq2v4kfm37f4f6mjrl656qxpbwd";
+  version = "0.8.1.2";
+  sha256 = "1xr44j3fcah3p5ic5s4rirb1ribq88m7ckmdfhwz5wy42sfiwv99";
   buildDepends = [
     attoparsec base64Bytestring binary blazeBuilder caseInsensitive
     entropy ioStreams mtl network random SHA text
-- 
GitLab


From 549f547358ec8137b4958cd7fa0feb54b3330c4c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:43 +0100
Subject: [PATCH 0514/3789] haskell-xmlgen: update to version 0.6.2.1

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

diff --git a/pkgs/development/libraries/haskell/xmlgen/default.nix b/pkgs/development/libraries/haskell/xmlgen/default.nix
index f45b7b4a6a0..6bc1a4b6f59 100644
--- a/pkgs/development/libraries/haskell/xmlgen/default.nix
+++ b/pkgs/development/libraries/haskell/xmlgen/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xmlgen";
-  version = "0.6.2.0";
-  sha256 = "0b6fyg6mlm068f2jjmil52az4hk144pryf1c0wr1gx6ddx9yzjy4";
+  version = "0.6.2.1";
+  sha256 = "1rmsg9wxs0bsj0xpagxrm3fmlqd63b0dfyc21rx9jj76g9za29wh";
   buildDepends = [ blazeBuilder mtl text ];
   testDepends = [ filepath HUnit hxt QuickCheck text ];
   meta = {
-- 
GitLab


From f5b46c33c1165e89ddba2d28ca28ae877e834064 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:43 +0100
Subject: [PATCH 0515/3789] haskell-xmlhtml: update to version 0.2.3.2

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

diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix
index 83dbdb07f21..659da9c8baa 100644
--- a/pkgs/development/libraries/haskell/xmlhtml/default.nix
+++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xmlhtml";
-  version = "0.2.3.1";
-  sha256 = "138nryn68f58cvg971qw7vw0kprsw5g39j3fmf0bz83sg4g98nmd";
+  version = "0.2.3.2";
+  sha256 = "1djw9d0hff9ii0n1bgbjjsca9n0w7mxj3ivf9dslyr3kv3yb4013";
   buildDepends = [
     blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers
   ];
-- 
GitLab


From e508c74a15de44c3a2f0a0173a0ea3bcbe7e1821 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:43 +0100
Subject: [PATCH 0516/3789] haskell-yesod-form: update to version 1.3.4.4

---
 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 35b55bde887..1fb2e487e7c 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.4.3";
-  sha256 = "1yf9kvnlkgfdpv44afj2zwdk8jh382lxj56jvafgw1bxa1hsn408";
+  version = "1.3.4.4";
+  sha256 = "0g5kxcb29qa7xq1s57bvl38fbrsm6jvmvw65nw14as0hbqlv67fh";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
     dataDefault emailValidate hamlet network persistent resourcet
-- 
GitLab


From 887ba81084aa714d0dd008e0b036f3aff7f1e4f6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 16:52:43 +0100
Subject: [PATCH 0517/3789] haskell-yesod-platform: update to version 1.2.6.1

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

diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix
index 0c9c31778ca..ee9fa20c8de 100644
--- a/pkgs/development/libraries/haskell/yesod-platform/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix
@@ -32,8 +32,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-platform";
-  version = "1.2.6";
-  sha256 = "15ixhxim14672hl9cl92sbi94yzv6g6zgg07jvkciixg0hd8xr6p";
+  version = "1.2.6.1";
+  sha256 = "1hwvpyxwirv9maangw4q6nb2m2kqpqvvh1i095fr08f1a1qih77f";
   buildDepends = [
     aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
     authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
-- 
GitLab


From 63482fc9b4db40385ae9f3c9eaf166509f24b152 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 18:52:13 +0100
Subject: [PATCH 0518/3789] haskell-blaze-html: jailbreak to fix test suite
 build

---
 pkgs/development/libraries/haskell/blaze-html/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index ee1b686493c..bec48f8e44f 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     blazeBuilder blazeMarkup HUnit QuickCheck testFramework
     testFrameworkHunit testFrameworkQuickcheck2 text
   ];
+  patchPhase = ''
+    sed -i -e 's|blaze-markup.*>=.*,|blaze-markup,|' blaze-html.cabal
+  '';
   meta = {
     homepage = "http://jaspervdj.be/blaze";
     description = "A blazingly fast HTML combinator library for Haskell";
-- 
GitLab


From 03f6a6989abe30a856f256364f7074049007125e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 19:03:32 +0100
Subject: [PATCH 0519/3789] haskell-blaze-svg: jailbreak to fix build with
 latest 'blaze-markup'

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

diff --git a/pkgs/development/libraries/haskell/blaze-svg/default.nix b/pkgs/development/libraries/haskell/blaze-svg/default.nix
index 7b3ec55dc57..b342b35dbe6 100644
--- a/pkgs/development/libraries/haskell/blaze-svg/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-svg/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.3.3.0";
   sha256 = "1wi4nc73ic3qmbx6v9fniacwcz2nlvmp5snn144fdiwb22klfn5f";
   buildDepends = [ blazeMarkup mtl ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/deepakjois/blaze-svg";
     description = "SVG combinator library";
-- 
GitLab


From 4cb0ec470f043d016144767e56cc4291200474bb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 20:44:18 +0100
Subject: [PATCH 0520/3789] haskell-highlighting-kate: jailbreak to fix build
 with latest 'blaze-html'

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

diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index f991bb58586..a2db6032675 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];
   prePatch = "sed -i -e 's|regex-pcre-builtin|regex-pcre|' highlighting-kate.cabal";
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/jgm/highlighting-kate";
     description = "Syntax highlighting";
-- 
GitLab


From 06627cbfc4bdd3e1998922f7802441306a95ec28 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 20:47:44 +0100
Subject: [PATCH 0521/3789] haskell-hledger-web: jailbreak to fix build with
 latest 'blaze-markup'

---
 pkgs/development/libraries/haskell/hledger-web/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index 21dc845b117..b547c8a6042 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -21,6 +21,9 @@ cabal.mkDerivation (self: {
   ];
   testDepends = [ hspec yesod yesodTest ];
   doCheck = false;
+  patchPhase = ''
+    sed -i -e 's|blaze-html.*0.7|blaze-html|' -e 's|blaze-markup.*0.7|blaze-markup|' hledger-web.cabal
+  '';
   meta = {
     homepage = "http://hledger.org";
     description = "A web interface for the hledger accounting tool";
-- 
GitLab


From 83c6cc32336b99c53095b9e16c062ea1bc2fb2f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 20:48:53 +0100
Subject: [PATCH 0522/3789] haskell-happstack-server: jailbreak to fix build
 with latest 'blaze-html'

---
 .../development/libraries/haskell/happstack/happstack-server.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index 88651c62b59..8b2bec395fc 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
   ];
   testDepends = [ HUnit parsec zlib ];
   doCheck = false;
+  jailbreak = true;
   meta = {
     homepage = "http://happstack.com";
     description = "Web related tools and services";
-- 
GitLab


From b845171dd6f781facfec1d1953a5c047819f1e0d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jan 2014 21:38:43 +0100
Subject: [PATCH 0523/3789] haskell-hakyll: jailbreak to fix build with latest
 'blaze-html' and 'pandoc-citeproc'

---
 pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 7dfac7b23dc..22ad997b32a 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -26,6 +26,10 @@ cabal.mkDerivation (self: {
     testFrameworkHunit testFrameworkQuickcheck2 text time
   ];
   doCheck = false;
+  patchPhase = ''
+    sed -i -e 's|blaze-markup.*,|blaze-markup,|' -e 's|blaze-html.*,|blaze-html,|' \
+      -e 's|pandoc-citeproc.*,|pandoc-citeproc,|' hakyll.cabal
+  '';
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";
-- 
GitLab


From 2f51348f4d90d945be461064e13819eecad54ed4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 26 Jan 2014 00:05:35 +0100
Subject: [PATCH 0524/3789] haskell-patience: add version 0.1.1

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

diff --git a/pkgs/development/libraries/haskell/patience/default.nix b/pkgs/development/libraries/haskell/patience/default.nix
new file mode 100644
index 00000000000..0f65e3eceed
--- /dev/null
+++ b/pkgs/development/libraries/haskell/patience/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "patience";
+  version = "0.1.1";
+  sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm";
+  meta = {
+    description = "Patience diff and longest increasing subsequence";
+    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 081caf41d2a..6115c4de684 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1769,6 +1769,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   pathPieces = callPackage ../development/libraries/haskell/path-pieces {};
 
+  patience = callPackage ../development/libraries/haskell/patience {};
+
   pandoc = callPackage ../development/libraries/haskell/pandoc {};
 
   pandocCiteproc = callPackage ../development/libraries/haskell/pandoc-citeproc {};
-- 
GitLab


From 88d4e92977bbf2c29a4eff75f3b68e816fadfc3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 25 Jan 2014 17:05:33 +0100
Subject: [PATCH 0525/3789] add ibus

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

diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/development/libraries/ibus/default.nix
new file mode 100644
index 00000000000..6200196d403
--- /dev/null
+++ b/pkgs/development/libraries/ibus/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, makeWrapper, python, glib, intltool, pkgconfig
+, gnome3, dbus, libnotify, isocodes, gobjectIntrospection, wayland }:
+
+stdenv.mkDerivation rec {
+  name = "ibus-${version}";
+  version = "1.5.5";
+
+  src = fetchurl {
+    url = "http://ibus.googlecode.com/files/${name}.tar.gz";
+    sha256 = "1v4a9xv2k26g6ggk4282ynfvh68j2r5hg1cdpvnryfa8c2pkdaq2";
+  };
+
+  configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library";
+
+  buildInputs = [
+    makeWrapper python glib wayland
+    intltool pkgconfig gnome3.gtk2
+    gnome3.gtk3 dbus gnome3.dconf gnome3.gconf
+    libnotify isocodes gobjectIntrospection
+  ];
+
+  preBuild = "patchShebangs ./scripts";
+
+  postInstall  = ''
+    #${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
+    
+    for f in "$out"/bin/*; do
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share"
+    done
+  '';
+
+  meta = {
+    homepage = https://code.google.com/p/ibus/;
+    description = "Intelligent Input Bus for Linux / Unix OS";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ee74ee90e1..61671607048 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3563,6 +3563,8 @@ let
 
   hyenae = callPackage ../tools/networking/hyenae { };
 
+  ibus = callPackage ../development/libraries/ibus { };
+
   iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils {
     inherit (perlPackages) XMLSimple;
   };
-- 
GitLab


From e505c8927d784bc3c1b1fd912dbd6020070e79d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 26 Jan 2014 00:15:05 +0100
Subject: [PATCH 0526/3789] upower: add gobject introspection

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

diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index cba4a510ff0..e9fa2b4adb1 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit
 , intltool, libxslt, docbook_xsl, udev, libusb1, pmutils
-, useSystemd ? true, systemd
+, useSystemd ? true, systemd, gobjectIntrospection
 }:
 
 assert stdenv.isLinux;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ]
+    [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ]
     ++ stdenv.lib.optional useSystemd systemd;
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 344e4408359f2f5e6584a9926a458d529656ffca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 26 Jan 2014 00:15:51 +0100
Subject: [PATCH 0527/3789] polkit: fix gobject introspection support

---
 pkgs/development/libraries/polkit/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 821e66ea0b3..d5d1614ec8f 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -53,13 +53,10 @@ stdenv.mkDerivation rec {
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     "--with-polkitd-user=polkituser" #TODO? <nixos> config.ids.uids.polkituser
     "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS
+    "--enable-introspection"
   ];
 
-  makeFlags =
-    ''
-      INTROSPECTION_GIRDIR=$(out)/share/gir-1.0
-      INTROSPECTION_TYPELIBDIR=$(out)lib/girepository-1.0
-    '';
+  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0 INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
 
   #doCheck = true; # some /bin/bash problem that isn't auto-solved by patchShebangs
 
-- 
GitLab


From d8a31ba94806dd4b4c98bc24bac603be275af0e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 26 Jan 2014 00:16:24 +0100
Subject: [PATCH 0528/3789] network-manager-applet: gtk2 -> gtk3

---
 .../networking/network-manager-applet/default.nix  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 0c2d02a5e77..4d2dff22d11 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf
-, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring
+{ stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
+, 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 }:
@@ -19,15 +19,13 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    gtk libglade networkmanager libnotify libsecret dbus_glib
-    polkit isocodes makeWrapper udev GConf libgnome_keyring
+    gnome3.gtk libglade networkmanager libnotify libsecret dbus_glib
+    polkit isocodes makeWrapper udev gnome3.gconf gnome3.libgnome_keyring
   ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
-  propagatedUserEnvPkgs = [ GConf gnome_keyring hicolor_icon_theme ];
-
-  configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
+  propagatedUserEnvPkgs = [ gnome3.gconf gnome3.gnome_keyring hicolor_icon_theme ];
 
   makeFlags = [
     ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
@@ -50,7 +48,7 @@ stdenv.mkDerivation rec {
       --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \
       --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
-      --prefix PATH ":" "${GConf}/bin"
+      --prefix PATH ":" "${gnome3.gconf}/bin"
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From fab72d88c938e77317570248fdd853828305e61c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 26 Jan 2014 00:17:18 +0100
Subject: [PATCH 0529/3789] telepahty-logger: add gobject introspection support

---
 .../instant-messengers/telepathy/logger/default.nix        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 527642348d2..173dfe9c929 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig
-, intltool, libxslt }:
+, intltool, libxslt, gobjectIntrospection, dbus_libs }:
 
 stdenv.mkDerivation rec {
   project = "telepathy-logger";
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl";
   };
 
-  buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool ];
+  NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
+
+  buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool
+                  gobjectIntrospection dbus_libs ];
 
   nativeBuildInputs = [ libxslt ];
 
-- 
GitLab


From 00eaf038ac41fb12771ad7639855de8dd3776f30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 26 Jan 2014 00:17:49 +0100
Subject: [PATCH 0530/3789] gnome3.at_spi2_core: add gobject introspection
 support

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

diff --git a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix
index 2c401856b7f..ab30c81efc2 100644
--- a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix
+++ b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib
-, libX11, xextproto, libSM, libICE, libXtst, libXi }:
+, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
 
 stdenv.mkDerivation (rec {
   versionMajor = "2.10";
@@ -15,6 +15,7 @@ stdenv.mkDerivation (rec {
   buildInputs = [
     python pkgconfig popt  intltool dbus_glib
     libX11 xextproto libSM libICE libXtst libXi
+    gobjectIntrospection
   ];
 
   # ToDo: on non-NixOS we create a symlink from there?
-- 
GitLab


From ec4502ff1b8df73da385ace1952270e393fa43db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 26 Jan 2014 00:18:22 +0100
Subject: [PATCH 0531/3789] gnome3.gconf: use gtk3, not gtk2

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

diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix
index fc7471019bd..47dae0486e9 100644
--- a/pkgs/desktops/gnome-3/core/gconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/gconf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, gtk, glib, libxml2
+{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3, glib, libxml2
 , intltool, polkit, orbit }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
   };
 
-  buildInputs = [ libxml2 polkit gtk orbit ];
+  buildInputs = [ libxml2 polkit gnome3.gtk orbit ];
   propagatedBuildInputs = [ glib dbus_glib  ];
   nativeBuildInputs = [ pkgconfig intltool ];
 
-- 
GitLab


From 369c6a06bf0de0992555f0b57fbe52c2c14e1750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 26 Jan 2014 00:18:44 +0100
Subject: [PATCH 0532/3789] gcr: add gobject introspection support

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

diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix
index 7b7588b9528..059942530ea 100644
--- a/pkgs/desktops/gnome-3/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/core/gcr/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
-, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk }:
+, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
+, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "gcr-3.10.1";
@@ -10,12 +11,10 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig intltool gnupg p11_kit glib
+    pkgconfig intltool gnupg p11_kit glib gobjectIntrospection
     libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk
   ];
 
-  configureFlags = [ "--disable-introspection" ];
-
   #doCheck = true;
 
   meta = with stdenv.lib; {
-- 
GitLab


From 7546695dbb5fefb3f2914ab315ff2e8062946c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 26 Jan 2014 00:19:06 +0100
Subject: [PATCH 0533/3789] gdm: add gobject introspection support

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

diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 2955c5f399b..3df5ab40eaf 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountservice, libX11
-, gtk, libcanberra_gtk3, pam, libtool
-}:
+, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "gdm-3.10.0.1";
 
   src = fetchurl {
-    url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
+    url = "mirror://gnome/sources/gdm/3.10/${name}.tar.xz";
     sha256 = "1rva3djas48m8w1gyv3nds3jxfkirdfl0bk30x79mizrk80456jl";
   };
 
-  buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice libX11 gtk libcanberra_gtk3 pam libtool ];
+  buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice
+                  gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-- 
GitLab


From 3c6d52c3daaa09737dd82a842ca557065e168885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 26 Jan 2014 00:19:23 +0100
Subject: [PATCH 0534/3789] gjs: add pango support

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

diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index e4a0752eb4a..429d147e728 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_17 }:
+{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_17, pango }:
 
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = with gnome3;
-    [ gobjectIntrospection pkgconfig glib  ];
+    [ gobjectIntrospection pkgconfig glib pango ];
 
   propagatedBuildInputs = [ spidermonkey_17 ];
 
-- 
GitLab


From 12f8e301386d1e2fd7af35c0d37fb1f3884d5505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 26 Jan 2014 00:19:49 +0100
Subject: [PATCH 0535/3789] gnome-keyring: use gtk3

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index 14f0110e374..455f18de98e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
-, gtk3, intltool, gconf, libgnome_keyring, pango, gcr, gdk_pixbuf, atk, p11_kit
-, docbook_xsl_ns, docbook_xsl }:
+, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit
+, docbook_xsl_ns, docbook_xsl, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-keyring-3.10.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1y6v2p14jx5h6yh14c53pd8r0r5zbmcgw8v4nxvf94kd9jliy00q";
   };
 
-  buildInputs = [
+  buildInputs = with gnome3; [
     dbus libgcrypt pam python gtk3 gconf libgnome_keyring
     pango gcr gdk_pixbuf atk p11_kit
   ];
-- 
GitLab


From 832f050679142add3688634318ca6c895f19c212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 26 Jan 2014 00:20:22 +0100
Subject: [PATCH 0536/3789] gnome3: fix some packages to use mirror url

---
 pkgs/desktops/gnome-3/core/gnome-menus/default.nix    | 11 +++++------
 .../gnome-3/core/gnome-online-accounts/default.nix    |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
index 0103800b02f..37d2ea1c086 100644
--- a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }:
-let
-  version = "3.10.1";
-in
-stdenv.mkDerivation {
+
+stdenv.mkDerivation rec {
   name = "gnome-menus-${version}";
+  version = "3.10.1";
 
-    src = fetchurl {
-    url = "http://ftp.gnome.org/pub/gnome/sources/gnome-menus/3.10/gnome-menus-3.10.1.tar.xz";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz";
     sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
   };
 
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 3040d817a16..c17b3ba3eb6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "gnome-online-accounts-3.10.2";
 
   src = fetchurl {
-    url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-online-accounts/3.10/${name}.tar.xz";
     sha256 = "15qvw40dmi886491s3abpidsm2lx65fhglhj99bvcdskhk0ih90b";
   };
 
-- 
GitLab


From 8b3c8926eb064613019f51df623ac248be8b5da7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 26 Jan 2014 00:20:49 +0100
Subject: [PATCH 0537/3789] gnome3.gnome_session: use systemd

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 40426986182..804a0c54a41 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
-, libxslt, intltool, makeWrapper }:
+, libxslt, intltool, makeWrapper, systemd }:
 
 
 stdenv.mkDerivation rec {
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
     sha256 = "1k59yss7r748nvr0cdjrqmx0zy26b93rfn66lsdg9fz60x77087n";
   };
 
+  configureFlags = "--enable-systemd";
+
   buildInputs = with gnome3;
     [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt 
-      gsettings_desktop_schemas upower intltool gconf makeWrapper ];
-
-  # TODO: dbus, gnome-shell, gnome-settings-daemon
+      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
 
   postInstall = ''
     wrapProgram "$out/bin/gnome-session" \
-- 
GitLab


From 96777994c88cd422dd773029eb4c5db9d59f60ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 26 Jan 2014 00:21:19 +0100
Subject: [PATCH 0538/3789] gnome3.gnome_settings_daemon: depend on ibus

---
 .../gnome-3/core/gnome-settings-daemon/default.nix         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index cce0ff46ca0..cb9b00f5279 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -1,7 +1,7 @@
 { 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 }:
+, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus }:
 
 stdenv.mkDerivation rec {
   name = "gnome-settings-daemon-3.10.2";
@@ -11,13 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "0r42lzlgk0w40ws4d3s7yayn6n8zqlnh5b6k88gvgv1lwk39k240";
   };
 
-  configureFlags = "--disable-ibus";
-
   # 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 gtk glib gsettings_desktop_schemas libnotify gnome_desktop
+    [ 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 ];
@@ -25,6 +23,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     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:${gnome3.gsettings_desktop_schemas}/share:$out/share"
   '';
 
-- 
GitLab


From 553963eb0c2bfa394b46061cb812317523712ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 26 Jan 2014 00:21:43 +0100
Subject: [PATCH 0539/3789] gnome3: always use libcanberra_gtk3

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

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 59097b6aeef..b3914659231 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -3,6 +3,7 @@
 rec {
   inherit (pkgs) glib gtk2 gtk3 gnome2;
   gtk = gtk3; # just to be sure
+  libcanberra = pkgs.libcanberra_gtk3; # just to be sure
   inherit (pkgs.gnome2) gnome_common ORBit2;
   orbit = ORBit2;
 
-- 
GitLab


From b4d7bafb8f0e3b84686366060bcb824a48fd8b55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 26 Jan 2014 00:22:04 +0100
Subject: [PATCH 0540/3789] ibus: cleanup

---
 pkgs/development/libraries/ibus/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/development/libraries/ibus/default.nix
index 6200196d403..6c82ad839e1 100644
--- a/pkgs/development/libraries/ibus/default.nix
+++ b/pkgs/development/libraries/ibus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, python, glib, intltool, pkgconfig
+{ stdenv, fetchurl, makeWrapper, python, intltool, pkgconfig
 , gnome3, dbus, libnotify, isocodes, gobjectIntrospection, wayland }:
 
 stdenv.mkDerivation rec {
@@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "1v4a9xv2k26g6ggk4282ynfvh68j2r5hg1cdpvnryfa8c2pkdaq2";
   };
 
-  configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library";
+  configureFlags = "--enable-dconf --disable-memconf --enable-ui --enable-python-library";
 
   buildInputs = [
-    makeWrapper python glib wayland
+    makeWrapper python gnome3.glib wayland
     intltool pkgconfig gnome3.gtk2
     gnome3.gtk3 dbus gnome3.dconf gnome3.gconf
     libnotify isocodes gobjectIntrospection
@@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
   preBuild = "patchShebangs ./scripts";
 
   postInstall  = ''
-    #${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
-    
     for f in "$out"/bin/*; do
       wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share"
     done
-- 
GitLab


From 64c44fa508343d693e94c01eb01fba8d8cca7ef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Jan 2014 00:41:14 +0100
Subject: [PATCH 0541/3789] weston: fix build by updating (after wayland
 update)

Also add dbus support, which seemed potentionally important to me.
---
 pkgs/applications/window-managers/weston/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 913235287ac..4880029119e 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon
 , cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev
-, libjpeg, pam, autoconf, automake, libtool }:
+, libjpeg, pam, autoconf, automake, libtool, dbus }:
 
-let version = "1.3.1"; in
+let version = "1.4.0"; in
 
 stdenv.mkDerivation rec {
   name = "weston-${version}";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1isvh66irrz707r69495767n5yxp07dvy0xx6mj1mbj1n4s1657p";
+    sha256 = "0r7dz72ys9p3f697ajgmihkar2da36bnjna6yanb3kg9k2fk38kl";
   };
 
   buildInputs = [
     pkgconfig wayland mesa libxkbcommon
-    cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam
+    cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam dbus.libs
   ];
 
   NIX_CFLAGS_COMPILE = "-I${libdrm}/include/libdrm";
-- 
GitLab


From bf8b81f538020c68ec018cc3e5b682d828a64ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Jan 2014 00:59:59 +0100
Subject: [PATCH 0542/3789] lyx: bugfix update 2.0.6 -> .7

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

diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index fd2e7c3ac42..1ea4f06c927 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.6";
+  version = "2.0.7";
   name = "lyx-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz";
-    sha256 = "1llah9d9ymvdk8asmqslcwnicycxrwb27k8si184n5bfxvnjpjx5";
+    sha256 = "0qp8xqmlafib4hispjgl1friln0w3s05mi20sjfzaxnl6jkvv5q5";
   };
 
   configureFlags = [
-- 
GitLab


From 5fb366d1e5fca5b7173d3f2ed7388285b8616d90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 17 Jan 2014 20:43:54 +0100
Subject: [PATCH 0543/3789] xorg: move nouveau driver here, some updates of
 modules

It seems that most of the modules is rarely used, but still.

Some of the updated modules don't build, just as they didn't before.
---
 .../linux/xf86-video-nouveau/default.nix      | 35 ----------
 pkgs/servers/x11/xorg/default.nix             | 64 +++++++++++--------
 pkgs/servers/x11/xorg/overrides.nix           |  4 ++
 pkgs/servers/x11/xorg/tarballs-7.7.list       | 21 +++---
 pkgs/top-level/all-packages.nix               |  5 +-
 5 files changed, 53 insertions(+), 76 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/xf86-video-nouveau/default.nix

diff --git a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix
deleted file mode 100644
index 3c9707828b3..00000000000
--- a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv
-, fetchurl
-, autoconf
-, automake
-, libtool
-, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto, pixman
-, utilmacros
-, libdrm
-, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "xf86-video-nouveau-1.0.7";
-
-  src = fetchurl {
-    url = "mirror://xorg/individual/driver/${name}.tar.bz2";
-    sha256 = "0cg1q9dz9ksfp593x707gr10s8p7z00zdws1r4lshg42w5ccd1yi";
-  };
-
-
-  buildInputs = [
-    xorgserver xproto fontsproto xf86driproto renderproto videoproto pixman
-    utilmacros
-    libdrm
-    pkgconfig
-  ];
-
-
-  meta = {
-    homepage = http://nouveau.freedesktop.org/wiki/;
-
-    description = "The xorg driver for nouveau-driven video cards";
-
-    license = "gplv2";
-  };
-}
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 7965c059288..580e09642a5 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1330,11 +1330,11 @@ let
   })) // {inherit ;};
 
   xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) {
-    name = "xf86-input-evdev-2.7.3";
+    name = "xf86-input-evdev-2.8.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2;
-      sha256 = "01557w1kmsaqdsc42pxyypig10l5r5vh9axz9g22hg9cc09r8f7b";
+      url = mirror://xorg/individual/driver/xf86-input-evdev-2.8.2.tar.bz2;
+      sha256 = "1cvyg425px92hr5ql1s7v0c7n9jyvg0aaajrf5vyxgc3k9s6213m";
     };
     buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
   })) // {inherit inputproto udev xorgserver xproto ;};
@@ -1350,31 +1350,31 @@ let
   })) // {inherit inputproto kbproto xorgserver xproto ;};
 
   xf86inputkeyboard = (stdenv.mkDerivation ((if overrides ? xf86inputkeyboard then overrides.xf86inputkeyboard else x: x) {
-    name = "xf86-input-keyboard-1.6.1";
+    name = "xf86-input-keyboard-1.8.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2;
-      sha256 = "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma";
+      url = mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2;
+      sha256 = "0nyb61w30z32djrllgr2s1i13di3vsl6hg4pqjhxdal71971ria1";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
   })) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputmouse = (stdenv.mkDerivation ((if overrides ? xf86inputmouse then overrides.xf86inputmouse else x: x) {
-    name = "xf86-input-mouse-1.7.2";
+    name = "xf86-input-mouse-1.9.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2;
-      sha256 = "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark";
+      url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.0.tar.bz2;
+      sha256 = "12344w0cxac1ld54qqwynxwazbmmpvqh1mzcskmfkmakmr5iwq2x";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
   })) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) {
-    name = "xf86-input-synaptics-1.7.2";
+    name = "xf86-input-synaptics-1.7.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.2.tar.bz2;
-      sha256 = "1kbx59zhk3kky0hkklsl8n2lm269am8k5xjpikpn51hdbyjpz5b3";
+      url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.3.tar.bz2;
+      sha256 = "1m9j5shypv3dmxxfxjcmj01glay4gqqlchxqav89a4cn8ch9falb";
     };
     buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
   })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
@@ -1470,21 +1470,21 @@ let
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
 
   xf86videogeode = (stdenv.mkDerivation ((if overrides ? xf86videogeode then overrides.xf86videogeode else x: x) {
-    name = "xf86-video-geode-2.11.14";
+    name = "xf86-video-geode-2.11.15";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2;
-      sha256 = "1k6gl1kq2fr0gj6sqrg2rypp59f8b8pr46c902m4z4rjr530nxac";
+      url = mirror://xorg/individual/driver/xf86-video-geode-2.11.15.tar.bz2;
+      sha256 = "1w4ghr2a41kaw4g9na8ws5fjbmy8zkbxpxa21vmqc8mkjzb3pnq0";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoglide = (stdenv.mkDerivation ((if overrides ? xf86videoglide then overrides.xf86videoglide else x: x) {
-    name = "xf86-video-glide-1.2.1";
+    name = "xf86-video-glide-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2;
-      sha256 = "0vp9izdy7lgx09jfwr4ra9zvrx1hg15a5v2nhx00v31ffkh2aiyp";
+      url = mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2;
+      sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y";
     };
     buildInputs = [pkgconfig xextproto xorgserver xproto ];
   })) // {inherit xextproto xorgserver xproto ;};
@@ -1530,11 +1530,11 @@ let
   })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) {
-    name = "xf86-video-mga-1.6.2";
+    name = "xf86-video-mga-1.6.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2;
-      sha256 = "0v6agqc9lxg8jgrksc1yksmhnv70j1vnhm09i7gg14za1qjwx29z";
+      url = mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2;
+      sha256 = "1my7y67sadjjmab1dyxckylrggi7p01yk4wwg9w6k1q96pmb213p";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
@@ -1559,6 +1559,16 @@ let
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ];
   })) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
 
+  xf86videonouveau = (stdenv.mkDerivation ((if overrides ? xf86videonouveau then overrides.xf86videonouveau else x: x) {
+    name = "xf86-video-nouveau-1.0.10";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.10.tar.bz2;
+      sha256 = "17fvjplzfx86099sqys0bfl8lfbmjz8li84kzj2x95mf1cbb7fn1";
+    };
+    buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+  })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+
   xf86videonv = (stdenv.mkDerivation ((if overrides ? xf86videonv then overrides.xf86videonv else x: x) {
     name = "xf86-video-nv-2.1.20";
     builder = ./builder.sh;
@@ -1580,21 +1590,21 @@ let
   })) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
 
   xf86videor128 = (stdenv.mkDerivation ((if overrides ? xf86videor128 then overrides.xf86videor128 else x: x) {
-    name = "xf86-video-r128-6.9.1";
+    name = "xf86-video-r128-6.9.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-r128-6.9.1.tar.bz2;
-      sha256 = "0k746kk75h3hg3wmihqlmp14s52fg0svylqay02km7misflbmqwb";
+      url = mirror://xorg/individual/driver/xf86-video-r128-6.9.2.tar.bz2;
+      sha256 = "1q3fsc603k2yinphx5rrcl5356qkpywwz8axlw277l2231gjjbcb";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
 
   xf86videosavage = (stdenv.mkDerivation ((if overrides ? xf86videosavage then overrides.xf86videosavage else x: x) {
-    name = "xf86-video-savage-2.3.6";
+    name = "xf86-video-savage-2.3.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-savage-2.3.6.tar.bz2;
-      sha256 = "1mk3mpwl97clxhwzl990hj31z8qfh7fd4vs6qbl5i250ykc3x0a8";
+      url = mirror://xorg/individual/driver/xf86-video-savage-2.3.7.tar.bz2;
+      sha256 = "0i2aqp68rfkrz9c1p6d7ny9x7bjrlnby7q56zf01fb12r42l4784";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8901d7dda54..0ee3594f6ec 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -148,6 +148,10 @@ in
     installFlags = "sdkdir=\${out}/include/xorg";
   };
 
+  xf86inputmouse = attrs: attrs // {
+    installFlags = "sdkdir=\${out}/include/xorg";
+  };
+
   xf86inputjoystick = attrs: attrs // {
     installFlags = "sdkdir=\${out}/include/xorg";
   };
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 39212bdfcf4..7a997c6c169 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -112,32 +112,33 @@ 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.7.3.tar.bz2
+mirror://xorg/individual/driver/xf86-input-evdev-2.8.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2
-mirror://xorg/individual/driver/xf86-input-synaptics-1.7.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.3.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
 mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ati-7.2.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-nouveau-1.0.10.tar.bz2
 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2
-mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2
-mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2
+mirror://xorg/individual/driver/xf86-video-geode-2.11.15.tar.bz2
+mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2
 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2
-mirror://xorg/individual/driver/xf86-video-intel-2.21.9.tar.bz2
+mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2
-mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2
+mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2
 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2
 mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2
-mirror://xorg/individual/driver/xf86-video-r128-6.9.1.tar.bz2
-mirror://xorg/individual/driver/xf86-video-savage-2.3.6.tar.bz2
+mirror://xorg/individual/driver/xf86-video-r128-6.9.2.tar.bz2
+mirror://xorg/individual/driver/xf86-video-savage-2.3.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-sis-0.10.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 275287cfcd9..0de827f9e84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7103,10 +7103,7 @@ let
     inherit (xorg) fontsproto renderproto utilmacros xorgserver;
   };
 
-  xf86_video_nouveau = callPackage ../os-specific/linux/xf86-video-nouveau {
-    inherit (xorg) xorgserver xproto fontsproto xf86driproto renderproto
-      videoproto utilmacros;
-  };
+  xf86_video_nouveau = xorg.xf86videonouveau;
 
   xmoto = builderDefsPackage (import ../games/xmoto) {
     inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng
-- 
GitLab


From f1f0b3a205c07a2dbdbf8ba579a155855de19b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 26 Jan 2014 09:55:52 +0100
Subject: [PATCH 0544/3789] Add gnome3.gnome_shell

---
 .../gnome-3/core/gnome-shell/default.nix      | 43 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-shell/default.nix

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
new file mode 100644
index 00000000000..3799a008c1b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -0,0 +1,43 @@
+{ 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
+, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
+, accountservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet }:
+
+
+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
+      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
+      at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger ];
+
+  configureFlags = "--disable-static";
+
+  preBuild = ''
+    patchShebangs src/data-to-c.pl
+  '';
+
+  postInstall = with gnome3; ''
+    wrapProgram "$out/bin/gnome-shell" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \
+      --prefix XDG_DATA_DIRS : "${gnome-menus}:/share:${ibus}/share:${gnome_settings_daemon}/share:${gdm}/share:${glib}/share:${gnome_themes_standard}/share:${mutter}/share:${gnome_icon_theme}/share:${gsettings_desktop_schemas}/share:${gtk}/share:$out/share"
+    wrapProgram "$out/libexec/gnome-shell-calendar-server" \
+      --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index b3914659231..772aaf54e0a 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -48,6 +48,8 @@ rec {
 
   gnome_session = callPackage ./core/gnome-session { };
 
+  gnome_shell = callPackage ./core/gnome-shell { };
+
   gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };
 
   gnome_terminal = callPackage ./core/gnome-terminal { };
-- 
GitLab


From 8c3346aff112070e70d75d5325a1ab4fd60d60cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Jan 2014 10:12:09 +0100
Subject: [PATCH 0545/3789] libsmpack: fetch from fedora (close #1598)

I see no other easy work-around for nix getting it automatically.
---
 pkgs/development/libraries/libmspack/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix
index d02217afd3e..a49cd95822f 100644
--- a/pkgs/development/libraries/libmspack/default.nix
+++ b/pkgs/development/libraries/libmspack/default.nix
@@ -3,7 +3,10 @@
 stdenv.mkDerivation {
   name = "libmspack-0.4alpha";
   src = fetchurl {
-    url = http://www.cabextract.org.uk/libmspack/libmspack-0.4alpha.tar.gz;
+    # upstream url: "curl: (22) The requested URL returned error: 406 Not Acceptable"
+    #url = http://www.cabextract.org.uk/libmspack/libmspack-0.4alpha.tar.gz;
+    url = "http://pkgs.fedoraproject.org/lookaside/pkgs/libmspack/"
+      + "libmspack-0.4alpha.tar.gz/1ab10b507259993c74b4c41a88103b59/libmspack-0.4alpha.tar.gz";
     sha256 = "0s2w5zxx9cw7445cx9ap59ky5n7r201551zg906w9ghcys1qk5dp";
   };
 
-- 
GitLab


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

Cf. #1515.
---
 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
+  '';
+
+  nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];
+
+  buildInputs = [ alsaLib jackaudio ];
 
-  preConfigure = ''
-    ./autogen.sh
+  configureFlags = ''
+    --enable-alsa
+    --enable-jack
+    --disable-portaudio
   '';
 
   postInstall = ''
-- 
GitLab


From 80adf16703fc233fcf5eb93f163a764bcc554423 Mon Sep 17 00:00:00 2001
From: Kevin Quick <quick@sparq.org>
Date: Sat, 25 Jan 2014 17:26:00 -0700
Subject: [PATCH 0547/3789] glib on darwin: disable warnings to avoid prototype
 errors

vcunat did some reformatting before pushing.
---
 pkgs/development/libraries/glib/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 812148c7adc..de0a02c56e2 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -35,7 +35,7 @@ let
   ver_maj = "2.38";
   ver_min = "2";
 in
-with { inherit (stdenv.lib) optionalString; };
+with { inherit (stdenv.lib) optional optionalString; };
 
 stdenv.mkDerivation rec {
   name = "glib-${ver_maj}.${ver_min}";
@@ -55,9 +55,11 @@ stdenv.mkDerivation rec {
 
   preConfigure = "autoreconf -fi";
 
-  configureFlags = stdenv.lib.optional stdenv.isSunOS "--disable-modular-tests";
+  configureFlags =
+    optional stdenv.isDarwin "--disable-compile-warnings"
+    ++ optional stdenv.isSunOS "--disable-modular-tests";
 
-  CPPFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-DBSD_COMP";
+  CPPFLAGS = optionalString stdenv.isSunOS "-DBSD_COMP";
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-lintl";
 
-- 
GitLab


From dec9e66ea1dcedecf4a67fd82048ca97a2fbcd0e Mon Sep 17 00:00:00 2001
From: Kevin Quick <kquick@godaddy.com>
Date: Sat, 25 Jan 2014 14:14:56 -0700
Subject: [PATCH 0548/3789] Update readline for patch5 (needed for darwin13).

---
 pkgs/development/libraries/readline/readline-6.2-patches.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/readline/readline-6.2-patches.nix b/pkgs/development/libraries/readline/readline-6.2-patches.nix
index 719face2135..9fdcb3743b7 100644
--- a/pkgs/development/libraries/readline/readline-6.2-patches.nix
+++ b/pkgs/development/libraries/readline/readline-6.2-patches.nix
@@ -5,4 +5,5 @@ patch: [
 (patch "002" "1m670g2xzib6r81315q9r24nh9brmxkpq07acch1fwxmih94jqqy")
 (patch "003" "0x13c9wir4r44v2vdg96y0ahn8kl3wcmb5y0xn15yvid6pzk28fb")
 (patch "004" "0xjlkxfssfsd6jwbqhfjs4hybcps0b9zgz8v86vbhnzag4j39g89")
+(patch "005" "1x61bjl3wgs1gwla9b3y1hh12m1j5qlbis22258mljjl9mg900pg")
 ]
-- 
GitLab


From 8f0511b0a0855746f5f1dd174295557d7c7ed9f0 Mon Sep 17 00:00:00 2001
From: Kevin Quick <quick@sparq.org>
Date: Sat, 25 Jan 2014 14:24:10 -0700
Subject: [PATCH 0549/3789] gawk: add gawkInteractive with readline support

stdenv (on linux) depends on gawk, readline and similar are useless for non-interactive usage.
Close #1596. Original patch was almost completely rewritten by vcunat.

On darwin we always specify whether to use readline, so it isn't always picked as reported.
---
 pkgs/tools/text/gawk/default.nix | 10 +++++++---
 pkgs/top-level/all-packages.nix  |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 901f53c5e5c..b231f2875c0 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libsigsegv }:
+{ stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false }:
 
 stdenv.mkDerivation rec {
   name = "gawk-4.1.0";
@@ -12,9 +12,13 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1
 
-  buildInputs = [ libsigsegv ];
+  buildInputs = [ libsigsegv ]
+    ++ stdenv.lib.optional readlineSupport readline;
 
-  configureFlags = [ "--with-libsigsegv-prefix=${libsigsegv}" ];
+  configureFlags = [ "--with-libsigsegv-prefix=${libsigsegv}" ]
+    ++ stdenv.lib.optional readlineSupport "--with-readline=${readline}"
+      # only darwin where reported, seems OK on non-chrooted Fedora (don't rebuild stdenv)
+    ++ stdenv.lib.optional (!readlineSupport && stdenv.isDarwin) "--without-readline";
 
   meta = {
     homepage = http://www.gnu.org/software/gawk/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 460cf40f0a6..43c8b14b2bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -974,7 +974,8 @@ let
 
   g500-control = callPackage ../tools/misc/g500-control { };
 
-  gawk = callPackage ../tools/text/gawk { };
+  gawk = lowPrio (callPackage ../tools/text/gawk { });
+  gawkInteractive = gawk.override { readlineSupport = true; };
 
   gdmap = callPackage ../tools/system/gdmap { };
 
-- 
GitLab


From 9a68fd380f201fe3c630e434e8d1b85b9dbe1558 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 12 Oct 2013 18:50:51 +0200
Subject: [PATCH 0550/3789] pkgs/docbook-xsl: update to 1.78.1 (close #1069)

---
 pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index c54d8f304b6..981aa59369d 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "docbook-xsl-1.72.0";
+  name = "docbook-xsl-1.78.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = mirror://sourceforge/docbook/docbook-xsl-1.72.0.tar.bz2;
-    sha256 = "1cnrfgqz8pc9wnlgqjch2338ad7jki6d4h6b2fhaxn1a2201df5k";
+    url = mirror://sourceforge/docbook/docbook-xsl-1.78.1.tar.bz2;
+    sha256 = "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9";
   };
 }
-- 
GitLab


From 0c2f09e992a15eca8bfef724dab57868e4e0f340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Jan 2014 13:44:34 +0100
Subject: [PATCH 0551/3789] gawk: signify interactivity in name

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43c8b14b2bc..b5fccb23c3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -975,7 +975,8 @@ let
   g500-control = callPackage ../tools/misc/g500-control { };
 
   gawk = lowPrio (callPackage ../tools/text/gawk { });
-  gawkInteractive = gawk.override { readlineSupport = true; };
+  gawkInteractive = appendToName "interactive"
+    (gawk.override { readlineSupport = true; });
 
   gdmap = callPackage ../tools/system/gdmap { };
 
-- 
GitLab


From 01b0d1c926472449474bf3486792bb5eb2c75b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Jan 2014 14:15:10 +0100
Subject: [PATCH 0552/3789] rabbitmq: move docs: $out/docs -> $out/share/docs

As pointed out by @bjornfor, we mostly have it under share.
---
 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 c404a56aef2..4bb05a23faf 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       patchShebangs .
     '';
 
-  installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man DOC_INSTALL_DIR=$(out)/doc";
+  installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man DOC_INSTALL_DIR=$(out)/share/doc";
 
   preInstall =
     ''
-- 
GitLab


From c47dc470837ac769350a25d7ade66b381fd7cb4d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 19 Jan 2014 19:27:38 -0600
Subject: [PATCH 0553/3789] linux: Update from 3.10.25 -> 3.10.27

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 4cb600b5238..7ff2ed0aad0 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.25";
+  version = "3.10.27";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1kf75br35i35p231i3z3blf90zv1xns26bcd0gwhlkxgvs46vi56";
+    sha256 = "0zjmfskb7m5wg2w9w1kks3jn7xc6b7ijw5ccdsw98l8zsdaknyvz";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 8bc7c9f66d6a3b23b0a7a69fbd33882ca5f54bfc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 19 Jan 2014 19:11:25 -0600
Subject: [PATCH 0554/3789] linux: Update from 3.12.7 -> 3.12.8

---
 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 fbf0df2ee2f..4828effb032 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.7";
+  version = "3.12.8";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1pmz1g919kbhf8mq23d25187gwzr8l85xj7bf9dvn3vpai7spafb";
+    sha256 = "15smxcn4q5c94jvdkgpz2r2dy4wgla67rp6s6r1yamz250xmc2xm";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 960b58d28095dbffbd7dbda405119b11adbc0e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 21 Jan 2014 12:47:58 +0100
Subject: [PATCH 0555/3789] wish fix for ssvnc (close #1560)

tcl deps change? causes wish to be missing
this corrects the wish path to use the one from tk
---
 pkgs/applications/networking/remote/ssvnc/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix
index b2c9b7c3e73..619925354f0 100644
--- a/pkgs/applications/networking/remote/ssvnc/default.nix
+++ b/pkgs/applications/networking/remote/ssvnc/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchurl, imake, zlib, openjdk, libX11, libXt, libXmu, libXaw, libXext, libXpm, openjpeg, openssl }:
+{ stdenv, fetchurl, imake, zlib, openjdk, libX11, libXt, libXmu
+, libXaw, libXext, libXpm, openjpeg, openssl, tcl, tk }:
 
-let version = "1.0.29"; in
 stdenv.mkDerivation rec {
   name = "ssvnc-${version}";
+  version = "1.0.29";
 
   src = fetchurl {
     url = "mirror://sourceforge/ssvnc/${name}.src.tar.gz";
@@ -13,6 +14,10 @@ stdenv.mkDerivation rec {
 
   configurePhase = "makeFlags=PREFIX=$out";
 
+  postInstall = ''
+    sed -i -e 's|exec wish|exec ${tk}/bin/wish|' $out/lib/ssvnc/util/ssvnc.tcl
+  '';
+
   meta = {
     description = "VNC viewer that adds encryption security to VNC connections";
     homepage = "http://www.karlrunge.com/x11vnc/ssvnc.html";
-- 
GitLab


From bcd9f04226f779ff20bdf62de03c9943f9dfe559 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 27 Dec 2013 14:14:42 -0600
Subject: [PATCH 0556/3789] add arpack-3.1.4

---
 .../libraries/science/math/arpack/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/arpack/default.nix

diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
new file mode 100644
index 00000000000..48bbd3aa785
--- /dev/null
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, gfortran, openblas }:
+
+let version = "3.1.4";
+in
+stdenv.mkDerivation {
+  name = "arpack-${version}";
+  src = fetchurl {
+    url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/arpack-ng_${version}.tar.gz";
+    sha256 = "0m4cqy3d7fpzx1nac3brhr298qj7vx3fchjdz5b7n0pp616cmcm1";
+  };
+
+  buildInputs = [ gfortran ];
+  propagatedBuildInputs = [ openblas ];
+
+  # Auto-detection fails because gfortran brings in BLAS by default
+  configureFlags="--with-blas=-lopenblas --with-lapack=-lopenblas";
+
+  meta = {
+    homepage = "http://forge.scilab.org/index.php/p/arpack-ng/";
+    description = "A collection of Fortran77 subroutines to solve large scale eigenvalue problems";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e61452e1f54..987c33efe0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9730,6 +9730,8 @@ let
 
   ### SCIENCE/MATH
 
+  arpack = callPackage ../development/libraries/science/math/arpack { };
+
   atlas = callPackage ../development/libraries/science/math/atlas {
     # The build process measures CPU capabilities and optimizes the
     # library to perform best on that particular machine. That is a
-- 
GitLab


From a9caafa0eaf223dc1382b3e5c98baabd6b0b55a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Jan 2014 17:07:31 +0100
Subject: [PATCH 0557/3789] linux kernel updates to 3.4.77, 3.10.28 and 3.12.9

I tested they still build on x86_64.
---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.4.nix  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 7ff2ed0aad0..6e22d6ed524 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.27";
+  version = "3.10.28";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0zjmfskb7m5wg2w9w1kks3jn7xc6b7ijw5ccdsw98l8zsdaknyvz";
+    sha256 = "1blzvr3qywi8wxgl28zsn5djwgvw70yh3i6qjh2sz3zk9gnpd6mq";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 4828effb032..6edb3669c53 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.8";
+  version = "3.12.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "15smxcn4q5c94jvdkgpz2r2dy4wgla67rp6s6r1yamz250xmc2xm";
+    sha256 = "1jzmcqshfgnkk4dibkxc7w06axw7c2fxdpghvm6d7amfpcd9ygka";
   };
 
   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 37d652a44e3..d1909c17967 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.76";
+  version = "3.4.77";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0rwa5n4z359351dnpfknmwi3f5is8haflpx9zq6rgb9dprv8af3j";
+    sha256 = "05hfa5cxcxvqg183amfpvjzh6i9lphx1956j92sh6r90pnhg0xgz";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 4417dd33c2d3fcdb0dfa1fd587ca0666a4c4b8bf Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 26 Jan 2014 18:02:03 +0100
Subject: [PATCH 0558/3789] fix chromium chroot build

---
 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 87cdf673041..908e54f3e43 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -40,6 +40,8 @@ let
       inherit url sha256;
     };
 
+    buildInputs = [ python ]; # cannot patch shebangs otherwise
+
     phases = [ "unpackPhase" "patchPhase" "installPhase" ];
 
     opensslPatches = optional useOpenSSL openssl.patches;
-- 
GitLab


From 11a752092870bcf18aa883032d5d06dac4728461 Mon Sep 17 00:00:00 2001
From: Vladimir Still <xstill@fi.muni.cz>
Date: Sun, 26 Jan 2014 19:16:50 +0100
Subject: [PATCH 0559/3789] llvm: Bring back old expressions for llvm & clang
 3.[123].

---
 .../llvm/3.1/clang-include-paths.patch        |  21 +++
 .../compilers/llvm/3.1/clang-ld-flags.patch   |  57 ++++++
 pkgs/development/compilers/llvm/3.1/clang.nix |  38 ++++
 .../compilers/llvm/3.1/default.nix            |  27 +++
 .../compilers/llvm/3.2/clang-purity.patch     | 137 +++++++++++++++
 pkgs/development/compilers/llvm/3.2/clang.nix |  40 +++++
 .../compilers/llvm/3.2/default.nix            |  36 ++++
 .../compilers/llvm/3.2/set_soname.patch       |  12 ++
 .../compilers/llvm/3.3/clang-purity.patch     | 162 ++++++++++++++++++
 .../llvm/3.3/clang-tablegen-dir.patch         |   9 +
 pkgs/development/compilers/llvm/3.3/clang.nix |  41 +++++
 11 files changed, 580 insertions(+)
 create mode 100644 pkgs/development/compilers/llvm/3.1/clang-include-paths.patch
 create mode 100644 pkgs/development/compilers/llvm/3.1/clang-ld-flags.patch
 create mode 100644 pkgs/development/compilers/llvm/3.1/clang.nix
 create mode 100644 pkgs/development/compilers/llvm/3.1/default.nix
 create mode 100644 pkgs/development/compilers/llvm/3.2/clang-purity.patch
 create mode 100644 pkgs/development/compilers/llvm/3.2/clang.nix
 create mode 100644 pkgs/development/compilers/llvm/3.2/default.nix
 create mode 100644 pkgs/development/compilers/llvm/3.2/set_soname.patch
 create mode 100644 pkgs/development/compilers/llvm/3.3/clang-purity.patch
 create mode 100644 pkgs/development/compilers/llvm/3.3/clang-tablegen-dir.patch
 create mode 100644 pkgs/development/compilers/llvm/3.3/clang.nix

diff --git a/pkgs/development/compilers/llvm/3.1/clang-include-paths.patch b/pkgs/development/compilers/llvm/3.1/clang-include-paths.patch
new file mode 100644
index 00000000000..5e7370718ab
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.1/clang-include-paths.patch
@@ -0,0 +1,21 @@
+diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp
+--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp	2012-05-11 20:16:02.000000000 -0400
++++ clang-3.1.src/lib/Driver/ToolChains.cpp	2012-10-08 01:13:01.044083509 -0400
+@@ -2146,9 +2146,6 @@
+   if (DriverArgs.hasArg(options::OPT_nostdinc))
+     return;
+ 
+-  if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
+-    addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include");
+-
+   if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
+     llvm::sys::Path P(D.ResourceDir);
+     P.appendComponent("include");
+@@ -2264,6 +2261,7 @@
+     return;
+ 
+   // Check if libc++ has been enabled and provide its include paths if so.
++  // !!! Will need to modify this if/when nixpkgs uses libc++
+   if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx) {
+     // libc++ is always installed at a fixed path on Linux currently.
+     addSystemInclude(DriverArgs, CC1Args,
diff --git a/pkgs/development/compilers/llvm/3.1/clang-ld-flags.patch b/pkgs/development/compilers/llvm/3.1/clang-ld-flags.patch
new file mode 100644
index 00000000000..ffa67b464ec
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.1/clang-ld-flags.patch
@@ -0,0 +1,57 @@
+diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp
+--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp	2012-05-11 20:16:02.000000000 -0400
++++ clang-3.1.src/lib/Driver/ToolChains.cpp	2012-10-08 01:22:53.458850737 -0400
+@@ -2077,16 +2077,6 @@
+       addPathIfExists(LibPath + "/../" + Multilib, Paths);
+     }
+   }
+-  addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths);
+-  addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths);
+-  addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
+-  addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths);
+-
+-  // Try walking via the GCC triple path in case of multiarch GCC
+-  // installations with strange symlinks.
+-  if (GCCInstallation.isValid())
+-    addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
+-                    "/../../" + Multilib, Paths);
+ 
+   // Add the non-multilib suffixed paths (if potentially different).
+   if (GCCInstallation.isValid()) {
+@@ -2100,8 +2090,6 @@
+       addPathIfExists(LibPath, Paths);
+     }
+   }
+-  addPathIfExists(SysRoot + "/lib", Paths);
+-  addPathIfExists(SysRoot + "/usr/lib", Paths);
+ }
+ 
+ bool Linux::HasNativeLLVMSupport() const {
+diff -Naur clang-3.1.src-orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp
+--- clang-3.1.src-orig/lib/Driver/Tools.cpp	2012-04-18 17:32:25.000000000 -0400
++++ clang-3.1.src/lib/Driver/Tools.cpp	2012-10-08 01:25:23.913501995 -0400
+@@ -5210,24 +5210,6 @@
+       ToolChain.getArch() == llvm::Triple::thumb ||
+       (!Args.hasArg(options::OPT_static) &&
+        !Args.hasArg(options::OPT_shared))) {
+-    CmdArgs.push_back("-dynamic-linker");
+-    if (ToolChain.getArch() == llvm::Triple::x86)
+-      CmdArgs.push_back("/lib/ld-linux.so.2");
+-    else if (ToolChain.getArch() == llvm::Triple::arm ||
+-             ToolChain.getArch() == llvm::Triple::thumb)
+-      CmdArgs.push_back("/lib/ld-linux.so.3");
+-    else if (ToolChain.getArch() == llvm::Triple::mips ||
+-             ToolChain.getArch() == llvm::Triple::mipsel)
+-      CmdArgs.push_back("/lib/ld.so.1");
+-    else if (ToolChain.getArch() == llvm::Triple::mips64 ||
+-             ToolChain.getArch() == llvm::Triple::mips64el)
+-      CmdArgs.push_back("/lib64/ld.so.1");
+-    else if (ToolChain.getArch() == llvm::Triple::ppc)
+-      CmdArgs.push_back("/lib/ld.so.1");
+-    else if (ToolChain.getArch() == llvm::Triple::ppc64)
+-      CmdArgs.push_back("/lib64/ld64.so.1");
+-    else
+-      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
+   }
+ 
+   CmdArgs.push_back("-o");
diff --git a/pkgs/development/compilers/llvm/3.1/clang.nix b/pkgs/development/compilers/llvm/3.1/clang.nix
new file mode 100644
index 00000000000..48e4c4946f3
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.1/clang.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, perl, groff, llvm, cmake }:
+
+let version = "3.1"; in
+
+stdenv.mkDerivation {
+  name = "clang-${version}";
+
+  buildInputs = [ perl llvm groff cmake ];
+
+  patches = stdenv.lib.optionals (stdenv.gcc.libc != null) 
+    [ ./clang-include-paths.patch ./clang-ld-flags.patch ];
+
+  cmakeFlags = [
+    "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DLLVM_TARGETS_TO_BUILD=all"
+  ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [
+    "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/"
+  ];
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+      url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz";
+      sha256 = "11m7sm9f8qcrayckfg3z91zb3fimilpm0f7azn7q7qnkvhay4qzz";
+  };
+
+  passthru = { gcc = stdenv.gcc.gcc; };
+
+  meta = {
+    homepage = http://clang.llvm.org/;
+    description = "A C language family frontend for LLVM";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric shlevy];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
+
diff --git a/pkgs/development/compilers/llvm/3.1/default.nix b/pkgs/development/compilers/llvm/3.1/default.nix
new file mode 100644
index 00000000000..204c080b871
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.1/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, perl, groff, cmake, python }:
+
+let version = "3.1"; in
+
+stdenv.mkDerivation {
+  name = "llvm-${version}";
+
+  src = fetchurl {
+    url    = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
+    sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab";
+  };
+
+  buildInputs = [ perl groff cmake python ];
+
+  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://llvm.org/;
+    description = "Collection of modular and reusable compiler and toolchain technologies";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric shlevy raskin];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
+
diff --git a/pkgs/development/compilers/llvm/3.2/clang-purity.patch b/pkgs/development/compilers/llvm/3.2/clang-purity.patch
new file mode 100644
index 00000000000..18c70b56c54
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.2/clang-purity.patch
@@ -0,0 +1,137 @@
+diff -Naur clang-3.2.src-orig/lib/Driver/ToolChains.cpp clang-3.2.src/lib/Driver/ToolChains.cpp
+--- clang-3.2.src-orig/lib/Driver/ToolChains.cpp	2012-12-16 10:59:27.000000000 -0500
++++ clang-3.2.src/lib/Driver/ToolChains.cpp	2013-01-22 14:16:55.787547681 -0500
+@@ -2153,16 +2153,6 @@
+       addPathIfExists(LibPath + "/../" + GCCTriple.str() + "/lib", Paths);
+     }
+   }
+-  addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths);
+-  addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths);
+-  addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
+-  addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths);
+-
+-  // Try walking via the GCC triple path in case of multiarch GCC
+-  // installations with strange symlinks.
+-  if (GCCInstallation.isValid())
+-    addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
+-                    "/../../" + Multilib, Paths);
+ 
+   // Add the non-multilib suffixed paths (if potentially different).
+   if (GCCInstallation.isValid()) {
+@@ -2176,8 +2166,6 @@
+       addPathIfExists(LibPath, Paths);
+     }
+   }
+-  addPathIfExists(SysRoot + "/lib", Paths);
+-  addPathIfExists(SysRoot + "/usr/lib", Paths);
+ }
+ 
+ bool Linux::HasNativeLLVMSupport() const {
+@@ -2228,9 +2216,6 @@
+   if (DriverArgs.hasArg(options::OPT_nostdinc))
+     return;
+ 
+-  if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
+-    addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include");
+-
+   if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
+     llvm::sys::Path P(D.ResourceDir);
+     P.appendComponent("include");
+@@ -2295,24 +2280,6 @@
+     "/usr/include/powerpc64-linux-gnu"
+   };
+   ArrayRef<StringRef> MultiarchIncludeDirs;
+-  if (getTriple().getArch() == llvm::Triple::x86_64) {
+-    MultiarchIncludeDirs = X86_64MultiarchIncludeDirs;
+-  } else if (getTriple().getArch() == llvm::Triple::x86) {
+-    MultiarchIncludeDirs = X86MultiarchIncludeDirs;
+-  } else if (getTriple().getArch() == llvm::Triple::arm) {
+-    if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
+-      MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs;
+-    else
+-      MultiarchIncludeDirs = ARMMultiarchIncludeDirs;
+-  } else if (getTriple().getArch() == llvm::Triple::mips) {
+-    MultiarchIncludeDirs = MIPSMultiarchIncludeDirs;
+-  } else if (getTriple().getArch() == llvm::Triple::mipsel) {
+-    MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs;
+-  } else if (getTriple().getArch() == llvm::Triple::ppc) {
+-    MultiarchIncludeDirs = PPCMultiarchIncludeDirs;
+-  } else if (getTriple().getArch() == llvm::Triple::ppc64) {
+-    MultiarchIncludeDirs = PPC64MultiarchIncludeDirs;
+-  }
+   for (ArrayRef<StringRef>::iterator I = MultiarchIncludeDirs.begin(),
+                                      E = MultiarchIncludeDirs.end();
+        I != E; ++I) {
+@@ -2324,13 +2291,6 @@
+ 
+   if (getTriple().getOS() == llvm::Triple::RTEMS)
+     return;
+-
+-  // Add an include of '/include' directly. This isn't provided by default by
+-  // system GCCs, but is often used with cross-compiling GCCs, and harmless to
+-  // add even when Clang is acting as-if it were a system compiler.
+-  addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include");
+-
+-  addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include");
+ }
+ 
+ /// \brief Helper to add the thre variant paths for a libstdc++ installation.
+diff -Naur clang-3.2.src-orig/lib/Driver/Tools.cpp clang-3.2.src/lib/Driver/Tools.cpp
+--- clang-3.2.src-orig/lib/Driver/Tools.cpp	2012-11-21 02:56:23.000000000 -0500
++++ clang-3.2.src/lib/Driver/Tools.cpp	2013-01-22 14:24:37.167212186 -0500
+@@ -5972,34 +5972,6 @@
+       ToolChain.getArch() == llvm::Triple::thumb ||
+       (!Args.hasArg(options::OPT_static) &&
+        !Args.hasArg(options::OPT_shared))) {
+-    CmdArgs.push_back("-dynamic-linker");
+-    if (isAndroid)
+-      CmdArgs.push_back("/system/bin/linker");
+-    else if (ToolChain.getArch() == llvm::Triple::x86)
+-      CmdArgs.push_back("/lib/ld-linux.so.2");
+-    else if (ToolChain.getArch() == llvm::Triple::arm ||
+-             ToolChain.getArch() == llvm::Triple::thumb) {
+-      if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
+-        CmdArgs.push_back("/lib/ld-linux-armhf.so.3");
+-      else
+-        CmdArgs.push_back("/lib/ld-linux.so.3");
+-    }
+-    else if (ToolChain.getArch() == llvm::Triple::mips ||
+-             ToolChain.getArch() == llvm::Triple::mipsel)
+-      CmdArgs.push_back("/lib/ld.so.1");
+-    else if (ToolChain.getArch() == llvm::Triple::mips64 ||
+-             ToolChain.getArch() == llvm::Triple::mips64el) {
+-      if (hasMipsN32ABIArg(Args))
+-        CmdArgs.push_back("/lib32/ld.so.1");
+-      else
+-        CmdArgs.push_back("/lib64/ld.so.1");
+-    }
+-    else if (ToolChain.getArch() == llvm::Triple::ppc)
+-      CmdArgs.push_back("/lib/ld.so.1");
+-    else if (ToolChain.getArch() == llvm::Triple::ppc64)
+-      CmdArgs.push_back("/lib64/ld64.so.1");
+-    else
+-      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
+   }
+ 
+   CmdArgs.push_back("-o");
+diff -Naur clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp
+--- clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp	2012-10-24 12:19:39.000000000 -0400
++++ clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp	2013-01-22 14:20:32.803925775 -0500
+@@ -221,8 +221,6 @@
+     case llvm::Triple::Bitrig:
+       break;
+     default:
+-      // FIXME: temporary hack: hard-coded paths.
+-      AddPath("/usr/local/include", System, true, false, false);
+       break;
+     }
+   }
+@@ -330,8 +328,6 @@
+     break;
+   }
+ 
+-  if ( os != llvm::Triple::RTEMS )
+-    AddPath("/usr/include", System, false, false, false);
+ }
+ 
+ void InitHeaderSearch::
diff --git a/pkgs/development/compilers/llvm/3.2/clang.nix b/pkgs/development/compilers/llvm/3.2/clang.nix
new file mode 100644
index 00000000000..c2117798666
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.2/clang.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2 }:
+
+let
+  version = "3.2";
+  gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc;
+in
+
+stdenv.mkDerivation {
+  name = "clang-${version}";
+
+  buildInputs = [ perl llvm groff cmake libxml2 ];
+
+  patches = stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch;
+
+  cmakeFlags = [
+    "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DLLVM_TARGETS_TO_BUILD=all"
+    "-DGCC_INSTALL_PREFIX=${gccReal}"
+  ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [
+    "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/"
+  ];
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+      url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz";
+      sha256 = "0n2nzw3pw2v7fk67f2k2qyzd9wibvi3i5j7cjzz1csqgghzz1aia";
+  };
+
+  passthru = { gcc = stdenv.gcc.gcc; };
+
+  meta = {
+    homepage = http://clang.llvm.org/;
+    description = "A C language family frontend for LLVM";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric shlevy];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/3.2/default.nix b/pkgs/development/compilers/llvm/3.2/default.nix
new file mode 100644
index 00000000000..59e2bdc5509
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.2/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, perl, groff, cmake, python, libffi }:
+
+let version = "3.2"; in
+
+stdenv.mkDerivation {
+  name = "llvm-${version}";
+
+  src = fetchurl {
+    url    = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
+    sha256 = "0hv30v5l4fkgyijs56sr1pbrlzgd674pg143x7az2h37sb290l0j";
+  };
+
+  patches = [ ./set_soname.patch ]; # http://llvm.org/bugs/show_bug.cgi?id=12334
+  patchFlags = "-p0";
+
+  preConfigure = "patchShebangs .";
+
+  propagatedBuildInputs = [ libffi ];
+  buildInputs = [ perl groff cmake python ]; # ToDo: polly, libc++; enable cxx11?
+
+  # created binaries need to be run before installation... I coudn't find a better way
+  preBuild = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/lib'';
+
+  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_SHARED_LIBS=ON" ];
+
+  enableParallelBuilding = true;
+  #doCheck = true; # tests are broken, don't know why
+
+  meta = {
+    homepage = http://llvm.org/;
+    description = "Collection of modular and reusable compiler and toolchain technologies";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric shlevy raskin];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/3.2/set_soname.patch b/pkgs/development/compilers/llvm/3.2/set_soname.patch
new file mode 100644
index 00000000000..69ba74dddad
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.2/set_soname.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/show_bug.cgi?id=409267
+http://llvm.org/bugs/show_bug.cgi?id=12334
+--- tools/llvm-shlib/Makefile.orig	2012-03-26 18:14:13.071797115 +0200
++++ tools/llvm-shlib/Makefile	2012-03-26 17:31:12.491196254 +0200
+@@ -67,6 +67,7 @@
+     # Include everything from the .a's into the shared library.
+     LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \
+                        -Wl,--no-whole-archive
++    LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT)
+ endif
+ 
+ ifeq ($(HOST_OS),Linux)
diff --git a/pkgs/development/compilers/llvm/3.3/clang-purity.patch b/pkgs/development/compilers/llvm/3.3/clang-purity.patch
new file mode 100644
index 00000000000..e82305189e8
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.3/clang-purity.patch
@@ -0,0 +1,162 @@
+diff -Naur cfe-3.3.src-orig/lib/Driver/ToolChains.cpp cfe-3.3.src/lib/Driver/ToolChains.cpp
+--- cfe-3.3.src-orig/lib/Driver/ToolChains.cpp	2013-05-06 12:26:41.000000000 -0400
++++ cfe-3.3.src/lib/Driver/ToolChains.cpp	2013-06-21 19:28:12.120364372 -0400
+@@ -2318,17 +2318,6 @@
+                       Paths);
+     }
+   }
+-  addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths);
+-  addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths);
+-  addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
+-  addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths);
+-
+-  // Try walking via the GCC triple path in case of multiarch GCC
+-  // installations with strange symlinks.
+-  if (GCCInstallation.isValid())
+-    addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
+-                    "/../../" + Multilib, Paths);
+-
+   // Add the non-multilib suffixed paths (if potentially different).
+   if (GCCInstallation.isValid()) {
+     const std::string &LibPath = GCCInstallation.getParentLibPath();
+@@ -2341,8 +2330,6 @@
+       addPathIfExists(LibPath, Paths);
+     }
+   }
+-  addPathIfExists(SysRoot + "/lib", Paths);
+-  addPathIfExists(SysRoot + "/usr/lib", Paths);
+ 
+   IsPIEDefault = SanitizerArgs(*this, Args).hasZeroBaseShadow();
+ }
+@@ -2395,9 +2382,6 @@
+   if (DriverArgs.hasArg(options::OPT_nostdinc))
+     return;
+ 
+-  if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
+-    addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include");
+-
+   if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
+     llvm::sys::Path P(D.ResourceDir);
+     P.appendComponent("include");
+@@ -2479,26 +2463,6 @@
+     "/usr/include/powerpc64-linux-gnu"
+   };
+   ArrayRef<StringRef> MultiarchIncludeDirs;
+-  if (getTriple().getArch() == llvm::Triple::x86_64) {
+-    MultiarchIncludeDirs = X86_64MultiarchIncludeDirs;
+-  } else if (getTriple().getArch() == llvm::Triple::x86) {
+-    MultiarchIncludeDirs = X86MultiarchIncludeDirs;
+-  } else if (getTriple().getArch() == llvm::Triple::aarch64) {
+-    MultiarchIncludeDirs = AArch64MultiarchIncludeDirs;
+-  } else if (getTriple().getArch() == llvm::Triple::arm) {
+-    if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
+-      MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs;
+-    else
+-      MultiarchIncludeDirs = ARMMultiarchIncludeDirs;
+-  } else if (getTriple().getArch() == llvm::Triple::mips) {
+-    MultiarchIncludeDirs = MIPSMultiarchIncludeDirs;
+-  } else if (getTriple().getArch() == llvm::Triple::mipsel) {
+-    MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs;
+-  } else if (getTriple().getArch() == llvm::Triple::ppc) {
+-    MultiarchIncludeDirs = PPCMultiarchIncludeDirs;
+-  } else if (getTriple().getArch() == llvm::Triple::ppc64) {
+-    MultiarchIncludeDirs = PPC64MultiarchIncludeDirs;
+-  }
+   for (ArrayRef<StringRef>::iterator I = MultiarchIncludeDirs.begin(),
+                                      E = MultiarchIncludeDirs.end();
+        I != E; ++I) {
+@@ -2510,13 +2474,6 @@
+ 
+   if (getTriple().getOS() == llvm::Triple::RTEMS)
+     return;
+-
+-  // Add an include of '/include' directly. This isn't provided by default by
+-  // system GCCs, but is often used with cross-compiling GCCs, and harmless to
+-  // add even when Clang is acting as-if it were a system compiler.
+-  addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/include");
+-
+-  addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include");
+ }
+ 
+ /// \brief Helper to add the three variant paths for a libstdc++ installation.
+diff -Naur cfe-3.3.src-orig/lib/Driver/Tools.cpp cfe-3.3.src/lib/Driver/Tools.cpp
+--- cfe-3.3.src-orig/lib/Driver/Tools.cpp	2013-05-30 14:01:30.000000000 -0400
++++ cfe-3.3.src/lib/Driver/Tools.cpp	2013-06-21 19:30:51.604726574 -0400
+@@ -5976,43 +5976,6 @@
+     }
+   }
+ 
+-  if (ToolChain.getArch() == llvm::Triple::arm ||
+-      ToolChain.getArch() == llvm::Triple::thumb ||
+-      (!Args.hasArg(options::OPT_static) &&
+-       !Args.hasArg(options::OPT_shared))) {
+-    CmdArgs.push_back("-dynamic-linker");
+-    if (isAndroid)
+-      CmdArgs.push_back("/system/bin/linker");
+-    else if (ToolChain.getArch() == llvm::Triple::x86)
+-      CmdArgs.push_back("/lib/ld-linux.so.2");
+-    else if (ToolChain.getArch() == llvm::Triple::aarch64)
+-      CmdArgs.push_back("/lib/ld-linux-aarch64.so.1");
+-    else if (ToolChain.getArch() == llvm::Triple::arm ||
+-             ToolChain.getArch() == llvm::Triple::thumb) {
+-      if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
+-        CmdArgs.push_back("/lib/ld-linux-armhf.so.3");
+-      else
+-        CmdArgs.push_back("/lib/ld-linux.so.3");
+-    }
+-    else if (ToolChain.getArch() == llvm::Triple::mips ||
+-             ToolChain.getArch() == llvm::Triple::mipsel)
+-      CmdArgs.push_back("/lib/ld.so.1");
+-    else if (ToolChain.getArch() == llvm::Triple::mips64 ||
+-             ToolChain.getArch() == llvm::Triple::mips64el) {
+-      if (hasMipsN32ABIArg(Args))
+-        CmdArgs.push_back("/lib32/ld.so.1");
+-      else
+-        CmdArgs.push_back("/lib64/ld.so.1");
+-    }
+-    else if (ToolChain.getArch() == llvm::Triple::ppc)
+-      CmdArgs.push_back("/lib/ld.so.1");
+-    else if (ToolChain.getArch() == llvm::Triple::ppc64 ||
+-	     ToolChain.getArch() == llvm::Triple::systemz)
+-      CmdArgs.push_back("/lib64/ld64.so.1");
+-    else
+-      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
+-  }
+-
+   CmdArgs.push_back("-o");
+   CmdArgs.push_back(Output.getFilename());
+ 
+diff -Naur cfe-3.3.src-orig/lib/Frontend/InitHeaderSearch.cpp cfe-3.3.src/lib/Frontend/InitHeaderSearch.cpp
+--- cfe-3.3.src-orig/lib/Frontend/InitHeaderSearch.cpp	2013-04-29 21:21:43.000000000 -0400
++++ cfe-3.3.src/lib/Frontend/InitHeaderSearch.cpp	2013-06-21 19:32:47.627016565 -0400
+@@ -225,20 +225,6 @@
+                                             const HeaderSearchOptions &HSOpts) {
+   llvm::Triple::OSType os = triple.getOS();
+ 
+-  if (HSOpts.UseStandardSystemIncludes) {
+-    switch (os) {
+-    case llvm::Triple::FreeBSD:
+-    case llvm::Triple::NetBSD:
+-    case llvm::Triple::OpenBSD:
+-    case llvm::Triple::Bitrig:
+-      break;
+-    default:
+-      // FIXME: temporary hack: hard-coded paths.
+-      AddPath("/usr/local/include", System, false);
+-      break;
+-    }
+-  }
+-
+   // Builtin includes use #include_next directives and should be positioned
+   // just prior C include dirs.
+   if (HSOpts.UseBuiltinIncludes) {
+@@ -332,9 +318,6 @@
+   default:
+     break;
+   }
+-
+-  if ( os != llvm::Triple::RTEMS )
+-    AddPath("/usr/include", ExternCSystem, false);
+ }
+ 
+ void InitHeaderSearch::
diff --git a/pkgs/development/compilers/llvm/3.3/clang-tablegen-dir.patch b/pkgs/development/compilers/llvm/3.3/clang-tablegen-dir.patch
new file mode 100644
index 00000000000..de6a468b239
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.3/clang-tablegen-dir.patch
@@ -0,0 +1,9 @@
+--- a/utils/TableGen/CMakeLists.txt       (revision 190146)
++++ b/utils/TableGen/CMakeLists.txt       (working copy)
+@@ -1,4 +1,5 @@
+ set(LLVM_LINK_COMPONENTS Support)
++set(LLVM_TOOLS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+ 
+ add_tablegen(clang-tblgen CLANG
+   ClangASTNodesEmitter.cpp
+
diff --git a/pkgs/development/compilers/llvm/3.3/clang.nix b/pkgs/development/compilers/llvm/3.3/clang.nix
new file mode 100644
index 00000000000..8c178c9ce03
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.3/clang.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2, python }:
+
+let
+  version = "3.3";
+  gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc;
+in
+
+stdenv.mkDerivation {
+  name = "clang-${version}";
+
+  buildInputs = [ perl llvm groff cmake libxml2 python ];
+
+  patches = [ ./clang-tablegen-dir.patch ] ++
+            stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch;
+
+  cmakeFlags = [
+    "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DLLVM_TARGETS_TO_BUILD=all"
+    "-DGCC_INSTALL_PREFIX=${gccReal}"
+  ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [
+    "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/"
+  ];
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+      url = "http://llvm.org/releases/${version}/cfe-${version}.src.tar.gz";
+      sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi";
+  };
+
+  passthru = { gcc = stdenv.gcc.gcc; };
+
+  meta = {
+    homepage = http://clang.llvm.org/;
+    description = "A C language family frontend for LLVM";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric shlevy];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
-- 
GitLab


From 51a4bf7ae0aa2f77131a0e6f4716d74b361485c5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 26 Jan 2014 13:20:24 -0500
Subject: [PATCH 0560/3789] Fix haskellPackages.llvmGeneral build

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 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 6115c4de684..ff06573af55 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1550,7 +1550,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   ListZipper = callPackage ../development/libraries/haskell/ListZipper {};
 
   llvmGeneral = callPackage ../development/libraries/haskell/llvm-general {
-    llvmConfig = pkgs.llvm;
+    # !!! llvm-general pre-release supports 3.4...
+    llvmConfig = pkgs.llvm_33;
   };
 
   llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {};
-- 
GitLab


From 66e789d199cd03704db10bd2163f24756b74baf5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 26 Jan 2014 13:41:13 -0500
Subject: [PATCH 0561/3789] trifecta-1.1: Fix compilation with new blaze

Note that jailbreak-cabal breaks the cabal file for trifecta (cc @peti)

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/libraries/haskell/trifecta/1.1.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/trifecta/1.1.nix b/pkgs/development/libraries/haskell/trifecta/1.1.nix
index 98772476fc0..67c3ae28d58 100644
--- a/pkgs/development/libraries/haskell/trifecta/1.1.nix
+++ b/pkgs/development/libraries/haskell/trifecta/1.1.nix
@@ -16,7 +16,8 @@ cabal.mkDerivation (self: {
   testDepends = [ doctest filepath ];
   postPatch = ''
     substituteInPlace trifecta.cabal \
-      --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.7," \
+      --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.8," \
+      --replace "blaze-markup         >= 0.5     && < 0.6," "blaze-markup         >= 0.5     && < 0.7," \
       --replace "hashable             >= 1.2     && < 1.3," "hashable             >= 1.1     && < 1.3," \
       --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2," \
       --replace "comonad              == 3.*,"              "comonad              >= 3       && < 5," \
-- 
GitLab


From 3901d21c80f16ddf789fbdad5748eee99b1799f5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 26 Jan 2014 13:54:11 -0500
Subject: [PATCH 0562/3789] Idris: Build with llvm backend and libffi support

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/compilers/idris/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index 4609dd0b442..c143e2cdcb2 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -2,7 +2,7 @@
 , deepseq, filepath, gmp, happy, haskeline, languageJava, mtl
 , network, parsers, split, text, time, transformers, trifecta
 , unorderedContainers, utf8String, vector, vectorBinaryInstances
-, xml
+, xml, llvmGeneral, libffi
 }:
 
 cabal.mkDerivation (self: {
@@ -15,10 +15,11 @@ cabal.mkDerivation (self: {
     ansiTerminal ansiWlPprint binary Cabal deepseq filepath haskeline
     languageJava mtl network parsers split text time transformers
     trifecta unorderedContainers utf8String vector
-    vectorBinaryInstances xml
+    vectorBinaryInstances xml llvmGeneral
   ];
   buildTools = [ happy ];
-  extraLibraries = [ boehmgc gmp ];
+  extraLibraries = [ boehmgc gmp libffi ];
+  configureFlags = [ "-f" "llvm" "-f" "gmp" "-f" "ffi" ];
   meta = {
     homepage = "http://www.idris-lang.org/";
     description = "Functional Programming Language with Dependent Types";
-- 
GitLab


From b5a560d76adbde569d83aee17909a50202efc0bd Mon Sep 17 00:00:00 2001
From: Vladimir Still <xstill@fi.muni.cz>
Date: Sun, 26 Jan 2014 20:42:12 +0100
Subject: [PATCH 0563/3789] llvm: Enable also building of LLVM 3.[12] & Clang
 3.[123].

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e61452e1f54..93ecb39ed41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2304,6 +2304,18 @@ let
 
   clang = wrapClang llvmPackages.clang;
 
+  clang_34 = wrapClang llvmPackages.clang;
+  clang_33 = wrapClang (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix);
+  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);
+
+  clangUnwrapped = llvm: pkg: callPackage pkg {
+      stdenv = if stdenv.isDarwin
+         then stdenvAdapters.overrideGCC stdenv gccApple
+         else stdenvAdapters.overrideGCC stdenv gcc48;
+      llvm = llvm;
+  };
+
   clangSelf = clangWrapSelf llvmPackagesSelf.clang;
 
   clangWrapSelf = build: (import ../build-support/clang-wrapper) {
@@ -2764,11 +2776,18 @@ let
   lessc = callPackage ../development/compilers/lessc { };
 
   llvm = llvmPackages.llvm;
-  llvm_33 = callPackage ../development/compilers/llvm/3.3/llvm.nix {
+
+  llvm_34 = llvmPackages.llvm;
+  llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix;
+  llvm_32 = llvm_v ../development/compilers/llvm/3.2;
+  llvm_31 = llvm_v ../development/compilers/llvm/3.1;
+
+  llvm_v = path: callPackage path {
     stdenv = if stdenv.isDarwin
       then stdenvAdapters.overrideGCC stdenv gccApple
       else stdenv;
   };
+
   llvmPackages = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { inherit newScope stdenv fetchurl; isl = isl_0_12; });
   llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; };
 
-- 
GitLab


From 69af3f4a7875087c4659e573488f4a61845cea2f Mon Sep 17 00:00:00 2001
From: Vladimir Still <xstill@fi.muni.cz>
Date: Sun, 26 Jan 2014 22:51:58 +0100
Subject: [PATCH 0564/3789] clang_31: Allow clang to find system includes in
 gcc dirs. Backported fix.

---
 pkgs/development/compilers/llvm/3.1/clang.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.1/clang.nix b/pkgs/development/compilers/llvm/3.1/clang.nix
index 48e4c4946f3..8e67583c54a 100644
--- a/pkgs/development/compilers/llvm/3.1/clang.nix
+++ b/pkgs/development/compilers/llvm/3.1/clang.nix
@@ -1,6 +1,9 @@
 { stdenv, fetchurl, perl, groff, llvm, cmake }:
 
-let version = "3.1"; in
+let
+  version = "3.1";
+  gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc;
+in
 
 stdenv.mkDerivation {
   name = "clang-${version}";
@@ -14,6 +17,7 @@ stdenv.mkDerivation {
     "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
     "-DCMAKE_BUILD_TYPE=Release"
     "-DLLVM_TARGETS_TO_BUILD=all"
+    "-DGCC_INSTALL_PREFIX=${gccReal}"
   ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [
     "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/"
   ];
@@ -31,7 +35,7 @@ stdenv.mkDerivation {
     homepage = http://clang.llvm.org/;
     description = "A C language family frontend for LLVM";
     license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric shlevy];
+    maintainers = with stdenv.lib.maintainers; [viric shlevy vlstill];
     platforms = with stdenv.lib.platforms; all;
   };
 }
-- 
GitLab


From 3209170626f760d0c093969ccbadabca475b9d62 Mon Sep 17 00:00:00 2001
From: Vladimir Still <xstill@fi.muni.cz>
Date: Sun, 26 Jan 2014 22:53:27 +0100
Subject: [PATCH 0565/3789] LLVM: Allow building gold plugins together with
 llvm 3.{1,2}.

---
 pkgs/development/compilers/llvm/3.1/default.nix |  9 ++++++---
 pkgs/development/compilers/llvm/3.2/default.nix | 10 +++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.1/default.nix b/pkgs/development/compilers/llvm/3.1/default.nix
index 204c080b871..81c0dea97c5 100644
--- a/pkgs/development/compilers/llvm/3.1/default.nix
+++ b/pkgs/development/compilers/llvm/3.1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, groff, cmake, python }:
+{ stdenv, fetchurl, perl, groff, cmake, python, binutils }:
 
 let version = "3.1"; in
 
@@ -12,7 +12,10 @@ stdenv.mkDerivation {
 
   buildInputs = [ perl groff cmake python ];
 
-  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
+  ];
 
   enableParallelBuilding = true;
 
@@ -20,7 +23,7 @@ stdenv.mkDerivation {
     homepage = http://llvm.org/;
     description = "Collection of modular and reusable compiler and toolchain technologies";
     license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric shlevy raskin];
+    maintainers = with stdenv.lib.maintainers; [viric shlevy raskin vlstill];
     platforms = with stdenv.lib.platforms; all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.2/default.nix b/pkgs/development/compilers/llvm/3.2/default.nix
index 59e2bdc5509..e29722f3ca9 100644
--- a/pkgs/development/compilers/llvm/3.2/default.nix
+++ b/pkgs/development/compilers/llvm/3.2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, groff, cmake, python, libffi }:
+{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils }:
 
 let version = "3.2"; in
 
@@ -21,7 +21,11 @@ stdenv.mkDerivation {
   # created binaries need to be run before installation... I coudn't find a better way
   preBuild = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/lib'';
 
-  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_SHARED_LIBS=ON" ];
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
+  ];
 
   enableParallelBuilding = true;
   #doCheck = true; # tests are broken, don't know why
@@ -30,7 +34,7 @@ stdenv.mkDerivation {
     homepage = http://llvm.org/;
     description = "Collection of modular and reusable compiler and toolchain technologies";
     license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric shlevy raskin];
+    maintainers = with stdenv.lib.maintainers; [viric shlevy raskin vlstill];
     platforms = with stdenv.lib.platforms; all;
   };
 }
-- 
GitLab


From cc33c351b880be5a208de1b84282076a11a965e9 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 24 Jan 2014 14:39:43 +0100
Subject: [PATCH 0566/3789] Add docker

---
 .../virtualization/docker/default.nix         | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/applications/virtualization/docker/default.nix

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
new file mode 100644
index 00000000000..b718d89c8c7
--- /dev/null
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, iptables, lvm2
+, bash}:
+
+stdenv.mkDerivation rec {
+  name = "docker-${version}";
+  version = "0.7.6";
+
+  src = fetchurl {
+    url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz";
+    sha256 = "0anlzba2vm1fs5nf0dl2svrgj3ddsbl5iyhsm8vfbi3f23vppkfv";
+  };
+
+  phases = ["unpackPhase" "preBuild" "buildPhase" "installPhase"];
+
+  buildInputs = [ makeWrapper go sqlite lxc iproute lvm2 iptables ];
+
+  preBuild = ''
+    patchShebangs ./hack
+  '';
+
+  buildPhase = ''
+    mkdir -p src/github.com/dotcloud
+    ln -sn "../../../" "src/github.com/dotcloud/docker"
+    export GOPATH="$(pwd):$(pwd)/vendor"
+    export DOCKER_GITCOMMIT="bc3b2ec0622f50879ae96f042056b6bd2e0b4fba"
+    export DOCKER_INITPATH="$out/libexec/docker/dockerinit"
+    ./hack/make.sh dynbinary
+  '';
+
+  installPhase = ''
+    install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/bin/docker
+    install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit
+    wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:${lvm2}:sbin:${lxc}/bin:${iptables}/sbin"
+
+    # systemd
+    install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
+
+    # completion
+    install -Dm644 ./contrib/completion/bash/docker $out/share/bash-completion/completions/docker
+    install -Dm644 ./contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.docker.io/;
+    description = "An open source project to pack, ship and run any application as a lightweight container";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ offline ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ee74ee90e1..80fb5616f1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6369,6 +6369,7 @@ let
 
   apparmor = callPackage ../os-specific/linux/apparmor {
     inherit (perlPackages) LocaleGettext TermReadKey RpcXML;
+    bison = bison2;
   };
 
   atop = callPackage ../os-specific/linux/atop { };
@@ -7519,6 +7520,8 @@ let
     inherit (xlibs) libX11;
   };
 
+  docker = callPackage ../applications/virtualization/docker { };
+
   doodle = callPackage ../applications/search/doodle { };
 
   dunst = callPackage ../applications/misc/dunst { };
-- 
GitLab


From c0e93ca39d30fc5ace819040e2a25ef323e8bb36 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 26 Jan 2014 21:01:13 -0500
Subject: [PATCH 0567/3789] Unmaintain old llvm versions

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/compilers/llvm/3.1/clang.nix   | 2 +-
 pkgs/development/compilers/llvm/3.1/default.nix | 2 +-
 pkgs/development/compilers/llvm/3.2/clang.nix   | 2 +-
 pkgs/development/compilers/llvm/3.2/default.nix | 2 +-
 pkgs/development/compilers/llvm/3.3/clang.nix   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.1/clang.nix b/pkgs/development/compilers/llvm/3.1/clang.nix
index 8e67583c54a..c152d2215d8 100644
--- a/pkgs/development/compilers/llvm/3.1/clang.nix
+++ b/pkgs/development/compilers/llvm/3.1/clang.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     homepage = http://clang.llvm.org/;
     description = "A C language family frontend for LLVM";
     license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric shlevy vlstill];
+    maintainers = with stdenv.lib.maintainers; [viric vlstill];
     platforms = with stdenv.lib.platforms; all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.1/default.nix b/pkgs/development/compilers/llvm/3.1/default.nix
index 81c0dea97c5..60837d58b29 100644
--- a/pkgs/development/compilers/llvm/3.1/default.nix
+++ b/pkgs/development/compilers/llvm/3.1/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     homepage = http://llvm.org/;
     description = "Collection of modular and reusable compiler and toolchain technologies";
     license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric shlevy raskin vlstill];
+    maintainers = with stdenv.lib.maintainers; [viric raskin vlstill];
     platforms = with stdenv.lib.platforms; all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.2/clang.nix b/pkgs/development/compilers/llvm/3.2/clang.nix
index c2117798666..b8e9f946773 100644
--- a/pkgs/development/compilers/llvm/3.2/clang.nix
+++ b/pkgs/development/compilers/llvm/3.2/clang.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     homepage = http://clang.llvm.org/;
     description = "A C language family frontend for LLVM";
     license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric shlevy];
+    maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.2/default.nix b/pkgs/development/compilers/llvm/3.2/default.nix
index e29722f3ca9..c373f1c1a4a 100644
--- a/pkgs/development/compilers/llvm/3.2/default.nix
+++ b/pkgs/development/compilers/llvm/3.2/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     homepage = http://llvm.org/;
     description = "Collection of modular and reusable compiler and toolchain technologies";
     license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric shlevy raskin vlstill];
+    maintainers = with stdenv.lib.maintainers; [viric raskin vlstill];
     platforms = with stdenv.lib.platforms; all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.3/clang.nix b/pkgs/development/compilers/llvm/3.3/clang.nix
index 8c178c9ce03..262e0bff248 100644
--- a/pkgs/development/compilers/llvm/3.3/clang.nix
+++ b/pkgs/development/compilers/llvm/3.3/clang.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     homepage = http://clang.llvm.org/;
     description = "A C language family frontend for LLVM";
     license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric shlevy];
+    maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; all;
   };
 }
-- 
GitLab


From fd796ed69a874fbb1a58d4c46b71f2a3830c8024 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:39:14 +0100
Subject: [PATCH 0568/3789] haskell-highlighting-kate: re-generate with
 cabal2nix

---
 .../development/libraries/haskell/highlighting-kate/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index a2db6032675..863a0441b02 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -7,8 +7,8 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];
-  prePatch = "sed -i -e 's|regex-pcre-builtin|regex-pcre|' highlighting-kate.cabal";
   jailbreak = true;
+  prePatch = "sed -i -e 's|regex-pcre-builtin|regex-pcre|' highlighting-kate.cabal";
   meta = {
     homepage = "http://github.com/jgm/highlighting-kate";
     description = "Syntax highlighting";
-- 
GitLab


From a2d8fccdfe69499dc2361823c8c40a1a61a56dae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:39:25 +0100
Subject: [PATCH 0569/3789] haskell-happstack-server: re-generate with
 cabal2nix

---
 .../libraries/haskell/happstack/happstack-server.nix            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index 8b2bec395fc..4d773603c04 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -16,8 +16,8 @@ cabal.mkDerivation (self: {
     utf8String xhtml zlib
   ];
   testDepends = [ HUnit parsec zlib ];
-  doCheck = false;
   jailbreak = true;
+  doCheck = false;
   meta = {
     homepage = "http://happstack.com";
     description = "Web related tools and services";
-- 
GitLab


From 666cfebff1f237be8e7ee75ede0b080a75b18580 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:49:20 +0100
Subject: [PATCH 0570/3789] idris: re-generate with cabal2nix

---
 pkgs/development/compilers/idris/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index c143e2cdcb2..10aa5ba4e07 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -1,8 +1,8 @@
 { cabal, ansiTerminal, ansiWlPprint, binary, boehmgc, Cabal
-, deepseq, filepath, gmp, happy, haskeline, languageJava, mtl
-, network, parsers, split, text, time, transformers, trifecta
-, unorderedContainers, utf8String, vector, vectorBinaryInstances
-, xml, llvmGeneral, libffi
+, deepseq, filepath, gmp, happy, haskeline, languageJava, libffi
+, llvmGeneral, llvmGeneralPure, mtl, network, parsers, split, text
+, time, transformers, trifecta, unorderedContainers, utf8String
+, vector, vectorBinaryInstances, xml
 }:
 
 cabal.mkDerivation (self: {
@@ -13,13 +13,13 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [
     ansiTerminal ansiWlPprint binary Cabal deepseq filepath haskeline
-    languageJava mtl network parsers split text time transformers
-    trifecta unorderedContainers utf8String vector
-    vectorBinaryInstances xml llvmGeneral
+    languageJava libffi llvmGeneral llvmGeneralPure mtl network parsers
+    split text time transformers trifecta unorderedContainers
+    utf8String vector vectorBinaryInstances xml
   ];
   buildTools = [ happy ];
-  extraLibraries = [ boehmgc gmp libffi ];
-  configureFlags = [ "-f" "llvm" "-f" "gmp" "-f" "ffi" ];
+  extraLibraries = [ boehmgc gmp ];
+  configureFlags = "-fllvm -fgmp -fffi";
   meta = {
     homepage = "http://www.idris-lang.org/";
     description = "Functional Programming Language with Dependent Types";
-- 
GitLab


From ab46db003ca5a05ec93f6686035180a2da96415e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:49:33 +0100
Subject: [PATCH 0571/3789] trifecta-1.2: re-generate with cabal2nix

---
 pkgs/development/libraries/haskell/trifecta/1.2.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/trifecta/1.2.nix b/pkgs/development/libraries/haskell/trifecta/1.2.nix
index 8181c445a5a..447e0d36c9c 100644
--- a/pkgs/development/libraries/haskell/trifecta/1.2.nix
+++ b/pkgs/development/libraries/haskell/trifecta/1.2.nix
@@ -16,7 +16,8 @@ cabal.mkDerivation (self: {
   testDepends = [ doctest filepath ];
   postPatch = ''
     substituteInPlace trifecta.cabal \
-      --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.7," \
+      --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.8," \
+      --replace "blaze-markup         >= 0.5     && < 0.6," "blaze-markup         >= 0.5     && < 0.7," \
       --replace "hashable             >= 1.2     && < 1.3," "hashable             >= 1.1     && < 1.3," \
       --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2," \
       --replace "comonad              == 3.*,"              "comonad              >= 3       && < 5," \
-- 
GitLab


From 5898d854da459526ef032db1ad081a6eebbd772d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jan 2014 13:51:22 +0100
Subject: [PATCH 0572/3789] junixsocket: Ensure that the native library can be
 found

---
 pkgs/development/libraries/java/junixsocket/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix
index a23de5d98c6..911cc6dd40d 100644
--- a/pkgs/development/libraries/java/junixsocket/default.nix
+++ b/pkgs/development/libraries/java/junixsocket/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   preConfigure =
     ''
       sed -i 's|/usr/bin/||' build.xml
+      substituteInPlace src/main/org/newsclub/net/unix/NativeUnixSocketConfig.java \
+        --replace /opt/newsclub/lib-native $out/lib
     '';
 
   buildPhase = "ant";
-- 
GitLab


From cb3f3ad35befe884ab031cf23680770d8e96887e Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 27 Jan 2014 14:19:22 +0000
Subject: [PATCH 0573/3789] haskellPackages.fay: New expression

---
 .../libraries/haskell/fay/default.nix         | 30 +++++++++++++++++++
 .../libraries/haskell/sourcemap/default.nix   | 17 +++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 +++
 3 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/fay/default.nix
 create mode 100644 pkgs/development/libraries/haskell/sourcemap/default.nix

diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix
new file mode 100644
index 00000000000..d7c8ba5a447
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fay/default.nix
@@ -0,0 +1,30 @@
+{ cabal, aeson, attoparsec, Cabal, cpphs, dataDefault, filepath
+, ghcPaths, haskellNames, haskellPackages, haskellSrcExts, HUnit
+, languageEcmascript, mtl, optparseApplicative, prettyShow, safe
+, sourcemap, split, syb, testFramework, testFrameworkHunit
+, testFrameworkTh, text, time, uniplate, unorderedContainers
+, utf8String, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "fay";
+  version = "0.18.1.3";
+  sha256 = "1m747l2555w1jkdwh8b851mxvngiy7l7sbkwvm2il6k5ygcz5gbv";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson attoparsec Cabal cpphs dataDefault filepath ghcPaths
+    haskellNames haskellPackages haskellSrcExts HUnit
+    languageEcmascript mtl optparseApplicative prettyShow safe
+    sourcemap split syb testFramework testFrameworkHunit
+    testFrameworkTh text time uniplate unorderedContainers utf8String
+    vector
+  ];
+  meta = {
+    homepage = "http://fay-lang.org/";
+    description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/sourcemap/default.nix b/pkgs/development/libraries/haskell/sourcemap/default.nix
new file mode 100644
index 00000000000..602654b0a01
--- /dev/null
+++ b/pkgs/development/libraries/haskell/sourcemap/default.nix
@@ -0,0 +1,17 @@
+{ cabal, aeson, attoparsec, text, unorderedContainers, utf8String
+}:
+
+cabal.mkDerivation (self: {
+  pname = "sourcemap";
+  version = "0.1.2.0";
+  sha256 = "040j2k1cwzlq5pybs6cg7wmf0x5i22zdidv2xvzdvgi5v7gf6kp1";
+  buildDepends = [
+    aeson attoparsec text unorderedContainers utf8String
+  ];
+  meta = {
+    description = "Implementation of source maps as proposed by Google and Mozilla";
+    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 ff06573af55..3dab134935f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1036,6 +1036,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   executablePath = callPackage ../development/libraries/haskell/executable-path {};
 
+  fay = callPackage ../development/libraries/haskell/fay {};
+
   filepath_1_3_0_0 = callPackage ../development/libraries/haskell/filepath {};
   filepath = null; # a core package in recent GHCs
 
@@ -2175,6 +2177,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   socketActivation = callPackage ../development/libraries/haskell/socket-activation {};
 
+  sourcemap = callPackage ../development/libraries/haskell/sourcemap {};
+
   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;
-- 
GitLab


From e9b02facfccce759879235464dfe2372d6142e7a Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 27 Jan 2014 14:21:56 +0000
Subject: [PATCH 0574/3789] haskellPackages.fayBase: New expression

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

diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix
new file mode 100644
index 00000000000..8e1212f5e5a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fay-base/default.nix
@@ -0,0 +1,15 @@
+{ cabal, fay }:
+
+cabal.mkDerivation (self: {
+  pname = "fay-base";
+  version = "0.18.0.0";
+  sha256 = "010zjcs4y0zdb4gijrw10sjc56i271s35bkwg5c0lblyr62nml0s";
+  buildDepends = [ fay ];
+  meta = {
+    homepage = "https://github.com/faylang/fay-base";
+    description = "The base package for Fay";
+    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 3dab134935f..2d09aa60b0c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1037,6 +1037,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   executablePath = callPackage ../development/libraries/haskell/executable-path {};
 
   fay = callPackage ../development/libraries/haskell/fay {};
+  fayBase = callPackage ../development/libraries/haskell/fay-base {};
 
   filepath_1_3_0_0 = callPackage ../development/libraries/haskell/filepath {};
   filepath = null; # a core package in recent GHCs
-- 
GitLab


From 4ae9de41ff95dd45fdae879f81791f61c4026d52 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Mon, 27 Jan 2014 17:25:57 +0200
Subject: [PATCH 0575/3789] youtubeDL: update from 2014.01.23.1 to 2014.01.23.4

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 1e8f9fd292d..40a2f7f481d 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.01.23.1";
+  version = "2014.01.23.4";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "07nzwjw3m63w53fk2chmv4dpq71h4k0kx02x6hzsb28bc89v06nr";
+    sha256 = "0wnw11s3k191wqf3h13ibdbkgdyabv3gigsjk5xq3sqswlmmcvd9";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From 1348aa5c4263bf6e18b7c1ff2cd4b7f8acfc8575 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jan 2014 15:45:18 +0100
Subject: [PATCH 0576/3789] rfkill: Update to 0.5

---
 pkgs/os-specific/linux/rfkill/default.nix    | 8 ++++----
 pkgs/os-specific/linux/rfkill/rfkill-hook.sh | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/rfkill/default.nix b/pkgs/os-specific/linux/rfkill/default.nix
index 0e0f5a3ff0c..48be4fbc343 100644
--- a/pkgs/os-specific/linux/rfkill/default.nix
+++ b/pkgs/os-specific/linux/rfkill/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "rfkill-0.4";
-  
+  name = "rfkill-0.5";
+
   src = fetchurl {
-    url = "http://wireless.kernel.org/download/rfkill/${name}.tar.bz2";
-    sha256 = "1hb884vgyldci648azbx17w83gzynn0svrmfjgh3c2jzga1f846a";
+    url = "mirror://kernel/software/network/rfkill/${name}.tar.bz2";
+    sha256 = "01zs7p9kd92pxgcgwl5w46h3iyx4acfg6m1j5fgnflsaa350q5iy";
   };
 
   makeFlags = "PREFIX=$(out)";
diff --git a/pkgs/os-specific/linux/rfkill/rfkill-hook.sh b/pkgs/os-specific/linux/rfkill/rfkill-hook.sh
index d07c7298183..bf6e679660c 100755
--- a/pkgs/os-specific/linux/rfkill/rfkill-hook.sh
+++ b/pkgs/os-specific/linux/rfkill/rfkill-hook.sh
@@ -10,10 +10,10 @@ if [ -z "$RFKILL_STATE" ]; then
   exit 1
 fi
 
-if [ -x /var/run/current-system/etc/rfkill.hook ]; then
-  exec /var/run/current-system/etc/rfkill.hook
+if [ -x /run/current-system/etc/rfkill.hook ]; then
+  exec /run/current-system/etc/rfkill.hook
 elif [ ! -z "$RFKILL_HOOK" ]; then
   exec $RFKILL_HOOK
 else
   echo "rfkill-hook: $RFKILL_STATE"
-fi
\ No newline at end of file
+fi
-- 
GitLab


From 2e70c14061786b6779d16cddde91d34e900c5163 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jan 2014 15:48:30 +0100
Subject: [PATCH 0577/3789] rcs: Update to 5.9.2

---
 pkgs/applications/version-management/rcs/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index 5f88bbc74cc..90bca9b0712 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, ed }:
 
 stdenv.mkDerivation rec {
-  name = "rcs-5.8.2";
+  name = "rcs-5.9.2";
 
   src = fetchurl {
-    url = "mirror://gnu/rcs/${name}.tar.gz";
-    sha256 = "1p4kqqrvc7plc3n6ls4xwp6d3mw1jcx9p36pilwd65q31mgbs07a";
+    url = "mirror://gnu/rcs/${name}.tar.xz";
+    sha256 = "0wdmmplga9k05d9k7wjqv4zb6xvvzsli8hmn206pvangki1g66k5";
   };
 
+  buildInputs = [ ed ];
+
   doCheck = true;
 
   meta = {
-- 
GitLab


From 150ec8f79e697845ae08973b0e20b395a65fa376 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jan 2014 15:54:39 +0100
Subject: [PATCH 0578/3789] wdiff: Update to 1.2.1

---
 pkgs/tools/text/wdiff/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix
index 70b9bf69e29..3981f67aefb 100644
--- a/pkgs/tools/text/wdiff/default.nix
+++ b/pkgs/tools/text/wdiff/default.nix
@@ -1,17 +1,14 @@
-{ stdenv, fetchurl, which, screen }:
+{ stdenv, fetchurl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "wdiff-1.1.2";
+  name = "wdiff-1.2.1";
 
   src = fetchurl {
     url = "mirror://gnu/wdiff/${name}.tar.gz";
-    sha256 = "0q78y5awvjjmsvizqilbpwany62shlmlq2ayxkjbygmdafpk1k8j";
+    sha256 = "1gb5hpiyikada9bwz63q3g96zs383iskiir0xsqynqnvq1vd4n41";
   };
 
-  # Required for the compile-time for the test suite.
-  buildInputs = [ which screen ];
-
-  doCheck = true;
+  buildInputs = [ texinfo ];
 
   meta = {
     homepage = http://www.gnu.org/software/wdiff/;
-- 
GitLab


From 6af7e0e1cdef53ef22590216b79bdcb1f698e319 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 27 Jan 2014 17:01:10 +0000
Subject: [PATCH 0579/3789] haskellPackages.iCalendar: New expression

---
 .../libraries/haskell/iCalendar/default.nix   | 20 +++++++++++++++++++
 .../libraries/haskell/mime/default.nix        | 14 +++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++++
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/iCalendar/default.nix
 create mode 100644 pkgs/development/libraries/haskell/mime/default.nix

diff --git a/pkgs/development/libraries/haskell/iCalendar/default.nix b/pkgs/development/libraries/haskell/iCalendar/default.nix
new file mode 100644
index 00000000000..7244e15c293
--- /dev/null
+++ b/pkgs/development/libraries/haskell/iCalendar/default.nix
@@ -0,0 +1,20 @@
+{ cabal, base64Bytestring, caseInsensitive, dataDefault, mime, mtl
+, network, parsec, text, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "iCalendar";
+  version = "0.3.0.1";
+  sha256 = "0d51rb46vcpb05vsqqmk3w7rymybl3vz8cqs0pw088a52kiy4xc3";
+  buildDepends = [
+    base64Bytestring caseInsensitive dataDefault mime mtl network
+    parsec text time
+  ];
+  meta = {
+    homepage = "http://github.com/tingtun/iCalendar";
+    description = "iCalendar data types, parser, and printer";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/mime/default.nix b/pkgs/development/libraries/haskell/mime/default.nix
new file mode 100644
index 00000000000..37c231d08ff
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mime/default.nix
@@ -0,0 +1,14 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "mime";
+  version = "0.3.4";
+  sha256 = "1klvy32idy6v029p5a6g93r79ac5cycnrx5c8z9bgvplbplpfjwy";
+  meta = {
+    homepage = "https://github.com/GaloisInc/mime";
+    description = "Working with MIME types";
+    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 ff06573af55..11805d9a00f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1434,6 +1434,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hxtUnicode = callPackage ../development/libraries/haskell/hxt-unicode {};
 
+  iCalendar = callPackage ../development/libraries/haskell/iCalendar {};
+
   idna = callPackage ../development/libraries/haskell/idna {};
 
   IfElse = callPackage ../development/libraries/haskell/IfElse {};
@@ -1586,6 +1588,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   midi = callPackage ../development/libraries/haskell/midi {};
 
+  mime = callPackage ../development/libraries/haskell/mime {};
+
   minimorph = callPackage ../development/libraries/haskell/minimorph {};
 
   miniutter = callPackage ../development/libraries/haskell/miniutter {
-- 
GitLab


From 1cb628c2e718d1dd84fd498039cd52015c363b4b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 27 Jan 2014 12:50:21 -0500
Subject: [PATCH 0580/3789] clang: the --sysroot purity trick doesn't take care
 of the -dynamic-linker setting

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../compilers/llvm/3.4/clang-purity.patch     | 19 +++++++++++++++++++
 pkgs/development/compilers/llvm/3.4/clang.nix |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/llvm/3.4/clang-purity.patch

diff --git a/pkgs/development/compilers/llvm/3.4/clang-purity.patch b/pkgs/development/compilers/llvm/3.4/clang-purity.patch
new file mode 100644
index 00000000000..c7021a58f9b
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.4/clang-purity.patch
@@ -0,0 +1,19 @@
+diff -Naur clang-3.4-orig/lib/Driver/Tools.cpp clang-3.4/lib/Driver/Tools.cpp
+--- clang-3.4-orig/lib/Driver/Tools.cpp	2013-12-08 21:59:27.000000000 -0500
++++ clang-3.4/lib/Driver/Tools.cpp	2014-01-27 12:48:29.421872597 -0500
+@@ -6477,15 +6477,6 @@
+     }
+   }
+ 
+-  if (ToolChain.getArch() == llvm::Triple::arm ||
+-      ToolChain.getArch() == llvm::Triple::thumb ||
+-      (!Args.hasArg(options::OPT_static) &&
+-       !Args.hasArg(options::OPT_shared))) {
+-    CmdArgs.push_back("-dynamic-linker");
+-    CmdArgs.push_back(Args.MakeArgString(
+-        D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain)));
+-  }
+-
+   CmdArgs.push_back("-o");
+   CmdArgs.push_back(Output.getFilename());
+ 
diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index 6f174a411cb..eafbc28661f 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     (cd llvm-${version} && patch -Np1 -i ${./llvm-separate-build.patch})
   '';
 
-  patches = [ ./clang-separate-build.patch ];
+  patches = [ ./clang-separate-build.patch ./clang-purity.patch ];
 
   buildInputs = [ cmake libedit libxml2 ];
 
-- 
GitLab


From c50314dc38b98e5c36dba817532d187bbf853691 Mon Sep 17 00:00:00 2001
From: Wojciech Danilo <wdanilo@chronos.pl>
Date: Sat, 25 Jan 2014 21:45:08 +0100
Subject: [PATCH 0581/3789] Added SublimeText3 support. SublimeText2 and
 SublimeText3 can be installed side by side. They provide 'sublime',
 'sublime2' and 'sublime3' commands. SublimeText3 has lower precedense than
 SublimeText2 because its in beta mode (for over a year now)

---
 pkgs/applications/editors/sublime/default.nix |  1 +
 .../applications/editors/sublime3/default.nix | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/editors/sublime3/default.nix

diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix
index cfa44d9285c..c7867ce22af 100644
--- a/pkgs/applications/editors/sublime/default.nix
+++ b/pkgs/applications/editors/sublime/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     mv Sublime* $out/sublime
     ln -s $out/sublime/sublime_text $out/bin/sublime
+    ln -s $out/sublime/sublime_text $out/bin/sublime2
 
     echo ${libPath}
     patchelf \
diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
new file mode 100644
index 00000000000..3d9dec0d8f8
--- /dev/null
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -0,0 +1,40 @@
+{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango}:
+let
+  libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango];
+in
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+
+stdenv.mkDerivation rec {
+  name = "sublimetext3-3.0.59";
+  src = 
+    if stdenv.system == "i686-linux" then
+      fetchurl {
+        name = "sublimetext-3.0.59.tar.bz2";
+        url = http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_3059_x32.tar.bz2;
+        sha256 = "5ee7b42b5db057108e97b86fd408124fc3f7b56662b2851f59d91f8f0c288088";
+      }
+    else
+      fetchurl {
+        name = "sublimetext-3.0.59.tar.bz2";
+        url = http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_3059_x64.tar.bz2;
+        sha256 = "da3039687664d33a734cea0151b2291ece9c7f35e5b73df5b2b5eac28a20b972";
+      };
+  buildCommand = ''
+    tar xvf ${src}
+    mkdir -p $out/bin
+    mv sublime_text_3 $out/sublime
+    ln -s $out/sublime/sublime_text $out/bin/sublime
+    ln -s $out/sublime/sublime_text $out/bin/sublime3
+
+    echo ${libPath}
+    patchelf \
+      --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+      --set-rpath ${libPath}:${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
+      $out/sublime/sublime_text
+  '';
+
+  meta = {
+    description = "Sophisticated text editor for code, markup and prose";
+    license = "unfree";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87fbffa2727..9d90654e031 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8744,6 +8744,8 @@ let
   stumpwm = lispPackages.stumpwm;
 
   sublime = callPackage ../applications/editors/sublime { };
+  
+  sublime3 = lowPrio (callPackage ../applications/editors/sublime3 { });
 
   subversion = callPackage ../applications/version-management/subversion/default.nix {
     bdbSupport = true;
-- 
GitLab


From e361d27eeb330f1b50ba2de584465d580532ddf1 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 21 Jan 2014 19:47:04 +0100
Subject: [PATCH 0582/3789] zfstools: Add new package

zfstools is an OpenSolaris-like and compatible auto snapshotting script
for ZFS, which also supports auto snapshotting mysql databases.
---
 pkgs/tools/filesystems/zfstools/default.nix | 39 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 +++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/tools/filesystems/zfstools/default.nix

diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/tools/filesystems/zfstools/default.nix
new file mode 100644
index 00000000000..1c1be59f515
--- /dev/null
+++ b/pkgs/tools/filesystems/zfstools/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchgit, ruby, zfs }:
+
+stdenv.mkDerivation rec {
+  name = "zfstools-${version}";
+
+  version = "0.3.1";
+
+  src = fetchgit {
+    url = https://github.com/bdrewery/zfstools.git;
+    rev = "refs/tags/v${version}";
+    sha256 = "0bhs0gn1f4z1jm631vp26sbysy4crq489q56rxqfd8ns1xsp1f5j";
+  };
+
+  buildInputs = [ ruby ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/* $out/bin/
+
+    cp -R lib $out/
+
+    for f in $out/bin/*; do
+      substituteInPlace $f --replace "/usr/bin/env ruby" "ruby -I$out/lib"
+    done
+
+    sed -e 's|cmd.*=.*"zfs |cmd = "${zfs}/sbin/zfs |g' -i $out/lib/zfstools/{dataset,snapshot}.rb
+  '';
+
+  meta = {
+    homepage = https://github.com/bdrewery/zfstools;
+    description = "OpenSolaris-like and compatible auto snapshotting script for ZFS";
+    longDescription = ''
+      zfstools is an OpenSolaris-like and compatible auto snapshotting script
+      for ZFS, which also supports auto snapshotting mysql databases.
+    '';
+
+    license = stdenv.lib.licenses.bsd2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d90654e031..51c4ffa894a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2240,6 +2240,10 @@ let
 
   zdelta = callPackage ../tools/compression/zdelta { };
 
+  zfstools = callPackage ../tools/filesystems/zfstools {
+    zfs = linuxPackages.zfs;
+  };
+
   zile = callPackage ../applications/editors/zile { };
 
   zip = callPackage ../tools/archivers/zip { };
-- 
GitLab


From 3f56d9f4b4437a91c933b5415d9cd54bbcaa0249 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 27 Jan 2014 21:55:04 +0100
Subject: [PATCH 0583/3789] Add keepassx 2.0alpha5, contributed by Thomas
 Tuegel.

---
 pkgs/applications/misc/keepassx/2.0.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/applications/misc/keepassx/2.0.nix

diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix
new file mode 100644
index 00000000000..6d54032bb38
--- /dev/null
+++ b/pkgs/applications/misc/keepassx/2.0.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, cmake, libgcrypt, qt4, xlibs, ... }:
+
+stdenv.mkDerivation {
+  name = "keepassx-2.0alpha5";
+  src = fetchurl {
+    url = "https://github.com/keepassx/keepassx/archive/2.0-alpha5.tar.gz";
+    sha256 = "1vxj306zhrr38mvsy3vpjlg6d0xwlcvsi3l69nhhwzkccsc4smfm";
+  };
+
+  buildInputs = [ cmake libgcrypt qt4 xlibs.libXtst ];
+
+  meta = {
+    description = "Qt password manager compatible with its Win32 and Pocket PC versions";
+    homepage = http://www.keepassx.org/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [qknight];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51c4ffa894a..9b3c86cd29c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7745,6 +7745,7 @@ let
   evopedia = callPackage ../applications/misc/evopedia { };
 
   keepassx = callPackage ../applications/misc/keepassx { };
+  keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };
 
   inherit (gnome3) evince;
   evolution_data_server = gnome3.evolution_data_server;
-- 
GitLab


From 8741ff387d96756835fa0c41d0906d7ab96831ba Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 28 Jan 2014 00:39:20 +0000
Subject: [PATCH 0584/3789] phantomjs: update to 1.9.7

---
 pkgs/development/tools/phantomjs/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix
index 7eea3bedcef..ef07d04212b 100644
--- a/pkgs/development/tools/phantomjs/default.nix
+++ b/pkgs/development/tools/phantomjs/default.nix
@@ -3,7 +3,7 @@
 assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" ];
 
 stdenv.mkDerivation rec {
-  name = "phantomjs-1.9.2";
+  name = "phantomjs-1.9.7";
 
   # I chose to use the binary build for now.
   # The source version is quite nasty to compile
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
 
   src = if stdenv.system == "i686-linux" then
           fetchurl {
-            url = "http://phantomjs.googlecode.com/files/${name}-linux-i686.tar.bz2";
-            sha256 = "1nywb9xhcfjark6zfjlnrljc08r5185vv25vfcc65jzla8hy75qp";
+            url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-i686.tar.bz2";
+            sha256 = "1ffd5544wnkww5cgwsims4bk4bymvm6pm19p32nbhwabxqhbnj9a";
           }
         else # x86_64-linux
           fetchurl {
-            url = "http://phantomjs.googlecode.com/files/${name}-linux-x86_64.tar.bz2";
-            sha256 = "1xsjx4j6rwkq27y4iqdn0ai4yrq70a3g9309blywki0g976phccg";
+            url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-x86_64.tar.bz2";
+            sha256 = "06mhvj8rx298j0mrijw48zfm28hqgy81vdr1vv0jp4ncxbvijfs7";
           };
 
   buildPhase = ''
-- 
GitLab


From 407a77016162958c743bbf354465e0396c32ecc0 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Tue, 28 Jan 2014 04:02:51 +0100
Subject: [PATCH 0585/3789] Rewrite as a pre-boot authentication module
 (mostly) comforming to the design specification of 'YubiKey Integration for
 Full Disk Encryption Pre-Boot Authentication (Copyright) Yubico, 2011
 Version: 1.1'.

Used binaries:
  * uuidgen - for generation of random sequence numbers
  * ykchalresp - for challenging a Yubikey
  * ykinfo - to check if a Yubikey is plugged in at boot (fallback to passphrase authentication otherwise)
  * openssl - for calculation of SHA-1, HMAC-SHA-1, as well as AES-256-CTR (de/en)cryption

Main differences to the specification mentioned above:
  * No user management (yet), only one password+yubikey per LUKS device
  * SHA-512 instead of CRC-16 for checksum

Main differences to the previous implementation:
  * Instead of changing the key slot of the LUKS device each boot,
    the actual key for the LUKS device will be encrypted itself
  * Since the response for the new challenge is now calculated
    locally with openssl, the MITM-USB-attack with which previously
    an attacker could obtain the new response (that was used as the new
    encryption key for the LUKS device) by listening to the
    Yubikey has ideally become useless (as long as uuidgen can
    successfuly generate new random sequence numbers).

Remarks:
  * This is not downwards compatible to the previous implementation
---
 nixos/modules/system/boot/luksroot.nix | 266 ++++++++++++++-----------
 1 file changed, 145 insertions(+), 121 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index ca4a8c480f8..52c91a0e20c 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -31,140 +31,148 @@ let
     fi
     ''}
 
+    open_normally() {
+        cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} \
+          ${optionalString (keyFile != null) "--key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}"}
+    }
+
     ${optionalString (luks.yubikeySupport && (yubikey != null)) ''
-    mkdir -p ${yubikey.challenge.mountPoint}
-    mount -t ${yubikey.challenge.fsType} ${toString yubikey.challenge.device} ${yubikey.challenge.mountPoint}
-    response="$(ykchalresp -${toString yubikey.yubikeySlot} "`cat ${yubikey.challenge.mountPoint}${yubikey.challenge.file}`" 2>/dev/null || true)"
-    if [ -z "$response" ]; then
-        echo -n "waiting 10 seconds for yubikey to appear..."
-        for try in $(seq 10); do
-            sleep 1
-            response="$(ykchalresp -${toString yubikey.yubikeySlot} "`cat ${yubikey.challenge.mountPoint}${yubikey.challenge.file}`" 2>/dev/null || true)"
-            if [ ! -z "$response" ]; then break; fi
-            echo -n .
-        done
-        echo "ok"
-    fi
 
-    ${optionalString yubikey.twoFactor ''
-    if [ ! -z "$response" ]; then
-        echo -n "Enter two-factor passphrase: "
-        read -s passphrase
-        current_key="$passphrase$response"
-    fi
-    ''}
+    rbtohex() {
+        od -An -vtx1 | tr -d ' \n'
+    }
+
+    hextorb() {
+        tr '[:lower:]' '[:upper:]' | sed -e 's|\([0-9A-F]\{2\}\)|\\\\\\x\1|gI' | xargs printf
+    }
+
+    take() {
+        local c="$1"
+        shift
+        head -c $c "$@"
+    }
+
+    drop() {
+        local c=$1
+        shift
+        if [ -e "$1" ]; then
+            cat "$1" | ( dd of=/dev/null bs="$c" count=1 2>/dev/null ; dd 2>/dev/null )
+        else
+            ( dd of=/dev/null bs="$c" count=1 2>/dev/null ; dd 2>/dev/null )
+        fi
+    }
 
-    ${optionalString (!yubikey.twoFactor) ''
-    if [ ! -z "$response" ]; then
-        current_key="$response"
-    fi
-    ''}
-    ''}
+    open_yubikey() {
 
-    # open luksRoot and scan for logical volumes
-    ${optionalString ((!luks.yubikeySupport) || (yubikey == null)) ''
-    cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} \
-      ${optionalString (keyFile != null) "--key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}"}
-    ''}
+        mkdir -p ${yubikey.storage.mountPoint}
+        mount -t ${yubikey.storage.fsType} ${toString yubikey.storage.device} ${yubikey.storage.mountPoint}
 
-    ${optionalString (luks.yubikeySupport && (yubikey != null)) ''
-    if [ -z "$response" ]; then
-        cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} \
-          ${optionalString (keyFile != null) "--key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}"}
-    else
-        echo $current_key | cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} --key-file=-
+        local uuid_r
+        uuid_r="$(take 16 ${yubikey.storage.mountPoint}${yubikey.storage.path} | rbtohex)"
 
-        if [ $? != "0" ]; then
-            for try in $(seq 3); do
+        local uuid_luks
+        uuid_luks="$(cryptsetup luksUUID ${device} | take 36 | tr -d '-')"
 
-                ${optionalString (!yubikey.twoFactor) ''
-                sleep 1
-                ''}
+        local k_user
+        local challenge
+        local k_blob
+        local aes_blob_decrypted
+        local checksum_correct
+        local checksum
 
-                ${optionalString yubikey.twoFactor ''
-                echo -n "Enter two-factor passphrase: "
-                read -s passphrase
-                current_key="$passphrase$response"
-                ''}
+        for try in $(seq 3); do
 
-                echo $current_key | cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} --key-file=-
-                if [ $? == "0" ]; then break; fi
-                echo -n .
-            done
+            ${optionalString yubikey.twoFactor ''
+            echo -n "Enter two-factor passphrase: "
+            read -s k_user
+            ''}
+
+            challenge="$(echo -n $k_user$uuid_r$uuid_luks | openssl-wrap dgst -binary -sha1 | rbtohex)"
+
+            k_blob="$(ykchalresp -${toString yubikey.slot} -x $challenge 2>/dev/null)"
+
+            aes_blob_decrypted="$(drop 16 ${yubikey.storage.mountPoint}${yubikey.storage.path} | openssl-wrap enc -d -aes-256-ctr -K $k_blob -iv $uuid_r | rbtohex)"
+
+            checksum="$(echo -n $aes_blob_decrypted | hextorb | drop 84 | rbtohex)"
+            if [ "$(echo -n $aes_blob_decrypted | hextorb | take 84 | openssl-wrap dgst -binary -sha512 | rbtohex)" == "$checksum" ]; then
+                 checksum_correct=1
+                 break
+            else
+                 checksum_correct=0
+                 echo "Authentication failed!"
+            fi
+        done
+
+        if [ "$checksum_correct" != "1" ]; then
+            umount ${yubikey.storage.mountPoint}
+            echo "Maximum authentication errors reached"
+            exit 1
         fi
 
-        mkdir -p ${yubikey.ramfsMountPoint}
-        # A ramfs is used here to ensure that the file used to update
-        # the key slot with cryptsetup will never get swapped out.
-        # Warning: Do NOT replace with tmpfs!
-        mount -t ramfs none ${yubikey.ramfsMountPoint}
+        local k_yubi
+        k_yubi="$(echo -n $aes_blob_decrypted | hextorb | take 20 | rbtohex)"
+
+        local k_luks
+        k_luks="$(echo -n $aes_blob_decrypted | hextorb | drop 20 | take 64 | rbtohex)"
+
+        echo -n "$k_luks" | hextorb | cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} --key-file=-
 
         update_failed=false
-        old_challenge=$(cat ${yubikey.challenge.mountPoint}${yubikey.challenge.file})
 
-        new_challenge=$(uuidgen)
+        local new_uuid_r
+        new_uuid_r="$(uuidgen)"
         if [ $? != "0" ]; then
             for try in $(seq 10); do
                 sleep 1
-                new_challenge=$(uuidgen)
+                new_uuid_r="$(uuidgen)"
                 if [ $? == "0" ]; then break; fi
                 if [ $try -eq 10 ]; then update_failed=true; fi
             done
         fi
 
         if [ "$update_failed" == false ]; then
-            echo $new_challenge > ${yubikey.challenge.mountPoint}${yubikey.challenge.file}
-            response="$(ykchalresp -${toString yubikey.yubikeySlot} "`cat ${yubikey.challenge.mountPoint}${yubikey.challenge.file}`" 2>/dev/null || true)"
-            if [ -z "$response" ]; then
-                echo -n "waiting 10 seconds for yubikey to appear..."
-                for try in $(seq 10); do
-                    sleep 1
-                    response="$(ykchalresp -${toString yubikey.yubikeySlot} "`cat ${yubikey.challenge.mountPoint}${yubikey.challenge.file}`" 2>/dev/null || true)"
-                    if [ ! -z "$response" ]; then break; fi
-                    echo -n .
-                done
-                echo "ok";
-            fi
+            new_uuid_r="$(echo -n $new_uuid_r | take 36 | tr -d '-')"
 
-            if [ ! -z "$response" ]; then
-                ${optionalString yubikey.twoFactor ''
-                new_key="$passphrase$response"
-                ''}
+            local new_challenge
+            new_challenge="$(echo -n $k_user$new_uuid_r$uuid_luks | openssl-wrap dgst -binary -sha1 | rbtohex)"
 
-                ${optionalString (!yubikey.twoFactor) ''
-                new_key="$response"
-                ''}
+            local new_k_blob
+            new_k_blob="$(echo -n $new_challenge | hextorb | openssl-wrap dgst -binary -sha1 -mac HMAC -macopt hexkey:$k_yubi | rbtohex)"
 
-                echo $new_key > ${yubikey.ramfsMountPoint}/new_key
-
-                echo $current_key | cryptsetup luksChangeKey ${device} --key-file=- --key-slot ${toString yubikey.luksKeySlot} ${yubikey.ramfsMountPoint}/new_key
-                if [ $? != "0" ]; then
-                    for try in $(seq 10); do
-                        sleep 1
-                        echo $current_key | cryptsetup luksChangeKey ${device} --key-file=- --key-slot ${toString yubikey.luksKeySlot} ${yubikey.ramfsMountPoint}/new_key
-                        if [ $? == "0" ]; then break; fi
-                        if [ $try -eq 10 ]; then update_failed=true; fi
-                    done
-
-                fi
-
-                rm -f ${yubikey.ramfsMountPoint}/new_key
-
-                if [ "$update_failed" == true ]; then
-                    echo $old_challenge > ${yubikey.challenge.mountPoint}${yubikey.challenge.file}
-                    echo "Warning: Could not update luks header with new key for ${device}, old challenge restored!"
-                fi
-            else
-              echo $old_challenge > ${yubikey.challenge.mountPoint}${yubikey.challenge.file}
-              echo "Warning: No yubikey present to challenge for ${device}, old challenge restored!"
-            fi
+            echo -n "$new_uuid_r" | hextorb > ${yubikey.storage.mountPoint}${yubikey.storage.path}
+            echo -n "$k_yubi$k_luks$checksum" | hextorb | openssl-wrap enc -e -aes-256-ctr -K "$new_k_blob" -iv "$new_uuid_r" >> ${yubikey.storage.mountPoint}${yubikey.storage.path}
         else
-            echo "Warning: New challenge could not be obtained for ${device}, old challenge persists!"
+            echo "Warning: Could not obtain new UUID, current challenge persists!"
         fi
 
-        umount ${yubikey.ramfsMountPoint}
-        umount ${yubikey.challenge.mountPoint}
+        umount ${yubikey.storage.mountPoint}
+    }
+
+    ykinfo -v
+    yubikey_missing="$(ykinfo -v 1>/dev/null 2>&1)$?"
+    if [ "$yubikey_missing" != "0" ]; then
+        echo -n "waiting 10 seconds for yubikey to appear..."
+        for try in $(seq 10); do
+            sleep 1
+            ykinfo -v
+            yubikey_missing="$(ykinfo -v 1>/dev/null 2>&1)$?"
+            if [ "$yubikey_missing" == "0" ]; then break; fi
+            echo -n .
+        done
+        echo "ok"
     fi
+
+    if [ "$yubikey_missing" != "0" ]; then
+        echo "no yubikey found, falling back to non-yubikey open procedure"
+        open_normally
+    else
+        open_yubikey
+    fi
+    ''}
+
+    # open luksRoot and scan for logical volumes
+    ${optionalString ((!luks.yubikeySupport) || (yubikey == null)) ''
+    open_normally
     ''}
   '';
 
@@ -283,19 +291,13 @@ in
               description = "TODO";
             };
 
-            yubikeySlot = mkOption {
+            slot = mkOption {
               default = 2;
               type = types.int;
               description = "TODO";
             };
 
-            luksKeySlot = mkOption {
-              default = 1;
-              type = types.int;
-              description = "TODO";
-            };
-
-            challenge = mkOption {
+            storage = mkOption {
               type = types.optionSet;
               description = "TODO";
 
@@ -313,24 +315,18 @@ in
                 };
 
                 mountPoint = mkOption {
-                  default = "/crypt-challenge";
+                  default = "/crypt-storage";
                   type = types.string;
                   description = "TODO";
                 };
 
-                file = mkOption {
-                  default = "/crypt-challenge";
+                path = mkOption {
+                  default = "/crypt-storage/default";
                   type = types.string;
                   description = "TODO";
                 };
               };
             };
-
-            ramfsMountPoint = mkOption {
-              default = "/crypt-update";
-              type = types.string;
-              description = "TODO";
-            };
           };
         };
 
@@ -361,6 +357,7 @@ in
         cp -pdvn $lib $out/lib
         cp -pvn $(readlink -f $lib) $out/lib
       done
+
       ${optionalString luks.yubikeySupport ''
       cp -pdv ${pkgs.utillinux}/bin/uuidgen $out/bin
       for lib in $(ldd $out/bin/uuidgen |grep '=>' |grep /nix/store/ |cut -d' ' -f3); do
@@ -373,6 +370,26 @@ in
         cp -pdvn $lib $out/lib
         cp -pvn $(readlink -f $lib) $out/lib
       done
+
+      cp -pdv ${pkgs.ykpers}/bin/ykinfo $out/bin
+      for lib in $(ldd $out/bin/ykinfo |grep '=>' |grep /nix/store/ |cut -d' ' -f3); do
+        cp -pdvn $lib $out/lib
+        cp -pvn $(readlink -f $lib) $out/lib
+      done
+
+      cp -pdv ${pkgs.openssl}/bin/openssl $out/bin
+      for lib in $(ldd $out/bin/openssl |grep '=>' |grep /nix/store/ |cut -d' ' -f3); do
+        cp -pdvn $lib $out/lib
+        cp -pvn $(readlink -f $lib) $out/lib
+      done
+
+      mkdir -p $out/etc/ssl
+      cp -pdv ${pkgs.openssl}/etc/ssl/openssl.cnf $out/etc/ssl
+
+      cat > $out/bin/openssl-wrap <<EOF
+#!$out/bin/sh
+EOF
+      chmod +x $out/bin/openssl-wrap
       ''}
     '';
 
@@ -381,6 +398,13 @@ in
       ${optionalString luks.yubikeySupport ''
         $out/bin/uuidgen --version
         $out/bin/ykchalresp -V
+        $out/bin/ykinfo -V
+        cat > $out/bin/openssl-wrap <<EOF
+#!$out/bin/sh
+export OPENSSL_CONF=$out/etc/ssl/openssl.cnf
+$out/bin/openssl "\$@"
+EOF
+        $out/bin/openssl-wrap version
       ''}
     '';
 
-- 
GitLab


From d92dc9bb3e4d957ad1bdfdd80abde7c3be966286 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Jan 2014 15:33:31 +0100
Subject: [PATCH 0586/3789] gdb: Build on Darwin

Note that it doesn't actually work unless you run it as root, because
the Darwin kernel disallows unsigned debuggers (you'll get an error
message "please check gdb is codesigned").
---
 pkgs/development/tools/misc/gdb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index d67407eb03d..0d3eb5c824f 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    platforms = with platforms; linux ++ cygwin;
+    platforms = with platforms; linux ++ cygwin ++ darwin;
     maintainers = with maintainers; [ pierron ];
   };
 }
-- 
GitLab


From 849b383f4d26eed9145fe2b584d1cf3d6f7dd63a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 28 Jan 2014 11:21:49 +0100
Subject: [PATCH 0587/3789] qt5: disable parallel building, as it often fails

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

diff --git a/pkgs/development/libraries/qt-5/default.nix b/pkgs/development/libraries/qt-5/default.nix
index e593200d159..e94aecc41e4 100644
--- a/pkgs/development/libraries/qt-5/default.nix
+++ b/pkgs/development/libraries/qt-5/default.nix
@@ -145,7 +145,7 @@ stdenv.mkDerivation rec {
 
   postInstall = if buildDocs then "make docs&&make install_docs" else "";
 
-  enableParallelBuilding = true;
+  #enableParallelBuilding = true; # often fails on Hydra, as well as qt4
 
   meta = {
     homepage = http://qt-project.org;
-- 
GitLab


From 355548449328da95507b5158bbe306b5236916ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 28 Jan 2014 11:34:05 +0100
Subject: [PATCH 0588/3789] mesa cleanup: remove patches, clean description

werror-wundef.patch came from #1082, but now no longer applied,
and it seems no longer necessary, as both qt5 and qtCreator build.
@bbenoist: was the patch useful for anything else?
---
 pkgs/development/libraries/mesa/default.nix   |  12 +-
 .../libraries/mesa/dricore-gallium.patch      | 216 ------------------
 .../libraries/mesa/werror-wundef.patch        |  12 -
 3 files changed, 6 insertions(+), 234 deletions(-)
 delete mode 100644 pkgs/development/libraries/mesa/dricore-gallium.patch
 delete mode 100644 pkgs/development/libraries/mesa/werror-wundef.patch

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 9d720621880..11b1e2bca77 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -12,14 +12,14 @@ else
 
 /** Packaging design:
   - The basic mesa ($out) contains headers and libraries (GLU is in mesa_glu now).
-    This or the mesa attribute (which also contains GLU) are small (~ 2.2 MB, mostly headers)
+    This or the mesa attribute (which also contains GLU) are small (~ 2 MB, mostly headers)
     and are designed to be the buildInput of other packages.
   - DRI and EGL drivers are compiled into $drivers output,
-    which is bigger (~13 MB) and depends on LLVM (~44 MB).
+    which is much bigger and depends on LLVM.
     These should be searched at runtime in "/run/opengl-driver{,-32}/lib/*"
     and so are kind-of impure (given by NixOS).
     (I suppose on non-NixOS one would create the appropriate symlinks from there.)
-  - libOSMesa is in $osmesa (~4.2 MB)
+  - libOSMesa is in $osmesa (~4 MB)
 */
 
 let
@@ -39,10 +39,10 @@ stdenv.mkDerivation {
 
   prePatch = "patchShebangs .";
 
-  patches = [ # some don't apply -- try without them ATM
+  patches = [
     ./static-gallium.patch
-   # ./dricore-gallium.patch
-   # ./werror-wundef.patch
+   # TODO: revive ./dricore-gallium.patch when it gets ported (from Ubuntu),
+   #  as it saved ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog
   ];
 
   # Change the search path for EGL drivers from $drivers/* to driverLink
diff --git a/pkgs/development/libraries/mesa/dricore-gallium.patch b/pkgs/development/libraries/mesa/dricore-gallium.patch
deleted file mode 100644
index 9a8b6768277..00000000000
--- a/pkgs/development/libraries/mesa/dricore-gallium.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-commit 5208f187c7dade2c33385a56c1a5f1c3cedc8377 (HEAD, nix-patches)
-Author: Vladimír Čunát <vcunat@gmail.com>
-Date:   Mon May 13 11:34:59 2013 +0200
-
-    118-dricore-gallium.patch
-
-diff --git a/configure.ac b/configure.ac
-index be89843..08f6761 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -928,6 +928,8 @@ AC_SUBST([GLESv2_LIB_DEPS])
- AC_SUBST([GLESv2_PC_LIB_PRIV])
- 
- DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la"
-+MESAGALLIUM_LIBS="${DRI_LIB_DEPS}"
-+AC_SUBST([MESAGALLIUM_LIBS], ${MESAGALLIUM_LIBS})
- 
- AC_SUBST([HAVE_XF86VIDMODE])
- 
-diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
-index 3cdec83..53ff69b 100644
---- a/src/gallium/auxiliary/Makefile.am
-+++ b/src/gallium/auxiliary/Makefile.am
-@@ -34,14 +34,14 @@ if LLVM_NEEDS_FNORTTI
- 
- AM_CXXFLAGS += -fno-rtti
- 
--libgallium_la_LIBADD = $(LLVM_LIBS)
--
- endif
- 
- libgallium_la_SOURCES += \
- 	$(GALLIVM_SOURCES) \
- 	$(GALLIVM_CPP_SOURCES)
- 
-+libgallium_la_LIBADD = ../../mesa/libdricore/libmesagallium.la $(LLVM_LIBS) $(GALLIUM_DRI_LIB_DEPS)
-+
- endif
- 
- indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py
-diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am
-index f4f9030..e9b9462 100644
---- a/src/gallium/targets/dri-i915/Makefile.am
-+++ b/src/gallium/targets/dri-i915/Makefile.am
-@@ -49,7 +49,7 @@ i915_dri_la_SOURCES = \
- i915_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
- 
- i915_dri_la_LIBADD = \
--	$(top_builddir)/src/mesa/libmesagallium.la \
-+	@MESAGALLIUM_LIBS@ \
- 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
- 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
- 	$(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
-diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am
-index 69ccf32..fef4c63 100644
---- a/src/gallium/targets/dri-nouveau/Makefile.am
-+++ b/src/gallium/targets/dri-nouveau/Makefile.am
-@@ -48,7 +48,7 @@ nouveau_dri_la_SOURCES = \
- nouveau_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
- 
- nouveau_dri_la_LIBADD = \
--	$(top_builddir)/src/mesa/libmesagallium.la \
-+	@MESAGALLIUM_LIBS@ \
- 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
- 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
- 	$(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
-diff --git a/src/gallium/targets/dri-r300/Makefile.am b/src/gallium/targets/dri-r300/Makefile.am
-index 8c0215d..6beb536 100644
---- a/src/gallium/targets/dri-r300/Makefile.am
-+++ b/src/gallium/targets/dri-r300/Makefile.am
-@@ -49,7 +49,7 @@ r300_dri_la_SOURCES = \
- r300_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
- 
- r300_dri_la_LIBADD = \
--	$(top_builddir)/src/mesa/libmesagallium.la \
-+	@MESAGALLIUM_LIBS@ \
- 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
- 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
- 	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
-diff --git a/src/gallium/targets/dri-r600/Makefile.am b/src/gallium/targets/dri-r600/Makefile.am
-index 2b3524b..d40fb89 100644
---- a/src/gallium/targets/dri-r600/Makefile.am
-+++ b/src/gallium/targets/dri-r600/Makefile.am
-@@ -48,7 +48,7 @@ r600_dri_la_SOURCES = \
- r600_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
- 
- r600_dri_la_LIBADD = \
--	$(top_builddir)/src/mesa/libmesagallium.la \
-+	@MESAGALLIUM_LIBS@ \
- 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
- 	$(top_builddir)/src/gallium/drivers/r600/libr600.la \
- 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
-diff --git a/src/gallium/targets/dri-radeonsi/Makefile.am b/src/gallium/targets/dri-radeonsi/Makefile.am
-index f7d87a6..87ab2aa 100644
---- a/src/gallium/targets/dri-radeonsi/Makefile.am
-+++ b/src/gallium/targets/dri-radeonsi/Makefile.am
-@@ -49,7 +49,7 @@ radeonsi_dri_la_SOURCES = \
- radeonsi_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
- 
- radeonsi_dri_la_LIBADD = \
--	$(top_builddir)/src/mesa/libmesagallium.la \
-+	@MESAGALLIUM_LIBS@ \
- 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
- 	$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
- 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
-diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am
-index 1104379..72d2401 100644
---- a/src/gallium/targets/dri-swrast/Makefile.am
-+++ b/src/gallium/targets/dri-swrast/Makefile.am
-@@ -49,7 +49,7 @@ swrast_dri_la_SOURCES = \
- swrast_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
- 
- swrast_dri_la_LIBADD = \
--	$(top_builddir)/src/mesa/libmesagallium.la \
-+	@MESAGALLIUM_LIBS@ \
- 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
- 	$(top_builddir)/src/gallium/state_trackers/dri/sw/libdrisw.la \
- 	$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
-diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am
-index ca7df65..4384976 100644
---- a/src/gallium/targets/dri-vmwgfx/Makefile.am
-+++ b/src/gallium/targets/dri-vmwgfx/Makefile.am
-@@ -48,7 +48,7 @@ vmwgfx_dri_la_SOURCES = \
- vmwgfx_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
- 
- vmwgfx_dri_la_LIBADD = \
--	$(top_builddir)/src/mesa/libmesagallium.la \
-+	@MESAGALLIUM_LIBS@ \
- 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
- 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
- 	$(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
-diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
-index 5c40ae8..6922ab2 100644
---- a/src/gallium/targets/egl-static/Makefile.am
-+++ b/src/gallium/targets/egl-static/Makefile.am
-@@ -104,7 +104,7 @@ AM_CPPFLAGS += \
- 	$(API_DEFINES)
- 
- egl_gallium_la_LIBADD += \
--	$(top_builddir)/src/mesa/libmesagallium.la
-+	@MESAGALLIUM_LIBS@
- # make st/mesa built-in when there is a single glapi provider
- if HAVE_SHARED_GLAPI
- egl_gallium_la_LIBADD += \
-diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
-index 41483dd..0045a673 100644
---- a/src/mesa/Makefile.am
-+++ b/src/mesa/Makefile.am
-@@ -75,9 +75,6 @@ noinst_LTLIBRARIES += libmesa.la
- else
- check_LTLIBRARIES = libmesa.la
- endif
--if HAVE_GALLIUM
--noinst_LTLIBRARIES += libmesagallium.la
--endif
- 
- SRCDIR = $(top_srcdir)/src/mesa/
- BUILDDIR = $(top_builddir)/src/mesa/
-@@ -119,15 +116,6 @@ libmesa_la_LIBADD = \
-         $()
- libmesa_la_LDFLAGS =
- 
--libmesagallium_la_SOURCES = \
--	$(MESA_GALLIUM_FILES) \
--        $(MESA_ASM_FILES_FOR_ARCH)
--
--libmesagallium_la_LIBADD = \
--        $(top_builddir)/src/glsl/libglsl.la \
--        $(top_builddir)/src/mesa/program/libprogram.la \
--        $()
--
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = gl.pc
- 
-diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
-index 753548e..8761418 100644
---- a/src/mesa/libdricore/Makefile.am
-+++ b/src/mesa/libdricore/Makefile.am
-@@ -42,6 +42,7 @@ libdricore@VERSION@_la_SOURCES = \
- libdricore@VERSION@_la_LDFLAGS = -version-number 1:0
- libdricore@VERSION@_la_LIBADD = \
-         ../program/libdricore_program.la \
-+        $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-         $()
- 
- if HAVE_X86_ASM
-@@ -65,8 +66,10 @@ AM_CPPFLAGS += \
-         -I$(top_srcdir)/src/mesa/sparc
- endif
- 
-+lib_LTLIBRARIES =
-+
- if HAVE_DRI
--lib_LTLIBRARIES = libdricore@VERSION@.la
-+lib_LTLIBRARIES += libdricore@VERSION@.la
- 
- # Provide compatibility with scripts for the old Mesa build system for
- # a while by putting a link to the driver into /lib of the build tree.
-@@ -76,6 +79,17 @@ all-local: libdricore@VERSION@.la
- 	ln -sf libdricore@VERSION@.so.1 $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so
- endif
- 
-+libmesagallium_la_SOURCES = \
-+	$(STATETRACKER_FILES)
-+libmesagallium_la_CFLAGS = @LLVM_CFLAGS@
-+libmesagallium_la_CXXFLAGS = @LLVM_CXXFLAGS@
-+libmesagallium_la_LIBADD = libdricore@VERSION@.la $(LLVM_LIBS)
-+
-+if HAVE_GALLIUM
-+noinst_LTLIBRARIES = libmesagallium.la
-+endif
-+
-+
- CLEANFILES = \
- 	$(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so.1 \
- 	$(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so
diff --git a/pkgs/development/libraries/mesa/werror-wundef.patch b/pkgs/development/libraries/mesa/werror-wundef.patch
deleted file mode 100644
index 4663f68bd7d..00000000000
--- a/pkgs/development/libraries/mesa/werror-wundef.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN Mesa-9.2.0-orig/include/GL/gl.h Mesa-9.2.0/include/GL/gl.h
---- Mesa-9.2.0-orig/include/GL/gl.h	2013-08-14 03:34:42.000000000 +0200
-+++ Mesa-9.2.0/include/GL/gl.h	2013-09-24 19:34:58.319140812 +0200
-@@ -2088,7 +2088,7 @@ typedef void (APIENTRYP PFNGLMULTITEXCOO
- 
- 
- 
--#if GL_ARB_shader_objects
-+#if defined(GL_ARB_shaders_objects) && GL_ARB_shader_objects
- 
- #ifndef GL_MESA_shader_debug
- #define GL_MESA_shader_debug 1
-- 
GitLab


From 9b905b97cb152deae8dfc064de53694f17f2887f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 28 Jan 2014 12:06:22 +0100
Subject: [PATCH 0589/3789] libdrm: minor update 2.4.50 -> .52

---
 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 5aa54582fdc..0969b51a168 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.50";
+  name = "libdrm-2.4.52";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "0idh6cwqr2rilig7vygb3gxvivchp0q1iq4md79jq340v96d48rq";
+    sha256 = "1h8q0azb5bxqljpi1dlxmh5i30c4wdrncffcpppzrgk13wpkqsgs";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 39a31190f06b6973d9493f125c9c858a453a86b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jan 2014 11:13:26 +0100
Subject: [PATCH 0590/3789] less: Build on Darwin

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

diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index 5acb0e0fb70..c51219839b2 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.greenwoodsoftware.com/less/;
     description = "A more advanced file pager than ‘more’";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }
-- 
GitLab


From 5150dbfdbe4144770d1dae868172fb94d7e6be55 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jan 2014 11:55:12 +0100
Subject: [PATCH 0591/3789] openjdk-darwin: Behave the same as openjdk-linux

---
 .../compilers/openjdk-darwin/default.nix      | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix
index ff9f12f8023..3e4835c8b53 100644
--- a/pkgs/development/compilers/openjdk-darwin/default.nix
+++ b/pkgs/development/compilers/openjdk-darwin/default.nix
@@ -1,6 +1,6 @@
-{stdenv, fetchurl, ...}:
+{ stdenv, fetchurl, setJavaClassPath }:
 let
-jdk = stdenv.mkDerivation {
+  jdk = stdenv.mkDerivation {
     name = "openjdk6-b16-24_apr_2009-r1";
 
     src = fetchurl {
@@ -11,6 +11,23 @@ jdk = stdenv.mkDerivation {
     installPhase = ''
       mkdir -p $out
       cp -vR * $out/
+
+      # jni.h expects jni_md.h to be in the header search path.
+      ln -s $out/include/darwin/*_md.h $out/include/
+    '';
+
+    preFixup = ''
+      # Propagate the setJavaClassPath setup hook from the JRE so that
+      # any package that depends on the JRE has $CLASSPATH set up
+      # properly.
+      mkdir -p $out/nix-support
+      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
+
+      # Set JAVA_HOME automatically.
+      mkdir -p $out/nix-support
+      cat <<EOF > $out/nix-support/setup-hook
+      if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+      EOF
     '';
 
     passthru.jre = jdk;
-- 
GitLab


From e5995e0703de588af9d71e636eea7ddb1c695af0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jan 2014 11:56:14 +0100
Subject: [PATCH 0592/3789] junixsocket: Support Darwin

Patch borrowed from Rob Vermaas.
---
 .../libraries/java/junixsocket/darwin.patch   | 20 +++++++++++++++++++
 .../libraries/java/junixsocket/default.nix    | 14 +++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/java/junixsocket/darwin.patch

diff --git a/pkgs/development/libraries/java/junixsocket/darwin.patch b/pkgs/development/libraries/java/junixsocket/darwin.patch
new file mode 100644
index 00000000000..97fd42d0b81
--- /dev/null
+++ b/pkgs/development/libraries/java/junixsocket/darwin.patch
@@ -0,0 +1,20 @@
+diff -rc junixsocket-1.3/src/main/org/newsclub/net/unix/NativeUnixSocket.java junixsocket-1.3-new/src/main/org/newsclub/net/unix/NativeUnixSocket.java
+*** junixsocket-1.3/src/main/org/newsclub/net/unix/NativeUnixSocket.java        Tue Jul 20 14:59:41 2010
+--- junixsocket-1.3-new/src/main/org/newsclub/net/unix/NativeUnixSocket.java    Sun May 27 22:26:15 2012
+***************
+*** 43,49 ****
+              String prefix = "lib";
+              String suffix = ".so";
+              String os = osName.replaceAll("[^A-Za-z0-9]", "").toLowerCase();
+!             if ("macosx".equals(os)) {
+                  suffix = ".dylib";
+              } else if ("linux".equals(os) || "freebsd".equals(os)
+                      || "sunos".equals(os)) {
+--- 43,49 ----
+              String prefix = "lib";
+              String suffix = ".so";
+              String os = osName.replaceAll("[^A-Za-z0-9]", "").toLowerCase();
+!             if ("macosx".equals(os) || "darwin".equals(os)) {
+                  suffix = ".dylib";
+              } else if ("linux".equals(os) || "freebsd".equals(os)
+                      || "sunos".equals(os)) {
diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix
index 911cc6dd40d..e49e626aa00 100644
--- a/pkgs/development/libraries/java/junixsocket/default.nix
+++ b/pkgs/development/libraries/java/junixsocket/default.nix
@@ -8,11 +8,15 @@ stdenv.mkDerivation rec {
     sha256 = "0c6p8vmiv5nk8i6g1hgivnl3mpb2k3lhjjz0ss9dlirisfrxf1ym";
   };
 
+  patches = [ ./darwin.patch ];
+
   buildInputs = [ ant jdk junit ];
 
   preConfigure =
     ''
-      sed -i 's|/usr/bin/||' build.xml
+      substituteInPlace build.xml \
+        --replace /usr/bin/ "" \
+        --replace macosx darwin
       substituteInPlace src/main/org/newsclub/net/unix/NativeUnixSocketConfig.java \
         --replace /opt/newsclub/lib-native $out/lib
     '';
@@ -20,8 +24,10 @@ stdenv.mkDerivation rec {
   buildPhase = "ant";
 
   ANT_ARGS =
-    "-Dskip32=true -Dant.build.javac.source=1.6"
-    + stdenv.lib.optionalString stdenv.isDarwin " -DisMac=true";
+    # Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib.
+    (if stdenv.is64bit && !stdenv.isDarwin then [ "-Dskip32=true" ] else [ "-Dskip64=true" ])
+    ++ [ "-Dgcc=cc" "-Dant.build.javac.source=1.6" ]
+    ++ stdenv.lib.optional stdenv.isDarwin "-DisMac=true";
 
   installPhase =
     ''
@@ -34,6 +40,6 @@ stdenv.mkDerivation rec {
     description = "A Java/JNI library for using Unix Domain Sockets from Java";
     homepage = https://code.google.com/p/junixsocket/;
     license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
-- 
GitLab


From edb1e2996f9bfab788f142b88a48b15b20df6cc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 28 Jan 2014 12:11:35 +0100
Subject: [PATCH 0593/3789] xorg.xtrans: update to 1.3.3

Another forgotten X lib; we had ~2 years without updating it.
---
 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 580e09642a5..b0ac857948b 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2010,11 +2010,11 @@ let
   })) // {inherit libX11 xbitmaps libXcursor libXmu ;};
 
   xtrans = (stdenv.mkDerivation ((if overrides ? xtrans then overrides.xtrans else x: x) {
-    name = "xtrans-1.2.7";
+    name = "xtrans-1.3.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xtrans-1.2.7.tar.bz2;
-      sha256 = "19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz";
+      url = mirror://xorg/individual/lib/xtrans-1.3.3.tar.bz2;
+      sha256 = "1gq9i9p1q7wgaj1vm1n5mrw0rp0bpcdk4hdy9yj82i92rsnv8bb2";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 7a997c6c169..50a4928e351 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -175,7 +175,7 @@ mirror://xorg/X11R7.7/src/everything/xrdb-1.0.9.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xrefresh-1.0.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xset-1.2.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xtrans-1.2.7.tar.bz2
+mirror://xorg/individual/lib/xtrans-1.3.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xvinfo-1.1.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xwd-1.0.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xwininfo-1.1.2.tar.bz2
-- 
GitLab


From 197de444dfaad1137b45b7ad61cd36e16a5c0852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Tue, 28 Jan 2014 12:13:28 +0100
Subject: [PATCH 0594/3789] ipython: disable support for qtconsole, pylabQt and
 pylab on Darwin

Qt and CUPS are not supported on Darwin and are dependencies.

Note: this makes ipython the same as ipythonLight on Darwin, but
ipython is used as an input for other packages (ipdb and ipdplugin)
and it is reasonable to assume that users on other platforms may
choose ipythonLight.
---
 pkgs/top-level/python-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5718572399f..62c37e5d30b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -65,6 +65,9 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   ipython = import ../shells/ipython {
     inherit (pkgs) stdenv fetchurl sip pyqt4;
     inherit buildPythonPackage pythonPackages;
+    qtconsoleSupport = !pkgs.stdenv.isDarwin; # qt is not supported on darwin
+    pylabQtSupport = !pkgs.stdenv.isDarwin;
+    pylabSupport = !pkgs.stdenv.isDarwin; # cups is not supported on darwin
   };
 
   ipythonLight = lowPrio (import ../shells/ipython {
-- 
GitLab


From 120be164794e0703729fba05643e95158dba9d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Jan 2014 14:08:23 +0100
Subject: [PATCH 0595/3789] llvm: propagate ncurses

Cf. discussion at https://github.com/NixOS/nixpkgs/commit/4eefe1a7
---
 pkgs/development/compilers/llvm/3.4/llvm.nix | 4 +++-
 pkgs/development/libraries/mesa/default.nix  | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 4947bdca2a9..df0bae3218d 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -25,7 +25,9 @@ in stdenv.mkDerivation rec {
     mv compiler-rt-${version} $sourceRoot/projects/compiler-rt
   '';
 
-  buildInputs = [ perl groff cmake libxml2 python libffi valgrind ncurses ];
+  propagatedBuildInputs = [ ncurses ]; # linked against it, e.g. mesa needs it now, too
+
+  buildInputs = [ perl groff cmake libxml2 python libffi valgrind ];
 
   # hacky fix: created binaries need to be run before installation
   preBuild = ''
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 11b1e2bca77..1eb3258b14b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook
 , python, libxml2Python, file, expat, makedepend
 , libdrm, xorg, wayland, udev, llvm, libffi
-, libvdpau, libelf, ncurses
+, libvdpau, libelf
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
 , enableExtraFeatures ? false # not maintained
 }:
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
   buildInputs = with xorg; [
     autoreconfHook intltool expat libxml2Python llvm
     libXfixes glproto dri2proto libX11 libXext libxcb libXt
-    libffi wayland libvdpau libelf ncurses
+    libffi wayland libvdpau libelf
   ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ]
     ++ optional stdenv.isLinux udev
     ;
-- 
GitLab


From 5acaa980a510f77fce358bdbe93ab5fa388118fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 21 Jan 2014 00:29:35 +0100
Subject: [PATCH 0596/3789] pull module blacklist from Ubuntu and use it by
 default

People often have serious problems due to bogus modules like *fb.
---
 nixos/modules/system/boot/modprobe.nix        | 24 ++++------------
 .../linux/kmod-blacklist-ubuntu/default.nix   | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix

diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix
index 027a7ac99d5..f694fd29dd0 100644
--- a/nixos/modules/system/boot/modprobe.nix
+++ b/nixos/modules/system/boot/modprobe.nix
@@ -68,7 +68,10 @@ with pkgs.lib;
 
   config = mkIf (!config.boot.isContainer) {
 
-    environment.etc = singleton
+    environment.etc = [
+      { source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
+        target = "modprobe.d/ubuntu.conf";
+      }
       { source = pkgs.writeText "modprobe.conf"
           ''
             ${flip concatMapStrings config.boot.blacklistedKernelModules (name: ''
@@ -77,26 +80,11 @@ with pkgs.lib;
             ${config.boot.extraModprobeConfig}
           '';
         target = "modprobe.d/nixos.conf";
-      };
+      }
+    ];
 
     environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ];
 
-    boot.blacklistedKernelModules =
-      [ # This module is for debugging and generates gigantic amounts
-        # of log output, so it should never be loaded automatically.
-        "evbug"
-
-        # This module causes ALSA to occassionally select the wrong
-        # default sound device, and is little more than an annoyance
-        # on modern machines.
-        "snd_pcsp"
-
-        # The cirrusfb module prevents X11 from starting.  FIXME:
-        # Ubuntu blacklists all framebuffer devices because they're
-        # "buggy" and cause suspend problems.  Maybe we should too?
-        "cirrusfb"
-      ];
-
     system.activationScripts.modprobe =
       ''
         # Allow the kernel to find our wrapped modprobe (which searches
diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
new file mode 100644
index 00000000000..9da50766f92
--- /dev/null
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchbzr }:
+
+stdenv.mkDerivation rec {
+  name = "blacklist-ubuntu-${builtins.toString src.revision}"; # Saucy
+
+  src = fetchbzr {
+    url = meta.homepage;
+    sha256 = "0ci4b5dxzirc27zvgpr3s0pa78gjmfjwprmvyplxhwxb765la9v9";
+    revision = 13;
+  };
+
+  unpackPhase = "true";
+
+  installPhase = ''
+    mkdir "$out"
+    for f in "$src"/debian/modprobe.d/*.conf; do
+      echo "''\n''\n## file: "`basename "$f"`"''\n''\n" >> "$out"/modprobe.conf
+      cat "$f" >> "$out"/modprobe.conf
+    done
+  '';
+
+  #TODO: iwlwifi.conf has some strange references
+
+  meta = {
+    homepage = https://code.launchpad.net/~ubuntu-branches/ubuntu/saucy/kmod/saucy;
+    description = "Linux kernel module blacklists from Ubuntu";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b3c86cd29c..85ac461732d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6835,6 +6835,8 @@ let
 
   kmod = callPackage ../os-specific/linux/kmod { };
 
+  kmod-blacklist-ubuntu = callPackage ../os-specific/linux/kmod-blacklist-ubuntu { };
+
   kvm = qemu_kvm;
 
   libcap = callPackage ../os-specific/linux/libcap { };
-- 
GitLab


From bc5995e3924397683b12766653087ff4bfbafbd7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jan 2014 13:36:35 +0100
Subject: [PATCH 0597/3789] cpio: Fix build on Darwin

---
 pkgs/tools/archivers/cpio/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
index ec873507c85..2f3a1b97487 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -8,10 +8,11 @@ stdenv.mkDerivation {
     sha256 = "bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd";
   };
 
-  patches = [ ./no-gets.patch ];
+  patches = [ ./no-gets.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-fix.patch;
 
   meta = {
     homepage = http://www.gnu.org/software/cpio/;
     description = "A program to create or extract from cpio archives";
+    platforms = stdenv.lib.platforms.all;
   };
 }
-- 
GitLab


From 4350c64bba80a598c9a9ee242e8dd91dea34b1aa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:31 +0100
Subject: [PATCH 0598/3789] haskell-GlomeVec: update to version 0.2

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

diff --git a/pkgs/development/libraries/haskell/GlomeVec/default.nix b/pkgs/development/libraries/haskell/GlomeVec/default.nix
index d22273f2030..710605c52e3 100644
--- a/pkgs/development/libraries/haskell/GlomeVec/default.nix
+++ b/pkgs/development/libraries/haskell/GlomeVec/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "GlomeVec";
-  version = "0.1.2";
-  sha256 = "6023c11977bf16baf487235087e94f5a2f465e8403b8e40ab513e7879dd52639";
+  version = "0.2";
+  sha256 = "08hyiadkbkmcsd1g51xvxqzp6l94hnqqbz4r6yk0zk29iawq8610";
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Glome";
     description = "Simple 3D vector library";
-- 
GitLab


From 8c58f6904a01e67fa0d08346a810f236f9013f17 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:31 +0100
Subject: [PATCH 0599/3789] haskell-JuicyPixels: update to version 3.1.3.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 9b34bc9672b..57c37139d4f 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.3.1";
-  sha256 = "03kbvm3y5di274gzz8sr24z9j27rdayx4kkbf5hfvl325ghidhx9";
+  version = "3.1.3.2";
+  sha256 = "0c0vavqisljsl8v8hvmxj8q3hmjq5layanbbyp0zcbj6yxv8s62a";
   buildDepends = [
     binary deepseq mtl primitive transformers vector zlib
   ];
-- 
GitLab


From 728c16612310e42d878af5bb44a31f98d02f85d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 0600/3789] haskell-diagrams-cairo: update to version 1.0.1

---
 pkgs/development/libraries/haskell/diagrams/cairo.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index ee9b0907347..53e9e0ac2cd 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -1,14 +1,14 @@
 { cabal, cairo, colour, dataDefaultClass, diagramsCore, diagramsLib
-, filepath, lens, mtl, split, statestack, time
+, filepath, hashable, lens, mtl, split, statestack, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-cairo";
-  version = "1.0";
-  sha256 = "1m549ryfyfjc6sg3xi0wlcpi4c0xj6yfrpjmxgiyl76rwaqns989";
+  version = "1.0.1";
+  sha256 = "16h1xz5amn0yd3h9rss0skaq08k1cy91cncxb9ky020s0wcix9fm";
   buildDepends = [
     cairo colour dataDefaultClass diagramsCore diagramsLib filepath
-    lens mtl split statestack time
+    hashable lens mtl split statestack time
   ];
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
-- 
GitLab


From b1e174725b72738412e70dbce5ee41da08402735 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 0601/3789] haskell-diagrams-lib: update to version 1.0.1

---
 pkgs/development/libraries/haskell/diagrams/lib.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index 858e2497642..6dbedd5ecda 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -1,16 +1,16 @@
 { cabal, active, colour, dataDefaultClass, diagramsCore, filepath
-, fingertree, intervals, lens, MemoTrie, monoidExtras, NumInstances
-, optparseApplicative, safe, semigroups, tagged, vectorSpace
-, vectorSpacePoints
+, fingertree, hashable, intervals, lens, MemoTrie, monoidExtras
+, NumInstances, optparseApplicative, safe, semigroups, tagged
+, vectorSpace, vectorSpacePoints
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "1.0.0.1";
-  sha256 = "1ilkc8dh1ma0wwmzgy6x3a6q6bwlw7dfv3mb24a5ny4i3wgvsnv8";
+  version = "1.0.1";
+  sha256 = "0cjhb6dm0n4a7s8z0lyihql7dz34pdbm3ahm2p0yya4xf9pf0fw4";
   buildDepends = [
     active colour dataDefaultClass diagramsCore filepath fingertree
-    intervals lens MemoTrie monoidExtras NumInstances
+    hashable intervals lens MemoTrie monoidExtras NumInstances
     optparseApplicative safe semigroups tagged vectorSpace
     vectorSpacePoints
   ];
-- 
GitLab


From 2cd347770ca547ed1ed8f7a3353383863c3e1852 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 0602/3789] haskell-diagrams-svg: update to version 1.0.1

---
 pkgs/development/libraries/haskell/diagrams/svg.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index dea68b93e6d..1d64d402bdf 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -1,14 +1,15 @@
-{ cabal, blazeSvg, colour, diagramsCore, diagramsLib, filepath
-, lens, monoidExtras, mtl, split, time, vectorSpace
+{ cabal, blazeMarkup, blazeSvg, colour, diagramsCore, diagramsLib
+, filepath, hashable, lens, monoidExtras, mtl, split, time
+, vectorSpace
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-svg";
-  version = "1.0";
-  sha256 = "13v1q9d2004k4324b0yxlmwrsanb0mk9pz0gqfxvx9v27sry12sl";
+  version = "1.0.1";
+  sha256 = "15adic3dl4qqrd63jx1rc1w4wx270vm7zc3hr69mnh0wn0cr0ga5";
   buildDepends = [
-    blazeSvg colour diagramsCore diagramsLib filepath lens monoidExtras
-    mtl split time vectorSpace
+    blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath
+    hashable lens monoidExtras mtl split time vectorSpace
   ];
   meta = {
     homepage = "http://projects.haskell.org/diagrams/";
-- 
GitLab


From f1530932bf282362912069f88023774e083b5ded Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 0603/3789] haskell-esqueleto: update to version 1.3.4.5

---
 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 5376ac4d7e6..3bbd8681ddb 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.4.3";
-  sha256 = "1p35nzaqmpcc7slr10ihlc54kz5zv5ak0ql848m3xpbjfzq6f6vc";
+  version = "1.3.4.5";
+  sha256 = "0fw57dn67gx5v7drd4g7xbj1z614sr3lxw7gcciypnjc7qkqjgv7";
   buildDepends = [
     conduit monadLogger persistent resourcet tagged text transformers
     unorderedContainers
-- 
GitLab


From 9c358f40232493d02001df1a73fc2ce012182411 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 0604/3789] haskell-hit: update to version 0.5.3

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

diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix
index fa74f1738b6..0c4020f746c 100644
--- a/pkgs/development/libraries/haskell/hit/default.nix
+++ b/pkgs/development/libraries/haskell/hit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hit";
-  version = "0.5.2";
-  sha256 = "05f5xm23049ngvsch9cp2snyknk3qknx1jlb42zi0nbv8f1hymnn";
+  version = "0.5.3";
+  sha256 = "0s6nfjdasf62x28vzks809slnh0p6j3g101jzqlfh7nrnj5k6q1d";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From e3f528ad8a44b2e0ed439a5be303446682dff6ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 0605/3789] haskell-http-client: update to version 0.2.1.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 092b696dc19..7d85c29e656 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.2.1";
-  sha256 = "1hwr8pjlal88b6clmrs0cksmyy1vmbybvr78s6kb2ppwrzmd2v8q";
+  version = "0.2.1.1";
+  sha256 = "03hcwz53sjvw3nv6xbdf24a4ny229ljq3rx89plmsxpjb44qwlq2";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie dataDefault
     deepseq failure httpTypes network publicsuffixlist text time
-- 
GitLab


From ea8c3ee7a2227fdbeebfdf5b9c9d7adffaac6c38 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 0606/3789] haskell-http-conduit: update to version 2.0.0.4

---
 .../libraries/haskell/http-conduit/default.nix       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index bb237f16d58..c55e8a4e6e7 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -5,14 +5,14 @@
 , httpClientMultipart, httpClientTls, httpTypes, HUnit, liftedBase
 , mimeTypes, monadControl, mtl, network, networkConduit
 , publicsuffixlist, random, regexCompat, resourcet, socks, text
-, time, tls, tlsExtra, transformers, transformersBase, utf8String
-, void, wai, warp, warpTls, zlibConduit
+, time, transformers, transformersBase, utf8String, void, wai, warp
+, warpTls, zlibConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "2.0.0.3";
-  sha256 = "1s3nyc3wwpqildhmkv5fps2a0552yrnwcqjv4bxcvg581k5sj42i";
+  version = "2.0.0.4";
+  sha256 = "0902sklwfb9gr1yqxp15qa4qqik75jv6pl0nfh2s4vq65sh4gndq";
   buildDepends = [
     conduit httpClient httpClientConduit httpClientTls httpTypes
     liftedBase resourcet transformers
@@ -23,8 +23,8 @@ cabal.mkDerivation (self: {
     dataDefault deepseq failure filepath hspec httpClient
     httpClientMultipart httpTypes HUnit liftedBase mimeTypes
     monadControl mtl network networkConduit publicsuffixlist random
-    regexCompat resourcet socks text time tls tlsExtra transformers
-    transformersBase utf8String void wai warp warpTls zlibConduit
+    regexCompat resourcet socks text time transformers transformersBase
+    utf8String void wai warp warpTls zlibConduit
   ];
   doCheck = false;
   meta = {
-- 
GitLab


From 838e8d3426fbf2017c18fa77e6d5eabaf566075c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 0607/3789] haskell-network-conduit: update to version 1.0.2

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

diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index 5dec259f5f5..5ad390c39e7 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit";
-  version = "1.0.1.1";
-  sha256 = "1mji8zb0chnnxl7z4dgijls6szfa6c47zmhx0v1dc9k27bnc0mhx";
+  version = "1.0.2";
+  sha256 = "00x9m4lsh4hkvw6z6kqd3q7hpy2q905vcnj9x1wbn6swz621h4rw";
   buildDepends = [
     conduit liftedBase monadControl network transformers
   ];
-- 
GitLab


From 221eafa7aac00ea99b16d00b7ed52e6a5d43cc7e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 0608/3789] haskell-stm-conduit: update to version 2.2.1.1

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

diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index f05396f8a6d..b53b310dafe 100644
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stm-conduit";
-  version = "2.2.1";
-  sha256 = "15ym83c42krx19rw719yqlib1vcg68jmx48rihy5aimc0m5m307b";
+  version = "2.2.1.1";
+  sha256 = "0rqn6xhqhaqiy0n2g46z58zzccq1i749p97aihrvjpikrz5kypka";
   buildDepends = [
     async cereal cerealConduit conduit liftedAsync liftedBase
     monadControl monadLoops resourcet stm stmChans transformers
-- 
GitLab


From 2c23e7227d19be79c0ee8c1293d37c301088a2c9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:33 +0100
Subject: [PATCH 0609/3789] haskell-wai-extra: update to version 2.0.3.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 451efd8a0a7..3022b0565de 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.0.3.1";
-  sha256 = "1ckn90j2zmh77mgpan28v315qipw5v0ji9k3lq1ni9kzjap7pl5a";
+  version = "2.0.3.2";
+  sha256 = "0zhwk78ny7ak6sf974gqg3zjrrmivgb7dvxs5jbqghq0a6xs97zi";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase
-- 
GitLab


From dc354b0beb6d3fd6432fa918655b1e29bc0db88c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:33 +0100
Subject: [PATCH 0610/3789] haskell-HaRe: update to version 0.7.1.0

---
 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 6c24b509db5..556359b9bc5 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.0.9";
-  sha256 = "1a3kf6hdzchcyb743l6ikyw3nclcy8g7a5kaj4jgxqvmss9z73f1";
+  version = "0.7.1.0";
+  sha256 = "07v0c177dydg4hv01knxyxid2ys37wkx0mz4nb9ca6b9s12781hn";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From cae97e9418908c374d41939456da7a55c3275518 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 20:58:15 +0100
Subject: [PATCH 0611/3789] Add newly required Haskell packages.

 - asn1-encoding: add version 0.8.1.2
 - asn1-parse: add version 0.8.1
 - x509-store: add version 1.4.3
 - x509-system: add version 1.4.2
 - x509-validation: add version 1.5.0
 - x509: add version 1.4.7
---
 .../haskell/asn1-encoding/default.nix         | 16 +++++++++++++
 .../libraries/haskell/asn1-parse/default.nix  | 14 +++++++++++
 .../libraries/haskell/x509-store/default.nix  | 18 ++++++++++++++
 .../libraries/haskell/x509-system/default.nix | 14 +++++++++++
 .../haskell/x509-validation/default.nix       | 21 ++++++++++++++++
 .../libraries/haskell/x509/default.nix        | 24 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           | 12 ++++++++++
 7 files changed, 119 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/asn1-encoding/default.nix
 create mode 100644 pkgs/development/libraries/haskell/asn1-parse/default.nix
 create mode 100644 pkgs/development/libraries/haskell/x509-store/default.nix
 create mode 100644 pkgs/development/libraries/haskell/x509-system/default.nix
 create mode 100644 pkgs/development/libraries/haskell/x509-validation/default.nix
 create mode 100644 pkgs/development/libraries/haskell/x509/default.nix

diff --git a/pkgs/development/libraries/haskell/asn1-encoding/default.nix b/pkgs/development/libraries/haskell/asn1-encoding/default.nix
new file mode 100644
index 00000000000..c151da0c7dd
--- /dev/null
+++ b/pkgs/development/libraries/haskell/asn1-encoding/default.nix
@@ -0,0 +1,16 @@
+{ cabal, asn1Types, mtl, text, time }:
+
+cabal.mkDerivation (self: {
+  pname = "asn1-encoding";
+  version = "0.8.1.2";
+  sha256 = "01i7zga9nfvccgjixnxza9mi7jj4k6308g8asnljr44s1k8rikwm";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ asn1Types mtl text time ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-asn1";
+    description = "ASN1 data reader and writer in RAW, BER and DER forms";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/asn1-parse/default.nix b/pkgs/development/libraries/haskell/asn1-parse/default.nix
new file mode 100644
index 00000000000..16386d939e4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/asn1-parse/default.nix
@@ -0,0 +1,14 @@
+{ cabal, asn1Encoding, asn1Types, mtl, text, time }:
+
+cabal.mkDerivation (self: {
+  pname = "asn1-parse";
+  version = "0.8.1";
+  sha256 = "021mbm5aayfx9vhxq4x1jj3gpnzq0bqaqcl1zsaa2a6l0qzpnmh9";
+  buildDepends = [ asn1Encoding asn1Types mtl text time ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-asn1";
+    description = "Simple monadic parser for ASN1 stream types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/x509-store/default.nix b/pkgs/development/libraries/haskell/x509-store/default.nix
new file mode 100644
index 00000000000..bc1c0c47dc9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/x509-store/default.nix
@@ -0,0 +1,18 @@
+{ cabal, asn1Encoding, asn1Types, cryptoPubkeyTypes, filepath, mtl
+, pem, time, x509
+}:
+
+cabal.mkDerivation (self: {
+  pname = "x509-store";
+  version = "1.4.3";
+  sha256 = "1px5r5y4vaxx479d4av333g1sc03mz1aalpvwwkbi5bwnxydvf01";
+  buildDepends = [
+    asn1Encoding asn1Types cryptoPubkeyTypes filepath mtl pem time x509
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-certificate";
+    description = "X.509 collection accessing and storing methods";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/x509-system/default.nix b/pkgs/development/libraries/haskell/x509-system/default.nix
new file mode 100644
index 00000000000..36d1f5bd706
--- /dev/null
+++ b/pkgs/development/libraries/haskell/x509-system/default.nix
@@ -0,0 +1,14 @@
+{ cabal, filepath, mtl, pem, time, x509, x509Store }:
+
+cabal.mkDerivation (self: {
+  pname = "x509-system";
+  version = "1.4.2";
+  sha256 = "1r22ignmwkv1z26bmnwh7prqy69cln26pfyyaf5r2vw8s66rgl39";
+  buildDepends = [ filepath mtl pem time x509 x509Store ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-certificate";
+    description = "Handle per-operating-system X.509 accessors and storage";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/x509-validation/default.nix b/pkgs/development/libraries/haskell/x509-validation/default.nix
new file mode 100644
index 00000000000..27f5d6ecbbe
--- /dev/null
+++ b/pkgs/development/libraries/haskell/x509-validation/default.nix
@@ -0,0 +1,21 @@
+{ cabal, asn1Encoding, asn1Types, byteable, cryptohash
+, cryptoPubkey, cryptoPubkeyTypes, dataDefaultClass, filepath, mtl
+, network, pem, time, x509, x509Store
+}:
+
+cabal.mkDerivation (self: {
+  pname = "x509-validation";
+  version = "1.5.0";
+  sha256 = "1xarn00ipi77whly5yjlpqa0xd25lj0jf4xk8ylp4ba58hvcxqrn";
+  buildDepends = [
+    asn1Encoding asn1Types byteable cryptohash cryptoPubkey
+    cryptoPubkeyTypes dataDefaultClass filepath mtl network pem time
+    x509 x509Store
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-certificate";
+    description = "X.509 Certificate and CRL validation";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix
new file mode 100644
index 00000000000..0aababd4715
--- /dev/null
+++ b/pkgs/development/libraries/haskell/x509/default.nix
@@ -0,0 +1,24 @@
+{ cabal, asn1Encoding, asn1Parse, asn1Types, cryptohash
+, cryptoPubkeyTypes, filepath, HUnit, mtl, pem, QuickCheck
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "x509";
+  version = "1.4.7";
+  sha256 = "0bm5sijahpih2c6scz3y32904wzvmllgslg9d547cksbgy7lyx1h";
+  buildDepends = [
+    asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes
+    filepath mtl pem time
+  ];
+  testDepends = [
+    asn1Types cryptoPubkeyTypes HUnit mtl QuickCheck testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 time
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-certificate";
+    description = "X509 reader and writer";
+    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 6e738048a92..0087aa59df3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -567,6 +567,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   asn1Data = callPackage ../development/libraries/haskell/asn1-data {};
 
+  asn1Encoding = callPackage ../development/libraries/haskell/asn1-encoding {};
+
+  asn1Parse = callPackage ../development/libraries/haskell/asn1-parse {};
+
   asn1Types = callPackage ../development/libraries/haskell/asn1-types {};
 
   AspectAG = callPackage ../development/libraries/haskell/AspectAG {};
@@ -2502,6 +2506,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {};
 
+  x509 = callPackage ../development/libraries/haskell/x509 {};
+
+  x509Store = callPackage ../development/libraries/haskell/x509-store {};
+
+  x509System = callPackage ../development/libraries/haskell/x509-system {};
+
+  x509Validation = callPackage ../development/libraries/haskell/x509-validation {};
+
   X11 = callPackage ../development/libraries/haskell/X11 {};
 
   X11Xft = callPackage ../development/libraries/haskell/X11-xft {};
-- 
GitLab


From c13d4085a3a78bc2a0b33248a4293c3521be7f23 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 21:22:52 +0100
Subject: [PATCH 0612/3789] haskell-network-conduit: disable test suite to fix
 build errors with GHC 7.4.2

https://github.com/snoyberg/conduit/issues/134
---
 pkgs/development/libraries/haskell/network-conduit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index 5ad390c39e7..cb10603355c 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -9,6 +9,7 @@ cabal.mkDerivation (self: {
     conduit liftedBase monadControl network transformers
   ];
   testDepends = [ conduit ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Stream socket data using conduits";
-- 
GitLab


From b8d6e1d4586d1c43f0db0b9f02ed6feedea5486d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 21:45:28 +0100
Subject: [PATCH 0613/3789] haskell-diagrams-svg: jailbreak to fix build with
 recent blaze-markup

---
 pkgs/development/libraries/haskell/diagrams/svg.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index 1d64d402bdf..4f1dfdc8672 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
     blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath
     hashable lens monoidExtras mtl split time vectorSpace
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams/";
     description = "SVG backend for diagrams drawing EDSL";
-- 
GitLab


From 63ec2bec8f3791370032ca821a4292c6ffc79f1a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Jan 2014 10:31:43 +0100
Subject: [PATCH 0614/3789] haskell-git-annex: update to version 5.20140127

---
 .../git-and-tools/git-annex/default.nix       | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 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 cd25bbfdc6f..6a4272101b3 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
@@ -5,17 +5,18 @@
 , hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, IfElse
 , json, lsof, MissingH, MonadCatchIOTransformers, monadControl, mtl
 , network, networkConduit, networkInfo, networkMulticast
-, networkProtocolXmpp, openssh, perl, QuickCheck, random, regexTdfa
-, rsync, SafeSemaphore, SHA, stm, tasty, tastyHunit
-, tastyQuickcheck, text, time, transformers, unixCompat, utf8String
-, uuid, wai, waiLogger, warp, which, xmlConduit, xmlTypes, yesod
-, yesodCore, yesodDefault, yesodForm, yesodStatic
+, networkProtocolXmpp, openssh, optparseApplicative, perl
+, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, SHA, stm
+, tasty, tastyHunit, tastyQuickcheck, text, time, transformers
+, unixCompat, utf8String, uuid, wai, waiLogger, warp, which
+, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm
+, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140116";
-  sha256 = "18l9nflmnfaqmrq9nvypv2jwn3v2461lb4m0jjpai6aipzl91jw2";
+  version = "5.20140127";
+  sha256 = "0aqqnv0faiva9vf0nb0d8xsd659y8cyrnyy6mfjdqjqdw8wha3yr";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -25,10 +26,10 @@ cabal.mkDerivation (self: {
     hinotify hS3 hslogger HTTP httpConduit httpTypes IfElse json
     MissingH MonadCatchIOTransformers monadControl mtl network
     networkConduit networkInfo networkMulticast networkProtocolXmpp
-    QuickCheck random regexTdfa SafeSemaphore SHA stm tasty tastyHunit
-    tastyQuickcheck text time transformers unixCompat utf8String uuid
-    wai waiLogger warp xmlConduit xmlTypes yesod yesodCore yesodDefault
-    yesodForm yesodStatic
+    optparseApplicative QuickCheck random regexTdfa SafeSemaphore SHA
+    stm tasty tastyHunit tastyQuickcheck text time transformers
+    unixCompat utf8String uuid wai waiLogger warp xmlConduit xmlTypes
+    yesod yesodCore yesodDefault yesodForm yesodStatic
   ];
   buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
   configureFlags = "-fS3
-- 
GitLab


From 4cbf42f006eb9a7ccfe31cf906070b9753509f8b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Jan 2014 10:31:43 +0100
Subject: [PATCH 0615/3789] haskell-direct-sqlite: update to version 2.3.11

---
 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 9ffd3ca728d..12e61ebb9ef 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.9";
-  sha256 = "0haq14acdijd41jvah6f6l6qlqc4wjp3mwkx57pz4q5m6qvxrz44";
+  version = "2.3.11";
+  sha256 = "0pd5qv8aq47d5n2sd99yblxiq70zvmy2rc71ys73a3d846k0ncs0";
   buildDepends = [ text ];
   testDepends = [ base16Bytestring HUnit text ];
   meta = {
-- 
GitLab


From 55a8134bbec4f8fdd15da3b71946aad78512f0c0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Jan 2014 10:31:43 +0100
Subject: [PATCH 0616/3789] haskell-highlighting-kate: update to version
 0.5.6.1

---
 .../libraries/haskell/highlighting-kate/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index 863a0441b02..497d1083f55 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "highlighting-kate";
-  version = "0.5.6";
-  sha256 = "1nd1ima3x7bb3lhkpzfw1qbl8g8mwp1ixk2w7nf2p1200c5zs49d";
+  version = "0.5.6.1";
+  sha256 = "0hwzybihx5znd2z00kqcffqmng7vwynmav0x0zf2b9g415c2lx23";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];
-- 
GitLab


From 048029493750a9f8d253054f10fe6158f59835b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Jan 2014 10:31:43 +0100
Subject: [PATCH 0617/3789] haskell-network-conduit: update to version 1.0.2.1

---
 .../libraries/haskell/network-conduit/default.nix            | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index cb10603355c..024cf9b1d41 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -3,13 +3,12 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit";
-  version = "1.0.2";
-  sha256 = "00x9m4lsh4hkvw6z6kqd3q7hpy2q905vcnj9x1wbn6swz621h4rw";
+  version = "1.0.2.1";
+  sha256 = "1dq7pwimjkr0wpyjphbvjy3klkcjl8jin76am5jbz3cxk1dr20jk";
   buildDepends = [
     conduit liftedBase monadControl network transformers
   ];
   testDepends = [ conduit ];
-  doCheck = false;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Stream socket data using conduits";
-- 
GitLab


From 9e36e4be1837ed2f87341fb4b7f616712e217409 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Jan 2014 10:31:43 +0100
Subject: [PATCH 0618/3789] haskell-yaml: update to version 0.8.5.4

---
 pkgs/development/libraries/haskell/yaml/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index fb8709f5a78..8e3a3e46f45 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -1,15 +1,15 @@
-{ cabal, aeson, attoparsec, conduit, hspec, HUnit, resourcet, text
-, transformers, unorderedContainers, vector
+{ cabal, aeson, attoparsec, conduit, hspec, HUnit, resourcet
+, scientific, text, transformers, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.8.5.3";
-  sha256 = "028wxp3jcvdy63707jhxm9mmkbxz9ni1c63rb7wvzjswijp3p95b";
+  version = "0.8.5.4";
+  sha256 = "0mn1i0whqr9q6vh43x5xa0p4xxckqszhsi62warx1kjvrq4yil6f";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson attoparsec conduit resourcet text transformers
+    aeson attoparsec conduit resourcet scientific text transformers
     unorderedContainers vector
   ];
   testDepends = [
-- 
GitLab


From 069220a868a3ac3f1ce60cd30e73088de5b61dde Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Jan 2014 10:31:43 +0100
Subject: [PATCH 0619/3789] haskell-yesod-bin: update to version 1.2.5.7

---
 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 60618be3616..af6b4f339f6 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.5.6";
-  sha256 = "1acqfg9g5xjfmpby1xham2ygvbydn0srw2c7hajvfwalc6zkxrny";
+  version = "1.2.5.7";
+  sha256 = "0vxkwdqmfi2ccknmgx0xh6w1p7bw3wi24w3c3fw80g72j9sxr5hn";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 134d52cb5fb2328add74107acf93d2c616abdbcd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Jan 2014 10:31:44 +0100
Subject: [PATCH 0620/3789] haskell-HaRe: update to version 0.7.1.1

---
 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 556359b9bc5..92bb973b558 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.1.0";
-  sha256 = "07v0c177dydg4hv01knxyxid2ys37wkx0mz4nb9ca6b9s12781hn";
+  version = "0.7.1.1";
+  sha256 = "1gh0md8gfchniclck5ddbkdwf9dl01mkcdmdx3n3f59rx9qi8g0h";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From a8a5a5905904b1319af5a0e1cfe03e577333013e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jan 2014 15:22:51 +0100
Subject: [PATCH 0621/3789] stdenv-linux: Fix binutils override

This ensures that pkgs.binutils equals the binutils used in the final
stdenv, as intended.
---
 pkgs/stdenv/linux/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index bedeea0915d..408c362bedb 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -296,12 +296,13 @@ rec {
     extraAttrs = {
       inherit (stdenvLinuxBoot3Pkgs) glibc;
       inherit platform bootstrapTools;
-      shellPackage = stdenvLinuxBoot4Pkgs.bash; 
+      shellPackage = stdenvLinuxBoot4Pkgs.bash;
     };
 
     overrides = pkgs: {
       inherit gcc;
-      inherit (stdenvLinuxBoot3Pkgs) binutils glibc;
+      inherit (stdenvLinuxBoot3Pkgs) glibc;
+      inherit (stdenvLinuxBoot4Pkgs) binutils;
       inherit (stdenvLinuxBoot4Pkgs)
         gzip bzip2 xz bash coreutils diffutils findutils gawk
         gnumake gnused gnutar gnugrep gnupatch patchelf
-- 
GitLab


From 577c20c23b8590fcbb527f7831f8def0c52c479e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 11 Jan 2014 22:11:32 +0100
Subject: [PATCH 0622/3789] tigervnc: fix ctrl-* keys, eg ctrl-c ctrl-v ctrl-d
 by applying patch to fltk

I'm unsure about
- is it ok to apply this patch globally, or should it be overridden for tigervnc only?
- how many rebuilds it triggers
- whether it was neccessary to update to latest dev version (seems to work)
The bug report indicates that others distros just includes this patch (?)

Cf. #1498. vcunat: the patch should be usable globally, as e.g. Arch does it.
Using autoreconfHook doesn't work for me, maybe --force is bad for it.
---
 pkgs/development/libraries/fltk/fltk13.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix
index c6951db228b..8fb4d40b1db 100644
--- a/pkgs/development/libraries/fltk/fltk13.nix
+++ b/pkgs/development/libraries/fltk/fltk13.nix
@@ -1,5 +1,8 @@
 { composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
-, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }:
+, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng
+
+, automake, autoconf, libtool
+}:
 
 let inherit (composableDerivation) edf; in
 
@@ -14,7 +17,12 @@ composableDerivation.composableDerivation {} {
 
   propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  enableParallelBilding = true;
+
+  nativeBuildInputs = [
+    pkgconfig
+    automake autoconf libtool # only required because of patch
+  ];
 
   flags =
     # this could be tidied up (?).. eg why does it require freeglut without glSupport?
@@ -46,4 +54,11 @@ composableDerivation.composableDerivation {} {
     description = "A C++ cross-platform light-weight GUI library binding";
     homepage = http://www.fltk.org;
   };
+
+  patches = [
+    # https://bugs.archlinux.org/task/36186
+    (fetchurl {
+    url = "https://bugs.archlinux.org/task/36186?getfile=10750";
+    sha256 = "1hpb1i87nc3zw6mgpgf3bfv557ci930bsn6rwlhaif51nlqd2wbj";
+  }) ];
 }
-- 
GitLab


From 1a68ee7deb2d9dbc6b6d18d5bd49677a6328b89d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jan 2014 16:13:01 +0100
Subject: [PATCH 0623/3789] Disable FreeBSD builds

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index c0800c8cad1..3d7fbd1c57b 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -12,7 +12,7 @@
 { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
 , officialRelease ? false
 , # The platforms for which we build Nixpkgs.
-  supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ]
+  supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
 }:
 
 with import ./release-lib.nix { inherit supportedSystems; };
-- 
GitLab


From 6f5be260b47c65dfc517ecbdb6bbc0a6826135fa Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Tue, 28 Jan 2014 17:24:00 +0100
Subject: [PATCH 0624/3789] Adopt packages.

---
 pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix | 2 +-
 pkgs/applications/graphics/photivo/default.nix              | 5 +++++
 pkgs/applications/networking/browsers/w3m/default.nix       | 3 ++-
 pkgs/development/tools/build-managers/cmake/default.nix     | 2 +-
 pkgs/development/tools/misc/lsof/default.nix                | 1 +
 pkgs/games/stepmania/default.nix                            | 5 +++++
 pkgs/os-specific/linux/pam_krb5/default.nix                 | 1 +
 pkgs/servers/dict/default.nix                               | 1 +
 8 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
index e0373fca5df..3ba848affc0 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://emacs-w3m.namazu.org/;
 
-    maintainers = [ ];
+    maintainers = [ stdenv.lib.maintainers.mornfall ];
   };
 }
diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
index 7c9ff32ec77..61e3f666dca 100644
--- a/pkgs/applications/graphics/photivo/default.nix
+++ b/pkgs/applications/graphics/photivo/default.nix
@@ -18,4 +18,9 @@ stdenv.mkDerivation rec {
         -e s,@INSTALL@,$out/share/photivo, \
         -i Sources/ptSettings.cpp
   '';
+
+  meta = with stdenv.lib; {
+      platforms = platforms.linux;
+      maintainers = maintainers.mornfall;
+  };
 }
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index 5953111fad5..5f046f7b732 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -39,8 +39,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://w3m.sourceforge.net/;
     description = "A text-mode web browser";
+    maintainers = maintainers.mornfall;
   };
 }
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 35ae214266d..c71592c8ec8 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.cmake.org/;
     description = "Cross-Platform Makefile Generator";
     platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = with stdenv.lib.maintainers; [ urkud mornfall ];
   };
 }
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index bdd35dc50f0..2469a0210b3 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation {
       socket (IPv6/IPv4/UNIX local), or partition (by opening a file
       from it).
     '';
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index 130f1f905a4..6a54dd7512f 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -23,4 +23,9 @@ stdenv.mkDerivation rec {
     echo "exec $out/stepmania" >> $out/bin/stepmania
     chmod +x $out/bin/stepmania
   '';
+
+  meta = with stdenv.lib; {
+      platforms = platforms.linux;
+      maintainers = maintainers.mornfall;
+  };
 }
diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix
index 5f95811e0f6..ad60e63c263 100644
--- a/pkgs/os-specific/linux/pam_krb5/default.nix
+++ b/pkgs/os-specific/linux/pam_krb5/default.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation {
       pam_krb5 can optionally convert Kerberos 5 credentials to Kerberos IV
       credentials and/or use them to set up AFS tokens for a user's session.
     '';
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix
index 0b78bb9ae94..51de674eb9f 100644
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -14,5 +14,6 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Dict protocol server and client";
+    maintainers = with stdenv.lib.maintainers; mornfall;
   };
 }
-- 
GitLab


From 4124bb9ff5eded88ae1d9db8645a7c3a4490b572 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Tue, 28 Jan 2014 18:11:00 +0100
Subject: [PATCH 0625/3789] Adopt more packages.

---
 pkgs/applications/audio/flac/default.nix              | 5 +++--
 pkgs/applications/audio/monkeys-audio/default.nix     | 5 +++++
 pkgs/applications/misc/pstree/default.nix             | 1 +
 pkgs/applications/misc/redshift/default.nix           | 1 +
 pkgs/applications/misc/rxvt_unicode/default.nix       | 1 +
 pkgs/data/documentation/pthread-man-pages/default.nix | 1 +
 pkgs/development/libraries/openldap/default.nix       | 1 +
 pkgs/development/libraries/openmpi/default.nix        | 1 +
 pkgs/development/tools/analysis/lcov/default.nix      | 6 +++---
 pkgs/development/tools/analysis/spin/default.nix      | 1 +
 pkgs/development/tools/misc/strace/default.nix        | 1 +
 pkgs/os-specific/linux/acpi/default.nix               | 4 +++-
 pkgs/os-specific/linux/fuse/default.nix               | 4 +++-
 pkgs/tools/networking/iftop/default.nix               | 1 +
 pkgs/tools/networking/tcpdump/default.nix             | 1 +
 pkgs/tools/package-management/dpkg/default.nix        | 5 +++--
 pkgs/tools/package-management/rpm/default.nix         | 1 +
 pkgs/tools/security/nmap/default.nix                  | 5 +++++
 pkgs/tools/typesetting/pdfjam/default.nix             | 4 ++++
 pkgs/tools/typesetting/tex/texlive/beamer.nix         | 1 +
 20 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index 0383a1ce0ad..1c8dc56de61 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -12,9 +12,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true; # takes lots of time but will be run rarely (small build-time closure)
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://xiph.org/flac/;
     description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    maintainers = maintainers.mornfall;
   };
 }
diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix
index 48b0b52c5ea..08aa7e017b2 100644
--- a/pkgs/applications/audio/monkeys-audio/default.nix
+++ b/pkgs/applications/audio/monkeys-audio/default.nix
@@ -11,4 +11,9 @@ stdenv.mkDerivation rec {
     url = "http://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz";
     sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz";
   };
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
+  };
 }
diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix
index 0d61d3d74cf..d4ffe2a4afd 100644
--- a/pkgs/applications/misc/pstree/default.nix
+++ b/pkgs/applications/misc/pstree/default.nix
@@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Show the set of running processes as a tree";
     license = "GPL";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index ae983aedc67..88d6e7a7cf9 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
     license = "GPLv3+";
     homepage = "http://jonls.dk/redshift";
     platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
   }; 
 }
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 640ace40277..e5d0ae95f99 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -41,5 +41,6 @@ stdenv.mkDerivation (rec {
   meta = {
     description = "A clone of the well-known terminal emulator rxvt";
     homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 })
diff --git a/pkgs/data/documentation/pthread-man-pages/default.nix b/pkgs/data/documentation/pthread-man-pages/default.nix
index 296ba982b8a..4cd5a5b8297 100644
--- a/pkgs/data/documentation/pthread-man-pages/default.nix
+++ b/pkgs/data/documentation/pthread-man-pages/default.nix
@@ -43,5 +43,6 @@ in
     meta = {
       description = "POSIX threads (pthreads) manual pages from LinuxThreads";
       homepage = http://www.gnu.org/software/libc/;
+      maintainers = stdenv.lib.maintainers.mornfall;
     };
   }
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 60b9c7738a0..1273146c342 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.openldap.org/";
     description = "An open source implementation of the Lightweight Directory Access Protocol";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 6e61b743a56..678a439fe0a 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation {
     homePage = http://www.open-mpi.org/;
     description = "Open source MPI-2 implementation";
     longDescription = "The Open MPI Project is an open source MPI-2 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
 
diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix
index a8d376ef23c..0a0974b886a 100644
--- a/pkgs/development/tools/analysis/lcov/default.nix
+++ b/pkgs/development/tools/analysis/lcov/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "LCOV, a code coverage tool that enhances GNU gcov";
 
     longDescription =
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     homepage = http://ltp.sourceforge.net/coverage/lcov.php;
     license = "GPLv2+";
 
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ maintainers.mornfall ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index b4fdd4c09d4..4be166f9768 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -26,5 +26,6 @@ stdenv.mkDerivation {
     description = "Formal verification tool for distributed software systems";
     homepage = http://spinroot.com/;
     license = "free";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index bdf3a7d0561..732423da5cd 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
     description = "A system call tracer for Linux";
     license = licenses.bsd3;
     platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
   };
 }
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
index 2a774949530..a3400ee0823 100644
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Show battery status and other ACPI information";
     longDescription = ''
       Linux ACPI client is a small command-line
@@ -19,5 +19,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://sourceforge.net/projects/acpiclient/;
     license = "GPLv2+";
+    platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
   };
 }
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index 183d2d86d4c..d6513f7ebb5 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -16,8 +16,10 @@ stdenv.mkDerivation rec {
   
   inherit utillinux;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://fuse.sourceforge.net/;
     description = "Kernel module and library that allows filesystems to be implemented in user space";
+    platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
   };
 }
diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix
index a1f5026fb28..c40764866eb 100644
--- a/pkgs/tools/networking/iftop/default.nix
+++ b/pkgs/tools/networking/iftop/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     homepage = http://ex-parrot.com/pdw/iftop/;
     platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
   };
 }
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index acea2d6da6a..2e27c2b2dc3 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     description = "tcpdump, a famous network sniffer";
     homepage = http://www.tcpdump.org/;
     license = "BSD-style";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index e801bcfb2c2..01dea9c35e3 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -39,9 +39,10 @@ stdenv.mkDerivation {
       done # */
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "The Debian package manager";
     homepage = http://wiki.debian.org/Teams/Dpkg;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
   };
 }
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index b35d3b66ad8..73b0ca58828 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.rpm.org/;
     license = "GPLv2";
     description = "The RPM Package Manager";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 73b6f660bf9..1b2e940540d 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -20,4 +20,9 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ libpcap libX11 gtk pkgconfig openssl python pygtk makeWrapper pysqlite ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
+  };
 }
diff --git a/pkgs/tools/typesetting/pdfjam/default.nix b/pkgs/tools/typesetting/pdfjam/default.nix
index e9b46eaa985..426cef3c85d 100644
--- a/pkgs/tools/typesetting/pdfjam/default.nix
+++ b/pkgs/tools/typesetting/pdfjam/default.nix
@@ -5,4 +5,8 @@
     url = http://www.warwick.ac.uk/go/pdfjam/pdfjam_1.20.tgz;
     sha256 = "05g3mx7mb6h15ivbv0f53r369xphy8ad8a2xblpnk9mrnlrkaxy9";
   };
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
+  };
 }
diff --git a/pkgs/tools/typesetting/tex/texlive/beamer.nix b/pkgs/tools/typesetting/tex/texlive/beamer.nix
index 4cb03e7d2c5..8b06cbb5a2b 100644
--- a/pkgs/tools/typesetting/tex/texlive/beamer.nix
+++ b/pkgs/tools/typesetting/tex/texlive/beamer.nix
@@ -20,5 +20,6 @@ rec {
 
   meta = {
     description = "Extra components for TeXLive: beamer class";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
-- 
GitLab


From 1f42b026247b657be72ee1867e9d2df84c588e8f Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 28 Jan 2014 19:09:08 +0100
Subject: [PATCH 0626/3789] androidenv: also allow references to individual apk
 files

---
 pkgs/development/mobile/androidenv/emulate-app.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
index 9c843fa8c37..53687868102 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -95,7 +95,15 @@ stdenv.mkDerivation {
     
     ${stdenv.lib.optionalString (app != null) ''
       # Install the App through the debugger
-      ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk
+      
+      if [ -d "${app}" ]
+      then
+          appPath="$(echo ${app}/*.apk)"
+      else
+          appPath="${app}"
+      fi
+      
+      ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install "$appPath"
     
       # Start the application
       ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity}
-- 
GitLab


From 45b1ffb8dba869b48b51daf72db5f73c960dd8f3 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Tue, 28 Jan 2014 20:39:25 +0100
Subject: [PATCH 0627/3789] Cosmetic change to yubikey detection

---
 nixos/modules/system/boot/luksroot.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 52c91a0e20c..46cd96e0167 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -148,21 +148,25 @@ let
         umount ${yubikey.storage.mountPoint}
     }
 
-    ykinfo -v
-    yubikey_missing="$(ykinfo -v 1>/dev/null 2>&1)$?"
-    if [ "$yubikey_missing" != "0" ]; then
+    yubikey_missing=true
+    ykinfo -v 1>/dev/null 2>&1
+    if [ $? != "0" ]; then
         echo -n "waiting 10 seconds for yubikey to appear..."
         for try in $(seq 10); do
             sleep 1
-            ykinfo -v
-            yubikey_missing="$(ykinfo -v 1>/dev/null 2>&1)$?"
-            if [ "$yubikey_missing" == "0" ]; then break; fi
+            ykinfo -v 1>/dev/null 2>&1
+            if [ $? == "0" ]; then
+                yubikey_missing=false
+                break
+            fi
             echo -n .
         done
         echo "ok"
+    else
+        yubikey_missing=false
     fi
 
-    if [ "$yubikey_missing" != "0" ]; then
+    if [ "$yubikey_missing" == true ]; then
         echo "no yubikey found, falling back to non-yubikey open procedure"
         open_normally
     else
-- 
GitLab


From 5383e07e40d05ce0fb82e7dacfb81f2d83a78315 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Tue, 28 Jan 2014 21:44:42 +0100
Subject: [PATCH 0628/3789] lua5: Add the lua-sockets extension.

---
 pkgs/development/interpreters/lua-5/5.1.nix   |  1 +
 .../interpreters/lua-5/sockets.nix            | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/interpreters/lua-5/sockets.nix

diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index 2923a8f960d..27b1589d27f 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -9,6 +9,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "lua-5.1.5";
+  luaversion = "5.1";
 
   src = fetchurl {
     url = "http://www.lua.org/ftp/${name}.tar.gz";
diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix
new file mode 100644
index 00000000000..a3f9adb0901
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/sockets.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, lua5}:
+
+stdenv.mkDerivation rec {
+  name    = "lua-sockets-${version}";
+  version = "2.0.2";
+  src = fetchurl {
+      url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz";
+      sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag";
+  };
+
+  luaver = "5.1"; # TODO
+  patchPhase = ''
+      sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua5.luaversion}," \
+          -e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua5.luaversion}," \
+          -i config
+  '';
+
+  buildInputs = [ lua5 ];
+
+  meta = {
+    homepage = "http://w3.impa.br/~diego/software/luasocket/";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.mornfall ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbaddaca195..1847540f823 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3126,6 +3126,8 @@ let
   };
   lua5 = lua5_1;
 
+  lua5_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {};
+
   luarocks = callPackage ../development/tools/misc/luarocks {
      lua = lua5;
   };
-- 
GitLab


From 5878ffa55b31317e8284cad8d5bae0f240d406bd Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Tue, 28 Jan 2014 21:45:52 +0100
Subject: [PATCH 0629/3789] quvi: Update to current upstream (0.9.4).

---
 pkgs/applications/video/quvi/library.nix | 10 +++++-----
 pkgs/applications/video/quvi/scripts.nix |  6 +++---
 pkgs/applications/video/quvi/tool.nix    | 17 ++++++++++-------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix
index 49207ad0661..0fdd78fe106 100644
--- a/pkgs/applications/video/quvi/library.nix
+++ b/pkgs/applications/video/quvi/library.nix
@@ -1,15 +1,15 @@
-{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts}:
+{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt}:
 
 stdenv.mkDerivation rec {
   name = "libquvi-${version}";
-  version="0.4.0";
+  version="0.9.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/quvi/libquvi-${version}.tar.gz";
-    sha256 = "15cm9j8dssn2zhplqvlw49piwfw511lia6b635byiwfniqf6dnwp";
+    url = "mirror://sourceforge/quvi/libquvi-${version}.tar.xz";
+    sha256 = "1cl1kbgxl1jnx2nwx4z90l0lap09lnnj1fg7hxsxk3m6aj4y4grd";
   };
 
-  buildInputs = [ pkgconfig lua5 curl quvi_scripts ];
+  buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt ];
 
   meta = { 
     description = "Web video downloader";
diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix
index cc82158ae82..68b61fc453d 100644
--- a/pkgs/applications/video/quvi/scripts.nix
+++ b/pkgs/applications/video/quvi/scripts.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "quvi-scripts-${version}";
-  version="0.4.0";
+  version="0.9.20131130";
 
   src = fetchurl {
-    url = "mirror://sourceforge/quvi/libquvi-scripts-${version}.tar.gz";
-    sha256 = "14p1sn7id4n35isaw3i3h8vsgfqlym09fih9k5xfqwsg6n7xdvq5";
+    url = "mirror://sourceforge/quvi/libquvi-scripts-${version}.tar.xz";
+    sha256 = "1qvp6z5k1qgcys7vf7jd6fm0g07xixmciwj14ypn1kqhmjgizwhp";
   };
 
   buildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix
index f8b6aad4310..89e24cff4de 100644
--- a/pkgs/applications/video/quvi/tool.nix
+++ b/pkgs/applications/video/quvi/tool.nix
@@ -1,22 +1,25 @@
-{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi}:
+{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}:
 
 stdenv.mkDerivation rec {
   name = "quvi-${version}";
-  version="0.4.0";
+  version="0.9.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/quvi/quvi-${version}.tar.gz";
-    sha256 = "0qzyj55py4z7pg97794jjycq8nvrlr02072rgjzg8jgknw49hgfv";
+    url = "mirror://sourceforge/quvi/quvi-${version}.tar.xz";
+    sha256 = "047rrwnnp72624z2px5nzn5wxi5fyckkddh2pj8j5xs6kdim429m";
   };
 
-  buildInputs = [ pkgconfig lua5 curl quvi_scripts libquvi ];
+  buildInputs = [ pkgconfig lua5 curl quvi_scripts libquvi glib makeWrapper ];
+  postInstall = ''
+      wrapProgram $out/bin/quvi --set LUA_PATH "${lua5_sockets}/share/lua/${lua5.luaversion}/?.lua"
+  '';
 
-  meta = { 
+  meta = {
     description = "Web video downloader";
     homepage = http://quvi.sf.net;
     license = "LGPLv2.1+";
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.mornfall ]; 
+    maintainers = [ stdenv.lib.maintainers.mornfall ];
   };
 }
 
-- 
GitLab


From f88de3b0911bcd34bb4114c86e2adfc216b03ebb Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Tue, 28 Jan 2014 22:08:02 +0100
Subject: [PATCH 0630/3789] quvi: Update the CLI tool to version 0.9.5.

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

diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix
index 89e24cff4de..807e3954d6f 100644
--- a/pkgs/applications/video/quvi/tool.nix
+++ b/pkgs/applications/video/quvi/tool.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "quvi-${version}";
-  version="0.9.4";
+  version="0.9.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/quvi/quvi-${version}.tar.xz";
-    sha256 = "047rrwnnp72624z2px5nzn5wxi5fyckkddh2pj8j5xs6kdim429m";
+    sha256 = "1h52s265rp3af16dvq1xlscp2926jqap2l4ah94vrfchv6m1hffb";
   };
 
   buildInputs = [ pkgconfig lua5 curl quvi_scripts libquvi glib makeWrapper ];
-- 
GitLab


From 91c9027691d7e70ecca20b7cc94cf90f2097db79 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Wed, 29 Jan 2014 01:12:41 +0100
Subject: [PATCH 0631/3789] Configure postgresql-9.3 with support for the
 ossp-uuid module

---
 pkgs/servers/sql/postgresql/9.3.x.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index cb33c6f2921..a57374ad02c 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, readline }:
+{ stdenv, fetchurl, zlib, readline, libossp_uuid }:
 
 let version = "9.3.2"; in
 
@@ -10,12 +10,17 @@ stdenv.mkDerivation rec {
     sha256 = "700da51a71857e092f6af1c85fcd86b46d7d5cd2f2ba343cafb1f206c20232d7";
   };
 
-  buildInputs = [ zlib readline ];
+  buildInputs = [ zlib readline libossp_uuid ];
 
   enableParallelBuilding = true;
 
   makeFlags = [ "world" ];
 
+  configureFlags =
+    ''
+      --with-ossp-uuid
+    '';
+
   patches = [ ./disable-resolve_symlinks.patch ];
 
   installTargets = [ "install-world" ];
-- 
GitLab


From 03857fe2ec54086243afd464d81e60e41632730f Mon Sep 17 00:00:00 2001
From: Arvin Moezzi <moezzia@gmail.com>
Date: Wed, 29 Jan 2014 02:26:09 +0100
Subject: [PATCH 0632/3789] calibre: upgrade from 1.20.0 to 1.21.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 7925e865b4a..686e327e2f7 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-1.20.0";
+  name = "calibre-1.21.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "1i7sybl6in0js8an1zp3mzqv394xnwx79rmv1hj7g6abpsqhjpj7";
+    sha256 = "05hwny9zi32gkk3hadvigrqrnbgzw53vhjkjp60dq0lb545pscih";
   };
 
   inherit python;
-- 
GitLab


From 99faf96ea7d5d67bc2d05331aeeff8f8a17bfe5a Mon Sep 17 00:00:00 2001
From: Marco Maggesi <marco.maggesi@gmail.com>
Date: Wed, 29 Jan 2014 08:46:12 +0100
Subject: [PATCH 0633/3789] Make OCaml 4.01.0 the default version of OCaml.
 Also change the ocaml attribute to always point to the one of the current
 ocamlPackages.

---
 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 1847540f823..35467078f60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2817,7 +2817,7 @@ let
 
   nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
 
-  ocaml = ocaml_3_12_1;
+  ocaml = ocamlPackages.ocaml;
 
   ocaml_3_08_0 = callPackage ../development/compilers/ocaml/3.08.0.nix { };
 
@@ -2949,7 +2949,7 @@ let
     opam = opam_1_1;
   };
 
-  ocamlPackages = recurseIntoAttrs ocamlPackages_3_12_1;
+  ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;
   ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0;
   ocamlPackages_3_11_2 = mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2;
   ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1;
-- 
GitLab


From de036bc10c03a20471d406d3f79c737b0ab25d0f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 29 Jan 2014 09:27:21 +0400
Subject: [PATCH 0634/3789] Fix Xmoto build (missing include)

---
 pkgs/games/xmoto/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix
index ed37227bb03..5695bb5b429 100644
--- a/pkgs/games/xmoto/default.nix
+++ b/pkgs/games/xmoto/default.nix
@@ -15,7 +15,11 @@ rec {
   configureFlags = [];
 
   /* doConfigure should be removed if not needed */
-  phaseNames = [ "doConfigure" "doMakeInstall"];
+  phaseNames = [ "patchIncludes" "doConfigure" "doMakeInstall"];
+  patchIncludes = a.fullDepEntry ''
+    sed -e '1i#include <sys/types.h>' -i src/helpers//System.cpp
+    sed -e '1i#include <unistd.h>' -i src/helpers//System.cpp
+  '' ["doUnpack" "minInit"];
 
   meta = {
     description = "X-Moto - obstacled race game";
-- 
GitLab


From 91ab5562363c2c28cb9127ce2982e2daa836253a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Jan 2014 11:53:39 +0100
Subject: [PATCH 0635/3789] amdadl-sdk: Don't build on Hydra

Since it uses requireFile, it won't build.  Likewise for cgminer which
depends on amdadl-sdk.
---
 pkgs/applications/misc/cgminer/default.nix   | 7 ++++---
 pkgs/development/misc/amdadl-sdk/default.nix | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix
index 54650d395c2..3247cb609fa 100644
--- a/pkgs/applications/misc/cgminer/default.nix
+++ b/pkgs/applications/misc/cgminer/default.nix
@@ -1,5 +1,5 @@
-{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake,
-  curl, ncurses, amdappsdk, amdadlsdk, xorg, jansson }:
+{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake
+, curl, ncurses, amdappsdk, amdadlsdk, xorg, jansson }:
 
 stdenv.mkDerivation rec {
   version = "3.7.2";
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/ckolivas/cgminer";
     license = licenses.gpl3;
     maintainers = [ maintainers.offline ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix
index a77e477f572..f131295bcba 100644
--- a/pkgs/development/misc/amdadl-sdk/default.nix
+++ b/pkgs/development/misc/amdadl-sdk/default.nix
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
     homepage = http://developer.amd.com/tools/graphics-development/display-library-adl-sdk/;
     license = licenses.amdadl;
     maintainers = [ maintainers.offline ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
   };
 }
-- 
GitLab


From 9c9c883cb921225272f82a6dd8b547a034f16bd1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 28 Jan 2014 22:50:16 +0100
Subject: [PATCH 0636/3789] Updated dwb to HEAD and used the current date as
 version number, because dwb has no version numbers.

---
 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 0421a8a6c6a..e10acf294bf 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-0.1";
+  name = "dwb-2014-01-29";
 
   src = fetchgit {
     url = "https://bitbucket.org/portix/dwb.git";
-    rev = "84a8621787baded72e84afdd5cdda278cb81e007";
-    sha256 = "5a32f3c21ad59b43935a16108244f84d260fafaea9b93d41e8de9ba9089ee7b0";
+    rev = "eaf090af9ad63341a846377cb9ce473feee8f032";
+    sha256 = "1wqa5dry9p3x3y07zpq3km8ycr8wvz8c11754vf99pv1kzk8gq0n";
   };
 
   buildInputs = [ pkgconfig makeWrapper libsoup webkit gtk3 gnutls json_c m4  ];
-- 
GitLab


From cce9712331e7470aa891dc66d0aa28255d582e97 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Tue, 28 Jan 2014 23:45:16 +0100
Subject: [PATCH 0637/3789] Enable two-factor authentication by default. Add
 proper descriptions to attributes.

---
 nixos/modules/system/boot/luksroot.nix | 35 ++++++++++++++++++--------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 46cd96e0167..ae684dd8977 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -53,7 +53,7 @@ let
     }
 
     drop() {
-        local c=$1
+        local c="$1"
         shift
         if [ -e "$1" ]; then
             cat "$1" | ( dd of=/dev/null bs="$c" count=1 2>/dev/null ; dd 2>/dev/null )
@@ -286,48 +286,57 @@ in
         yubikey = mkOption {
           default = null;
           type = types.nullOr types.optionSet;
-          description = "TODO";
+          description = ''
+            The options to use for this LUKS device in Yubikey-PBA.
+            If null (the default), Yubikey-PBA will be disabled for this device.
+          '';
 
           options = {
             twoFactor = mkOption {
-              default = false;
+              default = true;
               type = types.bool;
-              description = "TODO";
+              description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false)";
             };
 
             slot = mkOption {
               default = 2;
               type = types.int;
-              description = "TODO";
+              description = "Which slot on the Yubikey to challenge";
             };
 
             storage = mkOption {
               type = types.optionSet;
-              description = "TODO";
+              description = "Options related to the authentication record";
 
               options = {
                 device = mkOption {
                   default = /dev/sda1;
                   type = types.path;
-                  description = "TODO";
+                  description = ''
+                    An unencrypted device that will temporarily be mounted in stage-1.
+                    Must contain the authentication record for this LUKS device.
+                  '';
                 };
 
                 fsType = mkOption {
                   default = "vfat";
                   type = types.string;
-                  description = "TODO";
+                  description = "The filesystem of the unencrypted device";
                 };
 
                 mountPoint = mkOption {
                   default = "/crypt-storage";
                   type = types.string;
-                  description = "TODO";
+                  description = "Path where the unencrypted device will be mounted in stage-1";
                 };
 
                 path = mkOption {
                   default = "/crypt-storage/default";
                   type = types.string;
-                  description = "TODO";
+                  description = ''
+                    Absolute path of the authentication record on the unencrypted device with
+                    that device's root directory as "/".
+                  '';
                 };
               };
             };
@@ -340,7 +349,11 @@ in
     boot.initrd.luks.yubikeySupport = mkOption {
       default = false;
       type = types.bool;
-      description = "TODO";
+      description = ''
+            Enables support for authenticating with a Yubikey on LUKS devices.
+            See the NixOS wiki for information on how to properly setup a LUKS device
+            and a Yubikey to work with this feature.
+          '';
     };
   };
 
-- 
GitLab


From 1212d0be220393740766ca727689ebec9984cb0b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 6 Jan 2014 13:26:55 +0100
Subject: [PATCH 0638/3789] tkabber+plugins: Update to upstream version 1.0.

After several years, Tkabber finally got a new release.

The highlights are:

 * Completely rewritten Tkabber internals
 * Dropped Tcl/Tk 8.3 support. Now Tcl/Tk 8.4 is required
 * Partial IPv6 support (requires Tcl/Tk 8.6)
 * Switched from TclGPGME to TclGPG for encryption and signing
 * Added new connection method BOSH (XEP-0124 and XEP-0206)
 * Disabled SSLv2 and enabled TLSv1 TLS options
 * Added user nicknames (XEP-0172) support.
 * Updated the CAPTCHA forms (XEP-0158) support
 * Added metacontacts (XEP-0209) support
 * Implemented multiple proxy profiles
 * Implemented remote controlling from a locally executed script
 * Added new plugins: floatingcontact, poker
 * Rewritten most plugins to support disabling and unloading on the fly
 * A few interface enhancements (search in MUC affiliations lists, proxy
   management)
 * Many fixes and enhancements

The detailed changelogs can be found at:

http://svn.xmpp.ru/repos/tkabber/tags/1.0/tkabber/ChangeLog
http://svn.xmpp.ru/repos/tkabber/tags/1.0/tkabber-plugins/ChangeLog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../instant-messengers/tkabber-plugins/default.nix          | 6 +++---
 .../networking/instant-messengers/tkabber/default.nix       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix b/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix
index b46133e433e..bb5d0b1c76b 100644
--- a/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "tkabber-plugins-${version}";
-  version = "0.11.1";
+  version = "1.0";
 
   src = fetchurl {
-    url = "http://files.jabber.ru/tkabber/tkabber-plugins-${version}.tar.gz";
-    sha256 = "0jxriqvsckbih5a4lpisxy6wjw022wsz5j5n171gz0q3xw19dbgz";
+    url = "http://files.jabber.ru/tkabber/tkabber-plugins-${version}.tar.xz";
+    sha256 = "d61251dc664f0bfa8534e578096dede9a7bb7d4f2620489f8d2c43d36cd61ba9";
   };
 
   configurePhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
index fd989739c94..69c404f33b4 100644
--- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
@@ -10,11 +10,11 @@ let
     (map getTclLibPath tclLibraries);
 
 in stdenv.mkDerivation rec {
-  name = "tkabber-0.11.1";
+  name = "tkabber-1.0";
 
   src = fetchurl {
-    url = "http://files.jabber.ru/tkabber/tkabber-0.11.1.tar.gz";
-    sha256 = "19xv555cm7a2gczdalf9srxm39hmsh0fbidhwxa74a89nqkbf4lv";
+    url = "http://files.jabber.ru/tkabber/${name}.tar.xz";
+    sha256 = "49ee6e897dfe52ebac256531b54955e6b39223f606a9b8ad63a52475389db206";
   };
 
   defaultTheme = "ocean-deep";
-- 
GitLab


From aae2bab821a167ed53f020e53329c2073d1d2102 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 6 Jan 2014 13:33:52 +0100
Subject: [PATCH 0639/3789] tkabber: Don't set a default theme.

If people still want the ocean-deep theme, it can still be set by using:

tkabber.override { theme = "ocean-deep"; }

But by default we should not set a theme, so the user will get the same
result as everyone who installs the upstream version.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/instant-messengers/tkabber/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
index 69c404f33b4..53a334f6869 100644
--- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg
-, bwidget, makeWrapper, x11 }:
+, bwidget, makeWrapper, x11
+, theme ? null
+}:
 
 let
   tclLibraries = [ bwidget tcllib tcltls tclgpg ];
@@ -17,15 +19,14 @@ in stdenv.mkDerivation rec {
     sha256 = "49ee6e897dfe52ebac256531b54955e6b39223f606a9b8ad63a52475389db206";
   };
 
-  defaultTheme = "ocean-deep";
-
   patchPhase = ''
     substituteInPlace login.tcl --replace \
       "custom::defvar loginconf(sslcacertstore) \"\"" \
       "custom::defvar loginconf(sslcacertstore) \$env(OPENSSL_X509_CERT_FILE)"
-
+  '' + stdenv.lib.optionalString (theme != null) ''
+    themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb"
     sed -i '/^if.*load_default_xrdb/,/^}$/ {
-        s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$out/share/doc/tkabber/examples/xrdb/${defaultTheme}.xrdb"'"@
+      s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$themePath"'"@
     }' tkabber.tcl
   '';
 
-- 
GitLab


From 3a5334f853db5fb77466a93f6fc79dca6b4ed28b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 6 Jan 2014 14:15:58 +0100
Subject: [PATCH 0640/3789] tkabber: Properly wrap all scripts in $out/bin.

Alongside "tkabber", there is also "tkabber-remote", which uses the same
variables as the main script and thus needs to be wrapped the same way
as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/instant-messengers/tkabber/default.nix  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
index 53a334f6869..79c3d3d32cc 100644
--- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
@@ -36,10 +36,12 @@ in stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    wrapProgram $out/bin/tkabber \
-      --prefix PATH : "${tk}/bin" \
-      --set TCLLIBPATH '"${tclLibPaths}"' \
-      --set TKABBER_SITE_PLUGINS '$HOME/.nix-profile/share/tkabber-plugins'
+    for prog in $out/bin/*; do
+      wrapProgram "$prog" \
+        --prefix PATH : "${tk}/bin" \
+        --set TCLLIBPATH '"${tclLibPaths}"' \
+        --set TKABBER_SITE_PLUGINS '$HOME/.nix-profile/share/tkabber-plugins'
+    done
   '';
 
   buildInputs = [ tcl tk x11 makeWrapper ] ++ tclLibraries;
-- 
GitLab


From e3cb9e5e5f343d13cbbdc87b6fd1abc1103156ae Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 6 Jan 2014 14:36:53 +0100
Subject: [PATCH 0641/3789] tkabber: Merge main package with site plugins.

The site plugins are released alongside the main Tkabber sources, so it
makes no sense to have them in a separate package (which also introduces
an impurity). In addition, both packages share the same makefile
structure, so it really makes sense to merge them.

Before people might get worried about my decision to enable those
plugins by default: Since version 1.0, Tkabber is no longer loading
_all_ available plugins, but gives you a menu (Plugins Management) to
selectively enable plugins (whereas all plugins are disabled by
default).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../tkabber-plugins/default.nix               | 21 --------
 .../instant-messengers/tkabber/default.nix    | 50 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 34 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix b/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix
deleted file mode 100644
index bb5d0b1c76b..00000000000
--- a/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "tkabber-plugins-${version}";
-  version = "1.0";
-
-  src = fetchurl {
-    url = "http://files.jabber.ru/tkabber/tkabber-plugins-${version}.tar.xz";
-    sha256 = "d61251dc664f0bfa8534e578096dede9a7bb7d4f2620489f8d2c43d36cd61ba9";
-  };
-
-  configurePhase = ''
-    sed -e "s@/usr/local@$out@" -i Makefile
-  '';
-
-  meta = {
-    homepage = "http://tkabber.jabber.ru/tkabber-plugins";
-    description = "Plugins for the Tkabber instant messenger";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
index 79c3d3d32cc..8b6b3893311 100644
--- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
@@ -1,9 +1,24 @@
 { stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg
 , bwidget, makeWrapper, x11
+, withSitePlugins ? true
 , theme ? null
 }:
 
+with stdenv.lib;
+
 let
+  version = "1.0";
+
+  main = {
+    name = "tkabber";
+    sha256 = "49ee6e897dfe52ebac256531b54955e6b39223f606a9b8ad63a52475389db206";
+  };
+
+  plugins = {
+    name = "tkabber-plugins";
+    sha256 = "d61251dc664f0bfa8534e578096dede9a7bb7d4f2620489f8d2c43d36cd61ba9";
+  };
+
   tclLibraries = [ bwidget tcllib tcltls tclgpg ];
 
   getTclLibPath = p: "${p}/lib/${p.libPrefix}";
@@ -11,36 +26,39 @@ let
   tclLibPaths = stdenv.lib.concatStringsSep " "
     (map getTclLibPath tclLibraries);
 
-in stdenv.mkDerivation rec {
-  name = "tkabber-1.0";
+  mkTkabber = attrs: stdenv.mkDerivation (rec {
+    name = "${attrs.name}-${version}";
 
-  src = fetchurl {
-    url = "http://files.jabber.ru/tkabber/${name}.tar.xz";
-    sha256 = "49ee6e897dfe52ebac256531b54955e6b39223f606a9b8ad63a52475389db206";
-  };
+    src = fetchurl {
+      url = "http://files.jabber.ru/tkabber/${name}.tar.xz";
+      inherit (attrs) sha256;
+    };
 
-  patchPhase = ''
+    prePatch = ''
+      sed -e "s@/usr/local@$out@" -i Makefile
+    '';
+  } // removeAttrs attrs [ "name" "sha256" ]);
+
+in mkTkabber (main // {
+  postPatch = ''
     substituteInPlace login.tcl --replace \
       "custom::defvar loginconf(sslcacertstore) \"\"" \
       "custom::defvar loginconf(sslcacertstore) \$env(OPENSSL_X509_CERT_FILE)"
-  '' + stdenv.lib.optionalString (theme != null) ''
+  '' + optionalString (theme != null) ''
     themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb"
     sed -i '/^if.*load_default_xrdb/,/^}$/ {
       s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$themePath"'"@
     }' tkabber.tcl
   '';
 
-  configurePhase = ''
-    mkdir -p $out/bin
-    sed -e "s@/usr/local@$out@" -i Makefile
-  '';
-
   postInstall = ''
     for prog in $out/bin/*; do
       wrapProgram "$prog" \
         --prefix PATH : "${tk}/bin" \
         --set TCLLIBPATH '"${tclLibPaths}"' \
-        --set TKABBER_SITE_PLUGINS '$HOME/.nix-profile/share/tkabber-plugins'
+        ${optionalString withSitePlugins ''
+        --set TKABBER_SITE_PLUGINS '${mkTkabber plugins}/share/tkabber-plugins'
+        ''}
     done
   '';
 
@@ -48,7 +66,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://tkabber.jabber.ru/";
-    description = "A GUI client for the XMPP (Jabber) instant messaging protocol";
+    description = "A GUI XMPP (Jabber) client written in Tcl/Tk";
     license = stdenv.lib.licenses.gpl2;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1847540f823..e839833ee28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2065,8 +2065,6 @@ let
 
   tkabber = callPackage ../applications/networking/instant-messengers/tkabber { };
 
-  tkabber_plugins = callPackage ../applications/networking/instant-messengers/tkabber-plugins { };
-
   qfsm = callPackage ../applications/science/electronics/qfsm { };
 
   tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix {
-- 
GitLab


From 795941261a88b7b6a89e549ed6e4ccff19381484 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 6 Jan 2014 15:30:44 +0100
Subject: [PATCH 0642/3789] nixos-generate-config: Fix reference to <nixos>.

IIUC, <nixos> is going to be deprecated someday in the future, and as
most of those references are already replaced I guess it's safe to
replace it here as well, as it is only relevant on new/updated
installations.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 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 6b42058a892..1365f3b9396 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -61,7 +61,7 @@ my @attrs = ();
 my @kernelModules = ();
 my @initrdKernelModules = ();
 my @modulePackages = ();
-my @imports = ("<nixos/modules/installer/scan/not-detected.nix>");
+my @imports = ("<nixpkgs/nixos/modules/installer/scan/not-detected.nix>");
 
 
 sub debug {
-- 
GitLab


From a2a44f92ae18921c98d860a5bc9034423418d6fa Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 29 Jan 2014 09:05:22 +0100
Subject: [PATCH 0643/3789] paramiko: Update to new upstream version 1.12.1.

This release contains only minor fixes, which are:

 * Fix AttributeError bugs in known_hosts file (re)loading.
 * Note ecdsa requirement in README.

Full changelog with credits and issue IDs can be found at:

https://github.com/paramiko/paramiko/blob/master/NEWS

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 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 62c37e5d30b..c9039ec0972 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4296,11 +4296,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   };
 
   paramiko = buildPythonPackage rec {
-    name = "paramiko-1.12.0";
+    name = "paramiko-1.12.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/paramiko/${name}.tar.gz";
-      md5 = "4187f77b1a5a313c899993930e30c321";
+      md5 = "ae4544dc0a1419b141342af89fcf0dd9";
     };
 
     propagatedBuildInputs = [ pycrypto ecdsa ];
-- 
GitLab


From e18cd2f8ae67088c24d0d9484ab5531598ca473c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 29 Jan 2014 09:21:07 +0100
Subject: [PATCH 0644/3789] chromium: Update all channels to latest versions.

This closes #1623, and updates _all_ channels to the corresponding
latest upstream versions.

Thanks to @wizeman for opening the pull request noted above and for
another update in between, @aristidb for fixing the patcheShebangs issue
and @shlevy for notifying me about the build failure in stdenv-updates
in the first place.

Sorry to everyone for my inactivity lately.

The following changes were needed in order to build those new releases:

 * Patch out /bin/echo to allow building with all options enabled.
 * Always use GN from the source tree.
 * Remove import of depot_tools for version 34.
 * Drop version 32 specific stuff.

With this commit, the following new upstream versions are introduced:

stable: 32.0.1700.77 -> 32.0.1700.102 (builds fine, tested)
beta:   32.0.1700.19 -> 33.0.1750.46  (builds fine, tested)
dev:    33.0.1712.4  -> 34.0.1809.0   (build broken with gnome_keyring)

The dev version requires a more recent version gnome_keyring and thus
won't build if gnomeKeyringSupport is set to true. I haven't tested this
build without gnomeKeyringSupport yet, so it might be broken and will be
fixed later.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/default.nix   | 13 ++++++++-----
 .../networking/browsers/chromium/sources.nix   | 18 +++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 908e54f3e43..eba32738e0b 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -51,15 +51,18 @@ let
     patches = singleton ./sandbox_userns_31.patch;
 
     postPatch = ''
-      sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
-    '' + (if versionOlder version "32.0.0.0" then ''
-      sed -i -e 's|/usr/bin/gcc|gcc|' third_party/WebKit/Source/core/core.gypi
-    '' else ''
+      sed -i -r \
+        -e 's/-f(stack-protector)(-all)?/-fno-\1/' \
+        -e 's|/bin/echo|echo|' \
+        build/common.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 ''
+    '' + 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" ];
diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index b7a30ef63f7..6ad9d9090d5 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "33.0.1712.4";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1712.4.tar.xz";
-    sha256 = "1c1m0y3nnz2lclqi21j6hgqmb46p1hv7c22zz9fn7dax7jkimydk";
+    version = "34.0.1809.0";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1809.0.tar.xz";
+    sha256 = "0hyqqqq2hzbzk325pk9bc70lsh0al2nqf1mlahybp5vigy5jzy88";
   };
   beta = {
-    version = "32.0.1700.19";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.19.tar.xz";
-    sha256 = "0d0kgy160pyg472ka43gxk7n09pqhhs9nd93jyxrp9qsyllfc425";
+    version = "33.0.1750.46";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.46.tar.xz";
+    sha256 = "04n43c4vn8i7qhlybqb19c2c8kri8nc1wpa2l83vin4sqxkq519h";
   };
   stable = {
-    version = "32.0.1700.77";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.77.tar.xz";
-    sha256 = "1mwqa5k32d168swpw0bdcnhglxwcqdsx766fq0iz22h3hd4ccdwa";
+    version = "32.0.1700.102";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.102.tar.xz";
+    sha256 = "0jxwhd7cd60ivisrnzcglqqnmy99np1vvjqa27y42d852xjx84ys";
   };
 }
-- 
GitLab


From 20cfaf0faaef3fe3115275aa64b26b634f0108f0 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Wed, 29 Jan 2014 13:57:12 +0100
Subject: [PATCH 0645/3789] Change the crypt-storage file to be hex encoded
 instead of raw binary. To update from the previous configuration, convert
 your crypt-storage file from raw binary to hex.

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

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index ae684dd8977..b9dc6d7823e 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -68,7 +68,7 @@ let
         mount -t ${yubikey.storage.fsType} ${toString yubikey.storage.device} ${yubikey.storage.mountPoint}
 
         local uuid_r
-        uuid_r="$(take 16 ${yubikey.storage.mountPoint}${yubikey.storage.path} | rbtohex)"
+        uuid_r="$(take 32 ${yubikey.storage.mountPoint}${yubikey.storage.path})"
 
         local uuid_luks
         uuid_luks="$(cryptsetup luksUUID ${device} | take 36 | tr -d '-')"
@@ -91,9 +91,9 @@ let
 
             k_blob="$(ykchalresp -${toString yubikey.slot} -x $challenge 2>/dev/null)"
 
-            aes_blob_decrypted="$(drop 16 ${yubikey.storage.mountPoint}${yubikey.storage.path} | openssl-wrap enc -d -aes-256-ctr -K $k_blob -iv $uuid_r | rbtohex)"
+            aes_blob_decrypted="$(drop 32 ${yubikey.storage.mountPoint}${yubikey.storage.path} | hextorb | openssl-wrap enc -d -aes-256-ctr -K $k_blob -iv $uuid_r | rbtohex)"
 
-            checksum="$(echo -n $aes_blob_decrypted | hextorb | drop 84 | rbtohex)"
+            checksum="$(echo -n $aes_blob_decrypted | drop 168)"
             if [ "$(echo -n $aes_blob_decrypted | hextorb | take 84 | openssl-wrap dgst -binary -sha512 | rbtohex)" == "$checksum" ]; then
                  checksum_correct=1
                  break
@@ -110,10 +110,10 @@ let
         fi
 
         local k_yubi
-        k_yubi="$(echo -n $aes_blob_decrypted | hextorb | take 20 | rbtohex)"
+        k_yubi="$(echo -n $aes_blob_decrypted | take 40)"
 
         local k_luks
-        k_luks="$(echo -n $aes_blob_decrypted | hextorb | drop 20 | take 64 | rbtohex)"
+        k_luks="$(echo -n $aes_blob_decrypted | drop 40 | take 128)"
 
         echo -n "$k_luks" | hextorb | cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} --key-file=-
 
@@ -139,8 +139,8 @@ let
             local new_k_blob
             new_k_blob="$(echo -n $new_challenge | hextorb | openssl-wrap dgst -binary -sha1 -mac HMAC -macopt hexkey:$k_yubi | rbtohex)"
 
-            echo -n "$new_uuid_r" | hextorb > ${yubikey.storage.mountPoint}${yubikey.storage.path}
-            echo -n "$k_yubi$k_luks$checksum" | hextorb | openssl-wrap enc -e -aes-256-ctr -K "$new_k_blob" -iv "$new_uuid_r" >> ${yubikey.storage.mountPoint}${yubikey.storage.path}
+            echo -n "$new_uuid_r" > ${yubikey.storage.mountPoint}${yubikey.storage.path}
+            echo -n "$k_yubi$k_luks$checksum" | hextorb | openssl-wrap enc -e -aes-256-ctr -K "$new_k_blob" -iv "$new_uuid_r" | rbtohex >> ${yubikey.storage.mountPoint}${yubikey.storage.path}
         else
             echo "Warning: Could not obtain new UUID, current challenge persists!"
         fi
-- 
GitLab


From 48811001c405cd33be012831b4d8b73cc52ba3c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 29 Jan 2014 15:13:02 +0100
Subject: [PATCH 0646/3789] gtk3: change name to gtk+3-3.*, don't lower
 priority

This is to allow alongside installation of gtk2 and gtk3 in user envs.
Therefore, decreasing the priority of gtk3 was superfluous now.
---
 pkgs/development/libraries/gtk+/3.x.nix | 2 +-
 pkgs/top-level/all-packages.nix         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 651ac0d303b..6360d67cf20 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -13,7 +13,7 @@ let
   ver_min = "6";
 in
 stdenv.mkDerivation rec {
-  name = "gtk+-${ver_maj}.${ver_min}";
+  name = "gtk+3-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/${name}.tar.xz";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 286e029e08b..4201f6420d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4366,9 +4366,9 @@ let
     cupsSupport = config.gtk2.cups or stdenv.isLinux;
   };
 
-  gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.x.nix {
+  gtk3 = callPackage ../development/libraries/gtk+/3.x.nix {
     inherit (gnome3) at_spi2_atk;
-  });
+  };
 
   gtk = pkgs.gtk2;
 
-- 
GitLab


From 42911b19033e6e2d95dd4d74f456927cdcf8bc73 Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Wed, 29 Jan 2014 15:46:22 +0100
Subject: [PATCH 0647/3789] cuda: install the SDK using multiple-outputs
 support

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

diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index f68f918d585..af93cb13d37 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
       }
     else throw "cudatoolkit does not support platform ${stdenv.system}";
 
+  outputs = [ "out" "sdk" ];
+
   buildInputs = [ perl ];
 
   runtimeDependencies = [
@@ -30,6 +32,7 @@ stdenv.mkDerivation rec {
     sh $src --keep --noexec
     cd pkg/run_files
     sh cuda-linux64-rel-5.5.22-16488124.run --keep --noexec
+    sh cuda-samples-linux-5.5.22-16488124.run --keep --noexec
     cd pkg
   '';
 
@@ -44,8 +47,9 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir $out
+    mkdir $out $sdk
     perl ./install-linux.pl --prefix="$out"
+    perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
   '';
 
   meta = {
-- 
GitLab


From e96f58ef5cdbb28cd4efe1b5f7bc532b9ae55b58 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Wed, 29 Jan 2014 17:20:05 +0100
Subject: [PATCH 0648/3789] Implement muli-user authentication for yubikey pba,
 i.e. multiple users can now share a single luks keyslot. This is achieved by
 having multiple lines per storage file, one for each user (if the feature is
 enabled); each of these lines has the same format as would be the case for
 the userless authentication, except that they are prepended with a SHA-512 of
 the user's id.

---
 nixos/modules/system/boot/luksroot.nix | 76 ++++++++++++++++++++------
 1 file changed, 60 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index b9dc6d7823e..3f4b703fa9c 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -68,39 +68,69 @@ let
         mount -t ${yubikey.storage.fsType} ${toString yubikey.storage.device} ${yubikey.storage.mountPoint}
 
         local uuid_r
-        uuid_r="$(take 32 ${yubikey.storage.mountPoint}${yubikey.storage.path})"
-
-        local uuid_luks
-        uuid_luks="$(cryptsetup luksUUID ${device} | take 36 | tr -d '-')"
-
         local k_user
         local challenge
         local k_blob
         local aes_blob_decrypted
         local checksum_correct
         local checksum
+        local uuid_luks
+        local user_record
+
+        uuid_luks="$(cryptsetup luksUUID ${device} | take 36 | tr -d '-')"
+
+        ${optionalString (!yubikey.multiUser) ''
+        user_record="$(cat ${yubikey.storage.mountPoint}${yubikey.storage.path})"
+        uuid_r="$(echo -n $user_record | take 32)"
+        ''}
 
         for try in $(seq 3); do
 
+            ${optionalString yubikey.multiUser ''
+            local user_id
+            echo -n "Enter user id: "
+            read -s user_id
+            echo
+            ''}
+
             ${optionalString yubikey.twoFactor ''
             echo -n "Enter two-factor passphrase: "
             read -s k_user
+            echo
             ''}
 
-            challenge="$(echo -n $k_user$uuid_r$uuid_luks | openssl-wrap dgst -binary -sha1 | rbtohex)"
+            ${optionalString yubikey.multiUser ''
+            local user_id_hash
+            user_id_hash="$(echo -n $user_id | openssl-wrap dgst -binary -sha512 | rbtohex)"
+
+            user_record="$(sed -n -e /^$user_id_hash[^$]*$/p ${yubikey.storage.mountPoint}${yubikey.storage.path} | tr -d '\n')"
 
-            k_blob="$(ykchalresp -${toString yubikey.slot} -x $challenge 2>/dev/null)"
+            if [ ! -z "$user_record" ]; then
+                user_record="$(echo -n $user_record | drop 128)"
+                uuid_r="$(echo -n $user_record | take 32)"
+            ''}
 
-            aes_blob_decrypted="$(drop 32 ${yubikey.storage.mountPoint}${yubikey.storage.path} | hextorb | openssl-wrap enc -d -aes-256-ctr -K $k_blob -iv $uuid_r | rbtohex)"
+                challenge="$(echo -n $k_user$uuid_r$uuid_luks | openssl-wrap dgst -binary -sha1 | rbtohex)"
 
-            checksum="$(echo -n $aes_blob_decrypted | drop 168)"
-            if [ "$(echo -n $aes_blob_decrypted | hextorb | take 84 | openssl-wrap dgst -binary -sha512 | rbtohex)" == "$checksum" ]; then
-                 checksum_correct=1
-                 break
+                k_blob="$(ykchalresp -${toString yubikey.slot} -x $challenge 2>/dev/null)"
+
+                aes_blob_decrypted="$(echo -n $user_record | drop 32 | hextorb | openssl-wrap enc -d -aes-256-ctr -K $k_blob -iv $uuid_r | rbtohex)"
+
+                checksum="$(echo -n $aes_blob_decrypted | drop 168)"
+                if [ "$(echo -n $aes_blob_decrypted | hextorb | take 84 | openssl-wrap dgst -binary -sha512 | rbtohex)" == "$checksum" ]; then
+                    checksum_correct=1
+                    break
+                else
+                    checksum_correct=0
+                    echo "Authentication failed!"
+                fi
+
+            ${optionalString yubikey.multiUser ''
             else
-                 checksum_correct=0
-                 echo "Authentication failed!"
+                checksum_correct=0
+                echo "Authentication failed!"
             fi
+            ''}
         done
 
         if [ "$checksum_correct" != "1" ]; then
@@ -139,8 +169,16 @@ let
             local new_k_blob
             new_k_blob="$(echo -n $new_challenge | hextorb | openssl-wrap dgst -binary -sha1 -mac HMAC -macopt hexkey:$k_yubi | rbtohex)"
 
-            echo -n "$new_uuid_r" > ${yubikey.storage.mountPoint}${yubikey.storage.path}
-            echo -n "$k_yubi$k_luks$checksum" | hextorb | openssl-wrap enc -e -aes-256-ctr -K "$new_k_blob" -iv "$new_uuid_r" | rbtohex >> ${yubikey.storage.mountPoint}${yubikey.storage.path}
+            local new_aes_blob
+            new_aes_blob=$(echo -n "$k_yubi$k_luks$checksum" | hextorb | openssl-wrap enc -e -aes-256-ctr -K "$new_k_blob" -iv "$new_uuid_r" | rbtohex)
+
+            ${optionalString yubikey.multiUser ''
+            sed -i -e "s|^$user_id_hash$user_record|$user_id_hash$new_uuid_r$new_aes_blob|1"
+            ''}
+
+            ${optionalString (!yubikey.multiUser) ''
+            echo -n "$new_uuid_r$new_aes_blob" > ${yubikey.storage.mountPoint}${yubikey.storage.path}
+            ''}
         else
             echo "Warning: Could not obtain new UUID, current challenge persists!"
         fi
@@ -298,6 +336,12 @@ in
               description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false)";
             };
 
+            multiUser = mkOption {
+              default = false;
+              type = types.bool;
+              description = "Whether to allow multiple users to authenticate with a Yubikey";
+            };
+
             slot = mkOption {
               default = 2;
               type = types.int;
-- 
GitLab


From b0d2f0e3f04a74e847dee898bf4c73767c986dfc Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Wed, 29 Jan 2014 18:05:05 +0100
Subject: [PATCH 0649/3789] Add myself as a maintainer for ykpers and
 libyubikey

---
 lib/maintainers.nix                               | 1 +
 pkgs/applications/misc/ykpers/default.nix         | 7 ++++---
 pkgs/development/libraries/libyubikey/default.nix | 7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 3c7a399623d..5e55b64ffa9 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -18,6 +18,7 @@
   bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
   bodil = "Bodil Stokke <nix@bodil.org>";
+  calrama = "Moritz Maxeiner <moritz@ucworks.org>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
diff --git a/pkgs/applications/misc/ykpers/default.nix b/pkgs/applications/misc/ykpers/default.nix
index 70ec351f71b..e7bfa8ded50 100644
--- a/pkgs/applications/misc/ykpers/default.nix
+++ b/pkgs/applications/misc/ykpers/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec
   src = fetchurl
   {
     url = "http://opensource.yubico.com/yubikey-personalization/releases/${name}.tar.gz";
-	sha256 = "1n4s8kk31q5zh2rm7sj9qmv86yl8ibimdnpvk9ny391a88qlypyd";
+    sha256 = "1n4s8kk31q5zh2rm7sj9qmv86yl8ibimdnpvk9ny391a88qlypyd";
   };
 
   buildInputs = [pkgconfig libusb1 libyubikey];
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec
   meta =
   {
     homepage = "http://opensource.yubico.com/yubikey-personalization/";
-	description = "YubiKey Personalization cross-platform library and tool";
-	license = "bsd";
+    description = "YubiKey Personalization cross-platform library and tool";
+    license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.calrama ];
   };
 }
diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix
index 77bf60c4255..25c2117b059 100644
--- a/pkgs/development/libraries/libyubikey/default.nix
+++ b/pkgs/development/libraries/libyubikey/default.nix
@@ -8,13 +8,14 @@ stdenv.mkDerivation rec
   src = fetchurl
   {
     url = "http://opensource.yubico.com/yubico-c/releases/${name}.tar.gz";
-	sha256 = "19pm4rqsnm9r0n5j26bqkxa1jpimdavzcvg5g7p416vkjhxc6lw9";
+    sha256 = "19pm4rqsnm9r0n5j26bqkxa1jpimdavzcvg5g7p416vkjhxc6lw9";
   };
 
   meta =
   {
     homepage = "http://opensource.yubico.com/yubico-c/";
-	description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)";
-	license = "bsd";
+    description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)";
+    license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.calrama ];
   };
 }
-- 
GitLab


From c323f9eed4f88546fdcff6b506a44c8c0ce4168d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 18:31:36 +0100
Subject: [PATCH 0650/3789] nbd: update to version 3.7

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

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index 99793c139cb..54f6689582d 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
 let
-  name = "nbd-3.5";
+  name = "nbd-3.7";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "mirror://sourceforge/nbd/${name}.tar.bz2";
-    sha256 = "0frnbmdcm1b0nmmpvpwjb9h1yabdpwwd2l95056mhl2zaafh8gqx";
+    url = "mirror://sourceforge/nbd/${name}.tar.xz";
+    sha256 = "1k4bvg5rg4q6b58y4kd9qwj07sznsfbknlpc6y1bk6c48rgr3d0b";
   };
 
   buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders;
 
   postInstall = ''
     mkdir -p "$out/share/doc/${name}"
-    cp README "$out/share/doc/${name}/README"
+    cp README.md "$out/share/doc/${name}/"
   '';
 
   # The test suite doesn't succeed in chroot builds.
-- 
GitLab


From 7bf94cadad5c416375c3e5dfd46f31a81b76ea05 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Wed, 29 Jan 2014 18:49:26 +0100
Subject: [PATCH 0651/3789] Add library dependencies explicitly

---
 nixos/modules/system/boot/luksroot.nix | 35 ++++++++------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 3f4b703fa9c..8547682284f 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -413,36 +413,23 @@ in
     # copy the cryptsetup binary and it's dependencies
     boot.initrd.extraUtilsCommands = ''
       cp -pdv ${pkgs.cryptsetup}/sbin/cryptsetup $out/bin
-      # XXX: do we have a function that does this?
-      for lib in $(ldd $out/bin/cryptsetup |grep '=>' |grep /nix/store/ |cut -d' ' -f3); do
-        cp -pdvn $lib $out/lib
-        cp -pvn $(readlink -f $lib) $out/lib
-      done
+
+      cp -pdv ${pkgs.libgcrypt}/lib/libgcrypt*.so.* $out/lib
+      cp -pdv ${pkgs.libgpgerror}/lib/libgpg-error*.so.* $out/lib
+      cp -pdv ${pkgs.cryptsetup}/lib/libcryptsetup*.so.* $out/lib
+      cp -pdv ${pkgs.popt}/lib/libpopt*.so.* $out/lib
 
       ${optionalString luks.yubikeySupport ''
       cp -pdv ${pkgs.utillinux}/bin/uuidgen $out/bin
-      for lib in $(ldd $out/bin/uuidgen |grep '=>' |grep /nix/store/ |cut -d' ' -f3); do
-        cp -pdvn $lib $out/lib
-        cp -pvn $(readlink -f $lib) $out/lib
-      done
-
       cp -pdv ${pkgs.ykpers}/bin/ykchalresp $out/bin
-      for lib in $(ldd $out/bin/ykchalresp |grep '=>' |grep /nix/store/ |cut -d' ' -f3); do
-        cp -pdvn $lib $out/lib
-        cp -pvn $(readlink -f $lib) $out/lib
-      done
-
       cp -pdv ${pkgs.ykpers}/bin/ykinfo $out/bin
-      for lib in $(ldd $out/bin/ykinfo |grep '=>' |grep /nix/store/ |cut -d' ' -f3); do
-        cp -pdvn $lib $out/lib
-        cp -pvn $(readlink -f $lib) $out/lib
-      done
-
       cp -pdv ${pkgs.openssl}/bin/openssl $out/bin
-      for lib in $(ldd $out/bin/openssl |grep '=>' |grep /nix/store/ |cut -d' ' -f3); do
-        cp -pdvn $lib $out/lib
-        cp -pvn $(readlink -f $lib) $out/lib
-      done
+
+      cp -pdv ${pkgs.libusb1}/lib/libusb*.so.* $out/lib
+      cp -pdv ${pkgs.ykpers}/lib/libykpers*.so.* $out/lib
+      cp -pdv ${pkgs.libyubikey}/lib/libyubikey*.so.* $out/lib
+      cp -pdv ${pkgs.openssl}/lib/libssl*.so.* $out/lib
+      cp -pdv ${pkgs.openssl}/lib/libcrypto*.so.* $out/lib
 
       mkdir -p $out/etc/ssl
       cp -pdv ${pkgs.openssl}/etc/ssl/openssl.cnf $out/etc/ssl
-- 
GitLab


From 409677fbd2c1cb62a7a1f31f48d62a726b6a2985 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 29 Jan 2014 18:57:05 +0100
Subject: [PATCH 0652/3789] mailpile: update dev version

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

diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index bc38defe06c..1e68d2e90b8 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -5,8 +5,8 @@ buildPythonPackage rec {
 
   src = fetchgit {
     url = "https://github.com/pagekite/Mailpile.git";
-    rev = "695a25061a5220d4f0fd6ec3de4ccd9ae4c05a92";
-    sha256 = "0il9idfpnzb1a5cg3p9zrd6fnw2dhrqr6c3gzq1m06snw8jx9fpc";
+    rev = "6e19c1942541dbdefb5155db5f2583bf3ed22aeb";
+    sha256 = "04idlbjkasigq3vslcv33kg21rjyklm2yl8pyrf5h94lzabbl1fs";
   };
 
   propagatedBuildInputs = with pythonPackages; [
-- 
GitLab


From 7275a580b0e0b092f9f08ae6b183e95b23794ac8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 11:45:06 +0100
Subject: [PATCH 0653/3789] haskell-connection: update to version 0.2.0

---
 .../libraries/haskell/connection/default.nix          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/connection/default.nix b/pkgs/development/libraries/haskell/connection/default.nix
index 186557d81b0..69083520c18 100644
--- a/pkgs/development/libraries/haskell/connection/default.nix
+++ b/pkgs/development/libraries/haskell/connection/default.nix
@@ -1,13 +1,14 @@
-{ cabal, certificate, cprngAes, dataDefault, network, socks, tls
-, tlsExtra
+{ cabal, cprngAes, dataDefaultClass, network, socks, tls, x509
+, x509Store, x509System, x509Validation
 }:
 
 cabal.mkDerivation (self: {
   pname = "connection";
-  version = "0.1.3.1";
-  sha256 = "1z9vb20466lg7l8z4abfbsdzpix18hswpqcl7s2gv838s2wvd16w";
+  version = "0.2.0";
+  sha256 = "17fzkgrjavmcxhdjj7agkx16jwpf6ql31nw1ni8gczkbp7azd0kp";
   buildDepends = [
-    certificate cprngAes dataDefault network socks tls tlsExtra
+    cprngAes dataDefaultClass network socks tls x509 x509Store
+    x509System x509Validation
   ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-connection";
-- 
GitLab


From adea1ded8a7b18d567cda7fc088bd0914ce0deaf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 11:45:06 +0100
Subject: [PATCH 0654/3789] haskell-fay-base: update to version 0.19

---
 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 8e1212f5e5a..53f6fdce41c 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.18.0.0";
-  sha256 = "010zjcs4y0zdb4gijrw10sjc56i271s35bkwg5c0lblyr62nml0s";
+  version = "0.19";
+  sha256 = "03jf1ig3s2dcdd26j3d3iwm9hbiq5f5q5hyg22jdvl7lmvigw36j";
   buildDepends = [ fay ];
   meta = {
     homepage = "https://github.com/faylang/fay-base";
-- 
GitLab


From 9067bb3ef490807450e1213ea2e5a5b3c67a3771 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 11:45:06 +0100
Subject: [PATCH 0655/3789] haskell-fay: update to version 0.19.0.1

---
 pkgs/development/libraries/haskell/fay/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix
index d7c8ba5a447..adc29231d62 100644
--- a/pkgs/development/libraries/haskell/fay/default.nix
+++ b/pkgs/development/libraries/haskell/fay/default.nix
@@ -1,22 +1,22 @@
 { cabal, aeson, attoparsec, Cabal, cpphs, dataDefault, filepath
 , ghcPaths, haskellNames, haskellPackages, haskellSrcExts, HUnit
 , languageEcmascript, mtl, optparseApplicative, prettyShow, safe
-, sourcemap, split, syb, testFramework, testFrameworkHunit
-, testFrameworkTh, text, time, uniplate, unorderedContainers
-, utf8String, vector
+, scientific, sourcemap, split, syb, testFramework
+, testFrameworkHunit, testFrameworkTh, text, time, uniplate
+, unorderedContainers, utf8String, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "fay";
-  version = "0.18.1.3";
-  sha256 = "1m747l2555w1jkdwh8b851mxvngiy7l7sbkwvm2il6k5ygcz5gbv";
+  version = "0.19.0.1";
+  sha256 = "036z4wz7vziaczhx1ysbm7d2302n2sb6l1z48py8spai5awkbvh0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson attoparsec Cabal cpphs dataDefault filepath ghcPaths
     haskellNames haskellPackages haskellSrcExts HUnit
     languageEcmascript mtl optparseApplicative prettyShow safe
-    sourcemap split syb testFramework testFrameworkHunit
+    scientific sourcemap split syb testFramework testFrameworkHunit
     testFrameworkTh text time uniplate unorderedContainers utf8String
     vector
   ];
-- 
GitLab


From ef28a1a3956bdc8aad0ab13fafd7b7d30ef143d5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 11:45:07 +0100
Subject: [PATCH 0656/3789] haskell-lens: update to version 3.10.2

---
 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 704ec8db48e..b0f6b6cd505 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "3.10.1";
-  sha256 = "0xjjld1ra1a0a739ia8swgbpw7r72hv0bs9akbqr9wyw8qdzibnh";
+  version = "3.10.2";
+  sha256 = "0hdj75sg8r1m2jdpfh81zdcwbhp6mb7xipp6q57pv6n90xc6dnxw";
   buildDepends = [
     bifunctors comonad contravariant distributive filepath
     genericDeriving hashable MonadCatchIOTransformers mtl parallel
-- 
GitLab


From 1d8fc24c2706c2a12155a266fa4bcac6f51693d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 11:45:07 +0100
Subject: [PATCH 0657/3789] haskell-monadcryptorandom: update to version 0.6.1

---
 .../libraries/haskell/monadcryptorandom/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
index bd9261f901e..87bd36503e1 100644
--- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
+++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monadcryptorandom";
-  version = "0.6";
-  sha256 = "0gms6xsnr6g5lk36z92yygwmyrl568y1h76ww676wb3qph42xx3x";
+  version = "0.6.1";
+  sha256 = "0j99j0f2qwhslimfgslsdlv0xihsddas3i69pfnjwnsd9zg5pgj2";
   buildDepends = [ cryptoApi mtl tagged transformers ];
   meta = {
     homepage = "https://github.com/TomMD/monadcryptorandom";
-- 
GitLab


From e26fa930538d3e59e30b5f3231110d2fc718570c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 11:45:07 +0100
Subject: [PATCH 0658/3789] haskell-network-conduit-tls: update to version
 1.0.4.1

---
 .../libraries/haskell/network-conduit-tls/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
index 2cb5e5a5cfc..28cf920cf28 100644
--- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
@@ -1,17 +1,17 @@
 { cabal, aeson, certificate, conduit, connection, cprngAes
 , cryptoApi, cryptoRandomApi, dataDefault, HUnit, monadControl, mtl
 , network, networkConduit, pem, systemFileio, systemFilepath, tls
-, tlsExtra, transformers
+, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "network-conduit-tls";
-  version = "1.0.3";
-  sha256 = "0l8h9pfrrqzkf45cp5r8kxpzc2fi6m01s4zkrh0d226rbps3gmvc";
+  version = "1.0.4.1";
+  sha256 = "1l79v4ippyfw6pl4h3vqswh79vcif80phf6kq5fr4xmv3b6nbc06";
   buildDepends = [
     aeson certificate conduit connection cprngAes cryptoApi
     cryptoRandomApi dataDefault monadControl network networkConduit pem
-    systemFileio systemFilepath tls tlsExtra transformers
+    systemFileio systemFilepath tls transformers
   ];
   testDepends = [ conduit connection HUnit mtl networkConduit ];
   meta = {
-- 
GitLab


From 493be2d6afc6d492a9134999b5f66a9da2de4e4f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 11:45:07 +0100
Subject: [PATCH 0659/3789] haskell-reactive-banana-wx: update to version
 0.8.0.0

---
 .../libraries/haskell/reactive-banana-wx/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
index ee408fea480..c224da3a339 100644
--- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reactive-banana-wx";
-  version = "0.7.1.0";
-  sha256 = "06hkb8v6rjpw95vf16xh547igxxzddr6wpjiwhqwpwhz2alavk2v";
+  version = "0.8.0.0";
+  sha256 = "0qfd839nm2ppjhhhnn6s1hbx1mnrzjqx450p4jadsrs1y2403c9n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ cabalMacosx reactiveBanana wx wxcore ];
-- 
GitLab


From 3edd56c7a8064f020541b3d429eb963d51c8b989 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 11:45:07 +0100
Subject: [PATCH 0660/3789] haskell-reactive-banana: update to version 0.8.0.0

---
 .../libraries/haskell/reactive-banana/default.nix  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
index 0bf7747d46b..535b289a389 100644
--- a/pkgs/development/libraries/haskell/reactive-banana/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix
@@ -1,19 +1,21 @@
-{ cabal, hashable, HUnit, testFramework, testFrameworkHunit
+{ cabal, hashable, HUnit, pqueue, testFramework, testFrameworkHunit
 , transformers, unorderedContainers, vault
 }:
 
 cabal.mkDerivation (self: {
   pname = "reactive-banana";
-  version = "0.7.1.3";
-  sha256 = "117y1sk97kpiq0cippq0ydl2zqb99q49y2m2m6pgg2nh6gz6a3zb";
-  buildDepends = [ hashable transformers unorderedContainers vault ];
+  version = "0.8.0.0";
+  sha256 = "15dzvn7cbs9kg410lyd1kj6kf2r7ap2n9bc59byzkb0r8wzn9ra1";
+  buildDepends = [
+    hashable pqueue transformers unorderedContainers vault
+  ];
   testDepends = [
-    hashable HUnit testFramework testFrameworkHunit transformers
+    hashable HUnit pqueue testFramework testFrameworkHunit transformers
     unorderedContainers vault
   ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/Reactive-banana";
-    description = "Practical library for functional reactive programming (FRP)";
+    description = "Library for functional reactive programming (FRP)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
-- 
GitLab


From 5ea2be7a2a89c3148d3bb65d30f77a5e6e1d7828 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 11:45:07 +0100
Subject: [PATCH 0661/3789] haskell-sourcemap: update to version 0.1.3.0

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

diff --git a/pkgs/development/libraries/haskell/sourcemap/default.nix b/pkgs/development/libraries/haskell/sourcemap/default.nix
index 602654b0a01..ce0c89d4596 100644
--- a/pkgs/development/libraries/haskell/sourcemap/default.nix
+++ b/pkgs/development/libraries/haskell/sourcemap/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "sourcemap";
-  version = "0.1.2.0";
-  sha256 = "040j2k1cwzlq5pybs6cg7wmf0x5i22zdidv2xvzdvgi5v7gf6kp1";
+  version = "0.1.3.0";
+  sha256 = "1flfsjs2z2zjzqwvmc2vcibvxh19s89ah4s560xr2s5mhdqwbkk5";
   buildDepends = [
     aeson attoparsec text unorderedContainers utf8String
   ];
-- 
GitLab


From 4c14da1276a426241fd0d183ec40b244c8d179df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 11:45:07 +0100
Subject: [PATCH 0662/3789] haskell-tls: update to version 1.2.2

---
 .../libraries/haskell/tls/default.nix         | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
index 0f354d8b77e..638299d4a42 100644
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -1,18 +1,23 @@
-{ cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey
-, cryptoRandom, mtl, network, QuickCheck, testFramework
-, testFrameworkQuickcheck2, time
+{ cabal, asn1Encoding, asn1Types, cereal, cipherAes, cipherRc4
+, cprngAes, cryptohash, cryptoNumbers, cryptoPubkey
+, cryptoPubkeyTypes, cryptoRandom, dataDefaultClass, mtl, network
+, QuickCheck, testFramework, testFrameworkQuickcheck2, time, x509
+, x509Store, x509Validation
 }:
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "1.1.5";
-  sha256 = "1ja03x3i7dgjpy22h4shnni1xslph8i8q4accqq8njpqpz54c84c";
+  version = "1.2.2";
+  sha256 = "156l859mfpdax5rg1frwa5ms5bzggaja0mi795hh8i5c3ah7hfcp";
   buildDepends = [
-    cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network
+    asn1Encoding asn1Types cereal cipherAes cipherRc4 cryptohash
+    cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom
+    dataDefaultClass mtl network x509 x509Store x509Validation
   ];
   testDepends = [
-    cereal certificate cprngAes cryptoPubkey cryptoRandom mtl
-    QuickCheck testFramework testFrameworkQuickcheck2 time
+    cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass mtl
+    QuickCheck testFramework testFrameworkQuickcheck2 time x509
+    x509Validation
   ];
   doCheck = false;
   meta = {
-- 
GitLab


From 3896a2ae0447a8f0f4d73c3869d8553fec819e4f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 11:45:07 +0100
Subject: [PATCH 0663/3789] haskell-vector-th-unbox: update to version 0.2.0.2

---
 .../libraries/haskell/vector-th-unbox/default.nix          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix
index 8f5ec4b52bf..db328836616 100644
--- a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix
+++ b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix
@@ -1,10 +1,11 @@
-{ cabal, vector }:
+{ cabal, dataDefault, vector }:
 
 cabal.mkDerivation (self: {
   pname = "vector-th-unbox";
-  version = "0.2.0.1";
-  sha256 = "1q01yk6cyjxbdnmq31d5mfac09hbql43d7xiw1snc96nmkklfpjv";
+  version = "0.2.0.2";
+  sha256 = "1c8xy0rcl8il9ssclqshwi8dd2xx6bl1rfhrfm9h7wklw64db9xp";
   buildDepends = [ vector ];
+  testDepends = [ dataDefault vector ];
   meta = {
     description = "Deriver for Data.Vector.Unboxed using Template Haskell";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From c1b58647969eb7bd33b81bc9d8aa87026018f195 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 11:45:07 +0100
Subject: [PATCH 0664/3789] haskell-warp-tls: update to version 2.0.2

---
 .../libraries/haskell/warp-tls/default.nix          | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix
index 88e50b2488e..c93352cf65c 100644
--- a/pkgs/development/libraries/haskell/warp-tls/default.nix
+++ b/pkgs/development/libraries/haskell/warp-tls/default.nix
@@ -1,15 +1,14 @@
-{ cabal, certificate, conduit, cprngAes, cryptocipher
-, cryptoRandomApi, network, networkConduit, pem, tls, tlsExtra
-, transformers, wai, warp
+{ cabal, conduit, cprngAes, dataDefaultClass, network
+, networkConduit, tls, transformers, wai, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "warp-tls";
-  version = "2.0.1";
-  sha256 = "0qz02awxrfqmmckias21dh0irmf44vamv24jjjrbb6bjxbr4ldd0";
+  version = "2.0.2";
+  sha256 = "02wj9hwxd0x49g7kl68h3r4b9hc29yqfjagyybnr42xzwl6bdpyg";
   buildDepends = [
-    certificate conduit cprngAes cryptocipher cryptoRandomApi network
-    networkConduit pem tls tlsExtra transformers wai warp
+    conduit cprngAes dataDefaultClass network networkConduit tls
+    transformers wai warp
   ];
   meta = {
     homepage = "http://github.com/yesodweb/wai";
-- 
GitLab


From cc81e53ecba1138e430a5ae8a6a4a4d231d9122e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 11:45:07 +0100
Subject: [PATCH 0665/3789] haskell-x509-store: update to version 1.4.4

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

diff --git a/pkgs/development/libraries/haskell/x509-store/default.nix b/pkgs/development/libraries/haskell/x509-store/default.nix
index bc1c0c47dc9..100b5ca2835 100644
--- a/pkgs/development/libraries/haskell/x509-store/default.nix
+++ b/pkgs/development/libraries/haskell/x509-store/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "x509-store";
-  version = "1.4.3";
-  sha256 = "1px5r5y4vaxx479d4av333g1sc03mz1aalpvwwkbi5bwnxydvf01";
+  version = "1.4.4";
+  sha256 = "0i3hfrddr0wpfl75a76a1j24az08z4x7ya8l5qcdk7c1lr2c2bw8";
   buildDepends = [
     asn1Encoding asn1Types cryptoPubkeyTypes filepath mtl pem time x509
   ];
-- 
GitLab


From 557b14bc89faa6c673c994e637ac111a35d72fea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 11:45:07 +0100
Subject: [PATCH 0666/3789] haskell-HaRe: update to version 0.7.1.2

---
 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 92bb973b558..33e5339a5f0 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.1.1";
-  sha256 = "1gh0md8gfchniclck5ddbkdwf9dl01mkcdmdx3n3f59rx9qi8g0h";
+  version = "0.7.1.2";
+  sha256 = "1bplcjh0rx6m8ja8vpb18cfky349gmi27rlpsg0pw5nr3l4gcwyl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From eae54a4b60cbe3b6deb569ef6adf47d82f5141a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 12:00:31 +0100
Subject: [PATCH 0667/3789] haskell-pqueue: add version 1.2.1

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

diff --git a/pkgs/development/libraries/haskell/pqueue/default.nix b/pkgs/development/libraries/haskell/pqueue/default.nix
new file mode 100644
index 00000000000..8634c414318
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pqueue/default.nix
@@ -0,0 +1,13 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+  pname = "pqueue";
+  version = "1.2.1";
+  sha256 = "1fily60f4njby7zknmik7a2wxsm3y77ckr69w9bb3fgq22gbzky6";
+  buildDepends = [ deepseq ];
+  meta = {
+    description = "Reliable, persistent, fast priority queues";
+    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 0087aa59df3..7de8c4ab818 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1888,6 +1888,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   ppm = callPackage ../development/libraries/haskell/ppm {};
 
+  pqueue = callPackage ../development/libraries/haskell/pqueue {};
+
   prettyclass = callPackage ../development/libraries/haskell/prettyclass {};
 
   prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {};
-- 
GitLab


From 2fce900513bbd89238c81cb7ed1aa9149a99ad28 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 18:37:32 +0100
Subject: [PATCH 0668/3789] haskell-lens: jailbreak to fix build with recent
 MonadCatchIO-transformers

---
 pkgs/development/libraries/haskell/lens/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index b0f6b6cd505..819902d6139 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -23,6 +23,9 @@ cabal.mkDerivation (self: {
     testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
     transformers unorderedContainers vector
   ];
+  patchPhase = ''
+    sed -i lens.cabal -e 's|MonadCatchIO-transformers >=.*,|MonadCatchIO-transformers,|'
+  '';
   doCheck = false;
   meta = {
     homepage = "http://github.com/ekmett/lens/";
-- 
GitLab


From 5375237ba946fedd882a0dcbaf024b77b9437db6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 18:40:09 +0100
Subject: [PATCH 0669/3789] haskell-tls-extra: remove obsolete package

---
 .../libraries/haskell/tls-extra/default.nix   | 23 -------------------
 pkgs/top-level/haskell-packages.nix           |  6 ++---
 2 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/tls-extra/default.nix

diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
deleted file mode 100644
index 6d63c267c61..00000000000
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ cabal, certificate, cipherAes, cipherRc4, cryptohash
-, cryptoPubkey, cryptoRandom, mtl, network, pem, time, tls, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tls-extra";
-  version = "0.6.6";
-  sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    certificate cipherAes cipherRc4 cryptohash cryptoPubkey
-    cryptoRandom mtl network pem time tls vector
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-tls";
-    description = "TLS extra default values and helpers";
-    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 7de8c4ab818..d2cb93deabb 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2330,8 +2330,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   tls = callPackage ../development/libraries/haskell/tls {};
 
-  tlsExtra = callPackage ../development/libraries/haskell/tls-extra {};
-
   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;
@@ -2574,7 +2572,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   yesodPersistent = callPackage ../development/libraries/haskell/yesod-persistent {};
 
-  yesodPlatform = callPackage ../development/libraries/haskell/yesod-platform {};
+  yesodPlatform = callPackage ../development/libraries/haskell/yesod-platform {
+    tlsExtra = null;            # obsolete package, now part of tls
+  };
 
   yesodRoutes = callPackage ../development/libraries/haskell/yesod-routes {};
 
-- 
GitLab


From 9109c4650cd8514fc6279fefb918ad00cee3433e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Jan 2014 18:41:22 +0100
Subject: [PATCH 0670/3789] haskell-yesod-platform: remove broken (and unused)
 package

---
 .../haskell/yesod-platform/default.nix        | 74 -------------------
 pkgs/top-level/haskell-packages.nix           |  4 -
 2 files changed, 78 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/yesod-platform/default.nix

diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix
deleted file mode 100644
index ee9fa20c8de..00000000000
--- a/pkgs/development/libraries/haskell/yesod-platform/default.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ cabal, aeson, ansiTerminal, asn1Data, asn1Types, attoparsec
-, attoparsecConduit, authenticate, base64Bytestring
-, baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml
-, blazeMarkup, byteable, byteorder, caseInsensitive, cereal
-, certificate, cipherAes, cipherBlowfish, cipherCamellia, cipherDes
-, cipherRc4, clientsession, conduit, connection, controlMonadLoop
-, cookie, cprngAes, cryptoApi, cryptocipher, cryptoCipherTypes
-, cryptoConduit, cryptohash, cryptohashCryptoapi, cryptoNumbers
-, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom, cryptoRandomApi
-, cssText, dataDefault, dataDefaultClass, dataDefaultInstancesBase
-, dataDefaultInstancesContainers, dataDefaultInstancesDlist
-, dataDefaultInstancesOldLocale, dlist, emailValidate, entropy
-, esqueleto, failure, fastLogger, fileEmbed, filesystemConduit
-, hamlet, hjsmin, hspec, hspecExpectations, htmlConduit
-, httpAttoparsec, httpClient, httpClientConduit, httpClientTls
-, httpConduit, httpDate, httpTypes, languageJavascript, liftedBase
-, mimeMail, mimeTypes, mmorph, monadControl, monadLogger
-, monadLoops, networkConduit, pathPieces, pem, persistent
-, persistentTemplate, poolConduit, primitive, processConduit
-, publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo
-, resourcePool, resourcet, safe, scientific, securemem, semigroups
-, setenv, SHA, shakespeare, shakespeareCss, shakespeareI18n
-, shakespeareJs, shakespeareText, silently, simpleSendfile, skein
-, socks, stmChans, stringsearch, systemFileio, systemFilepath
-, tagged, tagsoup, tagstreamConduit, tls, tlsExtra
-, transformersBase, unixCompat, unorderedContainers, utf8Light
-, utf8String, vector, void, wai, waiAppStatic, waiExtra, waiLogger
-, waiTest, warp, warpTls, word8, xmlConduit, xmlTypes, xssSanitize
-, yaml, yesod, yesodAuth, yesodCore, yesodForm, yesodPersistent
-, yesodRoutes, yesodStatic, yesodTest, zlibBindings, zlibConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-platform";
-  version = "1.2.6.1";
-  sha256 = "1hwvpyxwirv9maangw4q6nb2m2kqpqvvh1i095fr08f1a1qih77f";
-  buildDepends = [
-    aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
-    authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
-    blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder
-    caseInsensitive cereal certificate cipherAes cipherBlowfish
-    cipherCamellia cipherDes cipherRc4 clientsession conduit connection
-    controlMonadLoop cookie cprngAes cryptoApi cryptocipher
-    cryptoCipherTypes cryptoConduit cryptohash cryptohashCryptoapi
-    cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom
-    cryptoRandomApi cssText dataDefault dataDefaultClass
-    dataDefaultInstancesBase dataDefaultInstancesContainers
-    dataDefaultInstancesDlist dataDefaultInstancesOldLocale dlist
-    emailValidate entropy esqueleto failure fastLogger fileEmbed
-    filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit
-    httpAttoparsec httpClient httpClientConduit httpClientTls
-    httpConduit httpDate httpTypes languageJavascript liftedBase
-    mimeMail mimeTypes mmorph monadControl monadLogger monadLoops
-    networkConduit pathPieces pem persistent persistentTemplate
-    poolConduit primitive processConduit publicsuffixlist pureMD5
-    pwstoreFast quickcheckIo resourcePool resourcet safe scientific
-    securemem semigroups setenv SHA shakespeare shakespeareCss
-    shakespeareI18n shakespeareJs shakespeareText silently
-    simpleSendfile skein socks stmChans stringsearch systemFileio
-    systemFilepath tagged tagsoup tagstreamConduit tls tlsExtra
-    transformersBase unixCompat unorderedContainers utf8Light
-    utf8String vector void wai waiAppStatic waiExtra waiLogger waiTest
-    warp warpTls word8 xmlConduit xmlTypes xssSanitize yaml yesod
-    yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes
-    yesodStatic yesodTest zlibBindings zlibConduit
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Meta package for Yesod";
-    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 d2cb93deabb..35c06388866 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2572,10 +2572,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   yesodPersistent = callPackage ../development/libraries/haskell/yesod-persistent {};
 
-  yesodPlatform = callPackage ../development/libraries/haskell/yesod-platform {
-    tlsExtra = null;            # obsolete package, now part of tls
-  };
-
   yesodRoutes = callPackage ../development/libraries/haskell/yesod-routes {};
 
   yesodStatic = callPackage ../development/libraries/haskell/yesod-static {};
-- 
GitLab


From 00765dccd832cb78f970d6aa53e94ba76a290805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 26 Jan 2014 21:42:18 +0100
Subject: [PATCH 0671/3789] bully, a wpa/wpa2 passphrase retriever from wps
 enabled devices

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

diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix
new file mode 100644
index 00000000000..f667d772ac4
--- /dev/null
+++ b/pkgs/tools/networking/bully/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, openssl, libpcap}:
+
+stdenv.mkDerivation rec {
+  name = "bully-${version}";
+  version = "1.0-22";
+  src = fetchurl {
+    url = "https://github.com/bdpurcell/bully/archive/v${version}.tar.gz";
+    sha256 = "72f568f659fdcf70455a17f91f25dde65a53431c67c796517d3d3c4a4703ab68";
+  };
+  buildInputs = [ openssl libpcap ];
+
+  buildPhase = ''
+    cd src
+    make
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv bully $out/bin
+  '';
+
+  meta = {
+    description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point.";
+    homepage = "https://github.com/bdpurcell/bully";
+    maintainers = [ stdenv.lib.maintainers.edwtjo ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e076230672c..de32281b89b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1619,6 +1619,8 @@ let
 
   briss = callPackage ../tools/graphics/briss { };
 
+  bully = callPackage ../tools/networking/bully { };
+
   pdnsd = callPackage ../tools/networking/pdnsd { };
 
   pg_top = callPackage ../tools/misc/pg_top { };
-- 
GitLab


From 83acdb6f8727290e7199a08cc22a05582932c989 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Wed, 29 Jan 2014 22:11:35 +0100
Subject: [PATCH 0672/3789] dictd-wiktionary: Update to a more recent dump.

---
 pkgs/servers/dict/dictd-wiktionary.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix
index 48aaf187605..9e9c05d2f91 100644
--- a/pkgs/servers/dict/dictd-wiktionary.nix
+++ b/pkgs/servers/dict/dictd-wiktionary.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, python, dict, glibcLocales, writeScript}:
 
 stdenv.mkDerivation rec {
-  version = "20121021";
+  version = "20140118";
   name = "dict-db-wiktionary-${version}";
   data = fetchurl {
     url = "http://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
-    sha256 = "1i4xwdpc2bx58495iy62iz0kn50c3qmnh4qribi82f2rd4qkfjd2";
+    sha256 = "892c9fc16b248a31e2d3e42590267161c1b899b31fe923eb1ede1deb6d24cfa8";
   };
 
   convert = ./wiktionary2dict.py;
-- 
GitLab


From 81622220713ca0871362703bc9e8c69ba5996e0e Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Wed, 29 Jan 2014 18:49:44 +0100
Subject: [PATCH 0673/3789] dictd: Update to latest upstream (0.12.1).

---
 pkgs/servers/dict/buildfix.diff | 11 +++++++++++
 pkgs/servers/dict/default.nix   | 21 ++++++++++++---------
 pkgs/top-level/all-packages.nix |  4 +++-
 3 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/servers/dict/buildfix.diff

diff --git a/pkgs/servers/dict/buildfix.diff b/pkgs/servers/dict/buildfix.diff
new file mode 100644
index 00000000000..e30fcb2b038
--- /dev/null
+++ b/pkgs/servers/dict/buildfix.diff
@@ -0,0 +1,11 @@
+--- Makefile.in~	2011-03-06 18:52:54.000000000 +0100
++++ Makefile.in	2014-01-29 19:04:51.384844897 +0100
+@@ -123,7 +123,7 @@
+ 
+ %: %.o
+ 	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \
+-		$^ $(OBJS) $(LDFLAGS) -lz ${LIBS}
++	    $(^:.o=.lo) $(OBJS) $(LDFLAGS) -lz ${LIBS}
+ 
+ include $(srcdir)/deps
+ 
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix
index 51de674eb9f..1fb7c24418f 100644
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl, which, bison, flex }:
+{ stdenv, fetchurl, which, bison, flex, libmaa, zlib, libtool }:
 
-stdenv.mkDerivation {
-  name = "dictd-1.9.15";
+stdenv.mkDerivation rec {
+  version = "1.12.1";
+  name = "dictd-${version}";
 
   src = fetchurl {
-    url = mirror://sourceforge/dict/dictd-1.9.15.tar.gz;
-    sha256 = "0p41yf72l0igmshz6vxy3hm51z25600vrnb9j2jpgws4c03fqnac";
+    url = "mirror://sourceforge/dict/dictd-${version}.tar.gz";
+    sha256 = "0min6v60b6z5mrymyjfwzx8nv6rdm8pd8phlwl6v2jl5vkngcdx2";
   };
 
-  buildInputs = [ flex bison which ];
-  
+  buildInputs = [ flex bison which libmaa zlib libtool ];
+
+  patchPhase = "patch -p0 < ${./buildfix.diff}";
   configureFlags = "--datadir=/var/run/current-system/share/dictd";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Dict protocol server and client";
-    maintainers = with stdenv.lib.maintainers; mornfall;
+    maintainers = maintainers.mornfall;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de32281b89b..22cf0c51680 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6102,7 +6102,9 @@ let
 
   dico = callPackage ../servers/dico { };
 
-  dict = callPackage ../servers/dict { };
+  dict = callPackage ../servers/dict {
+      libmaa = callPackage ../servers/dict/libmaa.nix {};
+  };
 
   dictdDBs = recurseIntoAttrs (import ../servers/dict/dictd-db.nix {
     inherit builderDefs;
-- 
GitLab


From a412cdeb91fbb0862e343384679397a37fcf29da Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 29 Jan 2014 23:39:58 +0100
Subject: [PATCH 0674/3789] Disabled tests because a running CouchDB server is
 needed and they currently don't compile. The latter should be fixed with PR
 arjunguha/haskell-couchdb#13.

---
 pkgs/development/libraries/haskell/CouchDB/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix
index 4a413e2e7b8..d2e66c438e1 100644
--- a/pkgs/development/libraries/haskell/CouchDB/default.nix
+++ b/pkgs/development/libraries/haskell/CouchDB/default.nix
@@ -6,6 +6,10 @@ cabal.mkDerivation (self: {
   sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98";
   buildDepends = [ HTTP json mtl network utf8String ];
   testDepends = [ HTTP HUnit json mtl network utf8String ];
+
+  # Disabled tests because a running CouchDB server is needed.
+  doCheck = false;
+
   meta = {
     homepage = "http://github.com/arjunguha/haskell-couchdb/";
     description = "CouchDB interface";
-- 
GitLab


From f93acdf3acdeb202f66ddee3f912e666f31a122e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 30 Jan 2014 08:28:08 +0100
Subject: [PATCH 0675/3789] haskell-CouchDB: re-generate with cabal2nix

---
 pkgs/development/libraries/haskell/CouchDB/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix
index d2e66c438e1..ac8ab3d7728 100644
--- a/pkgs/development/libraries/haskell/CouchDB/default.nix
+++ b/pkgs/development/libraries/haskell/CouchDB/default.nix
@@ -6,10 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98";
   buildDepends = [ HTTP json mtl network utf8String ];
   testDepends = [ HTTP HUnit json mtl network utf8String ];
-
-  # Disabled tests because a running CouchDB server is needed.
   doCheck = false;
-
   meta = {
     homepage = "http://github.com/arjunguha/haskell-couchdb/";
     description = "CouchDB interface";
-- 
GitLab


From d2a2a2628e994d909cefd7e16c0bf2662dc15c36 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 30 Jan 2014 08:32:38 +0100
Subject: [PATCH 0676/3789] haskell-adjunctions: add version 4.0.1

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

diff --git a/pkgs/development/libraries/haskell/adjunctions/default.nix b/pkgs/development/libraries/haskell/adjunctions/default.nix
new file mode 100644
index 00000000000..bdfec2f01d4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/adjunctions/default.nix
@@ -0,0 +1,19 @@
+{ cabal, comonad, contravariant, distributive, free, mtl
+, semigroupoids, semigroups, tagged, transformers, void
+}:
+
+cabal.mkDerivation (self: {
+  pname = "adjunctions";
+  version = "4.0.1";
+  sha256 = "0z13rmh9yp8jg2jzj3bmysqc4h2nblshx125h2sx51wllnvxzh5l";
+  buildDepends = [
+    comonad contravariant distributive free mtl semigroupoids
+    semigroups tagged transformers void
+  ];
+  meta = {
+    homepage = "http://github.com/ekmett/adjunctions/";
+    description = "Adjunctions and representable functors";
+    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 35c06388866..26c7ec2aa30 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -522,6 +522,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   abstractPar = callPackage ../development/libraries/haskell/abstract-par {};
 
+  adjunctions = callPackage ../development/libraries/haskell/adjunctions {};
+
   aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {};
   aeson_0_7_0_0 = callPackage ../development/libraries/haskell/aeson/0.7.0.0.nix {};
   aeson = self.aeson_0_6_2_1;
-- 
GitLab


From 1124a4ab08644cb1cbd4c9738ebb75984d54c62b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 30 Jan 2014 08:32:41 +0100
Subject: [PATCH 0677/3789] haskell-git-annex: update to version 5.20140129

---
 .../git-and-tools/git-annex/default.nix       | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 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 6a4272101b3..7a8d6995265 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
@@ -7,16 +7,16 @@
 , network, networkConduit, networkInfo, networkMulticast
 , networkProtocolXmpp, openssh, optparseApplicative, perl
 , QuickCheck, random, regexTdfa, rsync, SafeSemaphore, SHA, stm
-, tasty, tastyHunit, tastyQuickcheck, text, time, transformers
-, unixCompat, utf8String, uuid, wai, waiLogger, warp, which
-, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm
-, yesodStatic
+, tasty, tastyHunit, tastyQuickcheck, tastyRerun, text, time
+, transformers, unixCompat, utf8String, uuid, wai, waiLogger, warp
+, which, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault
+, yesodForm, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140127";
-  sha256 = "0aqqnv0faiva9vf0nb0d8xsd659y8cyrnyy6mfjdqjqdw8wha3yr";
+  version = "5.20140129";
+  sha256 = "0m1n3m16gvd0693i5xq5adki0hd0wdn7p5vqjxkqnc3imx9f11ng";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -27,9 +27,10 @@ cabal.mkDerivation (self: {
     MissingH MonadCatchIOTransformers monadControl mtl network
     networkConduit networkInfo networkMulticast networkProtocolXmpp
     optparseApplicative QuickCheck random regexTdfa SafeSemaphore SHA
-    stm tasty tastyHunit tastyQuickcheck text time transformers
-    unixCompat utf8String uuid wai waiLogger warp xmlConduit xmlTypes
-    yesod yesodCore yesodDefault yesodForm yesodStatic
+    stm tasty tastyHunit tastyQuickcheck tastyRerun text time
+    transformers unixCompat utf8String uuid wai waiLogger warp
+    xmlConduit xmlTypes yesod yesodCore yesodDefault yesodForm
+    yesodStatic
   ];
   buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
   configureFlags = "-fS3
-- 
GitLab


From f5578e8b8eb32dfed7d203a7f210bf2cb8deebd7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 30 Jan 2014 08:32:43 +0100
Subject: [PATCH 0678/3789] haskell-HList: update to version 0.3.1.0

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

diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix
index 99cb73dcf1f..ae6f8e435f7 100644
--- a/pkgs/development/libraries/haskell/HList/default.nix
+++ b/pkgs/development/libraries/haskell/HList/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HList";
-  version = "0.3.0.1";
-  sha256 = "03mp99pb8whh3whyffyj8wbld8lv8i930dyjdpyfwiaj13x05iy4";
+  version = "0.3.1.0";
+  sha256 = "1cq7l7cv62jf47s75ycsgxg75kkrgnnrpb6y22cskc97hkfsnjmk";
   buildDepends = [ mtl ];
   testDepends = [ cmdargs doctest filepath hspec lens mtl syb ];
   buildTools = [ diffutils ];
-- 
GitLab


From 969d4a3be2ecde79c34ec64e75a8d38efbed91de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 30 Jan 2014 08:32:44 +0100
Subject: [PATCH 0679/3789] haskell-ekg: update to version 0.3.1.4

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

diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix
index dd3c40a7d2c..28ef546163a 100644
--- a/pkgs/development/libraries/haskell/ekg/default.nix
+++ b/pkgs/development/libraries/haskell/ekg/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ekg";
-  version = "0.3.1.3";
-  sha256 = "1d8ly1lc92gh26bdqg3ql6n2iai3nyvwic6sj8pani58iv0p4ppc";
+  version = "0.3.1.4";
+  sha256 = "0hr9962yx463rq53xfqfm7vlv9izn47v3css3m6n4v694qlyz95i";
   buildDepends = [
     aeson filepath network snapCore snapServer text time transformers
     unorderedContainers
-- 
GitLab


From 3e51d2237a5377917ae12be904c2c5eefaa58e24 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 30 Jan 2014 08:32:46 +0100
Subject: [PATCH 0680/3789] haskell-free: update to version 4.4

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

diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix
index a481d451973..4e679da1bdb 100644
--- a/pkgs/development/libraries/haskell/free/default.nix
+++ b/pkgs/development/libraries/haskell/free/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "free";
-  version = "4.2";
-  sha256 = "0g2k36xqma8r6shrih40w5xv0pgs5ldr9lhc5hjpwmh4n3hgdhfb";
+  version = "4.4";
+  sha256 = "19c6zy7gxsd121g1kny9y8rv33gsxv3kfsi37iyn6q0p8r38wbcy";
   buildDepends = [
     bifunctors comonad distributive mtl profunctors semigroupoids
     semigroups transformers
-- 
GitLab


From d82430a903243ae4e98e29d4cd4380461dd3978e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 30 Jan 2014 08:32:48 +0100
Subject: [PATCH 0681/3789] haskell-hit: update to version 0.5.4

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

diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix
index 0c4020f746c..4dc73996cd1 100644
--- a/pkgs/development/libraries/haskell/hit/default.nix
+++ b/pkgs/development/libraries/haskell/hit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hit";
-  version = "0.5.3";
-  sha256 = "0s6nfjdasf62x28vzks809slnh0p6j3g101jzqlfh7nrnj5k6q1d";
+  version = "0.5.4";
+  sha256 = "1gr2f1bzncg8zlxk343p1ifnf2a2px000syzmr7hcf4yhhfavrhz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 3b21991fddb20d071c306a5b4c7ea98c0f846d16 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 30 Jan 2014 08:32:50 +0100
Subject: [PATCH 0682/3789] haskell-http-client-tls: update to version 0.2.0.3

---
 .../development/libraries/haskell/http-client-tls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix
index 82866abe9c3..201e1e11564 100644
--- a/pkgs/development/libraries/haskell/http-client-tls/default.nix
+++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client-tls";
-  version = "0.2.0.2";
-  sha256 = "0v5730rssddc28f1q6ndkcjrfz8r5a1wmxk1azpmdxlq6nh4i9q9";
+  version = "0.2.0.3";
+  sha256 = "0v8zbwlvdmkap5qbw9aw75krvw8j4q90fn301al13azzgjp71gmb";
   buildDepends = [ connection dataDefault httpClient network tls ];
   testDepends = [ hspec httpClient httpTypes ];
   doCheck = false;
-- 
GitLab


From ab713366f21a17384f7a0f1ebab5a12b734a2950 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 30 Jan 2014 08:32:53 +0100
Subject: [PATCH 0683/3789] haskell-linear: update to version 1.6

---
 .../libraries/haskell/linear/default.nix        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix
index a358528ee28..a0d1e67ee6f 100644
--- a/pkgs/development/libraries/haskell/linear/default.nix
+++ b/pkgs/development/libraries/haskell/linear/default.nix
@@ -1,16 +1,17 @@
-{ cabal, binary, distributive, doctest, filepath, hashable, HUnit
-, lens, reflection, semigroupoids, semigroups, simpleReflect
-, tagged, testFramework, testFrameworkHunit, transformers
-, unorderedContainers, vector
+{ cabal, adjunctions, binary, distributive, doctest, filepath
+, hashable, HUnit, lens, reflection, semigroupoids, semigroups
+, simpleReflect, tagged, testFramework, testFrameworkHunit
+, transformers, unorderedContainers, vector, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "linear";
-  version = "1.4";
-  sha256 = "1a2l68q0l2vlp4wpf5wqvpnag326s38k2ifh8hcfczjhsg9cq45a";
+  version = "1.6";
+  sha256 = "1aka0da4mwv9cdj76armlava0d4c5f8s2pv10fk6b5glyb0c1a7x";
   buildDepends = [
-    binary distributive hashable reflection semigroupoids semigroups
-    tagged transformers unorderedContainers vector
+    adjunctions binary distributive hashable lens reflection
+    semigroupoids semigroups tagged transformers unorderedContainers
+    vector void
   ];
   testDepends = [
     binary doctest filepath HUnit lens simpleReflect testFramework
-- 
GitLab


From e9dcfd8527d17227d7505bc5f8788c29794d7b87 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 30 Jan 2014 08:32:55 +0100
Subject: [PATCH 0684/3789] haskell-reflection: update to version 1.4

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

diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix
index 5f227d60ca8..a02a7ec6907 100644
--- a/pkgs/development/libraries/haskell/reflection/default.nix
+++ b/pkgs/development/libraries/haskell/reflection/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reflection";
-  version = "1.3.2";
-  sha256 = "0jmdygvmvhw20aqjk7k0jah93ggfgf2bgq5zpwnz9bwgi9gs17x6";
+  version = "1.4";
+  sha256 = "0i6yb3fa9wizyaz8x9b7yzkw9jf7zahdrkr2y0iw7igdxqn4n0k7";
   buildDepends = [ tagged ];
   meta = {
     homepage = "http://github.com/ekmett/reflection";
-- 
GitLab


From 5f0fa99020c1ee567991c30d3d174ab6b8bf8849 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 30 Jan 2014 08:32:56 +0100
Subject: [PATCH 0685/3789] haskell-unbound: update to version 0.4.3

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

diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix
index df57bbbdac7..4667ed956f0 100644
--- a/pkgs/development/libraries/haskell/unbound/default.nix
+++ b/pkgs/development/libraries/haskell/unbound/default.nix
@@ -1,10 +1,10 @@
-{ cabal, mtl, RepLib, transformers }:
+{ cabal, binary, mtl, RepLib, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "unbound";
-  version = "0.4.2";
-  sha256 = "1bnnnv4rmzb0pw7i56nzr7k7pahr9rcmlfi4xkpsjhrxmizcfml9";
-  buildDepends = [ mtl RepLib transformers ];
+  version = "0.4.3";
+  sha256 = "1lv60zpsvjfp9qnckwbphkfv0x9pz2qvaab3p4kj38fnlq2y20i4";
+  buildDepends = [ binary mtl RepLib transformers ];
   meta = {
     homepage = "http://code.google.com/p/replib/";
     description = "Generic support for programming with names and binders";
-- 
GitLab


From 98b2f63e71471bf4c22d6ee1846ef6bf7b1dfeb3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 30 Jan 2014 08:32:58 +0100
Subject: [PATCH 0686/3789] haskell-wai-extra: update to version 2.0.3.3

---
 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 3022b0565de..f3d2dfbd0cd 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.0.3.2";
-  sha256 = "0zhwk78ny7ak6sf974gqg3zjrrmivgb7dvxs5jbqghq0a6xs97zi";
+  version = "2.0.3.3";
+  sha256 = "11ma8pazvysvpiy8y7xfh7kpmsfiw94bd6vyyi3ji8q71rzjlf62";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase
-- 
GitLab


From b27477054f4a330255afb9003667d33b8e679ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Jan 2014 09:12:51 +0100
Subject: [PATCH 0687/3789] xorg xcb-util-wm: minor update

---
 pkgs/servers/x11/xorg/default.nix | 6 +++---
 pkgs/servers/x11/xorg/extra.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 b0ac857948b..9d27b2d1a38 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1180,11 +1180,11 @@ let
   })) // {inherit gperf m4 libxcb xproto ;};
 
   xcbutilwm = (stdenv.mkDerivation ((if overrides ? xcbutilwm then overrides.xcbutilwm else x: x) {
-    name = "xcb-util-wm-0.3.9";
+    name = "xcb-util-wm-0.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.3.9.tar.bz2;
-      sha256 = "0c30fj33gvwzwhyz1dhsfwni0ai16bxpvxb4l6c6s7vvj7drp3q3";
+      url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.0.tar.bz2;
+      sha256 = "07zmlaaqkasihmkfwcac4wclb8zws915inz57y3kr3frywc7ryb6";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
   })) // {inherit gperf m4 libxcb xproto ;};
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 505f0eafc3a..90c8e489e1e 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -5,5 +5,5 @@ http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2
-http://xcb.freedesktop.org/dist/xcb-util-wm-0.3.9.tar.bz2
+http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.0.tar.bz2
 http://xorg.freedesktop.org/releases/individual/util/util-macros-1.17.tar.bz2
-- 
GitLab


From e28c0da32e87f4c957d1e5312e56930686bc0d12 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 30 Jan 2014 12:26:11 +0100
Subject: [PATCH 0688/3789] sane-backends: Add extra source url

It seems alioth.debian.org has some problem (login needed for download), so
I've added a pkgs.fedoraproject.org url.
---
 pkgs/applications/graphics/sane/backends.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix
index 3b5077a14e2..3d95dcd81ee 100644
--- a/pkgs/applications/graphics/sane/backends.nix
+++ b/pkgs/applications/graphics/sane/backends.nix
@@ -12,7 +12,10 @@ stdenv.mkDerivation rec {
   name = "sane-backends-${version}";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/file/3958/${name}.tar.gz";
+    urls = [
+      "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-1.0.24.tar.gz/1ca68e536cd7c1852322822f5f6ac3a4/${name}.tar.gz"
+      "https://alioth.debian.org/frs/download.php/file/3958/${name}.tar.gz"
+    ];
     curlOpts = "--insecure";
     sha256 = "0ba68m6bzni54axjk15i51rya7hfsdliwvqyan5msl7iaid0iir7";
   };
-- 
GitLab


From b5e11465c9b9f62ca92d93d0cf4e8da641e6337e Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 30 Jan 2014 12:28:20 +0100
Subject: [PATCH 0689/3789] obnam: Update to 1.6.1

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

diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index f6a51eb3193..854801a3edd 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "obnam-${version}";
-  version = "1.6";
+  version = "1.6.1";
 
   namePrefix = "";
 
   src = fetchurl rec {
     url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.gz";
-    sha256 = "1vg0kppbyngvm7wi2pbg3himixy9v3h8z66lcps6pclw43s1kgpm";
+    sha256 = "0415njniqpy3xhvibpm82i9alrp2fw3lsnm15h7vqkkvgp8s5g39";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];
-- 
GitLab


From 48fb891646dbce4ef0a4cc4c827e4bf3ff17bd0c Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 30 Jan 2014 12:28:57 +0100
Subject: [PATCH 0690/3789] mkpasswd: Update to 5.1.1

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

diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix
index b27707a0015..624fcdbe6c6 100644
--- a/pkgs/tools/security/mkpasswd/default.nix
+++ b/pkgs/tools/security/mkpasswd/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "mkpasswd-${version}";
 
-  version = "5.0.26";
+  version = "5.1.1";
 
   src = fetchurl {
     url = "http://ftp.debian.org/debian/pool/main/w/whois/whois_${version}.tar.xz";
-    sha256 = "729625ef81425f4771e06492bb4f3e9f24bff75b8176044ce8d2f605f7ad6af5";
+    sha256 = "0i06a9mb9qcq272782mg6dffv3k7bqkw4cdr31yrc0s6jqylryv9";
   };
 
   preConfigure = ''
-- 
GitLab


From 8893f10d6a60a6e9f8c86b3a6194154c9a7831f7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 30 Jan 2014 13:41:17 +0100
Subject: [PATCH 0691/3789] ghc: Fix building on Darwin

http://hydra.nixos.org/build/8598783
---
 pkgs/development/compilers/ghc/7.6.3.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix
index c0933b2a961..1839c982e99 100644
--- a/pkgs/development/compilers/ghc/7.6.3.nix
+++ b/pkgs/development/compilers/ghc/7.6.3.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
   '';
 
-- 
GitLab


From 546bd7738d35094a8d8067581820056c33a9cd8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Jan 2014 13:46:02 +0100
Subject: [PATCH 0692/3789] xorg xkeyboard-config: update, unify with the other
 expression

---
 pkgs/data/misc/xkeyboard-config/default.nix   | 25 -----
 pkgs/data/misc/xkeyboard-config/eo.patch      | 71 --------------
 .../xkeyboard-config/level3-deadkeys-us-intl  | 95 -------------------
 pkgs/servers/x11/xorg/default.nix             |  6 +-
 pkgs/servers/x11/xorg/overrides.nix           |  2 +-
 pkgs/servers/x11/xorg/tarballs-7.7.list       |  2 +-
 pkgs/top-level/all-packages.nix               |  4 +-
 7 files changed, 7 insertions(+), 198 deletions(-)
 delete mode 100644 pkgs/data/misc/xkeyboard-config/default.nix
 delete mode 100644 pkgs/data/misc/xkeyboard-config/eo.patch
 delete mode 100644 pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl

diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix
deleted file mode 100644
index 15574a1dc36..00000000000
--- a/pkgs/data/misc/xkeyboard-config/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool  }:
-
-stdenv.mkDerivation rec {
-  name = "xkeyboard-config-2.7";
-
-  src = fetchurl {
-    url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2";
-    sha256 = "08c3mjdgp7c2v6lj5bymaczcazklsd7s1lxslxbngzmh5yhphd74";
-  };
-
-  buildInputs = [ gettext ];
-
-  nativeBuildInputs = [ perl perlXMLParser intltool xkbcomp ];
-
-  patches = [ ./eo.patch ];
-
-  preConfigure = ''
-    configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86 --disable-runtime-deps"
-    sed -e 's@#!\s*/bin/bash@#! /bin/sh@' -i rules/merge.sh
-  '';
-
-  postInstall = ''
-    cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
-  '';
-}
diff --git a/pkgs/data/misc/xkeyboard-config/eo.patch b/pkgs/data/misc/xkeyboard-config/eo.patch
deleted file mode 100644
index f288a5c0f6d..00000000000
--- a/pkgs/data/misc/xkeyboard-config/eo.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/rules/base.xml.in b/rules/base.xml.in
-index ec321f8..e9c3546 100644
---- a/rules/base.xml.in
-+++ b/rules/base.xml.in
-@@ -1786,6 +1786,13 @@
-     </layout>
-     <layout>
-       <configItem>
-+        <name>eo</name>
-+        <_shortDescription>Esp</_shortDescription>
-+        <_description>Esperanto</_description>
-+      </configItem>
-+    </layout>
-+    <layout>
-+      <configItem>
-         <name>ir</name>
-         <_shortDescription>Irn</_shortDescription>
-         <_description>Iran</_description>
-diff --git a/symbols/Makefile.am b/symbols/Makefile.am
-index 97c816d..d7e3a4e 100644
---- a/symbols/Makefile.am
-+++ b/symbols/Makefile.am
-@@ -10,7 +10,7 @@ bt by braille \
- ca cd \
- ch cn cz \
- de dk \
--ee es et epo \
-+ee eo es et epo \
- fi fo fr \
- gb ge gh gn \
- gr hr hu \
-diff --git a/symbols/Makefile.in b/symbols/Makefile.in
-index b5be077..5cddcc7 100644
---- a/symbols/Makefile.in
-+++ b/symbols/Makefile.in
-@@ -222,7 +222,7 @@ bt by braille \
- ca cd \
- ch cn cz \
- de dk \
--ee es et epo \
-+ee eo es et epo \
- fi fo fr \
- gb ge gh gn \
- gr hr hu \
-diff --git a/symbols/eo b/symbols/eo
-new file mode 100644
-index 0000000..d6358c9
---- /dev/null
-+++ b/symbols/eo
-@@ -0,0 +1,21 @@
-+// $XFree86$
-+
-+partial alphanumeric_keys
-+xkb_symbols "basic" {
-+
-+     // Describes the differences between a very simple en_US
-+     // keyboard and a simple Esperanto keyboard
-+     // Press AltGr or Windows Menu key together with C, H, J, S, U
-+     // to get accented letters.
-+     // 2001 by Radovan Garabik <garabik@melkor.dnp.fmph.uniba.sk>
-+
-+    key.type = "FOUR_LEVEL";
-+
-+    key <AD02>  { [w,W, ubreve,Ubreve ] };
-+    key <AD07>  { [u,U, ubreve, Ubreve ] };
-+    key <AC02>  { [s,S, scircumflex,    Scircumflex ] };
-+    key <AC05>  { [g,G, gcircumflex,Gcircumflex ] };
-+    key <AC06>  { [h,H, hcircumflex,Hcircumflex ] };
-+    key <AC07>  { [j,J, jcircumflex,Jcircumflex ] };
-+    key <AB03>  { [c,C, ccircumflex,Ccircumflex ] };
-+};
diff --git a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl b/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl
deleted file mode 100644
index 76905b7b77b..00000000000
--- a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// Grabbed from http://lists.freedesktop.org/archives/xorg/2007-July/026686.html
-// Submitted there by Adriaan van Nijendaal, he says he submitted it to X.org
-// for inclusion, so it should be OK to use it as if it were part of X.org
-
-// The keyboard section in the X-server config file
-// (/etc/X11/xorg.conf on my system) looks like this:
-//
-// Section "InputDevice"
-//   Driver	"kbd"
-//   Identifier	"Keyboard[0]"
-//   Option	"XkbModel"	"pc101"
-//   Option	"XkbLayout"	"us"
-//   Option	"XkbVariant"	"altgr-intl"
-// EndSection
-//
-// To be effective, you need to install this file, change the X config
-// file and restart the X-server. Or, alternatively, you can do this
-// run-time:
-//
-// setxkbmap -v -rules xorg -model pc101 -layout us -variant altgr-intl
-//
-// Once the X-server has loaded the new config, a keyboard can be
-// displayed with: (if you change "-ll 1" into "-ll 2", you'll see
-// the special keys ONLY.)
-//
-//   xkbcomp -o /tmp/keyboard.xkm -opt cgkst -xkb $DISPLAY
-//   xkbprint -o /tmp/keyboard.xkm.ps -kc -nkg 2 -ntg 4 -lg 1 -ll 1 \
-//	-lc en_US.iso885915 -level2 -mono -label symbols -w 3 $DISPLAY;
-//   gv -seascape /tmp/keyboard.xkm.ps
-//   rm -f /tmp/keyboard.xkm.ps /tmp/keyboard.xkm
-//
-
-partial hidden alphanumeric_keys
-xkb_symbols "altgr-intl-rich" {
-
-    name[Group1]= "U.S. English - International (AltGr dead keys)";
-
-    include "us(basic)"
-
-    key <TLDE> { [    grave,	asciitilde,	dead_grave,	dead_tilde	] };
-    key <AE01> { [	  1,	exclam,		onesuperior,	exclamdown	] };
-    key <AE02> { [	  2,	at,		twosuperior,	dead_doubleacute] };
-    key <AE03> { [	  3,	numbersign,	threesuperior,	dead_macron	] };
-    key <AE04> { [	  4,	dollar,		currency,	sterling	] };
-    key <AE05> { [	  5,	percent,	EuroSign,	approxeq	] };
-    key <AE06> { [	  6,	asciicircum,	dead_circumflex, dead_stroke	] };
-    key <AE07> { [	  7,	ampersand,		dead_horn		] };
-    key <AE08> { [	  8,	asterisk,	dead_ogonek,	infinity	] };
-    key <AE09> { [	  9,	parenleft,  leftsinglequotemark,dead_breve	] };
-    key <AE10> { [	  0,	parenright,rightsinglequotemark,dead_abovering	] };
-    key <AE11> { [    minus,	underscore,	yen,		dead_belowdot	] };
-    key <AE12> { [    equal,	plus,		multiply,	division	] };
-
-    key <AD01> { [	  q,	Q,		adiaeresis,	Adiaeresis	] };
-    key <AD02> { [	  w,	W,		aring,		Aring		] };
-    key <AD03> { [	  e,	E,		eacute,		Eacute		] };
-    key <AD04> { [	  r,	R,		ediaeresis,	Ediaeresis	] };
-    key <AD05> { [	  t,	T,		thorn,		THORN		] };
-    key <AD06> { [	  y,	Y,		udiaeresis,	Udiaeresis	] };
-    key <AD07> { [	  u,	U,		uacute,		Uacute		] };
-    key <AD08> { [	  i,	I,		iacute,		Iacute		] };
-    key <AD09> { [	  o,	O,		oacute,		Oacute		] };
-    key <AD10> { [	  p,	P,		odiaeresis,	Odiaeresis	] };
-    key <AD11> { [ bracketleft,	braceleft,	guillemotleft,	lessthanequal	] };
-    key <AD12> { [ bracketright,braceright,	guillemotright,	greaterthanequal] };
-
-    key <AC01> { [	  a,	A,		aacute,		Aacute		] };
-    key <AC02> { [	  s,	S,		ssharp,		section		] };
-    key <AC03> { [	  d,	D,		eth,		ETH		] };
-    key <AC04> { [	  f,	F,		union,		intersection	] };
-    key <AC05> { [	  g,	G,		eng,		ENG		] };
-    key <AC06> { [	  h,	H,		hyphen,		nobreakspace	] };
-    key <AC07> { [	  j,	J,		idiaeresis,	Idiaeresis	] };
-    key <AC08> { [	  k,	K						] };
-    key <AC09> { [	  l,	L,		oslash,		Ooblique	] };
-    key <AC10> { [semicolon,	colon,		paragraph,	degree		] };
-    key <AC11> { [apostrophe,	quotedbl,	dead_acute,	dead_diaeresis	] };
-
-    key <AB01> { [	  z,	Z,		ae,		AE		] };
-    key <AB02> { [	  x,	X,		oe,		OE		] };
-    key <AB03> { [	  c,	C,		copyright,	cent		] };
-    key <AB04> { [	  v,	V,		registered,	trademark	] };
-    key <AB05> { [	  b,	B,		emdash,		endash		] };
-    key <AB06> { [	  n,	N,		nu,		numerosign	] };
-    key <AB07> { [	  m,	M,		mu,		plusminus	] };
-    key <AB08> { [    comma,	less,		ccedilla,	Ccedilla	] };
-    key <AB09> { [   period,	greater,	dead_abovedot,	dead_caron	] };
-    key <AB10> { [    slash,	question,	questiondown,	dead_hook	] };
-    key <BKSL> { [backslash,	bar,		notsign,	brokenbar	] };
-
-    // Let's have free choice
-    //include "level3(ralt_switch)"
-};
-
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 9d27b2d1a38..a0cc0c7b148 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1830,11 +1830,11 @@ let
   })) // {inherit inputproto libX11 libXaw xproto libXt ;};
 
   xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) {
-    name = "xkeyboard-config-2.8";
+    name = "xkeyboard-config-2.11";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2;
-      sha256 = "1bkq415qw4r3dl139mqgal9v585x7kh3km6z1lraz2j8im3ga72f";
+      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2;
+      sha256 = "0xkdyyi759hzls42hp4j3q2lc35n4j6b2g44ilx5qarci5h584p7";
     };
     buildInputs = [pkgconfig libX11 xproto ];
   })) // {inherit libX11 xproto ;};
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0ee3594f6ec..499d78b947e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -131,7 +131,7 @@ in
     postInstall =
       ''
         mkdir -p $out/share
-        ln -sfn ${args.xkeyboard_config}/etc/X11 $out/share/X11
+        ln -sfn ${xorg.xkeyboardconfig}/etc/X11 $out/share/X11
       '';
   };
 
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 50a4928e351..2eb08b1831d 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -159,7 +159,7 @@ mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2
-mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2
+mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4201f6420d3..e8fd441f994 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6343,7 +6343,7 @@ let
   xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
     inherit fetchurl fetchgit stdenv pkgconfig intltool freetype fontconfig
       libxslt expat libdrm libpng zlib perl mesa_drivers
-      xkeyboard_config dbus libuuid openssl gperf m4
+      dbus libuuid openssl gperf m4
       autoconf libtool xmlto asciidoc udev flex bison python mtdev pixman;
     automake = automake110x;
     mesa = mesa_noglu;
@@ -7281,7 +7281,7 @@ let
 
   xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { };
 
-  xkeyboard_config = callPackage ../data/misc/xkeyboard-config { };
+  xkeyboard_config = xorg.xkeyboardconfig;
 
 
   ### APPLICATIONS
-- 
GitLab


From e8a401a0c9d062d3ade7e02272e7d06a1eda06ff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Jan 2014 11:57:08 +0100
Subject: [PATCH 0693/3789] llvm-3.4: Only build on Linux

It doesn't build on Darwin because it depends on Valgrind:
http://hydra.nixos.org/build/8616143/nixlog/1/raw
---
 pkgs/development/compilers/llvm/3.4/llvm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 4947bdca2a9..9ee63ee319f 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -50,6 +50,6 @@ in stdenv.mkDerivation rec {
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
-    platforms   = stdenv.lib.platforms.all;
+    platforms   = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From 5888f27c563427b1771979d3e794806302fe7ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Jan 2014 13:49:08 +0100
Subject: [PATCH 0694/3789] automake-1.10: remove, probably vulnerable
 CVE-2012-3386

The only user was xorg ATM, which I would remove from anyway.
---
 .../tools/misc/automake/automake-1.10.x.nix   | 41 -------------------
 pkgs/top-level/all-packages.nix               |  5 +--
 2 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/automake/automake-1.10.x.nix

diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix
deleted file mode 100644
index 80b033425a1..00000000000
--- a/pkgs/development/tools/misc/automake/automake-1.10.x.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false}:
-
-stdenv.mkDerivation rec {
-  name = "automake-1.10.3";
-
-  builder = ./builder.sh;
-
-  setupHook = ./setup-hook.sh;
-
-  src = fetchurl {
-    url = "mirror://gnu/automake/${name}.tar.bz2";
-    sha256 = "1p0sgv8zl6ah6vwpqf7jkrjr3cw8ydpmnbi0ljb1dhrrp0xv92p9";
-  };
-
-  buildInputs = [perl autoconf makeWrapper];
-
-  inherit doCheck;
-
-  # Disable indented log output from Make, otherwise "make.test" will
-  # fail.
-  preCheck = "unset NIX_INDENT_MAKE";
-
-  # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
-  # "fixed" path in generated files!
-  dontPatchShebangs = true;
-
-  meta = {
-    homepage = http://www.gnu.org/software/automake/;
-    description = "GNU standard-compliant makefile generator";
-
-    longDescription = ''
-      GNU Automake is a tool for automatically generating
-      `Makefile.in' files compliant with the GNU Coding
-      Standards.  Automake requires the use of Autoconf.
-    '';
-
-    license = "GPLv2+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8fd441f994..4693d5cf24d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3372,8 +3372,6 @@ let
 
   automake = automake112x;
 
-  automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { };
-
   automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
 
   automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { };
@@ -6344,8 +6342,7 @@ let
     inherit fetchurl fetchgit stdenv pkgconfig intltool freetype fontconfig
       libxslt expat libdrm libpng zlib perl mesa_drivers
       dbus libuuid openssl gperf m4
-      autoconf libtool xmlto asciidoc udev flex bison python mtdev pixman;
-    automake = automake110x;
+      autoconf automake libtool xmlto asciidoc udev flex bison python mtdev pixman;
     mesa = mesa_noglu;
   });
 
-- 
GitLab


From 82359bba65814a858c60aff5cdffdae3e76ff5c3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 30 Jan 2014 13:57:16 +0100
Subject: [PATCH 0695/3789] python-3.3: Only build on Linux

It doesn't build on Darwin: http://hydra.nixos.org/build/8597946
---
 pkgs/development/interpreters/python/3.3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index 36cb8158506..84cb9dd141a 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -69,8 +69,8 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://python.org";
-    description = "a high-level dynamically-typed programming language";
+    homepage = http://python.org;
+    description = "A high-level dynamically-typed programming language";
     longDescription = ''
       Python is a remarkably powerful dynamic programming language that
       is used in a wide variety of application domains. Some of its key
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
       high level dynamic data types.
     '';
     license = stdenv.lib.licenses.psfl;
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
   };
 }
-- 
GitLab


From cdd86c7875c7e31b69d1a859c0f8c6a9deb3266f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 30 Jan 2014 09:54:54 -0500
Subject: [PATCH 0696/3789] Add annotated-wl-pprint haskellPackage

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../haskell/annotated-wl-pprint/default.nix         | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix

diff --git a/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix b/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix
new file mode 100644
index 00000000000..f084fda35c5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "annotated-wl-pprint";
+  version = "0.5.3";
+  sha256 = "0g8b4hmgh7jhiknfrlaqr9sxr7a6sikkpaws15dy8mg4r792bbis";
+  meta = {
+    homepage = "https://github.com/david-christiansen/annotated-wl-pprint";
+    description = "The Wadler/Leijen Pretty Printer, with annotation support";
+    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 26c7ec2aa30..ae55febf893 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -542,6 +542,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   amqp = callPackage ../development/libraries/haskell/amqp {};
 
+  annotatedWlPprint = callPackage ../development/libraries/haskell/annotated-wl-pprint {};
+
   appar = callPackage ../development/libraries/haskell/appar {};
 
   ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {};
-- 
GitLab


From c27148d65038ec3e661b88daf7c9e2da395e9a19 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Thu, 30 Jan 2014 15:38:34 +0100
Subject: [PATCH 0697/3789] Add libcangjie

---
 lib/maintainers.nix                           |  1 +
 .../libraries/libcangjie/default.nix          | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/libraries/libcangjie/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 5e55b64ffa9..fa0d1d81e61 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -34,6 +34,7 @@
   jcumming = "Jack Cummings <jack@mudshark.org>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
+  linquize = "Linquize <linquize@yahoo.com.hk>";
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix
new file mode 100644
index 00000000000..695c0fa1a32
--- /dev/null
+++ b/pkgs/development/libraries/libcangjie/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }:
+
+stdenv.mkDerivation rec {
+  name = "libcangjie-1.0";
+
+  src = fetchurl {
+    url = "https://github.com/Cangjians/libcangjie/archive/v1.0.tar.gz";
+    sha256 = "15la1pxa2fvhznlbkl32qp2cgd602bvrx2zmahybypbfik0cgqk1";
+  };
+
+  buildInputs = [ automake autoconf libtool m4 pkgconfig sqlite ];
+
+  configureScript = "./autogen.sh";
+  
+  preConfigure = ''
+    find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';'
+  '';
+
+  doCheck = true;
+
+  meta = {
+    description = "A C library implementing the Cangjie input method";
+    longDescription = ''
+      libcangjie is a library implementing the Cangjie input method.
+    '';
+    homepage = http://cangjians.github.io/projects/libcangjie/;
+    license = "LGPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.linquize ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22cf0c51680..a1fb93285e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4583,6 +4583,8 @@ let
 
   inherit (gnome3) libcroco;
 
+  libcangjie = callPackage ../development/libraries/libcangjie { };
+
   libctemplate = callPackage ../development/libraries/libctemplate { };
 
   libcue = callPackage ../development/libraries/libcue { };
-- 
GitLab


From 5d6fdd8abbb576357844701b9cbffed033099128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 30 Jan 2014 18:22:16 +0100
Subject: [PATCH 0698/3789] oraclejdk7: add missing dependencies

---
 pkgs/development/compilers/jdk/jdk7-linux.nix | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/jdk/jdk7-linux.nix
index 6e1fec4d18c..fabcb5751bf 100644
--- a/pkgs/development/compilers/jdk/jdk7-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk7-linux.nix
@@ -6,6 +6,19 @@
 , installjdk ? true
 , pluginSupport ? true
 , installjce ? false
+, glib
+, libxml2
+, libav_0_8
+, ffmpeg_0_6
+, libxslt
+, mesa_noglu
+, freetype
+, fontconfig
+, gnome
+, cairo
+, alsaLib
+, atk
+, gdk_pixbuf
 }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@@ -87,7 +100,7 @@ stdenv.mkDerivation rec {
     # construct the rpath
     rpath=
     for i in $libraries; do
-        rpath=$rpath''${rpath:+:}$i/lib
+        rpath=$rpath''${rpath:+:}$i/lib''${rpath:+:}$i/lib64
     done
 
     if test -z "$installjdk"; then
@@ -102,6 +115,8 @@ stdenv.mkDerivation rec {
     fi
 
     rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli
+    rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/server
+    rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/xawt
     rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}
 
     # set all the dynamic linkers
@@ -128,8 +143,8 @@ stdenv.mkDerivation rec {
    * libXt is only needed on amd64
    */
   libraries =
-    [stdenv.gcc.libc] ++
-    (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []);
+    [stdenv.gcc.libc glib libxml2 libav_0_8 ffmpeg_0_6 libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo atk gdk_pixbuf] ++
+    (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.gcc.gcc] else []);
 
   passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
 
-- 
GitLab


From e5af7f79d55afaf4fcb49f0447eaa48517742a13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 11 Jan 2014 13:28:12 +0100
Subject: [PATCH 0699/3789] gupnp-tools and releated packages: fix and update

---
 pkgs/development/libraries/gssdp/default.nix  |  4 ++--
 .../libraries/gupnp-av/default.nix            | 20 +++++++++++++++++++
 pkgs/development/libraries/gupnp/default.nix  | 16 ++++++++++++---
 .../development/libraries/libsoup/default.nix | 13 ++++++------
 pkgs/tools/networking/gupnp-tools/default.nix | 13 ++++++++----
 pkgs/top-level/all-packages.nix               |  4 +++-
 6 files changed, 54 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/libraries/gupnp-av/default.nix

diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index 2c14451ba78..466406fbe79 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "gssdp-0.12.2.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gssdp/0.12/gssdp-0.12.2.1.tar.xz;
-    sha256 = "0544f9nv6dpnfd0qbmxm8xwqjh8dafcmf3vlzkdly12xh5bs52lj";
+    url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.6.tar.xz;
+    sha256 = "1kgakr0rpdpm7nkp4ycka12nndga16wmzim79v1nbcc0j2wxxkws";
   };
 
   buildInputs = [pkgconfig libsoup glib libxml2];
diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix
new file mode 100644
index 00000000000..ef78b4d185d
--- /dev/null
+++ b/pkgs/development/libraries/gupnp-av/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, gupnp, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "gupnp-av";
+  version = "0.12.4";
+  src = fetchurl {
+    url = mirror://gnome/sources/gupnp-av/0.12/gupnp-av-0.12.4.tar.xz;
+    sha256 = "0nvsvpiyfslz54j4hjh2gsdjkbi2qj2f4k0aw8s7f05kibprr2jl";
+  };
+  
+  buildInputs = [ gupnp pkgconfig ];
+
+  meta = {
+    homepage = http://gupnp.org/;
+    description = "GUPnP-AV is a collection of helpers for building AV (audio/video) applications using GUPnP.";
+    longDescription = "GUPnP implements the UPnP specification: resource announcement and discovery, description, control, event notification, and presentation (GUPnP includes basic web server functionality through libsoup). GUPnP does not include helpers for construction or control of specific standardized resources (e.g. MediaServer); this is left for higher level libraries utilizing the GUPnP framework.";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index ca92bb82a73..4bd4c1aee26 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }:
  
 stdenv.mkDerivation {
-  name = "gupnp-0.18.4";
+  name = "gupnp";
+  version = "0.20.9";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gupnp/0.18/gupnp-0.18.4.tar.xz;
-    sha256 = "18bqmy8r44fnga9wz9inlq6k2s0292bnnql0c0n2j4mj25bpshvb";
+    url = mirror://gnome/sources/gupnp/0.20/gupnp-0.20.9.tar.xz;
+    sha256 = "0vicydn3f72x1rqql7857ans85mg7dfap7n7h8xrfyb9whxhlrb1";
   };
 
   propagatedBuildInputs = [ libxml2 libsoup gssdp ];
@@ -13,7 +14,16 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
 
+  postInstall = '' 
+    cp -r ${libsoup}/include/libsoup-2.4/libsoup $out/include
+    cp -r ${gssdp}/include/gssdp-1.0/libgssdp $out/include
+    cp -r ${libxml2}/include/libxml2/libxml $out/include
+    '';
+
   meta = {
     homepage = http://www.gupnp.org/;
+    description = "GUPnP is an implementation of the UPnP specification.";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index a5ce0fda270..5e0cae657f8 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,17 +1,18 @@
 { stdenv, fetchurl, glib, libxml2, pkgconfig
 , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking
-, libintlOrEmpty }:
+, libintlOrEmpty
+, intltool, python }:
 
 stdenv.mkDerivation {
-  name = "libsoup-2.38.1";
+  name = "libsoup";
+  version = "2.45";
 
   src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz;
-    sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i";
+    url = mirror://gnome/sources/libsoup/2.45/libsoup-2.45.3.tar.xz;
+    sha256 = "04ma47hcrrbjp90r8jjn686cngnbgac24wgarpwwzlpg66wighva";
   };
 
-
-  buildInputs = libintlOrEmpty;
+  buildInputs = libintlOrEmpty ++ [ intltool python ];
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ glib libxml2 ]
     ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix
index 8346be2ceb5..f9583e22340 100644
--- a/pkgs/tools/networking/gupnp-tools/default.nix
+++ b/pkgs/tools/networking/gupnp-tools/default.nix
@@ -1,11 +1,16 @@
-{fetchurl, stdenv, gupnp, gssdp, pkgconfig, glib, libxml2, libsoup, gtk, libglade, gnomeicontheme, e2fsprogs}:
+{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, makeWrapper}:
 
 stdenv.mkDerivation rec {
   name = "gupnp-tools-0.6";
   src = fetchurl {
-    url = "http://www.gupnp.org/sources/gupnp-tools/gupnp-tools-0.6.tar.gz";
-    sha256 = "08fnggk85zqdcvm4np53yxw15b3ck25c2rmyfrh04g8j25qf50dj";
+    url = mirror://gnome/sources/gupnp-tools/0.8/gupnp-tools-0.8.8.tar.xz;
+    sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij";
   };
 
-  buildInputs = [gupnp gssdp pkgconfig glib libxml2 libsoup gtk libglade gnomeicontheme e2fsprogs];
+  buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av gnome3.gnome_icon_theme gnome3.gnome_themes_standard makeWrapper];
+
+  postInstall = ''
+    wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share"
+    wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share"
+  '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22cf0c51680..145655011fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1101,10 +1101,12 @@ let
     inherit (gnome) libsoup;
   };
 
+  gupnp_av = callPackage ../development/libraries/gupnp-av {};
+
   gupnp_igd = callPackage ../development/libraries/gupnp-igd {};
 
   gupnptools = callPackage ../tools/networking/gupnp-tools {
-    inherit (gnome) libsoup libglade gnomeicontheme;
+#    inherit (gnome) libsoup libglade gnomeicontheme;
   };
 
   gvpe = builderDefsPackage ../tools/networking/gvpe {
-- 
GitLab


From 9c4a58515d0a538776bc4cc0e5e3639f796e4001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 11 Jan 2014 21:26:05 +0100
Subject: [PATCH 0700/3789] Add version numbers to name and remove comment

---
 pkgs/development/libraries/gupnp-av/default.nix | 2 +-
 pkgs/development/libraries/gupnp/default.nix    | 2 +-
 pkgs/development/libraries/libsoup/default.nix  | 2 +-
 pkgs/top-level/all-packages.nix                 | 4 +---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix
index ef78b4d185d..0f4e783ff6e 100644
--- a/pkgs/development/libraries/gupnp-av/default.nix
+++ b/pkgs/development/libraries/gupnp-av/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gupnp, pkgconfig }:
 
 stdenv.mkDerivation {
-  name = "gupnp-av";
+  name = "gupnp-av-0.12.4";
   version = "0.12.4";
   src = fetchurl {
     url = mirror://gnome/sources/gupnp-av/0.12/gupnp-av-0.12.4.tar.xz;
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index 4bd4c1aee26..84c2df9b817 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }:
  
 stdenv.mkDerivation {
-  name = "gupnp";
+  name = "gupnp-0.20.9";
   version = "0.20.9";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 5e0cae657f8..c9203ec34c6 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -4,7 +4,7 @@
 , intltool, python }:
 
 stdenv.mkDerivation {
-  name = "libsoup";
+  name = "libsoup-2.45";
   version = "2.45";
 
   src = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 145655011fe..8507fe0eed2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1105,9 +1105,7 @@ let
 
   gupnp_igd = callPackage ../development/libraries/gupnp-igd {};
 
-  gupnptools = callPackage ../tools/networking/gupnp-tools {
-#    inherit (gnome) libsoup libglade gnomeicontheme;
-  };
+  gupnptools = callPackage ../tools/networking/gupnp-tools {};
 
   gvpe = builderDefsPackage ../tools/networking/gvpe {
     inherit openssl gmp nettools iproute;
-- 
GitLab


From 9d6ab791af07f4baeb84e116c0eb972f8b64ecf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 14 Jan 2014 21:33:11 +0100
Subject: [PATCH 0701/3789] Use version variables for easier upgrading

---
 pkgs/development/libraries/gupnp-av/default.nix |  9 +++++----
 pkgs/development/libraries/gupnp/default.nix    | 10 +++++-----
 pkgs/development/libraries/libsoup/default.nix  |  9 +++++----
 pkgs/tools/networking/gupnp-tools/default.nix   |  6 ++++--
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix
index 0f4e783ff6e..3cbb13972d3 100644
--- a/pkgs/development/libraries/gupnp-av/default.nix
+++ b/pkgs/development/libraries/gupnp-av/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, gupnp, pkgconfig }:
 
-stdenv.mkDerivation {
-  name = "gupnp-av-0.12.4";
-  version = "0.12.4";
+stdenv.mkDerivation rec {
+  name = "gupnp-av-${version}";
+  majorVersion = "0.12";
+  version = "${majorVersion}.4";
   src = fetchurl {
-    url = mirror://gnome/sources/gupnp-av/0.12/gupnp-av-0.12.4.tar.xz;
+    url = "mirror://gnome/sources/gupnp-av/${majorVersion}/gupnp-av-${version}.tar.xz";
     sha256 = "0nvsvpiyfslz54j4hjh2gsdjkbi2qj2f4k0aw8s7f05kibprr2jl";
   };
   
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index 84c2df9b817..bae0639a61c 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }:
  
-stdenv.mkDerivation {
-  name = "gupnp-0.20.9";
-  version = "0.20.9";
-
+stdenv.mkDerivation rec {
+  name = "gupnp-${version}";
+  majorVersion = "0.20";
+  version = "${majorVersion}.9";
   src = fetchurl {
-    url = mirror://gnome/sources/gupnp/0.20/gupnp-0.20.9.tar.xz;
+    url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz";
     sha256 = "0vicydn3f72x1rqql7857ans85mg7dfap7n7h8xrfyb9whxhlrb1";
   };
 
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index c9203ec34c6..99dc56722b9 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -3,12 +3,13 @@
 , libintlOrEmpty
 , intltool, python }:
 
-stdenv.mkDerivation {
-  name = "libsoup-2.45";
-  version = "2.45";
+stdenv.mkDerivation rec {
+  name = "libsoup-${version}";
+  majorVersion = "2.45";
+  version = "${majorVersion}.3";
 
   src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.45/libsoup-2.45.3.tar.xz;
+    url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
     sha256 = "04ma47hcrrbjp90r8jjn686cngnbgac24wgarpwwzlpg66wighva";
   };
 
diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix
index f9583e22340..54f3e860e0c 100644
--- a/pkgs/tools/networking/gupnp-tools/default.nix
+++ b/pkgs/tools/networking/gupnp-tools/default.nix
@@ -1,9 +1,11 @@
 {fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "gupnp-tools-0.6";
+  name = "gupnp-tools-${version}";
+  majorVersion = "0.8";
+  version = "${majorVersion}.8";
   src = fetchurl {
-    url = mirror://gnome/sources/gupnp-tools/0.8/gupnp-tools-0.8.8.tar.xz;
+    url = "mirror://gnome/sources/gupnp-tools/${majorVersion}/gupnp-tools-${version}.tar.xz";
     sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij";
   };
 
-- 
GitLab


From 49b668f5d2b8d1104eb9f1764cc384024f5cf97a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 21 Jan 2014 16:33:10 +0100
Subject: [PATCH 0702/3789] libsoup: Run patchShebangs

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

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 99dc56722b9..12124474566 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
     sha256 = "04ma47hcrrbjp90r8jjn686cngnbgac24wgarpwwzlpg66wighva";
   };
 
+  patchPhase = ''
+    patchShebangs libsoup/
+    '';
+
   buildInputs = libintlOrEmpty ++ [ intltool python ];
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ glib libxml2 ]
-- 
GitLab


From e0b8a4cc5e3486e1b2009cbfdb9092947ea60319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 30 Jan 2014 18:48:16 +0100
Subject: [PATCH 0703/3789] Remove libsoup_2_44

---
 pkgs/development/libraries/libsoup/2.44.nix | 35 ---------------------
 pkgs/top-level/all-packages.nix             |  6 +---
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 pkgs/development/libraries/libsoup/2.44.nix

diff --git a/pkgs/development/libraries/libsoup/2.44.nix b/pkgs/development/libraries/libsoup/2.44.nix
deleted file mode 100644
index 4bef93ff8cd..00000000000
--- a/pkgs/development/libraries/libsoup/2.44.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, python, gobjectIntrospection
-, glib, libxml2, sqlite, glib_networking
-, gnomeSupport ? true, libgnome_keyring
-}:
-
-stdenv.mkDerivation {
-  name = "libsoup-2.44.2";
-
-  meta = {
-    description = "HTTP client/server library";
-    license = stdenv.lib.licenses.lgpl2Plus;
-  };
-
-  src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.2.tar.xz;
-    sha256 = "1wwqsmi1jvidiqwbdnjl66nmk1yja8w9dxf9cz10zh56fjmvbr77";
-  };
-
-  preConfigure = ''
-    substituteInPlace libsoup/tld-parser.py \
-      --replace "!/usr/bin/env python" "!${python}/bin/${python.executable}"
-  '';
-
-  nativeBuildInputs = [ pkgconfig intltool python gobjectIntrospection ];
-
-  propagatedBuildInputs = [ glib libxml2 sqlite ]
-    ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
-
-  passthru.propagatedUserEnvPackages = [ glib_networking ];
-
-  # glib_networking is a runtime dependency, not a compile-time dependency
-  configureFlags = "--disable-tls-check";
-
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8507fe0eed2..6b28eb79073 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4120,9 +4120,7 @@ let
 
   geoclue = callPackage ../development/libraries/geoclue {};
 
-  geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {
-    libsoup = libsoup_2_44;
-  };
+  geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
 
   geoip = builderDefsPackage ../development/libraries/geoip {
     inherit zlib;
@@ -4928,7 +4926,6 @@ let
   libsodium = callPackage ../development/libraries/libsodium { };
 
   libsoup = callPackage ../development/libraries/libsoup { };
-  libsoup_2_44 = callPackage ../development/libraries/libsoup/2.44.nix { };
 
   libssh = callPackage ../development/libraries/libssh { };
 
@@ -5734,7 +5731,6 @@ let
     };
 
   webkitgtk = callPackage ../development/libraries/webkitgtk {
-    libsoup = libsoup_2_44;
     harfbuzz = harfbuzz.override {
       withIcu = true;
     };
-- 
GitLab


From 13d11227f1e68f55b1365c39c0e91bcc4371735e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 30 Jan 2014 19:02:29 +0100
Subject: [PATCH 0704/3789] Remove left-over reference to libsoup_2_44

---
 pkgs/desktops/gnome-3/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 772aaf54e0a..1b440be200a 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -8,10 +8,6 @@ rec {
   orbit = ORBit2;
 
 
-#### Overrides of libraries
-
-  libsoup = pkgs.libsoup_2_44;
-
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 
   at_spi2_atk = callPackage ./core/at-spi2-atk { };
-- 
GitLab


From 264dcdddf19f1c36a5a5de44e282c21a143cac98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 30 Jan 2014 19:40:42 +0100
Subject: [PATCH 0705/3789] Fixes

---
 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 fabcb5751bf..12c1a598551 100644
--- a/pkgs/development/compilers/jdk/jdk7-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk7-linux.nix
@@ -143,7 +143,7 @@ stdenv.mkDerivation rec {
    * libXt is only needed on amd64
    */
   libraries =
-    [stdenv.gcc.libc glib libxml2 libav_0_8 ffmpeg_0_6 libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo atk gdk_pixbuf] ++
+    [stdenv.gcc.libc glib libxml2 libav_0_8 ffmpeg_0_6 libxslt mesa_noglu xlibs.libXxf86vm] ++
     (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.gcc.gcc] else []);
 
   passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
-- 
GitLab


From ba0ca5361535d88f4e32399bb20ac340adad7029 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Fri, 31 Jan 2014 00:34:04 +0100
Subject: [PATCH 0706/3789] Update VirtualBox (and implicitly VirtualBox Guest
 Additions) to 4.3.6 and Oracle VM VirtualBox Extension Pack to 91406

---
 .../virtualization/virtualbox/default.nix          | 14 +++++++-------
 .../virtualbox/guest-additions/default.nix         |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 2ce134090fe..440bcd2d9cd 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
 , libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2
-, which, alsaLib, curl, gawk
+, which, alsaLib, curl, libvpx, gawk
 , xorriso, makeself, perl, pkgconfig
 , javaBindings ? false, jdk ? null
 , pythonBindings ? false, python ? null
@@ -11,7 +11,7 @@ with stdenv.lib;
 
 let
 
-  version = "4.2.18"; # changes ./guest-additions as well
+  version = "4.3.6"; # 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 = "88780";
+  extpackRevision = "91406";
   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.2.18/SHA256SUMS
-    sha256 = "1d1737b59d0f30f5d42beeabaff168bdc0a75b8b28df685979be6173e5adbbba";
+    # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.6/SHA256SUMS
+    sha256 = "983f87e4746a2e6739090d0ce905c24a71e209e87f11c449bdc3d0ca5bb4fde2";
     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,12 +56,12 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74";
+    sha256 = "09xvrk5g14q71lmprcdaci6fks6yilpq99scxslzn1hb5viy2iy5";
   };
 
   buildInputs =
     [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
-      libcap glib lvm2 python alsaLib curl pam xorriso makeself perl
+      libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl
       pkgconfig which libXmu ]
     ++ optional javaBindings jdk
     ++ optional pythonBindings python;
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 805e0b867d9..3cbd59ccabf 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 = "f11a7f13dfe7bf9f246fb877144bb467fe6deadcd876568ec79b6ccd3b59d767";
+    sha256 = "95648fcdb5d028e64145a2fe2f2f28c946d219da366389295a61fed296ca79f0";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";
-- 
GitLab


From 2ec67167d9ab418c8b748bf7d217e363fce45226 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Jan 2014 19:01:22 -0600
Subject: [PATCH 0707/3789] mumble: Small Fixups and add support for disabling
 speechd

This patch adds a collection of changes to clean up the mumble
expression as well as add support for disabling the external speech
dispatcher from being compiled in.
---
 .../networking/mumble/default.nix             | 45 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 8ed7c8d64d4..43fbe952b18 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,9 +1,18 @@
-{ stdenv, fetchurl, qt4, boost, speechd, protobuf, libsndfile,
- speex, libopus, avahi, pkgconfig,
-jackSupport ? false, 
-jackaudio ? null }:
-
-
+{ stdenv, fetchurl, qt4, boost, protobuf, libsndfile
+, speex, libopus, avahi, pkgconfig
+, jackSupport ? false
+, jackaudio ? null
+, speechdSupport ? false
+, speechd ? null
+}:
+
+assert jackSupport -> jackaudio != null;
+assert speechdSupport -> speechd != null;
+
+let
+  optional = stdenv.lib.optional;
+  optionalString = stdenv.lib.optionalString;
+in
 stdenv.mkDerivation rec {
   name = "mumble-" + version;
   version = "1.2.4";
@@ -13,35 +22,33 @@ stdenv.mkDerivation rec {
     sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1";
   };
 
-  patchPhase = ''
-    patch -p1 < ${ ./mumble-jack-support.patch }
-  '';
+  patches = optional jackSupport ./mumble-jack-support.patch;
 
   configurePhase = ''
     qmake CONFIG+=no-g15 CONFIG+=no-update CONFIG+=no-server \
       CONFIG+=no-embed-qt-translations CONFIG+=packaged \
       CONFIG+=bundled-celt CONFIG+=no-bundled-opus \
+      ${optionalString (!speechdSupport) "CONFIG+=no-speechd"} \
+      ${optionalString jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio"} \
       CONFIG+=no-bundled-speex
-  '' 
-  + stdenv.lib.optionalString jackSupport ''
-    CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio
   '';
 
 
-  buildInputs = [ qt4 boost speechd protobuf libsndfile speex
+  buildInputs = [ qt4 boost protobuf libsndfile speex
     libopus avahi pkgconfig ]
-    ++ (stdenv.lib.optional jackSupport jackaudio);
+    ++ (optional jackSupport jackaudio)
+    ++ (optional speechdSupport speechd);
 
   installPhase = ''
     mkdir -p $out
     cp -r ./release $out/bin
   '';
 
-  meta = { 
-    homepage = http://mumble.sourceforge.net/;
+  meta = with stdenv.lib; { 
+    homepage = "http://mumble.sourceforge.net/";
     description = "Low-latency, high quality voice chat software";
-    license = "BSD";
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ viric ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 929fd87e963..b9dd8bd4b8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8371,6 +8371,7 @@ let
       withLibdnssdCompat = true;
     };
     jackSupport = config.mumble.jackSupport or false;
+    speechdSupport = config.mumble.speechdSupport or false;
   };
 
   murmur = callPackage ../applications/networking/mumble/murmur.nix {
-- 
GitLab


From 82f315cd7d91facd372f6f79046ae64c7d108ed2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Jan 2014 21:51:26 -0600
Subject: [PATCH 0708/3789] db5: Add package

---
 pkgs/development/libraries/db/db-5.3.nix | 32 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  4 +++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/libraries/db/db-5.3.nix

diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix
new file mode 100644
index 00000000000..a59d28ba963
--- /dev/null
+++ b/pkgs/development/libraries/db/db-5.3.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl
+, cxxSupport ? true
+}:
+
+stdenv.mkDerivation rec {
+  name = "db-5.3.28";
+
+  src = fetchurl {
+    url = "http://download.oracle.com/berkeley-db/${name}.tar.gz";
+    sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
+  };
+
+  configureFlags = [
+    (if cxxSupport then "--enable-cxx" else "--disable-cxx")
+  ];
+
+  preConfigure = ''
+    cd build_unix
+    configureScript=../dist/configure
+  '';
+
+  postInstall = ''
+    rm -rf $out/docs
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html";
+    description = "Berkeley DB";
+    license = "Berkeley Database License";
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9dd8bd4b8d..7738465d10f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3940,6 +3940,10 @@ let
 
   db48 = callPackage ../development/libraries/db4/db4-4.8.nix { };
 
+  db5 = db53;
+
+  db53 = callPackage ../development/libraries/db/db-5.3.nix { };
+
   dbus = callPackage ../development/libraries/dbus { };
   dbus_cplusplus  = callPackage ../development/libraries/dbus-cplusplus { };
   dbus_glib       = callPackage ../development/libraries/dbus-glib { };
-- 
GitLab


From 4dae2621e3c1a8e58aad9b34fccf40613828e60e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Jan 2014 19:52:12 -0600
Subject: [PATCH 0709/3789] mcpp: Add package

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

diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix
new file mode 100644
index 00000000000..34cb63e783e
--- /dev/null
+++ b/pkgs/development/compilers/mcpp/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, mcpp }:
+
+stdenv.mkDerivation rec {
+  name = "mcpp-2.7.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mcpp/${name}.tar.gz";
+    sha256 = "0r48rfghjm90pkdyr4khxg783g9v98rdx2n69xn8f6c5i0hl96rv";
+  };
+
+  configureFlags = [ "--enable-mcpplib" ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://mcpp.sourceforge.net/";
+    description = "A portable c preprocessor";
+    license = licenses.bsd2;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7738465d10f..fc9b61c93a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8247,6 +8247,8 @@ let
 
   matchbox = callPackage ../applications/window-managers/matchbox { };
 
+  mcpp = callPackage ../development/compilers/mcpp { };
+
   mda_lv2 = callPackage ../applications/audio/mda-lv2 { };
 
   meld = callPackage ../applications/version-management/meld {
-- 
GitLab


From 18c718f04372a735381f0662347ad9078666e4a2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Jan 2014 19:41:58 -0600
Subject: [PATCH 0710/3789] zeroc-ice: Add package

---
 .../libraries/zeroc-ice/default.nix           | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/zeroc-ice/default.nix

diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix
new file mode 100644
index 00000000000..29e92d0b6ec
--- /dev/null
+++ b/pkgs/development/libraries/zeroc-ice/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, mcpp, bzip2, expat, openssl, db5 }:
+
+stdenv.mkDerivation rec {
+  name = "zeroc-ice-3.5.1";
+
+  src = fetchurl {
+    url = "http://www.zeroc.com/download/Ice/3.5/Ice-3.5.1.tar.gz";
+    sha256 = "14pk794p0fq3hcp50xmqnf9pp15dggiqhcnsav8xpnka9hcm37lq";
+  };
+
+  buildInputs = [ mcpp bzip2 expat openssl db5 ];
+
+  buildPhase = ''
+    cd cpp
+    make OPTIMIZE=yes
+  '';
+
+  installPhase = ''
+    make prefix=$out install
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.zeroc.com/ice.html";
+    description = "The internet communications engine";
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc9b61c93a5..b707f1cc633 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9136,6 +9136,8 @@ let
 
   zathura = zathuraCollection.zathuraWrapper;
 
+  zeroc_ice = callPackage ../development/libraries/zeroc-ice { };
+
   girara = callPackage ../applications/misc/girara {
     gtk = gtk3;
   };
-- 
GitLab


From 9e8a6a24f06a0ed175b05198839376d4ce79f390 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Jan 2014 22:34:21 -0600
Subject: [PATCH 0711/3789] murmur: Add ice support and small fixes

This patch adds optional ICE support to murmur which is enabled by
default. Additionally, it cleans up some of the expression similar to
the fixes added the mumble.
---
 .../applications/networking/mumble/murmur.nix | 32 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/mumble/murmur.nix b/pkgs/applications/networking/mumble/murmur.nix
index b40632384c2..4b074b0708e 100644
--- a/pkgs/applications/networking/mumble/murmur.nix
+++ b/pkgs/applications/networking/mumble/murmur.nix
@@ -1,5 +1,15 @@
-{ stdenv, fetchurl, qt4, boost, protobuf, avahi, libcap, pkgconfig }:
+{ stdenv, fetchurl, qt4, boost, protobuf
+, avahi, libcap, pkgconfig
+, iceSupport ? false
+, zeroc_ice ? null
+}:
 
+assert iceSupport -> zeroc_ice != null;
+
+let
+  optional = stdenv.lib.optional;
+  optionalString = stdenv.lib.optionalString;
+in
 stdenv.mkDerivation rec {
   name = "murmur-" + version;
   version = "1.2.4";
@@ -9,22 +19,28 @@ stdenv.mkDerivation rec {
     sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1";
   };
 
+  patchPhase = optional iceSupport ''
+    sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g' src/murmur/murmur.pro
+  '';
+
   configurePhase = ''
-    qmake CONFIG+=no-client CONFIG+=no-ice CONFIG+=no-embed-qt
+    qmake CONFIG+=no-client CONFIG+=no-embed-qt \
+    ${optionalString (!iceSupport) "CONFIG+=no-ice"}
   '';
 
-  buildInputs = [ qt4 boost protobuf avahi libcap pkgconfig ];
+  buildInputs = [ qt4 boost protobuf avahi libcap pkgconfig ]
+    ++ optional iceSupport [ zeroc_ice ];
 
   installPhase = ''
     mkdir -p $out
     cp -r ./release $out/bin
   '';
 
-  meta = { 
-    homepage = http://mumble.sourceforge.net/;
+  meta = with stdenv.lib; {
+    homepage = "http://mumble.sourceforge.net/";
     description = "Low-latency, high quality voice chat software";
-    license = "BSD";
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ viric ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b707f1cc633..978a67d232e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8384,6 +8384,7 @@ let
     avahi = avahi.override {
       withLibdnssdCompat = true;
     };
+    iceSupport = config.murmur.iceSupport or true;
   };
 
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
-- 
GitLab


From 1c83b079d280d8cdc863fc64e015e5d7464e210a Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Fri, 31 Jan 2014 14:05:53 +0800
Subject: [PATCH 0712/3789] gimp: wrap plugins with PYTHONPATH, fix #223

---
 pkgs/applications/graphics/gimp/2.8.nix | 7 ++++++-
 pkgs/top-level/all-packages.nix         | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index af7d9e3399b..423b9f3ce22 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf
 , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
 , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
-, python, pygtk, libart_lgpl, libexif, gettext, xlibs }:
+, python, pygtk, libart_lgpl, libexif, gettext, xlibs, wrapPython }:
 
 stdenv.mkDerivation rec {
   name = "gimp-2.8.10";
@@ -16,8 +16,13 @@ stdenv.mkDerivation rec {
       freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
       libmng librsvg libwmf zlib libzip ghostscript aalib jasper
       python pygtk libart_lgpl libexif gettext xlibs.libXpm
+      wrapPython
     ];
 
+  pythonPath = [ pygtk ];
+
+  postInstall = ''wrapPythonPrograms'';
+
   passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
 
   #configureFlags = [ "--disable-print" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b28eb79073..2b1446610b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7897,6 +7897,7 @@ let
     inherit (gnome) libart_lgpl;
     webkit = null;
     lcms = lcms2;
+    wrapPython = pythonPackages.wrapPython;
   };
 
   gimp = gimp_2_8;
-- 
GitLab


From b5d19fad6710e786a80f9584e65f4f17e9678c24 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Fri, 31 Jan 2014 09:44:05 +0100
Subject: [PATCH 0713/3789] Update simutrans 112.3

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

diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index 65a61cb6cab..1a75aa46095 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -4,7 +4,7 @@ let
   result = withPak (mkPak pak128);
 
   ver_1 = "112";
-  ver_2 = "1";
+  ver_2 = "3";
   ver_h2 = "${ver_1}-${ver_2}";
 
   # "pakset" of objects, images, text, music, etc.
@@ -23,7 +23,7 @@ let
   };
   pak64 = fetchurl {
     url = "mirror://sourceforge/simutrans/pak64/${ver_h2}/simupak64-${ver_h2}.zip";
-    sha256 = "1197rl2534wx9wdafarlr42qjw6pyghz4bynq2g68pi10h8csypw";
+    sha256 = "1ng963n2gvnwmsj73iy3gp9i5iqf5g6qk1gh1jnfm86gnjrsrq4m";
   };
   pak128 = fetchurl {
     url = "mirror://sourceforge/simutrans/pak128/pak128%20for%20${ver_1}/pak128-2.2.0--${ver_1}.0.zip";
@@ -44,7 +44,7 @@ let
 
     src = fetchurl {
       url = "mirror://sourceforge/simutrans/simutrans/${ver_h2}/simutrans-src-${ver_h2}.zip";
-      sha256 = "1xrxpd5m2dc9bk8w21smfj28r41ji1qaihjwkwrifgz6rhg19l5c";
+      sha256 = "0jdq2krfj3qsh8dks9ixsdvpyjq9yi80p58b0xjpsn35mkbxxaca";
     };
     sourceRoot = ".";
 
-- 
GitLab


From 841a02cabb06c1869ac772b2a2629574466d3cbe Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Wed, 29 Jan 2014 22:09:29 +0100
Subject: [PATCH 0714/3789] Update OCaml Type_conv to version 109.60.01. Also
 keep the old version 3.0.5 around for compatibility with OCaml 3.12.1.

---
 .../ocaml-modules/typeconv/3.0.5.nix          | 23 +++++++++++++++++++
 .../ocaml-modules/typeconv/default.nix        | 11 ++++-----
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/typeconv/3.0.5.nix

diff --git a/pkgs/development/ocaml-modules/typeconv/3.0.5.nix b/pkgs/development/ocaml-modules/typeconv/3.0.5.nix
new file mode 100644
index 00000000000..299e7729b91
--- /dev/null
+++ b/pkgs/development/ocaml-modules/typeconv/3.0.5.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, ocaml, findlib}:
+
+# note: works only with ocaml >3.12
+
+stdenv.mkDerivation {
+  name = "ocaml-typeconv-3.0.5";
+
+  src = fetchurl {
+    url = "http://forge.ocamlcore.org/frs/download.php/821/type_conv-3.0.5.tar.gz";
+    sha256 = "90ac6c401a600a23012a3f513def6f67d4979b11bd551f4d0af78f0f0b479198";
+  };
+
+  buildInputs = [ocaml findlib ]; 
+
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = "http://forge.ocamlcore.org/projects/type-conv/";
+    description = "Support library for OCaml preprocessor type conversions";
+    license = "LGPL";
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/typeconv/default.nix b/pkgs/development/ocaml-modules/typeconv/default.nix
index 299e7729b91..33e30f5d5c8 100644
--- a/pkgs/development/ocaml-modules/typeconv/default.nix
+++ b/pkgs/development/ocaml-modules/typeconv/default.nix
@@ -1,13 +1,11 @@
 {stdenv, fetchurl, ocaml, findlib}:
 
-# note: works only with ocaml >3.12
-
 stdenv.mkDerivation {
-  name = "ocaml-typeconv-3.0.5";
+  name = "ocaml-typeconv-109.60.01";
 
   src = fetchurl {
-    url = "http://forge.ocamlcore.org/frs/download.php/821/type_conv-3.0.5.tar.gz";
-    sha256 = "90ac6c401a600a23012a3f513def6f67d4979b11bd551f4d0af78f0f0b479198";
+    url = https://github.com/janestreet/type_conv/archive/109.60.01.tar.gz;
+    sha256 = "0lpxri68glgq1z2pp02rp45cb909xywbff8d4idljrf6fzzil2zx";
   };
 
   buildInputs = [ocaml findlib ]; 
@@ -17,7 +15,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://forge.ocamlcore.org/projects/type-conv/";
     description = "Support library for OCaml preprocessor type conversions";
-    license = "LGPL";
+    license = stdenv.lib.licenses.lgpl21;
     platforms = ocaml.meta.platforms;
+    maintainers = with stdenv.lib.maintainers; [ z77z ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1fb47c9be7..e4bc8845c07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2939,6 +2939,8 @@ let
 
     ocaml_typeconv = callPackage ../development/ocaml-modules/typeconv { };
 
+    ocaml_typeconv_3_0_5 = callPackage ../development/ocaml-modules/typeconv/3.0.5.nix { };
+
     ocaml_sexplib = callPackage ../development/ocaml-modules/sexplib { };
 
     ocaml_extlib = callPackage ../development/ocaml-modules/extlib { };
-- 
GitLab


From ec1b40be872c4a7ea06cfb354b6462bf75d72c96 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Wed, 29 Jan 2014 17:52:53 +0100
Subject: [PATCH 0715/3789] Update OCaml Batteries to version 2.2.0

---
 .../ocaml-modules/batteries/default.nix       | 24 ++++---------------
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index 3ecf2ae4699..ac7b8adfd8c 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -1,32 +1,18 @@
 {stdenv, fetchurl, ocaml, findlib, camomile, ounit}:
 
-let
-  ocaml_version = (builtins.parseDrvName ocaml.name).version;
-in
-
 stdenv.mkDerivation {
-  name = "ocaml-batteries-1.4.1";
+  name = "ocaml-batteries-2.2.0";
 
   src = fetchurl {
-    url = http://forge.ocamlcore.org/frs/download.php/684/batteries-1.4.1.tar.gz;
-    sha256 = "bdca7deba290d83c66c0a5001da52b2d7f2af58b7b7e7d9303d4363aaafe9c30";
+    url = http://forge.ocamlcore.org/frs/download.php/1363/batteries-2.2.tar.gz;
+    sha256 = "0z4wg357fzz7cnarjsrrdnpmxw8mxcj10fp67dm3bnn0l3zkjwbs";
   };
 
   buildInputs = [ocaml findlib camomile ounit];
 
-  patchPhase = ''
-    substituteInPlace Makefile --replace '/bin/echo -n' echo
-  '';
-
   configurePhase = "true"; 	# Skip configure
 
-  preInstall = ''
-    mkdir -p "$out/lib/ocaml/${ocaml_version}/site-lib"
-  '';
-
-  doCheck = true;
-
-  checkTarget = "test";
+  createFindlibDestdir = true;
 
   meta = {
     homepage = http://batteries.forge.ocamlcore.org/;
@@ -36,7 +22,7 @@ stdenv.mkDerivation {
       and comprehensive development platform for the OCaml programming
       language.
     '';
-    license = "LGPL";
+    license = stdenv.lib.licenses.lgpl21;
     platforms = ocaml.meta.platforms;
     maintainers = [
       stdenv.lib.maintainers.z77z
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4bc8845c07..4a41cebc7d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2899,9 +2899,7 @@ let
 
     mlgmp =  callPackage ../development/ocaml-modules/mlgmp { };
 
-    ocaml_batteries = callPackage ../development/ocaml-modules/batteries {
-      camomile = camomile_0_8_2;
-    };
+    ocaml_batteries = callPackage ../development/ocaml-modules/batteries { };
 
     ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { };
 
-- 
GitLab


From f3a49abf089de509bbfc5f535d01d0053bc54046 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Fri, 31 Jan 2014 06:44:42 +0100
Subject: [PATCH 0716/3789] Add OCaml Oasis

OCaml Oasis is a configure/build/install system for OCaml proget (like
Cabal for Haskell).

This commit also add a few small dependencies that where missing

  -  OCaml Data Notation (odn)
  -  ocamlify
  -  ocamlmod
---
 .../development/ocaml-modules/odn/default.nix | 28 ++++++++++++++++
 .../development/tools/ocaml/oasis/default.nix | 32 +++++++++++++++++++
 .../tools/ocaml/ocamlify/default.nix          | 26 +++++++++++++++
 .../tools/ocaml/ocamlmod/default.nix          | 25 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  8 +++++
 5 files changed, 119 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/odn/default.nix
 create mode 100644 pkgs/development/tools/ocaml/oasis/default.nix
 create mode 100644 pkgs/development/tools/ocaml/ocamlify/default.nix
 create mode 100644 pkgs/development/tools/ocaml/ocamlmod/default.nix

diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix
new file mode 100644
index 00000000000..5f72afcf766
--- /dev/null
+++ b/pkgs/development/ocaml-modules/odn/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, ounit}:
+
+stdenv.mkDerivation {
+  name = "ocaml-data-notation-0.0.11";
+
+  src = fetchurl {
+    url = https://forge.ocamlcore.org/frs/download.php/1310/ocaml-data-notation-0.0.11.tar.gz;
+    sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj";
+  };
+
+  buildInputs = [ocaml findlib ocaml_typeconv ounit];
+
+  createFindlibDestdir = true;
+
+  configurePhase = "ocaml setup.ml -configure";
+  buildPhase     = "ocaml setup.ml -build";
+  installPhase   = "ocaml setup.ml -install";
+
+  meta = {
+    description = "Store data using OCaml notation";
+    homepage = https://forge.ocamlcore.org/projects/odn/;
+    license = stdenv.lib.licenses.lgpl21;
+    platforms = ocaml.meta.platforms;
+    maintainers = with stdenv.lib.maintainers; [
+      z77z
+    ];
+  };
+}
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
new file mode 100644
index 00000000000..3ab935705a2
--- /dev/null
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv,
+ ocamlmod, ocamlify, ounit, expect}:
+
+stdenv.mkDerivation {
+  name = "ocaml-oasis-0.4.1";
+
+  src = fetchurl {
+    url = http://forge.ocamlcore.org/frs/download.php/1355/oasis-0.4.1.tar.gz;
+    sha256 = "1lsnw9f1jh6106kphxg40qp0sia6cbkbb9ahs5y6ifnfkmllkjhj";
+  };
+
+  createFindlibDestdir = true;
+
+  buildInputs =
+    [
+      ocaml findlib ocaml_data_notation ocaml_typeconv ocamlmod ocamlify ounit
+    ];
+
+  configurePhase = "ocaml setup.ml -configure --prefix $out";
+  buildPhase     = "ocaml setup.ml -build";
+  installPhase   = "ocaml setup.ml -install";
+
+  meta = {
+    homepage = http://oasis.forge.ocamlcore.org/;
+    description = "Configure, build and install system for OCaml projects";
+    license = stdenv.lib.licenses.lgpl21;
+    platforms = ocaml.meta.platforms;
+    maintainers = with stdenv.lib.maintainers; [
+      z77z
+    ];
+  };
+}
diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix
new file mode 100644
index 00000000000..88b7451e0f0
--- /dev/null
+++ b/pkgs/development/tools/ocaml/ocamlify/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, ocaml, findlib, ounit}:
+
+stdenv.mkDerivation {
+  name = "ocamlify-0.0.2";
+
+  src = fetchurl {
+    url = http://forge.ocamlcore.org/frs/download.php/1209/ocamlify-0.0.2.tar.gz;
+    sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii";
+  };
+
+  buildInputs = [ocaml findlib ounit];
+
+  configurePhase = "ocaml setup.ml -configure --prefix $out";
+  buildPhase     = "ocaml setup.ml -build";
+  installPhase   = "ocaml setup.ml -install";
+
+  meta = {
+    homepage = http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod;
+    description = "Generate OCaml modules from source files";
+    platforms = ocaml.meta.platforms;
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = with stdenv.lib.maintainers; [
+      z77z
+    ];
+  };
+}
diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix
new file mode 100644
index 00000000000..d72df18f899
--- /dev/null
+++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, ocaml, findlib, ounit}:
+
+stdenv.mkDerivation {
+  name = "ocamlmod-0.0.7";
+
+  src = fetchurl {
+    url = http://forge.ocamlcore.org/frs/download.php/1350/ocamlmod-0.0.7.tar.gz;
+    sha256 = "11kg7wh0gy492ma5c6bcjh6frv1a9lh9f26hiys2i0d1ky8s0ad3";
+  };
+
+  buildInputs = [ocaml findlib ounit];
+
+  configurePhase = "ocaml setup.ml -configure --prefix $out";
+  buildPhase     = "ocaml setup.ml -build";
+  installPhase   = "ocaml setup.ml -install";
+
+  meta = {
+    homepage = http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod;
+    description = "Generate OCaml modules from source files";
+    platforms = ocaml.meta.platforms;
+    maintainers = with stdenv.lib.maintainers; [
+      z77z
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a41cebc7d5..08b4f1efb10 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2903,18 +2903,26 @@ let
 
     ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { };
 
+    ocaml_data_notation = callPackage ../development/ocaml-modules/odn { };
+
     ocaml_expat = callPackage ../development/ocaml-modules/expat { };
 
     ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { };
 
     ocaml_http = callPackage ../development/ocaml-modules/http { };
 
+    ocamlify = callPackage ../development/tools/ocaml/ocamlify { };
+
     ocaml_lwt = callPackage ../development/ocaml-modules/lwt { };
 
+    ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };
+
     ocaml_mysql = callPackage ../development/ocaml-modules/mysql { };
 
     ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { };
 
+    ocaml_oasis = callPackage ../development/tools/ocaml/oasis { };
+
     ocaml_pcre = callPackage ../development/ocaml-modules/pcre {
       inherit pcre;
     };
-- 
GitLab


From e1df6c21620a78107ecbab33fb53eba921189d45 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Fri, 31 Jan 2014 00:10:20 +0100
Subject: [PATCH 0717/3789] Update OCaml react to version 2.4.3

---
 .../ocaml-modules/react/default.nix           | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix
index 02420204dbf..a69ef9d446c 100644
--- a/pkgs/development/ocaml-modules/react/default.nix
+++ b/pkgs/development/ocaml-modules/react/default.nix
@@ -1,34 +1,25 @@
-{stdenv, fetchurl, ocaml}:
-
-let
-  ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  version = "0.9.2";
-in
+{stdenv, fetchurl, ocaml, findlib, ocaml_oasis}:
 
 stdenv.mkDerivation {
-  name = "ocaml-react-${version}";
+  name = "ocaml-react-0.9.4";
 
   src = fetchurl {
-    url = "http://erratique.ch/software/react/releases/react-${version}.tbz";
-    sha256 = "0fiaxzfxv8pc82d31jz85zryz06k84is0l3sn5g0di5mpc5falxr";
+    url = http://github.com/dbuenzli/react/archive/v0.9.4.tar.gz;
+    sha256 = "16k0kx93kd45s7pigkzvirfsbr22xhby0y88y86p473qxzc6ngrm";
   };
 
-  buildInputs = [ocaml];
+  buildInputs = [ocaml findlib ocaml_oasis];
+
+  createFindlibDestdir = true;
 
-  buildCommand = ''
-    export INSTALLDIR=$out/lib/ocaml/${ocaml_version}/site-lib/react
-    tar xjf $src
-    cd react-*
-    substituteInPlace src/META --replace '+react' $INSTALLDIR
-    chmod +x build
-    ./build 
-    ./build install
-  '';
+  configurePhase = "oasis setup && ocaml setup.ml -configure --prefix $out";
+  buildPhase     = "ocaml setup.ml -build";
+  installPhase   = "ocaml setup.ml -install";
 
   meta = {
     homepage = http://erratique.ch/software/react;
     description = "Applicative events and signals for OCaml";
-    license = "BSD";
+    license = stdenv.lib.licenses.bsd3;
     platforms = ocaml.meta.platforms;
     maintainers = [
       stdenv.lib.maintainers.z77z
-- 
GitLab


From d59778678a23d72297a5dd813387d38c0448df3c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 31 Jan 2014 13:07:25 +0100
Subject: [PATCH 0718/3789] Revert "dictd: Update to latest upstream (0.12.1)."

This reverts commit 81622220713ca0871362703bc9e8c69ba5996e0e since it
breaks evaluation (libmaa.nix is missing).
---
 pkgs/servers/dict/buildfix.diff | 11 -----------
 pkgs/servers/dict/default.nix   | 21 +++++++++------------
 pkgs/top-level/all-packages.nix |  4 +---
 3 files changed, 10 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/servers/dict/buildfix.diff

diff --git a/pkgs/servers/dict/buildfix.diff b/pkgs/servers/dict/buildfix.diff
deleted file mode 100644
index e30fcb2b038..00000000000
--- a/pkgs/servers/dict/buildfix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in~	2011-03-06 18:52:54.000000000 +0100
-+++ Makefile.in	2014-01-29 19:04:51.384844897 +0100
-@@ -123,7 +123,7 @@
- 
- %: %.o
- 	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \
--		$^ $(OBJS) $(LDFLAGS) -lz ${LIBS}
-+	    $(^:.o=.lo) $(OBJS) $(LDFLAGS) -lz ${LIBS}
- 
- include $(srcdir)/deps
- 
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix
index 1fb7c24418f..51de674eb9f 100644
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -1,22 +1,19 @@
-{ stdenv, fetchurl, which, bison, flex, libmaa, zlib, libtool }:
+{ stdenv, fetchurl, which, bison, flex }:
 
-stdenv.mkDerivation rec {
-  version = "1.12.1";
-  name = "dictd-${version}";
+stdenv.mkDerivation {
+  name = "dictd-1.9.15";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dict/dictd-${version}.tar.gz";
-    sha256 = "0min6v60b6z5mrymyjfwzx8nv6rdm8pd8phlwl6v2jl5vkngcdx2";
+    url = mirror://sourceforge/dict/dictd-1.9.15.tar.gz;
+    sha256 = "0p41yf72l0igmshz6vxy3hm51z25600vrnb9j2jpgws4c03fqnac";
   };
 
-  buildInputs = [ flex bison which libmaa zlib libtool ];
-
-  patchPhase = "patch -p0 < ${./buildfix.diff}";
+  buildInputs = [ flex bison which ];
+  
   configureFlags = "--datadir=/var/run/current-system/share/dictd";
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Dict protocol server and client";
-    maintainers = maintainers.mornfall;
-    platforms = platforms.linux;
+    maintainers = with stdenv.lib.maintainers; mornfall;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1fb47c9be7..9187a6f0aad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6107,9 +6107,7 @@ let
 
   dico = callPackage ../servers/dico { };
 
-  dict = callPackage ../servers/dict {
-      libmaa = callPackage ../servers/dict/libmaa.nix {};
-  };
+  dict = callPackage ../servers/dict { };
 
   dictdDBs = recurseIntoAttrs (import ../servers/dict/dictd-db.nix {
     inherit builderDefs;
-- 
GitLab


From 0b499fb96350636ccb4be1c1416a8ac8a22eef63 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 31 Jan 2014 13:08:23 +0100
Subject: [PATCH 0719/3789] Remove trace message to prevent spamming nix-env
 users

---
 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 9187a6f0aad..1679e994a08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6816,7 +6816,7 @@ let
   linuxPackages = linuxPackages_3_10;
 
   # A function to build a manually-configured kernel
-  linuxManualConfig = builtins.trace "linuxManualConfig is now called buildLinux" pkgs.buildLinux;
+  linuxManualConfig = pkgs.buildLinux;
   buildLinux = import ../os-specific/linux/kernel/manual-config.nix {
     inherit (pkgs) stdenv runCommand nettools bc perl kmod writeTextFile ubootChooser;
   };
-- 
GitLab


From cdac4b69c97d539e96b2b03e963c29f8b28376be Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Fri, 31 Jan 2014 13:17:37 +0100
Subject: [PATCH 0720/3789] Revert "Revert "dictd: Update to latest upstream
 (0.12.1)."" and add the missing libmaa.nix.

This reverts commit d59778678a23d72297a5dd813387d38c0448df3c.
---
 pkgs/servers/dict/buildfix.diff | 11 +++++++++++
 pkgs/servers/dict/default.nix   | 21 ++++++++++++---------
 pkgs/servers/dict/libmaa.nix    | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  4 +++-
 4 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/servers/dict/buildfix.diff
 create mode 100644 pkgs/servers/dict/libmaa.nix

diff --git a/pkgs/servers/dict/buildfix.diff b/pkgs/servers/dict/buildfix.diff
new file mode 100644
index 00000000000..e30fcb2b038
--- /dev/null
+++ b/pkgs/servers/dict/buildfix.diff
@@ -0,0 +1,11 @@
+--- Makefile.in~	2011-03-06 18:52:54.000000000 +0100
++++ Makefile.in	2014-01-29 19:04:51.384844897 +0100
+@@ -123,7 +123,7 @@
+ 
+ %: %.o
+ 	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \
+-		$^ $(OBJS) $(LDFLAGS) -lz ${LIBS}
++	    $(^:.o=.lo) $(OBJS) $(LDFLAGS) -lz ${LIBS}
+ 
+ include $(srcdir)/deps
+ 
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix
index 51de674eb9f..1fb7c24418f 100644
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl, which, bison, flex }:
+{ stdenv, fetchurl, which, bison, flex, libmaa, zlib, libtool }:
 
-stdenv.mkDerivation {
-  name = "dictd-1.9.15";
+stdenv.mkDerivation rec {
+  version = "1.12.1";
+  name = "dictd-${version}";
 
   src = fetchurl {
-    url = mirror://sourceforge/dict/dictd-1.9.15.tar.gz;
-    sha256 = "0p41yf72l0igmshz6vxy3hm51z25600vrnb9j2jpgws4c03fqnac";
+    url = "mirror://sourceforge/dict/dictd-${version}.tar.gz";
+    sha256 = "0min6v60b6z5mrymyjfwzx8nv6rdm8pd8phlwl6v2jl5vkngcdx2";
   };
 
-  buildInputs = [ flex bison which ];
-  
+  buildInputs = [ flex bison which libmaa zlib libtool ];
+
+  patchPhase = "patch -p0 < ${./buildfix.diff}";
   configureFlags = "--datadir=/var/run/current-system/share/dictd";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Dict protocol server and client";
-    maintainers = with stdenv.lib.maintainers; mornfall;
+    maintainers = maintainers.mornfall;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix
new file mode 100644
index 00000000000..c63306e1ff4
--- /dev/null
+++ b/pkgs/servers/dict/libmaa.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, libtool }:
+
+stdenv.mkDerivation rec {
+  version = "1.3.2";
+  name = "libmaa-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/dict/libmaa-${version}.tar.gz";
+    sha256 = "1idi4c30pi79g5qfl7rr9s17krbjbg93bi8f2qrbsdlh78ga19ar";
+  };
+
+  buildInputs = [ libtool ];
+  # configureFlags = "--datadir=/var/run/current-system/share/dictd";
+
+  meta = with stdenv.lib; {
+    description = "Dict protocol server and client";
+    maintainers = maintainers.mornfall;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1679e994a08..423e627a89b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6107,7 +6107,9 @@ let
 
   dico = callPackage ../servers/dico { };
 
-  dict = callPackage ../servers/dict { };
+  dict = callPackage ../servers/dict {
+      libmaa = callPackage ../servers/dict/libmaa.nix {};
+  };
 
   dictdDBs = recurseIntoAttrs (import ../servers/dict/dictd-db.nix {
     inherit builderDefs;
-- 
GitLab


From 32a08d0846ca635e92b9efba7b5ccf7418258648 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Fri, 31 Jan 2014 11:11:04 +0000
Subject: [PATCH 0721/3789] lightdm: Update to 1.8.6

---
 .../services/x11/display-managers/lightdm.nix |   4 +-
 .../display-managers/lightdm/default.nix      |   7 +-
 .../display-managers/lightdm/lightdm.patch    | 143 ++++++------------
 3 files changed, 53 insertions(+), 101 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index e4125891e6c..0fa16a77c1b 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -55,8 +55,8 @@ let
     ''
       [LightDM]
       greeter-user = ${config.users.extraUsers.lightdm.name}
-      xgreeters-directory = ${cfg.greeter.package}
-      xsessions-directory = ${dmcfg.session.desktops}
+      greeters-directory = ${cfg.greeter.package}
+      sessions-directory = ${dmcfg.session.desktops}
 
       [SeatDefaults]
       xserver-command = ${xserverWrapper}
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 598c42199be..d4c6f24d69a 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -3,18 +3,18 @@
 
 let
   ver_branch = "1.8";
-  version = "1.7.0";
+  version = "1.8.6";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
-    sha256 = "0nwwjgc9xvwili6714ag88wsrf0lr5hv1i6z9f0xvin4ym18cbs5";
+    sha256 = "17ivc0c4dbnc0fzd581j53cn6hdav34zz2hswjzy8aczbpk605qi";
   };
 
   patches = [ ./lightdm.patch ];
-  patchFlags = "-p0";
+  patchFlags = "-p1";
 
   buildInputs = [
     pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://launchpad.net/lightdm;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.ocharles ];
   };
 }
diff --git a/pkgs/applications/display-managers/lightdm/lightdm.patch b/pkgs/applications/display-managers/lightdm/lightdm.patch
index a6e53bafcc7..d81e0aae56d 100644
--- a/pkgs/applications/display-managers/lightdm/lightdm.patch
+++ b/pkgs/applications/display-managers/lightdm/lightdm.patch
@@ -1,7 +1,8 @@
-=== modified file 'liblightdm-gobject/greeter.c'
---- liblightdm-gobject/greeter.c	2013-01-31 20:56:09 +0000
-+++ liblightdm-gobject/greeter.c	2013-03-29 14:15:58 +0000
-@@ -567,6 +567,21 @@
+diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c
+index 9387118..635cea0 100644
+--- a/liblightdm-gobject/greeter.c
++++ b/liblightdm-gobject/greeter.c
+@@ -567,6 +567,21 @@ lightdm_greeter_get_default_session_hint (LightDMGreeter *greeter)
  }
  
  /**
@@ -23,11 +24,11 @@
   * lightdm_greeter_get_hide_users_hint:
   * @greeter: A #LightDMGreeter
   *
-
-=== modified file 'liblightdm-gobject/lightdm/greeter.h'
---- liblightdm-gobject/lightdm/greeter.h	2013-01-31 20:56:09 +0000
-+++ liblightdm-gobject/lightdm/greeter.h	2013-03-29 11:56:11 +0000
-@@ -93,6 +93,8 @@
+diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h
+index 7d8988f..2b54909 100644
+--- a/liblightdm-gobject/lightdm/greeter.h
++++ b/liblightdm-gobject/lightdm/greeter.h
+@@ -93,6 +93,8 @@ gboolean lightdm_greeter_get_select_guest_hint (LightDMGreeter *greeter);
  
  const gchar *lightdm_greeter_get_autologin_user_hint (LightDMGreeter *greeter);
  
@@ -36,19 +37,19 @@
  gboolean lightdm_greeter_get_autologin_guest_hint (LightDMGreeter *greeter);
  
  gint lightdm_greeter_get_autologin_timeout_hint (LightDMGreeter *greeter);
-
-=== modified file 'liblightdm-gobject/lightdm/session.h'
---- liblightdm-gobject/lightdm/session.h	2013-01-31 20:56:09 +0000
-+++ liblightdm-gobject/lightdm/session.h	2013-03-29 11:59:16 +0000
+diff --git a/liblightdm-gobject/lightdm/session.h b/liblightdm-gobject/lightdm/session.h
+index 13ddcd9..cdb2fd6 100644
+--- a/liblightdm-gobject/lightdm/session.h
++++ b/liblightdm-gobject/lightdm/session.h
 @@ -12,6 +12,7 @@
- #define _LIGHTDM_SESSION_H_
+ #define LIGHTDM_SESSION_H_
  
  #include <glib-object.h>
 +#include "greeter.h"
  
  G_BEGIN_DECLS
  
-@@ -42,9 +43,9 @@
+@@ -42,9 +43,9 @@ typedef struct
  
  GType lightdm_session_get_type (void);
  
@@ -60,10 +61,10 @@
  
  const gchar *lightdm_session_get_key (LightDMSession *session);
  
-
-=== modified file 'liblightdm-gobject/session.c'
---- liblightdm-gobject/session.c	2013-01-31 20:56:09 +0000
-+++ liblightdm-gobject/session.c	2013-03-29 14:16:48 +0000
+diff --git a/liblightdm-gobject/session.c b/liblightdm-gobject/session.c
+index 949778f..db5e18a 100644
+--- a/liblightdm-gobject/session.c
++++ b/liblightdm-gobject/session.c
 @@ -11,6 +11,7 @@
  #include <string.h>
  #include <gio/gdesktopappinfo.h>
@@ -72,7 +73,7 @@
  #include "lightdm/session.h"
  
  enum {
-@@ -167,7 +168,7 @@
+@@ -189,7 +190,7 @@ load_sessions (const gchar *sessions_dir)
  }
  
  static void
@@ -81,18 +82,17 @@
  {
      GKeyFile *config_key_file = NULL;
      gchar *config_path = NULL;
-@@ -183,8 +184,8 @@
+@@ -205,8 +206,7 @@ update_sessions (void)
      remote_sessions_dir = g_strdup (REMOTE_SESSIONS_DIR);
  
      /* Use session directory from configuration */
 -    /* FIXME: This should be sent in the greeter connection */
 -    config_path = g_build_filename (CONFIG_DIR, "lightdm.conf", NULL);
 +    config_path = g_strdup (lightdm_greeter_get_config_path (greeter));
-+
      config_key_file = g_key_file_new ();
      result = g_key_file_load_from_file (config_key_file, config_path, G_KEY_FILE_NONE, &error);
-     if (error)
-@@ -228,9 +229,9 @@
+     if (error && !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
+@@ -250,9 +250,9 @@ update_sessions (void)
   * Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession
   **/
  GList *
@@ -104,7 +104,7 @@
      return local_sessions;
  }
  
-@@ -242,9 +243,9 @@
+@@ -264,9 +264,9 @@ lightdm_get_sessions (void)
   * Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession
   **/
  GList *
@@ -116,78 +116,29 @@
      return remote_sessions;
  }
  
-
-=== modified file 'src/display.c'
---- src/display.c	2013-03-26 22:22:49 +0000
-+++ src/display.c	2013-03-29 12:12:43 +0000
-@@ -62,6 +62,9 @@
-     /* Program to run sessions through */
-     gchar *session_wrapper;
- 
-+    /* Path to the configuration file that lightdm is running under */
-+    gchar *config_path;
+diff --git a/src/lightdm.c b/src/lightdm.c
+index 7d35034..910164c 100644
+--- a/src/lightdm.c
++++ b/src/lightdm.c
+@@ -1142,6 +1142,9 @@ main (int argc, char **argv)
+         }
+     }
+     g_clear_error (&error);
 +
-     /* TRUE if in a user session */
-     gboolean in_user_session;
- 
-@@ -213,6 +216,14 @@
- }
- 
- void
-+display_set_config_path (Display *display, const gchar *config_path)
-+{
-+    g_return_if_fail (display != NULL);
-+    g_free (display->priv->config_path);
-+    display->priv->config_path = g_strdup (config_path);
-+}
-+
-+void
- display_set_show_remote_login_hint (Display *display, gboolean show_remote_login)
- {
-     g_return_if_fail (display != NULL);
-@@ -436,6 +447,7 @@
-     greeter_set_hint (display->priv->greeter, "show-remote-login", display->priv->greeter_show_remote_login ? "true" : "false");
-     if (display->priv->greeter_is_lock)
-         greeter_set_hint (display->priv->greeter, "lock-screen", "true");
-+    greeter_set_hint (display->priv->greeter, "config-path", display->priv->config_path);
- 
-     /* Run greeter as unprivileged user */
-     if (getuid () != 0)
-
-=== modified file 'src/display.h'
---- src/display.h	2013-03-26 22:22:49 +0000
-+++ src/display.h	2013-03-29 12:12:37 +0000
-@@ -80,6 +80,8 @@
- 
- void display_set_user_session (Display *display, SessionType type, const gchar *session_name);
- 
-+void display_set_config_path (Display *display, const gchar *config_path);
++    config_set_string (config_get_instance (), "SeatDefaults", "config-path", config_path);
 +
- gboolean display_start (Display *display);
- 
- gboolean display_get_is_ready (Display *display);
-
-=== modified file 'src/lightdm.c'
---- src/lightdm.c	2013-03-07 21:40:31 +0000
-+++ src/lightdm.c	2013-03-29 11:48:45 +0000
-@@ -1050,6 +1050,7 @@
-     g_debug ("Starting Light Display Manager %s, UID=%i PID=%i", VERSION, getuid (), getpid ());
- 
-     g_debug ("Loaded configuration from %s", config_path);
-+    config_set_string (config_get_instance (), "LightDM", "config-path", config_path);
      g_free (config_path);
  
-     g_debug ("Using D-Bus name %s", LIGHTDM_BUS_NAME);
-
-=== modified file 'src/seat.c'
---- src/seat.c	2013-03-26 22:22:49 +0000
-+++ src/seat.c	2013-03-29 12:13:00 +0000
-@@ -536,6 +536,7 @@
-     if (!session_name)
-         session_name = seat_get_string_property (seat, "user-session");
-     display_set_user_session (display, SESSION_TYPE_LOCAL, session_name);
-+    display_set_config_path (display, config_get_string (config_get_instance (), "LightDM", "config-path"));
- 
-     seat->priv->displays = g_list_append (seat->priv->displays, display);
-     g_signal_emit (seat, signals[DISPLAY_ADDED], 0, display);
-
+     /* Set default values */
+diff --git a/src/seat.c b/src/seat.c
+index e2b9c2c..a950ea2 100644
+--- a/src/seat.c
++++ b/src/seat.c
+@@ -1137,6 +1137,7 @@ create_greeter_session (Seat *seat)
+     greeter_set_hint (greeter_session, "show-manual-login", seat_get_boolean_property (seat, "greeter-show-manual-login") ? "true" : "false");
+     greeter_set_hint (greeter_session, "show-remote-login", seat_get_boolean_property (seat, "greeter-show-remote-login") ? "true" : "false");
+     greeter_set_hint (greeter_session, "has-guest-account", seat_get_allow_guest (seat) && seat_get_boolean_property (seat, "greeter-allow-guest") ? "true" : "false");
++    greeter_set_hint (greeter_session, "config-path", seat_get_string_property (seat, "config-path"));
+ 
+     g_object_unref (session_config);
+ 
-- 
GitLab


From d56bd75967cc3802fa6d353ca4b6538a7300473b Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Fri, 31 Jan 2014 12:53:07 +0000
Subject: [PATCH 0722/3789] lightdm-gtk-greeter: Update to 1.6.1

---
 .../lightdm-gtk-greeter/default.nix            |  7 ++++---
 .../lightdm-gtk-greeter.patch                  | 18 +++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
index 0b8863752d2..0e75005d13b 100644
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -10,18 +10,18 @@
 
 let
   ver_branch = "1.6";
-  version = "1.5.1"; # 1.5.2 and 1.6.0 result into infinite cycling of X in restarts
+  version = "1.6.1";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-gtk-greeter-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
-    sha256 = "08fnsbnay5jhd7ps8n91i6c227zq6xizpyn34qhqzykrga8pxkpc";
+    sha256 = "1nb8ljrbrp1zga083g3b633xi3izxxm4jipw1qgial1x16mqc0hz";
   };
 
   patches = [ ./lightdm-gtk-greeter.patch ];
-  patchFlags = "-p0";
+  patchFlags = "-p1";
 
   buildInputs = [ pkgconfig lightdm intltool ]
     ++ (if useGTK2 then [ gtk2 makeWrapper ] else [ gtk3 ]);
@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://launchpad.net/lightdm-gtk-greeter;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.ocharles ];
   };
 }
diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch b/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch
index 5ae5603b4dd..ea9e0eaec93 100644
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch
@@ -1,13 +1,13 @@
-=== modified file 'src/lightdm-gtk-greeter.c'
---- src/lightdm-gtk-greeter.c	2013-02-09 23:20:39 +0000
-+++ src/lightdm-gtk-greeter.c	2013-03-29 12:21:34 +0000
-@@ -1273,7 +1273,7 @@
-     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (session_combo), renderer, TRUE);
-     gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (session_combo), renderer, "text", 0);
-     model = gtk_combo_box_get_model (session_combo);
+diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c
+index cc5f9e1..d615dc1 100644
+--- a/src/lightdm-gtk-greeter.c
++++ b/src/lightdm-gtk-greeter.c
+@@ -1716,7 +1716,7 @@ main (int argc, char **argv)
+     gtk_container_add (GTK_CONTAINER (menuitem), image);
+     gtk_widget_show (GTK_WIDGET (menuitem));
+     
 -    items = lightdm_get_sessions ();
 +    items = lightdm_get_sessions (greeter);
+     GSList *sessions = NULL;
      for (item = items; item; item = item->next)
      {
-         LightDMSession *session = item->data;
-
-- 
GitLab


From 210a9db16f2649e422b41ab077851f079bed6ee3 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Fri, 31 Jan 2014 13:59:44 +0100
Subject: [PATCH 0723/3789] Update OCaml ExtLib to version 1.6.1

---
 pkgs/development/ocaml-modules/extlib/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix
index 41620b9424f..8b977dd7c52 100644
--- a/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/pkgs/development/ocaml-modules/extlib/default.nix
@@ -1,21 +1,21 @@
 {stdenv, fetchurl, ocaml, findlib}:
 
 stdenv.mkDerivation {
-  name = "ocaml-extlib-1.5.3";
+  name = "ocaml-extlib-1.6.1";
 
   src = fetchurl {
-    url = http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz;
-    sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021";
+    url = http://ocaml-extlib.googlecode.com/files/extlib-1.6.1.tar.gz;
+    sha256 = "1jmfj2w0f3ap0swz8k3qqmrl6x2y4gkmg88vv024xnmliiiv7m48";
   };
 
   buildInputs = [ocaml findlib];
 
   createFindlibDestdir = true;
 
-  buildPhase = ''
-    make all
-    make opt
-  '';
+  configurePhase = "true";      # Skip configure
+  # De facto, option minimal=1 seems to be the default.  See the README.
+  buildPhase     = "make minimal=1 build";
+  installPhase   = "make minimal=1 install";
 
   meta = {
     homepage = http://code.google.com/p/ocaml-extlib/;
-- 
GitLab


From 62e78f6b23a9dd77411e8ffd5adcf6bd1083cd50 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jan 2014 02:34:27 -0600
Subject: [PATCH 0724/3789] openssh: Upgrade from 6.4p1 -> 6.5p1

---
 pkgs/tools/networking/openssh/default.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 1f785fdf730..0391d8f7b40 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -13,15 +13,16 @@ let
     url = mirror://sourceforge/hpnssh/openssh-6.3p1-hpnssh14v2.diff.gz;
     sha256 = "1jldqjwry9qpxxzb3mikfmmmv90mfb7xkmcfdbvwqac6nl3r7bi3";
   };
+  optionalString = stdenv.lib.optionalString;
 
 in
 
 stdenv.mkDerivation rec {
-  name = "openssh-6.4p1";
+  name = "openssh-6.5p1";
 
   src = fetchurl {
     url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "1lkmi7v83qvpcc04qrrqk4k7mafnmwxkfk1ccsisw51va4bgcc2m";
+    sha256 = "09wh7mi65aahyxd2xvq1makckhd5laid8c0pb8njaidrbpamw6d1";
   };
 
   prePatch = stdenv.lib.optionalString hpnSupport
@@ -32,9 +33,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./locale_archive.patch ];
 
-  buildInputs = [ zlib openssl libedit pkgconfig pam ] ++
-    (if withKerberos then [ kerberos ] else [])
-  ;
+  buildInputs = [ zlib openssl libedit pkgconfig pam ]
+    ++ stdenv.lib.optional withKerberos [ kerberos ];
 
   # I set --disable-strip because later we strip anyway. And it fails to strip
   # properly when cross building.
@@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
       --with-libedit=yes
       --disable-strip
       ${if pam != null then "--with-pam" else "--without-pam"}
-      ${if etcDir != null then "--sysconfdir=${etcDir}" else ""}
-      ${if withKerberos  then "--with-kerberos5=${kerberos}" else ""}
+      ${optionalString (etcDir != null) "--sysconfdir=${etcDir}"}
+      ${optionalString withKerberos "--with-kerberos5=${kerberos}"}
     '';
 
   preConfigure =
@@ -67,11 +67,11 @@ stdenv.mkDerivation rec {
 
   installTargets = "install-nosysconf";
 
-  meta = {
-    homepage = http://www.openssh.org/;
+  meta = with stdenv.lib; {
+    homepage = "http://www.openssh.org/";
     description = "An implementation of the SSH protocol";
     license = "bsd";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = stdenv.lib.maintainers.eelco;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ eelco ];
   };
 }
-- 
GitLab


From 54288f5cfe4e48779d7c08abefa8cbb23d58e58a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 31 Jan 2014 16:30:51 +0100
Subject: [PATCH 0725/3789] Update hipchat

---
 .../instant-messengers/hipchat/default.nix    | 47 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index c0f76602b2b..c7ea2d135d5 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -1,21 +1,12 @@
-{ stdenv
-, fetchurl
-, libtool
-, libXext
-, libSM
-, libICE
-, libX11
-, libXft
-, libXau
-, libXdmcp
-, libXrender
-, freetype
-, fontconfig
-, openssl
+{ stdenv, fetchurl, libtool, libXext, libSM, libICE, libX11, libXft, libXau, libXdmcp, libXrender
+, libxcb, libXfixes, libXcomposite, libXi, dbus, freetype, fontconfig, openssl, zlib, mesa
+, libxslt, libxml2
 }:
 
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; 
+
 let
-  version = "1.94.407";
+  version = "2.1.982";
 
   rpath = stdenv.lib.makeSearchPath "lib" [
     stdenv.glibc
@@ -29,15 +20,29 @@ let
     libXau
     libXdmcp
     libXrender
+    libxcb
+    libXfixes
+    libXcomposite
+    libXi
+    dbus
     freetype
     fontconfig
     openssl
+    zlib
+    mesa
+    libxslt
+    libxml2
   ];
 
-  src = fetchurl {
-    url = "http://downloads.hipchat.com/linux/arch/hipchat-${version}-i686.pkg.tar.xz";
-    sha256 = "0kyjpa2ir066zqkvs1zmnx6kvl8v4jfl8h7bw110cgigwmiplk7k";
-  };
+  src = 
+    if stdenv.system == "i686-linux" then fetchurl {
+      url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz";
+      sha256 = "1i60fkl5hdx2p2yfsx9w8qkzn6hl8fajvfls0r0gc2bqc9whg6vn";
+    } else fetchurl {
+      url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz";
+      sha256 = "12bn4la9z1grkbcnixjwhadgxa2g6qkd5x7r3l3vn1sdalgal4ks";
+    };
+
 in stdenv.mkDerivation {
   name = "hipchat-${version}";
 
@@ -49,8 +54,8 @@ in stdenv.mkDerivation {
     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
+        patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $file || true
+        patchelf --set-rpath ${rpath}:${stdenv.lib.optionalString stdenv.is64bit "${stdenv.gcc.gcc}/lib64:"}$out/lib $file || true
     done
     substituteInPlace $out/share/applications/hipchat.desktop \
       --replace /opt/HipChat/bin $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 423e627a89b..9ec3270b09d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8068,7 +8068,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 { };
 
-- 
GitLab


From b913a2eb81b03250a370ecd4456cad2f290f3870 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 31 Jan 2014 17:59:51 +0100
Subject: [PATCH 0726/3789] linux: Update to 3.4.78

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index d1909c17967..14a4b64fe55 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.77";
+  version = "3.4.78";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "05hfa5cxcxvqg183amfpvjzh6i9lphx1956j92sh6r90pnhg0xgz";
+    sha256 = "1n9avgjy3qpr28n1rq80kc1gn33w9nz6bvwds6i4d5z793fp7qpk";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 2778c00bfe1b472c40400a0867e3dfbf0be27481 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 31 Jan 2014 13:38:53 +0100
Subject: [PATCH 0727/3789] amdadl-sdk: set license to unfree (close #1647)

We cannot auto build amdadl-sdk on hydra, so setting license to unfree disable
auto builds. I also remove amdadl license, because it's irrelevant.

vcunat changed string license to attribute.
---
 lib/licenses.nix                             | 6 ------
 pkgs/development/misc/amdadl-sdk/default.nix | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index b13a72f3f64..cda43583279 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -28,12 +28,6 @@
     url = "http://developer.amd.com/amd-license-agreement/";
   };
 
-  amdadl = {
-    shortName = "amd-adl";
-    fullName = "amd-adl license";
-    url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/AMD-ADL?revision=1.1";
-  };
-
   # Apple Public Source License 2.0;
   # http://opensource.org/licenses/APSL-2.0
   apsl20 = "APSL 2.0";
diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix
index f131295bcba..6907a38d5a4 100644
--- a/pkgs/development/misc/amdadl-sdk/default.nix
+++ b/pkgs/development/misc/amdadl-sdk/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "API to access display driver functionality for ATI graphics cards";
     homepage = http://developer.amd.com/tools/graphics-development/display-library-adl-sdk/;
-    license = licenses.amdadl;
+    license = "unfree";
     maintainers = [ maintainers.offline ];
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = [];
-- 
GitLab


From 34b0e59c0a01eeabfc67bdfc7f805d053773079b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 31 Jan 2014 18:51:10 +0100
Subject: [PATCH 0728/3789] fixup previous commit: do the change to attribute

---
 pkgs/development/misc/amdadl-sdk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix
index 6907a38d5a4..c177d8fe03f 100644
--- a/pkgs/development/misc/amdadl-sdk/default.nix
+++ b/pkgs/development/misc/amdadl-sdk/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "API to access display driver functionality for ATI graphics cards";
     homepage = http://developer.amd.com/tools/graphics-development/display-library-adl-sdk/;
-    license = "unfree";
+    license = licenses.unfree;
     maintainers = [ maintainers.offline ];
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = [];
-- 
GitLab


From bfa56d7657e4e4d3f0180e16e20cd7e3e132d919 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 31 Jan 2014 21:14:05 +0100
Subject: [PATCH 0729/3789] httpd: Only add PHPRC to environment of httpd when
 enablePHP is true.

---
 nixos/modules/services/web-servers/apache-httpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 2552ec18bb9..d6c539aa78b 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -628,8 +628,8 @@ in
           ++ concatMap (svc: svc.extraServerPath) allSubservices;
 
         environment =
-          { PHPRC = if enablePHP then phpIni else "";
-          } // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices));
+          (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices))
+          // optionalAttrs enablePHP { PHPRC = phpIni; };
 
         preStart =
           ''
-- 
GitLab


From 9b1bd849402d208e7f0c8a0c0032adca41ab74e4 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 31 Jan 2014 21:18:24 +0100
Subject: [PATCH 0730/3789] httpd: Respect original order of environment eval.

---
 nixos/modules/services/web-servers/apache-httpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index d6c539aa78b..b96f5cf159b 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -628,8 +628,8 @@ in
           ++ concatMap (svc: svc.extraServerPath) allSubservices;
 
         environment =
-          (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices))
-          // optionalAttrs enablePHP { PHPRC = phpIni; };
+          optionalAttrs enablePHP { PHPRC = phpIni; }
+          // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices));
 
         preStart =
           ''
-- 
GitLab


From f9f065a17809c3b8c4998df0160d6262357626fd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jan 2014 15:28:50 -0600
Subject: [PATCH 0731/3789] kernel: Upgrade from 3.13.0 -> 3.13.1

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix
index 967de85b7b3..437e4bc025a 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix
@@ -1,13 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.13";
-
-  modDirVersion = "3.13.0";
+  version = "3.13.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2";
+    sha256 = "0gkikbz676h79rv0aaihl90mw7fqhjx3rkhcqrmzggjb54048jvq";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 6a756af3e7a50c22a45f7d958657527ac47d2902 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 31 Jan 2014 16:53:28 -0600
Subject: [PATCH 0732/3789] zsh: don't clobber the environment of non-login
 shells

---
 nixos/modules/programs/zsh/zsh.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index cff751934d7..69a56ff69a0 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -116,8 +116,9 @@ in
         # This file is read for all shells.
 
         # Only execute this file once per shell.
+        # But don't clobber the environment of interactive non-login children!
         if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
-        __ETC_ZSHENV_SOURCED=1
+        export __ETC_ZSHENV_SOURCED=1
 
         ${cfg.shellInit}
 
-- 
GitLab


From 6d449f7c60f1cd33f7bc34097353515f79871c68 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 1 Feb 2014 01:44:39 +0100
Subject: [PATCH 0733/3789] libarchive: Add extra source URL (close #1655)

It seems that libarchive's home page has not been available for at least the
past couple of days.
---
 pkgs/development/libraries/libarchive/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index e0f2ba77de2..7abad2f2d08 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -5,7 +5,10 @@ stdenv.mkDerivation rec {
   name = "libarchive-3.1.2";
 
   src = fetchurl {
-    url = "${meta.homepage}/downloads/${name}.tar.gz";
+    urls = [
+      "http://pkgs.fedoraproject.org/repo/pkgs/libarchive/libarchive-3.1.2.tar.gz/efad5a503f66329bb9d2f4308b5de98a/${name}.tar.gz"
+      "${meta.homepage}/downloads/${name}.tar.gz"
+    ];
     sha256 = "0pixqnrcf35dnqgv0lp7qlcw7k13620qkhgxr288v7p4iz6ym1zb";
   };
 
-- 
GitLab


From 5d2e884aa1cf3f0078ac0a109514500570bb89cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Feb 2014 08:43:33 +0100
Subject: [PATCH 0734/3789] pidgin: minor update 2.10.7 -> .8, including
 CVE-2013-6484

Also switch no newer libstartup-notification, add license and platforms.
---
 .../networking/instant-messengers/pidgin/default.nix      | 8 +++++---
 pkgs/top-level/all-packages.nix                           | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index d0652adcb0d..53790cd2b8b 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -21,10 +21,10 @@
 } :
 
 stdenv.mkDerivation rec {
-  name = "pidgin-2.10.7";
+  name = "pidgin-2.10.8";
   src = fetchurl {
     url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
-    sha256 = "14piyx4xpc3l8286x4nh5pna2wfyn9cv0qa29br1q3d2xja2k8zb";
+    sha256 = "09w2gbnplyw21lmf9jwk6vkk5gpx5lq15s38bmhkxzw86mz3ccxn";
   };
 
   inherit nss ncurses;
@@ -51,8 +51,10 @@ stdenv.mkDerivation rec {
   configureFlags="--with-nspr-includes=${nspr}/include/nspr --with-nspr-libs=${nspr}/lib --with-nss-includes=${nss}/include/nss --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include --disable-meanwhile --disable-nm --disable-tcl"
   + (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no")
   ;
-  meta = {
+  meta = with stdenv.lib; {
     description = "Pidgin IM - XMPP(Jabber), AIM/ICQ, IRC, SIP etc client";
     homepage = http://pidgin.im;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ec3270b09d..a4b687c344e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8555,7 +8555,7 @@ let
     openssl = if config.pidgin.openssl or true then openssl else null;
     gnutls = if config.pidgin.gnutls or false then gnutls else null;
     libgcrypt = if config.pidgin.gnutls or false then libgcrypt else null;
-    inherit (gnome) startupnotification;
+    startupnotification = libstartup_notification;
   };
 
   pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex {
-- 
GitLab


From f33d50c04eff944ce5b795c1ede9a00be7eee0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Feb 2014 09:07:16 +0100
Subject: [PATCH 0735/3789] openssh_hpn: mark as broken ATM, cf. #1640

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

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 0391d8f7b40..0b68ec83b52 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -73,5 +73,6 @@ stdenv.mkDerivation rec {
     license = "bsd";
     platforms = platforms.unix;
     maintainers = with maintainers; [ eelco ];
+    broken = hpnSupport; # cf. https://github.com/NixOS/nixpkgs/pull/1640
   };
 }
-- 
GitLab


From 449cfcfa918fad8487f966b978d629f66f823f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Feb 2014 10:09:52 +0100
Subject: [PATCH 0736/3789] gnome3: re-introduce libsoup dependency (fix many
 evals)

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

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 1b440be200a..56d38bf1d90 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -6,7 +6,7 @@ rec {
   libcanberra = pkgs.libcanberra_gtk3; # just to be sure
   inherit (pkgs.gnome2) gnome_common ORBit2;
   orbit = ORBit2;
-
+  inherit (pkgs) libsoup;
 
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 
-- 
GitLab


From ddf5841d74a6037197d0f8aa24a2f3ef9b6de1ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Feb 2014 10:12:36 +0100
Subject: [PATCH 0737/3789] libsoup: enable introspection (gnome3 stuff needs
 it)

Also some minor refactoring of the expression.
---
 pkgs/development/libraries/libsoup/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 12124474566..049d6646ec8 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchurl, glib, libxml2, pkgconfig
-, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking
+, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
 , libintlOrEmpty
 , intltool, python }:
-
-stdenv.mkDerivation rec {
-  name = "libsoup-${version}";
+let
   majorVersion = "2.45";
   version = "${majorVersion}.3";
+in
+stdenv.mkDerivation {
+  name = "libsoup-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
@@ -15,11 +16,11 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     patchShebangs libsoup/
-    '';
+  '';
 
   buildInputs = libintlOrEmpty ++ [ intltool python ];
   nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib libxml2 ]
+  propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
     ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
   passthru.propagatedUserEnvPackages = [ glib_networking ];
 
-- 
GitLab


From c79bda8d47772fdde7752fb22ae9f6bbb379cbe1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 1 Feb 2014 11:55:14 +0100
Subject: [PATCH 0738/3789] release-small.nix: Disable FreeBSD

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

diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 213358bc8ce..14812b3e811 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -2,7 +2,7 @@
    the load on Hydra when testing the `stdenv-updates' branch. */
 
 { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
-, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ]
+, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
 }:
 
 with import ./release-lib.nix { inherit supportedSystems; };
-- 
GitLab


From 21a220900ad72cebc08286f2f9d936db0da7fa6f Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Sat, 1 Feb 2014 01:07:00 -0800
Subject: [PATCH 0739/3789] libyaml: Patch to fix CVE-2013-6393 (close #1658)

---
 .../libraries/libyaml/cve-2013-6393_a.patch   |  11 ++
 .../libraries/libyaml/cve-2013-6393_b.patch   |  16 +++
 .../libraries/libyaml/cve-2013-6393_c.patch   | 131 ++++++++++++++++++
 .../development/libraries/libyaml/default.nix |   3 +
 4 files changed, 161 insertions(+)
 create mode 100644 pkgs/development/libraries/libyaml/cve-2013-6393_a.patch
 create mode 100644 pkgs/development/libraries/libyaml/cve-2013-6393_b.patch
 create mode 100644 pkgs/development/libraries/libyaml/cve-2013-6393_c.patch

diff --git a/pkgs/development/libraries/libyaml/cve-2013-6393_a.patch b/pkgs/development/libraries/libyaml/cve-2013-6393_a.patch
new file mode 100644
index 00000000000..130107341f7
--- /dev/null
+++ b/pkgs/development/libraries/libyaml/cve-2013-6393_a.patch
@@ -0,0 +1,11 @@
+--- a/src/scanner.c	
++++ a/src/scanner.c	
+@@ -2574,7 +2574,7 @@ 
+ 
+     /* Resize the string to include the head. */
+ 
+-    while (string.end - string.start <= (int)length) {
++    while ((size_t)(string.end - string.start) <= length) {
+         if (!yaml_string_extend(&string.start, &string.pointer, &string.end)) {
+             parser->error = YAML_MEMORY_ERROR;
+             goto error;
diff --git a/pkgs/development/libraries/libyaml/cve-2013-6393_b.patch b/pkgs/development/libraries/libyaml/cve-2013-6393_b.patch
new file mode 100644
index 00000000000..db2b9ff2bba
--- /dev/null
+++ b/pkgs/development/libraries/libyaml/cve-2013-6393_b.patch
@@ -0,0 +1,16 @@
+--- a/src/api.c	
++++ a/src/api.c	
+@@ -117,7 +117,12 @@ 
+ YAML_DECLARE(int)
+ yaml_stack_extend(void **start, void **top, void **end)
+ {
+-    void *new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
++    void *new_start;
++
++    if ((char *)*end - (char *)*start >= INT_MAX / 2)
++	return 0;
++
++    new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
+ 
+     if (!new_start) return 0;
+ 
diff --git a/pkgs/development/libraries/libyaml/cve-2013-6393_c.patch b/pkgs/development/libraries/libyaml/cve-2013-6393_c.patch
new file mode 100644
index 00000000000..dc1c50da4e8
--- /dev/null
+++ b/pkgs/development/libraries/libyaml/cve-2013-6393_c.patch
@@ -0,0 +1,131 @@
+--- a/src/scanner.c	Mon Dec 24 03:51:32 2012 +0000
++++ a/src/scanner.c	Mon Jan 27 19:48:28 2014 -0500
+@@ -615,11 +615,14 @@ 
+  */
+ 
+ static int
+-yaml_parser_roll_indent(yaml_parser_t *parser, int column,
++yaml_parser_roll_indent(yaml_parser_t *parser, size_t column,
+         int number, yaml_token_type_t type, yaml_mark_t mark);
+ 
+ static int
+-yaml_parser_unroll_indent(yaml_parser_t *parser, int column);
++yaml_parser_unroll_indent(yaml_parser_t *parser, size_t column);
++
++static int
++yaml_parser_reset_indent(yaml_parser_t *parser);
+ 
+ /*
+  * Token fetchers.
+@@ -1206,7 +1209,7 @@ 
+  */
+ 
+ static int
+-yaml_parser_roll_indent(yaml_parser_t *parser, int column,
++yaml_parser_roll_indent(yaml_parser_t *parser, size_t column,
+         int number, yaml_token_type_t type, yaml_mark_t mark)
+ {
+     yaml_token_t token;
+@@ -1216,7 +1219,7 @@ 
+     if (parser->flow_level)
+         return 1;
+ 
+-    if (parser->indent < column)
++    if (parser->indent == -1 || parser->indent < column)
+     {
+         /*
+          * Push the current indentation level to the stack and set the new
+@@ -1254,7 +1257,7 @@ 
+ 
+ 
+ static int
+-yaml_parser_unroll_indent(yaml_parser_t *parser, int column)
++yaml_parser_unroll_indent(yaml_parser_t *parser, size_t column)
+ {
+     yaml_token_t token;
+ 
+@@ -1263,6 +1266,15 @@ 
+     if (parser->flow_level)
+         return 1;
+ 
++    /*
++     * column is unsigned and parser->indent is signed, so if
++     * parser->indent is less than zero the conditional in the while
++     * loop below is incorrect.  Guard against that.
++     */
++    
++    if (parser->indent < 0)
++        return 1;
++
+     /* Loop through the intendation levels in the stack. */
+ 
+     while (parser->indent > column)
+@@ -1283,6 +1295,41 @@ 
+ }
+ 
+ /*
++ * Pop indentation levels from the indents stack until the current
++ * level resets to -1.  For each intendation level, append the
++ * BLOCK-END token.
++ */
++
++static int
++yaml_parser_reset_indent(yaml_parser_t *parser)
++{
++    yaml_token_t token;
++
++    /* In the flow context, do nothing. */
++
++    if (parser->flow_level)
++        return 1;
++
++    /* Loop through the intendation levels in the stack. */
++
++    while (parser->indent > -1)
++    {
++        /* Create a token and append it to the queue. */
++
++        TOKEN_INIT(token, YAML_BLOCK_END_TOKEN, parser->mark, parser->mark);
++
++        if (!ENQUEUE(parser, parser->tokens, token))
++            return 0;
++
++        /* Pop the indentation level. */
++
++        parser->indent = POP(parser, parser->indents);
++    }
++
++    return 1;
++}
++
++/*
+  * Initialize the scanner and produce the STREAM-START token.
+  */
+ 
+@@ -1338,7 +1385,7 @@ 
+ 
+     /* Reset the indentation level. */
+ 
+-    if (!yaml_parser_unroll_indent(parser, -1))
++    if (!yaml_parser_reset_indent(parser))
+         return 0;
+ 
+     /* Reset simple keys. */
+@@ -1369,7 +1416,7 @@ 
+ 
+     /* Reset the indentation level. */
+ 
+-    if (!yaml_parser_unroll_indent(parser, -1))
++    if (!yaml_parser_reset_indent(parser))
+         return 0;
+ 
+     /* Reset simple keys. */
+@@ -1407,7 +1454,7 @@ 
+ 
+     /* Reset the indentation level. */
+ 
+-    if (!yaml_parser_unroll_indent(parser, -1))
++    if (!yaml_parser_reset_indent(parser))
+         return 0;
+ 
+     /* Reset simple keys. */
diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix
index cf687c97243..93f19165e88 100644
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/pkgs/development/libraries/libyaml/default.nix
@@ -8,6 +8,9 @@ stdenv.mkDerivation {
     sha256 = "0dvavrhxjrjfxgdgysxqfpdy08lpg3m9i8vxjyvdkcjsmra1by3v";
   };
 
+  # Downloaded on 2014-02-01 from https://bugzilla.redhat.com/show_bug.cgi?id=1033990
+  patches = [ ./cve-2013-6393_a.patch ./cve-2013-6393_b.patch ./cve-2013-6393_c.patch ];
+
   meta = {
     homepage = http://pyyaml.org/;
     description = "A YAML 1.1 parser and emitter written in C";
-- 
GitLab


From 0602ef22de47435cc62f6a09111363f3084ef514 Mon Sep 17 00:00:00 2001
From: Arvin Moezzi <moezzia@gmail.com>
Date: Sat, 1 Feb 2014 11:48:00 +0100
Subject: [PATCH 0740/3789] git-daemon service: fix typo in option (close
 #1659)

---
 nixos/modules/services/networking/git-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix
index a7c7c206198..2e7c9c68e2f 100644
--- a/nixos/modules/services/networking/git-daemon.nix
+++ b/nixos/modules/services/networking/git-daemon.nix
@@ -101,7 +101,7 @@ in
       name = "git-daemon";
       startOn = "ip-up";
       exec = "${pkgs.git}/bin/git daemon --reuseaddr "
-        + (optionalString (cfg.basePath != "") "--basepath=${cfg.basePath} ")
+        + (optionalString (cfg.basePath != "") "--base-path=${cfg.basePath} ")
         + (optionalString (cfg.listenAddress != "") "--listen=${cfg.listenAddress} ")
         + "--port=${toString cfg.port} --user=${gitUser} --group=${gitUser} ${cfg.options} "
         + "--verbose " + (optionalString cfg.exportAll "--export-all")  + concatStringsSep " " cfg.repositories;
-- 
GitLab


From 5227638ee0934cd4570e494761672ff6a3a28ebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Feb 2014 12:44:22 +0100
Subject: [PATCH 0741/3789] libusb1: minor update x-1.0.17 -> 1.0.18 (joined)

The forks joined (or rather libusbx continues under libusb name).
http://sourceforge.net/p/libusb/mailman/message/31886062/
---
 pkgs/development/libraries/libusb1/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 3833e5bffa1..8be17b289f7 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, udev }:
 
 let
-  version = "1.0.17";
+  version = "1.0.18";
 in
 stdenv.mkDerivation rec {
-  name = "libusbx-${version}"; # it's a fork of original libusb1; should be mostly compatible
+  name = "libusb-${version}"; # at 1.0.18 libusb joined with libusbx
 
   src = fetchurl {
-    url = "mirror://sourceforge/libusbx/libusbx-${version}.tar.bz2";
-    sha256 = "1f25a773x9x5n48a0mcigyk77ay0hkiz6y6bi4588wzf7wn8svw7";
+    url = "mirror://sourceforge/libusb/libusb-${version}.tar.bz2";
+    sha256 = "081px0j98az0pjwwyjlq4qcmfn194fvm3qd4im0r9pm58pn5qgy7";
   };
 
   buildInputs = [ pkgconfig ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
   meta = {
-    homepage = http://www.libusb.org;
+    homepage = http://www.libusb.info;
     description = "User-space USB library";
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.urkud ];
-- 
GitLab


From 3dc05acf6a5d7907626c7deb6bb27625320f8b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 1 Feb 2014 13:45:00 +0100
Subject: [PATCH 0742/3789] directfb: update from 1.6.2 to 1.6.3

There is a 1.7.x release out but to minimize chances of breaking
dependees I'm only bumping the minimal needed to be compatible with
ilixi (a gui toolkit for directfb that I'm packaging).
---
 pkgs/development/libraries/directfb/src-for-default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/directfb/src-for-default.nix b/pkgs/development/libraries/directfb/src-for-default.nix
index a9c8c16a9d3..be583e08b6b 100644
--- a/pkgs/development/libraries/directfb/src-for-default.nix
+++ b/pkgs/development/libraries/directfb/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.6.2";
-   name="directfb-1.6.2";
-   hash="0k9x8lnjvlyalsd07a8z4iv2rfmpiz6j7aj0y4m4sybxhc8c86xr";
+   version="1.6.3";
+   name="directfb-1.6.3";
+   hash="0w2yyx6l2wn8jj9y14ymknqyc88wwrl314p9204frck91znsr5ks";
    url="http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${version}.tar.gz";
-   advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-1.6.2.tar.gz";
+   advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-1.6.3.tar.gz";
   
   
 }
-- 
GitLab


From 6473c41c71dad155c01cc7e4dee10cc24d3d8612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 1 Feb 2014 14:03:44 +0100
Subject: [PATCH 0743/3789] directfb: add meta attributes

---
 .../development/libraries/directfb/default.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix
index cdc54ef6691..6326efe1adb 100644
--- a/pkgs/development/libraries/directfb/default.nix
+++ b/pkgs/development/libraries/directfb/default.nix
@@ -35,4 +35,22 @@ stdenv.mkDerivation {
     ] ++ stdenv.lib.optionals enableX11 [
       "--enable-x11"
     ];
+
+  meta = with stdenv.lib; {
+    description = "Graphics and input library designed with embedded systems in mind";
+    longDescription = ''
+      DirectFB is a thin library that provides hardware graphics acceleration,
+      input device handling and abstraction, integrated windowing system with
+      support for translucent windows and multiple display layers, not only on
+      top of the Linux Framebuffer Device. It is a complete hardware
+      abstraction layer with software fallbacks for every graphics operation
+      that is not supported by the underlying hardware. DirectFB adds graphical
+      power to embedded systems and sets a new standard for graphics under
+      Linux.
+    '';
+    homepage = http://directfb.org/;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
 }
-- 
GitLab


From 40de4d73b8aa7e7c26e0abf8cb35a46da215b68e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 1 Feb 2014 16:00:40 +0100
Subject: [PATCH 0744/3789] ilixi: new package

ilixi is a lightweight C++ GUI toolkit for embedded Linux systems.

http://ilixi.org/
---
 pkgs/development/libraries/ilixi/default.nix | 27 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/ilixi/default.nix

diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix
new file mode 100644
index 00000000000..dd8ad8b3561
--- /dev/null
+++ b/pkgs/development/libraries/ilixi/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, directfb, libsigcxx, libxml2, fontconfig }:
+
+# TODO: optional deps: baresip, FusionDale, FusionSound, SaWMan, doxygen,
+# Reflex, Wnn, NLS
+
+stdenv.mkDerivation rec {
+  name = "ilixi-1.0.0";
+
+  src = fetchurl {
+    url = "http://www.directfb.org/downloads/Libs/${name}.tar.gz";
+    sha256 = "1kmdmqf68jiv7y6as41bhbgdy70yy2i811a3l6kccbazlzpif34v";
+  };
+
+  buildInputs = [ pkgconfig directfb libsigcxx libxml2 fontconfig ];
+
+  configureFlags = ''
+    --enable-log-debug --enable-debug --enable-trace --with-examples
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Lightweight C++ GUI toolkit for embedded Linux systems";
+    homepage = http://ilixi.org/;
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4b687c344e..e2cb2a62174 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4448,6 +4448,8 @@ let
 
   ilbc = callPackage ../development/libraries/ilbc { };
 
+  ilixi = callPackage ../development/libraries/ilixi { };
+
   ilmbase = callPackage ../development/libraries/ilmbase { };
 
   imlib = callPackage ../development/libraries/imlib {
-- 
GitLab


From 071e26e5e8ea391099c8918cc8a4cc7d017227fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 1 Feb 2014 16:25:47 +0100
Subject: [PATCH 0745/3789] python-dpkt: new package

dpkt is a fast, simple packet creation / parsing module, with
definitions for the basic TCP/IP protocols.
---
 pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c9039ec0972..b639f739a05 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1418,6 +1418,27 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   };
 
 
+  dpkt = buildPythonPackage rec {
+    name = "dpkt-1.8";
+
+    src = fetchurl {
+      url = "https://dpkt.googlecode.com/files/${name}.tar.gz";
+      sha256 = "01q5prynymaqyfsfi2296xncicdpid2hs3yyasim8iigvkwy4vf5";
+    };
+
+    # error: invalid command 'test'
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols";
+      homepage = https://code.google.com/p/dpkt/;
+      license = licenses.bsd3;
+      maintainers = [ maintainers.bjornfor ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
   evdev = buildPythonPackage rec {
     version = "0.3.2";
     name = "evdev-${version}";
-- 
GitLab


From 9037126df0050748b3bf65b90a6be36e1c3e8cd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 1 Feb 2014 12:30:23 +0100
Subject: [PATCH 0746/3789] bcache-tools: new package

Bcache is a Linux kernel block layer cache. It allows one or more fast
disk drives such as flash-based solid state drives (SSDs) to act as a
cache for one or more slower hard disk drives.

This package contains the required user-space tools.

User documentation is in Documentation/bcache.txt in the Linux kernel
tree.

http://bcache.evilpiepirate.org/
---
 .../filesystems/bcache-tools/default.nix      | 51 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/tools/filesystems/bcache-tools/default.nix

diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix
new file mode 100644
index 00000000000..183b889da9b
--- /dev/null
+++ b/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, pkgconfig, utillinux, kmod }:
+
+stdenv.mkDerivation rec {
+  name = "bcache-tools-${version}";
+  version = "1.0.5";
+
+  src = fetchurl {
+    url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz";
+    sha256 = "1abf86xcnj601lddig3kmn26jrf8q8xhcyszf5pxrcs5ym72jj8l";
+  };
+
+  buildInputs = [ pkgconfig utillinux ];
+
+  # * Remove broken install rules (they ignore $PREFIX) for stuff we don't need
+  #   anyway (it's distro specific stuff).
+  # * Fixup absolute path to modprobe.
+  prePatch = ''
+    sed -e "/INSTALL.*initramfs\/hook/d" \
+        -e "/INSTALL.*initcpio\/install/d" \
+        -e "/INSTALL.*dracut\/module-setup.sh/d" \
+        -i Makefile
+
+    sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|" -i bcache-register
+  '';
+
+  preBuild = ''
+    export makeFlags="$makeFlags PREFIX=\"$out\" UDEVLIBDIR=\"$out/lib/udev/\"";
+  '';
+
+  preInstall = ''
+    mkdir -p "$out/sbin" "$out/lib/udev/rules.d" "$out/share/man/man8"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "User-space tools required for bcache (Linux block layer cache)";
+    longDescription = ''
+      Bcache is a Linux kernel block layer cache. It allows one or more fast
+      disk drives such as flash-based solid state drives (SSDs) to act as a
+      cache for one or more slower hard disk drives.
+      
+      This package contains the required user-space tools.
+
+      User documentation is in Documentation/bcache.txt in the Linux kernel
+      tree.
+    '';
+    homepage = http://bcache.evilpiepirate.org/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2cb2a62174..c0de8b6a2d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -532,6 +532,8 @@ let
 
   bc = callPackage ../tools/misc/bc { };
 
+  bcache-tools = callPackage ../tools/filesystems/bcache-tools { };
+
   bchunk = callPackage ../tools/cd-dvd/bchunk { };
 
   bfr = callPackage ../tools/misc/bfr { };
-- 
GitLab


From 2d30955632ea02cf634cf098d3dba2c731cdddd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 1 Feb 2014 17:06:37 +0100
Subject: [PATCH 0747/3789] xpra: fix package name

Remove the "python2.7-" prefix from the package name so that it can be
installed with "nix-env -i xpra".
---
 pkgs/tools/X11/xpra/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index d7d1533b3be..35370ae2128 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -5,6 +5,7 @@
 
 buildPythonPackage rec {
   name = "xpra-0.9.5";
+  namePrefix = "";
 
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.bz2";
-- 
GitLab


From 67d73f3957eb9aaa2e75ce2868548274d05f44e8 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Sat, 1 Feb 2014 11:16:20 +0800
Subject: [PATCH 0748/3789] Update cython

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

diff --git a/pkgs/development/interpreters/cython/default.nix b/pkgs/development/interpreters/cython/default.nix
index 34bd63c29ab..83e5be6e255 100644
--- a/pkgs/development/interpreters/cython/default.nix
+++ b/pkgs/development/interpreters/cython/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, pkgconfig }:
 
 stdenv.mkDerivation {
-  name = "cython-0.16";
+  name = "cython-0.20";
 
   src = fetchurl {
-    url = http://www.cython.org/release/Cython-0.16.tar.gz;
-    sha256 = "1yz6jwv25xx5mbr2nm4l7mi65gvpm63dzi3vrw73p51wbpy525lp";
+    url = http://www.cython.org/release/Cython-0.20.tar.gz;
+    sha256 = "1a3m7zhw8mdyr95fwx7n1scrz82drr433i99dzm1n9dxi0cx2qah";
   };
 
   buildPhase = "python setup.py build --build-base $out";
-- 
GitLab


From 8f7a502af2cb2f000a2a2db9e8791cd6951ab818 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Sat, 1 Feb 2014 12:18:34 +0800
Subject: [PATCH 0749/3789] Add cython3 (python 3), move cython (python 2) to
 subfolder

---
 .../interpreters/cython/{ => 2}/default.nix   |  2 +-
 .../interpreters/cython/3/default.nix         | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++-
 3 files changed, 24 insertions(+), 2 deletions(-)
 rename pkgs/development/interpreters/cython/{ => 2}/default.nix (97%)
 create mode 100644 pkgs/development/interpreters/cython/3/default.nix

diff --git a/pkgs/development/interpreters/cython/default.nix b/pkgs/development/interpreters/cython/2/default.nix
similarity index 97%
rename from pkgs/development/interpreters/cython/default.nix
rename to pkgs/development/interpreters/cython/2/default.nix
index 83e5be6e255..5b3cfd588c9 100644
--- a/pkgs/development/interpreters/cython/default.nix
+++ b/pkgs/development/interpreters/cython/2/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   buildInputs = [ python pkgconfig ];
 
   meta = {
-    description = "An interpreter to help writing C extensions for Python";
+    description = "An interpreter to help writing C extensions for Python 2";
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/interpreters/cython/3/default.nix b/pkgs/development/interpreters/cython/3/default.nix
new file mode 100644
index 00000000000..d977ea87b3e
--- /dev/null
+++ b/pkgs/development/interpreters/cython/3/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, python3, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "cython3-0.20";
+
+  src = fetchurl {
+    url = http://www.cython.org/release/Cython-0.20.tar.gz;
+    sha256 = "1a3m7zhw8mdyr95fwx7n1scrz82drr433i99dzm1n9dxi0cx2qah";
+  };
+
+  buildPhase = "python3 setup.py build --build-base $out";
+
+  installPhase = "python3 setup.py install --prefix=$out";
+
+  buildInputs = [ python3 pkgconfig ];
+
+  meta = {
+    description = "An interpreter to help writing C extensions for Python3";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0de8b6a2d1..217258f43a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2345,7 +2345,8 @@ let
 
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
 
-  cython = callPackage ../development/interpreters/cython { };
+  cython = callPackage ../development/interpreters/cython/2 { };
+  cython3 = callPackage ../development/interpreters/cython/3 { };
 
   dylan = callPackage ../development/compilers/gwydion-dylan {
     dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix {  };
-- 
GitLab


From cf99e5f939138337a00c619520267f3dfa94dbbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 29 Jan 2014 20:38:11 +0100
Subject: [PATCH 0750/3789] IntelliJ IDEA version bump (13.0.1->13.0.2)

---
 pkgs/applications/editors/idea/default.nix | 36 +++++-----------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 74dbaf78dac..93e95c8d87d 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -61,43 +61,23 @@ let
 
 in {
 
-  idea_community_1301 = buildIdea {
-    name = "idea-IC-133.331";
+  idea_community_1302 = buildIdea {
+    name = "idea-IC-133.696";
     description = "IntelliJ IDEA 13 Community Edition";
     license = stdenv.lib.licenses.asl20.shortName;
     src = fetchurl {
-      url = http://download-ln.jetbrains.com/idea/ideaIC-13.0.1.tar.gz;
-      sha256 = "6f268bb1dbe61ed0274fd2ea9b4b7403f50da11bdde208bcfc8c391d235d7c02";
+      url = http://download-ln.jetbrains.com/idea/ideaIC-13.0.2.tar.gz;
+      sha256 = "a776878c2dba877761b74d2886d006f64eec3c9694dbd1578380287a9c8cbd53";
     };
   };
 
-  idea_ultimate_1301 = buildIdea {
-    name = "idea-IU-133.331";
+  idea_ultimate_1302 = buildIdea {
+    name = "idea-IU-133.696";
     description = "IntelliJ IDEA 13 Ultimate Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
-      url = http://download-ln.jetbrains.com/idea/ideaIU-13.0.1.tar.gz;
-      sha256 = "d3638d97b719773459d5027ba096b52695325b241cbf5e31e535165a5f19849d";
-    };
-  };
-
-  idea_community_13 = buildIdea {
-    name = "idea-IC-133.193";
-    description = "IntelliJ IDEA 13 Community Edition";
-    license = stdenv.lib.licenses.asl20.shortName;
-    src = fetchurl {
-      url = http://download-ln.jetbrains.com/idea/ideaIC-13.tar.gz;
-      sha256 = "5cd88b8effc5e4e55d999df1cec6f54c53b5adf0b88e49400b3a185bef7db13a";
-    };
-  };
-
-  idea_ultimate_13 = buildIdea {
-    name = "idea-IU-133.193";
-    description = "IntelliJ IDEA 13 Ultimate Edition";
-    license = stdenv.lib.licenses.unfree;
-    src = fetchurl {
-      url = http://download-ln.jetbrains.com/idea/ideaIU-13.tar.gz;
-      sha256 = "211a782654d04f2fe5fce9084043edfb8355a7bc4dc41fee7dc79cfe604d4654";
+      url = http://download-ln.jetbrains.com/idea/ideaIU-13.0.2.tar.gz;
+      sha256 = "7ba9499ecc82029470712d6ead520db1e2cf520e4f86d382cbdea1d0052712d0";
     };
   };
 
-- 
GitLab


From f06c3ef47f031fb9eb158ce600ced6c2dc99ff04 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Fri, 31 Jan 2014 21:27:55 +0800
Subject: [PATCH 0751/3789] Fix previous simutrans 112.3 build

This fixes commit b5d19fad6710e786a80f9584e65f4f17e9678c24
---
 pkgs/games/simutrans/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index 1a75aa46095..196561d1e37 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -26,8 +26,8 @@ let
     sha256 = "1ng963n2gvnwmsj73iy3gp9i5iqf5g6qk1gh1jnfm86gnjrsrq4m";
   };
   pak128 = fetchurl {
-    url = "mirror://sourceforge/simutrans/pak128/pak128%20for%20${ver_1}/pak128-2.2.0--${ver_1}.0.zip";
-    sha256 = "13rwv9q3fa3ac0k11ds7zkpd00k4mn14rb0cknknvyz46icb9n80";
+    url = "mirror://sourceforge/simutrans/pak128/pak128%20for%20${ver_1}/pak128-2.3.0--${ver_1}.2.zip";
+    sha256 = "0jcif6mafsvpvxh1njyd6z2f6sab0fclq3f3nlg765yp3i1bfgff";
   };
 
   withPak = pak: stdenv.mkDerivation {
@@ -46,6 +46,12 @@ let
       url = "mirror://sourceforge/simutrans/simutrans/${ver_h2}/simutrans-src-${ver_h2}.zip";
       sha256 = "0jdq2krfj3qsh8dks9ixsdvpyjq9yi80p58b0xjpsn35mkbxxaca";
     };
+
+    # this resource is needed since 112.2 because the folders in simutrans directory has been removed from source code
+    resources = fetchurl {
+      url = "mirror://sourceforge/simutrans/simutrans/${ver_h2}/simulinux-${ver_h2}.zip";
+      sha256 = "14ly341pdkr8r3cd0q49w424m79iz38iaxfi9l1yfcxl8idkga1c";
+    };
     sourceRoot = ".";
 
     buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ];
@@ -72,6 +78,7 @@ let
     installPhase = ''
       mkdir -p $out/share/
       mv simutrans $out/share/
+      unzip -o ${resources} -d $out/share/
 
       mkdir -p $out/bin/
       mv build/default/sim $out/bin/simutrans
-- 
GitLab


From 0828be1597d89859dc25ebe0af79fd3c9e539549 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 27 Jan 2014 14:31:27 +0000
Subject: [PATCH 0752/3789] xmlindent: New expression
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn Forsman <bjorn.forsman@gmail.com>:
 - introduce "name-${version}" (to not duplicate version number)
 - use mirror://sourceforge instead of specific mirror URL
 - add vertical whitespace between attributes
 - add meta description and homepage attributes
 - place the top-level 'xmlindent' attribute in alphabetial order
]
---
 pkgs/development/web/xmlindent/default.nix | 25 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/web/xmlindent/default.nix

diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/development/web/xmlindent/default.nix
new file mode 100644
index 00000000000..f0966357d93
--- /dev/null
+++ b/pkgs/development/web/xmlindent/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, flex }:
+
+stdenv.mkDerivation rec {
+  name = "xmlindent-${version}";
+  version = "0.2.17";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/xmlindent/xmlindent/${version}/${name}.tar.gz";
+    sha256 = "0k15rxh51a5r4bvfm6c4syxls8al96cx60a9mn6pn24nns3nh3rs";
+  };
+
+  buildInputs = [ flex ];
+
+  preConfigure = ''
+    substituteInPlace Makefile --replace "PREFIX=/usr/local" "PREFIX=$out"
+  '';
+
+  meta = {
+    description = "XML stream reformatter";
+    homepage = http://xmlindent.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.ocharles ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 217258f43a8..76b52f899d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3776,6 +3776,8 @@ let
 
   xc3sprog = callPackage ../development/tools/misc/xc3sprog { };
 
+  xmlindent = callPackage ../development/web/xmlindent {};
+
   xxdiff = callPackage ../development/tools/misc/xxdiff {
     bison = bison2;
   };
-- 
GitLab


From 03be686dec19302499bb7e20d7385c06ee8be57d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 25 Jan 2014 16:45:15 -0600
Subject: [PATCH 0753/3789] ccid: Update from 1.4.13 -> 1.4.14

---
 pkgs/tools/security/ccid/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index ad1cb6bec90..4be2393eed5 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
 stdenv.mkDerivation rec {
-  name = "ccid-1.4.13";
+  version = "1.4.14";
+  name = "ccid-${version}";
 
   src = fetchurl {
-    url = "http://pkgs.fedoraproject.org/repo/pkgs/pcsc-lite-ccid/ccid-1.4.13.tar.bz2/89c167a873df1f8bc0dc907ce209e5ff/ccid-1.4.13.tar.bz2";
-    sha256 = "1w0mxb5qzps9x2fcggv958mwgwmvfxxj4nspxs67fa7qg7r6yxar";
+    url = "http://ftp.de.debian.org/debian/pool/main/c/ccid/ccid_${version}.orig.tar.bz2";
+    sha256 = "0inibkhzk4ghg85jkysscjrzshmxfdzz6b54dqj182l0isn082y5";
   };
 
   patchPhase = ''
-- 
GitLab


From 40f202e4a069d3d4232bb80c7e2e45a64f18aeb1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 25 Jan 2014 16:51:09 -0600
Subject: [PATCH 0754/3789] pcsclite: Upgrade from 1.8.8 -> 1.8.10

---
 pkgs/tools/security/pcsclite/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index de0fef9b73f..18fa1045153 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl }:
 
 stdenv.mkDerivation rec {
-  name = "pcsclite-1.8.8";
+  version = "1.8.10";
+  name = "pcsclite-${version}";
 
   src = fetchurl {
-    url = "http://alioth.debian.org/frs/download.php/3862/${name}.tar.bz2";
-    sha256 = "1rw5530vr2jf02ziyf32jbd98n5q8zjcfwp5nkw3x3bkgr53arpy";
+    url = "http://ftp.de.debian.org/debian/pool/main/p/pcsc-lite/pcsc-lite_${version}.orig.tar.bz2";
+    sha256 = "04i63zi9ayg38z3cahp6gf3rgx23w17bmcpdccm2hvaj63blnz30";
   };
 
   # The OS should care on preparing the drivers into this location
-- 
GitLab


From f0be5119d9cf293d92d31967d6187bbd0b51e695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 1 Feb 2014 19:56:54 +0100
Subject: [PATCH 0755/3789] ruby/patches.nix: sort attributes alphabetically

And remove trailing whitespace.
---
 .../development/interpreters/ruby/patches.nix | 98 +++++++++----------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix
index c5ab0f5e5e2..10cbf1ecfe5 100644
--- a/pkgs/development/interpreters/ruby/patches.nix
+++ b/pkgs/development/interpreters/ruby/patches.nix
@@ -10,10 +10,29 @@ let
     find "$1" -type f -name "*.rb" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g"
     find "$1" -type f -name "*.mk" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g"
   '';
-  
+
 in
 
 {
+  buildr = {
+    # Many Buildfiles rely on RUBYLIB containing the current directory
+    # (as was the default in Ruby < 1.9.2).
+    extraWrapperFlags = "--prefix RUBYLIB : .";
+  };
+
+  fakes3 = {
+    postInstall = ''
+      cd $out/${ruby.gemPath}/gems/*
+      patch -Np1 -i ${../../ruby-modules/fake-s3-list-bucket.patch}
+    '';
+  };
+
+  ffi = {
+    postUnpack = "onetuh";
+    buildFlags = ["--with-ffi-dir=${libffi}"];
+    NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv;
+  };
+
   iconv = { buildInputs = [ libiconvOrEmpty ]; };
 
   libv8 = {
@@ -26,16 +45,16 @@ in
     #
     # Finally, we must set CC and AR explicitly to allow scons to find the
     # compiler and archiver
-    
+
     preBuild = ''
       cat > $TMPDIR/g++ <<EOF
       #! ${stdenv.shell}
       $(export)
-      
+
       g++ \$(echo \$@ | sed 's/-Werror//g')
       EOF
       chmod +x $TMPDIR/g++
-      
+
       export CXX=$TMPDIR/g++
       export AR=$(type -p ar)
     '';
@@ -48,22 +67,18 @@ in
       done
     '';
   };
-  
-  sqlite3 = { propagatedBuildInputs = [ sqlite ]; };
-  
-  rails = { gemFlags = "--no-ri --no-rdoc"; };
-  
+
   ncurses = { propagatedBuildInputs = [ ncurses ]; };
 
+  ncursesw = { propagatedBuildInputs = [ ncurses ]; };
+
   nix = {
     postInstall = ''
       cd $out/${ruby.gemPath}/gems/nix*
       patch -Np1 -i ${./fix-gem-nix-versions.patch}
     '';
   };
-  
-  ncursesw = { propagatedBuildInputs = [ ncurses ]; };
-  
+
   nokogiri = {
     buildFlags =
       [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2"
@@ -71,10 +86,13 @@ in
       ];
   };
 
-  ffi = {
-    postUnpack = "onetuh";
-    buildFlags = ["--with-ffi-dir=${libffi}"];
-    NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv;
+  pry = { gemFlags = "--no-ri --no-rdoc"; };
+
+  rails = { gemFlags = "--no-ri --no-rdoc"; };
+
+  rjb = {
+    buildInputs = [ jdk ];
+    JAVA_HOME = jdk;
   };
 
   rmagick = {
@@ -83,21 +101,7 @@ in
     NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick-6";
   };
 
-  xrefresh_server =
-    let
-      patch = fetchurl {
-        url = "http://mawercer.de/~nix/xrefresh.diff.gz";
-        sha256 = "1f7bnmn1pgkmkml0ms15m5lx880hq2sxy7vsddb3sbzm7n1yyicq";
-      };
-    in {
-      propagatedBuildInputs = [ gems.rb_inotify ];
-
-      # monitor implementation for Linux
-      postInstall = ''
-        cd $out/${ruby.gemPath}/gems/*
-        zcat ${patch} | patch -p 1
-      ''; # */
-    };
+  sqlite3 = { propagatedBuildInputs = [ sqlite ]; };
 
   xapian_full = {
     buildInputs = [ gems.rake zlib libuuid ];
@@ -112,23 +116,19 @@ in
     buildInputs = [ zlib libuuid ];
   };
 
-  rjb = {
-    buildInputs = [ jdk ];
-    JAVA_HOME = jdk;
-  };
-
-  buildr = {
-    # Many Buildfiles rely on RUBYLIB containing the current directory
-    # (as was the default in Ruby < 1.9.2).
-    extraWrapperFlags = "--prefix RUBYLIB : .";
-  };
-  
-  pry = { gemFlags = "--no-ri --no-rdoc"; };
+  xrefresh_server =
+    let
+      patch = fetchurl {
+        url = "http://mawercer.de/~nix/xrefresh.diff.gz";
+        sha256 = "1f7bnmn1pgkmkml0ms15m5lx880hq2sxy7vsddb3sbzm7n1yyicq";
+      };
+    in {
+      propagatedBuildInputs = [ gems.rb_inotify ];
 
-  fakes3 = {
-    postInstall = ''
-      cd $out/${ruby.gemPath}/gems/*
-      patch -Np1 -i ${../../ruby-modules/fake-s3-list-bucket.patch}
-    '';
-  };
+      # monitor implementation for Linux
+      postInstall = ''
+        cd $out/${ruby.gemPath}/gems/*
+        zcat ${patch} | patch -p 1
+      ''; # */
+    };
 }
-- 
GitLab


From a7373528628c47edd57a62bb7ad9bed6259127fa Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Mon, 27 Jan 2014 22:17:23 +0100
Subject: [PATCH 0756/3789] silver-searcher: updated to 0.19.1

---
 pkgs/tools/text/silver-searcher/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index 83a89cfb602..adc8d9ec486 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchgit, autoreconfHook, pkgconfig, pcre, zlib, lzma}:
 
-let release = "0.18.1"; in
+let release = "0.19.1"; in
 stdenv.mkDerivation {
   name = "silver-searcher-${release}";
 
   src = fetchgit {
     url = "https://github.com/ggreer/the_silver_searcher.git";
     rev = "refs/tags/${release}";
-    sha256 = "bf2c8f3c68895e0ee00d373c1d87201e806b413bb28373ee168e375f2a095ec5";
+    sha256 = "1km3ap74mls7vkp6si4f302zb1ifmldipjyfw2z9akqpvr3n44p9";
   };
 
   buildInputs = [ autoreconfHook pkgconfig pcre zlib lzma ];
-- 
GitLab


From 4900d6561bda910f5b7e8839e904a97c942aac9c Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Sun, 2 Feb 2014 02:43:11 +0100
Subject: [PATCH 0757/3789] Follow renaming of services.xserver.videoDrivers to
 services.mesa.videoDrivers for VirtualBox Guest

---
 nixos/modules/virtualisation/virtualbox-guest.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
index 664fd21781c..9dda455e5d3 100644
--- a/nixos/modules/virtualisation/virtualbox-guest.nix
+++ b/nixos/modules/virtualisation/virtualbox-guest.nix
@@ -52,7 +52,7 @@ optionalAttrs (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) # ugly...
         serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/sbin/VBoxService VBoxService --foreground";
       };
 
-    services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" ];
+    services.mesa.videoDrivers = mkOverride 50 [ "virtualbox" ];
 
     services.xserver.config =
       ''
-- 
GitLab


From 37b1c1481be10e20be0f05cf687eefcd303246cf Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 2 Feb 2014 07:43:00 +0200
Subject: [PATCH 0758/3789] bangarang: fix build with gcc 4.7

---
 pkgs/applications/video/bangarang/default.nix |  2 +
 .../video/bangarang/gcc-4.7.patch             | 45 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/applications/video/bangarang/gcc-4.7.patch

diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix
index 5dde88076a1..1058243c0e0 100644
--- a/pkgs/applications/video/bangarang/default.nix
+++ b/pkgs/applications/video/bangarang/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ kdelibs phonon soprano shared_desktop_ontologies kdemultimedia taglib gettext ];
   nativeBuildInputs = [ cmake ];
 
+  patches = [ ./gcc-4.7.patch ];
+
   meta = with stdenv.lib; {
     description = "A media player for KDE based on Nepomuk and Phonon";
     longDescription = ''
diff --git a/pkgs/applications/video/bangarang/gcc-4.7.patch b/pkgs/applications/video/bangarang/gcc-4.7.patch
new file mode 100644
index 00000000000..d4f650b9caf
--- /dev/null
+++ b/pkgs/applications/video/bangarang/gcc-4.7.patch
@@ -0,0 +1,45 @@
+commit b893fcdb7ddfc8c59fd29a29b7265a713c3dbab1
+Author: Alex Fiestas <afiestas@kde.org>
+Date:   Thu Mar 29 10:09:22 2012 +0200
+
+    Build fix: Add unistd.h include since sleep is defined there
+
+diff --git a/src/platform/infofetchers/lastfminfofetcher.cpp b/src/platform/infofetchers/lastfminfofetcher.cpp
+index 0c49d69..fcc4cd3 100644
+--- a/src/platform/infofetchers/lastfminfofetcher.cpp
++++ b/src/platform/infofetchers/lastfminfofetcher.cpp
+@@ -32,6 +32,8 @@
+ #include <QFile>
+ #include <QTextEdit>
+ 
++#include <unistd.h>
++
+ LastfmInfoFetcher::LastfmInfoFetcher(QObject *parent) :
+         InfoFetcher(parent)
+ {
+diff --git a/src/platform/infofetchers/tmdbinfofetcher.cpp b/src/platform/infofetchers/tmdbinfofetcher.cpp
+index 7801644..3c01960 100644
+--- a/src/platform/infofetchers/tmdbinfofetcher.cpp
++++ b/src/platform/infofetchers/tmdbinfofetcher.cpp
+@@ -30,6 +30,8 @@
+ #include <QDomDocument>
+ #include <QFile>
+ 
++#include <unistd.h>
++
+ TMDBInfoFetcher::TMDBInfoFetcher(QObject *parent) :
+         InfoFetcher(parent)
+ {
+diff --git a/src/platform/infofetchers/tvdbinfofetcher.cpp b/src/platform/infofetchers/tvdbinfofetcher.cpp
+index ff351b0..670ed18 100644
+--- a/src/platform/infofetchers/tvdbinfofetcher.cpp
++++ b/src/platform/infofetchers/tvdbinfofetcher.cpp
+@@ -30,6 +30,8 @@
+ #include <QDomDocument>
+ #include <QFile>
+ 
++#include <unistd.h>
++
+ TVDBInfoFetcher::TVDBInfoFetcher(QObject *parent) :
+         InfoFetcher(parent)
+ {
-- 
GitLab


From 72a8329ee2a598bd28787f276ccafa959fe60875 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 2 Feb 2014 07:43:30 +0200
Subject: [PATCH 0759/3789] vidalia: fix build with gcc-4.7

---
 pkgs/tools/security/vidalia/default.nix   |  2 ++
 pkgs/tools/security/vidalia/gcc-4.7.patch | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/tools/security/vidalia/gcc-4.7.patch

diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix
index 4d216bee0b6..6ce09499780 100644
--- a/pkgs/tools/security/vidalia/default.nix
+++ b/pkgs/tools/security/vidalia/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake qt4 doxygen ];
 
+  patches = [ ./gcc-4.7.patch ];
+
   meta = with stdenv.lib; {
     homepage = https://www.torproject.org/projects/vidalia.html.en;
     description = "a cross-platform graphical controller for the Tor software, built using the Qt framework";
diff --git a/pkgs/tools/security/vidalia/gcc-4.7.patch b/pkgs/tools/security/vidalia/gcc-4.7.patch
new file mode 100644
index 00000000000..4c163af760c
--- /dev/null
+++ b/pkgs/tools/security/vidalia/gcc-4.7.patch
@@ -0,0 +1,12 @@
+diff -ru vidalia-0.3.1_orig/src/vidalia/plugin/PluginEngine.cpp vidalia-0.3.1/src/vidalia/plugin/PluginEngine.cpp
+--- vidalia-0.3.1_orig/src/vidalia/plugin/PluginEngine.cpp	2012-08-08 18:02:01.901732270 +0200
++++ vidalia-0.3.1/src/vidalia/plugin/PluginEngine.cpp	2012-08-08 18:03:26.241677875 +0200
+@@ -20,6 +20,8 @@
+ 
+ #include "Vidalia.h"
+ 
++#include <unistd.h>
++
+ PluginEngine::PluginEngine(QObject *parent)
+   : QScriptEngine(parent)
+ {
-- 
GitLab


From 2ed3c10cbed8772fc1a14955207902ed9a490dfb Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 2 Feb 2014 07:45:08 +0200
Subject: [PATCH 0760/3789] youtubeDL: update from 2014.01.23.4 to 2014.01.30.2

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 40a2f7f481d..cca459c1a29 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.01.23.4";
+  version = "2014.01.30.2";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0wnw11s3k191wqf3h13ibdbkgdyabv3gigsjk5xq3sqswlmmcvd9";
+    sha256 = "1bx4ip1d4gp057nha4ylj2baksxg8kkxgvsdcx6bj36wbb0f8fl9";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From 22690a8cd534ffc181f737d57001e39dbfb8e8a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Feb 2014 08:33:19 +0100
Subject: [PATCH 0761/3789] kmod-blacklist-ubuntu: fetch from tar.gz, not
 bazaar

Now the source is just a miniature archive.
---
 .../linux/kmod-blacklist-ubuntu/default.nix   | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index 9da50766f92..57994420935 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -1,19 +1,18 @@
-{ stdenv, fetchbzr }:
+{ stdenv, fetchurl }:
+let
+  version = "3ubuntu1"; # Saucy
+in
+stdenv.mkDerivation {
+  name = "kmod-blacklist-${version}";
 
-stdenv.mkDerivation rec {
-  name = "blacklist-ubuntu-${builtins.toString src.revision}"; # Saucy
-
-  src = fetchbzr {
-    url = meta.homepage;
-    sha256 = "0ci4b5dxzirc27zvgpr3s0pa78gjmfjwprmvyplxhwxb765la9v9";
-    revision = 13;
+  src = fetchurl {
+    url = "http://archive.ubuntu.com/ubuntu/pool/main/k/kmod/kmod_9-${version}.debian.tar.gz";
+    sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67";
   };
 
-  unpackPhase = "true";
-
   installPhase = ''
     mkdir "$out"
-    for f in "$src"/debian/modprobe.d/*.conf; do
+    for f in modprobe.d/*.conf; do
       echo "''\n''\n## file: "`basename "$f"`"''\n''\n" >> "$out"/modprobe.conf
       cat "$f" >> "$out"/modprobe.conf
     done
@@ -22,7 +21,7 @@ stdenv.mkDerivation rec {
   #TODO: iwlwifi.conf has some strange references
 
   meta = {
-    homepage = https://code.launchpad.net/~ubuntu-branches/ubuntu/saucy/kmod/saucy;
+    homepage = http://packages.ubuntu.com/source/saucy/kmod;
     description = "Linux kernel module blacklists from Ubuntu";
   };
 }
-- 
GitLab


From 80f8b2cfbd2cffa2e8e2b4d9fcde9745ac99d835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Feb 2014 09:41:39 +0100
Subject: [PATCH 0762/3789] kmod-blacklist-ubuntu: fix references to binaries

---
 .../linux/kmod-blacklist-ubuntu/default.nix           | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index 57994420935..682c36401de 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, gnugrep, findutils }:
 let
   version = "3ubuntu1"; # Saucy
 in
@@ -16,9 +16,14 @@ stdenv.mkDerivation {
       echo "''\n''\n## file: "`basename "$f"`"''\n''\n" >> "$out"/modprobe.conf
       cat "$f" >> "$out"/modprobe.conf
     done
-  '';
 
-  #TODO: iwlwifi.conf has some strange references
+    substituteInPlace "$out"/modprobe.conf \
+      --replace /sbin/lsmod /run/booted-system/sw/bin/lsmod \
+      --replace /sbin/rmmod /run/booted-system/sw/sbin/rmmod \
+      --replace /sbin/modprobe /run/booted-system/sw/sbin/modprobe \
+      --replace " grep " " ${gnugrep}/bin/grep " \
+      --replace " xargs " " ${findutils}/bin/xargs "
+  '';
 
   meta = {
     homepage = http://packages.ubuntu.com/source/saucy/kmod;
-- 
GitLab


From 546315d9338ae1a6a783abb4efec4d1209e8bda4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 2 Feb 2014 12:50:57 +0400
Subject: [PATCH 0763/3789] Update/fix merkaartor to 0.18.1

---
 pkgs/applications/misc/merkaartor/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 6d10cbb8c21..e6636415b5e 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchurl, qt4, boost}:
+{stdenv, fetchurl, qt4, boost, proj, gdal}:
 
 stdenv.mkDerivation rec {
-  name = "merkaartor-0.17.2";
+  name = "merkaartor-0.18.1";
   src = fetchurl {
-    url = "http://merkaartor.be/attachments/download/253/merkaartor-0.17.2.tar.bz2";
-    sha256 = "0akhp9czzn39132mgj9h38nlh4l9ibzn3vh93bfs685zxyn4yps2";
+    url = "http://merkaartor.be/attachments/download/301/merkaartor-0.18.1.tar.bz2";
+    sha256 = "17qk45pmlxqigla1915dvn9pp91y85d2bkcaap4g3m8mk1crcsix";
   };
 
   configurePhase = ''
     qmake -makefile PREFIX=$out
   '';
 
-  buildInputs = [ qt4 boost ];
+  buildInputs = [ qt4 boost proj gdal ];
 
   meta = {
     description = "An openstreetmap editor";
-- 
GitLab


From 14a6a059f5863bfd9e7c69336baa8a918b41a86a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 2 Feb 2014 12:54:04 +0400
Subject: [PATCH 0764/3789] Use gcc-4.6.0 for avr-gcc-libc

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76b52f899d5..d49dc207133 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3323,7 +3323,10 @@ let
     samples = true;
   };
 
-  avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc {};
+  avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc {
+    gcc = gcc46;
+    stdenv = overrideGCC stdenv gcc46;
+  };
 
   avr8burnomat = callPackage ../development/misc/avr8-burn-omat { };
 
-- 
GitLab


From fcaa782b6ab7cd18b8ccca82cc6615b0b3c36b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Feb 2014 10:00:56 +0100
Subject: [PATCH 0765/3789] mesa: revert to 9.2.* until the driver problems are
 fixed

I was unable to make the gallium drivers not to miss some LLVM RTTI stuff.
9.* don't build with llvm-3.4.
---
 pkgs/development/libraries/mesa/default.nix   |  14 +-
 .../libraries/mesa/dricore-gallium.patch      | 216 ++++++++++++++++++
 .../libraries/mesa/werror-wundef.patch        |  12 +
 pkgs/top-level/all-packages.nix               |   2 +-
 4 files changed, 236 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/libraries/mesa/dricore-gallium.patch
 create mode 100644 pkgs/development/libraries/mesa/werror-wundef.patch

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 1eb3258b14b..68333892fd4 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,8 +23,8 @@ else
 */
 
 let
-  version = "10.0.2";
-  # this is the default search path for DRI drivers
+  version = "9.2.5";
+  # this is the default search path for DRI drivers (note: X server no longer introduces an overriding env var)
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
 with { inherit (stdenv.lib) optional optionals optionalString; };
@@ -34,15 +34,15 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "0zkayy6gl0nwgqg11ga95vl4z0hldcz1b77qzzc1agm5vziah0j5";
+    sha256 = "1w3bxclgwl2hwyxk3za7dbdakb8jsya7afck35cz0v8pxppvjsml";
   };
 
   prePatch = "patchShebangs .";
 
   patches = [
     ./static-gallium.patch
-   # TODO: revive ./dricore-gallium.patch when it gets ported (from Ubuntu),
-   #  as it saved ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog
+    ./dricore-gallium.patch
+    ./werror-wundef.patch
   ];
 
   # Change the search path for EGL drivers from $drivers/* to driverLink
@@ -69,7 +69,7 @@ stdenv.mkDerivation {
     "--enable-osmesa" # used by wine
 
     "--with-dri-drivers=i965,r200,radeon"
-    ("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,radeonsi")
+    "--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,radeonsi"
     "--with-egl-platforms=x11,wayland,drm" "--enable-gbm" "--enable-shared-glapi"
   ]
     ++ optional enableTextureFloats "--enable-texture-float"
@@ -94,7 +94,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
   #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672,
-    #tests for 10.* fail to link due to some RTTI problem
+    # also, 10.* links bad due to some RTTI problem
 
   # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM;
   #   also move libOSMesa to $osmesa, as it's relatively big
diff --git a/pkgs/development/libraries/mesa/dricore-gallium.patch b/pkgs/development/libraries/mesa/dricore-gallium.patch
new file mode 100644
index 00000000000..9a8b6768277
--- /dev/null
+++ b/pkgs/development/libraries/mesa/dricore-gallium.patch
@@ -0,0 +1,216 @@
+commit 5208f187c7dade2c33385a56c1a5f1c3cedc8377 (HEAD, nix-patches)
+Author: Vladimír Čunát <vcunat@gmail.com>
+Date:   Mon May 13 11:34:59 2013 +0200
+
+    118-dricore-gallium.patch
+
+diff --git a/configure.ac b/configure.ac
+index be89843..08f6761 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -928,6 +928,8 @@ AC_SUBST([GLESv2_LIB_DEPS])
+ AC_SUBST([GLESv2_PC_LIB_PRIV])
+ 
+ DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la"
++MESAGALLIUM_LIBS="${DRI_LIB_DEPS}"
++AC_SUBST([MESAGALLIUM_LIBS], ${MESAGALLIUM_LIBS})
+ 
+ AC_SUBST([HAVE_XF86VIDMODE])
+ 
+diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
+index 3cdec83..53ff69b 100644
+--- a/src/gallium/auxiliary/Makefile.am
++++ b/src/gallium/auxiliary/Makefile.am
+@@ -34,14 +34,14 @@ if LLVM_NEEDS_FNORTTI
+ 
+ AM_CXXFLAGS += -fno-rtti
+ 
+-libgallium_la_LIBADD = $(LLVM_LIBS)
+-
+ endif
+ 
+ libgallium_la_SOURCES += \
+ 	$(GALLIVM_SOURCES) \
+ 	$(GALLIVM_CPP_SOURCES)
+ 
++libgallium_la_LIBADD = ../../mesa/libdricore/libmesagallium.la $(LLVM_LIBS) $(GALLIUM_DRI_LIB_DEPS)
++
+ endif
+ 
+ indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py
+diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am
+index f4f9030..e9b9462 100644
+--- a/src/gallium/targets/dri-i915/Makefile.am
++++ b/src/gallium/targets/dri-i915/Makefile.am
+@@ -49,7 +49,7 @@ i915_dri_la_SOURCES = \
+ i915_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+ 
+ i915_dri_la_LIBADD = \
+-	$(top_builddir)/src/mesa/libmesagallium.la \
++	@MESAGALLIUM_LIBS@ \
+ 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
+ 	$(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
+diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am
+index 69ccf32..fef4c63 100644
+--- a/src/gallium/targets/dri-nouveau/Makefile.am
++++ b/src/gallium/targets/dri-nouveau/Makefile.am
+@@ -48,7 +48,7 @@ nouveau_dri_la_SOURCES = \
+ nouveau_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+ 
+ nouveau_dri_la_LIBADD = \
+-	$(top_builddir)/src/mesa/libmesagallium.la \
++	@MESAGALLIUM_LIBS@ \
+ 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
+ 	$(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
+diff --git a/src/gallium/targets/dri-r300/Makefile.am b/src/gallium/targets/dri-r300/Makefile.am
+index 8c0215d..6beb536 100644
+--- a/src/gallium/targets/dri-r300/Makefile.am
++++ b/src/gallium/targets/dri-r300/Makefile.am
+@@ -49,7 +49,7 @@ r300_dri_la_SOURCES = \
+ r300_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+ 
+ r300_dri_la_LIBADD = \
+-	$(top_builddir)/src/mesa/libmesagallium.la \
++	@MESAGALLIUM_LIBS@ \
+ 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
+ 	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
+diff --git a/src/gallium/targets/dri-r600/Makefile.am b/src/gallium/targets/dri-r600/Makefile.am
+index 2b3524b..d40fb89 100644
+--- a/src/gallium/targets/dri-r600/Makefile.am
++++ b/src/gallium/targets/dri-r600/Makefile.am
+@@ -48,7 +48,7 @@ r600_dri_la_SOURCES = \
+ r600_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+ 
+ r600_dri_la_LIBADD = \
+-	$(top_builddir)/src/mesa/libmesagallium.la \
++	@MESAGALLIUM_LIBS@ \
+ 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ 	$(top_builddir)/src/gallium/drivers/r600/libr600.la \
+ 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
+diff --git a/src/gallium/targets/dri-radeonsi/Makefile.am b/src/gallium/targets/dri-radeonsi/Makefile.am
+index f7d87a6..87ab2aa 100644
+--- a/src/gallium/targets/dri-radeonsi/Makefile.am
++++ b/src/gallium/targets/dri-radeonsi/Makefile.am
+@@ -49,7 +49,7 @@ radeonsi_dri_la_SOURCES = \
+ radeonsi_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+ 
+ radeonsi_dri_la_LIBADD = \
+-	$(top_builddir)/src/mesa/libmesagallium.la \
++	@MESAGALLIUM_LIBS@ \
+ 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ 	$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
+ 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
+diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am
+index 1104379..72d2401 100644
+--- a/src/gallium/targets/dri-swrast/Makefile.am
++++ b/src/gallium/targets/dri-swrast/Makefile.am
+@@ -49,7 +49,7 @@ swrast_dri_la_SOURCES = \
+ swrast_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+ 
+ swrast_dri_la_LIBADD = \
+-	$(top_builddir)/src/mesa/libmesagallium.la \
++	@MESAGALLIUM_LIBS@ \
+ 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ 	$(top_builddir)/src/gallium/state_trackers/dri/sw/libdrisw.la \
+ 	$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
+diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am
+index ca7df65..4384976 100644
+--- a/src/gallium/targets/dri-vmwgfx/Makefile.am
++++ b/src/gallium/targets/dri-vmwgfx/Makefile.am
+@@ -48,7 +48,7 @@ vmwgfx_dri_la_SOURCES = \
+ vmwgfx_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+ 
+ vmwgfx_dri_la_LIBADD = \
+-	$(top_builddir)/src/mesa/libmesagallium.la \
++	@MESAGALLIUM_LIBS@ \
+ 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
+ 	$(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
+diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
+index 5c40ae8..6922ab2 100644
+--- a/src/gallium/targets/egl-static/Makefile.am
++++ b/src/gallium/targets/egl-static/Makefile.am
+@@ -104,7 +104,7 @@ AM_CPPFLAGS += \
+ 	$(API_DEFINES)
+ 
+ egl_gallium_la_LIBADD += \
+-	$(top_builddir)/src/mesa/libmesagallium.la
++	@MESAGALLIUM_LIBS@
+ # make st/mesa built-in when there is a single glapi provider
+ if HAVE_SHARED_GLAPI
+ egl_gallium_la_LIBADD += \
+diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
+index 41483dd..0045a673 100644
+--- a/src/mesa/Makefile.am
++++ b/src/mesa/Makefile.am
+@@ -75,9 +75,6 @@ noinst_LTLIBRARIES += libmesa.la
+ else
+ check_LTLIBRARIES = libmesa.la
+ endif
+-if HAVE_GALLIUM
+-noinst_LTLIBRARIES += libmesagallium.la
+-endif
+ 
+ SRCDIR = $(top_srcdir)/src/mesa/
+ BUILDDIR = $(top_builddir)/src/mesa/
+@@ -119,15 +116,6 @@ libmesa_la_LIBADD = \
+         $()
+ libmesa_la_LDFLAGS =
+ 
+-libmesagallium_la_SOURCES = \
+-	$(MESA_GALLIUM_FILES) \
+-        $(MESA_ASM_FILES_FOR_ARCH)
+-
+-libmesagallium_la_LIBADD = \
+-        $(top_builddir)/src/glsl/libglsl.la \
+-        $(top_builddir)/src/mesa/program/libprogram.la \
+-        $()
+-
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = gl.pc
+ 
+diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
+index 753548e..8761418 100644
+--- a/src/mesa/libdricore/Makefile.am
++++ b/src/mesa/libdricore/Makefile.am
+@@ -42,6 +42,7 @@ libdricore@VERSION@_la_SOURCES = \
+ libdricore@VERSION@_la_LDFLAGS = -version-number 1:0
+ libdricore@VERSION@_la_LIBADD = \
+         ../program/libdricore_program.la \
++        $(top_builddir)/src/mapi/shared-glapi/libglapi.la
+         $()
+ 
+ if HAVE_X86_ASM
+@@ -65,8 +66,10 @@ AM_CPPFLAGS += \
+         -I$(top_srcdir)/src/mesa/sparc
+ endif
+ 
++lib_LTLIBRARIES =
++
+ if HAVE_DRI
+-lib_LTLIBRARIES = libdricore@VERSION@.la
++lib_LTLIBRARIES += libdricore@VERSION@.la
+ 
+ # Provide compatibility with scripts for the old Mesa build system for
+ # a while by putting a link to the driver into /lib of the build tree.
+@@ -76,6 +79,17 @@ all-local: libdricore@VERSION@.la
+ 	ln -sf libdricore@VERSION@.so.1 $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so
+ endif
+ 
++libmesagallium_la_SOURCES = \
++	$(STATETRACKER_FILES)
++libmesagallium_la_CFLAGS = @LLVM_CFLAGS@
++libmesagallium_la_CXXFLAGS = @LLVM_CXXFLAGS@
++libmesagallium_la_LIBADD = libdricore@VERSION@.la $(LLVM_LIBS)
++
++if HAVE_GALLIUM
++noinst_LTLIBRARIES = libmesagallium.la
++endif
++
++
+ CLEANFILES = \
+ 	$(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so.1 \
+ 	$(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so
diff --git a/pkgs/development/libraries/mesa/werror-wundef.patch b/pkgs/development/libraries/mesa/werror-wundef.patch
new file mode 100644
index 00000000000..4663f68bd7d
--- /dev/null
+++ b/pkgs/development/libraries/mesa/werror-wundef.patch
@@ -0,0 +1,12 @@
+diff -rupN Mesa-9.2.0-orig/include/GL/gl.h Mesa-9.2.0/include/GL/gl.h
+--- Mesa-9.2.0-orig/include/GL/gl.h	2013-08-14 03:34:42.000000000 +0200
++++ Mesa-9.2.0/include/GL/gl.h	2013-09-24 19:34:58.319140812 +0200
+@@ -2088,7 +2088,7 @@ typedef void (APIENTRYP PFNGLMULTITEXCOO
+ 
+ 
+ 
+-#if GL_ARB_shader_objects
++#if defined(GL_ARB_shaders_objects) && GL_ARB_shader_objects
+ 
+ #ifndef GL_MESA_shader_debug
+ #define GL_MESA_shader_debug 1
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4693d5cf24d..1cfa3a111d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5104,7 +5104,7 @@ let
 
   mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
 
-  mesa_original = callPackage ../development/libraries/mesa { };
+  mesa_original = callPackage ../development/libraries/mesa { llvm = llvm_33; };
   mesa_noglu = if stdenv.isDarwin
     then darwinX11AndOpenGL // { driverLink = mesa_noglu; }
     else mesa_original;
-- 
GitLab


From fbff019f08394e433fc1099a10eb230858094912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Feb 2014 10:41:00 +0100
Subject: [PATCH 0766/3789] gtk3: bugfix update 3.10.6 -> .7, fix bad URI

The bad URI was introduced by changing the name in 4881100.
---
 pkgs/development/libraries/gtk+/3.x.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 6360d67cf20..9f89fc074f1 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -10,14 +10,15 @@ assert cupsSupport -> cups != null;
 
 let
   ver_maj = "3.10";
-  ver_min = "6";
+  ver_min = "7";
+  version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
-  name = "gtk+3-${ver_maj}.${ver_min}";
+  name = "gtk+3-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtk+/${ver_maj}/${name}.tar.xz";
-    sha256 = "12i6n2vijglqgc7z5migllhpygg65fqzfgrsknimwynbqmzwa91w";
+    url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
+    sha256 = "09wlsim4immrws0fyvpk03sspsljcsgybrwp73scycah70axxsdp";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From d92f6c19db554318fab12c59e05381990fdc47f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Feb 2014 10:42:53 +0100
Subject: [PATCH 0767/3789] gdk-pixbuf: bugfix update 2.30.2 -> .3, enable
 tests

Hopefully the tests will succeed on Hydra, too.
---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 4b92c6470eb..50bab580ebf 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -3,14 +3,14 @@
 
 let
   ver_maj = "2.30";
-  ver_min = "2";
+  ver_min = "3";
 in
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "1gzczsv41h28is4rrxjfyj1qx8ifp23fq2ckh0k099m9fnhbzfna";
+    sha256 = "1524ayaahni9svn88k8ar0906xyvp6j90dmm22aangjpb4zwaaf2";
   };
 
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
     ;
 
-  doCheck = false; # broken animation tester
+  doCheck = true;
 
   postInstall = "rm -rf $out/share/gtk-doc";
 
-- 
GitLab


From e116d88694a0143108ef73f5ef1715119deee512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Feb 2014 10:45:30 +0100
Subject: [PATCH 0768/3789] harfbuzz: minor update 0.9.25 -> .26

---
 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 c69a96795d2..227ac58bda5 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.25";
+  name = "harfbuzz-0.9.26";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "1vkbdny880d60j3v6lvpc6p8fvj6cl7hma27h796qlk9lnbmjvnw";
+    sha256 = "0mz220qv3xn3lk1v94q1wgykayxnas94n8ks1liwkdazs71pvvax";
   };
 
   configureFlags = [
-- 
GitLab


From 32a4081a7f8a162cb10f3afb8cec57165f05e0b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Feb 2014 10:46:08 +0100
Subject: [PATCH 0769/3789] fontconfig: update 2.10.2 -> 2.11.0

Finally. This was blocking pango update for many months.
Hopefully the infinality patches still work with this release.
---
 pkgs/development/libraries/fontconfig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index b2afc427b4c..478c9c9bdb9 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, freetype, expat }:
 
 stdenv.mkDerivation rec {
-  name = "fontconfig-2.10.2";
+  name = "fontconfig-2.11.0";
 
   src = fetchurl {
     url = "http://fontconfig.org/release/${name}.tar.bz2";
-    sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f";
+    sha256 = "0rx4q7wcrz4lkpgcmqkwkp49v1fm0yxl0f35jn75dj1vy3v0w3nb";
   };
 
   infinality_patch = with freetype.infinality; if useInfinality
-- 
GitLab


From 9c4d6561029aebd8e7ad96f24e256d0de7ae8097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Feb 2014 10:57:35 +0100
Subject: [PATCH 0770/3789] pango: major update 1.32.5 -> 1.36.1, enable tests

Also propagate stuff in *.pc dependencies.
---
 pkgs/development/libraries/pango/default.nix | 26 +++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index f57ee931faf..2db977e0f34 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,24 +1,28 @@
-{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz, fontconfig
-, libintlOrEmpty, gobjectIntrospection }:
-
+{ stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng, harfbuzz
+, fontconfig, freetype, libintlOrEmpty, gobjectIntrospection
+}:
+
+let
+  ver_maj = "1.36";
+  ver_min = "1";
+in
 stdenv.mkDerivation rec {
-  name = "pango-1.32.5"; #.6 and higher need a not-yet-stable fontconfig (!)
+  name = "pango-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz";
-    sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx";
+    url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
+    sha256 = "1y2r1v4m8g4afggjd1siz0ri175p64myz9d2ks58grlrvhfbbr22";
   };
 
-  buildInputs = [ gobjectIntrospection ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];
-
-
   nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gobjectIntrospection ];
 
-  propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ] ++ libintlOrEmpty;
+  propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty;
 
   enableParallelBuilding = true;
 
+  doCheck = true;
+
   postInstall = "rm -rf $out/share/gtk-doc";
 
   meta = {
-- 
GitLab


From 559f5be07d33ed423f04c2b6dd88b0f9b95093b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 2 Feb 2014 11:27:41 +0100
Subject: [PATCH 0771/3789] dhcpcd: Update to 6.2.1

Dhcpcd now has integration with udev, so it should no longer be a
problem if udev renames an interface while dhcpcd is running.
---
 nixos/modules/services/networking/dhcpcd.nix |  1 -
 pkgs/tools/networking/dhcpcd/default.nix     | 11 ++++++++---
 pkgs/tools/networking/openresolv/default.nix |  4 +++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 08a5d6de6a2..d4ec96a18f6 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -106,7 +106,6 @@ in
       { description = "DHCP Client";
 
         wantedBy = [ "network.target" ];
-        after = [ "systemd-udev-settle.service" ];
 
         # Stopping dhcpcd during a reconfiguration is undesirable
         # because it brings down the network interfaces configured by
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index ad0b62d19f8..fe683c38285 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, pkgconfig, udev }:
 
 stdenv.mkDerivation rec {
-  name = "dhcpcd-5.6.8";
+  name = "dhcpcd-6.2.1";
 
   src = fetchurl {
     url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2";
-    sha256 = "1i7fv1l0n7q1mnia7g0789ch63x5zhwk5gsrwvs78dv2f2kmvcd3";
+    sha256 = "1gs23zwhzml2aam4j6rdncaqfv3z5n1ifx6lq4b8ccifqa87gbga";
   };
 
   patches = [ ./lxc_ro_promote_secondaries.patch ];
 
+  buildInputs = [ pkgconfig udev ];
+
   configureFlags = "--sysconfdir=/etc";
 
   makeFlags = "PREFIX=\${out}";
@@ -18,6 +20,9 @@ stdenv.mkDerivation rec {
   # at runtime.
   installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc";
 
+  # Check that the udev plugin got built.
+  postInstall = "[ -e $out/lib/dhcpcd/dev/udev.so ]";
+
   meta = {
     description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
     homepage = http://roy.marples.name/projects/dhcpcd;
diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix
index 3271941f884..36d3bfeca56 100644
--- a/pkgs/tools/networking/openresolv/default.nix
+++ b/pkgs/tools/networking/openresolv/default.nix
@@ -23,9 +23,11 @@ stdenv.mkDerivation rec {
 
   installFlags = "SYSCONFDIR=$(out)/etc";
 
-  meta = { 
+  meta = {
     description = "A program to manage /etc/resolv.conf";
     homepage = http://roy.marples.name/projects/openresolv;
     license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From e4c64d1e17fa198c091401315f9df873aaac2f6e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 2 Feb 2014 15:03:22 +0400
Subject: [PATCH 0772/3789] Adding missing unistd.h includes

---
 pkgs/games/ultimatestunts/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix
index dc221f37dd6..4b1cab6531c 100644
--- a/pkgs/games/ultimatestunts/default.nix
+++ b/pkgs/games/ultimatestunts/default.nix
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ SDL mesa SDL_image freealut openal libvorbis pkgconfig ];
 
+  postPatch = ''
+    sed -e '1i#include <unistd.h>' -i $(find . -name '*.c' -o -name '*.cpp')
+  '';
+
   meta = {
     homepage = http://www.ultimatestunts.nl/;
     description = "Remake of the popular racing DOS-game Stunts";
-- 
GitLab


From 07ab75205c8e2bd80258d5dc31e4f7c3dcb3c4cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Feb 2014 12:09:58 +0100
Subject: [PATCH 0773/3789] release: fix automake evaluation, broken in
 5888f27c

---
 pkgs/top-level/release-small.nix | 3 +--
 pkgs/top-level/release.nix       | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 14812b3e811..df0480bf82c 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -22,8 +22,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   aterm25 = all;
   aterm28 = all;
   autoconf = all;
-  automake110x = all;
-  automake111x = all;
+  automake = all;
   avahi = allBut "i686-cygwin";  # Cygwin builds fail
   bash = all;
   bashInteractive = all;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 3d7fbd1c57b..33ecef8b3a2 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -48,8 +48,7 @@ let
       atlas = linux;
       audacious = linux;
       autoconf = all;
-      automake110x = all;
-      automake111x = all;
+      automake = all;
       avahi = allBut "i686-cygwin";  # Cygwin builds fail
       bash = all;
       bashInteractive = all;
-- 
GitLab


From cbb856cb944540f03dfba043140eebb865bb741a Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Sun, 2 Feb 2014 19:38:31 +0800
Subject: [PATCH 0774/3789] Update libcangjie 1.1

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

diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix
index 695c0fa1a32..34441d8fa7f 100644
--- a/pkgs/development/libraries/libcangjie/default.nix
+++ b/pkgs/development/libraries/libcangjie/default.nix
@@ -1,11 +1,11 @@
 { stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "libcangjie-1.0";
+  name = "libcangjie-1.1";
 
   src = fetchurl {
-    url = "https://github.com/Cangjians/libcangjie/archive/v1.0.tar.gz";
-    sha256 = "15la1pxa2fvhznlbkl32qp2cgd602bvrx2zmahybypbfik0cgqk1";
+    url = "https://github.com/Cangjians/libcangjie/archive/v1.1.tar.gz";
+    sha256 = "1iy57vlmwgai9763adx6q4fisg2c63cmp31d1cd8mk00c222bw1z";
   };
 
   buildInputs = [ automake autoconf libtool m4 pkgconfig sqlite ];
-- 
GitLab


From 8e4665a634dd2840505919b0bd5df4f3090c137f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Feb 2014 13:31:36 +0100
Subject: [PATCH 0775/3789] pango: disable tests (fail to find config in
 chroot)

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

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 2db977e0f34..bd4e6354895 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = true;
+  #doCheck = true; # testiter fails to find fontconfig configuration
 
   postInstall = "rm -rf $out/share/gtk-doc";
 
-- 
GitLab


From 662039802a42e6ba1d0e0f5c344280ae86a02400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 2 Feb 2014 13:47:43 +0100
Subject: [PATCH 0776/3789] lttng-tools: use absolute path to modprobe

Instead of relying on it being available in $PATH.
---
 .../tools/misc/lttng-tools/default.nix        |  7 ++-
 ...-path-from-sbin-modprobe-to-modprobe.patch | 53 -------------------
 2 files changed, 5 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch

diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
index 42d11ebe7c5..1d223d83a65 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, popt, libuuid, liburcu, lttngUst }:
+{ stdenv, fetchurl, popt, libuuid, liburcu, lttngUst, kmod }:
 
 stdenv.mkDerivation rec {
   name = "lttng-tools-2.3.0";
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ popt libuuid liburcu lttngUst ];
 
-  patches = [ ./lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch ];
+  prePatch = ''
+    sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \
+        -i src/bin/lttng-sessiond/modprobe.c
+  '';
 
   meta = with stdenv.lib; {
     description = "Tracing tools (kernel + user space) for Linux";
diff --git a/pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch b/pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch
deleted file mode 100644
index 7d9edbda97a..00000000000
--- a/pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From daba2e936571a236817022b760d91c48b730c30b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
-Date: Tue, 9 Jul 2013 23:47:47 +0200
-Subject: [PATCH] Change modprobe path from "/sbin/modprobe" to "modprobe"
- (rely on PATH lookup)
-
----
- src/bin/lttng-sessiond/modprobe.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
-index 7e06dad..4075efe 100644
---- a/src/bin/lttng-sessiond/modprobe.c
-+++ b/src/bin/lttng-sessiond/modprobe.c
-@@ -90,7 +90,7 @@ void modprobe_remove_lttng_control(void)
- 
- 	for (i = ARRAY_SIZE(kern_modules_control) - 1; i >= 0; i--) {
- 		ret = snprintf(modprobe, sizeof(modprobe),
--				"/sbin/modprobe -r -q %s",
-+				"modprobe -r -q %s",
- 				kern_modules_control[i].name);
- 		if (ret < 0) {
- 			PERROR("snprintf modprobe -r");
-@@ -125,7 +125,7 @@ void modprobe_remove_lttng_data(void)
- 
- 	for (i = ARRAY_SIZE(kern_modules_list) - 1; i >= 0; i--) {
- 		ret = snprintf(modprobe, sizeof(modprobe),
--				"/sbin/modprobe -r -q %s",
-+				"modprobe -r -q %s",
- 				kern_modules_list[i].name);
- 		if (ret < 0) {
- 			PERROR("snprintf modprobe -r");
-@@ -169,7 +169,7 @@ int modprobe_lttng_control(void)
- 
- 	for (i = 0; i < ARRAY_SIZE(kern_modules_control); i++) {
- 		ret = snprintf(modprobe, sizeof(modprobe),
--				"/sbin/modprobe %s%s",
-+				"modprobe %s%s",
- 				kern_modules_control[i].required ? "" : "-q ",
- 				kern_modules_control[i].name);
- 		if (ret < 0) {
-@@ -205,7 +205,7 @@ int modprobe_lttng_data(void)
- 
- 	for (i = 0; i < ARRAY_SIZE(kern_modules_list); i++) {
- 		ret = snprintf(modprobe, sizeof(modprobe),
--				"/sbin/modprobe %s%s",
-+				"modprobe %s%s",
- 				kern_modules_list[i].required ? "" : "-q ",
- 				kern_modules_list[i].name);
- 		if (ret < 0) {
--- 
-1.8.2.3
-
-- 
GitLab


From 61d37c62c30197b43368b0a58a06cf79ae2a815f Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 28 Jan 2014 20:01:27 +0100
Subject: [PATCH 0777/3789] hub: Update from 1.10.6 -> 1.11.1

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

diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index b9a053211fa..87bb0a6d285 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "hub-${version}";
-  version = "1.10.6";
+  version = "1.11.1";
 
   src = fetchurl {
     url = "https://github.com/github/hub/archive/v${version}.tar.gz";
-    sha256 = "0vfl1iq1927in81vd7zvp7yqqzay7pciyj87s83qfxrqyjpxn609";
+    sha256 = "09wqxxzgrgcx6p3n3bhrb5ka3194qfwnli5j3frv37448hx6wd4n";
   };
 
   buildInputs = [ rake makeWrapper ];
-- 
GitLab


From 206b276fedfdd4363215003b16352342a4a04bb7 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Sun, 2 Feb 2014 21:34:40 +0800
Subject: [PATCH 0778/3789] Add pycangjie
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn Forsman <bjorn.forsman@gmail.com>: expression cleanup]
---
 .../python-modules/pycangjie/default.nix      | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/pycangjie/default.nix

diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix
new file mode 100644
index 00000000000..04f7e434a54
--- /dev/null
+++ b/pkgs/development/python-modules/pycangjie/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie
+, sqlite, python3, cython3
+}:
+
+stdenv.mkDerivation rec {
+  name = "pycangjie-${version}";
+  version = "1.0";
+
+  src = fetchurl {
+    name = "${name}.tar.gz";
+    url = "https://github.com/Cangjians/pycangjie/archive/v${version}.tar.gz";
+    sha256 = "1wx0m0chcpgxhj6cdxrwyi8hq05xlbap1ifs0wzb6nkglir0sb4j";
+  };
+
+  buildInputs = [
+    autoconf automake libtool pkgconfig libcangjie sqlite python3 cython3
+  ];
+
+  preConfigure = ''
+    find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';'
+    sed -i 's@/usr@${libcangjie}@' tests/__init__.py
+  '';
+
+  configureScript = "./autogen.sh";
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Python wrapper to libcangjie";
+    homepage = http://cangjians.github.io/projects/pycangjie/;
+    license = licenses.lgpl3Plus;
+    maintainers = [ maintainers.linquize ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d49dc207133..5b5572c119f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1702,6 +1702,8 @@ let
 
   pwnat = callPackage ../tools/networking/pwnat { };
 
+  pycangjie = callPackage ../development/python-modules/pycangjie { };
+
   pydb = callPackage ../development/tools/pydb { };
 
   pystringtemplate = callPackage ../development/python-modules/stringtemplate { };
-- 
GitLab


From 83bc415a7bcabd5fe992bd58f86a5cb31af4624d Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 27 Jan 2014 14:14:12 +0000
Subject: [PATCH 0779/3789] siege: Update to 3.0.6

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

diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix
index e29433adae3..a8dd147f367 100644
--- a/pkgs/tools/networking/siege/default.nix
+++ b/pkgs/tools/networking/siege/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lib }:
 let
-  version = "3.0.5";
+  version = "3.0.6";
   baseName = "siege";
 in stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
   src = fetchurl {
     url = "http://www.joedog.org/pub/siege/${name}.tar.gz";
-    sha256 = "16faa6kappg23bdriyiy3ym94rmddpvw8cl8xgv5nxq2v17n4gi8";
+    sha256 = "0nwcj2s804z7yd20pa0cl010m0qgf22a02305i9jwxynwdj9kdvq";
   };
   meta = {
     description = "HTTP load tester";
-- 
GitLab


From 43af271ac6171902cf1953cec7e5f926a33695a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 2 Feb 2014 15:04:46 +0100
Subject: [PATCH 0780/3789] siege: expression cleanup

---
 pkgs/tools/networking/siege/default.nix | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix
index a8dd147f367..fee3db878ac 100644
--- a/pkgs/tools/networking/siege/default.nix
+++ b/pkgs/tools/networking/siege/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchurl, lib }:
-let
-  version = "3.0.6";
-  baseName = "siege";
-in stdenv.mkDerivation rec {
-  name = "${baseName}-${version}";
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "siege-3.0.6";
+
   src = fetchurl {
     url = "http://www.joedog.org/pub/siege/${name}.tar.gz";
     sha256 = "0nwcj2s804z7yd20pa0cl010m0qgf22a02305i9jwxynwdj9kdvq";
   };
-  meta = {
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+
+  meta = with stdenv.lib; {
     description = "HTTP load tester";
-    maintainers = with lib.maintainers; [ ocharles raskin ];
-    platforms = with lib.platforms; linux;
-    license = with lib.licenses; gpl2Plus;
+    maintainers = with maintainers; [ ocharles raskin ];
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
   };
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 }
-- 
GitLab


From b6e3cd71707471a43cb95bb3bef8f12dd4b479df Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 31 Jan 2014 14:07:44 +0100
Subject: [PATCH 0781/3789] nixos/nscd: add option to change nscd config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn Forsman <bjorn.forsman@gmail.com>:
 - use types.lines instead of types.string. The former joins strings
   with "\n" and the latter with "" (and is deprecated).
]
---
 nixos/modules/services/system/nscd.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index b817b1df779..3259bdbbe12 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -5,6 +5,7 @@ with pkgs.lib;
 let
 
   nssModulesPath = config.system.nssModules.path;
+  cfg = config.services.nscd;
 
   inherit (pkgs.lib) singleton;
 
@@ -24,6 +25,12 @@ in
         description = "Whether to enable the Name Service Cache Daemon.";
       };
 
+      config = mkOption {
+        type = types.lines;
+        default = builtins.readFile ./nscd.conf;
+        description = "Configuration to use for Name Service Cache Daemon.";
+      };
+
     };
 
   };
@@ -31,7 +38,7 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.nscd.enable {
+  config = mkIf cfg.enable {
 
     users.extraUsers = singleton
       { name = "nscd";
@@ -56,7 +63,7 @@ in
         restartTriggers = [ config.environment.etc.hosts.source ];
 
         serviceConfig =
-          { ExecStart = "@${pkgs.glibc}/sbin/nscd nscd -f ${./nscd.conf}";
+          { ExecStart = "@${pkgs.glibc}/sbin/nscd nscd -f ${pkgs.writeText "nscd.conf" cfg.config}";
             Type = "forking";
             PIDFile = "/run/nscd/nscd.pid";
             Restart = "always";
-- 
GitLab


From 0d18d39e983fd6b7ad0535d1622cec608b4622e3 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sun, 2 Feb 2014 10:24:49 +0000
Subject: [PATCH 0782/3789] switch-to-configuration.pl: Handle successful
 auto-restarts

switch-to-configuration.pl is currently hard-coded to assume that if a
unit is in the "auto-restart" state that something has gone wrong, but
this is not strictly true. For example, I run offlineimap as a oneshot
service restarting itself every minute (on success). NixOS currently
thinks that offlineimap has failed to start as it enters the
auto-restart state, because it doesn't consider why the unit failed.

This commit changes switch-to-configuration.pl to inspect the full
status of a unit in auto-restart state, and now only considers it failed
if the ExecMainStatus is non-zero.
---
 .../activation/switch-to-configuration.pl     | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 33ae3aef9fc..cb5b49692fe 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -93,8 +93,13 @@ sub parseFstab {
 
 sub parseUnit {
     my ($filename) = @_;
+    parseKeyValues(read_file($filename));
+}
+
+sub parseKeyValues {
+    my @lines = @_;
     my $info = {};
-    foreach my $line (read_file($filename)) {
+    foreach my $line (@_) {
         # FIXME: not quite correct.
         $line =~ /^([^=]+)=(.*)$/ or next;
         $info->{$1} = $2;
@@ -337,8 +342,21 @@ system("@systemd@/bin/systemctl", "reload", "dbus.service");
 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 $lines = `@systemd@/bin/systemctl show '$unit'`;
+        my $info = parseKeyValues(split "\n", $lines);
+
+        if ($info->{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"
-- 
GitLab


From 8f897d2d395c5870643fae14e4c45570f50ac8b7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 2 Feb 2014 19:07:03 +0400
Subject: [PATCH 0783/3789] Update/fix farstream: Gajim now at least builds

---
 .../libraries/farstream/default.nix           | 14 ++++----
 .../libraries/gstreamer/default.nix           |  2 ++
 .../libraries/gstreamer/python/default.nix    | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++-
 4 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/libraries/gstreamer/python/default.nix

diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index 7d84cf88993..bcc3821d5e2 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base
-, pygobject, gst_python, gupnp_igd
-, gst_plugins_good, gst_plugins_bad, gst_ffmpeg
+{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst-plugins-base
+, pygobject, gst-python, gupnp_igd
+, gst-plugins-good, gst-plugins-bad, gst-libav
 }:
 
 stdenv.mkDerivation rec {
-  name = "farstream-0.1.2";
+  name = "farstream-0.2.3";
   src = fetchurl {
     url = "http://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz";
-    sha256 = "1nbkbvq959f70zhr03fwdibhs0sbf1k7zmbz9w99vda7gdcl0nps";
+    sha256 = "15h4qv30ql3rnmlm4ac3h7rplvj7125z14fbfh1zrkajjaa3bxdz";
   };
 
   buildInputs = [ libnice python pygobject gupnp_igd libnice ];
 
   nativeBuildInputs = [ pkgconfig ];
 
-  propagatedBuildInputs = [ gstreamer gst_plugins_base gst_python
-    gst_plugins_good gst_plugins_bad gst_ffmpeg
+  propagatedBuildInputs = [ gstreamer gst-plugins-base gst-python
+    gst-plugins-good gst-plugins-bad gst-libav
     ];
 
   meta = {
diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 1d02e6459ab..b68de91c240 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -12,4 +12,6 @@ rec {
   gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; };
 
   gst-libav = callPackage ./libav { inherit gst-plugins-base; };
+
+  gst-python = callPackage ./python { inherit gst-plugins-base gstreamer; };
 }
diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
new file mode 100644
index 00000000000..eaf284e950d
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/python/default.nix
@@ -0,0 +1,34 @@
+{ fetchurl, stdenv, pkgconfig, python, gstreamer
+  , gst-plugins-base, pygtk, pygobject3
+}:
+
+stdenv.mkDerivation rec {
+  name = "gst-python-1.1.90";
+
+  src = fetchurl {
+    urls = [
+      "${meta.homepage}/src/gst-python/${name}.tar.bz2"
+      "mirror://gentoo/distfiles/${name}.tar.bz2"
+      ];
+    sha256 = "1vsykx2l5360y19c0rxspa9nf1ilml2c1ybsv8cw8p696scryb2l";
+  };
+
+  buildInputs =
+    [ pkgconfig gst-plugins-base pygtk pygobject3 ]
+    ;
+
+  preConfigure = ''
+    export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.libPrefix}/site-packages/gi/overrides"
+  '';
+
+  propagatedBuildInputs = [ gstreamer python ];
+ 
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+
+    description = "Python bindings for GStreamer";
+
+    license = "LGPLv2+";
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c7827147df..e41d801d9aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4042,7 +4042,11 @@ let
 
   farsight2 = callPackage ../development/libraries/farsight2 { };
 
-  farstream = callPackage ../development/libraries/farstream { };
+  farstream = callPackage ../development/libraries/farstream { 
+    inherit (gst_all_1)
+      gstreamer gst-plugins-base gst-python gst-plugins-good gst-plugins-bad
+      gst-libav;
+  };
 
   fcgi = callPackage ../development/libraries/fcgi { };
 
-- 
GitLab


From ba4461f96f14b322ebd03d9cbcf4e0fdc206d595 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 2 Feb 2014 19:18:09 +0400
Subject: [PATCH 0784/3789] Fix wvdial build by inserting missing unistd.h
 includes

---
 pkgs/development/libraries/wvstreams/default.nix | 2 ++
 pkgs/os-specific/linux/wvdial/default.nix        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/wvstreams/default.nix b/pkgs/development/libraries/wvstreams/default.nix
index 0b551b753f5..ecfc9b88a0e 100644
--- a/pkgs/development/libraries/wvstreams/default.nix
+++ b/pkgs/development/libraries/wvstreams/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     find -type f | xargs sed -i 's@/bin/bash@bash@g'
+
+    sed -e '1i#include <unistd.h>' -i $(find . -name '*.c' -o -name '*.cc')
   '';
 
   buildInputs = [ qt4 dbus zlib openssl readline perl ];
diff --git a/pkgs/os-specific/linux/wvdial/default.nix b/pkgs/os-specific/linux/wvdial/default.nix
index eb9d09d2a11..7decd42b376 100644
--- a/pkgs/os-specific/linux/wvdial/default.nix
+++ b/pkgs/os-specific/linux/wvdial/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
     export makeFlags="prefix=$out"
     # not sure about this line
     sed -i 's@/etc/ppp/peers@$out/etc/ppp/peers@' Makefile.in
+
+    sed -e '1i#include <unistd.h>' -i $(find . -name '*.cc')
   '';
 
   meta = {
-- 
GitLab


From 335e92184f381e4099f2191a5c641bad0ce34290 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 2 Feb 2014 19:48:07 +0400
Subject: [PATCH 0785/3789] Create an attribute for latest ocaml packages even
 when this is not the default version

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e41d801d9aa..1bc857e0202 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2961,6 +2961,7 @@ let
   ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1;
   ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1;
   ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0;
+  ocamlPackages_latest = ocamlPackages_4_01_0;
 
   ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };
 
-- 
GitLab


From 41faaa1970fb6fe2674b0ca8023ae38f17c7a9b7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 2 Feb 2014 21:10:33 +0400
Subject: [PATCH 0786/3789] Update Aria download manager

---
 pkgs/tools/networking/aria/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/aria/default.nix b/pkgs/tools/networking/aria/default.nix
index 2cd3892eede..c7ccefd045b 100644
--- a/pkgs/tools/networking/aria/default.nix
+++ b/pkgs/tools/networking/aria/default.nix
@@ -1,11 +1,11 @@
 
 args : with args; 
-let version="0.16.2"; in
+let version="1.18.3"; in
 rec {
   src = /* Here a fetchurl expression goes */
   fetchurl {
-    url = "mirror://sourceforge/aria2/aria2c-${version}.tar.bz2";
-    sha256 = "02qj3j7a1r477pmk969nd3aa93m33kh4101azy001i9jacpjvzrp";
+    url = "mirror://sourceforge/aria2/stable/aria2-${version}.tar.bz2";
+    sha256 = "0y5wv7llq5sdwrsxqkc67wzk8gpb1kl4l1c0zl6l7kr0bkidna9r";
   };
 
   buildInputs = [];
-- 
GitLab


From 6b0769ef90fafb59054dae2f68c1c71369ed8151 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 2 Feb 2014 21:14:55 +0400
Subject: [PATCH 0787/3789] Use dynamical libbfd because static one is searched
 in strange places

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

diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index 85da8f72bf8..de53def2311 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -28,6 +28,8 @@ rec {
   inherit buildInputs;
   configureFlags = [
     "--enable-ansi"
+    "--enable-dynsysbfd"
+    "--disable-statsysbfd"
   ];
 
   # Upstream bug submitted - http://savannah.gnu.org/bugs/index.php?30371
-- 
GitLab


From 177b0a0e8b467858469e09977561abf83467b6af Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 2 Feb 2014 21:36:22 +0400
Subject: [PATCH 0788/3789] Update GCL source to latest release

---
 pkgs/development/compilers/gcl/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index de53def2311..73492fc65b7 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -16,20 +16,15 @@ assert a.stdenv.gcc.gcc != null ;
 assert a.stdenv.gcc.libc != null ;
 
 rec {
-  src = a.fetchcvs {
-    cvsRoot = ":pserver:anonymous@cvs.sv.gnu.org:/sources/gcl";
-    module = "gcl";
-    # tag = "Version_2_6_8pre";
-    date = "2010-07-01";
-    sha256 = "a61d1bf669fd11d13050e8e1ab850a5eecb38126b47c744c3e21646773c4fb4d";
+  src = a.fetchurl {
+    sha256 = "1vsicv81ml7d92c87bckgkpvcshi6hzdnj44k0j6zs5mj8pzp8br";
+    url="http://gnu.spinellicreations.com/gcl/gcl-2.6.10.tar.gz";
   };
 
-  name = "gcl-2.6.8pre";
+  name = "gcl-2.6.10";
   inherit buildInputs;
   configureFlags = [
     "--enable-ansi"
-    "--enable-dynsysbfd"
-    "--disable-statsysbfd"
   ];
 
   # Upstream bug submitted - http://savannah.gnu.org/bugs/index.php?30371
-- 
GitLab


From 9fb8624b94c6db633ebc2baad5de634b5199c97f Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sun, 2 Feb 2014 21:29:08 +0100
Subject: [PATCH 0789/3789] libcdio-0.82 for abcde

libcdio-0.9x lacks cd-paranoia needed by abcde. Bring back 0.82 for
abcde until we sort out where cd-paranoia went to.
---
 pkgs/development/libraries/libcdio/0.82.nix | 27 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/libcdio/0.82.nix

diff --git a/pkgs/development/libraries/libcdio/0.82.nix b/pkgs/development/libraries/libcdio/0.82.nix
new file mode 100644
index 00000000000..fc26fb9aca1
--- /dev/null
+++ b/pkgs/development/libraries/libcdio/0.82.nix
@@ -0,0 +1,27 @@
+{ fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }:
+
+stdenv.mkDerivation rec {
+  name = "libcdio-0.82";
+  
+  src = fetchurl {
+    url = "mirror://gnu/libcdio/${name}.tar.gz";
+    sha256 = "0fax1dzy84dzs20bmpq2gfw6hc1x2x9mhk53wynhcycjw3l3vjqs";
+  };
+
+  buildInputs = [ libcddb pkgconfig ncurses help2man ];
+
+  # Disabled because one test (check_paranoia.sh) fails.
+  #doCheck = true;
+
+  meta = {
+    description = "A library for OS-independent CD-ROM and CD image access";
+    longDescription = ''
+      GNU libcdio is a library for OS-idependent CD-ROM and
+      CD image access.  It includes a library for working with
+      ISO-9660 filesystems (libiso9660), as well as utility
+      programs such as an audio CD player and an extractor.
+    '';
+    license = "GPLv2+";
+    homepage = http://www.gnu.org/software/libcdio/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1bc857e0202..3cdb15b0475 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4590,6 +4590,7 @@ let
   libcddb = callPackage ../development/libraries/libcddb { };
 
   libcdio = callPackage ../development/libraries/libcdio { };
+  libcdio082 = callPackage ../development/libraries/libcdio/0.8.2.nix { };
 
   libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };
 
@@ -7339,6 +7340,7 @@ let
 
   abcde = callPackage ../applications/audio/abcde {
     inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID;
+    libcdio = libcdio082;
   };
 
   abiword = callPackage ../applications/office/abiword {
-- 
GitLab


From d71ea4a597d4b2126c12d42fb74391b4989fd4bf Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sat, 1 Feb 2014 21:20:48 -0430
Subject: [PATCH 0790/3789] texlive: Fix download file names to be current.

---
 pkgs/tools/typesetting/tex/texlive/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index b5e3c981e1c..3158f285933 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -6,13 +6,13 @@ rec {
   };
 
   texmfSrc = fetchurl {
-    url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20131219.orig.tar.xz;
-    sha256 = "1kcfw6n9rv3wznyqkvkad60p1zljbn1cw2jhajzcrn8m39y0ad3x";
+    url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20140123.orig.tar.xz;
+    sha256 = "1lwvqryfykz0d9pcjkhq1qh7dlcb6lsvjp7fizl18ji6166159iw";
   };
 
   langTexmfSrc = fetchurl {
-    url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2013.20131219.orig.tar.xz;
-    sha256 = "139hb91ks62q56dnnrzhcxmm2wpz0b40ka7smaqgw86r002albb0";
+    url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2013.20140123.orig.tar.xz;
+    sha256 = "1smzkg31msn9ci7fc69xq5klhxab00z8bcxmz5daqzcal8ak3d2d";
   };
 
   passthru = { inherit texmfSrc langTexmfSrc; };
-- 
GitLab


From cbf7c5496452eddb5a95ebc1451723ec5dd6011c Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sun, 2 Feb 2014 21:39:17 +0100
Subject: [PATCH 0791/3789] fix libcdio filename

---
 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 3cdb15b0475..6a43e10c577 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4590,7 +4590,7 @@ let
   libcddb = callPackage ../development/libraries/libcddb { };
 
   libcdio = callPackage ../development/libraries/libcdio { };
-  libcdio082 = callPackage ../development/libraries/libcdio/0.8.2.nix { };
+  libcdio082 = callPackage ../development/libraries/libcdio/0.82.nix { };
 
   libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };
 
-- 
GitLab


From f2b6e77e05c3414773d6d27c79f9102b732abf1b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 22:35:33 +0100
Subject: [PATCH 0792/3789] Fix file name used for libcdio 0.82

---
 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 6a43e10c577..de32bf9a782 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4043,7 +4043,7 @@ let
 
   farsight2 = callPackage ../development/libraries/farsight2 { };
 
-  farstream = callPackage ../development/libraries/farstream { 
+  farstream = callPackage ../development/libraries/farstream {
     inherit (gst_all_1)
       gstreamer gst-plugins-base gst-python gst-plugins-good gst-plugins-bad
       gst-libav;
@@ -8783,7 +8783,7 @@ let
   stumpwm = lispPackages.stumpwm;
 
   sublime = callPackage ../applications/editors/sublime { };
-  
+
   sublime3 = lowPrio (callPackage ../applications/editors/sublime3 { });
 
   subversion = callPackage ../applications/version-management/subversion/default.nix {
-- 
GitLab


From 13b05a4975adc7f7cb3fb4752107d595fc6eb439 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:12:31 +0100
Subject: [PATCH 0793/3789] haskell-GLUT: update to version 2.5.1.0

---
 .../libraries/haskell/GLUT/{2.5.0.2.nix => 2.5.1.0.nix}     | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/GLUT/{2.5.0.2.nix => 2.5.1.0.nix} (85%)

diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.0.2.nix b/pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix
similarity index 85%
rename from pkgs/development/libraries/haskell/GLUT/2.5.0.2.nix
rename to pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix
index da2c7f2b863..1cfd9a37eb0 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.5.0.2.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "GLUT";
-  version = "2.5.0.2";
-  sha256 = "0v6lwxn9karmym4fzd0hramcj86sb4wgiyqn47hmcg1dd1fsnhb5";
+  version = "2.5.1.0";
+  sha256 = "0zxj5i8rw402gpns5ivb1g5fkk502jwzrkviqhwhrxn7yxrybi1s";
   buildDepends = [ OpenGL OpenGLRaw ];
   extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
   meta = {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ae55febf893..807adc63ae5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -146,7 +146,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     caseInsensitive = self.caseInsensitive_1_1_0_3;
     cgi          = self.cgi_3001_1_8_4;
     fgl          = self.fgl_5_4_2_4;
-    GLUT         = self.GLUT_2_5_0_2;
+    GLUT         = self.GLUT_2_5_1_0;
     GLURaw       = self.GLURaw_1_4_0_0;
     haskellSrc   = self.haskellSrc_1_0_1_5;
     hashable     = self.hashable_1_2_1_0;
@@ -1188,10 +1188,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   GLUT_2_4_0_0 = callPackage ../development/libraries/haskell/GLUT/2.4.0.0.nix {
     OpenGL = self.OpenGL_2_8_0_0;
   };
-  GLUT_2_5_0_2 = callPackage ../development/libraries/haskell/GLUT/2.5.0.2.nix {
+  GLUT_2_5_1_0 = callPackage ../development/libraries/haskell/GLUT/2.5.1.0.nix {
     OpenGL = self.OpenGL_2_9_1_0;
   };
-  GLUT = self.GLUT_2_5_0_1;
+  GLUT = self.GLUT_2_5_1_0;
 
   gnuidn = callPackage ../development/libraries/haskell/gnuidn {};
 
-- 
GitLab


From c2cc4554f6bb73c8b68fee26214220d00ea3b29b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:12:42 +0100
Subject: [PATCH 0794/3789] haskell-pipes-group: add version 1.0.0

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

diff --git a/pkgs/development/libraries/haskell/pipes-group/default.nix b/pkgs/development/libraries/haskell/pipes-group/default.nix
new file mode 100644
index 00000000000..5fd5d7e1251
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pipes-group/default.nix
@@ -0,0 +1,13 @@
+{ cabal, free, pipes, pipesParse, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-group";
+  version = "1.0.0";
+  sha256 = "1izc2z3cwz7dihhfrngjyiaxmcpp794ragbl6v17y8c2pj0s34kh";
+  buildDepends = [ free pipes pipesParse transformers ];
+  meta = {
+    description = "Group streams into substreams";
+    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 807adc63ae5..092d7785f59 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1861,6 +1861,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   pipesNetwork = callPackage ../development/libraries/haskell/pipes-network {};
 
+  pipesGroup = callPackage ../development/libraries/haskell/pipes-group {};
+
   pipesParse = callPackage ../development/libraries/haskell/pipes-parse {};
 
   pipesPostgresqlSimple = callPackage ../development/libraries/haskell/pipes-postgresql-simple {};
-- 
GitLab


From 35b0a53ad3a8bedbcf5fea305fb6b54f76a3ae69 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:13:30 +0100
Subject: [PATCH 0795/3789] haskell-trifecta: add version 1.4

---
 .../libraries/haskell/trifecta/1.4.nix        | 32 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  3 +-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/trifecta/1.4.nix

diff --git a/pkgs/development/libraries/haskell/trifecta/1.4.nix b/pkgs/development/libraries/haskell/trifecta/1.4.nix
new file mode 100644
index 00000000000..9f03de78be1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/trifecta/1.4.nix
@@ -0,0 +1,32 @@
+{ cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml
+, blazeMarkup, charset, comonad, deepseq, doctest, filepath
+, fingertree, hashable, lens, mtl, parsers, reducers, semigroups
+, transformers, unorderedContainers, utf8String
+}:
+
+cabal.mkDerivation (self: {
+  pname = "trifecta";
+  version = "1.4";
+  sha256 = "1wz9rqd5nf1y4vpwn0vrbdlxdbrdp967p5ivpd0b2w5493m3mvax";
+  buildDepends = [
+    ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup
+    charset comonad deepseq fingertree hashable lens mtl parsers
+    reducers semigroups transformers unorderedContainers utf8String
+  ];
+  testDepends = [ doctest filepath ];
+  postPatch = ''
+    substituteInPlace trifecta.cabal \
+      --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.8," \
+      --replace "blaze-markup         >= 0.5     && < 0.6," "blaze-markup         >= 0.5     && < 0.7," \
+      --replace "hashable             >= 1.2     && < 1.3," "hashable             >= 1.1     && < 1.3," \
+      --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2," \
+      --replace "comonad              == 3.*,"              "comonad              >= 3       && < 5," \
+      --replace "comonad              >= 3       && < 4,"   "comonad              >= 3       && < 5,"
+  '';
+  meta = {
+    homepage = "http://github.com/ekmett/trifecta/";
+    description = "A modern parser combinator library with convenient diagnostics";
+    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 092d7785f59..11d291772c4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2353,7 +2353,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     parsers = self.parsers_0_9;
   };
   trifecta_1_2 = callPackage ../development/libraries/haskell/trifecta/1.2.nix {};
-  trifecta = self.trifecta_1_2;
+  trifecta_1_4 = callPackage ../development/libraries/haskell/trifecta/1.4.nix {};
+  trifecta = self.trifecta_1_4;
 
   tuple = callPackage ../development/libraries/haskell/tuple {};
 
-- 
GitLab


From 0ee4218f411521a28b20c6e823a11182b444efe2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:14:15 +0100
Subject: [PATCH 0796/3789] haskell-regex-tdfa: update to version 1.2.0

---
 .../libraries/haskell/regex-tdfa/default.nix  |   5 +-
 .../regex-tdfa/fix-build-with-array5.patch    | 120 ------------------
 2 files changed, 2 insertions(+), 123 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/regex-tdfa/fix-build-with-array5.patch

diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix
index 004bd9d7052..7f9bce42cf6 100644
--- a/pkgs/development/libraries/haskell/regex-tdfa/default.nix
+++ b/pkgs/development/libraries/haskell/regex-tdfa/default.nix
@@ -2,10 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "regex-tdfa";
-  version = "1.1.8";
-  sha256 = "1m75xh5bwmmgg5f757dc126kv47yfqqnz9fzj1hc80p6jpzs573x";
+  version = "1.2.0";
+  sha256 = "00gl9sx3hzd83lp38jlcj7wvzrda8kww7njwlm1way73m8aar0pw";
   buildDepends = [ mtl parsec regexBase ];
-  patches = [ ./fix-build-with-array5.patch ];
   meta = {
     homepage = "http://hackage.haskell.org/package/regex-tdfa";
     description = "Replaces/Enhances Text.Regex";
diff --git a/pkgs/development/libraries/haskell/regex-tdfa/fix-build-with-array5.patch b/pkgs/development/libraries/haskell/regex-tdfa/fix-build-with-array5.patch
deleted file mode 100644
index 2460e6bfc7a..00000000000
--- a/pkgs/development/libraries/haskell/regex-tdfa/fix-build-with-array5.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_FA.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_FA.hs
---- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_FA.hs	2011-03-12 00:46:39.000000000 +0100
-+++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_FA.hs	2013-12-19 12:42:27.048813869 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- -- | This is the code for the main engine.  This captures the posix
- -- subexpressions.  There is also a non-capturing engine, and a
- -- testing engine.
-@@ -20,7 +21,12 @@
- 
- import Prelude hiding ((!!))
- import Control.Monad(when,unless,forM,forM_,liftM2,foldM)
-+#if MIN_VERSION_array(0,4,0)
-+import Data.Array.MArray(MArray(..))
-+import Data.Array.Unsafe(unsafeFreeze)
-+#else
- import Data.Array.MArray(MArray(..),unsafeFreeze)
-+#endif
- import Data.Array.IArray(Array,bounds,assocs,Ix(range))
- import qualified Data.IntMap.CharMap2 as CMap(findWithDefault)
- import Data.IntMap(IntMap)
-@@ -574,7 +580,7 @@
-     case unsafeCoerce# memcpy mdest msource n# s1# of { (# s2#, () #) ->
-     (# s2#, () #) }}
- {-
--#else /* !__GLASGOW_HASKELL__ */
-+-- #else /* !__GLASGOW_HASKELL__ */
- 
- copySTU :: (MArray (STUArray s) e (S.ST s))=> STUArray s Tag e -> STUArray s Tag e -> S.ST s (STUArray s i e)
- copySTU source destination = do
-@@ -585,5 +591,5 @@
-   forM_ (range b) $ \index ->
-     set destination index =<< source !! index
-   return destination
--#endif /* !__GLASGOW_HASKELL__ */
-+-- #endif /* !__GLASGOW_HASKELL__ */
- -}
-diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine.hs
---- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine.hs	2011-03-12 00:46:39.000000000 +0100
-+++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine.hs	2013-12-19 12:42:27.049813918 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- -- | This is the code for the main engine.  This captures the posix subexpressions. This 'execMatch'
- -- also dispatches to "Engine_NC", "Engine_FA", and "Engine_FC_NA"
- -- 
-@@ -19,7 +20,12 @@
- -}
- import Prelude hiding ((!!))
- 
-+#if MIN_VERSION_array(0,4,0)
-+import Data.Array.MArray(MArray(..))
-+import Data.Array.Unsafe(unsafeFreeze)
-+#else
- import Data.Array.MArray(MArray(..),unsafeFreeze)
-+#endif
- import Data.Array.IArray(Array,bounds,assocs,Ix(rangeSize,range))
- import qualified Data.IntMap.CharMap2 as CMap(findWithDefault)
- import Data.IntMap(IntMap)
-@@ -716,7 +722,7 @@
-     case unsafeCoerce# memcpy mdest msource n# s1# of { (# s2#, () #) ->
-     (# s2#, () #) }}
- {-
--#else /* !__GLASGOW_HASKELL__ */
-+-- #else /* !__GLASGOW_HASKELL__ */
- 
- copySTU :: (MArray (STUArray s) e (S.ST s))=> STUArray s Tag e -> STUArray s Tag e -> S.ST s (STUArray s i e)
- copySTU source destination = do
-@@ -727,5 +733,5 @@
-   forM_ (range b) $ \index ->
-     set destination index =<< source !! index
-   return destination
--#endif /* !__GLASGOW_HASKELL__ */
-+-- #endif /* !__GLASGOW_HASKELL__ */
- -}
-diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs
---- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs	2011-03-12 00:46:39.000000000 +0100
-+++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs	2013-12-19 12:42:27.048813869 +0100
-@@ -1,10 +1,16 @@
-+{-# LANGUAGE CPP #-}
- -- | This is the non-capturing form of Text.Regex.TDFA.NewDFA.String
- module Text.Regex.TDFA.NewDFA.Engine_NC_FA(execMatch) where
- 
- import Control.Monad(unless)
- import Prelude hiding ((!!))
- 
-+#if MIN_VERSION_array(0,4,0)
-+import Data.Array.MArray(MArray(newArray))
-+import Data.Array.Unsafe(unsafeFreeze)
-+#else
- import Data.Array.MArray(MArray(newArray),unsafeFreeze)
-+#endif
- import Data.Array.ST(STArray)
- import qualified Data.IntMap.CharMap2 as CMap(findWithDefault)
- import qualified Data.IntMap as IMap(null)
-diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC.hs
---- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC.hs	2011-03-12 00:46:39.000000000 +0100
-+++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC.hs	2013-12-19 12:42:27.048813869 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- -- | This is the non-capturing form of Text.Regex.TDFA.NewDFA.String
- module Text.Regex.TDFA.NewDFA.Engine_NC(execMatch) where
- 
-@@ -5,7 +6,12 @@
- import Data.Array.Base(unsafeRead,unsafeWrite)
- import Prelude hiding ((!!))
- 
-+#if MIN_VERSION_array(0,4,0)
-+import Data.Array.MArray(MArray(..))
-+import Data.Array.Unsafe(unsafeFreeze)
-+#else
- import Data.Array.MArray(MArray(..),unsafeFreeze)
-+#endif
- import Data.Array.IArray(Ix)
- import Data.Array.ST(STArray,STUArray)
- import qualified Data.IntMap.CharMap2 as CMap(findWithDefault)
-@@ -248,4 +254,3 @@
- wsToGroup (WScratch start stop) = do
-   ma <- newArray (0,0) (start,stop-start)  :: S.ST s (STArray s Int (MatchOffset,MatchLength))
-   unsafeFreeze ma
--
-- 
GitLab


From 3829975fd56aa8618a6faff5ce8391262178ee07 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:15:34 +0100
Subject: [PATCH 0797/3789] haskell-packages.nix: obsolete regexTDFA attribute;
 the proper name is 'regexTdfa'

---
 pkgs/top-level/haskell-packages.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 11d291772c4..f53a4db04d6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2019,8 +2019,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   regexPosix_0_95_2 = callPackage ../development/libraries/haskell/regex-posix/0.95.2.nix {};
   regexPosix = self.regexPosix_0_95_2;
 
-  regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {};
-  regexTdfa = self.regexTDFA;
+  regexTdfa = callPackage ../development/libraries/haskell/regex-tdfa {};
 
   regexTdfaText = callPackage ../development/libraries/haskell/regex-tdfa-text {};
 
-- 
GitLab


From 10c4b8d0faa123bdb36fe7b5d3a19c749a5685e7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:15:50 +0100
Subject: [PATCH 0798/3789] haskell-boomerang: update to version 1.4.2

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

diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix
index af0dbd33898..74a4385aa92 100644
--- a/pkgs/development/libraries/haskell/boomerang/default.nix
+++ b/pkgs/development/libraries/haskell/boomerang/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "boomerang";
-  version = "1.4.1";
-  sha256 = "0pmaysp6vw6cnxh3px47pwflm4fc83idld09bpnfnh2jkscp630a";
+  version = "1.4.2";
+  sha256 = "0vy70anwnh7649za6nzb65fx09vqkf50a961da6gzwvbaf526rd0";
   buildDepends = [ mtl text ];
   meta = {
     description = "Library for invertible parsing and printing";
-- 
GitLab


From ba7a47ad095f25b0ba2d349db5d7da4ceb96db70 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:15:51 +0100
Subject: [PATCH 0799/3789] haskell-diagrams-cairo: update to version 1.0.1.1

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

diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index 53e9e0ac2cd..78de7fa1f8e 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-cairo";
-  version = "1.0.1";
-  sha256 = "16h1xz5amn0yd3h9rss0skaq08k1cy91cncxb9ky020s0wcix9fm";
+  version = "1.0.1.1";
+  sha256 = "0mjc24sir0mm1kqhkk26mfbz90kc71hdylral4bjymxs6fpx7crh";
   buildDepends = [
     cairo colour dataDefaultClass diagramsCore diagramsLib filepath
     hashable lens mtl split statestack time
-- 
GitLab


From 997e728458fd6bbf3b36be4c775373d78e0076ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:15:53 +0100
Subject: [PATCH 0800/3789] haskell-diagrams-svg: update to version 1.0.1.1

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

diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index 4f1dfdc8672..42289164144 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-svg";
-  version = "1.0.1";
-  sha256 = "15adic3dl4qqrd63jx1rc1w4wx270vm7zc3hr69mnh0wn0cr0ga5";
+  version = "1.0.1.1";
+  sha256 = "0wjk2f7xh7ihkvdri669mw25bdwszzx03np32fy66k56x7adgxzc";
   buildDepends = [
     blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath
     hashable lens monoidExtras mtl split time vectorSpace
-- 
GitLab


From c740b71160e812e3fcd4811b4ef5e895bd378f26 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:15:54 +0100
Subject: [PATCH 0801/3789] haskell-email-validate: update to version 2.0.1

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

diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix
index 3ba05926179..a1b09433782 100644
--- a/pkgs/development/libraries/haskell/email-validate/default.nix
+++ b/pkgs/development/libraries/haskell/email-validate/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "email-validate";
-  version = "1.0.0";
-  sha256 = "0sj1cvn9ap0m8d4cg4cqavvmkd74vp86lyyra9g6f17815sxdbsg";
+  version = "2.0.1";
+  sha256 = "1qxvcm8xiyz50ganzic8cm8nxswq361i80yi939y3n89dk067lzj";
   buildDepends = [ attoparsec ];
   testDepends = [
     HUnit QuickCheck testFramework testFrameworkHunit
-- 
GitLab


From b6ac32fd415575bcb8a54071c4fa968e7d56e910 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:15:55 +0100
Subject: [PATCH 0802/3789] haskell-fast-logger: update to version 2.1.5

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

diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
index 90432dfe975..9c9cae45b4b 100644
--- a/pkgs/development/libraries/haskell/fast-logger/default.nix
+++ b/pkgs/development/libraries/haskell/fast-logger/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fast-logger";
-  version = "2.1.4";
-  sha256 = "1fb75wx1v9h7690x43kd85lq1h9zi8nq438pqclzzrcfidsnm6z5";
+  version = "2.1.5";
+  sha256 = "12f7yad2f6q846rw2ji5fsx3d7qd8jdrnnzsbji5bpv00mvvsiza";
   buildDepends = [ blazeBuilder filepath text ];
   testDepends = [ hspec ];
   meta = {
-- 
GitLab


From ec3f8116f800043037b08a1f89ed4b0dbca7c890 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:15:56 +0100
Subject: [PATCH 0803/3789] haskell-fay: update to version 0.19.0.2

---
 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 adc29231d62..fdce9907056 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.0.1";
-  sha256 = "036z4wz7vziaczhx1ysbm7d2302n2sb6l1z48py8spai5awkbvh0";
+  version = "0.19.0.2";
+  sha256 = "025yhl32xr5fcsxval5rcj8jrgd6qnjq9bqbhbsr5ni8dz3ks5r3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From df7785473d4515cf07043d05c0b2023b2750153e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:15:57 +0100
Subject: [PATCH 0804/3789] haskell-happstack-lite: update to version 7.3.3

---
 .../libraries/haskell/happstack/happstack-lite.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
index 46edfb8946a..01cf7262783 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-lite";
-  version = "7.3.1";
-  sha256 = "0y8d0xv26szfjmkfqzak19zqjgv0w6rkc1rzrd2jkvsbchnwacjy";
+  version = "7.3.3";
+  sha256 = "0iv60cch0fiy9kh21wcpk3s4nvd4j2p50pqr3y56bsqwxk53hhv8";
   buildDepends = [ happstackServer mtl text ];
   meta = {
     homepage = "http://www.happstack.com/";
-- 
GitLab


From 3dbbe94e4b4f4bd41d5ddc9590b2d2cd0aafb699 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:15:58 +0100
Subject: [PATCH 0805/3789] haskell-happstack-server: update to version 7.3.3

---
 .../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 4d773603c04..40da6037e7d 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.2";
-  sha256 = "11wnnadxy1j786p81nkvd28vgpjjhm1amy34k5r0ynz0nkanfp3z";
+  version = "7.3.3";
+  sha256 = "18z706n9idszmn5j2cm2aqhs8zavk2sas6fwwywh38j536qzz36l";
   buildDepends = [
     base64Bytestring blazeHtml extensibleExceptions filepath hslogger
     html monadControl mtl network parsec sendfile syb systemFilepath
-- 
GitLab


From 4cffcb7002d730d51f16d0b94cacc8cb49303fde Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:15:59 +0100
Subject: [PATCH 0806/3789] haskell-haxr: update to version 3000.10.2

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

diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix
index 26ebbb9f8b0..eff9ada1da5 100644
--- a/pkgs/development/libraries/haskell/haxr/default.nix
+++ b/pkgs/development/libraries/haskell/haxr/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haxr";
-  version = "3000.10.1.1";
-  sha256 = "0qvbl3bms2mf650w9j3r0pnl151vzkggy2if3f4rj34qwb2sxmvp";
+  version = "3000.10.2";
+  sha256 = "10fgz1vvrx09pvlxp0k772xbfni8c8lxbjp59vzm95v2kc4hnagc";
   buildDepends = [
     base64Bytestring blazeBuilder HaXml HTTP mtl network time
     utf8String
-- 
GitLab


From 2b81f1da45c25a65a223c9321d97b19dacde14bb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:01 +0100
Subject: [PATCH 0807/3789] haskell-hsimport: update to version 0.2.7

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

diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix
index ba1c86d8d2d..8c657e780ec 100644
--- a/pkgs/development/libraries/haskell/hsimport/default.nix
+++ b/pkgs/development/libraries/haskell/hsimport/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hsimport";
-  version = "0.2.6.8";
-  sha256 = "0brz7lxbnkwhjlbvs7xk3012mp9419v9wpczwa3nahl5afzbsp3i";
+  version = "0.2.7";
+  sha256 = "03ddrszirx3xg7lxbykhwbzs4vqr8xravn2krc7v0q308rh070nr";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 1ca50c0d562785d99f8c50cb1ebd189c3aa90b1c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:03 +0100
Subject: [PATCH 0808/3789] haskell-llvm-general-pure: update to version
 3.4.0.0

---
 .../libraries/haskell/llvm-general-pure/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/default.nix b/pkgs/development/libraries/haskell/llvm-general-pure/default.nix
index 0a8f455d971..71947f00a23 100644
--- a/pkgs/development/libraries/haskell/llvm-general-pure/default.nix
+++ b/pkgs/development/libraries/haskell/llvm-general-pure/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "llvm-general-pure";
-  version = "3.3.8.2";
-  sha256 = "171mp9rydw6r2khcmvkcfjk934ckfahwyx1b4a15gmj8sr1s9hzp";
+  version = "3.4.0.0";
+  sha256 = "1b8nl4w16w6dsszmnvylrysi4fd86jcn2bvv531d13p81ybnxlx1";
   buildDepends = [ mtl parsec setenv transformers ];
   testDepends = [
     HUnit mtl QuickCheck testFramework testFrameworkHunit
-- 
GitLab


From 88c07a66b683ed22fe2e916319f75ba05e27e59e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:04 +0100
Subject: [PATCH 0809/3789] haskell-llvm-general: update to version 3.4.0.0

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

diff --git a/pkgs/development/libraries/haskell/llvm-general/default.nix b/pkgs/development/libraries/haskell/llvm-general/default.nix
index 2eb0a2c5d20..7749c47689e 100644
--- a/pkgs/development/libraries/haskell/llvm-general/default.nix
+++ b/pkgs/development/libraries/haskell/llvm-general/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "llvm-general";
-  version = "3.3.8.2";
-  sha256 = "11qnvpnx4i8mjdgn5y58rl70wf8pzmd555hrdaki1f4q0035cmm5";
+  version = "3.4.0.0";
+  sha256 = "1hj96wkgdqyvckgmk7r43n9s9fcq4gijnv0ghrj92ggd13hhmv7b";
   buildDepends = [
     llvmGeneralPure mtl parsec setenv transformers utf8String
   ];
-- 
GitLab


From cf68071ed1202bc4645d8c0243f62e4bf1ac6bed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:05 +0100
Subject: [PATCH 0810/3789] haskell-pipes-aeson: update to version 0.2.1

---
 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 156b89244ee..2552970717d 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.2.0";
-  sha256 = "12y5dywrhx3mvmlq26bc1cwybnclqbf91zvlz5ig2pi01ji3q94y";
+  version = "0.2.1";
+  sha256 = "19zrbk9jbls8zsnhx8bm9dzd7rxvf98bpjkr3k9ggmx2g5p08mgz";
   buildDepends = [
     aeson attoparsec pipes pipesAttoparsec pipesParse transformers
   ];
-- 
GitLab


From dd5010edc93a5026dbc490c91592f755447fbf3c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:06 +0100
Subject: [PATCH 0811/3789] haskell-pipes-bytestring: update to version 2.0.0

---
 .../libraries/haskell/pipes-bytestring/default.nix    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix
index 4e085105c20..8847f5e93f0 100644
--- a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix
@@ -1,10 +1,13 @@
-{ cabal, pipes, pipesParse, transformers }:
+{ cabal, pipes, pipesGroup, pipesParse, profunctors, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "pipes-bytestring";
-  version = "1.0.3";
-  sha256 = "11jiaf5vs0jz8m0x9dlcvflh636131bj4jnlrj3r5nz1v7a64v6b";
-  buildDepends = [ pipes pipesParse transformers ];
+  version = "2.0.0";
+  sha256 = "17l74g7xfl1i32jj9qa9ivbb3ndi68hkc1b6jchwnn19rmg51j9i";
+  buildDepends = [
+    pipes pipesGroup pipesParse profunctors transformers
+  ];
   meta = {
     description = "ByteString support for pipes";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From 7ff0169247e1f58969eda828e195d2e5b90d9fb5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:07 +0100
Subject: [PATCH 0812/3789] haskell-pipes-concurrency: update to version 2.0.2

---
 .../libraries/haskell/pipes-concurrency/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
index 7136a281f89..00336e8077d 100644
--- a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-concurrency";
-  version = "2.0.1";
-  sha256 = "0grfwmmwzxrska2218php22f898nn3x92bz1lmhpw2qi8mywvkzh";
+  version = "2.0.2";
+  sha256 = "0g4fbh8dk8ph2ga0vyanqj52rxk9c1zi6g4yk3a1g6bnf4bklhm8";
   buildDepends = [ pipes stm ];
   testDepends = [ async pipes stm ];
   meta = {
-- 
GitLab


From 3212a49491e408d24b3321bb023efd2b476093a3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:08 +0100
Subject: [PATCH 0813/3789] haskell-pipes-parse: update to version 3.0.0

---
 .../development/libraries/haskell/pipes-parse/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pipes-parse/default.nix b/pkgs/development/libraries/haskell/pipes-parse/default.nix
index 61c0f34a57e..ea83701f702 100644
--- a/pkgs/development/libraries/haskell/pipes-parse/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-parse/default.nix
@@ -1,10 +1,10 @@
-{ cabal, free, pipes, transformers }:
+{ cabal, pipes, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "pipes-parse";
-  version = "2.0.2";
-  sha256 = "1jcws5i9jhh4i6bh2j6m9pz1462qm05byibkkxfqvyx392sxy4wz";
-  buildDepends = [ free pipes transformers ];
+  version = "3.0.0";
+  sha256 = "07ycdnx24qlysbf78sgfl2g8rfsrxnaiq1rimc4656in4cmcjn9g";
+  buildDepends = [ pipes transformers ];
   meta = {
     description = "Parsing infrastructure for the pipes ecosystem";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From 599d0e193c368f7fc007d7f0b80abfdeef5d542f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:10 +0100
Subject: [PATCH 0814/3789] haskell-pipes-safe: update to version 2.0.2

---
 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 029bbd158b8..dddc27157dd 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.0.1";
-  sha256 = "11516rixqdym5rf5z5f5gwbfk689dl3ka3dj44c7a2qy7xl4sqzr";
+  version = "2.0.2";
+  sha256 = "004xjf0aqa73gxn8kj9844pwbkriv3hk9sbnwxx26pgvqvwjlrsj";
   buildDepends = [ exceptions pipes transformers ];
   meta = {
     description = "Safety for the pipes ecosystem";
-- 
GitLab


From 99c930d791fe9f6a0922e1c227065330dd21070d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:11 +0100
Subject: [PATCH 0815/3789] haskell-pipes: update to version 4.1.0

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

diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix
index 766393d7b45..3ca6969f159 100644
--- a/pkgs/development/libraries/haskell/pipes/default.nix
+++ b/pkgs/development/libraries/haskell/pipes/default.nix
@@ -1,12 +1,12 @@
 { cabal, mmorph, mtl, QuickCheck, testFramework
-, testFrameworkQuickcheck2, transformers, void
+, testFrameworkQuickcheck2, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "pipes";
-  version = "4.0.2";
-  sha256 = "18hcpklryyq9f6iwycxzi3sd6gyd9h0gy0ckg4rl7rhgy73hzgcz";
-  buildDepends = [ mmorph mtl transformers void ];
+  version = "4.1.0";
+  sha256 = "1n10plmrjvmkyv502195mkms48y3lfp5gy08lhyhqqr7kn1gzkf0";
+  buildDepends = [ mmorph mtl transformers ];
   testDepends = [
     mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers
   ];
-- 
GitLab


From e78bcf3b16bff9bac76c321afd76f68f8bf0f4e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:12 +0100
Subject: [PATCH 0816/3789] haskell-safe: update to version 0.3.4

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

diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix
index 6c16af12107..49c77c5ea26 100644
--- a/pkgs/development/libraries/haskell/safe/default.nix
+++ b/pkgs/development/libraries/haskell/safe/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "safe";
-  version = "0.3.3";
-  sha256 = "0ig9laq1p4iic24smjb304mvlsvdyn90lvxh64c4p75c8g459489";
+  version = "0.3.4";
+  sha256 = "0mwdaj0sjvqkgg077x1d896xphx64yrjvwbdhv7khdk3rh0vfl64";
   meta = {
     homepage = "http://community.haskell.org/~ndm/safe/";
     description = "Library for safe (pattern match free) functions";
-- 
GitLab


From b409b23fa0ecea780cc194d8e648966b3bf0d46e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:13 +0100
Subject: [PATCH 0817/3789] haskell-shelly: update to version 1.4.3.1

---
 pkgs/development/libraries/haskell/shelly/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 5a53a2f64c1..d64070459d6 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -1,12 +1,13 @@
-{ cabal, mtl, systemFileio, systemFilepath, text, time, unixCompat
+{ cabal, async, mtl, systemFileio, systemFilepath, text, time
+, unixCompat
 }:
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.4.1";
-  sha256 = "04yi5kc9jfcpc1rq3prypc832xgv94lrzv3i8saf1rg8a6najwbx";
+  version = "1.4.3.1";
+  sha256 = "04q22wprp0x075xyx6lnr8r792izvfigi4zryz2lxr5kqnzjki6r";
   buildDepends = [
-    mtl systemFileio systemFilepath text time unixCompat
+    async mtl systemFileio systemFilepath text time unixCompat
   ];
   meta = {
     homepage = "https://github.com/yesodweb/Shelly.hs";
-- 
GitLab


From f834ae003f2b5bddc213e02fb42434a762c44a74 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:14 +0100
Subject: [PATCH 0818/3789] haskell-snap: update to version 0.13.2.2

---
 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 92c02a27f42..3a656d65b33 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.1";
-  sha256 = "0jkjxyw7pcfl8r6gs0amzpkxardncvxsh20m7lad6aqjkcwh8r4l";
+  version = "0.13.2.2";
+  sha256 = "097bv45646g5qanc5ik0lpfm8g7zd1f5ymlxkilgcnvc72wiwkjm";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From c162ba42e57eb6127bdbf3df078854f40306ad86 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:15 +0100
Subject: [PATCH 0819/3789] haskell-warp: update to version 2.0.2.1

---
 .../libraries/haskell/warp/default.nix         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 8086ba20ca0..b8008447e40 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -1,23 +1,23 @@
 { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
-, conduit, doctest, hashable, hspec, HTTP, httpAttoparsec, httpDate
-, httpTypes, HUnit, liftedBase, network, networkConduit, QuickCheck
+, conduit, doctest, hashable, hspec, HTTP, httpDate, httpTypes
+, HUnit, liftedBase, network, networkConduit, QuickCheck
 , simpleSendfile, time, transformers, unixCompat, void, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.0.2";
-  sha256 = "1v28kfs311kr7n4hraqh5dzhw2gy0da2rp30732adivy9aj9grl9";
+  version = "2.0.2.1";
+  sha256 = "0r8kpg2k7mr9y7nlccvfk6qbzgv459gidbaw6sgaxb26f6bgipgk";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
-    httpAttoparsec httpDate httpTypes liftedBase network networkConduit
-    simpleSendfile transformers unixCompat void wai
+    httpDate httpTypes liftedBase network networkConduit simpleSendfile
+    transformers unixCompat void wai
   ];
   testDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit doctest
-    hashable hspec HTTP httpAttoparsec httpDate httpTypes HUnit
-    liftedBase network networkConduit QuickCheck simpleSendfile time
-    transformers unixCompat void wai
+    hashable hspec HTTP httpDate httpTypes HUnit liftedBase network
+    networkConduit QuickCheck simpleSendfile time transformers
+    unixCompat void wai
   ];
   doCheck = false;
   meta = {
-- 
GitLab


From 1dfed436197e4f12117f8b9bfc85f039a25cae72 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:16 +0100
Subject: [PATCH 0820/3789] haskell-web-routes-boomerang: update to version
 0.28.2

---
 .../libraries/haskell/web-routes-boomerang/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix
index ee6c19b0d93..ab89944d60f 100644
--- a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix
+++ b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "web-routes-boomerang";
-  version = "0.28.1";
-  sha256 = "1a655d73fr7b9k033wyqgc8waq7ii3s5rh0w3nkb1phxl9ldg0pi";
+  version = "0.28.2";
+  sha256 = "17237xq8nvy0c1mxzf7pad5kw0mrgbzazy0rflp382ig9q6ipd05";
   buildDepends = [ boomerang mtl parsec text webRoutes ];
   meta = {
     description = "Library for maintaining correctness and composability of URLs within an application";
-- 
GitLab


From b5041566b43e97400d2c0d74ad3ef3e2da6592e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:17 +0100
Subject: [PATCH 0821/3789] haskell-web-routes: update to version 0.27.5

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

diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix
index 76fbf12540a..8c84f81bcc9 100644
--- a/pkgs/development/libraries/haskell/web-routes/default.nix
+++ b/pkgs/development/libraries/haskell/web-routes/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "web-routes";
-  version = "0.27.4";
-  sha256 = "1n9gdaxzy22m3fmrq3j1jkm16c4wvffjbh19xckfpva53zdhsal4";
+  version = "0.27.5";
+  sha256 = "1jx5wwmlylwrf45wy3w29ck1p7509mgy8m02vipd8apibx6ghp22";
   buildDepends = [
     blazeBuilder httpTypes mtl parsec split text utf8String
   ];
-- 
GitLab


From c21822f64f273cdaf0a02707349c0ffd5084b8d9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:19 +0100
Subject: [PATCH 0822/3789] haskell-yesod-bin: update to version 1.2.5.8

---
 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 af6b4f339f6..f53c8f554b0 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.5.7";
-  sha256 = "0vxkwdqmfi2ccknmgx0xh6w1p7bw3wi24w3c3fw80g72j9sxr5hn";
+  version = "1.2.5.8";
+  sha256 = "1k9afj8f463rs0w9bzxda587jhm1g3fq3l42mabydmg8mx4hbm2c";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 012006bd961a0255ee5107a04c937dba7ebc5830 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:20 +0100
Subject: [PATCH 0823/3789] haskell-yesod-core: update to version 1.2.6.6

---
 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 afda7d777d6..0b9284b8f14 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.6.5";
-  sha256 = "1xry2jhm4rj3a7fg4xdx5q6fah8dixnrhzyk4176a60a3q8j3lal";
+  version = "1.2.6.6";
+  sha256 = "1wmcsblzr9mq831yp7g90m0rk8a1rgsz1vcdcsr7dsjrykcvxqfq";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit cookie dataDefault
-- 
GitLab


From 46753680659843ae44740ae07efe5f26c0ce7092 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:21 +0100
Subject: [PATCH 0824/3789] haskell-yesod-form: update to version 1.3.5

---
 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 1fb2e487e7c..f87938f9a03 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.4.4";
-  sha256 = "0g5kxcb29qa7xq1s57bvl38fbrsm6jvmvw65nw14as0hbqlv67fh";
+  version = "1.3.5";
+  sha256 = "01qh2s4z9w8g70xz613b2dirfrbag6c861c2niy85c6x8h05nnwy";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
     dataDefault emailValidate hamlet network persistent resourcet
-- 
GitLab


From 422eda499e2bcff15c9328529beb535229863904 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 20:16:22 +0100
Subject: [PATCH 0825/3789] haskell-hlint: update to version 1.8.56

---
 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 b78785f8fc1..c8ede663be4 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.55";
-  sha256 = "184y0vh5rwsv13vj49zvgwwpgdf5y7wxfisry9pv2998flwkf4rj";
+  version = "1.8.56";
+  sha256 = "1idff4jaca324acbr0aa64j977l5nxnlfk9nny33i81b5hzciwmw";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From f16f44662f558f25e009977ab12e1cffd06a6eaa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 21:34:57 +0100
Subject: [PATCH 0826/3789] haskell-aeson: fix build of version 0.7.x

---
 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 f53a4db04d6..933e7a29c5b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -525,7 +525,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   adjunctions = callPackage ../development/libraries/haskell/adjunctions {};
 
   aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {};
-  aeson_0_7_0_0 = callPackage ../development/libraries/haskell/aeson/0.7.0.0.nix {};
+  aeson_0_7_0_0 = callPackage ../development/libraries/haskell/aeson/0.7.0.0.nix {
+    attoparsec = self.attoparsec_0_11_1_0;
+  };
   aeson = self.aeson_0_6_2_1;
 
   aesonLens = callPackage ../development/libraries/haskell/aeson-lens {};
-- 
GitLab


From e3651da23e7bf54ff04d65f32311cc69393ba973 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 22:35:43 +0100
Subject: [PATCH 0827/3789] haskell-lens: add version 4.0

---
 .../haskell/lens/{default.nix => 3.10.2.nix}  |  0
 .../libraries/haskell/lens/4.0.nix            | 35 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++-
 3 files changed, 38 insertions(+), 1 deletion(-)
 rename pkgs/development/libraries/haskell/lens/{default.nix => 3.10.2.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/lens/4.0.nix

diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/3.10.2.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/lens/default.nix
rename to pkgs/development/libraries/haskell/lens/3.10.2.nix
diff --git a/pkgs/development/libraries/haskell/lens/4.0.nix b/pkgs/development/libraries/haskell/lens/4.0.nix
new file mode 100644
index 00000000000..9046558c22d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lens/4.0.nix
@@ -0,0 +1,35 @@
+{ cabal, aeson, bifunctors, comonad, constraints, contravariant
+, deepseq, distributive, doctest, exceptions, filepath
+, genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel
+, primitive, profunctors, QuickCheck, reflection, scientific
+, semigroupoids, semigroups, simpleReflect, split, tagged
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+, testFrameworkTh, text, transformers, transformersCompat
+, unorderedContainers, utf8String, vector, void, zlib
+}:
+
+cabal.mkDerivation (self: {
+  pname = "lens";
+  version = "4.0";
+  sha256 = "1mrpbwnj1k2my71lm0ajxsx5r44sz372gfxn78vz4182yv3bmla1";
+  buildDepends = [
+    aeson bifunctors comonad constraints contravariant distributive
+    exceptions filepath hashable mtl parallel primitive profunctors
+    reflection scientific semigroupoids semigroups split tagged text
+    transformers transformersCompat unorderedContainers utf8String
+    vector void zlib
+  ];
+  testDepends = [
+    deepseq doctest filepath genericDeriving hlint HUnit mtl nats
+    parallel QuickCheck semigroups simpleReflect split testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
+    transformers unorderedContainers vector
+  ];
+  doCheck = false;
+  meta = {
+    homepage = "http://github.com/ekmett/lens/";
+    description = "Lenses, Folds and Traversals";
+    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 933e7a29c5b..22ed0295494 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1532,7 +1532,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {};
 
-  lens = callPackage ../development/libraries/haskell/lens {};
+  lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {};
+  lens_4_0 = callPackage ../development/libraries/haskell/lens/4.0.nix {};
+  lens = self.lens_3_10_2;
 
   lensAeson = callPackage ../development/libraries/haskell/lens-aeson {};
 
-- 
GitLab


From c6053075bd46fc73ec1ddacca3b2942ac87bd0dc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 23:16:29 +0100
Subject: [PATCH 0828/3789] haskell-hakyll: jailbreak to fix build with recent
 versions of regex-tdfa

https://github.com/NixOS/nixos/issues/281
---
 pkgs/development/libraries/haskell/hakyll/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 22ad997b32a..e027111c6b6 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -27,8 +27,10 @@ cabal.mkDerivation (self: {
   ];
   doCheck = false;
   patchPhase = ''
-    sed -i -e 's|blaze-markup.*,|blaze-markup,|' -e 's|blaze-html.*,|blaze-html,|' \
-      -e 's|pandoc-citeproc.*,|pandoc-citeproc,|' hakyll.cabal
+    sed -i -e 's|blaze-markup.*,|blaze-markup,|' \
+      -e 's|blaze-html.*,|blaze-html,|' \
+      -e 's|pandoc-citeproc.*,|pandoc-citeproc,|' \
+      -e 's|regex-tdfa.*,|regex-tdfa,|' hakyll.cabal
   '';
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
-- 
GitLab


From 710ddf76629a2d883ee8e817cb3a2ae2f79dbb97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 23:36:22 +0100
Subject: [PATCH 0829/3789] haskell-trifecta: update jail-breaking code

---
 pkgs/development/libraries/haskell/trifecta/1.1.nix | 2 ++
 pkgs/development/libraries/haskell/trifecta/1.2.nix | 2 ++
 pkgs/development/libraries/haskell/trifecta/1.4.nix | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/haskell/trifecta/1.1.nix b/pkgs/development/libraries/haskell/trifecta/1.1.nix
index 67c3ae28d58..4f5841d6881 100644
--- a/pkgs/development/libraries/haskell/trifecta/1.1.nix
+++ b/pkgs/development/libraries/haskell/trifecta/1.1.nix
@@ -17,7 +17,9 @@ cabal.mkDerivation (self: {
   postPatch = ''
     substituteInPlace trifecta.cabal \
       --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.8," \
+      --replace "blaze-html           >= 0.5     && < 0.7," "blaze-html           >= 0.5     && < 0.8," \
       --replace "blaze-markup         >= 0.5     && < 0.6," "blaze-markup         >= 0.5     && < 0.7," \
+      --replace "hashable             >= 1.2.1   && < 1.3," "hashable             >= 1.1     && < 1.3," \
       --replace "hashable             >= 1.2     && < 1.3," "hashable             >= 1.1     && < 1.3," \
       --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2," \
       --replace "comonad              == 3.*,"              "comonad              >= 3       && < 5," \
diff --git a/pkgs/development/libraries/haskell/trifecta/1.2.nix b/pkgs/development/libraries/haskell/trifecta/1.2.nix
index 447e0d36c9c..fae592e73f0 100644
--- a/pkgs/development/libraries/haskell/trifecta/1.2.nix
+++ b/pkgs/development/libraries/haskell/trifecta/1.2.nix
@@ -17,7 +17,9 @@ cabal.mkDerivation (self: {
   postPatch = ''
     substituteInPlace trifecta.cabal \
       --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.8," \
+      --replace "blaze-html           >= 0.5     && < 0.7," "blaze-html           >= 0.5     && < 0.8," \
       --replace "blaze-markup         >= 0.5     && < 0.6," "blaze-markup         >= 0.5     && < 0.7," \
+      --replace "hashable             >= 1.2.1   && < 1.3," "hashable             >= 1.1     && < 1.3," \
       --replace "hashable             >= 1.2     && < 1.3," "hashable             >= 1.1     && < 1.3," \
       --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2," \
       --replace "comonad              == 3.*,"              "comonad              >= 3       && < 5," \
diff --git a/pkgs/development/libraries/haskell/trifecta/1.4.nix b/pkgs/development/libraries/haskell/trifecta/1.4.nix
index 9f03de78be1..84759406d00 100644
--- a/pkgs/development/libraries/haskell/trifecta/1.4.nix
+++ b/pkgs/development/libraries/haskell/trifecta/1.4.nix
@@ -17,7 +17,9 @@ cabal.mkDerivation (self: {
   postPatch = ''
     substituteInPlace trifecta.cabal \
       --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.8," \
+      --replace "blaze-html           >= 0.5     && < 0.7," "blaze-html           >= 0.5     && < 0.8," \
       --replace "blaze-markup         >= 0.5     && < 0.6," "blaze-markup         >= 0.5     && < 0.7," \
+      --replace "hashable             >= 1.2.1   && < 1.3," "hashable             >= 1.1     && < 1.3," \
       --replace "hashable             >= 1.2     && < 1.3," "hashable             >= 1.1     && < 1.3," \
       --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2," \
       --replace "comonad              == 3.*,"              "comonad              >= 3       && < 5," \
-- 
GitLab


From 86c587134b4af478047a520e7dc7d8af4f4a6998 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 2 Feb 2014 19:47:59 -0500
Subject: [PATCH 0830/3789] llvm-3.4: Try to fix build on darwin

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/compilers/llvm/3.4/llvm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 9ee63ee319f..45c8b84178c 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
     mv compiler-rt-${version} $sourceRoot/projects/compiler-rt
   '';
 
-  buildInputs = [ perl groff cmake libxml2 python libffi valgrind ncurses ];
+  buildInputs = [ perl groff cmake libxml2 python libffi ncurses ] ++ stdenv.lib.optional stdenv.isLinux valgrind;
 
   # hacky fix: created binaries need to be run before installation
   preBuild = ''
@@ -50,6 +50,6 @@ in stdenv.mkDerivation rec {
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = stdenv.lib.platforms.all;
   };
 }
-- 
GitLab


From 06ef22bcdd6ee60b33514ba314f3010863ad4d55 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 2 Feb 2014 20:36:50 -0500
Subject: [PATCH 0831/3789] llvm-general: Fix build

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/libraries/haskell/llvm-general/default.nix | 3 ++-
 pkgs/top-level/haskell-packages.nix                         | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/llvm-general/default.nix b/pkgs/development/libraries/haskell/llvm-general/default.nix
index 7749c47689e..ef4677a2ffc 100644
--- a/pkgs/development/libraries/haskell/llvm-general/default.nix
+++ b/pkgs/development/libraries/haskell/llvm-general/default.nix
@@ -1,6 +1,7 @@
 { cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec
 , QuickCheck, setenv, testFramework, testFrameworkHunit
 , testFrameworkQuickcheck2, transformers, utf8String
+, ncurses, zlib
 }:
 
 cabal.mkDerivation (self: {
@@ -14,7 +15,7 @@ cabal.mkDerivation (self: {
     HUnit llvmGeneralPure mtl QuickCheck testFramework
     testFrameworkHunit testFrameworkQuickcheck2
   ];
-  buildTools = [ llvmConfig ];
+  buildTools = [ llvmConfig ncurses zlib ];
   doCheck = false;
   meta = {
     description = "General purpose LLVM bindings";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 22ed0295494..a2476139455 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1567,8 +1567,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   ListZipper = callPackage ../development/libraries/haskell/ListZipper {};
 
   llvmGeneral = callPackage ../development/libraries/haskell/llvm-general {
-    # !!! llvm-general pre-release supports 3.4...
-    llvmConfig = pkgs.llvm_33;
+    llvmConfig = pkgs.llvm;
+    inherit (pkgs) zlib ncurses;
   };
 
   llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {};
-- 
GitLab


From 134546bca2a1e3ce01dc5fa21fe3e5971c067457 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 2 Feb 2014 20:39:16 -0500
Subject: [PATCH 0832/3789] clang: Fix linking with -flto

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/compilers/llvm/3.4/clang.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index eafbc28661f..6bb5622d0cf 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -27,6 +27,9 @@ stdenv.mkDerivation {
   (stdenv.lib.optional (stdenv.gcc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include") ++
   (stdenv.lib.optional (stdenv.gcc.gcc != null) "-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}");
 
+  # Clang expects to find LLVMgold in its own prefix
+  postInstall = "ln -sv ${llvm}/lib/LLVMgold.so $out/lib";
+
   passthru.gcc = stdenv.gcc.gcc;
 
   enableParallelBuilding = true;
-- 
GitLab


From 2cf7bc982b3acdac22be108b8d1917dc652aee0b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 2 Feb 2014 20:40:29 -0500
Subject: [PATCH 0833/3789] idris requires llvm-general-3.3 currently

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../haskell/llvm-general-pure/3.3.nix         | 20 ++++++++++++++++
 .../libraries/haskell/llvm-general/3.3.nix    | 24 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           | 10 ++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix
 create mode 100644 pkgs/development/libraries/haskell/llvm-general/3.3.nix

diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix
new file mode 100644
index 00000000000..0a8f455d971
--- /dev/null
+++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix
@@ -0,0 +1,20 @@
+{ cabal, HUnit, mtl, parsec, QuickCheck, setenv, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "llvm-general-pure";
+  version = "3.3.8.2";
+  sha256 = "171mp9rydw6r2khcmvkcfjk934ckfahwyx1b4a15gmj8sr1s9hzp";
+  buildDepends = [ mtl parsec setenv transformers ];
+  testDepends = [
+    HUnit mtl QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  doCheck = false;
+  meta = {
+    description = "Pure Haskell LLVM functionality (no FFI)";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.nix b/pkgs/development/libraries/haskell/llvm-general/3.3.nix
new file mode 100644
index 00000000000..2eb0a2c5d20
--- /dev/null
+++ b/pkgs/development/libraries/haskell/llvm-general/3.3.nix
@@ -0,0 +1,24 @@
+{ cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec
+, QuickCheck, setenv, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, transformers, utf8String
+}:
+
+cabal.mkDerivation (self: {
+  pname = "llvm-general";
+  version = "3.3.8.2";
+  sha256 = "11qnvpnx4i8mjdgn5y58rl70wf8pzmd555hrdaki1f4q0035cmm5";
+  buildDepends = [
+    llvmGeneralPure mtl parsec setenv transformers utf8String
+  ];
+  testDepends = [
+    HUnit llvmGeneralPure mtl QuickCheck testFramework
+    testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  buildTools = [ llvmConfig ];
+  doCheck = false;
+  meta = {
+    description = "General purpose LLVM bindings";
+    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 a2476139455..783b868f804 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1566,11 +1566,19 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   ListZipper = callPackage ../development/libraries/haskell/ListZipper {};
 
+  # Needed for idris for now
+  llvmGeneral_3_3 = callPackage ../development/libraries/haskell/llvm-general/3.3.nix {
+    llvmConfig = pkgs.llvm_33;
+    llvmGeneralPure = self.llvmGeneralPure_3_3;
+  };
+
   llvmGeneral = callPackage ../development/libraries/haskell/llvm-general {
     llvmConfig = pkgs.llvm;
     inherit (pkgs) zlib ncurses;
   };
 
+  llvmGeneralPure_3_3 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.nix { };
+
   llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {};
 
   lrucache = callPackage ../development/libraries/haskell/lrucache {};
@@ -2713,6 +2721,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   idris_plain = callPackage ../development/compilers/idris {
     parsers = self.parsers_0_9;
     trifecta = self.trifecta_1_1;
+    llvmGeneral = self.llvmGeneral_3_3;
+    llvmGeneralPure = self.llvmGeneralPure_3_3;
   };
 
   idris = callPackage ../development/compilers/idris/wrapper.nix {};
-- 
GitLab


From 9dd9e52c0c1df132977d648ab15da9c01672891b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 3 Feb 2014 10:05:47 +0100
Subject: [PATCH 0834/3789] pidgin: bugfix 2.10.8 -> .9

Fixes connection to some servers broken by the previous update.
---
 .../networking/instant-messengers/pidgin/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 53790cd2b8b..41a1abc5ee7 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -21,10 +21,10 @@
 } :
 
 stdenv.mkDerivation rec {
-  name = "pidgin-2.10.8";
+  name = "pidgin-2.10.9";
   src = fetchurl {
     url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
-    sha256 = "09w2gbnplyw21lmf9jwk6vkk5gpx5lq15s38bmhkxzw86mz3ccxn";
+    sha256 = "06gka47myl9f5x0flkq74ml75akkf28rx9sl8pm3wqkzazc2wdnw";
   };
 
   inherit nss ncurses;
-- 
GitLab


From 34484e65f3098088ba8c3101b576e729ad66aa91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 3 Feb 2014 12:34:50 +0100
Subject: [PATCH 0835/3789] arp-scan: new package

Arp-scan is a command-line tool that uses the ARP protocol to discover
and fingerprint IP hosts on the local network.

http://www.nta-monitor.com/tools-resources/security-tools/arp-scan
---
 pkgs/tools/misc/arp-scan/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/misc/arp-scan/default.nix

diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix
new file mode 100644
index 00000000000..f8adedc7c24
--- /dev/null
+++ b/pkgs/tools/misc/arp-scan/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, libpcap }:
+
+stdenv.mkDerivation rec {
+  name = "arp-scan-1.9";
+
+  src = fetchurl {
+    url = "http://www.nta-monitor.com/files/arp-scan/${name}.tar.gz";
+    sha256 = "14nqjzbmnlx2nac7lwa93y5m5iqk3layakyxyvfmvs283k3qm46f";
+  };
+
+  buildInputs = [ libpcap ];
+
+  meta = with stdenv.lib; {
+    description = "ARP scanning and fingerprinting tool";
+    longDescription = ''
+      Arp-scan is a command-line tool that uses the ARP protocol to discover
+      and fingerprint IP hosts on the local network.
+    '';
+    homepage = http://www.nta-monitor.com/tools-resources/security-tools/arp-scan;
+    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 de32bf9a782..a204e0bf6a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -435,6 +435,8 @@ let
 
   argyllcms = callPackage ../tools/graphics/argyllcms {};
 
+  arp-scan = callPackage ../tools/misc/arp-scan { };
+
   ascii = callPackage ../tools/text/ascii { };
 
   asymptote = builderDefsPackage ../tools/graphics/asymptote {
-- 
GitLab


From 700c1323b8cdebc188ad321ae1ba88ab2938c2e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 3 Feb 2014 17:58:23 +0100
Subject: [PATCH 0836/3789] sqliteodbc: fix library location

Commit d7d3c8fd828cf6aba4d511be1927458507422a67 (sqliteodbc: update to
0.995, add more metadata) mistakenly moved libraries from $out/lib to
$out (or rather stopped moving them from $out to $out/lib).

Move them back to $out/lib where they're expected to be and referred to
by the /etc/odbcinst.ini snippet.
---
 pkgs/development/libraries/unixODBCDrivers/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 47925520ab4..a50aff1922d 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -91,8 +91,11 @@ args : with args;
 
       configureFlags = "--with-sqlite3=${sqlite} --with-odbc=${unixODBC}";
 
+      # move libraries to $out/lib where they're expected to be
       postInstall = ''
-        mkdir -p  $out/lib
+        mkdir -p "$out/lib"
+        mv "$out"/*.so "$out/lib"
+        mv "$out"/*.la "$out/lib"
       '';
 
       meta = { 
-- 
GitLab


From 8e7518f923f9a8104832f898ae00ac1ac91407ed Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Mon, 3 Feb 2014 18:21:42 +0100
Subject: [PATCH 0837/3789] Added snapBlaze and sqliteSimple haskell packages

---
 .../libraries/haskell/snap-blaze/default.nix    | 14 ++++++++++++++
 .../libraries/haskell/sqlite-simple/default.nix | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  4 ++++
 3 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/snap-blaze/default.nix
 create mode 100644 pkgs/development/libraries/haskell/sqlite-simple/default.nix

diff --git a/pkgs/development/libraries/haskell/snap-blaze/default.nix b/pkgs/development/libraries/haskell/snap-blaze/default.nix
new file mode 100644
index 00000000000..2b7444cd154
--- /dev/null
+++ b/pkgs/development/libraries/haskell/snap-blaze/default.nix
@@ -0,0 +1,14 @@
+{ cabal, blazeHtml, snapCore }:
+
+cabal.mkDerivation (self: {
+  pname = "snap-blaze";
+  version = "0.2.1.2";
+  sha256 = "136i5q9ipfqrh7fw8rgn1ws6zkjdrfwfq9wpccrm8dg3l61380wh";
+  buildDepends = [ blazeHtml snapCore ];
+  meta = {
+    homepage = "http://github.com/jaspervdj/snap-blaze";
+    description = "blaze-html integration for Snap";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/sqlite-simple/default.nix b/pkgs/development/libraries/haskell/sqlite-simple/default.nix
new file mode 100644
index 00000000000..c566cd19d82
--- /dev/null
+++ b/pkgs/development/libraries/haskell/sqlite-simple/default.nix
@@ -0,0 +1,17 @@
+{ cabal, base16Bytestring, directSqlite, HUnit, text, time
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "sqlite-simple";
+  version = "0.4.4.0";
+  sha256 = "09vgy3hji0bjb3bwxwkwhmgf50q442dqr3d86g5l5s3xiw3hca0r";
+  buildDepends = [ directSqlite text time transformers ];
+  testDepends = [ base16Bytestring directSqlite HUnit text time ];
+  meta = {
+    homepage = "http://github.com/nurpax/sqlite-simple";
+    description = "Mid-Level SQLite client 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 783b868f804..8e9db7f21c4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2111,6 +2111,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   snapletAcidState = callPackage ../development/libraries/haskell/snaplet-acid-state {};
 
+  snapBlaze = callPackage ../development/libraries/haskell/snap-blaze/default.nix {};
+
   snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};
 
   snapLoaderDynamic = callPackage ../development/libraries/haskell/snap/loader-dynamic.nix {};
@@ -2211,6 +2213,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   split_0_2_2 = callPackage ../development/libraries/haskell/split/0.2.2.nix {};
   split = self.split_0_2_2;
 
+  sqliteSimple = callPackage ../development/libraries/haskell/sqlite-simple/default.nix {};
+
   stbImage = callPackage ../development/libraries/haskell/stb-image {};
 
   stm_2_1_1_2 = callPackage ../development/libraries/haskell/stm/2.1.1.2.nix {};
-- 
GitLab


From 8677b19c9da2ab43537ca5cb45e38af1c996215a Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Mon, 3 Feb 2014 17:41:25 +0100
Subject: [PATCH 0838/3789] silver-searcher: updated to 0.19.2

Also fixed the "libgcc_s.so.1 must be installed for pthread_cancel to
work" problem.
---
 pkgs/tools/text/silver-searcher/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index adc8d9ec486..e8a1ee96505 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -1,15 +1,17 @@
 {stdenv, fetchgit, autoreconfHook, pkgconfig, pcre, zlib, lzma}:
 
-let release = "0.19.1"; in
+let release = "0.19.2"; in
 stdenv.mkDerivation {
   name = "silver-searcher-${release}";
 
   src = fetchgit {
     url = "https://github.com/ggreer/the_silver_searcher.git";
     rev = "refs/tags/${release}";
-    sha256 = "1km3ap74mls7vkp6si4f302zb1ifmldipjyfw2z9akqpvr3n44p9";
+    sha256 = "b6993e077f650eb0976cbc924640665fa9b2499a899ecba5a6cad5cf9addfdff";
   };
 
+  NIX_LDFLAGS = "-lgcc_s";
+
   buildInputs = [ autoreconfHook pkgconfig pcre zlib lzma ];
 
   meta = {
-- 
GitLab


From 26ea10a7756bfbc76a812a38dfa4e12fe0fbde83 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Mon, 3 Feb 2014 09:58:48 -0430
Subject: [PATCH 0839/3789] proofgeneral: fix build with earlier version of
 texinfo.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a204e0bf6a7..4d1a6dadbb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7738,6 +7738,7 @@ let
     prologMode = callPackage ../applications/editors/emacs-modes/prolog { };
 
     proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral {
+      texinfo = texinfo4 ;
       texLive = pkgs.texLiveAggregationFun {
         paths = [ pkgs.texLive pkgs.texLiveCMSuper ];
       };
-- 
GitLab


From aaa462c4bc26a5975c2395589bba7e204484171c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Feb 2014 10:25:57 +0100
Subject: [PATCH 0840/3789] haskell-abstract-deque: update to version 0.2.2.1

---
 .../libraries/haskell/abstract-deque/default.nix   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix
index 263cd049a3d..03ae29aef73 100644
--- a/pkgs/development/libraries/haskell/abstract-deque/default.nix
+++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix
@@ -1,11 +1,15 @@
-{ cabal, HUnit, random, testFramework, testFrameworkHunit }:
+{ cabal, HUnit, random, testFramework, testFrameworkHunit, time }:
 
 cabal.mkDerivation (self: {
   pname = "abstract-deque";
-  version = "0.2.2";
-  sha256 = "12g4y3j59nkjw9ja247m8ydhj6a033lzfbqkp4a5slrqdxfdlvyb";
-  buildDepends = [ HUnit random testFramework testFrameworkHunit ];
-  testDepends = [ HUnit random testFramework testFrameworkHunit ];
+  version = "0.2.2.1";
+  sha256 = "0saf7j8fdqqk9msxrfja22zx8v0ibzrqx3v9l07g5n84yh4ydbdx";
+  buildDepends = [
+    HUnit random testFramework testFrameworkHunit time
+  ];
+  testDepends = [
+    HUnit random testFramework testFrameworkHunit time
+  ];
   doCheck = false;
   meta = {
     homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
-- 
GitLab


From 55bcf1bcc56d184fafff07e1ee7afc8c6b1b20ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Feb 2014 10:25:59 +0100
Subject: [PATCH 0841/3789] haskell-atomic-primops: update to version 0.6

---
 .../libraries/haskell/atomic-primops/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix
index 9f1c2eedc66..c5bc0dd2b47 100644
--- a/pkgs/development/libraries/haskell/atomic-primops/default.nix
+++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "atomic-primops";
-  version = "0.5";
-  sha256 = "0pni44gi9sh4l3hxwh7bqadhh6nc7v8w869sv9n45vkxwhhwbk4i";
+  version = "0.6";
+  sha256 = "0jj4mv9vzk7s257gnjs00fza6shr7j9bv8p48gj61yncg0qdypiz";
   buildDepends = [ Cabal primitive ];
   meta = {
-    homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
+    homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
     description = "A safe approach to CAS and other atomic ops in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From dae7d8345467b1dc2abbe983f98108cbe4a1c525 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Feb 2014 10:26:00 +0100
Subject: [PATCH 0842/3789] haskell-doctest: update to version 0.9.10.1

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

diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix
index 46e69c95f94..843fd6239dc 100644
--- a/pkgs/development/libraries/haskell/doctest/default.nix
+++ b/pkgs/development/libraries/haskell/doctest/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "doctest";
-  version = "0.9.10";
-  sha256 = "1xislgmg62i2bngq8ghg31r4ip4qdbqzr6rqhm5wac7nchjv0j83";
+  version = "0.9.10.1";
+  sha256 = "1kl6bihhyj08ifij7ddpy6067s1lv2lnnp4an9wany3fzwlifbyi";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ deepseq filepath ghcPaths syb transformers ];
-- 
GitLab


From a2d903d213a842a0507fc761be02f8c687976e0d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Feb 2014 10:26:02 +0100
Subject: [PATCH 0843/3789] haskell-pipes-network: update to version 0.6.2

---
 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 7a6c21db997..b70527ecdad 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.1";
-  sha256 = "0ds6v98jamda8p72rnrwnj3x77mfx3kss57hj9ns97gga5jq88kl";
+  version = "0.6.2";
+  sha256 = "1y64cyi1lq7y5x3b1rv2iixlwqnz4g82nxk2m14x214fmj3np965";
   buildDepends = [
     network networkSimple pipes pipesSafe transformers
   ];
-- 
GitLab


From c19547ad42d510fe6795bf9cbe60125003d19455 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Feb 2014 10:26:04 +0100
Subject: [PATCH 0844/3789] haskell-shelly: update to version 1.4.4

---
 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 d64070459d6..72b3e280b3b 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.4.3.1";
-  sha256 = "04q22wprp0x075xyx6lnr8r792izvfigi4zryz2lxr5kqnzjki6r";
+  version = "1.4.4";
+  sha256 = "0gxmwwpg7p5ai35ng8fsx743w3q9p5jl0c1c3ckiqvz4jbwgyf7y";
   buildDepends = [
     async mtl systemFileio systemFilepath text time unixCompat
   ];
-- 
GitLab


From b4a9fff1aab4565f9b22e36e8fa41e19033176a2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 14:43:21 -0500
Subject: [PATCH 0845/3789] Update node packages

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/node-packages-generated.nix | 1586 +++++++++++---------
 1 file changed, 898 insertions(+), 688 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 9aec47445b5..6fa581b2f9c 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -357,7 +357,7 @@
     ];
     passthru.names = [ "ansistyles" ];
   };
-  by-spec."apparatus".">= 0.0.4" =
+  by-spec."apparatus".">= 0.0.6" =
     self.by-version."apparatus"."0.0.8";
   by-version."apparatus"."0.0.8" = lib.makeOverridable self.buildNodePackage {
     name = "apparatus-0.0.8";
@@ -377,22 +377,25 @@
     ];
     passthru.names = [ "apparatus" ];
   };
-  by-spec."archiver"."~0.4.10" =
-    self.by-version."archiver"."0.4.10";
-  by-version."archiver"."0.4.10" = lib.makeOverridable self.buildNodePackage {
-    name = "archiver-0.4.10";
+  by-spec."archiver"."~0.5.2" =
+    self.by-version."archiver"."0.5.2";
+  by-version."archiver"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+    name = "archiver-0.5.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/archiver/-/archiver-0.4.10.tgz";
-        name = "archiver-0.4.10.tgz";
-        sha1 = "df0feac8f1d1295e5eceb3a205559072d21f4747";
+        url = "http://registry.npmjs.org/archiver/-/archiver-0.5.2.tgz";
+        name = "archiver-0.5.2.tgz";
+        sha1 = "4e021b1fea5d902201f4886fca6a19fcc760083b";
       })
     ];
     buildInputs =
       (self.nativeDeps."archiver" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.24"
-      self.by-version."iconv-lite"."0.2.11"
+      self.by-version."readable-stream"."1.0.25"
+      self.by-version."zip-stream"."0.1.3"
+      self.by-version."lazystream"."0.1.0"
+      self.by-version."file-utils"."0.1.5"
+      self.by-version."lodash"."2.4.1"
     ];
     peerDependencies = [
     ];
@@ -542,14 +545,14 @@
     passthru.names = [ "assertion-error" ];
   };
   by-spec."async"."*" =
-    self.by-version."async"."0.2.9";
-  by-version."async"."0.2.9" = lib.makeOverridable self.buildNodePackage {
-    name = "async-0.2.9";
+    self.by-version."async"."0.2.10";
+  by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage {
+    name = "async-0.2.10";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
-        name = "async-0.2.9.tgz";
-        sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
+        url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
+        name = "async-0.2.10.tgz";
+        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
       })
     ];
     buildInputs =
@@ -560,7 +563,7 @@
     ];
     passthru.names = [ "async" ];
   };
-  "async" = self.by-version."async"."0.2.9";
+  "async" = self.by-version."async"."0.2.10";
   by-spec."async"."0.1.15" =
     self.by-version."async"."0.1.15";
   by-version."async"."0.1.15" = lib.makeOverridable self.buildNodePackage {
@@ -603,27 +606,44 @@
     self.by-version."async"."0.1.22";
   by-spec."async"."0.2.9" =
     self.by-version."async"."0.2.9";
+  by-version."async"."0.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "async-0.2.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
+        name = "async-0.2.9.tgz";
+        sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
   by-spec."async"."0.2.x" =
-    self.by-version."async"."0.2.9";
+    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.6" =
-    self.by-version."async"."0.2.9";
+    self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.7" =
-    self.by-version."async"."0.2.9";
+    self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.8" =
-    self.by-version."async"."0.2.9";
+    self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.9" =
-    self.by-version."async"."0.2.9";
+    self.by-version."async"."0.2.10";
   by-spec."aws-sdk"."*" =
-    self.by-version."aws-sdk"."2.0.0-rc8";
-  by-version."aws-sdk"."2.0.0-rc8" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sdk-2.0.0-rc8";
+    self.by-version."aws-sdk"."2.0.0-rc9";
+  by-version."aws-sdk"."2.0.0-rc9" = lib.makeOverridable self.buildNodePackage {
+    name = "aws-sdk-2.0.0-rc9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc8.tgz";
-        name = "aws-sdk-2.0.0-rc8.tgz";
-        sha1 = "30583789843db95ecd090b0d73f42be09fbd6cf3";
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc9.tgz";
+        name = "aws-sdk-2.0.0-rc9.tgz";
+        sha1 = "caa7653837f7886e7f9e4da5df3b3c8324d7d0ab";
       })
     ];
     buildInputs =
@@ -636,16 +656,16 @@
     ];
     passthru.names = [ "aws-sdk" ];
   };
-  "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc8";
+  "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc9";
   by-spec."aws-sdk".">=1.2.0 <2" =
-    self.by-version."aws-sdk"."1.17.3";
-  by-version."aws-sdk"."1.17.3" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sdk-1.17.3";
+    self.by-version."aws-sdk"."1.18.0";
+  by-version."aws-sdk"."1.18.0" = lib.makeOverridable self.buildNodePackage {
+    name = "aws-sdk-1.18.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.17.3.tgz";
-        name = "aws-sdk-1.17.3.tgz";
-        sha1 = "fd0ee0e0222b6a2dc313fa59788ae595fe55dffe";
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz";
+        name = "aws-sdk-1.18.0.tgz";
+        sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       })
     ];
     buildInputs =
@@ -999,7 +1019,7 @@
       self.by-version."retry"."0.6.0"
       self.by-version."rimraf"."2.2.6"
       self.by-version."semver"."2.1.0"
-      self.by-version."stringify-object"."0.1.7"
+      self.by-version."stringify-object"."0.1.8"
       self.by-version."sudo-block"."0.2.1"
       self.by-version."tar"."0.1.19"
       self.by-version."tmp"."0.0.23"
@@ -1099,7 +1119,7 @@
     buildInputs =
       (self.nativeDeps."bower-json" or []);
     deps = [
-      self.by-version."deep-extend"."0.2.6"
+      self.by-version."deep-extend"."0.2.8"
       self.by-version."graceful-fs"."2.0.1"
       self.by-version."intersect"."0.0.3"
     ];
@@ -1161,7 +1181,7 @@
     buildInputs =
       (self.nativeDeps."bower-registry-client" or []);
     deps = [
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."bower-config"."0.4.5"
       self.by-version."graceful-fs"."2.0.1"
       self.by-version."lru-cache"."2.3.1"
@@ -1527,14 +1547,14 @@
     passthru.names = [ "cardinal" ];
   };
   by-spec."chai"."*" =
-    self.by-version."chai"."1.8.1";
-  by-version."chai"."1.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "chai-1.8.1";
+    self.by-version."chai"."1.9.0";
+  by-version."chai"."1.9.0" = lib.makeOverridable self.buildNodePackage {
+    name = "chai-1.9.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/chai/-/chai-1.8.1.tgz";
-        name = "chai-1.8.1.tgz";
-        sha1 = "cc77866d5e7ebca2bd75144b1edc370a88785f72";
+        url = "http://registry.npmjs.org/chai/-/chai-1.9.0.tgz";
+        name = "chai-1.9.0.tgz";
+        sha1 = "3ebe99f3bab9241ed3fcd576f8fe96cad9ed7413";
       })
     ];
     buildInputs =
@@ -1547,7 +1567,7 @@
     ];
     passthru.names = [ "chai" ];
   };
-  "chai" = self.by-version."chai"."1.8.1";
+  "chai" = self.by-version."chai"."1.9.0";
   by-spec."chainsaw"."~0.1.0" =
     self.by-version."chainsaw"."0.1.0";
   by-version."chainsaw"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -1582,7 +1602,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.2"
+      self.by-version."has-color"."0.1.3"
       self.by-version."ansi-styles"."0.1.2"
     ];
     peerDependencies = [
@@ -1603,7 +1623,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.2"
+      self.by-version."has-color"."0.1.3"
       self.by-version."ansi-styles"."0.2.0"
     ];
     peerDependencies = [
@@ -1626,7 +1646,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.2"
+      self.by-version."has-color"."0.1.3"
       self.by-version."ansi-styles"."0.2.0"
     ];
     peerDependencies = [
@@ -1647,7 +1667,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.2"
+      self.by-version."has-color"."0.1.3"
       self.by-version."ansi-styles"."1.0.0"
       self.by-version."strip-ansi"."0.1.1"
     ];
@@ -2000,6 +2020,27 @@
     passthru.names = [ "cmd-shim" ];
   };
   by-spec."coffee-script"."*" =
+    self.by-version."coffee-script"."1.7.1";
+  by-version."coffee-script"."1.7.1" = lib.makeOverridable self.buildNodePackage {
+    name = "coffee-script-1.7.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.7.1.tgz";
+        name = "coffee-script-1.7.1.tgz";
+        sha1 = "62996a861780c75e6d5069d13822723b73404bfc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."coffee-script" or []);
+    deps = [
+      self.by-version."mkdirp"."0.3.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "coffee-script" ];
+  };
+  "coffee-script" = self.by-version."coffee-script"."1.7.1";
+  by-spec."coffee-script"."1.6.3" =
     self.by-version."coffee-script"."1.6.3";
   by-version."coffee-script"."1.6.3" = lib.makeOverridable self.buildNodePackage {
     name = "coffee-script-1.6.3";
@@ -2018,13 +2059,10 @@
     ];
     passthru.names = [ "coffee-script" ];
   };
-  "coffee-script" = self.by-version."coffee-script"."1.6.3";
-  by-spec."coffee-script"."1.6.3" =
-    self.by-version."coffee-script"."1.6.3";
   by-spec."coffee-script".">= 0.0.1" =
-    self.by-version."coffee-script"."1.6.3";
+    self.by-version."coffee-script"."1.7.1";
   by-spec."coffee-script".">=1.2.0" =
-    self.by-version."coffee-script"."1.6.3";
+    self.by-version."coffee-script"."1.7.1";
   by-spec."coffee-script"."~1.3.3" =
     self.by-version."coffee-script"."1.3.3";
   by-version."coffee-script"."1.3.3" = lib.makeOverridable self.buildNodePackage {
@@ -2067,15 +2105,15 @@
     ];
     passthru.names = [ "coffee-script-redux" ];
   };
-  by-spec."color"."~0.4.4" =
-    self.by-version."color"."0.4.4";
-  by-version."color"."0.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "color-0.4.4";
+  by-spec."color"."~0.5.0" =
+    self.by-version."color"."0.5.0";
+  by-version."color"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "color-0.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/color/-/color-0.4.4.tgz";
-        name = "color-0.4.4.tgz";
-        sha1 = "f8bae8a848854616328704e64ce4a94ab336b7b5";
+        url = "http://registry.npmjs.org/color/-/color-0.5.0.tgz";
+        name = "color-0.5.0.tgz";
+        sha1 = "4d283d8bfe4cbc7006de6b6d25a3c26f00e3ee6d";
       })
     ];
     buildInputs =
@@ -2327,7 +2365,7 @@
       (self.nativeDeps."config" or []);
     deps = [
       self.by-version."js-yaml"."0.3.7"
-      self.by-version."coffee-script"."1.6.3"
+      self.by-version."coffee-script"."1.7.1"
       self.by-version."vows"."0.7.0"
     ];
     peerDependencies = [
@@ -2692,7 +2730,7 @@
     buildInputs =
       (self.nativeDeps."constantinople" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.11"
+      self.by-version."uglify-js"."2.4.12"
     ];
     peerDependencies = [
     ];
@@ -2853,19 +2891,20 @@
     passthru.names = [ "cookiejar" ];
   };
   by-spec."cookies".">= 0.2.2" =
-    self.by-version."cookies"."0.3.8";
-  by-version."cookies"."0.3.8" = lib.makeOverridable self.buildNodePackage {
-    name = "cookies-0.3.8";
+    self.by-version."cookies"."0.4.0";
+  by-version."cookies"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "cookies-0.4.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cookies/-/cookies-0.3.8.tgz";
-        name = "cookies-0.3.8.tgz";
-        sha1 = "92fe50918f3d55aec4ae9d978bcddda2ada28ce9";
+        url = "http://registry.npmjs.org/cookies/-/cookies-0.4.0.tgz";
+        name = "cookies-0.4.0.tgz";
+        sha1 = "c5d1f8b76217ed653135afe32bdad747c2fa9190";
       })
     ];
     buildInputs =
       (self.nativeDeps."cookies" or []);
     deps = [
+      self.by-version."keygrip"."1.0.0"
     ];
     peerDependencies = [
     ];
@@ -2891,14 +2930,14 @@
     passthru.names = [ "core-util-is" ];
   };
   by-spec."couch-login"."~0.1.15" =
-    self.by-version."couch-login"."0.1.19";
-  by-version."couch-login"."0.1.19" = lib.makeOverridable self.buildNodePackage {
-    name = "couch-login-0.1.19";
+    self.by-version."couch-login"."0.1.20";
+  by-version."couch-login"."0.1.20" = lib.makeOverridable self.buildNodePackage {
+    name = "couch-login-0.1.20";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.19.tgz";
-        name = "couch-login-0.1.19.tgz";
-        sha1 = "5c472f64670dfb43fc381d290629b223edb64afa";
+        url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz";
+        name = "couch-login-0.1.20.tgz";
+        sha1 = "007c70ef80089dbae6f59eeeec37480799b39595";
       })
     ];
     buildInputs =
@@ -2911,16 +2950,16 @@
     passthru.names = [ "couch-login" ];
   };
   by-spec."couch-login"."~0.1.18" =
-    self.by-version."couch-login"."0.1.19";
+    self.by-version."couch-login"."0.1.20";
   by-spec."coveralls"."*" =
-    self.by-version."coveralls"."2.6.1";
-  by-version."coveralls"."2.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "coveralls-2.6.1";
+    self.by-version."coveralls"."2.7.1";
+  by-version."coveralls"."2.7.1" = lib.makeOverridable self.buildNodePackage {
+    name = "coveralls-2.7.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.6.1.tgz";
-        name = "coveralls-2.6.1.tgz";
-        sha1 = "0de635bba15fd48f4fc557ae9ac21309c013d2de";
+        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.7.1.tgz";
+        name = "coveralls-2.7.1.tgz";
+        sha1 = "86e91436d248ca9c202504e9e022d77946eded41";
       })
     ];
     buildInputs =
@@ -2935,7 +2974,7 @@
     ];
     passthru.names = [ "coveralls" ];
   };
-  "coveralls" = self.by-version."coveralls"."2.6.1";
+  "coveralls" = self.by-version."coveralls"."2.7.1";
   by-spec."crc"."0.2.0" =
     self.by-version."crc"."0.2.0";
   by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -3283,25 +3322,8 @@
     ];
     passthru.names = [ "debug" ];
   };
-  by-spec."debug"."0.7.0" =
-    self.by-version."debug"."0.7.0";
-  by-version."debug"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "debug-0.7.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/debug/-/debug-0.7.0.tgz";
-        name = "debug-0.7.0.tgz";
-        sha1 = "f5be05ec0434c992d79940e50b2695cfb2e01b08";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."debug" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "debug" ];
-  };
+  by-spec."debug"."0.7.4" =
+    self.by-version."debug"."0.7.4";
   by-spec."debug".">= 0.7.3 < 1" =
     self.by-version."debug"."0.7.4";
   by-spec."debug"."~0.7.0" =
@@ -3401,14 +3423,14 @@
     passthru.names = [ "deep-eql" ];
   };
   by-spec."deep-equal"."*" =
-    self.by-version."deep-equal"."0.1.2";
-  by-version."deep-equal"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "deep-equal-0.1.2";
+    self.by-version."deep-equal"."0.2.1";
+  by-version."deep-equal"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "deep-equal-0.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz";
-        name = "deep-equal-0.1.2.tgz";
-        sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce";
+        url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz";
+        name = "deep-equal-0.2.1.tgz";
+        sha1 = "fad7a793224cbf0c3c7786f92ef780e4fc8cc878";
       })
     ];
     buildInputs =
@@ -3439,14 +3461,14 @@
     passthru.names = [ "deep-equal" ];
   };
   by-spec."deep-extend"."~0.2.5" =
-    self.by-version."deep-extend"."0.2.6";
-  by-version."deep-extend"."0.2.6" = lib.makeOverridable self.buildNodePackage {
-    name = "deep-extend-0.2.6";
+    self.by-version."deep-extend"."0.2.8";
+  by-version."deep-extend"."0.2.8" = lib.makeOverridable self.buildNodePackage {
+    name = "deep-extend-0.2.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.6.tgz";
-        name = "deep-extend-0.2.6.tgz";
-        sha1 = "1f767e02b46d88d0a4087affa4b11b1b0b804250";
+        url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.8.tgz";
+        name = "deep-extend-0.2.8.tgz";
+        sha1 = "6d2893a805286e46d8243137c32fb991b50f4299";
       })
     ];
     buildInputs =
@@ -3458,7 +3480,7 @@
     passthru.names = [ "deep-extend" ];
   };
   by-spec."deep-extend"."~0.2.6" =
-    self.by-version."deep-extend"."0.2.6";
+    self.by-version."deep-extend"."0.2.8";
   by-spec."delayed-stream"."0.0.5" =
     self.by-version."delayed-stream"."0.0.5";
   by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -3716,7 +3738,7 @@
       self.by-version."each-async"."0.1.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."request"."2.31.0"
-      self.by-version."through2"."0.4.0"
+      self.by-version."through2"."0.4.1"
     ];
     peerDependencies = [
     ];
@@ -4403,7 +4425,7 @@
   };
   by-spec."express"."~3.4" =
     self.by-version."express"."3.4.8";
-  by-spec."express"."~3.4.4" =
+  by-spec."express"."~3.4.8" =
     self.by-version."express"."3.4.8";
   by-spec."express-form"."*" =
     self.by-version."express-form"."0.10.1";
@@ -4421,7 +4443,7 @@
     deps = [
       self.by-version."validator"."0.4.28"
       self.by-version."object-additions"."0.5.1"
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
     ];
     peerDependencies = [
       self.by-version."express"."3.4.8"
@@ -4615,14 +4637,14 @@
   by-spec."fetch-bower".">=2 <3" =
     self.by-version."fetch-bower"."2.0.0";
   by-spec."fields"."~0.1.11" =
-    self.by-version."fields"."0.1.11";
-  by-version."fields"."0.1.11" = lib.makeOverridable self.buildNodePackage {
-    name = "fields-0.1.11";
+    self.by-version."fields"."0.1.12";
+  by-version."fields"."0.1.12" = lib.makeOverridable self.buildNodePackage {
+    name = "fields-0.1.12";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/fields/-/fields-0.1.11.tgz";
-        name = "fields-0.1.11.tgz";
-        sha1 = "d428e4a622c9f71d52f413fb2fde96cfdb51c520";
+        url = "http://registry.npmjs.org/fields/-/fields-0.1.12.tgz";
+        name = "fields-0.1.12.tgz";
+        sha1 = "ded2dfe1e0aad3576aed554bfb8f65a7e7404bc1";
       })
     ];
     buildInputs =
@@ -4662,6 +4684,8 @@
     ];
     passthru.names = [ "file-utils" ];
   };
+  by-spec."file-utils"."~0.1.5" =
+    self.by-version."file-utils"."0.1.5";
   by-spec."fileset"."0.1.x" =
     self.by-version."fileset"."0.1.5";
   by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage {
@@ -4935,28 +4959,6 @@
   };
   by-spec."forever-monitor"."1.2.3" =
     self.by-version."forever-monitor"."1.2.3";
-  by-spec."form-data"."0.0.8" =
-    self.by-version."form-data"."0.0.8";
-  by-version."form-data"."0.0.8" = lib.makeOverridable self.buildNodePackage {
-    name = "form-data-0.0.8";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/form-data/-/form-data-0.0.8.tgz";
-        name = "form-data-0.0.8.tgz";
-        sha1 = "0890cd1005c5ccecc0b9d24a88052c92442d0db5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."form-data" or []);
-    deps = [
-      self.by-version."combined-stream"."0.0.4"
-      self.by-version."mime"."1.2.11"
-      self.by-version."async"."0.2.9"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "form-data" ];
-  };
   by-spec."form-data"."~0.0.3" =
     self.by-version."form-data"."0.0.10";
   by-version."form-data"."0.0.10" = lib.makeOverridable self.buildNodePackage {
@@ -4973,7 +4975,7 @@
     deps = [
       self.by-version."combined-stream"."0.0.4"
       self.by-version."mime"."1.2.11"
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
     ];
     peerDependencies = [
     ];
@@ -4995,7 +4997,7 @@
     deps = [
       self.by-version."combined-stream"."0.0.4"
       self.by-version."mime"."1.2.11"
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
     ];
     peerDependencies = [
     ];
@@ -5117,6 +5119,25 @@
     ];
     passthru.names = [ "fresh" ];
   };
+  by-spec."fresh"."~0.2.1" =
+    self.by-version."fresh"."0.2.1";
+  by-version."fresh"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "fresh-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fresh/-/fresh-0.2.1.tgz";
+        name = "fresh-0.2.1.tgz";
+        sha1 = "13cc0b1f53fe0e6fa6a70c18d52ce3c5c56be066";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fresh" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fresh" ];
+  };
   by-spec."fs-extra"."~0.6.1" =
     self.by-version."fs-extra"."0.6.4";
   by-version."fs-extra"."0.6.4" = lib.makeOverridable self.buildNodePackage {
@@ -5154,7 +5175,7 @@
     buildInputs =
       (self.nativeDeps."fs-walk" or []);
     deps = [
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
     ];
     peerDependencies = [
     ];
@@ -5598,14 +5619,14 @@
   by-spec."graceful-fs"."~2.0.1" =
     self.by-version."graceful-fs"."2.0.1";
   by-spec."gridfs-stream"."*" =
-    self.by-version."gridfs-stream"."0.4.0";
-  by-version."gridfs-stream"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "gridfs-stream-0.4.0";
+    self.by-version."gridfs-stream"."0.4.1";
+  by-version."gridfs-stream"."0.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "gridfs-stream-0.4.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.0.tgz";
-        name = "gridfs-stream-0.4.0.tgz";
-        sha1 = "f76f791e0d1b22649e11beeacddf8e62bd89ca2a";
+        url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.1.tgz";
+        name = "gridfs-stream-0.4.1.tgz";
+        sha1 = "1bcccb1b05b57946363b5e53fbe2bc95dd8877bb";
       })
     ];
     buildInputs =
@@ -5616,7 +5637,7 @@
     ];
     passthru.names = [ "gridfs-stream" ];
   };
-  "gridfs-stream" = self.by-version."gridfs-stream"."0.4.0";
+  "gridfs-stream" = self.by-version."gridfs-stream"."0.4.1";
   by-spec."growl"."1.7.x" =
     self.by-version."growl"."1.7.0";
   by-version."growl"."1.7.0" = lib.makeOverridable self.buildNodePackage {
@@ -5706,14 +5727,14 @@
   };
   "grunt-bower-task" = self.by-version."grunt-bower-task"."0.3.4";
   by-spec."grunt-cli"."*" =
-    self.by-version."grunt-cli"."0.1.11";
-  by-version."grunt-cli"."0.1.11" = lib.makeOverridable self.buildNodePackage {
-    name = "grunt-cli-0.1.11";
+    self.by-version."grunt-cli"."0.1.13";
+  by-version."grunt-cli"."0.1.13" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-cli-0.1.13";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.11.tgz";
-        name = "grunt-cli-0.1.11.tgz";
-        sha1 = "a0d785b7f8633983ecb5e6af8397feb6e39dd0a8";
+        url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.13.tgz";
+        name = "grunt-cli-0.1.13.tgz";
+        sha1 = "e9ebc4047631f5012d922770c39378133cad10f4";
       })
     ];
     buildInputs =
@@ -5727,9 +5748,9 @@
     ];
     passthru.names = [ "grunt-cli" ];
   };
-  "grunt-cli" = self.by-version."grunt-cli"."0.1.11";
+  "grunt-cli" = self.by-version."grunt-cli"."0.1.13";
   by-spec."grunt-cli"."~0.1.7" =
-    self.by-version."grunt-cli"."0.1.11";
+    self.by-version."grunt-cli"."0.1.13";
   by-spec."grunt-contrib-cssmin"."*" =
     self.by-version."grunt-contrib-cssmin"."0.7.0";
   by-version."grunt-contrib-cssmin"."0.7.0" = lib.makeOverridable self.buildNodePackage {
@@ -5767,7 +5788,7 @@
     buildInputs =
       (self.nativeDeps."grunt-contrib-jshint" or []);
     deps = [
-      self.by-version."jshint"."2.4.1"
+      self.by-version."jshint"."2.4.3"
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.2"
@@ -5789,7 +5810,7 @@
     buildInputs =
       (self.nativeDeps."grunt-contrib-less" or []);
     deps = [
-      self.by-version."less"."1.6.1"
+      self.by-version."less"."1.6.2"
       self.by-version."grunt-lib-contrib"."0.6.1"
       self.by-version."chalk"."0.4.0"
     ];
@@ -5822,20 +5843,20 @@
   };
   "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.1";
   by-spec."grunt-contrib-uglify"."*" =
-    self.by-version."grunt-contrib-uglify"."0.3.1";
-  by-version."grunt-contrib-uglify"."0.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "grunt-contrib-uglify-0.3.1";
+    self.by-version."grunt-contrib-uglify"."0.3.2";
+  by-version."grunt-contrib-uglify"."0.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-contrib-uglify-0.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.3.1.tgz";
-        name = "grunt-contrib-uglify-0.3.1.tgz";
-        sha1 = "6ce6836d8e8d4078ae2f2758f46d417241516f51";
+        url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.3.2.tgz";
+        name = "grunt-contrib-uglify-0.3.2.tgz";
+        sha1 = "865b00ae0d11d1f5fafca3967c9b099f8929684b";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-uglify" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.11"
+      self.by-version."uglify-js"."2.4.12"
       self.by-version."grunt-lib-contrib"."0.6.1"
       self.by-version."chalk"."0.4.0"
     ];
@@ -5844,7 +5865,7 @@
     ];
     passthru.names = [ "grunt-contrib-uglify" ];
   };
-  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.3.1";
+  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.3.2";
   by-spec."grunt-karma"."*" =
     self.by-version."grunt-karma"."0.7.2";
   by-version."grunt-karma"."0.7.2" = lib.makeOverridable self.buildNodePackage {
@@ -5904,7 +5925,7 @@
     buildInputs =
       (self.nativeDeps."grunt-sed" or []);
     deps = [
-      self.by-version."replace"."0.2.8"
+      self.by-version."replace"."0.2.9"
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.2"
@@ -5926,7 +5947,7 @@
     buildInputs =
       (self.nativeDeps."guifi-earth" or []);
     deps = [
-      self.by-version."coffee-script"."1.6.3"
+      self.by-version."coffee-script"."1.7.1"
       self.by-version."jade"."1.1.5"
       self.by-version."q"."1.0.0"
       self.by-version."xml2js"."0.4.1"
@@ -5951,7 +5972,7 @@
     buildInputs =
       (self.nativeDeps."gzippo" or []);
     deps = [
-      self.by-version."send"."0.1.4"
+      self.by-version."send"."0.2.0"
     ];
     peerDependencies = [
     ];
@@ -6003,14 +6024,14 @@
   by-spec."handlebars"."~1.0.11" =
     self.by-version."handlebars"."1.0.12";
   by-spec."has-color"."~0.1.0" =
-    self.by-version."has-color"."0.1.2";
-  by-version."has-color"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "has-color-0.1.2";
+    self.by-version."has-color"."0.1.3";
+  by-version."has-color"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "has-color-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/has-color/-/has-color-0.1.2.tgz";
-        name = "has-color-0.1.2.tgz";
-        sha1 = "c4a523038912451262c745e0a663c38d948098b4";
+        url = "http://registry.npmjs.org/has-color/-/has-color-0.1.3.tgz";
+        name = "has-color-0.1.3.tgz";
+        sha1 = "b249acb22a6b481c572eeddb28b8f346c0b242a1";
       })
     ];
     buildInputs =
@@ -6106,29 +6127,6 @@
   };
   by-spec."hawk"."~0.10.2" =
     self.by-version."hawk"."0.10.2";
-  by-spec."hawk"."~0.13.0" =
-    self.by-version."hawk"."0.13.1";
-  by-version."hawk"."0.13.1" = lib.makeOverridable self.buildNodePackage {
-    name = "hawk-0.13.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hawk/-/hawk-0.13.1.tgz";
-        name = "hawk-0.13.1.tgz";
-        sha1 = "3617958821f58311e4d7f6de291fca662b412ef4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hawk" or []);
-    deps = [
-      self.by-version."hoek"."0.8.5"
-      self.by-version."boom"."0.4.2"
-      self.by-version."cryptiles"."0.2.2"
-      self.by-version."sntp"."0.2.4"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "hawk" ];
-  };
   by-spec."hawk"."~1.0.0" =
     self.by-version."hawk"."1.0.0";
   by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -6235,25 +6233,6 @@
     ];
     passthru.names = [ "hoek" ];
   };
-  by-spec."hoek"."0.8.x" =
-    self.by-version."hoek"."0.8.5";
-  by-version."hoek"."0.8.5" = lib.makeOverridable self.buildNodePackage {
-    name = "hoek-0.8.5";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hoek/-/hoek-0.8.5.tgz";
-        name = "hoek-0.8.5.tgz";
-        sha1 = "1e9fd770ef7ebe0274adfcb5b0806a025a5e4e9f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hoek" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "hoek" ];
-  };
   by-spec."hoek"."0.9.x" =
     self.by-version."hoek"."0.9.1";
   by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage {
@@ -6328,7 +6307,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.24"
+      self.by-version."readable-stream"."1.0.25"
     ];
     peerDependencies = [
     ];
@@ -6351,7 +6330,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.24"
+      self.by-version."readable-stream"."1.0.25"
     ];
     peerDependencies = [
     ];
@@ -6491,8 +6470,6 @@
     ];
     passthru.names = [ "http-signature" ];
   };
-  by-spec."http-signature"."~0.9.11" =
-    self.by-version."http-signature"."0.9.11";
   by-spec."humanize"."~0.0.9" =
     self.by-version."humanize"."0.0.9";
   by-version."humanize"."0.0.9" = lib.makeOverridable self.buildNodePackage {
@@ -6545,7 +6522,7 @@
     buildInputs =
       (self.nativeDeps."i18next" or []);
     deps = [
-      self.by-version."cookies"."0.3.8"
+      self.by-version."cookies"."0.4.0"
     ];
     peerDependencies = [
     ];
@@ -6707,7 +6684,7 @@
       (self.nativeDeps."inquirer" or []);
     deps = [
       self.by-version."lodash"."1.2.1"
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."cli-color"."0.2.3"
       self.by-version."mute-stream"."0.0.3"
     ];
@@ -6730,7 +6707,7 @@
       (self.nativeDeps."inquirer" or []);
     deps = [
       self.by-version."lodash"."1.2.1"
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."cli-color"."0.2.3"
       self.by-version."mute-stream"."0.0.3"
     ];
@@ -6755,7 +6732,7 @@
       (self.nativeDeps."inquirer" or []);
     deps = [
       self.by-version."lodash"."2.4.1"
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."cli-color"."0.2.3"
       self.by-version."mute-stream"."0.0.4"
       self.by-version."through"."2.3.4"
@@ -6781,7 +6758,7 @@
       self.by-version."chalk"."0.2.1"
       self.by-version."request"."2.27.0"
       self.by-version."configstore"."0.1.7"
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."lodash"."1.3.1"
       self.by-version."inquirer"."0.2.5"
     ];
@@ -6826,16 +6803,16 @@
       self.by-version."winston"."0.7.2"
       self.by-version."nconf"."0.6.9"
       self.by-version."fs-walk"."0.0.1"
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."express"."3.4.8"
       self.by-version."jade"."1.1.5"
-      self.by-version."passport"."0.1.18"
+      self.by-version."passport"."0.2.0"
       self.by-version."passport-http"."0.2.2"
       self.by-version."js-yaml"."3.0.1"
-      self.by-version."mongoose"."3.8.4"
-      self.by-version."gridfs-stream"."0.4.0"
+      self.by-version."mongoose"."3.8.6"
+      self.by-version."gridfs-stream"."0.4.1"
       self.by-version."temp"."0.6.0"
-      self.by-version."kue"."0.6.2"
+      self.by-version."kue"."0.7.4"
       self.by-version."redis"."0.10.0"
       self.by-version."hiredis"."0.1.16"
     ];
@@ -6885,14 +6862,14 @@
   by-spec."isbinaryfile"."~0.1.9" =
     self.by-version."isbinaryfile"."0.1.9";
   by-spec."isbinaryfile"."~2.0.0" =
-    self.by-version."isbinaryfile"."2.0.0";
-  by-version."isbinaryfile"."2.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "isbinaryfile-2.0.0";
+    self.by-version."isbinaryfile"."2.0.1";
+  by-version."isbinaryfile"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "isbinaryfile-2.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-2.0.0.tgz";
-        name = "isbinaryfile-2.0.0.tgz";
-        sha1 = "309c09010811d04ebed7c8d026df443d565e9f26";
+        url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-2.0.1.tgz";
+        name = "isbinaryfile-2.0.1.tgz";
+        sha1 = "b92369bfdaf616027133e077c5ba145f36699d55";
       })
     ];
     buildInputs =
@@ -6924,7 +6901,7 @@
       self.by-version."nopt"."2.1.2"
       self.by-version."fileset"."0.1.5"
       self.by-version."which"."1.0.5"
-      self.by-version."async"."0.2.9"
+      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.1"
@@ -6956,7 +6933,7 @@
       self.by-version."nopt"."2.1.2"
       self.by-version."fileset"."0.1.5"
       self.by-version."which"."1.0.5"
-      self.by-version."async"."0.2.9"
+      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.5.1"
@@ -7230,14 +7207,14 @@
   by-spec."jsesc"."~0.4.3" =
     self.by-version."jsesc"."0.4.3";
   by-spec."jshint"."*" =
-    self.by-version."jshint"."2.4.1";
-  by-version."jshint"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "jshint-2.4.1";
+    self.by-version."jshint"."2.4.3";
+  by-version."jshint"."2.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "jshint-2.4.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jshint/-/jshint-2.4.1.tgz";
-        name = "jshint-2.4.1.tgz";
-        sha1 = "833f361a56577b80816b64f18434cce3b3942591";
+        url = "http://registry.npmjs.org/jshint/-/jshint-2.4.3.tgz";
+        name = "jshint-2.4.3.tgz";
+        sha1 = "1beb074b4d9f817773bb5aa16882fd67164c216a";
       })
     ];
     buildInputs =
@@ -7254,9 +7231,9 @@
     ];
     passthru.names = [ "jshint" ];
   };
-  "jshint" = self.by-version."jshint"."2.4.1";
+  "jshint" = self.by-version."jshint"."2.4.3";
   by-spec."jshint"."~2.4.0" =
-    self.by-version."jshint"."2.4.1";
+    self.by-version."jshint"."2.4.3";
   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 {
@@ -7295,25 +7272,6 @@
     ];
     passthru.names = [ "json-stringify-safe" ];
   };
-  by-spec."json-stringify-safe"."~4.0.0" =
-    self.by-version."json-stringify-safe"."4.0.0";
-  by-version."json-stringify-safe"."4.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "json-stringify-safe-4.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-4.0.0.tgz";
-        name = "json-stringify-safe-4.0.0.tgz";
-        sha1 = "77c271aaea54302e68efeaccb56abbf06a9b1a54";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."json-stringify-safe" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "json-stringify-safe" ];
-  };
   by-spec."json-stringify-safe"."~5.0.0" =
     self.by-version."json-stringify-safe"."5.0.0";
   by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -7481,14 +7439,14 @@
   };
   "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.2";
   by-spec."karma-coverage"."*" =
-    self.by-version."karma-coverage"."0.1.4";
-  by-version."karma-coverage"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-coverage-0.1.4";
+    self.by-version."karma-coverage"."0.1.5";
+  by-version."karma-coverage"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-coverage-0.1.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.4.tgz";
-        name = "karma-coverage-0.1.4.tgz";
-        sha1 = "53766bad4dc2aa26dcc1be95ded7809be8032d8e";
+        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.5.tgz";
+        name = "karma-coverage-0.1.5.tgz";
+        sha1 = "a4dcbe87d4a7765456ca64218b5f0601018e1371";
       })
     ];
     buildInputs =
@@ -7503,7 +7461,7 @@
     ];
     passthru.names = [ "karma-coverage" ];
   };
-  "karma-coverage" = self.by-version."karma-coverage"."0.1.4";
+  "karma-coverage" = self.by-version."karma-coverage"."0.1.5";
   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 {
@@ -7543,7 +7501,7 @@
     ];
     peerDependencies = [
       self.by-version."karma"."0.11.13"
-      self.by-version."mocha"."1.17.0"
+      self.by-version."mocha"."1.17.1"
     ];
     passthru.names = [ "karma-mocha" ];
   };
@@ -7584,7 +7542,7 @@
     buildInputs =
       (self.nativeDeps."karma-sauce-launcher" or []);
     deps = [
-      self.by-version."wd"."0.2.8"
+      self.by-version."wd"."0.2.10"
       self.by-version."sauce-connect-launcher"."0.2.2"
       self.by-version."q"."0.9.7"
       self.by-version."saucelabs"."0.1.1"
@@ -7595,22 +7553,22 @@
     passthru.names = [ "karma-sauce-launcher" ];
   };
   "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.0";
-  by-spec."keen.io"."0.0.3" =
-    self.by-version."keen.io"."0.0.3";
-  by-version."keen.io"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "keen.io-0.0.3";
+  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 {
+    name = "keen.io-0.0.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/keen.io/-/keen.io-0.0.3.tgz";
-        name = "keen.io-0.0.3.tgz";
-        sha1 = "2d6ae2baa6d24b618f378b2a44413e1283fbcb63";
+        url = "http://registry.npmjs.org/keen.io/-/keen.io-0.0.4.tgz";
+        name = "keen.io-0.0.4.tgz";
+        sha1 = "041caa79371a6bec51288e222f3bb2e05c7e6b25";
       })
     ];
     buildInputs =
       (self.nativeDeps."keen.io" or []);
     deps = [
       self.by-version."superagent"."0.13.0"
-      self.by-version."underscore"."1.4.4"
+      self.by-version."underscore"."1.5.2"
     ];
     peerDependencies = [
     ];
@@ -7673,6 +7631,25 @@
     ];
     passthru.names = [ "kew" ];
   };
+  by-spec."keygrip"."~1.0.0" =
+    self.by-version."keygrip"."1.0.0";
+  by-version."keygrip"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "keygrip-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.0.tgz";
+        name = "keygrip-1.0.0.tgz";
+        sha1 = "b771120e8e697b8692b76866a84cdff3912fc379";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."keygrip" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "keygrip" ];
+  };
   by-spec."keypress"."0.1.x" =
     self.by-version."keypress"."0.1.0";
   by-version."keypress"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -7694,6 +7671,25 @@
   };
   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 = "knockout-3.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/knockout/-/knockout-3.0.0.tgz";
+        name = "knockout-3.0.0.tgz";
+        sha1 = "fd8d43ee446237cde7df650f5c7dbcf68ae49a80";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."knockout" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "knockout" ];
+  };
   by-spec."knox"."*" =
     self.by-version."knox"."0.8.8";
   by-version."knox"."0.8.8" = lib.makeOverridable self.buildNodePackage {
@@ -7719,31 +7715,31 @@
   };
   "knox" = self.by-version."knox"."0.8.8";
   by-spec."kue"."*" =
-    self.by-version."kue"."0.6.2";
-  by-version."kue"."0.6.2" = lib.makeOverridable self.buildNodePackage {
-    name = "kue-0.6.2";
+    self.by-version."kue"."0.7.4";
+  by-version."kue"."0.7.4" = lib.makeOverridable self.buildNodePackage {
+    name = "kue-0.7.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/kue/-/kue-0.6.2.tgz";
-        name = "kue-0.6.2.tgz";
-        sha1 = "9a6a95081842cf4ee3da5c61770bc23616a943f2";
+        url = "http://registry.npmjs.org/kue/-/kue-0.7.4.tgz";
+        name = "kue-0.7.4.tgz";
+        sha1 = "bb3315580bbf4ec8663ce4203aec92e560a044ef";
       })
     ];
     buildInputs =
       (self.nativeDeps."kue" or []);
     deps = [
-      self.by-version."redis"."0.7.2"
+      self.by-version."redis"."0.10.0"
       self.by-version."express"."3.1.2"
       self.by-version."jade"."0.26.3"
       self.by-version."stylus"."0.27.2"
       self.by-version."nib"."0.5.0"
-      self.by-version."reds"."0.1.4"
+      self.by-version."reds"."0.2.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "kue" ];
   };
-  "kue" = self.by-version."kue"."0.6.2";
+  "kue" = self.by-version."kue"."0.7.4";
   by-spec."lazy"."~1.0.11" =
     self.by-version."lazy"."1.0.11";
   by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage {
@@ -7763,6 +7759,26 @@
     ];
     passthru.names = [ "lazy" ];
   };
+  by-spec."lazystream"."~0.1.0" =
+    self.by-version."lazystream"."0.1.0";
+  by-version."lazystream"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "lazystream-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz";
+        name = "lazystream-0.1.0.tgz";
+        sha1 = "1b25d63c772a4c20f0a5ed0a9d77f484b6e16920";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lazystream" or []);
+    deps = [
+      self.by-version."readable-stream"."1.0.25"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lazystream" ];
+  };
   by-spec."lcov-parse"."0.0.4" =
     self.by-version."lcov-parse"."0.0.4";
   by-version."lcov-parse"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -7804,14 +7820,14 @@
   };
   "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2";
   by-spec."less"."~1.6.0" =
-    self.by-version."less"."1.6.1";
-  by-version."less"."1.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "less-1.6.1";
+    self.by-version."less"."1.6.2";
+  by-version."less"."1.6.2" = lib.makeOverridable self.buildNodePackage {
+    name = "less-1.6.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/less/-/less-1.6.1.tgz";
-        name = "less-1.6.1.tgz";
-        sha1 = "54e5e8d7b4fc43a14f8a32aaf0bae2d45ac287ca";
+        url = "http://registry.npmjs.org/less/-/less-1.6.2.tgz";
+        name = "less-1.6.2.tgz";
+        sha1 = "86556e6ab8f9af4d8b853db16c5f262e94fc98a0";
       })
     ];
     buildInputs =
@@ -8021,15 +8037,15 @@
     ];
     passthru.names = [ "lodash" ];
   };
-  by-spec."lodash"."~2.3.0" =
-    self.by-version."lodash"."2.3.0";
-  by-version."lodash"."2.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "lodash-2.3.0";
+  by-spec."lodash"."~2.4.1" =
+    self.by-version."lodash"."2.4.1";
+  by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash-2.4.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/lodash/-/lodash-2.3.0.tgz";
-        name = "lodash-2.3.0.tgz";
-        sha1 = "dfbdac99cf87a59a022c474730570d8716c267dd";
+        url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz";
+        name = "lodash-2.4.1.tgz";
+        sha1 = "5b7723034dda4d262e5a46fb2c58d7cc22f71420";
       })
     ];
     buildInputs =
@@ -8040,24 +8056,126 @@
     ];
     passthru.names = [ "lodash" ];
   };
-  by-spec."lodash"."~2.4.1" =
-    self.by-version."lodash"."2.4.1";
-  by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "lodash-2.4.1";
+  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 {
+    name = "lodash._isnative-2.4.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz";
-        name = "lodash-2.4.1.tgz";
-        sha1 = "5b7723034dda4d262e5a46fb2c58d7cc22f71420";
+        url = "http://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz";
+        name = "lodash._isnative-2.4.1.tgz";
+        sha1 = "3ea6404b784a7be836c7b57580e1cdf79b14832c";
       })
     ];
     buildInputs =
-      (self.nativeDeps."lodash" or []);
+      (self.nativeDeps."lodash._isnative" or []);
     deps = [
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "lodash" ];
+    passthru.names = [ "lodash._isnative" ];
+  };
+  by-spec."lodash._objecttypes"."~2.4.1" =
+    self.by-version."lodash._objecttypes"."2.4.1";
+  by-version."lodash._objecttypes"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash._objecttypes-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz";
+        name = "lodash._objecttypes-2.4.1.tgz";
+        sha1 = "7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._objecttypes" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._objecttypes" ];
+  };
+  by-spec."lodash._shimkeys"."~2.4.1" =
+    self.by-version."lodash._shimkeys"."2.4.1";
+  by-version."lodash._shimkeys"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash._shimkeys-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz";
+        name = "lodash._shimkeys-2.4.1.tgz";
+        sha1 = "6e9cc9666ff081f0b5a6c978b83e242e6949d203";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._shimkeys" or []);
+    deps = [
+      self.by-version."lodash._objecttypes"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._shimkeys" ];
+  };
+  by-spec."lodash.defaults"."~2.4.1" =
+    self.by-version."lodash.defaults"."2.4.1";
+  by-version."lodash.defaults"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash.defaults-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz";
+        name = "lodash.defaults-2.4.1.tgz";
+        sha1 = "a7e8885f05e68851144b6e12a8f3678026bc4c54";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.defaults" or []);
+    deps = [
+      self.by-version."lodash.keys"."2.4.1"
+      self.by-version."lodash._objecttypes"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.defaults" ];
+  };
+  by-spec."lodash.isobject"."~2.4.1" =
+    self.by-version."lodash.isobject"."2.4.1";
+  by-version."lodash.isobject"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash.isobject-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz";
+        name = "lodash.isobject-2.4.1.tgz";
+        sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.isobject" or []);
+    deps = [
+      self.by-version."lodash._objecttypes"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.isobject" ];
+  };
+  by-spec."lodash.keys"."~2.4.1" =
+    self.by-version."lodash.keys"."2.4.1";
+  by-version."lodash.keys"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash.keys-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz";
+        name = "lodash.keys-2.4.1.tgz";
+        sha1 = "48dea46df8ff7632b10d706b8acb26591e2b3727";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.keys" or []);
+    deps = [
+      self.by-version."lodash._isnative"."2.4.1"
+      self.by-version."lodash.isobject"."2.4.1"
+      self.by-version."lodash._shimkeys"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.keys" ];
   };
   by-spec."log-driver"."1.2.1" =
     self.by-version."log-driver"."1.2.1";
@@ -8094,7 +8212,7 @@
     deps = [
       self.by-version."async"."0.1.15"
       self.by-version."semver"."1.1.4"
-      self.by-version."readable-stream"."1.0.24"
+      self.by-version."readable-stream"."1.0.25"
     ];
     peerDependencies = [
     ];
@@ -8254,15 +8372,34 @@
   };
   by-spec."lru-cache"."~2.5.0" =
     self.by-version."lru-cache"."2.5.0";
+  by-spec."lsmod"."0.0.2" =
+    self.by-version."lsmod"."0.0.2";
+  by-version."lsmod"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "lsmod-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lsmod/-/lsmod-0.0.2.tgz";
+        name = "lsmod-0.0.2.tgz";
+        sha1 = "ebfe765bbfcbe85006eb315862445158b7baf613";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lsmod" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lsmod" ];
+  };
   by-spec."mailcomposer".">= 0.1.27" =
-    self.by-version."mailcomposer"."0.2.7";
-  by-version."mailcomposer"."0.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "mailcomposer-0.2.7";
+    self.by-version."mailcomposer"."0.2.8";
+  by-version."mailcomposer"."0.2.8" = lib.makeOverridable self.buildNodePackage {
+    name = "mailcomposer-0.2.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.7.tgz";
-        name = "mailcomposer-0.2.7.tgz";
-        sha1 = "173ba58e9bca0e4c43ca25f44f2dfecf16ef98aa";
+        url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.8.tgz";
+        name = "mailcomposer-0.2.8.tgz";
+        sha1 = "bcb4d84aea08ea6f4c007f927c0ad214986370cc";
       })
     ];
     buildInputs =
@@ -8706,14 +8843,14 @@
     passthru.names = [ "mkpath" ];
   };
   by-spec."mocha"."*" =
-    self.by-version."mocha"."1.17.0";
-  by-version."mocha"."1.17.0" = lib.makeOverridable self.buildNodePackage {
-    name = "mocha-1.17.0";
+    self.by-version."mocha"."1.17.1";
+  by-version."mocha"."1.17.1" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-1.17.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mocha/-/mocha-1.17.0.tgz";
-        name = "mocha-1.17.0.tgz";
-        sha1 = "583d12a9f21775b6d37d104ac7db05d557fa5d50";
+        url = "http://registry.npmjs.org/mocha/-/mocha-1.17.1.tgz";
+        name = "mocha-1.17.1.tgz";
+        sha1 = "7f7671d68526d074b7bae660c9099f87e0ea1ccb";
       })
     ];
     buildInputs =
@@ -8731,7 +8868,7 @@
     ];
     passthru.names = [ "mocha" ];
   };
-  "mocha" = self.by-version."mocha"."1.17.0";
+  "mocha" = self.by-version."mocha"."1.17.1";
   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 {
@@ -8794,15 +8931,34 @@
     ];
     passthru.names = [ "moment" ];
   };
+  by-spec."moment"."~2.5.0" =
+    self.by-version."moment"."2.5.1";
+  by-version."moment"."2.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "moment-2.5.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/moment/-/moment-2.5.1.tgz";
+        name = "moment-2.5.1.tgz";
+        sha1 = "7146a3900533064ca799d5e792f4e480ee0e82bc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."moment" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "moment" ];
+  };
   by-spec."mongodb"."*" =
-    self.by-version."mongodb"."1.4.0-rc4";
-  by-version."mongodb"."1.4.0-rc4" = lib.makeOverridable self.buildNodePackage {
-    name = "mongodb-1.4.0-rc4";
+    self.by-version."mongodb"."1.4.0-rc5";
+  by-version."mongodb"."1.4.0-rc5" = lib.makeOverridable self.buildNodePackage {
+    name = "mongodb-1.4.0-rc5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc4.tgz";
-        name = "mongodb-1.4.0-rc4.tgz";
-        sha1 = "0d17168ec9b4e51a13300d4528478273b632aec5";
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc5.tgz";
+        name = "mongodb-1.4.0-rc5.tgz";
+        sha1 = "4be74a98df5f2f0e1eba6d868498d710f4c264ae";
       })
     ];
     buildInputs =
@@ -8815,7 +8971,7 @@
     ];
     passthru.names = [ "mongodb" ];
   };
-  "mongodb" = self.by-version."mongodb"."1.4.0-rc4";
+  "mongodb" = self.by-version."mongodb"."1.4.0-rc5";
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
   by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
@@ -8881,14 +9037,14 @@
   by-spec."mongodb"."1.3.x" =
     self.by-version."mongodb"."1.3.23";
   by-spec."mongoose"."*" =
-    self.by-version."mongoose"."3.8.4";
-  by-version."mongoose"."3.8.4" = lib.makeOverridable self.buildNodePackage {
-    name = "mongoose-3.8.4";
+    self.by-version."mongoose"."3.8.6";
+  by-version."mongoose"."3.8.6" = lib.makeOverridable self.buildNodePackage {
+    name = "mongoose-3.8.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.4.tgz";
-        name = "mongoose-3.8.4.tgz";
-        sha1 = "7ad48944d16213eb16c14ec5fbd25cf90d8c586c";
+        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.6.tgz";
+        name = "mongoose-3.8.6.tgz";
+        sha1 = "c8a282d3c74915864b6ed1e01884388c6e91d146";
       })
     ];
     buildInputs =
@@ -8902,7 +9058,7 @@
       self.by-version."mpromise"."0.4.3"
       self.by-version."mpath"."0.1.1"
       self.by-version."regexp-clone"."0.0.1"
-      self.by-version."mquery"."0.4.1"
+      self.by-version."mquery"."0.5.2"
     ];
     peerDependencies = [
     ];
@@ -9138,23 +9294,22 @@
     ];
     passthru.names = [ "mpromise" ];
   };
-  by-spec."mquery"."0.4.1" =
-    self.by-version."mquery"."0.4.1";
-  by-version."mquery"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "mquery-0.4.1";
+  by-spec."mquery"."0.5.2" =
+    self.by-version."mquery"."0.5.2";
+  by-version."mquery"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+    name = "mquery-0.5.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mquery/-/mquery-0.4.1.tgz";
-        name = "mquery-0.4.1.tgz";
-        sha1 = "c4626dd29203f3991abe9ddba88781256ad42fdf";
+        url = "http://registry.npmjs.org/mquery/-/mquery-0.5.2.tgz";
+        name = "mquery-0.5.2.tgz";
+        sha1 = "3b844d772af24e370c52e6eca1ddbb87af8b5a71";
       })
     ];
     buildInputs =
       (self.nativeDeps."mquery" or []);
     deps = [
       self.by-version."sliced"."0.0.5"
-      self.by-version."debug"."0.7.0"
-      self.by-version."mongodb"."1.3.19"
+      self.by-version."debug"."0.7.4"
       self.by-version."regexp-clone"."0.0.1"
     ];
     peerDependencies = [
@@ -9336,15 +9491,15 @@
     ];
     passthru.names = [ "nan" ];
   };
-  by-spec."natural"."0.0.69" =
-    self.by-version."natural"."0.0.69";
-  by-version."natural"."0.0.69" = lib.makeOverridable self.buildNodePackage {
-    name = "natural-0.0.69";
+  by-spec."natural"."0.1.17" =
+    self.by-version."natural"."0.1.17";
+  by-version."natural"."0.1.17" = lib.makeOverridable self.buildNodePackage {
+    name = "natural-0.1.17";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/natural/-/natural-0.0.69.tgz";
-        name = "natural-0.0.69.tgz";
-        sha1 = "60d9ce23797a54ec211600eb721cc66779b954d3";
+        url = "http://registry.npmjs.org/natural/-/natural-0.1.17.tgz";
+        name = "natural-0.1.17.tgz";
+        sha1 = "0ff654cd30aeb2aa298ab0580e6f7ea9f40954e0";
       })
     ];
     buildInputs =
@@ -9559,7 +9714,7 @@
       (self.nativeDeps."node-appc" or []);
     deps = [
       self.by-version."adm-zip"."0.4.3"
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."colors"."0.6.2"
       self.by-version."diff"."1.0.8"
       self.by-version."dox"."0.4.4"
@@ -9572,7 +9727,7 @@
       self.by-version."temp"."0.6.0"
       self.by-version."wrench"."1.5.6"
       self.by-version."uglify-js"."2.3.6"
-      self.by-version."xmldom"."0.1.18"
+      self.by-version."xmldom"."0.1.19"
     ];
     peerDependencies = [
     ];
@@ -9635,14 +9790,14 @@
   by-spec."node-gyp"."~0.12.2" =
     self.by-version."node-gyp"."0.12.2";
   by-spec."node-inspector"."*" =
-    self.by-version."node-inspector"."0.7.0-1";
-  by-version."node-inspector"."0.7.0-1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-inspector-0.7.0-1";
+    self.by-version."node-inspector"."0.7.0-2";
+  by-version."node-inspector"."0.7.0-2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-inspector-0.7.0-2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.0-1.tgz";
-        name = "node-inspector-0.7.0-1.tgz";
-        sha1 = "13964415403ee7642fd7554f87c2c7a51af64090";
+        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.0-2.tgz";
+        name = "node-inspector-0.7.0-2.tgz";
+        sha1 = "e26d3c5ee74fe99fc5c8b2adb5634dac0ca86e81";
       })
     ];
     buildInputs =
@@ -9650,7 +9805,7 @@
     deps = [
       self.by-version."socket.io"."0.9.16"
       self.by-version."express"."3.4.8"
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."glob"."3.2.8"
       self.by-version."rc"."0.3.3"
       self.by-version."strong-data-uri"."0.1.1"
@@ -9660,7 +9815,7 @@
     ];
     passthru.names = [ "node-inspector" ];
   };
-  "node-inspector" = self.by-version."node-inspector"."0.7.0-1";
+  "node-inspector" = self.by-version."node-inspector"."0.7.0-2";
   by-spec."node-protobuf"."*" =
     self.by-version."node-protobuf"."1.0.10";
   by-version."node-protobuf"."1.0.10" = lib.makeOverridable self.buildNodePackage {
@@ -9870,8 +10025,8 @@
     buildInputs =
       (self.nativeDeps."nodemailer" or []);
     deps = [
-      self.by-version."mailcomposer"."0.2.7"
-      self.by-version."simplesmtp"."0.3.18"
+      self.by-version."mailcomposer"."0.2.8"
+      self.by-version."simplesmtp"."0.3.20"
       self.by-version."optimist"."0.6.0"
     ];
     peerDependencies = [
@@ -9879,14 +10034,14 @@
     passthru.names = [ "nodemailer" ];
   };
   by-spec."nodemon"."*" =
-    self.by-version."nodemon"."1.0.13";
-  by-version."nodemon"."1.0.13" = lib.makeOverridable self.buildNodePackage {
-    name = "nodemon-1.0.13";
+    self.by-version."nodemon"."1.0.14";
+  by-version."nodemon"."1.0.14" = lib.makeOverridable self.buildNodePackage {
+    name = "nodemon-1.0.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.13.tgz";
-        name = "nodemon-1.0.13.tgz";
-        sha1 = "7ff62ddf0ba03b572fbc22901b33d53531034410";
+        url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.14.tgz";
+        name = "nodemon-1.0.14.tgz";
+        sha1 = "415499efd9262b6a76cbf37385876c3343f4f0c6";
       })
     ];
     buildInputs =
@@ -9899,7 +10054,7 @@
     ];
     passthru.names = [ "nodemon" ];
   };
-  "nodemon" = self.by-version."nodemon"."1.0.13";
+  "nodemon" = self.by-version."nodemon"."1.0.14";
   by-spec."nomnom"."1.6.x" =
     self.by-version."nomnom"."1.6.2";
   by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage {
@@ -9969,9 +10124,9 @@
     name = "nopt-1.0.10";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
+        url = "https://github.com/Filirom1/nopt/tarball/master#pull-request-in-progress";
         name = "nopt-1.0.10.tgz";
-        sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
+        sha256 = "94daa53a0ab7668be12931b7b551c924c913d1efef7f2a05e60704c9b90a7bad";
       })
     ];
     buildInputs =
@@ -10012,14 +10167,14 @@
     passthru.names = [ "normalize-package-data" ];
   };
   by-spec."npm"."*" =
-    self.by-version."npm"."1.3.24";
-  by-version."npm"."1.3.24" = lib.makeOverridable self.buildNodePackage {
-    name = "npm-1.3.24";
+    self.by-version."npm"."1.3.26";
+  by-version."npm"."1.3.26" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-1.3.26";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm/-/npm-1.3.24.tgz";
-        name = "npm-1.3.24.tgz";
-        sha1 = "d68273a343562aa969320a218f528930356d99de";
+        url = "http://registry.npmjs.org/npm/-/npm-1.3.26.tgz";
+        name = "npm-1.3.26.tgz";
+        sha1 = "bc07bf7cb58710078141c885c2d492fd570f606d";
       })
     ];
     buildInputs =
@@ -10048,7 +10203,7 @@
       self.by-version."chownr"."0.0.1"
       self.by-version."npmlog"."0.0.6"
       self.by-version."ansi"."0.2.1"
-      self.by-version."npm-registry-client"."0.3.3"
+      self.by-version."npm-registry-client"."0.3.5"
       self.by-version."read-package-json"."1.1.6"
       self.by-version."read-installed"."0.2.5"
       self.by-version."glob"."3.2.8"
@@ -10077,9 +10232,7 @@
     ];
     passthru.names = [ "npm" ];
   };
-  "npm" = self.by-version."npm"."1.3.24";
-  by-spec."npm"."~1.3.14" =
-    self.by-version."npm"."1.3.24";
+  "npm" = self.by-version."npm"."1.3.26";
   by-spec."npm-registry-client"."0.2.27" =
     self.by-version."npm-registry-client"."0.2.27";
   by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage {
@@ -10102,7 +10255,7 @@
       self.by-version."mkdirp"."0.3.5"
       self.by-version."rimraf"."2.2.6"
       self.by-version."retry"."0.6.0"
-      self.by-version."couch-login"."0.1.19"
+      self.by-version."couch-login"."0.1.20"
       self.by-version."npmlog"."0.0.6"
     ];
     peerDependencies = [
@@ -10110,14 +10263,14 @@
     passthru.names = [ "npm-registry-client" ];
   };
   by-spec."npm-registry-client"."~0.3.3" =
-    self.by-version."npm-registry-client"."0.3.3";
-  by-version."npm-registry-client"."0.3.3" = lib.makeOverridable self.buildNodePackage {
-    name = "npm-registry-client-0.3.3";
+    self.by-version."npm-registry-client"."0.3.5";
+  by-version."npm-registry-client"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-registry-client-0.3.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.3.tgz";
-        name = "npm-registry-client-0.3.3.tgz";
-        sha1 = "da08bb681fb24aa5c988ca71f8c10f27f09daf4a";
+        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.5.tgz";
+        name = "npm-registry-client-0.3.5.tgz";
+        sha1 = "98ba1ac851a3939a3fb9917c28fa8da522dc635f";
       })
     ];
     buildInputs =
@@ -10131,13 +10284,15 @@
       self.by-version."mkdirp"."0.3.5"
       self.by-version."rimraf"."2.2.6"
       self.by-version."retry"."0.6.0"
-      self.by-version."couch-login"."0.1.19"
+      self.by-version."couch-login"."0.1.20"
       self.by-version."npmlog"."0.0.6"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm-registry-client" ];
   };
+  by-spec."npm-registry-client"."~0.3.5" =
+    self.by-version."npm-registry-client"."0.3.5";
   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 {
@@ -10724,36 +10879,36 @@
     passthru.names = [ "p-throttler" ];
   };
   by-spec."passport"."*" =
-    self.by-version."passport"."0.1.18";
-  by-version."passport"."0.1.18" = lib.makeOverridable self.buildNodePackage {
-    name = "passport-0.1.18";
+    self.by-version."passport"."0.2.0";
+  by-version."passport"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "passport-0.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/passport/-/passport-0.1.18.tgz";
-        name = "passport-0.1.18.tgz";
-        sha1 = "c8264479dcb6414cadbb66752d12b37e0b6525a1";
+        url = "http://registry.npmjs.org/passport/-/passport-0.2.0.tgz";
+        name = "passport-0.2.0.tgz";
+        sha1 = "ae5ebc5611300d51fdc44032c7ca442a548dbca5";
       })
     ];
     buildInputs =
       (self.nativeDeps."passport" or []);
     deps = [
-      self.by-version."pkginfo"."0.2.3"
+      self.by-version."passport-strategy"."1.0.0"
       self.by-version."pause"."0.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "passport" ];
   };
-  "passport" = self.by-version."passport"."0.1.18";
-  by-spec."passport"."0.1.17" =
-    self.by-version."passport"."0.1.17";
-  by-version."passport"."0.1.17" = lib.makeOverridable self.buildNodePackage {
-    name = "passport-0.1.17";
+  "passport" = self.by-version."passport"."0.2.0";
+  by-spec."passport"."~0.1.1" =
+    self.by-version."passport"."0.1.18";
+  by-version."passport"."0.1.18" = lib.makeOverridable self.buildNodePackage {
+    name = "passport-0.1.18";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz";
-        name = "passport-0.1.17.tgz";
-        sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc";
+        url = "http://registry.npmjs.org/passport/-/passport-0.1.18.tgz";
+        name = "passport-0.1.18.tgz";
+        sha1 = "c8264479dcb6414cadbb66752d12b37e0b6525a1";
       })
     ];
     buildInputs =
@@ -10766,7 +10921,7 @@
     ];
     passthru.names = [ "passport" ];
   };
-  by-spec."passport"."~0.1.1" =
+  by-spec."passport"."~0.1.18" =
     self.by-version."passport"."0.1.18";
   by-spec."passport"."~0.1.3" =
     self.by-version."passport"."0.1.18";
@@ -10816,6 +10971,25 @@
   "passport-local" = self.by-version."passport-local"."0.1.6";
   by-spec."passport-local"."0.1.6" =
     self.by-version."passport-local"."0.1.6";
+  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 {
+    name = "passport-strategy-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz";
+        name = "passport-strategy-1.0.0.tgz";
+        sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."passport-strategy" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "passport-strategy" ];
+  };
   by-spec."path-is-inside"."~1.0.0" =
     self.by-version."path-is-inside"."1.0.0";
   by-version."path-is-inside"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -10855,14 +11029,14 @@
     passthru.names = [ "pause" ];
   };
   by-spec."phantomjs"."~1.9.1-2" =
-    self.by-version."phantomjs"."1.9.2-6";
-  by-version."phantomjs"."1.9.2-6" = lib.makeOverridable self.buildNodePackage {
-    name = "phantomjs-1.9.2-6";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-6.tgz";
-        name = "phantomjs-1.9.2-6.tgz";
-        sha1 = "71db87e5275489570560a744dbaa649c2f9da0a0";
+        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-1.tgz";
+        name = "phantomjs-1.9.7-1.tgz";
+        sha1 = "57a191c908de74d27ac4948bd66100ae88222f47";
       })
     ];
     buildInputs =
@@ -11208,6 +11382,8 @@
     self.by-version."q"."0.9.7";
   by-spec."q"."~0.9.7" =
     self.by-version."q"."0.9.7";
+  by-spec."q"."~1.0.0" =
+    self.by-version."q"."1.0.0";
   by-spec."qs"."0.4.2" =
     self.by-version."qs"."0.4.2";
   by-version."qs"."0.4.2" = lib.makeOverridable self.buildNodePackage {
@@ -11387,22 +11563,43 @@
     ];
     passthru.names = [ "range-parser" ];
   };
+  by-spec."range-parser"."~1.0.0" =
+    self.by-version."range-parser"."1.0.0";
+  by-version."range-parser"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "range-parser-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz";
+        name = "range-parser-1.0.0.tgz";
+        sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."range-parser" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "range-parser" ];
+  };
   by-spec."raven"."~0.6.0" =
-    self.by-version."raven"."0.6.0";
-  by-version."raven"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "raven-0.6.0";
+    self.by-version."raven"."0.6.1";
+  by-version."raven"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+    name = "raven-0.6.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/raven/-/raven-0.6.0.tgz";
-        name = "raven-0.6.0.tgz";
-        sha1 = "440aa58143e95760cb7b73b7b23b3429ca9b5576";
+        url = "http://registry.npmjs.org/raven/-/raven-0.6.1.tgz";
+        name = "raven-0.6.1.tgz";
+        sha1 = "2c307e90295517ce2d45354b0c2d905311f66a5d";
       })
     ];
     buildInputs =
       (self.nativeDeps."raven" or []);
     deps = [
-      self.by-version."node-uuid"."1.4.0"
-      self.by-version."raw-stacktrace"."1.0.0"
+      self.by-version."node-uuid"."1.4.1"
+      self.by-version."stack-trace"."0.0.7"
+      self.by-version."lsmod"."0.0.2"
+      self.by-version."cookie"."0.1.0"
     ];
     peerDependencies = [
     ];
@@ -11466,27 +11663,6 @@
     ];
     passthru.names = [ "raw-socket" ];
   };
-  by-spec."raw-stacktrace"."1.0.0" =
-    self.by-version."raw-stacktrace"."1.0.0";
-  by-version."raw-stacktrace"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "raw-stacktrace-1.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/raw-stacktrace/-/raw-stacktrace-1.0.0.tgz";
-        name = "raw-stacktrace-1.0.0.tgz";
-        sha1 = "f308881f17667785a9acd7c8fbd442e1b2acf1db";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."raw-stacktrace" or []);
-    deps = [
-      self.by-version."traceback"."0.3.0"
-      self.by-version."underscore"."1.5.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "raw-stacktrace" ];
-  };
   by-spec."rbytes"."*" =
     self.by-version."rbytes"."1.0.0";
   by-version."rbytes"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -11522,14 +11698,14 @@
       (self.nativeDeps."rc" or []);
     deps = [
       self.by-version."optimist"."0.3.7"
-      self.by-version."deep-extend"."0.2.6"
+      self.by-version."deep-extend"."0.2.8"
       self.by-version."ini"."1.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "rc" ];
   };
-  by-spec."rc"."~0.3.1" =
+  by-spec."rc"."~0.3.2" =
     self.by-version."rc"."0.3.3";
   by-spec."read"."1" =
     self.by-version."read"."1.0.5";
@@ -11629,19 +11805,20 @@
   by-spec."read-package-json"."~1.1.6" =
     self.by-version."read-package-json"."1.1.6";
   by-spec."readable-stream"."1.0" =
-    self.by-version."readable-stream"."1.0.24";
-  by-version."readable-stream"."1.0.24" = lib.makeOverridable self.buildNodePackage {
-    name = "readable-stream-1.0.24";
+    self.by-version."readable-stream"."1.0.25";
+  by-version."readable-stream"."1.0.25" = lib.makeOverridable self.buildNodePackage {
+    name = "readable-stream-1.0.25";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.24.tgz";
-        name = "readable-stream-1.0.24.tgz";
-        sha1 = "b5659d5772cd06992dffe5a3bee2eec480f1c2fe";
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.25.tgz";
+        name = "readable-stream-1.0.25.tgz";
+        sha1 = "df19f64e6f74fd37ecf9d3ab8dbf1e2d11c9a045";
       })
     ];
     buildInputs =
       (self.nativeDeps."readable-stream" or []);
     deps = [
+      self.by-version."string_decoder"."0.10.25"
     ];
     peerDependencies = [
     ];
@@ -11655,13 +11832,14 @@
       (fetchurl {
         url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.10.tgz";
         name = "readable-stream-1.1.10.tgz";
-        sha1 = "c616cbc30aa586724b7401c37de33b0b5c0c6429";
+        sha1 = "d4dc2e5319e9c90d1e71c69390ef62cd90827f65";
       })
     ];
     buildInputs =
       (self.nativeDeps."readable-stream" or []);
     deps = [
       self.by-version."core-util-is"."1.0.1"
+      self.by-version."string_decoder"."0.10.25"
       self.by-version."debuglog"."0.0.2"
     ];
     peerDependencies = [
@@ -11669,9 +11847,11 @@
     passthru.names = [ "readable-stream" ];
   };
   by-spec."readable-stream"."~1.0.17" =
-    self.by-version."readable-stream"."1.0.24";
+    self.by-version."readable-stream"."1.0.25";
   by-spec."readable-stream"."~1.0.2" =
-    self.by-version."readable-stream"."1.0.24";
+    self.by-version."readable-stream"."1.0.25";
+  by-spec."readable-stream"."~1.0.24" =
+    self.by-version."readable-stream"."1.0.25";
   by-spec."readable-stream"."~1.1.8" =
     self.by-version."readable-stream"."1.1.10";
   by-spec."readable-stream"."~1.1.9" =
@@ -11794,24 +11974,24 @@
     ];
     passthru.names = [ "redis" ];
   };
-  by-spec."redis".">= 0.6.6" =
+  by-spec."redis"."~0.10.0" =
     self.by-version."redis"."0.10.0";
-  by-spec."reds"."0.1.4" =
-    self.by-version."reds"."0.1.4";
-  by-version."reds"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "reds-0.1.4";
+  by-spec."reds"."~0.2.4" =
+    self.by-version."reds"."0.2.4";
+  by-version."reds"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "reds-0.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/reds/-/reds-0.1.4.tgz";
-        name = "reds-0.1.4.tgz";
-        sha1 = "a97819180c30f6ecd01cad03cecb574eaabb4bee";
+        url = "http://registry.npmjs.org/reds/-/reds-0.2.4.tgz";
+        name = "reds-0.2.4.tgz";
+        sha1 = "a82dcaaa52319635bc6eee3ef9c1ac074411de3c";
       })
     ];
     buildInputs =
       (self.nativeDeps."reds" or []);
     deps = [
-      self.by-version."natural"."0.0.69"
-      self.by-version."redis"."0.10.0"
+      self.by-version."natural"."0.1.17"
+      self.by-version."redis"."0.7.2"
     ];
     peerDependencies = [
     ];
@@ -11856,14 +12036,14 @@
     passthru.names = [ "regexp-clone" ];
   };
   by-spec."replace"."~0.2.4" =
-    self.by-version."replace"."0.2.8";
-  by-version."replace"."0.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "replace-0.2.8";
+    self.by-version."replace"."0.2.9";
+  by-version."replace"."0.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "replace-0.2.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/replace/-/replace-0.2.8.tgz";
-        name = "replace-0.2.8.tgz";
-        sha1 = "05fadc9800bf0e91459c229e867bdd9eac1a6d3d";
+        url = "http://registry.npmjs.org/replace/-/replace-0.2.9.tgz";
+        name = "replace-0.2.9.tgz";
+        sha1 = "64428de4451717e8cc34965d2d133dd86dace404";
       })
     ];
     buildInputs =
@@ -11995,37 +12175,6 @@
     self.by-version."request"."2.33.0";
   by-spec."request"."~2" =
     self.by-version."request"."2.33.0";
-  by-spec."request"."~2.21.0" =
-    self.by-version."request"."2.21.0";
-  by-version."request"."2.21.0" = lib.makeOverridable self.buildNodePackage {
-    name = "request-2.21.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.21.0.tgz";
-        name = "request-2.21.0.tgz";
-        sha1 = "5728ab9c45e5a87c99daccd530298b6673a868d7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request" or []);
-    deps = [
-      self.by-version."qs"."0.6.6"
-      self.by-version."json-stringify-safe"."4.0.0"
-      self.by-version."forever-agent"."0.5.0"
-      self.by-version."tunnel-agent"."0.3.0"
-      self.by-version."http-signature"."0.9.11"
-      self.by-version."hawk"."0.13.1"
-      self.by-version."aws-sign"."0.3.0"
-      self.by-version."oauth-sign"."0.3.0"
-      self.by-version."cookie-jar"."0.3.0"
-      self.by-version."node-uuid"."1.4.1"
-      self.by-version."mime"."1.2.11"
-      self.by-version."form-data"."0.0.8"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "request" ];
-  };
   by-spec."request"."~2.25.0" =
     self.by-version."request"."2.25.0";
   by-version."request"."2.25.0" = lib.makeOverridable self.buildNodePackage {
@@ -12150,6 +12299,8 @@
     ];
     passthru.names = [ "request" ];
   };
+  by-spec."request"."~2.33.0" =
+    self.by-version."request"."2.33.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 {
@@ -12305,14 +12456,14 @@
     passthru.names = [ "restify" ];
   };
   by-spec."rethinkdb"."*" =
-    self.by-version."rethinkdb"."1.11.0-3";
-  by-version."rethinkdb"."1.11.0-3" = lib.makeOverridable self.buildNodePackage {
-    name = "rethinkdb-1.11.0-3";
+    self.by-version."rethinkdb"."1.11.0-4";
+  by-version."rethinkdb"."1.11.0-4" = lib.makeOverridable self.buildNodePackage {
+    name = "rethinkdb-1.11.0-4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.11.0-3.tgz";
-        name = "rethinkdb-1.11.0-3.tgz";
-        sha1 = "6db00acf53b6fa75b0183b01fa2d7cb24f027881";
+        url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.11.0-4.tgz";
+        name = "rethinkdb-1.11.0-4.tgz";
+        sha1 = "11a4f32cf7cd98d895016448641b9af6a1b575e9";
       })
     ];
     buildInputs =
@@ -12324,7 +12475,7 @@
     ];
     passthru.names = [ "rethinkdb" ];
   };
-  "rethinkdb" = self.by-version."rethinkdb"."1.11.0-3";
+  "rethinkdb" = self.by-version."rethinkdb"."1.11.0-4";
   by-spec."retry"."0.6.0" =
     self.by-version."retry"."0.6.0";
   by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -12469,7 +12620,7 @@
     buildInputs =
       (self.nativeDeps."s3http" or []);
     deps = [
-      self.by-version."aws-sdk"."1.17.3"
+      self.by-version."aws-sdk"."1.18.0"
       self.by-version."commander"."2.0.0"
       self.by-version."http-auth"."2.0.7"
       self.by-version."express"."3.4.4"
@@ -12498,7 +12649,7 @@
       (self.nativeDeps."sauce-connect-launcher" or []);
     deps = [
       self.by-version."lodash"."1.3.1"
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."adm-zip"."0.4.3"
     ];
     peerDependencies = [
@@ -12695,14 +12846,14 @@
   by-spec."semver"."~2.2.1" =
     self.by-version."semver"."2.2.1";
   by-spec."send"."*" =
-    self.by-version."send"."0.1.4";
-  by-version."send"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "send-0.1.4";
+    self.by-version."send"."0.2.0";
+  by-version."send"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "send-0.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz";
-        name = "send-0.1.4.tgz";
-        sha1 = "be70d8d1be01de61821af13780b50345a4f71abd";
+        url = "http://registry.npmjs.org/send/-/send-0.2.0.tgz";
+        name = "send-0.2.0.tgz";
+        sha1 = "067abf45cff8bffb29cbdb7439725b32388a2c58";
       })
     ];
     buildInputs =
@@ -12710,8 +12861,8 @@
     deps = [
       self.by-version."debug"."0.7.4"
       self.by-version."mime"."1.2.11"
-      self.by-version."fresh"."0.2.0"
-      self.by-version."range-parser"."0.0.4"
+      self.by-version."fresh"."0.2.1"
+      self.by-version."range-parser"."1.0.0"
     ];
     peerDependencies = [
     ];
@@ -12765,6 +12916,27 @@
   };
   by-spec."send"."0.1.4" =
     self.by-version."send"."0.1.4";
+  by-version."send"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "send-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz";
+        name = "send-0.1.4.tgz";
+        sha1 = "be70d8d1be01de61821af13780b50345a4f71abd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."send" or []);
+    deps = [
+      self.by-version."debug"."0.7.4"
+      self.by-version."mime"."1.2.11"
+      self.by-version."fresh"."0.2.0"
+      self.by-version."range-parser"."0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "send" ];
+  };
   by-spec."sequence"."*" =
     self.by-version."sequence"."3.0.0";
   by-version."sequence"."3.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -12818,7 +12990,7 @@
       (self.nativeDeps."sha" or []);
     deps = [
       self.by-version."graceful-fs"."2.0.1"
-      self.by-version."readable-stream"."1.0.24"
+      self.by-version."readable-stream"."1.0.25"
     ];
     peerDependencies = [
     ];
@@ -12865,14 +13037,14 @@
     passthru.names = [ "shelljs" ];
   };
   by-spec."should"."*" =
-    self.by-version."should"."3.0.1";
-  by-version."should"."3.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "should-3.0.1";
+    self.by-version."should"."3.1.2";
+  by-version."should"."3.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "should-3.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/should/-/should-3.0.1.tgz";
-        name = "should-3.0.1.tgz";
-        sha1 = "b30fff8968b4701e2ea499de91d9b0ea4d37623e";
+        url = "http://registry.npmjs.org/should/-/should-3.1.2.tgz";
+        name = "should-3.1.2.tgz";
+        sha1 = "4bc206253d736c2fb902153477982c2b2e988c02";
       })
     ];
     buildInputs =
@@ -12883,7 +13055,7 @@
     ];
     passthru.names = [ "should" ];
   };
-  "should" = self.by-version."should"."3.0.1";
+  "should" = self.by-version."should"."3.1.2";
   by-spec."sigmund"."~1.0.0" =
     self.by-version."sigmund"."1.0.0";
   by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -12946,14 +13118,14 @@
     passthru.names = [ "simple-lru-cache" ];
   };
   by-spec."simplesmtp".">= 0.1.22" =
-    self.by-version."simplesmtp"."0.3.18";
-  by-version."simplesmtp"."0.3.18" = lib.makeOverridable self.buildNodePackage {
-    name = "simplesmtp-0.3.18";
+    self.by-version."simplesmtp"."0.3.20";
+  by-version."simplesmtp"."0.3.20" = lib.makeOverridable self.buildNodePackage {
+    name = "simplesmtp-0.3.20";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.18.tgz";
-        name = "simplesmtp-0.3.18.tgz";
-        sha1 = "54493d7d5b59b23b061b981655be8d001167a978";
+        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.20.tgz";
+        name = "simplesmtp-0.3.20.tgz";
+        sha1 = "9de032acd3f4dfee69aed80ea9843b09419bd001";
       })
     ];
     buildInputs =
@@ -13045,14 +13217,14 @@
   by-spec."slide"."~1.1.5" =
     self.by-version."slide"."1.1.5";
   by-spec."smartdc"."*" =
-    self.by-version."smartdc"."7.1.2";
-  by-version."smartdc"."7.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "smartdc-7.1.2";
+    self.by-version."smartdc"."7.2.0";
+  by-version."smartdc"."7.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "smartdc-7.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/smartdc/-/smartdc-7.1.2.tgz";
-        name = "smartdc-7.1.2.tgz";
-        sha1 = "11228af972ed5014d3798202ecc370e02f007872";
+        url = "http://registry.npmjs.org/smartdc/-/smartdc-7.2.0.tgz";
+        name = "smartdc-7.2.0.tgz";
+        sha1 = "2b4f9375f2c709061e96440976767774d5e4fe86";
       })
     ];
     buildInputs =
@@ -13070,7 +13242,7 @@
     ];
     passthru.names = [ "smartdc" ];
   };
-  "smartdc" = self.by-version."smartdc"."7.1.2";
+  "smartdc" = self.by-version."smartdc"."7.2.0";
   by-spec."smartdc-auth"."1.0.1" =
     self.by-version."smartdc-auth"."1.0.1";
   by-version."smartdc-auth"."1.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -13345,15 +13517,15 @@
     ];
     passthru.names = [ "ssh-agent" ];
   };
-  by-spec."ssh2"."~0.2.14" =
-    self.by-version."ssh2"."0.2.16";
-  by-version."ssh2"."0.2.16" = lib.makeOverridable self.buildNodePackage {
-    name = "ssh2-0.2.16";
+  by-spec."ssh2"."~0.2.16" =
+    self.by-version."ssh2"."0.2.17";
+  by-version."ssh2"."0.2.17" = lib.makeOverridable self.buildNodePackage {
+    name = "ssh2-0.2.17";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.16.tgz";
-        name = "ssh2-0.2.16.tgz";
-        sha1 = "f0e2fe7f4e3223c74ddd430dac82506ed3d747c7";
+        url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.17.tgz";
+        name = "ssh2-0.2.17.tgz";
+        sha1 = "ce7773e4c7c4f78a8ab19227dcc3afae0b149291";
       })
     ];
     buildInputs =
@@ -13366,7 +13538,7 @@
     ];
     passthru.names = [ "ssh2" ];
   };
-  by-spec."stack-trace"."0.0.x" =
+  by-spec."stack-trace"."0.0.7" =
     self.by-version."stack-trace"."0.0.7";
   by-version."stack-trace"."0.0.7" = lib.makeOverridable self.buildNodePackage {
     name = "stack-trace-0.0.7";
@@ -13385,6 +13557,25 @@
     ];
     passthru.names = [ "stack-trace" ];
   };
+  by-spec."stack-trace"."0.0.x" =
+    self.by-version."stack-trace"."0.0.8";
+  by-version."stack-trace"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "stack-trace-0.0.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.8.tgz";
+        name = "stack-trace-0.0.8.tgz";
+        sha1 = "8a9c30543ed9697f77739c67b053d8b030d86f3e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."stack-trace" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "stack-trace" ];
+  };
   by-spec."statsd"."*" =
     self.by-version."statsd"."0.7.0";
   by-version."statsd"."0.7.0" = lib.makeOverridable self.buildNodePackage {
@@ -13442,7 +13633,7 @@
     buildInputs =
       (self.nativeDeps."stream-counter" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.24"
+      self.by-version."readable-stream"."1.0.25"
     ];
     peerDependencies = [
     ];
@@ -13527,15 +13718,34 @@
     ];
     passthru.names = [ "string" ];
   };
+  by-spec."string_decoder"."~0.10.x" =
+    self.by-version."string_decoder"."0.10.25";
+  by-version."string_decoder"."0.10.25" = lib.makeOverridable self.buildNodePackage {
+    name = "string_decoder-0.10.25";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25.tgz";
+        name = "string_decoder-0.10.25.tgz";
+        sha1 = "668c9da4f8efbdc937a4a6b6bf1cfbec4e9a82e2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."string_decoder" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "string_decoder" ];
+  };
   by-spec."stringify-object"."~0.1.4" =
-    self.by-version."stringify-object"."0.1.7";
-  by-version."stringify-object"."0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "stringify-object-0.1.7";
+    self.by-version."stringify-object"."0.1.8";
+  by-version."stringify-object"."0.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "stringify-object-0.1.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.1.7.tgz";
-        name = "stringify-object-0.1.7.tgz";
-        sha1 = "bb54d1ceed118b428c1256742b40a53f03599581";
+        url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.1.8.tgz";
+        name = "stringify-object-0.1.8.tgz";
+        sha1 = "463348f38fdcd4fec1c011084c24a59ac653c1ee";
       })
     ];
     buildInputs =
@@ -13586,14 +13796,14 @@
     passthru.names = [ "strong-data-uri" ];
   };
   by-spec."stylus"."*" =
-    self.by-version."stylus"."0.42.1";
-  by-version."stylus"."0.42.1" = lib.makeOverridable self.buildNodePackage {
-    name = "stylus-0.42.1";
+    self.by-version."stylus"."0.42.2";
+  by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage {
+    name = "stylus-0.42.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stylus/-/stylus-0.42.1.tgz";
-        name = "stylus-0.42.1.tgz";
-        sha1 = "8e5bfec922e8d0037748cd05281d53ca602b6e4f";
+        url = "http://registry.npmjs.org/stylus/-/stylus-0.42.2.tgz";
+        name = "stylus-0.42.2.tgz";
+        sha1 = "bed29107803129bed1983efc4c7e33f4fd34fee7";
       })
     ];
     buildInputs =
@@ -13609,7 +13819,7 @@
     ];
     passthru.names = [ "stylus" ];
   };
-  "stylus" = self.by-version."stylus"."0.42.1";
+  "stylus" = self.by-version."stylus"."0.42.2";
   by-spec."stylus"."0.27.2" =
     self.by-version."stylus"."0.27.2";
   by-version."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage {
@@ -13724,33 +13934,8 @@
     ];
     passthru.names = [ "superagent" ];
   };
-  by-spec."superagent"."~0.15.7" =
-    self.by-version."superagent"."0.15.7";
-  by-version."superagent"."0.15.7" = lib.makeOverridable self.buildNodePackage {
-    name = "superagent-0.15.7";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/superagent/-/superagent-0.15.7.tgz";
-        name = "superagent-0.15.7.tgz";
-        sha1 = "095c70b8afffbc072f1458f39684d4854d6333a3";
-      })
-    ];
-    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.16.0" =
+    self.by-version."superagent"."0.16.0";
   by-spec."supertest"."*" =
     self.by-version."supertest"."0.9.0";
   by-version."supertest"."0.9.0" = lib.makeOverridable self.buildNodePackage {
@@ -13991,20 +14176,20 @@
     passthru.names = [ "through" ];
   };
   by-spec."through2"."~0.4.0" =
-    self.by-version."through2"."0.4.0";
-  by-version."through2"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "through2-0.4.0";
+    self.by-version."through2"."0.4.1";
+  by-version."through2"."0.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "through2-0.4.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/through2/-/through2-0.4.0.tgz";
-        name = "through2-0.4.0.tgz";
-        sha1 = "4c9a96e385ef082a86cce5b915ef512119bc5225";
+        url = "http://registry.npmjs.org/through2/-/through2-0.4.1.tgz";
+        name = "through2-0.4.1.tgz";
+        sha1 = "afd849c65af513c2541a98a7cfbcfec3a15a9686";
       })
     ];
     buildInputs =
       (self.nativeDeps."through2" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.24"
+      self.by-version."readable-stream"."1.0.25"
       self.by-version."xtend"."2.1.2"
     ];
     peerDependencies = [
@@ -14083,9 +14268,9 @@
     buildInputs =
       (self.nativeDeps."titanium" or []);
     deps = [
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."colors"."0.6.2"
-      self.by-version."fields"."0.1.11"
+      self.by-version."fields"."0.1.12"
       self.by-version."humanize"."0.0.9"
       self.by-version."jade"."0.35.0"
       self.by-version."longjohn"."0.2.2"
@@ -14183,25 +14368,6 @@
     ];
     passthru.names = [ "tough-cookie" ];
   };
-  by-spec."traceback".">=0.3.0 && < 0.4" =
-    self.by-version."traceback"."0.3.0";
-  by-version."traceback"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "traceback-0.3.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/traceback/-/traceback-0.3.0.tgz";
-        name = "traceback-0.3.0.tgz";
-        sha1 = "4e147f07cd332fbd0330ba510b942a5c9256a0ab";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."traceback" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "traceback" ];
-  };
   by-spec."transformers"."2.1.0" =
     self.by-version."transformers"."2.1.0";
   by-version."transformers"."2.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -14371,7 +14537,7 @@
     buildInputs =
       (self.nativeDeps."uglify-js" or []);
     deps = [
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."source-map"."0.1.31"
       self.by-version."optimist"."0.3.7"
       self.by-version."uglify-to-browserify"."1.0.1"
@@ -14415,7 +14581,7 @@
     buildInputs =
       (self.nativeDeps."uglify-js" or []);
     deps = [
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."source-map"."0.1.31"
       self.by-version."optimist"."0.3.7"
     ];
@@ -14426,20 +14592,20 @@
   by-spec."uglify-js"."~2.3.6" =
     self.by-version."uglify-js"."2.3.6";
   by-spec."uglify-js"."~2.4.0" =
-    self.by-version."uglify-js"."2.4.11";
-  by-version."uglify-js"."2.4.11" = lib.makeOverridable self.buildNodePackage {
-    name = "uglify-js-2.4.11";
+    self.by-version."uglify-js"."2.4.12";
+  by-version."uglify-js"."2.4.12" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-2.4.12";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.11.tgz";
-        name = "uglify-js-2.4.11.tgz";
-        sha1 = "ff2c824be664b715c1054e890b4b9027ed45b5c5";
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.12.tgz";
+        name = "uglify-js-2.4.12.tgz";
+        sha1 = "2354d9659f85330c1e3e2910f8acd77fe14bb4a8";
       })
     ];
     buildInputs =
       (self.nativeDeps."uglify-js" or []);
     deps = [
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."source-map"."0.1.31"
       self.by-version."optimist"."0.3.7"
       self.by-version."uglify-to-browserify"."1.0.1"
@@ -14546,6 +14712,8 @@
   };
   by-spec."underscore".">=1.1.7" =
     self.by-version."underscore"."1.5.2";
+  by-spec."underscore".">=1.3.1" =
+    self.by-version."underscore"."1.5.2";
   by-spec."underscore".">=1.4.3" =
     self.by-version."underscore"."1.5.2";
   by-spec."underscore".">=1.5.x" =
@@ -14623,33 +14791,32 @@
     passthru.names = [ "unfunk-diff" ];
   };
   by-spec."ungit"."*" =
-    self.by-version."ungit"."0.6.0";
-  by-version."ungit"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "ungit-0.6.0";
+    self.by-version."ungit"."0.6.1";
+  by-version."ungit"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+    name = "ungit-0.6.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ungit/-/ungit-0.6.0.tgz";
-        name = "ungit-0.6.0.tgz";
-        sha1 = "fffc26cafc5d138bc6b3585fef3f15744f5f3d31";
+        url = "http://registry.npmjs.org/ungit/-/ungit-0.6.1.tgz";
+        name = "ungit-0.6.1.tgz";
+        sha1 = "7fc1527eb183acf65eb72752b9c54324184d6fff";
       })
     ];
     buildInputs =
       (self.nativeDeps."ungit" or []);
     deps = [
       self.by-version."express"."3.4.8"
-      self.by-version."superagent"."0.15.7"
-      self.by-version."lodash"."2.3.0"
+      self.by-version."superagent"."0.16.0"
+      self.by-version."lodash"."2.4.1"
       self.by-version."temp"."0.6.0"
       self.by-version."socket.io"."0.9.16"
-      self.by-version."moment"."2.4.0"
+      self.by-version."moment"."2.5.1"
       self.by-version."async"."0.2.9"
-      self.by-version."ssh2"."0.2.16"
+      self.by-version."ssh2"."0.2.17"
       self.by-version."rc"."0.3.3"
       self.by-version."uuid"."1.4.1"
       self.by-version."winston"."0.7.2"
-      self.by-version."passport"."0.1.17"
+      self.by-version."passport"."0.1.18"
       self.by-version."passport-local"."0.1.6"
-      self.by-version."npm"."1.3.24"
       self.by-version."semver"."2.2.1"
       self.by-version."forever-monitor"."1.1.0"
       self.by-version."open"."0.0.4"
@@ -14658,17 +14825,21 @@
       self.by-version."signals"."1.0.0"
       self.by-version."hasher"."1.2.0"
       self.by-version."blueimp-md5"."1.1.0"
-      self.by-version."color"."0.4.4"
-      self.by-version."keen.io"."0.0.3"
+      self.by-version."color"."0.5.0"
+      self.by-version."keen.io"."0.0.4"
       self.by-version."getmac"."1.0.6"
-      self.by-version."deep-extend"."0.2.6"
-      self.by-version."raven"."0.6.0"
+      self.by-version."deep-extend"."0.2.8"
+      self.by-version."raven"."0.6.1"
+      self.by-version."knockout"."3.0.0"
+      self.by-version."npm-registry-client"."0.3.5"
+      self.by-version."npmconf"."0.1.12"
+      self.by-version."mkdirp"."0.3.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "ungit" ];
   };
-  "ungit" = self.by-version."ungit"."0.6.0";
+  "ungit" = self.by-version."ungit"."0.6.1";
   by-spec."update-notifier"."~0.1.3" =
     self.by-version."update-notifier"."0.1.7";
   by-version."update-notifier"."0.1.7" = lib.makeOverridable self.buildNodePackage {
@@ -14769,7 +14940,7 @@
       (self.nativeDeps."utile" or []);
     deps = [
       self.by-version."async"."0.1.22"
-      self.by-version."deep-equal"."0.1.2"
+      self.by-version."deep-equal"."0.2.1"
       self.by-version."i"."0.3.2"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."ncp"."0.2.7"
@@ -14793,8 +14964,8 @@
     buildInputs =
       (self.nativeDeps."utile" or []);
     deps = [
-      self.by-version."async"."0.2.9"
-      self.by-version."deep-equal"."0.1.2"
+      self.by-version."async"."0.2.10"
+      self.by-version."deep-equal"."0.2.1"
       self.by-version."i"."0.3.2"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."ncp"."0.4.2"
@@ -14992,6 +15163,27 @@
     passthru.names = [ "vows" ];
   };
   by-spec."walk"."*" =
+    self.by-version."walk"."2.3.1";
+  by-version."walk"."2.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "walk-2.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/walk/-/walk-2.3.1.tgz";
+        name = "walk-2.3.1.tgz";
+        sha1 = "015e0ef7a636ac43185661a9673d459572a44050";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."walk" or []);
+    deps = [
+      self.by-version."forEachAsync"."2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "walk" ];
+  };
+  "walk" = self.by-version."walk"."2.3.1";
+  by-spec."walk"."~2.2.1" =
     self.by-version."walk"."2.2.1";
   by-version."walk"."2.2.1" = lib.makeOverridable self.buildNodePackage {
     name = "walk-2.2.1";
@@ -15011,9 +15203,6 @@
     ];
     passthru.names = [ "walk" ];
   };
-  "walk" = self.by-version."walk"."2.2.1";
-  by-spec."walk"."~2.2.1" =
-    self.by-version."walk"."2.2.1";
   by-spec."watch"."0.5.x" =
     self.by-version."watch"."0.5.1";
   by-version."watch"."0.5.1" = lib.makeOverridable self.buildNodePackage {
@@ -15053,25 +15242,25 @@
     passthru.names = [ "watch" ];
   };
   by-spec."wd"."~0.2.8" =
-    self.by-version."wd"."0.2.8";
-  by-version."wd"."0.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "wd-0.2.8";
+    self.by-version."wd"."0.2.10";
+  by-version."wd"."0.2.10" = lib.makeOverridable self.buildNodePackage {
+    name = "wd-0.2.10";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wd/-/wd-0.2.8.tgz";
-        name = "wd-0.2.8.tgz";
-        sha1 = "397ccb8058e72af3ae6e7c485f4368f4fb514631";
+        url = "http://registry.npmjs.org/wd/-/wd-0.2.10.tgz";
+        name = "wd-0.2.10.tgz";
+        sha1 = "c4ac58eff5f32cc8e79e8f272a4c365c4240a68e";
       })
     ];
     buildInputs =
       (self.nativeDeps."wd" or []);
     deps = [
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."vargs"."0.1.0"
-      self.by-version."q"."0.9.7"
-      self.by-version."request"."2.21.0"
-      self.by-version."archiver"."0.4.10"
-      self.by-version."lodash"."1.3.1"
+      self.by-version."q"."1.0.0"
+      self.by-version."request"."2.33.0"
+      self.by-version."archiver"."0.5.2"
+      self.by-version."lodash"."2.4.1"
       self.by-version."underscore.string"."2.3.3"
     ];
     peerDependencies = [
@@ -15096,7 +15285,7 @@
       self.by-version."kew"."0.1.7"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."npmconf"."0.1.12"
-      self.by-version."phantomjs"."1.9.2-6"
+      self.by-version."phantomjs"."1.9.7-1"
       self.by-version."tmp"."0.0.23"
       self.by-version."follow-redirects"."0.0.3"
     ];
@@ -15205,13 +15394,13 @@
     buildInputs =
       (self.nativeDeps."winston" or []);
     deps = [
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."colors"."0.6.2"
       self.by-version."cycle"."1.0.3"
       self.by-version."eyes"."0.1.8"
       self.by-version."pkginfo"."0.3.0"
       self.by-version."request"."2.16.6"
-      self.by-version."stack-trace"."0.0.7"
+      self.by-version."stack-trace"."0.0.8"
     ];
     peerDependencies = [
     ];
@@ -15238,7 +15427,7 @@
       self.by-version."eyes"."0.1.8"
       self.by-version."pkginfo"."0.2.3"
       self.by-version."request"."2.9.203"
-      self.by-version."stack-trace"."0.0.7"
+      self.by-version."stack-trace"."0.0.8"
     ];
     peerDependencies = [
     ];
@@ -15540,14 +15729,14 @@
     passthru.names = [ "xmlbuilder" ];
   };
   by-spec."xmldom"."~0.1.16" =
-    self.by-version."xmldom"."0.1.18";
-  by-version."xmldom"."0.1.18" = lib.makeOverridable self.buildNodePackage {
-    name = "xmldom-0.1.18";
+    self.by-version."xmldom"."0.1.19";
+  by-version."xmldom"."0.1.19" = lib.makeOverridable self.buildNodePackage {
+    name = "xmldom-0.1.19";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.18.tgz";
-        name = "xmldom-0.1.18.tgz";
-        sha1 = "cb0ca87d81106ea4e75f632c9fff044d9cd3394a";
+        url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz";
+        name = "xmldom-0.1.19.tgz";
+        sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc";
       })
     ];
     buildInputs =
@@ -15662,7 +15851,7 @@
       self.by-version."debug"."0.7.4"
       self.by-version."isbinaryfile"."0.1.9"
       self.by-version."dargs"."0.1.0"
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."inquirer"."0.3.5"
       self.by-version."iconv-lite"."0.2.11"
       self.by-version."shelljs"."0.1.4"
@@ -15699,7 +15888,7 @@
       self.by-version."debug"."0.7.4"
       self.by-version."isbinaryfile"."0.1.9"
       self.by-version."dargs"."0.1.0"
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."inquirer"."0.3.5"
       self.by-version."iconv-lite"."0.2.11"
       self.by-version."shelljs"."0.2.6"
@@ -15737,9 +15926,9 @@
       self.by-version."mkdirp"."0.3.5"
       self.by-version."glob"."3.2.8"
       self.by-version."debug"."0.7.4"
-      self.by-version."isbinaryfile"."2.0.0"
+      self.by-version."isbinaryfile"."2.0.1"
       self.by-version."dargs"."0.1.0"
-      self.by-version."async"."0.2.9"
+      self.by-version."async"."0.2.10"
       self.by-version."inquirer"."0.4.0"
       self.by-version."iconv-lite"."0.2.11"
       self.by-version."shelljs"."0.2.6"
@@ -15775,14 +15964,14 @@
       self.by-version."update-notifier"."0.1.7"
       self.by-version."insight"."0.3.0"
       self.by-version."sudo-block"."0.3.0"
-      self.by-version."async"."0.2.9"
+      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.3"
       self.by-version."shelljs"."0.2.6"
     ];
     peerDependencies = [
-      self.by-version."grunt-cli"."0.1.11"
+      self.by-version."grunt-cli"."0.1.13"
       self.by-version."bower"."1.2.8"
     ];
     passthru.names = [ "yo" ];
@@ -15811,6 +16000,27 @@
     ];
     passthru.names = [ "zeparser" ];
   };
+  by-spec."zip-stream"."~0.1.0" =
+    self.by-version."zip-stream"."0.1.3";
+  by-version."zip-stream"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "zip-stream-0.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.1.3.tgz";
+        name = "zip-stream-0.1.3.tgz";
+        sha1 = "06d8787133ab397ab60ef6ee688d76dd5fb10de1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."zip-stream" or []);
+    deps = [
+      self.by-version."readable-stream"."1.1.10"
+      self.by-version."lodash.defaults"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "zip-stream" ];
+  };
   by-spec."zlib-browserify"."0.0.1" =
     self.by-version."zlib-browserify"."0.0.1";
   by-version."zlib-browserify"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-- 
GitLab


From 15eed826b69411edf6ac7301d98fa4906ff03a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 3 Feb 2014 21:03:05 +0100
Subject: [PATCH 0846/3789] psqlodbc: update from 8.3 to 9.3 (fixes build)

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

diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index a50aff1922d..11dc34176f5 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -30,8 +30,8 @@ args : with args;
   };
 # official postgres connector
  psql = rec {
-   deriv = stdenv.mkDerivation {
-    name = "psql-odbc-08.03.0200";
+   deriv = stdenv.mkDerivation rec {
+    name = "psqlodbc-09.03.0100";
     buildInputs = [ unixODBC libtool postgresql openssl ];
     preConfigure="
       export CPPFLAGS=-I${unixODBC}/include
@@ -39,9 +39,8 @@ args : with args;
     ";
     # added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose' 
     src = fetchurl {
-      url = http://wwwmaster.postgresql.org/redir?setmir=53&typ=h&url=http://ftp.de.postgresql.org/mirror/postgresql//odbc/versions/src/psqlodbc-08.03.0200.tar.gz;
-      name = "psqlodbc-08.03.0200.tar.gz";
-      sha256 = "1401hgzvs3m2yr2nbbf9gfy2wwijrk4ihwz972arbn0krsiwxya1";
+      url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz";
+      sha256 = "0mh10chkmlppidnmvgbp47v5jnphsrls28zwbvyk2crcn8gdx9q1";
     };
     meta = {
         description = "unix odbc driver for postgresql";
-- 
GitLab


From 3fe1656376bc830285bb89b9adbb11a3ad43af40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 3 Feb 2014 21:43:55 +0100
Subject: [PATCH 0847/3789] libav: bugfix updates for both branches; maintain

---
 pkgs/development/libraries/libav/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 6678984ebbe..c99059bf034 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -26,15 +26,15 @@ with { inherit (stdenv.lib) optional optionals; };
 
 let
   result = {
-    libav_9   = libavFun  "9.10" "039hx7z8lmsiljy4wj87hk8lkxspbxbrjv43v3lc38cxfx0fdnw3";
-    libav_0_8 = libavFun "0.8.9" "0zzphhkpwsdp2k3ijqr8miqsp4vk7dgcrcrv06qda1s09qb82lag";
+    libav_9   = libavFun  "9.11"  "1ad7vyxp0w8dw6ngc16fz0ngsjlgk6h8bpphghqia5sqkbl10ca3";
+    libav_0_8 = libavFun "0.8.10" "0sxmj4qsd3ljygvdjz7ly46nf7sqmaqka4hx65b1jdji12al1djc";
   };
 
   libavFun = version : sha256 : stdenv.mkDerivation rec {
     name = "libav-${version}";
 
     src = fetchurl {
-      url = "http://libav.org/releases/${name}.tar.xz";
+      url = "${meta.homepage}/releases/${name}.tar.xz";
       inherit sha256;
     };
     configureFlags =
@@ -105,6 +105,7 @@ let
       license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not?
         else if enableGPL then gpl2Plus else lgpl21Plus;
       platforms = platforms.all;
+      maintainers = [ maintainers.vcunat ];
     };
   }; # libavFun
 
-- 
GitLab


From e96bc485dba4cbae35f0dc9215b07b96b5491329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 3 Feb 2014 21:54:08 +0100
Subject: [PATCH 0848/3789] retroshare: 0.5.1d -> 0.5.5c

---
 .../networking/p2p/retroshare/default.nix     | 48 +++++++++++--------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index d4e3aa91cc0..3ae4f2a7483 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -1,28 +1,38 @@
-{stdenv, fetchurl, qt, libupnp, gpgme, libgnome_keyring, glib}:
-
-throw "still fails to build"
+{ stdenv, fetchurl, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
+, libXScrnSaver, speex, curl, libxml2, libxslt }:
 
 stdenv.mkDerivation {
-  name = "retroshare-0.5.1d";
+  name = "retroshare-0.5.5c";
 
   src = fetchurl {
-    url = mirror://sourceforge/retroshare/RetroShare-v0.5.1d.tar.gz;
-    sha256 = "15971wxx8djwcxn170jyn0mlh7cfzqsf031aa849wr9z234gwrcn";
+    url = mirror://sourceforge/project/retroshare/RetroShare/0.5.5c/retroshare_0.5.5-0.7068.tar.gz;
+    sha256 = "0l2n4pr1hq66q6qa073hrdx3s3d7iw54z8ay1zy82zhk2rwhsavp";
   };
 
-  buildInputs = [ qt libupnp gpgme libgnome_keyring glib ];
-
-  buildPhase = ''
-    cd libbitdht/src
-    qmake libbitdht.pro PREFIX=$out
-    make
-    cd ../..
-    cd libretroshare/src
-    qmake libretroshare.pro PREFIX=$out
-    make
-    cd ../../src
-    qmake libretroshare.pro PREFIX=$out
-    make
+  NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${libxml2}/include/libxml2";
+
+  patchPhase = "sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' libretroshare/src/upnp/UPnPBase.cpp";
+
+  buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig
+                  protobuf bzip2 libXScrnSaver curl libxml2 libxslt ];
+
+  sourceRoot = "retroshare-0.5.5/src";
+
+  configurePhase = ''
+    qmake PREFIX=$out DESTDIR=$out RetroShare.pro
+  '';
+
+  postInstall = ''
+    mkdir -p $out/bin
+    ln -s $out/retroshare-nogui $out/bin
+    ln -s $out/RetroShare $out/bin
   '';
 
+  meta = with stdenv.lib; {
+    description = "";
+    homepage = http://retroshare.sourceforge.net/;
+    #license = licenses.bsd2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.iElectric ];
+  };
 }
-- 
GitLab


From 8e74e1fdedbadd58e218d99f215ef91e6b84e3e7 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Mon, 3 Feb 2014 22:50:17 +0100
Subject: [PATCH 0849/3789] Replace the current Yubikey PBA implementation with
 the previous one.

Rationale:
  * The main reason for choosing to implement the PBA in accordance
    with the Yubico documentation was to prevent a MITM-USB-attack
    successfully recovering the new LUKS key.
  * However, a MITM-USB-attacker can read user id and password when
    they were entered for PBA, which allows him to recover the new
    challenge after the PBA is complete, with which he can challenge
    the Yubikey, decrypt the new AES blob and recover the LUKS key.
  * Additionally, since the Yubikey shared secret is stored in the
    same AES blob, after such an attack not only is the LUKS device
    compromised, the Yubikey is as well, since the shared secret
    has also been recovered by the attacker.
  * Furthermore, with this method an attacker could also bruteforce
    the AES blob, if he has access to the unencrypted device, which
    would again compromise the Yubikey, should he be successful.
  * Finally, with this method, once the LUKS key has been recovered
    once, the encryption is permanently broken, while with the previous
    system, the LUKS key itself it changed at every successful boot,
    so recovering it once will not necessarily result in a permanent
    breakage and will also not compromise the Yubikey itself (since
    its secret is never stored anywhere but on the Yubikey itself).

Summary:
The current implementation opens up up vulnerability to brute-forcing
the AES blob, while retaining the current MITM-USB attack, additionally
making the consequences of this attack permanent and extending it to
the Yubikey itself.
---
 nixos/modules/system/boot/luksroot.nix | 134 ++++++++-----------------
 1 file changed, 42 insertions(+), 92 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 8547682284f..d70d1341166 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -39,27 +39,11 @@ let
     ${optionalString (luks.yubikeySupport && (yubikey != null)) ''
 
     rbtohex() {
-        od -An -vtx1 | tr -d ' \n'
+        ( od -An -vtx1 | tr -d ' \n' )
     }
 
     hextorb() {
-        tr '[:lower:]' '[:upper:]' | sed -e 's|\([0-9A-F]\{2\}\)|\\\\\\x\1|gI' | xargs printf
-    }
-
-    take() {
-        local c="$1"
-        shift
-        head -c $c "$@"
-    }
-
-    drop() {
-        local c="$1"
-        shift
-        if [ -e "$1" ]; then
-            cat "$1" | ( dd of=/dev/null bs="$c" count=1 2>/dev/null ; dd 2>/dev/null )
-        else
-            ( dd of=/dev/null bs="$c" count=1 2>/dev/null ; dd 2>/dev/null )
-        fi
+        ( tr '[:lower:]' '[:upper:]' | sed -e 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI'| xargs printf )
     }
 
     open_yubikey() {
@@ -70,83 +54,41 @@ let
         local uuid_r
         local k_user
         local challenge
-        local k_blob
-        local aes_blob_decrypted
-        local checksum_correct
-        local checksum
-        local uuid_luks
-        local user_record
+        local opened
 
-        uuid_luks="$(cryptsetup luksUUID ${device} | take 36 | tr -d '-')"
+        sleep 1
 
-        ${optionalString (!yubikey.multiUser) ''
-        user_record="$(cat ${yubikey.storage.mountPoint}${yubikey.storage.path})"
-        uuid_r="$(echo -n $user_record | take 32)"
-        ''}
+        uuid_r="$(cat ${yubikey.storage.mountPoint}${yubikey.storage.path})"
 
         for try in $(seq 3); do
 
-            ${optionalString yubikey.multiUser ''
-            local user_id
-            echo -n "Enter user id: "
-            read -s user_id
-            echo
-            ''}
-
             ${optionalString yubikey.twoFactor ''
             echo -n "Enter two-factor passphrase: "
             read -s k_user
             echo
             ''}
 
-            ${optionalString yubikey.multiUser ''
-            local user_id_hash
-            user_id_hash="$(echo -n $user_id | openssl-wrap dgst -binary -sha512 | rbtohex)"
-
-            user_record="$(sed -n -e /^$user_id_hash[^$]*$/p ${yubikey.storage.mountPoint}${yubikey.storage.path} | tr -d '\n')"
-
-            if [ ! -z "$user_record" ]; then
-                user_record="$(echo -n $user_record | drop 128)"
-                uuid_r="$(echo -n $user_record | take 32)"
-            ''}
-
-                challenge="$(echo -n $k_user$uuid_r$uuid_luks | openssl-wrap dgst -binary -sha1 | rbtohex)"
-
-                k_blob="$(ykchalresp -${toString yubikey.slot} -x $challenge 2>/dev/null)"
+            challenge="$(echo -n $k_user$uuid_r | openssl-wrap dgst -binary -sha512 | rbtohex)"
 
-                aes_blob_decrypted="$(echo -n $user_record | drop 32 | hextorb | openssl-wrap enc -d -aes-256-ctr -K $k_blob -iv $uuid_r | rbtohex)"
+            k_luks="$(ykchalresp -${toString yubikey.slot} -x $challenge 2>/dev/null)"
 
-                checksum="$(echo -n $aes_blob_decrypted | drop 168)"
-                if [ "$(echo -n $aes_blob_decrypted | hextorb | take 84 | openssl-wrap dgst -binary -sha512 | rbtohex)" == "$checksum" ]; then
-                    checksum_correct=1
-                    break
-                else
-                    checksum_correct=0
-                    echo "Authentication failed!"
-                fi
+            echo -n "$k_luks" | hextorb | cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} --key-file=-
 
-            ${optionalString yubikey.multiUser ''
+            if [ $? == "0" ]; then
+                opened=true
+                break
             else
-                checksum_correct=0
+                opened=false
                 echo "Authentication failed!"
             fi
-            ''}
         done
 
-        if [ "$checksum_correct" != "1" ]; then
+        if [ "$opened" == false ]; then
             umount ${yubikey.storage.mountPoint}
             echo "Maximum authentication errors reached"
             exit 1
         fi
 
-        local k_yubi
-        k_yubi="$(echo -n $aes_blob_decrypted | take 40)"
-
-        local k_luks
-        k_luks="$(echo -n $aes_blob_decrypted | drop 40 | take 128)"
-
-        echo -n "$k_luks" | hextorb | cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} --key-file=-
-
         update_failed=false
 
         local new_uuid_r
@@ -161,24 +103,32 @@ let
         fi
 
         if [ "$update_failed" == false ]; then
-            new_uuid_r="$(echo -n $new_uuid_r | take 36 | tr -d '-')"
+            new_uuid_r="$(echo -n $new_uuid_r | head -c 36 | tr -d '-')"
 
             local new_challenge
-            new_challenge="$(echo -n $k_user$new_uuid_r$uuid_luks | openssl-wrap dgst -binary -sha1 | rbtohex)"
+            new_challenge="$(echo -n $k_user$new_uuid_r | openssl-wrap dgst -binary -sha512 | rbtohex)"
 
-            local new_k_blob
-            new_k_blob="$(echo -n $new_challenge | hextorb | openssl-wrap dgst -binary -sha1 -mac HMAC -macopt hexkey:$k_yubi | rbtohex)"
+            local new_k_luks
+            new_k_luks="$(ykchalresp -${toString yubikey.slot} -x $new_challenge 2>/dev/null)"
 
-            local new_aes_blob
-            new_aes_blob=$(echo -n "$k_yubi$k_luks$checksum" | hextorb | openssl-wrap enc -e -aes-256-ctr -K "$new_k_blob" -iv "$new_uuid_r" | rbtohex)
+            mkdir -p ${yubikey.ramfsMountPoint}
+            # A ramfs is used here to ensure that the file used to update
+            # the key slot with cryptsetup will never get swapped out.
+            # Warning: Do NOT replace with tmpfs!
+            mount -t ramfs none ${yubikey.ramfsMountPoint}
 
-            ${optionalString yubikey.multiUser ''
-            sed -i -e "s|^$user_id_hash$user_record|$user_id_hash$new_uuid_r$new_aes_blob|1"
-            ''}
+            echo -n "$new_k_luks" | hextorb > ${yubikey.ramfsMountPoint}/new_key
+            echo -n "$k_luks" | cryptsetup luksChangeKey ${device} --key-file=- ${yubikey.ramfsMountPoint}/new_key
 
-            ${optionalString (!yubikey.multiUser) ''
-            echo -n "$new_uuid_r$new_aes_blob" > ${yubikey.storage.mountPoint}${yubikey.storage.path}
-            ''}
+            if [ $? == "0" ]; then
+                echo -n "$new_uuid_r" > ${yubikey.storage.mountPoint}${yubikey.storage.path}
+            else
+                echo "Warning: Could not update LUKS key, current challenge persists!"
+            fi
+
+            rm -f ${yubikey.ramfsMountPoint}/new_key
+            umount ${yubikey.ramfsMountPoint}
+            rm -rf ${yubikey.ramfsMountPoint}
         else
             echo "Warning: Could not obtain new UUID, current challenge persists!"
         fi
@@ -336,21 +286,21 @@ in
               description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false)";
             };
 
-            multiUser = mkOption {
-              default = false;
-              type = types.bool;
-              description = "Whether to allow multiple users to authenticate with a Yubikey";
-            };
-
             slot = mkOption {
               default = 2;
               type = types.int;
               description = "Which slot on the Yubikey to challenge";
             };
 
+            ramfsMountPoint = mkOption {
+              default = "/crypt-ramfs";
+              type = types.string;
+              description = "Path where the ramfs used to update the LUKS key will be mounted in stage-1";
+            };
+
             storage = mkOption {
               type = types.optionSet;
-              description = "Options related to the authentication record";
+              description = "Options related to the storing the random UUID";
 
               options = {
                 device = mkOption {
@@ -358,7 +308,7 @@ in
                   type = types.path;
                   description = ''
                     An unencrypted device that will temporarily be mounted in stage-1.
-                    Must contain the authentication record for this LUKS device.
+                    Must contain the current random UUID to create the challenge for this LUKS device.
                   '';
                 };
 
@@ -378,7 +328,7 @@ in
                   default = "/crypt-storage/default";
                   type = types.string;
                   description = ''
-                    Absolute path of the authentication record on the unencrypted device with
+                    Absolute path of the random UUID on the unencrypted device with
                     that device's root directory as "/".
                   '';
                 };
-- 
GitLab


From d6ef65cb6ac4b46841c7a6294d25ef12c79376c7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 15:02:31 -0500
Subject: [PATCH 0850/3789] Limit livecd label to 11 characters

vfat partition labels can only be 11 characters long

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 nixos/modules/installer/cd-dvd/installation-cd-base.nix | 2 +-
 1 file changed, 1 insertion(+), 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 1aba67dcd9e..2a28131c28c 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -19,7 +19,7 @@ with pkgs.lib;
   # ISO naming.
   isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso";
 
-  isoImage.volumeID = substring 0 32 "NIXOS_${config.system.nixosVersion}";
+  isoImage.volumeID = substring 0 11 "NIXOS_${config.system.nixosVersion}";
 
   # Make the installer more likely to succeed in low memory
   # environments.  The kernel's overcommit heustistics bite us
-- 
GitLab


From 448dc031ed8150006398bbf6902711c6c2b1f716 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 17:05:23 -0500
Subject: [PATCH 0851/3789] Document EFI installation

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 nixos/doc/manual/installation.xml | 65 +++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml
index 70001577692..92e7625555b 100644
--- a/nixos/doc/manual/installation.xml
+++ b/nixos/doc/manual/installation.xml
@@ -295,8 +295,73 @@ $ reboot</screen>
 }</screen>
 </example>
 
+<section>
+
+<title>UEFI Installation</title>
+
+<para>NixOS can also be installed on UEFI systems.  The procedure
+is by and large the same as a BIOS installation, with the following
+changes:
+
+<itemizedlist>
+  <listitem>
+    <para>You should boot the livecd in UEFI mode (consult your specific
+    hardware's documentation for instructions how).</para>
+  </listitem>
+  <listitem>
+    <para>Instead of <command>fdisk</command>, you should use <command>
+    gdisk</command> to partition your disks. You will need to have a
+    separate partition for <filename>/boot</filename> with partition code
+    EF00, and it should be formatted with a vfat filesystem.</para>
+  </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>
+    should do this automatically for new configurations when booted in
+    UEFI mode.</para>
+  </listitem>
+  <listitem>
+    <para>You may want to look at the options starting with
+    <option>boot.loader.efi</option> and <option>boot.loader.gummiboot</option>
+    as well.</para>
+  </listitem>
+  <listitem>
+    <para>To see console messages during early boot, put <literal>"fbcon"</literal>
+    in your <option>boot.initrd.kernelModules</option></para>
+  </listitem>
+</itemizedlist>
+</para>
+
+</section>
+
+<section>
+
+<title>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,
+<link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>
+will work. For UEFI installations, you should mount the ISO, copy its contents
+verbatim to your drive, then either:
+
+<itemizedlist>
+  <listitem>
+    <para>Change the label of the disk partition to the label of the ISO
+    (visible with the blkid command), or</para>
+  </listitem>
+  <listitem>
+    <para>Edit <filename>loader/entries/nixos-livecd.conf</filename> on the drive
+    and change the <literal>root=</literal> field in the <literal>options</literal>
+    line to point to your drive (see the documentation on <literal>root=</literal>
+    in <link xlink:href="https://www.kernel.org/doc/Documentation/kernel-parameters.txt">
+    the kernel documentation</link> for more details).</para>
+  </listitem>
+</itemizedlist>
+</para>
 </section>
 
+</section>
 
 
 <!--===============================================================-->
-- 
GitLab


From 3bec816e0d4f4719c29d5f7ef2e2860b72c01318 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 17:23:54 -0500
Subject: [PATCH 0852/3789] Update node packages to np2nix 5.5.0

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/node-packages-generated.nix | 1276 ++++++++++----------
 1 file changed, 638 insertions(+), 638 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 6fa581b2f9c..e899df2e98e 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -4,7 +4,7 @@
   by-spec."CSSselect"."0.x" =
     self.by-version."CSSselect"."0.4.0";
   by-version."CSSselect"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "CSSselect-0.4.0";
+    name = "node-CSSselect-0.4.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.0.tgz";
@@ -27,7 +27,7 @@
   by-spec."CSSwhat"."0.4" =
     self.by-version."CSSwhat"."0.4.1";
   by-version."CSSwhat"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "CSSwhat-0.4.1";
+    name = "node-CSSwhat-0.4.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.1.tgz";
@@ -46,7 +46,7 @@
   by-spec."StringScanner"."~0.0.3" =
     self.by-version."StringScanner"."0.0.3";
   by-version."StringScanner"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "StringScanner-0.0.3";
+    name = "node-StringScanner-0.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/StringScanner/-/StringScanner-0.0.3.tgz";
@@ -65,7 +65,7 @@
   by-spec."abbrev"."1" =
     self.by-version."abbrev"."1.0.4";
   by-version."abbrev"."1.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "abbrev-1.0.4";
+    name = "node-abbrev-1.0.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz";
@@ -88,7 +88,7 @@
   by-spec."active-x-obfuscator"."0.0.1" =
     self.by-version."active-x-obfuscator"."0.0.1";
   by-version."active-x-obfuscator"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "active-x-obfuscator-0.0.1";
+    name = "node-active-x-obfuscator-0.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz";
@@ -108,7 +108,7 @@
   by-spec."addressparser"."~0.2.0" =
     self.by-version."addressparser"."0.2.0";
   by-version."addressparser"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "addressparser-0.2.0";
+    name = "node-addressparser-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.0.tgz";
@@ -127,7 +127,7 @@
   by-spec."adm-zip"."0.2.1" =
     self.by-version."adm-zip"."0.2.1";
   by-version."adm-zip"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "adm-zip-0.2.1";
+    name = "node-adm-zip-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz";
@@ -146,7 +146,7 @@
   by-spec."adm-zip"."~0.4.3" =
     self.by-version."adm-zip"."0.4.3";
   by-version."adm-zip"."0.4.3" = lib.makeOverridable self.buildNodePackage {
-    name = "adm-zip-0.4.3";
+    name = "node-adm-zip-0.4.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.3.tgz";
@@ -165,7 +165,7 @@
   by-spec."almond"."*" =
     self.by-version."almond"."0.2.9";
   by-version."almond"."0.2.9" = lib.makeOverridable self.buildNodePackage {
-    name = "almond-0.2.9";
+    name = "node-almond-0.2.9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/almond/-/almond-0.2.9.tgz";
@@ -185,7 +185,7 @@
   by-spec."amdefine"."*" =
     self.by-version."amdefine"."0.1.0";
   by-version."amdefine"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "amdefine-0.1.0";
+    name = "node-amdefine-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz";
@@ -226,7 +226,7 @@
   by-spec."ansi-remover"."*" =
     self.by-version."ansi-remover"."0.0.2";
   by-version."ansi-remover"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "ansi-remover-0.0.2";
+    name = "node-ansi-remover-0.0.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/ansi-remover/-/ansi-remover-0.0.2.tgz";
@@ -246,7 +246,7 @@
   by-spec."ansi-styles"."~0.1.0" =
     self.by-version."ansi-styles"."0.1.2";
   by-version."ansi-styles"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "ansi-styles-0.1.2";
+    name = "node-ansi-styles-0.1.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-0.1.2.tgz";
@@ -265,7 +265,7 @@
   by-spec."ansi-styles"."~0.2.0" =
     self.by-version."ansi-styles"."0.2.0";
   by-version."ansi-styles"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "ansi-styles-0.2.0";
+    name = "node-ansi-styles-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-0.2.0.tgz";
@@ -284,7 +284,7 @@
   by-spec."ansi-styles"."~1.0.0" =
     self.by-version."ansi-styles"."1.0.0";
   by-version."ansi-styles"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "ansi-styles-1.0.0";
+    name = "node-ansi-styles-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz";
@@ -303,7 +303,7 @@
   by-spec."ansicolors"."~0.2.1" =
     self.by-version."ansicolors"."0.2.1";
   by-version."ansicolors"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "ansicolors-0.2.1";
+    name = "node-ansicolors-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz";
@@ -322,7 +322,7 @@
   by-spec."ansicolors"."~0.3.2" =
     self.by-version."ansicolors"."0.3.2";
   by-version."ansicolors"."0.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "ansicolors-0.3.2";
+    name = "node-ansicolors-0.3.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz";
@@ -341,7 +341,7 @@
   by-spec."ansistyles"."~0.1.3" =
     self.by-version."ansistyles"."0.1.3";
   by-version."ansistyles"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "ansistyles-0.1.3";
+    name = "node-ansistyles-0.1.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz";
@@ -360,7 +360,7 @@
   by-spec."apparatus".">= 0.0.6" =
     self.by-version."apparatus"."0.0.8";
   by-version."apparatus"."0.0.8" = lib.makeOverridable self.buildNodePackage {
-    name = "apparatus-0.0.8";
+    name = "node-apparatus-0.0.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.8.tgz";
@@ -380,7 +380,7 @@
   by-spec."archiver"."~0.5.2" =
     self.by-version."archiver"."0.5.2";
   by-version."archiver"."0.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "archiver-0.5.2";
+    name = "node-archiver-0.5.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/archiver/-/archiver-0.5.2.tgz";
@@ -404,7 +404,7 @@
   by-spec."archy"."0" =
     self.by-version."archy"."0.0.2";
   by-version."archy"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "archy-0.0.2";
+    name = "node-archy-0.0.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/archy/-/archy-0.0.2.tgz";
@@ -425,7 +425,7 @@
   by-spec."argparse"."0.1.15" =
     self.by-version."argparse"."0.1.15";
   by-version."argparse"."0.1.15" = lib.makeOverridable self.buildNodePackage {
-    name = "argparse-0.1.15";
+    name = "node-argparse-0.1.15";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz";
@@ -448,7 +448,7 @@
   by-spec."ascli"."*" =
     self.by-version."ascli"."0.3.0";
   by-version."ascli"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "ascli-0.3.0";
+    name = "node-ascli-0.3.0";
     src = [
       (self.patchSource fetchurl {
         url = "http://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz";
@@ -469,7 +469,7 @@
   by-spec."asn1"."0.1.11" =
     self.by-version."asn1"."0.1.11";
   by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage {
-    name = "asn1-0.1.11";
+    name = "node-asn1-0.1.11";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
@@ -488,7 +488,7 @@
   by-spec."assert"."*" =
     self.by-version."assert"."1.1.0";
   by-version."assert"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "assert-1.1.0";
+    name = "node-assert-1.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/assert/-/assert-1.1.0.tgz";
@@ -509,7 +509,7 @@
   by-spec."assert-plus"."0.1.2" =
     self.by-version."assert-plus"."0.1.2";
   by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "assert-plus-0.1.2";
+    name = "node-assert-plus-0.1.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz";
@@ -528,7 +528,7 @@
   by-spec."assertion-error"."1.0.0" =
     self.by-version."assertion-error"."1.0.0";
   by-version."assertion-error"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "assertion-error-1.0.0";
+    name = "node-assertion-error-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz";
@@ -547,7 +547,7 @@
   by-spec."async"."*" =
     self.by-version."async"."0.2.10";
   by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage {
-    name = "async-0.2.10";
+    name = "node-async-0.2.10";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
@@ -567,7 +567,7 @@
   by-spec."async"."0.1.15" =
     self.by-version."async"."0.1.15";
   by-version."async"."0.1.15" = lib.makeOverridable self.buildNodePackage {
-    name = "async-0.1.15";
+    name = "node-async-0.1.15";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/async/-/async-0.1.15.tgz";
@@ -586,7 +586,7 @@
   by-spec."async"."0.1.22" =
     self.by-version."async"."0.1.22";
   by-version."async"."0.1.22" = lib.makeOverridable self.buildNodePackage {
-    name = "async-0.1.22";
+    name = "node-async-0.1.22";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz";
@@ -607,7 +607,7 @@
   by-spec."async"."0.2.9" =
     self.by-version."async"."0.2.9";
   by-version."async"."0.2.9" = lib.makeOverridable self.buildNodePackage {
-    name = "async-0.2.9";
+    name = "node-async-0.2.9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
@@ -638,7 +638,7 @@
   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 {
-    name = "aws-sdk-2.0.0-rc9";
+    name = "node-aws-sdk-2.0.0-rc9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc9.tgz";
@@ -660,7 +660,7 @@
   by-spec."aws-sdk".">=1.2.0 <2" =
     self.by-version."aws-sdk"."1.18.0";
   by-version."aws-sdk"."1.18.0" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sdk-1.18.0";
+    name = "node-aws-sdk-1.18.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz";
@@ -681,7 +681,7 @@
   by-spec."aws-sign"."~0.2.0" =
     self.by-version."aws-sign"."0.2.0";
   by-version."aws-sign"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sign-0.2.0";
+    name = "node-aws-sign-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz";
@@ -700,7 +700,7 @@
   by-spec."aws-sign"."~0.3.0" =
     self.by-version."aws-sign"."0.3.0";
   by-version."aws-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sign-0.3.0";
+    name = "node-aws-sign-0.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz";
@@ -719,7 +719,7 @@
   by-spec."aws-sign2"."~0.5.0" =
     self.by-version."aws-sign2"."0.5.0";
   by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sign2-0.5.0";
+    name = "node-aws-sign2-0.5.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
@@ -738,7 +738,7 @@
   by-spec."backbone"."*" =
     self.by-version."backbone"."1.1.0";
   by-version."backbone"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "backbone-1.1.0";
+    name = "node-backbone-1.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/backbone/-/backbone-1.1.0.tgz";
@@ -759,7 +759,7 @@
   by-spec."backoff"."2.1.0" =
     self.by-version."backoff"."2.1.0";
   by-version."backoff"."2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "backoff-2.1.0";
+    name = "node-backoff-2.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/backoff/-/backoff-2.1.0.tgz";
@@ -778,7 +778,7 @@
   by-spec."base64id"."0.1.0" =
     self.by-version."base64id"."0.1.0";
   by-version."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "base64id-0.1.0";
+    name = "node-base64id-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
@@ -797,7 +797,7 @@
   by-spec."batch"."0.5.0" =
     self.by-version."batch"."0.5.0";
   by-version."batch"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "batch-0.5.0";
+    name = "node-batch-0.5.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/batch/-/batch-0.5.0.tgz";
@@ -816,7 +816,7 @@
   by-spec."bcrypt"."*" =
     self.by-version."bcrypt"."0.7.7";
   by-version."bcrypt"."0.7.7" = lib.makeOverridable self.buildNodePackage {
-    name = "bcrypt-0.7.7";
+    name = "node-bcrypt-0.7.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.7.tgz";
@@ -837,7 +837,7 @@
   by-spec."binary"."~0.3.0" =
     self.by-version."binary"."0.3.0";
   by-version."binary"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "binary-0.3.0";
+    name = "node-binary-0.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/binary/-/binary-0.3.0.tgz";
@@ -858,7 +858,7 @@
   by-spec."bindings"."*" =
     self.by-version."bindings"."1.1.1";
   by-version."bindings"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "bindings-1.1.1";
+    name = "node-bindings-1.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz";
@@ -877,7 +877,7 @@
   by-spec."bindings"."1.0.0" =
     self.by-version."bindings"."1.0.0";
   by-version."bindings"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "bindings-1.0.0";
+    name = "node-bindings-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bindings/-/bindings-1.0.0.tgz";
@@ -896,7 +896,7 @@
   by-spec."block-stream"."*" =
     self.by-version."block-stream"."0.0.7";
   by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "block-stream-0.0.7";
+    name = "node-block-stream-0.0.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz";
@@ -918,7 +918,7 @@
   by-spec."blueimp-md5"."~1.1.0" =
     self.by-version."blueimp-md5"."1.1.0";
   by-version."blueimp-md5"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "blueimp-md5-1.1.0";
+    name = "node-blueimp-md5-1.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/blueimp-md5/-/blueimp-md5-1.1.0.tgz";
@@ -937,7 +937,7 @@
   by-spec."boom"."0.3.x" =
     self.by-version."boom"."0.3.8";
   by-version."boom"."0.3.8" = lib.makeOverridable self.buildNodePackage {
-    name = "boom-0.3.8";
+    name = "node-boom-0.3.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz";
@@ -957,7 +957,7 @@
   by-spec."boom"."0.4.x" =
     self.by-version."boom"."0.4.2";
   by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "boom-0.4.2";
+    name = "node-boom-0.4.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
@@ -1041,7 +1041,7 @@
   by-spec."bower-config"."~0.4.3" =
     self.by-version."bower-config"."0.4.5";
   by-version."bower-config"."0.4.5" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-config-0.4.5";
+    name = "node-bower-config-0.4.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bower-config/-/bower-config-0.4.5.tgz";
@@ -1064,7 +1064,7 @@
   by-spec."bower-config"."~0.5.0" =
     self.by-version."bower-config"."0.5.0";
   by-version."bower-config"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-config-0.5.0";
+    name = "node-bower-config-0.5.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.0.tgz";
@@ -1087,7 +1087,7 @@
   by-spec."bower-endpoint-parser"."0.2.1" =
     self.by-version."bower-endpoint-parser"."0.2.1";
   by-version."bower-endpoint-parser"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-endpoint-parser-0.2.1";
+    name = "node-bower-endpoint-parser-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.1.tgz";
@@ -1108,7 +1108,7 @@
   by-spec."bower-json"."0.4.0" =
     self.by-version."bower-json"."0.4.0";
   by-version."bower-json"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-json-0.4.0";
+    name = "node-bower-json-0.4.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bower-json/-/bower-json-0.4.0.tgz";
@@ -1132,7 +1132,7 @@
   by-spec."bower-logger"."0.2.1" =
     self.by-version."bower-logger"."0.2.1";
   by-version."bower-logger"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-logger-0.2.1";
+    name = "node-bower-logger-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.1.tgz";
@@ -1151,7 +1151,7 @@
   by-spec."bower-logger"."~0.2.1" =
     self.by-version."bower-logger"."0.2.2";
   by-version."bower-logger"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-logger-0.2.2";
+    name = "node-bower-logger-0.2.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.2.tgz";
@@ -1170,7 +1170,7 @@
   by-spec."bower-registry-client"."~0.1.4" =
     self.by-version."bower-registry-client"."0.1.6";
   by-version."bower-registry-client"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-registry-client-0.1.6";
+    name = "node-bower-registry-client-0.1.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.1.6.tgz";
@@ -1224,7 +1224,7 @@
   by-spec."broadway"."0.2.9" =
     self.by-version."broadway"."0.2.9";
   by-version."broadway"."0.2.9" = lib.makeOverridable self.buildNodePackage {
-    name = "broadway-0.2.9";
+    name = "node-broadway-0.2.9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/broadway/-/broadway-0.2.9.tgz";
@@ -1250,7 +1250,7 @@
   by-spec."browserchannel"."*" =
     self.by-version."browserchannel"."1.0.8";
   by-version."browserchannel"."1.0.8" = lib.makeOverridable self.buildNodePackage {
-    name = "browserchannel-1.0.8";
+    name = "node-browserchannel-1.0.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.8.tgz";
@@ -1273,7 +1273,7 @@
   by-spec."bson"."0.1.8" =
     self.by-version."bson"."0.1.8";
   by-version."bson"."0.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "bson-0.1.8";
+    name = "node-bson-0.1.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bson/-/bson-0.1.8.tgz";
@@ -1292,7 +1292,7 @@
   by-spec."bson"."0.2.2" =
     self.by-version."bson"."0.2.2";
   by-version."bson"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "bson-0.2.2";
+    name = "node-bson-0.2.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz";
@@ -1311,7 +1311,7 @@
   by-spec."bson"."0.2.5" =
     self.by-version."bson"."0.2.5";
   by-version."bson"."0.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "bson-0.2.5";
+    name = "node-bson-0.2.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bson/-/bson-0.2.5.tgz";
@@ -1330,7 +1330,7 @@
   by-spec."buffer-crc32"."0.1.1" =
     self.by-version."buffer-crc32"."0.1.1";
   by-version."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "buffer-crc32-0.1.1";
+    name = "node-buffer-crc32-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz";
@@ -1349,7 +1349,7 @@
   by-spec."buffer-crc32"."0.2.1" =
     self.by-version."buffer-crc32"."0.2.1";
   by-version."buffer-crc32"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "buffer-crc32-0.2.1";
+    name = "node-buffer-crc32-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz";
@@ -1370,7 +1370,7 @@
   by-spec."buffers"."~0.1.1" =
     self.by-version."buffers"."0.1.1";
   by-version."buffers"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "buffers-0.1.1";
+    name = "node-buffers-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz";
@@ -1389,7 +1389,7 @@
   by-spec."buffertools"."*" =
     self.by-version."buffertools"."2.0.1";
   by-version."buffertools"."2.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "buffertools-2.0.1";
+    name = "node-buffertools-2.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/buffertools/-/buffertools-2.0.1.tgz";
@@ -1409,7 +1409,7 @@
   by-spec."buffertools".">=1.1.1 <2.0.0" =
     self.by-version."buffertools"."1.1.1";
   by-version."buffertools"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "buffertools-1.1.1";
+    name = "node-buffertools-1.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz";
@@ -1449,7 +1449,7 @@
   by-spec."bytebuffer".">=2.2 <3" =
     self.by-version."bytebuffer"."2.3.1";
   by-version."bytebuffer"."2.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "bytebuffer-2.3.1";
+    name = "node-bytebuffer-2.3.1";
     src = [
       (self.patchSource fetchurl {
         url = "http://registry.npmjs.org/bytebuffer/-/bytebuffer-2.3.1.tgz";
@@ -1469,7 +1469,7 @@
   by-spec."bytes"."0.1.0" =
     self.by-version."bytes"."0.1.0";
   by-version."bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "bytes-0.1.0";
+    name = "node-bytes-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz";
@@ -1488,7 +1488,7 @@
   by-spec."bytes"."0.2.0" =
     self.by-version."bytes"."0.2.0";
   by-version."bytes"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "bytes-0.2.0";
+    name = "node-bytes-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz";
@@ -1507,7 +1507,7 @@
   by-spec."bytes"."0.2.1" =
     self.by-version."bytes"."0.2.1";
   by-version."bytes"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "bytes-0.2.1";
+    name = "node-bytes-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz";
@@ -1549,7 +1549,7 @@
   by-spec."chai"."*" =
     self.by-version."chai"."1.9.0";
   by-version."chai"."1.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "chai-1.9.0";
+    name = "node-chai-1.9.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/chai/-/chai-1.9.0.tgz";
@@ -1571,7 +1571,7 @@
   by-spec."chainsaw"."~0.1.0" =
     self.by-version."chainsaw"."0.1.0";
   by-version."chainsaw"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "chainsaw-0.1.0";
+    name = "node-chainsaw-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz";
@@ -1591,7 +1591,7 @@
   by-spec."chalk"."~0.1.1" =
     self.by-version."chalk"."0.1.1";
   by-version."chalk"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "chalk-0.1.1";
+    name = "node-chalk-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/chalk/-/chalk-0.1.1.tgz";
@@ -1612,7 +1612,7 @@
   by-spec."chalk"."~0.2.0" =
     self.by-version."chalk"."0.2.1";
   by-version."chalk"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "chalk-0.2.1";
+    name = "node-chalk-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/chalk/-/chalk-0.2.1.tgz";
@@ -1635,7 +1635,7 @@
   by-spec."chalk"."~0.3.0" =
     self.by-version."chalk"."0.3.0";
   by-version."chalk"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "chalk-0.3.0";
+    name = "node-chalk-0.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/chalk/-/chalk-0.3.0.tgz";
@@ -1656,7 +1656,7 @@
   by-spec."chalk"."~0.4.0" =
     self.by-version."chalk"."0.4.0";
   by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "chalk-0.4.0";
+    name = "node-chalk-0.4.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";
@@ -1678,7 +1678,7 @@
   by-spec."character-parser"."1.2.0" =
     self.by-version."character-parser"."1.2.0";
   by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "character-parser-1.2.0";
+    name = "node-character-parser-1.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz";
@@ -1697,7 +1697,7 @@
   by-spec."cheerio"."~0.12.0" =
     self.by-version."cheerio"."0.12.4";
   by-version."cheerio"."0.12.4" = lib.makeOverridable self.buildNodePackage {
-    name = "cheerio-0.12.4";
+    name = "node-cheerio-0.12.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.4.tgz";
@@ -1720,7 +1720,7 @@
   by-spec."cheerio"."~0.13.0" =
     self.by-version."cheerio"."0.13.1";
   by-version."cheerio"."0.13.1" = lib.makeOverridable self.buildNodePackage {
-    name = "cheerio-0.13.1";
+    name = "node-cheerio-0.13.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cheerio/-/cheerio-0.13.1.tgz";
@@ -1743,7 +1743,7 @@
   by-spec."cheerio-select"."*" =
     self.by-version."cheerio-select"."0.0.3";
   by-version."cheerio-select"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "cheerio-select-0.0.3";
+    name = "node-cheerio-select-0.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cheerio-select/-/cheerio-select-0.0.3.tgz";
@@ -1763,7 +1763,7 @@
   by-spec."child-process-close"."~0.1.1" =
     self.by-version."child-process-close"."0.1.1";
   by-version."child-process-close"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "child-process-close-0.1.1";
+    name = "node-child-process-close-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz";
@@ -1782,7 +1782,7 @@
   by-spec."chmodr"."~0.1.0" =
     self.by-version."chmodr"."0.1.0";
   by-version."chmodr"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "chmodr-0.1.0";
+    name = "node-chmodr-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/chmodr/-/chmodr-0.1.0.tgz";
@@ -1801,7 +1801,7 @@
   by-spec."chokidar"."~0.8.0" =
     self.by-version."chokidar"."0.8.1";
   by-version."chokidar"."0.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "chokidar-0.8.1";
+    name = "node-chokidar-0.8.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/chokidar/-/chokidar-0.8.1.tgz";
@@ -1820,7 +1820,7 @@
   by-spec."chownr"."0" =
     self.by-version."chownr"."0.0.1";
   by-version."chownr"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "chownr-0.0.1";
+    name = "node-chownr-0.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/chownr/-/chownr-0.0.1.tgz";
@@ -1839,7 +1839,7 @@
   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 {
-    name = "class-extend-0.1.1";
+    name = "node-class-extend-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/class-extend/-/class-extend-0.1.1.tgz";
@@ -1881,7 +1881,7 @@
   by-spec."cli"."0.4.x" =
     self.by-version."cli"."0.4.5";
   by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage {
-    name = "cli-0.4.5";
+    name = "node-cli-0.4.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz";
@@ -1901,7 +1901,7 @@
   by-spec."cli-color"."~0.2.2" =
     self.by-version."cli-color"."0.2.3";
   by-version."cli-color"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "cli-color-0.2.3";
+    name = "node-cli-color-0.2.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cli-color/-/cli-color-0.2.3.tgz";
@@ -1922,7 +1922,7 @@
   by-spec."cliff"."0.1.8" =
     self.by-version."cliff"."0.1.8";
   by-version."cliff"."0.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "cliff-0.1.8";
+    name = "node-cliff-0.1.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz";
@@ -1944,7 +1944,7 @@
   by-spec."clone"."0.1.11" =
     self.by-version."clone"."0.1.11";
   by-version."clone"."0.1.11" = lib.makeOverridable self.buildNodePackage {
-    name = "clone-0.1.11";
+    name = "node-clone-0.1.11";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/clone/-/clone-0.1.11.tgz";
@@ -1963,7 +1963,7 @@
   by-spec."clone"."0.1.5" =
     self.by-version."clone"."0.1.5";
   by-version."clone"."0.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "clone-0.1.5";
+    name = "node-clone-0.1.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/clone/-/clone-0.1.5.tgz";
@@ -1982,7 +1982,7 @@
   by-spec."clone"."0.1.6" =
     self.by-version."clone"."0.1.6";
   by-version."clone"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "clone-0.1.6";
+    name = "node-clone-0.1.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/clone/-/clone-0.1.6.tgz";
@@ -2001,7 +2001,7 @@
   by-spec."cmd-shim"."~1.1.1" =
     self.by-version."cmd-shim"."1.1.1";
   by-version."cmd-shim"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "cmd-shim-1.1.1";
+    name = "node-cmd-shim-1.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.1.tgz";
@@ -2108,7 +2108,7 @@
   by-spec."color"."~0.5.0" =
     self.by-version."color"."0.5.0";
   by-version."color"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "color-0.5.0";
+    name = "node-color-0.5.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/color/-/color-0.5.0.tgz";
@@ -2129,7 +2129,7 @@
   by-spec."color-convert"."0.2.x" =
     self.by-version."color-convert"."0.2.1";
   by-version."color-convert"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "color-convert-0.2.1";
+    name = "node-color-convert-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/color-convert/-/color-convert-0.2.1.tgz";
@@ -2148,7 +2148,7 @@
   by-spec."color-string"."0.1.x" =
     self.by-version."color-string"."0.1.2";
   by-version."color-string"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "color-string-0.1.2";
+    name = "node-color-string-0.1.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/color-string/-/color-string-0.1.2.tgz";
@@ -2168,7 +2168,7 @@
   by-spec."colors"."0.5.x" =
     self.by-version."colors"."0.5.1";
   by-version."colors"."0.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "colors-0.5.1";
+    name = "node-colors-0.5.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz";
@@ -2187,7 +2187,7 @@
   by-spec."colors"."0.6.x" =
     self.by-version."colors"."0.6.2";
   by-version."colors"."0.6.2" = lib.makeOverridable self.buildNodePackage {
-    name = "colors-0.6.2";
+    name = "node-colors-0.6.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
@@ -2212,7 +2212,7 @@
   by-spec."colour"."*" =
     self.by-version."colour"."0.7.1";
   by-version."colour"."0.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "colour-0.7.1";
+    name = "node-colour-0.7.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/colour/-/colour-0.7.1.tgz";
@@ -2231,7 +2231,7 @@
   by-spec."columnify"."0.1.2" =
     self.by-version."columnify"."0.1.2";
   by-version."columnify"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "columnify-0.1.2";
+    name = "node-columnify-0.1.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/columnify/-/columnify-0.1.2.tgz";
@@ -2250,7 +2250,7 @@
   by-spec."combined-stream"."~0.0.4" =
     self.by-version."combined-stream"."0.0.4";
   by-version."combined-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "combined-stream-0.0.4";
+    name = "node-combined-stream-0.0.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz";
@@ -2270,7 +2270,7 @@
   by-spec."commander"."*" =
     self.by-version."commander"."2.1.0";
   by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "commander-2.1.0";
+    name = "node-commander-2.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
@@ -2289,7 +2289,7 @@
   by-spec."commander"."0.6.1" =
     self.by-version."commander"."0.6.1";
   by-version."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "commander-0.6.1";
+    name = "node-commander-0.6.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
@@ -2308,7 +2308,7 @@
   by-spec."commander"."1.3.2" =
     self.by-version."commander"."1.3.2";
   by-version."commander"."1.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "commander-1.3.2";
+    name = "node-commander-1.3.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz";
@@ -2328,7 +2328,7 @@
   by-spec."commander"."2.0.0" =
     self.by-version."commander"."2.0.0";
   by-version."commander"."2.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "commander-2.0.0";
+    name = "node-commander-2.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz";
@@ -2353,7 +2353,7 @@
   by-spec."config"."0.4.15" =
     self.by-version."config"."0.4.15";
   by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage {
-    name = "config-0.4.15";
+    name = "node-config-0.4.15";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/config/-/config-0.4.15.tgz";
@@ -2375,7 +2375,7 @@
   by-spec."config-chain"."~1.1.1" =
     self.by-version."config-chain"."1.1.8";
   by-version."config-chain"."1.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "config-chain-1.1.8";
+    name = "node-config-chain-1.1.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz";
@@ -2398,7 +2398,7 @@
   by-spec."configstore"."~0.1.0" =
     self.by-version."configstore"."0.1.7";
   by-version."configstore"."0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "configstore-0.1.7";
+    name = "node-configstore-0.1.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/configstore/-/configstore-0.1.7.tgz";
@@ -2422,7 +2422,7 @@
   by-spec."connect"."1.x" =
     self.by-version."connect"."1.9.2";
   by-version."connect"."1.9.2" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-1.9.2";
+    name = "node-connect-1.9.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/connect/-/connect-1.9.2.tgz";
@@ -2444,7 +2444,7 @@
   by-spec."connect"."2.11.0" =
     self.by-version."connect"."2.11.0";
   by-version."connect"."2.11.0" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-2.11.0";
+    name = "node-connect-2.11.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/connect/-/connect-2.11.0.tgz";
@@ -2477,7 +2477,7 @@
   by-spec."connect"."2.12.0" =
     self.by-version."connect"."2.12.0";
   by-version."connect"."2.12.0" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-2.12.0";
+    name = "node-connect-2.12.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/connect/-/connect-2.12.0.tgz";
@@ -2511,7 +2511,7 @@
   by-spec."connect"."2.3.x" =
     self.by-version."connect"."2.3.9";
   by-version."connect"."2.3.9" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-2.3.9";
+    name = "node-connect-2.3.9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/connect/-/connect-2.3.9.tgz";
@@ -2538,7 +2538,7 @@
   by-spec."connect"."2.7.5" =
     self.by-version."connect"."2.7.5";
   by-version."connect"."2.7.5" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-2.7.5";
+    name = "node-connect-2.7.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/connect/-/connect-2.7.5.tgz";
@@ -2567,7 +2567,7 @@
   by-spec."connect"."2.7.6" =
     self.by-version."connect"."2.7.6";
   by-version."connect"."2.7.6" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-2.7.6";
+    name = "node-connect-2.7.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/connect/-/connect-2.7.6.tgz";
@@ -2600,7 +2600,7 @@
   by-spec."connect-flash"."*" =
     self.by-version."connect-flash"."0.1.1";
   by-version."connect-flash"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-flash-0.1.1";
+    name = "node-connect-flash-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz";
@@ -2620,7 +2620,7 @@
   by-spec."connect-flash"."0.1.0" =
     self.by-version."connect-flash"."0.1.0";
   by-version."connect-flash"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-flash-0.1.0";
+    name = "node-connect-flash-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz";
@@ -2639,7 +2639,7 @@
   by-spec."connect-jade-static"."*" =
     self.by-version."connect-jade-static"."0.1.3";
   by-version."connect-jade-static"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-jade-static-0.1.3";
+    name = "node-connect-jade-static-0.1.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.1.3.tgz";
@@ -2660,7 +2660,7 @@
   by-spec."connect-mongo"."*" =
     self.by-version."connect-mongo"."0.4.0";
   by-version."connect-mongo"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-mongo-0.4.0";
+    name = "node-connect-mongo-0.4.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.0.tgz";
@@ -2681,7 +2681,7 @@
   by-spec."connection-parse"."0.0.x" =
     self.by-version."connection-parse"."0.0.7";
   by-version."connection-parse"."0.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "connection-parse-0.0.7";
+    name = "node-connection-parse-0.0.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
@@ -2700,7 +2700,7 @@
   by-spec."console-browserify"."0.1.x" =
     self.by-version."console-browserify"."0.1.6";
   by-version."console-browserify"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "console-browserify-0.1.6";
+    name = "node-console-browserify-0.1.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/console-browserify/-/console-browserify-0.1.6.tgz";
@@ -2719,7 +2719,7 @@
   by-spec."constantinople"."~1.0.1" =
     self.by-version."constantinople"."1.0.2";
   by-version."constantinople"."1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "constantinople-1.0.2";
+    name = "node-constantinople-1.0.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/constantinople/-/constantinople-1.0.2.tgz";
@@ -2741,7 +2741,7 @@
   by-spec."cookie"."0.0.4" =
     self.by-version."cookie"."0.0.4";
   by-version."cookie"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "cookie-0.0.4";
+    name = "node-cookie-0.0.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz";
@@ -2760,7 +2760,7 @@
   by-spec."cookie"."0.0.5" =
     self.by-version."cookie"."0.0.5";
   by-version."cookie"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "cookie-0.0.5";
+    name = "node-cookie-0.0.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
@@ -2779,7 +2779,7 @@
   by-spec."cookie"."0.1.0" =
     self.by-version."cookie"."0.1.0";
   by-version."cookie"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "cookie-0.1.0";
+    name = "node-cookie-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz";
@@ -2798,7 +2798,7 @@
   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 {
-    name = "cookie-jar-0.2.0";
+    name = "node-cookie-jar-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz";
@@ -2817,7 +2817,7 @@
   by-spec."cookie-jar"."~0.3.0" =
     self.by-version."cookie-jar"."0.3.0";
   by-version."cookie-jar"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "cookie-jar-0.3.0";
+    name = "node-cookie-jar-0.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz";
@@ -2836,7 +2836,7 @@
   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 {
-    name = "cookie-signature-1.0.0";
+    name = "node-cookie-signature-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.0.tgz";
@@ -2855,7 +2855,7 @@
   by-spec."cookie-signature"."1.0.1" =
     self.by-version."cookie-signature"."1.0.1";
   by-version."cookie-signature"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "cookie-signature-1.0.1";
+    name = "node-cookie-signature-1.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz";
@@ -2874,7 +2874,7 @@
   by-spec."cookiejar"."1.3.0" =
     self.by-version."cookiejar"."1.3.0";
   by-version."cookiejar"."1.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "cookiejar-1.3.0";
+    name = "node-cookiejar-1.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.0.tgz";
@@ -2893,7 +2893,7 @@
   by-spec."cookies".">= 0.2.2" =
     self.by-version."cookies"."0.4.0";
   by-version."cookies"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "cookies-0.4.0";
+    name = "node-cookies-0.4.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cookies/-/cookies-0.4.0.tgz";
@@ -2913,7 +2913,7 @@
   by-spec."core-util-is"."~1.0.0" =
     self.by-version."core-util-is"."1.0.1";
   by-version."core-util-is"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "core-util-is-1.0.1";
+    name = "node-core-util-is-1.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
@@ -2932,7 +2932,7 @@
   by-spec."couch-login"."~0.1.15" =
     self.by-version."couch-login"."0.1.20";
   by-version."couch-login"."0.1.20" = lib.makeOverridable self.buildNodePackage {
-    name = "couch-login-0.1.20";
+    name = "node-couch-login-0.1.20";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz";
@@ -2978,7 +2978,7 @@
   by-spec."crc"."0.2.0" =
     self.by-version."crc"."0.2.0";
   by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "crc-0.2.0";
+    name = "node-crc-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/crc/-/crc-0.2.0.tgz";
@@ -2997,7 +2997,7 @@
   by-spec."crossroads"."~0.12.0" =
     self.by-version."crossroads"."0.12.0";
   by-version."crossroads"."0.12.0" = lib.makeOverridable self.buildNodePackage {
-    name = "crossroads-0.12.0";
+    name = "node-crossroads-0.12.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/crossroads/-/crossroads-0.12.0.tgz";
@@ -3017,7 +3017,7 @@
   by-spec."cryptiles"."0.1.x" =
     self.by-version."cryptiles"."0.1.3";
   by-version."cryptiles"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "cryptiles-0.1.3";
+    name = "node-cryptiles-0.1.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz";
@@ -3037,7 +3037,7 @@
   by-spec."cryptiles"."0.2.x" =
     self.by-version."cryptiles"."0.2.2";
   by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "cryptiles-0.2.2";
+    name = "node-cryptiles-0.2.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
@@ -3057,7 +3057,7 @@
   by-spec."crypto"."0.0.3" =
     self.by-version."crypto"."0.0.3";
   by-version."crypto"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "crypto-0.0.3";
+    name = "node-crypto-0.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz";
@@ -3076,7 +3076,7 @@
   by-spec."css"."~1.0.8" =
     self.by-version."css"."1.0.8";
   by-version."css"."1.0.8" = lib.makeOverridable self.buildNodePackage {
-    name = "css-1.0.8";
+    name = "node-css-1.0.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/css/-/css-1.0.8.tgz";
@@ -3097,7 +3097,7 @@
   by-spec."css-parse"."1.0.4" =
     self.by-version."css-parse"."1.0.4";
   by-version."css-parse"."1.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "css-parse-1.0.4";
+    name = "node-css-parse-1.0.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz";
@@ -3116,7 +3116,7 @@
   by-spec."css-parse"."1.7.x" =
     self.by-version."css-parse"."1.7.0";
   by-version."css-parse"."1.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "css-parse-1.7.0";
+    name = "node-css-parse-1.7.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz";
@@ -3135,7 +3135,7 @@
   by-spec."css-stringify"."1.0.5" =
     self.by-version."css-stringify"."1.0.5";
   by-version."css-stringify"."1.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "css-stringify-1.0.5";
+    name = "node-css-stringify-1.0.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz";
@@ -3154,7 +3154,7 @@
   by-spec."cssom"."0.2.x" =
     self.by-version."cssom"."0.2.5";
   by-version."cssom"."0.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "cssom-0.2.5";
+    name = "node-cssom-0.2.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cssom/-/cssom-0.2.5.tgz";
@@ -3173,7 +3173,7 @@
   by-spec."ctype"."0.5.0" =
     self.by-version."ctype"."0.5.0";
   by-version."ctype"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "ctype-0.5.0";
+    name = "node-ctype-0.5.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/ctype/-/ctype-0.5.0.tgz";
@@ -3192,7 +3192,7 @@
   by-spec."ctype"."0.5.2" =
     self.by-version."ctype"."0.5.2";
   by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "ctype-0.5.2";
+    name = "node-ctype-0.5.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz";
@@ -3211,7 +3211,7 @@
   by-spec."cycle"."1.0.x" =
     self.by-version."cycle"."1.0.3";
   by-version."cycle"."1.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "cycle-1.0.3";
+    name = "node-cycle-1.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
@@ -3230,7 +3230,7 @@
   by-spec."dargs"."~0.1.0" =
     self.by-version."dargs"."0.1.0";
   by-version."dargs"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "dargs-0.1.0";
+    name = "node-dargs-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/dargs/-/dargs-0.1.0.tgz";
@@ -3249,7 +3249,7 @@
   by-spec."dateformat"."1.0.2-1.2.3" =
     self.by-version."dateformat"."1.0.2-1.2.3";
   by-version."dateformat"."1.0.2-1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "dateformat-1.0.2-1.2.3";
+    name = "node-dateformat-1.0.2-1.2.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
@@ -3268,7 +3268,7 @@
   by-spec."dateformat"."~1.0.6" =
     self.by-version."dateformat"."1.0.7-1.2.3";
   by-version."dateformat"."1.0.7-1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "dateformat-1.0.7-1.2.3";
+    name = "node-dateformat-1.0.7-1.2.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.7-1.2.3.tgz";
@@ -3287,7 +3287,7 @@
   by-spec."debug"."*" =
     self.by-version."debug"."0.7.4";
   by-version."debug"."0.7.4" = lib.makeOverridable self.buildNodePackage {
-    name = "debug-0.7.4";
+    name = "node-debug-0.7.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
@@ -3306,7 +3306,7 @@
   by-spec."debug"."0.5.0" =
     self.by-version."debug"."0.5.0";
   by-version."debug"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "debug-0.5.0";
+    name = "node-debug-0.5.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/debug/-/debug-0.5.0.tgz";
@@ -3335,7 +3335,7 @@
   by-spec."debuglog"."0.0.2" =
     self.by-version."debuglog"."0.0.2";
   by-version."debuglog"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "debuglog-0.0.2";
+    name = "node-debuglog-0.0.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/debuglog/-/debuglog-0.0.2.tgz";
@@ -3354,7 +3354,7 @@
   by-spec."decompress"."~0.1.5" =
     self.by-version."decompress"."0.1.6";
   by-version."decompress"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "decompress-0.1.6";
+    name = "node-decompress-0.1.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/decompress/-/decompress-0.1.6.tgz";
@@ -3405,7 +3405,7 @@
   by-spec."deep-eql"."0.1.3" =
     self.by-version."deep-eql"."0.1.3";
   by-version."deep-eql"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "deep-eql-0.1.3";
+    name = "node-deep-eql-0.1.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz";
@@ -3425,7 +3425,7 @@
   by-spec."deep-equal"."*" =
     self.by-version."deep-equal"."0.2.1";
   by-version."deep-equal"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "deep-equal-0.2.1";
+    name = "node-deep-equal-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz";
@@ -3444,7 +3444,7 @@
   by-spec."deep-equal"."0.0.0" =
     self.by-version."deep-equal"."0.0.0";
   by-version."deep-equal"."0.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "deep-equal-0.0.0";
+    name = "node-deep-equal-0.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
@@ -3463,7 +3463,7 @@
   by-spec."deep-extend"."~0.2.5" =
     self.by-version."deep-extend"."0.2.8";
   by-version."deep-extend"."0.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "deep-extend-0.2.8";
+    name = "node-deep-extend-0.2.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.8.tgz";
@@ -3484,7 +3484,7 @@
   by-spec."delayed-stream"."0.0.5" =
     self.by-version."delayed-stream"."0.0.5";
   by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "delayed-stream-0.0.5";
+    name = "node-delayed-stream-0.0.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
@@ -3503,7 +3503,7 @@
   by-spec."di"."~0.0.1" =
     self.by-version."di"."0.0.1";
   by-version."di"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "di-0.0.1";
+    name = "node-di-0.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/di/-/di-0.0.1.tgz";
@@ -3522,7 +3522,7 @@
   by-spec."diff"."1.0.7" =
     self.by-version."diff"."1.0.7";
   by-version."diff"."1.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "diff-1.0.7";
+    name = "node-diff-1.0.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz";
@@ -3541,7 +3541,7 @@
   by-spec."diff"."~1.0.3" =
     self.by-version."diff"."1.0.8";
   by-version."diff"."1.0.8" = lib.makeOverridable self.buildNodePackage {
-    name = "diff-1.0.8";
+    name = "node-diff-1.0.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz";
@@ -3564,7 +3564,7 @@
   by-spec."director"."1.1.10" =
     self.by-version."director"."1.1.10";
   by-version."director"."1.1.10" = lib.makeOverridable self.buildNodePackage {
-    name = "director-1.1.10";
+    name = "node-director-1.1.10";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/director/-/director-1.1.10.tgz";
@@ -3583,7 +3583,7 @@
   by-spec."dkim-signer"."~0.1.0" =
     self.by-version."dkim-signer"."0.1.0";
   by-version."dkim-signer"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "dkim-signer-0.1.0";
+    name = "node-dkim-signer-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.0.tgz";
@@ -3604,7 +3604,7 @@
   by-spec."domelementtype"."1" =
     self.by-version."domelementtype"."1.1.1";
   by-version."domelementtype"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "domelementtype-1.1.1";
+    name = "node-domelementtype-1.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.1.tgz";
@@ -3623,7 +3623,7 @@
   by-spec."domhandler"."2.0" =
     self.by-version."domhandler"."2.0.3";
   by-version."domhandler"."2.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "domhandler-2.0.3";
+    name = "node-domhandler-2.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/domhandler/-/domhandler-2.0.3.tgz";
@@ -3643,7 +3643,7 @@
   by-spec."domhandler"."2.1" =
     self.by-version."domhandler"."2.1.0";
   by-version."domhandler"."2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "domhandler-2.1.0";
+    name = "node-domhandler-2.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz";
@@ -3663,7 +3663,7 @@
   by-spec."domhandler"."2.2" =
     self.by-version."domhandler"."2.2.0";
   by-version."domhandler"."2.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "domhandler-2.2.0";
+    name = "node-domhandler-2.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/domhandler/-/domhandler-2.2.0.tgz";
@@ -3683,7 +3683,7 @@
   by-spec."domutils"."1.1" =
     self.by-version."domutils"."1.1.6";
   by-version."domutils"."1.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "domutils-1.1.6";
+    name = "node-domutils-1.1.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz";
@@ -3703,7 +3703,7 @@
   by-spec."domutils"."1.3" =
     self.by-version."domutils"."1.3.0";
   by-version."domutils"."1.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "domutils-1.3.0";
+    name = "node-domutils-1.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/domutils/-/domutils-1.3.0.tgz";
@@ -3723,7 +3723,7 @@
   by-spec."download"."~0.1.6" =
     self.by-version."download"."0.1.10";
   by-version."download"."0.1.10" = lib.makeOverridable self.buildNodePackage {
-    name = "download-0.1.10";
+    name = "node-download-0.1.10";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/download/-/download-0.1.10.tgz";
@@ -3768,7 +3768,7 @@
   by-spec."dtrace-provider"."0.2.8" =
     self.by-version."dtrace-provider"."0.2.8";
   by-version."dtrace-provider"."0.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "dtrace-provider-0.2.8";
+    name = "node-dtrace-provider-0.2.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.8.tgz";
@@ -3787,7 +3787,7 @@
   by-spec."duplexer"."~0.1.1" =
     self.by-version."duplexer"."0.1.1";
   by-version."duplexer"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "duplexer-0.1.1";
+    name = "node-duplexer-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
@@ -3806,7 +3806,7 @@
   by-spec."each-async"."~0.1.1" =
     self.by-version."each-async"."0.1.1";
   by-version."each-async"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "each-async-0.1.1";
+    name = "node-each-async-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/each-async/-/each-async-0.1.1.tgz";
@@ -3825,7 +3825,7 @@
   by-spec."editor"."0.0.5" =
     self.by-version."editor"."0.0.5";
   by-version."editor"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "editor-0.0.5";
+    name = "node-editor-0.0.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/editor/-/editor-0.0.5.tgz";
@@ -3844,7 +3844,7 @@
   by-spec."ejs"."0.8.3" =
     self.by-version."ejs"."0.8.3";
   by-version."ejs"."0.8.3" = lib.makeOverridable self.buildNodePackage {
-    name = "ejs-0.8.3";
+    name = "node-ejs-0.8.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz";
@@ -3863,7 +3863,7 @@
   by-spec."emitter-component"."0.0.6" =
     self.by-version."emitter-component"."0.0.6";
   by-version."emitter-component"."0.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "emitter-component-0.0.6";
+    name = "node-emitter-component-0.0.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/emitter-component/-/emitter-component-0.0.6.tgz";
@@ -3882,7 +3882,7 @@
   by-spec."emitter-component"."1.0.0" =
     self.by-version."emitter-component"."1.0.0";
   by-version."emitter-component"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "emitter-component-1.0.0";
+    name = "node-emitter-component-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/emitter-component/-/emitter-component-1.0.0.tgz";
@@ -3901,7 +3901,7 @@
   by-spec."encoding"."~0.1" =
     self.by-version."encoding"."0.1.7";
   by-version."encoding"."0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "encoding-0.1.7";
+    name = "node-encoding-0.1.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/encoding/-/encoding-0.1.7.tgz";
@@ -3921,7 +3921,7 @@
   by-spec."entities"."0.x" =
     self.by-version."entities"."0.3.0";
   by-version."entities"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "entities-0.3.0";
+    name = "node-entities-0.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/entities/-/entities-0.3.0.tgz";
@@ -3940,7 +3940,7 @@
   by-spec."es5-ext"."~0.9.2" =
     self.by-version."es5-ext"."0.9.2";
   by-version."es5-ext"."0.9.2" = lib.makeOverridable self.buildNodePackage {
-    name = "es5-ext-0.9.2";
+    name = "node-es5-ext-0.9.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.9.2.tgz";
@@ -3959,7 +3959,7 @@
   by-spec."escape-html"."*" =
     self.by-version."escape-html"."1.0.1";
   by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "escape-html-1.0.1";
+    name = "node-escape-html-1.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
@@ -4074,7 +4074,7 @@
   by-spec."estraverse"."*" =
     self.by-version."estraverse"."1.5.0";
   by-version."estraverse"."1.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "estraverse-1.5.0";
+    name = "node-estraverse-1.5.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.0.tgz";
@@ -4093,7 +4093,7 @@
   by-spec."estraverse"."~0.0.4" =
     self.by-version."estraverse"."0.0.4";
   by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "estraverse-0.0.4";
+    name = "node-estraverse-0.0.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz";
@@ -4114,7 +4114,7 @@
   by-spec."esutils"."~1.0.0" =
     self.by-version."esutils"."1.0.0";
   by-version."esutils"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "esutils-1.0.0";
+    name = "node-esutils-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz";
@@ -4133,7 +4133,7 @@
   by-spec."event-emitter"."~0.2.2" =
     self.by-version."event-emitter"."0.2.2";
   by-version."event-emitter"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "event-emitter-0.2.2";
+    name = "node-event-emitter-0.2.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.2.2.tgz";
@@ -4153,7 +4153,7 @@
   by-spec."event-stream"."~0.5" =
     self.by-version."event-stream"."0.5.3";
   by-version."event-stream"."0.5.3" = lib.makeOverridable self.buildNodePackage {
-    name = "event-stream-0.5.3";
+    name = "node-event-stream-0.5.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz";
@@ -4173,7 +4173,7 @@
   by-spec."eventemitter2"."0.4.12" =
     self.by-version."eventemitter2"."0.4.12";
   by-version."eventemitter2"."0.4.12" = lib.makeOverridable self.buildNodePackage {
-    name = "eventemitter2-0.4.12";
+    name = "node-eventemitter2-0.4.12";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.12.tgz";
@@ -4192,7 +4192,7 @@
   by-spec."eventemitter2"."~0.4.11" =
     self.by-version."eventemitter2"."0.4.13";
   by-version."eventemitter2"."0.4.13" = lib.makeOverridable self.buildNodePackage {
-    name = "eventemitter2-0.4.13";
+    name = "node-eventemitter2-0.4.13";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.13.tgz";
@@ -4213,7 +4213,7 @@
   by-spec."events.node".">= 0.4.0" =
     self.by-version."events.node"."0.4.9";
   by-version."events.node"."0.4.9" = lib.makeOverridable self.buildNodePackage {
-    name = "events.node-0.4.9";
+    name = "node-events.node-0.4.9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz";
@@ -4232,7 +4232,7 @@
   by-spec."everyauth"."0.4.5" =
     self.by-version."everyauth"."0.4.5";
   by-version."everyauth"."0.4.5" = lib.makeOverridable self.buildNodePackage {
-    name = "everyauth-0.4.5";
+    name = "node-everyauth-0.4.5";
     src = [
       (self.patchSource fetchurl {
         url = "http://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz";
@@ -4260,7 +4260,7 @@
   by-spec."exit"."~0.1.1" =
     self.by-version."exit"."0.1.2";
   by-version."exit"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "exit-0.1.2";
+    name = "node-exit-0.1.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
@@ -4430,7 +4430,7 @@
   by-spec."express-form"."*" =
     self.by-version."express-form"."0.10.1";
   by-version."express-form"."0.10.1" = lib.makeOverridable self.buildNodePackage {
-    name = "express-form-0.10.1";
+    name = "node-express-form-0.10.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/express-form/-/express-form-0.10.1.tgz";
@@ -4454,7 +4454,7 @@
   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 {
-    name = "express-partials-0.0.6";
+    name = "node-express-partials-0.0.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz";
@@ -4473,7 +4473,7 @@
   by-spec."extend"."*" =
     self.by-version."extend"."1.2.1";
   by-version."extend"."1.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "extend-1.2.1";
+    name = "node-extend-1.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
@@ -4493,7 +4493,7 @@
   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 {
-    name = "extract-opts-2.2.0";
+    name = "node-extract-opts-2.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz";
@@ -4513,7 +4513,7 @@
   by-spec."extsprintf"."1.0.0" =
     self.by-version."extsprintf"."1.0.0";
   by-version."extsprintf"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "extsprintf-1.0.0";
+    name = "node-extsprintf-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz";
@@ -4532,7 +4532,7 @@
   by-spec."extsprintf"."1.0.2" =
     self.by-version."extsprintf"."1.0.2";
   by-version."extsprintf"."1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "extsprintf-1.0.2";
+    name = "node-extsprintf-1.0.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
@@ -4551,7 +4551,7 @@
   by-spec."eyes"."0.1.x" =
     self.by-version."eyes"."0.1.8";
   by-version."eyes"."0.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "eyes-0.1.8";
+    name = "node-eyes-0.1.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
@@ -4572,7 +4572,7 @@
   by-spec."faye-websocket"."*" =
     self.by-version."faye-websocket"."0.7.2";
   by-version."faye-websocket"."0.7.2" = lib.makeOverridable self.buildNodePackage {
-    name = "faye-websocket-0.7.2";
+    name = "node-faye-websocket-0.7.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.2.tgz";
@@ -4593,7 +4593,7 @@
   by-spec."faye-websocket"."0.7.0" =
     self.by-version."faye-websocket"."0.7.0";
   by-version."faye-websocket"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "faye-websocket-0.7.0";
+    name = "node-faye-websocket-0.7.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.0.tgz";
@@ -4639,7 +4639,7 @@
   by-spec."fields"."~0.1.11" =
     self.by-version."fields"."0.1.12";
   by-version."fields"."0.1.12" = lib.makeOverridable self.buildNodePackage {
-    name = "fields-0.1.12";
+    name = "node-fields-0.1.12";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/fields/-/fields-0.1.12.tgz";
@@ -4661,7 +4661,7 @@
   by-spec."file-utils"."~0.1.1" =
     self.by-version."file-utils"."0.1.5";
   by-version."file-utils"."0.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "file-utils-0.1.5";
+    name = "node-file-utils-0.1.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz";
@@ -4689,7 +4689,7 @@
   by-spec."fileset"."0.1.x" =
     self.by-version."fileset"."0.1.5";
   by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "fileset-0.1.5";
+    name = "node-fileset-0.1.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz";
@@ -4710,7 +4710,7 @@
   by-spec."findit".">=1.1.0 <2.0.0" =
     self.by-version."findit"."1.1.0";
   by-version."findit"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "findit-1.1.0";
+    name = "node-findit-1.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/findit/-/findit-1.1.0.tgz";
@@ -4750,7 +4750,7 @@
   by-spec."findup-sync"."~0.1.0" =
     self.by-version."findup-sync"."0.1.2";
   by-version."findup-sync"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "findup-sync-0.1.2";
+    name = "node-findup-sync-0.1.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.2.tgz";
@@ -4799,7 +4799,7 @@
   by-spec."follow-redirects"."0.0.3" =
     self.by-version."follow-redirects"."0.0.3";
   by-version."follow-redirects"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "follow-redirects-0.0.3";
+    name = "node-follow-redirects-0.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz";
@@ -4819,7 +4819,7 @@
   by-spec."forEachAsync"."~2.2" =
     self.by-version."forEachAsync"."2.2.1";
   by-version."forEachAsync"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "forEachAsync-2.2.1";
+    name = "node-forEachAsync-2.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/forEachAsync/-/forEachAsync-2.2.1.tgz";
@@ -4871,7 +4871,7 @@
   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 {
-    name = "forever-agent-0.2.0";
+    name = "node-forever-agent-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz";
@@ -4890,7 +4890,7 @@
   by-spec."forever-agent"."~0.5.0" =
     self.by-version."forever-agent"."0.5.0";
   by-version."forever-agent"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "forever-agent-0.5.0";
+    name = "node-forever-agent-0.5.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.0.tgz";
@@ -4909,7 +4909,7 @@
   by-spec."forever-monitor"."*" =
     self.by-version."forever-monitor"."1.2.3";
   by-version."forever-monitor"."1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "forever-monitor-1.2.3";
+    name = "node-forever-monitor-1.2.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.3.tgz";
@@ -4935,7 +4935,7 @@
   by-spec."forever-monitor"."1.1.0" =
     self.by-version."forever-monitor"."1.1.0";
   by-version."forever-monitor"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "forever-monitor-1.1.0";
+    name = "node-forever-monitor-1.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz";
@@ -4962,7 +4962,7 @@
   by-spec."form-data"."~0.0.3" =
     self.by-version."form-data"."0.0.10";
   by-version."form-data"."0.0.10" = lib.makeOverridable self.buildNodePackage {
-    name = "form-data-0.0.10";
+    name = "node-form-data-0.0.10";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz";
@@ -4984,7 +4984,7 @@
   by-spec."form-data"."~0.1.0" =
     self.by-version."form-data"."0.1.2";
   by-version."form-data"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "form-data-0.1.2";
+    name = "node-form-data-0.1.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz";
@@ -5006,7 +5006,7 @@
   by-spec."formidable"."1.0.11" =
     self.by-version."formidable"."1.0.11";
   by-version."formidable"."1.0.11" = lib.makeOverridable self.buildNodePackage {
-    name = "formidable-1.0.11";
+    name = "node-formidable-1.0.11";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz";
@@ -5025,7 +5025,7 @@
   by-spec."formidable"."1.0.13" =
     self.by-version."formidable"."1.0.13";
   by-version."formidable"."1.0.13" = lib.makeOverridable self.buildNodePackage {
-    name = "formidable-1.0.13";
+    name = "node-formidable-1.0.13";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/formidable/-/formidable-1.0.13.tgz";
@@ -5044,7 +5044,7 @@
   by-spec."formidable"."1.0.14" =
     self.by-version."formidable"."1.0.14";
   by-version."formidable"."1.0.14" = lib.makeOverridable self.buildNodePackage {
-    name = "formidable-1.0.14";
+    name = "node-formidable-1.0.14";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz";
@@ -5063,7 +5063,7 @@
   by-spec."formidable"."1.0.9" =
     self.by-version."formidable"."1.0.9";
   by-version."formidable"."1.0.9" = lib.makeOverridable self.buildNodePackage {
-    name = "formidable-1.0.9";
+    name = "node-formidable-1.0.9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/formidable/-/formidable-1.0.9.tgz";
@@ -5084,7 +5084,7 @@
   by-spec."fresh"."0.1.0" =
     self.by-version."fresh"."0.1.0";
   by-version."fresh"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "fresh-0.1.0";
+    name = "node-fresh-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
@@ -5103,7 +5103,7 @@
   by-spec."fresh"."0.2.0" =
     self.by-version."fresh"."0.2.0";
   by-version."fresh"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "fresh-0.2.0";
+    name = "node-fresh-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz";
@@ -5122,7 +5122,7 @@
   by-spec."fresh"."~0.2.1" =
     self.by-version."fresh"."0.2.1";
   by-version."fresh"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "fresh-0.2.1";
+    name = "node-fresh-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/fresh/-/fresh-0.2.1.tgz";
@@ -5141,7 +5141,7 @@
   by-spec."fs-extra"."~0.6.1" =
     self.by-version."fs-extra"."0.6.4";
   by-version."fs-extra"."0.6.4" = lib.makeOverridable self.buildNodePackage {
-    name = "fs-extra-0.6.4";
+    name = "node-fs-extra-0.6.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz";
@@ -5164,7 +5164,7 @@
   by-spec."fs-walk"."*" =
     self.by-version."fs-walk"."0.0.1";
   by-version."fs-walk"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "fs-walk-0.0.1";
+    name = "node-fs-walk-0.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/fs-walk/-/fs-walk-0.0.1.tgz";
@@ -5185,7 +5185,7 @@
   by-spec."fs.extra".">=1.2.0 <2.0.0" =
     self.by-version."fs.extra"."1.2.1";
   by-version."fs.extra"."1.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "fs.extra-1.2.1";
+    name = "node-fs.extra-1.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/fs.extra/-/fs.extra-1.2.1.tgz";
@@ -5209,7 +5209,7 @@
   by-spec."fstream"."0" =
     self.by-version."fstream"."0.1.25";
   by-version."fstream"."0.1.25" = lib.makeOverridable self.buildNodePackage {
-    name = "fstream-0.1.25";
+    name = "node-fstream-0.1.25";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz";
@@ -5240,7 +5240,7 @@
   by-spec."fstream-ignore"."~0.0.5" =
     self.by-version."fstream-ignore"."0.0.7";
   by-version."fstream-ignore"."0.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "fstream-ignore-0.0.7";
+    name = "node-fstream-ignore-0.0.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz";
@@ -5264,7 +5264,7 @@
   by-spec."fstream-npm"."~0.1.6" =
     self.by-version."fstream-npm"."0.1.6";
   by-version."fstream-npm"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "fstream-npm-0.1.6";
+    name = "node-fstream-npm-0.1.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.6.tgz";
@@ -5285,7 +5285,7 @@
   by-spec."generator-angular"."*" =
     self.by-version."generator-angular"."0.7.1";
   by-version."generator-angular"."0.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "generator-angular-0.7.1";
+    name = "node-generator-angular-0.7.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.7.1.tgz";
@@ -5310,7 +5310,7 @@
   by-spec."generator-karma"."~0.6.0" =
     self.by-version."generator-karma"."0.6.0";
   by-version."generator-karma"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "generator-karma-0.6.0";
+    name = "node-generator-karma-0.6.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.6.0.tgz";
@@ -5331,7 +5331,7 @@
   by-spec."generator-mocha".">=0.1.0" =
     self.by-version."generator-mocha"."0.1.3";
   by-version."generator-mocha"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "generator-mocha-0.1.3";
+    name = "node-generator-mocha-0.1.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/generator-mocha/-/generator-mocha-0.1.3.tgz";
@@ -5352,7 +5352,7 @@
   by-spec."generator-webapp"."*" =
     self.by-version."generator-webapp"."0.4.7";
   by-version."generator-webapp"."0.4.7" = lib.makeOverridable self.buildNodePackage {
-    name = "generator-webapp-0.4.7";
+    name = "node-generator-webapp-0.4.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.7.tgz";
@@ -5397,7 +5397,7 @@
   by-spec."getobject"."~0.1.0" =
     self.by-version."getobject"."0.1.0";
   by-version."getobject"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "getobject-0.1.0";
+    name = "node-getobject-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz";
@@ -5416,7 +5416,7 @@
   by-spec."github-flavored-markdown".">= 0.0.1" =
     self.by-version."github-flavored-markdown"."1.0.1";
   by-version."github-flavored-markdown"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "github-flavored-markdown-1.0.1";
+    name = "node-github-flavored-markdown-1.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/github-flavored-markdown/-/github-flavored-markdown-1.0.1.tgz";
@@ -5435,7 +5435,7 @@
   by-spec."github-url-from-git"."1.1.1" =
     self.by-version."github-url-from-git"."1.1.1";
   by-version."github-url-from-git"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "github-url-from-git-1.1.1";
+    name = "node-github-url-from-git-1.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz";
@@ -5456,7 +5456,7 @@
   by-spec."github-url-from-username-repo"."0.0.2" =
     self.by-version."github-url-from-username-repo"."0.0.2";
   by-version."github-url-from-username-repo"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "github-url-from-username-repo-0.0.2";
+    name = "node-github-url-from-username-repo-0.0.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.0.2.tgz";
@@ -5475,7 +5475,7 @@
   by-spec."glob"."3" =
     self.by-version."glob"."3.2.8";
   by-version."glob"."3.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "glob-3.2.8";
+    name = "node-glob-3.2.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/glob/-/glob-3.2.8.tgz";
@@ -5496,7 +5496,7 @@
   by-spec."glob"."3.2.3" =
     self.by-version."glob"."3.2.3";
   by-version."glob"."3.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "glob-3.2.3";
+    name = "node-glob-3.2.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
@@ -5526,7 +5526,7 @@
   by-spec."glob"."~3.1.21" =
     self.by-version."glob"."3.1.21";
   by-version."glob"."3.1.21" = lib.makeOverridable self.buildNodePackage {
-    name = "glob-3.1.21";
+    name = "node-glob-3.1.21";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/glob/-/glob-3.1.21.tgz";
@@ -5556,7 +5556,7 @@
   by-spec."graceful-fs"."2" =
     self.by-version."graceful-fs"."2.0.1";
   by-version."graceful-fs"."2.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "graceful-fs-2.0.1";
+    name = "node-graceful-fs-2.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.1.tgz";
@@ -5575,7 +5575,7 @@
   by-spec."graceful-fs"."~1" =
     self.by-version."graceful-fs"."1.2.3";
   by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "graceful-fs-1.2.3";
+    name = "node-graceful-fs-1.2.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
@@ -5594,7 +5594,7 @@
   by-spec."graceful-fs"."~1.1" =
     self.by-version."graceful-fs"."1.1.14";
   by-version."graceful-fs"."1.1.14" = lib.makeOverridable self.buildNodePackage {
-    name = "graceful-fs-1.1.14";
+    name = "node-graceful-fs-1.1.14";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.1.14.tgz";
@@ -5621,7 +5621,7 @@
   by-spec."gridfs-stream"."*" =
     self.by-version."gridfs-stream"."0.4.1";
   by-version."gridfs-stream"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "gridfs-stream-0.4.1";
+    name = "node-gridfs-stream-0.4.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.1.tgz";
@@ -5641,7 +5641,7 @@
   by-spec."growl"."1.7.x" =
     self.by-version."growl"."1.7.0";
   by-version."growl"."1.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "growl-1.7.0";
+    name = "node-growl-1.7.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/growl/-/growl-1.7.0.tgz";
@@ -5660,7 +5660,7 @@
   by-spec."grunt"."0.4.x" =
     self.by-version."grunt"."0.4.2";
   by-version."grunt"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "grunt-0.4.2";
+    name = "node-grunt-0.4.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/grunt/-/grunt-0.4.2.tgz";
@@ -5703,7 +5703,7 @@
   by-spec."grunt-bower-task"."*" =
     self.by-version."grunt-bower-task"."0.3.4";
   by-version."grunt-bower-task"."0.3.4" = lib.makeOverridable self.buildNodePackage {
-    name = "grunt-bower-task-0.3.4";
+    name = "node-grunt-bower-task-0.3.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/grunt-bower-task/-/grunt-bower-task-0.3.4.tgz";
@@ -5754,7 +5754,7 @@
   by-spec."grunt-contrib-cssmin"."*" =
     self.by-version."grunt-contrib-cssmin"."0.7.0";
   by-version."grunt-contrib-cssmin"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "grunt-contrib-cssmin-0.7.0";
+    name = "node-grunt-contrib-cssmin-0.7.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.7.0.tgz";
@@ -5777,7 +5777,7 @@
   by-spec."grunt-contrib-jshint"."*" =
     self.by-version."grunt-contrib-jshint"."0.8.0";
   by-version."grunt-contrib-jshint"."0.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "grunt-contrib-jshint-0.8.0";
+    name = "node-grunt-contrib-jshint-0.8.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.8.0.tgz";
@@ -5799,7 +5799,7 @@
   by-spec."grunt-contrib-less"."*" =
     self.by-version."grunt-contrib-less"."0.9.0";
   by-version."grunt-contrib-less"."0.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "grunt-contrib-less-0.9.0";
+    name = "node-grunt-contrib-less-0.9.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.9.0.tgz";
@@ -5823,7 +5823,7 @@
   by-spec."grunt-contrib-requirejs"."*" =
     self.by-version."grunt-contrib-requirejs"."0.4.1";
   by-version."grunt-contrib-requirejs"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "grunt-contrib-requirejs-0.4.1";
+    name = "node-grunt-contrib-requirejs-0.4.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.1.tgz";
@@ -5845,7 +5845,7 @@
   by-spec."grunt-contrib-uglify"."*" =
     self.by-version."grunt-contrib-uglify"."0.3.2";
   by-version."grunt-contrib-uglify"."0.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "grunt-contrib-uglify-0.3.2";
+    name = "node-grunt-contrib-uglify-0.3.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.3.2.tgz";
@@ -5869,7 +5869,7 @@
   by-spec."grunt-karma"."*" =
     self.by-version."grunt-karma"."0.7.2";
   by-version."grunt-karma"."0.7.2" = lib.makeOverridable self.buildNodePackage {
-    name = "grunt-karma-0.7.2";
+    name = "node-grunt-karma-0.7.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.7.2.tgz";
@@ -5892,7 +5892,7 @@
   by-spec."grunt-lib-contrib"."~0.6.0" =
     self.by-version."grunt-lib-contrib"."0.6.1";
   by-version."grunt-lib-contrib"."0.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "grunt-lib-contrib-0.6.1";
+    name = "node-grunt-lib-contrib-0.6.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/grunt-lib-contrib/-/grunt-lib-contrib-0.6.1.tgz";
@@ -5914,7 +5914,7 @@
   by-spec."grunt-sed"."*" =
     self.by-version."grunt-sed"."0.1.1";
   by-version."grunt-sed"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "grunt-sed-0.1.1";
+    name = "node-grunt-sed-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/grunt-sed/-/grunt-sed-0.1.1.tgz";
@@ -5961,7 +5961,7 @@
   by-spec."gzippo"."*" =
     self.by-version."gzippo"."0.2.0";
   by-version."gzippo"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "gzippo-0.2.0";
+    name = "node-gzippo-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/gzippo/-/gzippo-0.2.0.tgz";
@@ -6026,7 +6026,7 @@
   by-spec."has-color"."~0.1.0" =
     self.by-version."has-color"."0.1.3";
   by-version."has-color"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "has-color-0.1.3";
+    name = "node-has-color-0.1.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/has-color/-/has-color-0.1.3.tgz";
@@ -6045,7 +6045,7 @@
   by-spec."hasher"."~1.2.0" =
     self.by-version."hasher"."1.2.0";
   by-version."hasher"."1.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "hasher-1.2.0";
+    name = "node-hasher-1.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz";
@@ -6065,7 +6065,7 @@
   by-spec."hashring"."1.0.1" =
     self.by-version."hashring"."1.0.1";
   by-version."hashring"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "hashring-1.0.1";
+    name = "node-hashring-1.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz";
@@ -6086,7 +6086,7 @@
   by-spec."hat"."*" =
     self.by-version."hat"."0.0.3";
   by-version."hat"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "hat-0.0.3";
+    name = "node-hat-0.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/hat/-/hat-0.0.3.tgz";
@@ -6105,7 +6105,7 @@
   by-spec."hawk"."~0.10.0" =
     self.by-version."hawk"."0.10.2";
   by-version."hawk"."0.10.2" = lib.makeOverridable self.buildNodePackage {
-    name = "hawk-0.10.2";
+    name = "node-hawk-0.10.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz";
@@ -6130,7 +6130,7 @@
   by-spec."hawk"."~1.0.0" =
     self.by-version."hawk"."1.0.0";
   by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "hawk-1.0.0";
+    name = "node-hawk-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
@@ -6197,7 +6197,7 @@
   by-spec."hiredis"."*" =
     self.by-version."hiredis"."0.1.16";
   by-version."hiredis"."0.1.16" = lib.makeOverridable self.buildNodePackage {
-    name = "hiredis-0.1.16";
+    name = "node-hiredis-0.1.16";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.16.tgz";
@@ -6217,7 +6217,7 @@
   by-spec."hoek"."0.7.x" =
     self.by-version."hoek"."0.7.6";
   by-version."hoek"."0.7.6" = lib.makeOverridable self.buildNodePackage {
-    name = "hoek-0.7.6";
+    name = "node-hoek-0.7.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz";
@@ -6236,7 +6236,7 @@
   by-spec."hoek"."0.9.x" =
     self.by-version."hoek"."0.9.1";
   by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage {
-    name = "hoek-0.9.1";
+    name = "node-hoek-0.9.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
@@ -6255,7 +6255,7 @@
   by-spec."hooker"."~0.2.3" =
     self.by-version."hooker"."0.2.3";
   by-version."hooker"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "hooker-0.2.3";
+    name = "node-hooker-0.2.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz";
@@ -6274,7 +6274,7 @@
   by-spec."hooks"."0.2.1" =
     self.by-version."hooks"."0.2.1";
   by-version."hooks"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "hooks-0.2.1";
+    name = "node-hooks-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz";
@@ -6293,7 +6293,7 @@
   by-spec."htmlparser2"."3.1.4" =
     self.by-version."htmlparser2"."3.1.4";
   by-version."htmlparser2"."3.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "htmlparser2-3.1.4";
+    name = "node-htmlparser2-3.1.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.1.4.tgz";
@@ -6316,7 +6316,7 @@
   by-spec."htmlparser2"."3.3.x" =
     self.by-version."htmlparser2"."3.3.0";
   by-version."htmlparser2"."3.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "htmlparser2-3.3.0";
+    name = "node-htmlparser2-3.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz";
@@ -6339,7 +6339,7 @@
   by-spec."htmlparser2"."~3.4.0" =
     self.by-version."htmlparser2"."3.4.0";
   by-version."htmlparser2"."3.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "htmlparser2-3.4.0";
+    name = "node-htmlparser2-3.4.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.4.0.tgz";
@@ -6362,7 +6362,7 @@
   by-spec."http-auth"."2.0.7" =
     self.by-version."http-auth"."2.0.7";
   by-version."http-auth"."2.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "http-auth-2.0.7";
+    name = "node-http-auth-2.0.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz";
@@ -6429,7 +6429,7 @@
   by-spec."http-signature"."0.9.11" =
     self.by-version."http-signature"."0.9.11";
   by-version."http-signature"."0.9.11" = lib.makeOverridable self.buildNodePackage {
-    name = "http-signature-0.9.11";
+    name = "node-http-signature-0.9.11";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz";
@@ -6451,7 +6451,7 @@
   by-spec."http-signature"."~0.10.0" =
     self.by-version."http-signature"."0.10.0";
   by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "http-signature-0.10.0";
+    name = "node-http-signature-0.10.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz";
@@ -6473,7 +6473,7 @@
   by-spec."humanize"."~0.0.9" =
     self.by-version."humanize"."0.0.9";
   by-version."humanize"."0.0.9" = lib.makeOverridable self.buildNodePackage {
-    name = "humanize-0.0.9";
+    name = "node-humanize-0.0.9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz";
@@ -6492,7 +6492,7 @@
   by-spec."i"."0.3.x" =
     self.by-version."i"."0.3.2";
   by-version."i"."0.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "i-0.3.2";
+    name = "node-i-0.3.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/i/-/i-0.3.2.tgz";
@@ -6511,7 +6511,7 @@
   by-spec."i18next"."*" =
     self.by-version."i18next"."1.7.1";
   by-version."i18next"."1.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "i18next-1.7.1";
+    name = "node-i18next-1.7.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/i18next/-/i18next-1.7.1.tgz";
@@ -6558,7 +6558,7 @@
   by-spec."iconv-lite"."~0.2.10" =
     self.by-version."iconv-lite"."0.2.11";
   by-version."iconv-lite"."0.2.11" = lib.makeOverridable self.buildNodePackage {
-    name = "iconv-lite-0.2.11";
+    name = "node-iconv-lite-0.2.11";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz";
@@ -6579,7 +6579,7 @@
   by-spec."inherits"."1" =
     self.by-version."inherits"."1.0.0";
   by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "inherits-1.0.0";
+    name = "node-inherits-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz";
@@ -6600,7 +6600,7 @@
   by-spec."inherits"."2" =
     self.by-version."inherits"."2.0.1";
   by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "inherits-2.0.1";
+    name = "node-inherits-2.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
@@ -6625,7 +6625,7 @@
   by-spec."ini"."1" =
     self.by-version."ini"."1.1.0";
   by-version."ini"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "ini-1.1.0";
+    name = "node-ini-1.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz";
@@ -6648,7 +6648,7 @@
   by-spec."init-package-json"."0.0.14" =
     self.by-version."init-package-json"."0.0.14";
   by-version."init-package-json"."0.0.14" = lib.makeOverridable self.buildNodePackage {
-    name = "init-package-json-0.0.14";
+    name = "node-init-package-json-0.0.14";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.14.tgz";
@@ -6672,7 +6672,7 @@
   by-spec."inquirer"."~0.2.4" =
     self.by-version."inquirer"."0.2.5";
   by-version."inquirer"."0.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "inquirer-0.2.5";
+    name = "node-inquirer-0.2.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.5.tgz";
@@ -6695,7 +6695,7 @@
   by-spec."inquirer"."~0.3.0" =
     self.by-version."inquirer"."0.3.5";
   by-version."inquirer"."0.3.5" = lib.makeOverridable self.buildNodePackage {
-    name = "inquirer-0.3.5";
+    name = "node-inquirer-0.3.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.5.tgz";
@@ -6720,7 +6720,7 @@
   by-spec."inquirer"."~0.4.0" =
     self.by-version."inquirer"."0.4.0";
   by-version."inquirer"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "inquirer-0.4.0";
+    name = "node-inquirer-0.4.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/inquirer/-/inquirer-0.4.0.tgz";
@@ -6744,7 +6744,7 @@
   by-spec."insight"."~0.3.0" =
     self.by-version."insight"."0.3.0";
   by-version."insight"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "insight-0.3.0";
+    name = "node-insight-0.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/insight/-/insight-0.3.0.tgz";
@@ -6769,7 +6769,7 @@
   by-spec."intersect"."~0.0.3" =
     self.by-version."intersect"."0.0.3";
   by-version."intersect"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "intersect-0.0.3";
+    name = "node-intersect-0.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/intersect/-/intersect-0.0.3.tgz";
@@ -6788,7 +6788,7 @@
   by-spec."ironhorse"."*" =
     self.by-version."ironhorse"."0.0.9";
   by-version."ironhorse"."0.0.9" = lib.makeOverridable self.buildNodePackage {
-    name = "ironhorse-0.0.9";
+    name = "node-ironhorse-0.0.9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.9.tgz";
@@ -6824,7 +6824,7 @@
   by-spec."is-promise"."~1" =
     self.by-version."is-promise"."1.0.0";
   by-version."is-promise"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "is-promise-1.0.0";
+    name = "node-is-promise-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.0.tgz";
@@ -6843,7 +6843,7 @@
   by-spec."isbinaryfile"."~0.1.8" =
     self.by-version."isbinaryfile"."0.1.9";
   by-version."isbinaryfile"."0.1.9" = lib.makeOverridable self.buildNodePackage {
-    name = "isbinaryfile-0.1.9";
+    name = "node-isbinaryfile-0.1.9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz";
@@ -6864,7 +6864,7 @@
   by-spec."isbinaryfile"."~2.0.0" =
     self.by-version."isbinaryfile"."2.0.1";
   by-version."isbinaryfile"."2.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "isbinaryfile-2.0.1";
+    name = "node-isbinaryfile-2.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-2.0.1.tgz";
@@ -7063,7 +7063,7 @@
   by-spec."jedediah"."~0.1.0" =
     self.by-version."jedediah"."0.1.1";
   by-version."jedediah"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "jedediah-0.1.1";
+    name = "node-jedediah-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/jedediah/-/jedediah-0.1.1.tgz";
@@ -7104,7 +7104,7 @@
   by-spec."js-yaml"."0.3.x" =
     self.by-version."js-yaml"."0.3.7";
   by-version."js-yaml"."0.3.7" = lib.makeOverridable self.buildNodePackage {
-    name = "js-yaml-0.3.7";
+    name = "node-js-yaml-0.3.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz";
@@ -7237,7 +7237,7 @@
   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 {
-    name = "json-schema-0.2.2";
+    name = "node-json-schema-0.2.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz";
@@ -7256,7 +7256,7 @@
   by-spec."json-stringify-safe"."~3.0.0" =
     self.by-version."json-stringify-safe"."3.0.0";
   by-version."json-stringify-safe"."3.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "json-stringify-safe-3.0.0";
+    name = "node-json-stringify-safe-3.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz";
@@ -7275,7 +7275,7 @@
   by-spec."json-stringify-safe"."~5.0.0" =
     self.by-version."json-stringify-safe"."5.0.0";
   by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "json-stringify-safe-5.0.0";
+    name = "node-json-stringify-safe-5.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
@@ -7294,7 +7294,7 @@
   by-spec."jsonfile"."~1.0.1" =
     self.by-version."jsonfile"."1.0.1";
   by-version."jsonfile"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "jsonfile-1.0.1";
+    name = "node-jsonfile-1.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
@@ -7333,7 +7333,7 @@
   by-spec."jsprim"."0.3.0" =
     self.by-version."jsprim"."0.3.0";
   by-version."jsprim"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "jsprim-0.3.0";
+    name = "node-jsprim-0.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz";
@@ -7355,7 +7355,7 @@
   by-spec."junk"."~0.2.0" =
     self.by-version."junk"."0.2.2";
   by-version."junk"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "junk-0.2.2";
+    name = "node-junk-0.2.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/junk/-/junk-0.2.2.tgz";
@@ -7420,7 +7420,7 @@
   by-spec."karma-chrome-launcher"."*" =
     self.by-version."karma-chrome-launcher"."0.1.2";
   by-version."karma-chrome-launcher"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-chrome-launcher-0.1.2";
+    name = "node-karma-chrome-launcher-0.1.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.2.tgz";
@@ -7441,7 +7441,7 @@
   by-spec."karma-coverage"."*" =
     self.by-version."karma-coverage"."0.1.5";
   by-version."karma-coverage"."0.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-coverage-0.1.5";
+    name = "node-karma-coverage-0.1.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.5.tgz";
@@ -7465,7 +7465,7 @@
   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 = "karma-junit-reporter-0.2.1";
+    name = "node-karma-junit-reporter-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.1.tgz";
@@ -7487,7 +7487,7 @@
   by-spec."karma-mocha"."*" =
     self.by-version."karma-mocha"."0.1.1";
   by-version."karma-mocha"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-mocha-0.1.1";
+    name = "node-karma-mocha-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.1.tgz";
@@ -7509,7 +7509,7 @@
   by-spec."karma-requirejs"."*" =
     self.by-version."karma-requirejs"."0.2.1";
   by-version."karma-requirejs"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-requirejs-0.2.1";
+    name = "node-karma-requirejs-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.1.tgz";
@@ -7531,7 +7531,7 @@
   by-spec."karma-sauce-launcher"."*" =
     self.by-version."karma-sauce-launcher"."0.2.0";
   by-version."karma-sauce-launcher"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-sauce-launcher-0.2.0";
+    name = "node-karma-sauce-launcher-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.0.tgz";
@@ -7556,7 +7556,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 {
-    name = "keen.io-0.0.4";
+    name = "node-keen.io-0.0.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/keen.io/-/keen.io-0.0.4.tgz";
@@ -7577,7 +7577,7 @@
   by-spec."keep-alive-agent"."0.0.1" =
     self.by-version."keep-alive-agent"."0.0.1";
   by-version."keep-alive-agent"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "keep-alive-agent-0.0.1";
+    name = "node-keep-alive-agent-0.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz";
@@ -7596,7 +7596,7 @@
   by-spec."kerberos"."0.0.3" =
     self.by-version."kerberos"."0.0.3";
   by-version."kerberos"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "kerberos-0.0.3";
+    name = "node-kerberos-0.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.3.tgz";
@@ -7615,7 +7615,7 @@
   by-spec."kew"."~0.1.7" =
     self.by-version."kew"."0.1.7";
   by-version."kew"."0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "kew-0.1.7";
+    name = "node-kew-0.1.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/kew/-/kew-0.1.7.tgz";
@@ -7634,7 +7634,7 @@
   by-spec."keygrip"."~1.0.0" =
     self.by-version."keygrip"."1.0.0";
   by-version."keygrip"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "keygrip-1.0.0";
+    name = "node-keygrip-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.0.tgz";
@@ -7653,7 +7653,7 @@
   by-spec."keypress"."0.1.x" =
     self.by-version."keypress"."0.1.0";
   by-version."keypress"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "keypress-0.1.0";
+    name = "node-keypress-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
@@ -7674,7 +7674,7 @@
   by-spec."knockout"."~3.0.0" =
     self.by-version."knockout"."3.0.0";
   by-version."knockout"."3.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "knockout-3.0.0";
+    name = "node-knockout-3.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/knockout/-/knockout-3.0.0.tgz";
@@ -7693,7 +7693,7 @@
   by-spec."knox"."*" =
     self.by-version."knox"."0.8.8";
   by-version."knox"."0.8.8" = lib.makeOverridable self.buildNodePackage {
-    name = "knox-0.8.8";
+    name = "node-knox-0.8.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/knox/-/knox-0.8.8.tgz";
@@ -7717,7 +7717,7 @@
   by-spec."kue"."*" =
     self.by-version."kue"."0.7.4";
   by-version."kue"."0.7.4" = lib.makeOverridable self.buildNodePackage {
-    name = "kue-0.7.4";
+    name = "node-kue-0.7.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/kue/-/kue-0.7.4.tgz";
@@ -7743,7 +7743,7 @@
   by-spec."lazy"."~1.0.11" =
     self.by-version."lazy"."1.0.11";
   by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage {
-    name = "lazy-1.0.11";
+    name = "node-lazy-1.0.11";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz";
@@ -7762,7 +7762,7 @@
   by-spec."lazystream"."~0.1.0" =
     self.by-version."lazystream"."0.1.0";
   by-version."lazystream"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "lazystream-0.1.0";
+    name = "node-lazystream-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz";
@@ -7782,7 +7782,7 @@
   by-spec."lcov-parse"."0.0.4" =
     self.by-version."lcov-parse"."0.0.4";
   by-version."lcov-parse"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "lcov-parse-0.0.4";
+    name = "node-lcov-parse-0.0.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.4.tgz";
@@ -7846,7 +7846,7 @@
   by-spec."libxmljs"."~0.8.1" =
     self.by-version."libxmljs"."0.8.1";
   by-version."libxmljs"."0.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "libxmljs-0.8.1";
+    name = "node-libxmljs-0.8.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.8.1.tgz";
@@ -7866,7 +7866,7 @@
   by-spec."libyaml"."*" =
     self.by-version."libyaml"."0.2.2";
   by-version."libyaml"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "libyaml-0.2.2";
+    name = "node-libyaml-0.2.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.2.tgz";
@@ -7886,7 +7886,7 @@
   by-spec."lockfile"."~0.4.0" =
     self.by-version."lockfile"."0.4.2";
   by-version."lockfile"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "lockfile-0.4.2";
+    name = "node-lockfile-0.4.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.2.tgz";
@@ -7905,7 +7905,7 @@
   by-spec."lodash"."~0.10.0" =
     self.by-version."lodash"."0.10.0";
   by-version."lodash"."0.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "lodash-0.10.0";
+    name = "node-lodash-0.10.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash/-/lodash-0.10.0.tgz";
@@ -7924,7 +7924,7 @@
   by-spec."lodash"."~0.9.2" =
     self.by-version."lodash"."0.9.2";
   by-version."lodash"."0.9.2" = lib.makeOverridable self.buildNodePackage {
-    name = "lodash-0.9.2";
+    name = "node-lodash-0.9.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz";
@@ -7943,7 +7943,7 @@
   by-spec."lodash"."~1.0.1" =
     self.by-version."lodash"."1.0.1";
   by-version."lodash"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "lodash-1.0.1";
+    name = "node-lodash-1.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz";
@@ -7962,7 +7962,7 @@
   by-spec."lodash"."~1.2.1" =
     self.by-version."lodash"."1.2.1";
   by-version."lodash"."1.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "lodash-1.2.1";
+    name = "node-lodash-1.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash/-/lodash-1.2.1.tgz";
@@ -7981,7 +7981,7 @@
   by-spec."lodash"."~1.3.0" =
     self.by-version."lodash"."1.3.1";
   by-version."lodash"."1.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "lodash-1.3.1";
+    name = "node-lodash-1.3.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz";
@@ -8002,7 +8002,7 @@
   by-spec."lodash"."~2.1.0" =
     self.by-version."lodash"."2.1.0";
   by-version."lodash"."2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "lodash-2.1.0";
+    name = "node-lodash-2.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz";
@@ -8021,7 +8021,7 @@
   by-spec."lodash"."~2.2.1" =
     self.by-version."lodash"."2.2.1";
   by-version."lodash"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "lodash-2.2.1";
+    name = "node-lodash-2.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash/-/lodash-2.2.1.tgz";
@@ -8040,7 +8040,7 @@
   by-spec."lodash"."~2.4.1" =
     self.by-version."lodash"."2.4.1";
   by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "lodash-2.4.1";
+    name = "node-lodash-2.4.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz";
@@ -8059,7 +8059,7 @@
   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 {
-    name = "lodash._isnative-2.4.1";
+    name = "node-lodash._isnative-2.4.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz";
@@ -8078,7 +8078,7 @@
   by-spec."lodash._objecttypes"."~2.4.1" =
     self.by-version."lodash._objecttypes"."2.4.1";
   by-version."lodash._objecttypes"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "lodash._objecttypes-2.4.1";
+    name = "node-lodash._objecttypes-2.4.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz";
@@ -8097,7 +8097,7 @@
   by-spec."lodash._shimkeys"."~2.4.1" =
     self.by-version."lodash._shimkeys"."2.4.1";
   by-version."lodash._shimkeys"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "lodash._shimkeys-2.4.1";
+    name = "node-lodash._shimkeys-2.4.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz";
@@ -8117,7 +8117,7 @@
   by-spec."lodash.defaults"."~2.4.1" =
     self.by-version."lodash.defaults"."2.4.1";
   by-version."lodash.defaults"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "lodash.defaults-2.4.1";
+    name = "node-lodash.defaults-2.4.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz";
@@ -8138,7 +8138,7 @@
   by-spec."lodash.isobject"."~2.4.1" =
     self.by-version."lodash.isobject"."2.4.1";
   by-version."lodash.isobject"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "lodash.isobject-2.4.1";
+    name = "node-lodash.isobject-2.4.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz";
@@ -8158,7 +8158,7 @@
   by-spec."lodash.keys"."~2.4.1" =
     self.by-version."lodash.keys"."2.4.1";
   by-version."lodash.keys"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "lodash.keys-2.4.1";
+    name = "node-lodash.keys-2.4.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz";
@@ -8180,7 +8180,7 @@
   by-spec."log-driver"."1.2.1" =
     self.by-version."log-driver"."1.2.1";
   by-version."log-driver"."1.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "log-driver-1.2.1";
+    name = "node-log-driver-1.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.1.tgz";
@@ -8199,7 +8199,7 @@
   by-spec."log4js"."~0.6.3" =
     self.by-version."log4js"."0.6.9";
   by-version."log4js"."0.6.9" = lib.makeOverridable self.buildNodePackage {
-    name = "log4js-0.6.9";
+    name = "node-log4js-0.6.9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/log4js/-/log4js-0.6.9.tgz";
@@ -8221,7 +8221,7 @@
   by-spec."long"."*" =
     self.by-version."long"."1.1.2";
   by-version."long"."1.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "long-1.1.2";
+    name = "node-long-1.1.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/long/-/long-1.1.2.tgz";
@@ -8240,7 +8240,7 @@
   by-spec."longjohn"."~0.2.2" =
     self.by-version."longjohn"."0.2.2";
   by-version."longjohn"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "longjohn-0.2.2";
+    name = "node-longjohn-0.2.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/longjohn/-/longjohn-0.2.2.tgz";
@@ -8259,7 +8259,7 @@
   by-spec."lru-cache"."2" =
     self.by-version."lru-cache"."2.5.0";
   by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "lru-cache-2.5.0";
+    name = "node-lru-cache-2.5.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz";
@@ -8278,7 +8278,7 @@
   by-spec."lru-cache"."2.2.0" =
     self.by-version."lru-cache"."2.2.0";
   by-version."lru-cache"."2.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "lru-cache-2.2.0";
+    name = "node-lru-cache-2.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz";
@@ -8297,7 +8297,7 @@
   by-spec."lru-cache"."2.2.x" =
     self.by-version."lru-cache"."2.2.4";
   by-version."lru-cache"."2.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "lru-cache-2.2.4";
+    name = "node-lru-cache-2.2.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz";
@@ -8316,7 +8316,7 @@
   by-spec."lru-cache"."2.3.0" =
     self.by-version."lru-cache"."2.3.0";
   by-version."lru-cache"."2.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "lru-cache-2.3.0";
+    name = "node-lru-cache-2.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz";
@@ -8335,7 +8335,7 @@
   by-spec."lru-cache"."~1.0.2" =
     self.by-version."lru-cache"."1.0.6";
   by-version."lru-cache"."1.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "lru-cache-1.0.6";
+    name = "node-lru-cache-1.0.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz";
@@ -8354,7 +8354,7 @@
   by-spec."lru-cache"."~2.3.0" =
     self.by-version."lru-cache"."2.3.1";
   by-version."lru-cache"."2.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "lru-cache-2.3.1";
+    name = "node-lru-cache-2.3.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz";
@@ -8375,7 +8375,7 @@
   by-spec."lsmod"."0.0.2" =
     self.by-version."lsmod"."0.0.2";
   by-version."lsmod"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "lsmod-0.0.2";
+    name = "node-lsmod-0.0.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lsmod/-/lsmod-0.0.2.tgz";
@@ -8394,7 +8394,7 @@
   by-spec."mailcomposer".">= 0.1.27" =
     self.by-version."mailcomposer"."0.2.8";
   by-version."mailcomposer"."0.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "mailcomposer-0.2.8";
+    name = "node-mailcomposer-0.2.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.8.tgz";
@@ -8445,7 +8445,7 @@
   by-spec."memoizee"."~0.2.5" =
     self.by-version."memoizee"."0.2.6";
   by-version."memoizee"."0.2.6" = lib.makeOverridable self.buildNodePackage {
-    name = "memoizee-0.2.6";
+    name = "node-memoizee-0.2.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/memoizee/-/memoizee-0.2.6.tgz";
@@ -8467,7 +8467,7 @@
   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 = "merge-descriptors-0.0.1";
+    name = "node-merge-descriptors-0.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.1.tgz";
@@ -8486,7 +8486,7 @@
   by-spec."methods"."0.0.1" =
     self.by-version."methods"."0.0.1";
   by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "methods-0.0.1";
+    name = "node-methods-0.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
@@ -8505,7 +8505,7 @@
   by-spec."methods"."0.1.0" =
     self.by-version."methods"."0.1.0";
   by-version."methods"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "methods-0.1.0";
+    name = "node-methods-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz";
@@ -8524,7 +8524,7 @@
   by-spec."mime"."*" =
     self.by-version."mime"."1.2.11";
   by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage {
-    name = "mime-1.2.11";
+    name = "node-mime-1.2.11";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
@@ -8543,7 +8543,7 @@
   by-spec."mime"."1.2.4" =
     self.by-version."mime"."1.2.4";
   by-version."mime"."1.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "mime-1.2.4";
+    name = "node-mime-1.2.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mime/-/mime-1.2.4.tgz";
@@ -8562,7 +8562,7 @@
   by-spec."mime"."1.2.5" =
     self.by-version."mime"."1.2.5";
   by-version."mime"."1.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "mime-1.2.5";
+    name = "node-mime-1.2.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mime/-/mime-1.2.5.tgz";
@@ -8581,7 +8581,7 @@
   by-spec."mime"."1.2.6" =
     self.by-version."mime"."1.2.6";
   by-version."mime"."1.2.6" = lib.makeOverridable self.buildNodePackage {
-    name = "mime-1.2.6";
+    name = "node-mime-1.2.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
@@ -8600,7 +8600,7 @@
   by-spec."mime"."1.2.9" =
     self.by-version."mime"."1.2.9";
   by-version."mime"."1.2.9" = lib.makeOverridable self.buildNodePackage {
-    name = "mime-1.2.9";
+    name = "node-mime-1.2.9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
@@ -8631,7 +8631,7 @@
   by-spec."mimelib"."~0.2.14" =
     self.by-version."mimelib"."0.2.14";
   by-version."mimelib"."0.2.14" = lib.makeOverridable self.buildNodePackage {
-    name = "mimelib-0.2.14";
+    name = "node-mimelib-0.2.14";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz";
@@ -8652,7 +8652,7 @@
   by-spec."minimatch"."0" =
     self.by-version."minimatch"."0.2.14";
   by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage {
-    name = "minimatch-0.2.14";
+    name = "node-minimatch-0.2.14";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
@@ -8673,7 +8673,7 @@
   by-spec."minimatch"."0.0.x" =
     self.by-version."minimatch"."0.0.5";
   by-version."minimatch"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "minimatch-0.0.5";
+    name = "node-minimatch-0.0.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz";
@@ -8713,7 +8713,7 @@
   by-spec."minimist"."~0.0.1" =
     self.by-version."minimist"."0.0.5";
   by-version."minimist"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "minimist-0.0.5";
+    name = "node-minimist-0.0.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz";
@@ -8732,7 +8732,7 @@
   by-spec."ministyle"."~0.1.3" =
     self.by-version."ministyle"."0.1.3";
   by-version."ministyle"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "ministyle-0.1.3";
+    name = "node-ministyle-0.1.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.3.tgz";
@@ -8751,7 +8751,7 @@
   by-spec."miniwrite"."~0.1.3" =
     self.by-version."miniwrite"."0.1.3";
   by-version."miniwrite"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "miniwrite-0.1.3";
+    name = "node-miniwrite-0.1.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.3.tgz";
@@ -8771,7 +8771,7 @@
   by-spec."mkdirp"."*" =
     self.by-version."mkdirp"."0.3.5";
   by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage {
-    name = "mkdirp-0.3.5";
+    name = "node-mkdirp-0.3.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
@@ -8795,7 +8795,7 @@
   by-spec."mkdirp"."0.3.0" =
     self.by-version."mkdirp"."0.3.0";
   by-version."mkdirp"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "mkdirp-0.3.0";
+    name = "node-mkdirp-0.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
@@ -8826,7 +8826,7 @@
   by-spec."mkpath"."~0.1.0" =
     self.by-version."mkpath"."0.1.0";
   by-version."mkpath"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "mkpath-0.1.0";
+    name = "node-mkpath-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz";
@@ -8872,7 +8872,7 @@
   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 {
-    name = "mocha-unfunk-reporter-0.4.0";
+    name = "node-mocha-unfunk-reporter-0.4.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.4.0.tgz";
@@ -8896,7 +8896,7 @@
   by-spec."moment"."2.1.0" =
     self.by-version."moment"."2.1.0";
   by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "moment-2.1.0";
+    name = "node-moment-2.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz";
@@ -8915,7 +8915,7 @@
   by-spec."moment"."~2.4.0" =
     self.by-version."moment"."2.4.0";
   by-version."moment"."2.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "moment-2.4.0";
+    name = "node-moment-2.4.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/moment/-/moment-2.4.0.tgz";
@@ -8934,7 +8934,7 @@
   by-spec."moment"."~2.5.0" =
     self.by-version."moment"."2.5.1";
   by-version."moment"."2.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "moment-2.5.1";
+    name = "node-moment-2.5.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/moment/-/moment-2.5.1.tgz";
@@ -8953,7 +8953,7 @@
   by-spec."mongodb"."*" =
     self.by-version."mongodb"."1.4.0-rc5";
   by-version."mongodb"."1.4.0-rc5" = lib.makeOverridable self.buildNodePackage {
-    name = "mongodb-1.4.0-rc5";
+    name = "node-mongodb-1.4.0-rc5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc5.tgz";
@@ -8975,7 +8975,7 @@
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
   by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
-    name = "mongodb-1.2.14";
+    name = "node-mongodb-1.2.14";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz";
@@ -8995,7 +8995,7 @@
   by-spec."mongodb"."1.3.19" =
     self.by-version."mongodb"."1.3.19";
   by-version."mongodb"."1.3.19" = lib.makeOverridable self.buildNodePackage {
-    name = "mongodb-1.3.19";
+    name = "node-mongodb-1.3.19";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz";
@@ -9016,7 +9016,7 @@
   by-spec."mongodb"."1.3.23" =
     self.by-version."mongodb"."1.3.23";
   by-version."mongodb"."1.3.23" = lib.makeOverridable self.buildNodePackage {
-    name = "mongodb-1.3.23";
+    name = "node-mongodb-1.3.23";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.23.tgz";
@@ -9039,7 +9039,7 @@
   by-spec."mongoose"."*" =
     self.by-version."mongoose"."3.8.6";
   by-version."mongoose"."3.8.6" = lib.makeOverridable self.buildNodePackage {
-    name = "mongoose-3.8.6";
+    name = "node-mongoose-3.8.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.6.tgz";
@@ -9067,7 +9067,7 @@
   by-spec."mongoose"."3.6.7" =
     self.by-version."mongoose"."3.6.7";
   by-version."mongoose"."3.6.7" = lib.makeOverridable self.buildNodePackage {
-    name = "mongoose-3.6.7";
+    name = "node-mongoose-3.6.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz";
@@ -9093,7 +9093,7 @@
   by-spec."mongoose"."3.6.x" =
     self.by-version."mongoose"."3.6.20";
   by-version."mongoose"."3.6.20" = lib.makeOverridable self.buildNodePackage {
-    name = "mongoose-3.6.20";
+    name = "node-mongoose-3.6.20";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.20.tgz";
@@ -9121,7 +9121,7 @@
   by-spec."mongoose-lifecycle"."1.0.0" =
     self.by-version."mongoose-lifecycle"."1.0.0";
   by-version."mongoose-lifecycle"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "mongoose-lifecycle-1.0.0";
+    name = "node-mongoose-lifecycle-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz";
@@ -9140,7 +9140,7 @@
   by-spec."mongoose-schema-extend"."*" =
     self.by-version."mongoose-schema-extend"."0.1.7";
   by-version."mongoose-schema-extend"."0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "mongoose-schema-extend-0.1.7";
+    name = "node-mongoose-schema-extend-0.1.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.7.tgz";
@@ -9161,7 +9161,7 @@
   by-spec."monocle"."1.1.50" =
     self.by-version."monocle"."1.1.50";
   by-version."monocle"."1.1.50" = lib.makeOverridable self.buildNodePackage {
-    name = "monocle-1.1.50";
+    name = "node-monocle-1.1.50";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/monocle/-/monocle-1.1.50.tgz";
@@ -9181,7 +9181,7 @@
   by-spec."monocle"."1.1.51" =
     self.by-version."monocle"."1.1.51";
   by-version."monocle"."1.1.51" = lib.makeOverridable self.buildNodePackage {
-    name = "monocle-1.1.51";
+    name = "node-monocle-1.1.51";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/monocle/-/monocle-1.1.51.tgz";
@@ -9201,7 +9201,7 @@
   by-spec."mout"."~0.6.0" =
     self.by-version."mout"."0.6.0";
   by-version."mout"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "mout-0.6.0";
+    name = "node-mout-0.6.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mout/-/mout-0.6.0.tgz";
@@ -9220,7 +9220,7 @@
   by-spec."mout"."~0.7.0" =
     self.by-version."mout"."0.7.1";
   by-version."mout"."0.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "mout-0.7.1";
+    name = "node-mout-0.7.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mout/-/mout-0.7.1.tgz";
@@ -9239,7 +9239,7 @@
   by-spec."mpath"."0.1.1" =
     self.by-version."mpath"."0.1.1";
   by-version."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "mpath-0.1.1";
+    name = "node-mpath-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz";
@@ -9258,7 +9258,7 @@
   by-spec."mpromise"."0.2.1" =
     self.by-version."mpromise"."0.2.1";
   by-version."mpromise"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "mpromise-0.2.1";
+    name = "node-mpromise-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz";
@@ -9278,7 +9278,7 @@
   by-spec."mpromise"."0.4.3" =
     self.by-version."mpromise"."0.4.3";
   by-version."mpromise"."0.4.3" = lib.makeOverridable self.buildNodePackage {
-    name = "mpromise-0.4.3";
+    name = "node-mpromise-0.4.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mpromise/-/mpromise-0.4.3.tgz";
@@ -9297,7 +9297,7 @@
   by-spec."mquery"."0.5.2" =
     self.by-version."mquery"."0.5.2";
   by-version."mquery"."0.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "mquery-0.5.2";
+    name = "node-mquery-0.5.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mquery/-/mquery-0.5.2.tgz";
@@ -9319,7 +9319,7 @@
   by-spec."ms"."0.1.0" =
     self.by-version."ms"."0.1.0";
   by-version."ms"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "ms-0.1.0";
+    name = "node-ms-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/ms/-/ms-0.1.0.tgz";
@@ -9357,7 +9357,7 @@
   by-spec."multiparty"."2.2.0" =
     self.by-version."multiparty"."2.2.0";
   by-version."multiparty"."2.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "multiparty-2.2.0";
+    name = "node-multiparty-2.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz";
@@ -9378,7 +9378,7 @@
   by-spec."muri"."0.3.1" =
     self.by-version."muri"."0.3.1";
   by-version."muri"."0.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "muri-0.3.1";
+    name = "node-muri-0.3.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/muri/-/muri-0.3.1.tgz";
@@ -9397,7 +9397,7 @@
   by-spec."mute-stream"."0.0.3" =
     self.by-version."mute-stream"."0.0.3";
   by-version."mute-stream"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "mute-stream-0.0.3";
+    name = "node-mute-stream-0.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.3.tgz";
@@ -9416,7 +9416,7 @@
   by-spec."mute-stream"."0.0.4" =
     self.by-version."mute-stream"."0.0.4";
   by-version."mute-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "mute-stream-0.0.4";
+    name = "node-mute-stream-0.0.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz";
@@ -9437,7 +9437,7 @@
   by-spec."mv"."0.0.5" =
     self.by-version."mv"."0.0.5";
   by-version."mv"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "mv-0.0.5";
+    name = "node-mv-0.0.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/mv/-/mv-0.0.5.tgz";
@@ -9456,7 +9456,7 @@
   by-spec."nan"."~0.3.0" =
     self.by-version."nan"."0.3.2";
   by-version."nan"."0.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "nan-0.3.2";
+    name = "node-nan-0.3.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/nan/-/nan-0.3.2.tgz";
@@ -9475,7 +9475,7 @@
   by-spec."nan"."~0.6.0" =
     self.by-version."nan"."0.6.0";
   by-version."nan"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "nan-0.6.0";
+    name = "node-nan-0.6.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/nan/-/nan-0.6.0.tgz";
@@ -9494,7 +9494,7 @@
   by-spec."natural"."0.1.17" =
     self.by-version."natural"."0.1.17";
   by-version."natural"."0.1.17" = lib.makeOverridable self.buildNodePackage {
-    name = "natural-0.1.17";
+    name = "node-natural-0.1.17";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/natural/-/natural-0.1.17.tgz";
@@ -9516,7 +9516,7 @@
   by-spec."nconf"."*" =
     self.by-version."nconf"."0.6.9";
   by-version."nconf"."0.6.9" = lib.makeOverridable self.buildNodePackage {
-    name = "nconf-0.6.9";
+    name = "node-nconf-0.6.9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz";
@@ -9585,7 +9585,7 @@
   by-spec."negotiator"."0.2.5" =
     self.by-version."negotiator"."0.2.5";
   by-version."negotiator"."0.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "negotiator-0.2.5";
+    name = "node-negotiator-0.2.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/negotiator/-/negotiator-0.2.5.tgz";
@@ -9604,7 +9604,7 @@
   by-spec."negotiator"."0.3.0" =
     self.by-version."negotiator"."0.3.0";
   by-version."negotiator"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "negotiator-0.3.0";
+    name = "node-negotiator-0.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz";
@@ -9623,7 +9623,7 @@
   by-spec."net-ping"."1.1.7" =
     self.by-version."net-ping"."1.1.7";
   by-version."net-ping"."1.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "net-ping-1.1.7";
+    name = "node-net-ping-1.1.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz";
@@ -9643,7 +9643,7 @@
   by-spec."next-tick"."0.1.x" =
     self.by-version."next-tick"."0.1.0";
   by-version."next-tick"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "next-tick-0.1.0";
+    name = "node-next-tick-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/next-tick/-/next-tick-0.1.0.tgz";
@@ -9662,7 +9662,7 @@
   by-spec."nib"."0.5.0" =
     self.by-version."nib"."0.5.0";
   by-version."nib"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "nib-0.5.0";
+    name = "node-nib-0.5.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/nib/-/nib-0.5.0.tgz";
@@ -9702,7 +9702,7 @@
   by-spec."node-appc"."0.2.0" =
     self.by-version."node-appc"."0.2.0";
   by-version."node-appc"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-appc-0.2.0";
+    name = "node-node-appc-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/node-appc/-/node-appc-0.2.0.tgz";
@@ -9736,7 +9736,7 @@
   by-spec."node-expat"."*" =
     self.by-version."node-expat"."2.1.4";
   by-version."node-expat"."2.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-expat-2.1.4";
+    name = "node-node-expat-2.1.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.4.tgz";
@@ -9819,7 +9819,7 @@
   by-spec."node-protobuf"."*" =
     self.by-version."node-protobuf"."1.0.10";
   by-version."node-protobuf"."1.0.10" = lib.makeOverridable self.buildNodePackage {
-    name = "node-protobuf-1.0.10";
+    name = "node-node-protobuf-1.0.10";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.0.10.tgz";
@@ -9839,7 +9839,7 @@
   by-spec."node-swt".">=0.1.1" =
     self.by-version."node-swt"."0.1.1";
   by-version."node-swt"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-swt-0.1.1";
+    name = "node-node-swt-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz";
@@ -9858,7 +9858,7 @@
   by-spec."node-syslog"."1.1.7" =
     self.by-version."node-syslog"."1.1.7";
   by-version."node-syslog"."1.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-syslog-1.1.7";
+    name = "node-node-syslog-1.1.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz";
@@ -9877,7 +9877,7 @@
   by-spec."node-uptime"."https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" =
     self.by-version."node-uptime"."3.2.0";
   by-version."node-uptime"."3.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-uptime-3.2.0";
+    name = "node-node-uptime-3.2.0";
     src = [
       (fetchurl {
         url = "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7";
@@ -9911,7 +9911,7 @@
   by-spec."node-uuid"."*" =
     self.by-version."node-uuid"."1.4.1";
   by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-uuid-1.4.1";
+    name = "node-node-uuid-1.4.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz";
@@ -9931,7 +9931,7 @@
   by-spec."node-uuid"."1.3.3" =
     self.by-version."node-uuid"."1.3.3";
   by-version."node-uuid"."1.3.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-uuid-1.3.3";
+    name = "node-node-uuid-1.3.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz";
@@ -9950,7 +9950,7 @@
   by-spec."node-uuid"."1.4.0" =
     self.by-version."node-uuid"."1.4.0";
   by-version."node-uuid"."1.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-uuid-1.4.0";
+    name = "node-node-uuid-1.4.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz";
@@ -9975,7 +9975,7 @@
   by-spec."node-wsfederation".">=0.1.1" =
     self.by-version."node-wsfederation"."0.1.1";
   by-version."node-wsfederation"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-wsfederation-0.1.1";
+    name = "node-node-wsfederation-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz";
@@ -9995,7 +9995,7 @@
   by-spec."node.extend"."1.0.0" =
     self.by-version."node.extend"."1.0.0";
   by-version."node.extend"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node.extend-1.0.0";
+    name = "node-node.extend-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz";
@@ -10058,7 +10058,7 @@
   by-spec."nomnom"."1.6.x" =
     self.by-version."nomnom"."1.6.2";
   by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage {
-    name = "nomnom-1.6.2";
+    name = "node-nomnom-1.6.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz";
@@ -10147,7 +10147,7 @@
   by-spec."normalize-package-data"."~0.2.7" =
     self.by-version."normalize-package-data"."0.2.8";
   by-version."normalize-package-data"."0.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "normalize-package-data-0.2.8";
+    name = "node-normalize-package-data-0.2.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.8.tgz";
@@ -10236,7 +10236,7 @@
   by-spec."npm-registry-client"."0.2.27" =
     self.by-version."npm-registry-client"."0.2.27";
   by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage {
-    name = "npm-registry-client-0.2.27";
+    name = "node-npm-registry-client-0.2.27";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz";
@@ -10265,7 +10265,7 @@
   by-spec."npm-registry-client"."~0.3.3" =
     self.by-version."npm-registry-client"."0.3.5";
   by-version."npm-registry-client"."0.3.5" = lib.makeOverridable self.buildNodePackage {
-    name = "npm-registry-client-0.3.5";
+    name = "node-npm-registry-client-0.3.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.5.tgz";
@@ -10296,7 +10296,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 {
-    name = "npm-user-validate-0.0.3";
+    name = "node-npm-user-validate-0.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz";
@@ -10313,14 +10313,14 @@
     passthru.names = [ "npm-user-validate" ];
   };
   by-spec."npm2nix"."*" =
-    self.by-version."npm2nix"."5.4.2";
-  by-version."npm2nix"."5.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "npm2nix-5.4.2";
+    self.by-version."npm2nix"."5.5.0";
+  by-version."npm2nix"."5.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "npm2nix-5.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.4.2.tgz";
-        name = "npm2nix-5.4.2.tgz";
-        sha1 = "03184775d310c75117c82303eecb50f6b26f93d0";
+        url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.5.0.tgz";
+        name = "npm2nix-5.5.0.tgz";
+        sha1 = "79729928cc4d2f4e765797491eeb4ced2b1d9e9e";
       })
     ];
     buildInputs =
@@ -10339,11 +10339,11 @@
     ];
     passthru.names = [ "npm2nix" ];
   };
-  "npm2nix" = self.by-version."npm2nix"."5.4.2";
+  "npm2nix" = self.by-version."npm2nix"."5.5.0";
   by-spec."npmconf"."0.0.24" =
     self.by-version."npmconf"."0.0.24";
   by-version."npmconf"."0.0.24" = lib.makeOverridable self.buildNodePackage {
-    name = "npmconf-0.0.24";
+    name = "node-npmconf-0.0.24";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz";
@@ -10370,7 +10370,7 @@
   by-spec."npmconf"."0.1.1" =
     self.by-version."npmconf"."0.1.1";
   by-version."npmconf"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "npmconf-0.1.1";
+    name = "node-npmconf-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz";
@@ -10397,7 +10397,7 @@
   by-spec."npmconf"."~0.1.12" =
     self.by-version."npmconf"."0.1.12";
   by-version."npmconf"."0.1.12" = lib.makeOverridable self.buildNodePackage {
-    name = "npmconf-0.1.12";
+    name = "node-npmconf-0.1.12";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.12.tgz";
@@ -10426,7 +10426,7 @@
   by-spec."npmlog"."*" =
     self.by-version."npmlog"."0.0.6";
   by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "npmlog-0.0.6";
+    name = "node-npmlog-0.0.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz";
@@ -10450,7 +10450,7 @@
   by-spec."nssocket"."~0.5.1" =
     self.by-version."nssocket"."0.5.1";
   by-version."nssocket"."0.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "nssocket-0.5.1";
+    name = "node-nssocket-0.5.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.1.tgz";
@@ -10471,7 +10471,7 @@
   by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" =
     self.by-version."oauth"."0.9.11";
   by-version."oauth"."0.9.11" = lib.makeOverridable self.buildNodePackage {
-    name = "oauth-0.9.11";
+    name = "node-oauth-0.9.11";
     src = [
       (fetchurl {
         url = "https://github.com/ciaranj/node-oauth/tarball/master";
@@ -10490,7 +10490,7 @@
   by-spec."oauth-sign"."~0.2.0" =
     self.by-version."oauth-sign"."0.2.0";
   by-version."oauth-sign"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "oauth-sign-0.2.0";
+    name = "node-oauth-sign-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz";
@@ -10509,7 +10509,7 @@
   by-spec."oauth-sign"."~0.3.0" =
     self.by-version."oauth-sign"."0.3.0";
   by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "oauth-sign-0.3.0";
+    name = "node-oauth-sign-0.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
@@ -10528,7 +10528,7 @@
   by-spec."object-additions".">= 0.5.0" =
     self.by-version."object-additions"."0.5.1";
   by-version."object-additions"."0.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "object-additions-0.5.1";
+    name = "node-object-additions-0.5.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/object-additions/-/object-additions-0.5.1.tgz";
@@ -10547,7 +10547,7 @@
   by-spec."object-keys"."~0.4.0" =
     self.by-version."object-keys"."0.4.0";
   by-version."object-keys"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "object-keys-0.4.0";
+    name = "node-object-keys-0.4.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz";
@@ -10566,7 +10566,7 @@
   by-spec."once"."1.1.1" =
     self.by-version."once"."1.1.1";
   by-version."once"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "once-1.1.1";
+    name = "node-once-1.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz";
@@ -10587,7 +10587,7 @@
   by-spec."once"."~1.3.0" =
     self.by-version."once"."1.3.0";
   by-version."once"."1.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "once-1.3.0";
+    name = "node-once-1.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/once/-/once-1.3.0.tgz";
@@ -10606,7 +10606,7 @@
   by-spec."open"."0.0.2" =
     self.by-version."open"."0.0.2";
   by-version."open"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "open-0.0.2";
+    name = "node-open-0.0.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/open/-/open-0.0.2.tgz";
@@ -10625,7 +10625,7 @@
   by-spec."open"."0.0.4" =
     self.by-version."open"."0.0.4";
   by-version."open"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "open-0.0.4";
+    name = "node-open-0.0.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/open/-/open-0.0.4.tgz";
@@ -10665,7 +10665,7 @@
   by-spec."openid".">=0.2.0" =
     self.by-version."openid"."0.5.5";
   by-version."openid"."0.5.5" = lib.makeOverridable self.buildNodePackage {
-    name = "openid-0.5.5";
+    name = "node-openid-0.5.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/openid/-/openid-0.5.5.tgz";
@@ -10684,7 +10684,7 @@
   by-spec."optimist"."*" =
     self.by-version."optimist"."0.6.0";
   by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "optimist-0.6.0";
+    name = "node-optimist-0.6.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
@@ -10706,7 +10706,7 @@
   by-spec."optimist"."0.2" =
     self.by-version."optimist"."0.2.8";
   by-version."optimist"."0.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "optimist-0.2.8";
+    name = "node-optimist-0.2.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz";
@@ -10726,7 +10726,7 @@
   by-spec."optimist"."0.3.x" =
     self.by-version."optimist"."0.3.7";
   by-version."optimist"."0.3.7" = lib.makeOverridable self.buildNodePackage {
-    name = "optimist-0.3.7";
+    name = "node-optimist-0.3.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
@@ -10758,7 +10758,7 @@
   by-spec."options".">=0.0.5" =
     self.by-version."options"."0.0.5";
   by-version."options"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "options-0.0.5";
+    name = "node-options-0.0.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/options/-/options-0.0.5.tgz";
@@ -10777,7 +10777,7 @@
   by-spec."optjs"."*" =
     self.by-version."optjs"."3.2.1-boom";
   by-version."optjs"."3.2.1-boom" = lib.makeOverridable self.buildNodePackage {
-    name = "optjs-3.2.1-boom";
+    name = "node-optjs-3.2.1-boom";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/optjs/-/optjs-3.2.1-boom.tgz";
@@ -10796,7 +10796,7 @@
   by-spec."optparse"."*" =
     self.by-version."optparse"."1.0.5";
   by-version."optparse"."1.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "optparse-1.0.5";
+    name = "node-optparse-1.0.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz";
@@ -10818,7 +10818,7 @@
   by-spec."osenv"."0" =
     self.by-version."osenv"."0.0.3";
   by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "osenv-0.0.3";
+    name = "node-osenv-0.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
@@ -10839,7 +10839,7 @@
   by-spec."owl-deepcopy"."*" =
     self.by-version."owl-deepcopy"."0.0.2";
   by-version."owl-deepcopy"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "owl-deepcopy-0.0.2";
+    name = "node-owl-deepcopy-0.0.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.2.tgz";
@@ -10861,7 +10861,7 @@
   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 {
-    name = "p-throttler-0.0.1";
+    name = "node-p-throttler-0.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/p-throttler/-/p-throttler-0.0.1.tgz";
@@ -10881,7 +10881,7 @@
   by-spec."passport"."*" =
     self.by-version."passport"."0.2.0";
   by-version."passport"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "passport-0.2.0";
+    name = "node-passport-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/passport/-/passport-0.2.0.tgz";
@@ -10903,7 +10903,7 @@
   by-spec."passport"."~0.1.1" =
     self.by-version."passport"."0.1.18";
   by-version."passport"."0.1.18" = lib.makeOverridable self.buildNodePackage {
-    name = "passport-0.1.18";
+    name = "node-passport-0.1.18";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/passport/-/passport-0.1.18.tgz";
@@ -10928,7 +10928,7 @@
   by-spec."passport-http"."*" =
     self.by-version."passport-http"."0.2.2";
   by-version."passport-http"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "passport-http-0.2.2";
+    name = "node-passport-http-0.2.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/passport-http/-/passport-http-0.2.2.tgz";
@@ -10950,7 +10950,7 @@
   by-spec."passport-local"."*" =
     self.by-version."passport-local"."0.1.6";
   by-version."passport-local"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "passport-local-0.1.6";
+    name = "node-passport-local-0.1.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/passport-local/-/passport-local-0.1.6.tgz";
@@ -10974,7 +10974,7 @@
   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 {
-    name = "passport-strategy-1.0.0";
+    name = "node-passport-strategy-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz";
@@ -10993,7 +10993,7 @@
   by-spec."path-is-inside"."~1.0.0" =
     self.by-version."path-is-inside"."1.0.0";
   by-version."path-is-inside"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "path-is-inside-1.0.0";
+    name = "node-path-is-inside-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.0.tgz";
@@ -11012,7 +11012,7 @@
   by-spec."pause"."0.0.1" =
     self.by-version."pause"."0.0.1";
   by-version."pause"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "pause-0.0.1";
+    name = "node-pause-0.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
@@ -11057,7 +11057,7 @@
   by-spec."pkginfo"."0.2.x" =
     self.by-version."pkginfo"."0.2.3";
   by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "pkginfo-0.2.3";
+    name = "node-pkginfo-0.2.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz";
@@ -11076,7 +11076,7 @@
   by-spec."pkginfo"."0.3.0" =
     self.by-version."pkginfo"."0.3.0";
   by-version."pkginfo"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "pkginfo-0.3.0";
+    name = "node-pkginfo-0.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
@@ -11099,7 +11099,7 @@
   by-spec."plist-native"."*" =
     self.by-version."plist-native"."0.2.2";
   by-version."plist-native"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "plist-native-0.2.2";
+    name = "node-plist-native-0.2.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/plist-native/-/plist-native-0.2.2.tgz";
@@ -11120,7 +11120,7 @@
   by-spec."policyfile"."0.0.4" =
     self.by-version."policyfile"."0.0.4";
   by-version."policyfile"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "policyfile-0.0.4";
+    name = "node-policyfile-0.0.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz";
@@ -11139,7 +11139,7 @@
   by-spec."posix"."*" =
     self.by-version."posix"."1.0.3";
   by-version."posix"."1.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "posix-1.0.3";
+    name = "node-posix-1.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/posix/-/posix-1.0.3.tgz";
@@ -11159,7 +11159,7 @@
   by-spec."posix-getopt"."1.0.0" =
     self.by-version."posix-getopt"."1.0.0";
   by-version."posix-getopt"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "posix-getopt-1.0.0";
+    name = "node-posix-getopt-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.0.0.tgz";
@@ -11178,7 +11178,7 @@
   by-spec."promise"."~2.0" =
     self.by-version."promise"."2.0.0";
   by-version."promise"."2.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "promise-2.0.0";
+    name = "node-promise-2.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz";
@@ -11198,7 +11198,7 @@
   by-spec."prompt"."0.2.11" =
     self.by-version."prompt"."0.2.11";
   by-version."prompt"."0.2.11" = lib.makeOverridable self.buildNodePackage {
-    name = "prompt-0.2.11";
+    name = "node-prompt-0.2.11";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/prompt/-/prompt-0.2.11.tgz";
@@ -11222,7 +11222,7 @@
   by-spec."promptly"."~0.2.0" =
     self.by-version."promptly"."0.2.0";
   by-version."promptly"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "promptly-0.2.0";
+    name = "node-promptly-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/promptly/-/promptly-0.2.0.tgz";
@@ -11242,7 +11242,7 @@
   by-spec."promzard"."~0.2.0" =
     self.by-version."promzard"."0.2.1";
   by-version."promzard"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "promzard-0.2.1";
+    name = "node-promzard-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/promzard/-/promzard-0.2.1.tgz";
@@ -11262,7 +11262,7 @@
   by-spec."proto-list"."~1.2.1" =
     self.by-version."proto-list"."1.2.2";
   by-version."proto-list"."1.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "proto-list-1.2.2";
+    name = "node-proto-list-1.2.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.2.tgz";
@@ -11302,7 +11302,7 @@
   by-spec."ps-tree"."0.0.x" =
     self.by-version."ps-tree"."0.0.3";
   by-version."ps-tree"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "ps-tree-0.0.3";
+    name = "node-ps-tree-0.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz";
@@ -11322,7 +11322,7 @@
   by-spec."punycode".">=0.2.0" =
     self.by-version."punycode"."1.2.3";
   by-version."punycode"."1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "punycode-1.2.3";
+    name = "node-punycode-1.2.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/punycode/-/punycode-1.2.3.tgz";
@@ -11343,7 +11343,7 @@
   by-spec."q".">= 0.0.1" =
     self.by-version."q"."1.0.0";
   by-version."q"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "q-1.0.0";
+    name = "node-q-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/q/-/q-1.0.0.tgz";
@@ -11362,7 +11362,7 @@
   by-spec."q"."~0.9.2" =
     self.by-version."q"."0.9.7";
   by-version."q"."0.9.7" = lib.makeOverridable self.buildNodePackage {
-    name = "q-0.9.7";
+    name = "node-q-0.9.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz";
@@ -11387,7 +11387,7 @@
   by-spec."qs"."0.4.2" =
     self.by-version."qs"."0.4.2";
   by-version."qs"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "qs-0.4.2";
+    name = "node-qs-0.4.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/qs/-/qs-0.4.2.tgz";
@@ -11408,7 +11408,7 @@
   by-spec."qs"."0.5.1" =
     self.by-version."qs"."0.5.1";
   by-version."qs"."0.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "qs-0.5.1";
+    name = "node-qs-0.5.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/qs/-/qs-0.5.1.tgz";
@@ -11427,7 +11427,7 @@
   by-spec."qs"."0.5.2" =
     self.by-version."qs"."0.5.2";
   by-version."qs"."0.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "qs-0.5.2";
+    name = "node-qs-0.5.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/qs/-/qs-0.5.2.tgz";
@@ -11446,7 +11446,7 @@
   by-spec."qs"."0.5.5" =
     self.by-version."qs"."0.5.5";
   by-version."qs"."0.5.5" = lib.makeOverridable self.buildNodePackage {
-    name = "qs-0.5.5";
+    name = "node-qs-0.5.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/qs/-/qs-0.5.5.tgz";
@@ -11465,7 +11465,7 @@
   by-spec."qs"."0.6.5" =
     self.by-version."qs"."0.6.5";
   by-version."qs"."0.6.5" = lib.makeOverridable self.buildNodePackage {
-    name = "qs-0.6.5";
+    name = "node-qs-0.6.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
@@ -11484,7 +11484,7 @@
   by-spec."qs"."0.6.6" =
     self.by-version."qs"."0.6.6";
   by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage {
-    name = "qs-0.6.6";
+    name = "node-qs-0.6.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
@@ -11505,7 +11505,7 @@
   by-spec."qs"."~0.5.0" =
     self.by-version."qs"."0.5.6";
   by-version."qs"."0.5.6" = lib.makeOverridable self.buildNodePackage {
-    name = "qs-0.5.6";
+    name = "node-qs-0.5.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
@@ -11528,7 +11528,7 @@
   by-spec."rai"."~0.1" =
     self.by-version."rai"."0.1.9";
   by-version."rai"."0.1.9" = lib.makeOverridable self.buildNodePackage {
-    name = "rai-0.1.9";
+    name = "node-rai-0.1.9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/rai/-/rai-0.1.9.tgz";
@@ -11547,7 +11547,7 @@
   by-spec."range-parser"."0.0.4" =
     self.by-version."range-parser"."0.0.4";
   by-version."range-parser"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "range-parser-0.0.4";
+    name = "node-range-parser-0.0.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
@@ -11566,7 +11566,7 @@
   by-spec."range-parser"."~1.0.0" =
     self.by-version."range-parser"."1.0.0";
   by-version."range-parser"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "range-parser-1.0.0";
+    name = "node-range-parser-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz";
@@ -11585,7 +11585,7 @@
   by-spec."raven"."~0.6.0" =
     self.by-version."raven"."0.6.1";
   by-version."raven"."0.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "raven-0.6.1";
+    name = "node-raven-0.6.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/raven/-/raven-0.6.1.tgz";
@@ -11608,7 +11608,7 @@
   by-spec."raw-body"."0.0.3" =
     self.by-version."raw-body"."0.0.3";
   by-version."raw-body"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "raw-body-0.0.3";
+    name = "node-raw-body-0.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz";
@@ -11627,7 +11627,7 @@
   by-spec."raw-body"."1.1.2" =
     self.by-version."raw-body"."1.1.2";
   by-version."raw-body"."1.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "raw-body-1.1.2";
+    name = "node-raw-body-1.1.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.2.tgz";
@@ -11647,7 +11647,7 @@
   by-spec."raw-socket"."*" =
     self.by-version."raw-socket"."1.2.2";
   by-version."raw-socket"."1.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "raw-socket-1.2.2";
+    name = "node-raw-socket-1.2.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/raw-socket/-/raw-socket-1.2.2.tgz";
@@ -11666,7 +11666,7 @@
   by-spec."rbytes"."*" =
     self.by-version."rbytes"."1.0.0";
   by-version."rbytes"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "rbytes-1.0.0";
+    name = "node-rbytes-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/rbytes/-/rbytes-1.0.0.tgz";
@@ -11710,7 +11710,7 @@
   by-spec."read"."1" =
     self.by-version."read"."1.0.5";
   by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "read-1.0.5";
+    name = "node-read-1.0.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz";
@@ -11736,7 +11736,7 @@
   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 = "read-installed-0.2.2";
+    name = "node-read-installed-0.2.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.2.tgz";
@@ -11759,7 +11759,7 @@
   by-spec."read-installed"."~0.2.2" =
     self.by-version."read-installed"."0.2.5";
   by-version."read-installed"."0.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "read-installed-0.2.5";
+    name = "node-read-installed-0.2.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.5.tgz";
@@ -11782,7 +11782,7 @@
   by-spec."read-package-json"."1" =
     self.by-version."read-package-json"."1.1.6";
   by-version."read-package-json"."1.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "read-package-json-1.1.6";
+    name = "node-read-package-json-1.1.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.6.tgz";
@@ -11807,7 +11807,7 @@
   by-spec."readable-stream"."1.0" =
     self.by-version."readable-stream"."1.0.25";
   by-version."readable-stream"."1.0.25" = lib.makeOverridable self.buildNodePackage {
-    name = "readable-stream-1.0.25";
+    name = "node-readable-stream-1.0.25";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.25.tgz";
@@ -11827,7 +11827,7 @@
   by-spec."readable-stream"."1.1" =
     self.by-version."readable-stream"."1.1.10";
   by-version."readable-stream"."1.1.10" = lib.makeOverridable self.buildNodePackage {
-    name = "readable-stream-1.1.10";
+    name = "node-readable-stream-1.1.10";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.10.tgz";
@@ -11859,7 +11859,7 @@
   by-spec."readdirp"."~0.2.3" =
     self.by-version."readdirp"."0.2.5";
   by-version."readdirp"."0.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "readdirp-0.2.5";
+    name = "node-readdirp-0.2.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz";
@@ -11879,7 +11879,7 @@
   by-spec."redeyed"."~0.4.0" =
     self.by-version."redeyed"."0.4.2";
   by-version."redeyed"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "redeyed-0.4.2";
+    name = "node-redeyed-0.4.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.2.tgz";
@@ -11899,7 +11899,7 @@
   by-spec."redis"."*" =
     self.by-version."redis"."0.10.0";
   by-version."redis"."0.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "redis-0.10.0";
+    name = "node-redis-0.10.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/redis/-/redis-0.10.0.tgz";
@@ -11919,7 +11919,7 @@
   by-spec."redis"."0.7.2" =
     self.by-version."redis"."0.7.2";
   by-version."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage {
-    name = "redis-0.7.2";
+    name = "node-redis-0.7.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/redis/-/redis-0.7.2.tgz";
@@ -11939,7 +11939,7 @@
   by-spec."redis"."0.7.3" =
     self.by-version."redis"."0.7.3";
   by-version."redis"."0.7.3" = lib.makeOverridable self.buildNodePackage {
-    name = "redis-0.7.3";
+    name = "node-redis-0.7.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/redis/-/redis-0.7.3.tgz";
@@ -11958,7 +11958,7 @@
   by-spec."redis"."0.8.x" =
     self.by-version."redis"."0.8.6";
   by-version."redis"."0.8.6" = lib.makeOverridable self.buildNodePackage {
-    name = "redis-0.8.6";
+    name = "node-redis-0.8.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/redis/-/redis-0.8.6.tgz";
@@ -11979,7 +11979,7 @@
   by-spec."reds"."~0.2.4" =
     self.by-version."reds"."0.2.4";
   by-version."reds"."0.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "reds-0.2.4";
+    name = "node-reds-0.2.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/reds/-/reds-0.2.4.tgz";
@@ -12000,7 +12000,7 @@
   by-spec."reduce-component"."1.0.1" =
     self.by-version."reduce-component"."1.0.1";
   by-version."reduce-component"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "reduce-component-1.0.1";
+    name = "node-reduce-component-1.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz";
@@ -12019,7 +12019,7 @@
   by-spec."regexp-clone"."0.0.1" =
     self.by-version."regexp-clone"."0.0.1";
   by-version."regexp-clone"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "regexp-clone-0.0.1";
+    name = "node-regexp-clone-0.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz";
@@ -12060,7 +12060,7 @@
   by-spec."request"."2" =
     self.by-version."request"."2.33.0";
   by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage {
-    name = "request-2.33.0";
+    name = "node-request-2.33.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz";
@@ -12095,7 +12095,7 @@
   by-spec."request"."2.16.2" =
     self.by-version."request"."2.16.2";
   by-version."request"."2.16.2" = lib.makeOverridable self.buildNodePackage {
-    name = "request-2.16.2";
+    name = "node-request-2.16.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/request/-/request-2.16.2.tgz";
@@ -12125,7 +12125,7 @@
   by-spec."request"."2.16.x" =
     self.by-version."request"."2.16.6";
   by-version."request"."2.16.6" = lib.makeOverridable self.buildNodePackage {
-    name = "request-2.16.6";
+    name = "node-request-2.16.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz";
@@ -12155,7 +12155,7 @@
   by-spec."request"."2.9.x" =
     self.by-version."request"."2.9.203";
   by-version."request"."2.9.203" = lib.makeOverridable self.buildNodePackage {
-    name = "request-2.9.203";
+    name = "node-request-2.9.203";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz";
@@ -12178,7 +12178,7 @@
   by-spec."request"."~2.25.0" =
     self.by-version."request"."2.25.0";
   by-version."request"."2.25.0" = lib.makeOverridable self.buildNodePackage {
-    name = "request-2.25.0";
+    name = "node-request-2.25.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
@@ -12209,7 +12209,7 @@
   by-spec."request"."~2.27.0" =
     self.by-version."request"."2.27.0";
   by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage {
-    name = "request-2.27.0";
+    name = "node-request-2.27.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz";
@@ -12240,7 +12240,7 @@
   by-spec."request"."~2.30.0" =
     self.by-version."request"."2.30.0";
   by-version."request"."2.30.0" = lib.makeOverridable self.buildNodePackage {
-    name = "request-2.30.0";
+    name = "node-request-2.30.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/request/-/request-2.30.0.tgz";
@@ -12271,7 +12271,7 @@
   by-spec."request"."~2.31.0" =
     self.by-version."request"."2.31.0";
   by-version."request"."2.31.0" = lib.makeOverridable self.buildNodePackage {
-    name = "request-2.31.0";
+    name = "node-request-2.31.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/request/-/request-2.31.0.tgz";
@@ -12304,7 +12304,7 @@
   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 {
-    name = "request-progress-0.3.1";
+    name = "node-request-progress-0.3.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz";
@@ -12324,7 +12324,7 @@
   by-spec."request-replay"."~0.2.0" =
     self.by-version."request-replay"."0.2.0";
   by-version."request-replay"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "request-replay-0.2.0";
+    name = "node-request-replay-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/request-replay/-/request-replay-0.2.0.tgz";
@@ -12365,7 +12365,7 @@
   by-spec."resolve"."0.5.x" =
     self.by-version."resolve"."0.5.1";
   by-version."resolve"."0.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "resolve-0.5.1";
+    name = "node-resolve-0.5.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/resolve/-/resolve-0.5.1.tgz";
@@ -12384,7 +12384,7 @@
   by-spec."resolve"."0.6.x" =
     self.by-version."resolve"."0.6.1";
   by-version."resolve"."0.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "resolve-0.6.1";
+    name = "node-resolve-0.6.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/resolve/-/resolve-0.6.1.tgz";
@@ -12403,7 +12403,7 @@
   by-spec."resolve"."~0.3.1" =
     self.by-version."resolve"."0.3.1";
   by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "resolve-0.3.1";
+    name = "node-resolve-0.3.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz";
@@ -12458,7 +12458,7 @@
   by-spec."rethinkdb"."*" =
     self.by-version."rethinkdb"."1.11.0-4";
   by-version."rethinkdb"."1.11.0-4" = lib.makeOverridable self.buildNodePackage {
-    name = "rethinkdb-1.11.0-4";
+    name = "node-rethinkdb-1.11.0-4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.11.0-4.tgz";
@@ -12479,7 +12479,7 @@
   by-spec."retry"."0.6.0" =
     self.by-version."retry"."0.6.0";
   by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "retry-0.6.0";
+    name = "node-retry-0.6.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz";
@@ -12500,7 +12500,7 @@
   by-spec."revalidator"."0.1.x" =
     self.by-version."revalidator"."0.1.6";
   by-version."revalidator"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "revalidator-0.1.6";
+    name = "node-revalidator-0.1.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.6.tgz";
@@ -12519,7 +12519,7 @@
   by-spec."rimraf"."1.x.x" =
     self.by-version."rimraf"."1.0.9";
   by-version."rimraf"."1.0.9" = lib.makeOverridable self.buildNodePackage {
-    name = "rimraf-1.0.9";
+    name = "node-rimraf-1.0.9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz";
@@ -12561,7 +12561,7 @@
   by-spec."rimraf"."~2.0.2" =
     self.by-version."rimraf"."2.0.3";
   by-version."rimraf"."2.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "rimraf-2.0.3";
+    name = "node-rimraf-2.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/rimraf/-/rimraf-2.0.3.tgz";
@@ -12583,7 +12583,7 @@
   by-spec."rimraf"."~2.1.4" =
     self.by-version."rimraf"."2.1.4";
   by-version."rimraf"."2.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "rimraf-2.1.4";
+    name = "node-rimraf-2.1.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
@@ -12637,7 +12637,7 @@
   by-spec."sauce-connect-launcher"."~0.2.2" =
     self.by-version."sauce-connect-launcher"."0.2.2";
   by-version."sauce-connect-launcher"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "sauce-connect-launcher-0.2.2";
+    name = "node-sauce-connect-launcher-0.2.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.2.2.tgz";
@@ -12659,7 +12659,7 @@
   by-spec."saucelabs"."~0.1.0" =
     self.by-version."saucelabs"."0.1.1";
   by-version."saucelabs"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "saucelabs-0.1.1";
+    name = "node-saucelabs-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz";
@@ -12678,7 +12678,7 @@
   by-spec."sax"."0.5.x" =
     self.by-version."sax"."0.5.8";
   by-version."sax"."0.5.8" = lib.makeOverridable self.buildNodePackage {
-    name = "sax-0.5.8";
+    name = "node-sax-0.5.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
@@ -12697,7 +12697,7 @@
   by-spec."sax".">=0.4.2" =
     self.by-version."sax"."0.6.0";
   by-version."sax"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "sax-0.6.0";
+    name = "node-sax-0.6.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sax/-/sax-0.6.0.tgz";
@@ -12716,7 +12716,7 @@
   by-spec."selenium-webdriver"."*" =
     self.by-version."selenium-webdriver"."2.39.0";
   by-version."selenium-webdriver"."2.39.0" = lib.makeOverridable self.buildNodePackage {
-    name = "selenium-webdriver-2.39.0";
+    name = "node-selenium-webdriver-2.39.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.39.0.tgz";
@@ -12848,7 +12848,7 @@
   by-spec."send"."*" =
     self.by-version."send"."0.2.0";
   by-version."send"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "send-0.2.0";
+    name = "node-send-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/send/-/send-0.2.0.tgz";
@@ -12871,7 +12871,7 @@
   by-spec."send"."0.0.3" =
     self.by-version."send"."0.0.3";
   by-version."send"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "send-0.0.3";
+    name = "node-send-0.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/send/-/send-0.0.3.tgz";
@@ -12894,7 +12894,7 @@
   by-spec."send"."0.1.0" =
     self.by-version."send"."0.1.0";
   by-version."send"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "send-0.1.0";
+    name = "node-send-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/send/-/send-0.1.0.tgz";
@@ -12917,7 +12917,7 @@
   by-spec."send"."0.1.4" =
     self.by-version."send"."0.1.4";
   by-version."send"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "send-0.1.4";
+    name = "node-send-0.1.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz";
@@ -12940,7 +12940,7 @@
   by-spec."sequence"."*" =
     self.by-version."sequence"."3.0.0";
   by-version."sequence"."3.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "sequence-3.0.0";
+    name = "node-sequence-3.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sequence/-/sequence-3.0.0.tgz";
@@ -12959,7 +12959,7 @@
   by-spec."sequence"."2.x" =
     self.by-version."sequence"."2.2.1";
   by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "sequence-2.2.1";
+    name = "node-sequence-2.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
@@ -12978,7 +12978,7 @@
   by-spec."sha"."~1.2.1" =
     self.by-version."sha"."1.2.3";
   by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "sha-1.2.3";
+    name = "node-sha-1.2.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sha/-/sha-1.2.3.tgz";
@@ -13039,7 +13039,7 @@
   by-spec."should"."*" =
     self.by-version."should"."3.1.2";
   by-version."should"."3.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "should-3.1.2";
+    name = "node-should-3.1.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/should/-/should-3.1.2.tgz";
@@ -13059,7 +13059,7 @@
   by-spec."sigmund"."~1.0.0" =
     self.by-version."sigmund"."1.0.0";
   by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "sigmund-1.0.0";
+    name = "node-sigmund-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz";
@@ -13078,7 +13078,7 @@
   by-spec."signals"."<2.0" =
     self.by-version."signals"."1.0.0";
   by-version."signals"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "signals-1.0.0";
+    name = "node-signals-1.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz";
@@ -13101,7 +13101,7 @@
   by-spec."simple-lru-cache"."0.0.x" =
     self.by-version."simple-lru-cache"."0.0.1";
   by-version."simple-lru-cache"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "simple-lru-cache-0.0.1";
+    name = "node-simple-lru-cache-0.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.1.tgz";
@@ -13120,7 +13120,7 @@
   by-spec."simplesmtp".">= 0.1.22" =
     self.by-version."simplesmtp"."0.3.20";
   by-version."simplesmtp"."0.3.20" = lib.makeOverridable self.buildNodePackage {
-    name = "simplesmtp-0.3.20";
+    name = "node-simplesmtp-0.3.20";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.20.tgz";
@@ -13141,7 +13141,7 @@
   by-spec."sliced"."0.0.3" =
     self.by-version."sliced"."0.0.3";
   by-version."sliced"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "sliced-0.0.3";
+    name = "node-sliced-0.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz";
@@ -13160,7 +13160,7 @@
   by-spec."sliced"."0.0.4" =
     self.by-version."sliced"."0.0.4";
   by-version."sliced"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "sliced-0.0.4";
+    name = "node-sliced-0.0.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz";
@@ -13179,7 +13179,7 @@
   by-spec."sliced"."0.0.5" =
     self.by-version."sliced"."0.0.5";
   by-version."sliced"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "sliced-0.0.5";
+    name = "node-sliced-0.0.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz";
@@ -13198,7 +13198,7 @@
   by-spec."slide"."~1.1.3" =
     self.by-version."slide"."1.1.5";
   by-version."slide"."1.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "slide-1.1.5";
+    name = "node-slide-1.1.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/slide/-/slide-1.1.5.tgz";
@@ -13246,7 +13246,7 @@
   by-spec."smartdc-auth"."1.0.1" =
     self.by-version."smartdc-auth"."1.0.1";
   by-version."smartdc-auth"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "smartdc-auth-1.0.1";
+    name = "node-smartdc-auth-1.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.1.tgz";
@@ -13270,7 +13270,7 @@
   by-spec."sntp"."0.1.x" =
     self.by-version."sntp"."0.1.4";
   by-version."sntp"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "sntp-0.1.4";
+    name = "node-sntp-0.1.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz";
@@ -13290,7 +13290,7 @@
   by-spec."sntp"."0.2.x" =
     self.by-version."sntp"."0.2.4";
   by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "sntp-0.2.4";
+    name = "node-sntp-0.2.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
@@ -13310,7 +13310,7 @@
   by-spec."socket.io"."0.9.14" =
     self.by-version."socket.io"."0.9.14";
   by-version."socket.io"."0.9.14" = lib.makeOverridable self.buildNodePackage {
-    name = "socket.io-0.9.14";
+    name = "node-socket.io-0.9.14";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz";
@@ -13333,7 +13333,7 @@
   by-spec."socket.io"."0.9.16" =
     self.by-version."socket.io"."0.9.16";
   by-version."socket.io"."0.9.16" = lib.makeOverridable self.buildNodePackage {
-    name = "socket.io-0.9.16";
+    name = "node-socket.io-0.9.16";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz";
@@ -13360,7 +13360,7 @@
   by-spec."socket.io-client"."0.9.11" =
     self.by-version."socket.io-client"."0.9.11";
   by-version."socket.io-client"."0.9.11" = lib.makeOverridable self.buildNodePackage {
-    name = "socket.io-client-0.9.11";
+    name = "node-socket.io-client-0.9.11";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz";
@@ -13383,7 +13383,7 @@
   by-spec."socket.io-client"."0.9.16" =
     self.by-version."socket.io-client"."0.9.16";
   by-version."socket.io-client"."0.9.16" = lib.makeOverridable self.buildNodePackage {
-    name = "socket.io-client-0.9.16";
+    name = "node-socket.io-client-0.9.16";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz";
@@ -13406,7 +13406,7 @@
   by-spec."sockjs"."*" =
     self.by-version."sockjs"."0.3.8";
   by-version."sockjs"."0.3.8" = lib.makeOverridable self.buildNodePackage {
-    name = "sockjs-0.3.8";
+    name = "node-sockjs-0.3.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.8.tgz";
@@ -13428,7 +13428,7 @@
   by-spec."source-map"."*" =
     self.by-version."source-map"."0.1.31";
   by-version."source-map"."0.1.31" = lib.makeOverridable self.buildNodePackage {
-    name = "source-map-0.1.31";
+    name = "node-source-map-0.1.31";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz";
@@ -13459,7 +13459,7 @@
   by-spec."spdy"."1.7.1" =
     self.by-version."spdy"."1.7.1";
   by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "spdy-1.7.1";
+    name = "node-spdy-1.7.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/spdy/-/spdy-1.7.1.tgz";
@@ -13478,7 +13478,7 @@
   by-spec."sprintf"."~0.1.2" =
     self.by-version."sprintf"."0.1.3";
   by-version."sprintf"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "sprintf-0.1.3";
+    name = "node-sprintf-0.1.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.3.tgz";
@@ -13520,7 +13520,7 @@
   by-spec."ssh2"."~0.2.16" =
     self.by-version."ssh2"."0.2.17";
   by-version."ssh2"."0.2.17" = lib.makeOverridable self.buildNodePackage {
-    name = "ssh2-0.2.17";
+    name = "node-ssh2-0.2.17";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.17.tgz";
@@ -13541,7 +13541,7 @@
   by-spec."stack-trace"."0.0.7" =
     self.by-version."stack-trace"."0.0.7";
   by-version."stack-trace"."0.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "stack-trace-0.0.7";
+    name = "node-stack-trace-0.0.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz";
@@ -13560,7 +13560,7 @@
   by-spec."stack-trace"."0.0.x" =
     self.by-version."stack-trace"."0.0.8";
   by-version."stack-trace"."0.0.8" = lib.makeOverridable self.buildNodePackage {
-    name = "stack-trace-0.0.8";
+    name = "node-stack-trace-0.0.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.8.tgz";
@@ -13602,7 +13602,7 @@
   by-spec."stream-combiner"."~0.0.2" =
     self.by-version."stream-combiner"."0.0.4";
   by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "stream-combiner-0.0.4";
+    name = "node-stream-combiner-0.0.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
@@ -13622,7 +13622,7 @@
   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 {
-    name = "stream-counter-0.1.0";
+    name = "node-stream-counter-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.1.0.tgz";
@@ -13642,7 +13642,7 @@
   by-spec."stream-counter"."~0.2.0" =
     self.by-version."stream-counter"."0.2.0";
   by-version."stream-counter"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "stream-counter-0.2.0";
+    name = "node-stream-counter-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz";
@@ -13662,7 +13662,7 @@
   by-spec."stream-splitter-transform"."*" =
     self.by-version."stream-splitter-transform"."0.0.4";
   by-version."stream-splitter-transform"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "stream-splitter-transform-0.0.4";
+    name = "node-stream-splitter-transform-0.0.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/stream-splitter-transform/-/stream-splitter-transform-0.0.4.tgz";
@@ -13683,7 +13683,7 @@
   by-spec."streamsearch"."0.1.2" =
     self.by-version."streamsearch"."0.1.2";
   by-version."streamsearch"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "streamsearch-0.1.2";
+    name = "node-streamsearch-0.1.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
@@ -13702,7 +13702,7 @@
   by-spec."string"."1.6.1" =
     self.by-version."string"."1.6.1";
   by-version."string"."1.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "string-1.6.1";
+    name = "node-string-1.6.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/string/-/string-1.6.1.tgz";
@@ -13721,7 +13721,7 @@
   by-spec."string_decoder"."~0.10.x" =
     self.by-version."string_decoder"."0.10.25";
   by-version."string_decoder"."0.10.25" = lib.makeOverridable self.buildNodePackage {
-    name = "string_decoder-0.10.25";
+    name = "node-string_decoder-0.10.25";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25.tgz";
@@ -13740,7 +13740,7 @@
   by-spec."stringify-object"."~0.1.4" =
     self.by-version."stringify-object"."0.1.8";
   by-version."stringify-object"."0.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "stringify-object-0.1.8";
+    name = "node-stringify-object-0.1.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.1.8.tgz";
@@ -13778,7 +13778,7 @@
   by-spec."strong-data-uri"."~0.1.0" =
     self.by-version."strong-data-uri"."0.1.1";
   by-version."strong-data-uri"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "strong-data-uri-0.1.1";
+    name = "node-strong-data-uri-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/strong-data-uri/-/strong-data-uri-0.1.1.tgz";
@@ -13845,7 +13845,7 @@
   by-spec."sudo-block"."~0.2.0" =
     self.by-version."sudo-block"."0.2.1";
   by-version."sudo-block"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "sudo-block-0.2.1";
+    name = "node-sudo-block-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sudo-block/-/sudo-block-0.2.1.tgz";
@@ -13865,7 +13865,7 @@
   by-spec."sudo-block"."~0.3.0" =
     self.by-version."sudo-block"."0.3.0";
   by-version."sudo-block"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "sudo-block-0.3.0";
+    name = "node-sudo-block-0.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sudo-block/-/sudo-block-0.3.0.tgz";
@@ -13885,7 +13885,7 @@
   by-spec."superagent"."0.16.0" =
     self.by-version."superagent"."0.16.0";
   by-version."superagent"."0.16.0" = lib.makeOverridable self.buildNodePackage {
-    name = "superagent-0.16.0";
+    name = "node-superagent-0.16.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/superagent/-/superagent-0.16.0.tgz";
@@ -13912,7 +13912,7 @@
   by-spec."superagent"."~0.13.0" =
     self.by-version."superagent"."0.13.0";
   by-version."superagent"."0.13.0" = lib.makeOverridable self.buildNodePackage {
-    name = "superagent-0.13.0";
+    name = "node-superagent-0.13.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/superagent/-/superagent-0.13.0.tgz";
@@ -13939,7 +13939,7 @@
   by-spec."supertest"."*" =
     self.by-version."supertest"."0.9.0";
   by-version."supertest"."0.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "supertest-0.9.0";
+    name = "node-supertest-0.9.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/supertest/-/supertest-0.9.0.tgz";
@@ -13961,7 +13961,7 @@
   by-spec."swig"."0.14.x" =
     self.by-version."swig"."0.14.0";
   by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage {
-    name = "swig-0.14.0";
+    name = "node-swig-0.14.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/swig/-/swig-0.14.0.tgz";
@@ -13982,7 +13982,7 @@
   by-spec."sylvester".">= 0.0.12" =
     self.by-version."sylvester"."0.0.21";
   by-version."sylvester"."0.0.21" = lib.makeOverridable self.buildNodePackage {
-    name = "sylvester-0.0.21";
+    name = "node-sylvester-0.0.21";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz";
@@ -14003,7 +14003,7 @@
   by-spec."tar"."*" =
     self.by-version."tar"."0.1.19";
   by-version."tar"."0.1.19" = lib.makeOverridable self.buildNodePackage {
-    name = "tar-0.1.19";
+    name = "node-tar-0.1.19";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/tar/-/tar-0.1.19.tgz";
@@ -14028,7 +14028,7 @@
   by-spec."tar"."0.1.17" =
     self.by-version."tar"."0.1.17";
   by-version."tar"."0.1.17" = lib.makeOverridable self.buildNodePackage {
-    name = "tar-0.1.17";
+    name = "node-tar-0.1.17";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
@@ -14056,7 +14056,7 @@
   by-spec."temp"."*" =
     self.by-version."temp"."0.6.0";
   by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "temp-0.6.0";
+    name = "node-temp-0.6.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz";
@@ -14082,7 +14082,7 @@
   by-spec."tempfile"."~0.1.2" =
     self.by-version."tempfile"."0.1.2";
   by-version."tempfile"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "tempfile-0.1.2";
+    name = "node-tempfile-0.1.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/tempfile/-/tempfile-0.1.2.tgz";
@@ -14102,7 +14102,7 @@
   by-spec."text-table"."~0.1.1" =
     self.by-version."text-table"."0.1.1";
   by-version."text-table"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "text-table-0.1.1";
+    name = "node-text-table-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/text-table/-/text-table-0.1.1.tgz";
@@ -14121,7 +14121,7 @@
   by-spec."text-table"."~0.2.0" =
     self.by-version."text-table"."0.2.0";
   by-version."text-table"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "text-table-0.2.0";
+    name = "node-text-table-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
@@ -14140,7 +14140,7 @@
   by-spec."throttleit"."~0.0.2" =
     self.by-version."throttleit"."0.0.2";
   by-version."throttleit"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "throttleit-0.0.2";
+    name = "node-throttleit-0.0.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz";
@@ -14159,7 +14159,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 = "through-2.3.4";
+    name = "node-through-2.3.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz";
@@ -14178,7 +14178,7 @@
   by-spec."through2"."~0.4.0" =
     self.by-version."through2"."0.4.1";
   by-version."through2"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "through2-0.4.1";
+    name = "node-through2-0.4.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/through2/-/through2-0.4.1.tgz";
@@ -14199,7 +14199,7 @@
   by-spec."timespan"."~2.3.0" =
     self.by-version."timespan"."2.3.0";
   by-version."timespan"."2.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "timespan-2.3.0";
+    name = "node-timespan-2.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz";
@@ -14218,7 +14218,7 @@
   by-spec."timezone"."*" =
     self.by-version."timezone"."0.0.23";
   by-version."timezone"."0.0.23" = lib.makeOverridable self.buildNodePackage {
-    name = "timezone-0.0.23";
+    name = "node-timezone-0.0.23";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/timezone/-/timezone-0.0.23.tgz";
@@ -14238,7 +14238,7 @@
   by-spec."tinycolor"."0.x" =
     self.by-version."tinycolor"."0.0.1";
   by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "tinycolor-0.0.1";
+    name = "node-tinycolor-0.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
@@ -14292,7 +14292,7 @@
   by-spec."tmp"."~0.0.20" =
     self.by-version."tmp"."0.0.23";
   by-version."tmp"."0.0.23" = lib.makeOverridable self.buildNodePackage {
-    name = "tmp-0.0.23";
+    name = "node-tmp-0.0.23";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/tmp/-/tmp-0.0.23.tgz";
@@ -14311,7 +14311,7 @@
   by-spec."touch"."0.0.2" =
     self.by-version."touch"."0.0.2";
   by-version."touch"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "touch-0.0.2";
+    name = "node-touch-0.0.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/touch/-/touch-0.0.2.tgz";
@@ -14331,7 +14331,7 @@
   by-spec."tough-cookie".">=0.12.0" =
     self.by-version."tough-cookie"."0.12.1";
   by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage {
-    name = "tough-cookie-0.12.1";
+    name = "node-tough-cookie-0.12.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz";
@@ -14351,7 +14351,7 @@
   by-spec."tough-cookie"."~0.9.15" =
     self.by-version."tough-cookie"."0.9.15";
   by-version."tough-cookie"."0.9.15" = lib.makeOverridable self.buildNodePackage {
-    name = "tough-cookie-0.9.15";
+    name = "node-tough-cookie-0.9.15";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz";
@@ -14371,7 +14371,7 @@
   by-spec."transformers"."2.1.0" =
     self.by-version."transformers"."2.1.0";
   by-version."transformers"."2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "transformers-2.1.0";
+    name = "node-transformers-2.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz";
@@ -14393,7 +14393,7 @@
   by-spec."traverse".">=0.3.0 <0.4" =
     self.by-version."traverse"."0.3.9";
   by-version."traverse"."0.3.9" = lib.makeOverridable self.buildNodePackage {
-    name = "traverse-0.3.9";
+    name = "node-traverse-0.3.9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz";
@@ -14412,7 +14412,7 @@
   by-spec."truncate"."~1.0.2" =
     self.by-version."truncate"."1.0.2";
   by-version."truncate"."1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "truncate-1.0.2";
+    name = "node-truncate-1.0.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/truncate/-/truncate-1.0.2.tgz";
@@ -14431,7 +14431,7 @@
   by-spec."tunnel-agent"."~0.2.0" =
     self.by-version."tunnel-agent"."0.2.0";
   by-version."tunnel-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "tunnel-agent-0.2.0";
+    name = "node-tunnel-agent-0.2.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz";
@@ -14450,7 +14450,7 @@
   by-spec."tunnel-agent"."~0.3.0" =
     self.by-version."tunnel-agent"."0.3.0";
   by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "tunnel-agent-0.3.0";
+    name = "node-tunnel-agent-0.3.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
@@ -14469,7 +14469,7 @@
   by-spec."type-detect"."0.1.1" =
     self.by-version."type-detect"."0.1.1";
   by-version."type-detect"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "type-detect-0.1.1";
+    name = "node-type-detect-0.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz";
@@ -14488,7 +14488,7 @@
   by-spec."typechecker"."~2.0.1" =
     self.by-version."typechecker"."2.0.8";
   by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage {
-    name = "typechecker-2.0.8";
+    name = "node-typechecker-2.0.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz";
@@ -14617,7 +14617,7 @@
   by-spec."uglify-to-browserify"."~1.0.0" =
     self.by-version."uglify-to-browserify"."1.0.1";
   by-version."uglify-to-browserify"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "uglify-to-browserify-1.0.1";
+    name = "node-uglify-to-browserify-1.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.1.tgz";
@@ -14636,7 +14636,7 @@
   by-spec."uid-number"."0" =
     self.by-version."uid-number"."0.0.3";
   by-version."uid-number"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "uid-number-0.0.3";
+    name = "node-uid-number-0.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz";
@@ -14655,7 +14655,7 @@
   by-spec."uid2"."0.0.3" =
     self.by-version."uid2"."0.0.3";
   by-version."uid2"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "uid2-0.0.3";
+    name = "node-uid2-0.0.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz";
@@ -14674,7 +14674,7 @@
   by-spec."underscore"."*" =
     self.by-version."underscore"."1.5.2";
   by-version."underscore"."1.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "underscore-1.5.2";
+    name = "node-underscore-1.5.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz";
@@ -14694,7 +14694,7 @@
   by-spec."underscore"."1.4.x" =
     self.by-version."underscore"."1.4.4";
   by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "underscore-1.4.4";
+    name = "node-underscore-1.4.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
@@ -14731,7 +14731,7 @@
   by-spec."underscore.string"."~2.2.1" =
     self.by-version."underscore.string"."2.2.1";
   by-version."underscore.string"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "underscore.string-2.2.1";
+    name = "node-underscore.string-2.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz";
@@ -14750,7 +14750,7 @@
   by-spec."underscore.string"."~2.3.1" =
     self.by-version."underscore.string"."2.3.3";
   by-version."underscore.string"."2.3.3" = lib.makeOverridable self.buildNodePackage {
-    name = "underscore.string-2.3.3";
+    name = "node-underscore.string-2.3.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
@@ -14771,7 +14771,7 @@
   by-spec."unfunk-diff"."~0.0.1" =
     self.by-version."unfunk-diff"."0.0.2";
   by-version."unfunk-diff"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "unfunk-diff-0.0.2";
+    name = "node-unfunk-diff-0.0.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/unfunk-diff/-/unfunk-diff-0.0.2.tgz";
@@ -14843,7 +14843,7 @@
   by-spec."update-notifier"."~0.1.3" =
     self.by-version."update-notifier"."0.1.7";
   by-version."update-notifier"."0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "update-notifier-0.1.7";
+    name = "node-update-notifier-0.1.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.7.tgz";
@@ -14868,7 +14868,7 @@
   by-spec."useragent"."~2.0.4" =
     self.by-version."useragent"."2.0.7";
   by-version."useragent"."2.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "useragent-2.0.7";
+    name = "node-useragent-2.0.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/useragent/-/useragent-2.0.7.tgz";
@@ -14888,7 +14888,7 @@
   by-spec."util"."0.10.2" =
     self.by-version."util"."0.10.2";
   by-version."util"."0.10.2" = lib.makeOverridable self.buildNodePackage {
-    name = "util-0.10.2";
+    name = "node-util-0.10.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/util/-/util-0.10.2.tgz";
@@ -14908,7 +14908,7 @@
   by-spec."util"."0.4.9" =
     self.by-version."util"."0.4.9";
   by-version."util"."0.4.9" = lib.makeOverridable self.buildNodePackage {
-    name = "util-0.4.9";
+    name = "node-util-0.4.9";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/util/-/util-0.4.9.tgz";
@@ -14928,7 +14928,7 @@
   by-spec."utile"."0.1.x" =
     self.by-version."utile"."0.1.7";
   by-version."utile"."0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "utile-0.1.7";
+    name = "node-utile-0.1.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz";
@@ -14953,7 +14953,7 @@
   by-spec."utile"."0.2.1" =
     self.by-version."utile"."0.2.1";
   by-version."utile"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "utile-0.2.1";
+    name = "node-utile-0.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/utile/-/utile-0.2.1.tgz";
@@ -14984,7 +14984,7 @@
   by-spec."uuid"."1.4.1" =
     self.by-version."uuid"."1.4.1";
   by-version."uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "uuid-1.4.1";
+    name = "node-uuid-1.4.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/uuid/-/uuid-1.4.1.tgz";
@@ -15005,7 +15005,7 @@
   by-spec."validator"."0.4.x" =
     self.by-version."validator"."0.4.28";
   by-version."validator"."0.4.28" = lib.makeOverridable self.buildNodePackage {
-    name = "validator-0.4.28";
+    name = "node-validator-0.4.28";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/validator/-/validator-0.4.28.tgz";
@@ -15024,7 +15024,7 @@
   by-spec."vargs"."~0.1.0" =
     self.by-version."vargs"."0.1.0";
   by-version."vargs"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "vargs-0.1.0";
+    name = "node-vargs-0.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz";
@@ -15043,7 +15043,7 @@
   by-spec."vasync"."1.3.3" =
     self.by-version."vasync"."1.3.3";
   by-version."vasync"."1.3.3" = lib.makeOverridable self.buildNodePackage {
-    name = "vasync-1.3.3";
+    name = "node-vasync-1.3.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/vasync/-/vasync-1.3.3.tgz";
@@ -15064,7 +15064,7 @@
   by-spec."verror"."1.1.0" =
     self.by-version."verror"."1.1.0";
   by-version."verror"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "verror-1.1.0";
+    name = "node-verror-1.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/verror/-/verror-1.1.0.tgz";
@@ -15084,7 +15084,7 @@
   by-spec."verror"."1.3.3" =
     self.by-version."verror"."1.3.3";
   by-version."verror"."1.3.3" = lib.makeOverridable self.buildNodePackage {
-    name = "verror-1.3.3";
+    name = "node-verror-1.3.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/verror/-/verror-1.3.3.tgz";
@@ -15104,7 +15104,7 @@
   by-spec."verror"."1.3.6" =
     self.by-version."verror"."1.3.6";
   by-version."verror"."1.3.6" = lib.makeOverridable self.buildNodePackage {
-    name = "verror-1.3.6";
+    name = "node-verror-1.3.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
@@ -15124,7 +15124,7 @@
   by-spec."view-helpers"."*" =
     self.by-version."view-helpers"."0.1.4";
   by-version."view-helpers"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "view-helpers-0.1.4";
+    name = "node-view-helpers-0.1.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.4.tgz";
@@ -15165,7 +15165,7 @@
   by-spec."walk"."*" =
     self.by-version."walk"."2.3.1";
   by-version."walk"."2.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "walk-2.3.1";
+    name = "node-walk-2.3.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/walk/-/walk-2.3.1.tgz";
@@ -15186,7 +15186,7 @@
   by-spec."walk"."~2.2.1" =
     self.by-version."walk"."2.2.1";
   by-version."walk"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "walk-2.2.1";
+    name = "node-walk-2.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/walk/-/walk-2.2.1.tgz";
@@ -15206,7 +15206,7 @@
   by-spec."watch"."0.5.x" =
     self.by-version."watch"."0.5.1";
   by-version."watch"."0.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "watch-0.5.1";
+    name = "node-watch-0.5.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/watch/-/watch-0.5.1.tgz";
@@ -15225,7 +15225,7 @@
   by-spec."watch"."~0.8.0" =
     self.by-version."watch"."0.8.0";
   by-version."watch"."0.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "watch-0.8.0";
+    name = "node-watch-0.8.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/watch/-/watch-0.8.0.tgz";
@@ -15297,7 +15297,7 @@
   by-spec."websocket-driver".">=0.3.0" =
     self.by-version."websocket-driver"."0.3.2";
   by-version."websocket-driver"."0.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "websocket-driver-0.3.2";
+    name = "node-websocket-driver-0.3.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.2.tgz";
@@ -15318,7 +15318,7 @@
   by-spec."when"."~2.2.1" =
     self.by-version."when"."2.2.1";
   by-version."when"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "when-2.2.1";
+    name = "node-when-2.2.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/when/-/when-2.2.1.tgz";
@@ -15383,7 +15383,7 @@
   by-spec."winston"."*" =
     self.by-version."winston"."0.7.2";
   by-version."winston"."0.7.2" = lib.makeOverridable self.buildNodePackage {
-    name = "winston-0.7.2";
+    name = "node-winston-0.7.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz";
@@ -15410,7 +15410,7 @@
   by-spec."winston"."0.6.2" =
     self.by-version."winston"."0.6.2";
   by-version."winston"."0.6.2" = lib.makeOverridable self.buildNodePackage {
-    name = "winston-0.6.2";
+    name = "node-winston-0.6.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
@@ -15442,7 +15442,7 @@
   by-spec."wiredep"."~0.4.2" =
     self.by-version."wiredep"."0.4.2";
   by-version."wiredep"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "wiredep-0.4.2";
+    name = "node-wiredep-0.4.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/wiredep/-/wiredep-0.4.2.tgz";
@@ -15463,7 +15463,7 @@
   by-spec."with"."~1.1.0" =
     self.by-version."with"."1.1.1";
   by-version."with"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "with-1.1.1";
+    name = "node-with-1.1.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/with/-/with-1.1.1.tgz";
@@ -15483,7 +15483,7 @@
   by-spec."with"."~2.0.0" =
     self.by-version."with"."2.0.0";
   by-version."with"."2.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "with-2.0.0";
+    name = "node-with-2.0.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/with/-/with-2.0.0.tgz";
@@ -15503,7 +15503,7 @@
   by-spec."wordwrap"."0.0.x" =
     self.by-version."wordwrap"."0.0.2";
   by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "wordwrap-0.0.2";
+    name = "node-wordwrap-0.0.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
@@ -15526,7 +15526,7 @@
   by-spec."wrench"."~1.4.3" =
     self.by-version."wrench"."1.4.4";
   by-version."wrench"."1.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "wrench-1.4.4";
+    name = "node-wrench-1.4.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/wrench/-/wrench-1.4.4.tgz";
@@ -15545,7 +15545,7 @@
   by-spec."wrench"."~1.5.0" =
     self.by-version."wrench"."1.5.6";
   by-version."wrench"."1.5.6" = lib.makeOverridable self.buildNodePackage {
-    name = "wrench-1.5.6";
+    name = "node-wrench-1.5.6";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/wrench/-/wrench-1.5.6.tgz";
@@ -15589,7 +15589,7 @@
   by-spec."wu"."*" =
     self.by-version."wu"."0.1.8";
   by-version."wu"."0.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "wu-0.1.8";
+    name = "node-wu-0.1.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/wu/-/wu-0.1.8.tgz";
@@ -15609,7 +15609,7 @@
   by-spec."x509"."*" =
     self.by-version."x509"."0.0.7";
   by-version."x509"."0.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "x509-0.0.7";
+    name = "node-x509-0.0.7";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/x509/-/x509-0.0.7.tgz";
@@ -15629,7 +15629,7 @@
   by-spec."xml2js"."0.2.4" =
     self.by-version."xml2js"."0.2.4";
   by-version."xml2js"."0.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "xml2js-0.2.4";
+    name = "node-xml2js-0.2.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz";
@@ -15649,7 +15649,7 @@
   by-spec."xml2js"."0.2.x" =
     self.by-version."xml2js"."0.2.8";
   by-version."xml2js"."0.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "xml2js-0.2.8";
+    name = "node-xml2js-0.2.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz";
@@ -15669,7 +15669,7 @@
   by-spec."xml2js".">= 0.0.1" =
     self.by-version."xml2js"."0.4.1";
   by-version."xml2js"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "xml2js-0.4.1";
+    name = "node-xml2js-0.4.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.1.tgz";
@@ -15692,7 +15692,7 @@
   by-spec."xmlbuilder"."0.4.2" =
     self.by-version."xmlbuilder"."0.4.2";
   by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "xmlbuilder-0.4.2";
+    name = "node-xmlbuilder-0.4.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
@@ -15711,7 +15711,7 @@
   by-spec."xmlbuilder".">=0.4.2" =
     self.by-version."xmlbuilder"."2.1.0";
   by-version."xmlbuilder"."2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "xmlbuilder-2.1.0";
+    name = "node-xmlbuilder-2.1.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.1.0.tgz";
@@ -15731,7 +15731,7 @@
   by-spec."xmldom"."~0.1.16" =
     self.by-version."xmldom"."0.1.19";
   by-version."xmldom"."0.1.19" = lib.makeOverridable self.buildNodePackage {
-    name = "xmldom-0.1.19";
+    name = "node-xmldom-0.1.19";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz";
@@ -15750,7 +15750,7 @@
   by-spec."xmlhttprequest"."1.4.2" =
     self.by-version."xmlhttprequest"."1.4.2";
   by-version."xmlhttprequest"."1.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "xmlhttprequest-1.4.2";
+    name = "node-xmlhttprequest-1.4.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz";
@@ -15769,7 +15769,7 @@
   by-spec."xoauth2"."~0.1" =
     self.by-version."xoauth2"."0.1.8";
   by-version."xoauth2"."0.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "xoauth2-0.1.8";
+    name = "node-xoauth2-0.1.8";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz";
@@ -15788,7 +15788,7 @@
   by-spec."xtend"."~2.1.1" =
     self.by-version."xtend"."2.1.2";
   by-version."xtend"."2.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "xtend-2.1.2";
+    name = "node-xtend-2.1.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz";
@@ -15808,7 +15808,7 @@
   by-spec."yaml"."0.2.3" =
     self.by-version."yaml"."0.2.3";
   by-version."yaml"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "yaml-0.2.3";
+    name = "node-yaml-0.2.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/yaml/-/yaml-0.2.3.tgz";
@@ -15827,7 +15827,7 @@
   by-spec."yeoman-generator"."~0.13.0" =
     self.by-version."yeoman-generator"."0.13.4";
   by-version."yeoman-generator"."0.13.4" = lib.makeOverridable self.buildNodePackage {
-    name = "yeoman-generator-0.13.4";
+    name = "node-yeoman-generator-0.13.4";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.4.tgz";
@@ -15866,7 +15866,7 @@
   by-spec."yeoman-generator"."~0.14.0" =
     self.by-version."yeoman-generator"."0.14.2";
   by-version."yeoman-generator"."0.14.2" = lib.makeOverridable self.buildNodePackage {
-    name = "yeoman-generator-0.14.2";
+    name = "node-yeoman-generator-0.14.2";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.14.2.tgz";
@@ -15906,7 +15906,7 @@
   by-spec."yeoman-generator"."~0.16.0" =
     self.by-version."yeoman-generator"."0.16.0";
   by-version."yeoman-generator"."0.16.0" = lib.makeOverridable self.buildNodePackage {
-    name = "yeoman-generator-0.16.0";
+    name = "node-yeoman-generator-0.16.0";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.16.0.tgz";
@@ -15984,7 +15984,7 @@
   by-spec."zeparser"."0.0.5" =
     self.by-version."zeparser"."0.0.5";
   by-version."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "zeparser-0.0.5";
+    name = "node-zeparser-0.0.5";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz";
@@ -16003,7 +16003,7 @@
   by-spec."zip-stream"."~0.1.0" =
     self.by-version."zip-stream"."0.1.3";
   by-version."zip-stream"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "zip-stream-0.1.3";
+    name = "node-zip-stream-0.1.3";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.1.3.tgz";
@@ -16024,7 +16024,7 @@
   by-spec."zlib-browserify"."0.0.1" =
     self.by-version."zlib-browserify"."0.0.1";
   by-version."zlib-browserify"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "zlib-browserify-0.0.1";
+    name = "node-zlib-browserify-0.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.1.tgz";
-- 
GitLab


From f2210651eb5bb01a46a64c565d2cf3faf74d6f55 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 17:28:12 -0500
Subject: [PATCH 0853/3789] Revert "Hide nodePackages from nix-env"

Now node packages that aren't just programs have a node- prefix in their
names.

This reverts commit 2f11bc495b50c36c1984f334df6867c1b9200a91.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 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 4d1a6dadbb7..cca8cd32368 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1253,11 +1253,11 @@ let
 
   nodejs = callPackage ../development/web/nodejs {};
 
-  nodePackages = import ./node-packages.nix {
+  nodePackages = recurseIntoAttrs (import ./node-packages.nix {
     inherit pkgs stdenv nodejs fetchurl fetchgit;
     neededNatives = [python] ++ lib.optional (lib.elem system lib.platforms.linux) utillinux;
     self = pkgs.nodePackages;
-  };
+  });
 
   ldapvi = callPackage ../tools/misc/ldapvi { };
 
-- 
GitLab


From b5720518828a0d64f1c2a52aed893fa7b4369315 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Mon, 3 Feb 2014 13:42:30 -0430
Subject: [PATCH 0854/3789] mlton: fix build with latest version.

---
 pkgs/development/compilers/mlton/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index 47c4404a818..4bd05301ecf 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp }:
+{ stdenv, fetchurl, patchelf, gmp }:
 
 let
   version = "20130715";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   sourceRoot = name;
 
-  buildInputs = [ gmp ];
+  buildInputs = [ patchelf gmp ];
 
   makeFlags = [ "all-no-docs" ];
 
@@ -54,6 +54,15 @@ stdenv.mkDerivation rec {
     chmod u+x $(pwd)/../usr/bin/mllex
     chmod u+x $(pwd)/../usr/bin/mlyacc
     chmod u+x $(pwd)/../usr/bin/mlton
+
+    # So the builder runs the binary compiler with gmp.
+    export LD_LIBRARY_PATH=${gmp}/lib:$LD_LIBRARY_PATH
+
+    # Patch ELF interpreter.
+    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $(pwd)/../usr/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
+    done
   '';
 
   doCheck = true;
-- 
GitLab


From 1739fcf61273e6331df87711fb2bf6f86f632126 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Mon, 3 Feb 2014 15:50:23 -0430
Subject: [PATCH 0855/3789] pure: The pure interpreter does not now build with
 llvm 3.4 on linux.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cca8cd32368..17c57cc54e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3206,7 +3206,9 @@ let
 
   polyml = callPackage ../development/compilers/polyml { };
 
-  pure = callPackage ../development/interpreters/pure {};
+  pure = callPackage ../development/interpreters/pure {
+    llvm = llvm_33 ;
+  };
 
   python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { });
   python33 = callPackage ../development/interpreters/python/3.3 { };
-- 
GitLab


From e1b422d348d2584a3e96138536b5979aee1dd5fd Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Mon, 3 Feb 2014 15:34:34 -0430
Subject: [PATCH 0856/3789] Update perl CPAN GraphViz package to work with
 latest graphviz.

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9e609af514b..0041d7dbd58 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3712,10 +3712,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   GraphViz = buildPerlPackage rec {
-    name = "GraphViz-2.04";
+    name = "GraphViz-2.15";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/L/LB/LBROCARD/${name}.tar.gz";
-      sha256 = "1gxpajd49pb9w9ka7nq5477my8snp3myrgiarnk6hj922jpn62xd";
+      url = "mirror://cpan/authors/id/R/RS/RSAVAGE/${name}.tgz";
+      sha256 = "0ngm90vd1ymrm2c9k4dbgzpbip501gklll32l9jsj8j00x845iz2";
     };
 
     # XXX: It'd be nicer it `GraphViz.pm' could record the path to graphviz.
-- 
GitLab


From 5e72e36f95404fe4045e20a7fb5bf8394c177c65 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 17:41:06 -0500
Subject: [PATCH 0857/3789] gummiboot-builder.py: Remove old entries before
 adding new ones

Fixes #1483

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../boot/loader/gummiboot/gummiboot-builder.py     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py b/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py
index 9ea224b51f6..f49c55c7e95 100644
--- a/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py
+++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py
@@ -9,7 +9,6 @@ import tempfile
 import errno
 
 def copy_if_not_exists(source, dest):
-    known_paths.append(dest)
     if not os.path.exists(dest):
         shutil.copyfile(source, dest)
 
@@ -38,12 +37,13 @@ def write_loader_conf(generation):
         print >> f, "default nixos-generation-%d" % (generation)
     os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf")
 
-def copy_from_profile(generation, name):
+def copy_from_profile(generation, name, dry_run=False):
     store_file_path = os.readlink("%s/%s" % (system_dir(generation), name))
     suffix = os.path.basename(store_file_path)
     store_dir = os.path.basename(os.path.dirname(store_file_path))
     efi_file_path = "/efi/nixos/%s-%s.efi" % (store_dir, suffix)
-    copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path))
+    if not dry_run:
+        copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path))
     return efi_file_path
 
 def add_entry(generation):
@@ -72,6 +72,10 @@ def get_generations(profile):
 def remove_old_entries(gens):
     slice_start = len("@efiSysMountPoint@/loader/entries/nixos-generation-")
     slice_end = -1 * len(".conf")
+    known_paths = []
+    for gen in gens:
+        known_paths.append copy_from_profile(gen, "kernel", True)
+        known_paths.append copy_from_profile(gen, "initrd", True)
     for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos-generation-[1-9]*.conf"):
         try:
             gen = int(path[slice_start:slice_end])
@@ -94,7 +98,6 @@ if os.getenv("NIXOS_INSTALL_GRUB") == "1":
     else:
         subprocess.check_call(["@gummiboot@/bin/gummiboot", "--path=@efiSysMountPoint@", "--no-variables", "install"])
 
-known_paths = []
 mkdir_p("@efiSysMountPoint@/efi/nixos")
 mkdir_p("@efiSysMountPoint@/loader/entries")
 try:
@@ -106,9 +109,8 @@ except IOError as e:
     machine_id = None
 
 gens = get_generations("system")
+remove_old_entries(gens)
 for gen in gens:
     add_entry(gen)
     if os.readlink(system_dir(gen)) == args.default_config:
         write_loader_conf(gen)
-
-remove_old_entries(gens)
-- 
GitLab


From d451d12128e17ef015e08bad566eac8755ebc44d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 3 Feb 2014 23:15:25 +0100
Subject: [PATCH 0858/3789] ntp: Update to 4.2.6p5

---
 pkgs/tools/networking/ntp/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index a3b347f6423..465f15184f1 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -1,24 +1,26 @@
-{stdenv, fetchurl, libcap}:
+{ stdenv, fetchurl, libcap }:
 
 assert stdenv.isLinux -> libcap != null;
- 
+
 stdenv.mkDerivation rec {
-  name = "ntp-4.2.6p4";
-  
+  name = "ntp-4.2.6p5";
+
   src = fetchurl {
     url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
-    sha256 = "1ww1hpy0yfmj13vs46d80hs48hy8ig6kn6p6d8q2syym02khxhyy";
+    sha256 = "077r69a41hasl8zf5c44km7cqgfhrkaj6a4jnr75j7nkz5qq7ayn";
   };
-  
+
   configureFlags = ''
     --without-crypto
     ${if stdenv.isLinux then "--enable-linuxcaps" else ""}
   '';
-  
+
   buildInputs = stdenv.lib.optional stdenv.isLinux libcap;
 
   meta = {
     homepage = http://www.ntp.org/;
     description = "An implementation of the Network Time Protocol";
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From 9e7fe29e416736bf2be5aeaf7adbad05d4e175cf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 3 Feb 2014 23:41:35 +0100
Subject: [PATCH 0859/3789] ntpd: Don't answer status queries

Workaround for CVE-2013-5211:

http://support.ntp.org/bin/view/Main/SecurityNotice#DRDoS_Amplification_Attack_using
---
 nixos/modules/services/networking/ntpd.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix
index e5e164021d3..cdab789cd28 100644
--- a/nixos/modules/services/networking/ntpd.nix
+++ b/nixos/modules/services/networking/ntpd.nix
@@ -15,6 +15,9 @@ let
     # chroot to ${stateDir}, we have to specify it as /ntp.drift.
     driftfile /ntp.drift
 
+    restrict default kod nomodify notrap nopeer noquery
+    restrict -6 default kod nomodify notrap nopeer noquery
+
     ${toString (map (server: "server " + server + " iburst\n") config.services.ntp.servers)}
   '';
 
-- 
GitLab


From 34638ebc1eaf7f43bf5902d16270d21894e45ec1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 3 Feb 2014 23:43:54 +0100
Subject: [PATCH 0860/3789] cleanSource: Support Mercurial

---
 lib/sources.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sources.nix b/lib/sources.nix
index 6f8554d340b..8d259c0837e 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -10,7 +10,7 @@ rec {
   cleanSource =
     let filter = name: type: let baseName = baseNameOf (toString name); in ! (
       # Filter out Subversion and CVS directories.
-      (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS")) ||
+      (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) ||
       # Filter out backup files.
       (lib.hasSuffix "~" baseName)
     );
-- 
GitLab


From 9cf29b7039fd31abda8c46b3f5807df1c12d6446 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 18:10:38 -0500
Subject: [PATCH 0861/3789] llvm: Propagate ncurses and zlib

Really shouldn't be needed with shared libs, should patch llvm-config

Fixes #1601

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/compilers/llvm/3.4/llvm.nix                | 3 +++
 pkgs/development/libraries/haskell/llvm-general/default.nix | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 45c8b84178c..d93bd4aba19 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -10,6 +10,7 @@
 , valgrind
 , ncurses
 , version
+, zlib
 }:
 
 let
@@ -27,6 +28,8 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ perl groff cmake libxml2 python libffi ncurses ] ++ stdenv.lib.optional stdenv.isLinux valgrind;
 
+  propagatedBuildInputs = [ ncurses zlib ];
+
   # hacky fix: created binaries need to be run before installation
   preBuild = ''
     mkdir -p $out/
diff --git a/pkgs/development/libraries/haskell/llvm-general/default.nix b/pkgs/development/libraries/haskell/llvm-general/default.nix
index ef4677a2ffc..3206493eee3 100644
--- a/pkgs/development/libraries/haskell/llvm-general/default.nix
+++ b/pkgs/development/libraries/haskell/llvm-general/default.nix
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
     HUnit llvmGeneralPure mtl QuickCheck testFramework
     testFrameworkHunit testFrameworkQuickcheck2
   ];
-  buildTools = [ llvmConfig ncurses zlib ];
+  buildTools = [ llvmConfig ];
   doCheck = false;
   meta = {
     description = "General purpose LLVM bindings";
-- 
GitLab


From b47609410b00796d4ce7644cce2b5975025f2dc7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 18:14:27 -0500
Subject: [PATCH 0862/3789] ats: unmaintain

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/compilers/ats2/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index 074fc4f334f..0f46b7aeb6d 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -14,6 +14,5 @@ let version = "0.0.3"; in stdenv.mkDerivation {
     description = "A statically typed programming language that unifies implementation with formal specification";
     homepage = http://www.ats-lang.org/;
     license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
-- 
GitLab


From eb4e04c24f6e7c07edaaa1243157420b336aff89 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 18:14:52 -0500
Subject: [PATCH 0863/3789] gcc-4.6: unmaintain

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/compilers/gcc/4.6/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
index 796fc8fde53..3ed0f7ad0e6 100644
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -456,7 +456,6 @@ stdenv.mkDerivation ({
     maintainers = [
       stdenv.lib.maintainers.ludo
       stdenv.lib.maintainers.viric
-      stdenv.lib.maintainers.shlevy
     ];
 
     # Volunteers needed for the {Cyg,Dar}win ports of *PPL.
-- 
GitLab


From dc4c049f3cbd5269fa2925b472d0ce70e648cf25 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 18:16:10 -0500
Subject: [PATCH 0864/3789] Remove refind

We never used it in NixOS

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/tools/misc/refind/default.nix | 34 ------------------------------
 pkgs/top-level/all-packages.nix    |  2 --
 2 files changed, 36 deletions(-)
 delete mode 100644 pkgs/tools/misc/refind/default.nix

diff --git a/pkgs/tools/misc/refind/default.nix b/pkgs/tools/misc/refind/default.nix
deleted file mode 100644
index 6f4e031e441..00000000000
--- a/pkgs/tools/misc/refind/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, gnu-efi, unzip }:
-
-let version = "0.4.5"; in
-
-stdenv.mkDerivation {
-  name = "refind-${version}";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/refind/refind-src-${version}.zip";
-    sha256 = "05nbalsl5csgph0v2amzgay9k2vzm47z8n1n6blbh9hvb7j5vn2c";
-  };
-
-  buildInputs = [ unzip ];
-
-  buildFlags = [ "prefix=" "EFIINC=${gnu-efi}/include/efi" "GNUEFILIB=${gnu-efi}/lib" "EFILIB=${gnu-efi}/lib" "EFICRT0=${gnu-efi}/lib" "LOCAL_CFLAGS=-I${gnu-efi}/include" ];
-
-  installPhase = ''
-    mkdir -pv $out
-    install -v -m644 refind/refind*.efi refind.conf-sample $out
-    mv -v icons $out
-  '';
-
-  meta = {
-    description = "An EFI boot manager";
-
-    homepage = http://www.rodsbooks.com/refind/;
-
-    license = "GPLv3+";
-
-    maintainers = with stdenv.lib.maintainers; [ shlevy ];
-
-    platforms = [ "i686-linux" "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17c57cc54e7..7c14a91e489 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1742,8 +1742,6 @@ let
 
   recoll = callPackage ../applications/search/recoll { };
 
-  refind = callPackage ../tools/misc/refind { };
-
   reiser4progs = callPackage ../tools/filesystems/reiser4progs { };
 
   reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { };
-- 
GitLab


From 72b5403ee8434bc6dca570740897d4641bf24db4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 18:32:21 -0500
Subject: [PATCH 0865/3789] edk2/OVMF: Update

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/applications/virtualization/OVMF/default.nix |  2 +-
 pkgs/development/compilers/edk2/default.nix       | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index e6d0b7cb40d..54d697d4275 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -12,7 +12,7 @@ let
 in
 
 stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
-  name = "OVMF-2012-10-09";
+  name = "OVMF-2014-02-01";
 
   unpackPhase = ''
     for file in \
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 3c2a4f779fd..9787d0da929 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -10,12 +10,12 @@ else
   throw "Unsupported architecture";
 
 edk2 = stdenv.mkDerivation {
-  name = "edk2-2013-10-09";
+  name = "edk2-2014-02-01";
   
   src = fetchgit {
     url = git://github.com/tianocore/edk2;
-    rev = "5bcb62a4098c9bde9be6af0833a025adc768e08d";
-    sha256 = "3e2958877061bf6bbfb28b150743d7244486929c1c320bdb1ff2586774aa042a";
+    rev = "2818c158de6a164d012e6afb0fc145656aed4e4b";
+    sha256 = "a756b5de3a3e71d82ce1de8c7832bc69d2affb98d704894b26540571f9f5e214";
   };
 
   buildInputs = [ libuuid pythonFull ];
@@ -47,10 +47,10 @@ edk2 = stdenv.mkDerivation {
       configurePhase = ''
         mkdir -v Conf
         sed -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' -e \
-          's|MYTOOLS|GCC46|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\
+          's|MYTOOLS|GCC48|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\
           < ${edk2}/BaseTools/Conf/target.template > Conf/target.txt
-        sed -e 's|DEFINE GCC46_IA32_PREFIX       = /usr/bin/|DEFINE GCC46_IA32_PREFIX       = ""|' \
-          -e 's|DEFINE GCC46_X64_PREFIX        = /usr/bin/|DEFINE GCC46_X64_PREFIX        = ""|' \
+        sed -e 's|DEFINE GCC48_IA32_PREFIX       = /usr/bin/|DEFINE GCC48_IA32_PREFIX       = ""|' \
+          -e 's|DEFINE GCC48_X64_PREFIX        = /usr/bin/|DEFINE GCC48_X64_PREFIX        = ""|' \
           -e 's|DEFINE UNIX_IASL_BIN           = /usr/bin/iasl|DEFINE UNIX_IASL_BIN           = ${iasl}/bin/iasl|' \
           < ${edk2}/BaseTools/Conf/tools_def.template > Conf/tools_def.txt
         export WORKSPACE="$PWD"
-- 
GitLab


From 3c9ed5b51a88d41742415245c9cbb2a32f1ff400 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 18:37:20 -0500
Subject: [PATCH 0866/3789] http-parser: Bump

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/libraries/http-parser/default.nix | 4 ++--
 pkgs/development/web/nodejs/default.nix            | 5 ++---
 pkgs/top-level/all-packages.nix                    | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index ca61a00f034..5ced635aa66 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, gyp, utillinux, python, fixDarwinDylibNames }:
 
 let
-  version = "2.1";
+  version = "2.2.1";
 in stdenv.mkDerivation {
   name = "http-parser-${version}";
 
   src = fetchurl {
     url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz";
-    sha256 = "16a2w5z4g2bma25fqcrkpidqzlq8a2jxkk93ajl721q85406j105";
+    sha256 = "0p8wmchqsj9kwa8pg2is7v0h83q5lqns3vnm6sxrld7gaz979zh5";
   };
 
   patches = [ ./build-shared.patch ];
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 7c10bcb51de..b54918a6994 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 }:
 
 let
   dtrace = runCommand "dtrace-native" {} ''
@@ -10,9 +10,8 @@ let
 
   # !!! Should we also do shared libuv?
   deps = {
-    inherit v8 openssl zlib;
+    inherit v8 openssl zlib http-parser;
     cares = c-ares;
-    http-parser = http_parser;
   };
 
   sharedConfigureFlags = name: [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c14a91e489..d4048429fdc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4447,7 +4447,7 @@ let
 
   hsqldb = callPackage ../development/libraries/java/hsqldb { };
 
-  http_parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; };
+  http-parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; };
 
   hunspell = callPackage ../development/libraries/hunspell { };
 
-- 
GitLab


From 41bbe377d31e35e93c98464b4253a67f810fe4c1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 18:38:01 -0500
Subject: [PATCH 0867/3789] libspotify: unmaintain

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/libraries/libspotify/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix
index 000112008a3..56d15cd1e80 100644
--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/pkgs/development/libraries/libspotify/default.nix
@@ -79,7 +79,7 @@ else stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Spotify API library";
     homepage    = https://developer.spotify.com/technologies/libspotify;
-    maintainers = with maintainers; [ lovek323 shlevy ];
+    maintainers = with maintainers; [ lovek323 ];
     license     = licenses.unfree;
   };
 }
-- 
GitLab


From bc6aa21b0510ba4df5a27ca4ff2927cb0ef1ee6b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 18:40:04 -0500
Subject: [PATCH 0868/3789] nodejs: Bump

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 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 b54918a6994..2c2d343838c 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.24";
+  version = "0.10.25";
 
   # !!! Should we also do shared libuv?
   deps = {
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "0yip81va8nd3kzj64385avcx7ck13a2xcdj3amzwnhk830rxf331";
+    sha256 = "0vxkyvl8hyhxxpkh96zws4j6i9f3ykqpqbrbvj0j0nj7snwz7vj6";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);
-- 
GitLab


From 608cee44cc8a4b0e08ba60fc1dfbcd758f0d0490 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 18:42:04 -0500
Subject: [PATCH 0869/3789] kmod: bump

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 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 acea2e4435c..378e1a87d07 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-15";
+  name = "kmod-16";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz";
-    sha256 = "17nasn7kpbmbcgyfn9lh50k00bg6qmccxrhzd2m4d6wjw6khxvz8";
+    sha256 = "63412efab37c70459ccef167556965c93fd4f56af5986cd3750542a684c613c5";
   };
 
   # Disable xz/zlib support to prevent needing them in the initrd.
-- 
GitLab


From a2b9ed2eaef767c150a36cabfce35ba85df23a71 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 18:48:05 -0500
Subject: [PATCH 0870/3789] gummiboot: bump

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/tools/misc/gummiboot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix
index 1098e9d0920..502d9044c5d 100644
--- a/pkgs/tools/misc/gummiboot/default.nix
+++ b/pkgs/tools/misc/gummiboot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gnu-efi, unzip, pkgconfig, utillinux, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
 
 stdenv.mkDerivation rec {
-  name = "gummiboot-38";
+  name = "gummiboot-43";
 
   buildInputs = [ gnu-efi pkgconfig libxslt utillinux ];
 
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-38.tar.xz/0504791387e1998bf2075728c237f27e/gummiboot-38.tar.xz;
-    sha256 = "1aid2a29ym8dqldxpcihnrls7vrr9ijbla3dad0r8qwkca43d4lm";
+    url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-43.tar.xz/c9b46a3504a2f7e335404a1475818d98/gummiboot-43.tar.xz;
+    sha256 = "1hwaan3985ap9r5ncf9bykbaixbm0xn4x09silssngwfl2srn4iv";
   };
 
   meta = {
-- 
GitLab


From 5ac4f3dcf6d54cc322ff0581518eaa207c53c5f6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 18:54:25 -0500
Subject: [PATCH 0871/3789] llvm: Attempt to fix build on darwin

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/all-packages.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4048429fdc..bbae9a7946e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2798,7 +2798,13 @@ let
       else stdenv;
   };
 
-  llvmPackages = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { inherit newScope stdenv fetchurl; isl = isl_0_12; });
+  llvmPackages = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
+    inherit newScope fetchurl;
+    isl = isl_0_12;
+    stdenv = if stdenv.isDarwin
+      then stdenvAdapters.overrideGCC stdenv gccApple
+      else stdenv;
+  });
   llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; };
 
   mentorToolchains = recurseIntoAttrs (
-- 
GitLab


From bd996abc9cac2c68008dc6a95a3897486fa154d8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 18:56:27 -0500
Subject: [PATCH 0872/3789] Haskell packages don't mix default.nix and
 <version>.nix in the same directory

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../haskell/llvm-general-pure/{default.nix => 3.4.nix}        | 0
 .../libraries/haskell/llvm-general/{default.nix => 3.4.nix}   | 0
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/haskell/llvm-general-pure/{default.nix => 3.4.nix} (100%)
 rename pkgs/development/libraries/haskell/llvm-general/{default.nix => 3.4.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/default.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/llvm-general-pure/default.nix
rename to pkgs/development/libraries/haskell/llvm-general-pure/3.4.nix
diff --git a/pkgs/development/libraries/haskell/llvm-general/default.nix b/pkgs/development/libraries/haskell/llvm-general/3.4.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/llvm-general/default.nix
rename to pkgs/development/libraries/haskell/llvm-general/3.4.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 783b868f804..105799eaf35 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1572,14 +1572,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     llvmGeneralPure = self.llvmGeneralPure_3_3;
   };
 
-  llvmGeneral = callPackage ../development/libraries/haskell/llvm-general {
+  llvmGeneral = callPackage ../development/libraries/haskell/llvm-general/3.4.nix {
     llvmConfig = pkgs.llvm;
     inherit (pkgs) zlib ncurses;
   };
 
   llvmGeneralPure_3_3 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.nix { };
 
-  llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {};
+  llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.nix {};
 
   lrucache = callPackage ../development/libraries/haskell/lrucache {};
 
-- 
GitLab


From 5d8ca218df9b90c07599f975dcfa8c8cf2a162e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 31 Jan 2014 10:02:00 +0100
Subject: [PATCH 0873/3789] upx: updating to 3.91.

---
 pkgs/tools/compression/upx/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix
index 2dd4d7eb794..283b751cf26 100644
--- a/pkgs/tools/compression/upx/default.nix
+++ b/pkgs/tools/compression/upx/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, ucl, zlib}:
 
 stdenv.mkDerivation {
-  name = "upx-3.09";
+  name = "upx-3.91";
   src = fetchurl {
-    url = mirror://sourceforge/upx/upx-3.09-src.tar.bz2;
-    sha256 = "16jwynharr1silfd6vlxl9i94fs8mg79qp72dr48r3wv9mlra6pn";
+    url = mirror://sourceforge/upx/upx-3.91-src.tar.bz2;
+    sha256 = "0g3aiinlcb37z1xhs202h2qrgbf8dygiyarmflbgahcq89byfz2j";
   };
 
   buildInputs = [ ucl zlib ];
-- 
GitLab


From 2ef5b4ec7c310dae141d07cc436885941471e028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 3 Feb 2014 14:08:26 +0100
Subject: [PATCH 0874/3789] Updating tox/toxic

---
 .../networking/instant-messengers/toxic/default.nix         | 6 +++---
 pkgs/development/libraries/libtoxcore/default.nix           | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index 59aef8c6c43..23b09cf8fa1 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -2,8 +2,8 @@
 , libtoxcore, pkgconfig }:
 
 let
-  version = "5570b7c98aa";
-  date = "20131112";
+  version = "da99d776df";
+  date = "20140203";
 in
 stdenv.mkDerivation rec {
   name = "toxic-${date}-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://github.com/Tox/toxic/tarball/${version}";
     name = "${name}.tar.gz";
-    sha256 = "02jfdp10qcw4w62qpra59m9yzzk7a3k2nypkbq5q7ydksbqlx8sj";
+    sha256 = "0d97crkslyk7sgcsawnnwyzp31azp80yprpd6xqjcraxd442dfyj";
   };
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index a3de6f99418..91f9e4f2f2b 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -2,8 +2,8 @@
 , libconfig, pkgconfig }:
 
 let
-  version = "18c98eb";
-  date = "20131112";
+  version = "dbe256cc82";
+  date = "20140203";
 in
 stdenv.mkDerivation rec {
   name = "tox-core-${date}-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://github.com/irungentoo/ProjectTox-Core/tarball/${version}";
     name = "${name}.tar.gz";
-    sha256 = "1g69fz9aspzsrlzlk6fpmjyyhb38v8mmp25nszlbra17n3f209yh";
+    sha256 = "0mqbwwqbm15p16ya8nlij23fgbafjdmnc44nm2vh47m8pyb119lc";
   };
 
   preConfigure = ''
-- 
GitLab


From 627c82b99112f8fff5fd94a213a24b0e4531f386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 3 Feb 2014 22:46:21 +0100
Subject: [PATCH 0875/3789] gcc 4.8: no need for the arm eabi patch.

---
 .../compilers/gcc/4.8/arm-eabi.patch          | 230 ------------------
 .../development/compilers/gcc/4.8/default.nix |   1 -
 2 files changed, 231 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc/4.8/arm-eabi.patch

diff --git a/pkgs/development/compilers/gcc/4.8/arm-eabi.patch b/pkgs/development/compilers/gcc/4.8/arm-eabi.patch
deleted file mode 100644
index 63b017062b5..00000000000
--- a/pkgs/development/compilers/gcc/4.8/arm-eabi.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-Index: gcc-4_7-branch/libstdc++-v3/configure.host
-===================================================================
---- gcc-4_7-branch/libstdc++-v3/configure.host	(revision 194579)
-+++ gcc-4_7-branch/libstdc++-v3/configure.host	(revision 194580)
-@@ -340,7 +340,7 @@
-         fi
-     esac
-     case "${host}" in
--      arm*-*-linux-*eabi)
-+      arm*-*-linux-*eabi*)
- 	port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
- 	;;
-     esac
-Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
-===================================================================
---- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	(revision 194579)
-+++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	(revision 194580)
-@@ -1,5 +1,5 @@
- // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
--// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
- 
- // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
- //
-Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
-===================================================================
---- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	(revision 194579)
-+++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	(revision 194580)
-@@ -1,5 +1,5 @@
- // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
--// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
- 
- // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
- //
-Index: gcc-4_7-branch/libjava/configure.ac
-===================================================================
---- gcc-4_7-branch/libjava/configure.ac	(revision 194579)
-+++ gcc-4_7-branch/libjava/configure.ac	(revision 194580)
-@@ -931,7 +931,7 @@
-     # on Darwin -single_module speeds up loading of the dynamic libraries.
-     extra_ldflags_libjava=-Wl,-single_module
-     ;;
--arm*linux*eabi)
-+arm*-*-linux*eabi*)
-     # Some of the ARM unwinder code is actually in libstdc++.  We
-     # could in principle replicate it in libgcj, but it's better to
-     # have a dependency on libstdc++.
-Index: gcc-4_7-branch/libjava/configure
-===================================================================
---- gcc-4_7-branch/libjava/configure	(revision 194579)
-+++ gcc-4_7-branch/libjava/configure	(revision 194580)
-@@ -20542,7 +20542,7 @@
-     # on Darwin -single_module speeds up loading of the dynamic libraries.
-     extra_ldflags_libjava=-Wl,-single_module
-     ;;
--arm*linux*eabi)
-+arm*-*-linux*eabi*)
-     # Some of the ARM unwinder code is actually in libstdc++.  We
-     # could in principle replicate it in libgcj, but it's better to
-     # have a dependency on libstdc++.
-Index: gcc-4_7-branch/libgcc/config.host
-===================================================================
---- gcc-4_7-branch/libgcc/config.host	(revision 194579)
-+++ gcc-4_7-branch/libgcc/config.host	(revision 194580)
-@@ -327,7 +327,7 @@
- arm*-*-linux*)			# ARM GNU/Linux with ELF
- 	tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix"
- 	case ${host} in
--	arm*-*-linux-*eabi)
-+	arm*-*-linux-*eabi*)
- 	  tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
- 	  tm_file="$tm_file arm/bpabi-lib.h"
- 	  unwind_header=config/arm/unwind-arm.h
-Index: gcc-4_7-branch/gcc/doc/install.texi
-===================================================================
---- gcc-4_7-branch/gcc/doc/install.texi	(revision 194579)
-+++ gcc-4_7-branch/gcc/doc/install.texi	(revision 194580)
-@@ -3222,7 +3222,7 @@
- @heading @anchor{arm-x-eabi}arm-*-eabi
- ARM-family processors.  Subtargets that use the ELF object format
- require GNU binutils 2.13 or newer.  Such subtargets include:
--@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi}
-+@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi*}
- and @code{arm-*-rtemseabi}.
- 
- @html
-Index: gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c
-===================================================================
---- gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c	(revision 194579)
-+++ gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c	(revision 194580)
-@@ -1,4 +1,4 @@
--/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi } } } */
-+/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi* } } } */
- 
- void *foo (void)
- {
-Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C
-===================================================================
---- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C	(revision 194579)
-+++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C	(revision 194580)
-@@ -7,10 +7,10 @@
- // enum-size attributes should only be emitted if there are values of
- // enum type that can escape the compilation unit, gcc cannot currently
- // detect this; if this facility is added then this linker option should
--// not be needed.  arm-*-linux*eabi should be a good approximation to
-+// not be needed.  arm-*-linux*eabi* should be a good approximation to
- // those platforms where the EABI supplement defines enum values to be
- // 32 bits wide.
--// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
- 
- #include <limits.h>
- 
-Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C
-===================================================================
---- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C	(revision 194579)
-+++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C	(revision 194580)
-@@ -9,10 +9,10 @@
- // enum-size attributes should only be emitted if there are values of
- // enum type that can escape the compilation unit, gcc cannot currently
- // detect this; if this facility is added then this linker option should
--// not be needed.  arm-*-linux*eabi should be a good approximation to
-+// not be needed.  arm-*-linux*eabi* should be a good approximation to
- // those platforms where the EABI supplement defines enum values to be
- // 32 bits wide.
--// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
- 
- enum E { 
-   a = -312
-Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C
-===================================================================
---- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C	(revision 194579)
-+++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C	(revision 194580)
-@@ -7,10 +7,10 @@
- // enum-size attributes should only be emitted if there are values of
- // enum type that can escape the compilation unit, gcc cannot currently
- // detect this; if this facility is added then this linker option should
--// not be needed.  arm-*-linux*eabi should be a good approximation to
-+// not be needed.  arm-*-linux*eabi* should be a good approximation to
- // those platforms where the EABI supplement defines enum values to be
- // 32 bits wide.
--// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
- 
- // GROUPS passed enums
-   extern "C" int printf (const char *, ...);
-Index: gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp
-===================================================================
---- gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp	(revision 194579)
-+++ gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp	(revision 194580)
-@@ -3818,7 +3818,7 @@
- 		}
- 	    } ""
- 	}]
--    } elseif { [istarget arm*-*-linux-gnueabi] } {
-+    } elseif { [istarget arm*-*-linux-gnueabi*] } {
- 	return [check_runtime sync_longlong_runtime {
- 	    #include <stdlib.h>
- 	    int main ()
-@@ -3860,7 +3860,7 @@
- 	     || [istarget i?86-*-*]
- 	     || [istarget x86_64-*-*]
- 	     || [istarget alpha*-*-*] 
--	     || [istarget arm*-*-linux-gnueabi] 
-+	     || [istarget arm*-*-linux-gnueabi*] 
- 	     || [istarget bfin*-*linux*]
- 	     || [istarget hppa*-*linux*]
- 	     || [istarget s390*-*-*] 
-@@ -3890,7 +3890,7 @@
- 	     || [istarget i?86-*-*]
- 	     || [istarget x86_64-*-*]
- 	     || [istarget alpha*-*-*] 
--	     || [istarget arm*-*-linux-gnueabi] 
-+	     || [istarget arm*-*-linux-gnueabi*] 
- 	     || [istarget hppa*-*linux*]
- 	     || [istarget s390*-*-*] 
- 	     || [istarget powerpc*-*-*]
-Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90
-===================================================================
---- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90	(revision 194579)
-+++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90	(revision 194580)
-@@ -1,6 +1,6 @@
- ! { dg-do run }
- ! { dg-options "-fshort-enums" }
--! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
- ! Program to test enumerations when option -fshort-enums is given
- 
- program main
-Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90
-===================================================================
---- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90	(revision 194579)
-+++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90	(revision 194580)
-@@ -1,7 +1,7 @@
- ! { dg-do run }
- ! { dg-additional-sources enum_10.c }
- ! { dg-options "-fshort-enums -w" }
--! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
- ! Make sure short enums are indeed interoperable with the
- ! corresponding C type.
- 
-Index: gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in
-===================================================================
---- gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in	(revision 194579)
-+++ gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in	(revision 194580)
-@@ -1866,7 +1866,7 @@
-   LIBRARY_VERSION := $(LIB_VERSION)
- endif
- 
--ifeq ($(strip $(filter-out arm% linux-gnueabi,$(arch) $(osys)-$(word 4,$(targ)))),)
-+ifeq ($(strip $(filter-out arm%-linux,$(arch)-$(osys)) $(if $(findstring eabi,$(word 4,$(targ))),,$(word 4,$(targ)))),)
-   LIBGNAT_TARGET_PAIRS = \
-   a-intnam.ads<a-intnam-linux.ads \
-   s-inmaop.adb<s-inmaop-posix.adb \
-Index: gcc-4_7-branch/gcc/config.gcc
-===================================================================
---- gcc-4_7-branch/gcc/config.gcc	(revision 194579)
-+++ gcc-4_7-branch/gcc/config.gcc	(revision 194580)
-@@ -855,7 +855,7 @@
- 	esac
- 	tmake_file="${tmake_file} arm/t-arm"
- 	case ${target} in
--	arm*-*-linux-*eabi)
-+	arm*-*-linux-*eabi*)
- 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
- 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
- 	    # Define multilib configuration for arm-linux-androideabi.
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index aa3bfa09d72..aea52593323 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -63,7 +63,6 @@ let version = "4.8.2";
     enableParallelBuilding = !profiledCompiler;
 
     patches = []
-      ++ optional stdenv.isArm ./arm-eabi.patch
       ++ optional enableParallelBuilding ./parallel-bconfig.patch
       ++ optional (cross != null) ./libstdc++-target.patch
       # ++ optional noSysDirs ./no-sys-dirs.patch
-- 
GitLab


From d2451cbce68b19396e0707984c9f911c6a381b16 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Tue, 4 Feb 2014 10:35:20 +0100
Subject: [PATCH 0876/3789] mercurialFull: update from 2.8.2 to 2.9

---
 pkgs/applications/version-management/mercurial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index fae0c6a5ed6..10283c171db 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -2,7 +2,7 @@
 , guiSupport ? false, tk ? null, curses }:
 
 let
-  name = "mercurial-2.8.2";
+  name = "mercurial-2.9";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "0vxyxx91k6z0knfqslbwxswbc52abrg2pdf395kwvij026ibm9f8";
+    sha256 = "08m6h2zxik4hcqb5qq3k2anwgjrf0p9kj77lvikcaw8rqmz06y3h";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
-- 
GitLab


From 5da2c77fbd61a8924028e06163d5a572fe81c590 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 4 Feb 2014 07:05:21 -0500
Subject: [PATCH 0877/3789] telepathy-farstream: Bump.

Hopefully fixes the tested job

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/libraries/telepathy/farstream/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix
index a6a624c0a87..e41bd9fdb02 100644
--- a/pkgs/development/libraries/telepathy/farstream/default.nix
+++ b/pkgs/development/libraries/telepathy/farstream/default.nix
@@ -2,12 +2,12 @@
 , pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-0.4.0";
+  name = "${pname}-0.6.0";
   pname = "telepathy-farstream";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
-    sha256 = "13mllgfx4b1hh1vpzq8lk5qfr3ivkkkmwbxgi6d47avgk746kznd";
+    sha256 = "04v414jij2ba71krk7vh4avsz07sfp5w38dmvjwig5isdygy0905";
   };
 
   buildInputs = [ gst_plugins_base gst_python pygobject ];
-- 
GitLab


From 741cc62f753704602fb988049d19fb3d8812f636 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 4 Feb 2014 08:43:45 -0500
Subject: [PATCH 0878/3789] Force a rebuild.

Sigh.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 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 7581c10a01d..564792a1a9d 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -238,7 +238,7 @@ in {
               "mkfs.ext3 -L nixos /dev/vda3",
               "mount LABEL=nixos /mnt",
               "mkfs.ext3 -L boot /dev/vda1",
-              "mkdir /mnt/boot",
+              "mkdir -p /mnt/boot",
               "mount LABEL=boot /mnt/boot",
           );
         '';
-- 
GitLab


From 351e0703664101e51874663a68aee8a772e07231 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 4 Feb 2014 15:47:03 +0100
Subject: [PATCH 0879/3789] Add emacs minor mode writegood

---
 .../editors/emacs-modes/writegood/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/writegood/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/writegood/default.nix b/pkgs/applications/editors/emacs-modes/writegood/default.nix
new file mode 100644
index 00000000000..c4dbde9e0d2
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/writegood/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, emacs}:
+
+let version = "1.2";
+
+in stdenv.mkDerivation {
+  name = "writegood-mode-${version}";
+  src = fetchurl {
+    url = "https://github.com/bnbeckwith/writegood-mode/archive/v${version}.tar.gz";
+    sha256 = "1kgi2i5pq0vk751z079yp7kdw721cclfg9d9p28h3a8xbr95l7b6";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs -L . --batch -f batch-byte-compile *.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "Emacs minor mode that aids in finding common writing problems";
+    homepage = https://github.com/bnbeckwith/writegood-mode;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.pSub ];
+    license = "GPL3";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1bc857e0202..dcb8785b7b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7751,6 +7751,8 @@ let
 
     sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { };
 
+    writeGood = callPackage ../applications/editors/emacs-modes/writegood { };
+
     xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { };
   };
 
-- 
GitLab


From 77451661d49ae6046a782857ff1200f5e8980a67 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 4 Feb 2014 16:21:22 +0100
Subject: [PATCH 0880/3789] Updated node packages

---
 pkgs/top-level/node-packages-generated.nix | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index e899df2e98e..4b242dc8416 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -7864,14 +7864,14 @@
     passthru.names = [ "libxmljs" ];
   };
   by-spec."libyaml"."*" =
-    self.by-version."libyaml"."0.2.2";
-  by-version."libyaml"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-libyaml-0.2.2";
+    self.by-version."libyaml"."0.2.3";
+  by-version."libyaml"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-libyaml-0.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.2.tgz";
-        name = "libyaml-0.2.2.tgz";
-        sha1 = "a22d5f699911b6b622d6dc323fb62320c877c9c8";
+        url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.3.tgz";
+        name = "libyaml-0.2.3.tgz";
+        sha1 = "c07e7fefcad6e09218ebf9ff814bbd520172add6";
       })
     ];
     buildInputs =
@@ -7882,7 +7882,7 @@
     ];
     passthru.names = [ "libyaml" ];
   };
-  "libyaml" = self.by-version."libyaml"."0.2.2";
+  "libyaml" = self.by-version."libyaml"."0.2.3";
   by-spec."lockfile"."~0.4.0" =
     self.by-version."lockfile"."0.4.2";
   by-version."lockfile"."0.4.2" = lib.makeOverridable self.buildNodePackage {
@@ -9679,14 +9679,14 @@
     passthru.names = [ "nib" ];
   };
   by-spec."nijs"."*" =
-    self.by-version."nijs"."0.0.12";
-  by-version."nijs"."0.0.12" = lib.makeOverridable self.buildNodePackage {
-    name = "nijs-0.0.12";
+    self.by-version."nijs"."0.0.13";
+  by-version."nijs"."0.0.13" = lib.makeOverridable self.buildNodePackage {
+    name = "nijs-0.0.13";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nijs/-/nijs-0.0.12.tgz";
-        name = "nijs-0.0.12.tgz";
-        sha1 = "23bb40746b409e8556f9a4fe97ca314410a685df";
+        url = "http://registry.npmjs.org/nijs/-/nijs-0.0.13.tgz";
+        name = "nijs-0.0.13.tgz";
+        sha1 = "c092af70f2008f9852725230e138106feee69c7b";
       })
     ];
     buildInputs =
@@ -9698,7 +9698,7 @@
     ];
     passthru.names = [ "nijs" ];
   };
-  "nijs" = self.by-version."nijs"."0.0.12";
+  "nijs" = self.by-version."nijs"."0.0.13";
   by-spec."node-appc"."0.2.0" =
     self.by-version."node-appc"."0.2.0";
   by-version."node-appc"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-- 
GitLab


From e1b206b4a9c895e6684fc948b1526d8759e54328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 4 Feb 2014 16:32:50 +0100
Subject: [PATCH 0881/3789] clarify rename error messages

---
 nixos/modules/rename.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 6ff5277cf9c..15e05a3d675 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -12,18 +12,20 @@ let
     visible = true;
   };
 
+  # warn option was renamed
   obsolete = from: to: rename {
     inherit from to;
     name = "Obsolete name";
-    use = x: builtins.trace "Obsolete option `${showOption from}' is used instead of `${showOption to}'." x;
-    define = x: builtins.trace "Obsolete option `${showOption from}' is defined instead of `${showOption to}'." x;
+    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;
   };
 
+  # abort if deprecated option is used
   deprecated = from: to: rename {
     inherit from to;
     name = "Deprecated name";
-    use = x: abort "Deprecated option `${showOption from}' is used instead of `${showOption to}'.";
-    define = x: abort "Deprecated option `${showOption from}' is defined instead of `${showOption to}'.";
+    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}'.";
   };
 
   showOption = concatStringsSep ".";
-- 
GitLab


From 81408168f2599104c2633c00dca54a1f03578951 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <sander@conference-compass.com>
Date: Tue, 4 Feb 2014 18:03:21 +0100
Subject: [PATCH 0882/3789] nodejs: fix the patch to make it build on darwin

---
 pkgs/development/web/nodejs/no-xcode.patch | 96 +++++++++++-----------
 1 file changed, 47 insertions(+), 49 deletions(-)

diff --git a/pkgs/development/web/nodejs/no-xcode.patch b/pkgs/development/web/nodejs/no-xcode.patch
index c0e8ec92493..e88168b68a7 100644
--- a/pkgs/development/web/nodejs/no-xcode.patch
+++ b/pkgs/development/web/nodejs/no-xcode.patch
@@ -1,7 +1,7 @@
 diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
---- a/tools/gyp/pylib/gyp/xcode_emulation.py	2013-12-19 00:49:45.000000000 +0100
-+++ b/tools/gyp/pylib/gyp/xcode_emulation.py	2014-01-13 13:46:19.000000000 +0100
-@@ -295,11 +295,20 @@
+--- a/tools/gyp/pylib/gyp/xcode_emulation.py	2014-01-23 06:05:51.000000000 +0100
++++ b/tools/gyp/pylib/gyp/xcode_emulation.py	2014-02-04 17:49:48.000000000 +0100
+@@ -302,10 +302,17 @@
  
    def _XcodeSdkPath(self, sdk_root):
      if sdk_root not in XcodeSettings._sdk_path_cache:
@@ -9,87 +9,85 @@ diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_
 -      XcodeSettings._sdk_path_cache[sdk_root] = sdk_path
 -      if sdk_root:
 -        XcodeSettings._sdk_root_cache[sdk_path] = sdk_root
--    return XcodeSettings._sdk_path_cache[sdk_root]
-+        try:
-+            sdk_path = self._GetSdkVersionInfoItem(sdk_root, 'Path')
-+            XcodeSettings._sdk_path_cache[sdk_root] = sdk_path
-+            
-+            if sdk_root:
-+                XcodeSettings._sdk_root_cache[sdk_path] = sdk_root
-+        except:
-+            # if this fails it's because xcodebuild failed, which means
-+            # the user is probably on a CLT-only system, where there
-+            # is no valid SDK root
-+            XcodeSettings._sdk_path_cache[sdk_root] = None
-+
-+    return None;
-+    #return XcodeSettings._sdk_path_cache[sdk_root]
++      try:
++        sdk_path = self._GetSdkVersionInfoItem(sdk_root, 'Path')
++        XcodeSettings._sdk_path_cache[sdk_root] = sdk_path
++        if sdk_root:
++          XcodeSettings._sdk_root_cache[sdk_path] = sdk_root
++      except:
++        # if this fails it's because xcodebuild failed, which means
++        # the user is probably on a CLT-only system, where there
++        # is no valid SDK root
++        XcodeSettings._sdk_path_cache[sdk_root] = None
++        
+     return XcodeSettings._sdk_path_cache[sdk_root]
  
    def _AppendPlatformVersionMinFlags(self, lst):
-     self._Appendf(lst, 'MACOSX_DEPLOYMENT_TARGET', '-mmacosx-version-min=%s')
-@@ -409,10 +418,11 @@
- 
-     cflags += self._Settings().get('WARNING_CFLAGS', [])
- 
+@@ -420,10 +427,12 @@
+       framework_root = sdk_root
+     else:
+       framework_root = ''
 -    config = self.spec['configurations'][self.configname]
 -    framework_dirs = config.get('mac_framework_dirs', [])
 -    for directory in framework_dirs:
--      cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
+-      cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root))
++    
 +    if 'SDKROOT' in self._Settings():
 +      config = self.spec['configurations'][self.configname]
 +      framework_dirs = config.get('mac_framework_dirs', [])
 +      for directory in framework_dirs:
-+        cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
++        cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root))
  
      self.configname = None
      return cflags
-@@ -659,10 +669,11 @@
-     for rpath in self._Settings().get('LD_RUNPATH_SEARCH_PATHS', []):
-       ldflags.append('-Wl,-rpath,' + rpath)
- 
+@@ -673,10 +682,12 @@
+     sdk_root = self._SdkPath()
+     if not sdk_root:
+       sdk_root = ''
 -    config = self.spec['configurations'][self.configname]
 -    framework_dirs = config.get('mac_framework_dirs', [])
 -    for directory in framework_dirs:
--      ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath()))
+-      ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
++    
 +    if 'SDKROOT' in self._Settings():
 +      config = self.spec['configurations'][self.configname]
 +      framework_dirs = config.get('mac_framework_dirs', [])
 +      for directory in framework_dirs:
-+        ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath()))
++        ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
  
      self.configname = None
      return ldflags
-@@ -843,7 +854,10 @@
-         l = '-l' + m.group(1)
-       else:
-         l = library
--    return l.replace('$(SDKROOT)', self._SdkPath(config_name))
+@@ -863,7 +874,11 @@
+     sdk_root = self._SdkPath(config_name)
+     if not sdk_root:
+       sdk_root = ''
+-    return l.replace('$(SDKROOT)', sdk_root)
++    
 +    if self._SdkPath():
-+      return l.replace('$(SDKROOT)', self._SdkPath(config_name))
++      return l.replace('$(SDKROOT)', sdk_root)
 +    else:
 +      return l
  
    def AdjustLibraries(self, libraries, config_name=None):
      """Transforms entries like 'Cocoa.framework' in libraries into entries like
-@@ -956,12 +970,15 @@
+@@ -1018,12 +1033,16 @@
      # Since the value returned by this function is only used when ARCHS is not
      # set, then on iOS we return "i386", as the default xcode project generator
      # does not set ARCHS if it is not set in the .gyp file.
 -    if self.isIOS:
--      return 'i386'
--    version, build = self._XcodeVersion()
--    if version >= '0500':
--      return 'x86_64'
--    return 'i386'
++    
 +    try:
-+        if self.isIOS:
-+          return 'i386'
-+        version, build = self._XcodeVersion()
-+        if version >= '0500':
-+          return 'x86_64'
++      if self.isIOS:
 +        return 'i386'
-+    except:
++      version, build = self._XcodeVersion()
++      if version >= '0500':
 +        return 'x86_64'
+       return 'i386'
+-    version, build = self._XcodeVersion()
+-    if version >= '0500':
++    except:
+       return 'x86_64'
+-    return 'i386'
  
  class MacPrefixHeader(object):
    """A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature.
-- 
GitLab


From 2c8e492691aeaac55fe6971ce7b74aa8188fe14c Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Tue, 4 Feb 2014 18:09:12 +0100
Subject: [PATCH 0883/3789] Generate hoogle databases beside HTML haddock
 documentation for Haskell packages

---
 pkgs/build-support/cabal/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 6dc83963d19..5e028863b06 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -220,7 +220,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
               ./Setup build ${self.buildTarget}
 
               export GHC_PACKAGE_PATH=$(${ghc.GHCPackages})
-              test -n "$noHaddock" || ./Setup haddock
+              test -n "$noHaddock" || ./Setup haddock --html --hoogle
 
               eval "$postBuild"
             '';
-- 
GitLab


From e8b0001268fae60ca22eeb6e346443012f4766ff Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 4 Feb 2014 14:56:42 +0100
Subject: [PATCH 0884/3789] idris-mode: fixed link to homepage (merge #1671)

---
 pkgs/applications/editors/emacs-modes/idris/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix
index 7bd39cd2b4e..572ca8cdb22 100644
--- a/pkgs/applications/editors/emacs-modes/idris/default.nix
+++ b/pkgs/applications/editors/emacs-modes/idris/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Emacs major mode for Idris";
-    homepage = https://github.com/idris-hackers/idris-modehttps://github.com/idris-hackers/idris-mode;
+    homepage = https://github.com/idris-hackers/idris-mode;
     license = "GPLv3";
 
     platforms = stdenv.lib.platforms.all;
-- 
GitLab


From ab60acc1aaad12c024d17af9bf2981b271aa0de9 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <sander@conference-compass.com>
Date: Tue, 4 Feb 2014 19:04:59 +0100
Subject: [PATCH 0885/3789] nodejs: update packages

---
 pkgs/top-level/node-packages-generated.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 4b242dc8416..fd4077e4e4c 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -9686,7 +9686,7 @@
       (fetchurl {
         url = "http://registry.npmjs.org/nijs/-/nijs-0.0.13.tgz";
         name = "nijs-0.0.13.tgz";
-        sha1 = "c092af70f2008f9852725230e138106feee69c7b";
+        sha1 = "31396055a3cc19ed5b7438c8e6811b9a20f27cfc";
       })
     ];
     buildInputs =
@@ -12607,14 +12607,14 @@
   by-spec."rimraf"."~2.2.5" =
     self.by-version."rimraf"."2.2.6";
   by-spec."s3http"."*" =
-    self.by-version."s3http"."0.0.4";
-  by-version."s3http"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "s3http-0.0.4";
+    self.by-version."s3http"."0.0.5";
+  by-version."s3http"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "s3http-0.0.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/s3http/-/s3http-0.0.4.tgz";
-        name = "s3http-0.0.4.tgz";
-        sha1 = "e7cc4b7e9f9bacaa7ee3a5af81917fd0ca8ce8da";
+        url = "http://registry.npmjs.org/s3http/-/s3http-0.0.5.tgz";
+        name = "s3http-0.0.5.tgz";
+        sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198";
       })
     ];
     buildInputs =
@@ -12633,7 +12633,7 @@
     ];
     passthru.names = [ "s3http" ];
   };
-  "s3http" = self.by-version."s3http"."0.0.4";
+  "s3http" = self.by-version."s3http"."0.0.5";
   by-spec."sauce-connect-launcher"."~0.2.2" =
     self.by-version."sauce-connect-launcher"."0.2.2";
   by-version."sauce-connect-launcher"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-- 
GitLab


From 99ba14ee7a94d5f809d024e6fa4bfffba7984040 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Tue, 4 Feb 2014 20:02:46 +0100
Subject: [PATCH 0886/3789] Add packages for libzdb, libsearpc, ccnet,
 seafile-shared, and seafile-client

---
 .../networking/seafile-client/default.nix     |  38 ++++++
 .../libraries/libsearpc/default.nix           |  31 +++++
 .../libraries/libsearpc/libsearpc.pc.patch    |  10 ++
 pkgs/development/libraries/libzdb/default.nix |  23 ++++
 ...Add-autoconfiguration-for-libjansson.patch | 121 ++++++++++++++++++
 pkgs/misc/seafile-shared/default.nix          |  42 ++++++
 ...Add-autoconfiguration-for-libjansson.patch |  72 +++++++++++
 pkgs/tools/networking/ccnet/default.nix       |  36 ++++++
 pkgs/tools/networking/ccnet/libccnet.pc.patch |  10 ++
 pkgs/top-level/all-packages.nix               |  10 ++
 10 files changed, 393 insertions(+)
 create mode 100644 pkgs/applications/networking/seafile-client/default.nix
 create mode 100644 pkgs/development/libraries/libsearpc/default.nix
 create mode 100644 pkgs/development/libraries/libsearpc/libsearpc.pc.patch
 create mode 100644 pkgs/development/libraries/libzdb/default.nix
 create mode 100644 pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch
 create mode 100644 pkgs/misc/seafile-shared/default.nix
 create mode 100644 pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch
 create mode 100644 pkgs/tools/networking/ccnet/default.nix
 create 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
new file mode 100644
index 00000000000..8640389f9d3
--- /dev/null
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -0,0 +1,38 @@
+{stdenv, fetchurl, writeScript, pkgconfig, cmake, qt4, seafileShared, ccnet, makeWrapper}:
+
+stdenv.mkDerivation rec
+{
+  version = "2.1.1";
+  name = "seafile-client-${version}";
+
+  src = fetchurl
+  {
+    url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz";
+    sha256 = "d98515ea229df702cbe973d85ec0bd5cf3f5282ef1022ba0157d5301b521c8e0";
+  };
+
+  buildInputs = [ pkgconfig cmake qt4 seafileShared makeWrapper ];
+
+  builder = writeScript "${name}-builder.sh" ''
+  source $stdenv/setup
+
+  tar xvfz $src
+  cd seafile-client-*
+
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_INSTALL_PREFIX="$out" .
+  make -j1
+
+  make install
+
+  wrapProgram $out/bin/seafile-applet \
+    --suffix PATH : ${ccnet}/bin:${seafileShared}/bin
+  '';
+
+  meta =
+  {
+    homepage = "https://github.com/haiwen/seafile-clients";
+    description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.calrama ];
+  };
+}
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix
new file mode 100644
index 00000000000..b27519fa66c
--- /dev/null
+++ b/pkgs/development/libraries/libsearpc/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, automake, autoconf, pkgconfig, libtool, python, pythonPackages, glib, jansson}:
+
+stdenv.mkDerivation rec
+{
+  version = "1.2.1";
+  seafileVersion = "2.1.1";
+  name = "libsearpc-${version}";
+
+  src = fetchurl
+  {
+    url = "https://github.com/haiwen/libsearpc/archive/v${seafileVersion}.tar.gz";
+    sha256 = "c0e7cc812c642ebb1339c3701570e78ff5b8c8aa2a521e5a505e28d9666e89ec";
+  };
+
+  patches = [ ./libsearpc.pc.patch ];
+
+  buildInputs = [ automake autoconf pkgconfig libtool python pythonPackages.simplejson ];
+  propagatedBuildInputs = [ glib jansson ];
+
+  preConfigure = "./autogen.sh";
+
+  buildPhase = "make -j1";
+
+  meta =
+  {
+    homepage = "https://github.com/haiwen/libsearpc";
+    description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System.";
+    license = stdenv.lib.licenses.lgpl3;
+    maintainers = [ stdenv.lib.maintainers.calrama ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/libsearpc/libsearpc.pc.patch b/pkgs/development/libraries/libsearpc/libsearpc.pc.patch
new file mode 100644
index 00000000000..6f30932ba6d
--- /dev/null
+++ b/pkgs/development/libraries/libsearpc/libsearpc.pc.patch
@@ -0,0 +1,10 @@
+From: Aaron Lindsay <aaron@aclindsay.com>
+
+--- a/libsearpc.pc.in	2013-01-10 01:35:24.000000000 -0500
++++ b/libsearpc.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@
diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix
new file mode 100644
index 00000000000..25eef6c7a99
--- /dev/null
+++ b/pkgs/development/libraries/libzdb/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, sqlite}:
+
+stdenv.mkDerivation rec
+{
+  version = "3.0";
+  name = "libzdb-${version}";
+
+  src = fetchurl
+  {
+    url = "http://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz";
+    sha256 = "e334bcb9ca1410e863634a164e3b1b5784018eb6e90b6c2b527780fc29a123c8";
+  };
+
+  buildInputs = [ sqlite ];
+
+  meta =
+  {
+    homepage = "http://www.tildeslash.com/libzdb/";
+    description = "A small, easy to use Open Source Database Connection Pool Library.";
+    license = stdenv.lib.licenses.gpl3;
+    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
new file mode 100644
index 00000000000..7966d1e683b
--- /dev/null
+++ b/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch
@@ -0,0 +1,121 @@
+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
new file mode 100644
index 00000000000..f392e9ece7a
--- /dev/null
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -0,0 +1,42 @@
+{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala, python, intltool, fuse, ccnet}:
+
+stdenv.mkDerivation rec
+{
+  version = "2.1.1";
+  name = "seafile-shared-${version}";
+
+  src = fetchurl
+  {
+    url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz";
+    sha256 = "f07b09ab1eb1cb33f92cee74e499d0350941624396910a4c1a7d79abb45acaa6";
+  };
+
+  patches = [ ./0003-Add-autoconfiguration-for-libjansson.patch ];
+
+  buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ];
+  propagatedBuildInputs = [ ccnet ];
+
+  preConfigure = ''
+  sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh
+  ./autogen.sh
+  '';
+
+  configureFlags = "--disable-server --disable-console";
+
+  buildPhase = "make -j1";
+
+  postInstall = ''
+  # Remove seafile binary
+  rm -rf "$out/bin/seafile"
+  # Remove cli client binary
+  rm -rf "$out/bin/seaf-cli"
+  '';
+
+  meta =
+  {
+    homepage = "https://github.com/haiwen/seafile";
+    description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.calrama ];
+  };
+}
diff --git a/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch b/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch
new file mode 100644
index 00000000000..83cdbad7bba
--- /dev/null
+++ b/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch
@@ -0,0 +1,72 @@
+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
new file mode 100644
index 00000000000..95479b8598e
--- /dev/null
+++ b/pkgs/tools/networking/ccnet/default.nix
@@ -0,0 +1,36 @@
+{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}:
+
+stdenv.mkDerivation rec
+{
+  version = "1.4.0";
+  seafileVersion = "2.1.1";
+  name = "ccnet-${version}";
+
+  src = fetchurl
+  {
+    url = "https://github.com/haiwen/ccnet/archive/v${seafileVersion}.tar.gz";
+    sha256 = "6882eb1a3066897e4f91fb60a3405b3f58b4b794334deaca73617003f77a7eb0";
+  };
+
+  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 ];
+
+  preConfigure = ''
+  sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh
+  ./autogen.sh
+  '';
+
+  configureFlags = "--enable-server";
+
+  buildPhase = "make -j1";
+
+  meta =
+  {
+    homepage = "https://github.com/haiwen/ccnet";
+    description = "A framework for writing networked applications in C.";
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = [ stdenv.lib.maintainers.calrama ];
+  };
+}
diff --git a/pkgs/tools/networking/ccnet/libccnet.pc.patch b/pkgs/tools/networking/ccnet/libccnet.pc.patch
new file mode 100644
index 00000000000..0d9fea552bc
--- /dev/null
+++ b/pkgs/tools/networking/ccnet/libccnet.pc.patch
@@ -0,0 +1,10 @@
+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@
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbae9a7946e..19261ef2fe1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -562,6 +562,8 @@ let
 
   catdoc = callPackage ../tools/text/catdoc { };
 
+  ccnet = callPackage ../tools/networking/ccnet { };
+
   ditaa = callPackage ../tools/graphics/ditaa { };
 
   direnv = callPackage ../tools/misc/direnv { };
@@ -4943,6 +4945,8 @@ let
 
   librsync = callPackage ../development/libraries/librsync { };
 
+  libsearpc = callPackage ../development/libraries/libsearpc { };
+
   libsigcxx = callPackage ../development/libraries/libsigcxx { };
 
   libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { };
@@ -5101,6 +5105,8 @@ let
 
   libzip = callPackage ../development/libraries/libzip { };
 
+  libzdb = callPackage ../development/libraries/libzdb { };
+
   libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { };
   libzrtpcpp_1_6 = callPackage ../development/libraries/libzrtpcpp/1.6.nix {
     ccrtp = ccrtp_1_8;
@@ -8706,6 +8712,8 @@ let
     inherit (gnome) libart_lgpl;
   };
 
+  seafileClient = callPackage ../applications/networking/seafile-client { };
+
   seeks = callPackage ../tools/networking/p2p/seeks {
     opencv = opencv_2_1;
   };
@@ -10227,6 +10235,8 @@ let
 
   saneFrontends = callPackage ../applications/graphics/sane/frontends.nix { };
 
+  seafileShared = callPackage ../misc/seafile-shared { };
+
   slock = callPackage ../misc/screensavers/slock { };
 
   sourceAndTags = import ../misc/source-and-tags {
-- 
GitLab


From 4ca25047d69959efbc619b63e8d2d3a11d66e665 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 4 Feb 2014 12:31:10 +0200
Subject: [PATCH 0887/3789] libassuan: update from 2.0.3 to 2.1.1

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

diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix
index f93a44c2e1d..d9775c25610 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pth, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "libassuan-2.0.3";
+  name = "libassuan-2.1.1";
 
   src = fetchurl {
     url = "mirror://gnupg/libassuan/${name}.tar.bz2";
-    sha256 = "06xckkvxxlx7cj77803m8x58gxksap4k8yhspc5cqsy7fhinimds";
+    sha256 = "1783nb0b6nr9yjhb5wfh8ykc5w89f4anppz1kz9913mqg5vxdqi3";
   };
 
   propagatedBuildInputs = [ libgpgerror pth ];
-- 
GitLab


From b98014f7e58ec5d701fb2bb6f739e940ab4ce366 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 4 Feb 2014 12:34:13 +0200
Subject: [PATCH 0888/3789] openldap: update from 2.4.35 to 2.4.38

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

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 1273146c342..8f26f29c377 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}:
 
 stdenv.mkDerivation rec {
-  name = "openldap-2.4.35";
+  name = "openldap-2.4.38";
 
   src = fetchurl {
     url = "ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/${name}.tgz";
-    sha256 = "1swy3rly6y0asikp862sigmab8gcll6scb65ln10vps7q5s0640n";
+    sha256 = "1l8zng86alhcmmmw09r1c4dzl7yvk6dy5fq9zia96pgck4srl848";
   };
 
   buildInputs = [ openssl cyrus_sasl db4 groff ];
-- 
GitLab


From 60f9005fa7b0f3f1e5cf4a1528ff925c91d42e6f Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 4 Feb 2014 12:39:37 +0200
Subject: [PATCH 0889/3789] exiv2: update from 0.23 to 0.24

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

diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index a7deb9f4c27..22b6cf242c8 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, zlib, expat}:
 
 stdenv.mkDerivation rec {
-  name = "exiv2-0.23";
+  name = "exiv2-0.24";
   
   src = fetchurl {
     url = "http://www.exiv2.org/${name}.tar.gz";
-    sha256 = "04bbg2cg6mgcyz435zamx37sp5zw44n2alb59ki1daz71f851yl1";
+    sha256 = "13pgvz14kyapxl89pxjaq3274k56d5lzfckpg1g9z7gvqzk4797l";
   };
   
   propagatedBuildInputs = [zlib expat];
-- 
GitLab


From 832324d5eb47cf3f24f68b1ee0eb79519022c8e3 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 4 Feb 2014 12:43:15 +0200
Subject: [PATCH 0890/3789] lm_sensors: update from 3.3.4 to 3.3.5

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

diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix
index 354027dbd71..388ec857b4a 100644
--- a/pkgs/os-specific/linux/lm-sensors/default.nix
+++ b/pkgs/os-specific/linux/lm-sensors/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, bison, flex, which, perl }:
 
-let version = "3.3.4"; in
+let version = "3.3.5"; in
 
 stdenv.mkDerivation rec {
   name = "lm-sensors-${version}";
   
   src = fetchurl {
     url = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2";
-    sha256 = "0vd7dgpcri7cbvgl5fwvja53lqz829vkbbp17x7b5r2xrc88cq5l";
+    sha256 = "1ksgrynxgrq590nb2fwxrl1gwzisjkqlyg3ljfd1al0ibrk6mbjx";
   };
 
   buildInputs = [ bison flex which perl ];
-- 
GitLab


From ab9dcd9ad0a7b2a44968079101f7d7f82aca4893 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 4 Feb 2014 12:51:09 +0200
Subject: [PATCH 0891/3789] gphoto2: update from 2.5.2 to 2.5.3

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

diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index cba54bf8013..7ff253fd4e8 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gphoto2-2.5.2";
+  name = "gphoto2-2.5.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "16c8k1cxfypg7v5h8xi87grclw7a5ayaamn548ys3zkj727r5fcf";
+    sha256 = "0i6qjyvgn3aaspiblmiwv51mfy92gm73xpbd3z41ki8mw7plg53i";
   };
 
   nativeBuildInputs = [ pkgconfig gettext ];
-- 
GitLab


From a598b6247489a7b6c322908e4cb1eff78db5c672 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 4 Feb 2014 21:57:25 +0200
Subject: [PATCH 0892/3789] KDE-4.11: update to 4.11.5

---
 pkgs/desktops/kde-4.11/default.nix            |   2 +-
 pkgs/desktops/kde-4.11/kde-package/4.11.5.nix | 444 ++++++++++++++++++
 .../kde-4.11/l10n/manifest-4.11.5.nix         | 272 +++++++++++
 3 files changed, 717 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/kde-4.11/kde-package/4.11.5.nix
 create mode 100644 pkgs/desktops/kde-4.11/l10n/manifest-4.11.5.nix

diff --git a/pkgs/desktops/kde-4.11/default.nix b/pkgs/desktops/kde-4.11/default.nix
index ef0f871b5a8..95bf4b512c7 100644
--- a/pkgs/desktops/kde-4.11/default.nix
+++ b/pkgs/desktops/kde-4.11/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.4" }:
+{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.5" }:
 
 let
   # Need callPackageOrig to avoid infinite cycle
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
new file mode 100644
index 00000000000..d9571a4d83c
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kde-package/4.11.5.nix
@@ -0,0 +1,444 @@
+{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/l10n/manifest-4.11.5.nix b/pkgs/desktops/kde-4.11/l10n/manifest-4.11.5.nix
new file mode 100644
index 00000000000..17236c067b9
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/l10n/manifest-4.11.5.nix
@@ -0,0 +1,272 @@
+[
+{
+  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";
+}
+]
-- 
GitLab


From ec985c8ffa6d29bf50e60ba814e3523ffd4c2919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 4 Feb 2014 20:02:51 +0100
Subject: [PATCH 0893/3789] fontconfig: stop using xml:space; vital for
 nixos+2.11

Since fontconfig-2.11 the xml:space attribute makes it reject
/etc/fonts/fonts.conf, so it renders garbage and eats lots of CPU.

To use anything linked to fontconfig-2.11 you need to have this patch
applied to your running NixOS. That's why I'm pushing it to master
before the fontconfig update (as soon as I found and tested the fix).
---
 pkgs/development/libraries/fontconfig/make-fonts-conf.xsl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
index 68c91596ac5..073e4165931 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
@@ -22,11 +22,11 @@
     <fontconfig>
       <xsl:copy-of select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != 'include']" />
 
-      <include ignore_missing="yes" xml:space="preserve">/etc/fonts/conf.d</include>
-      <include xml:space="preserve"><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
+      <include ignore_missing="yes">/etc/fonts/conf.d</include>
+      <include><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
 
-      <cachedir xml:space="preserve">/var/cache/fontconfig</cachedir>
-      <cachedir xml:space="preserve">~/.fontconfig</cachedir>
+      <cachedir>/var/cache/fontconfig</cachedir>
+      <cachedir>~/.fontconfig</cachedir>
 
       <xsl:for-each select="str:tokenize($fontDirectories)">
         <dir><xsl:value-of select="." /></dir>
-- 
GitLab


From 1920d6854ad04a57e3aa653ea6253f244532364c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 4 Feb 2014 22:13:24 -0600
Subject: [PATCH 0894/3789] Add pythonPackages.pysphere 0.1.8

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/top-level/python-packages.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b639f739a05..48d0a8c5db3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5388,6 +5388,21 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  pysphere = buildPythonPackage rec {
+    name = "pysphere-0.1.8";
+
+    src = fetchurl {
+      url = "http://pysphere.googlecode.com/files/${name}.zip";
+      md5 = "c57cba33626ac4b1e3d1974923d59232";
+    };
+
+    buildInputs = [ pkgs.unzip ];
+    meta = {
+      homepage    = "https://code.google.com/p/pysphere/";
+      license     = "BSD";
+      description = "Python API for interaction with the VMWare vSphere";
+    };
+  };
 
   pysqlite = buildPythonPackage (rec {
     name = "pysqlite-2.6.3";
-- 
GitLab


From ab7b06d8c953b81f400f76387a59ae513f2781e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Feb 2014 08:16:33 +0100
Subject: [PATCH 0895/3789] fontconfig: propagate freetype as *.pc requires;
 maintain

---
 pkgs/development/libraries/fontconfig/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 478c9c9bdb9..75e28ffe748 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
       }
     else null;
 
-  buildInputs = [ pkgconfig freetype expat ];
+  propagatedBuildInputs = [ freetype ];
+  buildInputs = [ pkgconfig expat ];
 
   configureFlags = "--sysconfdir=/etc --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts=";
 
@@ -38,10 +39,11 @@ stdenv.mkDerivation rec {
     cd "$out/etc/fonts" && tar xvf ${infinality_patch}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A library for font customization and configuration";
     homepage = http://fontconfig.org/;
-    license = "bsd";
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.bsd2; # custom but very bsd-like
+    platforms = platforms.all;
+    maintainers = [ maintainers.vcunat ];
   };
 }
-- 
GitLab


From e43018e0196dd6af57087ecb6aaa3af7b17776ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Feb 2014 08:20:20 +0100
Subject: [PATCH 0896/3789] spring: disable parallel building, as it breaks on
 Hydra

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

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 70cffaa192e..7273b425f9a 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       --replace "which" "type -p"
   '';
 
-  enableParallelBuilding = true;
+  #enableParallelBuilding = true; # occasionally missing generated files on Hydra
 
   meta = with stdenv.lib; {
     homepage = http://springrts.com/;
-- 
GitLab


From 9eaf987e623a76c915578de8fda25b21996c9b1c Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 5 Feb 2014 10:19:28 +0100
Subject: [PATCH 0897/3789] nodejs: update packages

---
 pkgs/top-level/node-packages-generated.nix | 80 +++++++++++-----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index fd4077e4e4c..80910e5a7d9 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -144,14 +144,14 @@
     passthru.names = [ "adm-zip" ];
   };
   by-spec."adm-zip"."~0.4.3" =
-    self.by-version."adm-zip"."0.4.3";
-  by-version."adm-zip"."0.4.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-adm-zip-0.4.3";
+    self.by-version."adm-zip"."0.4.4";
+  by-version."adm-zip"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-adm-zip-0.4.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.3.tgz";
-        name = "adm-zip-0.4.3.tgz";
-        sha1 = "28d6a3809abb7845a0ffa38f9fff455c2c6f6f6c";
+        url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz";
+        name = "adm-zip-0.4.4.tgz";
+        sha1 = "a61ed5ae6905c3aea58b3a657d25033091052736";
       })
     ];
     buildInputs =
@@ -3365,7 +3365,7 @@
     buildInputs =
       (self.nativeDeps."decompress" or []);
     deps = [
-      self.by-version."adm-zip"."0.4.3"
+      self.by-version."adm-zip"."0.4.4"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."mout"."0.6.0"
       self.by-version."rimraf"."2.2.6"
@@ -4888,14 +4888,14 @@
     passthru.names = [ "forever-agent" ];
   };
   by-spec."forever-agent"."~0.5.0" =
-    self.by-version."forever-agent"."0.5.0";
-  by-version."forever-agent"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-forever-agent-0.5.0";
+    self.by-version."forever-agent"."0.5.2";
+  by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-forever-agent-0.5.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.0.tgz";
-        name = "forever-agent-0.5.0.tgz";
-        sha1 = "0c1647a74f3af12d76a07a99490ade7c7249c8f0";
+        url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
+        name = "forever-agent-0.5.2.tgz";
+        sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
       })
     ];
     buildInputs =
@@ -5884,7 +5884,7 @@
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.2"
-      self.by-version."karma"."0.11.13"
+      self.by-version."karma"."0.11.14"
     ];
     passthru.names = [ "grunt-karma" ];
   };
@@ -7372,14 +7372,14 @@
     passthru.names = [ "junk" ];
   };
   by-spec."karma"."*" =
-    self.by-version."karma"."0.11.13";
-  by-version."karma"."0.11.13" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-0.11.13";
+    self.by-version."karma"."0.11.14";
+  by-version."karma"."0.11.14" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-0.11.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.11.13.tgz";
-        name = "karma-0.11.13.tgz";
-        sha1 = "f63da4f9d14669c6b3d2d9feb7f4406c4cd004c0";
+        url = "http://registry.npmjs.org/karma/-/karma-0.11.14.tgz";
+        name = "karma-0.11.14.tgz";
+        sha1 = "2f6f81611bfe62e588d4e1d63c14f3928971a77c";
       })
     ];
     buildInputs =
@@ -7408,15 +7408,15 @@
     ];
     passthru.names = [ "karma" ];
   };
-  "karma" = self.by-version."karma"."0.11.13";
+  "karma" = self.by-version."karma"."0.11.14";
   by-spec."karma".">=0.11.11" =
-    self.by-version."karma"."0.11.13";
+    self.by-version."karma"."0.11.14";
   by-spec."karma".">=0.9" =
-    self.by-version."karma"."0.11.13";
+    self.by-version."karma"."0.11.14";
   by-spec."karma".">=0.9.3" =
-    self.by-version."karma"."0.11.13";
+    self.by-version."karma"."0.11.14";
   by-spec."karma"."~0.11.0" =
-    self.by-version."karma"."0.11.13";
+    self.by-version."karma"."0.11.14";
   by-spec."karma-chrome-launcher"."*" =
     self.by-version."karma-chrome-launcher"."0.1.2";
   by-version."karma-chrome-launcher"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -7433,7 +7433,7 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.13"
+      self.by-version."karma"."0.11.14"
     ];
     passthru.names = [ "karma-chrome-launcher" ];
   };
@@ -7457,7 +7457,7 @@
       self.by-version."dateformat"."1.0.7-1.2.3"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.13"
+      self.by-version."karma"."0.11.14"
     ];
     passthru.names = [ "karma-coverage" ];
   };
@@ -7479,7 +7479,7 @@
       self.by-version."xmlbuilder"."0.4.2"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.13"
+      self.by-version."karma"."0.11.14"
     ];
     passthru.names = [ "karma-junit-reporter" ];
   };
@@ -7500,7 +7500,7 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.13"
+      self.by-version."karma"."0.11.14"
       self.by-version."mocha"."1.17.1"
     ];
     passthru.names = [ "karma-mocha" ];
@@ -7522,7 +7522,7 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.13"
+      self.by-version."karma"."0.11.14"
       self.by-version."requirejs"."2.1.10"
     ];
     passthru.names = [ "karma-requirejs" ];
@@ -7548,7 +7548,7 @@
       self.by-version."saucelabs"."0.1.1"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.13"
+      self.by-version."karma"."0.11.14"
     ];
     passthru.names = [ "karma-sauce-launcher" ];
   };
@@ -9686,7 +9686,7 @@
       (fetchurl {
         url = "http://registry.npmjs.org/nijs/-/nijs-0.0.13.tgz";
         name = "nijs-0.0.13.tgz";
-        sha1 = "31396055a3cc19ed5b7438c8e6811b9a20f27cfc";
+        sha1 = "eba11ace22e3ff73a9dc526b2b955c2e04472572";
       })
     ];
     buildInputs =
@@ -9713,7 +9713,7 @@
     buildInputs =
       (self.nativeDeps."node-appc" or []);
     deps = [
-      self.by-version."adm-zip"."0.4.3"
+      self.by-version."adm-zip"."0.4.4"
       self.by-version."async"."0.2.10"
       self.by-version."colors"."0.6.2"
       self.by-version."diff"."1.0.8"
@@ -12073,7 +12073,7 @@
     deps = [
       self.by-version."qs"."0.6.6"
       self.by-version."json-stringify-safe"."5.0.0"
-      self.by-version."forever-agent"."0.5.0"
+      self.by-version."forever-agent"."0.5.2"
       self.by-version."node-uuid"."1.4.1"
       self.by-version."mime"."1.2.11"
       self.by-version."tough-cookie"."0.12.1"
@@ -12191,7 +12191,7 @@
     deps = [
       self.by-version."qs"."0.6.6"
       self.by-version."json-stringify-safe"."5.0.0"
-      self.by-version."forever-agent"."0.5.0"
+      self.by-version."forever-agent"."0.5.2"
       self.by-version."tunnel-agent"."0.3.0"
       self.by-version."http-signature"."0.10.0"
       self.by-version."hawk"."1.0.0"
@@ -12222,7 +12222,7 @@
     deps = [
       self.by-version."qs"."0.6.6"
       self.by-version."json-stringify-safe"."5.0.0"
-      self.by-version."forever-agent"."0.5.0"
+      self.by-version."forever-agent"."0.5.2"
       self.by-version."tunnel-agent"."0.3.0"
       self.by-version."http-signature"."0.10.0"
       self.by-version."hawk"."1.0.0"
@@ -12253,7 +12253,7 @@
     deps = [
       self.by-version."qs"."0.6.6"
       self.by-version."json-stringify-safe"."5.0.0"
-      self.by-version."forever-agent"."0.5.0"
+      self.by-version."forever-agent"."0.5.2"
       self.by-version."node-uuid"."1.4.1"
       self.by-version."mime"."1.2.11"
       self.by-version."tough-cookie"."0.9.15"
@@ -12284,7 +12284,7 @@
     deps = [
       self.by-version."qs"."0.6.6"
       self.by-version."json-stringify-safe"."5.0.0"
-      self.by-version."forever-agent"."0.5.0"
+      self.by-version."forever-agent"."0.5.2"
       self.by-version."node-uuid"."1.4.1"
       self.by-version."mime"."1.2.11"
       self.by-version."tough-cookie"."0.9.15"
@@ -12650,7 +12650,7 @@
     deps = [
       self.by-version."lodash"."1.3.1"
       self.by-version."async"."0.2.10"
-      self.by-version."adm-zip"."0.4.3"
+      self.by-version."adm-zip"."0.4.4"
     ];
     peerDependencies = [
     ];
@@ -15281,7 +15281,7 @@
     buildInputs =
       (self.nativeDeps."webdrvr" or []);
     deps = [
-      self.by-version."adm-zip"."0.4.3"
+      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.12"
-- 
GitLab


From b9fe0b8fb10bdc25d62fc766f04f2235205e1ef9 Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Tue, 4 Feb 2014 18:43:21 +0100
Subject: [PATCH 0898/3789] bazaar: updated to 2.6.0 and fixed ssl bug

Fixes #1216
---
 .../bazaar/add_certificates.patch              | 11 +++++++++++
 .../version-management/bazaar/default.nix      | 18 +++++++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/version-management/bazaar/add_certificates.patch

diff --git a/pkgs/applications/version-management/bazaar/add_certificates.patch b/pkgs/applications/version-management/bazaar/add_certificates.patch
new file mode 100644
index 00000000000..332f42aa89c
--- /dev/null
+++ b/pkgs/applications/version-management/bazaar/add_certificates.patch
@@ -0,0 +1,11 @@
+diff -ru orig/bzrlib/transport/http/_urllib2_wrappers.py bzr-2.6.0/bzrlib/transport/http/_urllib2_wrappers.py
+--- orig/bzrlib/transport/http/_urllib2_wrappers.py	2013-07-27 13:50:53.000000000 +0200
++++ bzr-2.6.0/bzrlib/transport/http/_urllib2_wrappers.py	2014-02-04 18:34:15.838622492 +0100
+@@ -86,6 +86,7 @@
+     u"/usr/local/share/certs/ca-root-nss.crt", # FreeBSD
+     # XXX: Needs checking, can't trust the interweb ;) -- vila 2012-01-25
+     u'/etc/openssl/certs/ca-certificates.crt', # Solaris
++    u'@certPath@',
+     ]
+ def default_ca_certs():
+     if sys.platform == 'win32':
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index 1eb114ecd8c..2ea916052a3 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -1,20 +1,28 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, pythonPackages, cacert }:
 
 stdenv.mkDerivation rec {
-  version = "2.5";
-  release = ".1";
+  version = "2.6";
+  release = ".0";
   name = "bazaar-${version}${release}";
 
   src = fetchurl {
     url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz";
-    sha256 = "10krjbzia2avn09p0cdlbx2wya0r5v11w5ymvyl72af5dkx4cwwn";
+    sha256 = "1c6sj77h5f97qimjc14kr532kgc0jk3wq778xrkqi0pbh9qpk509";
   };
 
-  buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
+  buildInputs = [ pythonPackages.python pythonPackages.wrapPython cacert ];
 
   # Readline support is needed by bzrtools.
   pythonPath = [ pythonPackages.readline ];
 
+  # Bazaar can't find the certificates alone
+  patches = [ ./add_certificates.patch ];
+  postPatch = ''
+    substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \
+      --subst-var-by "certPath" "${cacert}/etc/ca-bundle.crt"
+  '';
+
+
   installPhase = ''
     python setup.py install --prefix=$out
     wrapPythonPrograms
-- 
GitLab


From d573ea576fce2c86f8d706b9048c2d72ad12b703 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Wed, 5 Feb 2014 16:44:59 +0400
Subject: [PATCH 0899/3789] add normal theme support for slim and slimlock

---
 .../services/x11/display-managers/slim.nix    | 25 ++++++++++++++++---
 .../display-managers/slim/default.nix         | 23 +++++++++++++++--
 .../display-managers/slim/runtime-paths.patch | 22 ++++++++++++++++
 3 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 35834ef3764..b4f42ec7649 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -5,7 +5,10 @@ with pkgs.lib;
 let
 
   dmcfg = config.services.xserver.displayManager;
+
   cfg = dmcfg.slim;
+  
+  slimPackage = cfg.package;
 
   slimConfig = pkgs.writeText "slim.cfg"
     ''
@@ -32,7 +35,7 @@ let
           ln -s * default
         '';
       };
-    in if cfg.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme;
+    in if cfg.theme == null then "${slimPackage}/share/slim/themes" else unpackedTheme;
 
 in
 
@@ -79,6 +82,22 @@ in
           the focus is placed on the password.
         '';
       };
+      
+      package = mkOption {
+        type = types.package;
+        default = pkgs.slim;
+        description = ''
+          Configure slim package.
+        '';
+        example = ''
+          pkgs.slim.override { 
+            theme = pkgs.fetchurl {
+              url = http://download.berlios.de/slim/slim-wave.tar.gz;
+              sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
+            }; 
+          };
+        '';
+      };
 
       autoLogin = mkOption {
         type = types.bool;
@@ -106,7 +125,7 @@ in
           { SLIM_CFGFILE = slimConfig;
             SLIM_THEMESDIR = slimThemesDir;
           };
-        execCmd = "exec ${pkgs.slim}/bin/slim";
+        execCmd = "exec ${slimPackage}/bin/slim";
       };
 
     # Allow null passwords so that the user can login as root on the
@@ -116,7 +135,7 @@ in
     # Allow slimlock to work.
     security.pam.services.slimlock = {};
 
-    environment.systemPackages = [ pkgs.slim ];
+    environment.systemPackages = [ slimPackage ];
 
   };
 
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 0b5bcccfb21..caf8a7c4222 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -1,5 +1,20 @@
 { stdenv, fetchurl, cmake, pkgconfig, xorg, libjpeg, libpng
-, fontconfig, freetype, pam, dbus_libs }:
+, fontconfig, freetype, pam, dbus_libs, makeWrapper, pkgs, theme ? null }:
+
+let 
+  slimThemesDir =
+      let
+        unpackedTheme = pkgs.stdenv.mkDerivation {
+          name = "slim-theme";
+          buildCommand = ''
+            ensureDir $out
+            cd $out
+            unpackFile ${theme}
+            ln -s * default
+          '';
+        };
+    in if theme == null then "$out/share/slim/themes" else unpackedTheme;
+in
 
 stdenv.mkDerivation rec {
   name = "slim-1.3.6";
@@ -29,9 +44,13 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ cmake pkgconfig libjpeg libpng fontconfig freetype
       pam dbus_libs
-      xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft
+      xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft makeWrapper
     ];
 
+  postInstall = ''
+    wrapProgram $out/bin/slimlock --set SLIM_THEMESDIR "${slimThemesDir}" --set SLIM_CFGFILE "$out/etc/slim.cfg"
+  '';
+
   NIX_CFLAGS_LINK = "-lXmu";
 
   meta = {
diff --git a/pkgs/applications/display-managers/slim/runtime-paths.patch b/pkgs/applications/display-managers/slim/runtime-paths.patch
index f6811dbe668..2e4868092e5 100644
--- a/pkgs/applications/display-managers/slim/runtime-paths.patch
+++ b/pkgs/applications/display-managers/slim/runtime-paths.patch
@@ -23,3 +23,25 @@ diff -ru -x '*~' slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp
  		themeName = cfg->getOption("current_theme");
  		string::size_type pos;
  		if ((pos = themeName.find(",")) != string::npos) {
+--- slim-1.3.6-orig/slimlock.cpp	2014-02-05 01:58:01.576560731 +0400
++++ slim-1.3.6/slimlock.cpp	2014-02-05 02:11:16.587634246 +0400
+@@ -106,13 +106,17 @@
+ 	unsigned int cfg_passwd_timeout;
+ 	// Read user's current theme
+ 	cfg = new Cfg;
+-	cfg->readConf(CFGFILE);
++	char *cfgfile = getenv("SLIM_CFGFILE");
++	if (!cfgfile) cfgfile = CFGFILE;
++	cfg->readConf(cfgfile);
+ 	cfg->readConf(SLIMLOCKCFG);
+ 	string themebase = "";
+ 	string themefile = "";
+ 	string themedir = "";
+ 	themeName = "";
+-	themebase = string(THEMESDIR) + "/";
++	char *themesdir = getenv("SLIM_THEMESDIR");
++	if (!themesdir) themesdir = THEMESDIR;
++	themebase = string(themesdir) + "/";
+ 	themeName = cfg->getOption("current_theme");
+ 	string::size_type pos;
+ 	if ((pos = themeName.find(",")) != string::npos) {
-- 
GitLab


From 1e0352f80140510ac0d0fa303197fc75235049ec Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 5 Feb 2014 07:54:11 -0500
Subject: [PATCH 0900/3789] Fix gummiboot builder

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../modules/system/boot/loader/gummiboot/gummiboot-builder.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py b/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py
index f49c55c7e95..db73544181b 100644
--- a/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py
+++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py
@@ -74,8 +74,8 @@ def remove_old_entries(gens):
     slice_end = -1 * len(".conf")
     known_paths = []
     for gen in gens:
-        known_paths.append copy_from_profile(gen, "kernel", True)
-        known_paths.append copy_from_profile(gen, "initrd", True)
+        known_paths.append(copy_from_profile(gen, "kernel", True))
+        known_paths.append(copy_from_profile(gen, "initrd", True))
     for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos-generation-[1-9]*.conf"):
         try:
             gen = int(path[slice_start:slice_end])
-- 
GitLab


From bfc682ea372d04049994d679ae1cce3fa3aeff4a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 5 Feb 2014 08:00:19 -0500
Subject: [PATCH 0901/3789] Mount a ramfs on /run/keys for safe key storage for
 nixops

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 nixos/modules/system/boot/stage-2-init.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 2fadd3de1f0..e0ff258c0ee 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -131,6 +131,15 @@ if ! mountpoint -q /run; then
     mount -t tmpfs -o "mode=0755,size=@runSize@" none /run
 fi
 
+# Create a ramfs on /run/keys to hold secrets that shouldn't
+# be written to disk (generally used for nixops, harmless
+# elsehwere)
+if ! mountpoint -q /run/keys; then
+    rm -rf /run/keys
+    mkdir -m 0700 /run/keys
+    mount -t ramfs none /run/keys
+fi
+
 mkdir -m 0755 -p /run/lock
 
 
-- 
GitLab


From d1d3e841b66b0834733f96a31bc577c73577d068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 5 Feb 2014 15:24:56 +0100
Subject: [PATCH 0902/3789] spring 95.0 -> 96.0

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

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 70cffaa192e..99066581aa2 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   name = "spring-${version}";
-  version = "95.0";
+  version = "96.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma";
-    sha256 = "0g0jfbbxl1g8nasibw13yjnsgalnfn4s2ii5z4s8k87vla9apg1v";
+    sha256 = "1axyqkxgv3a0zg0afzlc7j3lyi412zd551j317ci41yqz2qzf0px";
   };
 
   buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL
-- 
GitLab


From 6fe07cb3044f99861cafb05709fc094c403d5473 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 5 Feb 2014 15:49:45 +0100
Subject: [PATCH 0903/3789] Fix IDEA, previously it could not find the jdk.

---
 pkgs/applications/editors/idea/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 93e95c8d87d..31812bcb989 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -39,11 +39,14 @@ let
       7z a -tzip $out/$name/lib/snappy-java-1.0.5.jar .
 
       mkdir -p $out/bin
+
+      jdk=${jdk}/lib/openjdk
+
       makeWrapper $out/$name/bin/idea.sh $out/bin/idea \
         --prefix PATH : ${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin \
         --prefix LD_RUN_PATH : ${stdenv.gcc.gcc}/lib/ \
-        --prefix JDK_HOME : ${jdk} \
-        --prefix IDEA_JDK : ${jdk}
+        --prefix JDK_HOME : $jdk \
+        --prefix IDEA_JDK : $jdk
 
         mkdir -p $out/share/applications
         cp ${ideaItem}/share/applications/* $out/share/applications
-- 
GitLab


From da16a4b631c8885410575d6e8c3b0b6c985cac19 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 5 Feb 2014 09:07:45 -0500
Subject: [PATCH 0904/3789] Add string-conversions haskell package

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../haskell/string-conversions/default.nix          | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/string-conversions/default.nix

diff --git a/pkgs/development/libraries/haskell/string-conversions/default.nix b/pkgs/development/libraries/haskell/string-conversions/default.nix
new file mode 100644
index 00000000000..efab2ee40bb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/string-conversions/default.nix
@@ -0,0 +1,13 @@
+{ cabal, text, utf8String }:
+
+cabal.mkDerivation (self: {
+  pname = "string-conversions";
+  version = "0.3.0.2";
+  sha256 = "0jcm0vv0ll74zfc7s2l8qpqpbfnkv7ir9d1kg68m6b0f9sq0dgng";
+  buildDepends = [ text utf8String ];
+  meta = {
+    description = "Simplifies dealing with different types for strings";
+    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 105799eaf35..f7554b5da56 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2146,6 +2146,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   stringCombinators = callPackage ../development/libraries/haskell/string-combinators {};
 
+  stringConversions = callPackage ../development/libraries/haskell/string-conversions {};
+
   stringprep = callPackage ../development/libraries/haskell/stringprep {};
 
   stringQq = callPackage ../development/libraries/haskell/string-qq {};
-- 
GitLab


From b8e06f3110ffecbb4846c0da098eb88390ec3255 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 5 Feb 2014 09:56:14 -0500
Subject: [PATCH 0905/3789] Revive old haskell-tls packages

tls-1.2 broke source-compatability

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../libraries/haskell/tls-extra/default.nix   | 21 ++++++++++++++++
 .../libraries/haskell/tls/1.1.x.nix           | 25 +++++++++++++++++++
 .../haskell/tls/{default.nix => 1.2.x.nix}    |  0
 pkgs/top-level/haskell-packages.nix           |  8 +++++-
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/tls-extra/default.nix
 create mode 100644 pkgs/development/libraries/haskell/tls/1.1.x.nix
 rename pkgs/development/libraries/haskell/tls/{default.nix => 1.2.x.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
new file mode 100644
index 00000000000..0fdcaf71d51
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -0,0 +1,21 @@
+{ cabal, certificate, cipherAes, cipherRc4, cryptohash
+, cryptoPubkey, cryptoRandom, mtl, network, pem, time, tls, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "tls-extra";
+  version = "0.6.6";
+  sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    certificate cipherAes cipherRc4 cryptohash cryptoPubkey
+    cryptoRandom mtl network pem time tls vector
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-tls";
+    description = "TLS extra default values and helpers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/tls/1.1.x.nix b/pkgs/development/libraries/haskell/tls/1.1.x.nix
new file mode 100644
index 00000000000..0f354d8b77e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tls/1.1.x.nix
@@ -0,0 +1,25 @@
+{ cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey
+, cryptoRandom, mtl, network, QuickCheck, testFramework
+, testFrameworkQuickcheck2, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "tls";
+  version = "1.1.5";
+  sha256 = "1ja03x3i7dgjpy22h4shnni1xslph8i8q4accqq8njpqpz54c84c";
+  buildDepends = [
+    cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network
+  ];
+  testDepends = [
+    cereal certificate cprngAes cryptoPubkey cryptoRandom mtl
+    QuickCheck testFramework testFrameworkQuickcheck2 time
+  ];
+  doCheck = false;
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-tls";
+    description = "TLS/SSL protocol native implementation (Server and Client)";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/1.2.x.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/tls/default.nix
rename to pkgs/development/libraries/haskell/tls/1.2.x.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f7554b5da56..5bcd7b3a69d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2347,7 +2347,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   timeCompat = callPackage ../development/libraries/haskell/time-compat {};
 
-  tls = callPackage ../development/libraries/haskell/tls {};
+  tls = callPackage ../development/libraries/haskell/tls/1.2.x.nix {};
+
+  tls_1_1_x = callPackage ../development/libraries/haskell/tls/1.1.x.nix {};
+
+  tlsExtra = callPackage ../development/libraries/haskell/tls-extra {
+    tls = self.tls_1_1_x;
+  };
 
   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
-- 
GitLab


From eb2f44c18cb6d300e965308547d8a4dea110f519 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 17 May 2013 17:08:32 +0200
Subject: [PATCH 0906/3789] Generate /etc/passwd and /etc/group at build time

This is a rather large commit that switches user/group creation from using
useradd/groupadd on activation to just generating the contents of /etc/passwd
and /etc/group, and then on activation merging the generated files with the
files that exist in the system. This makes the user activation process much
cleaner, in my opinion.

The users.extraUsers.<user>.uid and users.extraGroups.<group>.gid must all be
properly defined (if <user>.createUser is true, which it is by default). My
pull request adds a lot of uids/gids to config.ids to solve this problem for
existing nixos services, but there might be configurations that break because
this change. However, this will be discovered during the build.

Option changes introduced by this commit:

* Remove the options <user>.isSystemUser and <user>.isAlias since
they don't make sense when generating /etc/passwd statically.

* Add <group>.members as a complement to <user>.extraGroups.

* Add <user>.passwordFile for setting a user's password from an encrypted
(shadow-style) file.

* Add users.mutableUsers which is true by default. This means you can keep
managing your users as previously, by using useradd/groupadd manually. This is
accomplished by merging the generated passwd/group file with the existing files
in /etc on system activation. The merging of the files is simplistic. It just
looks at the user/group names. If a user/group exists both on the system and
in the generated files, the system entry will be kept un-changed and the
generated entries will be ignored. The merging itself is performed with the
help of vipw/vigr to properly lock the account files during edit.
If mutableUsers is set to false, the generated passwd and group files will not
be merged with the system files on activation. Instead they will simply replace
the system files, and overwrite any changes done on the running system. The
same logic holds for user password, if the <user>.password or
<user>.passwordFile options are used. If mutableUsers is false, password will
simply be replaced on activation. If true, the initial user passwords will be
set according to the configuration, but existing passwords will not be touched.

I have tested this on a couple of different systems and it seems to work fine
so far. If you think this is a good idea, please test it. This way of adding
local users has been discussed in issue #103 (and this commit solves that
issue).
---
 nixos/modules/config/users-groups.nix         | 375 ++++++++++--------
 nixos/modules/programs/shadow.nix             |   2 +
 nixos/modules/virtualisation/amazon-image.nix |   2 +-
 .../virtualisation/virtualbox-image.nix       |   2 +-
 4 files changed, 211 insertions(+), 170 deletions(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 714de646eb7..97bf6726279 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
 
   ids = config.ids;
-  users = config.users;
+  cfg = config.users;
 
   userOpts = { name, config, ... }: {
 
@@ -28,9 +28,8 @@ let
       };
 
       uid = mkOption {
-        type = with types; uniq (nullOr int);
-        default = null;
-        description = "The account UID. If undefined, NixOS will select a free UID.";
+        type = with types; uniq int;
+        description = "The account UID.";
       };
 
       group = mkOption {
@@ -60,13 +59,21 @@ let
       createHome = mkOption {
         type = types.bool;
         default = false;
-        description = "If true, the home directory will be created automatically.";
+        description = ''
+          If true, the home directory will be created automatically. If this
+          option is true and the home directory already exists but is not
+          owned by the user, directory owner and group will be changed to
+          match the user.
+        '';
       };
 
       useDefaultShell = mkOption {
         type = types.bool;
         default = false;
-        description = "If true, the user's shell will be set to <literal>users.defaultUserShell</literal>.";
+        description = ''
+          If true, the user's shell will be set to
+          <literal>cfg.defaultUserShell</literal>.
+        '';
       };
 
       password = mkOption {
@@ -78,13 +85,29 @@ let
           because it is world-readable in the Nix store.  This option
           should only be used for public accounts such as
           <literal>guest</literal>.
+          The option <literal>password</literal> overrides
+          <literal>passwordFile</literal>, if both are specified.
+          If none of the options <literal>password</literal> or
+          <literal>passwordFile</literal> are specified, the user account will
+          be locked for password logins. This is the default behavior except
+          for the root account, which has an empty password by default. If you
+          want to lock the root account for password logins, set
+          <literal>users.extraUsers.root.password</literal> to
+          <literal>null</literal>.
         '';
       };
 
-      isSystemUser = mkOption {
-        type = types.bool;
-        default = true;
-        description = "Indicates if the user is a system user or not.";
+      passwordFile = mkOption {
+        type = with types; uniq (nullOr string);
+        default = null;
+        description = ''
+          The path to a file that contains the user's password. The password
+          file is read on each system activation. The file should contain
+          exactly one line, which should be the password in an encrypted form
+          that is suitable for the <literal>chpasswd -e</literal> command.
+          See the <literal>password</literal> for more details on how passwords
+          are assigned.
+        '';
       };
 
       createUser = mkOption {
@@ -96,19 +119,11 @@ let
           then not modify any of the basic properties for the user account.
         '';
       };
-
-      isAlias = mkOption {
-        type = types.bool;
-        default = false;
-        description = "If true, the UID of this user is not required to be unique and can thus alias another user.";
-      };
-
     };
 
     config = {
       name = mkDefault name;
-      uid = mkDefault (attrByPath [name] null ids.uids);
-      shell = mkIf config.useDefaultShell (mkDefault users.defaultUserShell);
+      shell = mkIf config.useDefaultShell (mkDefault cfg.defaultUserShell);
     };
 
   };
@@ -123,28 +138,100 @@ let
       };
 
       gid = mkOption {
-        type = with types; uniq (nullOr int);
-        default = null;
-        description = "The GID of the group. If undefined, NixOS will select a free GID.";
+        type = with types; uniq int;
+        description = "The GID of the group.";
+      };
+
+      members = mkOption {
+        type = with types; listOf string;
+        default = [];
+        description = ''
+        '';
       };
 
     };
 
     config = {
       name = mkDefault name;
-      gid = mkDefault (attrByPath [name] null ids.gids);
     };
 
   };
 
-  # Note: the 'X' in front of the password is to distinguish between
-  # having an empty password, and not having a password.
-  serializedUser = u: "${u.name}\n${u.description}\n${if u.uid != null then toString u.uid else ""}\n${u.group}\n${toString (concatStringsSep "," u.extraGroups)}\n${u.home}\n${u.shell}\n${toString u.createHome}\n${if u.password != null then "X" + u.password else ""}\n${toString u.isSystemUser}\n${toString u.createUser}\n${toString u.isAlias}\n";
-
-  usersFile = pkgs.writeText "users" (
+  getGroup = gname:
+    let
+      groups = mapAttrsToList (n: g: g) (
+        filterAttrs (n: g: g.name == gname) cfg.extraGroups
+      );
+    in
+      if length groups == 1 then head groups
+      else if groups == [] then throw "Group ${gname} not defined"
+      else throw "Group ${gname} has multiple definitions";
+
+  getUser = uname:
+    let
+      users = mapAttrsToList (n: u: u) (
+        filterAttrs (n: u: u.name == uname) cfg.extraUsers
+      );
+    in
+      if length users == 1 then head users
+      else if users == [] then throw "User ${uname} not defined"
+      else throw "User ${uname} has multiple definitions";
+
+  mkGroupEntry = gname:
     let
-      p = partition (u: u.isAlias) (attrValues config.users.extraUsers);
-    in concatStrings (map serializedUser p.wrong ++ map serializedUser p.right));
+      g = getGroup gname;
+      users = mapAttrsToList (n: u: u.name) (
+        filterAttrs (n: u: elem g.name u.extraGroups) cfg.extraUsers
+      );
+    in concatStringsSep ":" [
+      g.name "x" (toString g.gid)
+      (concatStringsSep "," (users ++ (filter (u: !(elem u users)) g.members)))
+    ];
+
+  mkPasswdEntry = uname: let u = getUser uname; in
+    concatStringsSep ":" [
+      u.name "x" (toString u.uid)
+      (toString (getGroup u.group).gid)
+      u.description u.home u.shell
+    ];
+
+  sortOn = a: sort (as1: as2: lessThan (getAttr a as1) (getAttr a as2));
+
+  groupFile = pkgs.writeText "group" (
+    concatStringsSep "\n" (map (g: mkGroupEntry g.name) (
+      sortOn "gid" (attrValues cfg.extraGroups)
+    ))
+  );
+
+  passwdFile = pkgs.writeText "passwd" (
+    concatStringsSep "\n" (map (u: mkPasswdEntry u.name) (
+      sortOn "uid" (filter (u: u.createUser) (attrValues cfg.extraUsers))
+    ))
+  );
+
+  # If mutableUsers is true, this script adds all users/groups defined in
+  # users.extra{Users,Groups} to /etc/{passwd,group} iff there isn't any
+  # existing user/group with the same name in those files.
+  # If mutableUsers is false, the /etc/{passwd,group} files will simply be
+  # replaced with the users/groups defined in the NixOS configuration.
+  # The merging procedure could certainly be improved, and instead of just
+  # keeping the lines as-is from /etc/{passwd,group} they could be combined
+  # in some way with the generated content from the NixOS configuration.
+  merger = src: pkgs.writeScript "merger" ''
+    #!${pkgs.bash}/bin/bash
+
+    PATH=${pkgs.gawk}/bin:${pkgs.gnugrep}/bin:$PATH
+
+    ${if !cfg.mutableUsers
+      then ''cp ${src} $1.tmp''
+      else ''awk -F: '{ print "^"$1":.*" }' $1 | egrep -vf - ${src} | cat $1 - > $1.tmp''
+    }
+
+    # set mtime to +1, otherwise change might go unnoticed (vipw/vigr only looks at mtime)
+    touch -m -t $(date -d @$(($(stat -c %Y $1)+1)) +%Y%m%d%H%M.%S) $1.tmp
+
+    mv -f $1.tmp $1
+  '';
 
 in
 
@@ -154,6 +241,28 @@ in
 
   options = {
 
+    users.mutableUsers = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        If true, you are free to add new users and groups to the system
+        with the ordinary <literal>useradd</literal> and
+        <literal>groupadd</literal> commands. On system activation, the
+        existing contents of the <literal>/etc/passwd</literal> and
+        <literal>/etc/group</literal> files will be merged with the
+        contents generated from the <literal>users.extraUsers</literal> and
+        <literal>users.extraGroups</literal> options. If
+        <literal>mutableUsers</literal> is false, the contents of the user and
+        group files will simply be replaced on system activation. This also
+        holds for the user passwords; if this option is false, all changed
+        passwords will be reset according to the
+        <literal>users.extraUsers</literal> configuration on activation. If
+        this option is true, the initial password for a user will be set
+        according to <literal>users.extraUsers</literal>, but existing passwords
+        will not be changed.
+      '';
+    };
+
     users.extraUsers = mkOption {
       default = {};
       type = types.loaOf types.optionSet;
@@ -188,20 +297,6 @@ in
       options = [ groupOpts ];
     };
 
-    security.initialRootPassword = mkOption {
-      type = types.str;
-      default = "";
-      example = "!";
-      description = ''
-        The (hashed) password for the root account set on initial
-        installation.  The empty string denotes that root can login
-        locally without a password (but not via remote services such
-        as SSH, or indirectly via <command>su</command> or
-        <command>sudo</command>).  The string <literal>!</literal>
-        prevents root from logging in using a password.
-      '';
-    };
-
   };
 
 
@@ -211,144 +306,88 @@ in
 
     users.extraUsers = {
       root = {
+        uid = ids.uids.root;
         description = "System administrator";
         home = "/root";
-        shell = config.users.defaultUserShell;
+        shell = cfg.defaultUserShell;
         group = "root";
+        password = mkDefault "";
       };
       nobody = {
+        uid = ids.uids.nobody;
         description = "Unprivileged account (don't use!)";
+        group = "nogroup";
       };
     };
 
     users.extraGroups = {
-      root = { };
-      wheel = { };
-      disk = { };
-      kmem = { };
-      tty = { };
-      floppy = { };
-      uucp = { };
-      lp = { };
-      cdrom = { };
-      tape = { };
-      audio = { };
-      video = { };
-      dialout = { };
-      nogroup = { };
-      users = { };
-      nixbld = { };
-      utmp = { };
-      adm = { }; # expected by journald
+      root.gid = ids.gids.root;
+      wheel.gid = ids.gids.wheel;
+      disk.gid = ids.gids.disk;
+      kmem.gid = ids.gids.kmem;
+      tty.gid = ids.gids.tty;
+      floppy.gid = ids.gids.floppy;
+      uucp.gid = ids.gids.uucp;
+      lp.gid = ids.gids.lp;
+      cdrom.gid = ids.gids.cdrom;
+      tape.gid = ids.gids.tape;
+      audio.gid = ids.gids.audio;
+      video.gid = ids.gids.video;
+      dialout.gid = ids.gids.dialout;
+      nogroup.gid = ids.gids.nogroup;
+      users.gid = ids.gids.users;
+      nixbld.gid = ids.gids.nixbld;
+      utmp.gid = ids.gids.utmp;
+      adm.gid = ids.gids.adm;
     };
 
-    system.activationScripts.rootPasswd = stringAfter [ "etc" ]
-      ''
-        # If there is no password file yet, create a root account with an
-        # empty password.
-        if ! test -e /etc/passwd; then
-            rootHome=/root
-            touch /etc/passwd; chmod 0644 /etc/passwd
-            touch /etc/group; chmod 0644 /etc/group
-            touch /etc/shadow; chmod 0600 /etc/shadow
-            # Can't use useradd, since it complains that it doesn't know us
-            # (bootstrap problem!).
-            echo "root:x:0:0:System administrator:$rootHome:${config.users.defaultUserShell}" >> /etc/passwd
-            echo "root:${config.security.initialRootPassword}:::::::" >> /etc/shadow
-        fi
-      '';
-
-    # Print a reminder for users to set a root password.
-    environment.interactiveShellInit =
-      ''
-        if [ "$UID" = 0 ]; then
-            read _l < /etc/shadow
-            if [ "''${_l:0:6}" = root:: ]; then
-                cat >&2 <<EOF
-        Warning: Your root account has a null password, allowing local users
-        to login as root.  Please set a non-null password using \`passwd', or
-        disable password-based root logins using \`passwd -l'.
-        EOF
-            fi
-            unset _l
-        fi
-      '';
-
-    system.activationScripts.users = stringAfter [ "groups" ]
-      ''
-        echo "updating users..."
-
-        cat ${usersFile} | while true; do
-            read name || break
-            read description
-            read uid
-            read group
-            read extraGroups
-            read home
-            read shell
-            read createHome
-            read password
-            read isSystemUser
-            read createUser
-            read isAlias
-
-            if [ -z "$createUser" ]; then
-                continue
-            fi
-
-            if ! curEnt=$(getent passwd "$name"); then
-                useradd ''${isSystemUser:+--system} \
-                    --comment "$description" \
-                    ''${uid:+--uid $uid} \
-                    --gid "$group" \
-                    --groups "$extraGroups" \
-                    --home "$home" \
-                    --shell "$shell" \
-                    ''${createHome:+--create-home} \
-                    ''${isAlias:+--non-unique} \
-                    "$name"
-                if test "''${password:0:1}" = 'X'; then
-                    (echo "''${password:1}"; echo "''${password:1}") | ${pkgs.shadow}/bin/passwd "$name"
-                fi
-            else
-                #echo "updating user $name..."
-                oldIFS="$IFS"; IFS=:; set -- $curEnt; IFS="$oldIFS"
-                prevUid=$3
-                prevHome=$6
-                # Don't change the home directory if it's the same to prevent
-                # unnecessary warnings about logged in users.
-                if test "$prevHome" = "$home"; then unset home; fi
-                usermod \
-                    --comment "$description" \
-                    --gid "$group" \
-                    --groups "$extraGroups" \
-                    ''${home:+--home "$home"} \
-                    --shell "$shell" \
-                    "$name"
-            fi
-
-        done
+    system.activationScripts.users =
+      let
+        mkhomeUsers = filterAttrs (n: u: u.createHome) cfg.extraUsers;
+        setpwUsers = filterAttrs (n: u: u.createUser) cfg.extraUsers;
+        setpw = n: u: ''
+          setpw=yes
+          ${optionalString cfg.mutableUsers ''
+            test "$(getent shadow '${u.name}' | cut -d: -f2)" != "x" && setpw=no
+          ''}
+          if [ "$setpw" == "yes" ]; then
+            ${if u.password == ""
+              then "passwd -d '${u.name}' &>/dev/null"
+              else if (isNull u.password && isNull u.passwordFile)
+              then "passwd -l '${u.name}' &>/dev/null"
+              else if !(isNull u.password)
+              then ''
+                echo "${u.name}:${u.password}" | ${pkgs.shadow}/sbin/chpasswd''
+              else ''
+                echo -n "${u.name}:" | cat - "${u.passwordFile}" | \
+                  ${pkgs.shadow}/sbin/chpasswd -e
+              ''
+            }
+          fi
+        '';
+        mkhome = n: u:
+         let
+            uid = toString u.uid;
+            gid = toString ((getGroup u.group).gid);
+            h = u.home;
+          in ''
+            test -a "${h}" || mkdir -p "${h}" || true
+            test "$(stat -c %u "${h}")" = ${uid} || chown ${uid} "${h}" || true
+            test "$(stat -c %g "${h}")" = ${gid} || chgrp ${gid} "${h}" || true
+          '';
+      in stringAfter [ "etc" ] ''
+        touch /etc/group
+        touch /etc/passwd
+        VISUAL=${merger groupFile} ${pkgs.shadow}/sbin/vigr &>/dev/null
+        VISUAL=${merger passwdFile} ${pkgs.shadow}/sbin/vipw &>/dev/null
+        ${pkgs.shadow}/sbin/grpconv
+        ${pkgs.shadow}/sbin/pwconv
+        ${concatStrings (mapAttrsToList mkhome mkhomeUsers)}
+        ${concatStrings (mapAttrsToList setpw setpwUsers)}
       '';
 
-    system.activationScripts.groups = stringAfter [ "rootPasswd" "binsh" "etc" "var" ]
-      ''
-        echo "updating groups..."
-
-        createGroup() {
-            name="$1"
-            gid="$2"
-
-            if ! curEnt=$(getent group "$name"); then
-                groupadd --system \
-                    ''${gid:+--gid $gid} \
-                    "$name"
-            fi
-        }
-
-        ${flip concatMapStrings (attrValues config.users.extraGroups) (g: ''
-          createGroup '${g.name}' '${toString g.gid}'
-        '')}
-      '';
+    # for backwards compatibility
+    system.activationScripts.groups = stringAfter [ "users" ] "";
 
   };
 
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 9e46ab8b298..fdc80331a84 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -94,6 +94,8 @@ in
         groupmems = { rootOK = true; };
         groupdel = { rootOK = true; };
         login = { startSession = true; allowNullPassword = true; showMotd = true; updateWtmp = true; };
+        chpasswd = { rootOK = true; };
+        chgpasswd = { rootOK = true; };
       };
 
     security.setuidPrograms = [ "passwd" "chfn" "su" "newgrp" ];
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index abd2a1084bd..701e95af7d3 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -164,5 +164,5 @@ with pkgs.lib;
   # 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 = "!";
+  users.extraUsers.root.password = null;
 }
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 71bdf31a98d..a89c8264a33 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -111,5 +111,5 @@ with pkgs.lib;
   # 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 = "!";
+  users.extraUsers.root.password = null;
 }
-- 
GitLab


From 03ee174032530af70b3deb278cd37c393dcaf096 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 5 Feb 2014 14:05:09 +0100
Subject: [PATCH 0907/3789] Only add shadow to system packages if
 users.mutableUsers is true

---
 nixos/modules/programs/shadow.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index fdc80331a84..15b083b72d2 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -58,7 +58,8 @@ in
 
   config = {
 
-    environment.systemPackages = [ pkgs.shadow ];
+    environment.systemPackages =
+      pkgs.lib.optional config.users.mutableUsers pkgs.shadow;
 
     environment.etc =
       [ { # /etc/login.defs: global configuration for pwdutils.  You
-- 
GitLab


From 0b92ad02c87b9eff8dbc45cc4221289d737d29a6 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 5 Feb 2014 15:07:20 +0100
Subject: [PATCH 0908/3789] Re-introduce security.initialRootPassword, and add
 a new option users.extraUsers.<user>.hashedPassword

---
 nixos/modules/config/users-groups.nix         | 83 ++++++++++++++-----
 nixos/modules/virtualisation/amazon-image.nix |  2 +-
 .../virtualisation/virtualbox-image.nix       |  2 +-
 3 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 97bf6726279..e38593d5602 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -7,6 +7,24 @@ let
   ids = config.ids;
   cfg = config.users;
 
+  passwordDescription = ''
+    The options <literal>hashedPassword</literal>,
+    <literal>password</literal> and <literal>passwordFile</literal>
+    controls what password is set for the user.
+    <literal>hashedPassword</literal> overrides both
+    <literal>password</literal> and <literal>passwordFile</literal>.
+    <literal>password</literal> overrides <literal>passwordFile</literal>.
+    If none of these three options are set, no password is assigned to
+    the user, and the user will not be able to do password logins.
+    If the option <literal>users.mutableUsers</literal> is true, the
+    password defined in one of the three options will only be set when
+    the user is created for the first time. After that, you are free to
+    change the password with the ordinary user management commands. If
+    <literal>users.mutableUsers</literal> is false, you cannot change
+    user passwords, they will always be set according to the password
+    options.
+  '';
+
   userOpts = { name, config, ... }: {
 
     options = {
@@ -76,24 +94,24 @@ let
         '';
       };
 
+      hashedPassword = mkOption {
+        type = with types; uniq (nullOr str);
+        default = null;
+        description = ''
+          Specifies the (hashed) password for the user.
+          ${passwordDescription}
+        '';
+      };
+
       password = mkOption {
         type = with types; uniq (nullOr str);
         default = null;
         description = ''
-          The user's password. If undefined, no password is set for
-          the user.  Warning: do not set confidential information here
-          because it is world-readable in the Nix store.  This option
-          should only be used for public accounts such as
-          <literal>guest</literal>.
-          The option <literal>password</literal> overrides
-          <literal>passwordFile</literal>, if both are specified.
-          If none of the options <literal>password</literal> or
-          <literal>passwordFile</literal> are specified, the user account will
-          be locked for password logins. This is the default behavior except
-          for the root account, which has an empty password by default. If you
-          want to lock the root account for password logins, set
-          <literal>users.extraUsers.root.password</literal> to
-          <literal>null</literal>.
+          Specifies the (clear text) password for the user.
+          Warning: do not set confidential information here
+          because it is world-readable in the Nix store. This option
+          should only be used for public accounts.
+          ${passwordDescription}
         '';
       };
 
@@ -105,8 +123,7 @@ let
           file is read on each system activation. The file should contain
           exactly one line, which should be the password in an encrypted form
           that is suitable for the <literal>chpasswd -e</literal> command.
-          See the <literal>password</literal> for more details on how passwords
-          are assigned.
+          ${passwordDescription}
         '';
       };
 
@@ -297,6 +314,26 @@ in
       options = [ groupOpts ];
     };
 
+    security.initialRootPassword = mkOption {
+      type = types.str;
+      default = "";
+      example = "!";
+      description = ''
+        The (hashed) password for the root account set on initial
+        installation. The empty string denotes that root can login
+        locally without a password (but not via remote services such
+        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
+        <literal>users.extraUsers.root.hashedPassword</literal>.
+        Note, 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.
+      '';
+    };
+
   };
 
 
@@ -311,7 +348,7 @@ in
         home = "/root";
         shell = cfg.defaultUserShell;
         group = "root";
-        password = mkDefault "";
+        hashedPassword = config.security.initialRootPassword;
       };
       nobody = {
         uid = ids.uids.nobody;
@@ -351,17 +388,21 @@ in
             test "$(getent shadow '${u.name}' | cut -d: -f2)" != "x" && setpw=no
           ''}
           if [ "$setpw" == "yes" ]; then
-            ${if u.password == ""
+            ${if !(isNull u.hashedPassword)
+              then ''
+                echo "${u.name}:${u.hashedPassword}" | \
+                  ${pkgs.shadow}/sbin/chpasswd -e''
+              else if u.password == ""
               then "passwd -d '${u.name}' &>/dev/null"
-              else if (isNull u.password && isNull u.passwordFile)
-              then "passwd -l '${u.name}' &>/dev/null"
               else if !(isNull u.password)
               then ''
                 echo "${u.name}:${u.password}" | ${pkgs.shadow}/sbin/chpasswd''
-              else ''
+              else if !(isNull u.passwordFile)
+              then ''
                 echo -n "${u.name}:" | cat - "${u.passwordFile}" | \
                   ${pkgs.shadow}/sbin/chpasswd -e
               ''
+              else "passwd -l '${u.name}' &>/dev/null"
             }
           fi
         '';
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 701e95af7d3..abd2a1084bd 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -164,5 +164,5 @@ with pkgs.lib;
   # 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.
-  users.extraUsers.root.password = null;
+  security.initialRootPassword = "!";
 }
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index a89c8264a33..71bdf31a98d 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -111,5 +111,5 @@ with pkgs.lib;
   # 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.
-  users.extraUsers.root.password = null;
+  security.initialRootPassword = "!";
 }
-- 
GitLab


From 72ba2bf1269afd4a33d62476fa1ddcd5450ba58d Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 5 Feb 2014 15:24:05 +0100
Subject: [PATCH 0909/3789] Add description to group.members option

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

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index e38593d5602..20ec1bda281 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -163,6 +163,8 @@ let
         type = with types; listOf string;
         default = [];
         description = ''
+          The user names of the group members, added to the
+          <literal>/etc/group</literal> file.
         '';
       };
 
-- 
GitLab


From 63adcbcfc7160954540e13fc1ce9a913c5d9854a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 5 Feb 2014 16:29:49 +0100
Subject: [PATCH 0910/3789] libgcrypt: update to 1.6.1

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

diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix
index f5f8297bc6c..ea981f7ed12 100644
--- a/pkgs/development/libraries/libgcrypt/1.6.nix
+++ b/pkgs/development/libraries/libgcrypt/1.6.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libgpgerror, transfig, ghostscript, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "libgcrypt-1.6.0";
+  name = "libgcrypt-1.6.1";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "024plbybsmnxbp39hs92lp6dzvkz2cb70nv69qrwr55d02350bb6";
+    sha256 = "0w10vhpj1r5nq7qm6jp21p1v1vhf37701cw8yilygzzqd7mfzhx1";
   };
 
   nativeBuildInputs = [ transfig ghostscript texinfo ];
-- 
GitLab


From 3d7010b5b70cf9008da986874a76231a37708ffb Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Wed, 5 Feb 2014 18:25:43 +0100
Subject: [PATCH 0911/3789] Dashify seafileShared and seafileClient

---
 pkgs/applications/networking/seafile-client/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 8640389f9d3..82e5d08da41 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, writeScript, pkgconfig, cmake, qt4, seafileShared, ccnet, makeWrapper}:
+{stdenv, fetchurl, writeScript, pkgconfig, cmake, qt4, seafile-shared, ccnet, makeWrapper}:
 
 stdenv.mkDerivation rec
 {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec
     sha256 = "d98515ea229df702cbe973d85ec0bd5cf3f5282ef1022ba0157d5301b521c8e0";
   };
 
-  buildInputs = [ pkgconfig cmake qt4 seafileShared makeWrapper ];
+  buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ];
 
   builder = writeScript "${name}-builder.sh" ''
   source $stdenv/setup
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec
   make install
 
   wrapProgram $out/bin/seafile-applet \
-    --suffix PATH : ${ccnet}/bin:${seafileShared}/bin
+    --suffix PATH : ${ccnet}/bin:${seafile-shared}/bin
   '';
 
   meta =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19261ef2fe1..7425338225f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8712,7 +8712,7 @@ let
     inherit (gnome) libart_lgpl;
   };
 
-  seafileClient = callPackage ../applications/networking/seafile-client { };
+  seafile-client = callPackage ../applications/networking/seafile-client { };
 
   seeks = callPackage ../tools/networking/p2p/seeks {
     opencv = opencv_2_1;
@@ -10235,7 +10235,7 @@ let
 
   saneFrontends = callPackage ../applications/graphics/sane/frontends.nix { };
 
-  seafileShared = callPackage ../misc/seafile-shared { };
+  seafile-shared = callPackage ../misc/seafile-shared { };
 
   slock = callPackage ../misc/screensavers/slock { };
 
-- 
GitLab


From 0a230b852d56c6ff8fe9eb6b0ab16aab47f0e48d Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Wed, 5 Feb 2014 18:38:03 +0100
Subject: [PATCH 0912/3789] Add "vboxsf" to the kernel modules for VirtualBox
 Guest Additions 4.3.6

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

diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
index 9dda455e5d3..3d43ec0ff4c 100644
--- a/nixos/modules/virtualisation/virtualbox-guest.nix
+++ b/nixos/modules/virtualisation/virtualbox-guest.nix
@@ -38,6 +38,8 @@ optionalAttrs (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) # ugly...
 
     boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ];
 
+    boot.kernelModules = [ "vboxsf" ];
+
     users.extraGroups.vboxsf.gid = config.ids.gids.vboxsf;
 
     systemd.services.virtualbox =
-- 
GitLab


From bb0c35d982471da435e8b32d94ec7c35dadebac6 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 5 Feb 2014 08:11:22 +0200
Subject: [PATCH 0913/3789] kde4_next.konversation: update from 1.4 to 1.5

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

diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index c4d2f4b3782..d3009115b17 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -3,7 +3,7 @@
 
 let
   pn = "konversation";
-  v = "1.4";
+  v = "1.5";
 in
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.xz";
-    sha256 = "030vsbb18dlzsnjl3fzyd1m9wvvksiyc1lm45abi4q6x4xd60knv";
+    sha256 = "0vsl34kiar7kbsgncycwd7f66f493fip6d635qlprqn1gqhycb9q";
   };
 
   buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs
-- 
GitLab


From e27b00915af1515fa3e5fdafdd82f6fb031c2fbf Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 5 Feb 2014 08:13:05 +0200
Subject: [PATCH 0914/3789] youtubeDL: update from 2014.01.30.2 to 2014.02.03

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index cca459c1a29..629cf93695f 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.01.30.2";
+  version = "2014.02.03";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1bx4ip1d4gp057nha4ylj2baksxg8kkxgvsdcx6bj36wbb0f8fl9";
+    sha256 = "0ba6kg72j7h7xcldar0fd5pk809fp4ihr8nclwwp1qj93mraqjir";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From 1f21ae53d3162252f5898e614511dbfd3b66d4de Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 5 Feb 2014 20:14:16 +0200
Subject: [PATCH 0915/3789] KDE: default to 4.11

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbae9a7946e..243c021d16d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9586,9 +9586,11 @@ let
 
   hsetroot = callPackage ../tools/X11/hsetroot { };
 
-  kde4 = recurseIntoAttrs pkgs.kde410;
+  kde4 = recurseIntoAttrs pkgs.kde411;
 
-  kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde411 );
+# kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );
+
+  kde4_prev = recurseIntoAttrs pkgs.kde410;
 
   kde410 = kdePackagesFor (pkgs.kde410 // {
       boost = boost149;
-- 
GitLab


From e060d9a2ffb677f7482ddba4845544392a1f4b28 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Feb 2014 16:02:43 +0100
Subject: [PATCH 0916/3789] Remove obsolete file

---
 doc/outline.txt | 158 ------------------------------------------------
 1 file changed, 158 deletions(-)
 delete mode 100644 doc/outline.txt

diff --git a/doc/outline.txt b/doc/outline.txt
deleted file mode 100644
index 816cdbdc3ed..00000000000
--- a/doc/outline.txt
+++ /dev/null
@@ -1,158 +0,0 @@
-- The standard environment
-
-  (Some of this can be moved from the Nix manual)
-
-  - Special attributes
-
-  - Generic builder
-
-  - Helper functions
-
-  - GCC / ld wrapper (+ env vars)
-
-  - Phases (+ how to add phases) and hooks
-
-  - Override functions for stdenv
-
-    - Overriding GCC
-
-    - Overriding the setup script
-
-    - Predefined override functions in all-packages.nix: static binary
-      stdenv, dietlibc stdenv
-
-  - Stdenv bootstrap; how to update the Linux bootstrap binaries
-
-  - Specific platform notes (Linux, Native, Cygwin, Mingw)
-
-
-- Support for specific languages
-
-  - Perl
-
-    - Generic Perl builder
-
-  - Python
-
-    - Wrapper generation
-
-  - Haskell
-
-    - TODO
-
-  - Java
-
-    - TODO; Java needs lots of improvement
-
-  - TeX/LaTeX
-
-    - Special support for building TeX documents
-  
-
-- Special kinds of applications
-
-  - OpenGL apps
-
-  - Binary-only apps
-
-  - Linux kernel modules
-
-  - Mozilla plugins/extensions
-
-  - X apps
-
-  - KDE apps
-
-  - GConf-based apps
-
-  - Programs that need wrappers
-
-    - makeWrapper etc.
-
-  - Initial ramdisks
-
-
-- Library functions
-
-  - i.e. in lib/default.nix
-
-
-- Specific package notes
-
-  - Linux kernel; how to update; feature tests
-
-  - X.org; how to update
-
-  - Gnome; how to update
-
-  - GCC?
-
-  - GHC?
-
-  - ...
-
-
-- Meta attributes
-
-  - License attr; possible values
-
-
-- Virtual machine support (for the build farm)
-
-  - vmtools
-
-  - KVM notes
-
-  - Performing a build in a VM
-
-    - In the host FS
-
-    - In a disk image
-
-  - RPM builds
-
-    - RPM image creation
-
-  - Deb builds
-
-    - Deb image creation
-
-  - Debugging VM builds
-  
-
-- Guidelines for Nixpkgs contributions
-
-  - File naming conventions
-
-    - Versioning of packages
-
-  - Tree organisation
-
-  - Variable naming
-
-  - Layout / indentations style
-
-  - Output FS hierarchy (e.g. $out/share/man instead of $out/man)
-
-  
-- Misc
-
-  - Building outside of the Nixpkgs tree
-
-  - Config options
-
-  - Downloading stuff
-
-    - fetchurl
-
-      - mirror:// scheme
-
-    - fetchsvn
-
-    - fetchcvs
-
-    - fetchdarcs
-
-
-- Appendix: Nixpkgs config options
-
-- 
GitLab


From 7703f04b751084aecca9eeda4517ce7c053a4000 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Feb 2014 16:58:12 +0100
Subject: [PATCH 0917/3789] =?UTF-8?q?Add=20a=20stdenv=20adapter=20?=
 =?UTF-8?q?=E2=80=98useGoldLinker=E2=80=99=20to=20force=20use=20of=20Gold?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/build-support/clang-wrapper/default.nix | 10 +++----
 pkgs/build-support/gcc-wrapper/default.nix   |  8 +++---
 pkgs/stdenv/adapters.nix                     | 30 ++++++++++++++------
 pkgs/stdenv/linux/default.nix                |  6 ++--
 pkgs/top-level/all-packages.nix              |  6 ++--
 5 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/pkgs/build-support/clang-wrapper/default.nix b/pkgs/build-support/clang-wrapper/default.nix
index 05b8194697e..49ee34e9926 100644
--- a/pkgs/build-support/clang-wrapper/default.nix
+++ b/pkgs/build-support/clang-wrapper/default.nix
@@ -18,21 +18,21 @@ let
 
   clangVersion = (builtins.parseDrvName clang.name).version;
   clangName = (builtins.parseDrvName clang.name).name;
-  
+
 in
 
 stdenv.mkDerivation {
   name =
     (if name != "" then name else clangName + "-wrapper") +
     (if clang != null && clangVersion != "" then "-" + clangVersion else "");
-  
+
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   clangWrapper = ./clang-wrapper.sh;
   ldWrapper = ./ld-wrapper.sh;
   utils = ./utils.sh;
   addFlags = ./add-flags;
-  
+
   inherit nativeTools nativeLibc nativePrefix clang clangVersion libcxx;
 
   libcxxabi = libcxx.abi or null;
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
   binutils = if nativeTools then null else binutils;
   # The wrapper scripts use 'cat', so we may need coreutils
   coreutils = if nativeTools then null else coreutils;
-  
+
   langC = true;
   langCC = true;
   shell = if shell == "" then stdenv.shell else
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
        if stdenv.lib.hasSuffix "pc-gnu" stdenv.cross.config then "ld.so.1" else
        abort "don't know the name of the dynamic linker for this platform");
   };
-  
+
   meta =
     let clang_ = if clang != null then clang else {}; in
     (if clang_ ? meta then removeAttrs clang.meta ["priority"] else {}) //
diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
index 58dde3485ca..1f521f40585 100644
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   name =
     (if name != "" then name else gccName + "-wrapper") +
     (if gcc != null && gccVersion != "" then "-" + gccVersion else "");
-  
+
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   gccWrapper = ./gcc-wrapper.sh;
@@ -39,13 +39,13 @@ stdenv.mkDerivation {
   ldSolarisWrapper = ./ld-solaris-wrapper.sh;
   utils = ./utils.sh;
   addFlags = ./add-flags;
-  
+
   inherit nativeTools nativeLibc nativePrefix gcc;
   libc = if nativeLibc then null else libc;
   binutils = if nativeTools then null else binutils;
   # The wrapper scripts use 'cat', so we may need coreutils
   coreutils = if nativeTools then null else coreutils;
-  
+
   langC = if nativeTools then true else gcc.langC;
   langCC = if nativeTools then true else gcc.langCC;
   langFortran = if nativeTools then false else gcc ? langFortran;
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
        if stdenv.lib.hasSuffix "pc-gnu" stdenv.cross.config then "ld.so.1" else
        abort "don't know the name of the dynamic linker for this platform");
   };
-  
+
   meta =
     let gcc_ = if gcc != null then gcc else {}; in
     (if gcc_ ? meta then removeAttrs gcc.meta ["priority"] else {}) //
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 662f3307b46..85063621815 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -2,8 +2,7 @@
    a new stdenv with different behaviour, e.g. using a different C
    compiler. */
 
-{dietlibc, fetchurl, runCommand}:
-
+pkgs:
 
 rec {
 
@@ -57,13 +56,13 @@ rec {
 
         NIX_GCC = import ../build-support/gcc-wrapper {
           inherit stdenv;
-          libc = dietlibc;
+          libc = pkgs.dietlibc;
           inherit (stdenv.gcc) gcc binutils nativeTools nativePrefix;
           nativeLibc = false;
         };
       });
       isDietLibC = true;
-    } // {inherit fetchurl;};
+    };
 
 
   # Return a modified stdenv that uses klibc to create small
@@ -80,7 +79,7 @@ rec {
         configureFlags =
           args.configureFlags or "" + " --disable-shared"; # brrr...
 
-        NIX_GCC = runCommand "klibc-wrapper" {} ''
+        NIX_GCC = pkgs.runCommand "klibc-wrapper" {} ''
           mkdir -p $out/bin
           ln -s ${klibc}/bin/klcc $out/bin/gcc
           ln -s ${klibc}/bin/klcc $out/bin/cc
@@ -90,7 +89,7 @@ rec {
       });
       isKlibc = true;
       isStatic = true;
-    } // {inherit fetchurl;};
+    };
 
 
   # Return a modified stdenv that tries to build statically linked
@@ -103,7 +102,7 @@ rec {
           + " --disable-shared"; # brrr...
       });
       isStatic = true;
-    } // {inherit fetchurl;};
+    };
 
 
   # Return a modified stdenv that builds static libraries instead of
@@ -115,7 +114,7 @@ rec {
           toString args.configureFlags or ""
           + " --enable-static --disable-shared";
       });
-    } // {inherit fetchurl;};
+    };
 
 
   # Return a modified stdenv that adds a cross compiler to the
@@ -277,7 +276,7 @@ rec {
   */
   replaceMaintainersField = stdenv: pkgs: maintainers: stdenv //
     { mkDerivation = args:
-        pkgs.lib.recursiveUpdate
+        stdenv.lib.recursiveUpdate
           (stdenv.mkDerivation args)
           { meta.maintainers = maintainers; };
     };
@@ -354,4 +353,17 @@ rec {
       });
     };
 
+
+  /* Modify a stdenv so that it used the Gold linker. */
+  useGoldLinker = stdenv:
+    let
+      binutils = stdenv.gcc.binutils;
+      binutils' = pkgs.runCommand "${binutils.name}-gold" { }
+        ''
+          mkdir -p $out/bin
+          ln -s ${binutils}/bin/* $out/bin/
+          ln -sfn ${binutils}/bin/ld.gold $out/bin/ld
+        ''; # */
+    in overrideGCC stdenv (stdenv.gcc.override { binutils = binutils'; });
+
 }
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 408c362bedb..3d424c904ba 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -11,6 +11,8 @@
 
 rec {
 
+  lib = import ../../../lib;
+
   bootstrapFiles =
     if system == "i686-linux" then import ./bootstrap/i686
     else if system == "x86_64-linux" then import ./bootstrap/x86_64
@@ -134,9 +136,9 @@ rec {
 
   # A helper function to call gcc-wrapper.
   wrapGCC =
-    {gcc ? bootstrapTools, libc, binutils, coreutils, shell ? "", name ? "bootstrap-gcc-wrapper"}:
+    { gcc ? bootstrapTools, libc, binutils, coreutils, shell ? "", name ? "bootstrap-gcc-wrapper" }:
 
-    import ../../build-support/gcc-wrapper {
+    lib.makeOverridable (import ../../build-support/gcc-wrapper) {
       nativeTools = false;
       nativeLibc = false;
       inherit gcc binutils coreutils libc shell name;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 243c021d16d..785e22f95e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -97,7 +97,7 @@ let
     (import ../build-support/trivial-builders.nix { inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; });
 
   stdenvAdapters =
-    import ../stdenv/adapters.nix { inherit (pkgs) dietlibc fetchurl runCommand; };
+    import ../stdenv/adapters.nix pkgs;
 
 
   # Allow packages to be overriden globally via the `packageOverrides'
@@ -3060,9 +3060,9 @@ let
     inherit stdenv coreutils zlib;
   };
 
-  wrapClang = wrapClangWith (import ../build-support/clang-wrapper) glibc;
+  wrapClang = wrapClangWith (makeOverridable (import ../build-support/clang-wrapper)) glibc;
 
-  wrapGCC = wrapGCCWith (import ../build-support/gcc-wrapper) glibc;
+  wrapGCC = wrapGCCWith (makeOverridable (import ../build-support/gcc-wrapper)) glibc;
 
   wrapGCCCross =
     {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}:
-- 
GitLab


From c3d84d15ce29b3be3f55e3c5fded66998202595c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Feb 2014 17:18:38 +0100
Subject: [PATCH 0918/3789] Apply makeOverridable to stdenv
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This removes the need for hacks like stdenv.regenerate.  It also
ensures that overrideGCC is now stackable (so ‘stdenv = useGoldLinker
clangStdenv’ works).
---
 pkgs/development/compilers/dev86/default.nix |   4 +-
 pkgs/stdenv/adapters.nix                     |  14 +-
 pkgs/stdenv/generic/default.nix              | 308 +++++++++----------
 pkgs/top-level/all-packages.nix              |   7 +-
 4 files changed, 157 insertions(+), 176 deletions(-)

diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix
index 539588ac3ad..f37dae80830 100644
--- a/pkgs/development/compilers/dev86/default.nix
+++ b/pkgs/development/compilers/dev86/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "dev86-0.16.19";
-  
+
   src = fetchurl {
     url = http://www.debath.co.uk/dev86/Dev86src-0.16.19.tar.gz;
     sha256 = "33398b87ca85e2b69e4062cf59f2f7354af46da5edcba036c6f97bae17b8d00e";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     ''
       substituteInPlace makefile.in --replace "-O2" "" --replace "-O" ""
     '';
-      
+
   meta = {
     description = "Linux 8086 development environment";
     homepage = http://www.debath.co.uk/;
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 85063621815..da4e0691e43 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -8,20 +8,14 @@ rec {
 
 
   # Override the compiler in stdenv for specific packages.
-  overrideGCC = stdenv: gcc: stdenv //
-    { mkDerivation = args: stdenv.mkDerivation (args // { NIX_GCC = gcc; });
-      inherit gcc;
-    };
+  overrideGCC = stdenv: gcc: stdenv.override { inherit gcc; };
 
 
   # Add some arbitrary packages to buildInputs for specific packages.
   # Used to override packages in stdenv like Make.  Should not be used
   # for other dependencies.
-  overrideInStdenv = stdenv: pkgs: stdenv //
-    { mkDerivation = args: stdenv.mkDerivation (args //
-        { buildInputs = args.buildInputs or [] ++ pkgs; }
-      );
-    };
+  overrideInStdenv = stdenv: pkgs:
+    stdenv.override (prev: { extraBuildInputs = prev.extraBuildInputs or [] ++ pkgs; });
 
 
   # Override the setup script of stdenv.  Useful for testing new
@@ -32,7 +26,7 @@ rec {
   #   randomPkg = import ../bla { ...
   #     stdenv = overrideSetup stdenv ../stdenv/generic/setup-latest.sh;
   #   };
-  overrideSetup = stdenv: setup: stdenv.regenerate setup;
+  overrideSetup = stdenv: setupScript: stdenv.override { inherit setupScript; };
 
 
   # Return a modified stdenv that uses dietlibc to create small
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 4a36327810b..f872d5b1b75 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -1,9 +1,15 @@
+let lib = import ../../../lib; in lib.makeOverridable (
+
 { system, name ? "stdenv", preHook ? "", initialPath, gcc, shell
 , extraAttrs ? {}, overrides ? (pkgs: {}), config
 
 , # The `fetchurl' to use for downloading curl and its dependencies
   # (see all-packages.nix).
   fetchurlBoot
+
+, setupScript ? ./setup.sh
+
+, extraBuildInputs ? []
 }:
 
 if ! builtins ? langVersion then
@@ -14,169 +20,155 @@ else
 
 let
 
-  lib = import ../../../lib;
-
   allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1";
 
   allowBroken = builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
 
   unsafeGetAttrPos = builtins.unsafeGetAttrPos or (n: as: null);
 
-  stdenvGenerator = setupScript: rec {
-
-    # The stdenv that we are producing.
-    result =
-
-      derivation {
-        inherit system name;
-
-        builder = shell;
-
-        args = ["-e" ./builder.sh];
-
-        setup = setupScript;
-
-        inherit preHook initialPath gcc shell;
-
-        propagatedUserEnvPkgs = [gcc] ++
-          lib.filter lib.isDerivation initialPath;
-
-        __ignoreNulls = true;
-      }
-
-      // rec {
-
-        meta = {
-          description = "The default build environment for Unix packages in Nixpkgs";
-        };
-
-        # Add a utility function to produce derivations that use this
-        # stdenv and its shell.
-        mkDerivation = attrs:
-          let
-            pos =
-              if attrs.meta.description or null != null then
-                unsafeGetAttrPos "description" attrs.meta
-              else
-                unsafeGetAttrPos "name" attrs;
-            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"
-          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
-            throw "the package ‘${attrs.name}’ in ${pos'} is not supported on ‘${result.system}’"
-          else
-            lib.addPassthru (derivation (
-              (removeAttrs attrs ["meta" "passthru" "crossAttrs"])
-              // (let
-                buildInputs = attrs.buildInputs or [];
-                nativeBuildInputs = attrs.nativeBuildInputs or [];
-                propagatedBuildInputs = attrs.propagatedBuildInputs or [];
-                propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or [];
-                crossConfig = attrs.crossConfig or null;
-              in
-              {
-                builder = attrs.realBuilder or shell;
-                args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
-                stdenv = result;
-                system = result.system;
-                userHook = config.stdenv.userHook or null;
-
-                # Inputs built by the cross compiler.
-                buildInputs = lib.optionals (crossConfig != null) buildInputs;
-                propagatedBuildInputs = lib.optionals (crossConfig != null)
-                    propagatedBuildInputs;
-                # Inputs built by the usual native compiler.
-                nativeBuildInputs = nativeBuildInputs ++ lib.optionals
-                  (crossConfig == null) buildInputs;
-                propagatedNativeBuildInputs = propagatedNativeBuildInputs ++
-                  lib.optionals (crossConfig == null) propagatedBuildInputs;
-            }))) (
+  # The stdenv that we are producing.
+  result =
+
+    derivation {
+      inherit system name;
+
+      builder = shell;
+
+      args = ["-e" ./builder.sh];
+
+      setup = setupScript;
+
+      inherit preHook initialPath gcc shell;
+
+      propagatedUserEnvPkgs = [gcc] ++
+        lib.filter lib.isDerivation initialPath;
+
+      __ignoreNulls = true;
+    }
+
+    // rec {
+
+      meta = {
+        description = "The default build environment for Unix packages in Nixpkgs";
+      };
+
+      # Add a utility function to produce derivations that use this
+      # stdenv and its shell.
+      mkDerivation = attrs:
+        let
+          pos =
+            if attrs.meta.description or null != null then
+              unsafeGetAttrPos "description" attrs.meta
+            else
+              unsafeGetAttrPos "name" attrs;
+          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"
+        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
+          throw "the package ‘${attrs.name}’ in ${pos'} is not supported on ‘${result.system}’"
+        else
+          lib.addPassthru (derivation (
+            (removeAttrs attrs ["meta" "passthru" "crossAttrs"])
+            // (let
+              buildInputs = attrs.buildInputs or [];
+              nativeBuildInputs = attrs.nativeBuildInputs or [];
+              propagatedBuildInputs = attrs.propagatedBuildInputs or [];
+              propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or [];
+              crossConfig = attrs.crossConfig or null;
+            in
             {
-              # The meta attribute is passed in the resulting attribute set,
-              # but it's not part of the actual derivation, i.e., it's not
-              # passed to the builder and is not a dependency.  But since we
-              # include it in the result, it *is* available to nix-env for
-              # queries.  We also a meta.position attribute here to
-              # identify the source location of the package.
-              meta = attrs.meta or {} // (if pos != null then {
-                position = pos.file + ":" + (toString pos.line);
-              } else {});
-              passthru = attrs.passthru or {};
-            } //
-            # Pass through extra attributes that are not inputs, but
-            # should be made available to Nix expressions using the
-            # derivation (e.g., in assertions).
-            (attrs.passthru or {}));
-
-        # Utility flags to test the type of platform.
-        isDarwin = result.system == "x86_64-darwin";
-        isLinux = result.system == "i686-linux"
-               || result.system == "x86_64-linux"
-               || result.system == "powerpc-linux"
-               || result.system == "armv5tel-linux"
-               || result.system == "armv6l-linux"
-               || result.system == "armv7l-linux"
-               || result.system == "mips64el-linux";
-        isGNU = result.system == "i686-gnu";      # GNU/Hurd
-        isGlibc = isGNU                           # useful for `stdenvNative'
-               || isLinux
-               || result.system == "x86_64-kfreebsd-gnu";
-        isSunOS = result.system == "i686-solaris"
-               || result.system == "x86_64-solaris";
-        isCygwin = result.system == "i686-cygwin";
-        isFreeBSD = result.system == "i686-freebsd"
-               || result.system == "x86_64-freebsd";
-        isOpenBSD = result.system == "i686-openbsd"
-               || result.system == "x86_64-openbsd";
-        isBSD = result.system == "i686-freebsd"
-               || result.system == "x86_64-freebsd"
-               || result.system == "i686-openbsd"
-               || result.system == "x86_64-openbsd";
-        isi686 = result.system == "i686-linux"
-               || result.system == "i686-gnu"
-               || result.system == "i686-freebsd"
-               || result.system == "i686-openbsd"
-               || result.system == "i386-sunos";
-        isx86_64 = result.system == "x86_64-linux"
-               || result.system == "x86_64-darwin"
-               || result.system == "x86_64-freebsd"
-               || result.system == "x86_64-openbsd"
-               || result.system == "x86_64-solaris";
-        is64bit = result.system == "x86_64-linux"
-                || result.system == "x86_64-darwin"
-                || result.system == "x86_64-freebsd"
-                || result.system == "x86_64-openbsd"
-                || result.system == "x86_64-solaris";
-        isMips = result.system == "mips-linux"
-                || result.system == "mips64el-linux";
-        isArm = result.system == "armv5tel-linux"
+              builder = attrs.realBuilder or shell;
+              args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
+              stdenv = result;
+              system = result.system;
+              userHook = config.stdenv.userHook or null;
+
+              # Inputs built by the cross compiler.
+              buildInputs = lib.optionals (crossConfig != null) buildInputs ++ extraBuildInputs;
+              propagatedBuildInputs = lib.optionals (crossConfig != null) propagatedBuildInputs;
+              # Inputs built by the usual native compiler.
+              nativeBuildInputs = nativeBuildInputs ++ lib.optionals (crossConfig == null) buildInputs;
+              propagatedNativeBuildInputs = propagatedNativeBuildInputs ++
+                lib.optionals (crossConfig == null) propagatedBuildInputs;
+          }))) (
+          {
+            # The meta attribute is passed in the resulting attribute set,
+            # but it's not part of the actual derivation, i.e., it's not
+            # passed to the builder and is not a dependency.  But since we
+            # include it in the result, it *is* available to nix-env for
+            # queries.  We also a meta.position attribute here to
+            # identify the source location of the package.
+            meta = attrs.meta or {} // (if pos != null then {
+              position = pos.file + ":" + (toString pos.line);
+            } else {});
+            passthru = attrs.passthru or {};
+          } //
+          # Pass through extra attributes that are not inputs, but
+          # should be made available to Nix expressions using the
+          # derivation (e.g., in assertions).
+          (attrs.passthru or {}));
+
+      # Utility flags to test the type of platform.
+      isDarwin = result.system == "x86_64-darwin";
+      isLinux = result.system == "i686-linux"
+             || result.system == "x86_64-linux"
+             || result.system == "powerpc-linux"
+             || result.system == "armv5tel-linux"
              || result.system == "armv6l-linux"
-             || result.system == "armv7l-linux";
-
-        # Utility function: allow stdenv to be easily regenerated with
-        # a different setup script.  (See all-packages.nix for an
-        # example.)
-        regenerate = stdenvGenerator;
-
-        # For convenience, bring in the library functions in lib/ so
-        # packages don't have to do that themselves.
-        inherit lib;
-
-        inherit fetchurlBoot;
-
-        inherit overrides;
-      }
-
-      # Propagate any extra attributes.  For instance, we use this to
-      # "lift" packages like curl from the final stdenv for Linux to
-      # all-packages.nix for that platform (meaning that it has a line
-      # like curl = if stdenv ? curl then stdenv.curl else ...).
-      // extraAttrs;
-
-  }.result;
-
-
-in stdenvGenerator ./setup.sh
+             || result.system == "armv7l-linux"
+             || result.system == "mips64el-linux";
+      isGNU = result.system == "i686-gnu";      # GNU/Hurd
+      isGlibc = isGNU                           # useful for `stdenvNative'
+             || isLinux
+             || result.system == "x86_64-kfreebsd-gnu";
+      isSunOS = result.system == "i686-solaris"
+             || result.system == "x86_64-solaris";
+      isCygwin = result.system == "i686-cygwin";
+      isFreeBSD = result.system == "i686-freebsd"
+             || result.system == "x86_64-freebsd";
+      isOpenBSD = result.system == "i686-openbsd"
+             || result.system == "x86_64-openbsd";
+      isBSD = result.system == "i686-freebsd"
+             || result.system == "x86_64-freebsd"
+             || result.system == "i686-openbsd"
+             || result.system == "x86_64-openbsd";
+      isi686 = result.system == "i686-linux"
+             || result.system == "i686-gnu"
+             || result.system == "i686-freebsd"
+             || result.system == "i686-openbsd"
+             || result.system == "i386-sunos";
+      isx86_64 = result.system == "x86_64-linux"
+             || result.system == "x86_64-darwin"
+             || result.system == "x86_64-freebsd"
+             || result.system == "x86_64-openbsd"
+             || result.system == "x86_64-solaris";
+      is64bit = result.system == "x86_64-linux"
+              || result.system == "x86_64-darwin"
+              || result.system == "x86_64-freebsd"
+              || result.system == "x86_64-openbsd"
+              || result.system == "x86_64-solaris";
+      isMips = result.system == "mips-linux"
+              || result.system == "mips64el-linux";
+      isArm = result.system == "armv5tel-linux"
+           || result.system == "armv6l-linux"
+           || result.system == "armv7l-linux";
+
+      # For convenience, bring in the library functions in lib/ so
+      # packages don't have to do that themselves.
+      inherit lib;
+
+      inherit fetchurlBoot;
+
+      inherit overrides;
+    }
+
+    # Propagate any extra attributes.  For instance, we use this to
+    # "lift" packages like curl from the final stdenv for Linux to
+    # all-packages.nix for that platform (meaning that it has a line
+    # like curl = if stdenv ? curl then stdenv.curl else ...).
+    // extraAttrs;
+
+in result)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 785e22f95e9..1495372f6da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -782,12 +782,7 @@ let
 
   despotify = callPackage ../development/libraries/despotify { };
 
-  dev86 = callPackage ../development/compilers/dev86 {
-    /* Using GNU Make 3.82 leads to this:
-         make[4]: *** No rule to make target `__ldivmod.o)'
-       So use 3.81.  */
-    stdenv = overrideInStdenv stdenv [gnumake381];
-  };
+  dev86 = callPackage ../development/compilers/dev86 { };
 
   dnsmasq = callPackage ../tools/networking/dnsmasq { };
 
-- 
GitLab


From 58a863268a8f4cb0b5e9ed7bf7cb00b164b576a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Feb 2014 17:34:15 +0100
Subject: [PATCH 0919/3789] stdenv: Simplify

---
 pkgs/stdenv/generic/default.nix | 84 ++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index f872d5b1b75..457eb29ee14 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -112,49 +112,49 @@ let
           (attrs.passthru or {}));
 
       # Utility flags to test the type of platform.
-      isDarwin = result.system == "x86_64-darwin";
-      isLinux = result.system == "i686-linux"
-             || result.system == "x86_64-linux"
-             || result.system == "powerpc-linux"
-             || result.system == "armv5tel-linux"
-             || result.system == "armv6l-linux"
-             || result.system == "armv7l-linux"
-             || result.system == "mips64el-linux";
-      isGNU = result.system == "i686-gnu";      # GNU/Hurd
-      isGlibc = isGNU                           # useful for `stdenvNative'
+      isDarwin = system == "x86_64-darwin";
+      isLinux = system == "i686-linux"
+             || system == "x86_64-linux"
+             || system == "powerpc-linux"
+             || system == "armv5tel-linux"
+             || system == "armv6l-linux"
+             || system == "armv7l-linux"
+             || system == "mips64el-linux";
+      isGNU = system == "i686-gnu"; # GNU/Hurd
+      isGlibc = isGNU # useful for `stdenvNative'
              || isLinux
-             || result.system == "x86_64-kfreebsd-gnu";
-      isSunOS = result.system == "i686-solaris"
-             || result.system == "x86_64-solaris";
-      isCygwin = result.system == "i686-cygwin";
-      isFreeBSD = result.system == "i686-freebsd"
-             || result.system == "x86_64-freebsd";
-      isOpenBSD = result.system == "i686-openbsd"
-             || result.system == "x86_64-openbsd";
-      isBSD = result.system == "i686-freebsd"
-             || result.system == "x86_64-freebsd"
-             || result.system == "i686-openbsd"
-             || result.system == "x86_64-openbsd";
-      isi686 = result.system == "i686-linux"
-             || result.system == "i686-gnu"
-             || result.system == "i686-freebsd"
-             || result.system == "i686-openbsd"
-             || result.system == "i386-sunos";
-      isx86_64 = result.system == "x86_64-linux"
-             || result.system == "x86_64-darwin"
-             || result.system == "x86_64-freebsd"
-             || result.system == "x86_64-openbsd"
-             || result.system == "x86_64-solaris";
-      is64bit = result.system == "x86_64-linux"
-              || result.system == "x86_64-darwin"
-              || result.system == "x86_64-freebsd"
-              || result.system == "x86_64-openbsd"
-              || result.system == "x86_64-solaris";
-      isMips = result.system == "mips-linux"
-              || result.system == "mips64el-linux";
-      isArm = result.system == "armv5tel-linux"
-           || result.system == "armv6l-linux"
-           || result.system == "armv7l-linux";
+             || system == "x86_64-kfreebsd-gnu";
+      isSunOS = system == "i686-solaris"
+             || system == "x86_64-solaris";
+      isCygwin = system == "i686-cygwin";
+      isFreeBSD = system == "i686-freebsd"
+              || system == "x86_64-freebsd";
+      isOpenBSD = system == "i686-openbsd"
+              || system == "x86_64-openbsd";
+      isBSD = system == "i686-freebsd"
+           || system == "x86_64-freebsd"
+           || system == "i686-openbsd"
+           || system == "x86_64-openbsd";
+      isi686 = system == "i686-linux"
+            || system == "i686-gnu"
+            || system == "i686-freebsd"
+            || system == "i686-openbsd"
+            || system == "i386-sunos";
+      isx86_64 = system == "x86_64-linux"
+              || system == "x86_64-darwin"
+              || system == "x86_64-freebsd"
+              || system == "x86_64-openbsd"
+              || system == "x86_64-solaris";
+      is64bit = system == "x86_64-linux"
+             || system == "x86_64-darwin"
+             || system == "x86_64-freebsd"
+             || system == "x86_64-openbsd"
+             || system == "x86_64-solaris";
+      isMips = system == "mips-linux"
+            || system == "mips64el-linux";
+      isArm = system == "armv5tel-linux"
+           || system == "armv6l-linux"
+           || system == "armv7l-linux";
 
       # For convenience, bring in the library functions in lib/ so
       # packages don't have to do that themselves.
-- 
GitLab


From bea2b3c5177a9fae5df5598574bd25bca8f6cb09 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Feb 2014 12:49:53 +0100
Subject: [PATCH 0920/3789] addCoverageInstrumentation: Set NIX_CFLAGS_COMPILE
 as an attribute

This allows it to show up in nix-shell.
---
 pkgs/stdenv/adapters.nix | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index da4e0691e43..3bac5341154 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -231,8 +231,17 @@ rec {
      programs like lcov to produce pretty-printed reports.
   */
   addCoverageInstrumentation = stdenv:
-    addAttrsToDerivation
-      {
+    # Object files instrumented with coverage analysis write runtime
+    # coverage data to <path>/<object>.gcda, where <path> is the
+    # location where gcc originally created the object file.  That
+    # would be /tmp/nix-build-<something>, which will be long gone by
+    # the time we run the program.  Furthermore, the <object>.gcno
+    # files created at compile time are also written there.  And to
+    # make nice coverage reports with lcov, we need the source code.
+    # So we have to use the `keepBuildTree' adapter as well.
+    let stdenv' = cleanupBuildTree (keepBuildTree stdenv); in
+    { mkDerivation = args: stdenv'.mkDerivation (args // {
+        NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -O0 --coverage";
         postUnpack =
           ''
             # This is an uberhack to prevent libtool from removing gcno
@@ -242,21 +251,9 @@ rec {
             for i in $(find -name ltmain.sh); do
                 substituteInPlace $i --replace '*.$objext)' '*.$objext | *.gcno)'
             done
-
-            export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -O0 --coverage"
-          '';
-      }
-
-      # Object files instrumented with coverage analysis write
-      # runtime coverage data to <path>/<object>.gcda, where <path>
-      # is the location where gcc originally created the object
-      # file.  That would be /tmp/nix-build-<something>, which will
-      # be long gone by the time we run the program.  Furthermore,
-      # the <object>.gcno files created at compile time are also
-      # written there.  And to make nice coverage reports with lcov,
-      # we need the source code.  So we have to use the
-      # `keepBuildTree' adapter as well.
-      (cleanupBuildTree (keepBuildTree stdenv));
+          '' + args.postUnpack or "";
+      });
+    };
 
 
   /* Replace the meta.maintainers field of a derivation.  This is useful
-- 
GitLab


From 80647127a3e7e3eaf84dc6ff0af13ff4aaad2e0b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Feb 2014 14:11:21 +0100
Subject: [PATCH 0921/3789] Turn the coverage analysis stdenv adapters into
 setup hooks

Stdenv adapters are kinda weird and un-idiomatic (especially when they
don't actually change stdenv).  It's more idiomatic to say

  buildInputs = [ makeCoverageAnalysisReport ];
---
 pkgs/build-support/release/default.nix        |  2 +-
 pkgs/build-support/release/nix-build.nix      | 29 ++-----------------
 .../enable-coverage-instrumentation.sh        | 14 +++++++++
 .../make-coverage-analysis-report.sh          | 18 ++++++++++++
 pkgs/stdenv/adapters.nix                      | 24 +--------------
 pkgs/stdenv/generic/default.nix               |  4 +--
 pkgs/top-level/all-packages.nix               |  6 ++++
 7 files changed, 45 insertions(+), 52 deletions(-)
 create mode 100644 pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh
 create mode 100644 pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh

diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix
index 3d593f0b6bb..acad3487dad 100644
--- a/pkgs/build-support/release/default.nix
+++ b/pkgs/build-support/release/default.nix
@@ -27,7 +27,7 @@ rec {
     } // args);
 
   coverageAnalysis = args: nixBuild (
-    { inherit lcov;
+    { inherit lcov enableCoverageInstrumentation makeCoverageAnalysisReport;
       doCoverageAnalysis = true;
     } // args);
 
diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index 88bafd84faa..42533b0094a 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -15,6 +15,7 @@
 , failureHook ? null
 , prePhases ? []
 , postPhases ? []
+, buildInputs ? []
 , ... } @ args:
 
 stdenv.mkDerivation (
@@ -61,13 +62,6 @@ stdenv.mkDerivation (
       . ${./functions.sh}
       origSrc=$src
       src=$(findTarballs $src | head -1)
-
-      # Set GCC flags for coverage analysis, if desired.
-      if test -n "${toString doCoverageAnalysis}"; then
-          export NIX_CFLAGS_COMPILE="-O0 --coverage $NIX_CFLAGS_COMPILE"
-          export CFLAGS="-O0"
-          export CXXFLAGS="-O0"
-      fi
     '';
 
     initPhase = ''
@@ -85,30 +79,13 @@ stdenv.mkDerivation (
 
     prePhases = ["initPhase"] ++ prePhases;
 
-    # In the report phase, create a coverage analysis report.
-    coverageReportPhase = if doCoverageAnalysis then ''
-      ${args.lcov}/bin/lcov --directory . --capture --output-file app.info
-      set -o noglob
-      ${args.lcov}/bin/lcov --remove app.info $lcovFilter > app2.info
-      set +o noglob
-      mv app2.info app.info
-
-      mkdir $out/coverage
-      ${args.lcov}/bin/genhtml app.info $lcovExtraTraceFiles -o $out/coverage > log
-
-      # Grab the overall coverage percentage for use in release overviews.
-      grep "Overall coverage rate" log | sed 's/^.*(\(.*\)%).*$/\1/' > $out/nix-support/coverage-rate
-
-      echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
-    '' else "";
-
+    buildInputs = buildInputs ++ [ args.makeCoverageAnalysisReport ];
 
     lcovFilter = ["/nix/store/*"] ++ lcovFilter;
 
     inherit lcovExtraTraceFiles;
 
-    postPhases = postPhases ++
-      (stdenv.lib.optional doCoverageAnalysis "coverageReportPhase") ++ ["finalPhase"];
+    postPhases = postPhases ++ ["finalPhase"];
 
     meta = (if args ? meta then args.meta else {}) // {
       description = if doCoverageAnalysis then "Coverage analysis" else "Nix package for ${stdenv.system}";
diff --git a/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh b/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh
new file mode 100644
index 00000000000..08ef490e244
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh
@@ -0,0 +1,14 @@
+# Force GCC to build with coverage instrumentation.  Also disable
+# optimisation, since it may confuse things.
+export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -O0 --coverage"
+
+# FIXME: Handle the case where postUnpack is already set.
+postUnpack() {
+    # This is an uberhack to prevent libtool from remoaving gcno
+    # files.  This has been fixed in libtool, but there are packages
+    # out there with old ltmain.sh scripts.  See
+    # http://www.mail-archive.com/libtool@gnu.org/msg10725.html
+    for i in $(find -name ltmain.sh); do
+        substituteInPlace $i --replace '*.$objext)' '*.$objext | *.gcno)'
+    done
+}
diff --git a/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh b/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh
new file mode 100644
index 00000000000..2951666651c
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh
@@ -0,0 +1,18 @@
+postPhases+=" coverageReportPhase"
+
+coverageReportPhase() {
+    lcov --directory . --capture --output-file app.info
+    set -o noglob
+    lcov --remove app.info $lcovFilter > app2.info
+    set +o noglob
+    mv app2.info app.info
+
+    mkdir -p $out/coverage
+    genhtml app.info $lcovExtraTraceFiles -o $out/coverage > log
+
+    # Grab the overall coverage percentage for use in release overviews.
+    mkdir -p $out/nix-support
+    grep "Overall coverage rate" log | sed 's/^.*(\(.*\)%).*$/\1/' > $out/nix-support/coverage-rate
+
+    echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
+}
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 3bac5341154..cb7e3ba925f 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -231,29 +231,7 @@ rec {
      programs like lcov to produce pretty-printed reports.
   */
   addCoverageInstrumentation = stdenv:
-    # Object files instrumented with coverage analysis write runtime
-    # coverage data to <path>/<object>.gcda, where <path> is the
-    # location where gcc originally created the object file.  That
-    # would be /tmp/nix-build-<something>, which will be long gone by
-    # the time we run the program.  Furthermore, the <object>.gcno
-    # files created at compile time are also written there.  And to
-    # make nice coverage reports with lcov, we need the source code.
-    # So we have to use the `keepBuildTree' adapter as well.
-    let stdenv' = cleanupBuildTree (keepBuildTree stdenv); in
-    { mkDerivation = args: stdenv'.mkDerivation (args // {
-        NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -O0 --coverage";
-        postUnpack =
-          ''
-            # This is an uberhack to prevent libtool from removing gcno
-            # files.  This has been fixed in libtool, but there are
-            # packages out there with old ltmain.sh scripts.
-            # See http://www.mail-archive.com/libtool@gnu.org/msg10725.html
-            for i in $(find -name ltmain.sh); do
-                substituteInPlace $i --replace '*.$objext)' '*.$objext | *.gcno)'
-            done
-          '' + args.postUnpack or "";
-      });
-    };
+    cleanupBuildTree (keepBuildTree (overrideInStdenv stdenv [ pkgs.enableCoverageInstrumentation ]));
 
 
   /* Replace the meta.maintainers field of a derivation.  This is useful
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 457eb29ee14..6e74af5fce5 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -87,10 +87,10 @@ let
               userHook = config.stdenv.userHook or null;
 
               # Inputs built by the cross compiler.
-              buildInputs = lib.optionals (crossConfig != null) buildInputs ++ extraBuildInputs;
+              buildInputs = lib.optionals (crossConfig != null) (buildInputs ++ extraBuildInputs);
               propagatedBuildInputs = lib.optionals (crossConfig != null) propagatedBuildInputs;
               # Inputs built by the usual native compiler.
-              nativeBuildInputs = nativeBuildInputs ++ lib.optionals (crossConfig == null) buildInputs;
+              nativeBuildInputs = nativeBuildInputs ++ lib.optionals (crossConfig == null) (buildInputs ++ extraBuildInputs);
               propagatedNativeBuildInputs = propagatedNativeBuildInputs ++
                 lib.optionals (crossConfig == null) propagatedBuildInputs;
           }))) (
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1495372f6da..bbc14656e8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -396,6 +396,12 @@ let
 
   fixDarwinDylibNames = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-dylib-names.sh;
 
+  enableCoverageInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh;
+
+  makeCoverageAnalysisReport = makeSetupHook
+    { deps = [ pkgs.lcov pkgs.enableCoverageInstrumentation ]; }
+    ../build-support/setup-hooks/make-coverage-analysis-report.sh;
+
 
   ### TOOLS
 
-- 
GitLab


From a123a2675bdd7da9b592fb7ab3db328208f88843 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Feb 2014 14:37:43 +0100
Subject: [PATCH 0922/3789] lcov: Filter out /nix/store/* by default

---
 pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh b/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh
index 2951666651c..4b8abb61ace 100644
--- a/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh
+++ b/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh
@@ -3,7 +3,7 @@ postPhases+=" coverageReportPhase"
 coverageReportPhase() {
     lcov --directory . --capture --output-file app.info
     set -o noglob
-    lcov --remove app.info $lcovFilter > app2.info
+    lcov --remove app.info ${lcovFilter:-"/nix/store/*"} > app2.info
     set +o noglob
     mv app2.info app.info
 
-- 
GitLab


From 428469443987e063760cf85235d96f02f51dc891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Feb 2014 19:16:15 +0100
Subject: [PATCH 0923/3789] nixos/mesa: don't create /run/opengl-driver-32 ...

... if on 64-bit and without 32-bit drivers.
Also assert against requesting 32-bit drivers on 32-bit machine.
---
 nixos/modules/services/x11/mesa.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/mesa.nix b/nixos/modules/services/x11/mesa.nix
index f892a151758..12fc7ae1178 100644
--- a/nixos/modules/services/x11/mesa.nix
+++ b/nixos/modules/services/x11/mesa.nix
@@ -61,13 +61,18 @@ in {
   };
 
   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.";
+    };
+
     system.activationScripts.setup-opengl.deps = [];
     system.activationScripts.setup-opengl.text = ''
       rm -f /run/opengl-driver{,-32}
-      ${optionalString (!cfg.driSupport32Bit) "ln -sf opengl-driver /run/opengl-driver-32"}
-
-      ${# !!! The OpenGL driver depends on what's detected at runtime.
-        if elem "nvidia" cfg.videoDrivers then
+      ${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
           ''
             ln -sf ${kernelPackages.nvidia_x11} /run/opengl-driver
             ${optionalString cfg.driSupport32Bit
@@ -89,8 +94,7 @@ in {
             ${optionalString cfg.driSupport32Bit
               "ln -sf ${pkgs_i686.mesa_drivers} /run/opengl-driver-32"}
           ''
-      }
-    '';
+      );
 
     environment.variables.LD_LIBRARY_PATH =
       [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ]
-- 
GitLab


From 65fe5331f4247ca3b1b5baa6f64a19c195df9f1b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 5 Feb 2014 20:22:14 +0200
Subject: [PATCH 0924/3789] kde4_next.calligra: update from 2.7.2 to 2.7.5

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

diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 137e7be019f..e87053d5326 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -6,11 +6,11 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "calligra-2.7.2";
+  name = "calligra-2.7.5";
 
   src = fetchurl {
     url = "mirror://kde/stable/${name}/${name}.tar.xz";
-    sha256 = "1awnvv62fp5bjhi6fys37s6lpzxaig4v15m1zjlgxq82ig61w6sq";
+    sha256 = "0png8ac10xywxsml1z18as18kc9k9162l6an67hi6lgx0rv27ldi";
   };
 
   nativeBuildInputs = [ cmake perl pkgconfig ];
-- 
GitLab


From c60f9cdb3eabdf28c63b6b32f033c9975de02be2 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 5 Feb 2014 20:28:53 +0200
Subject: [PATCH 0925/3789] kwebkitpart: update from 1.3.2 to 1.3.3

---
 .../networking/browsers/kwebkitpart/default.nix            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/kwebkitpart/default.nix b/pkgs/applications/networking/browsers/kwebkitpart/default.nix
index e9babf787bd..5ced048fe64 100644
--- a/pkgs/applications/networking/browsers/kwebkitpart/default.nix
+++ b/pkgs/applications/networking/browsers/kwebkitpart/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchgit, kdelibs }:
 
 stdenv.mkDerivation rec {
-  name = "kwebkitpart-1.3.2";
+  name = "kwebkitpart-${version}";
+  version = "1.3.3";
 
   src = fetchgit {
     url = git://anongit.kde.org/kwebkitpart;
-    rev = "292f32fda933b2ead5a61ff1ec457f839fad5c85";
-    sha256 = "1b2jar9b1yb3gy9fnq8dn2n4z8lffb6pfrj9jc4rjzv5b3rwh1ak";
+    rev = "refs/tags/v${version}";
+    sha256 = "0kszffgg3zpf319lmzlmdba5gq8kdr5xwb69xwy4s2abc9nvwvbi";
   };
 
   buildInputs = [ kdelibs ];
-- 
GitLab


From d7cb2f5712ec392093bc2cd714f099eaec74acbc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Feb 2014 19:45:15 +0100
Subject: [PATCH 0926/3789] lcov: Apply upstream patch for GCC >= 4.7
 compatibility

---
 pkgs/development/tools/analysis/lcov/default.nix    |  3 ++-
 .../tools/analysis/lcov/lcov-except-unreach.patch   | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/analysis/lcov/lcov-except-unreach.patch

diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix
index 0a0974b886a..92e53204a34 100644
--- a/pkgs/development/tools/analysis/lcov/default.nix
+++ b/pkgs/development/tools/analysis/lcov/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
   };
 
   patches =
-    (stdenv.lib.optional stdenv.isFreeBSD ./freebsd-install.patch);
+    [ ./lcov-except-unreach.patch ]
+    ++ stdenv.lib.optional stdenv.isFreeBSD ./freebsd-install.patch;
 
   preBuild = ''
     makeFlagsArray=(PREFIX=$out BIN_DIR=$out/bin MAN_DIR=$out/share/man)
diff --git a/pkgs/development/tools/analysis/lcov/lcov-except-unreach.patch b/pkgs/development/tools/analysis/lcov/lcov-except-unreach.patch
new file mode 100644
index 00000000000..6c8d8664d02
--- /dev/null
+++ b/pkgs/development/tools/analysis/lcov/lcov-except-unreach.patch
@@ -0,0 +1,13 @@
+http://ltp.cvs.sourceforge.net/viewvc/ltp/utils/analysis/lcov/bin/geninfo?r1=1.117&r2=1.118&view=patch
+
+--- a/bin/geninfo	2012/10/10 08:36:16	1.117
++++ b/bin/geninfo	2012/11/13 09:58:53	1.118
+@@ -1833,7 +1833,7 @@
+ 						push(@result, 0);
+ 					} else {
+ 						# Check for zero count
+-						if ($count eq "#####") {
++						if ($count =~ /^[#=]/) {
+ 							$count = 0;
+ 						}
+ 						push(@result, 1);
-- 
GitLab


From eed3c8a6eccaaa5680d4d358e4c996d38576ca83 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Feb 2014 20:17:01 +0100
Subject: [PATCH 0927/3789] lcov: Don't warn about missing source files

Another upstream patch for compatibility with current GCCs.
---
 .../tools/analysis/lcov/default.nix           |  2 +-
 .../tools/analysis/lcov/no-warn-missing.patch | 54 +++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/analysis/lcov/no-warn-missing.patch

diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix
index 92e53204a34..9ad34097d0b 100644
--- a/pkgs/development/tools/analysis/lcov/default.nix
+++ b/pkgs/development/tools/analysis/lcov/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   patches =
-    [ ./lcov-except-unreach.patch ]
+    [ ./lcov-except-unreach.patch ./no-warn-missing.patch ]
     ++ stdenv.lib.optional stdenv.isFreeBSD ./freebsd-install.patch;
 
   preBuild = ''
diff --git a/pkgs/development/tools/analysis/lcov/no-warn-missing.patch b/pkgs/development/tools/analysis/lcov/no-warn-missing.patch
new file mode 100644
index 00000000000..fa1f476fba0
--- /dev/null
+++ b/pkgs/development/tools/analysis/lcov/no-warn-missing.patch
@@ -0,0 +1,54 @@
+http://ltp.cvs.sourceforge.net/viewvc/ltp/utils/analysis/lcov/bin/geninfo?view=log
+
+--- a/bin/geninfo	2013/01/10 09:02:32	1.119
++++ b/bin/geninfo	2013/02/22 14:09:08	1.120
+@@ -864,7 +864,6 @@
+ 	my $source;		# gcov source header information
+ 	my $object;		# gcov object header information
+ 	my @matches;		# List of absolute paths matching filename
+-	my @unprocessed;	# List of unprocessed source code files
+ 	my $base_dir;		# Base directory for current file
+ 	my @tmp_links;		# Temporary links to be cleaned up
+ 	my @result;
+@@ -1060,7 +1059,6 @@
+ 
+ 	# Traverse the list of generated .gcov files and combine them into a
+ 	# single .info file
+-	@unprocessed = keys(%{$instr});
+ 	foreach $gcov_file (sort(@gcov_list))
+ 	{
+ 		my $i;
+@@ -1143,16 +1141,6 @@
+ 						\@matches, \@gcov_content);
+ 		}
+ 
+-		# Remove processed file from list
+-		for ($index = scalar(@unprocessed) - 1; $index >= 0; $index--)
+-		{
+-			if ($unprocessed[$index] eq $source_filename)
+-			{
+-				splice(@unprocessed, $index, 1);
+-				last;
+-			}
+-		}
+-
+ 		# Skip external files if requested
+ 		if (!$opt_external) {
+ 			if (is_external($source_filename)) {
+@@ -1297,16 +1285,6 @@
+ 		unlink($gcov_file);
+ 	}
+ 
+-	# Check for files which show up in the graph file but were never
+-	# processed
+-	if (@unprocessed && @gcov_list)
+-	{
+-		foreach (@unprocessed)
+-		{
+-			warn("WARNING: no data found for $_\n");
+-		}
+-	}
+-
+ 	if (!($output_filename && ($output_filename eq "-")))
+ 	{
+ 		close(INFO_HANDLE);
-- 
GitLab


From d39d5cbc166532d5fc581e8910a6a77010eee57c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Feb 2014 20:24:37 +0100
Subject: [PATCH 0928/3789] gnome2.vte: fix CVE-2012-2738 (just DOS)

---
 pkgs/desktops/gnome-2/desktop/vte/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
index e9928aa73cf..aca30f87dfc 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
@@ -9,7 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "00zrip28issgmz2cqk5k824cbqpbixi5x7k88zxksdqpnq1f414d";
   };
 
-  patches = [ ./alt.patch ];
+  patches = [
+    ./alt.patch
+    ( fetchurl { # CVE-2012-2738
+      url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/"
+        + "vte/files/vte-0.28.2-limit-arguments.patch?revision=1.1";
+      sha256 = "1s8agx74wa7wlv9ybd5h3dp4hzf4ddg7piyan37g2ab3fnvg4jhn";
+    } )
+  ];
 
   buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++
                 stdenv.lib.optionals pythonSupport [python pygtk];
-- 
GitLab


From 37a354f632491da50b9d6034230617e0dce1bf4c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:39:04 +0100
Subject: [PATCH 0929/3789] haskell-llvm-general: drop unnecessary function
 arguments

---
 pkgs/development/libraries/haskell/llvm-general/3.4.nix | 1 -
 pkgs/top-level/haskell-packages.nix                     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.nix b/pkgs/development/libraries/haskell/llvm-general/3.4.nix
index 3206493eee3..7749c47689e 100644
--- a/pkgs/development/libraries/haskell/llvm-general/3.4.nix
+++ b/pkgs/development/libraries/haskell/llvm-general/3.4.nix
@@ -1,7 +1,6 @@
 { cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec
 , QuickCheck, setenv, testFramework, testFrameworkHunit
 , testFrameworkQuickcheck2, transformers, utf8String
-, ncurses, zlib
 }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5bcd7b3a69d..c6776b913e3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1574,7 +1574,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   llvmGeneral = callPackage ../development/libraries/haskell/llvm-general/3.4.nix {
     llvmConfig = pkgs.llvm;
-    inherit (pkgs) zlib ncurses;
   };
 
   llvmGeneralPure_3_3 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.nix { };
-- 
GitLab


From eb7b5317fdfe79888695f9b7fc7086bdca890760 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:40:47 +0100
Subject: [PATCH 0930/3789] haskell-packages.nix: provide a consistent
 attribute name for llvmGeneral_3_4

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c6776b913e3..058343267c9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1571,14 +1571,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     llvmConfig = pkgs.llvm_33;
     llvmGeneralPure = self.llvmGeneralPure_3_3;
   };
-
-  llvmGeneral = callPackage ../development/libraries/haskell/llvm-general/3.4.nix {
+  llvmGeneral_3_4 = callPackage ../development/libraries/haskell/llvm-general/3.4.nix {
     llvmConfig = pkgs.llvm;
   };
+  llvmGeneral = self.llvmGeneral_3_4;
 
   llvmGeneralPure_3_3 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.nix { };
-
-  llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.nix {};
+  llvmGeneralPure_3_4 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.nix {};
+  llvmGeneralPure = self.llvmGeneralPure_3_4;
 
   lrucache = callPackage ../development/libraries/haskell/lrucache {};
 
-- 
GitLab


From f379d2f5b454f8a22c036eacdf2b01a772563888 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:41:05 +0100
Subject: [PATCH 0931/3789] haskell-abstract-deque-tests: add version 0.3

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

diff --git a/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix b/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix
new file mode 100644
index 00000000000..66db8b44dc5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix
@@ -0,0 +1,21 @@
+{ cabal, abstractDeque, HUnit, random, testFramework
+, testFrameworkHunit, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "abstract-deque-tests";
+  version = "0.3";
+  sha256 = "19gb5x5z3nvazdra3skm24c2g2byj0i4cjbzfwfghnb5q96gn5sz";
+  buildDepends = [
+    abstractDeque HUnit random testFramework testFrameworkHunit time
+  ];
+  testDepends = [
+    abstractDeque HUnit random testFramework testFrameworkHunit time
+  ];
+  meta = {
+    homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
+    description = "A test-suite for any queue or double-ended queue satisfying an interface";
+    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 058343267c9..8cfd3fec62d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -520,6 +520,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   abstractDeque = callPackage ../development/libraries/haskell/abstract-deque {};
 
+  abstractDequeTests = callPackage ../development/libraries/haskell/abstract-deque-tests {};
+
   abstractPar = callPackage ../development/libraries/haskell/abstract-par {};
 
   adjunctions = callPackage ../development/libraries/haskell/adjunctions {};
-- 
GitLab


From cdbca9518e3f0e45e1c94a7ffd673887e979fc1c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:42:31 +0100
Subject: [PATCH 0932/3789] haskell-HList: update to version 0.3.2.0

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

diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix
index ae6f8e435f7..aafa2fae825 100644
--- a/pkgs/development/libraries/haskell/HList/default.nix
+++ b/pkgs/development/libraries/haskell/HList/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HList";
-  version = "0.3.1.0";
-  sha256 = "1cq7l7cv62jf47s75ycsgxg75kkrgnnrpb6y22cskc97hkfsnjmk";
+  version = "0.3.2.0";
+  sha256 = "1cv27y8jg38yvfca83zn3fzq7mkzhqw7j1y7kg5fkfh4wd8ixs1f";
   buildDepends = [ mtl ];
   testDepends = [ cmdargs doctest filepath hspec lens mtl syb ];
   buildTools = [ diffutils ];
-- 
GitLab


From 9c3c0397a24334508ef76da070c28c1be563c199 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:42:33 +0100
Subject: [PATCH 0933/3789] haskell-HTF: update to version 0.11.1.1

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

diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix
index ddcb8c0e371..509719d383a 100644
--- a/pkgs/development/libraries/haskell/HTF/default.nix
+++ b/pkgs/development/libraries/haskell/HTF/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HTF";
-  version = "0.11.1.0";
-  sha256 = "0prijzy852fkr8z58rhba6jvrb27b6lyz2jdgqb7r1jrnkhqmhpq";
+  version = "0.11.1.1";
+  sha256 = "0j425h0av82cbwkfds2jhf3hsm2wd8vca8bjdyg8v09k6kb220cs";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From e41a33b48faef62638b26108226d1cf87a3de0b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:42:35 +0100
Subject: [PATCH 0934/3789] haskell-abstract-deque: update to version 0.3

---
 .../libraries/haskell/abstract-deque/default.nix  | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix
index 03ae29aef73..c9df3b5c86a 100644
--- a/pkgs/development/libraries/haskell/abstract-deque/default.nix
+++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix
@@ -1,18 +1,13 @@
-{ cabal, HUnit, random, testFramework, testFrameworkHunit, time }:
+{ cabal, random, time }:
 
 cabal.mkDerivation (self: {
   pname = "abstract-deque";
-  version = "0.2.2.1";
-  sha256 = "0saf7j8fdqqk9msxrfja22zx8v0ibzrqx3v9l07g5n84yh4ydbdx";
-  buildDepends = [
-    HUnit random testFramework testFrameworkHunit time
-  ];
-  testDepends = [
-    HUnit random testFramework testFrameworkHunit time
-  ];
+  version = "0.3";
+  sha256 = "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9";
+  buildDepends = [ random time ];
   doCheck = false;
   meta = {
-    homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
+    homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
     description = "Abstract, parameterized interface to mutable Deques";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From 30ae0ae0a8f18a24ccc7bcf3febd4c49e71e5364 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:42:37 +0100
Subject: [PATCH 0935/3789] haskell-ansi-terminal: update to version 0.6.1.1

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

diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix
index 2e9b1c0c25f..59eb51845b8 100644
--- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix
+++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ansi-terminal";
-  version = "0.6.1";
-  sha256 = "0ncghc0z2xkfn1hfvyl0haf4mia9lhjbiqda11nxkqqfxdyklb2j";
+  version = "0.6.1.1";
+  sha256 = "06pdcpp2z7wk9mkr5lzwk64lqhj09c7l1ah4s3vz7zwrdzfaccwi";
   isLibrary = true;
   isExecutable = true;
   meta = {
-- 
GitLab


From 2916f880b1d67a4eb81ebbedb63e5a6d538836ec Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:42:39 +0100
Subject: [PATCH 0936/3789] haskell-bindings-DSL: update to version 1.0.21

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

diff --git a/pkgs/development/libraries/haskell/bindings-DSL/default.nix b/pkgs/development/libraries/haskell/bindings-DSL/default.nix
index ed2a631419a..223760b291a 100644
--- a/pkgs/development/libraries/haskell/bindings-DSL/default.nix
+++ b/pkgs/development/libraries/haskell/bindings-DSL/default.nix
@@ -2,10 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "bindings-DSL";
-  version = "1.0.20";
-  sha256 = "11qc02fkmrpy6c1a85lwlz06m4fpvfpbpbxgv5rkyb1amg2cnklq";
+  version = "1.0.21";
+  sha256 = "0fbrl9jfkwlv66v3cv6cj51kk7jjdry0jz8k83bf4mav26123mk9";
   meta = {
-    homepage = "http://bitbucket.org/mauricio/bindings-dsl";
+    homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
     description = "FFI domain specific language, on top of hsc2hs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From 2f17d51ce8df8f394cc5f7a3e6a872441ebd5aa5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:42:41 +0100
Subject: [PATCH 0937/3789] haskell-blaze-html: update to version 0.7.0.1

---
 pkgs/development/libraries/haskell/blaze-html/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index bec48f8e44f..81b00235673 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -4,16 +4,13 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-html";
-  version = "0.7.0.0";
-  sha256 = "1k8mxq3hmf2s7qab67jz3yaan7wdc4mn5sa00rw5zk4mjh722w86";
+  version = "0.7.0.1";
+  sha256 = "05z0a6x49f56bazkcdxpdi2a7pyzsiv7qc72grcz9sqjz1d6yagh";
   buildDepends = [ blazeBuilder blazeMarkup text ];
   testDepends = [
     blazeBuilder blazeMarkup HUnit QuickCheck testFramework
     testFrameworkHunit testFrameworkQuickcheck2 text
   ];
-  patchPhase = ''
-    sed -i -e 's|blaze-markup.*>=.*,|blaze-markup,|' blaze-html.cabal
-  '';
   meta = {
     homepage = "http://jaspervdj.be/blaze";
     description = "A blazingly fast HTML combinator library for Haskell";
-- 
GitLab


From 31e1399a31b699dcfc4e0a0a2986f2da408565a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:42:43 +0100
Subject: [PATCH 0938/3789] haskell-blaze-svg: update to version 0.3.3.1

---
 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 b342b35dbe6..0502f1eabc2 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.0";
-  sha256 = "1wi4nc73ic3qmbx6v9fniacwcz2nlvmp5snn144fdiwb22klfn5f";
+  version = "0.3.3.1";
+  sha256 = "00i0apyklvmkr4w30d4r86gcg86h35sc3ncvqax70827126cdmsj";
   buildDepends = [ blazeMarkup mtl ];
   jailbreak = true;
   meta = {
-- 
GitLab


From 337a7f9e17acaf65100ae4f8319e3d1189355548 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:42:45 +0100
Subject: [PATCH 0939/3789] haskell-conduit: update to version 1.0.13

---
 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 0557fd36236..25987150533 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.0.12";
-  sha256 = "025h1nbplq7v1qp74bg647q36n3d56kin700ws7vm922xmvcrjjm";
+  version = "1.0.13";
+  sha256 = "19l2wqx5fil9sv4kj8jd19yvb4fa7jp3n523j38z9bd6ydnb8fni";
   buildDepends = [
     liftedBase mmorph monadControl mtl resourcet text transformers
     transformersBase void
-- 
GitLab


From 43f6f321707713f60ecdb8b50eed3d19b17cb72b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:42:47 +0100
Subject: [PATCH 0940/3789] haskell-diagrams-svg: update to version 1.0.1.2

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

diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index 42289164144..56b1306a7ce 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-svg";
-  version = "1.0.1.1";
-  sha256 = "0wjk2f7xh7ihkvdri669mw25bdwszzx03np32fy66k56x7adgxzc";
+  version = "1.0.1.2";
+  sha256 = "1aaybkizlfc4ji7m2p2naw4ml1pacppkbfr2ygqlq0k3bg0cd36k";
   buildDepends = [
     blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath
     hashable lens monoidExtras mtl split time vectorSpace
-- 
GitLab


From 24f0b095a6582dc1998c808ea914f11e972ae0c5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:42:49 +0100
Subject: [PATCH 0941/3789] haskell-free: update to version 4.5

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

diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix
index 4e679da1bdb..7d8376da28e 100644
--- a/pkgs/development/libraries/haskell/free/default.nix
+++ b/pkgs/development/libraries/haskell/free/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "free";
-  version = "4.4";
-  sha256 = "19c6zy7gxsd121g1kny9y8rv33gsxv3kfsi37iyn6q0p8r38wbcy";
+  version = "4.5";
+  sha256 = "0hcdl02whmnyxd3mbfrncd978778irm5sx5f4z54zsigwlk822vx";
   buildDepends = [
     bifunctors comonad distributive mtl profunctors semigroupoids
     semigroups transformers
-- 
GitLab


From 4e9e56382eac6c8e25f9caf64c85145d26a3ba41 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:42:51 +0100
Subject: [PATCH 0942/3789] haskell-haskell-src-exts: update to version
 1.14.0.1

---
 .../libraries/haskell/haskell-src-exts/default.nix           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
index b044437e527..270353b7f76 100644
--- a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
@@ -4,15 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-exts";
-  version = "1.14.0";
-  sha256 = "070khsw56xwyrclamv5wckj9na2xbzibv702xx52ik2wbs21dr0d";
+  version = "1.14.0.1";
+  sha256 = "1bsqjj4hy8mqprs44yfy1c96678w9q708yc40g5ygqfyhg0hd29s";
   buildDepends = [ cpphs ];
   testDepends = [
     filepath smallcheck tasty tastyHunit tastySmallcheck
   ];
   buildTools = [ happy ];
   doCheck = false;
-  preConfigure = "runhaskell Setup.hs clean";
   meta = {
     homepage = "https://github.com/haskell-suite/haskell-src-exts";
     description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
-- 
GitLab


From 216be85d75712fa73a6bb25513b226459bca52b2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:42:52 +0100
Subject: [PATCH 0943/3789] haskell-lockfree-queue: update to version 0.2.3

---
 .../libraries/haskell/lockfree-queue/default.nix     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/lockfree-queue/default.nix b/pkgs/development/libraries/haskell/lockfree-queue/default.nix
index ac2114b7f37..a5106d910f3 100644
--- a/pkgs/development/libraries/haskell/lockfree-queue/default.nix
+++ b/pkgs/development/libraries/haskell/lockfree-queue/default.nix
@@ -1,18 +1,18 @@
-{ cabal, abstractDeque, atomicPrimops, HUnit, IORefCAS
+{ cabal, abstractDeque, abstractDequeTests, atomicPrimops, HUnit
 , testFramework, testFrameworkHunit
 }:
 
 cabal.mkDerivation (self: {
   pname = "lockfree-queue";
-  version = "0.2.0.2";
-  sha256 = "0mb07hx4cllnxv7mz19vvn9zcc5rx0ji5wv80fx0yirgk2qjpgml";
-  buildDepends = [ abstractDeque atomicPrimops IORefCAS ];
+  version = "0.2.3";
+  sha256 = "0y8ax6vcjnjm8g7ybn95wca74hm0g22fvgra06vj6l90pl93awyg";
+  buildDepends = [ abstractDeque atomicPrimops ];
   testDepends = [
-    abstractDeque atomicPrimops HUnit IORefCAS testFramework
+    abstractDeque abstractDequeTests atomicPrimops HUnit testFramework
     testFrameworkHunit
   ];
   meta = {
-    homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
+    homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
     description = "Michael and Scott lock-free queues";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From 859f5be293c472619088baed184ec7c4466d7a63 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:42:54 +0100
Subject: [PATCH 0944/3789] haskell-mime-mail: update to version 0.4.4

---
 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 4f7353dfdb6..e88dee9fa51 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.3";
-  sha256 = "0xh6j4vdg2ispr9f41s8pvx5rb08zqapkqxyvykvjg2ibmczzg4f";
+  version = "0.4.4";
+  sha256 = "1y0fss53z1mvykpfkp28zwic2mb7zhf02lwxdr22n34hjzk34g9b";
   buildDepends = [
     base64Bytestring blazeBuilder filepath random text
   ];
-- 
GitLab


From d5aaeb89c141a76fa09cf514f742ddffd7273400 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:42:56 +0100
Subject: [PATCH 0945/3789] haskell-mime: update to version 0.4.0

---
 pkgs/development/libraries/haskell/mime/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mime/default.nix b/pkgs/development/libraries/haskell/mime/default.nix
index 37c231d08ff..b4d2f7d7e50 100644
--- a/pkgs/development/libraries/haskell/mime/default.nix
+++ b/pkgs/development/libraries/haskell/mime/default.nix
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, text }:
 
 cabal.mkDerivation (self: {
   pname = "mime";
-  version = "0.3.4";
-  sha256 = "1klvy32idy6v029p5a6g93r79ac5cycnrx5c8z9bgvplbplpfjwy";
+  version = "0.4.0";
+  sha256 = "159jp7dcyx26slda2743zdr2prnm707mnglcb9p66hr1wjh98kx4";
+  buildDepends = [ text ];
   meta = {
     homepage = "https://github.com/GaloisInc/mime";
     description = "Working with MIME types";
-- 
GitLab


From ebe7e96078131c272f41c84fa4988ae15e53eab2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:42:58 +0100
Subject: [PATCH 0946/3789] haskell-murmur-hash: update to version 0.1.0.7

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

diff --git a/pkgs/development/libraries/haskell/murmur-hash/default.nix b/pkgs/development/libraries/haskell/murmur-hash/default.nix
index 0c4058eb111..12d5d550d10 100644
--- a/pkgs/development/libraries/haskell/murmur-hash/default.nix
+++ b/pkgs/development/libraries/haskell/murmur-hash/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "murmur-hash";
-  version = "0.1.0.6";
-  sha256 = "0wnkwl3a9x0f4rvsj4wf129n03vpw8qk4kzx6vmrapwwb4r80npz";
+  version = "0.1.0.7";
+  sha256 = "125v4ypiv8n2m8zd1yi46prz96yy79ap0yzhm4vhrws4cf1zapkp";
   meta = {
     homepage = "http://github.com/nominolo/murmur-hash";
     description = "MurmurHash2 implementation for Haskell";
-- 
GitLab


From 9ce70d54f66327e8a7ee67627ff9a9ff7a1331fb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:43:00 +0100
Subject: [PATCH 0947/3789] haskell-mwc-random: update to version 0.13.1.1

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

diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix
index d26980994e7..995571abc20 100644
--- a/pkgs/development/libraries/haskell/mwc-random/default.nix
+++ b/pkgs/development/libraries/haskell/mwc-random/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mwc-random";
-  version = "0.13.1.0";
-  sha256 = "16g6b1pphr4p36nn5qjj62iwf47rq8kfmpjgfvd35r3cz9qqb8cb";
+  version = "0.13.1.1";
+  sha256 = "1hi9ci65m3pjkli0rvx2x4fmp73c9fsmnc1zkpaj4g64ibhhir64";
   buildDepends = [ primitive time vector ];
   testDepends = [
     HUnit QuickCheck statistics testFramework testFrameworkHunit
-- 
GitLab


From f8fb3529e6c74dbb86b3fc12a210c25a668cde6a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:43:02 +0100
Subject: [PATCH 0948/3789] haskell-numbers: update to version 3000.2.0.1

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

diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix
index 26ed2d77bd0..902ea9ce880 100644
--- a/pkgs/development/libraries/haskell/numbers/default.nix
+++ b/pkgs/development/libraries/haskell/numbers/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "numbers";
-  version = "3000.2.0.0";
-  sha256 = "035qc7dgh4nd661z4mm742v8y7xqdyyp0r0vkinxiifciqb1fkbm";
+  version = "3000.2.0.1";
+  sha256 = "10z1bi5qbc81z5xx2v1ylwcpmcfl1ci7lxrswkgi0dd1wi8havbk";
   testDepends = [
     QuickCheck testFramework testFrameworkQuickcheck2
   ];
   meta = {
-    homepage = "https://github.com/DanBurton/numbers#readme";
+    homepage = "https://github.com/jwiegley/numbers#readme";
     description = "Various number types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From c4ce58575bf4d1f73de1828aa3d98beef38c973a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:43:04 +0100
Subject: [PATCH 0949/3789] haskell-pandoc-types: update to version 1.12.3.2

---
 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 110195fa518..ee41d76a417 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.1";
-  sha256 = "0q9wj3vkhnvl1l2hbg9nmcbshkf23nmaylm3zmqj5j95vay60hkr";
+  version = "1.12.3.2";
+  sha256 = "1jgab8ccyyr8ygm6y0wbr3vvwdg5gkp1b6014dk8ryqb2dmkmikc";
   buildDepends = [ aeson syb ];
   meta = {
     homepage = "http://johnmacfarlane.net/pandoc";
-- 
GitLab


From 390f7c457944534185550f8e57c4f638519f12ec Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:43:06 +0100
Subject: [PATCH 0950/3789] haskell-pandoc: update to version 1.12.3.3

---
 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 94a0ba418ea..5a93cb023c9 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.1";
-  sha256 = "0kvw10d2cnv16w9y9zx2l2gmn3zsrxppa9lllvqh1jah54rbn1pc";
+  version = "1.12.3.3";
+  sha256 = "0v7wvh93rz3k7phlz21627j5xakpi83174mchr3lwg4bmkfxn25s";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 677eef34b3f70c1eaecd31116fae7069675dfc8e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:43:07 +0100
Subject: [PATCH 0951/3789] haskell-pipes-parse: update to version 3.0.1

---
 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 ea83701f702..ef615ebb808 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.0";
-  sha256 = "07ycdnx24qlysbf78sgfl2g8rfsrxnaiq1rimc4656in4cmcjn9g";
+  version = "3.0.1";
+  sha256 = "0f262p8mfcpvs3f3myy6bll9v61rfgrfdy2scdzf7vvx0h0lrpj7";
   buildDepends = [ pipes transformers ];
   meta = {
     description = "Parsing infrastructure for the pipes ecosystem";
-- 
GitLab


From c1aefe3b26f1b419136d4563cf54e93c82c708e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:43:09 +0100
Subject: [PATCH 0952/3789] haskell-pipes-zlib: update to version 0.4.0

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

diff --git a/pkgs/development/libraries/haskell/pipes-zlib/default.nix b/pkgs/development/libraries/haskell/pipes-zlib/default.nix
index 171b8c90b56..67d08ebcb4a 100644
--- a/pkgs/development/libraries/haskell/pipes-zlib/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-zlib/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-zlib";
-  version = "0.3.0";
-  sha256 = "15d475rxziazxlbcbm8snik45z88kk7gxbxrpv4070bwylh3z0wc";
+  version = "0.4.0";
+  sha256 = "1xi8x7cfzr7042x5jq8b6xqdhffh1jgprk90yzsfjldllck9z5ia";
   buildDepends = [ pipes transformers zlib zlibBindings ];
   meta = {
     homepage = "https://github.com/k0001/pipes-zlib";
-- 
GitLab


From 363a00d1ce0e1060ff87d62cd6bd2a5a0204c8e7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:43:11 +0100
Subject: [PATCH 0953/3789] haskell-setenv: update to version 0.1.1.1

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

diff --git a/pkgs/development/libraries/haskell/setenv/default.nix b/pkgs/development/libraries/haskell/setenv/default.nix
index b00480279e1..4b3e75a1731 100644
--- a/pkgs/development/libraries/haskell/setenv/default.nix
+++ b/pkgs/development/libraries/haskell/setenv/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "setenv";
-  version = "0.1.1";
-  sha256 = "1j0fj8nrx9z90kghasxjx5jycz9y9xdi7mrxmgnsc14csa65rhb8";
+  version = "0.1.1.1";
+  sha256 = "0azkvsvk9i1979rn45zryqyirvjhj9b32nnz1m30aasbs2q8f393";
   doCheck = false;
   meta = {
     description = "A cross-platform library for setting environment variables";
-- 
GitLab


From d91fe0a1d8a539b699491d91e7ab193ed963e4c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:43:13 +0100
Subject: [PATCH 0954/3789] haskell-tagstream-conduit: update to version 0.5.5

---
 .../libraries/haskell/tagstream-conduit/default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
index ca177a80a10..c28301e4183 100644
--- a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
@@ -1,15 +1,15 @@
 { cabal, attoparsec, attoparsecConduit, blazeBuilder
-, blazeBuilderConduit, caseInsensitive, conduit, hspec, HUnit
-, QuickCheck, text, transformers
+, blazeBuilderConduit, caseInsensitive, conduit, dataDefault, hspec
+, HUnit, QuickCheck, text, transformers, xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "tagstream-conduit";
-  version = "0.5.4.1";
-  sha256 = "1gahdil5jasm6v7gp519ahr2yc7ppysdnmkl21cd4zzn6y1r0gw9";
+  version = "0.5.5";
+  sha256 = "17157chhw610f8az6c25qzq5mmhpb1a8m12kdc2k8khgynpkrj5f";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
-    caseInsensitive conduit text transformers
+    caseInsensitive conduit dataDefault text transformers xmlConduit
   ];
   testDepends = [ conduit hspec HUnit QuickCheck text ];
   meta = {
-- 
GitLab


From 8fee060a8bbab34b18afabec6ee8506398924a29 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:43:15 +0100
Subject: [PATCH 0955/3789] haskell-warp: update to version 2.0.3.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 b8008447e40..84f653cde16 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.0.2.1";
-  sha256 = "0r8kpg2k7mr9y7nlccvfk6qbzgv459gidbaw6sgaxb26f6bgipgk";
+  version = "2.0.3.1";
+  sha256 = "0rbl9p1kdgvya2ah2bpaqfv73hlvhsd46nk5f5wgx244pm714kc5";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpDate httpTypes liftedBase network networkConduit simpleSendfile
-- 
GitLab


From fdce90b76ccacdf0f01df62fda728ea3519097a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:43:17 +0100
Subject: [PATCH 0956/3789] haskell-yaml: update to version 0.8.6

---
 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 8e3a3e46f45..e7fac87c319 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.5.4";
-  sha256 = "0mn1i0whqr9q6vh43x5xa0p4xxckqszhsi62warx1kjvrq4yil6f";
+  version = "0.8.6";
+  sha256 = "0qmbgb2gsqj25hl1blxjjcpk5fp5za9d1vshjs86mpapqvlhr9rn";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 8cefbfcb1f43918e3009253a571b8f9c185c464f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:43:18 +0100
Subject: [PATCH 0957/3789] haskell-hasktags: update to version 0.68.7

---
 pkgs/development/tools/haskell/hasktags/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/haskell/hasktags/default.nix b/pkgs/development/tools/haskell/hasktags/default.nix
index cd27fb5fbc4..036c308a712 100644
--- a/pkgs/development/tools/haskell/hasktags/default.nix
+++ b/pkgs/development/tools/haskell/hasktags/default.nix
@@ -1,13 +1,12 @@
-{ cabal, filepath, HUnit, json }:
+{ cabal, filepath, json, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "hasktags";
-  version = "0.68.6";
-  sha256 = "1r5vnn9n2jva1ccjv8vnp3j0z3bh3xsi7yjv9llnvj0jw308aq9r";
+  version = "0.68.7";
+  sha256 = "0z98ha2xjc6npcyn15arp6h6ad87bs4acdhd1rnqrsy4lc0lny04";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ filepath json ];
-  testDepends = [ filepath HUnit json ];
+  buildDepends = [ filepath json utf8String ];
   meta = {
     homepage = "http://github.com/MarcWeber/hasktags";
     description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
-- 
GitLab


From 190a01eb43f80bdc78aae04428e13a9f6e13106c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Feb 2014 10:43:20 +0100
Subject: [PATCH 0958/3789] haskell-hlint: update to version 1.8.57

---
 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 c8ede663be4..860148cf244 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.56";
-  sha256 = "1idff4jaca324acbr0aa64j977l5nxnlfk9nny33i81b5hzciwmw";
+  version = "1.8.57";
+  sha256 = "062fpyjd3mha9faxdpg763sigafl4mvl8qqw3z31zkafz361qzm4";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From befe6905e2e2de88ab34e7b11608651fc5fd84b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Feb 2014 20:43:52 +0100
Subject: [PATCH 0959/3789] curl: update 7.33 -> .35, including two security
 fixes

CVE-2013-4545
CVE-2014-0015
---
 pkgs/tools/networking/curl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 86f27d7460c..10bfc0e21ec 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.33.0";
+  name = "curl-7.35.0";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "1cyiali7jq613qz5zb28myhywrdi35dngniwvknmh9lyjk6y9z8a";
+    sha256 = "10qdzk3lfdpg8lvg8wfiqbfjp5yxyv25y1y2679vgwal2iqd2x6p";
   };
 
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains
-- 
GitLab


From c2c50db47d9048c3747850ab25731ba509a0c4a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Feb 2014 21:38:03 +0100
Subject: [PATCH 0960/3789] gegl: fix CVE-2012-4433 via an Arch patch

---
 pkgs/development/libraries/gegl/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index a30d5c78e7f..0649775ad21 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg
 , librsvg, pango, gtk, bzip2, intltool }:
-        
+
 stdenv.mkDerivation rec {
   name = "gegl-0.2.0";
 
@@ -9,6 +9,13 @@ stdenv.mkDerivation rec {
     sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426";
   };
 
+  patches = [( fetchurl {
+    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/"
+      + "gegl-0.2.0-CVE-2012-4433.patch?h=packages/gegl&id=57a60fbda5d7bbbd1cc4767cb0724baa80c5e3e9";
+    sha256 = "0p8mxj3w09nn1cc6cbxrd9hx742c5y27903i608wx6ja3kdjis59";
+    name = "CVE-2012-4433.patch";
+  })];
+
   # needs fonts otherwise  don't know how to pass them
   configureFlags = "--disable-docs";
 
-- 
GitLab


From edb9e50ef9ee4f671a65b515abe3c899a20c39ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Feb 2014 22:17:41 +0100
Subject: [PATCH 0961/3789] flashplayer: update, fixing many security CVEs

---
 .../mozilla-plugins/flashplayer-11/default.nix        | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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 d4d95f7e5b9..ecd51f7c110 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -35,6 +35,8 @@
 }:
 
 let
+  # -> http://get.adobe.com/flashplayer/
+  version = "11.2.202.336";
 
   src =
     if stdenv.system == "x86_64-linux" then
@@ -43,10 +45,9 @@ let
         # http://labs.adobe.com/technologies/flashplayer10/faq.html
         throw "no x86_64 debugging version available"
       else rec {
-        # -> http://labs.adobe.com/downloads/flashplayer10.html
-        version = "11.2.202.310";
+        inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "03r9r7h3l4i15hw62k9il6pjzq122nldbgxr37b4y10xp08a9izj";
+        sha256 = "1wri6y5vllgs452dfklv23k7bp5daajnaqblkn5cb2gl28l5xcni";
       }
     else if stdenv.system == "i686-linux" then
       if debug then {
@@ -55,9 +56,9 @@ let
         url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
         sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
       } else rec {
-        version = "11.2.202.310";
+        inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "0qf09p92silp81pjfcg2vcfcfi1padizmb58q5iaarnapgkawlbh";
+        sha256 = "0mjxjbj75r74gqpmqzqa6vlrk2wv7r358wcqbmg132bhv8kaph85";
       }
     else throw "Flash Player is not supported on this platform";
 
-- 
GitLab


From 4424edccf402537aa6789eb27244e61aea8d13bb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 3 Feb 2014 07:30:29 -0600
Subject: [PATCH 0962/3789] rxvt-unicode: calculate font width correctly

It is (fairly) well known among rxvt-unicode users that its method of
calculating the width of Xft fonts is not correct. This is the Gentoo
version of the patch which corrects the problem.
---
 .../misc/rxvt_unicode/default.nix             |  2 ++
 .../rxvt-unicode-9.06-font-width.patch        | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/misc/rxvt_unicode/rxvt-unicode-9.06-font-width.patch

diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index e5d0ae95f99..2e3ef9f0d10 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation (rec {
 
   outputs = [ "out" "terminfo" ];
 
+  patches = [ ./rxvt-unicode-9.06-font-width.patch ];
+
   preConfigure =
     ''
       mkdir -p $terminfo/share/terminfo
diff --git a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-9.06-font-width.patch b/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-9.06-font-width.patch
new file mode 100644
index 00000000000..636083218fa
--- /dev/null
+++ b/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-9.06-font-width.patch
@@ -0,0 +1,21 @@
+--- a/src/rxvtfont.C	2008-07-09 12:21:45.000000000 +0400
++++ b/src/rxvtfont.C	2009-10-30 14:32:53.000000000 +0300
+@@ -1195,12 +1195,14 @@
+           XGlyphInfo g;
+           XftTextExtents16 (disp, f, &ch, 1, &g);
+ 
+-          g.width -= g.x;
+-
++/*
++ * bukind: don't use g.width as a width of a character!
++ * instead use g.xOff, see e.g.: http://keithp.com/~keithp/render/Xft.tutorial
++ */
+           int wcw = WCWIDTH (ch);
+-          if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
++          if (wcw > 1) g.xOff = g.xOff / wcw;
++          if (width < g.xOff) width = g.xOff;
+ 
+-          if (width    < g.width       ) width    = g.width;
+           if (height   < g.height      ) height   = g.height;
+           if (glheight < g.height - g.y) glheight = g.height - g.y;
+         }
\ No newline at end of file
-- 
GitLab


From 19027ca0a6f3ee348d4a36d63cb98c8638d9097f Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Mon, 3 Feb 2014 22:40:23 -0430
Subject: [PATCH 0963/3789] pakcs: advance version to 1.11.3, which is
 compatible with SWI Prolog 6.6

---
 .../compilers/pakcs/adjust-buildsystem.patch  | 31 +++++++++----------
 pkgs/development/compilers/pakcs/default.nix  | 19 ++++++------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/compilers/pakcs/adjust-buildsystem.patch b/pkgs/development/compilers/pakcs/adjust-buildsystem.patch
index 4de7683dcdd..830fc3fa7f9 100644
--- a/pkgs/development/compilers/pakcs/adjust-buildsystem.patch
+++ b/pkgs/development/compilers/pakcs/adjust-buildsystem.patch
@@ -1,7 +1,7 @@
-diff -Naur pakcs-1.11.2-upstream/Makefile pakcs-1.11.2/Makefile
---- pakcs-1.11.2-upstream/Makefile	2013-03-21 04:58:38.000000000 -0430
-+++ pakcs-1.11.2/Makefile	2013-05-09 15:04:48.035646127 -0430
-@@ -55,7 +55,6 @@
+diff -Naur pakcs-1.11.3-upstream/Makefile pakcs-1.11.3/Makefile
+--- pakcs-1.11.3-upstream/Makefile	2014-01-31 09:10:03.000000000 -0430
++++ pakcs-1.11.3/Makefile	2014-02-03 20:27:41.558334480 -0430
+@@ -66,7 +66,6 @@
  #
  .PHONY: install
  install: installscripts
@@ -9,21 +9,20 @@ diff -Naur pakcs-1.11.2-upstream/Makefile pakcs-1.11.2/Makefile
  	# pre-compile all libraries:
  	@cd lib && $(MAKE) fcy
  	# install the Curry2Prolog compiler as a saved system:
-@@ -66,11 +65,6 @@
- 	@cd lib && $(MAKE) acy
- 	# prepare for separate compilation by compiling all librariers to Prolog code:
- 	@if [ -r bin/pakcs ] ; then cd lib && $(MAKE) pl ; fi
+@@ -105,10 +104,6 @@
+ # compile the tools:
+ .PHONY: tools
+ tools:
 -	# compile the Curry Port Name Server demon:
--	@if [ -r bin/pakcs ] ; then cd cpns && $(MAKE) ; fi
+-	@if [ -r bin/pakcs ] ; then cd cpns       && $(MAKE) ; fi
 -	# compile the event handler demon for dynamic web pages:
--	@if [ -r bin/pakcs ] ; then cd www && $(MAKE) ; fi
--	$(MAKE) tools
- 	$(MAKE) docs
- 	chmod -R go+rX .
+-	@if [ -r bin/pakcs ] ; then cd www        && $(MAKE) ; fi
+ 	@if [ -r bin/pakcs ] ; then cd currytools && $(MAKE) ; fi
+ 	@if [ -r bin/pakcs ] ; then cd tools      && $(MAKE) ; fi
  
-diff -Naur pakcs-1.11.2-upstream/scripts/pakcs.sh pakcs-1.11.2/scripts/pakcs.sh
---- pakcs-1.11.2-upstream/scripts/pakcs.sh	2013-03-21 04:52:59.000000000 -0430
-+++ pakcs-1.11.2/scripts/pakcs.sh	2013-05-09 03:14:23.500876628 -0430
+diff -Naur pakcs-1.11.3-upstream/scripts/pakcs.sh pakcs-1.11.3/scripts/pakcs.sh
+--- pakcs-1.11.3-upstream/scripts/pakcs.sh	2014-01-31 09:04:19.000000000 -0430
++++ pakcs-1.11.3/scripts/pakcs.sh	2014-02-03 20:20:40.775350116 -0430
 @@ -16,7 +16,7 @@
  # use readline wrapper rlwrap if it is installed and we have tty as stdin:
  USERLWRAP=no
diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
index bb4657d8aff..a3b80c02545 100644
--- a/pkgs/development/compilers/pakcs/default.nix
+++ b/pkgs/development/compilers/pakcs/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchurl, cabal, swiProlog, mtl, syb, makeWrapper, rlwrap, tk }:
+{ stdenv, fetchurl, cabal, swiProlog, either, mtl, syb
+, glibcLocales, makeWrapper, rlwrap, tk }:
 
 let
-  fname = "pakcs-1.11.2";
+  fname = "pakcs-1.11.3";
 
   fsrc = fetchurl {
     url = "http://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz";
-    sha256 = "1x23kn91v44my4rd8j3247pj8i2myz82rzgbq07asi1x21bpvvmy";
+    sha256 = "006bq6cmycq2f4xb3zmnmxyngj64hppk3a083hy0qzj7gl77zvfw";
   };
 
 in
@@ -29,12 +30,12 @@ stdenv.mkDerivation rec {
     sourceRoot = "${name}/frontend/curry-frontend";
     isLibrary = true;
     isExecutable = true;
-    buildDepends = [ mtl syb curryBase ];
+    buildDepends = [ either mtl syb curryBase ];
   });
 
   src = fsrc;
 
-  buildInputs = [ swiProlog makeWrapper rlwrap tk ];
+  buildInputs = [ swiProlog makeWrapper glibcLocales rlwrap tk ];
 
   patches = [ ./adjust-buildsystem.patch ];
 
@@ -48,6 +49,10 @@ stdenv.mkDerivation rec {
   '';
 
   preBuild = ''
+    # Some comments in files are in UTF-8, so include the locale needed by GHC runtime.
+    export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive
+    export LC_ALL=en_US.UTF-8
+
     # Set up link to cymake, which has been built already.
     ensureDir bin/.local
     ln -s ${curryFront}/bin/cymake bin/.local/
@@ -65,10 +70,6 @@ stdenv.mkDerivation rec {
     # Fixing PAKCSHOME and related paths.
     sed -i 's@PAKCSHOME=/tmp/.*@PAKCSHOME='$out/pakcs'@' $out/pakcs/bin/{pakcs,makecurrycgi,parsecurry,.makesavedstate}
 
-    # Fix symbolic links into the tmp build dir.
-    ln -s ../currytools/CASS/cass $out/pakcs/bin/cass
-    ln -s ../currytools/currydoc/CurryDoc $out/pakcs/bin/currydoc
-
     # The Prolog sources must be rebuilt in their final directory,
     # to switch the embedded references to the tmp build directory.
     export TEMP=/tmp
-- 
GitLab


From 9b7ecb76f320574094799d33e77df14fddc55782 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 5 Feb 2014 23:19:08 -0500
Subject: [PATCH 0964/3789] Use proper file and attribute names for tls
 packages

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../libraries/haskell/tls/{1.1.x.nix => 1.1.5.nix}        | 0
 .../libraries/haskell/tls/{1.2.x.nix => 1.2.2.nix}        | 0
 pkgs/top-level/haskell-packages.nix                       | 8 ++++----
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/tls/{1.1.x.nix => 1.1.5.nix} (100%)
 rename pkgs/development/libraries/haskell/tls/{1.2.x.nix => 1.2.2.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/tls/1.1.x.nix b/pkgs/development/libraries/haskell/tls/1.1.5.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/tls/1.1.x.nix
rename to pkgs/development/libraries/haskell/tls/1.1.5.nix
diff --git a/pkgs/development/libraries/haskell/tls/1.2.x.nix b/pkgs/development/libraries/haskell/tls/1.2.2.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/tls/1.2.x.nix
rename to pkgs/development/libraries/haskell/tls/1.2.2.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8cfd3fec62d..d9e8fbc958b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2348,12 +2348,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   timeCompat = callPackage ../development/libraries/haskell/time-compat {};
 
-  tls = callPackage ../development/libraries/haskell/tls/1.2.x.nix {};
-
-  tls_1_1_x = callPackage ../development/libraries/haskell/tls/1.1.x.nix {};
+  tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {};
+  tls_1_2_2 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {};
+  tls = self.tls_1_2_2;
 
   tlsExtra = callPackage ../development/libraries/haskell/tls-extra {
-    tls = self.tls_1_1_x;
+    tls = self.tls_1_1_5;
   };
 
   transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {};
-- 
GitLab


From 5559d4d47e62d079df525cbd1059f2b19727d8ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 6 Feb 2014 08:06:22 +0100
Subject: [PATCH 0965/3789] kicad: disable parallel building, as it often fails

CC @viric.
---
 pkgs/applications/science/electronics/kicad/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 11d2e770165..8adab57656e 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     sed -i -e 's,/usr/local/kicad,'$out,g common/gestfich.cpp
   '';
 
-  enableParallelBuilding = true;
+  #enableParallelBuilding = true; # often fails on Hydra: fatal error: pcb_plot_params_lexer.h: No such file or directory
 
   buildInputs = [ cmake mesa wxGTK zlib libX11 gettext ];
 
-- 
GitLab


From 0c439c3a1afe9f31f88e28059624577068ed9405 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 6 Feb 2014 09:49:32 +0200
Subject: [PATCH 0966/3789] socat: update from 1.7.2.2 to 1.7.2.3, potentially
 fixes CVE-2014-0019

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

diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix
index 45de7015d7a..8e2f9449090 100644
--- a/pkgs/tools/networking/socat/default.nix
+++ b/pkgs/tools/networking/socat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "socat-1.7.2.2";
+  name = "socat-1.7.2.3";
 
   src = fetchurl {
     url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
-    sha256 = "0g4miazc9w3gxbk5vvw228jp3qxn775jspkgqv5hjf2d3bqpl5ls";
+    sha256 = "1l5ajqwfpxy35mvqlihzncmfngn61k7in51wkvd8q4vvmxaar605";
   };
 
   buildInputs = [ openssl ];
-- 
GitLab


From 951f37f3da52548ae6170d96ae64083adace16c2 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 19 Jan 2014 14:01:25 +0100
Subject: [PATCH 0967/3789] services.xserver.videoDrivers ->
 services.mesa.videoDrivers

---
 nixos/modules/virtualisation/qemu-vm.nix          | 2 +-
 nixos/modules/virtualisation/virtualbox-guest.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 2218e1045eb..2483ee63d57 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -387,7 +387,7 @@ in
     # When building a regular system configuration, override whatever
     # video driver the host uses.
     services.xserver.videoDriver = mkVMOverride null;
-    services.xserver.videoDrivers = mkVMOverride [ "vesa" ];
+    services.mesa.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 664fd21781c..9dda455e5d3 100644
--- a/nixos/modules/virtualisation/virtualbox-guest.nix
+++ b/nixos/modules/virtualisation/virtualbox-guest.nix
@@ -52,7 +52,7 @@ optionalAttrs (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) # ugly...
         serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/sbin/VBoxService VBoxService --foreground";
       };
 
-    services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" ];
+    services.mesa.videoDrivers = mkOverride 50 [ "virtualbox" ];
 
     services.xserver.config =
       ''
-- 
GitLab


From fc30e8e9b503618010db98094c6892846849a4db Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 6 Feb 2014 09:56:35 +0100
Subject: [PATCH 0968/3789] llvm: remove duplicate ncurses buildInput

---
 pkgs/development/compilers/llvm/3.4/llvm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index d93bd4aba19..7f58abea1fa 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
     mv compiler-rt-${version} $sourceRoot/projects/compiler-rt
   '';
 
-  buildInputs = [ perl groff cmake libxml2 python libffi ncurses ] ++ stdenv.lib.optional stdenv.isLinux valgrind;
+  buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind;
 
   propagatedBuildInputs = [ ncurses zlib ];
 
-- 
GitLab


From eed6431d97433e8dd081b5318189d00e19ae4cbf Mon Sep 17 00:00:00 2001
From: Andraz Brodnik <brodul@brodul.org>
Date: Thu, 6 Feb 2014 11:59:59 +0100
Subject: [PATCH 0969/3789] Add steghide-0.5.1 .

---
 pkgs/tools/security/steghide/default.nix      |  30 ++
 .../patches/steghide-0.5.1-gcc34.patch        |  42 +++
 .../patches/steghide-0.5.1-gcc4.patch         |  46 +++
 .../patches/steghide-0.5.1-gcc43.patch        | 349 ++++++++++++++++++
 4 files changed, 467 insertions(+)
 create mode 100644 pkgs/tools/security/steghide/default.nix
 create mode 100644 pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch
 create mode 100644 pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch
 create mode 100644 pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch

diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix
new file mode 100644
index 00000000000..bc87c091a58
--- /dev/null
+++ b/pkgs/tools/security/steghide/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, libjpeg, libmcrypt, zlib, libmhash, gettext, libtool}:
+
+  stdenv.mkDerivation rec {
+    buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ];
+    version = "0.5.1";
+    name = "steghide-${version}";
+
+    meta = with stdenv.lib; {
+        homepage = http://steghide.sourceforge.net/;
+        description = "Steghide is a steganography program that is able to hide data in various kinds of image- and audio-files.";
+        license = licenses.gpl2;
+    };
+
+    src = fetchurl {
+      url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ;
+      sha256 = "78069b7cfe9d1f5348ae43f918f06f91d783c2b3ff25af021e6a312cf541b47b";
+    };
+
+    patches = [
+      ./patches/steghide-0.5.1-gcc34.patch
+      ./patches/steghide-0.5.1-gcc4.patch
+      ./patches/steghide-0.5.1-gcc43.patch
+    ];
+
+    # AM_CXXFLAGS needed for automake
+    preConfigure = ''
+      export AM_CXXFLAGS="$CXXFLAGS -std=c++0x"
+    '';
+
+  }
diff --git a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch b/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch
new file mode 100644
index 00000000000..373316c7840
--- /dev/null
+++ b/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch
@@ -0,0 +1,42 @@
+--- steghide-0.5.1.old/src/Makefile.am
++++ steghide-0.5.1.new/src/Makefile.am	2004-07-16 19:01:39.673947633 +0200
+@@ -33,5 +33,5 @@
+ WavPCMSampleValue.cc error.cc main.cc msg.cc SMDConstructionHeuristic.cc
+ LIBS = @LIBINTL@ @LIBS@
+ localedir = $(datadir)/locale
+-LIBTOOL = $(SHELL) libtool
++LIBTOOL = $(SHELL) libtool --tag=CXX
+ MAINTAINERCLEANFILES = Makefile.in
+--- steghide-0.5.1.old/src/AuSampleValues.cc
++++ steghide-0.5.1.new/src/AuSampleValues.cc	2004-07-16 18:59:18.934578427 +0200
+@@ -17,21 +17,21 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  *
+  */
+-
++#include "common.h"
+ #include "AuSampleValues.h"
+ 
+ // AuMuLawSampleValue
+-const BYTE AuMuLawSampleValue::MinValue = 0 ;
+-const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
++template<> const BYTE  AuMuLawSampleValue::MinValue = 0 ;
++template<> const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
+ 
+ // AuPCM8SampleValue
+-const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
+-const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
++template<> const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
++template<> const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
+ 
+ // AuPCM16SampleValue
+-const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
+-const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
++template<> const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
++template<> const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
+ 
+ // AuPCM32SampleValue
+-const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
+-const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
++template<> const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
++template<> const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
diff --git a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch b/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch
new file mode 100644
index 00000000000..a8df1735e9d
--- /dev/null
+++ b/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch
@@ -0,0 +1,46 @@
+diff -Naur steghide-0.5.1-orig/src/AuData.h steghide-0.5.1/src/AuData.h
+--- steghide-0.5.1-orig/src/AuData.h	2003-09-28 09:30:29.000000000 -0600
++++ steghide-0.5.1/src/AuData.h	2007-05-11 22:04:56.000000000 -0600
+@@ -26,22 +26,30 @@
+ 
+ // AuMuLawAudioData
+ typedef AudioDataImpl<AuMuLaw,BYTE> AuMuLawAudioData ;
++template<>
+ inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; }
++template<>
+ inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; }
+ 
+ // AuPCM8AudioData
+ typedef AudioDataImpl<AuPCM8,SBYTE> AuPCM8AudioData ;
++template<>
+ inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; }
++template<>
+ inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; }
+ 
+ // AuPCM16AudioData
+ typedef AudioDataImpl<AuPCM16,SWORD16> AuPCM16AudioData ;
++template<>
+ inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; }
++template<>
+ inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; }
+ 
+ // AuPCM32AudioData
+ typedef AudioDataImpl<AuPCM32,SWORD32> AuPCM32AudioData ;
++template<>
+ inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; }
++template<>
+ inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; }
+ 
+ #endif // ndef SH_AUDATA_H
+diff -Naur steghide-0.5.1-orig/src/MHashPP.cc steghide-0.5.1/src/MHashPP.cc
+--- steghide-0.5.1-orig/src/MHashPP.cc	2003-10-05 04:17:50.000000000 -0600
++++ steghide-0.5.1/src/MHashPP.cc	2007-05-11 22:07:01.000000000 -0600
+@@ -120,7 +120,7 @@
+ 
+ std::string MHashPP::getAlgorithmName (hashid id)
+ {
+-	char *name = mhash_get_hash_name (id) ;
++	char *name = (char *) mhash_get_hash_name (id) ;
+ 	std::string retval ;
+ 	if (name == NULL) {
+ 		retval = std::string ("<algorithm not found>") ;
diff --git a/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch b/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch
new file mode 100644
index 00000000000..ca66b9c544f
--- /dev/null
+++ b/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch
@@ -0,0 +1,349 @@
+--- steghide-0.5.1.old/configure.in	2003-10-15 09:48:52.000000000 +0200
++++ steghide-0.5.1.new/configure.in	2008-05-09 19:04:46.000000000 +0200
+@@ -7,27 +7,26 @@
+ dnl checks for programs.
+ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_AWK
+ AC_PROG_LN_S
++AC_CXX_COMPILE_STDCXX_0X
+ 
+ dnl GNU gettext
+ AC_CHECK_FUNCS(strchr)
+ AM_GNU_GETTEXT
+ AM_CONDITIONAL(USE_INTLDIR, test "$nls_cv_use_gnu_gettext" = yes)
+ 
+ dnl check if debugging support is requested
+-AC_MSG_CHECKING([wether to enable debugging])
++AC_MSG_CHECKING([whether to enable debugging])
+ AC_ARG_ENABLE(debug,[  --enable-debug          enable debugging],
+ 	if test "$enableval" = yes ;
+ 	then
+ 		AC_MSG_RESULT([yes])
+ 		AC_DEFINE(DEBUG,1,[enable code used only for debugging])
+-		CXXFLAGS="-O2 -Wall -g"
+ 	else
+ 		AC_MSG_RESULT([no])
+-		CXXFLAGS="-O2 -Wall"
+ 	fi
+ 	,
+ 	AC_MSG_RESULT([no])
+ 	CXXFLAGS="-O2 -Wall"
+ )
+@@ -213,7 +212,18 @@
+ 	echo "libmhash can be downloaded from http://mhash.sourceforge.net/.";
+ 	echo "**********";
+ 	AC_MSG_ERROR([[libmhash not found]])
+ fi
+ 
++dnl Should we add std=c++0x?
++
++if test "$ac_cv_cxx_compile_cxx0x_cxx" = yes;
++then
++	CXXFLAGS="${CXXFLAGS} -std=c++0x -Wall -Wextra"
++else
++	CXXFLAGS="${CXXFLAGS} -Wall -Wextra"
++fi
++
++AC_SUBST(CXXFLAGS)
++
+ dnl create Makefiles
+ AC_OUTPUT([Makefile steghide.spec steghide.doxygen doc/Makefile po/Makefile.in src/Makefile tests/Makefile tests/data/Makefile m4/Makefile intl/Makefile])
+--- steghide-0.5.1.old/m4/ac_cxx_compile_stdcxx_0x.m4	1970-01-01 01:00:00.000000000 +0100
++++ steghide-0.5.1.new/m4/ac_cxx_compile_stdcxx_0x.m4	2008-05-09 19:04:46.000000000 +0200
+@@ -0,0 +1,107 @@
++# ===========================================================================
++#        http://autoconf-archive.cryp.to/ac_cxx_compile_stdcxx_0x.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AC_CXX_COMPILE_STDCXX_0X
++#
++# DESCRIPTION
++#
++#   Check for baseline language coverage in the compiler for the C++0x
++#   standard.
++#
++# LAST MODIFICATION
++#
++#   2008-04-17
++#
++# COPYLEFT
++#
++#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved.
++
++AC_DEFUN([AC_CXX_COMPILE_STDCXX_0X], [
++  AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
++  ac_cv_cxx_compile_cxx0x_native,
++  [AC_LANG_SAVE
++  AC_LANG_CPLUSPLUS
++  AC_TRY_COMPILE([
++  template <typename T>
++    struct check
++    {
++      static_assert(sizeof(int) <= sizeof(T), "not big enough");
++    };
++
++    typedef check<check<bool>> right_angle_brackets;
++
++    int a;
++    decltype(a) b;
++
++    typedef check<int> check_type;
++    check_type c;
++    check_type&& cr = c;],,
++  ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no)
++  AC_LANG_RESTORE
++  ])
++
++  AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,
++  ac_cv_cxx_compile_cxx0x_cxx,
++  [AC_LANG_SAVE
++  AC_LANG_CPLUSPLUS
++  ac_save_CXXFLAGS="$CXXFLAGS"
++  CXXFLAGS="$CXXFLAGS -std=c++0x"
++  AC_TRY_COMPILE([
++  template <typename T>
++    struct check
++    {
++      static_assert(sizeof(int) <= sizeof(T), "not big enough");
++    };
++
++    typedef check<check<bool>> right_angle_brackets;
++
++    int a;
++    decltype(a) b;
++
++    typedef check<int> check_type;
++    check_type c;
++    check_type&& cr = c;],,
++  ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no)
++  CXXFLAGS="$ac_save_CXXFLAGS"
++  AC_LANG_RESTORE
++  ])
++
++  AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,
++  ac_cv_cxx_compile_cxx0x_gxx,
++  [AC_LANG_SAVE
++  AC_LANG_CPLUSPLUS
++  ac_save_CXXFLAGS="$CXXFLAGS"
++  CXXFLAGS="$CXXFLAGS -std=gnu++0x"
++  AC_TRY_COMPILE([
++  template <typename T>
++    struct check
++    {
++      static_assert(sizeof(int) <= sizeof(T), "not big enough");
++    };
++
++    typedef check<check<bool>> right_angle_brackets;
++
++    int a;
++    decltype(a) b;
++
++    typedef check<int> check_type;
++    check_type c;
++    check_type&& cr = c;],,
++  ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no)
++  CXXFLAGS="$ac_save_CXXFLAGS"
++  AC_LANG_RESTORE
++  ])
++
++  if test "$ac_cv_cxx_compile_cxx0x_native" = yes ||
++     test "$ac_cv_cxx_compile_cxx0x_cxx" = yes ||
++     test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then
++    AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])
++  fi
++])
+--- steghide-0.5.1.old/src/Arguments.cc	2003-10-11 23:25:04.000000000 +0200
++++ steghide-0.5.1.new/src/Arguments.cc	2008-05-09 19:04:44.000000000 +0200
+@@ -26,10 +26,12 @@
+ #include "Terminal.h"
+ #include "common.h"
+ #include "error.h"
+ #include "msg.h"
+ 
++float Arguments::Default_Goal = 100.0 ;
++
+ // the global Arguments object
+ Arguments Args ;
+ 
+ Arguments::Arguments (int argc, char* argv[])
+ {
+--- steghide-0.5.1.old/src/Arguments.h	2003-10-11 23:23:57.000000000 +0200
++++ steghide-0.5.1.new/src/Arguments.h	2008-05-09 19:04:44.000000000 +0200
+@@ -98,11 +98,11 @@
+ 	static const bool		Default_EmbedEmbFn = true ;
+ 	static const bool		Default_Force = false ;
+ 	static const VERBOSITY	Default_Verbosity = NORMAL ;
+ 	static const unsigned long	Default_Radius = 0 ; // there is no default radius for all file formats
+ 	static const unsigned int	Max_Algorithm = 3 ;
+-	static const float		Default_Goal = 100.0 ;
++	static float			Default_Goal ;
+ 	static const DEBUGCOMMAND	Default_DebugCommand = NONE ;
+ 	static const bool		Default_Check = false ;
+ 	static const unsigned int	Default_DebugLevel = 0 ;
+ 	static const unsigned int	Default_GmlGraphRecDepth = 0 ;
+ 	static const unsigned int	Default_GmlStartVertex = 0 ;
+--- steghide-0.5.1.old/src/EncryptionMode.h	2003-09-28 17:30:30.000000000 +0200
++++ steghide-0.5.1.new/src/EncryptionMode.h	2008-05-09 19:04:46.000000000 +0200
+@@ -69,11 +69,11 @@
+ 	static const unsigned int NumValues = 8 ;
+ 	IRep Value ;
+ 
+ 	typedef struct struct_Translation {
+ 		IRep	irep ;
+-		char*	srep ;
++		const char*	srep ;
+ 	} Translation ;
+ 	static const Translation Translations[] ;
+ } ;
+ 
+ #endif // ndef SH_ENCMODE_H
+--- steghide-0.5.1.old/src/Graph.cc	2003-10-11 23:54:26.000000000 +0200
++++ steghide-0.5.1.new/src/Graph.cc	2008-05-09 19:04:46.000000000 +0200
+@@ -20,10 +20,12 @@
+ 
+ #include <ctime>
+ #include <list>
+ #include <map>
+ #include <vector>
++#include <algorithm>
++#include <climits>
+ 
+ #include "BitString.h"
+ #include "CvrStgFile.h"
+ #include "Edge.h"
+ #include "Graph.h"
+--- steghide-0.5.1.old/src/Matching.cc	2003-10-11 23:54:30.000000000 +0200
++++ steghide-0.5.1.new/src/Matching.cc	2008-05-09 19:04:46.000000000 +0200
+@@ -16,10 +16,11 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  *
+  */
+ 
++#include <algorithm>
+ #include "Edge.h"
+ #include "Graph.h"
+ #include "Matching.h"
+ #include "ProgressOutput.h"
+ #include "common.h"
+--- steghide-0.5.1.old/src/ProgressOutput.cc	2003-10-11 11:20:51.000000000 +0200
++++ steghide-0.5.1.new/src/ProgressOutput.cc	2008-05-09 19:04:44.000000000 +0200
+@@ -21,10 +21,12 @@
+ #include <cmath>
+ 
+ #include "ProgressOutput.h"
+ #include "common.h"
+ 
++float ProgressOutput::NoAvgWeight = 1.0 ;
++
+ ProgressOutput::ProgressOutput ()
+ 	: Message("__nomessage__")
+ {
+ 	LastUpdate = time(NULL) - 1 ; // -1 to ensure that message is written first time
+ }
+--- steghide-0.5.1.old/src/ProgressOutput.h	2003-09-28 17:30:30.000000000 +0200
++++ steghide-0.5.1.new/src/ProgressOutput.h	2008-05-09 19:04:44.000000000 +0200
+@@ -60,13 +60,13 @@
+ 	/**
+ 	 * update the output appending rate, [average edge weight], "done" and a newline
+ 	 * \param rate the rate of matched vertices
+ 	 * \param avgweight the average edge weight (is not printed if not given)
+ 	 **/
+-	void done (float rate, float avgweight = NoAvgWeight) const ;
++	void done (float rate, float avgweight = 1.0) const ;
+ 
+-	static const float NoAvgWeight = -1.0 ;
++	static float NoAvgWeight ;
+ 
+ 	protected:
+ 	std::string vcompose (const char *msgfmt, va_list ap) const ;
+ 
+ 	private:
+--- steghide-0.5.1.old/src/SMDConstructionHeuristic.cc	2003-09-28 17:30:30.000000000 +0200
++++ steghide-0.5.1.new/src/SMDConstructionHeuristic.cc	2008-05-09 19:04:46.000000000 +0200
+@@ -16,10 +16,12 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  *
+  */
+ 
++#include <algorithm>
++
+ #include "Edge.h"
+ #include "Graph.h"
+ #include "Matching.h"
+ #include "SMDConstructionHeuristic.h"
+ #include "Vertex.h"
+--- steghide-0.5.1.old/src/WavFile.cc	2003-09-28 17:30:30.000000000 +0200
++++ steghide-0.5.1.new/src/WavFile.cc	2008-05-09 19:04:46.000000000 +0200
+@@ -19,10 +19,11 @@
+  */
+ 
+ #include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
++#include <algorithm>
+ 
+ #include "CvrStgFile.h"
+ #include "DFSAPHeuristic.h"
+ #include "SampleValueAdjacencyList.h"
+ #include "SMDConstructionHeuristic.h"
+--- steghide-0.5.1.old/src/wrapper_hash_map.h	2003-09-28 17:30:30.000000000 +0200
++++ steghide-0.5.1.new/src/wrapper_hash_map.h	2008-05-09 19:04:46.000000000 +0200
+@@ -25,17 +25,21 @@
+ 
+ #ifdef __GNUC__
+ # if __GNUC__ < 3
+ #  include <hash_map.h>
+     namespace sgi { using ::hash ; using ::hash_map ; } ;
+-# else
++# elif __GNUC__ == 3 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 3 )
+ #  include <ext/hash_map>
+-#  if __GNUC_MINOR__ == 0
++#  if __GNUC__ == 3 &&  __GNUC_MINOR__ == 0
+     namespace sgi = std ;			// GCC 3.0
+ #  else
+     namespace sgi = __gnu_cxx ;	// GCC 3.1 and later
+ #  endif
++# else
++#  include <unordered_map>
++#  define hash_map unordered_map
++   namespace sgi = std ;
+ # endif
+ #else
+   namespace sgi = std ;
+ #endif
+ 
+--- steghide-0.5.1.old/src/wrapper_hash_set.h	2003-09-28 17:30:30.000000000 +0200
++++ steghide-0.5.1.new/src/wrapper_hash_set.h	2008-05-09 19:04:46.000000000 +0200
+@@ -26,17 +26,21 @@
+ 
+ #ifdef __GNUC__
+ # if __GNUC__ < 3
+ #  include <hash_set.h>
+     namespace sgi { using ::hash ; using ::hash_set ; } ;
+-# else
++# elif __GNUC__ == 3 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 3 )
+ #  include <ext/hash_set>
+-#  if __GNUC_MINOR__ == 0
++#  if __GNUC__ == 3 && __GNUC_MINOR__ == 0
+     namespace sgi = std ;			// GCC 3.0
+ #  else
+     namespace sgi = ::__gnu_cxx ;	// GCC 3.1 and later
+ #  endif
++# else
++#  include <unordered_set>
++#  define hash_set unordered_set
++   namespace sgi = std ;
+ # endif
+ #else
+   namespace sgi = std ;
+ #endif
+ 
-- 
GitLab


From 451fe867b2162f0a9ff5ec0e4f5327623a88f80f Mon Sep 17 00:00:00 2001
From: Andraz Brodnik <brodul@brodul.org>
Date: Thu, 6 Feb 2014 12:00:41 +0100
Subject: [PATCH 0970/3789] Add steghide to top level.

---
 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 bbc14656e8e..3b7ca278dbc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5641,6 +5641,8 @@ let
 
   stlink = callPackage ../development/tools/misc/stlink { };
 
+  steghide = callPackage ../tools/security/steghide {};
+
   stepmania = callPackage ../games/stepmania {};
 
   stlport = callPackage ../development/libraries/stlport { };
-- 
GitLab


From 6b613f285c50290a68c4c5e633f27a29d0a12835 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 6 Feb 2014 12:29:53 +0100
Subject: [PATCH 0971/3789] Fix nixBuild

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

diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index 42533b0094a..993f12bc300 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (
 
     prePhases = ["initPhase"] ++ prePhases;
 
-    buildInputs = buildInputs ++ [ args.makeCoverageAnalysisReport ];
+    buildInputs = buildInputs ++ stdenv.lib.optional doCoverageAnalysis args.makeCoverageAnalysisReport;
 
     lcovFilter = ["/nix/store/*"] ++ lcovFilter;
 
-- 
GitLab


From de9ed78ab2e774d65bcab74c56cdc01dbde4cdec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 6 Feb 2014 12:30:03 +0100
Subject: [PATCH 0972/3789] cleanSources: Filter *.o and *.so

---
 lib/sources.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/sources.nix b/lib/sources.nix
index 8d259c0837e..a80e4397d6a 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -12,7 +12,10 @@ rec {
       # Filter out Subversion and CVS directories.
       (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) ||
       # Filter out backup files.
-      (lib.hasSuffix "~" baseName)
+      lib.hasSuffix "~" baseName ||
+      # Filter out generates files.
+      lib.hasSuffix ".o" baseName ||
+      lib.hasSuffix ".so" baseName
     );
     in src: builtins.filterSource filter src;
 
-- 
GitLab


From 77376a215e1dd2c1ab36d710891bd00255169fce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 6 Feb 2014 14:21:58 +0100
Subject: [PATCH 0973/3789] debBuild: Allow setting a maintainer address

---
 pkgs/build-support/release/debian-build.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index ba7be86a6c1..168b44ad74c 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -51,7 +51,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
     '';
 
     installPhase = ''
-      eval "$preInstall" 
+      eval "$preInstall"
       export LOGNAME=root
 
       ${checkinstall}/sbin/checkinstall --nodoc -y -D \
@@ -59,6 +59,8 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
         --requires="${concatStringsSep "," debRequires}" \
         --provides="${concatStringsSep "," debProvides}" \
         ${optionalString (src ? version) "--pkgversion=$(echo ${src.version} | tr _ -)"} \
+        ''${debMaintainer:+--maintainer="'$debMaintainer'"} \
+        $checkInstallFlags \
         make install
 
       mkdir -p $out/debs
@@ -79,7 +81,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
         echo "file deb-extra $(ls $i/debs/*.deb | sort | head -1)" >> $out/nix-support/hydra-build-products
       done
 
-      eval "$postInstall" 
+      eval "$postInstall"
     ''; # */
 
     meta = (if args ? meta then args.meta else {}) // {
-- 
GitLab


From 43166e306e5e842336ca98229706fb3ab68da5d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Feb 2014 15:11:00 +0100
Subject: [PATCH 0974/3789] haskell-packages.nix: use the correct path to tls
 1.2.2

---
 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 d9e8fbc958b..7b98108dccb 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2349,7 +2349,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   timeCompat = callPackage ../development/libraries/haskell/time-compat {};
 
   tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {};
-  tls_1_2_2 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {};
+  tls_1_2_2 = callPackage ../development/libraries/haskell/tls/1.2.2.nix {};
   tls = self.tls_1_2_2;
 
   tlsExtra = callPackage ../development/libraries/haskell/tls-extra {
-- 
GitLab


From 09dd6a64fcfcdd86eb103c162087bb5c45b54c41 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 12 Oct 2013 19:31:44 +0200
Subject: [PATCH 0975/3789] systemd: add optional python support

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 2c2ed582083..d7af0a6d36b 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,11 +1,13 @@
 { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
 , xz, pam, acl, cryptsetup, libuuid, m4, utillinux
 , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl
-, kexectools
+, kexectools, python ? null, pythonSupport ? false
 }:
 
 assert stdenv.isLinux;
 
+assert pythonSupport -> python != null;
+
 stdenv.mkDerivation rec {
   version = "203";
   name = "systemd-${version}";
@@ -25,7 +27,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ pkgconfig intltool gperf libcap dbus.libs kmod xz pam acl
       /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl
-    ];
+    ] ++ stdenv.lib.optional pythonSupport python;
 
   configureFlags =
     [ "--localstatedir=/var"
-- 
GitLab


From ae9c22df3f0e51ac89480b80676bcd49bd4ba2c1 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 13 Dec 2013 17:58:11 +0100
Subject: [PATCH 0976/3789] systemd: enable journal http gateway by adding
 libmicrohttp

---
 pkgs/os-specific/linux/systemd/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index d7af0a6d36b..caa69a9e3a8 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
 , xz, pam, acl, cryptsetup, libuuid, m4, utillinux
 , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl
-, kexectools, python ? null, pythonSupport ? false
+, kexectools, libmicrohttpd
+, python ? null, pythonSupport ? false
 }:
 
 assert stdenv.isLinux;
@@ -27,6 +28,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ pkgconfig intltool gperf libcap dbus.libs kmod xz pam acl
       /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl
+      libmicrohttpd
     ] ++ stdenv.lib.optional pythonSupport python;
 
   configureFlags =
-- 
GitLab


From 616b4b5b0ef8ac9bcb2ce7b577040f0b209e34b6 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 1 Feb 2014 14:50:20 +0100
Subject: [PATCH 0977/3789] nixos/systemd: add journal http gateway support

---
 nixos/modules/misc/ids.nix            |  2 ++
 nixos/modules/system/boot/systemd.nix | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 16eec904321..0a585139521 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -110,6 +110,7 @@
       openldap = 99;
       memcached = 100;
       cgminer = 101;
+      systemd-journal-gateway = 102;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -199,6 +200,7 @@
       haproxy = 92;
       openldap = 93;
       connman = 94;
+      systemd-journal-gateway = 95;
 
       # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index b575deb24b7..aaa49695540 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -132,6 +132,11 @@ let
     ++ optionals cfg.enableEmergencyMode [
       "emergency.target"
       "emergency.service"
+    ]
+
+    ++ optionals config.services.journald.enableHttpGateway [
+      "systemd-journal-gatewayd.socket"
+      "systemd-journal-gatewayd.service"
     ];
 
   upstreamWants =
@@ -372,6 +377,10 @@ 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
@@ -567,6 +576,14 @@ in
       '';
     };
 
+    services.journald.enableHttpGateway = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Enable journal http gateway
+      '';
+    };
+
     services.logind.extraConfig = mkOption {
       default = "";
       type = types.lines;
@@ -673,6 +690,8 @@ in
       };
 
     users.extraGroups.systemd-journal.gid = config.ids.gids.systemd-journal;
+    users.extraUsers.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway;
+    users.extraGroups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway;
 
     # Generate timer units for all services that have a ‘startAt’ value.
     systemd.timers =
-- 
GitLab


From 2dd13fcb0b1ca678af58d5c53dd3e4b05a75b2fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 6 Feb 2014 19:21:26 +0100
Subject: [PATCH 0978/3789] socat-2.*: fix CVE-2014-0019

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

diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix
index 62180313442..885f2d005d8 100644
--- a/pkgs/tools/networking/socat/2.x.nix
+++ b/pkgs/tools/networking/socat/2.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "socat-2.0.0-b6";
+  name = "socat-2.0.0-b7";
 
   src = fetchurl {
     url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
-    sha256 = "03n70v7ygsl4ji7rwvyv8f70d3q32jnas26j29amkf3fm4agnhvz";
+    sha256 = "0h6k9ccrnziw03j0if7myrd28vcc97nwz1bifmbrkp5jkpk69ygk";
   };
 
   buildInputs = [ openssl ];
-- 
GitLab


From 32cd198d8f9c8e36f5ef95f1690e76f1e438505f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 6 Feb 2014 19:56:28 +0100
Subject: [PATCH 0979/3789] gimp: remove 2.6, because it's old and vulnerable

CVE-2012-2763 and three others. If we really need to resurrect it,
I think I saw debian could have patches for these somewhere.

Also add linux platforms for 2.8.
---
 pkgs/applications/graphics/gimp/2.8.nix     |  1 +
 pkgs/applications/graphics/gimp/default.nix | 32 ---------------------
 pkgs/top-level/all-packages.nix             |  5 ----
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 pkgs/applications/graphics/gimp/default.nix

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 423b9f3ce22..0f8d6d45f12 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
     description = "The GNU Image Manipulation Program";
     homepage = http://www.gimp.org/;
     license = "GPL";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
deleted file mode 100644
index 33d52c6645b..00000000000
--- a/pkgs/applications/graphics/gimp/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, freetype
-, fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
-, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl_0_0_22, gegl_0_0_22
-}:
-
-stdenv.mkDerivation rec {
-  name = "gimp-2.6.12";
-
-  src = fetchurl {
-    url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
-    sha256 = "0qpcgaa4pdqqhyyy8vjvzfflxgsrrs25zk79gixzlnbzq3qwjlym";
-  };
-
-  buildInputs = [
-    pkgconfig gtk freetype fontconfig
-    libart_lgpl libtiff libjpeg libpng libexif zlib perl
-    perlXMLParser python pygtk gettext intltool babl_0_0_22 gegl_0_0_22
-  ];
-
-  passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
-
-  configureFlags = [ "--disable-print" ];
-
-  # "screenshot" needs this.
-  NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib";
-
-  meta = {
-    description = "The GNU Image Manipulation Program";
-    homepage = http://www.gimp.org/;
-    license = "GPL";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbc14656e8e..c793a200eb2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7928,11 +7928,6 @@ let
 
   get_iplayer = callPackage ../applications/misc/get_iplayer {};
 
-  gimp_2_6 = callPackage ../applications/graphics/gimp {
-    inherit (gnome) libart_lgpl;
-    libpng = libpng12;
-  };
-
   gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix {
     inherit (gnome) libart_lgpl;
     webkit = null;
-- 
GitLab


From 15282d8228b0b9f216c02f057ea90288e70f9b7f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 6 Feb 2014 14:14:53 -0500
Subject: [PATCH 0980/3789] Add scottyHastache haskell package

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../haskell/scotty-hastache/default.nix       | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/scotty-hastache/default.nix

diff --git a/pkgs/development/libraries/haskell/scotty-hastache/default.nix b/pkgs/development/libraries/haskell/scotty-hastache/default.nix
new file mode 100644
index 00000000000..76e6fe45ad1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/scotty-hastache/default.nix
@@ -0,0 +1,19 @@
+{ cabal, blazeHtml, blazeMarkup, filepath, hastache, httpTypes, mtl
+, scotty, text, wai, warp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "scotty-hastache";
+  version = "0.2.0";
+  sha256 = "105cxlasj4sl4ddzg8ms6k95078q10zcm2c86jcn76s0jmv95669";
+  buildDepends = [
+    blazeHtml blazeMarkup filepath hastache httpTypes mtl scotty text
+    wai warp
+  ];
+  meta = {
+    homepage = "https://github.com/scotty-web/scotty-hastache";
+    description = "Easy Mustache templating support for Scotty";
+    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 7b98108dccb..9619364ea56 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2080,6 +2080,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   scotty = callPackage ../development/libraries/haskell/scotty {};
 
+  scottyHastache = callPackage ../development/libraries/haskell/scotty-hastache {};
+
   securemem = callPackage ../development/libraries/haskell/securemem {};
 
   sendfile = callPackage ../development/libraries/haskell/sendfile {};
-- 
GitLab


From f4c4f121cb4c07f628d5260a5f85cf63ae6b3289 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 6 Feb 2014 14:16:28 -0500
Subject: [PATCH 0981/3789] Add wai-middleware-static haskell package

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../haskell/wai-middleware-static/default.nix      | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/wai-middleware-static/default.nix

diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
new file mode 100644
index 00000000000..859c75c39c3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
@@ -0,0 +1,14 @@
+{ cabal, filepath, httpTypes, mtl, text, wai }:
+
+cabal.mkDerivation (self: {
+  pname = "wai-middleware-static";
+  version = "0.4.0.2";
+  sha256 = "0nw54h8baphjdwsd118g9j5w4g2mnb2hrny0n4ih4jlqlcqam3lf";
+  buildDepends = [ filepath httpTypes mtl text wai ];
+  meta = {
+    homepage = "https://github.com/scotty-web/scotty";
+    description = "WAI middleware that intercepts requests to static 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 9619364ea56..f14e7150ba8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2480,6 +2480,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   waiLogger = callPackage ../development/libraries/haskell/wai-logger {};
 
+  waiMiddlewareStatic = callPackage ../development/libraries/haskell/wai-middleware-static {};
+
   waiTest = callPackage ../development/libraries/haskell/wai-test {};
 
   warp = callPackage ../development/libraries/haskell/warp {};
-- 
GitLab


From 11914108aa7cd855a52f94c4d30e931572ba0655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 6 Feb 2014 20:09:49 +0100
Subject: [PATCH 0982/3789] gnash: fix CVE-2012-1175 by upstream patch

---
 pkgs/applications/video/gnash/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index 4f2addcc99b..0291e7593ea 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -10,7 +10,13 @@
 
 assert stdenv ? glibc;
 
-let version = "0.8.10"; in
+let version = "0.8.10";
+    patch_CVE = fetchurl {
+      url = "http://git.savannah.gnu.org/cgit/gnash.git/patch/?id=bb4dc77eecb6ed1b967e3ecbce3dac6c5e6f1527";
+      sha256 = "1g7ymbq9vxi0mwcgs2dpyd2sf30gaam7blza0ywiwj32f5wk62v1";
+      name = "CVE-2012-1175.patch";
+    };
+in
 
 stdenv.mkDerivation rec {
   name = "gnash-${version}";
@@ -21,6 +27,8 @@ stdenv.mkDerivation rec {
   };
 
   patchPhase = ''
+    patch -p1 < ${patch_CVE}
+
     # Add all libs to `macros/libslist', a list of library search paths.
     for lib in ${lib.concatStringsSep " "
                                       (map (lib: "\"${lib}\"/lib")
-- 
GitLab


From 97e7ce23447d0aafe1c20d2e459079abf54b31a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 6 Feb 2014 20:34:55 +0100
Subject: [PATCH 0983/3789] gnutls2: fix CVE-2013-2116 by Debian patch

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

diff --git a/pkgs/development/libraries/gnutls/2.12.nix b/pkgs/development/libraries/gnutls/2.12.nix
index 86829a3a44b..fa9e5c69b79 100644
--- a/pkgs/development/libraries/gnutls/2.12.nix
+++ b/pkgs/development/libraries/gnutls/2.12.nix
@@ -12,6 +12,13 @@ stdenv.mkDerivation rec {
     sha256 = "1lkys703z4yxfgzarmgas5ccvn6m254w9wvm7s8v0zkj81z7m9nz";
   };
 
+  patches = [(fetchurl {
+    url = "http://anonscm.debian.org/viewvc/pkg-gnutls/packages/gnutls26/trunk/"
+      + "debian/patches/21_sanitycheck.diff?revision=1777&view=co";
+    sha256 = "0k18a7q6irmgjzp647bd18zccjpsr82n2s9arpamnkakgnny4ks9";
+    name = "CVE-2013-2116.patch";
+  })];
+
   configurePhase = ''
     ./configure --prefix="$out"                                 \
       --disable-dependency-tracking --enable-fast-install       \
-- 
GitLab


From cb605c92d2294eb873c637d399169a74bdcb593a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 6 Feb 2014 20:45:14 +0100
Subject: [PATCH 0984/3789] gnutls32: update 3.2.4 -> .10, including CVE fixes

Also make gnutls32 the default gnutls.
CVE-2013-{4466,4487}
---
 pkgs/development/libraries/gnutls/3.2.nix | 4 ++--
 pkgs/top-level/all-packages.nix           | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix
index 5a5b6aa94e2..03a0c001979 100644
--- a/pkgs/development/libraries/gnutls/3.2.nix
+++ b/pkgs/development/libraries/gnutls/3.2.nix
@@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
 
 stdenv.mkDerivation (rec {
 
-  name = "gnutls-3.2.4";
+  name = "gnutls-3.2.10";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz";
-    sha256 = "0zl4h37g51xyaalv3qp2hvn1m6z7xzfw4yvpvi6mby4x5sqrrp8i";
+    sha256 = "1g1w93d66sz51977zbqd56641r501a1djcwhykbjm8alhyz1564h";
   };
 
   # Note: GMP is a dependency of Nettle, whose public headers include
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c793a200eb2..1b1916f2c63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4323,7 +4323,8 @@ let
 
   gnu-efi = callPackage ../development/libraries/gnu-efi { };
 
-  gnutls = callPackage ../development/libraries/gnutls {
+  gnutls = gnutls32;
+  gnutls31 = callPackage ../development/libraries/gnutls {
     guileBindings = config.gnutls.guile or true;
   };
 
-- 
GitLab


From 1c3950dc9d1c12ea97a0203bda296da24581f6b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 6 Feb 2014 20:49:23 +0100
Subject: [PATCH 0985/3789] gnutls31: update 3.1.12 -> .20, including CVE fixes

Also make gnutls32 the default gnutls.
CVE-2013-{4466,4487}
---
 pkgs/development/libraries/gnutls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 0a98a2698fd..8750dd568f7 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
 
 stdenv.mkDerivation (rec {
 
-  name = "gnutls-3.1.12";
+  name = "gnutls-3.1.20";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${name}.tar.lz";
-    sha256 = "1h8j3xi2jad2dclybgqffb5264hdqrxpsx99irs03yy9np6iw5l8";
+    sha256 = "1a8pzc29sn1kmbqvldljf4kmbz60pdk931dirk5jdd0qpf8fzd5x";
   };
 
   # Note: GMP is a dependency of Nettle, whose public headers include
-- 
GitLab


From 6e0cac6d6a1d0b12634b38100308ec6c7bbf23f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 6 Feb 2014 20:54:07 +0100
Subject: [PATCH 0986/3789] hadoop: update, including fix for CVE-2013-2192

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

diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index ef2f16e3193..f6e86c6289c 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "hadoop-2.0.2-alpha";
+  name = "hadoop-2.2.0";
 
   src = fetchurl {
     url = "mirror://apache/hadoop/common/${name}/${name}.tar.gz";
-    sha256 = "1r7ailmqhny3pl5nb8bcblnhckszy6hb9n58kwa3s4b8qfk87gkb";
+    sha256 = "0r0kx8arsrvmcfy0693hpv4cz3i0razvk1xa3yhlf3ybb80a8106";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 72740390d73d329ac799da221b2f26cdca1fa62b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 6 Feb 2014 20:59:04 +0100
Subject: [PATCH 0987/3789] libarchive: fix CVE-2013-0211 by upstream patch

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

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 7abad2f2d08..b7b001e44eb 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -12,6 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "0pixqnrcf35dnqgv0lp7qlcw7k13620qkhgxr288v7p4iz6ym1zb";
   };
 
+  patches = [(fetchurl {
+    url = "https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4.patch";
+    sha256 = "0c1a0prlpq5nn7zgs7cqvw9xnmhkkc8l0mpsip86k1lafircqhzh";
+    name = "CVE-2013-0211.patch";
+  })];
+
   buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz ] ++
     stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ];
 
-- 
GitLab


From ce5f84ce567e735b4f6b9cd3ea69264ed98ab109 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Thu, 6 Feb 2014 12:15:43 -0800
Subject: [PATCH 0988/3789] nss: update to 3.15.4

---
 pkgs/development/libraries/nss/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index b352064cee5..92cc12fe1be 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -5,17 +5,17 @@
 let
 
   nssPEM = fetchurl {
-    url = http://dev.gentoo.org/~anarchy/patches/nss-3.15-pem-support-20130617.patch.xz;
-    sha256 = "1k1m8lsgqwxx251943hks1dd13hz1adpqqb0hxwn011by5vmi201";
+    url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
+    sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
   };
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.15.3.1";
+  version = "3.15.4";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_3_1_RTM/src/${name}.tar.gz";
-    sha1 = "4e0f81a1f770447dc5440201a579151b601463e2";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_4_RTM/src/${name}.tar.gz";
+    sha1 = "c164fac83fcbaff010786767e2a858ca23a89a5b";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
-- 
GitLab


From 2ceb44b9a9b3f22271f0499bf17dcbf0b25cc77b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 6 Feb 2014 21:55:22 +0100
Subject: [PATCH 0989/3789] lightdm-gtk-greter: fix CVE-2014-0979 by upstream
 patch

---
 .../display-managers/lightdm-gtk-greeter/default.nix      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
index 0e75005d13b..69f1eef9cec 100644
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -20,7 +20,13 @@ stdenv.mkDerivation rec {
     sha256 = "1nb8ljrbrp1zga083g3b633xi3izxxm4jipw1qgial1x16mqc0hz";
   };
 
-  patches = [ ./lightdm-gtk-greeter.patch ];
+  patches = [
+    ./lightdm-gtk-greeter.patch
+    (fetchurl { # CVE-2014-0979, https://bugs.launchpad.net/lightdm-gtk-greeter/+bug/1266449
+      url = "https://launchpadlibrarian.net/161796033/07_fix-NULL-username.patch";
+      sha256 = "1sqkhsz1z10k6vlmlrqrfx452lznv30885fmnzc73p2zxdlw9q1a";
+    })
+  ];
   patchFlags = "-p1";
 
   buildInputs = [ pkgconfig lightdm intltool ]
-- 
GitLab


From 35c586e62473d13114cf1dd1842563693120a853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 6 Feb 2014 21:57:23 +0100
Subject: [PATCH 0990/3789] boost149: fix CVE-2013-0252 by upstream patch

Also have just one patch per line in the expression.
---
 pkgs/development/libraries/boost/1.49.nix     |  7 ++-
 .../libraries/boost/CVE-2013-0252.patch       | 48 +++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/boost/CVE-2013-0252.patch

diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix
index f502df4e19c..fca4249e963 100644
--- a/pkgs/development/libraries/boost/1.49.nix
+++ b/pkgs/development/libraries/boost/1.49.nix
@@ -57,7 +57,12 @@ stdenv.mkDerivation {
   };
 
   # See <http://svn.boost.org/trac/boost/ticket/4688>.
-  patches = [ ./boost_filesystem_post_1_49_0.patch ./time_utc.patch ./boost-149-cstdint.patch ] ++ (stdenv.lib.optional stdenv.isDarwin ./boost-149-darwin.patch );
+  patches = [
+    ./CVE-2013-0252.patch # https://svn.boost.org/trac/boost/ticket/7743
+    ./boost_filesystem_post_1_49_0.patch
+    ./time_utc.patch
+    ./boost-149-cstdint.patch
+  ] ++ (stdenv.lib.optional stdenv.isDarwin ./boost-149-darwin.patch );
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/boost/CVE-2013-0252.patch b/pkgs/development/libraries/boost/CVE-2013-0252.patch
new file mode 100644
index 00000000000..fce52d47969
--- /dev/null
+++ b/pkgs/development/libraries/boost/CVE-2013-0252.patch
@@ -0,0 +1,48 @@
+Index: /boost/locale/utf.hpp
+===================================================================
+--- /boost/locale/utf.hpp	(revision 78304)
++++ /boost/locale/utf.hpp	(revision 81590)
+@@ -220,4 +220,6 @@
+                     return incomplete;
+                 tmp = *p++;
++                if (!is_trail(tmp))
++                    return illegal;
+                 c = (c << 6) | ( tmp & 0x3F);
+             case 2:
+@@ -225,4 +227,6 @@
+                     return incomplete;
+                 tmp = *p++;
++                if (!is_trail(tmp))
++                    return illegal;
+                 c = (c << 6) | ( tmp & 0x3F);
+             case 1:
+@@ -230,4 +234,6 @@
+                     return incomplete;
+                 tmp = *p++;
++                if (!is_trail(tmp))
++                    return illegal;
+                 c = (c << 6) | ( tmp & 0x3F);
+             }
+Index: /libs/locale/test/test_codepage_converter.cpp
+===================================================================
+--- /libs/locale/test/test_codepage_converter.cpp	(revision 73786)
++++ /libs/locale/test/test_codepage_converter.cpp	(revision 81590)
+@@ -140,4 +140,18 @@
+         TEST_TO("\xf8\x90\x80\x80\x80",illegal);  // 400 0000
+         TEST_TO("\xfd\xbf\xbf\xbf\xbf\xbf",illegal);  // 7fff ffff
++
++        std::cout << "-- Invalid trail" << std::endl;
++        TEST_TO("\xC2\x7F",illegal);
++        TEST_TO("\xdf\x7F",illegal);
++        TEST_TO("\xe0\x7F\x80",illegal);
++        TEST_TO("\xef\xbf\x7F",illegal);
++        TEST_TO("\xe0\x7F\x80",illegal);
++        TEST_TO("\xef\xbf\x7F",illegal);
++        TEST_TO("\xf0\x7F\x80\x80",illegal);
++        TEST_TO("\xf4\x7f\xbf\xbf",illegal);
++        TEST_TO("\xf0\x90\x7F\x80",illegal);
++        TEST_TO("\xf4\x8f\x7F\xbf",illegal);
++        TEST_TO("\xf0\x90\x80\x7F",illegal);
++        TEST_TO("\xf4\x8f\xbf\x7F",illegal);
+ 
+         std::cout << "-- Invalid length" << std::endl;
-- 
GitLab


From c3a81a6991389d03644b72a475ca4d63da04faa1 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 31 Jan 2014 14:25:26 +0100
Subject: [PATCH 0991/3789] Add fakechroot

---
 pkgs/tools/system/fakechroot/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/system/fakechroot/default.nix

diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/tools/system/fakechroot/default.nix
new file mode 100644
index 00000000000..a652a1e84ef
--- /dev/null
+++ b/pkgs/tools/system/fakechroot/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "fakechroot-${version}";
+  version = "2.17.2";
+
+  src = fetchurl {
+    url = "https://github.com/dex4er/fakechroot/archive/${version}.tar.gz";
+    md5 = "e614f62972efa4654fc780ae7e4affad";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/dex4er/fakechroot;
+    description = "Give a fake chroot environment through LD_PRELOAD";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [offline];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f027cbe2e16..59e3334e121 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -899,6 +899,8 @@ let
 
   fakeroot = callPackage ../tools/system/fakeroot { };
 
+  fakechroot = callPackage ../tools/system/fakechroot { };
+
   fcitx = callPackage ../tools/inputmethods/fcitx { };
 
   fcron = callPackage ../tools/system/fcron { };
-- 
GitLab


From 23c2993ef6916bf61e883e7e99acbaf2d507a0dc Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 6 Feb 2014 21:43:49 +0000
Subject: [PATCH 0992/3789] node-packages: add gh and regenerate
 pkgs/top-level/node-packages-generated.nix

---
 pkgs/top-level/node-packages-generated.nix | 393 ++++++++++++++++-----
 pkgs/top-level/node-packages.json          |   1 +
 2 files changed, 308 insertions(+), 86 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 80910e5a7d9..139c948298a 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -1054,7 +1054,7 @@
     deps = [
       self.by-version."graceful-fs"."2.0.1"
       self.by-version."mout"."0.6.0"
-      self.by-version."optimist"."0.6.0"
+      self.by-version."optimist"."0.6.1"
       self.by-version."osenv"."0.0.3"
     ];
     peerDependencies = [
@@ -1077,7 +1077,7 @@
     deps = [
       self.by-version."graceful-fs"."2.0.1"
       self.by-version."mout"."0.6.0"
-      self.by-version."optimist"."0.6.0"
+      self.by-version."optimist"."0.6.1"
       self.by-version."osenv"."0.0.3"
     ];
     peerDependencies = [
@@ -1898,7 +1898,7 @@
     ];
     passthru.names = [ "cli" ];
   };
-  by-spec."cli-color"."~0.2.2" =
+  by-spec."cli-color"."*" =
     self.by-version."cli-color"."0.2.3";
   by-version."cli-color"."0.2.3" = lib.makeOverridable self.buildNodePackage {
     name = "node-cli-color-0.2.3";
@@ -1919,6 +1919,30 @@
     ];
     passthru.names = [ "cli-color" ];
   };
+  by-spec."cli-color"."~0.2.2" =
+    self.by-version."cli-color"."0.2.3";
+  by-spec."cli-color"."~0.2.3" =
+    self.by-version."cli-color"."0.2.3";
+  by-spec."cli-log"."~0.0.8" =
+    self.by-version."cli-log"."0.0.8";
+  by-version."cli-log"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cli-log-0.0.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cli-log/-/cli-log-0.0.8.tgz";
+        name = "cli-log-0.0.8.tgz";
+        sha1 = "af738d7f5fcda8aab21bd4dbcd904ee5137c1ad0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cli-log" or []);
+    deps = [
+      self.by-version."cli-color"."0.2.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cli-log" ];
+  };
   by-spec."cliff"."0.1.8" =
     self.by-version."cliff"."0.1.8";
   by-version."cliff"."0.1.8" = lib.makeOverridable self.buildNodePackage {
@@ -2267,15 +2291,15 @@
     ];
     passthru.names = [ "combined-stream" ];
   };
-  by-spec."commander"."*" =
-    self.by-version."commander"."2.1.0";
-  by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-commander-2.1.0";
+  by-spec."commander"."0.6.1" =
+    self.by-version."commander"."0.6.1";
+  by-version."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-commander-0.6.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
-        name = "commander-2.1.0.tgz";
-        sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
+        url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+        name = "commander-0.6.1.tgz";
+        sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
       })
     ];
     buildInputs =
@@ -2286,20 +2310,21 @@
     ];
     passthru.names = [ "commander" ];
   };
-  by-spec."commander"."0.6.1" =
-    self.by-version."commander"."0.6.1";
-  by-version."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-commander-0.6.1";
+  by-spec."commander"."1.3.1" =
+    self.by-version."commander"."1.3.1";
+  by-version."commander"."1.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-commander-1.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
-        name = "commander-0.6.1.tgz";
-        sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+        url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
+        name = "commander-1.3.1.tgz";
+        sha1 = "02443e02db96f4b32b674225451abb6e9510000e";
       })
     ];
     buildInputs =
       (self.nativeDeps."commander" or []);
     deps = [
+      self.by-version."keypress"."0.1.0"
     ];
     peerDependencies = [
     ];
@@ -2348,6 +2373,23 @@
     self.by-version."commander"."2.0.0";
   by-spec."commander"."2.1.0" =
     self.by-version."commander"."2.1.0";
+  by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-commander-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
+        name = "commander-2.1.0.tgz";
+        sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."commander" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "commander" ];
+  };
   by-spec."commander"."~0.6.1" =
     self.by-version."commander"."0.6.1";
   by-spec."config"."0.4.15" =
@@ -2910,6 +2952,26 @@
     ];
     passthru.names = [ "cookies" ];
   };
+  by-spec."copy-paste"."~0.1.0" =
+    self.by-version."copy-paste"."0.1.0";
+  by-version."copy-paste"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-copy-paste-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/copy-paste/-/copy-paste-0.1.0.tgz";
+        name = "copy-paste-0.1.0.tgz";
+        sha1 = "d748638a4eccfa83af064eeb4bfc625cb300d28c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."copy-paste" or []);
+    deps = [
+      self.by-version."execSync"."1.0.1-pre"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "copy-paste" ];
+  };
   by-spec."core-util-is"."~1.0.0" =
     self.by-version."core-util-is"."1.0.1";
   by-version."core-util-is"."1.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -4257,6 +4319,26 @@
     ];
     passthru.names = [ "everyauth" ];
   };
+  by-spec."execSync"."~1.0.0" =
+    self.by-version."execSync"."1.0.1-pre";
+  by-version."execSync"."1.0.1-pre" = lib.makeOverridable self.buildNodePackage {
+    name = "node-execSync-1.0.1-pre";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/execSync/-/execSync-1.0.1-pre.tgz";
+        name = "execSync-1.0.1-pre.tgz";
+        sha1 = "8fa8deb748eecdafe61feea49921bb9b7a410d1e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."execSync" or []);
+    deps = [
+      self.by-version."temp"."0.5.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "execSync" ];
+  };
   by-spec."exit"."~0.1.1" =
     self.by-version."exit"."0.1.2";
   by-version."exit"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -4856,7 +4938,7 @@
       self.by-version."forever-monitor"."1.2.3"
       self.by-version."nconf"."0.6.9"
       self.by-version."nssocket"."0.5.1"
-      self.by-version."optimist"."0.6.0"
+      self.by-version."optimist"."0.6.1"
       self.by-version."pkginfo"."0.3.0"
       self.by-version."timespan"."2.3.0"
       self.by-version."watch"."0.8.0"
@@ -5413,6 +5495,60 @@
     ];
     passthru.names = [ "getobject" ];
   };
+  by-spec."gh"."*" =
+    self.by-version."gh"."1.8.2";
+  by-version."gh"."1.8.2" = lib.makeOverridable self.buildNodePackage {
+    name = "gh-1.8.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/gh/-/gh-1.8.2.tgz";
+        name = "gh-1.8.2.tgz";
+        sha1 = "01ae9e23a617a9c08e8196078dd7b5a8b79b0156";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."gh" or []);
+    deps = [
+      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."copy-paste"."0.1.0"
+      self.by-version."moment"."2.4.0"
+      self.by-version."handlebars"."1.0.11"
+      self.by-version."github"."0.1.13"
+      self.by-version."inquirer"."0.3.5"
+      self.by-version."wordwrap"."0.0.2"
+      self.by-version."nopt"."2.1.2"
+      self.by-version."open"."0.0.4"
+      self.by-version."truncate"."1.0.2"
+      self.by-version."update-notifier"."0.1.7"
+      self.by-version."userhome"."0.1.0"
+      self.by-version."which"."1.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "gh" ];
+  };
+  "gh" = self.by-version."gh"."1.8.2";
+  by-spec."github"."~0.1.12" =
+    self.by-version."github"."0.1.13";
+  by-version."github"."0.1.13" = lib.makeOverridable self.buildNodePackage {
+    name = "node-github-0.1.13";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/github/-/github-0.1.13.tgz";
+        name = "github-0.1.13.tgz";
+        sha1 = "90567238d0eb54f7c58ad3a6a2bea0fa495c94fb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."github" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "github" ];
+  };
   by-spec."github-flavored-markdown".">= 0.0.1" =
     self.by-version."github-flavored-markdown"."1.0.1";
   by-version."github-flavored-markdown"."1.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -5880,7 +6016,7 @@
     buildInputs =
       (self.nativeDeps."grunt-karma" or []);
     deps = [
-      self.by-version."optimist"."0.6.0"
+      self.by-version."optimist"."0.6.1"
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.2"
@@ -5979,6 +6115,27 @@
     passthru.names = [ "gzippo" ];
   };
   "gzippo" = self.by-version."gzippo"."0.2.0";
+  by-spec."handlebars"."1.0.11" =
+    self.by-version."handlebars"."1.0.11";
+  by-version."handlebars"."1.0.11" = lib.makeOverridable self.buildNodePackage {
+    name = "handlebars-1.0.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/handlebars/-/handlebars-1.0.11.tgz";
+        name = "handlebars-1.0.11.tgz";
+        sha1 = "28b8af8b1f3658ef377e621e0d6b07078fc450a9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."handlebars" or []);
+    deps = [
+      self.by-version."optimist"."0.3.7"
+      self.by-version."uglify-js"."1.2.6"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "handlebars" ];
+  };
   by-spec."handlebars"."1.0.x" =
     self.by-version."handlebars"."1.0.12";
   by-version."handlebars"."1.0.12" = lib.makeOverridable self.buildNodePackage {
@@ -6418,7 +6575,7 @@
       (self.nativeDeps."http-proxy" or []);
     deps = [
       self.by-version."colors"."0.6.2"
-      self.by-version."optimist"."0.6.0"
+      self.by-version."optimist"."0.6.1"
       self.by-version."pkginfo"."0.3.0"
       self.by-version."utile"."0.2.1"
     ];
@@ -6545,7 +6702,7 @@
     deps = [
       self.by-version."coffee-script-redux"."2.0.0-beta4"
       self.by-version."istanbul"."0.2.4"
-      self.by-version."optimist"."0.6.0"
+      self.by-version."optimist"."0.6.1"
       self.by-version."escodegen"."1.1.0"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."which"."1.0.5"
@@ -6717,6 +6874,8 @@
   };
   by-spec."inquirer"."~0.3.1" =
     self.by-version."inquirer"."0.3.5";
+  by-spec."inquirer"."~0.3.4" =
+    self.by-version."inquirer"."0.3.5";
   by-spec."inquirer"."~0.4.0" =
     self.by-version."inquirer"."0.4.0";
   by-version."inquirer"."0.4.0" = lib.makeOverridable self.buildNodePackage {
@@ -7391,7 +7550,7 @@
       self.by-version."glob"."3.2.8"
       self.by-version."minimatch"."0.2.14"
       self.by-version."http-proxy"."0.10.4"
-      self.by-version."optimist"."0.6.0"
+      self.by-version."optimist"."0.6.1"
       self.by-version."coffee-script"."1.6.3"
       self.by-version."rimraf"."2.2.6"
       self.by-version."q"."0.9.7"
@@ -8951,14 +9110,14 @@
     passthru.names = [ "moment" ];
   };
   by-spec."mongodb"."*" =
-    self.by-version."mongodb"."1.4.0-rc5";
-  by-version."mongodb"."1.4.0-rc5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mongodb-1.4.0-rc5";
+    self.by-version."mongodb"."1.4.0-rc6";
+  by-version."mongodb"."1.4.0-rc6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mongodb-1.4.0-rc6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc5.tgz";
-        name = "mongodb-1.4.0-rc5.tgz";
-        sha1 = "4be74a98df5f2f0e1eba6d868498d710f4c264ae";
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc6.tgz";
+        name = "mongodb-1.4.0-rc6.tgz";
+        sha1 = "dd2f6a03d9e9da019d6aa5da66c4d5de7993aedd";
       })
     ];
     buildInputs =
@@ -8971,7 +9130,7 @@
     ];
     passthru.names = [ "mongodb" ];
   };
-  "mongodb" = self.by-version."mongodb"."1.4.0-rc5";
+  "mongodb" = self.by-version."mongodb"."1.4.0-rc6";
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
   by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
@@ -9720,7 +9879,7 @@
       self.by-version."dox"."0.4.4"
       self.by-version."jade"."0.35.0"
       self.by-version."node-uuid"."1.4.1"
-      self.by-version."optimist"."0.6.0"
+      self.by-version."optimist"."0.6.1"
       self.by-version."request"."2.27.0"
       self.by-version."semver"."2.1.0"
       self.by-version."sprintf"."0.1.3"
@@ -10027,7 +10186,7 @@
     deps = [
       self.by-version."mailcomposer"."0.2.8"
       self.by-version."simplesmtp"."0.3.20"
-      self.by-version."optimist"."0.6.0"
+      self.by-version."optimist"."0.6.1"
     ];
     peerDependencies = [
     ];
@@ -10643,6 +10802,8 @@
   };
   by-spec."open"."~0.0.3" =
     self.by-version."open"."0.0.4";
+  by-spec."open"."~0.0.4" =
+    self.by-version."open"."0.0.4";
   by-spec."opener"."~1.3.0" =
     self.by-version."opener"."1.3.0";
   by-version."opener"."1.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -10682,14 +10843,14 @@
     passthru.names = [ "openid" ];
   };
   by-spec."optimist"."*" =
-    self.by-version."optimist"."0.6.0";
-  by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-optimist-0.6.0";
+    self.by-version."optimist"."0.6.1";
+  by-version."optimist"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-optimist-0.6.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
-        name = "optimist-0.6.0.tgz";
-        sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200";
+        url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
+        name = "optimist-0.6.1.tgz";
+        sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
       })
     ];
     buildInputs =
@@ -10702,7 +10863,7 @@
     ];
     passthru.names = [ "optimist" ];
   };
-  "optimist" = self.by-version."optimist"."0.6.0";
+  "optimist" = self.by-version."optimist"."0.6.1";
   by-spec."optimist"."0.2" =
     self.by-version."optimist"."0.2.8";
   by-version."optimist"."0.2.8" = lib.makeOverridable self.buildNodePackage {
@@ -10745,8 +10906,27 @@
   };
   by-spec."optimist"."0.6.0" =
     self.by-version."optimist"."0.6.0";
+  by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-optimist-0.6.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
+        name = "optimist-0.6.0.tgz";
+        sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optimist" or []);
+    deps = [
+      self.by-version."wordwrap"."0.0.2"
+      self.by-version."minimist"."0.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optimist" ];
+  };
   by-spec."optimist"."0.6.x" =
-    self.by-version."optimist"."0.6.0";
+    self.by-version."optimist"."0.6.1";
   by-spec."optimist"."~0.3" =
     self.by-version."optimist"."0.3.7";
   by-spec."optimist"."~0.3.4" =
@@ -10754,7 +10934,7 @@
   by-spec."optimist"."~0.3.5" =
     self.by-version."optimist"."0.3.7";
   by-spec."optimist"."~0.6.0" =
-    self.by-version."optimist"."0.6.0";
+    self.by-version."optimist"."0.6.1";
   by-spec."options".">=0.0.5" =
     self.by-version."options"."0.0.5";
   by-version."options"."0.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -12937,26 +13117,7 @@
     ];
     passthru.names = [ "send" ];
   };
-  by-spec."sequence"."*" =
-    self.by-version."sequence"."3.0.0";
-  by-version."sequence"."3.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sequence-3.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sequence/-/sequence-3.0.0.tgz";
-        name = "sequence-3.0.0.tgz";
-        sha1 = "5957d3e03c70e270b2009a8c8bdaa97338a6e170";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sequence" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "sequence" ];
-  };
-  by-spec."sequence"."2.x" =
+  by-spec."sequence"."2.2.1" =
     self.by-version."sequence"."2.2.1";
   by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-sequence-2.2.1";
@@ -12975,6 +13136,8 @@
     ];
     passthru.names = [ "sequence" ];
   };
+  by-spec."sequence"."2.x" =
+    self.by-version."sequence"."2.2.1";
   by-spec."sha"."~1.2.1" =
     self.by-version."sha"."1.2.3";
   by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -13577,14 +13740,14 @@
     passthru.names = [ "stack-trace" ];
   };
   by-spec."statsd"."*" =
-    self.by-version."statsd"."0.7.0";
-  by-version."statsd"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "statsd-0.7.0";
+    self.by-version."statsd"."0.7.1";
+  by-version."statsd"."0.7.1" = lib.makeOverridable self.buildNodePackage {
+    name = "statsd-0.7.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/statsd/-/statsd-0.7.0.tgz";
-        name = "statsd-0.7.0.tgz";
-        sha1 = "13354345392c50a30221d3ab524bffcdda90272e";
+        url = "http://registry.npmjs.org/statsd/-/statsd-0.7.1.tgz";
+        name = "statsd-0.7.1.tgz";
+        sha1 = "b3a5124948ea5558e59eb26536ccfdedb9ba2a70";
       })
     ];
     buildInputs =
@@ -13592,13 +13755,13 @@
     deps = [
       self.by-version."node-syslog"."1.1.7"
       self.by-version."hashring"."1.0.1"
-      self.by-version."winser"."0.0.11"
+      self.by-version."winser"."0.1.6"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "statsd" ];
   };
-  "statsd" = self.by-version."statsd"."0.7.0";
+  "statsd" = self.by-version."statsd"."0.7.1";
   by-spec."stream-combiner"."~0.0.2" =
     self.by-version."stream-combiner"."0.0.4";
   by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -14077,6 +14240,26 @@
   "temp" = self.by-version."temp"."0.6.0";
   by-spec."temp"."0.6.0" =
     self.by-version."temp"."0.6.0";
+  by-spec."temp"."~0.5.1" =
+    self.by-version."temp"."0.5.1";
+  by-version."temp"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-temp-0.5.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/temp/-/temp-0.5.1.tgz";
+        name = "temp-0.5.1.tgz";
+        sha1 = "77ab19c79aa7b593cbe4fac2441768cad987b8df";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."temp" or []);
+    deps = [
+      self.by-version."rimraf"."2.1.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "temp" ];
+  };
   by-spec."temp"."~0.6.0" =
     self.by-version."temp"."0.6.0";
   by-spec."tempfile"."~0.1.2" =
@@ -14276,7 +14459,7 @@
       self.by-version."longjohn"."0.2.2"
       self.by-version."moment"."2.4.0"
       self.by-version."node-appc"."0.2.0"
-      self.by-version."optimist"."0.6.0"
+      self.by-version."optimist"."0.6.1"
       self.by-version."request"."2.27.0"
       self.by-version."semver"."2.2.1"
       self.by-version."sprintf"."0.1.3"
@@ -14540,7 +14723,26 @@
       self.by-version."async"."0.2.10"
       self.by-version."source-map"."0.1.31"
       self.by-version."optimist"."0.3.7"
-      self.by-version."uglify-to-browserify"."1.0.1"
+      self.by-version."uglify-to-browserify"."1.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "uglify-js" ];
+  };
+  by-spec."uglify-js"."~1.2" =
+    self.by-version."uglify-js"."1.2.6";
+  by-version."uglify-js"."1.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-1.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.6.tgz";
+        name = "uglify-js-1.2.6.tgz";
+        sha1 = "d354b2d3c1cf10ebc18fa78c11a28bdd9ce1580d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."uglify-js" or []);
+    deps = [
     ];
     peerDependencies = [
     ];
@@ -14608,21 +14810,21 @@
       self.by-version."async"."0.2.10"
       self.by-version."source-map"."0.1.31"
       self.by-version."optimist"."0.3.7"
-      self.by-version."uglify-to-browserify"."1.0.1"
+      self.by-version."uglify-to-browserify"."1.0.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "uglify-js" ];
   };
   by-spec."uglify-to-browserify"."~1.0.0" =
-    self.by-version."uglify-to-browserify"."1.0.1";
-  by-version."uglify-to-browserify"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-uglify-to-browserify-1.0.1";
+    self.by-version."uglify-to-browserify"."1.0.2";
+  by-version."uglify-to-browserify"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-uglify-to-browserify-1.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.1.tgz";
-        name = "uglify-to-browserify-1.0.1.tgz";
-        sha1 = "0e9ada5d4ca358a59a00bb33c8061e2f40ef97d2";
+        url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
+        name = "uglify-to-browserify-1.0.2.tgz";
+        sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       })
     ];
     buildInputs =
@@ -14885,6 +15087,25 @@
     ];
     passthru.names = [ "useragent" ];
   };
+  by-spec."userhome"."~0.1.0" =
+    self.by-version."userhome"."0.1.0";
+  by-version."userhome"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-userhome-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/userhome/-/userhome-0.1.0.tgz";
+        name = "userhome-0.1.0.tgz";
+        sha1 = "bd2067d90b3f7ac6c026d87612c579d88fb89f86";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."userhome" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "userhome" ];
+  };
   by-spec."util"."0.10.2" =
     self.by-version."util"."0.10.2";
   by-version."util"."0.10.2" = lib.makeOverridable self.buildNodePackage {
@@ -15359,22 +15580,22 @@
     self.by-version."which"."1.0.5";
   by-spec."which"."~1.0.5" =
     self.by-version."which"."1.0.5";
-  by-spec."winser"."=0.0.11" =
-    self.by-version."winser"."0.0.11";
-  by-version."winser"."0.0.11" = lib.makeOverridable self.buildNodePackage {
-    name = "winser-0.0.11";
+  by-spec."winser"."=0.1.6" =
+    self.by-version."winser"."0.1.6";
+  by-version."winser"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+    name = "winser-0.1.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/winser/-/winser-0.0.11.tgz";
-        name = "winser-0.0.11.tgz";
-        sha1 = "38474086a89ac72f90f9c6762e23375d12046c7c";
+        url = "http://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
+        name = "winser-0.1.6.tgz";
+        sha1 = "08663dc32878a12bbce162d840da5097b48466c9";
       })
     ];
     buildInputs =
       (self.nativeDeps."winser" or []);
     deps = [
-      self.by-version."sequence"."3.0.0"
-      self.by-version."commander"."2.1.0"
+      self.by-version."sequence"."2.2.1"
+      self.by-version."commander"."1.3.1"
     ];
     peerDependencies = [
     ];
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 0e6d45bb551..e2adc137aa9 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -115,4 +115,5 @@
 , "bower2nix"
 , "fetch-bower"
 , { "titanium": "3.2.0" }
+, "gh"
 ]
-- 
GitLab


From 346bfc28ea979ef37f3508950842e69daf9cba32 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 6 Feb 2014 16:30:40 -0600
Subject: [PATCH 0993/3789] kernel: Upgrade from 3.13.1 -> 3.13.2

---
 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 437e4bc025a..637d2935c98 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.13.1";
+  version = "3.13.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0gkikbz676h79rv0aaihl90mw7fqhjx3rkhcqrmzggjb54048jvq";
+    sha256 = "1bvxcdzjff514zwk18b9dfkhhk12fjjbb4a1saynqnisdn7b78dl";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From d7eb849349972656fc99e1b8f56286aa10cf7836 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Thu, 6 Feb 2014 14:41:54 -0800
Subject: [PATCH 0994/3789] firefox: update to 27.0.

---
 .../networking/browsers/firefox/default.nix       | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 27363482be0..9869e24ce5a 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -17,9 +17,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "26.0";
+  firefoxVersion = "27.0";
 
-  xulVersion = "26.0"; # this attribute is used by other packages
+  xulVersion = "27.0"; # this attribute is used by other packages
 
 
   src = fetchurl {
@@ -29,7 +29,7 @@ rec {
         # 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"
     ];
-    sha1 = "f7c6642d6f62aea8d4eced48dd27aba0634edcd5";
+    sha1 = "ec2031385237e30be829817ac79caa8e80cc2a14";
   };
 
   commonConfigureFlags =
@@ -162,13 +162,20 @@ rec {
       "SYSTEM_LIBXUL=1"
     ];
 
-    # Hack to work around make's idea of -lbz2 dependency
+    # Because preConfigure runs configure from a subdirectory.
+    configureScript = "../configure";
+
     preConfigure =
       ''
+        # Hack to work around make's idea of -lbz2 dependency
         find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
           stdenv.lib.concatStringsSep ":"
             (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
         }' ';'
+
+        # Building directly in the main source directory is not allowed.
+        mkdir obj_dir
+        cd obj_dir
       '';
 
     postInstall =
-- 
GitLab


From 15fb296b43609cfe936b77b30f945d66f0788bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 7 Feb 2014 00:25:50 +0100
Subject: [PATCH 0995/3789] xfce: partially add gtk3 support

---
 nixos/modules/services/x11/desktop-managers/xfce.nix | 2 +-
 pkgs/desktops/xfce/core/gtk-xfce-engine.nix          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 5e5fab3ed2b..3c67571ffd5 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -29,7 +29,7 @@ in
         start =
           ''
             # Set GTK_PATH so that GTK+ can find the theme engines.
-            export GTK_PATH=${config.system.path}/lib/gtk-2.0
+            export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0"
 
             # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
             export GTK_DATA_PREFIX=${config.system.path}
diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
index a97a11c6f12..0a30d8ac48b 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 }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, 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 ];
+  buildInputs = [ pkgconfig intltool gtk gtk3 ];
 
   meta = {
     homepage = http://www.xfce.org/;
-- 
GitLab


From c9decf12e3f346a22e60c5fc4f2933fd5de8dbd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 7 Feb 2014 00:28:07 +0100
Subject: [PATCH 0996/3789] gnome3.gnome-keyring: add missing runtime
 dependency

---
 pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index 455f18de98e..b557e210645 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
-, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit
+, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
 , docbook_xsl_ns, docbook_xsl, gnome3 }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with gnome3; [
     dbus libgcrypt pam python gtk3 gconf libgnome_keyring
-    pango gcr gdk_pixbuf atk p11_kit
+    pango gcr gdk_pixbuf atk p11_kit makeWrapper
   ];
 
   propagatedBuildInputs = [ glib libtasn1 libxslt ];
@@ -25,6 +25,13 @@ stdenv.mkDerivation rec {
     "--with-pkcs11-modules=$$out/lib/pkcs11/"
   ];
 
+  postInstall = ''
+    wrapProgram "$out/bin/gnome-keyring" \
+      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share"
+    wrapProgram "$out/bin/gnome-keyring-daemon" \
+      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share"
+  '';
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
   };
-- 
GitLab


From 2d166153ec33185d2f62a181cbdce2f8ce5bfb95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 7 Feb 2014 00:29:08 +0100
Subject: [PATCH 0997/3789] gnome3.gnome-shell: add GDK_PIXBUG_MODULE that has
 svg and png loaders

---
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix          | 6 ++++--
 .../desktops/gnome-3/core/gnome-themes-standard/default.nix | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 3799a008c1b..92c8d2a3bc7 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -2,8 +2,9 @@
 , python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns
 , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit
 , pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
-, accountservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet }:
+, 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";
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
 
   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
+      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
@@ -31,6 +32,7 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/bin/gnome-shell" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \
+      --set GDK_PIXBUF_MODULE_FILE ${gnome_themes_standard}/lib/gdk-pixbuf/loaders.cache \
       --prefix XDG_DATA_DIRS : "${gnome-menus}:/share:${ibus}/share:${gnome_settings_daemon}/share:${gdm}/share:${glib}/share:${gnome_themes_standard}/share:${mutter}/share:${gnome_icon_theme}/share:${gsettings_desktop_schemas}/share:${gtk}/share:$out/share"
     wrapProgram "$out/libexec/gnome-shell-calendar-server" \
       --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share"
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
index 8faae4d2148..e3de21806d3 100644
--- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ];
 
   preConfigure = ''
-    cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > loaders.cache
-    export GDK_PIXBUF_MODULE_FILE=`readlink -e loaders.cache`
+    mkdir -p $out/lib/gdk-pixbuf/
+    cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/lib/gdk-pixbuf/loaders.cache
+    export GDK_PIXBUF_MODULE_FILE=`readlink -e $out/lib/gdk-pixbuf/loaders.cache`
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 1142be63016ee1c36ef6e433778d133ea737b325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 7 Feb 2014 00:29:39 +0100
Subject: [PATCH 0998/3789] gnome3.gnome_terminal: add missing runtime
 dependencies

---
 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index 281f985c121..31ee53e9713 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
 , gnome_doc_utils, intltool, libX11, which, gconf, libuuid
-, desktop_file_utils, itstool, ncurses }:
+, desktop_file_utils, itstool, ncurses, makeWrapper }:
 
 stdenv.mkDerivation rec {
 
@@ -15,10 +15,16 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte
-                  gnome3.dconf gnome3.gconf itstool ncurses ];
+                  gnome3.dconf gnome3.gconf itstool ncurses makeWrapper ];
 
   nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];
 
+  postInstall = ''
+    wrapProgram "$out/libexec/gnome-terminal-server" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gsettings_desktop_schemas}/share:$out/share"
+  '';
+
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
   };
-- 
GitLab


From c5c14c72f4d94365a8b9c5a818752bf2d8fdb8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 7 Feb 2014 00:31:10 +0100
Subject: [PATCH 0999/3789] gnome3.gnome-settings-daemon: add missing input

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index cb9b00f5279..668a53d2bf8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     [ 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 ];
+      libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
 
   postInstall = ''
     wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
-- 
GitLab


From 65a28e8b7312a4c7c493378c1cbdda7b17fceba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 7 Feb 2014 00:31:29 +0100
Subject: [PATCH 1000/3789] Add gnome3 desktop manager. Very experimental.

Currently very basic gnome-shell launches on my laptop. Quite some
services won't start yet, most notable is gnome-control-center.

GTK3 apps still don't have theming applied and for example launching
chromium results in horrible red windows.
---
 nixos/modules/services/x11/desktop-managers/default.nix | 2 +-
 pkgs/desktops/gnome-3/default.nix                       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 035b23b4e1b..70750770663 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -17,7 +17,7 @@ in
   # Note: the order in which desktop manager modules are imported here
   # determines the default: later modules (if enabled) are preferred.
   # E.g., if KDE is enabled, it supersedes xterm.
-  imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ];
+  imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ./gnome3.nix ];
 
   options = {
 
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 56d38bf1d90..e9ec7be55b9 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -32,6 +32,8 @@ rec {
 
   gjs = callPackage ./core/gjs { };
 
+  gnome_control_center = callPackage ./core/gnome-control-center { };
+
   gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
 
   gnome-menus = callPackage ./core/gnome-menus { };
-- 
GitLab


From 506a030b910fe7ff619a0ec3cc8a4a59cbbb5bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 7 Feb 2014 00:37:17 +0100
Subject: [PATCH 1001/3789] gnome3: add missing files

---
 .../services/x11/desktop-managers/gnome3.nix  | 58 +++++++++++++++++++
 .../core/gnome-control-center/default.nix     | 25 ++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 nixos/modules/services/x11/desktop-managers/gnome3.nix
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
new file mode 100644
index 00000000000..6c43112c813
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -0,0 +1,58 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.xserver.desktopManager.gnome3;
+  gnome3 = pkgs.gnome3;
+in {
+
+  options = {
+
+    services.xserver.desktopManager.gnome3.enable = mkOption {
+      default = false;
+      example = true;
+      description = "Enable Gnome 3 desktop manager.";
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    # Enable helpful DBus services.
+    security.polkit.enable = true;
+    services.udisks2.enable = true;
+    networking.networkmanager.enable = true;
+    services.upower.enable = config.powerManagement.enable;
+
+    fonts.extraFonts = [ pkgs.dejavu_fonts ];
+
+    services.xserver.desktopManager.session = singleton
+      { name = "gnome3";
+        start = ''
+          # Set GTK_DATA_PREFIX so that GTK+ can find the themes
+          export GTK_DATA_PREFIX=${config.system.path}
+
+          # find theme engines
+          export GTK_PATH=${config.system.path}/lib/gtk-3.0:{config.system.path}/lib/gtk-2.0
+
+          export XDG_MENU_PREFIX=gnome
+
+          ${gnome3.gnome_session}/bin/gnome-session&
+          waitPID=$!
+        '';
+      };
+
+    environment.systemPackages =
+      [ gnome3.evince
+        gnome3.eog
+        pkgs.ibus
+        gnome3.gnome_shell
+        gnome3.gnome_settings_daemon
+        gnome3.gnome_terminal
+        gnome3.gnome_icon_theme
+        gnome3.gnome_themes_standard
+      ];
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
new file mode 100644
index 00000000000..b73009d896d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -0,0 +1,25 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, libcanberra
+, libxml2, polkit, libxslt, libgtop, libsoup, colord, pulseaudio, fontconfig }:
+
+# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
+# TODO: colord_gtk
+
+
+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";
+  };
+
+  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 ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+
+}
-- 
GitLab


From f5de6b8fc83bd00032db3411350561c0efac127c Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 6 Feb 2014 00:53:55 +0000
Subject: [PATCH 1002/3789] updates: mr, vcsh and transmission-remote-gtk

- mr: copy some more stuff to output
- add vcsh package
- transmission-remote-gtk: 1.0.1 -> 1.1.1
---
 .../p2p/transmission-remote-gtk/default.nix   |  8 +++---
 .../version-management/mr/default.nix         |  6 ++--
 .../version-management/vcsh/default.nix       | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/applications/version-management/vcsh/default.nix

diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index 894b1363cd0..3c1cfe51836 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, json_glib, curl }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, json_glib, curl }:
 
 
 stdenv.mkDerivation rec {
-  name = "transmission-remote-gtk-1.0.1";
+  name = "transmission-remote-gtk-1.1.1";
 
   src = fetchurl {
     url = "http://transmission-remote-gtk.googlecode.com/files/${name}.tar.gz";
-    sha256 = "b1ae032dd52b2d7975656913e4fe39e7f74d29ef8138292d8b82318ff9afed6f";
+    sha256 = "1jbh2pm4i740cmzqd2r7zxnqqipvv2v2ndmnmk53nqrxcbgc4nlz";
   };
 
-  buildInputs = [ pkgconfig intltool gtk json_glib curl ];
+  buildInputs = [ pkgconfig intltool gtk3 json_glib curl ];
 
   meta = {
    description = "GTK remote control for the Transmission BitTorrent client";
diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix
index 9e8024d7b19..e89cea6aadc 100644
--- a/pkgs/applications/version-management/mr/default.nix
+++ b/pkgs/applications/version-management/mr/default.nix
@@ -17,13 +17,14 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -pv $out/bin $out/share/man/man1
+    mkdir -pv $out/bin $out/share/man/man1 $out/share/mr
     cp -v mr $out/bin
     cp -v webcheckout $out/bin
     cp -v mr.1 $out/share/man/man1
     cp -v webcheckout.1 $out/share/man/man1
+    cp -v lib/* $out/share/mr
   '';
-      
+
   meta = {
     description = "Multiple Repository management tool";
     longDescription = ''The mr(1) command can checkout, update, or perform other actions on a
@@ -53,4 +54,3 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.antono ];
   };
 }
- 
diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix
new file mode 100644
index 00000000000..d438cb1bc6c
--- /dev/null
+++ b/pkgs/applications/version-management/vcsh/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchgit}:
+
+stdenv.mkDerivation rec {
+  rev = "75c4c554eefbefb714fabd356933858edbce3b1e";
+  version = "1.20131229";
+  name = "vcsh-${version}_${rev}";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/RichiH/vcsh";
+    sha256 = "0rc82a8vnnk9q6q88z9s10873gqgdpppbpwy2yw8a7hydqrpn0hs";
+  };
+
+  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp vcsh $out/bin
+  '';
+
+  meta = {
+    description = "Version Control System for $HOME";
+    homepage = https://github.com/RichiH/vcsh;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59e3334e121..241f73868f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2018,6 +2018,8 @@ let
 
   vboot_reference = callPackage ../tools/system/vboot_reference { };
 
+  vcsh = callPackage ../applications/version-management/vcsh { };
+
   verilog = callPackage ../applications/science/electronics/verilog {};
 
   vfdecrypt = callPackage ../tools/misc/vfdecrypt { };
-- 
GitLab


From 7a653e515603af12b1a8c369b00081665c6f41b0 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Thu, 6 Feb 2014 14:00:59 -0800
Subject: [PATCH 1003/3789] add guvcview package

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

diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix
new file mode 100644
index 00000000000..6e4a2caba18
--- /dev/null
+++ b/pkgs/os-specific/linux/guvcview/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchgit, intltool, autoreconfHook, gettext, pkgconfig
+, gtk3, portaudio, libpng, SDL, ffmpeg, udev, libusb1, libv4l, alsaLib }:
+
+stdenv.mkDerivation rec {
+  version = "1.7.2";
+  rev = "ab84b0b1ed358f0504e1218a0ef792a02b307af8";
+  name = "guvcview-${version}_${rev}";
+
+  src = fetchgit {
+    inherit rev;
+    url = "git://git.code.sf.net/p/guvcview/git-master";
+    sha256 = "08cpbxq3dh2mlsgzk5dj3vfrgap4q281n9h6xzpbsvyifcj1a9n1";
+  };
+
+  buildInputs =
+    [ SDL
+      alsaLib
+      autoreconfHook
+      ffmpeg
+      gtk3
+      intltool
+      libusb1
+      libv4l
+      pkgconfig
+      portaudio
+      udev
+    ];
+
+  preConfigure = ''
+    ./bootstrap.sh
+  '';
+
+  meta = {
+    description = "A simple interface for devices supported by the linux UVC driver";
+    homepage = http://guvcview.sourceforge.net;
+    maintainers = [ stdenv.lib.maintainers.coconnor ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 241f73868f0..666d573d396 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8095,6 +8095,8 @@ let
 
   gv = callPackage ../applications/misc/gv { };
 
+  guvcview = callPackage ../os-specific/linux/guvcview { };
+
   hello = callPackage ../applications/misc/hello/ex-2 { };
 
   herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
-- 
GitLab


From 6fa5612a46ab291c291aa1925a2e5da152dbdfdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 7 Feb 2014 09:48:18 +0100
Subject: [PATCH 1004/3789] gnutls2: fix build in chroot (/usr/bin/perl doc
 script)

I've got no idea how this could get triggered on Hydra, 97e7ce2 ?
---
 pkgs/development/libraries/gnutls/2.12.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/2.12.nix b/pkgs/development/libraries/gnutls/2.12.nix
index fa9e5c69b79..59f0131b9d4 100644
--- a/pkgs/development/libraries/gnutls/2.12.nix
+++ b/pkgs/development/libraries/gnutls/2.12.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, zlib, lzo, libtasn1, nettle
-, guileBindings, guile, pkgconfig }:
+, guileBindings, guile, pkgconfig, perl }:
 
 assert guileBindings -> guile != null;
 
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
   })];
 
   configurePhase = ''
+    patchShebangs .
+
     ./configure --prefix="$out"                                 \
       --disable-dependency-tracking --enable-fast-install       \
       --with-lzo --with-libtasn1-prefix="${libtasn1}"		\
@@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
         else ""}
   '';
 
-  buildInputs = [ zlib lzo libtasn1 pkgconfig ]
+  buildInputs = [ zlib lzo libtasn1 pkgconfig perl ]
     ++ stdenv.lib.optional guileBindings guile;
 
   propagatedBuildInputs = [ nettle ];
-- 
GitLab


From fabda56521c5f40acdbba926eb63b92c27605bc9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Feb 2014 09:16:02 +0100
Subject: [PATCH 1005/3789] haskell-lens: update to version 4.0.1

---
 .../development/libraries/haskell/lens/{4.0.nix => 4.0.1.nix} | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename pkgs/development/libraries/haskell/lens/{4.0.nix => 4.0.1.nix} (94%)

diff --git a/pkgs/development/libraries/haskell/lens/4.0.nix b/pkgs/development/libraries/haskell/lens/4.0.1.nix
similarity index 94%
rename from pkgs/development/libraries/haskell/lens/4.0.nix
rename to pkgs/development/libraries/haskell/lens/4.0.1.nix
index 9046558c22d..d921dbe1cbb 100644
--- a/pkgs/development/libraries/haskell/lens/4.0.nix
+++ b/pkgs/development/libraries/haskell/lens/4.0.1.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "4.0";
-  sha256 = "1mrpbwnj1k2my71lm0ajxsx5r44sz372gfxn78vz4182yv3bmla1";
+  version = "4.0.1";
+  sha256 = "1dm4gdpyd7kndf3zaikjqa1gkc7y7wzfnyhhk3xyhjxa5hn5rj75";
   buildDepends = [
     aeson bifunctors comonad constraints contravariant distributive
     exceptions filepath hashable mtl parallel primitive profunctors
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f14e7150ba8..1a404240d48 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1535,7 +1535,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {};
 
   lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {};
-  lens_4_0 = callPackage ../development/libraries/haskell/lens/4.0.nix {};
+  lens_4_0_1 = callPackage ../development/libraries/haskell/lens/4.0.1.nix {
+    aeson = self.aeson_0_7_0_0;
+  };
   lens = self.lens_3_10_2;
 
   lensAeson = callPackage ../development/libraries/haskell/lens-aeson {};
-- 
GitLab


From 6498f489766c216da1d3bc10ce733d506bb73160 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Feb 2014 09:49:48 +0100
Subject: [PATCH 1006/3789] haskell-linear: this package requires lens 4.x to
 compile

---
 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 1a404240d48..766a8d7d309 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1560,7 +1560,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   liftedBase = callPackage ../development/libraries/haskell/lifted-base {};
 
-  linear = callPackage ../development/libraries/haskell/linear {};
+  linear = callPackage ../development/libraries/haskell/linear {
+    lens = self.lens_4_0_1;
+  };
 
   List = callPackage ../development/libraries/haskell/List {};
 
-- 
GitLab


From 5b421f7bdb2ed78fd7f23683e50de97742f5a007 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 6 Feb 2014 13:25:14 -0600
Subject: [PATCH 1007/3789] Add Haskell packages 'hybrid-vectors' and 'sparse'.

Also, disable the test suite of 'linear' which fails running the doctests.
---
 .../haskell/hybrid-vectors/default.nix        | 14 ++++++++++
 .../libraries/haskell/linear/default.nix      |  1 +
 .../libraries/haskell/sparse/default.nix      | 28 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  7 +++++
 4 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/hybrid-vectors/default.nix
 create mode 100644 pkgs/development/libraries/haskell/sparse/default.nix

diff --git a/pkgs/development/libraries/haskell/hybrid-vectors/default.nix b/pkgs/development/libraries/haskell/hybrid-vectors/default.nix
new file mode 100644
index 00000000000..56fd36fbe87
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hybrid-vectors/default.nix
@@ -0,0 +1,14 @@
+{ cabal, deepseq, primitive, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "hybrid-vectors";
+  version = "0.1";
+  sha256 = "0a5ry6xmkr0zjz0kp7qbm7kdz5yr9842gy116902djppmdn5dq05";
+  buildDepends = [ deepseq primitive vector ];
+  meta = {
+    homepage = "http://github.com/ekmett/hybrid-vectors";
+    description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix
index a0d1e67ee6f..5b8f42d5420 100644
--- a/pkgs/development/libraries/haskell/linear/default.nix
+++ b/pkgs/development/libraries/haskell/linear/default.nix
@@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
     binary doctest filepath HUnit lens simpleReflect testFramework
     testFrameworkHunit
   ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/ekmett/linear/";
     description = "Linear Algebra";
diff --git a/pkgs/development/libraries/haskell/sparse/default.nix b/pkgs/development/libraries/haskell/sparse/default.nix
new file mode 100644
index 00000000000..6af05d19379
--- /dev/null
+++ b/pkgs/development/libraries/haskell/sparse/default.nix
@@ -0,0 +1,28 @@
+{ cabal, contravariant, deepseq, doctest, filepath, hlint
+, hybridVectors, lens, linear, mtl, primitive, QuickCheck
+, semigroups, simpleReflect, testFramework
+, testFrameworkQuickcheck2, testFrameworkTh, transformers, vector
+, vectorAlgorithms
+}:
+
+cabal.mkDerivation (self: {
+  pname = "sparse";
+  version = "0.9";
+  sha256 = "0v0z7kjgmcdx9ajlhr9pc1i3qqghd60s02xnlmj4hcxby8k0r8mc";
+  buildDepends = [
+    contravariant deepseq hybridVectors lens primitive transformers
+    vector vectorAlgorithms
+  ];
+  testDepends = [
+    deepseq doctest filepath hlint hybridVectors lens linear mtl
+    QuickCheck semigroups simpleReflect testFramework
+    testFrameworkQuickcheck2 testFrameworkTh transformers vector
+  ];
+  doCheck = false;
+  meta = {
+    homepage = "http://github.com/ekmett/sparse";
+    description = "A playground of sparse linear algebra primitives using Morton ordering";
+    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 766a8d7d309..282f36ac9cd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1449,6 +1449,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hxtUnicode = callPackage ../development/libraries/haskell/hxt-unicode {};
 
+  hybridVectors = callPackage ../development/libraries/haskell/hybrid-vectors {};
+
   iCalendar = callPackage ../development/libraries/haskell/iCalendar {};
 
   idna = callPackage ../development/libraries/haskell/idna {};
@@ -2128,6 +2130,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   socks = callPackage ../development/libraries/haskell/socks {};
 
+  sparse = callPackage ../development/libraries/haskell/sparse {
+    lens = self.lens_4_0_1;
+    linear = self.linear.override { lens = self.lens_4_0_1; };
+  };
+
   srcloc = callPackage ../development/libraries/haskell/srcloc {};
 
   stateref = callPackage ../development/libraries/haskell/stateref {};
-- 
GitLab


From 56d26d04ece7c119664ac82290680933bb1d43fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Feb 2014 09:40:06 +0100
Subject: [PATCH 1008/3789] haskell-sparse: jailbreak to fix build with current
 versions of vector-algorithms and QuickCheck

https://github.com/NixOS/nixpkgs/pull/1692
https://github.com/ekmett/sparse/issues/3
https://github.com/ekmett/sparse/issues/4
---
 pkgs/development/libraries/haskell/sparse/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/sparse/default.nix b/pkgs/development/libraries/haskell/sparse/default.nix
index 6af05d19379..f498da21939 100644
--- a/pkgs/development/libraries/haskell/sparse/default.nix
+++ b/pkgs/development/libraries/haskell/sparse/default.nix
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
     QuickCheck semigroups simpleReflect testFramework
     testFrameworkQuickcheck2 testFrameworkTh transformers vector
   ];
+  patchPhase = ''
+    sed -i -e 's|vector-algorithms >=.*|vector-algorithms|' -e 's|QuickCheck.*,|QuickCheck,|' sparse.cabal
+  '';
   doCheck = false;
   meta = {
     homepage = "http://github.com/ekmett/sparse";
-- 
GitLab


From 4f3d4c55ffa45b5216d1d3a8df0a446cd17f0b0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 7 Feb 2014 01:49:16 +0100
Subject: [PATCH 1009/3789] vim-ft: match attributes with dash and set nix as
 ft

---
 pkgs/applications/editors/vim/ft-nix-support.patch | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/ft-nix-support.patch b/pkgs/applications/editors/vim/ft-nix-support.patch
index 0e73162d33e..b2ac423092e 100644
--- a/pkgs/applications/editors/vim/ft-nix-support.patch
+++ b/pkgs/applications/editors/vim/ft-nix-support.patch
@@ -23,7 +23,7 @@ new file mode 100644
 index 0000000..a2f9918
 --- /dev/null
 +++ b/runtime/syntax/nix.vim
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,42 @@
 +" Vim syntax file
 +" Language:	nix
 +" Maintainer:	Marc Weber <marco-oweber@gmx.de>
@@ -46,8 +46,8 @@ index 0000000..a2f9918
 +  \ __readFile __toXML __toFile __filterSource __attrNames __getAttr __hasAttr __isAttrs __listToAttrs __isList 
 +  \ __head __tail __add __sub __lessThan __substring __stringLength
 +
-+syn match nixAttr "\w\+\ze\s*="
-+syn match nixFuncArg "\zs\w\+\ze\s*:"
++syn match nixAttr "[a-zA-Z0-9-_]\+\ze\s*="
++syn match nixFuncArg "\zs[a-zA-Z0-9-_]\+\ze\s*:"
 +syn region nixStringParam start=+\${+ end=+}+
 +syn region nixMultiLineComment start=+/\*+ skip=+\\"+ end=+\*/+
 +syn match  nixEndOfLineComment "#.*$"
@@ -66,3 +66,5 @@ index 0000000..a2f9918
 +hi def link nixEndOfLineComment Comment
 +hi def link nixAttr        Identifier
 +hi def link nixFuncArg     Identifier
++
++let b:current_syntax = "nix"
-- 
GitLab


From 515d4ad8fe2743ea71f6871de586ac73eadf7e09 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 6 Feb 2014 01:18:09 +0000
Subject: [PATCH 1010/3789] add haskellPackages.preprocessorTools (0.1.3 and
 1.0.1)

---
 .../libraries/haskell/preprocessor-tools/0.1.3.nix | 14 ++++++++++++++
 .../libraries/haskell/preprocessor-tools/1.0.1.nix | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  6 ++++++
 3 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix
 create mode 100644 pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix

diff --git a/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix b/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix
new file mode 100644
index 00000000000..1ca159c7128
--- /dev/null
+++ b/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix
@@ -0,0 +1,14 @@
+{ cabal, mtl, parsec, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "preprocessor-tools";
+  version = "0.1.3";
+  sha256 = "0jz85v93zpv6cwvad18wr12nsikmv4n20gn37zli2h34zi543i9v";
+  buildDepends = [ mtl parsec syb ];
+  meta = {
+    homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
+    description = "Extending Haskell's syntax using a custom preprocessor";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix b/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix
new file mode 100644
index 00000000000..e4a1f02eafa
--- /dev/null
+++ b/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix
@@ -0,0 +1,14 @@
+{ cabal, mtl, parsec, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "preprocessor-tools";
+  version = "1.0.1";
+  sha256 = "0ngfmvw6hvbr52i01n180ls4c8rx2wk2rka6g6igpvy9x2gwjin9";
+  buildDepends = [ mtl parsec syb ];
+  meta = {
+    homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
+    description = "Extending Haskell's syntax using a custom preprocessor";
+    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 8cfd3fec62d..ef0dc8b8a58 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1909,6 +1909,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   pqueue = callPackage ../development/libraries/haskell/pqueue {};
 
+  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;
+
   prettyclass = callPackage ../development/libraries/haskell/prettyclass {};
 
   prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {};
-- 
GitLab


From 5b243ad01550aaa452ed42d08ee66aa682c07937 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 7 Feb 2014 13:20:52 +0100
Subject: [PATCH 1011/3789] netbeans: Bump to version 7.4

---
 pkgs/applications/editors/netbeans/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix
index f1fd9adbe86..5a2afebdd5c 100644
--- a/pkgs/applications/editors/netbeans/default.nix
+++ b/pkgs/applications/editors/netbeans/default.nix
@@ -11,10 +11,10 @@ let
   };
 in
 stdenv.mkDerivation {
-  name = "netbeans-7.2";
+  name = "netbeans-7.4";
   src = fetchurl {
-    url = http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-ml.zip;
-    sha256 = "18ya1w291hdnc35vb12yqnai82wmqm7351wn82fax12kzha5fmci";
+    url = http://download.netbeans.org/netbeans/7.4/final/zip/netbeans-7.4-201310111528.zip;
+    sha256 = "0nrnghnsdix5cmp86xi1gmvarhjk2k8mlbld3dfa9impm8gpv6mx";
   };
   buildCommand = ''
     # Unpack and copy the stuff
@@ -25,7 +25,9 @@ stdenv.mkDerivation {
     # Create a wrapper capable of starting it
     mkdir -p $out/bin
     makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \
-      --prefix PATH : ${jdk}/bin:${which}/bin
+      --prefix PATH : ${jdk}/bin:${which}/bin \
+      --prefix JAVA_HOME : ${jdk}/lib/openjdk \
+      --add-flags "--jdkhome ${jdk}/lib/openjdk"
       
     # Create desktop item, so we can pick it from the KDE/GNOME menu
     mkdir -p $out/share/applications
-- 
GitLab


From 303c418035b6f91581e07fb742968a7dd28a8eb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 7 Feb 2014 15:07:12 +0100
Subject: [PATCH 1012/3789] Workaround for relocation error

This works around "java: relocation error: java: symbol , version GLIBC_2.2.5 not defined in file libc.so.6 with link time reference"
---
 pkgs/development/compilers/jdk/jdk7-linux.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/jdk/jdk7-linux.nix
index 12c1a598551..106b9fa02d7 100644
--- a/pkgs/development/compilers/jdk/jdk7-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk7-linux.nix
@@ -126,6 +126,12 @@ stdenv.mkDerivation rec {
 
     find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
 
+    # HACK: For some reason, appending atk to the global patchelf rpath paths causes:
+    #   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
+
     if test -z "$pluginSupport"; then
       rm -f $out/bin/javaws
       if test -n "$installjdk"; then
@@ -143,7 +149,7 @@ stdenv.mkDerivation rec {
    * libXt is only needed on amd64
    */
   libraries =
-    [stdenv.gcc.libc glib libxml2 libav_0_8 ffmpeg_0_6 libxslt mesa_noglu xlibs.libXxf86vm] ++
+    [stdenv.gcc.libc glib libxml2 libav_0_8 ffmpeg_0_6 libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf] ++
     (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.gcc.gcc] else []);
 
   passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
-- 
GitLab


From e058de164252314ff6deab948e4ec9a5db0986f5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 7 Feb 2014 09:57:28 -0500
Subject: [PATCH 1013/3789] Add option to enforce uniqueness of uids/gids (on
 by default)

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 nixos/modules/config/users-groups.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 20ec1bda281..f70e8c292c4 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -252,6 +252,17 @@ let
     mv -f $1.tmp $1
   '';
 
+  idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }:
+    let
+      id = builtins.toString (builtins.getAttr idAttr (builtins.getAttr name set));
+      exists = builtins.hasAttr id acc;
+      newAcc = acc // (builtins.listToAttrs [ { name = id; value = true; } ]);
+    in if dup then args else if exists
+      then builtins.trace "Duplicate ${idAttr} ${id}" { dup = true; acc = null; }
+      else { dup = false; acc = newAcc; }
+    ) { dup = false; acc = {}; } (builtins.attrNames set)).dup;
+  uidsAreUnique = idsAreUnique cfg.extraUsers "uid";
+  gidsAreUnique = idsAreUnique cfg.extraGroups "gid";
 in
 
 {
@@ -282,6 +293,14 @@ in
       '';
     };
 
+    users.enforceIdUniqueness = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether to require that no two users/groups share the same uid/gid.
+      '';
+    };
+
     users.extraUsers = mkOption {
       default = {};
       type = types.loaOf types.optionSet;
@@ -432,6 +451,8 @@ in
     # for backwards compatibility
     system.activationScripts.groups = stringAfter [ "users" ] "";
 
+    assertions = [ { assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique); message = "uids and gids must be unique!"; } ];
+
   };
 
 }
-- 
GitLab


From 6b2533c48f738963b15a27782bff2201de6fdf03 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 4 Feb 2014 13:13:30 -0600
Subject: [PATCH 1014/3789] glfw: Update packaging and add v3

This patch cleans up the previous glfw2 package. Additionally, it adds
glfw3 and makes that the new default glfw version.
---
 .../libraries/glfw/{default.nix => 2.x.nix}   | 24 ++++++++++---------
 pkgs/development/libraries/glfw/3.x.nix       | 22 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++-
 3 files changed, 38 insertions(+), 12 deletions(-)
 rename pkgs/development/libraries/glfw/{default.nix => 2.x.nix} (51%)
 create mode 100644 pkgs/development/libraries/glfw/3.x.nix

diff --git a/pkgs/development/libraries/glfw/default.nix b/pkgs/development/libraries/glfw/2.x.nix
similarity index 51%
rename from pkgs/development/libraries/glfw/default.nix
rename to pkgs/development/libraries/glfw/2.x.nix
index 292c15361b6..8750cd955a6 100644
--- a/pkgs/development/libraries/glfw/default.nix
+++ b/pkgs/development/libraries/glfw/2.x.nix
@@ -1,27 +1,29 @@
-{ stdenv, fetchurl, mesa, libX11, libXext }:
+{ stdenv, fetchurl, mesa, libX11 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "glfw-2.7.9";
 
   src = fetchurl {
-    url = mirror://sourceforge/glfw/glfw-2.7.9.tar.bz2;
+    url = "mirror://sourceforge/glfw/${name}.tar.bz2";
     sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i";
   };
 
-  buildInputs = [ mesa libX11 libXext ];
+  buildInputs = [ mesa libX11 ];
 
   buildPhase = ''
+    make x11
+  '';
+
+  installPhase = ''
     mkdir -p $out
     make x11-install PREFIX=$out
-  '';
+  ''; 
   
-  installPhase = ":";
-
-  meta = { 
+  meta = with stdenv.lib; { 
     description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
-    homepage = http://glfw.sourceforge.net/;
-    license = "zlib/libpng"; # http://www.opensource.org/licenses/zlib-license.php
+    homepage = "http://glfw.sourceforge.net/";
+    license = licenses.zlib;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
new file mode 100644
index 00000000000..ab7e312762f
--- /dev/null
+++ b/pkgs/development/libraries/glfw/3.x.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11 }:
+
+stdenv.mkDerivation rec {
+  name = "glfw-3.0.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/glfw/${name}.tar.bz2";
+    sha256 = "1h7g16ncgkl38w19x4dvnn17k9j0kqfvbb9whw9qc71lkq5xf2ag";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ cmake mesa libXrandr libXi libXxf86vm libXfixes x11 ];
+
+  meta = with stdenv.lib; { 
+    description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
+    homepage = "http://glfw.sourceforge.net/";
+    license = licenses.zlib;
+    maintainers = with maintainers; [ marcweber ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 666d573d396..3478b409d10 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4180,7 +4180,9 @@ let
 
   glew = callPackage ../development/libraries/glew { };
 
-  glfw = callPackage ../development/libraries/glfw { };
+  glfw = glfw3;
+  glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
+  glfw3 = callPackage ../development/libraries/glfw/3.x.nix { };
 
   glibc = callPackage ../development/libraries/glibc/2.18 {
     kernelHeaders = linuxHeaders;
-- 
GitLab


From a8db8e15e60d4704371a5d885a14d35d3aada56c Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 6 Feb 2014 01:18:43 +0000
Subject: [PATCH 1015/3789] add haskellPackages.ixdopp

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

diff --git a/pkgs/development/libraries/haskell/ixdopp/default.nix b/pkgs/development/libraries/haskell/ixdopp/default.nix
new file mode 100644
index 00000000000..94bfa018553
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ixdopp/default.nix
@@ -0,0 +1,16 @@
+{ cabal, preprocessorTools, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "ixdopp";
+  version = "0.1.3";
+  sha256 = "1vknwznk42b33q4pmh6z620g761yf3cmsmrmhilgq42i5qhll4d4";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ preprocessorTools ];
+  meta = {
+    homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
+    description = "Expands a Haskell program using ixdo notation into a Haskell program using the indexed monad bind operator (>>>=)";
+    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 ef0dc8b8a58..793656c15bf 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1489,6 +1489,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   ivor = callPackage ../development/libraries/haskell/ivor {};
 
+  ixdopp = callPackage ../development/libraries/haskell/ixdopp {
+    preprocessorTools = self.preprocessorTools_0_1_3;
+  };
+
   ixShapable = callPackage ../development/libraries/haskell/ix-shapable {};
 
   JuicyPixels = callPackage ../development/libraries/haskell/JuicyPixels {};
-- 
GitLab


From 70e4f8f928f8cc29414b3d49d92cb328f85a4437 Mon Sep 17 00:00:00 2001
From: Vladimir Still <vl.still@gmail.com>
Date: Fri, 7 Feb 2014 18:16:24 +0100
Subject: [PATCH 1016/3789] perf: Allow proceeding in build even if patch
 fails. Patching fails for linux 3.13 but it builds OK.

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

diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 0a92e39c153..f486f55654e 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   preConfigure = ''
     cd tools/perf
     sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
-    patch -p1 < ${./perf.diff}
+    patch -p1 < ${./perf.diff} || true
     [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion
     export makeFlags="DESTDIR=$out $makeFlags"
   '';
-- 
GitLab


From 498c0687991417672199becaa34502cc4c6b406e Mon Sep 17 00:00:00 2001
From: PkmX <pkmx.tw@gmail.com>
Date: Sat, 8 Feb 2014 05:44:44 +0800
Subject: [PATCH 1017/3789] Add pygobject3 to PYTHONPATH and add relevant paths
 to LD_LIBRRY_PATH and GI_TYPELIB_PATH to fix the perference GUI (ibus-setup).

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

diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/development/libraries/ibus/default.nix
index 6c82ad839e1..16f7db941b6 100644
--- a/pkgs/development/libraries/ibus/default.nix
+++ b/pkgs/development/libraries/ibus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, python, intltool, pkgconfig
-, gnome3, dbus, libnotify, isocodes, gobjectIntrospection, wayland }:
+, gnome3, atk, pygobject3, dbus, libnotify, isocodes, gobjectIntrospection, wayland }:
 
 stdenv.mkDerivation rec {
   name = "ibus-${version}";
@@ -21,9 +21,12 @@ stdenv.mkDerivation rec {
 
   preBuild = "patchShebangs ./scripts";
 
-  postInstall  = ''
+  postInstall = ''
     for f in "$out"/bin/*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share"
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share" \
+                       --prefix PYTHONPATH : "$(toPythonPath ${pygobject3})" \
+                       --prefix LD_LIBRARY_PATH : "${gnome3.gtk3}/lib:${atk}/lib:$out/lib" \
+                       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0"
     done
   '';
 
-- 
GitLab


From d3979b659cb385597baecf5518a614089b489424 Mon Sep 17 00:00:00 2001
From: Vladimir Still <vl.still@gmail.com>
Date: Fri, 7 Feb 2014 22:53:55 +0100
Subject: [PATCH 1018/3789] perf: Make build fix for 3.13 cleaner.

---
 pkgs/os-specific/linux/kernel/perf.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index f486f55654e..a7337760b79 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -4,6 +4,9 @@
 
 assert withGtk -> gtk != null;
 
+let optionalString = stdenv.lib.optionalString;
+    versionOlder = stdenv.lib.versionOlder;
+in
 stdenv.mkDerivation {
   name = "perf-linux-${kernel.version}";
 
@@ -12,7 +15,7 @@ stdenv.mkDerivation {
   preConfigure = ''
     cd tools/perf
     sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
-    patch -p1 < ${./perf.diff} || true
+    ${optionalString (versionOlder kernel.version "3.13") "patch -p1 < ${./perf.diff}"}
     [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion
     export makeFlags="DESTDIR=$out $makeFlags"
   '';
-- 
GitLab


From db12d783ffd753145119c22a34ca5945e9a7a4ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 7 Feb 2014 23:08:15 +0100
Subject: [PATCH 1019/3789] nixos: add uid/gid for munin

To be compatible with eb2f44c18cb6d300e965308547d8a4dea110f519 (Generate
/etc/passwd and /etc/group at build time). Without this you'll get this:

  $ nixos-rebuild build
  [...]
  user-thrown exception: The option `users.extraGroups.unnamed-9.1.gid' is used but not defined.
---
 nixos/modules/misc/ids.nix                  | 2 ++
 nixos/modules/services/monitoring/munin.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 16eec904321..51da1a2cfce 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -110,6 +110,7 @@
       openldap = 99;
       memcached = 100;
       cgminer = 101;
+      munin = 102;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -199,6 +200,7 @@
       haproxy = 92;
       openldap = 93;
       connman = 94;
+      munin = 95;
 
       # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index 153f4942902..39c4fb1aefa 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -173,10 +173,12 @@ in
       name = "munin";
       description = "Munin monitoring user";
       group = "munin";
+      uid = config.ids.uids.munin;
     }];
 
     users.extraGroups = [{
       name = "munin";
+      gid = config.ids.gids.munin;
     }];
 
   }) (mkIf nodeCfg.enable {
-- 
GitLab


From f7e47552bfc04e9e39b4746d220429fecd17c1ed Mon Sep 17 00:00:00 2001
From: PkmX <pkmx.tw@gmail.com>
Date: Sat, 8 Feb 2014 07:38:04 +0800
Subject: [PATCH 1020/3789] Add dconf to GIO_EXTRA_MODULES so ibus-setup
 doesn't use the memory backend.

---
 pkgs/development/libraries/ibus/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/development/libraries/ibus/default.nix
index 16f7db941b6..75eb1b4134c 100644
--- a/pkgs/development/libraries/ibus/default.nix
+++ b/pkgs/development/libraries/ibus/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1v4a9xv2k26g6ggk4282ynfvh68j2r5hg1cdpvnryfa8c2pkdaq2";
   };
 
-  configureFlags = "--enable-dconf --disable-memconf --enable-ui --enable-python-library";
+  configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library";
 
   buildInputs = [
     makeWrapper python gnome3.glib wayland
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
       wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share" \
                        --prefix PYTHONPATH : "$(toPythonPath ${pygobject3})" \
                        --prefix LD_LIBRARY_PATH : "${gnome3.gtk3}/lib:${atk}/lib:$out/lib" \
-                       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0"
+                       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
+                       --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
     done
   '';
 
-- 
GitLab


From 8ef2cadca4e4e74679ce16ac7b31688382a9aae4 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Fri, 7 Feb 2014 17:28:02 -0800
Subject: [PATCH 1021/3789] gnash: Hack to define nullptr as NULL, since some
 included mozilla headers seem to want nullptr

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

diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index 4f2addcc99b..616b474393c 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -73,6 +73,8 @@ stdenv.mkDerivation rec {
        echo "\$GST_PLUGIN_PATH set to \`$GST_PLUGIN_PATH'"
     '';
 
+  postConfigure = "echo '#define nullptr NULL' >> gnashconfig.h";
+
   # Make sure `gtk-gnash' gets `libXext' in its `RPATH'.
   NIX_LDFLAGS="-lX11 -lXext";
 
-- 
GitLab


From aec17bfbd380da05eb43b423041adc2b19a42914 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Sat, 8 Feb 2014 10:52:59 +0800
Subject: [PATCH 1022/3789] add guile-xcb 1.3

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

diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix
new file mode 100644
index 00000000000..a192025df69
--- /dev/null
+++ b/pkgs/development/guile-modules/guile-xcb/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, guile, texinfo }:
+
+stdenv.mkDerivation {
+  name = "guile-xcb-1.3";
+
+  meta = with stdenv.lib; {
+    description = "XCB bindings for Guile";
+    homepage    = "http://www.markwitmer.com/guile-xcb/guile-xcb.html";
+    license     = licenses.gpl3Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    name = "guile-xcb-1.3.tar.gz";
+    sha256 = "1gna9h3536s880p4bd9n2jyh2a8igwya6x7v3vfx19f4rppmai60";
+
+    urls = [
+     "http://www.markwitmer.com/dist/guile-xcb-1.3.tar.gz"
+     "https://github.com/mwitmer/guile-xcb/archive/1.3.tar.gz"
+    ];
+  };
+
+  buildInputs = [ pkgconfig guile texinfo ];
+
+  preConfigure = ''
+    configureFlags="
+      --with-guile-site-dir=$out/share/guile/site
+      --with-guile-site-ccache-dir=$out/share/guile/site
+    ";
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3478b409d10..2c68e9bc193 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3367,6 +3367,8 @@ let
 
   guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { };
 
+  guile-xcb = callPackage ../development/guile-modules/guile-xcb { };
+
   srecord = callPackage ../development/tools/misc/srecord { };
 
   windowssdk = (
-- 
GitLab


From 07b38340bd5f1c14acc0a6add96350bc8bc920c7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 7 Feb 2014 21:29:29 -0600
Subject: [PATCH 1023/3789] mumble: Upgrade 1.2.4 -> 1.2.5

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

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 43fbe952b18..9d2050d10fe 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.4";
+  version = "1.2.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/mumble/${name}.tar.gz";
-    sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1";
+    sha256 = "1bsgains6xgpgpd1b5bq682z0kswp5fcjh2cir4c4qkndya5clci";
   };
 
   patches = optional jackSupport ./mumble-jack-support.patch;
-- 
GitLab


From 4191ee53b972b7c01d365571da4cfda606a95a7c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 7 Feb 2014 21:29:38 -0600
Subject: [PATCH 1024/3789] murmur: Upgrade 1.2.4 -> 1.2.5

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

diff --git a/pkgs/applications/networking/mumble/murmur.nix b/pkgs/applications/networking/mumble/murmur.nix
index 4b074b0708e..b886896c071 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.4";
+  version = "1.2.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/mumble/mumble-${version}.tar.gz";
-    sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1";
+    sha256 = "1bsgains6xgpgpd1b5bq682z0kswp5fcjh2cir4c4qkndya5clci";
   };
 
   patchPhase = optional iceSupport ''
-- 
GitLab


From c4dbb0a961fe236229811250a8c20e0b44a15f4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 8 Feb 2014 08:29:09 +0100
Subject: [PATCH 1025/3789] rtmpdump: fix build by reverting to gnutls31

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3478b409d10..a44487d98c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1737,7 +1737,9 @@ let
 
   privateer = callPackage ../games/privateer { };
 
-  rtmpdump = callPackage ../tools/video/rtmpdump { };
+  rtmpdump = callPackage ../tools/video/rtmpdump {
+    gnutls = gnutls31; # gnutls32: undefined reference to gnutls_calc_dh_{key,secret}
+  };
 
   reaverwps = callPackage ../tools/networking/reaver-wps {};
 
-- 
GitLab


From 7ae5902c593afa7e5e4c87f05768298a10b0bc2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 8 Feb 2014 08:58:27 +0100
Subject: [PATCH 1026/3789] libchop: fix build by reverting to gnutls31

The errors were a bit cryptic.
CC @viric.
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a44487d98c7..2d8e96cc664 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4618,7 +4618,9 @@ let
 
   libchamplain_0_6 = callPackage ../development/libraries/libchamplain/0.6.nix {};
 
-  libchop = callPackage ../development/libraries/libchop { };
+  libchop = callPackage ../development/libraries/libchop {
+    gnutls = gnutls31;
+  };
 
   libcm = callPackage ../development/libraries/libcm { };
 
-- 
GitLab


From 3967a1c444c1ba17c068eb14d2badf418d1365e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Feb 2014 08:20:20 +0100
Subject: [PATCH 1027/3789] spring: disable parallel building, as it breaks on
 Hydra

(cherry picked from commit e43018e0196dd6af57087ecb6aaa3af7b17776ab)
---
 pkgs/games/spring/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 99066581aa2..4f8fe0d1974 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       --replace "which" "type -p"
   '';
 
-  enableParallelBuilding = true;
+  #enableParallelBuilding = true; # occasionally missing generated files on Hydra
 
   meta = with stdenv.lib; {
     homepage = http://springrts.com/;
-- 
GitLab


From 989bfbac7907eb01b6fb6e6183bcfc9c3198bddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 8 Feb 2014 09:49:41 +0100
Subject: [PATCH 1028/3789] llvmPackages on darwin: attempt to fix build by
 using gcc48

---
 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 2d8e96cc664..252f77d00f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2809,7 +2809,7 @@ let
     inherit newScope fetchurl;
     isl = isl_0_12;
     stdenv = if stdenv.isDarwin
-      then stdenvAdapters.overrideGCC stdenv gccApple
+      then stdenvAdapters.overrideGCC stdenv gcc48
       else stdenv;
   });
   llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; };
-- 
GitLab


From 0fa30be7a8725392f92aeb959e880ae5cf1ef891 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 8 Feb 2014 11:10:47 +0100
Subject: [PATCH 1029/3789] andagii: fix fetch by providing a different
 user-agent

Close #1706.
---
 pkgs/data/fonts/andagii/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix
index 8b08708fb1d..8143d284120 100644
--- a/pkgs/data/fonts/andagii/default.nix
+++ b/pkgs/data/fonts/andagii/default.nix
@@ -19,6 +19,7 @@ in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
+    curlOpts = "--user-agent 'Mozilla/5.0'";
     sha256 = sourceInfo.hash;
   };
 
-- 
GitLab


From 9665c85f992f1a830cf3e0f32089592ba0afd032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 8 Feb 2014 11:52:56 +0100
Subject: [PATCH 1030/3789] kde410.kde_workspace: fix CVE-2013-4132 by upstream
 patch

---
 pkgs/desktops/kde-4.10/kde-workspace.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.10/kde-workspace.nix b/pkgs/desktops/kde-4.10/kde-workspace.nix
index a478dc975fe..57b2fea79b2 100644
--- a/pkgs/desktops/kde-4.10/kde-workspace.nix
+++ b/pkgs/desktops/kde-4.10/kde-workspace.nix
@@ -1,7 +1,8 @@
 { 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
+  libjpeg, pkgconfig, libXft, libXxf86misc, kactivities, qjson, networkmanager,
+  fetchurl
 }:
 
 kde {
@@ -17,6 +18,12 @@ kde {
       kactivities
     ];
 
+  patches = [(fetchurl {
+    url = "https://git.reviewboard.kde.org/r/111261/diff/raw/";
+    sha256 = "0g8qjna1s0imz7801k4iy2ap5z81izi4bncvks7z3n9agji4zf40";
+    name = "CVE-2013-4132.patch";
+  })];
+
   nativeBuildInputs = [ pkgconfig ];
 
   preConfigure =
-- 
GitLab


From 24029ec478b1755eb375f05714a311d9b1d94541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 8 Feb 2014 11:54:16 +0100
Subject: [PATCH 1031/3789] linux: minor updates 3.12.10, 3.10.29, 3.4.79

---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.4.nix  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 6e22d6ed524..212e676a28f 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.28";
+  version = "3.10.29";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1blzvr3qywi8wxgl28zsn5djwgvw70yh3i6qjh2sz3zk9gnpd6mq";
+    sha256 = "14g8z5g2xwf0s6r7m9586xdpd56nc810dny70cz6zq8c03kfq594";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 6edb3669c53..5baddbbdc7d 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.9";
+  version = "3.12.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1jzmcqshfgnkk4dibkxc7w06axw7c2fxdpghvm6d7amfpcd9ygka";
+    sha256 = "0p30mfrf3jfp353k0fbfpbmz3sfkhlyzcispqg22dc0lzcj76aj7";
   };
 
   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 14a4b64fe55..0993b0e74ee 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.78";
+  version = "3.4.79";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1n9avgjy3qpr28n1rq80kc1gn33w9nz6bvwds6i4d5z793fp7qpk";
+    sha256 = "07xd01b5vl6gl4p2cs75fsn295jvwmlq2j9jw582b2ii8vsaavvv";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 5ffab7710dd6aee43f37f710583a4dd066031997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 8 Feb 2014 12:30:10 +0100
Subject: [PATCH 1032/3789] gnome3.gnome_control_center: build and fix runtime
 deps

---
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../core/gnome-control-center/default.nix     | 42 ++++++++++++++++---
 .../gnome-3/core/gnome-shell/default.nix      |  5 ++-
 pkgs/tools/misc/colord-gtk/default.nix        | 18 ++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 5 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/tools/misc/colord-gtk/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 6c43112c813..ecb6706544a 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -52,6 +52,7 @@ in {
         gnome3.gnome_terminal
         gnome3.gnome_icon_theme
         gnome3.gnome_themes_standard
+        gnome3.gnome_control_center
       ];
   };
 
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 b73009d896d..ed9adb370d4 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -1,11 +1,24 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, libcanberra
-, libxml2, polkit, libxslt, libgtop, libsoup, colord, pulseaudio, fontconfig }:
+{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, libcanberra, accountservice
+, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk, pulseaudio, fontconfig
+, cracklib, python, krb5, networkmanagerapplet, libwacom, samba, libnotify, libxkbfile
+, shared_mime_info, tzdata, icu, libtool, docbook_xsl, docbook_xsl_ns, makeWrapper }:
 
 # http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
-# TODO: colord_gtk
+# TODO: bluetooth, networkmanager, wacom, smbclient, printers
 
+let
+  libpwquality = stdenv.mkDerivation rec {
+    name = "libpwquality-1.2.3";
 
-stdenv.mkDerivation rec {
+    src = fetchurl {
+      url = "https://fedorahosted.org/releases/l/i/libpwquality/${name}.tar.bz2";
+      sha256 = "0sjiabvl5277nfxyy96jdz65a0a3pmkkwrfbziwgik83gg77j75i";
+    };
+
+    buildInputs = [ cracklib python ];
+  };
+
+in stdenv.mkDerivation rec {
   name = "gnome-control-center-3.10.2";
 
   src = fetchurl {
@@ -16,7 +29,26 @@ stdenv.mkDerivation rec {
   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 ];
+      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 ];
+
+  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/"
+  '';
+
+  postInstall = with gnome3; ''
+    wrapProgram $out/bin/gnome-control-center \
+      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:${gnome_settings_daemon}/share:${glib}/share:${gtk}/share:${colord}/share:$out/share"
+    for i in $out/share/applications/*; do
+      substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
+    done
+  '';
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 92c8d2a3bc7..7dee64a8aff 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -19,13 +19,14 @@ stdenv.mkDerivation rec {
       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
+      libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center
       at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger ];
 
   configureFlags = "--disable-static";
 
   preBuild = ''
     patchShebangs src/data-to-c.pl
+    substituteInPlace data/Makefile --replace " install-keysDATA" ""
   '';
 
   postInstall = with gnome3; ''
@@ -33,7 +34,7 @@ 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 ${gnome_themes_standard}/lib/gdk-pixbuf/loaders.cache \
-      --prefix XDG_DATA_DIRS : "${gnome-menus}:/share:${ibus}/share:${gnome_settings_daemon}/share:${gdm}/share:${glib}/share:${gnome_themes_standard}/share:${mutter}/share:${gnome_icon_theme}/share:${gsettings_desktop_schemas}/share:${gtk}/share:$out/share"
+      --prefix XDG_DATA_DIRS : "${gnome-menus}:/share:${ibus}/share:${gnome_settings_daemon}/share:${gnome_control_center}/share:${gdm}/share:${glib}/share:${gnome_themes_standard}/share:${mutter}/share:${gnome_icon_theme}/share:${gsettings_desktop_schemas}/share:${gtk}/share:$out/share"
     wrapProgram "$out/libexec/gnome-shell-calendar-server" \
       --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share"
   '';
diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix
new file mode 100644
index 00000000000..f46bf3ef7a4
--- /dev/null
+++ b/pkgs/tools/misc/colord-gtk/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, colord, intltool, glib, gtk3, pkgconfig, lcms2 }:
+
+stdenv.mkDerivation rec {
+  name = "colord-gtk-0.1.25";
+
+  src = fetchurl {
+    url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
+    sha256 = "02hblw9rw24dhj0wqfw86pfq4y4icb6iaa92308a9jwa6k2923xx";
+  };
+
+  buildInputs = [ intltool colord glib gtk3 pkgconfig lcms2 ];
+
+  meta = {
+    homepage = http://www.freedesktop.org/software/colord/intro.html;
+    license = stdenv.lib.licenses.lgpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 252f77d00f7..57a1933c7b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -684,6 +684,8 @@ let
 
   colord = callPackage ../tools/misc/colord { };
 
+  colord-gtk = callPackage ../tools/misc/colord-gtk { };
+
   colordiff = callPackage ../tools/text/colordiff { };
 
   connect = callPackage ../tools/networking/connect { };
-- 
GitLab


From 140e06f9aae33daae501441e2933a981f2fc3344 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Tue, 28 Jan 2014 17:24:33 +0100
Subject: [PATCH 1033/3789] osc: Add an OBS (open build system) CLI client.

---
 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 48d0a8c5db3..3624502e121 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4293,6 +4293,23 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   });
 
+  osc = buildPythonPackage (rec {
+    name = "osc-0.133+git";
+
+    src = fetchgit {
+      url = git://gitorious.org/opensuse/osc.git;
+      rev = "6cd541967ee2fca0b89e81470f18b97a3ffc23ce";
+      sha256 = "a39ce0e321e40e9758bf7b9128d316c71b35b80eabc84f13df492083bb6f1cc6";
+    };
+
+    buildPhase = "python setup.py build";
+    doCheck = false;
+    postInstall = "ln -s $out/bin/osc-wrapper.py $out/bin/osc";
+
+    propagatedBuildInputs = [ pythonPackages.m2crypto ];
+
+  });
+
   pandas = buildPythonPackage rec {
     name = "pandas-0.12.0";
 
-- 
GitLab


From 63478d95909a065dc4416c1b2fa0d7b62ef5e08d Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sat, 8 Feb 2014 13:42:04 +0100
Subject: [PATCH 1034/3789] Add fedpkg, koji &c. + their python dependencies.

---
 .../python-modules/fedpkg-buildfix.diff       |  14 ++
 .../python-modules/rpkg-buildfix.diff         |  11 ++
 pkgs/top-level/python-packages.nix            | 152 ++++++++++++++++++
 3 files changed, 177 insertions(+)
 create mode 100644 pkgs/development/python-modules/fedpkg-buildfix.diff
 create mode 100644 pkgs/development/python-modules/rpkg-buildfix.diff

diff --git a/pkgs/development/python-modules/fedpkg-buildfix.diff b/pkgs/development/python-modules/fedpkg-buildfix.diff
new file mode 100644
index 00000000000..b9d46d7c741
--- /dev/null
+++ b/pkgs/development/python-modules/fedpkg-buildfix.diff
@@ -0,0 +1,14 @@
+--- a/setup.py	2014-02-04 16:12:37.021993713 +0100
++++ b/setup.py	2014-02-04 16:11:42.653995607 +0100
+@@ -13,8 +13,8 @@
+     package_dir = {'': 'src'},
+     packages = ['fedpkg'],
+     scripts = ['src/bin/fedpkg'],
+-    data_files = [('/etc/bash_completion.d', ['src/fedpkg.bash']),
+-                  ('/etc/rpkg', ['src/fedpkg.conf']),
+-                  ('/usr/libexec/', ['src/fedpkg-fixbranches.py']),
++    data_files = [('etc/bash_completion.d', ['src/fedpkg.bash']),
++                  ('etc/rpkg', ['src/fedpkg.conf']),
++                  ('libexec/', ['src/fedpkg-fixbranches.py']),
+                  ]
+ )
diff --git a/pkgs/development/python-modules/rpkg-buildfix.diff b/pkgs/development/python-modules/rpkg-buildfix.diff
new file mode 100644
index 00000000000..d410f09072f
--- /dev/null
+++ b/pkgs/development/python-modules/rpkg-buildfix.diff
@@ -0,0 +1,11 @@
+--- a/setup.py	2012-03-12 23:26:16.000000000 +0100
++++ b/setup.py	2014-02-04 14:52:02.335856975 +0100
+@@ -14,6 +14,6 @@
+     package_dir = {'': 'src'},
+     packages = ['pyrpkg'],
+     scripts = ['src/rpkg'],
+-    data_files = [('/etc/bash_completion.d', ['src/rpkg.bash']),
+-                  ('/etc/rpkg', ['src/rpkg.conf'])],
++    data_files = [('etc/bash_completion.d', ['src/rpkg.bash']),
++                  ('etc/rpkg', ['src/rpkg.conf'])],
+ )
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3624502e121..6d2605e0f98 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -417,6 +417,19 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   });
 
 
+  async = buildPythonPackage rec {
+    name = "async-0.6.1";
+    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+
+    buildInputs = [ pkgs.zlib ];
+    doCheck = false;
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/a/async/${name}.tar.gz";
+      sha256 = "1lfmjm8apy9qpnpbq8g641fd01qxh9jlya5g2d6z60vf8p04rla1";
+    };
+  };
+
   argparse = buildPythonPackage (rec {
     name = "argparse-1.2.1";
 
@@ -795,6 +808,17 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  bunch = buildPythonPackage (rec {
+    name = "bunch-1.0.1";
+    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/b/bunch/${name}.tar.gz";
+      sha256 = "1akalx2pd1fjlvrq69plvcx783ppslvikqdm93z2sdybq07pmish";
+    };
+    doCheck = false;
+  });
+
 
   carrot = buildPythonPackage rec {
     name = "carrot-0.10.7";
@@ -1555,6 +1579,33 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     buildInputs = [ fudge nose ];
   };
 
+  fedora_cert = buildPythonPackage (rec {
+    name = "fedora-cert-0.5.9.2";
+    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+
+    src = fetchurl {
+      url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2";
+      sha256 = "105swvzshgn3g6bjwk67xd8pslnhpxwa63mdsw6cl4c7cjp2blx9";
+    };
+    installCommand = "make install";
+    propagatedBuildInputs = [ python_fedora ];
+    postInstall = "mv $out/bin/fedpkg $out/bin/fedora-cert-fedpkg";
+    doCheck = false;
+  });
+
+  fedpkg = buildPythonPackage (rec {
+    name = "fedpkg-1.14";
+    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+
+    src = fetchurl {
+      url = "https://fedorahosted.org/releases/f/e/fedpkg/fedpkg-1.14.tar.bz2";
+      sha256 = "0rj60525f2sv34g5llafnkmpvbwrfbmfajxjc14ldwzymp8clc02";
+    };
+
+    patches = [ ../development/python-modules/fedpkg-buildfix.diff ];
+    propagatedBuildInputs = [ rpkg offtrac urlgrabber fedora_cert ];
+  });
+
   fudge = buildPythonPackage rec {
     name = "fudge-0.9.4";
     src = fetchurl {
@@ -1582,6 +1633,31 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  gitdb = buildPythonPackage rec {
+    name = "gitdb-0.5.4";
+    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+    doCheck = false;
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/g/gitdb/${name}.tar.gz";
+      sha256 = "10rpmmlln59aq44cd5vkb77hslak5pa1rbmigg6ski5f1nn2spfy";
+    };
+
+    propagatedBuildInputs = [ smmap async ];
+  };
+
+  GitPython = buildPythonPackage rec {
+    name = "GitPython-0.3.2";
+    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/G/GitPython/GitPython-0.3.2.RC1.tar.gz";
+      sha256 = "1q4lc2ps12l517mmrxc8iq6gxyhj6d77bnk1p7mxf38d99l8crzx";
+    };
+
+    buildInputs = [ nose ];
+    propagatedBuildInputs = [ gitdb ];
+  };
 
   googlecl = buildPythonPackage rec {
     version = "0.9.14";
@@ -1619,6 +1695,22 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  koji = buildPythonPackage (rec {
+    name = "koji-1.8";
+    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+
+    src = fetchurl {
+      url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2";
+      sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1";
+    };
+
+    buildPhase = ":";
+    installCommand = "make install DESTDIR=$out/ && cp -R $out/nix/store/*/* $out/ && rm -rf $out/nix";
+    doCheck = false;
+    propagatedBuildInputs = [ pythonPackages.pycurl ];
+
+  });
+
   logilab_astng = buildPythonPackage rec {
     name = "logilab-astng-0.24.1";
 
@@ -3227,6 +3319,16 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       [ pkgs.unzip fs gdata python_keyczar mock pyasn1 pycrypto pytest ];
   };
 
+  kitchen = buildPythonPackage (rec {
+    name = "kitchen-1.1.1";
+    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/k/kitchen/kitchen-1.1.1.tar.gz";
+      sha256 = "0ki840hjk1q19w6icv0dj2jxb00966nwy9b1jib0dgdspj00yrr5";
+    };
+  });
+
   pylast = buildPythonPackage rec {
     name = "pylast-${version}";
     version = "0.5.11";
@@ -4229,6 +4331,17 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   });
 
+  offtrac = buildPythonPackage rec {
+    name = "offtrac-0.1.0";
+    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/o/offtrac/${name}.tar.gz";
+      sha256 = "06vd010pa1z7lyfj1na30iqzffr4kzj2k2sba09spik7drlvvl56";
+    };
+    doCheck = false;
+  };
+
   # optfunc = buildPythonPackage ( rec {
   #   name = "optfunc-git";
   #
@@ -5188,6 +5301,18 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   });
 
+  python_fedora = buildPythonPackage (rec {
+    name = "python-fedora-0.3.32.3";
+    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+
+    src = fetchurl {
+      url = "https://fedorahosted.org/releases/p/y/python-fedora/python-fedora-0.3.32.3.tar.gz";
+      sha256 = "0qwmbid4pkdj6z9gwa43fzs97fr6ci2h2vj1hyk0gp0vqim4kv4l";
+    };
+    propagatedBuildInputs = [ kitchen requests bunch ];
+    doCheck = false;
+  });
+
   python_keyczar = buildPythonPackage rec {
     name = "python-keyczar-0.71c";
 
@@ -5958,6 +6083,24 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  rpkg = buildPythonPackage (rec {
+    name = "rpkg-1.14";
+    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+
+    src = fetchurl {
+      url = "https://fedorahosted.org/releases/r/p/rpkg/rpkg-1.14.tar.gz";
+      sha256 = "0d053hdjz87aym1sfm6c4cxmzmy5g0gkrmrczly86skj957r77a7";
+    };
+
+    patches = [ ../development/python-modules/rpkg-buildfix.diff ];
+
+    # buildPhase = "python setup.py build";
+    # doCheck = false;
+    propagatedBuildInputs = [ pycurl koji GitPython pkgs.git
+                              pkgs.rpm pkgs.pyopenssl ];
+
+  });
+
   rtslib_fb = buildPythonPackage rec {
     version = "2.1.fb43";
     name = "rtslib-fb-${version}";
@@ -6823,6 +6966,15 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   #   };
   # };
 
+  smmap = buildPythonPackage rec {
+    name = "smmap-0.8.2";
+    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/s/smmap/${name}.tar.gz";
+      sha256 = "0vrdgr6npmajrv658fv8bij7zgm5jmz2yxkbv8kmbv25q1f9b8ny";
+    };
+  };
 
   trac = buildPythonPackage {
     name = "trac-1.0.1";
-- 
GitLab


From 8d877463f697cdd965343fcf3636d64f1efce633 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sat, 8 Feb 2014 13:23:38 +0100
Subject: [PATCH 1035/3789] rpm: Build python bindings (--enable-python).

---
 pkgs/tools/package-management/rpm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 73b0ca58828..9a96baf5fe0 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4, xz }:
+{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4, xz, python }:
 
 stdenv.mkDerivation rec {
   name = "rpm-4.7.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0";
   };
 
-  buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 xz ];
+  buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 xz python ];
 
   # Note: we don't add elfutils to buildInputs, since it provides a
   # bad `ld' and other stuff.
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_LINK = "-L${elfutils}/lib";
   
-  configureFlags = "--with-external-db --without-lua";
+  configureFlags = "--with-external-db --without-lua --enable-python";
 
   meta = {
     homepage = http://www.rpm.org/;
-- 
GitLab


From 09f9af17b46c8c6dad4df82214afa9f0b15af3b9 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Wed, 5 Feb 2014 17:10:59 +0100
Subject: [PATCH 1036/3789] Update to the Yubikey PBA

Security-relevant changes:
 * No (salted) passphrase hash send to the yubikey, only hash of the salt (as it was in the original implementation).
 * Derive $k_luks with PBKDF2 from the yubikey $response (as the PBKDF2 salt) and the passphrase $k_user
   (as the PBKDF2 password), so that if two-factor authentication is enabled
   (a) a USB-MITM attack on the yubikey itself is not enough to break the system
   (b) the potentially low-entropy $k_user is better protected against brute-force attacks
 * Instead of using uuidgen, gather the salt (previously random uuid / uuid_r) directly from /dev/random.
 * Length of the new salt in byte added as the parameter "saltLength", defaults to 16 byte.
   Note: Length of the challenge is 64 byte, so saltLength > 64 may have no benefit over saltLengh = 64.
 * Length of $k_luks derived with PBKDF2 in byte added as the parameter "keyLength", defaults to 64 byte.
   Example: For a luks device with a 512-bit key, keyLength should be 64.
 * Increase of the PBKDF2 iteration count per successful authentication added as the
   parameter "iterationStep", defaults to 0.

Other changes:
 * Add optional grace period before trying to find the yubikey, defaults to 2 seconds.

Full overview of the yubikey authentication process:

  (1) Read $salt and $iterations from unencrypted device (UD).
  (2) Calculate the $challenge from the $salt with a hash function.
      Chosen instantiation: SHA-512($salt).
  (3) Challenge the yubikey with the $challenge and receive the $response.
  (4) Repeat three times:
    (a) Prompt for the passphrase $k_user.
    (b) Derive the key $k_luks for the luks device with a key derivation function from $k_user and $response.
        Chosen instantiation: PBKDF2(HMAC-SHA-512, $k_user, $response, $iterations, keyLength).
    (c) Try to open the luks device with $k_luks and escape loop (4) only on success.
  (5) Proceed only if luks device was opened successfully, fail otherwise.

  (6) Gather $new_salt from a cryptographically secure pseudorandom number generator
      Chosen instantiation: /dev/random
  (7) Calculate the $new_challenge from the $new_salt with the same hash function as (2).
  (8) Challenge the yubikey with the $new_challenge and receive the $new_response.
  (9) Derive the new key $new_k_luks for the luks device in the same manner as in (4) (b),
      but with more iterations as given by iterationStep.
 (10) Try to change the luks device's key $k_luks to $new_k_luks.
 (11) If (10) was successful, write the $new_salt and the $new_iterations to the UD.
      Note: $new_iterations = $iterations + iterationStep

Known (software) attack vectors:

 * A MITM attack on the keyboard can recover $k_user. This, combined with a USB-MITM
   attack on the yubikey for the $response (1) or the $new_response (2) will result in
   (1) $k_luks being recovered,
   (2) $new_k_luks being recovered.
 * Any attacker with access to the RAM state of stage-1 at mid- or post-authentication
   can recover $k_user, $k_luks, and  $new_k_luks
 * If an attacker has recovered $response or $new_response, he can perform a brute-force
   attack on $k_user with it without the Yubikey needing to be present (using cryptsetup's
   "luksOpen --verify-passphrase" oracle. He could even make a copy of the luks device's
   luks header and run the brute-force attack without further access to the system.
 * A USB-MITM attack on the yubikey will allow an attacker to attempt to brute-force
   the yubikey's internal key ("shared secret") without it needing to be present anymore.

Credits:

 * Florian Klien,
   for the original concept and the reference implementation over at
   https://github.com/flowolf/initramfs_ykfde
 * Anthony Thysse,
   for the reference implementation of accessing OpenSSL's PBKDF2 over at
   http://www.ict.griffith.edu.au/anthony/software/pbkdf2.c
---
 nixos/modules/system/boot/luksroot.nix    | 143 ++++++++++++++--------
 nixos/modules/system/boot/pbkdf2-sha512.c |  38 ++++++
 2 files changed, 132 insertions(+), 49 deletions(-)
 create mode 100644 nixos/modules/system/boot/pbkdf2-sha512.c

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index d70d1341166..117c526fcd3 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -43,22 +43,33 @@ let
     }
 
     hextorb() {
-        ( tr '[:lower:]' '[:upper:]' | sed -e 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI'| xargs printf )
+        ( tr '[:lower:]' '[:upper:]' | sed -e 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf )
     }
 
     open_yubikey() {
 
-        mkdir -p ${yubikey.storage.mountPoint}
-        mount -t ${yubikey.storage.fsType} ${toString yubikey.storage.device} ${yubikey.storage.mountPoint}
-
-        local uuid_r
+        # Make all of these local to this function
+        # to prevent their values being leaked
+        local salt
+        local iterations
         local k_user
         local challenge
+        local response
+        local k_luks
         local opened
+        local new_salt
+        local new_iterations
+        local new_challenge
+        local new_response
+        local new_k_luks
 
-        sleep 1
+        mkdir -p ${yubikey.storage.mountPoint}
+        mount -t ${yubikey.storage.fsType} ${toString yubikey.storage.device} ${yubikey.storage.mountPoint}
 
-        uuid_r="$(cat ${yubikey.storage.mountPoint}${yubikey.storage.path})"
+        salt="$(cat ${yubikey.storage.mountPoint}${yubikey.storage.path} | sed -n 1p | tr -d '\n')"
+        iterations="$(cat ${yubikey.storage.mountPoint}${yubikey.storage.path} | sed -n 2p | tr -d '\n')"
+        challenge="$(echo -n $salt | openssl-wrap dgst -binary -sha512 | rbtohex)"
+        response="$(ykchalresp -${toString yubikey.slot} -x $challenge 2>/dev/null)"
 
         for try in $(seq 3); do
 
@@ -68,9 +79,11 @@ let
             echo
             ''}
 
-            challenge="$(echo -n $k_user$uuid_r | openssl-wrap dgst -binary -sha512 | rbtohex)"
-
-            k_luks="$(ykchalresp -${toString yubikey.slot} -x $challenge 2>/dev/null)"
+            if [ ! -z "$k_user" ]; then
+                k_luks="$(echo -n $k_user | pbkdf2-sha512 ${toString yubikey.keyLength} $iterations $response | rbtohex)"
+            else
+                k_luks="$(echo | pbkdf2-sha512 ${toString yubikey.keyLength} $iterations $response | rbtohex)"
+            fi
 
             echo -n "$k_luks" | hextorb | cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} --key-file=-
 
@@ -89,53 +102,60 @@ let
             exit 1
         fi
 
-        update_failed=false
-
-        local new_uuid_r
-        new_uuid_r="$(uuidgen)"
-        if [ $? != "0" ]; then
-            for try in $(seq 10); do
-                sleep 1
-                new_uuid_r="$(uuidgen)"
-                if [ $? == "0" ]; then break; fi
-                if [ $try -eq 10 ]; then update_failed=true; fi
-            done
-        fi
+        echo -n "Gathering entropy for new salt (please enter random keys to generate entropy if this blocks for long)..."
+        for i in $(seq ${toString yubikey.saltLength}); do
+            byte="$(dd if=/dev/random bs=1 count=1 2>/dev/null | rbtohex)";
+            new_salt="$new_salt$byte";
+            echo -n .
+        done;
+        echo "ok"
 
-        if [ "$update_failed" == false ]; then
-            new_uuid_r="$(echo -n $new_uuid_r | head -c 36 | tr -d '-')"
+        new_iterations="$iterations"
+        ${optionalString (yubikey.iterationStep > 0) ''
+        new_iterations="$(($new_iterations + ${toString yubikey.iterationStep}))"
+        ''}
 
-            local new_challenge
-            new_challenge="$(echo -n $k_user$new_uuid_r | openssl-wrap dgst -binary -sha512 | rbtohex)"
+        new_challenge="$(echo -n $new_salt | openssl-wrap dgst -binary -sha512 | rbtohex)"
 
-            local new_k_luks
-            new_k_luks="$(ykchalresp -${toString yubikey.slot} -x $new_challenge 2>/dev/null)"
+        new_response="$(ykchalresp -${toString yubikey.slot} -x $new_challenge 2>/dev/null)"
 
-            mkdir -p ${yubikey.ramfsMountPoint}
-            # A ramfs is used here to ensure that the file used to update
-            # the key slot with cryptsetup will never get swapped out.
-            # Warning: Do NOT replace with tmpfs!
-            mount -t ramfs none ${yubikey.ramfsMountPoint}
+        if [ ! -z "$k_user" ]; then
+            new_k_luks="$(echo -n $k_user | pbkdf2-sha512 ${toString yubikey.keyLength} $new_iterations $new_response | rbtohex)"
+        else
+            new_k_luks="$(echo | pbkdf2-sha512 ${toString yubikey.keyLength} $new_iterations $new_response | rbtohex)"
+        fi
 
-            echo -n "$new_k_luks" | hextorb > ${yubikey.ramfsMountPoint}/new_key
-            echo -n "$k_luks" | cryptsetup luksChangeKey ${device} --key-file=- ${yubikey.ramfsMountPoint}/new_key
+        mkdir -p ${yubikey.ramfsMountPoint}
+        # A ramfs is used here to ensure that the file used to update
+        # the key slot with cryptsetup will never get swapped out.
+        # Warning: Do NOT replace with tmpfs!
+        mount -t ramfs none ${yubikey.ramfsMountPoint}
 
-            if [ $? == "0" ]; then
-                echo -n "$new_uuid_r" > ${yubikey.storage.mountPoint}${yubikey.storage.path}
-            else
-                echo "Warning: Could not update LUKS key, current challenge persists!"
-            fi
+        echo -n "$new_k_luks" | hextorb > ${yubikey.ramfsMountPoint}/new_key
+        echo -n "$k_luks" | hextorb | cryptsetup luksChangeKey ${device} --key-file=- ${yubikey.ramfsMountPoint}/new_key
 
-            rm -f ${yubikey.ramfsMountPoint}/new_key
-            umount ${yubikey.ramfsMountPoint}
-            rm -rf ${yubikey.ramfsMountPoint}
+        if [ $? == "0" ]; then
+            echo -ne "$new_salt\n$new_iterations" > ${yubikey.storage.mountPoint}${yubikey.storage.path}
         else
-            echo "Warning: Could not obtain new UUID, current challenge persists!"
+            echo "Warning: Could not update LUKS key, current challenge persists!"
         fi
 
+        rm -f ${yubikey.ramfsMountPoint}/new_key
+        umount ${yubikey.ramfsMountPoint}
+        rm -rf ${yubikey.ramfsMountPoint}
+
         umount ${yubikey.storage.mountPoint}
     }
 
+    ${optionalString (yubikey.gracePeriod > 0) ''
+    echo -n "Waiting ${toString yubikey.gracePeriod} seconds as grace..."
+    for i in $(seq ${toString yubikey.gracePeriod}); do
+        sleep 1
+        echo -n .
+    done
+    echo "ok"
+    ''}
+
     yubikey_missing=true
     ykinfo -v 1>/dev/null 2>&1
     if [ $? != "0" ]; then
@@ -292,6 +312,30 @@ in
               description = "Which slot on the Yubikey to challenge";
             };
 
+            saltLength = mkOption {
+              default = 16;
+              type = types.int;
+              description = "Length of the new salt in byte (64 is the effective maximum)";
+            };
+
+            keyLength = mkOption {
+              default = 64;
+              type = types.int;
+              description = "Length of the LUKS slot key derived with PBKDF2 in byte";
+            };
+
+            iterationStep = mkOption {
+              default = 0;
+              type = types.int;
+              description = "How much the iteration count for PBKDF2 is increased at each successful authentication";
+            };
+
+            gracePeriod = mkOption {
+              default = 2;
+              type = types.int;
+              description = "Time in seconds to wait before attempting to find the Yubikey";
+            };
+
             ramfsMountPoint = mkOption {
               default = "/crypt-ramfs";
               type = types.string;
@@ -300,7 +344,7 @@ in
 
             storage = mkOption {
               type = types.optionSet;
-              description = "Options related to the storing the random UUID";
+              description = "Options related to the storing the salt";
 
               options = {
                 device = mkOption {
@@ -308,7 +352,7 @@ in
                   type = types.path;
                   description = ''
                     An unencrypted device that will temporarily be mounted in stage-1.
-                    Must contain the current random UUID to create the challenge for this LUKS device.
+                    Must contain the current salt to create the challenge for this LUKS device.
                   '';
                 };
 
@@ -328,7 +372,7 @@ in
                   default = "/crypt-storage/default";
                   type = types.string;
                   description = ''
-                    Absolute path of the random UUID on the unencrypted device with
+                    Absolute path of the salt on the unencrypted device with
                     that device's root directory as "/".
                   '';
                 };
@@ -370,11 +414,13 @@ in
       cp -pdv ${pkgs.popt}/lib/libpopt*.so.* $out/lib
 
       ${optionalString luks.yubikeySupport ''
-      cp -pdv ${pkgs.utillinux}/bin/uuidgen $out/bin
       cp -pdv ${pkgs.ykpers}/bin/ykchalresp $out/bin
       cp -pdv ${pkgs.ykpers}/bin/ykinfo $out/bin
       cp -pdv ${pkgs.openssl}/bin/openssl $out/bin
 
+      cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl}/lib ${./pbkdf2-sha512.c} -o $out/bin/pbkdf2-sha512 -lcrypto
+      strip -s $out/bin/pbkdf2-sha512
+
       cp -pdv ${pkgs.libusb1}/lib/libusb*.so.* $out/lib
       cp -pdv ${pkgs.ykpers}/lib/libykpers*.so.* $out/lib
       cp -pdv ${pkgs.libyubikey}/lib/libyubikey*.so.* $out/lib
@@ -394,7 +440,6 @@ EOF
     boot.initrd.extraUtilsCommandsTest = ''
       $out/bin/cryptsetup --version
       ${optionalString luks.yubikeySupport ''
-        $out/bin/uuidgen --version
         $out/bin/ykchalresp -V
         $out/bin/ykinfo -V
         cat > $out/bin/openssl-wrap <<EOF
diff --git a/nixos/modules/system/boot/pbkdf2-sha512.c b/nixos/modules/system/boot/pbkdf2-sha512.c
new file mode 100644
index 00000000000..b40c383ac02
--- /dev/null
+++ b/nixos/modules/system/boot/pbkdf2-sha512.c
@@ -0,0 +1,38 @@
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+#include <openssl/evp.h>
+
+void hextorb(uint8_t* hex, uint8_t* rb)
+{
+	while(sscanf(hex, "%2x", rb) == 1)
+	{
+		hex += 2;
+		rb += 1;
+	}
+	*rb = '\0';
+}
+
+int main(int argc, char** argv)
+{
+	uint8_t k_user[2048];
+	uint8_t salt[2048];
+	uint8_t key[4096];
+
+	uint32_t key_length = atoi(argv[1]);
+	uint32_t iteration_count = atoi(argv[2]);
+
+	hextorb(argv[3], salt);
+	uint32_t salt_length = strlen(argv[3]) / 2;
+
+	fgets(k_user, 2048, stdin);
+	uint32_t k_user_length = strlen(k_user);
+	if(k_user[k_user_length - 1] == '\n') {
+			k_user[k_user_length - 1] = '\0';
+	}
+
+	PKCS5_PBKDF2_HMAC(k_user, k_user_length, salt, salt_length, iteration_count, EVP_sha512(), key_length, key);
+	fwrite(key, 1, key_length, stdout);
+
+	return 0;
+}
\ No newline at end of file
-- 
GitLab


From 31fa2cd52bef42d670c569cb8951509c89c143b0 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 29 Jan 2014 19:06:45 +0100
Subject: [PATCH 1037/3789] grsecurity: Fix building grsec-3.x.0 kernels

---
 pkgs/os-specific/linux/kernel/linux-3.13.nix | 2 +-
 pkgs/os-specific/linux/kernel/linux-3.2.nix  | 2 +-
 pkgs/top-level/all-packages.nix              | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix
index 637d2935c98..a5d816b2563 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix
@@ -13,4 +13,4 @@ import ./generic.nix (args // rec {
   features.needsCifsUtils = true;
   features.canDisableNetfilterConntrackHelpers = true;
   features.netfilterRPFilter = true;
-})
+} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index d7598b53b1b..c0006ed7348 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -9,4 +9,4 @@ import ./generic.nix (args // rec {
   };
 
   features.iwlwifi = true;
-})
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57a1933c7b2..c6f8fe8b8dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6660,13 +6660,17 @@ let
   # config options you need (e.g. by overriding extraConfig). See list of options here:
   # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
   linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
-    modDirVersion = "${linux_3_2.version}-grsec";
     kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_54 kernelPatches.grsec_path ];
+    argsOverride = {
+      modDirVersion = "${linux_3_2.modDirVersion}-grsec";
+    };
   })) (args: grsecurityOverrider args));
 
   linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: {
-    modDirVersion = "${linux_3_12.version}-grsec";
     kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_8 kernelPatches.grsec_path ];
+    argsOverride = {
+      modDirVersion = "${linux_3_12.modDirVersion}-grsec";
+    };
   })) (args: grsecurityOverrider args));
 
   linux_3_2_apparmor = lowPrio (linux_3_2.override {
-- 
GitLab


From b31547654d7fd5fea0eadbae07fcae5c9dd60077 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 29 Jan 2014 14:52:18 +0100
Subject: [PATCH 1038/3789] grsecurity: Update stable and test patches

stable: 3.0-3.2.54-201401191012 -> 3.0-3.2.54-201402062221
test:   3.0-3.12.8-201401191015 -> 3.0-3.13.2-201402062224
---
 pkgs/os-specific/linux/kernel/patches.nix | 14 +++++++-------
 pkgs/top-level/all-packages.nix           |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 8b658a6030e..5ade01014f9 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -81,22 +81,22 @@ rec {
   grsecurity_3_0_3_2_54 =
     { name = "grsecurity-3.0-3.2.54";
       patch = fetchurl {
-        url = https://grsecurity.net/stable/grsecurity-3.0-3.2.54-201401191012.patch;
-        sha256 = "10kfdk46fgd1awys8f8520w7kanc4m0ckn28xg36473fi76i6snx";
+        url = https://grsecurity.net/stable/grsecurity-3.0-3.2.54-201402062221.patch;
+        sha256 = "14x887xibl7d50a1pxmi0snnwcnh27z8bnidhxg2xfasxxp248m5";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54
       features.apparmor = true;
     };
 
-  grsecurity_3_0_3_12_8 =
-    { name = "grsecurity-3.0-3.12.8";
+  grsecurity_3_0_3_13_2 =
+    { name = "grsecurity-3.0-3.13.2";
       patch = fetchurl {
-        url = https://grsecurity.net/test/grsecurity-3.0-3.12.8-201401191015.patch;
-        sha256 = "0dy7daar873jp0afkf48l8ij1ii8cgcc9z5pn50h1fvhc9ap1j4f";
+        url = https://grsecurity.net/test/grsecurity-3.0-3.13.2-201402062224.patch;
+        sha256 = "0w42d76bv7yzpr23bicsadf64csbmq988kmpzxg4yv5qwzhhbyh7";
       };
       features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.8
+      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2
       features.apparmor = true;
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6f8fe8b8dd..fd24b251b48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6666,10 +6666,10 @@ let
     };
   })) (args: grsecurityOverrider args));
 
-  linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_8 kernelPatches.grsec_path ];
+  linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: {
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_2 kernelPatches.grsec_path ];
     argsOverride = {
-      modDirVersion = "${linux_3_12.modDirVersion}-grsec";
+      modDirVersion = "${linux_3_13.modDirVersion}-grsec";
     };
   })) (args: grsecurityOverrider args));
 
@@ -6854,7 +6854,7 @@ let
   linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice;
   linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11);
   linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
-  linuxPackages_3_12_grsecurity = linuxPackagesFor pkgs.linux_3_12_grsecurity linuxPackages_3_12_grsecurity;
+  linuxPackages_3_13_grsecurity = linuxPackagesFor pkgs.linux_3_13_grsecurity linuxPackages_3_13_grsecurity;
   linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13);
   # Update this when adding a new version!
   linuxPackages_latest = pkgs.linuxPackages_3_13;
-- 
GitLab


From 979473a17b5026e9f972dc02fb2b47272bfb0bc0 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 7 Feb 2014 12:18:31 +0000
Subject: [PATCH 1039/3789] chromium: Update stable channel from 32.0.1700.102
 -> 32.0.1700.107

---
 pkgs/applications/networking/browsers/chromium/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index 6ad9d9090d5..ffce71ef09f 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -11,8 +11,8 @@
     sha256 = "04n43c4vn8i7qhlybqb19c2c8kri8nc1wpa2l83vin4sqxkq519h";
   };
   stable = {
-    version = "32.0.1700.102";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.102.tar.xz";
-    sha256 = "0jxwhd7cd60ivisrnzcglqqnmy99np1vvjqa27y42d852xjx84ys";
+    version = "32.0.1700.107";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.107.tar.xz";
+    sha256 = "1bf1gbjf4r9nf3xdn7zgq0ny1ihak21ka4rkkiadxsg8aq9vdsqz";
   };
 }
-- 
GitLab


From e78351cf3a4829c9eecb43af3acba0f82c07513b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 8 Feb 2014 17:24:17 +0100
Subject: [PATCH 1040/3789] llvm: revert to _33 default on darwin as a temp
 workaround

_34 doesn't build and I don't have a clue what to do about it
(and I don't have a machine to test it anyway).
---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57a1933c7b2..1332cadc646 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2794,7 +2794,8 @@ let
 
   lessc = callPackage ../development/compilers/lessc { };
 
-  llvm = llvmPackages.llvm;
+  llvm = if stdenv.isDarwin then llvm_33 # until someone solves build problems with _34
+    else llvmPackages.llvm;
 
   llvm_34 = llvmPackages.llvm;
   llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix;
-- 
GitLab


From 64a8ae3692a3139ce0b576e6b1a0575b605187b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 8 Feb 2014 18:09:27 +0100
Subject: [PATCH 1041/3789] SpringRTS: fix runtime dependencies and maintain

---
 pkgs/games/spring/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 4f8fe0d1974..c5ba87b113e 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -14,23 +14,24 @@ stdenv.mkDerivation rec {
     sha256 = "1axyqkxgv3a0zg0afzlc7j3lyi412zd551j317ci41yqz2qzf0px";
   };
 
-  buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL
-    xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl ]
+  cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON"
+                "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
+                "-DPREFER_STATIC_LIBS=OFF"];
+
+  buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL glibc
+    xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl
+    docbook_xsl_ns ]
     ++ stdenv.lib.optional withAI jdk
     ++ stdenv.lib.optional withAI python;
 
-  prePatch = ''
-    substituteInPlace cont/base/make_gamedata_arch.sh --replace "#!/bin/sh" "#!${stdenv.shell}/bin/sh" \
-      --replace "which" "type -p"
-  '';
-
+  # reported upstream http://springrts.com/mantis/view.php?id=4305
   #enableParallelBuilding = true; # occasionally missing generated files on Hydra
 
   meta = with stdenv.lib; {
     homepage = http://springrts.com/;
     description = "A powerful real-time strategy (RTS) game engine";
     license = licenses.gpl2;
-    maintainers = [ maintainers.phreedom maintainers.qknight ];
+    maintainers = [ maintainers.phreedom maintainers.qknight maintainers.iElectric ];
     platforms = platforms.mesaPlatforms;
   };
 }
-- 
GitLab


From 4baa1197ddf9ece82da78d32a981985f182e5b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 8 Feb 2014 18:16:28 +0100
Subject: [PATCH 1042/3789] spring: add missing function parameters

---
 pkgs/games/spring/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index c5ba87b113e..b073aa3488b 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip
+{ stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip, glibc
 , openal, libvorbis, glew, freetype, xlibs, SDL, mesa, binutils
-, asciidoc, libxslt, docbook_xsl, curl
+, asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl
 , jdk ? null, python ? null
 , withAI ? true # support for AI Interfaces and Skirmish AIs
 }:
+
 stdenv.mkDerivation rec {
 
   name = "spring-${version}";
-- 
GitLab


From 93f45ad2e5af3af22f91fc57e1a51e180b547b53 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sat, 8 Feb 2014 18:54:34 +0100
Subject: [PATCH 1043/3789] Rebar: update to 2.2.0

---
 .../development/tools/build-managers/rebar/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix
index ac695178541..a64360c5727 100644
--- a/pkgs/development/tools/build-managers/rebar/default.nix
+++ b/pkgs/development/tools/build-managers/rebar/default.nix
@@ -1,11 +1,15 @@
 { stdenv, fetchurl, erlang }:
 
+
+let
+  version = "2.2.0";
+in
 stdenv.mkDerivation {
-  name = "rebar-2.1.0-pre";
+  name = "rebar-${version}";
 
   src = fetchurl {
-    url = "https://github.com/basho/rebar/archive/2.1.0-pre.tar.gz";
-    sha256 = "0dsbk9ssvk1hx9275900dg4bz79kpwcid4gsz09ziiwzv0jjbrjn";
+    url = "https://github.com/rebar/rebar/archive/${version}.tar.gz";
+    sha256 = "0wprgzin09286v583jmlc385jqpi2lcpdql9srm4c7g39122dg43";
   };
 
   buildInputs = [ erlang ];
-- 
GitLab


From c983d23e336acb74ad3bc15c707353f731c51190 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sat, 8 Feb 2014 19:05:31 +0100
Subject: [PATCH 1044/3789] elixir: Update to 0.12.3.

---
 pkgs/development/interpreters/elixir/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 5f1749f33c9..56fc15b0511 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,29 +1,30 @@
 { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }:
 
 let
-  version = "0.12.0";
+  version = "0.12.3";
 in
 stdenv.mkDerivation {
   name = "elixir-${version}";
 
   src = fetchurl {
     url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "0cir2y36zljwphiqyz8xmq7qq0f094jmfy3qwk3wdm05c05nqnc8";
+    sha256 = "1im00cki38ldsig93djlsap8zbgwv74kpgw7xg9l6ik2cbpk0131";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];
 
   preBuild = ''
-    substituteInPlace rebar \
-      --replace "/usr/bin/env escript" ${erlang}/bin/escript
+    # The build process uses ./rebar. Link it to the nixpkgs rebar
+    rm -v rebar
+    ln -s ${rebar}/bin/rebar rebar
+
     substituteInPlace Makefile \
-      --replace '$(shell echo `pwd`/rebar)' ${rebar}/bin/rebar \
       --replace "/usr/local" $out
   '';
 
   postFixup = ''
-    # Elixirs binaries are shell scripts which run erl. This adds some
-    # stuff to PATH so the scripts run without problems.
+    # Elixir binaries are shell scripts which run erl. Add some stuff
+    # to PATH so the scripts can run without problems.
 
     for f in $out/bin/*
     do
-- 
GitLab


From bb66a3ff6ce25350f3999b80932e40c91d079e73 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sat, 8 Feb 2014 19:17:18 +0100
Subject: [PATCH 1045/3789] Anki: Update to 2.0.22.

---
 pkgs/games/anki/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index e039291882c..720be6fb1d2 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -6,13 +6,13 @@
 
 let
     py = pythonPackages;
+    version = "2.0.22";
 in
-
 stdenv.mkDerivation rec {
-    name = "anki-2.0.20";
+    name = "anki-${version}";
     src = fetchurl {
       url = "http://ankisrs.net/download/mirror/${name}.tgz";
-      sha256 = "1w274g7as458bfkh86635p04fimvmkn70j8qy9m6nl2xwjaq8nhm";
+      sha256 = "1bnjzf8050hrs3iiaak0m07sxj07vqic677llg2g6iarg9ws8x26";
     };
 
     pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ]
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
         decrease your time spent studying, or greatly increase the amount you learn.
 
         Anyone who needs to remember things in their daily life can benefit from
-        Anki. Since it is content-agnostic and supports images, audio, videos and 
+        Anki. Since it is content-agnostic and supports images, audio, videos and
         scientific markup (via LaTeX), the possibilities are endless. For example:
 
         * learning a language
-- 
GitLab


From 61f20ca45ea848185123c65f483d4929c417dadc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 8 Feb 2014 20:15:12 +0100
Subject: [PATCH 1046/3789] libqmi: 1.0 -> 1.8.0, move outside gnome3
 namespace, fix build

---
 pkgs/desktops/gnome-3/core/libqmi/default.nix | 16 --------------
 pkgs/desktops/gnome-3/default.nix             |  2 --
 pkgs/development/libraries/libqmi/default.nix | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 23 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/core/libqmi/default.nix
 create mode 100644 pkgs/development/libraries/libqmi/default.nix

diff --git a/pkgs/desktops/gnome-3/core/libqmi/default.nix b/pkgs/desktops/gnome-3/core/libqmi/default.nix
deleted file mode 100644
index beb63f80b80..00000000000
--- a/pkgs/desktops/gnome-3/core/libqmi/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, python }:
-
-stdenv.mkDerivation rec {
-  name = "libqmi-1.0";
-
-  src = fetchurl {
-    url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
-    sha256 = "0w4cd7nihp73frh3sfi13fx0rkwmd581xpil54bsjc7pw7z01bd1";
-  };
-
-  buildInputs = [ pkgconfig glib python ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index e9ec7be55b9..197a135dcaa 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -70,8 +70,6 @@ rec {
 
   libpeas = callPackage ./core/libpeas {};
 
-  libqmi = callPackage ./core/libqmi {};
-
   libgweather = callPackage ./core/libgweather { };
 
   libzapojit = callPackage ./core/libzapojit { };
diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix
new file mode 100644
index 00000000000..a0292067dbb
--- /dev/null
+++ b/pkgs/development/libraries/libqmi/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, glib, python }:
+
+stdenv.mkDerivation rec {
+  name = "libqmi-1.8.0";
+
+  src = fetchurl {
+    url = "http://www.freedesktop.org/software/libqmi/${name}.tar.xz";
+    sha256 = "03gf221yjcdzvnl4v2adwpc6cyg5mlbccn20s00fp5bgvmq81pgs";
+  };
+
+  preBuild = ''
+    patchShebangs .
+  '';
+
+  buildInputs = [ pkgconfig glib python ];
+
+  meta = with stdenv.lib; {
+    description = "Modem protocol helper library";
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c542dfc361..d7aff1acc06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1282,6 +1282,8 @@ let
 
   libshout = callPackage ../development/libraries/libshout { };
 
+  libqmi = callPackage ../development/libraries/libqmi { };
+
   libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
 
   logcheck = callPackage ../tools/system/logcheck {
-- 
GitLab


From b17edbac57919117475525cdc7fb9301224c0263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 8 Feb 2014 20:16:34 +0100
Subject: [PATCH 1047/3789] ModemManager: 0.5.4.0 -> 0.7.991

---
 .../services/networking/networkmanager.nix    |  8 ++++---
 .../development/libraries/libmbim/default.nix | 23 +++++++++++++++++++
 .../tools/networking/modemmanager/default.nix | 19 ++++++++-------
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/libraries/libmbim/default.nix

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 0b079e3567a..2db96d9cd31 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -31,7 +31,7 @@ let
 
     [modem-manager]
     Identity=unix-group:networkmanager
-    Action=org.freedesktop.ModemManager.*
+    Action=org.freedesktop.ModemManager*
     ResultAny=yes
     ResultInactive=no
     ResultActive=yes
@@ -42,7 +42,7 @@ let
         subject.isInGroup("networkmanager")
         && subject.active
         && (action.id.indexOf("org.freedesktop.NetworkManager.") == 0
-            || action.id.indexOf("org.freedesktop.ModemManager.")  == 0
+            || action.id.indexOf("org.freedesktop.ModemManager")  == 0
         ))
           { return polkit.Result.YES; }
     });
@@ -161,6 +161,7 @@ in {
         networkmanager_vpnc
         networkmanager_openconnect
         networkmanager_pptp
+        modemmanager
         ];
 
     users.extraGroups = singleton {
@@ -177,7 +178,7 @@ in {
       description = "NetworkManager initialisation";
       wantedBy = [ "network.target" ];
       partOf = [ "NetworkManager.service" ];
-      wants = [ "NetworkManager.service" ];
+      wants = [ "ModemManager.service" ];
       before = [ "NetworkManager.service" ];
       script = ''
         mkdir -m 700 -p /etc/NetworkManager/system-connections
@@ -206,6 +207,7 @@ in {
         networkmanager_vpnc
         networkmanager_openconnect
         networkmanager_pptp
+        modemmanager
         ];
 
     services.udev.packages = cfg.packages;
diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix
new file mode 100644
index 00000000000..8207051b2a8
--- /dev/null
+++ b/pkgs/development/libraries/libmbim/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, glib, python, udev }:
+
+stdenv.mkDerivation rec {
+  name = "libmbim-1.6.0";
+
+  src = fetchurl {
+    url = "http://www.freedesktop.org/software/libmbim/${name}.tar.xz";
+    sha256 = "10mh1b8jfxg6y6nhr7swbi9wx4acjgvx1if7nhrw1ppd5apvvvz0";
+  };
+
+  preConfigure = ''
+    for f in build-aux/mbim-codegen/*; do
+       substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python"
+    done
+  '';
+
+  buildInputs = [ pkgconfig glib udev ];
+
+  meta = with stdenv.lib; {
+    description = "talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol";
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix
index bfa673eff09..3e33b845b60 100644
--- a/pkgs/tools/networking/modemmanager/default.nix
+++ b/pkgs/tools/networking/modemmanager/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl_gnome, udev, polkit, dbus_glib, ppp, intltool, pkgconfig }:
+{ stdenv, fetchurl, udev, polkit, dbus_glib, ppp, intltool, pkgconfig, libmbim, libqmi }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "ModemManager-0.7.991";
 
-  src = fetchurl_gnome {
-    project = "ModemManager";
-    major = "0"; minor = "5"; patchlevel = "4.0"; extension = "xz";
-    sha256 = "1fdf5d5cc494825afe9f551248e00a2d91e220e88435b47f109ca2a707a40f1f";
+  src = fetchurl {
+    url = "mirror://gnome/sources/ModemManager/0.7/${name}.tar.xz";
+    sha256 = "0p8shqsbgnsazim7s52ylxjk064cbx2n1vm1jgywr7i58hsd6n4y";
   };
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
-  buildInputs = [ udev polkit dbus_glib ppp ];
+  buildInputs = [ udev polkit dbus_glib ppp libmbim libqmi ];
 
-  configureFlags = "--with-polkit --with-udev-base-dir=$(out)/lib/udev";
+  configureFlags = [
+    "--with-polkit"
+    "--with-udev-base-dir=$(out)/lib/udev"
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+  ];
 
   meta = {
     description = "WWAN modem manager, part of NetworkManager";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7aff1acc06..a51d1d33f56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1284,6 +1284,8 @@ let
 
   libqmi = callPackage ../development/libraries/libqmi { };
 
+  libmbim = callPackage ../development/libraries/libmbim { };
+
   libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
 
   logcheck = callPackage ../tools/system/logcheck {
-- 
GitLab


From a23b87a13a68c4d838318fab7d835b5d704ceb58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 8 Feb 2014 20:26:23 +0100
Subject: [PATCH 1048/3789] pypy: disable a test with transient error #1634

---
 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 b870522f629..a348937d8af 100644
--- a/pkgs/development/interpreters/pypy/2.2/default.nix
+++ b/pkgs/development/interpreters/pypy/2.2/default.nix
@@ -58,7 +58,8 @@ let
        # disable shutils because it assumes gid 0 exists
        # disable socket because it has two actual network tests that fail
        # disable test_mhlib because it fails for unknown reason
-      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_shutil -test_mhlib' lib-python
+       # 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
     '';
 
     installPhase = ''
-- 
GitLab


From 4a1e74673a2ead0e727f5a356fbccbd88c52dd91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 8 Feb 2014 20:27:57 +0100
Subject: [PATCH 1049/3789] pypy: support only linux for now

---
 pkgs/development/interpreters/pypy/2.2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix
index a348937d8af..231a0a7dfaa 100644
--- a/pkgs/development/interpreters/pypy/2.2/default.nix
+++ b/pkgs/development/interpreters/pypy/2.2/default.nix
@@ -87,7 +87,7 @@ let
       homepage = "http://pypy.org/";
       description = "PyPy is a fast, compliant alternative implementation of the Python language (2.7.3)";
       license = licenses.mit;
-      platforms = platforms.all;
+      platforms = platforms.linux;
       maintainers = with maintainers; [ iElectric ];
     };
   };
-- 
GitLab


From dea562b6b920463395db47d141689e0768eb4836 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 8 Feb 2014 14:45:28 -0500
Subject: [PATCH 1050/3789] services.mesa -> hardware.opengl

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../x11/mesa.nix => hardware/opengl.nix}      | 22 +++++++++----------
 nixos/modules/module-list.nix                 |  2 +-
 nixos/modules/rename.nix                      |  4 ++++
 nixos/modules/services/ttys/kmscon.nix        |  2 +-
 nixos/modules/services/x11/xserver.nix        |  8 +++----
 nixos/modules/virtualisation/qemu-vm.nix      |  2 +-
 .../virtualisation/virtualbox-guest.nix       |  2 +-
 7 files changed, 23 insertions(+), 19 deletions(-)
 rename nixos/modules/{services/x11/mesa.nix => hardware/opengl.nix} (89%)

diff --git a/nixos/modules/services/x11/mesa.nix b/nixos/modules/hardware/opengl.nix
similarity index 89%
rename from nixos/modules/services/x11/mesa.nix
rename to nixos/modules/hardware/opengl.nix
index 12fc7ae1178..603012cb109 100644
--- a/nixos/modules/services/x11/mesa.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -2,19 +2,19 @@
 let
   inherit (pkgs.lib) mkOption types mkIf optional optionals elem optionalString optionalAttrs;
 
-  cfg = config.services.mesa;
+  cfg = config.hardware.opengl;
 
   kernelPackages = config.boot.kernelPackages;
 in {
   options = {
-    services.mesa.enable = mkOption {
-      description = "Whether this configuration requires mesa.";
+    hardware.opengl.enable = mkOption {
+      description = "Whether this configuration requires opengl.";
       type = types.bool;
       default = false;
       internal = true;
     };
 
-    services.mesa.driSupport = mkOption {
+    hardware.opengl.driSupport = mkOption {
       type = types.bool;
       default = true;
       description = ''
@@ -23,18 +23,18 @@ in {
       '';
     };
 
-    services.mesa.driSupport32Bit = mkOption {
+    hardware.opengl.driSupport32Bit = mkOption {
       type = types.bool;
       default = false;
       description = ''
         On 64-bit systems, whether to support Direct Rendering for
         32-bit applications (such as Wine).  This is currently only
         supported for the <literal>nvidia</literal> driver and for
-        <literal>mesa</literal>.
+        <literal>Mesa</literal>.
       '';
     };
 
-    services.mesa.s3tcSupport = mkOption {
+    hardware.opengl.s3tcSupport = mkOption {
       type = types.bool;
       default = false;
       description = ''
@@ -47,15 +47,15 @@ in {
     };
 
 
-    services.mesa.videoDrivers = mkOption {
+    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 video drivers that the mesa should
-        support.  Mesa will try all of the drivers listed
-        here until it finds one that supports your video card.
+        The names of the opengl video drivers the configuration
+        supports. They will be tried in order until one that
+        supports your card is found.
       '';
     };
   };
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index aa4bada8b28..5d52f71c9ff 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -29,6 +29,7 @@
   ./hardware/network/intel-3945abg.nix
   ./hardware/network/ralink.nix
   ./hardware/network/rtl8192c.nix
+  ./hardware/opengl.nix
   ./hardware/pcmcia.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
@@ -235,7 +236,6 @@
   ./services/x11/hardware/multitouch.nix
   ./services/x11/hardware/synaptics.nix
   ./services/x11/hardware/wacom.nix
-  ./services/x11/mesa.nix
   ./services/x11/window-managers/awesome.nix
   #./services/x11/window-managers/compiz.nix
   ./services/x11/window-managers/default.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 15e05a3d675..8393b5758f3 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -119,6 +119,10 @@ in zipModules ([]
 ++ obsolete [ "services" "xserver" "driSupport32Bit" ] [ "services" "mesa" "driSupport32Bit" ]
 ++ obsolete [ "services" "xserver" "s3tcSupport" ] [ "services" "mesa" "s3tcSupport" ]
 ++ obsolete [ "services" "xserver" "videoDrivers" ] [ "services" "mesa" "videoDrivers" ]
+++ obsolete [ "services" "mesa" "driSupport" ] [ "hardware" "opengl" "driSupport" ]
+++ obsolete [ "services" "mesa" "driSupport32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ]
+++ obsolete [ "services" "mesa" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ]
+++ obsolete [ "services" "mesa" "videoDrivers" ] [ "hardware" "opengl" "videoDrivers" ]
 
 # Options that are obsolete and have no replacement.
 ++ obsolete' [ "boot" "loader" "grub" "bootDevice" ]
diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index 302e660a7bf..eb68a3d95d8 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixos/modules/services/ttys/kmscon.nix
@@ -73,6 +73,6 @@ in {
       hwaccel
     '';
 
-    services.mesa.enable = mkIf cfg.hwRender true;
+    hardware.opengl.enable = mkIf cfg.hwRender true;
   };
 }
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 5600ce7fac1..2677f758456 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -22,7 +22,7 @@ let
     virtualbox   = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; };
   };
 
-  driverNames = config.services.mesa.videoDrivers;
+  driverNames = config.hardware.opengl.videoDrivers;
 
   drivers = flip map driverNames
     (name: { inherit name; driverName = name; } //
@@ -181,7 +181,7 @@ in
         description = ''
           The name of the video driver for your graphics card.  This
           option is obsolete; please set the
-          <option>services.mesa.videoDrivers</option> instead.
+          <option>hardware.opengl.videoDrivers</option> instead.
         '';
       };
 
@@ -381,8 +381,8 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
-    services.mesa.enable = true;
-    services.mesa.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ];
+    hardware.opengl.enable = true;
+    hardware.opengl.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ];
 
     assertions =
       [ { assertion = !(cfg.startOpenSSHAgent && cfg.startGnuPGAgent);
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 2483ee63d57..4f7f6ae8f2b 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -387,7 +387,7 @@ in
     # When building a regular system configuration, override whatever
     # video driver the host uses.
     services.xserver.videoDriver = mkVMOverride null;
-    services.mesa.videoDrivers = mkVMOverride [ "vesa" ];
+    hardware.opengl.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 9dda455e5d3..e4c00fe4a41 100644
--- a/nixos/modules/virtualisation/virtualbox-guest.nix
+++ b/nixos/modules/virtualisation/virtualbox-guest.nix
@@ -52,7 +52,7 @@ optionalAttrs (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) # ugly...
         serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/sbin/VBoxService VBoxService --foreground";
       };
 
-    services.mesa.videoDrivers = mkOverride 50 [ "virtualbox" ];
+    hardware.opengl.videoDrivers = mkOverride 50 [ "virtualbox" ];
 
     services.xserver.config =
       ''
-- 
GitLab


From ee14f8da9a04daa6c0412d983aa8daf37a539662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 8 Feb 2014 21:09:48 +0100
Subject: [PATCH 1051/3789] remove references to isSystemUser and fix eval of
 tested job

---
 nixos/doc/manual/configuration.xml  | 1 -
 nixos/modules/profiles/demo.nix     | 2 +-
 nixos/tests/common/user-account.nix | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml
index e6d7dee251a..da08098ddda 100644
--- a/nixos/doc/manual/configuration.xml
+++ b/nixos/doc/manual/configuration.xml
@@ -1025,7 +1025,6 @@ users.extraUsers.alice =
     home = "/home/alice";
     description = "Alice Foobar";
     extraGroups = [ "wheel" ];
-    isSystemUser = false;
     useDefaultShell = true;
     openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
   };
diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix
index 396dcf6c5d3..605cc6aad1d 100644
--- a/nixos/modules/profiles/demo.nix
+++ b/nixos/modules/profiles/demo.nix
@@ -11,6 +11,6 @@
       createHome = true;
       useDefaultShell = true;
       password = "demo";
-      isSystemUser = false;
+      uid = 1000;
     };
 }
diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix
index 8157cf8d263..0239a3c4d08 100644
--- a/nixos/tests/common/user-account.nix
+++ b/nixos/tests/common/user-account.nix
@@ -7,5 +7,6 @@
       createHome = true;
       useDefaultShell = true;
       password = "foobar";
+      uid = 1000;
     };
 }
-- 
GitLab


From 84a7a09bc8c0bd1b53ea5f56ae6426e3a2e9bb21 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 8 Feb 2014 15:20:15 -0500
Subject: [PATCH 1052/3789] Try to improve naming of list elements in loaOf
 types

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 lib/types.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index bdd21f12395..afc8f80eb0e 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -132,7 +132,7 @@ rec {
             { inherit (def) file;
               value = listToAttrs (
                 imap (elemIdx: elem:
-                  { name = "unnamed-${toString defIdx}.${toString elemIdx}";
+                  { name = "${elem.name or "unnamed"}-${toString defIdx}.${toString elemIdx}";
                     value = elem;
                   }) def.value);
             }
-- 
GitLab


From 028379be28695cf07ac31a73bcbc1439bfb944b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 8 Feb 2014 21:47:28 +0100
Subject: [PATCH 1053/3789] nixos: add most basic gnome3 test and take a
 screenshot

---
 nixos/release-combined.nix |  1 +
 nixos/tests/default.nix    |  1 +
 nixos/tests/gnome3.nix     | 31 +++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 nixos/tests/gnome3.nix

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index dccc3acbf46..ed5c4769d0a 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.xfce)
+        (all nixos.tests.gnome3)
 
         nixpkgs.tarball
         (all nixpkgs.emacs)
diff --git a/nixos/tests/default.nix b/nixos/tests/default.nix
index 574e1dd2f8b..b37a0d5fa0c 100644
--- a/nixos/tests/default.nix
+++ b/nixos/tests/default.nix
@@ -12,6 +12,7 @@ with import ../lib/testing.nix { inherit system minimal; };
   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);
   kde4 = makeTest (import ./kde4.nix);
   #kexec = makeTest (import ./kexec.nix);
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
new file mode 100644
index 00000000000..98a76137842
--- /dev/null
+++ b/nixos/tests/gnome3.nix
@@ -0,0 +1,31 @@
+{ pkgs, ... }:
+
+{
+
+  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;
+    };
+
+  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");
+    '';
+
+}
-- 
GitLab


From 18a03d72852b9a95dd9a8090da2cfd3ad0ef390a Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sat, 8 Feb 2014 21:48:50 +0100
Subject: [PATCH 1054/3789] Leiningen: Update to 2.3.4

---
 .../tools/build-managers/leiningen/builder.sh         |  2 +-
 .../tools/build-managers/leiningen/default.nix        | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh
index 6a66466506c..e1dd9d5a786 100644
--- a/pkgs/development/tools/build-managers/leiningen/builder.sh
+++ b/pkgs/development/tools/build-managers/leiningen/builder.sh
@@ -19,5 +19,5 @@ chmod -v 755 $out_bin
 patchShebangs $out
 
 wrapProgram $out_bin \
-    --prefix PATH ":" ${rlwrap}/bin \
+    --prefix PATH ":" "${rlwrap}/bin:${coreutils}/bin:${findutils}/bin" \
     --set LEIN_GPG ${gnupg}/bin/gpg
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index a41cf69ad23..2c039b3fa0c 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchurl, makeWrapper, jdk, rlwrap, clojure, gnupg }:
+{ stdenv, fetchurl, makeWrapper
+, coreutils, findutils, jdk, rlwrap, clojure, gnupg }:
 
 stdenv.mkDerivation rec {
   pname = "leiningen";
-  version = "2.3.3";
+  version = "2.3.4";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
-    sha256 = "0lc5ivgknkflk6k4a4q1r8bm3kq63p4cazfs1rdb02cfhdip52hc";
+    sha256 = "1v83hpvp349pgqqiy4babc5m5b9lcwk0fif80fpv4jqvp0a8v6r7";
   };
 
   jarsrc = fetchurl {
     url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar";
-    sha256 = "1a8i0940ww7xqhwlaaavsgw8s9rjqdnv46hfsla41ns789bappxf";
+    sha256 = "1pqc99p4vz4q3qcs90cqql6m7kc27ihx4hbqs5alxkzk7jv8s2bk";
   };
 
   patches = ./lein_2.3.0.patch;
 
-  inherit rlwrap clojure gnupg;
+  inherit rlwrap clojure gnupg findutils coreutils;
 
   builder = ./builder.sh;
 
-- 
GitLab


From c7b781ca129befdda451590b291c1761402b8645 Mon Sep 17 00:00:00 2001
From: PkmX <pkmx.tw@gmail.com>
Date: Sun, 9 Feb 2014 05:20:21 +0800
Subject: [PATCH 1055/3789] Bump wqy-zenhei to 0.9.45.

---
 pkgs/data/fonts/wqy-zenhei/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix
index 960c74f6841..993e584a7d4 100644
--- a/pkgs/data/fonts/wqy-zenhei/default.nix
+++ b/pkgs/data/fonts/wqy-zenhei/default.nix
@@ -1,17 +1,20 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "wqy-zenhei-0.4.23-1";
+  name = "wqy-zenhei-${version}";
+  version = "0.9.45";
 
   src = fetchurl {
-    url = mirror://sourceforge/wqy/wqy-zenhei-0.4.23-1.tar.gz;
-    sha256 = "138nn81ai240av0xvcq4ab3rl73n0qlj3gwr3a36i63ry8vdj5qm";
+    url = "mirror://sourceforge/wqy/${name}.tar.gz";
+    sha256 = "1mkmxq8g2hjcglb3zajfqj20r4r88l78ymsp2xyl5yav8w3f7dz4";
   };
 
+  dontBuild = true;
+
   installPhase =
     ''
       mkdir -p $out/share/fonts
-      cp *.ttf $out/share/fonts
+      install -m644 *.ttc $out/share/fonts/
     '';
 
   meta = {
-- 
GitLab


From 023f30f07d927976060e5b0a7eec0699340b3ce2 Mon Sep 17 00:00:00 2001
From: PkmX <pkmx.tw@gmail.com>
Date: Sat, 8 Feb 2014 22:37:40 +0800
Subject: [PATCH 1056/3789] Add wqy-microhei font

---
 pkgs/data/fonts/wqy-microhei/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/data/fonts/wqy-microhei/default.nix

diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix
new file mode 100644
index 00000000000..fb3bbabf847
--- /dev/null
+++ b/pkgs/data/fonts/wqy-microhei/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "wqy-microhei-0.2.0-beta";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/wqy/${name}.tar.gz";
+    sha256 = "0gi1yxqph8xx869ichpzzxvx6y50wda5hi77lrpacdma4f0aq0i8";
+  };
+
+  installPhase =
+    ''
+      install -Dm644 wqy-microhei.ttc $out/share/fonts
+    '';
+
+  meta = {
+    description = "A (mainly) Chinese Unicode font";
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a51d1d33f56..5fa44337c73 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7344,6 +7344,8 @@ let
 
   vistafonts = callPackage ../data/fonts/vista-fonts { };
 
+  wqy_microhei = callPackage ../data/fonts/wqy-microhei { };
+
   wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { };
 
   xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { };
-- 
GitLab


From b95b70c7a6a21f4ec2d4d2dd684b59404c950527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 8 Feb 2014 23:05:36 +0100
Subject: [PATCH 1057/3789] firefox: whitespace change to trigger a rebuild

---
 pkgs/applications/networking/browsers/firefox/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 9869e24ce5a..3b2911a97ac 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -116,6 +116,7 @@ rec {
       for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
           wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
       done
+
       rm -f $out/bin/run-mozilla.sh
     ''; # */
 
-- 
GitLab


From ce28f1bb72c1d9942504e4b4d2a6ffcb2b7ecde1 Mon Sep 17 00:00:00 2001
From: PkmX <pkmx.tw@gmail.com>
Date: Sun, 9 Feb 2014 06:10:40 +0800
Subject: [PATCH 1058/3789] Minor fix to wqy-microhei.ttc path.

---
 pkgs/data/fonts/wqy-microhei/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix
index fb3bbabf847..97638cb008c 100644
--- a/pkgs/data/fonts/wqy-microhei/default.nix
+++ b/pkgs/data/fonts/wqy-microhei/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   installPhase =
     ''
-      install -Dm644 wqy-microhei.ttc $out/share/fonts
+      install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc
     '';
 
   meta = {
-- 
GitLab


From 3f30c971c8d65312cf0a1a18a8a804621eaae967 Mon Sep 17 00:00:00 2001
From: PkmX <pkmx.tw@gmail.com>
Date: Sun, 9 Feb 2014 04:16:43 +0800
Subject: [PATCH 1059/3789] Add haskell package 'taffybar'

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

diff --git a/pkgs/applications/misc/taffybar/default.nix b/pkgs/applications/misc/taffybar/default.nix
new file mode 100644
index 00000000000..a92e7e32f04
--- /dev/null
+++ b/pkgs/applications/misc/taffybar/default.nix
@@ -0,0 +1,25 @@
+{ cabal, cairo, dbus, dyre, filepath, gtk, gtkTraymanager
+, HStringTemplate, HTTP, mtl, network, parsec, split, stm, text
+, time, transformers, utf8String, X11, xdgBasedir, xmonad
+, xmonadContrib
+}:
+
+cabal.mkDerivation (self: {
+  pname = "taffybar";
+  version = "0.3.0";
+  sha256 = "02vpfbwfprca997ykk746ih7id0ls3i5pnb33gj3nrfgc59fkz7v";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    cairo dbus dyre filepath gtk gtkTraymanager HStringTemplate HTTP
+    mtl network parsec split stm text time transformers utf8String X11
+    xdgBasedir xmonad xmonadContrib
+  ];
+  pkgconfigDepends = [ gtk ];
+  meta = {
+    homepage = "http://github.com/travitch/taffybar";
+    description = "A desktop bar similar to xmobar, but with more GUI";
+    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 a599b48f065..1cf642539e9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2769,6 +2769,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     QuickCheck = self.QuickCheck2;
   };
 
+  taffybar = callPackage ../applications/misc/taffybar {};
+
   yi = callPackage ../applications/editors/yi/yi.nix {};
 
   yiContrib = callPackage ../applications/editors/yi/yi-contrib.nix {};
-- 
GitLab


From 807d01debd4d81b028c1b62de72c3f6a934b5d49 Mon Sep 17 00:00:00 2001
From: PkmX <pkmx.tw@gmail.com>
Date: Sun, 9 Feb 2014 04:09:04 +0800
Subject: [PATCH 1060/3789] Add Haskell package 'gtk-traymanager'

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

diff --git a/pkgs/development/libraries/haskell/gtk-traymanager/default.nix b/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
new file mode 100644
index 00000000000..8d319ee246e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
@@ -0,0 +1,15 @@
+{ cabal, glib, gtk, X11 }:
+
+cabal.mkDerivation (self: {
+  pname = "gtk-traymanager";
+  version = "0.1.3";
+  sha256 = "07671f3j3r07djgvrlpbdaqqnm2yc7sc5f5isjn5nczrwh8n0sj4";
+  buildDepends = [ glib gtk ];
+  pkgconfigDepends = [ gtk X11 ];
+  meta = {
+    homepage = "http://github.com/travitch/gtk-traymanager";
+    description = "A wrapper around the eggtraymanager library for Linux system trays";
+    license = self.stdenv.lib.licenses.lgpl21;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1cf642539e9..7bf78003777 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1216,6 +1216,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     libc = pkgs.stdenv.gcc.libc;
   };
 
+  gtkTraymanager = callPackage ../development/libraries/haskell/gtk-traymanager {};
+
   graphviz = callPackage ../development/libraries/haskell/graphviz {};
 
   groups = callPackage ../development/libraries/haskell/groups {};
-- 
GitLab


From 5b41db9765e33465988900cbb5f1aafe51bf548a Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Sun, 9 Feb 2014 11:47:30 +0800
Subject: [PATCH 1061/3789] git: update to 1.8.5.4 (close #1714)

---
 .../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 dad607c1462..d9d09def5ca 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.8.5.2";
+  version = "1.8.5.4";
 
   svn = subversionClient.override { perlBindings = true; };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "12iyj6f89dmb1cn2pvym5lrf23g4m71mp9pwkbi1zscb9d998ih2";
+    sha256 = "062z4j4hfhfdlvkxs2mzarsyvbqvfy4kv8j5h4c75ymb5yp8iklk";
   };
 
   patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
-- 
GitLab


From c3df9e21c0116eddaeff0f446d9ae005321afa44 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sun, 9 Feb 2014 12:42:26 +0100
Subject: [PATCH 1062/3789] Weechat: Update to 0.4.3

---
 pkgs/applications/networking/irc/weechat/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 01ba8c97d98..89b437acc90 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -3,12 +3,12 @@
 , pythonPackages, cacert, cmake, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.2";
+  version = "0.4.3";
   name = "weechat-${version}";
 
   src = fetchurl {
     url = "http://weechat.org/files/src/${name}.tar.gz";
-    sha256 = "03ypji34kb5yrxqyn8dbrjm3j00pc8v7wfsip7d3l63nyx79df9v";
+    sha256 = "1sfx2j8xy6das0zis2nmzi9z41q96gzq61xaw4i0xbgag17s7ddz";
   };
 
   buildInputs = 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a51d1d33f56..2302c5bb700 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9044,8 +9044,8 @@ let
   };
 
   weechat = callPackage ../applications/networking/irc/weechat {
-    # weechat crashes on /exit when using gnutls 3.1.x. gnutls 3.2.x works.
-    gnutls = gnutls32;
+    # weechat doesn't exit with gnutls32. Use 3.1 for now.
+    gnutls = gnutls31;
   };
 
   weston = callPackage ../applications/window-managers/weston { };
-- 
GitLab


From de6222577a547d233cf8f000d60130a323db2b63 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sun, 9 Feb 2014 12:26:16 +0000
Subject: [PATCH 1063/3789] haskellPackages.jsonAssertions: New expression

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

diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix
new file mode 100644
index 00000000000..8797ca90029
--- /dev/null
+++ b/pkgs/development/libraries/haskell/json-assertions/default.nix
@@ -0,0 +1,15 @@
+{ cabal, aeson, indexed, indexedFree, lens, text }:
+
+cabal.mkDerivation (self: {
+  pname = "json-assertions";
+  version = "1.0.1";
+  sha256 = "0rpj300knyk602wqkqipmy54xv3pn20cd06sa8irkf2wz0xribzm";
+  buildDepends = [ aeson indexed indexedFree lens text ];
+  meta = {
+    homepage = "http://github.com/ocharles/json-assertions.git";
+    description = "Test that your (Aeson) JSON encoding matches your expectations";
+    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 a599b48f065..89de24234d1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1508,6 +1508,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   json = callPackage ../development/libraries/haskell/json {};
 
+  jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {
+    aeson = self.aeson_0_7_0_0;
+    lens = self.lens_4_0_1;
+  };
+
   jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
 
   kansasLava = callPackage ../development/libraries/haskell/kansas-lava {};
-- 
GitLab


From cf5513f2409ae0cd46a69f3dcc65e880305c8ed5 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sun, 9 Feb 2014 12:12:31 +0000
Subject: [PATCH 1064/3789] haskellPackages.diff3: New expression

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

diff --git a/pkgs/development/libraries/haskell/diff3/default.nix b/pkgs/development/libraries/haskell/diff3/default.nix
new file mode 100644
index 00000000000..60f27e89d58
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diff3/default.nix
@@ -0,0 +1,19 @@
+{ cabal, Diff, QuickCheck, testFramework, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "diff3";
+  version = "0.2.0.3";
+  sha256 = "0zdfn1jhsq8pd23qpkhzr8wgiwbazfbq688bjnpc406i7gq88k78";
+  buildDepends = [ Diff ];
+  testDepends = [
+    QuickCheck testFramework testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "http://github.com/ocharles/diff3.git";
+    description = "Perform a 3-way difference of documents";
+    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 a599b48f065..0d457bbbb51 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -944,6 +944,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   Diff = callPackage ../development/libraries/haskell/Diff {};
 
+  diff3 = callPackage ../development/libraries/haskell/diff3 {};
+
   digest = callPackage ../development/libraries/haskell/digest {
     inherit (pkgs) zlib;
   };
-- 
GitLab


From cba2444d11ca4d2a8a335a752568c5fe09a90390 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 21 Jan 2014 17:25:49 +0100
Subject: [PATCH 1065/3789] nixos/memtest: Allow user to specify memtest86 boot
 parameters

---
 .../installer/cd-dvd/installation-cd-base.nix |  2 +-
 .../system/boot/loader/grub/memtest.nix       | 41 +++++++++++++++----
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index 2a28131c28c..07c054b391a 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -36,7 +36,7 @@ with pkgs.lib;
   isoImage.makeEfiBootable = true;
 
   # Add Memtest86+ to the CD.
-  boot.loader.grub.memtest86 = true;
+  boot.loader.grub.memtest86.enable = true;
 
   # Get a console as soon as the initrd loads fbcon on EFI boot
   boot.initrd.kernelModules = [ "fbcon" ];
diff --git a/nixos/modules/system/boot/loader/grub/memtest.nix b/nixos/modules/system/boot/loader/grub/memtest.nix
index 80c1a160cfd..3745b405712 100644
--- a/nixos/modules/system/boot/loader/grub/memtest.nix
+++ b/nixos/modules/system/boot/loader/grub/memtest.nix
@@ -6,28 +6,51 @@ with pkgs.lib;
 
 let
   memtest86 = pkgs.memtest86plus;
+  cfg = config.boot.loader.grub.memtest86;
+  params = concatStringsSep " " cfg.params;
 in
 
 {
   options = {
 
-    boot.loader.grub.memtest86 = mkOption {
-      default = false;
-      type = types.bool;
-      description = ''
-        Make Memtest86+, a memory testing program, available from the
-        GRUB boot menu.
-      '';
+    boot.loader.grub.memtest86 = {
+
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Make Memtest86+, a memory testing program, available from the
+          GRUB boot menu.
+        '';
+      };
+
+      params = mkOption {
+        default = [];
+        example = [ "console=ttyS0,115200" ];
+        type = types.listOf types.str;
+        description = ''
+          Parameters added to the Memtest86+ command line. As of memtest86+ 5.01
+          the following list of (apparently undocumented) parameters are
+          accepted:
+            console=... -- set up a serial console.
+            btrace      -- enable boot trace.
+            maxcpus=... -- limit number of CPUs.
+            onepass     -- run one pass and exit if there are no errors.
+            tstlist=... -- list of tests to run.
+            cpumask=... -- set a CPU mask, to select CPUs to use for testing.
+        '';
+      };
+
     };
   };
 
-  config = mkIf config.boot.loader.grub.memtest86 {
+  config = mkIf cfg.enable {
 
     boot.loader.grub.extraEntries =
       if config.boot.loader.grub.version == 2 then
         ''
           menuentry "Memtest86+" {
-            linux16 @bootRoot@/memtest.bin
+            linux16 @bootRoot@/memtest.bin ${params}
           }
         ''
       else
-- 
GitLab


From 48851fa749d634d68eaaa0dcd6c4041615b6c0f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 9 Feb 2014 13:43:12 +0100
Subject: [PATCH 1066/3789] nixos/memtest: use docbook formatting

Without this the HTML manual and manpage is quite unreadable (newlines
are squashed so it doesn't look like a list anymore).

(Unfortunately, this makes the source unreadable.)
---
 .../system/boot/loader/grub/memtest.nix       | 44 ++++++++++++++++---
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/memtest.nix b/nixos/modules/system/boot/loader/grub/memtest.nix
index 3745b405712..2461d1f80c7 100644
--- a/nixos/modules/system/boot/loader/grub/memtest.nix
+++ b/nixos/modules/system/boot/loader/grub/memtest.nix
@@ -32,12 +32,44 @@ in
           Parameters added to the Memtest86+ command line. As of memtest86+ 5.01
           the following list of (apparently undocumented) parameters are
           accepted:
-            console=... -- set up a serial console.
-            btrace      -- enable boot trace.
-            maxcpus=... -- limit number of CPUs.
-            onepass     -- run one pass and exit if there are no errors.
-            tstlist=... -- list of tests to run.
-            cpumask=... -- set a CPU mask, to select CPUs to use for testing.
+
+          <itemizedlist>
+
+          <listitem>
+            <para><literal>console=...</literal>, set up a serial console.
+            Examples:
+            <literal>console=ttyS0</literal>,
+            <literal>console=ttyS0,9600</literal> or
+            <literal>console=ttyS0,115200n8</literal>.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>btrace</literal>, enable boot trace.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>maxcpus=N</literal>, limit number of CPUs.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>onepass</literal>, run one pass and exit if there
+            are no errors.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>tstlist=...</literal>, list of tests to run.
+            Example: <literal>0,1,2</literal>.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>cpumask=...</literal>, set a CPU mask, to select CPUs
+            to use for testing.</para>
+          </listitem>
+
+          </itemizedlist>
+
+          This list of command line options was obtained by reading the
+          Memtest86+ source code.
         '';
       };
 
-- 
GitLab


From fe38031168620d0bc30c0b79f464f3c04c99f9d1 Mon Sep 17 00:00:00 2001
From: Tomasz Kontusz <tomasz.kontusz@gmail.com>
Date: Sat, 8 Feb 2014 19:47:51 +0100
Subject: [PATCH 1067/3789] Upgrade bumblebee and add nixos module

 * Bump bumblebee to 3.2.1
 * Remove config.patch - options it added can be passed to ./configure now
 * Remove the provided xorg.conf
   Provided xorg.conf was causing problems for some users,
   and Bumblebee provides its own default configuration anyway.
 * Make secondary X11 log to /var/log/X.bumblebee.log
 * Add a module for bumblebee
---
 nixos/modules/hardware/video/bumblebee.nix | 41 +++++++++++++++
 nixos/modules/module-list.nix              |  1 +
 pkgs/tools/X11/bumblebee/config.patch      | 30 -----------
 pkgs/tools/X11/bumblebee/default.nix       | 59 +++++-----------------
 pkgs/tools/X11/bumblebee/xopts.patch       |  2 +-
 pkgs/tools/X11/bumblebee/xorg.conf.nvidia  | 49 ------------------
 6 files changed, 57 insertions(+), 125 deletions(-)
 create mode 100644 nixos/modules/hardware/video/bumblebee.nix
 delete mode 100644 pkgs/tools/X11/bumblebee/config.patch
 delete mode 100644 pkgs/tools/X11/bumblebee/xorg.conf.nvidia

diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix
new file mode 100644
index 00000000000..504da2cde85
--- /dev/null
+++ b/nixos/modules/hardware/video/bumblebee.nix
@@ -0,0 +1,41 @@
+{ config, pkgs, ... }:
+
+let kernel = config.boot.kernelPackages; in
+with pkgs.lib;
+
+{
+
+  options = {
+    hardware.bumblebee.enable = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Enable the bumblebee daemon to manage Optimus hybrid video cards.
+        This should power off secondary GPU until its use is requested
+        by running an application with optirun.
+
+        Only nvidia driver is supported so far.
+      '';
+    };
+  };
+
+  config = mkIf config.hardware.bumblebee.enable {
+    boot.blacklistedKernelModules = [ "nouveau" "nvidia" ];
+    boot.kernelModules = [ "bbswitch" ];
+    boot.extraModulePackages = [ kernel.bbswitch kernel.nvidia_x11 ];
+
+    environment.systemPackages = [ pkgs.bumblebee ];
+
+    systemd.services.bumblebeed = {
+      description = "Bumblebee Hybrid Graphics Switcher";
+      wantedBy = [ "display-manager.service" ];
+      script = "bumblebeed --use-syslog";
+      path = [ kernel.bbswitch pkgs.bumblebee ];
+      serviceConfig = {
+        Restart = "always";
+        RestartSec = 60;
+        CPUSchedulingPolicy = "idle";
+      };
+    };
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5d52f71c9ff..c66cccb3975 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -31,6 +31,7 @@
   ./hardware/network/rtl8192c.nix
   ./hardware/opengl.nix
   ./hardware/pcmcia.nix
+  ./hardware/video/bumblebee.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
   ./misc/assertions.nix
diff --git a/pkgs/tools/X11/bumblebee/config.patch b/pkgs/tools/X11/bumblebee/config.patch
deleted file mode 100644
index 61b671f80c1..00000000000
--- a/pkgs/tools/X11/bumblebee/config.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- bumblebee-3.0/src/driver.c.orig	2012-02-03 14:51:10.282464426 +0100
-+++ bumblebee-3.0/src/driver.c	2012-02-04 22:26:02.715498536 +0100
-@@ -23,6 +23,7 @@
- #include "module.h"
- #include "bblogger.h"
- #include "driver.h"
-+#include <stdlib.h>
- 
- /**
-  * Check what drivers are available and autodetect if possible. Driver, module
-@@ -30,6 +31,7 @@
-  */
- void driver_detect(void) {
-   /* determine driver to be used */
-+  set_string_value(&bb_config.driver, getenv("BUMBLEBEE_DRIVER"));
-   if (*bb_config.driver) {
-     bb_log(LOG_DEBUG, "Skipping auto-detection, using configured driver"
-             " '%s'\n", bb_config.driver);
-@@ -65,8 +67,8 @@
-     }
-   }
- 
--  if (strcmp(bb_config.driver, "nvidia")) {
--    set_string_value(&bb_config.ld_path, CONF_LDPATH_NVIDIA);
--    set_string_value(&bb_config.mod_path, CONF_MODPATH_NVIDIA);
-+  if (!strcmp(bb_config.driver, "nvidia")) {
-+    set_string_value(&bb_config.ld_path, getenv("BUMBLEBEE_LDPATH_NVIDIA"));
-+    set_string_value(&bb_config.mod_path, getenv("BUMBLEBEE_MODPATH_NVIDIA"));
-   }
- }
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index 74e3e7b1f82..58db0c13abb 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -8,19 +8,7 @@
 
 # To test: make sure that the 'bbswitch' kernel module is installed,
 # then run 'bumblebeed' as root and 'optirun glxgears' as user.
-# To use at startup, add e.g. to configuration.nix:
-# jobs = {
-#   bumblebeed = {
-#     name = "bumblebeed";
-#     description = "Manages the Optimus video card";
-#     startOn = "started udev and started syslogd";
-#     stopOn = "starting shutdown";
-#     exec = "bumblebeed --use-syslog";
-#     path = [ pkgs.bumblebee ];
-#     environment = { MODULE_DIR = "${config.system.modulesTree}/lib/modules"; };
-#     respawn = true;
-#   };
-# };
+# To use at startup, see hardware.bumblebee options.
 
 # This nix expression supports for now only the native nvidia driver.
 # It should not be hard to generalize this approach to support the
@@ -34,7 +22,7 @@
 }:
 
 let
-  version = "3.0";
+  version = "3.2.1";
   name = "bumblebee-${version}";
 
   # isolated X11 environment with the nvidia module
@@ -61,22 +49,15 @@ let
     ignoreCollisions = true;
   };
 
-  # Custom X11 configuration for the additional xserver instance.
-  xorgConf = ./xorg.conf.nvidia;
-
 in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "http://github.com/downloads/Bumblebee-Project/Bumblebee/${name}.tar.gz";
-    sha256 = "a27ddb77b282ac8b972857fdb0dc5061cf0a0982b7ac3e1cfa698b4f786e49a1";
+    url = "http://bumblebee-project.org/${name}.tar.gz";
+    sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h";
   };
 
-  # 'config.patch' makes bumblebee read the active module and the nvidia configuration
-  # from the environment variables instead of the config file:
-  #   BUMBLEBEE_DRIVER, BUMBLEBEE_LDPATH_NVIDIA, BUMBLEBEE_MODPATH_NVIDIA
-  # These variables must be set when bumblebeed and optirun are executed.
-  patches = [ ./config.patch ./xopts.patch ];
+  patches = [ ./xopts.patch ];
 
   preConfigure = ''
     # Substitute the path to the actual modinfo program in module.c.
@@ -88,32 +69,25 @@ in stdenv.mkDerivation {
     # Don't use a special group, just reuse wheel.
     substituteInPlace configure \
       --replace 'CONF_GID="bumblebee"' 'CONF_GID="wheel"'
-
-    # Ensures that the config file ends up with a nonempty
-    # name of the nvidia module. This is needed, because the
-    # configuration handling code otherwise resets the
-    # data that we obtained from the environment (see config.patch)
-    export CONF_DRIVER_MODULE_NVIDIA=nvidia
   '';
 
   # Build-time dependencies of bumblebeed and optirun.
   # Note that it has several runtime dependencies.
   buildInputs = [ stdenv makeWrapper pkgconfig help2man libX11 glib libbsd ];
 
+  configureFlags = [
+    "--with-udev-rules=$out/lib/udev/rules.d"
+    "CONF_DRIVER=nvidia"
+    "CONF_DRIVER_MODULE_NVIDIA=nvidia"
+    "CONF_LDPATH_NVIDIA=${commonEnv}/lib"
+    "CONF_MODPATH_NVIDIA=${commonEnv}/lib/xorg/modules"
+  ];
+
   # create a wrapper environment for bumblebeed and optirun
   postInstall = ''
-    # remove some entries from the configuration file that would otherwise
-    # cause our environment variables to be ignored.
-    substituteInPlace "$out/etc/bumblebee/bumblebee.conf" \
-      --replace "LibraryPath=" "" \
-      --replace "XorgModulePath=" ""
-
     wrapProgram "$out/sbin/bumblebeed" \
       --prefix PATH : "${commonEnv}/sbin:${commonEnv}/bin:\$PATH" \
       --prefix LD_LIBRARY_PATH : "${commonEnv}/lib:\$LD_LIBRARY_PATH" \
-      --set BUMBLEBEE_DRIVER "nvidia" \
-      --set BUMBLEBEE_LDPATH_NVIDIA "${commonEnv}/lib" \
-      --set BUMBLEBEE_MODPATH_NVIDIA "${commonEnv}/lib/xorg/modules" \
       --set FONTCONFIG_FILE "/etc/fonts/fonts.conf" \
       --set XKB_BINDIR "${xorg.xkbcomp}/bin" \
       --set XKB_DIR "${xkeyboard_config}/etc/X11/xkb"
@@ -121,16 +95,11 @@ in stdenv.mkDerivation {
     wrapProgram "$out/bin/optirun" \
       --prefix PATH : "${commonEnv}/sbin:${commonEnv}/bin" \
       --prefix LD_LIBRARY_PATH : "${commonEnv}/lib" \
-      --set BUMBLEBEE_DRIVER "nvidia" \
-      --set BUMBLEBEE_LDPATH_NVIDIA "${commonEnv}/lib" \
-      --set BUMBLEBEE_MODPATH_NVIDIA "${commonEnv}/lib/xorg/modules"
-
-    cp ${xorgConf} "$out/etc/bumblebee/xorg.conf.nvidia"
   '';
 
   meta = {
     homepage = http://github.com/Bumblebee-Project/Bumblebee;
     description = "Daemon for managing Optimus videocards (power-on/off, spawns xservers)";
-    license = "free";
+    license = stdenv.lib.licenses.gpl3;
   };
 }
diff --git a/pkgs/tools/X11/bumblebee/xopts.patch b/pkgs/tools/X11/bumblebee/xopts.patch
index 9e44a8e9fd1..f24b2a20562 100644
--- a/pkgs/tools/X11/bumblebee/xopts.patch
+++ b/pkgs/tools/X11/bumblebee/xopts.patch
@@ -5,7 +5,7 @@
        "-nolisten", "tcp",
        "-noreset",
 +      "-xkbdir", getenv("XKB_DIR"),
-+      "-logfile", "/dev/null",
++      "-logfile", "/var/log/X.bumblebee.log",
        "-verbose", "3",
        "-isolateDevice", pci_id,
        "-modulepath",
diff --git a/pkgs/tools/X11/bumblebee/xorg.conf.nvidia b/pkgs/tools/X11/bumblebee/xorg.conf.nvidia
deleted file mode 100644
index 31c417d6971..00000000000
--- a/pkgs/tools/X11/bumblebee/xorg.conf.nvidia
+++ /dev/null
@@ -1,49 +0,0 @@
-Section "DRI"
-    Mode 0666
-EndSection
-
-Section "ServerLayout"
-    Identifier "Layout0"
-    Screen "Screen1"
-    Option "AutoAddDevices" "false"
-EndSection
-
-Section "Module"
-    Load "dbe"
-    Load "extmod"
-    Load "glx"
-    Load "record"
-    Load "freetype"
-    Load "type1"
-EndSection
-
-Section "Files"
-EndSection
-
-Section "Device"
-    Identifier "Device1"
-    Driver "nvidia"
-    VendorName "NVIDIA Corporation"
-    Option "NoLogo" "true"
-    Option "UseEDID" "false"
-    Option "ConnectedMonitor" "CRT-0"
-EndSection
-
-Section "Screen"
-    Identifier "Screen1"
-    Device "Device1"
-    Monitor "Monitor0"
-    DefaultDepth 24
-    SubSection "Display"
-        Depth 24
-    EndSubSection
-EndSection
-
-Section "Extensions"
-    Option "Composite" "Enable"
-EndSection
-
-Section "Monitor"
-    Identifier "Monitor0"
-    Option "DPMS"
-EndSection
-- 
GitLab


From 52e99bc723cd7b481d3f66612e518fd88a3c54df Mon Sep 17 00:00:00 2001
From: Artyom Shalkhakov <artyom.shalkhakov@gmail.com>
Date: Sun, 9 Feb 2014 16:26:46 +0100
Subject: [PATCH 1068/3789] Bumping ATS/Postiats version to 0.0.5.

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

diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index 0f46b7aeb6d..ae9a202a529 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gmp }:
 
-let version = "0.0.3"; in stdenv.mkDerivation {
+let version = "0.0.5"; in stdenv.mkDerivation {
   name = "ats2-postiats-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "0hq63zrmm92j5ffnsmylhhllm8kgjpjkaj4xvzz1zlshz39lijxp";
+    sha256 = "1rzcqc7fwqf0y4cc14lr282r25s66jygf6cxrnf5l8p5p550l0dl";
   };
 
   buildInputs = [ gmp ];
-- 
GitLab


From 258c7536be8f74242f29b012dd1f1094cdd36fb7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 9 Feb 2014 11:59:02 -0500
Subject: [PATCH 1069/3789] Force a rebuild

---
 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 564792a1a9d..b32012ea034 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -252,9 +252,9 @@ in {
         ''
           $machine->succeed(
               "parted /dev/vda mklabel msdos",
-              "parted /dev/vda -- mkpart primary 1M 2048M", # first PV
+              "parted /dev/vda -- mkpart primary 1M 2048M", # PV1
               "parted /dev/vda -- set 1 lvm on",
-              "parted /dev/vda -- mkpart primary 2048M -1s", # second PV
+              "parted /dev/vda -- mkpart primary 2048M -1s", # PV2
               "parted /dev/vda -- set 2 lvm on",
               "udevadm settle",
               "pvcreate /dev/vda1 /dev/vda2",
-- 
GitLab


From 0f79534aa72807c86c96604e875a50ab2f997401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 9 Feb 2014 23:52:59 +0100
Subject: [PATCH 1070/3789] spring: use wrapper to set gcc lib path

---
 pkgs/games/spring/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index b073aa3488b..9de55a24312 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip, glibc
+{ stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip
 , openal, libvorbis, glew, freetype, xlibs, SDL, mesa, binutils
-, asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl
+, asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper
 , jdk ? null, python ? null
 , withAI ? true # support for AI Interfaces and Skirmish AIs
 }:
@@ -17,10 +17,10 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON"
                 "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
-                "-DPREFER_STATIC_LIBS=OFF"];
+                "-DPREFER_STATIC_LIBS:BOOL=OFF"];
 
-  buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL glibc
-    xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl
+  buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL stdenv.glibc 
+    xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper
     docbook_xsl_ns ]
     ++ stdenv.lib.optional withAI jdk
     ++ stdenv.lib.optional withAI python;
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
   # reported upstream http://springrts.com/mantis/view.php?id=4305
   #enableParallelBuilding = true; # occasionally missing generated files on Hydra
 
+  postInstall = ''
+    wrapProgram "$out/bin/spring" \
+      --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib"
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://springrts.com/;
     description = "A powerful real-time strategy (RTS) game engine";
-- 
GitLab


From 8e9f61995ebd6b272dd338d671bb5db2cc26b751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 10 Feb 2014 09:41:30 +0100
Subject: [PATCH 1071/3789] spring: don't pass glibc

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

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 9de55a24312..f9d380d9cd5 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
                 "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
                 "-DPREFER_STATIC_LIBS:BOOL=OFF"];
 
-  buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL stdenv.glibc 
+  buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL 
     xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper
     docbook_xsl_ns ]
     ++ stdenv.lib.optional withAI jdk
-- 
GitLab


From e5124e7a0ea5514b9fa4334cd4fa474331f6e300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 10 Feb 2014 14:18:58 +0100
Subject: [PATCH 1072/3789] springlobby: specify spring run-time dependency
 paths

---
 pkgs/games/spring/springlobby.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index f522eef8eb9..34760db7c68 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, wxGTK, openal, pkgconfig, curl, libtorrentRasterbar, libpng, libX11
-, gettext, bash, gawk, boost, libnotify, gtk, doxygen }:
+, gettext, bash, gawk, boost, libnotify, gtk, doxygen, spring, makeWrapper }:
 stdenv.mkDerivation rec {
 
   name = "springlobby-${version}";
@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost libpng libX11
-    libnotify gtk doxygen
+    libnotify gtk doxygen makeWrapper
   ];
 
+  patches = [ ./unitsync_path_find.patch ];
+
   prePatch = ''
     substituteInPlace tools/regen_config_header.sh --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace tools/test-susynclib.awk --replace "#!/usr/bin/awk" "#!${gawk}/bin/awk"
@@ -26,13 +28,17 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  #buildPhase = "make VERBOSE=1";
+  postInstall = ''
+    wrapProgram $out/bin/springlobby \
+      --prefix PATH : "${spring}/bin" \
+      --set SPRING_LIB_DIRS "${spring}/lib"
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://springlobby.info/;
     description = "Cross-platform lobby client for the Spring RTS project";
     license = licenses.gpl2;
-    maintainers = [ maintainers.phreedom maintainers.qknight];
+    maintainers = [ maintainers.phreedom maintainers.qknight maintainers.iElectric ];
     platforms = platforms.linux;
   };
 }
-- 
GitLab


From e5017d8239f39308c897eadf1d7de8371f5ea55b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 10 Feb 2014 14:21:42 +0100
Subject: [PATCH 1073/3789] springlobby: add unitsync patch

---
 pkgs/games/spring/unitsync_path_find.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 pkgs/games/spring/unitsync_path_find.patch

diff --git a/pkgs/games/spring/unitsync_path_find.patch b/pkgs/games/spring/unitsync_path_find.patch
new file mode 100644
index 00000000000..66257a5f52f
--- /dev/null
+++ b/pkgs/games/spring/unitsync_path_find.patch
@@ -0,0 +1,10 @@
+--- a/src/settings.cpp	2013-12-02 10:09:19.000000000 +0000
++++ b/src/settings.cpp-new	2014-02-10 11:39:48.265628767 +0000
+@@ -498,6 +498,7 @@
+ 
+ wxString Settings::AutoFindUnitSync(wxPathList pl) const
+ {
++	pl.AddEnvList( _T( "SPRING_LIB_DIRS" ) );
+ 	wxString retpath = pl.FindValidPath( _T( "unitsync" ) + GetLibExtension() );
+ 	if ( retpath.IsEmpty() )
+ 		retpath = pl.FindValidPath( _T( "libunitsync" ) + GetLibExtension() );
-- 
GitLab


From 42df6fcee920248a1a39b42f914705e32791bd0e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 10 Feb 2014 08:56:16 -0500
Subject: [PATCH 1074/3789] mediawiki: Run update script after initializing the
 database

---
 nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index 423087991e1..a310884525a 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -290,6 +290,7 @@ in
             echo COMMIT
           ) | ${pkgs.postgresql}/bin/psql -U "${config.dbUser}" "${config.dbName}"
       fi
+      ${php}/bin/php ${mediawikiRoot}/maintenance/update.php
     '');
 
   robotsEntries = optionalString (config.articleUrlPrefix != "")
-- 
GitLab


From 6a8cc9ab11765d101023076f022e8682d40ad7f0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 10 Feb 2014 09:14:30 -0500
Subject: [PATCH 1075/3789] mediawiki: Fix some references to /bin/bash

---
 nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index a310884525a..af2e2cae797 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -93,6 +93,10 @@ let
         ensureDir $out
         cp -r * $out
         cp ${mediawikiConfig} $out/LocalSettings.php
+        sed -i 's|/bin/bash|${pkgs.stdenv.shell}|' \
+          $out/maintenance/fuzz-tester.php \
+          $out/bin/ulimit.sh \
+          $out/includes/GlobalFunctions.php
       '';
   };
 
-- 
GitLab


From 3dc6168b317fb3923f2ae073575a8582d01d3ba9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 10 Feb 2014 08:15:24 -0600
Subject: [PATCH 1076/3789] Properly escape passwords sent to chpasswd

The mutableUsers feature uses `chpasswd` to set users passwords.
Passwords and their hashes were being piped into the program using
double quotes ("") to escape. This causes any `$` characters to be
expanded as shell variables. This is a serious problem because all the
password hash methods besides DES use multiple `$` in the hashes. Single
quotes ('') should be used instead to prevent shell variable expansion.
---
 nixos/modules/config/users-groups.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index f70e8c292c4..09e7fc53c76 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -411,13 +411,13 @@ in
           if [ "$setpw" == "yes" ]; then
             ${if !(isNull u.hashedPassword)
               then ''
-                echo "${u.name}:${u.hashedPassword}" | \
+                echo '${u.name}:${u.hashedPassword}' | \
                   ${pkgs.shadow}/sbin/chpasswd -e''
               else if u.password == ""
               then "passwd -d '${u.name}' &>/dev/null"
               else if !(isNull u.password)
               then ''
-                echo "${u.name}:${u.password}" | ${pkgs.shadow}/sbin/chpasswd''
+                echo '${u.name}:${u.password}' | ${pkgs.shadow}/sbin/chpasswd''
               else if !(isNull u.passwordFile)
               then ''
                 echo -n "${u.name}:" | cat - "${u.passwordFile}" | \
-- 
GitLab


From 80cc2697b147c63300e4dd09f2790dee78220d5f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 10 Feb 2014 10:12:34 -0500
Subject: [PATCH 1077/3789] user-groups: Sidestep all password escaping issues

Now passwords are written to a file first
---
 nixos/modules/config/users-groups.nix | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 09e7fc53c76..a0fd99732bd 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -403,24 +403,21 @@ in
       let
         mkhomeUsers = filterAttrs (n: u: u.createHome) cfg.extraUsers;
         setpwUsers = filterAttrs (n: u: u.createUser) cfg.extraUsers;
+        pwFile = u: if !(isNull u.hashedPassword)
+          then pkgs.writeTextFile { name = "password-file"; text = u.hashedPassword; }
+          else if !(isNull u.password)
+          then pkgs.runCommand "password-file" { pw = u.password; } ''
+            echo -n "$pw" | ${pkgs.mkpasswd}/bin/mkpasswd -s > $out
+          '' else u.passwordFile;
         setpw = n: u: ''
           setpw=yes
           ${optionalString cfg.mutableUsers ''
             test "$(getent shadow '${u.name}' | cut -d: -f2)" != "x" && setpw=no
           ''}
           if [ "$setpw" == "yes" ]; then
-            ${if !(isNull u.hashedPassword)
+            ${if !(isNull (pwFile u))
               then ''
-                echo '${u.name}:${u.hashedPassword}' | \
-                  ${pkgs.shadow}/sbin/chpasswd -e''
-              else if u.password == ""
-              then "passwd -d '${u.name}' &>/dev/null"
-              else if !(isNull u.password)
-              then ''
-                echo '${u.name}:${u.password}' | ${pkgs.shadow}/sbin/chpasswd''
-              else if !(isNull u.passwordFile)
-              then ''
-                echo -n "${u.name}:" | cat - "${u.passwordFile}" | \
+                echo -n "${u.name}:" | cat - "${pwFile u}" | \
                   ${pkgs.shadow}/sbin/chpasswd -e
               ''
               else "passwd -l '${u.name}' &>/dev/null"
-- 
GitLab


From 00b1461e4fdf968948491930aed4ec79a79b1100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Mon, 10 Feb 2014 16:41:09 +0100
Subject: [PATCH 1078/3789] ATI-driver: the hash has changed, reported by:
 @ikervagyok

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

diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index 518ca784d4a..0aa67dba237 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip;
-    sha256 = "1jm0c4rqyjjhyj8a7axf4hz16bcvy8yhnkn45wc2l73xhks36h02";
+    sha256 = "1c3fn328340by4qn99dgfj8c2q34fxdb2alcak0vnyc6bw7l5sms";
     curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64";
   };
 
-- 
GitLab


From e9a894a97ddee892fe85a87851424a202198508d Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 10 Feb 2014 17:34:35 +0100
Subject: [PATCH 1079/3789] Revert "Update hipchat"

This reverts commit 54288f5cfe4e48779d7c08abefa8cbb23d58e58a.
---
 .../instant-messengers/hipchat/default.nix    | 47 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index c7ea2d135d5..c0f76602b2b 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -1,12 +1,21 @@
-{ stdenv, fetchurl, libtool, libXext, libSM, libICE, libX11, libXft, libXau, libXdmcp, libXrender
-, libxcb, libXfixes, libXcomposite, libXi, dbus, freetype, fontconfig, openssl, zlib, mesa
-, libxslt, libxml2
+{ stdenv
+, fetchurl
+, libtool
+, libXext
+, libSM
+, libICE
+, libX11
+, libXft
+, libXau
+, libXdmcp
+, libXrender
+, freetype
+, fontconfig
+, openssl
 }:
 
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; 
-
 let
-  version = "2.1.982";
+  version = "1.94.407";
 
   rpath = stdenv.lib.makeSearchPath "lib" [
     stdenv.glibc
@@ -20,29 +29,15 @@ let
     libXau
     libXdmcp
     libXrender
-    libxcb
-    libXfixes
-    libXcomposite
-    libXi
-    dbus
     freetype
     fontconfig
     openssl
-    zlib
-    mesa
-    libxslt
-    libxml2
   ];
 
-  src = 
-    if stdenv.system == "i686-linux" then fetchurl {
-      url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz";
-      sha256 = "1i60fkl5hdx2p2yfsx9w8qkzn6hl8fajvfls0r0gc2bqc9whg6vn";
-    } else fetchurl {
-      url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz";
-      sha256 = "12bn4la9z1grkbcnixjwhadgxa2g6qkd5x7r3l3vn1sdalgal4ks";
-    };
-
+  src = fetchurl {
+    url = "http://downloads.hipchat.com/linux/arch/hipchat-${version}-i686.pkg.tar.xz";
+    sha256 = "0kyjpa2ir066zqkvs1zmnx6kvl8v4jfl8h7bw110cgigwmiplk7k";
+  };
 in stdenv.mkDerivation {
   name = "hipchat-${version}";
 
@@ -54,8 +49,8 @@ in stdenv.mkDerivation {
     mv usr/share $out
     patchShebangs $out/bin
     for file in $(find $out/lib -type f); do
-        patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $file || true
-        patchelf --set-rpath ${rpath}:${stdenv.lib.optionalString stdenv.is64bit "${stdenv.gcc.gcc}/lib64:"}$out/lib $file || true
+        patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $file || true
+        patchelf --set-rpath ${rpath}:$out/lib $file || true
     done
     substituteInPlace $out/share/applications/hipchat.desktop \
       --replace /opt/HipChat/bin $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2302c5bb700..8d657ed4435 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8120,7 +8120,7 @@ let
 
   hexedit = callPackage ../applications/editors/hexedit { };
 
-  hipchat = callPackage ../applications/networking/instant-messengers/hipchat { };
+  hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { };
 
   homebank = callPackage ../applications/office/homebank { };
 
-- 
GitLab


From 3269027235e562ecb73264b708af48a79149b891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 10 Feb 2014 18:40:18 +0100
Subject: [PATCH 1080/3789] thunderbird: simple esr bump (Nov 2013), incl. CVE

I failed to make -26 build, so this will get security fixes at least.
---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 08758c55a4e..3a8dab10ff2 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -12,14 +12,14 @@
   enableOfficialBranding ? false
 }:
 
-let version = "17.0.8"; in
+let version = "17.0.11esr"; in
 
 stdenv.mkDerivation {
   name = "thunderbird-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
-    sha1 = "4bcbb33f0b3ea050e805723680b5669d80438812";
+    sha256 = "1m2lph8x82kgxqzlyaxr1l1x7s4qnqfzfnqck4b777914mrv1mdp";
   };
 
   #enableParallelBuilding = true;
-- 
GitLab


From 159144c1e9dfdf98cab00e8756b1f3fbcad5566c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 10 Feb 2014 19:01:37 +0100
Subject: [PATCH 1081/3789] libpng(_apng): maintenance update 1.6.8 -> .9

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

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index f120bca50c6..c1655bf7f2b 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,11 +3,11 @@
 assert zlib != null;
 
 let
-  version = "1.6.8";
-  sha256 = "109h2fcjspd792lvh5q4xnkpsv7rjczmrdl15i4ajx0xbs5kvxr4";
+  version = "1.6.9";
+  sha256 = "0ji7488fp08b3xa6605zzghzpxawkhhg6jbqzrdw2y38zrvadqzx";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
-    sha256 = "0wysnv0d8h7pyz7gfagnkwra2k7malqga1cn6wbk2l7a8k2r53qi";
+    sha256 = "0l61y6b03avyxrx8c72x8m73j3b8mj0wx80wdl6w82wgnr2fw4x1";
   };
   whenPatched = stdenv.lib.optionalString apngSupport;
 
-- 
GitLab


From 74c34763e77a1c7f7b6729a17e798c123ccd00ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 10 Feb 2014 19:08:42 +0100
Subject: [PATCH 1082/3789] gdk_pixbuf: bugfix update 2.30.3 -> .4

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

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 50bab580ebf..7a06f08aea6 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -3,14 +3,14 @@
 
 let
   ver_maj = "2.30";
-  ver_min = "3";
+  ver_min = "4";
 in
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "1524ayaahni9svn88k8ar0906xyvp6j90dmm22aangjpb4zwaaf2";
+    sha256 = "0ldhpdalbyi6q5k1dz498i9hqcsd51yxq0f91ck9p0h4v38blfx1";
   };
 
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
-- 
GitLab


From 334a911ace888ae82d0c34b99c237f6f0632ff8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 10 Feb 2014 19:24:25 +0100
Subject: [PATCH 1083/3789] libyaml: minor update 0.1.4 -> .5

The CVE patches are in the release now.
---
 .../libraries/libyaml/cve-2013-6393_a.patch   |  11 --
 .../libraries/libyaml/cve-2013-6393_b.patch   |  16 ---
 .../libraries/libyaml/cve-2013-6393_c.patch   | 131 ------------------
 .../development/libraries/libyaml/default.nix |  19 ++-
 4 files changed, 9 insertions(+), 168 deletions(-)
 delete mode 100644 pkgs/development/libraries/libyaml/cve-2013-6393_a.patch
 delete mode 100644 pkgs/development/libraries/libyaml/cve-2013-6393_b.patch
 delete mode 100644 pkgs/development/libraries/libyaml/cve-2013-6393_c.patch

diff --git a/pkgs/development/libraries/libyaml/cve-2013-6393_a.patch b/pkgs/development/libraries/libyaml/cve-2013-6393_a.patch
deleted file mode 100644
index 130107341f7..00000000000
--- a/pkgs/development/libraries/libyaml/cve-2013-6393_a.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scanner.c	
-+++ a/src/scanner.c	
-@@ -2574,7 +2574,7 @@ 
- 
-     /* Resize the string to include the head. */
- 
--    while (string.end - string.start <= (int)length) {
-+    while ((size_t)(string.end - string.start) <= length) {
-         if (!yaml_string_extend(&string.start, &string.pointer, &string.end)) {
-             parser->error = YAML_MEMORY_ERROR;
-             goto error;
diff --git a/pkgs/development/libraries/libyaml/cve-2013-6393_b.patch b/pkgs/development/libraries/libyaml/cve-2013-6393_b.patch
deleted file mode 100644
index db2b9ff2bba..00000000000
--- a/pkgs/development/libraries/libyaml/cve-2013-6393_b.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/api.c	
-+++ a/src/api.c	
-@@ -117,7 +117,12 @@ 
- YAML_DECLARE(int)
- yaml_stack_extend(void **start, void **top, void **end)
- {
--    void *new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
-+    void *new_start;
-+
-+    if ((char *)*end - (char *)*start >= INT_MAX / 2)
-+	return 0;
-+
-+    new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
- 
-     if (!new_start) return 0;
- 
diff --git a/pkgs/development/libraries/libyaml/cve-2013-6393_c.patch b/pkgs/development/libraries/libyaml/cve-2013-6393_c.patch
deleted file mode 100644
index dc1c50da4e8..00000000000
--- a/pkgs/development/libraries/libyaml/cve-2013-6393_c.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- a/src/scanner.c	Mon Dec 24 03:51:32 2012 +0000
-+++ a/src/scanner.c	Mon Jan 27 19:48:28 2014 -0500
-@@ -615,11 +615,14 @@ 
-  */
- 
- static int
--yaml_parser_roll_indent(yaml_parser_t *parser, int column,
-+yaml_parser_roll_indent(yaml_parser_t *parser, size_t column,
-         int number, yaml_token_type_t type, yaml_mark_t mark);
- 
- static int
--yaml_parser_unroll_indent(yaml_parser_t *parser, int column);
-+yaml_parser_unroll_indent(yaml_parser_t *parser, size_t column);
-+
-+static int
-+yaml_parser_reset_indent(yaml_parser_t *parser);
- 
- /*
-  * Token fetchers.
-@@ -1206,7 +1209,7 @@ 
-  */
- 
- static int
--yaml_parser_roll_indent(yaml_parser_t *parser, int column,
-+yaml_parser_roll_indent(yaml_parser_t *parser, size_t column,
-         int number, yaml_token_type_t type, yaml_mark_t mark)
- {
-     yaml_token_t token;
-@@ -1216,7 +1219,7 @@ 
-     if (parser->flow_level)
-         return 1;
- 
--    if (parser->indent < column)
-+    if (parser->indent == -1 || parser->indent < column)
-     {
-         /*
-          * Push the current indentation level to the stack and set the new
-@@ -1254,7 +1257,7 @@ 
- 
- 
- static int
--yaml_parser_unroll_indent(yaml_parser_t *parser, int column)
-+yaml_parser_unroll_indent(yaml_parser_t *parser, size_t column)
- {
-     yaml_token_t token;
- 
-@@ -1263,6 +1266,15 @@ 
-     if (parser->flow_level)
-         return 1;
- 
-+    /*
-+     * column is unsigned and parser->indent is signed, so if
-+     * parser->indent is less than zero the conditional in the while
-+     * loop below is incorrect.  Guard against that.
-+     */
-+    
-+    if (parser->indent < 0)
-+        return 1;
-+
-     /* Loop through the intendation levels in the stack. */
- 
-     while (parser->indent > column)
-@@ -1283,6 +1295,41 @@ 
- }
- 
- /*
-+ * Pop indentation levels from the indents stack until the current
-+ * level resets to -1.  For each intendation level, append the
-+ * BLOCK-END token.
-+ */
-+
-+static int
-+yaml_parser_reset_indent(yaml_parser_t *parser)
-+{
-+    yaml_token_t token;
-+
-+    /* In the flow context, do nothing. */
-+
-+    if (parser->flow_level)
-+        return 1;
-+
-+    /* Loop through the intendation levels in the stack. */
-+
-+    while (parser->indent > -1)
-+    {
-+        /* Create a token and append it to the queue. */
-+
-+        TOKEN_INIT(token, YAML_BLOCK_END_TOKEN, parser->mark, parser->mark);
-+
-+        if (!ENQUEUE(parser, parser->tokens, token))
-+            return 0;
-+
-+        /* Pop the indentation level. */
-+
-+        parser->indent = POP(parser, parser->indents);
-+    }
-+
-+    return 1;
-+}
-+
-+/*
-  * Initialize the scanner and produce the STREAM-START token.
-  */
- 
-@@ -1338,7 +1385,7 @@ 
- 
-     /* Reset the indentation level. */
- 
--    if (!yaml_parser_unroll_indent(parser, -1))
-+    if (!yaml_parser_reset_indent(parser))
-         return 0;
- 
-     /* Reset simple keys. */
-@@ -1369,7 +1416,7 @@ 
- 
-     /* Reset the indentation level. */
- 
--    if (!yaml_parser_unroll_indent(parser, -1))
-+    if (!yaml_parser_reset_indent(parser))
-         return 0;
- 
-     /* Reset simple keys. */
-@@ -1407,7 +1454,7 @@ 
- 
-     /* Reset the indentation level. */
- 
--    if (!yaml_parser_unroll_indent(parser, -1))
-+    if (!yaml_parser_reset_indent(parser))
-         return 0;
- 
-     /* Reset simple keys. */
diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix
index 93f19165e88..15ba83b757a 100644
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/pkgs/development/libraries/libyaml/default.nix
@@ -1,19 +1,18 @@
-{stdenv, fetchurl}:
-
+{ stdenv, fetchurl }:
+let
+  version = "0.1.5";
+in
 stdenv.mkDerivation {
-  name = "libyaml-0.1.4";
+  name = "libyaml-${version}";
 
   src = fetchurl {
-    url = http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz;
-    sha256 = "0dvavrhxjrjfxgdgysxqfpdy08lpg3m9i8vxjyvdkcjsmra1by3v";
+    url = "http://pyyaml.org/download/libyaml/yaml-${version}.tar.gz";
+    sha256 = "1vrv5ly58bkmcyc049ad180f2m8iav6l9h3v8l2fqdmrny7yx1zs";
   };
 
-  # Downloaded on 2014-02-01 from https://bugzilla.redhat.com/show_bug.cgi?id=1033990
-  patches = [ ./cve-2013-6393_a.patch ./cve-2013-6393_b.patch ./cve-2013-6393_c.patch ];
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://pyyaml.org/;
     description = "A YAML 1.1 parser and emitter written in C";
-    license = "free";
+    license = licenses.mit;
   };
 }
-- 
GitLab


From f99f60af32049068327a8cbdb84ad3679f6d7c07 Mon Sep 17 00:00:00 2001
From: Arvin Moezzi <moezzia@gmail.com>
Date: Mon, 10 Feb 2014 20:09:44 +0100
Subject: [PATCH 1084/3789] calibre: upgrade from 1.21.0 to 1.23.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 686e327e2f7..c2672393bc5 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-1.21.0";
+  name = "calibre-1.23.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "05hwny9zi32gkk3hadvigrqrnbgzw53vhjkjp60dq0lb545pscih";
+    sha256 = "1sm6v53c12nkqnpv7n4g1mzkwmzbn74a8v83bzvvjiz0i9c7cl59";
   };
 
   inherit python;
-- 
GitLab


From a6a65c05d303d7740a1c943965d2973b420a132f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:02:14 +0100
Subject: [PATCH 1085/3789] haskell-aeson: update to version 0.7.0.1

---
 .../libraries/haskell/aeson/{0.7.0.0.nix => 0.7.0.1.nix}    | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/aeson/{0.7.0.0.nix => 0.7.0.1.nix} (90%)

diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.0.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix
similarity index 90%
rename from pkgs/development/libraries/haskell/aeson/0.7.0.0.nix
rename to pkgs/development/libraries/haskell/aeson/0.7.0.1.nix
index 41bbdbf5a0b..551f62d0756 100644
--- a/pkgs/development/libraries/haskell/aeson/0.7.0.0.nix
+++ b/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson";
-  version = "0.7.0.0";
-  sha256 = "14xh7i07ha2hgljq0y0v7f5gkn0pv2zqj8l9j92957mf7f17zwf6";
+  version = "0.7.0.1";
+  sha256 = "17cwclxh2f2m0mvs867lfzrv14gd9grw8a9f8l95j3nd76y58kb3";
   buildDepends = [
     attoparsec deepseq dlist hashable mtl scientific syb text time
     unorderedContainers vector
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bcc738e3bce..5876d3ad887 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -527,7 +527,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   adjunctions = callPackage ../development/libraries/haskell/adjunctions {};
 
   aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {};
-  aeson_0_7_0_0 = callPackage ../development/libraries/haskell/aeson/0.7.0.0.nix {
+  aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix {
     attoparsec = self.attoparsec_0_11_1_0;
   };
   aeson = self.aeson_0_6_2_1;
@@ -1513,7 +1513,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   json = callPackage ../development/libraries/haskell/json {};
 
   jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {
-    aeson = self.aeson_0_7_0_0;
+    aeson = self.aeson_0_7_0_1;
     lens = self.lens_4_0_1;
   };
 
@@ -1551,7 +1551,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {};
   lens_4_0_1 = callPackage ../development/libraries/haskell/lens/4.0.1.nix {
-    aeson = self.aeson_0_7_0_0;
+    aeson = self.aeson_0_7_0_1;
   };
   lens = self.lens_3_10_2;
 
-- 
GitLab


From 84aa7e1434d54f7e32da348c61d06ba48eaed5dc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:04:08 +0100
Subject: [PATCH 1086/3789] haskell-lens: update to version 4.0.2

---
 .../libraries/haskell/lens/{4.0.1.nix => 4.0.2.nix}    |  4 ++--
 pkgs/top-level/haskell-packages.nix                    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/development/libraries/haskell/lens/{4.0.1.nix => 4.0.2.nix} (94%)

diff --git a/pkgs/development/libraries/haskell/lens/4.0.1.nix b/pkgs/development/libraries/haskell/lens/4.0.2.nix
similarity index 94%
rename from pkgs/development/libraries/haskell/lens/4.0.1.nix
rename to pkgs/development/libraries/haskell/lens/4.0.2.nix
index d921dbe1cbb..492334bfc8f 100644
--- a/pkgs/development/libraries/haskell/lens/4.0.1.nix
+++ b/pkgs/development/libraries/haskell/lens/4.0.2.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "4.0.1";
-  sha256 = "1dm4gdpyd7kndf3zaikjqa1gkc7y7wzfnyhhk3xyhjxa5hn5rj75";
+  version = "4.0.2";
+  sha256 = "0j5lmyd7myaaz71kxwznr10wz5ww3j6faiik4hjvd74v658i34r5";
   buildDepends = [
     aeson bifunctors comonad constraints contravariant distributive
     exceptions filepath hashable mtl parallel primitive profunctors
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5876d3ad887..5ab99882926 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1514,7 +1514,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {
     aeson = self.aeson_0_7_0_1;
-    lens = self.lens_4_0_1;
+    lens = self.lens_4_0_2;
   };
 
   jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
@@ -1550,7 +1550,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {};
 
   lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {};
-  lens_4_0_1 = callPackage ../development/libraries/haskell/lens/4.0.1.nix {
+  lens_4_0_2 = callPackage ../development/libraries/haskell/lens/4.0.2.nix {
     aeson = self.aeson_0_7_0_1;
   };
   lens = self.lens_3_10_2;
@@ -1576,7 +1576,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   liftedBase = callPackage ../development/libraries/haskell/lifted-base {};
 
   linear = callPackage ../development/libraries/haskell/linear {
-    lens = self.lens_4_0_1;
+    lens = self.lens_4_0_2;
   };
 
   List = callPackage ../development/libraries/haskell/List {};
@@ -2152,8 +2152,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   socks = callPackage ../development/libraries/haskell/socks {};
 
   sparse = callPackage ../development/libraries/haskell/sparse {
-    lens = self.lens_4_0_1;
-    linear = self.linear.override { lens = self.lens_4_0_1; };
+    lens = self.lens_4_0_2;
+    linear = self.linear.override { lens = self.lens_4_0_2; };
   };
 
   srcloc = callPackage ../development/libraries/haskell/srcloc {};
-- 
GitLab


From 4149ab9c50e7d8b53c4997c8621e406db722fef6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:05:14 +0100
Subject: [PATCH 1087/3789] haskell-cgi: update to version 3001.1.8.5

---
 .../haskell/cgi/{3001.1.8.4.nix => 3001.1.8.5.nix}          | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/cgi/{3001.1.8.4.nix => 3001.1.8.5.nix} (83%)

diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix
similarity index 83%
rename from pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix
rename to pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix
index d2d89918086..0e6a6a71ae9 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cgi";
-  version = "3001.1.8.4";
-  sha256 = "1h0ynrrda18g5pn1sw2n94rhhp3k39nb7wmx53b52dhxkp2izlgn";
+  version = "3001.1.8.5";
+  sha256 = "0ffvn9ki5yq2zc65afmy04353v4s66lajc7y563fhj2kz5ib5ks6";
   buildDepends = [ MonadCatchIOMtl mtl network parsec xhtml ];
   meta = {
     homepage = "http://andersk.mit.edu/haskell/cgi/";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5ab99882926..2d23a269ebf 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -144,7 +144,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     async        = self.async_2_0_1_5;
     attoparsec   = self.attoparsec_0_11_1_0;
     caseInsensitive = self.caseInsensitive_1_1_0_3;
-    cgi          = self.cgi_3001_1_8_4;
+    cgi          = self.cgi_3001_1_8_5;
     fgl          = self.fgl_5_4_2_4;
     GLUT         = self.GLUT_2_5_1_0;
     GLURaw       = self.GLURaw_1_4_0_0;
@@ -742,8 +742,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cgi_3001_1_7_3 = callPackage ../development/libraries/haskell/cgi/3001.1.7.3.nix {};
   cgi_3001_1_7_4 = callPackage ../development/libraries/haskell/cgi/3001.1.7.4.nix {};
   cgi_3001_1_7_5 = callPackage ../development/libraries/haskell/cgi/3001.1.7.5.nix {};
-  cgi_3001_1_8_4 = callPackage ../development/libraries/haskell/cgi/3001.1.8.4.nix {};
-  cgi = self.cgi_3001_1_8_4;
+  cgi_3001_1_8_5 = callPackage ../development/libraries/haskell/cgi/3001.1.8.5.nix {};
+  cgi = self.cgi_3001_1_8_5;
 
   charset = callPackage ../development/libraries/haskell/charset {};
 
-- 
GitLab


From 96756095b77d88800342e4150310c7d4108858b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:05:42 +0100
Subject: [PATCH 1088/3789] haskell-idris: update to version 0.9.11.1

---
 pkgs/development/compilers/idris/default.nix | 26 +++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index 10aa5ba4e07..898bd50e62b 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -1,21 +1,23 @@
-{ cabal, ansiTerminal, ansiWlPprint, binary, boehmgc, Cabal
-, deepseq, filepath, gmp, happy, haskeline, languageJava, libffi
-, llvmGeneral, llvmGeneralPure, mtl, network, parsers, split, text
-, time, transformers, trifecta, unorderedContainers, utf8String
-, vector, vectorBinaryInstances, xml
+{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint, binary
+, boehmgc, Cabal, deepseq, filepath, gmp, happy, haskeline
+, languageJava, libffi, llvmGeneral, llvmGeneralPure, mtl, network
+, parsers, split, text, time, transformers, trifecta
+, unorderedContainers, utf8String, vector, vectorBinaryInstances
+, xml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "idris";
-  version = "0.9.10.1";
-  sha256 = "194gbpk8fy64maj9lcwj9hkbndc3287bh9mz2jm09vd11i23iyg1";
-  isLibrary = false;
+  version = "0.9.11.1";
+  sha256 = "02a484vcf4sm2kdmxfxsy8x5whf002xyp2b6w1zrg7a6qggcabar";
+  isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    ansiTerminal ansiWlPprint binary Cabal deepseq filepath haskeline
-    languageJava libffi llvmGeneral llvmGeneralPure mtl network parsers
-    split text time transformers trifecta unorderedContainers
-    utf8String vector vectorBinaryInstances xml
+    annotatedWlPprint ansiTerminal ansiWlPprint binary Cabal deepseq
+    filepath haskeline languageJava libffi llvmGeneral llvmGeneralPure
+    mtl network parsers split text time transformers trifecta
+    unorderedContainers utf8String vector vectorBinaryInstances xml
+    zlib
   ];
   buildTools = [ happy ];
   extraLibraries = [ boehmgc gmp ];
-- 
GitLab


From 877d850506b9ea690b67d0a0436757a7f4a42cce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:05:44 +0100
Subject: [PATCH 1089/3789] haskell-DAV: update to version 0.6.1

---
 .../libraries/haskell/DAV/default.nix           | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix
index a7e15f2d6b4..84ef157613e 100644
--- a/pkgs/development/libraries/haskell/DAV/default.nix
+++ b/pkgs/development/libraries/haskell/DAV/default.nix
@@ -1,18 +1,19 @@
-{ cabal, caseInsensitive, httpClient, httpClientTls, httpTypes
-, lens, liftedBase, monadControl, mtl, network, optparseApplicative
-, transformers, transformersBase, xmlConduit, xmlHamlet
+{ cabal, caseInsensitive, either, errors, httpClient, httpClientTls
+, httpTypes, lens, liftedBase, monadControl, mtl, network
+, optparseApplicative, transformers, transformersBase, xmlConduit
+, xmlHamlet
 }:
 
 cabal.mkDerivation (self: {
   pname = "DAV";
-  version = "0.6";
-  sha256 = "1lqc1w40mzj5gvpd3gc4qwgz3zrivwkz6ssa5592dsnwz81k1dxk";
+  version = "0.6.1";
+  sha256 = "0j82fz5z9cwnl41qqs69gv0li25rkjndd8lnf4zy7bbdy558nxgz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    caseInsensitive httpClient httpClientTls httpTypes lens liftedBase
-    monadControl mtl network optparseApplicative transformers
-    transformersBase xmlConduit xmlHamlet
+    caseInsensitive either errors httpClient httpClientTls httpTypes
+    lens liftedBase monadControl mtl network optparseApplicative
+    transformers transformersBase xmlConduit xmlHamlet
   ];
   meta = {
     homepage = "http://floss.scru.org/hDAV";
-- 
GitLab


From 7be1c1f111cd5c28c3ab609c928526b9783ffc8e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:05:45 +0100
Subject: [PATCH 1090/3789] haskell-HTF: update to version 0.11.2

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

diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix
index 509719d383a..3d7df9e540a 100644
--- a/pkgs/development/libraries/haskell/HTF/default.nix
+++ b/pkgs/development/libraries/haskell/HTF/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HTF";
-  version = "0.11.1.1";
-  sha256 = "0j425h0av82cbwkfds2jhf3hsm2wd8vca8bjdyg8v09k6kb220cs";
+  version = "0.11.2";
+  sha256 = "12q7j1vhb5w8lnpnxn1aszs4bv2yigi3php6pimcwwv9q9vc3i3c";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 5e72710518e83229afa4985cf1c10094355bf050 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:05:47 +0100
Subject: [PATCH 1091/3789] haskell-MonadRandom: update to version 0.1.13

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

diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix
index 32c2f9eeffe..3eac88d8880 100644
--- a/pkgs/development/libraries/haskell/MonadRandom/default.nix
+++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MonadRandom";
-  version = "0.1.12";
-  sha256 = "0lr1lvpcj96i6n0w810bjy8k9jygx97nnv0k2zb51d7saw6y95p4";
+  version = "0.1.13";
+  sha256 = "1pi12ymsbl2l0ly3ggihg8r0ac87ax267m419cga60wp5ry5zbnk";
   buildDepends = [ mtl random transformers ];
   meta = {
     description = "Random-number generation monad";
-- 
GitLab


From cc037323cd09491f674284561934f85ceb6eaca7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:05:49 +0100
Subject: [PATCH 1092/3789] haskell-SafeSemaphore: update to version 0.10.0

---
 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 d4cc7490277..20c879e0dc4 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.9.0";
-  sha256 = "1xa30cciw8wmri675kdsz4pb5qwrh592pzylbhawqsvsarf80gz4";
+  version = "0.10.0";
+  sha256 = "0zjm99jqkbn99p5d3mdggij4b4jfpz4fk1rwpd48ld4vmzzqh92c";
   buildDepends = [ stm ];
   testDepends = [ HUnit ];
   meta = {
-- 
GitLab


From eebaec72a1484b62bef2482e09eb9ae466badb51 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:05:50 +0100
Subject: [PATCH 1093/3789] haskell-cairo: update to version 0.12.5.1

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

diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
index 686cf3b9bcb..b009f6763ab 100644
--- a/pkgs/development/libraries/haskell/cairo/default.nix
+++ b/pkgs/development/libraries/haskell/cairo/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cairo";
-  version = "0.12.5.0";
-  sha256 = "1khpksznh51yl27hs0zbabx8df04d26ccwh0vjidcwf3flvrbgwb";
+  version = "0.12.5.1";
+  sha256 = "02a57kg7s1bjfvk7cnkppfva5g7akhpwsrsa1qzm0kdld51cs86l";
   buildDepends = [ mtl utf8String ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ cairo libc pkgconfig zlib ];
-- 
GitLab


From afce4f0412a1e018910ecad91f9690b627e5cccf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:05:52 +0100
Subject: [PATCH 1094/3789] haskell-conduit: update to version 1.0.13.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 25987150533..d2d221177c8 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.0.13";
-  sha256 = "19l2wqx5fil9sv4kj8jd19yvb4fa7jp3n523j38z9bd6ydnb8fni";
+  version = "1.0.13.1";
+  sha256 = "0kxfck6d72fdnymf2rj6m7h97svq1d2fq1ss5mlhsrks5fflia9y";
   buildDepends = [
     liftedBase mmorph monadControl mtl resourcet text transformers
     transformersBase void
-- 
GitLab


From 643c8e1aba330e51bdf2685ee23ced10550b97b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:05:54 +0100
Subject: [PATCH 1095/3789] haskell-diagrams-cairo: update to version 1.0.1.2

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

diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index 78de7fa1f8e..186f60aecf5 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-cairo";
-  version = "1.0.1.1";
-  sha256 = "0mjc24sir0mm1kqhkk26mfbz90kc71hdylral4bjymxs6fpx7crh";
+  version = "1.0.1.2";
+  sha256 = "040x3zdrr70kg10isby6xp8mswvjd84xiz2rf7w1y66g9izdgfmc";
   buildDepends = [
     cairo colour dataDefaultClass diagramsCore diagramsLib filepath
     hashable lens mtl split statestack time
-- 
GitLab


From 392d78a7dd42fd91f5e2f1a599184c6fd5c90def Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:05:56 +0100
Subject: [PATCH 1096/3789] haskell-diagrams-svg: update to version 1.0.1.3

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

diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index 56b1306a7ce..926249b853a 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-svg";
-  version = "1.0.1.2";
-  sha256 = "1aaybkizlfc4ji7m2p2naw4ml1pacppkbfr2ygqlq0k3bg0cd36k";
+  version = "1.0.1.3";
+  sha256 = "0brbvzwh7yi3400wrdpkmw6jfd2nhi238zddhid76lmx2q9zxvvx";
   buildDepends = [
     blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath
     hashable lens monoidExtras mtl split time vectorSpace
-- 
GitLab


From b655b5c044ea75ad8f5bc3569e2085dbe3e9e1ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:05:57 +0100
Subject: [PATCH 1097/3789] haskell-digestive-functors-aeson: update to version
 1.1.5

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

diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
index 02b7f35d382..dd098cbe183 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
@@ -1,14 +1,12 @@
-{ cabal, aeson, digestiveFunctors, HUnit, lens, lensAeson, mtl
-, safe, tasty, tastyHunit, text, vector
+{ cabal, aeson, digestiveFunctors, HUnit, lens, mtl, safe, tasty
+, tastyHunit, text, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-aeson";
-  version = "1.1.4";
-  sha256 = "1rca25zycmz4al5izq8j7h3cggvb4844g3gj3a1686yy38k5rfvn";
-  buildDepends = [
-    aeson digestiveFunctors lens lensAeson safe text vector
-  ];
+  version = "1.1.5";
+  sha256 = "1mxi8zbv3hxy2crj6h6p1a885k8rd0fqhmwq7l7w7d7d73h8bmm3";
+  buildDepends = [ aeson digestiveFunctors lens safe text vector ];
   testDepends = [
     aeson digestiveFunctors HUnit mtl tasty tastyHunit text
   ];
-- 
GitLab


From 3b417ab8df3f1ea797162006c4ebee26e41aada7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:05:59 +0100
Subject: [PATCH 1098/3789] haskell-either: update to version 4.1.1

---
 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 d6853f4cf4c..46348d7e4bb 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";
-  sha256 = "1wddidjqwk283zrydl6xwi0crrrlskayici0fhjyf2abd3lgnnkc";
+  version = "4.1.1";
+  sha256 = "0wipgwrca7bm4rm843gc0p69f2hvm2z067mjrv8qvnivyxhy8i6k";
   buildDepends = [
     monadControl MonadRandom mtl semigroupoids semigroups transformers
     transformersBase
-- 
GitLab


From 9eb8b4854c5a30aadec578c51faa7792a5ff7639 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:01 +0100
Subject: [PATCH 1099/3789] haskell-ghc-mod: update to version 3.1.6

---
 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 d37bfcf0f5a..02c459c8e5c 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 = "3.1.5";
-  sha256 = "1sjam6cqz9dhgsdv4sm1lgmwq5dhs9x5q3p1h7l0n34w2q7cc6if";
+  version = "3.1.6";
+  sha256 = "1z8fzh08f38cxplf14sflpgrazlwzz6q73lvxm37xyp7gww2prhi";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From f4f3d8092cc25b48b99f1df714115d131aaed374 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:03 +0100
Subject: [PATCH 1100/3789] haskell-gtk-traymanager: update to version 0.1.3

---
 .../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 8d319ee246e..f55d9f2edef 100644
--- a/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
+++ b/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
@@ -1,11 +1,11 @@
-{ cabal, glib, gtk, X11 }:
+{ cabal, glib, gtk, x11 }:
 
 cabal.mkDerivation (self: {
   pname = "gtk-traymanager";
   version = "0.1.3";
   sha256 = "07671f3j3r07djgvrlpbdaqqnm2yc7sc5f5isjn5nczrwh8n0sj4";
   buildDepends = [ glib gtk ];
-  pkgconfigDepends = [ gtk X11 ];
+  pkgconfigDepends = [ gtk x11 ];
   meta = {
     homepage = "http://github.com/travitch/gtk-traymanager";
     description = "A wrapper around the eggtraymanager library for Linux system trays";
-- 
GitLab


From 1d07d957b5bb9c24b6ce077d74d0b2e3859c6374 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:04 +0100
Subject: [PATCH 1101/3789] haskell-gtk: update to version 0.12.5.2

---
 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 6acf1fb90c6..9ac6fb2f6f2 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.0";
-  sha256 = "1xj2x9aakk70k3z88klfniqvffzbdkn55vslbqk60k6sv4k3qs2n";
+  version = "0.12.5.2";
+  sha256 = "06jlwln3w2pgzahhy8n4sqv1chmh899naz8avqabr9ni4hmbrssb";
   buildDepends = [ cairo glib mtl pango ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
-- 
GitLab


From 9e4625d290fbdbaebaa354d77993e1a56898a576 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:06 +0100
Subject: [PATCH 1102/3789] haskell-hamlet: update to version 1.1.7.7

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

diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index ca6de3fecfe..739b800e28d 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.1.7.6";
-  sha256 = "1b0y7imdihm87nkz32bmh2gbalidy9rzp85x677lvxc99c1m9d1d";
+  version = "1.1.7.7";
+  sha256 = "1qwx0gn367gp2a4kb1q3xc23addjyawr9gvs7bzv8vfx5xnkxglx";
   buildDepends = [
     blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
   ];
-- 
GitLab


From 980c9e05404680d97669b75f83e5db6ceb12fd36 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:08 +0100
Subject: [PATCH 1103/3789] haskell-hsimport: update to version 0.2.9

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

diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix
index 8c657e780ec..eea778ec08a 100644
--- a/pkgs/development/libraries/haskell/hsimport/default.nix
+++ b/pkgs/development/libraries/haskell/hsimport/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hsimport";
-  version = "0.2.7";
-  sha256 = "03ddrszirx3xg7lxbykhwbzs4vqr8xravn2krc7v0q308rh070nr";
+  version = "0.2.9";
+  sha256 = "1xfz1as980jg3crlwlajaj8yfj4pl4phg9l6fjap037vr0107hav";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 3cac682315f4cb277f8ea9c2e36426e3a6f214aa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:09 +0100
Subject: [PATCH 1104/3789] haskell-hspec-meta: update to version 1.8.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 5374ed7cd80..1b9cbd08978 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.8.1";
-  sha256 = "03582b79cqv3c2z02ni2xyzb3kccgcw0phmg5lklaphkrarm0g3w";
+  version = "1.8.3";
+  sha256 = "12d254snnv8i1qqybsp6yzbqdxjf1wx8d29ja3lazb3kx12qwawd";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 9305df4363535ead60ee0695818466fd9ec597d5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:11 +0100
Subject: [PATCH 1105/3789] haskell-hspec: update to version 1.8.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 10994799c43..984a046f501 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.8.1.1";
-  sha256 = "1gpll1pr8zs7ha1nn13rp579av4nnjkz94rq0js6r1awz69cp0rb";
+  version = "1.8.3";
+  sha256 = "0k5l8r54nc0q5x3czdfxkwa606qnli3a6qm2xd3r5yl5bnz6hzh8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 579232ae5b6c2428f654a4509dcd945a7f1acfcf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:13 +0100
Subject: [PATCH 1106/3789] haskell-http-client-tls: update to version 0.2.1.1

---
 .../libraries/haskell/http-client-tls/default.nix      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix
index 201e1e11564..5ec8eecd06c 100644
--- a/pkgs/development/libraries/haskell/http-client-tls/default.nix
+++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix
@@ -1,12 +1,14 @@
-{ cabal, connection, dataDefault, hspec, httpClient, httpTypes
+{ cabal, connection, dataDefaultClass, hspec, httpClient, httpTypes
 , network, tls
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-client-tls";
-  version = "0.2.0.3";
-  sha256 = "0v8zbwlvdmkap5qbw9aw75krvw8j4q90fn301al13azzgjp71gmb";
-  buildDepends = [ connection dataDefault httpClient network tls ];
+  version = "0.2.1.1";
+  sha256 = "07kwcamc100y48gghmlfvj5ycf6y3cynqqg5kx0ymgjk85k7vim7";
+  buildDepends = [
+    connection dataDefaultClass httpClient network tls
+  ];
   testDepends = [ hspec httpClient httpTypes ];
   doCheck = false;
   meta = {
-- 
GitLab


From 8bdbb966710b9cd7c1ab579c91739c3b5eab2ead Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:15 +0100
Subject: [PATCH 1107/3789] haskell-http-client: update to version 0.2.2.2

---
 .../libraries/haskell/http-client/default.nix | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index 7d85c29e656..ff21e12bb43 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -1,22 +1,22 @@
 { cabal, base64Bytestring, blazeBuilder, caseInsensitive, cookie
-, dataDefault, deepseq, failure, hspec, httpTypes, monadControl
-, network, publicsuffixlist, text, time, transformers, zlib
-, zlibBindings
+, dataDefaultClass, deepseq, failure, hspec, httpTypes
+, monadControl, network, publicsuffixlist, text, time, transformers
+, zlib, zlibBindings
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.2.1.1";
-  sha256 = "03hcwz53sjvw3nv6xbdf24a4ny229ljq3rx89plmsxpjb44qwlq2";
+  version = "0.2.2.2";
+  sha256 = "1pn38vqbb8ff3gmwkzb8a2fika2rdymnlglpi3q7yn0jsvxl5xli";
   buildDepends = [
-    base64Bytestring blazeBuilder caseInsensitive cookie dataDefault
-    deepseq failure httpTypes network publicsuffixlist text time
-    transformers zlibBindings
+    base64Bytestring blazeBuilder caseInsensitive cookie
+    dataDefaultClass deepseq failure httpTypes network publicsuffixlist
+    text time transformers zlibBindings
   ];
   testDepends = [
-    base64Bytestring blazeBuilder caseInsensitive dataDefault deepseq
-    failure hspec httpTypes monadControl network text time transformers
-    zlib zlibBindings
+    base64Bytestring blazeBuilder caseInsensitive deepseq failure hspec
+    httpTypes monadControl network text time transformers zlib
+    zlibBindings
   ];
   doCheck = false;
   meta = {
-- 
GitLab


From 258b077a3cac8d1a28d45e59ddea20d5922a50a0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:16 +0100
Subject: [PATCH 1108/3789] haskell-http-conduit: update to version 2.0.0.5

---
 .../libraries/haskell/http-conduit/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index c55e8a4e6e7..04c88c257c1 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -1,6 +1,6 @@
 { cabal, asn1Data, base64Bytestring, blazeBuilder
 , blazeBuilderConduit, caseInsensitive, certificate, conduit
-, connection, cookie, cprngAes, dataDefault, deepseq, failure
+, connection, cookie, cprngAes, dataDefaultClass, deepseq, failure
 , filepath, hspec, httpClient, httpClientConduit
 , httpClientMultipart, httpClientTls, httpTypes, HUnit, liftedBase
 , mimeTypes, monadControl, mtl, network, networkConduit
@@ -11,8 +11,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "2.0.0.4";
-  sha256 = "0902sklwfb9gr1yqxp15qa4qqik75jv6pl0nfh2s4vq65sh4gndq";
+  version = "2.0.0.5";
+  sha256 = "1vgfg2jgr7gavfbys33rd2l0dxyqk7ig7v357jhy8imxsm0xykp9";
   buildDepends = [
     conduit httpClient httpClientConduit httpClientTls httpTypes
     liftedBase resourcet transformers
@@ -20,7 +20,7 @@ cabal.mkDerivation (self: {
   testDepends = [
     asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive certificate conduit connection cookie cprngAes
-    dataDefault deepseq failure filepath hspec httpClient
+    dataDefaultClass deepseq failure filepath hspec httpClient
     httpClientMultipart httpTypes HUnit liftedBase mimeTypes
     monadControl mtl network networkConduit publicsuffixlist random
     regexCompat resourcet socks text time transformers transformersBase
-- 
GitLab


From cbd1ceb877bad71ddb1e849f1155ba75904c819c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:18 +0100
Subject: [PATCH 1109/3789] haskell-iCalendar: update to version 0.4

---
 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 7244e15c293..9d54e8531ab 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.3.0.1";
-  sha256 = "0d51rb46vcpb05vsqqmk3w7rymybl3vz8cqs0pw088a52kiy4xc3";
+  version = "0.4";
+  sha256 = "1wjgrgm4m21fic7a83k5jql4jxknk7mhh3shhrgb2kvxrj0bfw8b";
   buildDepends = [
     base64Bytestring caseInsensitive dataDefault mime mtl network
     parsec text time
-- 
GitLab


From c7767f32661ba6c3937c9eb1bafcd385b281a298 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:20 +0100
Subject: [PATCH 1110/3789] haskell-ixdopp: update to version 0.1.3

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

diff --git a/pkgs/development/libraries/haskell/ixdopp/default.nix b/pkgs/development/libraries/haskell/ixdopp/default.nix
index 94bfa018553..8e4a92f6dca 100644
--- a/pkgs/development/libraries/haskell/ixdopp/default.nix
+++ b/pkgs/development/libraries/haskell/ixdopp/default.nix
@@ -6,10 +6,10 @@ cabal.mkDerivation (self: {
   sha256 = "1vknwznk42b33q4pmh6z620g761yf3cmsmrmhilgq42i5qhll4d4";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ preprocessorTools ];
+  buildDepends = [ preprocessorTools syb ];
   meta = {
     homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
-    description = "Expands a Haskell program using ixdo notation into a Haskell program using the indexed monad bind operator (>>>=)";
+    description = "A preprocessor for expanding \"ixdo\" notation for indexed monads";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From c2a3e2daee0002a7e83af75d358f42b30aa40f87 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:21 +0100
Subject: [PATCH 1111/3789] haskell-logict: update to version 0.6.0.2

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

diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix
index 9dc4b58797f..b0768708429 100644
--- a/pkgs/development/libraries/haskell/logict/default.nix
+++ b/pkgs/development/libraries/haskell/logict/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "logict";
-  version = "0.6.0.1";
-  sha256 = "0sznrnx7l5sqnyvc2xwx1q33b4833qsnhppm06a3scp9gj3y1xp2";
+  version = "0.6.0.2";
+  sha256 = "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi";
   buildDepends = [ mtl ];
   meta = {
-    homepage = "http://code.haskell.org/~dolio/logict";
+    homepage = "http://code.haskell.org/~dolio/";
     description = "A backtracking logic-programming monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From 9cfa09bdf728e03ce9215052d71322a2546d2169 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:23 +0100
Subject: [PATCH 1112/3789] haskell-persistent-postgresql: update to version
 1.3.0.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 c4dc0be2a43..9853969d9f1 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-postgresql";
-  version = "1.3.0";
-  sha256 = "1mayfq1z9i46nqgiajkhxx4z3hfy3gl5nzx8d5xlp7s1mliz3qjv";
+  version = "1.3.0.1";
+  sha256 = "00m78hdrnk367ymlgbi49p2zq2gkwskax1ng2h3ljskf3ic4jahf";
   buildDepends = [
     aeson blazeBuilder conduit monadControl persistent postgresqlLibpq
     postgresqlSimple text time transformers
-- 
GitLab


From 43a0f73638e818a71216d14e7edb159428e12175 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:25 +0100
Subject: [PATCH 1113/3789] haskell-persistent-sqlite: update to version
 1.3.0.2

---
 .../libraries/haskell/persistent-sqlite/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
index fc59c2477ed..742f4d3b516 100644
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-sqlite";
-  version = "1.3.0.1";
-  sha256 = "0nfih7g32pmh0hq798r4mxkkrp2zjkqb38zwhdyrdbszk6ryzx9l";
+  version = "1.3.0.2";
+  sha256 = "0mxnmbqsj67mfsp7d09wbziwfwcfdqr0rln0qcyi3wjwgybjmkzk";
   buildDepends = [
     aeson conduit monadControl monadLogger persistent text transformers
   ];
-- 
GitLab


From 61d0a53ce48de27169fd0a8ee81196c8d41bd242 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:27 +0100
Subject: [PATCH 1114/3789] haskell-persistent-template: update to version
 1.3.1.1

---
 .../libraries/haskell/persistent-template/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 60ae9a40ca3..9dc3ea188bb 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "1.3.1";
-  sha256 = "148gznxqzd5743l0r3pc9g14gvanxpl6nfla2lhb2xsa162b2hjx";
+  version = "1.3.1.1";
+  sha256 = "13rbsxfrync5vmg5f1h5z5lc2b1vvh7nzbap4s5g5df3nvzfmmqx";
   buildDepends = [
     aeson monadControl monadLogger persistent text transformers
     unorderedContainers
-- 
GitLab


From 3d0163a084751627cf82cc3c0dfbc021e9ac2f14 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:28 +0100
Subject: [PATCH 1115/3789] haskell-pipes-attoparsec: update to version 0.4.0

---
 .../libraries/haskell/pipes-attoparsec/default.nix  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
index 484f2104567..27f9d8a0b87 100644
--- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
@@ -1,16 +1,15 @@
-{ cabal, attoparsec, HUnit, mmorph, pipes, pipesParse, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-, transformers
+{ cabal, attoparsec, HUnit, mmorph, pipes, pipesParse, tasty
+, tastyHunit, text, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "pipes-attoparsec";
-  version = "0.3.1";
-  sha256 = "1bvz5fxy2mfz3swiv9jfmhxl1psmm3c7nfi58pggam52lz20va2h";
+  version = "0.4.0";
+  sha256 = "0xffqxsh8yvfdk39mdgkf0l2v284fr31nz5k16dq752p63fnczkw";
   buildDepends = [ attoparsec pipes pipesParse text transformers ];
   testDepends = [
-    attoparsec HUnit mmorph pipes pipesParse QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 text transformers
+    attoparsec HUnit mmorph pipes pipesParse tasty tastyHunit text
+    transformers
   ];
   meta = {
     homepage = "https://github.com/k0001/pipes-attoparsec";
-- 
GitLab


From 7e5d1095d36250e863e581dc54c9891ca3ef0cae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:30 +0100
Subject: [PATCH 1116/3789] haskell-preprocessor-tools: update to version 0.1.3

---
 .../libraries/haskell/preprocessor-tools/0.1.3.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix b/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix
index 1ca159c7128..7b96ba87a8e 100644
--- a/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix
+++ b/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix
@@ -6,8 +6,8 @@ cabal.mkDerivation (self: {
   sha256 = "0jz85v93zpv6cwvad18wr12nsikmv4n20gn37zli2h34zi543i9v";
   buildDepends = [ mtl parsec syb ];
   meta = {
-    homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
-    description = "Extending Haskell's syntax using a custom preprocessor";
+    homepage = "http://www.ccs.neu.edu/~tov/pubs/haskell-session-types";
+    description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 4d3b7d63272247c532f8cb928ea4247338dbdf05 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:32 +0100
Subject: [PATCH 1117/3789] haskell-preprocessor-tools: update to version 1.0.1

---
 pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix b/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix
index e4a1f02eafa..c8a01b35a97 100644
--- a/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix
+++ b/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   buildDepends = [ mtl parsec syb ];
   meta = {
     homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
-    description = "Extending Haskell's syntax using a custom preprocessor";
+    description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 1092ee7b83b7f3504319a35c313a555ef4e8a345 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:34 +0100
Subject: [PATCH 1118/3789] haskell-reducers: update to version 3.10.2

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

diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix
index bc1bf72beea..335cee497ea 100644
--- a/pkgs/development/libraries/haskell/reducers/default.nix
+++ b/pkgs/development/libraries/haskell/reducers/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reducers";
-  version = "3.10.1.1";
-  sha256 = "1d4zhcqy499pm0wxn76gyw0brbrdycmajblqy4mi49kiy0zlg8a7";
+  version = "3.10.2";
+  sha256 = "159srk8v6zmfprq80mx3rpqrxzgzvf7xiwm8ywfaxrqyfcwkkjmg";
   buildDepends = [
     comonad fingertree hashable keys pointed semigroupoids semigroups
     text transformers unorderedContainers
-- 
GitLab


From 24e1cff27289eb73a5c6059875c962566ec2595b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:35 +0100
Subject: [PATCH 1119/3789] haskell-shake: update to version 0.11.1

---
 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 411140459ed..d0c5f220099 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";
-  sha256 = "0w0m94ahr2pzgrknk023vpabjydaj2ir8372rca3b4xik6idaag2";
+  version = "0.11.1";
+  sha256 = "0fk3b4c9r4ybdv7x533afy91dcyf3ji2xsyfpi72z7637vmgv202";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 266698152ab83bfe6577663c9b94a06f12aeef4b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:37 +0100
Subject: [PATCH 1120/3789] haskell-shakespeare-js: update to version 1.2.0.3

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

diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index ed743d87832..36d3443c958 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "1.2.0.2";
-  sha256 = "1d7fmw2295ycjipaj9fjgw02y1088h2gxxk1d6sy4c165x95r6vx";
+  version = "1.2.0.3";
+  sha256 = "1zcqq8880rsdx3xwf1czl4vn5l9igw181snbfv5k1gxpif6myhp1";
   buildDepends = [ aeson shakespeare text ];
   testDepends = [ aeson hspec HUnit shakespeare text ];
   meta = {
-- 
GitLab


From 5831b35f0b3344c8ab20f37265574568b7730a4c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:38 +0100
Subject: [PATCH 1121/3789] haskell-shakespeare-text: update to version 1.0.1

---
 .../libraries/haskell/shakespeare-text/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index feadafeb29f..95ae94a8f26 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-text";
-  version = "1.0.0.10";
-  sha256 = "0az3l70syb7ch5fb4i0nlibgh7wcrzqnqmlp1w5h68s796g5rjlb";
+  version = "1.0.1";
+  sha256 = "1vxy1d8r9wd8qijmy2jm7c7y7wg77qnzsh1ga0rlh3nklj9w01ml";
   buildDepends = [ shakespeare text ];
   testDepends = [ hspec HUnit text ];
   meta = {
-- 
GitLab


From 589d40db12585f2ee6320fc561ab26c7cf3fac96 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:40 +0100
Subject: [PATCH 1122/3789] haskell-sqlite-simple: update to version 0.4.5.0

---
 .../libraries/haskell/sqlite-simple/default.nix     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/sqlite-simple/default.nix b/pkgs/development/libraries/haskell/sqlite-simple/default.nix
index c566cd19d82..ab4426a3d1e 100644
--- a/pkgs/development/libraries/haskell/sqlite-simple/default.nix
+++ b/pkgs/development/libraries/haskell/sqlite-simple/default.nix
@@ -1,12 +1,15 @@
-{ cabal, base16Bytestring, directSqlite, HUnit, text, time
-, transformers
+{ cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual
+, directSqlite, HUnit, text, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "sqlite-simple";
-  version = "0.4.4.0";
-  sha256 = "09vgy3hji0bjb3bwxwkwhmgf50q442dqr3d86g5l5s3xiw3hca0r";
-  buildDepends = [ directSqlite text time transformers ];
+  version = "0.4.5.0";
+  sha256 = "0y4w8rj46lawz3hbi8dz80fbvxxgzj85094dxkwvpzgrf33py4y4";
+  buildDepends = [
+    attoparsec blazeBuilder blazeTextual directSqlite text time
+    transformers
+  ];
   testDepends = [ base16Bytestring directSqlite HUnit text time ];
   meta = {
     homepage = "http://github.com/nurpax/sqlite-simple";
-- 
GitLab


From 47947a0ab70f6bdd3b492a1b8231c613a7d23d4e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:42 +0100
Subject: [PATCH 1123/3789] haskell-unbounded-delays: update to version 0.1.0.6

---
 .../libraries/haskell/unbounded-delays/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/unbounded-delays/default.nix b/pkgs/development/libraries/haskell/unbounded-delays/default.nix
index ccccf9d95d3..69f6ac60ac3 100644
--- a/pkgs/development/libraries/haskell/unbounded-delays/default.nix
+++ b/pkgs/development/libraries/haskell/unbounded-delays/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unbounded-delays";
-  version = "0.1.0.5";
-  sha256 = "109swgxlv3ywf5g0wgm3gp2y7azd6mqf2lfb9sk21dfzcz28aq4k";
+  version = "0.1.0.6";
+  sha256 = "0yykb9jqxhvbngvp2gbzb0ch2cmzdxx8km62dclyvr3xbv6hk1h7";
   meta = {
     homepage = "https://github.com/basvandijk/unbounded-delays";
     description = "Unbounded thread delays and timeouts";
-- 
GitLab


From 714053c0ccc3d56bdbab0d3f88e34e1525e3d611 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:43 +0100
Subject: [PATCH 1124/3789] haskell-yaml: update to version 0.8.6.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 e7fac87c319..5ded7e665ab 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.6";
-  sha256 = "0qmbgb2gsqj25hl1blxjjcpk5fp5za9d1vshjs86mpapqvlhr9rn";
+  version = "0.8.6.2";
+  sha256 = "1qgxjm6jv7w12a30irgb0dgdn51zxzcwqd0r713l26v35m2fvmdg";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 49bf3dac87ee542e0c427afa17fa0a35e92095a3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:45 +0100
Subject: [PATCH 1125/3789] haskell-yesod-bin: update to version 1.2.6

---
 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 f53c8f554b0..a466da06d41 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.5.8";
-  sha256 = "1k9afj8f463rs0w9bzxda587jhm1g3fq3l42mabydmg8mx4hbm2c";
+  version = "1.2.6";
+  sha256 = "10p0j5w8s2lfjlmkyw4f2lslfr4xb8mzx5ijwavcpc7q9zw9zjk5";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 083465968e69c635176659f0216a89657b7c678c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:47 +0100
Subject: [PATCH 1126/3789] haskell-yesod-core: update to version 1.2.6.7

---
 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 0b9284b8f14..5eaaa316ecf 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.6.6";
-  sha256 = "1wmcsblzr9mq831yp7g90m0rk8a1rgsz1vcdcsr7dsjrykcvxqfq";
+  version = "1.2.6.7";
+  sha256 = "09vxi7fkiakr58ifa6ribsqq1p6fmqclznj38vhl5rdfalm7yivg";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit cookie dataDefault
-- 
GitLab


From bbe3cdd3ed1d310c578a13ccf10c36340304b8f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:48 +0100
Subject: [PATCH 1127/3789] haskell-yesod-form: update to version 1.3.5.1

---
 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 f87938f9a03..7474884d4a0 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.5";
-  sha256 = "01qh2s4z9w8g70xz613b2dirfrbag6c861c2niy85c6x8h05nnwy";
+  version = "1.3.5.1";
+  sha256 = "0jvza4ly3kjfsbayjcggf8fq0lcb8n9f6cp0q6fcif1xkwkkhmdh";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
     dataDefault emailValidate hamlet network persistent resourcet
-- 
GitLab


From d9250ef57315b170d6353f760e15a796c9f0e7d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:50 +0100
Subject: [PATCH 1128/3789] haskell-yesod: update to version 1.2.5

---
 .../libraries/haskell/yesod/default.nix       | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index b4e935428b2..130e6eb9c33 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -1,18 +1,19 @@
-{ cabal, aeson, blazeHtml, blazeMarkup, dataDefault, hamlet
-, monadControl, networkConduit, safe, shakespeareCss, shakespeareJs
-, text, transformers, unorderedContainers, wai, waiExtra, warp
-, yaml, yesodAuth, yesodCore, yesodForm, yesodPersistent
+{ cabal, aeson, blazeHtml, blazeMarkup, dataDefault, fastLogger
+, hamlet, monadControl, monadLogger, networkConduit, safe
+, shakespeareCss, shakespeareJs, text, transformers
+, unorderedContainers, wai, waiExtra, warp, yaml, yesodAuth
+, yesodCore, yesodForm, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.2.4";
-  sha256 = "0c8z4hsplfjb2ilrk0qbyighjipwcfhf55xqaw4zqvq752yj4n7c";
+  version = "1.2.5";
+  sha256 = "0vcszhd8vasfpm754bz1vyarhlkffj3kbrfcq9q5gqmm389jfpk2";
   buildDepends = [
-    aeson blazeHtml blazeMarkup dataDefault hamlet monadControl
-    networkConduit safe shakespeareCss shakespeareJs text transformers
-    unorderedContainers wai waiExtra warp yaml yesodAuth yesodCore
-    yesodForm yesodPersistent
+    aeson blazeHtml blazeMarkup dataDefault fastLogger hamlet
+    monadControl monadLogger networkConduit safe shakespeareCss
+    shakespeareJs text transformers unorderedContainers wai waiExtra
+    warp yaml yesodAuth yesodCore yesodForm yesodPersistent
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
-- 
GitLab


From 941b61b9f0e25f523224d12e2e0c3f1fe9bae8a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:52 +0100
Subject: [PATCH 1129/3789] haskell-zip-archive: update to version 0.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 bfe648f449b..2d18fcd1f83 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";
-  sha256 = "0d2n8mgfikyjzc4x7qm3vvpmhhf3mva9f0q6p9l1q9b7dlf8vmdv";
+  version = "0.2.1";
+  sha256 = "1w58fg3kzbsgscadwx3k34xbq7d7hzghlv4mxyglaxn3qdcd6w8b";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ binary digest filepath mtl text time zlib ];
-- 
GitLab


From f687687e7d466bcfd958010b350db9e1fc204a3b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:06:54 +0100
Subject: [PATCH 1130/3789] haskell-cpphs: update to version 1.18

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

diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
index e5c9df96aab..4ec9358a388 100644
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cpphs";
-  version = "1.17.1";
-  sha256 = "1xk1gk3skgiy6bc8rdhm7i3f6b5nqsm9nz6qswbxq94nxmw3pg9p";
+  version = "1.18";
+  sha256 = "0b5hpqbzvw5dzkbjxqyc2d7ll2c6zf9wd8k182zhvz3kyxmkvs2s";
   isLibrary = true;
   isExecutable = true;
   meta = {
-- 
GitLab


From d6d943b31fe1c676731763c0bc0c401e8c1b35d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:11:24 +0100
Subject: [PATCH 1131/3789] haskell-parsers: update to version 0.10.3

---
 .../libraries/haskell/parsers/{0.10.2.nix => 0.10.3.nix}      | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/parsers/{0.10.2.nix => 0.10.3.nix} (84%)

diff --git a/pkgs/development/libraries/haskell/parsers/0.10.2.nix b/pkgs/development/libraries/haskell/parsers/0.10.3.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/parsers/0.10.2.nix
rename to pkgs/development/libraries/haskell/parsers/0.10.3.nix
index 406cb610a3e..84e5619167a 100644
--- a/pkgs/development/libraries/haskell/parsers/0.10.2.nix
+++ b/pkgs/development/libraries/haskell/parsers/0.10.3.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "parsers";
-  version = "0.10.2";
-  sha256 = "092wck874sdyyh4aql5kzsm8k9a7dscgndvzarhh98by5k3n45bk";
+  version = "0.10.3";
+  sha256 = "1s9n59q77h0w1csq7yh945b53847a9hnpvviashgxyi7ahvw7jli";
   buildDepends = [
     charset parsec text transformers unorderedContainers
   ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2d23a269ebf..2de47d2ceae 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1852,8 +1852,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   parsec  = self.parsec3;
 
   parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {};
-  parsers_0_10_2 = callPackage ../development/libraries/haskell/parsers/0.10.2.nix {};
-  parsers = self.parsers_0_10_2;
+  parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {};
+  parsers = self.parsers_0_10_3;
 
   parsimony = callPackage ../development/libraries/haskell/parsimony {};
 
-- 
GitLab


From 7d3cda336f40c0fa2fa87dd2686eb16eed801cb5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 11:40:31 +0100
Subject: [PATCH 1132/3789] haskell-Zwaluw: drop obsolete package

This package doesn't compile and hasn't seen an update in ages.
---
 .../libraries/haskell/Zwaluw/default.nix           | 14 --------------
 pkgs/top-level/haskell-packages.nix                |  2 --
 2 files changed, 16 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/Zwaluw/default.nix

diff --git a/pkgs/development/libraries/haskell/Zwaluw/default.nix b/pkgs/development/libraries/haskell/Zwaluw/default.nix
deleted file mode 100644
index 1cb214b94b0..00000000000
--- a/pkgs/development/libraries/haskell/Zwaluw/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "Zwaluw";
-  version = "0.1";
-  sha256 = "1crvcvni5gzpc1c6cnaqqp0gng1l9gk9d8ac23967nvp82xav7s1";
-  meta = {
-    homepage = "https://github.com/MedeaMelana/Zwaluw";
-    description = "Combinators for bidirectional URL routing";
-    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 2de47d2ceae..e7c4e892a9f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2679,8 +2679,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {};
 
-  Zwaluw = callPackage ../development/libraries/haskell/Zwaluw {};
-
   # Compilers.
 
   AgdaExecutable = callPackage ../development/compilers/Agda-executable {};
-- 
GitLab


From 27ea519caf37570221c41c84ee15320831872ceb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 12:19:35 +0100
Subject: [PATCH 1133/3789] Update haskell-llvm-* (and use full version numbers
 in their attribute names, like all other Haskell packages do)

---
 .../llvm-general-pure/{3.3.nix => 3.3.8.2.nix} |  0
 .../llvm-general-pure/{3.4.nix => 3.4.1.0.nix} |  4 ++--
 .../llvm-general/{3.3.nix => 3.3.8.2.nix}      |  0
 .../llvm-general/{3.4.nix => 3.4.1.0.nix}      |  4 ++--
 pkgs/top-level/haskell-packages.nix            | 18 +++++++++---------
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename pkgs/development/libraries/haskell/llvm-general-pure/{3.3.nix => 3.3.8.2.nix} (100%)
 rename pkgs/development/libraries/haskell/llvm-general-pure/{3.4.nix => 3.4.1.0.nix} (86%)
 rename pkgs/development/libraries/haskell/llvm-general/{3.3.nix => 3.3.8.2.nix} (100%)
 rename pkgs/development/libraries/haskell/llvm-general/{3.4.nix => 3.4.1.0.nix} (88%)

diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix
rename to pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix
diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix
similarity index 86%
rename from pkgs/development/libraries/haskell/llvm-general-pure/3.4.nix
rename to pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix
index 71947f00a23..200d8d00b44 100644
--- a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.nix
+++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "llvm-general-pure";
-  version = "3.4.0.0";
-  sha256 = "1b8nl4w16w6dsszmnvylrysi4fd86jcn2bvv531d13p81ybnxlx1";
+  version = "3.4.1.0";
+  sha256 = "0cjzqw9k6x8akbgx4rdigvhjhfv9zlq40p789invdc514qmxhr6q";
   buildDepends = [ mtl parsec setenv transformers ];
   testDepends = [
     HUnit mtl QuickCheck testFramework testFrameworkHunit
diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.nix b/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/llvm-general/3.3.nix
rename to pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix
diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.nix b/pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix
similarity index 88%
rename from pkgs/development/libraries/haskell/llvm-general/3.4.nix
rename to pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix
index 7749c47689e..b86a65618cd 100644
--- a/pkgs/development/libraries/haskell/llvm-general/3.4.nix
+++ b/pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "llvm-general";
-  version = "3.4.0.0";
-  sha256 = "1hj96wkgdqyvckgmk7r43n9s9fcq4gijnv0ghrj92ggd13hhmv7b";
+  version = "3.4.1.0";
+  sha256 = "0vh0bqkkahafhiv1sqvrncxswvz4rvb2zfwf33936fnnh5vn8vyp";
   buildDepends = [
     llvmGeneralPure mtl parsec setenv transformers utf8String
   ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e7c4e892a9f..fd697471fa2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1588,18 +1588,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   ListZipper = callPackage ../development/libraries/haskell/ListZipper {};
 
   # Needed for idris for now
-  llvmGeneral_3_3 = callPackage ../development/libraries/haskell/llvm-general/3.3.nix {
+  llvmGeneral_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general/3.3.8.2.nix {
     llvmConfig = pkgs.llvm_33;
-    llvmGeneralPure = self.llvmGeneralPure_3_3;
+    llvmGeneralPure = self.llvmGeneralPure_3_3_8_2;
   };
-  llvmGeneral_3_4 = callPackage ../development/libraries/haskell/llvm-general/3.4.nix {
+  llvmGeneral_3_4_1_0 = callPackage ../development/libraries/haskell/llvm-general/3.4.1.0.nix {
     llvmConfig = pkgs.llvm;
   };
-  llvmGeneral = self.llvmGeneral_3_4;
+  llvmGeneral = self.llvmGeneral_3_4_1_0;
 
-  llvmGeneralPure_3_3 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.nix { };
-  llvmGeneralPure_3_4 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.nix {};
-  llvmGeneralPure = self.llvmGeneralPure_3_4;
+  llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix { };
+  llvmGeneralPure_3_4_1_0 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.1.0.nix {};
+  llvmGeneralPure = self.llvmGeneralPure_3_4_1_0;
 
   lrucache = callPackage ../development/libraries/haskell/lrucache {};
 
@@ -2766,8 +2766,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   idris_plain = callPackage ../development/compilers/idris {
     parsers = self.parsers_0_9;
     trifecta = self.trifecta_1_1;
-    llvmGeneral = self.llvmGeneral_3_3;
-    llvmGeneralPure = self.llvmGeneralPure_3_3;
+    llvmGeneral = self.llvmGeneral_3_3_8_2;
+    llvmGeneralPure = self.llvmGeneralPure_3_3_8_2;
   };
 
   idris = callPackage ../development/compilers/idris/wrapper.nix {};
-- 
GitLab


From 161d029d7d3850648ab6d0df520584fd91d30409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 10 Feb 2014 21:03:17 +0100
Subject: [PATCH 1134/3789] preferLocalBuild: set to true for wrappers and
 fetchers

---
 pkgs/applications/misc/zathura/default.nix                      | 2 ++
 pkgs/applications/networking/browsers/firefox/wrapper.nix       | 2 ++
 .../browsers/mozilla-plugins/nspluginwrapper/default.nix        | 2 ++
 pkgs/build-support/clang-wrapper/default.nix                    | 2 ++
 pkgs/build-support/fetchgit/default.nix                         | 2 ++
 pkgs/build-support/fetchsvn/default.nix                         | 2 ++
 pkgs/build-support/gcc-wrapper/default.nix                      | 2 ++
 pkgs/build-support/kdewrapper/default.nix                       | 2 ++
 pkgs/data/fonts/fontWrap/default.nix                            | 1 +
 pkgs/development/interpreters/python/python-linkme-wrapper.nix  | 2 ++
 pkgs/development/libraries/boost/header-only-wrapper.nix        | 2 ++
 pkgs/development/libraries/xlibs-wrapper/default.nix            | 2 ++
 pkgs/development/lisp-modules/clwrapper/default.nix             | 2 ++
 pkgs/tools/typesetting/tex/texlive/aggregate.nix                | 2 ++
 14 files changed, 27 insertions(+)

diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index 74288657fb3..2ee32f77c1e 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -33,6 +33,8 @@ rec {
 
     builder = ./builder.sh;
 
+    preferLocalBuild = true;
+
     meta = {
       homepage = http://pwmt.org/projects/zathura/;
       description = "A highly customizable and functional PDF viewer";
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index bf4c7f3e7d2..3a73afe48c5 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -40,6 +40,8 @@ stdenv.mkDerivation {
     echo ${browser} > $out/nix-support/propagated-user-env-packages
   '';
 
+  preferLocalBuild = true;
+
   # Let each plugin tell us (through its `mozillaPlugin') attribute
   # where to find the plugin in its tree.
   plugins = map (x: x + x.mozillaPlugin) plugins;
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
index 7cb1abf3153..51511621dce 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [which pkgconfig file glib gtk2 gtk3 curl];
 
+  preferLocalBuild = true;
+
   meta = {
     description = ''A wrapper to run browser plugins out-of-process'';
     homepage = "http://nspluginwrapper.org/";
diff --git a/pkgs/build-support/clang-wrapper/default.nix b/pkgs/build-support/clang-wrapper/default.nix
index 49ee34e9926..4b2a5a1182e 100644
--- a/pkgs/build-support/clang-wrapper/default.nix
+++ b/pkgs/build-support/clang-wrapper/default.nix
@@ -84,4 +84,6 @@ stdenv.mkDerivation {
        if stdenv.system == "mips64el-linux" then "ld.so.1" else
        abort "don't know the name of the dynamic linker for this platform")
     else "";
+
+  preferLocalBuild = true;
 }
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index e94e4185936..01424bae30b 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -44,5 +44,7 @@ stdenv.mkDerivation {
     # by definition pure.
     "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
     ];
+
+  preferLocalBuild = true;
 }
 
diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix
index 30625a758f8..228a5eaa580 100644
--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/pkgs/build-support/fetchsvn/default.nix
@@ -40,4 +40,6 @@ stdenv.mkDerivation {
     # by definition pure.
     "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
     ];
+
+  preferLocalBuild = true;
 }
diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
index 1f521f40585..55c6571bcf5 100644
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@@ -92,4 +92,6 @@ stdenv.mkDerivation {
        if stdenv.system == "mips64el-linux" then "ld.so.1" else
        abort "don't know the name of the dynamic linker for this platform")
     else "";
+
+  preferLocalBuild = true;
 }
diff --git a/pkgs/build-support/kdewrapper/default.nix b/pkgs/build-support/kdewrapper/default.nix
index be90011f493..6dcf68a324a 100644
--- a/pkgs/build-support/kdewrapper/default.nix
+++ b/pkgs/build-support/kdewrapper/default.nix
@@ -39,4 +39,6 @@ stdenv.mkDerivation {
     chmod +x $PROG
     done
   '';
+
+  preferLocalBuild = true;
 }
diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix
index 0d6750614d4..a7bf1ce0ce9 100644
--- a/pkgs/data/fonts/fontWrap/default.nix
+++ b/pkgs/data/fonts/fontWrap/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
 	name = "wrapped-font-dir";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [ doInstall doForceShare doPropagate]);
+  preferLocalBuild = true;
 	meta = {
 		description = "
 		Just a wrapper to create fonts.dir and fonts.scale .
diff --git a/pkgs/development/interpreters/python/python-linkme-wrapper.nix b/pkgs/development/interpreters/python/python-linkme-wrapper.nix
index 8d783a8c11e..040dd7531a2 100644
--- a/pkgs/development/interpreters/python/python-linkme-wrapper.nix
+++ b/pkgs/development/interpreters/python/python-linkme-wrapper.nix
@@ -10,4 +10,6 @@ stdenv.mkDerivation {
     cat ${./python-linkme-wrapper.sh} >  $out/bin/.python-linkme-wrapper
     chmod +x $out/bin/.python-linkme-wrapper
   '';
+
+  preferLocalBuild = true;
 }
diff --git a/pkgs/development/libraries/boost/header-only-wrapper.nix b/pkgs/development/libraries/boost/header-only-wrapper.nix
index 6027ea5c393..96c9216a371 100644
--- a/pkgs/development/libraries/boost/header-only-wrapper.nix
+++ b/pkgs/development/libraries/boost/header-only-wrapper.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation {
     tar xf $src -C $out/include --strip-components=1 ${pkgid}/boost
   '';
 
+  preferLocalBuild = true;
+
   meta = {
     homepage = "http://boost.org/";
     description = "Boost C++ Library Collection";
diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix
index 07220d6e1a6..fcdab133e2f 100644
--- a/pkgs/development/libraries/xlibs-wrapper/default.nix
+++ b/pkgs/development/libraries/xlibs-wrapper/default.nix
@@ -6,6 +6,8 @@ stdenv.mkDerivation {
   installPhase = "mkdir -p $out";
   unpackPhase = "sourceRoot=.";
   propagatedBuildInputs = packages;
+
+  preferLocalBuild = true;
 } // {
   # For compatability with XFree86.
   buildClientLibs = true;
diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix
index 0ae4ce13064..efaadf5606e 100644
--- a/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation {
 
   phases="installPhase fixupPhase";
 
+  preferLocalBuild = true;
+
   passthru = {
     inherit lisp;
   };
diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
index 2d1de93fed8..e001a36cab0 100644
--- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix
+++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
@@ -68,6 +68,8 @@ rec {
     done
   '' ) [ "minInit" "defEnsureDir" "addInputs" ];
 
+  preferLocalBuild = true;
+
   meta = {
     description = "TeX distribution directory";
     longDescription = ''
-- 
GitLab


From 30e1186a0c3c3633af58a734be0cba3c37f3eb5b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Feb 2014 21:42:02 +0100
Subject: [PATCH 1135/3789] haskell-git-annex: update to version 5.20140210

---
 .../version-management/git-and-tools/git-annex/default.nix   | 5 +++--
 1 file changed, 3 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 7a8d6995265..fb00474e567 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
@@ -15,8 +15,8 @@
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140129";
-  sha256 = "0m1n3m16gvd0693i5xq5adki0hd0wdn7p5vqjxkqnc3imx9f11ng";
+  version = "5.20140210";
+  sha256 = "0l5fny743v27yv7spppms64qca0mizh776b6wv8wca0wmcbc6j88";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -53,6 +53,7 @@ cabal.mkDerivation (self: {
     cp dist/build/git-annex/git-annex git-annex
     ./git-annex test
   '';
+  propagatedUserEnvPkgs = [git lsof];
   meta = {
     homepage = "http://git-annex.branchable.com/";
     description = "manage files with git, without checking their contents into git";
-- 
GitLab


From 4c9c7f6ba41f92c7d5ed86e27c3f66486ef6ecae Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 11 Feb 2014 01:23:59 +0400
Subject: [PATCH 1136/3789] Add an option to change vsftpd anonymos write
 umask.

---
 nixos/modules/services/networking/vsftpd.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix
index 1c77cc6df4e..763fa8dc3c4 100644
--- a/nixos/modules/services/networking/vsftpd.nix
+++ b/nixos/modules/services/networking/vsftpd.nix
@@ -91,6 +91,7 @@ let
       ${optionalString (pkgs.stdenv.system == "x86_64-linux") ''
         seccomp_sandbox=NO
       ''}
+      anon_umask=${cfg.anonymousUmask}
     '';
 
 in
@@ -139,6 +140,13 @@ in
         description = "RSA certificate file.";
       };
 
+      anonymousUmask = mkOption {
+        type = types.string;
+        default = "077";
+        example = "002";
+        description = "Anonymous write umask.";
+      };
+
     } // (listToAttrs (catAttrs "nixosOption" optionDescription));
 
   };
-- 
GitLab


From 91b5aa7e1001f5b6de127559b98edc9501553b7a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 11 Feb 2014 01:33:57 +0400
Subject: [PATCH 1137/3789] Add some packages needed by some generic HP PCL
 drivers

---
 nixos/modules/services/printing/cupsd.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 1be3587c3bb..fb8923e107a 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -143,7 +143,9 @@ in
       };
 
     services.printing.drivers =
-      [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends pkgs.perl pkgs.coreutils pkgs.gnused ];
+      [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends
+        pkgs.perl pkgs.coreutils pkgs.gnused pkgs.bc pkgs.gawk pkgs.gnugrep
+	];
 
     services.printing.cupsdConf =
       ''
-- 
GitLab


From e31523a369a012c4dc102d3b4e8ad52587a928c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 10 Feb 2014 23:32:55 +0100
Subject: [PATCH 1138/3789] preferLocalBuild: revert a stdenv change

---
 pkgs/build-support/gcc-wrapper/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
index 55c6571bcf5..1f521f40585 100644
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@@ -92,6 +92,4 @@ stdenv.mkDerivation {
        if stdenv.system == "mips64el-linux" then "ld.so.1" else
        abort "don't know the name of the dynamic linker for this platform")
     else "";
-
-  preferLocalBuild = true;
 }
-- 
GitLab


From 95c3d664f140aec0c4d21ae1d5f2120b4666ea33 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Mon, 10 Feb 2014 23:27:44 +0800
Subject: [PATCH 1139/3789] google-gflags: add 2.0

---
 .../libraries/google-gflags/default.nix       | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/google-gflags/default.nix

diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/google-gflags/default.nix
new file mode 100644
index 00000000000..3631d4927a3
--- /dev/null
+++ b/pkgs/development/libraries/google-gflags/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "google-gflags-2.0";
+
+  src = fetchurl {
+    url = "https://gflags.googlecode.com/files/gflags-2.0.tar.gz";
+    sha256 = "1mypfahsfy0piavhf7il2jfs1gq7jp6yarl9sq5hhypj34s5sjnf";
+  };
+
+  doCheck = true;
+
+  meta = {
+    description = "A C++ library that implements commandline flags processing";
+    longDescription = ''
+      The gflags package contains a C++ library that implements commandline flags processing.
+      As such it's a replacement for getopt().
+      It was owned by Google. google-gflags project has been renamed to gflags and maintained by new community.
+    '';
+    homepage = https://code.google.com/p/gflags/;
+    license = stdenv.lib.licenses.bsd3;
+
+    maintainers = [ stdenv.lib.maintainers.linquize ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d657ed4435..890432d0390 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4295,6 +4295,8 @@ let
 
   goocanvas = callPackage ../development/libraries/goocanvas { };
 
+  google-gflags = callPackage ../development/libraries/google-gflags { };
+
   gperftools = callPackage ../development/libraries/gperftools { };
 
   gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { });
-- 
GitLab


From 4696dc40339cb7d8840e2f1aad985d4fe755063e Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Tue, 11 Feb 2014 15:56:37 +0800
Subject: [PATCH 1140/3789] portaudio: update to v19_20140130

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

diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index 34d5bac6adb..f405e30433f 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, alsaLib, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "portaudio-19-20111121";
+  name = "portaudio-19-20140130";
   
   src = fetchurl {
-    url = http://www.portaudio.com/archives/pa_stable_v19_20111121.tgz;
-    sha256 = "168vmcag3c5y3zwf7h5298ydh83g72q5bznskrw9cr2h1lrx29lw";
+    url = http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz;
+    sha256 = "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g";
   };
 
   buildInputs = [ pkgconfig ]
-- 
GitLab


From f2a7622a6d29e7f97d1153d3f4c9485e42c2a55d Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 11 Feb 2014 11:56:47 +0100
Subject: [PATCH 1141/3789] Add smtps-gmail Haskell package

---
 .../libraries/haskell/smtps-gmail/default.nix | 23 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/smtps-gmail/default.nix

diff --git a/pkgs/development/libraries/haskell/smtps-gmail/default.nix b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
new file mode 100644
index 00000000000..d41a37d1e5b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
@@ -0,0 +1,23 @@
+{ cabal, base64String, cprngAes, network, tlsExtra, utf8String
+}:
+
+cabal.mkDerivation (self: {
+  pname = "smtps-gmail";
+  version = "1.0.0";
+  sha256 = "0kv5m8rg5z1iic10av3bscdygnph1iab4b22sq3hmx6a93abqkc2";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    base64String cprngAes network tlsExtra utf8String
+  ];
+  meta = {
+    homepage = "https://github.com/enzoh/smtps-gmail";
+    description = "Gmail API";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+  # adding a Setup script as it's needed by nix
+  preConfigure = ''
+    printf "import Distribution.Simple\nmain = defaultMain\n" > Setup.hs
+  '';
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index fd697471fa2..8482a7b2147 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2135,6 +2135,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   smtpMail = callPackage ../development/libraries/haskell/smtp-mail {};
 
+  smtpsGmail = callPackage ../development/libraries/haskell/smtps-gmail {};
+
   snap = callPackage ../development/libraries/haskell/snap/snap.nix {};
 
   snapletAcidState = callPackage ../development/libraries/haskell/snaplet-acid-state {};
-- 
GitLab


From 248161ffeb5ff1ceb61855c88b21a1ab547e1235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 11 Feb 2014 11:55:59 +0100
Subject: [PATCH 1142/3789] Updating irssi_otr and libotr to the latest master
 versions.

According to their few additional commit logs, it's worth it.

I also set libotr to use the latest libgcrypt, related to a comment
in libotr commit. They talk about a libgcrypt fix that will have
more chances to be in the latest libgcrypt.
---
 .../networking/irc/irssi/otr/default.nix      |  6 ++--
 ...opdata-when-sending-message-fragment.patch | 29 -------------------
 pkgs/development/libraries/libotr/default.nix | 23 ++++++---------
 pkgs/top-level/all-packages.nix               |  4 ++-
 4 files changed, 15 insertions(+), 47 deletions(-)
 delete mode 100644 pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch

diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix
index 00a9aa1fc68..988320dd61f 100644
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
 
 let
-  rev = "cab3fc915c";
+  rev = "640e98c74b";
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "irssi-otr-20130601-${rev}";
+  name = "irssi-otr-20131007-${rev}";
   
   src = fetchurl {
     url = "https://github.com/cryptodotis/irssi-otr/tarball/${rev}";
     name = "${name}.tar.gz";
-    sha256 = "0kn9c562zfh36gpcrbpslwjjr78baagdwphczz2d608ndczm1vrk";
+    sha256 = "0d08ianzhy20w0ld8xx7hgrp9psg54l37619pcdpqyrnlzkkdalz";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch b/pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch
deleted file mode 100644
index 2b39d1fee9a..00000000000
--- a/pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dc5f05eb934ebd285e01febb9a4018512db702b1 Mon Sep 17 00:00:00 2001
-From: David Goulet <dgoulet@ev0ke.net>
-Date: Sat, 19 Jan 2013 15:53:23 -0500
-Subject: [PATCH] Fix: pass opdata when sending message fragment
-
-The inject_message callback was missing the opdata when sending message
-fragments.
-
-Signed-off-by: David Goulet <dgoulet@ev0ke.net>
----
- src/message.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/message.c b/src/message.c
-index 7c39529..aa71df2 100644
---- a/src/message.c
-+++ b/src/message.c
-@@ -441,7 +441,7 @@ fragment:
- 	/* Fragment and send according to policy */
- 	if (!err && messagep && *messagep) {
- 	    if (context) {
--		err = fragment_and_send(ops, NULL, context, *messagep,
-+		err = fragment_and_send(ops, opdata, context, *messagep,
- 			fragPolicy, messagep);
- 	    }
- 	}
--- 
-1.7.10.4
-
diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix
index d737b8d9916..560b807dbaf 100644
--- a/pkgs/development/libraries/libotr/default.nix
+++ b/pkgs/development/libraries/libotr/default.nix
@@ -1,23 +1,18 @@
-{stdenv, fetchurl, libgcrypt}:
+{stdenv, fetchgit, libgcrypt, autoconf, automake, libtool}:
 
 stdenv.mkDerivation rec {
-  name = "libotr-4.0.0";
-  src = fetchurl {
-    urls = [
-      "http://www.cypherpunks.ca/otr/${name}.tar.gz"
-      # The site is down at the time of updating to 4.0.0, so I add this url
-      http://ftp.de.debian.org/debian/pool/main/libo/libotr/libotr_4.0.0.orig.tar.gz
-    ];
-    sha256 = "3f911994409898e74527730745ef35ed75c352c695a1822a677a34b2cf0293b4";
+  name = "libotr-20130821-git-f0f8a2";
+  src = fetchgit {
+    url = "http://git.code.sf.net/p/otr/libotr";
+    rev = "f0f8a2";
+    sha256 = "08019r8bnk8f4yx6574jdz217p283ry7dmpqcad2d87yhkdmc3mm";
   };
 
-  # Crashes without it, still not accepted upstream.
-  # Discussed in https://github.com/cryptodotis/irssi-otr/issues/21
-  patches = [ ./0001-Fix-pass-opdata-when-sending-message-fragment.patch ];
-
   NIX_LDFLAGS = "-lssp";
 
-  propagatedBuildInputs = [ libgcrypt ];
+  propagatedBuildInputs = [ libgcrypt autoconf automake libtool ];
+
+  preConfigure = "autoreconf -vfi";
 
   meta = {
     homepage = "http://www.cypherpunks.ca/otr/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 890432d0390..36374308bbb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4935,7 +4935,9 @@ let
 
   libosip_3 = callPackage ../development/libraries/osip/3.nix {};
 
-  libotr = callPackage ../development/libraries/libotr { };
+  libotr = callPackage ../development/libraries/libotr {
+    libgcrypt = libgcrypt_1_6;
+  };
 
   libotr_3_2 = callPackage ../development/libraries/libotr/3.2.nix { };
 
-- 
GitLab


From 8f64e74414e683767e5c603a57007de45c0b0501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 11 Feb 2014 12:32:24 +0100
Subject: [PATCH 1143/3789] Updating fossil to 1.28.

---
 pkgs/applications/version-management/fossil/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 2a669729a9c..c2793190e89 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite, withJson ? true}:
 
 stdenv.mkDerivation {
-  name = "fossil-1.27";
+  name = "fossil-1.28";
 
   src = fetchurl {
-    url = http://www.fossil-scm.org/download/fossil-src-20130911114349.tar.gz;
-    sha256 = "0n40z8bx2311i11zjx2x15lw3q8vzjwvfqzikrjlqnpal4vzd72f";
+    url = http://www.fossil-scm.org/download/fossil-src-20140127173344.tar.gz;
+    sha256 = "105a3f3wiqshmkw8q7f7ask3nm0jkjf0h3h2283qiqlsqfkwb9xc";
   };
 
   buildInputs = [ zlib openssl readline sqlite ];
-- 
GitLab


From 4ab5646417e3cc606281f71027c12ddced8b65b4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 11 Feb 2014 07:00:10 -0500
Subject: [PATCH 1144/3789] Add a keys group with read access to /run/keys

This allows processes running as unprivileged users access to keys they might need
---
 nixos/modules/misc/ids.nix                | 1 +
 nixos/modules/system/boot/stage-2-init.sh | 3 ++-
 nixos/modules/system/boot/systemd.nix     | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 51da1a2cfce..5f8111eb986 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -201,6 +201,7 @@
       openldap = 93;
       connman = 94;
       munin = 95;
+      keys = 96;
 
       # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index e0ff258c0ee..b749172a3ff 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -136,7 +136,8 @@ fi
 # elsehwere)
 if ! mountpoint -q /run/keys; then
     rm -rf /run/keys
-    mkdir -m 0700 /run/keys
+    mkdir -m 0750 /run/keys
+    chown root:keys /run/keys
     mount -t ramfs none /run/keys
 fi
 
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index b575deb24b7..e0773c1fab4 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -645,6 +645,8 @@ in
       '';
 
     # Target for ‘charon send-keys’ to hook into.
+    users.extraGroups.keys.gid = config.ids.gids.keys;
+
     systemd.targets.keys =
       { description = "Security Keys";
       };
-- 
GitLab


From 61eae537091a16e2f438f475ff231f253ad21eda Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 11 Feb 2014 13:26:46 +0100
Subject: [PATCH 1145/3789] Add all AWS regions to EBS AMI creation script.

---
 nixos/maintainers/scripts/ec2/create-ebs-amis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py
index 541eadd7b8c..eab111a2665 100755
--- a/nixos/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/nixos/maintainers/scripts/ec2/create-ebs-amis.py
@@ -203,7 +203,7 @@ f = open("{0}.{1}.ami-id".format(args.region, image_type), "w")
 f.write("{0}".format(ami_id))
 f.close()
 
-for dest in [ 'us-east-1', 'us-west-1', 'us-west-2', 'eu-west-1']:
+for dest in [ 'us-east-1', 'us-west-1', 'us-west-2', 'eu-west-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'sa-east-1']:
     if args.region != dest:
         print >> sys.stderr, "copying image from region {0} to {1}".format(args.region, dest)
         conn = boto.ec2.connect_to_region(dest)
-- 
GitLab


From 884190a23837936813a33a4ae4bdc4c5ee58f349 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 11 Feb 2014 14:19:06 +0100
Subject: [PATCH 1146/3789] nixos: add uid for logcheck and only create a user
 for the default user

---
 nixos/modules/misc/ids.nix                  | 1 +
 nixos/modules/services/logging/logcheck.nix | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 5f8111eb986..6d833551604 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -111,6 +111,7 @@
       memcached = 100;
       cgminer = 101;
       munin = 102;
+      logcheck = 103;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index 2a6a6516f48..ef147f95358 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -208,12 +208,13 @@ in
         mapAttrsToList writeIgnoreRule cfg.ignore
         ++ mapAttrsToList writeIgnoreCronRule cfg.ignoreCron;
 
-    users.extraUsers = singleton
-      { name = cfg.user;
+    users.extraUsers = optionalAttrs (cfg.user == "logcheck") (singleton
+      { name = "logcheck";
+        uid = config.ids.uids.logcheck;
         shell = "/bin/sh";
         description = "Logcheck user account";
         extraGroups = cfg.extraGroups;
-      };
+      });
 
     system.activationScripts.logcheck = ''
       mkdir -m 700 -p /var/{lib,lock}/logcheck
-- 
GitLab


From 8cf797b1b54eb5ac642f600446afc08f690a40bc Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Tue, 11 Feb 2014 23:35:00 +0800
Subject: [PATCH 1147/3789] vala: Update to 0.23.2

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

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 95c37edb09a..8cf5fb9afed 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -4,8 +4,8 @@
 
 let
   major = "0.23";
-  minor = "1";
-  sha256 = "1m8f2d01r4jqp266mk29qsl68lzh7c258cqd5zzbpbryxszlzdfj";
+  minor = "2";
+  sha256 = "0g22ss9qbm3fqhx4fxhsyfmdc5g1hgdw4dz9d37f4489kl0qf8pl";
 in
 stdenv.mkDerivation rec {
   name = "vala-${major}.${minor}";
-- 
GitLab


From 9c616e3bf4d05430d77e208cd56ef8186bab92d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Feb 2014 17:13:36 +0100
Subject: [PATCH 1148/3789] Remove /etc/ca-bundle.crt

Applications should use /etc/ssl/certs/ca-bundle.crt instead.
---
 nixos/modules/security/ca.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index 2e93fb36b45..05cd1c3ecc1 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -10,11 +10,6 @@ with pkgs.lib;
       [ { source = "${pkgs.cacert}/etc/ca-bundle.crt";
           target = "ssl/certs/ca-bundle.crt";
         }
-
-        # Backward compatibility; may remove at some point.
-        { source = "${pkgs.cacert}/etc/ca-bundle.crt";
-          target = "ca-bundle.crt";
-        }
       ];
 
     environment.variables.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
-- 
GitLab


From 70d73236e866a9157aaa65c0aba7a3e4880a823c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 11 Feb 2014 11:48:03 -0500
Subject: [PATCH 1149/3789] Remove now-unneeded old version of haskell-tls

---
 .../libraries/haskell/tls-extra/default.nix   | 21 ----------------
 .../libraries/haskell/tls/1.1.5.nix           | 25 -------------------
 .../haskell/tls/{1.2.2.nix => default.nix}    |  0
 pkgs/top-level/haskell-packages.nix           |  8 +-----
 4 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/tls-extra/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/tls/1.1.5.nix
 rename pkgs/development/libraries/haskell/tls/{1.2.2.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
deleted file mode 100644
index 0fdcaf71d51..00000000000
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ cabal, certificate, cipherAes, cipherRc4, cryptohash
-, cryptoPubkey, cryptoRandom, mtl, network, pem, time, tls, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tls-extra";
-  version = "0.6.6";
-  sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    certificate cipherAes cipherRc4 cryptohash cryptoPubkey
-    cryptoRandom mtl network pem time tls vector
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-tls";
-    description = "TLS extra default values and helpers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tls/1.1.5.nix b/pkgs/development/libraries/haskell/tls/1.1.5.nix
deleted file mode 100644
index 0f354d8b77e..00000000000
--- a/pkgs/development/libraries/haskell/tls/1.1.5.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey
-, cryptoRandom, mtl, network, QuickCheck, testFramework
-, testFrameworkQuickcheck2, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tls";
-  version = "1.1.5";
-  sha256 = "1ja03x3i7dgjpy22h4shnni1xslph8i8q4accqq8njpqpz54c84c";
-  buildDepends = [
-    cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network
-  ];
-  testDepends = [
-    cereal certificate cprngAes cryptoPubkey cryptoRandom mtl
-    QuickCheck testFramework testFrameworkQuickcheck2 time
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-tls";
-    description = "TLS/SSL protocol native implementation (Server and Client)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tls/1.2.2.nix b/pkgs/development/libraries/haskell/tls/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/tls/1.2.2.nix
rename to pkgs/development/libraries/haskell/tls/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8482a7b2147..11c6f9f666c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2386,13 +2386,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   timeCompat = callPackage ../development/libraries/haskell/time-compat {};
 
-  tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {};
-  tls_1_2_2 = callPackage ../development/libraries/haskell/tls/1.2.2.nix {};
-  tls = self.tls_1_2_2;
-
-  tlsExtra = callPackage ../development/libraries/haskell/tls-extra {
-    tls = self.tls_1_1_5;
-  };
+  tls = callPackage ../development/libraries/haskell/tls {};
 
   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
-- 
GitLab


From b2d0c27d0acd3e8d4270038f93e672b1e63a79d6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 11 Feb 2014 13:47:34 -0500
Subject: [PATCH 1150/3789] Revert "Remove now-unneeded old version of
 haskell-tls"

It's used by smtps-gmail

This reverts commit 70d73236e866a9157aaa65c0aba7a3e4880a823c.
---
 .../libraries/haskell/tls-extra/default.nix   | 21 ++++++++++++++++
 .../libraries/haskell/tls/1.1.5.nix           | 25 +++++++++++++++++++
 .../haskell/tls/{default.nix => 1.2.2.nix}    |  0
 pkgs/top-level/haskell-packages.nix           |  8 +++++-
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/tls-extra/default.nix
 create mode 100644 pkgs/development/libraries/haskell/tls/1.1.5.nix
 rename pkgs/development/libraries/haskell/tls/{default.nix => 1.2.2.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
new file mode 100644
index 00000000000..0fdcaf71d51
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -0,0 +1,21 @@
+{ cabal, certificate, cipherAes, cipherRc4, cryptohash
+, cryptoPubkey, cryptoRandom, mtl, network, pem, time, tls, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "tls-extra";
+  version = "0.6.6";
+  sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    certificate cipherAes cipherRc4 cryptohash cryptoPubkey
+    cryptoRandom mtl network pem time tls vector
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-tls";
+    description = "TLS extra default values and helpers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/tls/1.1.5.nix b/pkgs/development/libraries/haskell/tls/1.1.5.nix
new file mode 100644
index 00000000000..0f354d8b77e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tls/1.1.5.nix
@@ -0,0 +1,25 @@
+{ cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey
+, cryptoRandom, mtl, network, QuickCheck, testFramework
+, testFrameworkQuickcheck2, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "tls";
+  version = "1.1.5";
+  sha256 = "1ja03x3i7dgjpy22h4shnni1xslph8i8q4accqq8njpqpz54c84c";
+  buildDepends = [
+    cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network
+  ];
+  testDepends = [
+    cereal certificate cprngAes cryptoPubkey cryptoRandom mtl
+    QuickCheck testFramework testFrameworkQuickcheck2 time
+  ];
+  doCheck = false;
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-tls";
+    description = "TLS/SSL protocol native implementation (Server and Client)";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/1.2.2.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/tls/default.nix
rename to pkgs/development/libraries/haskell/tls/1.2.2.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 11c6f9f666c..8482a7b2147 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2386,7 +2386,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   timeCompat = callPackage ../development/libraries/haskell/time-compat {};
 
-  tls = callPackage ../development/libraries/haskell/tls {};
+  tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {};
+  tls_1_2_2 = callPackage ../development/libraries/haskell/tls/1.2.2.nix {};
+  tls = self.tls_1_2_2;
+
+  tlsExtra = callPackage ../development/libraries/haskell/tls-extra {
+    tls = self.tls_1_1_5;
+  };
 
   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
-- 
GitLab


From 2deb26bd4a0c21d7c5eef54cdd2f4913699efb7c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 11 Feb 2014 13:03:19 -0500
Subject: [PATCH 1151/3789] Pass lib to modules

Since mkOption, types, etc. are defined there, lib is really part of the interface
---
 lib/modules.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index fa31ce6399c..6d9dc0e3ad3 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -12,7 +12,7 @@ rec {
      and ‘config’: the nested set of all option values. */
   evalModules = { modules, prefix ? [], args ? {}, check ? true }:
     let
-      args' = args // result;
+      args' = args // { lib = import ./.; } // result;
       closed = closeModules modules args';
       # Note: the list of modules is reversed to maintain backward
       # compatibility with the old module system.  Not sure if this is
-- 
GitLab


From ca1c5cfa8fff055c74786dbe0d2ca889ae462365 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 11 Feb 2014 14:21:34 -0500
Subject: [PATCH 1152/3789] Add nixosSubmodule option type

Since NixOS modules expect special arguments, use a hack to provide them
---
 lib/types.nix                               | 19 +++++++++++++++++++
 nixos/modules/virtualisation/containers.nix |  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index afc8f80eb0e..ac84ef29611 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -195,6 +195,25 @@ rec {
             args = { name = ""; }; }).options;
       };
 
+    nixosSubmodule = nixos: args: mkOptionType rec {
+      name = "submodule containing a NixOS config";
+      check = x: isAttrs x || isFunction x;
+      merge = loc: defs:
+        let
+          coerce = def: if isFunction def then def else { config = def; };
+        in (import (nixos + "/lib/eval-config.nix") (args // {
+          modules = (args.modules or []) ++
+            map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;
+
+          prefix = loc;
+        })).config;
+      getSubOptions = prefix: (import (nixos + "/lib/eval-config.nix") (args // {
+        modules = (args.modules or []);
+
+        inherit prefix;
+      })).options;
+    };
+
     # Obsolete alternative to configOf.  It takes its option
     # declarations from the ‘options’ attribute of containing option
     # declaration.
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index bcbfaacd703..531ee559663 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -15,6 +15,7 @@ with pkgs.lib;
     };
 
     systemd.containers = mkOption {
+      # !!! Should probably use nixosSubmodule here
       type = types.attrsOf (types.submodule (
         { config, options, name, ... }:
         {
@@ -134,4 +135,4 @@ with pkgs.lib;
       }) config.systemd.containers;
 
   };
-}
\ No newline at end of file
+}
-- 
GitLab


From 8764758044b0425de54228d87cc68a4ed6d4d414 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 11 Feb 2014 14:39:46 -0500
Subject: [PATCH 1153/3789] Add option type for a submodule with extra
 arguments

---
 lib/types.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index ac84ef29611..77957a7763b 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -176,7 +176,7 @@ rec {
       getSubOptions = elemType.getSubOptions;
     };
 
-    submodule = opts:
+    submoduleWithExtraArgs = extraArgs: opts:
       let
         opts' = toList opts;
         inherit (import ./modules.nix) evalModules;
@@ -188,13 +188,16 @@ rec {
           let
             coerce = def: if isFunction def then def else { config = def; };
             modules = opts' ++ map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;
-          in (evalModules { inherit modules; args.name = last loc; prefix = loc; }).config;
+            args = extraArgs // { name = last loc; };
+          in (evalModules { inherit modules args; prefix = loc; }).config;
         getSubOptions = prefix: (evalModules
           { modules = opts'; inherit prefix;
             # FIXME: hack to get shit to evaluate.
-            args = { name = ""; }; }).options;
+            args = extraArgs // { name = ""; }; }).options;
       };
 
+    submodule = submoduleWithExtraArgs {};
+
     nixosSubmodule = nixos: args: mkOptionType rec {
       name = "submodule containing a NixOS config";
       check = x: isAttrs x || isFunction x;
-- 
GitLab


From 3f70dabad320b115d586a59db8cca05c7f3b7c75 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 11 Feb 2014 14:59:24 -0500
Subject: [PATCH 1154/3789] Add heterogeneousAttrsOf option type

It is parameterized by a function that takes a name and evaluates to the
option type for the attribute of that name. Together with
submoduleWithExtraArgs, this subsumes nixosSubmodule.
---
 lib/types.nix                               | 30 ++++++++-------------
 nixos/modules/virtualisation/containers.nix |  1 -
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index 77957a7763b..e9302688d5c 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -124,6 +124,17 @@ rec {
       getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name>"]);
     };
 
+    heterogeneousAttrsOf = elemTypeFn: mkOptionType {
+      name = "attribute set of values of many types, including ${(elemTypeFn "<name>").name}";
+      check = x: isAttrs x && all (name: (elemTypeFn name).check (getAttr name x)) (attrNames x);
+      merge = loc: defs:
+        zipAttrsWith (name: (elemTypeFn name).merge (loc ++ [name]))
+          # Push down position info.
+          (map (def: listToAttrs (mapAttrsToList (n: def':
+            { name = n; value = { inherit (def) file; value = def'; }; }) def.value)) defs);
+      getSubOptions = prefix: (elemTypeFn "<name>").getSubOptions (prefix ++ ["<name>"]);
+    };
+
     # List or attribute set of ...
     loaOf = elemType:
       let
@@ -198,25 +209,6 @@ rec {
 
     submodule = submoduleWithExtraArgs {};
 
-    nixosSubmodule = nixos: args: mkOptionType rec {
-      name = "submodule containing a NixOS config";
-      check = x: isAttrs x || isFunction x;
-      merge = loc: defs:
-        let
-          coerce = def: if isFunction def then def else { config = def; };
-        in (import (nixos + "/lib/eval-config.nix") (args // {
-          modules = (args.modules or []) ++
-            map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;
-
-          prefix = loc;
-        })).config;
-      getSubOptions = prefix: (import (nixos + "/lib/eval-config.nix") (args // {
-        modules = (args.modules or []);
-
-        inherit prefix;
-      })).options;
-    };
-
     # Obsolete alternative to configOf.  It takes its option
     # declarations from the ‘options’ attribute of containing option
     # declaration.
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 531ee559663..99451e2bd3c 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -15,7 +15,6 @@ with pkgs.lib;
     };
 
     systemd.containers = mkOption {
-      # !!! Should probably use nixosSubmodule here
       type = types.attrsOf (types.submodule (
         { config, options, name, ... }:
         {
-- 
GitLab


From 0774192dd38c0c769628c3fb9e5836d6fba6cecc Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Sun, 24 Mar 2013 14:38:43 -0430
Subject: [PATCH 1155/3789] xmlstarlet: advance version to 1.5.0

---
 pkgs/tools/text/xml/xmlstarlet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix
index ffeb9a8cd7c..db7ebfbb77a 100644
--- a/pkgs/tools/text/xml/xmlstarlet/default.nix
+++ b/pkgs/tools/text/xml/xmlstarlet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libxml2, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "xmlstarlet-1.0.2";
+  name = "xmlstarlet-1.5.0";
   
   src = fetchurl {
     url = "mirror://sourceforge/xmlstar/${name}.tar.gz";
-    sha256 = "07a5c3fhqpvyy07pggl3ky7ahvlcpsmppy71x4h4albvanfbpjwj";
+    sha256 = "1fmvqvzrzyfcg53j39sdz01v7klzyhd011m3y9br54525q2fvd27";
   };
 
   buildInputs = [ pkgconfig libxml2 libxslt ];
-- 
GitLab


From 671a36963436508757c74f12ddcfd1ac78842332 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 11 Feb 2014 23:46:46 +0000
Subject: [PATCH 1156/3789] add phantomjs to darwin platform

---
 pkgs/development/tools/phantomjs/default.nix | 26 +++++++++++++-------
 pkgs/top-level/all-packages.nix              |  6 ++++-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix
index ef07d04212b..6fc53595efb 100644
--- a/pkgs/development/tools/phantomjs/default.nix
+++ b/pkgs/development/tools/phantomjs/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, freetype, fontconfig, openssl }:
+{ stdenv, fetchurl, freetype, fontconfig, openssl, unzip }:
 
-assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" ];
+assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
 
 stdenv.mkDerivation rec {
   name = "phantomjs-1.9.7";
@@ -15,13 +15,21 @@ stdenv.mkDerivation rec {
             url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-i686.tar.bz2";
             sha256 = "1ffd5544wnkww5cgwsims4bk4bymvm6pm19p32nbhwabxqhbnj9a";
           }
-        else # x86_64-linux
-          fetchurl {
-            url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-x86_64.tar.bz2";
-            sha256 = "06mhvj8rx298j0mrijw48zfm28hqgy81vdr1vv0jp4ncxbvijfs7";
-          };
+        else
+          if stdenv.system == "x86_64-linux" then
+            fetchurl {
+              url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-x86_64.tar.bz2";
+              sha256 = "06mhvj8rx298j0mrijw48zfm28hqgy81vdr1vv0jp4ncxbvijfs7";
+            }
+          else # x86_64-darwin
+            fetchurl {
+              url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-macosx.zip";
+              sha256 = "0vsagvx181gnypi6kgmxp4br6hnvd81vyy3cbz5pxccdys7iywvj";
+            };
+
+  buildInputs = if stdenv.isDarwin then [ unzip ] else [];
 
-  buildPhase = ''
+  buildPhase = if stdenv.isDarwin then "" else ''
     patchelf \
       --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
       --set-rpath "${freetype}/lib:${fontconfig}/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${openssl}/lib" \
@@ -55,6 +63,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd3;
 
     maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
-    platforms = ["i686-linux" "x86_64-linux" ];
+    platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36374308bbb..a3ab10fdeef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3685,7 +3685,11 @@ let
 
   peg = callPackage ../development/tools/parsing/peg { };
 
-  phantomjs = callPackage ../development/tools/phantomjs { };
+  phantomjs = callPackage ../development/tools/phantomjs {
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
 
   pmccabe = callPackage ../development/tools/misc/pmccabe { };
 
-- 
GitLab


From 5181713002e2920684fa46f70020102af8a0aa20 Mon Sep 17 00:00:00 2001
From: PkmX <pkmx.tw@gmail.com>
Date: Wed, 12 Feb 2014 11:24:06 +0800
Subject: [PATCH 1157/3789] Add myself to maintainers and metadata to wqy-*.

---
 lib/maintainers.nix                      | 1 +
 pkgs/data/fonts/wqy-microhei/default.nix | 3 +++
 pkgs/data/fonts/wqy-zenhei/default.nix   | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fa0d1d81e61..8b53c8ae738 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -49,6 +49,7 @@
   phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
   pierron = "Nicolas B. Pierron <nixos@nbp.name>";
   piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";
+  pkmx = "Chih-Mao Chen <pkmx.tw@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/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix
index 97638cb008c..1d3b3e6d82d 100644
--- a/pkgs/data/fonts/wqy-microhei/default.nix
+++ b/pkgs/data/fonts/wqy-microhei/default.nix
@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A (mainly) Chinese Unicode font";
+    homepage = "http://wenq.org";
+    license = "gplv2"; # with font embedding exceptions
+    maintainers = stdenv.lib.maintainers.pkmx;
   };
 }
 
diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix
index 993e584a7d4..e317b863db3 100644
--- a/pkgs/data/fonts/wqy-zenhei/default.nix
+++ b/pkgs/data/fonts/wqy-zenhei/default.nix
@@ -19,6 +19,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A (mainly) Chinese Unicode font";
+    homepage = "http://wenq.org";
+    license = "gplv2"; # with font embedding exceptions
+    maintainers = stdenv.lib.maintainers.pkmx;
   };
 }
 
-- 
GitLab


From 0ce54a4768f92636c91bedd1c5197b7b1a75b8a8 Mon Sep 17 00:00:00 2001
From: PkmX <pkmx.tw@gmail.com>
Date: Wed, 12 Feb 2014 11:27:02 +0800
Subject: [PATCH 1158/3789] wqy-microhei: squash installPhase into one line.

---
 pkgs/data/fonts/wqy-microhei/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix
index 1d3b3e6d82d..506dd895d6a 100644
--- a/pkgs/data/fonts/wqy-microhei/default.nix
+++ b/pkgs/data/fonts/wqy-microhei/default.nix
@@ -8,10 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0gi1yxqph8xx869ichpzzxvx6y50wda5hi77lrpacdma4f0aq0i8";
   };
 
-  installPhase =
-    ''
-      install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc
-    '';
+  installPhase = ''install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc'';
 
   meta = {
     description = "A (mainly) Chinese Unicode font";
-- 
GitLab


From b2f9e1d4f7fba0f1fce3908b9fc12765e20ba22c Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Tue, 11 Feb 2014 10:44:59 -0430
Subject: [PATCH 1159/3789] nvidia-x11: bump version and add patch for kernel
 3.13

---
 pkgs/os-specific/linux/nvidia-x11/default.nix |   8 +-
 .../linux/nvidia-x11/kernel-3.13.patch        | 122 ++++++++++++++++++
 2 files changed, 127 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/os-specific/linux/nvidia-x11/kernel-3.13.patch

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index c89e5550f3e..98bbaef8770 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -10,7 +10,7 @@ with stdenv.lib;
 
 let
 
-  versionNumber = "331.20";
+  versionNumber = "331.38";
 
 in
 
@@ -19,16 +19,18 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
 
+  patches = optional (versionAtLeast kernel.version "3.13") ./kernel-3.13.patch ;
+
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "0icpmfsppnsvk7vj0fshi3ry4s1wix435s2c8wwak47765fv1mks";
+        sha256 = "1x1b70lnw2ipwlyff7czxqrgz8yyq87djzgmgs9p3lmczy7lsvir";
       }
     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 = "02503dis3ngraqv7174a4pay2x08hp697n9q74rpjjclf5k74ax1";
+        sha256 = "1ljafiqnyhj355mjp3r8wmb806xm6mbrn0x1dfgqh5pv9imhszhp";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/kernel-3.13.patch b/pkgs/os-specific/linux/nvidia-x11/kernel-3.13.patch
new file mode 100644
index 00000000000..477ac1369e0
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/kernel-3.13.patch
@@ -0,0 +1,122 @@
+diff -rupN NVIDIA-Linux-x86_64-331.38.orig/kernel/nv-acpi.c NVIDIA-Linux-x86_64-331.38/kernel/nv-acpi.c
+--- NVIDIA-Linux-x86_64-331.38.orig/kernel/nv-acpi.c	2014-01-25 09:39:47.126966926 +0100
++++ NVIDIA-Linux-x86_64-331.38/kernel/nv-acpi.c	2014-01-26 09:59:45.853427603 +0100
+@@ -303,7 +303,10 @@ static int nv_acpi_remove(struct acpi_de
+ 
+     if (pNvAcpiObject->notify_handler_installed)
+     {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
++ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
+         NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
++#endif
+ 
+         // remove event notifier
+         status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
+@@ -1076,10 +1079,17 @@ RM_STATUS NV_API_CALL nv_acpi_dsm_method
+     NvU8 argument3[4]; /* For all DSM sub functions, input size is 4 */
+     NvU32 data_size;
+     acpi_handle dev_handle  = NULL;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ #ifdef DEVICE_ACPI_HANDLE
+     nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); 
+     dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev);
+ #endif
++#else
++#ifdef ACPI_HANDLE
++    nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); 
++    dev_handle = ACPI_HANDLE(&nvl->dev->dev);
++#endif
++#endif
+ 
+     if (!dev_handle)
+         return RM_ERR_NOT_SUPPORTED;
+@@ -1179,12 +1189,21 @@ RM_STATUS NV_API_CALL nv_acpi_ddc_method
+     NvU32 i;
+     acpi_handle dev_handle  = NULL;
+     acpi_handle lcd_dev_handle  = NULL;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ #ifdef DEVICE_ACPI_HANDLE
+     nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); 
+     dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev);
+ #else
+         return RM_ERR_NOT_SUPPORTED;
+ #endif
++#else
++#ifdef ACPI_HANDLE
++    nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); 
++    dev_handle = ACPI_HANDLE(&nvl->dev->dev);
++#else
++        return RM_ERR_NOT_SUPPORTED;
++#endif
++#endif
+     if (!dev_handle)
+         return RM_ERR_INVALID_ARGUMENT;
+ 
+@@ -1294,12 +1313,21 @@ RM_STATUS NV_API_CALL nv_acpi_rom_method
+     struct acpi_object_list input = { 2, rom_arg };
+     acpi_handle dev_handle  = NULL;
+     uint32_t offset, length;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ #ifdef DEVICE_ACPI_HANDLE
+     nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); 
+-    dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev);
++    dev_handle = ACPI_DEVICE_HANDLE(&nvl->dev->dev);
+ #else
+     return RM_ERR_NOT_SUPPORTED;
+ #endif
++#else
++#ifdef ACPI_HANDLE
++    nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); 
++    dev_handle = ACPI_HANDLE(&nvl->dev->dev);
++#else
++    return RM_ERR_NOT_SUPPORTED;
++#endif
++#endif
+ 
+     if (!dev_handle)
+         return RM_ERR_INVALID_ARGUMENT;
+@@ -1364,12 +1392,21 @@ RM_STATUS NV_API_CALL nv_acpi_dod_method
+     union acpi_object *dod;
+     acpi_handle dev_handle = NULL;
+     NvU32 i, count = (*pSize / sizeof(NvU32));
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ #ifdef DEVICE_ACPI_HANDLE
+     nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
+     dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev);
+ #else
+     return RM_ERR_NOT_SUPPORTED;
+ #endif
++#else
++#ifdef ACPI_HANDLE
++    nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
++    dev_handle = ACPI_HANDLE(&nvl->dev->dev);
++#else
++    return RM_ERR_NOT_SUPPORTED;
++#endif
++#endif
+ 
+     if (!dev_handle)
+         return RM_ERR_INVALID_ARGUMENT;
+diff -rupN NVIDIA-Linux-x86_64-331.38.orig/kernel/uvm/nvidia_uvm_linux.h NVIDIA-Linux-x86_64-331.38/kernel/uvm/nvidia_uvm_linux.h
+--- NVIDIA-Linux-x86_64-331.38.orig/kernel/uvm/nvidia_uvm_linux.h	2014-01-25 09:39:47.172966925 +0100
++++ NVIDIA-Linux-x86_64-331.38/kernel/uvm/nvidia_uvm_linux.h	2014-01-25 09:46:40.572999245 +0100
+@@ -405,11 +405,17 @@ typedef void irqreturn_t;
+ // not require the RCU's read lock on current->cred.
+ //
+ //
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
++#define NV_KUID_TO_UID(value) (__kuid_val(value))
++#else
++#define NV_KUID_TO_UID(value) (value)
++#endif
++
+ #if defined(NV_TASK_STRUCT_HAS_CRED)
+ #define NV_CURRENT_EUID() \
+-    (((typeof(*current->cred) __force __kernel *)current->cred)->euid)
++        NV_KUID_TO_UID(((typeof(*current->cred) __force __kernel *)current->cred)->euid)
+ #else
+-#define NV_CURRENT_EUID() (current->euid)
++#define NV_CURRENT_EUID() NV_KUID_TO_UID(current->euid)
+ #endif
+ 
+ #define NV_ATOMIC_SET(data,val)         atomic_set(&(data), (val))
-- 
GitLab


From 7271eb50e6e4f70dd8a0b78a9894efacf17274f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 12 Feb 2014 12:04:34 +0100
Subject: [PATCH 1160/3789] Add i3minator: i3 project manager similar to
 tmuxinator

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

diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix
new file mode 100644
index 00000000000..2b16dc3b5b7
--- /dev/null
+++ b/pkgs/tools/misc/i3minator/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, buildPythonPackage, pythonPackages, python }:
+
+let
+  i3-py = buildPythonPackage rec {
+    version = "0.6.4";
+    name = "i3-py-${version}";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/i/i3-py/i3-py-${version}.tar.gz";
+      sha256 = "1sgl438jrb4cdyl7hbc3ymwsf7y3zy09g1gh7ynilxpllp37jc8y";
+    };
+
+    # no tests in tarball
+    doCheck = false;
+  };
+in buildPythonPackage rec {
+  name = "i3minator-${version}";
+  version = "0.0.3";
+
+  src = fetchurl {
+    url = "https://github.com/carlesso/i3minator/archive/v${version}.tar.gz";
+    sha256 = "0ksb0frrhq10k5rjzk72kj5rjzak1irr9q4x4f22w2vylxq19xxa";
+  };
+
+  propagatedBuildInputs = [ pythonPackages.pyyaml i3-py ];
+
+  meta = {
+    description = "i3 project manager similar to tmuxinator";
+    longDescription = ''
+      A simple "workspace manager" for i3. It allows to quickly
+      manage workspaces defining windows and their layout. The
+      project is inspired by tmuxinator and uses i3-py.
+    '';
+    homepage = https://github.com/carlesso/i3minator;
+    license = "WTFPL"; # http://sam.zoy.org/wtfpl/
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13de0149ed8..88feaa12091 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8148,6 +8148,8 @@ let
     inherit (xorg) libxkbfile;
     cairo = cairo.override { xcbSupport = true; };
   };
+  
+  i3minator = callPackage ../tools/misc/i3minator { };
 
   i3status = callPackage ../applications/window-managers/i3/status.nix { };
 
-- 
GitLab


From 625b42838a7faf4d1cf72c98963c7d96fe36405f Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Wed, 12 Feb 2014 11:29:18 +0000
Subject: [PATCH 1161/3789] NetworkManager: Fix aliases and dependencies

There are two fixes in this commit.

Firstly, I am creating proper symlinks for the Alias= definitions in the
.service files. This achieves the same result as `systemctl enable`, and
I think is preferred over `mv`.

Secondly, `networkmanager-init` now wants `NetworkManager.service`,
along with `ModemManager.service`. ModemManager does not depend on
NetworkManager (according to `systemctl list-dependencies ModemManager`),
thus NetworkManager never got started on boot.
---
 nixos/modules/services/networking/networkmanager.nix | 4 ++--
 pkgs/tools/networking/network-manager/default.nix    | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 2db96d9cd31..e5213c7fccf 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -89,7 +89,7 @@ in {
           to change network settings to this group.
         '';
       };
-  
+
       packages = mkOption {
         type = types.listOf types.path;
         default = [ ];
@@ -178,7 +178,7 @@ in {
       description = "NetworkManager initialisation";
       wantedBy = [ "network.target" ];
       partOf = [ "NetworkManager.service" ];
-      wants = [ "ModemManager.service" ];
+      wants = [ "ModemManager.service" "NetworkManager.service" ];
       before = [ "NetworkManager.service" ];
       script = ''
         mkdir -m 700 -p /etc/NetworkManager/system-connections
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 3fb0a729dea..6cf842dcafb 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -57,12 +57,14 @@ stdenv.mkDerivation rec {
   postInstall =
     ''
       mkdir -p $out/lib/NetworkManager
-      
+
       # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy
       substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"'
 
-      # As NixOS doesn't seem to handle systemd Aliases, we just rename the dispatcher service file
-      mv $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
+      # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
+      # aliases ourselves.
+      ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
+      ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
     '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 8e97e38677fca507b9f93b4017e23491190eaf92 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 12 Feb 2014 07:13:37 -0500
Subject: [PATCH 1162/3789] Reenable efi tests

---
 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 ed5c4769d0a..419f71bc259 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -44,7 +44,7 @@ in rec {
         (all nixos.iso_graphical)
         (all nixos.ova)
 
-        #(all nixos.tests.efi-installer.simple)
+        (all nixos.tests.efi-installer.simple)
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         (all nixos.tests.installer.grub1)
-- 
GitLab


From 77817b7638d1afe0be0979d70c257deb51a75406 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 12 Feb 2014 08:27:08 -0500
Subject: [PATCH 1163/3789] aws: hardcode perl location

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

diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix
index 00cc4e7733f..27f4ce4476f 100644
--- a/pkgs/tools/virtualization/aws/default.nix
+++ b/pkgs/tools/virtualization/aws/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchurl, perl, curl }:
 
 stdenv.mkDerivation {
   name = "aws-1.75";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   installPhase =
     ''
       mkdir -p $out/bin
-      cp $src $out/bin/aws
+      sed 's|\[curl|[${curl}/bin/curl|g' $src > $out/bin/aws
       chmod +x $out/bin/aws
     '';
 
-- 
GitLab


From 5c9dc83bb909a07e830f0364ba65e0fe0d59b230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 12 Feb 2014 14:39:24 +0100
Subject: [PATCH 1164/3789] vim ft: address the problem with broken
 highlighting in big files

It seems Vim needs to be instructed how to scan for the begining
of the multiline statements to correctly and efficiently highlight
lanuages.

See :help syn-sync-maxlines
---
 pkgs/applications/editors/vim/ft-nix-support.patch | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/ft-nix-support.patch b/pkgs/applications/editors/vim/ft-nix-support.patch
index b2ac423092e..ed508784813 100644
--- a/pkgs/applications/editors/vim/ft-nix-support.patch
+++ b/pkgs/applications/editors/vim/ft-nix-support.patch
@@ -23,7 +23,7 @@ new file mode 100644
 index 0000000..a2f9918
 --- /dev/null
 +++ b/runtime/syntax/nix.vim
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,47 @@
 +" Vim syntax file
 +" Language:	nix
 +" Maintainer:	Marc Weber <marco-oweber@gmx.de>
@@ -68,3 +68,8 @@ index 0000000..a2f9918
 +hi def link nixFuncArg     Identifier
 +
 +let b:current_syntax = "nix"
++
++" scan backwards to find begining of multiline statements
++syn sync ccomment nixMultiLineComment minlines=10 maxlines=500
++syn sync ccomment nixStringIndented minlines=10 maxlines=500
++syn sync ccomment nixString maxlines=10
-- 
GitLab


From ffc30918118dca407016b9716da6d682303b4712 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 12 Feb 2014 09:19:01 -0500
Subject: [PATCH 1165/3789] Add bcdoc pythonPackage

---
 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 6d2605e0f98..0afa08c5f58 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -461,6 +461,23 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   });
 
+  bcdoc = buildPythonPackage rec {
+    name = "bcdoc-0.12.1";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/b/bcdoc/bcdoc-0.12.1.tar.gz";
+      md5 = "7c8617347c294ea4d36ec73fb5b2c26e";
+    };
+
+    buildInputs = [ pythonPackages.docutils pythonPackages.six ];
+
+    meta = {
+      homepage = https://github.com/botocore/bcdoc;
+      license = "Apache License 2.0";
+      description = "ReST document generation tools for botocore";
+    };
+  };
+
   beautifulsoup = buildPythonPackage (rec {
     name = "beautifulsoup-3.2.1";
 
-- 
GitLab


From 6a4e30d8d1fb4b80e4a23c970bc57d7e3270ec11 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 12 Feb 2014 09:29:22 -0500
Subject: [PATCH 1166/3789] Add rsa pythonPackage

---
 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 0afa08c5f58..e7364f8bc1e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6118,6 +6118,23 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
   });
 
+  rsa = buildPythonPackage rec {
+    name = "rsa-3.1.2";
+
+    src = fetchurl {
+      url = "https://bitbucket.org/sybren/python-rsa/get/version-3.1.2.tar.bz2";
+      sha256 = "0ag2q4gaapi74x47q74xhcjzs4b7r2bb6zrj2an4sz5d3yd06cgf";
+    };
+
+    buildInputs = [ pythonPackages.pyasn1 ];
+
+    meta = {
+      homepage = http://stuvel.eu/rsa;
+      license = "Apache License 2.0";
+      description = "A pure-Python RSA implementation";
+    };
+  };
+
   rtslib_fb = buildPythonPackage rec {
     version = "2.1.fb43";
     name = "rtslib-fb-${version}";
-- 
GitLab


From 9332d9ed5c0c5ae2ad2bf47a5f67442a11ac9c1f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 12 Feb 2014 09:33:19 -0500
Subject: [PATCH 1167/3789] Update pythonPackages.jmespath

---
 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 e7364f8bc1e..b300f0c9c75 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3300,11 +3300,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   jmespath = buildPythonPackage rec {
-    name = "jmespath-0.0.2";
+    name = "jmespath-0.2.1";
 
     src = fetchurl {
-      url = "https://github.com/boto/jmespath/archive/0.0.2.tar.gz";
-      sha256 = "0wr1gq3gdyn3n21pvj62csdm095512zxd10gkg5ai1vvxh0mbn3r";
+      url = "https://pypi.python.org/packages/source/j/jmespath/jmespath-0.2.1.tar.gz";
+      md5 = "7800775aa12c6303f9ad597b6a8fa03c";
     };
 
     propagatedBuildInputs = [ ply ];
-- 
GitLab


From 51d35d5028ab334a705e356f1e08b3de2829fd32 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 12 Feb 2014 09:33:50 -0500
Subject: [PATCH 1168/3789] Update pythonPackages.botocore

---
 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 b300f0c9c75..aba6ab989bd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -721,12 +721,12 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   botocore = buildPythonPackage rec {
-    version = "0.13.1";
+    version = "0.33.0";
     name = "botocore-${version}";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz";
-      sha256 = "192kxgw76b22zmk5mxjkij5rskibb9jfaggvpznzy3ggsgja7yy8";
+      md5 = "6743c73a2e148abaa9c487a6e2ee53a3";
     };
 
     propagatedBuildInputs =
-- 
GitLab


From 271de86a94cf7eb5366c2166eb8c11a854d86a7c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 12 Feb 2014 09:35:01 -0500
Subject: [PATCH 1169/3789] Update awscli

---
 pkgs/tools/admin/awscli/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index aa8361c737f..a2530319014 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -2,17 +2,21 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "awscli-${version}";
-  version = "0.8.3";
+  version = "1.2.13";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/aws/aws-cli/archive/${version}.tar.gz";
-    sha256 = "0v7igh00zja560v8qz315g3m7x9six1hprrrb10cpp9sy8n58xnn";
+    sha256 = "1mpy1q9y5qiq1fr2xc98sn1njx0p0b1g21p0rdh4ccsf9w7i0rpb";
   };
 
   propagatedBuildInputs = [ 
-    pythonPackages.argparse
     pythonPackages.botocore
+    pythonPackages.bcdoc
+    pythonPackages.six
     pythonPackages.colorama
+    pythonPackages.docutils
+    pythonPackages.rsa
+    pythonPackages.pyasn1
   ];
 }
-- 
GitLab


From 42c083df4110237032a0667158535ccf8cd1812b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Feb 2014 17:38:02 +0100
Subject: [PATCH 1170/3789] Add Template::Plugin::IO::All

---
 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 0041d7dbd58..a508de63c8c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7787,6 +7787,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TemplatePluginIOAll = buildPerlPackage {
+    name = "Template-Plugin-IO-All-0.01";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/X/XE/XERN/Template-Plugin-IO-All-0.01.tar.gz;
+      sha256 = "1f7445422a21932e09bbef935766e0af6b7cceb088e9d8e030cd7a84bcdc5ee4";
+    };
+    propagatedBuildInputs = [ IOAll TemplateToolkit ];
+    meta = {
+      maintainers = with maintainers; [ eelco ];
+      description = "Perl Template Toolkit Plugin for IO::All";
+      license = "perl";
+    };
+  };
+
   TemplatePluginJavaScript = buildPerlPackage {
     name = "Template-Plugin-JavaScript-0.02";
     src = fetchurl {
-- 
GitLab


From 85d38d143631b93841242215067c4a7c3538e81e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 12 Feb 2014 18:35:39 +0100
Subject: [PATCH 1171/3789] nginx: add appendConfig option with types.lines

---
 .../modules/services/web-servers/nginx/default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 4a1b6de2873..512da831aa3 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -9,6 +9,7 @@ let
     user ${cfg.user} ${cfg.group};
     daemon off;
     ${cfg.config}
+    ${cfg.appendConfig}
   '';
 in
 
@@ -36,6 +37,19 @@ in
         ";
       };
 
+      appendConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Configuration lines appended to the generated Nginx
+          configuration file. Commonly used by different modules
+          providing http snippets. <option>appendConfig</option>
+          can be specified more than once and it's value will be
+          concatenated (contrary to <option>config</option> which
+          can be set only once).
+        '';
+      };
+
       stateDir = mkOption {
         default = "/var/spool/nginx";
         description = "
-- 
GitLab


From aa6ddfb1199d5304b6f43a492fe3f9eb64f08daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 12 Feb 2014 18:35:50 +0100
Subject: [PATCH 1172/3789] nginx: 1.4.4 -> 1.4.5

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

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index b16911cfb5d..4504d49edbb 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -5,10 +5,10 @@
 , moreheaders ? false}:
 
 let
-  version = "1.4.4";
+  version = "1.4.5";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "1f82845mpgmhvm151fhn2cnqjggw9w7cvsqbva9rb320wmc9m63w";
+    sha256 = "0zh7w1bz8rcxrs5bwp39m91nzm454mxlf3m5krkv1wm8ar1h5sdd";
   };
 
   rtmp-ext = fetchgit {
-- 
GitLab


From 35d1c4d34a80756b56003e18ad007021823a64eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 12 Feb 2014 19:22:44 +0100
Subject: [PATCH 1173/3789] i3minator: add platforms and maintain

---
 pkgs/tools/misc/i3minator/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix
index 2b16dc3b5b7..cb12cb33c76 100644
--- a/pkgs/tools/misc/i3minator/default.nix
+++ b/pkgs/tools/misc/i3minator/default.nix
@@ -24,7 +24,7 @@ in buildPythonPackage rec {
 
   propagatedBuildInputs = [ pythonPackages.pyyaml i3-py ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "i3 project manager similar to tmuxinator";
     longDescription = ''
       A simple "workspace manager" for i3. It allows to quickly
@@ -33,5 +33,8 @@ in buildPythonPackage rec {
     '';
     homepage = https://github.com/carlesso/i3minator;
     license = "WTFPL"; # http://sam.zoy.org/wtfpl/
+    maintainers = with maintainers; [ iElectric ];
+    platforms = stdenv.lib.platforms.linux;
   };
+
 }
-- 
GitLab


From 83ca1bec308367360ee8f2d6f39f81e72744df04 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 12 Feb 2014 19:24:35 +0100
Subject: [PATCH 1174/3789] Fix references to ca-bundle.

Several packages referred to /etc/ca-bundle.crt, that
was removed in 9c616e3. I've changed those references to
/etc/ssl/certs/ca-bundle.crt instead.
---
 pkgs/applications/networking/browsers/vimprobable2/default.nix  | 2 +-
 .../networking/instant-messengers/telepathy/gabble/default.nix  | 2 +-
 pkgs/development/libraries/glib-networking/default.nix          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index ee8e4b8434a..2a44449c750 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   # Nixos default ca bundle
   patchPhase = ''
-    sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ca-bundle.crt, config.h
+    sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, config.h
   '';
 
   buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit ];
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index 8863af25984..b3036037f7f 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [pkgconfig libxslt];
   buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ];
 
-  configureFlags = "--with-ca-certificates=/etc/ca-bundle.crt";
+  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
 
   meta = {
     homepage = http://telepathy.freedesktop.org;
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 2c651980eda..1e9fdd4f0aa 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1g2ran0rn37009fs3xl38m95i5w8sdf9ax0ady4jbjir15844xcz";
   };
 
-  configureFlags = "--with-ca-certificates=/etc/ca-bundle.crt";
+  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
   
   preBuild = ''
     sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
-- 
GitLab


From bcb792556212250797c712defd49fe8852a45a13 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 12 Feb 2014 19:42:39 +0100
Subject: [PATCH 1175/3789] New package: The vimb web browser

---
 .../networking/browsers/vimb/default.nix      | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 11 +++++
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/vimb/default.nix

diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
new file mode 100644
index 00000000000..10bca4848dd
--- /dev/null
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk, glib_networking
+, gsettings_desktop_schemas, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+  name = "vimb-${version}";
+  version = "2.2";
+
+  src = fetchurl {
+    url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz";
+    sha256 = "18gig6rcxv0i4a8mz3jv29zpj0323zw45jsg1ycx61a08rzag60m";
+  };
+
+  # Nixos default ca bundle
+  patchPhase = ''
+    sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/default.h
+  '';
+
+  buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    wrapProgram "$out/bin/vimb" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share"
+  '';
+
+  meta = {
+    description = "A Vim-like browser";
+    longDescription = ''
+      A fast and lightweight vim like web browser based on the webkit web
+      browser engine and the GTK toolkit. Vimb is modal like the great vim
+      editor and also easily configurable during runtime. Vimb is mostly
+      keyboard driven and does not detract you from your daily work.
+    '';
+    homepage = "http://fanglingsu.github.io/vimb/";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.rickynils ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88feaa12091..db1b06cc86d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10370,6 +10370,17 @@ let
     { browser = vimprobable2; browserName = "vimprobable2"; desktopName = "Vimprobable2";
     };
 
+  vimb = callPackage ../applications/networking/browsers/vimb {
+    inherit (gnome) libsoup;
+    webkit = webkit_gtk2;
+  };
+
+  vimbWrapper = wrapFirefox {
+    browser = vimb;
+    browserName = "vimb";
+    desktopName = "Vimb";
+  };
+
   VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
 
   # Wine cannot be built in 64-bit; use a 32-bit build instead.
-- 
GitLab


From eb295a62f21203e520f0017737b6288758c6c925 Mon Sep 17 00:00:00 2001
From: PkmX <pkmx.tw@gmail.com>
Date: Thu, 13 Feb 2014 03:38:21 +0800
Subject: [PATCH 1176/3789] Fix licenses and add platforms metadata for wqy-*.

---
 pkgs/data/fonts/wqy-microhei/default.nix | 3 ++-
 pkgs/data/fonts/wqy-zenhei/default.nix   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix
index 506dd895d6a..065bb4bc828 100644
--- a/pkgs/data/fonts/wqy-microhei/default.nix
+++ b/pkgs/data/fonts/wqy-microhei/default.nix
@@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A (mainly) Chinese Unicode font";
     homepage = "http://wenq.org";
-    license = "gplv2"; # with font embedding exceptions
+    license = stdenv.lib.licenses.asl20;
     maintainers = stdenv.lib.maintainers.pkmx;
+    platforms = stdenv.lib.platforms.all;
   };
 }
 
diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix
index e317b863db3..d42665c69cc 100644
--- a/pkgs/data/fonts/wqy-zenhei/default.nix
+++ b/pkgs/data/fonts/wqy-zenhei/default.nix
@@ -20,8 +20,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A (mainly) Chinese Unicode font";
     homepage = "http://wenq.org";
-    license = "gplv2"; # with font embedding exceptions
+    license = stdenv.lib.licenses.gpl2; # with font embedding exceptions
     maintainers = stdenv.lib.maintainers.pkmx;
+    platforms = stdenv.lib.platforms.all;
   };
 }
 
-- 
GitLab


From 0ba6f6bf5bda63b327bf647584fe2f5ef9b36e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 12 Feb 2014 21:39:50 +0100
Subject: [PATCH 1177/3789] gbus_glib: maintenance update 0.100.2 -> 0.102

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

diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index be6cf442a49..9c774e802fc 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }:
+{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconvOrEmpty, dbus, glib }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-glib-0.100.2";
+  name = "dbus-glib-0.102";
 
   src = fetchurl {
     url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
-    sha256 = "1ibav91yg70f2l3l18cr0hf4mna1h9d4mrg0c60w4l8zjbd45fx5";
+    sha256 = "177j5p2vrvpmzk2xrrj6akn73kvpbvnmsjvlmca9l55qbdcfsr39";
   };
 
   nativeBuildInputs = [ pkgconfig gettext ];
 
-  buildInputs = [ expat ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
+  buildInputs = [ expat ] ++ libiconvOrEmpty;
 
   propagatedBuildInputs = [ dbus.libs glib ];
 
-- 
GitLab


From acad17f5e5492ff828d54d2ad13745a9d4f6e1c1 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Feb 2014 04:13:15 +0200
Subject: [PATCH 1178/3789] liblastfm: update to 1.0.7

---
 .../libraries/liblastfm/default.nix           | 20 ++++-----
 .../libraries/liblastfm/ruby-1.9.patch        | 45 -------------------
 2 files changed, 8 insertions(+), 57 deletions(-)
 delete mode 100644 pkgs/development/libraries/liblastfm/ruby-1.9.patch

diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index b1e8342ca91..6a253d06b3b 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -1,30 +1,26 @@
-{ stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which }:
+{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake }:
 
-let version = "0.3.3"; in
+let version = "1.0.7"; in
 
 stdenv.mkDerivation rec {
   name = "liblastfm-${version}";
 
   # Upstream does not package git tags as tarballs. Get tarball from github.
   src = fetchurl {
-    url = "https://github.com/mxcl/liblastfm/tarball/${version}";
+    url = "https://github.com/lastfm/liblastfm/tarball/${version}";
     name = "${name}.tar.gz";
-    sha256 = "0v33vzj89mgx2pc5fmiywlz51i553ckydw9xz70fiflm2inbl1r6";
+    sha256 = "1837gd2azy8r34rcmsn2m1zngk4v2hpk7q0ii60dhjjvjaaswkwq";
   };
 
   prefixKey = "--prefix ";
   propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ];
-  nativeBuildInputs = [ ruby pkgconfig which ];
-
-  configureFlags = "--release";
-
-  patches = [ ./ruby-1.9.patch ];
-  postPatch = "patchShebangs .";
+  nativeBuildInputs = [ pkgconfig which cmake ];
 
   meta = {
-    homepage = http://github.com/mxcl/liblastfm;
+    homepage = http://github.com/lastfm/liblastfm;
+    repositories.git = git://github.com/lastfm/liblastfm.git;
     description = "Official LastFM library";
     inherit (qt4.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = with stdenv.lib.maintainers; [ urkud phreedom ];
   };
 }
diff --git a/pkgs/development/libraries/liblastfm/ruby-1.9.patch b/pkgs/development/libraries/liblastfm/ruby-1.9.patch
deleted file mode 100644
index ac6d175e73a..00000000000
--- a/pkgs/development/libraries/liblastfm/ruby-1.9.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Yury G. Kudryashov <urkud.urkud@gmail.com>
-Subject: [PATCH] Fix compilation with ruby-1.9
-
-__FILE__ is a relative path in ruby-1.9
-
----
- admin/Makefile.rb |    4 ++--
- admin/qpp         |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/admin/Makefile.rb b/admin/Makefile.rb
-index 592f5a5..33fe688 100755
---- a/admin/Makefile.rb
-+++ b/admin/Makefile.rb
-@@ -6,7 +6,7 @@
- 
- cwd = File.dirname( __FILE__ )
- require 'find'
--require "#{cwd}/platform.rb"
-+require_relative 'platform'
- 
- 
- ######################################################################### defs
-@@ -158,4 +158,4 @@ puts <<-EOS
- .PHONY: dist
- dist:
- 	git archive --prefix=#{BASENAME}/ HEAD | bzip2 > #{BASENAME}.tar.bz2
--EOS
-\ No newline at end of file
-+EOS
-diff --git a/admin/qpp b/admin/qpp
-index 36b2d05..ee840fd 100755
---- a/admin/qpp
-+++ b/admin/qpp
-@@ -4,7 +4,7 @@
- 
- cwd=File.dirname __FILE__
- require 'find'
--require "#{cwd}/findsrc"
-+require_relative 'findsrc'
- 
- sources = Array.new
- headers = Array.new
--- 
-tg: (f0b3239..) t/ruby19 (depends on: master)
-- 
GitLab


From 545f5a2f6fbfc0f022ba96e45e49efa3efd3b952 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Feb 2014 04:14:58 +0200
Subject: [PATCH 1179/3789] amarok: minor cleanup

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

diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index 1dac3f6b853..b1bcfe869f7 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -22,12 +22,10 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = "-DKDE4_BUILD_TESTS=OFF";
 
-  postInstall = ''
-    mkdir -p $out/nix-support
-    echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages
-  '';
+  propagatedUserEnvPkgs = [ qtscriptgenerator ];
 
   meta = {
+    repositories.git = git://anongit.kde.org/amarok.git;
     description = "Popular music player for KDE";
     license = "GPL";
     homepage = http://amarok.kde.org;
-- 
GitLab


From f30491bdaddedaad20da0553976c47075aa4f923 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Feb 2014 04:15:20 +0200
Subject: [PATCH 1180/3789] taglib: update from 1.8 to 1.9.1

---
 pkgs/development/libraries/taglib/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix
index cd083f0d80a..41087044e49 100644
--- a/pkgs/development/libraries/taglib/default.nix
+++ b/pkgs/development/libraries/taglib/default.nix
@@ -1,20 +1,22 @@
 {stdenv, fetchurl, zlib, cmake}:
 
 stdenv.mkDerivation rec {
-  name = "taglib-1.8";
+  name = "taglib-1.9.1";
 
   src = fetchurl {
-    url = "https://github.com/downloads/taglib/taglib/${name}.tar.gz";
-    sha256 = "16i0zjpxqqslbwi4kl6y15qwm15mh7ykh74x19m2741wf20k9lv6";
+    url = http://taglib.github.io/releases/taglib-1.9.1.tar.gz;
+    sha256 = "06n7gnbcqa3r6c9gv00y0y1r48dyyazm6yj403i7ma0r2k6p3lvj";
   };
 
   cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON";
 
-  buildInputs = [zlib];
-  nativeBuildInputs = [cmake];
+  buildInputs = [ zlib ];
+  nativeBuildInputs = [ cmake ];
 
   meta = {
     homepage = http://developer.kde.org/~wheeler/taglib.html;
+    repositories.git = git://github.com/taglib/taglib.git;
+
     description = "A library for reading and editing the meta-data of several popular audio formats";
     inherit (cmake.meta) platforms;
     maintainers = [ stdenv.lib.maintainers.urkud ];
-- 
GitLab


From d91696c1f3ad23f3b50d3286efafa0590530d942 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Feb 2014 04:22:39 +0200
Subject: [PATCH 1181/3789] libraw: package 0.16.0

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

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
new file mode 100644
index 00000000000..f0012f552c1
--- /dev/null
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, lcms2, jasper, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "libraw-0.16.0";
+
+  src = fetchurl {
+    url = http://www.libraw.org/data/LibRaw-0.16.0.tar.gz;
+    sha256 = "15ng4s24grib39r0nlgrf18r2j9yh43qyx4vbif38d95xiqkix3i";
+  };
+
+  buildInputs = [ lcms2 jasper ] ;
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = { 
+    description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)";
+    homepage = http://www.libraw.org/;
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db1b06cc86d..5d3797788dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6888,6 +6888,8 @@ let
 
   libsemanage = callPackage ../os-specific/linux/libsemanage { };
 
+  libraw = callPackage ../development/libraries/libraw { };
+
   libraw1394 = callPackage ../development/libraries/libraw1394 { };
 
   libsexy = callPackage ../development/libraries/libsexy { };
-- 
GitLab


From 432a698e8dd4988d13f57d2e05d37a2e1ec9c714 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Feb 2014 04:25:11 +0200
Subject: [PATCH 1182/3789] KDE-4.12: package 4.12.2

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

diff --git a/pkgs/desktops/kde-4.12/applications/kate.nix b/pkgs/desktops/kde-4.12/applications/kate.nix
new file mode 100644
index 00000000000..63bfa12c4bb
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/applications/kate.nix
@@ -0,0 +1,11 @@
+{ 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.12/applications/konsole.nix b/pkgs/desktops/kde-4.12/applications/konsole.nix
new file mode 100644
index 00000000000..0db47fb2d7c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/applications/konsole.nix
@@ -0,0 +1,11 @@
+{ 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.12/default.nix b/pkgs/desktops/kde-4.12/default.nix
new file mode 100644
index 00000000000..b8e0a828a88
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/default.nix
@@ -0,0 +1,42 @@
+{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.12.2" }:
+
+let
+  # Need callPackageOrig to avoid infinite cycle
+  kde = callPackageOrig ./kde-package {
+    inherit release 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;
+    inherit (kde.manifest) stable;
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.12/files/kde-wallpapers-buildsystem.patch
new file mode 100644
index 00000000000..378cdb64694
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/files/kde-wallpapers-buildsystem.patch
@@ -0,0 +1,17 @@
+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.12/files/polkit-install.patch b/pkgs/desktops/kde-4.12/files/polkit-install.patch
new file mode 100644
index 00000000000..d2ecac663ec
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/files/polkit-install.patch
@@ -0,0 +1,12 @@
+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.12/kactivities.nix b/pkgs/desktops/kde-4.12/kactivities.nix
new file mode 100644
index 00000000000..06381bb13d7
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kactivities.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, nepomuk_core }:
+
+kde {
+  propagatedBuildInputs = [ kdelibs nepomuk_core ];
+
+  meta = {
+    description = "KDE activities library and daemon";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kde-base-artwork.nix b/pkgs/desktops/kde-4.12/kde-base-artwork.nix
new file mode 100644
index 00000000000..3f416cebddc
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-base-artwork.nix
@@ -0,0 +1,14 @@
+{ 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.12/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix
new file mode 100644
index 00000000000..c2a25664678
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix
@@ -0,0 +1,11 @@
+{ 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.12/kde-package/4.12.2.nix b/pkgs/desktops/kde-4.12/kde-package/4.12.2.nix
new file mode 100644
index 00000000000..a10582d7142
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-package/4.12.2.nix
@@ -0,0 +1,444 @@
+{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/default.nix b/pkgs/desktops/kde-4.12/kde-package/default.nix
new file mode 100644
index 00000000000..04f798c233a
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-package/default.nix
@@ -0,0 +1,128 @@
+{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
+, release, 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;
+    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_, version ? release, ...}:
+    stdenv.mkDerivation ({
+      name = "${name}-${version}";
+      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.12/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.12/kde-package/kde-manifest.sh
new file mode 100755
index 00000000000..e964ce3ddc1
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-package/kde-manifest.sh
@@ -0,0 +1,146 @@
+#! /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.12/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.12/kde-package/kde-submodules.xslt
new file mode 100644
index 00000000000..952a05a9d27
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-package/kde-submodules.xslt
@@ -0,0 +1,22 @@
+<?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.12/kde-runtime.nix b/pkgs/desktops/kde-4.12/kde-runtime.nix
new file mode 100644
index 00000000000..1c9706f4f4b
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-runtime.nix
@@ -0,0 +1,24 @@
+{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2
+, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, pulseaudio
+, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme
+}:
+
+kde {
+  buildInputs = [
+    kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
+    qca2 samba libcanberra pulseaudio gpgme
+    networkmanager kactivities kdepimlibs openexr
+#todo: add openslp
+#todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late
+  ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+  passthru.propagatedUserEnvPackages = [ virtuoso ];
+
+  meta = {
+    license = "LGPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kde-wallpapers.nix b/pkgs/desktops/kde-4.12/kde-wallpapers.nix
new file mode 100644
index 00000000000..30e68934acf
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-wallpapers.nix
@@ -0,0 +1,17 @@
+{ kde, cmake }:
+
+kde {
+  nativeBuildInputs = [ cmake ];
+
+  patches = [ ./files/kde-wallpapers-buildsystem.patch ];
+
+  cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "19d2ly05hv2x1kkzgdgvkcpjypp2nk4q9bffv17lz2q5pzhjhsa4";
+
+  meta = {
+    description = "Wallpapers for KDE";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kde-workspace.nix b/pkgs/desktops/kde-4.12/kde-workspace.nix
new file mode 100644
index 00000000000..39e9c10a0fb
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-workspace.nix
@@ -0,0 +1,46 @@
+{ 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, fetchurl
+}:
+
+kde {
+
+  version = "4.11.6";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/4.12.2/src/kde-workspace-4.11.6.tar.xz";
+    sha256 = "0lk3k9zl4x4il5dqpw7mf25gv8a3y48fd3jq3jvgmwwlviwcpcz1";
+  };
+
+#todo: wayland, xmms,   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.12/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/jovie.nix
new file mode 100644
index 00000000000..d38c80c4c36
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeaccessibility/jovie.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, speechd }:
+
+kde {
+  buildInputs = [ kdelibs speechd ];
+
+  meta = {
+    description = "Text-to-speech synthesis daemon";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/kaccessible.nix
new file mode 100644
index 00000000000..98fae7c983f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeaccessibility/kaccessible.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, speechd }:
+
+kde {
+  buildInputs = [ kdelibs speechd ];
+
+  meta = {
+    description = "Bridge that provides accessibility services to applications";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/kmag.nix
new file mode 100644
index 00000000000..606c61cddb6
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeaccessibility/kmag.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+#todo: package qaccessibilityclient
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Screen magnifier for KDE";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/kmousetool.nix
new file mode 100644
index 00000000000..8e0caa76ed9
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeaccessibility/kmousetool.nix
@@ -0,0 +1,9 @@
+{ 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.12/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/kmouth.nix
new file mode 100644
index 00000000000..4159501967c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeaccessibility/kmouth.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A type-and-say front end for speech synthesizers";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.12/kdeadmin/kcron.nix
new file mode 100644
index 00000000000..f585461af38
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeadmin/kcron.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Configure and schedule tasks";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.12/kdeadmin/ksystemlog.nix
new file mode 100644
index 00000000000..88757a6b91c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeadmin/ksystemlog.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "System log viewer tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.12/kdeadmin/kuser.nix
new file mode 100644
index 00000000000..6118cf558bb
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeadmin/kuser.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, kdepimlibs }:
+
+kde {
+  buildInputs = [ kdelibs kdepimlibs ];
+
+  meta = {
+    description = "User management tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.12/kdeartwork/ColorSchemes.nix
new file mode 100644
index 00000000000..acccf66976f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/ColorSchemes.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kde-color-schemes";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE color schemes";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.12/kdeartwork/FindXscreensaver.cmake
new file mode 100644
index 00000000000..499ed75268e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/FindXscreensaver.cmake
@@ -0,0 +1,73 @@
+#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.12/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.12/kdeartwork/HighResolutionWallpapers.nix
new file mode 100644
index 00000000000..edffca1562e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/HighResolutionWallpapers.nix
@@ -0,0 +1,11 @@
+{ 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.12/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.12/kdeartwork/IconThemes.nix
new file mode 100644
index 00000000000..43071e8bd14
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/IconThemes.nix
@@ -0,0 +1,13 @@
+{ 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.12/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.12/kdeartwork/WeatherWallpapers.nix
new file mode 100644
index 00000000000..947e5e17ab0
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/WeatherWallpapers.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kde-weather-wallpapers";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE wallpapers (weather)";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.12/kdeartwork/desktopthemes.nix
new file mode 100644
index 00000000000..93dd361af73
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/desktopthemes.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kde-desktop-themes";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE desktop themes";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.12/kdeartwork/emoticons.nix
new file mode 100644
index 00000000000..5ef9f78a719
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/emoticons.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kde-emotion-icons";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE emotion icons (smiles)";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.12/kdeartwork/kscreensaver.nix
new file mode 100644
index 00000000000..84cb008056e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/kscreensaver.nix
@@ -0,0 +1,15 @@
+{ 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.12/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.12/kdeartwork/kwin-styles.nix
new file mode 100644
index 00000000000..b5d769b216d
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/kwin-styles.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, kde_workspace }:
+
+kde {
+  buildInputs = [ kdelibs kde_workspace ];
+
+  meta = {
+    description = "Styles for KWin";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/styles.nix b/pkgs/desktops/kde-4.12/kdeartwork/styles.nix
new file mode 100644
index 00000000000..6a1306c3710
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/styles.nix
@@ -0,0 +1,11 @@
+{ 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.12/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.12/kdeartwork/wallpapers.nix
new file mode 100644
index 00000000000..7c9846fbf9e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/wallpapers.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kdeartwork-wallpapers";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE wallpapers";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.12/kdebindings/perlqt.nix
new file mode 100644
index 00000000000..48eed141ce6
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/perlqt.nix
@@ -0,0 +1,14 @@
+{ 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.12/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix
new file mode 100644
index 00000000000..64e196452e3
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix
@@ -0,0 +1,32 @@
+{ 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.12/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.12/kdebindings/qtruby-install-prefix.patch
new file mode 100644
index 00000000000..bd95a0d8bd3
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/qtruby-install-prefix.patch
@@ -0,0 +1,15 @@
+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.12/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.12/kdebindings/qtruby.nix
new file mode 100644
index 00000000000..03e9dc9a007
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/qtruby.nix
@@ -0,0 +1,20 @@
+{ 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.12/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.12/kdebindings/smokegen-CMakeLists.txt-nix.patch
new file mode 100644
index 00000000000..f0811d335a7
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/smokegen-CMakeLists.txt-nix.patch
@@ -0,0 +1,13 @@
+--- 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.12/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.12/kdebindings/smokegen-nix.patch
new file mode 100644
index 00000000000..53257e836e0
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/smokegen-nix.patch
@@ -0,0 +1,13 @@
+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.12/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix
new file mode 100644
index 00000000000..a80574ff67a
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix
@@ -0,0 +1,13 @@
+{ 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.12/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.12/kdebindings/smokekde.nix
new file mode 100644
index 00000000000..4474c1d9731
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/smokekde.nix
@@ -0,0 +1,19 @@
+{ 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.12/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix
new file mode 100644
index 00000000000..72b267e43c5
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix
@@ -0,0 +1,15 @@
+{ 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.12/kdeedu/analitza.nix b/pkgs/desktops/kde-4.12/kdeedu/analitza.nix
new file mode 100644
index 00000000000..74c3a1ebb20
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/analitza.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, readline }:
+kde {
+  buildInputs = [ kdelibs readline ];
+
+  meta = {
+    description = "Library part of KAlgebra";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/blinken.nix b/pkgs/desktops/kde-4.12/kdeedu/blinken.nix
new file mode 100644
index 00000000000..cdf9728833c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/blinken.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Memory Enhancement Game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/cantor.nix b/pkgs/desktops/kde-4.12/kdeedu/cantor.nix
new file mode 100644
index 00000000000..a8cd2e44957
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/cantor.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libspectre, analitza, R, pkgconfig, libqalculate, python }:
+kde {
+
+# TODO: R is not found
+
+  buildInputs = [ kdelibs libspectre analitza R libqalculate python ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "KDE Frontend to Mathematical Software";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.12/kdeedu/kalgebra.nix
new file mode 100644
index 00000000000..3675c3a225f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kalgebra.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu, analitza }:
+kde {
+  buildInputs = [ kdelibs libkdeedu analitza ];
+
+  meta = {
+    description = "2D and 3D Graph Calculator";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.12/kdeedu/kalzium.nix
new file mode 100644
index 00000000000..09de79ce1c0
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kalzium.nix
@@ -0,0 +1,13 @@
+{ 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.12/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.12/kdeedu/kanagram.nix
new file mode 100644
index 00000000000..8759c96d78c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kanagram.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu }:
+kde {
+  buildInputs = [ kdelibs libkdeedu ];
+
+  meta = {
+    description = "Letter Order Game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.12/kdeedu/kbruch.nix
new file mode 100644
index 00000000000..dc50f1e85a3
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kbruch.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Practice Fractions";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.12/kdeedu/kgeography.nix
new file mode 100644
index 00000000000..bd8d27c8d6e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kgeography.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Geography Trainer";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/khangman.nix b/pkgs/desktops/kde-4.12/kdeedu/khangman.nix
new file mode 100644
index 00000000000..997b50e906a
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/khangman.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu }:
+kde {
+  buildInputs = [ kdelibs libkdeedu ];
+
+  meta = {
+    description = "KDE hangman game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kig.nix b/pkgs/desktops/kde-4.12/kdeedu/kig.nix
new file mode 100644
index 00000000000..37906c32bcb
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kig.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, boost, python}:
+kde {
+  buildInputs = [ kdelibs boost python ];
+
+  cmakeFlags = "-DKIG_ENABLE_PYTHON_SCRIPTING=1";
+  meta = {
+    description = "KDE Interactive Geometry";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kiten.nix b/pkgs/desktops/kde-4.12/kdeedu/kiten.nix
new file mode 100644
index 00000000000..939b7a9f77a
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kiten.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Japanese Reference/Study Tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/klettres.nix b/pkgs/desktops/kde-4.12/kdeedu/klettres.nix
new file mode 100644
index 00000000000..7a0fa83078e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/klettres.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A KDE alphabet tutorial";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.12/kdeedu/kmplot.nix
new file mode 100644
index 00000000000..fc7b0578c27
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kmplot.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A KDE mathematical function plotter";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kstars.nix b/pkgs/desktops/kde-4.12/kdeedu/kstars.nix
new file mode 100644
index 00000000000..0832dc2121e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kstars.nix
@@ -0,0 +1,14 @@
+{ kde, kdelibs, eigen, xplanet, indilib, pkgconfig }:
+
+kde {
+
+# TODO: wcslib, astrometry
+
+  buildInputs = [ kdelibs eigen xplanet indilib ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "A KDE graphical desktop planetarium";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.12/kdeedu/ktouch.nix
new file mode 100644
index 00000000000..9e606adde33
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/ktouch.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libxkbfile }:
+
+kde {
+  buildInputs = [ kdelibs libxkbfile ];
+
+  meta = {
+    description = "Touch Typing Tutor";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.12/kdeedu/kturtle.nix
new file mode 100644
index 00000000000..1e1922b1410
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kturtle.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Educational Programming Environment";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.12/kdeedu/kwordquiz.nix
new file mode 100644
index 00000000000..1b33ba2e469
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kwordquiz.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libkdeedu }:
+
+kde {
+  buildInputs = [ kdelibs libkdeedu ];
+
+  meta = {
+    description = "Flash Card Trainer";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.12/kdeedu/libkdeedu.nix
new file mode 100644
index 00000000000..def6c85fefe
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/libkdeedu.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Libraries used by KDE Education applications";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/marble.nix b/pkgs/desktops/kde-4.12/kdeedu/marble.nix
new file mode 100644
index 00000000000..2dc07d14a0d
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/marble.nix
@@ -0,0 +1,12 @@
+{ 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.12/kdeedu/pairs.nix b/pkgs/desktops/kde-4.12/kdeedu/pairs.nix
new file mode 100644
index 00000000000..36c4aba9604
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/pairs.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A memory and pairs game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/parley.nix b/pkgs/desktops/kde-4.12/kdeedu/parley.nix
new file mode 100644
index 00000000000..f9f86dde150
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/parley.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libkdeedu, attica }:
+
+kde {
+  buildInputs = [ kdelibs libkdeedu attica ];
+
+  meta = {
+    description = "Vocabulary Trainer";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/rocs.nix b/pkgs/desktops/kde-4.12/kdeedu/rocs.nix
new file mode 100644
index 00000000000..ce30d11fda3
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/rocs.nix
@@ -0,0 +1,14 @@
+{ 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.12/kdeedu/step.nix b/pkgs/desktops/kde-4.12/kdeedu/step.nix
new file mode 100644
index 00000000000..f36ccef9b7c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/step.nix
@@ -0,0 +1,12 @@
+{ kde, kdelibs, gsl, libqalculate, eigen, pkgconfig }:
+
+kde {
+
+  buildInputs = [ kdelibs gsl libqalculate eigen ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "A KDE interactive physical simulator";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/bomber.nix b/pkgs/desktops/kde-4.12/kdegames/bomber.nix
new file mode 100644
index 00000000000..026227910f2
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/bomber.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/bovo.nix b/pkgs/desktops/kde-4.12/kdegames/bovo.nix
new file mode 100644
index 00000000000..b0e7d99c589
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/bovo.nix
@@ -0,0 +1,8 @@
+{ 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.12/kdegames/granatier.nix b/pkgs/desktops/kde-4.12/kdegames/granatier.nix
new file mode 100644
index 00000000000..9f1ab005309
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/granatier.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/kajongg.nix b/pkgs/desktops/kde-4.12/kdegames/kajongg.nix
new file mode 100644
index 00000000000..9a6f5e83695
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kajongg.nix
@@ -0,0 +1,13 @@
+{ 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.12/kdegames/kapman.nix b/pkgs/desktops/kde-4.12/kdegames/kapman.nix
new file mode 100644
index 00000000000..f10e099da3c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kapman.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/katomic.nix b/pkgs/desktops/kde-4.12/kdegames/katomic.nix
new file mode 100644
index 00000000000..a9936c04f0e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/katomic.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.12/kdegames/kblackbox.nix
new file mode 100644
index 00000000000..27eeff2f65b
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kblackbox.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/kblocks.nix b/pkgs/desktops/kde-4.12/kdegames/kblocks.nix
new file mode 100644
index 00000000000..98cf068de09
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kblocks.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a classic single player falling blocks puzzle game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kbounce.nix b/pkgs/desktops/kde-4.12/kdegames/kbounce.nix
new file mode 100644
index 00000000000..77fa0db6352
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kbounce.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.12/kdegames/kbreakout.nix
new file mode 100644
index 00000000000..3a484d919bb
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kbreakout.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.12/kdegames/kdiamond.nix
new file mode 100644
index 00000000000..06dfcee5ac3
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kdiamond.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.12/kdegames/kfourinline.nix
new file mode 100644
index 00000000000..11b8838e708
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kfourinline.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.12/kdegames/kgoldrunner.nix
new file mode 100644
index 00000000000..6217c47a806
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kgoldrunner.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/kigo.nix b/pkgs/desktops/kde-4.12/kdegames/kigo.nix
new file mode 100644
index 00000000000..32eee67cc1e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kigo.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/killbots.nix b/pkgs/desktops/kde-4.12/kdegames/killbots.nix
new file mode 100644
index 00000000000..d9c1472495e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/killbots.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple game of evading killer robots";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kiriki.nix b/pkgs/desktops/kde-4.12/kdegames/kiriki.nix
new file mode 100644
index 00000000000..72f7ab67501
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kiriki.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.12/kdegames/kjumpingcube.nix
new file mode 100644
index 00000000000..a6d22cff51c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kjumpingcube.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple dice driven tactical game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/klickety.nix b/pkgs/desktops/kde-4.12/kdegames/klickety.nix
new file mode 100644
index 00000000000..b592bc40641
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/klickety.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/klines.nix b/pkgs/desktops/kde-4.12/kdegames/klines.nix
new file mode 100644
index 00000000000..90952fe91c0
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/klines.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.12/kdegames/kmahjongg.nix
new file mode 100644
index 00000000000..946b531ff12
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kmahjongg.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/kmines.nix b/pkgs/desktops/kde-4.12/kdegames/kmines.nix
new file mode 100644
index 00000000000..538454e9598
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kmines.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a classic Minesweeper game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.12/kdegames/knavalbattle.nix
new file mode 100644
index 00000000000..42ffd2fcb4d
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/knavalbattle.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a Battle Ship game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.12/kdegames/knetwalk.nix
new file mode 100644
index 00000000000..a16e578ce84
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/knetwalk.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/kolf.nix b/pkgs/desktops/kde-4.12/kdegames/kolf.nix
new file mode 100644
index 00000000000..78815ee5799
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kolf.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a miniature golf game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kollision.nix b/pkgs/desktops/kde-4.12/kdegames/kollision.nix
new file mode 100644
index 00000000000..3147c7305ea
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kollision.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple ball dodging game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/konquest.nix b/pkgs/desktops/kde-4.12/kdegames/konquest.nix
new file mode 100644
index 00000000000..53ddd64928c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/konquest.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "the KDE version of Gnu-Lactic Konquest";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kpat.nix b/pkgs/desktops/kde-4.12/kdegames/kpat.nix
new file mode 100644
index 00000000000..f8d9bad36dc
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kpat.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a relaxing card sorting game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kreversi.nix b/pkgs/desktops/kde-4.12/kdegames/kreversi.nix
new file mode 100644
index 00000000000..2aed981428e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kreversi.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/kshisen.nix b/pkgs/desktops/kde-4.12/kdegames/kshisen.nix
new file mode 100644
index 00000000000..9c888034038
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kshisen.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/ksirk.nix b/pkgs/desktops/kde-4.12/kdegames/ksirk.nix
new file mode 100644
index 00000000000..767eb67971a
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/ksirk.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.12/kdegames/ksnakeduel.nix
new file mode 100644
index 00000000000..ccf1fb551e9
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/ksnakeduel.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple Tron-Clone";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.12/kdegames/kspaceduel.nix
new file mode 100644
index 00000000000..5285f7916ca
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kspaceduel.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/ksquares.nix b/pkgs/desktops/kde-4.12/kdegames/ksquares.nix
new file mode 100644
index 00000000000..a17be2da632
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/ksquares.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.12/kdegames/ksudoku.nix
new file mode 100644
index 00000000000..ea4e13a5e4f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/ksudoku.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a logic-based symbol placement puzzle";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.12/kdegames/ktuberling.nix
new file mode 100644
index 00000000000..1a6ba9d653c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/ktuberling.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/kubrick.nix b/pkgs/desktops/kde-4.12/kdegames/kubrick.nix
new file mode 100644
index 00000000000..9bdc6879db4
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kubrick.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/libkdegames.nix b/pkgs/desktops/kde-4.12/kdegames/libkdegames.nix
new file mode 100644
index 00000000000..3819dcdc9ae
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/libkdegames.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, openal, libsndfile }:
+kde {
+  buildInputs = [ kdelibs openal libsndfile ];
+  meta = {
+    description = "KDE games library";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.12/kdegames/libkmahjongg.nix
new file mode 100644
index 00000000000..383b347dc33
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/libkmahjongg.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a library for KMahjongg game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/lskat.nix b/pkgs/desktops/kde-4.12/kdegames/lskat.nix
new file mode 100644
index 00000000000..2a5050cd667
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/lskat.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdegames/palapeli.nix b/pkgs/desktops/kde-4.12/kdegames/palapeli.nix
new file mode 100644
index 00000000000..010dbd5d623
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/palapeli.nix
@@ -0,0 +1,11 @@
+{ 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.12/kdegames/picmi.nix b/pkgs/desktops/kde-4.12/kdegames/picmi.nix
new file mode 100644
index 00000000000..165d7422f95
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/picmi.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a single player logic-based puzzle game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix
new file mode 100644
index 00000000000..b6fd701ac12
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix
@@ -0,0 +1,15 @@
+{ 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.12/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix
new file mode 100644
index 00000000000..70904b17c23
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libgphoto2 }:
+
+kde {
+  buildInputs = [ kdelibs libgphoto2 ];
+
+  meta = {
+    description = "KDE camera interface library";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix
new file mode 100644
index 00000000000..58528cb186b
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A small utility to select a color";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix
new file mode 100644
index 00000000000..2c2ba3796a2
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix
@@ -0,0 +1,10 @@
+{ 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.12/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix
new file mode 100644
index 00000000000..35af39aa611
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix
@@ -0,0 +1,10 @@
+{ 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.12/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix
new file mode 100644
index 00000000000..18c6534eb5c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix
@@ -0,0 +1,13 @@
+{ 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.12/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix
new file mode 100644
index 00000000000..28d9252187e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libXxf86vm }:
+
+kde {
+  buildInputs = [ kdelibs libXxf86vm ];
+
+  meta = {
+    description = "KDE monitor calibration tool";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix
new file mode 100644
index 00000000000..5276ec09f46
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, qimageblitz }:
+
+kde {
+  buildInputs = [ kdelibs qimageblitz ];
+
+  meta = {
+    description = "KDE paint program";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix
new file mode 100644
index 00000000000..c5c2c6e05d7
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE screen ruler";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix
new file mode 100644
index 00000000000..1381ed7dd26
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix
@@ -0,0 +1,10 @@
+{ 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.12/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix
new file mode 100644
index 00000000000..f01a609e20d
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libkipi }:
+
+kde {
+  buildInputs = [ kdelibs libkipi ];
+
+  meta = {
+    description = "KDE screenshot utility";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix
new file mode 100644
index 00000000000..e7c01f98a8c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, pkgconfig, libraw, lcms2 }:
+
+kde {
+
+  buildInputs = [ kdelibs libraw lcms2 ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "Library for decoding RAW images";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix
new file mode 100644
index 00000000000..096b0a6e957
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, exiv2 }:
+
+kde {
+  buildInputs = [ kdelibs exiv2 ];
+
+  meta = {
+    description = "Exiv2 support library";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix
new file mode 100644
index 00000000000..6b16265e7a3
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Interface library to kipi-plugins";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix
new file mode 100644
index 00000000000..b539eab3899
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix
@@ -0,0 +1,10 @@
+{ 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.12/kdegraphics/okular.nix b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix
new file mode 100644
index 00000000000..aca1691eace
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix
@@ -0,0 +1,17 @@
+{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
+, qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }:
+
+kde {
+
+# TODO: package activeapp, qmobipocket
+
+  buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre popplerQt4
+                  qca2 qimageblitz libtiff kactivities libkexiv2 ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "Okular, the KDE document viewer";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix
new file mode 100644
index 00000000000..a344cc4b4b4
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "SVG KPart";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix
new file mode 100644
index 00000000000..396adf9ba75
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix
@@ -0,0 +1,46 @@
+{ 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, attr, libXtst
+, udev, herqq, phonon, libjpeg, xz, ilmbase, libxslt
+, pkgconfig
+}:
+
+kde {
+
+# TODO: media-player-info
+
+  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
+      libXtst attr
+    ];
+
+  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 ];
+
+  cmakeFlags = [
+    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
+    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
+    "-DHUPNP_ENABLED=ON"
+    "-DWITH_SOLID_UDISKS2=ON"
+  ];
+
+  passthru.wantsUdisks2 = true;
+
+  meta = {
+    description = "KDE libraries";
+    license = "LGPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix
new file mode 100644
index 00000000000..7e29eebf3b7
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix
@@ -0,0 +1,20 @@
+{ kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4
+, pkgconfig, doxygen, ebook_tools
+}:
+
+kde {
+
+# TODO: qmobipocket
+
+  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.12/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix
new file mode 100644
index 00000000000..0d29a4f97de
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, nepomuk_core }:
+
+kde {
+
+  buildInputs = [ kdelibs nepomuk_core ];
+
+  meta = {
+    description = "NEPOMUK Widgets";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.12/kdemultimedia/audiocd-kio.nix
new file mode 100644
index 00000000000..4c56e7529dd
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/audiocd-kio.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.12/kdemultimedia/dragon.nix
new file mode 100644
index 00000000000..006300742ec
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/dragon.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+  meta = {
+    description = "a multimedia player with the focus on simplicity";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.12/kdemultimedia/ffmpegthumbs.nix
new file mode 100644
index 00000000000..45f6c9abcb6
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/ffmpegthumbs.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.12/kdemultimedia/juk.nix
new file mode 100644
index 00000000000..5d7b1db224e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/juk.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, taglib, libtunepimp }:
+kde {
+
+# TODO: opusfile
+
+  buildInputs = [ kdelibs taglib libtunepimp ];
+  meta = {
+    description = "an audio jukebox application";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.12/kdemultimedia/kmix.nix
new file mode 100644
index 00000000000..1dd8108166f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/kmix.nix
@@ -0,0 +1,7 @@
+{ 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.12/kdemultimedia/kscd.nix b/pkgs/desktops/kde-4.12/kdemultimedia/kscd.nix
new file mode 100644
index 00000000000..e99ae53935b
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/kscd.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libmusicbrainz }:
+kde {
+  buildInputs = [ kdelibs libmusicbrainz ];
+  meta = {
+    description = "KDE CD player";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.12/kdemultimedia/libkcddb.nix
new file mode 100644
index 00000000000..720b01d1861
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/libkcddb.nix
@@ -0,0 +1,8 @@
+{ 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.12/kdemultimedia/libkcompactdisc.nix b/pkgs/desktops/kde-4.12/kdemultimedia/libkcompactdisc.nix
new file mode 100644
index 00000000000..6ed08af89f3
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/libkcompactdisc.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+  meta = {
+    description = "KDE library for playing & ripping CDs";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.12/kdemultimedia/mplayerthumbs.nix
new file mode 100644
index 00000000000..c88ebcc2a5a
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/mplayerthumbs.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+  meta = {
+    description = "a video thumbnail generator for KDE";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-filesharing.nix b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-filesharing.nix
new file mode 100644
index 00000000000..0330511a258
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-filesharing.nix
@@ -0,0 +1,9 @@
+{ 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.12/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix
new file mode 100644
index 00000000000..e838d84fc5e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, boost }:
+
+kde {
+  buildInputs = [ kdelibs boost ];
+
+  meta = {
+    description = "Strigi analyzers for various network protocols";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.12/kdenetwork/kdnssd.nix
new file mode 100644
index 00000000000..f65960cc337
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kdnssd.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE tool that monitors the network for DNS-SD services";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kget.nix b/pkgs/desktops/kde-4.12/kdenetwork/kget.nix
new file mode 100644
index 00000000000..f986da2de21
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kget.nix
@@ -0,0 +1,20 @@
+{ 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.12/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix
new file mode 100644
index 00000000000..7d8aec21ce6
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix
@@ -0,0 +1,26 @@
+{ kde, kdelibs, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
+  jasper, libidn, mediastreamer, pkgconfig, libxslt, giflib,
+  libgadu, boost, qca2, sqlite, jsoncpp,
+  ortp, srtp, libv4l }:
+
+kde {
+
+# TODO: libmeanwhile, xmms, jsoncpp(not found), kleopatra(from kdepim but doesn't install headers?),
+
+  buildInputs = [
+    kdelibs qca2 mediastreamer libgadu jsoncpp
+    kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib
+    libidn libxslt boost
+    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.12/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.12/kdenetwork/kppp.nix
new file mode 100644
index 00000000000..4c6bd65769f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kppp.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "PPP(Dial-Up) client tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.12/kdenetwork/krdc.nix
new file mode 100644
index 00000000000..80557e827fe
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdenetwork/krdc.nix
@@ -0,0 +1,9 @@
+{ 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.12/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.12/kdenetwork/krfb.nix
new file mode 100644
index 00000000000..cb4857965a3
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdenetwork/krfb.nix
@@ -0,0 +1,9 @@
+{ 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.12/kdepim-runtime.nix b/pkgs/desktops/kde-4.12/kdepim-runtime.nix
new file mode 100644
index 00000000000..d92e2254820
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdepim-runtime.nix
@@ -0,0 +1,16 @@
+{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies }:
+
+kde {
+
+# TODO: libkgapi(2), 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.12/kdepim.nix b/pkgs/desktops/kde-4.12/kdepim.nix
new file mode 100644
index 00000000000..4f364648d23
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdepim.nix
@@ -0,0 +1,28 @@
+{ kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime
+, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison
+, nepomuk_widgets, kactivities, libXScrnSaver, qjson
+, pkgconfig }:
+
+kde {
+
+# TODO: LinkGrammar
+
+  buildInputs =
+    [ kdepimlibs boost shared_desktop_ontologies akonadi nepomuk_widgets
+      libxslt cyrus_sasl gpgme libassuan grantlee prison kactivities
+      libXScrnSaver qjson
+    ];
+
+  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.12/kdepimlibs.nix b/pkgs/desktops/kde-4.12/kdepimlibs.nix
new file mode 100644
index 00000000000..ca0af9400b1
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdepimlibs.nix
@@ -0,0 +1,19 @@
+{ 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.12/kdeplasma-addons.nix b/pkgs/desktops/kde-4.12/kdeplasma-addons.nix
new file mode 100644
index 00000000000..550099830d9
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeplasma-addons.nix
@@ -0,0 +1,23 @@
+{ 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.12/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.12/kdesdk/cervisia.nix
new file mode 100644
index 00000000000..1dabe46cd42
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/cervisia.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A KDE CVS frontend";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.12/kdesdk/dolphin-plugins.nix
new file mode 100644
index 00000000000..ad8132a850e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/dolphin-plugins.nix
@@ -0,0 +1,11 @@
+{ 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.12/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.12/kdesdk/kapptemplate.nix
new file mode 100644
index 00000000000..391536248dd
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/kapptemplate.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A KDE 4 project template generator";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.12/kdesdk/kcachegrind.nix
new file mode 100644
index 00000000000..65d410cca48
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/kcachegrind.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE Frontend for Callgrind/Cachegrind";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/kde-dev-scripts.nix b/pkgs/desktops/kde-4.12/kdesdk/kde-dev-scripts.nix
new file mode 100644
index 00000000000..df81145e5d6
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/kde-dev-scripts.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Various scripts to ease KDE development";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.12/kdesdk/kde-dev-utils.nix
new file mode 100644
index 00000000000..215c0a3c613
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/kde-dev-utils.nix
@@ -0,0 +1,11 @@
+{ 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.12/kdesdk/kdesdk-kioslaves.nix b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-kioslaves.nix
new file mode 100644
index 00000000000..98bbce35a97
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-kioslaves.nix
@@ -0,0 +1,12 @@
+{ 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.12/kdesdk/kdesdk-strigi-analyzers.nix b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-strigi-analyzers.nix
new file mode 100644
index 00000000000..4d579b88ba8
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-strigi-analyzers.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Strigi analyzers for diff, po and ts";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/kdesdk-thumbnailers.nix b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-thumbnailers.nix
new file mode 100644
index 00000000000..d707fe9038f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-thumbnailers.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, gettext }:
+
+kde {
+
+  buildInputs = [ kdelibs gettext ];
+
+  meta = {
+    description = "PO file format thumbnailer";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/kompare.nix b/pkgs/desktops/kde-4.12/kdesdk/kompare.nix
new file mode 100644
index 00000000000..644c7c48dc9
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/kompare.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libkomparediff2 }:
+
+kde {
+  buildInputs = [ kdelibs libkomparediff2 ];
+
+  meta = {
+    description = "A program to view the differences between files and optionally generate a diff";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/libkomparediff2.nix b/pkgs/desktops/kde-4.12/kdesdk/libkomparediff2.nix
new file mode 100644
index 00000000000..5933682c70a
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/libkomparediff2.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A library to compare files and strings";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.12/kdesdk/lokalize.nix
new file mode 100644
index 00000000000..1565426eb1f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/lokalize.nix
@@ -0,0 +1,13 @@
+{ 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.12/kdesdk/okteta.nix b/pkgs/desktops/kde-4.12/kdesdk/okteta.nix
new file mode 100644
index 00000000000..058636596ad
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/okteta.nix
@@ -0,0 +1,13 @@
+{ 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.12/kdesdk/poxml.nix b/pkgs/desktops/kde-4.12/kdesdk/poxml.nix
new file mode 100644
index 00000000000..6e46c3e3ab4
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/poxml.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, antlr, gettext }:
+
+kde {
+  buildInputs = [ kdelibs antlr gettext ];
+
+  meta = {
+    description = "Po<->xml tools";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix
new file mode 100644
index 00000000000..e83a2d9a901
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libxml2, libxslt, boost }:
+
+kde {
+  buildInputs = [ kdelibs libxml2 libxslt boost ];
+
+  meta = {
+    description = "Umbrello UML modeller";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdetoys/amor.nix b/pkgs/desktops/kde-4.12/kdetoys/amor.nix
new file mode 100644
index 00000000000..936d63d544a
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdetoys/amor.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE creature for your desktop";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.12/kdetoys/kteatime.nix
new file mode 100644
index 00000000000..dacf54def4b
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdetoys/kteatime.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE utility for making a fine cup of tea";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdetoys/ktux.nix b/pkgs/desktops/kde-4.12/kdetoys/ktux.nix
new file mode 100644
index 00000000000..108f9be7c72
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdetoys/ktux.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, kde_workspace }:
+
+kde {
+  buildInputs = [ kdelibs kde_workspace ];
+
+  meta = {
+    description = "Tux Screen Saver";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/ark.nix b/pkgs/desktops/kde-4.12/kdeutils/ark.nix
new file mode 100644
index 00000000000..eb3e12281d6
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/ark.nix
@@ -0,0 +1,9 @@
+{ 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.12/kdeutils/filelight.nix b/pkgs/desktops/kde-4.12/kdeutils/filelight.nix
new file mode 100644
index 00000000000..25ecabed27c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/filelight.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Tool to visualise file and directory sizes";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.12/kdeutils/kcalc.nix
new file mode 100644
index 00000000000..08b202e8f0e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/kcalc.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, gmp }:
+
+kde {
+  buildInputs = [ kdelibs gmp ];
+
+  meta = {
+    description = "KDE Calculator";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.12/kdeutils/kcharselect.nix
new file mode 100644
index 00000000000..d4c9c06f483
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/kcharselect.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE character selection utility";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kdf.nix b/pkgs/desktops/kde-4.12/kdeutils/kdf.nix
new file mode 100644
index 00000000000..3f9da58d0a6
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/kdf.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE free disk space utility";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.12/kdeutils/kfloppy.nix
new file mode 100644
index 00000000000..2434a4fa671
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/kfloppy.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Floppy disk formatting utility";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix
new file mode 100644
index 00000000000..3ff1a286ae5
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, kdepimlibs, boost }:
+
+kde {
+
+  buildInputs = [ kdelibs kdepimlibs boost ];
+
+  meta = {
+    description = "Simple KDE GUI for GPG";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.12/kdeutils/kremotecontrol.nix
new file mode 100644
index 00000000000..70311a789f9
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/kremotecontrol.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libXtst }:
+
+kde {
+  buildInputs = [ kdelibs libXtst ];
+
+  meta = {
+    description = "KDE remote control";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.12/kdeutils/ktimer.nix
new file mode 100644
index 00000000000..5700977349e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/ktimer.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE Timer";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kwallet.nix b/pkgs/desktops/kde-4.12/kdeutils/kwallet.nix
new file mode 100644
index 00000000000..9ec0e6c0396
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/kwallet.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE Wallet (password storage) management tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.12/kdeutils/print-manager.nix
new file mode 100644
index 00000000000..ae72becd1e4
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/print-manager.nix
@@ -0,0 +1,27 @@
+{ 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.12/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.12/kdeutils/superkaramba.nix
new file mode 100644
index 00000000000..cbe7a285606
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/superkaramba.nix
@@ -0,0 +1,11 @@
+{ 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.12/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.12/kdeutils/sweeper.nix
new file mode 100644
index 00000000000..78d56c7df30
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/sweeper.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Helps clean unwanted traces the user leaves on the system";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.12/kdewebdev/kfilereplace.nix
new file mode 100644
index 00000000000..55e37809e07
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdewebdev/kfilereplace.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Batch search and replace tool";
+    homepage = http://www.kdewebdev.org;
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.12/kdewebdev/kimagemapeditor.nix
new file mode 100644
index 00000000000..6d22f72461f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdewebdev/kimagemapeditor.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "An HTML imagemap editor";
+    homepage = http://www.nongnu.org/kimagemap/;
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix
new file mode 100644
index 00000000000..918512e2b2d
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }:
+
+kde {
+
+# todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old
+
+  buildInputs = [ kdelibs kdepimlibs htmlTidy boost ];
+
+  meta = {
+    description = "A KDE link checker";
+    homepage = http://klinkstatus.kdewebdev.org;
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.12/kdewebdev/kommander.nix
new file mode 100644
index 00000000000..d5f4337f714
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdewebdev/kommander.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A graphical editor of scripted dialogs";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/l10n/default.nix b/pkgs/desktops/kde-4.12/l10n/default.nix
new file mode 100644
index 00000000000..c9fab80bffb
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/l10n/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, kdelibs, gettext, release, 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}";
+        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.12/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.12/l10n/l10n-manifest.sh
new file mode 100755
index 00000000000..ec159a1e204
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/l10n/l10n-manifest.sh
@@ -0,0 +1,32 @@
+#!/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.12/l10n/manifest-4.12.2.nix b/pkgs/desktops/kde-4.12/l10n/manifest-4.12.2.nix
new file mode 100644
index 00000000000..9040e7006fb
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/l10n/manifest-4.12.2.nix
@@ -0,0 +1,262 @@
+[
+{
+  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/oxygen-icons.nix b/pkgs/desktops/kde-4.12/oxygen-icons.nix
new file mode 100644
index 00000000000..626948cb24d
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/oxygen-icons.nix
@@ -0,0 +1,15 @@
+{ kde, cmake }:
+
+kde {
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "0i28c8iz83ian5mnci66jlrdkwiw09j0vxgfs74mc4wgbj5xns2f";
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    description = "KDE Oxygen theme icons";
+    longDescription = "Icons for KDE's default theme";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.12/support/akonadi/default.nix b/pkgs/desktops/kde-4.12/support/akonadi/default.nix
new file mode 100644
index 00000000000..d51996e3bc1
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/support/akonadi/default.nix
@@ -0,0 +1,24 @@
+{ 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 5d3797788dc..90e59c96c29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9626,7 +9626,7 @@ let
 
   kde4 = recurseIntoAttrs pkgs.kde411;
 
-# kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );
+  kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );
 
   kde4_prev = recurseIntoAttrs pkgs.kde410;
 
@@ -9646,6 +9646,12 @@ let
       libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.11;
 
+ kde412 = kdePackagesFor (pkgs.kde412 // {
+      eigen = eigen2;
+      libusb = libusb1;
+      libcanberra = libcanberra_kde;
+    }) ../desktops/kde-4.12;
+
   kdePackagesFor = self: dir:
     let callPackageOrig = callPackage; in
     let
-- 
GitLab


From 7cbadb51e18938581b12a17ffd80393bd1be84c9 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Feb 2014 04:31:50 +0200
Subject: [PATCH 1183/3789] libtorrent-rasterbar: change repo to the current
 one

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

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 035077e12a6..4ec4d0dcfa6 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.16.13";
   
   src = fetchurl {
-    url = "http://libtorrent.googlecode.com/files/${name}.tar.gz";
+    url = mirror://sourceforge/libtorrent/libtorrent-rasterbar-0.16.13.tar.gz;
     sha256 = "1sr788hhip6pgfb842110nl36hqdc1vz2s9n5vzypm0jy7qklmvm";
   };
 
-- 
GitLab


From 04ddcf6079b48e77019645f2dcd13dc463f07153 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:54:28 +0100
Subject: [PATCH 1184/3789] haskell-pretty-show: update to version 1.6.7

---
 .../libraries/haskell/pretty-show/{1.6.5.nix => 1.6.7.nix}    | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/pretty-show/{1.6.5.nix => 1.6.7.nix} (86%)

diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.5.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.7.nix
similarity index 86%
rename from pkgs/development/libraries/haskell/pretty-show/1.6.5.nix
rename to pkgs/development/libraries/haskell/pretty-show/1.6.7.nix
index 60a191da251..7e3e3e25e8a 100644
--- a/pkgs/development/libraries/haskell/pretty-show/1.6.5.nix
+++ b/pkgs/development/libraries/haskell/pretty-show/1.6.7.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pretty-show";
-  version = "1.6.5";
-  sha256 = "0yn20gh2xwzvfwb9fdzxqqbbb6vvd4rlv5ancw4vc8p2kgfhwxf3";
+  version = "1.6.7";
+  sha256 = "16qjp6cl3hyir5bchnncq95bp7nw5cpp5kd5mszkjjhzw1jj9srz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath haskellLexer ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8482a7b2147..ca69b94aa52 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1937,10 +1937,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   prettyclass = callPackage ../development/libraries/haskell/prettyclass {};
 
   prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {};
-  prettyShow_1_6_5 = callPackage ../development/libraries/haskell/pretty-show/1.6.5.nix {
+  prettyShow_1_6_7 = callPackage ../development/libraries/haskell/pretty-show/1.6.7.nix {
     happy = self.happy_1_19_2;
   };
-  prettyShow = self.prettyShow_1_6_5;
+  prettyShow = self.prettyShow_1_6_7;
 
   punycode = callPackage ../development/libraries/haskell/punycode {};
 
-- 
GitLab


From 51095c1e5c28f0f4d5072e877544b1efc2a1efdb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:57:08 +0100
Subject: [PATCH 1185/3789] haskell-lens: update to version 4.0.3

---
 .../libraries/haskell/lens/{4.0.2.nix => 4.0.3.nix}    |  4 ++--
 pkgs/top-level/haskell-packages.nix                    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/development/libraries/haskell/lens/{4.0.2.nix => 4.0.3.nix} (94%)

diff --git a/pkgs/development/libraries/haskell/lens/4.0.2.nix b/pkgs/development/libraries/haskell/lens/4.0.3.nix
similarity index 94%
rename from pkgs/development/libraries/haskell/lens/4.0.2.nix
rename to pkgs/development/libraries/haskell/lens/4.0.3.nix
index 492334bfc8f..9aca42a77df 100644
--- a/pkgs/development/libraries/haskell/lens/4.0.2.nix
+++ b/pkgs/development/libraries/haskell/lens/4.0.3.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "4.0.2";
-  sha256 = "0j5lmyd7myaaz71kxwznr10wz5ww3j6faiik4hjvd74v658i34r5";
+  version = "4.0.3";
+  sha256 = "01gf0hxpd136555r9ilzjrc6fyw0ng9bmr8bmkhfnkba127y7hgx";
   buildDepends = [
     aeson bifunctors comonad constraints contravariant distributive
     exceptions filepath hashable mtl parallel primitive profunctors
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ca69b94aa52..37ea026db96 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1514,7 +1514,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {
     aeson = self.aeson_0_7_0_1;
-    lens = self.lens_4_0_2;
+    lens = self.lens_4_0_3;
   };
 
   jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
@@ -1550,7 +1550,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {};
 
   lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {};
-  lens_4_0_2 = callPackage ../development/libraries/haskell/lens/4.0.2.nix {
+  lens_4_0_3 = callPackage ../development/libraries/haskell/lens/4.0.3.nix {
     aeson = self.aeson_0_7_0_1;
   };
   lens = self.lens_3_10_2;
@@ -1576,7 +1576,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   liftedBase = callPackage ../development/libraries/haskell/lifted-base {};
 
   linear = callPackage ../development/libraries/haskell/linear {
-    lens = self.lens_4_0_2;
+    lens = self.lens_4_0_3;
   };
 
   List = callPackage ../development/libraries/haskell/List {};
@@ -2154,8 +2154,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   socks = callPackage ../development/libraries/haskell/socks {};
 
   sparse = callPackage ../development/libraries/haskell/sparse {
-    lens = self.lens_4_0_2;
-    linear = self.linear.override { lens = self.lens_4_0_2; };
+    lens = self.lens_4_0_3;
+    linear = self.linear.override { lens = self.lens_4_0_3; };
   };
 
   srcloc = callPackage ../development/libraries/haskell/srcloc {};
-- 
GitLab


From 57e4d68025aebcaa62d48a15d5f94545d52c555e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:57:43 +0100
Subject: [PATCH 1186/3789] haskell-idris: update to version 0.9.11.2

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

diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index 898bd50e62b..a22c8bf7762 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "idris";
-  version = "0.9.11.1";
-  sha256 = "02a484vcf4sm2kdmxfxsy8x5whf002xyp2b6w1zrg7a6qggcabar";
+  version = "0.9.11.2";
+  sha256 = "16xgiygn0j3kl3l36lnv6wz422nz2bvn3lk86xkdfvwjpv4630yn";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From d89b4860fe91116780ef42521e5545142e2672eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:57:45 +0100
Subject: [PATCH 1187/3789] haskell-HTF: update to version 0.11.2.1

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

diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix
index 3d7df9e540a..877fa68ab00 100644
--- a/pkgs/development/libraries/haskell/HTF/default.nix
+++ b/pkgs/development/libraries/haskell/HTF/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HTF";
-  version = "0.11.2";
-  sha256 = "12q7j1vhb5w8lnpnxn1aszs4bv2yigi3php6pimcwwv9q9vc3i3c";
+  version = "0.11.2.1";
+  sha256 = "194wjcs06cbxjfgfcax697405c0vlaklnvh705ffrxmrrww77z7l";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From c2e385f4548ac49d0ce0a944028451068a746308 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:57:46 +0100
Subject: [PATCH 1188/3789] haskell-dimensional-tf: update to version 0.3

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

diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
index 6bed24f5c40..4b7117a0e4c 100644
--- a/pkgs/development/libraries/haskell/dimensional-tf/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dimensional-tf";
-  version = "0.2.1";
-  sha256 = "1avvq8kgxagdw3345y7ly30i4x43l0i0m43rlb72j3inv6rdgxgz";
+  version = "0.3";
+  sha256 = "0z3k9962zz652bk2azv9lcms1j06v60hid3iach043dpg5r083qg";
   buildDepends = [ numtypeTf time ];
   meta = {
     homepage = "http://dimensional.googlecode.com/";
-- 
GitLab


From 8e2e0a9023e3ad61f4a2e36aa1f520257002f446 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:57:48 +0100
Subject: [PATCH 1189/3789] haskell-dimensional: update to version 0.13

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

diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
index 512ea378b66..f3444703c3d 100644
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dimensional";
-  version = "0.12.2";
-  sha256 = "0b5w9g3xn74b7z4bcsfcijnj54r8cwbbd8129q61c3nhng1f896a";
+  version = "0.13";
+  sha256 = "1nj8h79iq7pirqlj8iw1p782nm05xgym3469x7hlzaz3ig9nwgrg";
   buildDepends = [ numtype time ];
   meta = {
     homepage = "http://dimensional.googlecode.com/";
-- 
GitLab


From 6dc1b3254225b94b418626f1b423f47cf54359ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:57:50 +0100
Subject: [PATCH 1190/3789] haskell-foldl: update to version 1.0.2

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

diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix
index efc0aa61d3d..3b1c61574f0 100644
--- a/pkgs/development/libraries/haskell/foldl/default.nix
+++ b/pkgs/development/libraries/haskell/foldl/default.nix
@@ -1,10 +1,10 @@
-{ cabal, text }:
+{ cabal, primitive, text, vector }:
 
 cabal.mkDerivation (self: {
   pname = "foldl";
-  version = "1.0.1";
-  sha256 = "194dkpjh0964cmh4mg35qffkg8dx8d821aj8k6khb40fq5s8smjy";
-  buildDepends = [ text ];
+  version = "1.0.2";
+  sha256 = "11cqmw102m2bskaknl8qr7hwyn94hfv2ind5fgvjw4hwgllr8v84";
+  buildDepends = [ primitive text vector ];
   meta = {
     description = "Composable, streaming, and efficient left folds";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From 96a64bff2a0311fdc716311bd8e80c3f130e4a93 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:57:51 +0100
Subject: [PATCH 1191/3789] haskell-force-layout: update to version 0.3.0.1

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

diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
index 6c1082b0f4b..70488010072 100644
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ b/pkgs/development/libraries/haskell/force-layout/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "force-layout";
-  version = "0.3";
-  sha256 = "1v4jgh08ppvfxc8w13wc9iiwk5hh2q9n7m5xb9vl59bmxdx81kai";
+  version = "0.3.0.1";
+  sha256 = "0x9nfmvml9hszbm2izr4rfl9xphiyv0lj0hlixjbpxvm5nqk2w95";
   buildDepends = [
     dataDefaultClass lens vectorSpace vectorSpacePoints
   ];
-- 
GitLab


From 6038c78c252a39709bf8ae8ade0116ecfc2114f9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:57:53 +0100
Subject: [PATCH 1192/3789] haskell-hledger-web: update to version 0.22.4

---
 pkgs/development/libraries/haskell/hledger-web/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index b547c8a6042..0875c09db86 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.22.1";
-  sha256 = "0nqw7scnhcip2bg832p9v0rqk01gn4xwj9bqsvsvmh31fh9ldchw";
+  version = "0.22.4";
+  sha256 = "07xz6ijg3nzzjair5gdjjryv5hs2rxws4maz22rrqnpf8wwjjc54";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -21,9 +21,6 @@ cabal.mkDerivation (self: {
   ];
   testDepends = [ hspec yesod yesodTest ];
   doCheck = false;
-  patchPhase = ''
-    sed -i -e 's|blaze-html.*0.7|blaze-html|' -e 's|blaze-markup.*0.7|blaze-markup|' hledger-web.cabal
-  '';
   meta = {
     homepage = "http://hledger.org";
     description = "A web interface for the hledger accounting tool";
-- 
GitLab


From 7d25bc200f578b48682b091ab93f3849113738fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:57:55 +0100
Subject: [PATCH 1193/3789] haskell-lifted-base: update to version 0.2.2.0

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

diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
index cfa51bd39aa..7462b362c98 100644
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-base";
-  version = "0.2.1.1";
-  sha256 = "062mdh364c4adnyc3l037zi1aaqvgm43g1x6vf3pjb75c3sayc5k";
+  version = "0.2.2.0";
+  sha256 = "1m6mk24nxkp9a78nywdb844avbqwh931gv1bxsgcbhavavzs72jj";
   buildDepends = [
     baseUnicodeSymbols monadControl transformersBase
   ];
-- 
GitLab


From 7ea11af3488e8acf81e770aa1b948c1b41d268e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:57:56 +0100
Subject: [PATCH 1194/3789] haskell-lrucache: update to version 1.1.1.4

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

diff --git a/pkgs/development/libraries/haskell/lrucache/default.nix b/pkgs/development/libraries/haskell/lrucache/default.nix
index 2d494f4a896..43fdd6caf99 100644
--- a/pkgs/development/libraries/haskell/lrucache/default.nix
+++ b/pkgs/development/libraries/haskell/lrucache/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lrucache";
-  version = "1.1.1.3";
-  sha256 = "1djjxlyfrk3wpgc4h6xljpray09v7lc956202k9bxra24vj5f1lm";
+  version = "1.1.1.4";
+  sha256 = "0w3b338wsf7c0acjxxfdjxsljfpsix67aihkl2jwnp5x71awf8qh";
   meta = {
     homepage = "http://github.com/chowells79/lrucache";
     description = "a simple, pure LRU cache";
-- 
GitLab


From 215de77297a0dd8cd46a18aa962da77f5e1c2f40 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:57:58 +0100
Subject: [PATCH 1195/3789] haskell-monad-control: update to version 0.3.2.3

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

diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix
index 12657a63b4c..e9c6088b5f4 100644
--- a/pkgs/development/libraries/haskell/monad-control/default.nix
+++ b/pkgs/development/libraries/haskell/monad-control/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-control";
-  version = "0.3.2.2";
-  sha256 = "1wwcx2k0nzmjqxf8d8wasnhvdx5q3nxkcyq7vbprkfy85sj7ivxc";
+  version = "0.3.2.3";
+  sha256 = "1fk3cqzsiwyjpyd20z1j0i4m669rcag2q7kpl78m6vm1a405iwlw";
   buildDepends = [
     baseUnicodeSymbols transformers transformersBase
   ];
-- 
GitLab


From 4a8e988dc5926d4a1dcd1b91e362695553236507 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:58:00 +0100
Subject: [PATCH 1196/3789] haskell-numtype-tf: update to version 0.1.2

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

diff --git a/pkgs/development/libraries/haskell/numtype-tf/default.nix b/pkgs/development/libraries/haskell/numtype-tf/default.nix
index ad7f2d98660..d317f57efce 100644
--- a/pkgs/development/libraries/haskell/numtype-tf/default.nix
+++ b/pkgs/development/libraries/haskell/numtype-tf/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "numtype-tf";
-  version = "0.1.1";
-  sha256 = "0aj24jlfcv4rsa0zfglsfgq9f0kxln32drypp66652ycffz3ip9a";
+  version = "0.1.2";
+  sha256 = "00bnz9k4nq21z4vax37qjv6ra2jvlshk0jlici1w8y9rx39zrjyx";
   meta = {
     homepage = "http://dimensional.googlecode.com/";
     description = "Type-level (low cardinality) integers, implemented using type families";
-- 
GitLab


From 6ff746c698e75277314455122f62c919f6fb2654 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:58:01 +0100
Subject: [PATCH 1197/3789] haskell-numtype: update to version 1.1

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

diff --git a/pkgs/development/libraries/haskell/numtype/default.nix b/pkgs/development/libraries/haskell/numtype/default.nix
index d35f763d32e..25e0a61beb9 100644
--- a/pkgs/development/libraries/haskell/numtype/default.nix
+++ b/pkgs/development/libraries/haskell/numtype/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "numtype";
-  version = "1.0.1";
-  sha256 = "130qchi9dplpg7pxf4pz7nz4mnprngw16mizqycp5pdlawbcp5js";
+  version = "1.1";
+  sha256 = "1az10xcfl6qpyy9qnh8g2iqx53rxnjxzc1h8kl1gira6yv7g6857";
   meta = {
     homepage = "http://dimensional.googlecode.com/";
     description = "Type-level (low cardinality) integers";
-- 
GitLab


From c1be8982401e00a5e61f3ec8d17d0c1b8d3d4f1c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:58:03 +0100
Subject: [PATCH 1198/3789] haskell-pipes-aeson: update to version 0.3.0

---
 .../libraries/haskell/pipes-aeson/default.nix         | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix
index 2552970717d..899810c1539 100644
--- a/pkgs/development/libraries/haskell/pipes-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-aeson/default.nix
@@ -1,13 +1,14 @@
-{ cabal, aeson, attoparsec, pipes, pipesAttoparsec, pipesParse
-, transformers
+{ cabal, aeson, attoparsec, pipes, pipesAttoparsec, pipesBytestring
+, pipesParse, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "pipes-aeson";
-  version = "0.2.1";
-  sha256 = "19zrbk9jbls8zsnhx8bm9dzd7rxvf98bpjkr3k9ggmx2g5p08mgz";
+  version = "0.3.0";
+  sha256 = "1kckdllw5xnh8z92gjw5swyxp9km879wqfly7af3iirwhickk4vn";
   buildDepends = [
-    aeson attoparsec pipes pipesAttoparsec pipesParse transformers
+    aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse
+    transformers
   ];
   meta = {
     homepage = "https://github.com/k0001/pipes-aeson";
-- 
GitLab


From 4b7295c1c7fadc46f236bbea0256bd01deda22a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:58:05 +0100
Subject: [PATCH 1199/3789] haskell-snaplet-acid-state: update to version
 0.2.6.1

---
 .../libraries/haskell/snaplet-acid-state/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
index 8a9a594e45d..4d66f69acd6 100644
--- a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
+++ b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snaplet-acid-state";
-  version = "0.2.6";
-  sha256 = "005c4x7sh820iar69rany3hv4rlbzpsd4yqd2x2v3jql9z55k4s9";
+  version = "0.2.6.1";
+  sha256 = "0wlawnsxisslqzspa29swsdmncgx04z3rd1bhwx73mx5pksykw60";
   buildDepends = [ acidState snap text ];
   meta = {
     homepage = "https://github.com/mightybyte/snaplet-acid-state";
-- 
GitLab


From fe5a17ae2e6b44d6a426e52456b77e660b8bcb73 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:58:06 +0100
Subject: [PATCH 1200/3789] haskell-sqlite-simple: update to version 0.4.5.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 ab4426a3d1e..cc6204735d2 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.0";
-  sha256 = "0y4w8rj46lawz3hbi8dz80fbvxxgzj85094dxkwvpzgrf33py4y4";
+  version = "0.4.5.1";
+  sha256 = "0mmj6vk3yjvrbsggc5pyba5iprzvfhlsq1jfradpazgfc998j0ry";
   buildDepends = [
     attoparsec blazeBuilder blazeTextual directSqlite text time
     transformers
-- 
GitLab


From 169e7734b96e8e483f1f2c133fd7960b3bf586f4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:58:08 +0100
Subject: [PATCH 1201/3789] haskell-th-orphans: update to version 0.8.1

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

diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix
index dd9fbc198bf..9a8d22423a3 100644
--- a/pkgs/development/libraries/haskell/th-orphans/default.nix
+++ b/pkgs/development/libraries/haskell/th-orphans/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "th-orphans";
-  version = "0.8";
-  sha256 = "0kzzcicn6pggvvblhbrs3vh0bf71izlb99lb0f5qww7ymi4smldr";
+  version = "0.8.1";
+  sha256 = "1glf1zkiip18l0qdy3856ag7ksbxzd11dzdyq00qrz87kck5y58w";
   buildDepends = [ thLift ];
   jailbreak = true;
   meta = {
-- 
GitLab


From 797fd2d7375d390a2eec44a3873c47b9e4977eaf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:58:09 +0100
Subject: [PATCH 1202/3789] haskell-websockets: update to version 0.8.1.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 82a745b8725..24b0554ea01 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.1.2";
-  sha256 = "1xr44j3fcah3p5ic5s4rirb1ribq88m7ckmdfhwz5wy42sfiwv99";
+  version = "0.8.1.3";
+  sha256 = "16iq2grgafshjwhjxwb0qdxiawr6z6hxaksix52nr8l4wm9ibhjv";
   buildDepends = [
     attoparsec base64Bytestring binary blazeBuilder caseInsensitive
     entropy ioStreams mtl network random SHA text
-- 
GitLab


From 636edd49bfc0864cbeb75fafb82a4f8e08cc2e71 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:58:11 +0100
Subject: [PATCH 1203/3789] haskell-yaml: update to version 0.8.7.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 5ded7e665ab..35106292f85 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.6.2";
-  sha256 = "1qgxjm6jv7w12a30irgb0dgdn51zxzcwqd0r713l26v35m2fvmdg";
+  version = "0.8.7.2";
+  sha256 = "00dmmws0gmp9fb2ha6z055ix7jlsiry24bwhkl226b680gi9a84d";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 690fc8cbe156498862b26304d64b00c7ca976e6a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 10:58:13 +0100
Subject: [PATCH 1204/3789] haskell-zeromq3-haskell: update to version 0.5.2

---
 .../libraries/haskell/zeromq3-haskell/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
index a60bc457f85..820f174e129 100644
--- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zeromq3-haskell";
-  version = "0.5.1";
-  sha256 = "0jmdhs2apmcr3wf5r739gq9qqad59qj82h7qpdk3m4cc2a7djil0";
+  version = "0.5.2";
+  sha256 = "1ky92qwyk27qsxnvaj0mc9yyhk7g19ry2nq55666ayahc899z213";
   buildDepends = [
     async MonadCatchIOTransformers semigroups transformers
   ];
@@ -13,7 +13,7 @@ cabal.mkDerivation (self: {
     ansiTerminal async checkers MonadCatchIOTransformers QuickCheck
     transformers
   ];
-  extraLibraries = [ zeromq ];
+  pkgconfigDepends = [ zeromq ];
   doCheck = false;
   meta = {
     homepage = "http://github.com/twittner/zeromq-haskell/";
-- 
GitLab


From 1ff560f2ad5c72e65ab000c16198e27bcdac4cd8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 6 Feb 2014 18:59:19 -0600
Subject: [PATCH 1205/3789] Add haskell-SVGFonts-1.4.0.1

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

diff --git a/pkgs/development/libraries/haskell/SVGFonts/default.nix b/pkgs/development/libraries/haskell/SVGFonts/default.nix
new file mode 100644
index 00000000000..de47bd200ee
--- /dev/null
+++ b/pkgs/development/libraries/haskell/SVGFonts/default.nix
@@ -0,0 +1,18 @@
+{ cabal, attoparsec, blazeMarkup, blazeSvg, dataDefaultClass
+, diagramsLib, parsec, split, text, tuple, vector, vectorSpace, xml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "SVGFonts";
+  version = "1.4.0.1";
+  sha256 = "0f878xg6qngl8ahk8zz03f1kyn2jq1dz05zw8av7s91x2ms8q3rg";
+  buildDepends = [
+    attoparsec blazeMarkup blazeSvg dataDefaultClass diagramsLib parsec
+    split text tuple vector vectorSpace xml
+  ];
+  meta = {
+    description = "Fonts from the SVG-Font 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 8482a7b2147..95d953c3866 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2280,6 +2280,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     libc = pkgs.stdenv.gcc.libc;
   };
 
+  SVGFonts = callPackage ../development/libraries/haskell/SVGFonts {};
+
   symbol = callPackage ../development/libraries/haskell/symbol {};
 
   systemFilepath = callPackage ../development/libraries/haskell/system-filepath {};
-- 
GitLab


From 89a9a9405440283b8afc5d0d21122425f069bf63 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 6 Feb 2014 19:00:02 -0600
Subject: [PATCH 1206/3789] Add haskell-diagrams-postscript-1.0.1.2

---
 .../libraries/haskell/diagrams/postscript.nix | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/diagrams/postscript.nix

diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix
new file mode 100644
index 00000000000..2c827b5f3d1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix
@@ -0,0 +1,19 @@
+{ cabal, diagramsCore, diagramsLib, dlist, filepath, hashable, lens
+, monoidExtras, mtl, semigroups, split, vectorSpace
+}:
+
+cabal.mkDerivation (self: {
+  pname = "diagrams-postscript";
+  version = "1.0.1.2";
+  sha256 = "0im1w70qi8qs2z8x41v7pwvk1alfaw1h8k0683njzd5sfz2m1gny";
+  buildDepends = [
+    diagramsCore diagramsLib dlist filepath hashable lens monoidExtras
+    mtl semigroups split vectorSpace
+  ];
+  meta = {
+    homepage = "http://projects.haskell.org/diagrams/";
+    description = "Postscript backend for diagrams drawing EDSL";
+    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 95d953c3866..7bf233ade17 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -940,6 +940,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {};
   diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix {};
   diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {};
+  diagramsPostscript = callPackage ../development/libraries/haskell/diagrams/postscript.nix {};
   diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix {};
 
   Diff = callPackage ../development/libraries/haskell/Diff {};
-- 
GitLab


From 2cd48f94cccd06c09c7d5fb7f6405c37534919d7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 6 Feb 2014 19:00:17 -0600
Subject: [PATCH 1207/3789] Add haskell-Chart-diagrams-1.2

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

diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
new file mode 100644
index 00000000000..008869713ef
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
@@ -0,0 +1,21 @@
+{ cabal, blazeSvg, Chart, colour, dataDefaultClass, diagramsCore
+, diagramsLib, diagramsPostscript, diagramsSvg, lens, mtl
+, operational, SVGFonts, text, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "Chart-diagrams";
+  version = "1.2";
+  sha256 = "11pvyasra4mxid6826z6rkjhr71lg37fihzr8mgvjw3arascgqxz";
+  buildDepends = [
+    blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib
+    diagramsPostscript diagramsSvg lens mtl operational SVGFonts text
+    time
+  ];
+  meta = {
+    homepage = "https://github.com/timbod7/haskell-chart/wiki";
+    description = "Diagrams backend for Charts";
+    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 7bf233ade17..ad634e80cf5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -749,6 +749,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   Chart = callPackage ../development/libraries/haskell/Chart {};
   ChartCairo = callPackage ../development/libraries/haskell/Chart-cairo {};
+  ChartDiagrams = callPackage ../development/libraries/haskell/Chart-diagrams {};
   ChartGtk = callPackage ../development/libraries/haskell/Chart-gtk {};
 
   ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {};
-- 
GitLab


From b5d17fe873a1db4109bab1061ab1572cd501de4e Mon Sep 17 00:00:00 2001
From: Thiago Tonelli Bartolomei <thiagobart@gmail.com>
Date: Thu, 13 Feb 2014 11:11:14 -0500
Subject: [PATCH 1208/3789] - adding brightness options - setting options to be
 uniq - using proper systemd exec service

---
 nixos/modules/services/x11/redshift.nix | 26 +++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index b9ad962d8e4..368403ed8a5 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -14,24 +14,37 @@ in {
 
     services.redshift.latitude = mkOption {
       description = "Your current latitude";
-      type = types.string;
+      type = types.uniq types.string;
     };
 
     services.redshift.longitude = mkOption {
       description = "Your current longitude";
-      type = types.string;
+      type = types.uniq types.string;
     };
 
     services.redshift.temperature = {
       day = mkOption {
         description = "Colour temperature to use during day time";
         default = 5500;
-        type = types.int;
+        type = types.uniq types.int;
       };
       night = mkOption {
         description = "Colour temperature to use during night time";
         default = 3700;
-        type = types.int;
+        type = types.uniq types.int;
+      };
+    };
+
+    services.redshift.brightness = {
+      day = mkOption {
+        description = "Screen brightness to apply during the day (between 0.1 and 1.0)";
+        default = 1;
+        type = types.uniq types.string;
+      };
+      night = mkOption {
+        description = "Screen brightness to apply during the night (between 0.1 and 1.0)";
+        default = 1;
+        type = types.uniq types.string;
       };
     };
   };
@@ -41,10 +54,11 @@ in {
       description = "Redshift colour temperature adjuster";
       requires = [ "display-manager.service" ];
       after = [ "display-manager.service" ];
-      script = ''
+      serviceConfig.ExecStart = ''
         ${pkgs.redshift}/bin/redshift \
           -l ${cfg.latitude}:${cfg.longitude} \
-          -t ${toString cfg.temperature.day}:${toString cfg.temperature.night}
+          -t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \
+          -b ${toString cfg.brightness.day}:${toString cfg.brightness.night}
       '';
       environment = { DISPLAY = ":0"; };
       serviceConfig.Restart = "always";
-- 
GitLab


From f508ff8793fcb90b21424d3fbf9e0faf248b3ef8 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Thu, 13 Feb 2014 16:59:48 +0000
Subject: [PATCH 1209/3789] haskellPackages.digestiveFunctorsAeson: Correct
 dependencies

---
 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 37ea026db96..9e157dc55fe 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -952,7 +952,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   digestiveFunctors = callPackage ../development/libraries/haskell/digestive-functors {};
 
-  digestiveFunctorsAeson = callPackage ../development/libraries/haskell/digestive-functors-aeson {};
+  digestiveFunctorsAeson = callPackage ../development/libraries/haskell/digestive-functors-aeson {
+    aeson = self.aeson_0_7_0_1;
+    lens = self.lens_4_0_3;
+  };
 
   digestiveFunctorsHeist = callPackage ../development/libraries/haskell/digestive-functors-heist {};
 
-- 
GitLab


From 129d1b98512f60d38b3e3939d97d60b357fe7eeb Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 13 Feb 2014 18:02:15 +0100
Subject: [PATCH 1210/3789] modemmanager: Update from 0.7.991 to 1.2.0

---
 pkgs/tools/networking/modemmanager/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix
index 3e33b845b60..0640f55bc9e 100644
--- a/pkgs/tools/networking/modemmanager/default.nix
+++ b/pkgs/tools/networking/modemmanager/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, udev, polkit, dbus_glib, ppp, intltool, pkgconfig, libmbim, libqmi }:
 
 stdenv.mkDerivation rec {
-  name = "ModemManager-0.7.991";
+  name = "ModemManager-${version}";
+  version = "1.2.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/ModemManager/0.7/${name}.tar.xz";
-    sha256 = "0p8shqsbgnsazim7s52ylxjk064cbx2n1vm1jgywr7i58hsd6n4y";
+    url = "http://www.freedesktop.org/software/ModemManager/${name}.tar.xz";
+    sha256 = "1g08ciyhys9bi5m45z30kln17zni4r07i5byjaglmwq6np1xincb";
   };
 
   nativeBuildInputs = [ intltool pkgconfig ];
@@ -18,6 +19,13 @@ stdenv.mkDerivation rec {
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
   ];
 
+  postInstall = ''
+    # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
+    # aliases ourselves.
+    ln -s $out/etc/systemd/system/ModemManager.service \
+      $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
+  '';
+
   meta = {
     description = "WWAN modem manager, part of NetworkManager";
     maintainers = [ stdenv.lib.maintainers.urkud ];
-- 
GitLab


From 0d506296f0f0e9c56fba9b3df42d9d5113da1d32 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 13 Feb 2014 18:03:06 +0100
Subject: [PATCH 1211/3789] networkmanager: Build with ModemManager support

---
 pkgs/tools/networking/network-manager/default.nix       | 8 +++++---
 pkgs/tools/networking/network-manager/pptp-purity.patch | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 6cf842dcafb..8a8306ea30c 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz
 , udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
 , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll
-, gobjectIntrospection }:
+, gobjectIntrospection, modemmanager }:
 
 stdenv.mkDerivation rec {
   name = "network-manager-${version}";
@@ -33,9 +33,11 @@ stdenv.mkDerivation rec {
     "--with-crypto=gnutls" "--disable-more-warnings"
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     "--with-kernel-firmware-dir=/run/current-system/firmware"
-    "--with-session-tracking=systemd" ];
+    "--with-session-tracking=systemd"
+    "--with-modem-manager-1"
+  ];
 
-  buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz bluez5 gobjectIntrospection ];
+  buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz bluez5 gobjectIntrospection modemmanager ];
 
   propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];
 
diff --git a/pkgs/tools/networking/network-manager/pptp-purity.patch b/pkgs/tools/networking/network-manager/pptp-purity.patch
index 55ade68dd41..88af666b658 100644
--- a/pkgs/tools/networking/network-manager/pptp-purity.patch
+++ b/pkgs/tools/networking/network-manager/pptp-purity.patch
@@ -2,7 +2,7 @@ diff --git a/src/nm-pptp-service.c b/src/nm-pptp-service.c
 index 68a5759..568bbfe 100644
 --- a/src/nm-pptp-service.c
 +++ b/src/nm-pptp-service.c
-@@ -729,9 +729,7 @@ nm_find_pppd (void)
+@@ -730,9 +730,7 @@ nm_find_pppd (void)
  {
  	static const char *pppd_binary_paths[] =
  		{
@@ -12,8 +12,8 @@ index 68a5759..568bbfe 100644
 +			"@ppp@/sbin/pppd",
  			NULL
  		};
- 
-@@ -751,9 +749,7 @@ nm_find_pptp (void)
+
+@@ -752,9 +750,7 @@ nm_find_pptp (void)
  {
  	static const char *pptp_binary_paths[] =
  		{
-- 
GitLab


From fc90a739ba24a3f0122b73472ed1c7f1264f7d6a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 13 Feb 2014 18:04:46 +0100
Subject: [PATCH 1212/3789] networkmanager module: No need to start
 ModemManager explicitly, done by NM

---
 nixos/modules/services/networking/networkmanager.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index e5213c7fccf..fd5ff5e4498 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -177,16 +177,13 @@ in {
     systemd.services."networkmanager-init" = {
       description = "NetworkManager initialisation";
       wantedBy = [ "network.target" ];
-      partOf = [ "NetworkManager.service" ];
-      wants = [ "ModemManager.service" "NetworkManager.service" ];
+      wants = [ "NetworkManager.service" ];
       before = [ "NetworkManager.service" ];
       script = ''
         mkdir -m 700 -p /etc/NetworkManager/system-connections
         mkdir -m 755 -p ${stateDirs}
       '';
-      serviceConfig = {
-        Type = "oneshot";
-      };
+      serviceConfig.Type = "oneshot";
     };
 
     # Turn off NixOS' network management
-- 
GitLab


From 42cf992aaca572ec17cdbf76e1465da9d3a0adec Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Feb 2014 19:03:02 +0200
Subject: [PATCH 1213/3789] libtorrentRasterbar: update from 0.16.13 to 0.16.14

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

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 4ec4d0dcfa6..6e8567d2c46 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libtorrent-rasterbar-${version}";
-  version = "0.16.13";
+  version = "0.16.14";
   
   src = fetchurl {
-    url = mirror://sourceforge/libtorrent/libtorrent-rasterbar-0.16.13.tar.gz;
-    sha256 = "1sr788hhip6pgfb842110nl36hqdc1vz2s9n5vzypm0jy7qklmvm";
+    url = mirror://sourceforge/libtorrent/libtorrent-rasterbar-0.16.14.tar.gz;
+    sha256 = "0s4f36f28cgq55pgx4h99q18a0p566bhifxmqxjhlb63a1w20m2c";
   };
 
   buildInputs = [ boost pkgconfig openssl zlib python libiconvOrNull geoip ];
-- 
GitLab


From 0cc699b497cb91bf9e1caa723fd39de2b9d28f14 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Feb 2014 19:04:04 +0200
Subject: [PATCH 1214/3789] liblastfm: update from 1.0.7 to 1.0.8

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

diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index 6a253d06b3b..701b4df3cd8 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake }:
 
-let version = "1.0.7"; in
+let version = "1.0.8"; in
 
 stdenv.mkDerivation rec {
   name = "liblastfm-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://github.com/lastfm/liblastfm/tarball/${version}";
     name = "${name}.tar.gz";
-    sha256 = "1837gd2azy8r34rcmsn2m1zngk4v2hpk7q0ii60dhjjvjaaswkwq";
+    sha256 = "17jjhsgbwrzh09i0wcqsnmxzyrqy1png5ixpnx6rbqmhp54a3jn3";
   };
 
   prefixKey = "--prefix ";
-- 
GitLab


From 08004bc93e09af3a213f8094ae8dca2e1a216661 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Feb 2014 15:02:47 +0200
Subject: [PATCH 1215/3789] youtubeDL: update from 2014.02.03 to 2014.02.10

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 629cf93695f..a8863da4038 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.02.03";
+  version = "2014.02.10";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0ba6kg72j7h7xcldar0fd5pk809fp4ihr8nclwwp1qj93mraqjir";
+    sha256 = "0grxdbvzjnxd26c80rr22mjp89y4i6bghmqyp5bpzd53sgkpl0zs";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From 279e4e0a06ded85e571c6bc5a57b7d86b858fcae Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Feb 2014 12:11:51 +0200
Subject: [PATCH 1216/3789] kde4.kmymoney: update from 4.6.2 to 4.6.4, add
 documentation

---
 pkgs/applications/office/kmymoney/default.nix | 14 ++++----
 .../applications/office/kmymoney/qt-4.8.patch | 32 -------------------
 2 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/applications/office/kmymoney/qt-4.8.patch

diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index d55c66a2624..87e3bfd5312 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -1,20 +1,22 @@
 { stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig
-, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }:
+, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical
+, doxygen }:
 
 stdenv.mkDerivation rec {
-  name = "kmymoney-4.6.2";
+  name = "kmymoney-4.6.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/kmymoney2/${name}.tar.bz2";
-    sha256 = "0x9bl4h2mk8dv49nnn7drv528fnl5ynvvyy7q4m22k0d5yxarn5d";
+    url = "mirror://sourceforge/kmymoney2/${name}.tar.xz";
+    sha256 = "04n0lgi2yrx67bgjzbdbcm10pxs7l53srmp240znzw59njnjyll9";
   };
 
-  buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ];
+  buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical
+                  doxygen ];
   nativeBuildInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ];
 
   KDEDIRS = libalkimia;
 
-  patches = [ ./qgpgme.patch ./qt-4.8.patch ];
+  patches = [ ./qgpgme.patch ];
 
   meta = {
     homepage = http://kmymoney2.sourceforge.net/;
diff --git a/pkgs/applications/office/kmymoney/qt-4.8.patch b/pkgs/applications/office/kmymoney/qt-4.8.patch
deleted file mode 100644
index 7e9a44337cd..00000000000
--- a/pkgs/applications/office/kmymoney/qt-4.8.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Christoph Feck <christoph@maxiom.de>
-Date: Thu, 10 Nov 2011 11:34:20 +0000
-Subject: Fix compile with Qt 4.8
-X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&amp;a=commitdiff&amp;h=8324cfb9657d8c03f83691402386e8c5bfb29981
----
-Fix compile with Qt 4.8
-
-Sideported commits f42a0a3d878afebb298609c9886851858c56cc15 and
-fe74b25bf3b78c42e95569fe467a397876bc9c04 from massif-visualizer
----
-
-
---- a/libkdchart/src/KDChartBackgroundAttributes.cpp
-+++ b/libkdchart/src/KDChartBackgroundAttributes.cpp
-@@ -22,6 +22,7 @@
- 
- #include "KDChartBackgroundAttributes.h"
- #include <QPixmap>
-+#include <QVariant>
- 
- #include <KDABLibFakes>
- 
-@@ -150,7 +151,7 @@ QDebug operator<<(QDebug dbg, const KDCh
- 	<< "visible="<<ba.isVisible()
- 	<< "brush="<<ba.brush()
- 	<< "pixmapmode="<<ba.pixmapMode()
--	<< "pixmap="<<ba.pixmap()
-+	<< "pixmap="<<QVariant(ba.pixmap())
- 	<< ")";
-     return dbg;
- }
-
-- 
GitLab


From 5857e5c4f8f0c8185ff616d2f5ec7e5530bc160f Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Feb 2014 19:06:20 +0200
Subject: [PATCH 1217/3789] libxmlxx: update from 2.30.1 to 2.37.1

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

diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix
index 37f03a1dfb6..aebb81020b3 100644
--- a/pkgs/development/libraries/libxmlxx/default.nix
+++ b/pkgs/development/libraries/libxmlxx/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl
 , pkgconfig, libxml2, glibmm, perl }:
 stdenv.mkDerivation rec {
-  name = "libxml++-2.30.1";
+  name = "libxml++-2.37.1";
   src = fetchurl {
-    url = "mirror://gnome/sources/libxml++/2.30/${name}.tar.bz2";
-    sha256 = "02mrib11cjx5fshdr8p1biwvyl0xfkf86b6nh8ashwv590v0wgs3";
+    url = "mirror://gnome/sources/libxml++/2.37/${name}.tar.xz";
+    sha256 = "17xkdndcambij33k25cb5c4mg2457wi114kiaprjma9j0mh87cgk";
   };
 
   buildInputs = [ pkgconfig glibmm perl ];
-- 
GitLab


From 220654e2052774ec7d3d834547119db105686715 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 13 Feb 2014 12:07:43 -0500
Subject: [PATCH 1218/3789] Revert "Add heterogeneousAttrsOf option type"

Moving recent types work to a separate branch for now

This reverts commit 3f70dabad320b115d586a59db8cca05c7f3b7c75.
---
 lib/types.nix                               | 30 +++++++++++++--------
 nixos/modules/virtualisation/containers.nix |  1 +
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index e9302688d5c..77957a7763b 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -124,17 +124,6 @@ rec {
       getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name>"]);
     };
 
-    heterogeneousAttrsOf = elemTypeFn: mkOptionType {
-      name = "attribute set of values of many types, including ${(elemTypeFn "<name>").name}";
-      check = x: isAttrs x && all (name: (elemTypeFn name).check (getAttr name x)) (attrNames x);
-      merge = loc: defs:
-        zipAttrsWith (name: (elemTypeFn name).merge (loc ++ [name]))
-          # Push down position info.
-          (map (def: listToAttrs (mapAttrsToList (n: def':
-            { name = n; value = { inherit (def) file; value = def'; }; }) def.value)) defs);
-      getSubOptions = prefix: (elemTypeFn "<name>").getSubOptions (prefix ++ ["<name>"]);
-    };
-
     # List or attribute set of ...
     loaOf = elemType:
       let
@@ -209,6 +198,25 @@ rec {
 
     submodule = submoduleWithExtraArgs {};
 
+    nixosSubmodule = nixos: args: mkOptionType rec {
+      name = "submodule containing a NixOS config";
+      check = x: isAttrs x || isFunction x;
+      merge = loc: defs:
+        let
+          coerce = def: if isFunction def then def else { config = def; };
+        in (import (nixos + "/lib/eval-config.nix") (args // {
+          modules = (args.modules or []) ++
+            map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;
+
+          prefix = loc;
+        })).config;
+      getSubOptions = prefix: (import (nixos + "/lib/eval-config.nix") (args // {
+        modules = (args.modules or []);
+
+        inherit prefix;
+      })).options;
+    };
+
     # Obsolete alternative to configOf.  It takes its option
     # declarations from the ‘options’ attribute of containing option
     # declaration.
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 99451e2bd3c..531ee559663 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -15,6 +15,7 @@ with pkgs.lib;
     };
 
     systemd.containers = mkOption {
+      # !!! Should probably use nixosSubmodule here
       type = types.attrsOf (types.submodule (
         { config, options, name, ... }:
         {
-- 
GitLab


From 4fd825cc94cf58d95007cd513ac5cb8e0c8409af Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 13 Feb 2014 12:08:05 -0500
Subject: [PATCH 1219/3789] Revert "Add option type for a submodule with extra
 arguments"

Moving recent types work to a separate branch for now

This reverts commit 8764758044b0425de54228d87cc68a4ed6d4d414.
---
 lib/types.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index 77957a7763b..ac84ef29611 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -176,7 +176,7 @@ rec {
       getSubOptions = elemType.getSubOptions;
     };
 
-    submoduleWithExtraArgs = extraArgs: opts:
+    submodule = opts:
       let
         opts' = toList opts;
         inherit (import ./modules.nix) evalModules;
@@ -188,16 +188,13 @@ rec {
           let
             coerce = def: if isFunction def then def else { config = def; };
             modules = opts' ++ map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;
-            args = extraArgs // { name = last loc; };
-          in (evalModules { inherit modules args; prefix = loc; }).config;
+          in (evalModules { inherit modules; args.name = last loc; prefix = loc; }).config;
         getSubOptions = prefix: (evalModules
           { modules = opts'; inherit prefix;
             # FIXME: hack to get shit to evaluate.
-            args = extraArgs // { name = ""; }; }).options;
+            args = { name = ""; }; }).options;
       };
 
-    submodule = submoduleWithExtraArgs {};
-
     nixosSubmodule = nixos: args: mkOptionType rec {
       name = "submodule containing a NixOS config";
       check = x: isAttrs x || isFunction x;
-- 
GitLab


From c8f1a6ac1eaa549169cd8a154ad8f1947fe30311 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 13 Feb 2014 12:08:15 -0500
Subject: [PATCH 1220/3789] Revert "Add nixosSubmodule option type"

Moving recent types work to a separate branch for now

This reverts commit ca1c5cfa8fff055c74786dbe0d2ca889ae462365.
---
 lib/types.nix                               | 19 -------------------
 nixos/modules/virtualisation/containers.nix |  3 +--
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index ac84ef29611..afc8f80eb0e 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -195,25 +195,6 @@ rec {
             args = { name = ""; }; }).options;
       };
 
-    nixosSubmodule = nixos: args: mkOptionType rec {
-      name = "submodule containing a NixOS config";
-      check = x: isAttrs x || isFunction x;
-      merge = loc: defs:
-        let
-          coerce = def: if isFunction def then def else { config = def; };
-        in (import (nixos + "/lib/eval-config.nix") (args // {
-          modules = (args.modules or []) ++
-            map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;
-
-          prefix = loc;
-        })).config;
-      getSubOptions = prefix: (import (nixos + "/lib/eval-config.nix") (args // {
-        modules = (args.modules or []);
-
-        inherit prefix;
-      })).options;
-    };
-
     # Obsolete alternative to configOf.  It takes its option
     # declarations from the ‘options’ attribute of containing option
     # declaration.
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 531ee559663..bcbfaacd703 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -15,7 +15,6 @@ with pkgs.lib;
     };
 
     systemd.containers = mkOption {
-      # !!! Should probably use nixosSubmodule here
       type = types.attrsOf (types.submodule (
         { config, options, name, ... }:
         {
@@ -135,4 +134,4 @@ with pkgs.lib;
       }) config.systemd.containers;
 
   };
-}
+}
\ No newline at end of file
-- 
GitLab


From da60b53242af232db2445db984ad6f6663a4bf53 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Feb 2014 18:30:50 +0100
Subject: [PATCH 1221/3789] zabbix: Update from 1.8.19 to 1.8.20

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

diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix
index bf0366f20b1..1e46ffdbc85 100644
--- a/pkgs/servers/monitoring/zabbix/default.nix
+++ b/pkgs/servers/monitoring/zabbix/default.nix
@@ -2,11 +2,11 @@
 
 let
 
-  version = "1.8.19";
+  version = "1.8.20";
 
   src = fetchurl {
     url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
-    sha256 = "0xgki1lrqyhfvx2691v8mk7a868zz35cnvrhiyqgksq2kshm11ph";
+    sha256 = "0psdvzg5c3yhdqqmy5m1b0j3nrvcshjywhl56igy0j8vj16zxi86";
   };
 
   preConfigure =
-- 
GitLab


From 5dfff3a97057ba23a43cdb91ea5ad58e5f601c82 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Feb 2014 18:31:15 +0100
Subject: [PATCH 1222/3789] zabbix: Update from 2.0.10 to 2.0.11

---
 pkgs/servers/monitoring/zabbix/2.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix
index cc05730cee5..399fb54875a 100644
--- a/pkgs/servers/monitoring/zabbix/2.0.nix
+++ b/pkgs/servers/monitoring/zabbix/2.0.nix
@@ -5,12 +5,12 @@ assert enableJabber -> minmay != null;
 
 let
 
-  version = "2.0.10";
+  version = "2.0.11";
   branch = "2.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
-    sha256 = "0p86m634j08w0gbr2rwqr3h5p6md7k0c688w5yxc1ii3l9fmnhbi";
+    sha256 = "1vqxlqwhnz02wrca08vrqbq8k19qp84hbdplmqk7d9699njim46i";
   };
 
   preConfigure =
-- 
GitLab


From 2ea4ec798bd289328aeb164024fb8edf9a9593a4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Feb 2014 18:31:37 +0100
Subject: [PATCH 1223/3789] zabbix: Update from 2.2.1 to 2.2.2

Potentially fixes CVE-2012-0031, CVE-2012-0053, CVE-2012-0883,
CVE-2012-2687, CVE-2012-3499, CVE-2012-4558, CVE-2013-1862,
CVE-2013-1896, CVE-2013-2249, CVE-2013-1034, CVE-2013-5143.
---
 pkgs/servers/monitoring/zabbix/2.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix
index 71d4a963d7a..424001ea377 100644
--- a/pkgs/servers/monitoring/zabbix/2.2.nix
+++ b/pkgs/servers/monitoring/zabbix/2.2.nix
@@ -5,12 +5,12 @@ assert enableJabber -> minmay != null;
 
 let
 
-  version = "2.2.1";
+  version = "2.2.2";
   branch = "2.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
-    sha256 = "1yy7jbbnpr7qkvzqcspybdkmaz50v2hsa9kvg4lzjysjzg7f9j99";
+    sha256 = "1gmjbjmajdllzd7akihb5kg4l2gf0ii9c16fq8mlla37sshzj3p0";
   };
 
   preConfigure =
-- 
GitLab


From 318c44d84ce1ce0060f80b2d5f6cb5cf7cc20bf7 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Thu, 13 Feb 2014 18:32:22 +0100
Subject: [PATCH 1224/3789] fail2ban: Update from 0.8.11 to 0.8.12

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

diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index ffa204b8944..aa387eff3e7 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages, unzip, gamin }:
 
-let version = "0.8.11"; in
+let version = "0.8.12"; in
 
 pythonPackages.buildPythonPackage {
   name = "fail2ban-${version}";
@@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage {
   src = fetchurl {
     url    = "https://github.com/fail2ban/fail2ban/zipball/${version}";
     name   = "fail2ban-${version}.zip";
-    sha256 = "0g87c1yfa6lxb68iz3sq3gxqf5c1a8m2anlvk3lsrx1mczbq0dlc";
+    sha256 = "17cassfn3gdgw530g7gh9fvffsixfb30zamzlfmx7s5x80rnqd3k";
   };
 
   buildInputs = [ unzip ];
-- 
GitLab


From 2ea7c908390a0828c8fbfabca70889a78122437f Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Thu, 13 Feb 2014 18:52:59 +0000
Subject: [PATCH 1225/3789] postgresql module: Use the default superuser
 username

PostgreSQL defaults to having 'postgres' as the superuser. NixOS should
use this default name to provide a less surprising result to people who
enable services.postgres.
---
 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 265d26e8ce9..f63aec6b145 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -190,7 +190,7 @@ in
                 mkdir -m 0700 -p ${cfg.dataDir}
                 if [ "$(id -u)" = 0 ]; then
                   chown -R postgres ${cfg.dataDir}
-                  su -s ${pkgs.stdenv.shell} postgres -c 'initdb -U root'
+                  su -s ${pkgs.stdenv.shell} postgres -c initdb
                 else
                   # For non-root operation.
                   initdb
-- 
GitLab


From c3dc69358672e6f697b07ba2eaa27dd4bd46dd50 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 22:29:34 +0100
Subject: [PATCH 1226/3789] writegood-mode: update to version 1.3

https://github.com/bnbeckwith/writegood-mode/issues/7
---
 pkgs/applications/editors/emacs-modes/writegood/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/writegood/default.nix b/pkgs/applications/editors/emacs-modes/writegood/default.nix
index c4dbde9e0d2..353215a5d48 100644
--- a/pkgs/applications/editors/emacs-modes/writegood/default.nix
+++ b/pkgs/applications/editors/emacs-modes/writegood/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, emacs}:
 
-let version = "1.2";
+let version = "1.3";
 
 in stdenv.mkDerivation {
   name = "writegood-mode-${version}";
   src = fetchurl {
     url = "https://github.com/bnbeckwith/writegood-mode/archive/v${version}.tar.gz";
-    sha256 = "1kgi2i5pq0vk751z079yp7kdw721cclfg9d9p28h3a8xbr95l7b6";
+    sha256 = "0p34rgawnqg94vk4lcw14x99rrvsd23dmbwkxz2vax5kq6l8y5yf";
   };
 
   buildInputs = [ emacs ];
-- 
GitLab


From b705e0d1566817d22107c096c633dd5a7b7f511e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 13 Feb 2014 22:35:10 +0100
Subject: [PATCH 1227/3789] python-robotframework: bump 2.8.1 -> 2.8.4

Source URL is changing from googlecode to pypi; new releases are no
longer available on googlecode.
---
 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 aba6ab989bd..219917a77be 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5923,12 +5923,12 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   robotframework = buildPythonPackage rec {
-    version = "2.8.1";
+    version = "2.8.4";
     name = "robotframework-${version}";
 
     src = fetchurl {
-      url = "https://robotframework.googlecode.com/files/${name}.tar.gz";
-      sha256 = "04zwjri1j5py3fpbhy1xlc18bhbmdm2gbd58fwa2jnhmrha5dgnw";
+      url = "https://pypi.python.org/packages/source/r/robotframework/${name}.tar.gz";
+      sha256 = "0rxk135c1051cwv45219ib3faqvi5rl50l98ncb83c7qxy92jg2n";
     };
 
     # error: invalid command 'test'
-- 
GitLab


From bf57fb7386463dfa87ef20886bfb8c8e9d29db3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 13 Feb 2014 22:36:39 +0100
Subject: [PATCH 1228/3789] python-robotframework-ride: bump 1.2.2 -> 1.2.3

Remove the now unneeded postPatch phase; the fix has been integrated
into the upstream release.
---
 pkgs/top-level/python-packages.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 219917a77be..e0dcb5ce76d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5990,23 +5990,16 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   robotframework-ride = buildPythonPackage rec {
-    version = "1.2.2";
+    version = "1.2.3";
     name = "robotframework-ride-${version}";
 
     src = fetchurl {
       url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz";
-      sha256 = "1yfvl0hdjjkwk90w3f3i23dxxk3yiyv4pbvnp4l7yd6cmxsia8f3";
+      sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j";
     };
 
     propagatedBuildInputs = [ pygments wxPython modules.sqlite3 ];
 
-    # Stop copying (read-only) permission bits from the nix store into $HOME,
-    # because that leads to this:
-    #   IOError: [Errno 13] Permission denied: '/home/bfo/.robotframework/ride/settings.cfg'
-    postPatch = ''
-      sed -i "s|shutil\.copy(|shutil.copyfile(|" src/robotide/preferences/settings.py
-    '';
-
     # ride_postinstall.py checks that needed deps are installed and creates a
     # desktop shortcut. We don't really need it and it clutters up bin/ so
     # remove it.
-- 
GitLab


From d4ebb62481bbc58157be4cbadb1d736892349cb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 13 Feb 2014 22:39:59 +0100
Subject: [PATCH 1229/3789] python-robotframework-selenium2library: bump 1.4.0
 -> 1.5.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 e0dcb5ce76d..d440e67184d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5945,12 +5945,12 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   robotframework-selenium2library = buildPythonPackage rec {
-    version = "1.4.0";
+    version = "1.5.0";
     name = "robotframework-selenium2library-${version}";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/r/robotframework-selenium2library/${name}.tar.gz";
-      sha256 = "1rgzjxrciy74lp9mvdqxiixkma569mc0l0kizpi7lg1zkbr2k1q2";
+      sha256 = "0hjmar9766jqfpbckac8zncyal546vm059wnkbn33f68djdcnwz1";
     };
 
     # error: invalid command 'test'
-- 
GitLab


From 8bc5ee71e30f6b566ef70ccba65cf022ee0e249a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 13 Feb 2014 22:52:29 +0100
Subject: [PATCH 1230/3789] apcupsd: update 3.14.10 -> .11 (stable)

---
 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 4ccb1b069c9..6489d4dceff 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.10";
+  name = "${pname}-3.14.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "0ci0xyg1hzj8lnmm3vxfsvgpb3wdgh1ii3gb8jgdxyqnk7nba1q7";
+    sha256 = "0wrb8vdc872f1x0gw21b5c81h0vxvsc7yks5qzbq2j3hkbl2vixd";
   };
 
   buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd;
-- 
GitLab


From e6204c872117400001cfd49ebff86d16a2b61259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 13 Feb 2014 22:54:48 +0100
Subject: [PATCH 1231/3789] qmmp: update 0.7.3 -> 0.7.5

---
 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 255c63a5d6d..122b7ed7867 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.3";
+  name = "qmmp-0.7.5";
 
   src = fetchurl {
     url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "0qjmnyq3qmrm510g3lsa6vd80nmbz0859pwhnaaa19ah0jhf3r2p";
+    sha256 = "0ryg4hns5zi9swn2q4vxjya3i4drdqfzycngwzd6fdl176lswrk0";
   };
 
   buildInputs =
-- 
GitLab


From 2f314cb231ba459ad966df539bd2b38b78f8f44d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 13 Feb 2014 23:09:02 +0100
Subject: [PATCH 1232/3789] ethtool: update 3.11 -> 3.13

---
 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 48baa8bff01..fe5985b9698 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.11";
+  name = "ethtool-3.13";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
-    sha256 = "1m1gc2g5ym7xmbq64ysw9avp9bbsagbi7x624mzki5ba3535agym";
+    sha256 = "07z7janzj8fbs04sw6nlzr039yh7b5gmzvik7ymg807i2gi5fmjs";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 869402ef224ebb30d1f2cbaca899d65752b5f9ff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 23:21:10 +0100
Subject: [PATCH 1233/3789] lxc: update from 1.0.0.beta2 to 1.0.0.beta4

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

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index fd6bb9b0389..825c241e53a 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "lxc-1.0.0.beta2";
+  name = "lxc-1.0.0.beta4";
 
   src = fetchurl {
     url = "http://github.com/lxc/lxc/archive/${name}.tar.gz";
-    sha256 = "0w38kxpqrhrgzd057yk8xzi4lx2vzvjkn6iysnj9zibw1bzb5rbk";
+    sha256 = "174grvh5086pmbaladp5ivy2azlm7q9v5xwgc5yww2mggx99w41j";
   };
 
   buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ];
-- 
GitLab


From c3945b2a8c8665d98dfc9eba05903393c0677c0c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Feb 2014 23:21:20 +0100
Subject: [PATCH 1234/3789] ikiwiki: update from 3.20140102 to 3.20140125

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

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 6e5eece5d34..c0dce81c803 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
 
 let
   name = "ikiwiki";
-  version = "3.20140102";
+  version = "3.20140125";
 
   lib = stdenv.lib;
 in
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "0nsyfq7j03cg4qq73kw7cxnc7wgbr2m75fqmmll77wyl9cb661lj";
+    sha256 = "06r95xhm8pnvswgmkf3j7h4n6b1nmk0v0znmnzblkdx7xh12m0hd";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
-- 
GitLab


From a0b1954611297dbb456b254296132f36ad442093 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Feb 2014 19:13:29 +0200
Subject: [PATCH 1235/3789] librecad2: update from 2.0.0beta1 to 2.0.2

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

diff --git a/pkgs/applications/misc/librecad/2.0.nix b/pkgs/applications/misc/librecad/2.0.nix
index 2394d116314..2f140db9397 100644
--- a/pkgs/applications/misc/librecad/2.0.nix
+++ b/pkgs/applications/misc/librecad/2.0.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, qt4, muparser, which, boost}:
+{ stdenv, fetchurl, qt4, muparser, which, boost, pkgconfig }:
 
 stdenv.mkDerivation {
-  name = "librecad-2.0.0beta1";
+  name = "librecad-2.0.2";
 
   src = fetchurl {
-    url = https://github.com/LibreCAD/LibreCAD/tarball/2.0.0beta1;
-    name = "librecad-2.0.0beta1.tar.gz";
-    sha256 = "8bf969b79be115f3b3ff72cc030a4c21fe93164dd0cb19ddfb78a7d66b8bc770";
+    url = https://github.com/LibreCAD/LibreCAD/tarball/2.0.2;
+    name = "librecad-2.0.2.tar.gz";
+    sha256 = "0a5rs1h4n74d4bnrj91ij6y6wzc8d6nbrg9lfwjx8icjjl6hqikm";
   };
 
   patchPhase = ''
@@ -25,12 +25,14 @@ stdenv.mkDerivation {
   '';
 
   buildInputs = [ qt4 muparser which boost ];
+  nativeBuildInputs = [ pkgconfig ];
 
   enableParallelBuilding = true;
 
   meta = {
     description = "A 2D CAD package based upon Qt";
     homepage = http://librecad.org;
+    repositories.git = git://github.com/LibreCAD/LibreCAD.git;
     license = "GPLv2";
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
-- 
GitLab


From cf3d2e0a17e7621c5991039eaf4b71fff701937c Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 09:34:30 +0200
Subject: [PATCH 1236/3789] add repositories.git to several packages

---
 pkgs/development/libraries/libotr/default.nix | 1 +
 pkgs/development/tools/misc/cgdb/default.nix  | 2 ++
 pkgs/top-level/python-packages.nix            | 1 +
 3 files changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix
index 560b807dbaf..0d5bdfcc9a7 100644
--- a/pkgs/development/libraries/libotr/default.nix
+++ b/pkgs/development/libraries/libotr/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.cypherpunks.ca/otr/";
+    repositories.git = git://git.code.sf.net/p/otr/libotr;
     license = "LGPLv2.1";
     description = "Library for Off-The-Record Messaging";
   };
diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix
index adabcec9898..d313d271afb 100644
--- a/pkgs/development/tools/misc/cgdb/default.nix
+++ b/pkgs/development/tools/misc/cgdb/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
 
     homepage = http://cgdb.sourceforge.net/;
 
+    repositories.git = git://github.com/cgdb/cgdb.git;
+
     license = "GPLv2+";
 
     platforms = with stdenv.lib.platforms; linux ++ cygwin;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d440e67184d..1afadd1a276 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7197,6 +7197,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "A full-featured console (xterm et al.) user interface library";
       homepage = http://excess.org/urwid;
+      repositories.git = git://github.com/wardi/urwid.git;
       license = pkgs.lib.licenses.lgpl21;
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
-- 
GitLab


From 69f4bdac6e2a1a06fdc62059c87931dd6d987a95 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 10:45:36 +0200
Subject: [PATCH 1237/3789] linux: add git repository and branch meta

---
 pkgs/os-specific/linux/kernel/linux-3.10.nix    | 1 +
 pkgs/os-specific/linux/kernel/linux-3.11.nix    | 1 +
 pkgs/os-specific/linux/kernel/linux-3.12.nix    | 1 +
 pkgs/os-specific/linux/kernel/linux-3.13.nix    | 1 +
 pkgs/os-specific/linux/kernel/linux-3.2.nix     | 1 +
 pkgs/os-specific/linux/kernel/linux-3.4.nix     | 1 +
 pkgs/os-specific/linux/kernel/manual-config.nix | 1 +
 7 files changed, 7 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 212e676a28f..f2e8ef355e7 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -2,6 +2,7 @@
 
 import ./generic.nix (args // rec {
   version = "3.10.29";
+  extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/kernel/linux-3.11.nix b/pkgs/os-specific/linux/kernel/linux-3.11.nix
index 2ef1eb98365..6c3c37663c6 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.11.nix
@@ -2,6 +2,7 @@
 
 import ./generic.nix (args // rec {
   version = "3.11.10";
+  extraMeta.branch = "3.11";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 5baddbbdc7d..cd2e5cdae87 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -2,6 +2,7 @@
 
 import ./generic.nix (args // rec {
   version = "3.12.10";
+  extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix
index a5d816b2563..da9f5583d82 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix
@@ -2,6 +2,7 @@
 
 import ./generic.nix (args // rec {
   version = "3.13.2";
+  extraMeta.branch = "3.13";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index c0006ed7348..f9135ea3e11 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -2,6 +2,7 @@
 
 import ./generic.nix (args // rec {
   version = "3.2.54";
+  extraMeta.branch = "3.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 0993b0e74ee..0e2dade27aa 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -2,6 +2,7 @@
 
 import ./generic.nix (args // rec {
   version = "3.4.79";
+  extraMeta.branch = "3.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index b387efd5c41..ae226f0908b 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -197,6 +197,7 @@ let
             + ")");
         license = "GPLv2";
         homepage = http://www.kernel.org/;
+        repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;
         maintainers = [
           maintainers.shlevy
         ];
-- 
GitLab


From ca5f99b9eaf05fbfd34f1104f2acfd205f9780e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Feb 2014 10:54:00 +0100
Subject: [PATCH 1238/3789] Finance::Quote: Fix the Yahoo source

---
 .../perl-modules/finance-quote-yahoo.patch           | 12 ++++++++++++
 pkgs/top-level/perl-packages.nix                     |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/development/perl-modules/finance-quote-yahoo.patch

diff --git a/pkgs/development/perl-modules/finance-quote-yahoo.patch b/pkgs/development/perl-modules/finance-quote-yahoo.patch
new file mode 100644
index 00000000000..213d96c31c8
--- /dev/null
+++ b/pkgs/development/perl-modules/finance-quote-yahoo.patch
@@ -0,0 +1,12 @@
+diff -ru Finance-Quote-1.18-orig/lib/Finance/Quote/Yahoo/USA.pm Finance-Quote-1.18/lib/Finance/Quote/Yahoo/USA.pm
+--- Finance-Quote-1.18-orig/lib/Finance/Quote/Yahoo/USA.pm	2012-09-30 13:37:20.000000000 +0000
++++ Finance-Quote-1.18/lib/Finance/Quote/Yahoo/USA.pm	2014-02-13 22:02:53.538698928 +0000
+@@ -41,7 +41,7 @@
+ 
+ # URLs of where to obtain information.
+ 
+-$YAHOO_URL = ("http://finance.yahoo.com/d");
++$YAHOO_URL = ("http://finance.yahoo.com/d/quotes.csv");
+ 
+ sub methods {return (canada   => \&yahoo,
+                      usa      => \&yahoo,
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a508de63c8c..1ff07770947 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3558,6 +3558,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "4240faabe0646defd4ec76ca9e111977b9e8060eaec41adeb284eb422a428393";
     };
     propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP ];
+    patches = [ ../development/perl-modules/finance-quote-yahoo.patch ];
     meta = {
       homepage = http://finance-quote.sourceforge.net/;
       description = "Get stock and mutual fund quotes from various exchanges";
-- 
GitLab


From d8a5ac138cc6f4abc27bb25b2d150c5f47fe46af Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Tue, 11 Feb 2014 10:28:38 +0000
Subject: [PATCH 1239/3789] haskellPackages.aeson_0_7: No longer depends on
 attoparsec 0.11

---
 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 04563d1fda1..8dedd487b36 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -527,9 +527,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   adjunctions = callPackage ../development/libraries/haskell/adjunctions {};
 
   aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {};
-  aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix {
-    attoparsec = self.attoparsec_0_11_1_0;
-  };
+  aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix {};
   aeson = self.aeson_0_6_2_1;
 
   aesonLens = callPackage ../development/libraries/haskell/aeson-lens {};
-- 
GitLab


From 6a95e90f27f63a49d07df59f8305773d0ddc3e7c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 14 Feb 2014 06:15:08 -0500
Subject: [PATCH 1240/3789] Add interpolatedstring-perl6 haskell package

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

diff --git a/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix b/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix
new file mode 100644
index 00000000000..63ea81058e5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix
@@ -0,0 +1,13 @@
+{ cabal, haskellSrcMeta, text }:
+
+cabal.mkDerivation (self: {
+  pname = "interpolatedstring-perl6";
+  version = "0.9.0";
+  sha256 = "15hzmni3wfdgjl0vyk5mcld61ba99wdax87s7wkz2s8bsyxkbq9n";
+  buildDepends = [ haskellSrcMeta text ];
+  meta = {
+    description = "QuasiQuoter for Perl6-style multi-line interpolated strings";
+    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 04563d1fda1..119aca3305a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1478,6 +1478,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   interlude = callPackage ../development/libraries/haskell/interlude {};
 
+  interpolatedstringPerl6 = callPackage ../development/libraries/haskell/interpolatedstring-perl6 {};
+
   intervals = callPackage ../development/libraries/haskell/intervals {};
 
   IntervalMap = callPackage ../development/libraries/haskell/IntervalMap {};
-- 
GitLab


From 48b8118f2c1ae07a6d7fb30e71b583ccca298a8c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 14 Feb 2014 09:06:26 -0500
Subject: [PATCH 1241/3789] virtualbox-image.nix: initialRootPassword setting
 should be easily overrideable

---
 nixos/modules/virtualisation/virtualbox-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 71bdf31a98d..06bea2d8acf 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -111,5 +111,5 @@ with pkgs.lib;
   # 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 = "!";
+  security.initialRootPassword = mkDefault "!";
 }
-- 
GitLab


From 2dcf9338178bc784c59034fecb32de3de32c1284 Mon Sep 17 00:00:00 2001
From: Thiago Tonelli Bartolomei <thiagobart@gmail.com>
Date: Fri, 14 Feb 2014 09:48:19 -0500
Subject: [PATCH 1242/3789] adding wantedBy graphical.target

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

diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 368403ed8a5..332d742a141 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -54,6 +54,7 @@ in {
       description = "Redshift colour temperature adjuster";
       requires = [ "display-manager.service" ];
       after = [ "display-manager.service" ];
+      wantedBy = [ "graphical.target" ];
       serviceConfig.ExecStart = ''
         ${pkgs.redshift}/bin/redshift \
           -l ${cfg.latitude}:${cfg.longitude} \
-- 
GitLab


From de605827f89034ad2e5ffbd32909ad725128e2b1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Feb 2014 15:49:50 +0100
Subject: [PATCH 1243/3789] glibc: Rename 2.18 -> 2.19

---
 .../libraries/glibc/{2.18 => 2.19}/builder.sh          |  0
 .../libraries/glibc/{2.18 => 2.19}/common.nix          |  0
 .../glibc/{2.18 => 2.19}/cve-2012-4412+4424.patch      |  0
 .../libraries/glibc/{2.18 => 2.19}/cve-2013-4237.patch |  0
 .../libraries/glibc/{2.18 => 2.19}/cve-2013-4332.patch |  0
 .../libraries/glibc/{2.18 => 2.19}/cve-2013-4458.patch |  0
 .../libraries/glibc/{2.18 => 2.19}/cve-2013-4788.patch |  0
 .../libraries/glibc/{2.18 => 2.19}/default.nix         |  0
 .../{2.18 => 2.19}/dont-use-system-ld-so-cache.patch   |  0
 .../{2.18 => 2.19}/fix_path_attribute_in_getconf.patch |  0
 .../glibc/{2.18 => 2.19}/glibc-crypt-blowfish.patch    |  0
 .../glibc/{2.18 => 2.19}/glibc-rh739743.patch          |  0
 .../libraries/glibc/{2.18 => 2.19}/info.nix            |  0
 .../libraries/glibc/{2.18 => 2.19}/locales-builder.sh  |  0
 .../libraries/glibc/{2.18 => 2.19}/locales.nix         |  0
 .../glibc/{2.18 => 2.19}/nix-locale-archive.patch      |  0
 .../libraries/glibc/{2.18 => 2.19}/rpcgen-path.patch   |  0
 .../libraries/glibc/{2.18 => 2.19}/scanf.patch         |  0
 .../glibc/{2.18 => 2.19}/strstr-sse42-hack.patch       |  0
 pkgs/top-level/all-packages.nix                        | 10 +++++-----
 20 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/builder.sh (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/common.nix (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/cve-2012-4412+4424.patch (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/cve-2013-4237.patch (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/cve-2013-4332.patch (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/cve-2013-4458.patch (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/cve-2013-4788.patch (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/default.nix (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/dont-use-system-ld-so-cache.patch (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/fix_path_attribute_in_getconf.patch (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/glibc-crypt-blowfish.patch (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/glibc-rh739743.patch (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/info.nix (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/locales-builder.sh (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/locales.nix (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/nix-locale-archive.patch (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/rpcgen-path.patch (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/scanf.patch (100%)
 rename pkgs/development/libraries/glibc/{2.18 => 2.19}/strstr-sse42-hack.patch (100%)

diff --git a/pkgs/development/libraries/glibc/2.18/builder.sh b/pkgs/development/libraries/glibc/2.19/builder.sh
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/builder.sh
rename to pkgs/development/libraries/glibc/2.19/builder.sh
diff --git a/pkgs/development/libraries/glibc/2.18/common.nix b/pkgs/development/libraries/glibc/2.19/common.nix
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/common.nix
rename to pkgs/development/libraries/glibc/2.19/common.nix
diff --git a/pkgs/development/libraries/glibc/2.18/cve-2012-4412+4424.patch b/pkgs/development/libraries/glibc/2.19/cve-2012-4412+4424.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/cve-2012-4412+4424.patch
rename to pkgs/development/libraries/glibc/2.19/cve-2012-4412+4424.patch
diff --git a/pkgs/development/libraries/glibc/2.18/cve-2013-4237.patch b/pkgs/development/libraries/glibc/2.19/cve-2013-4237.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/cve-2013-4237.patch
rename to pkgs/development/libraries/glibc/2.19/cve-2013-4237.patch
diff --git a/pkgs/development/libraries/glibc/2.18/cve-2013-4332.patch b/pkgs/development/libraries/glibc/2.19/cve-2013-4332.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/cve-2013-4332.patch
rename to pkgs/development/libraries/glibc/2.19/cve-2013-4332.patch
diff --git a/pkgs/development/libraries/glibc/2.18/cve-2013-4458.patch b/pkgs/development/libraries/glibc/2.19/cve-2013-4458.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/cve-2013-4458.patch
rename to pkgs/development/libraries/glibc/2.19/cve-2013-4458.patch
diff --git a/pkgs/development/libraries/glibc/2.18/cve-2013-4788.patch b/pkgs/development/libraries/glibc/2.19/cve-2013-4788.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/cve-2013-4788.patch
rename to pkgs/development/libraries/glibc/2.19/cve-2013-4788.patch
diff --git a/pkgs/development/libraries/glibc/2.18/default.nix b/pkgs/development/libraries/glibc/2.19/default.nix
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/default.nix
rename to pkgs/development/libraries/glibc/2.19/default.nix
diff --git a/pkgs/development/libraries/glibc/2.18/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-cache.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/dont-use-system-ld-so-cache.patch
rename to pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-cache.patch
diff --git a/pkgs/development/libraries/glibc/2.18/fix_path_attribute_in_getconf.patch b/pkgs/development/libraries/glibc/2.19/fix_path_attribute_in_getconf.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/fix_path_attribute_in_getconf.patch
rename to pkgs/development/libraries/glibc/2.19/fix_path_attribute_in_getconf.patch
diff --git a/pkgs/development/libraries/glibc/2.18/glibc-crypt-blowfish.patch b/pkgs/development/libraries/glibc/2.19/glibc-crypt-blowfish.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/glibc-crypt-blowfish.patch
rename to pkgs/development/libraries/glibc/2.19/glibc-crypt-blowfish.patch
diff --git a/pkgs/development/libraries/glibc/2.18/glibc-rh739743.patch b/pkgs/development/libraries/glibc/2.19/glibc-rh739743.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/glibc-rh739743.patch
rename to pkgs/development/libraries/glibc/2.19/glibc-rh739743.patch
diff --git a/pkgs/development/libraries/glibc/2.18/info.nix b/pkgs/development/libraries/glibc/2.19/info.nix
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/info.nix
rename to pkgs/development/libraries/glibc/2.19/info.nix
diff --git a/pkgs/development/libraries/glibc/2.18/locales-builder.sh b/pkgs/development/libraries/glibc/2.19/locales-builder.sh
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/locales-builder.sh
rename to pkgs/development/libraries/glibc/2.19/locales-builder.sh
diff --git a/pkgs/development/libraries/glibc/2.18/locales.nix b/pkgs/development/libraries/glibc/2.19/locales.nix
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/locales.nix
rename to pkgs/development/libraries/glibc/2.19/locales.nix
diff --git a/pkgs/development/libraries/glibc/2.18/nix-locale-archive.patch b/pkgs/development/libraries/glibc/2.19/nix-locale-archive.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/nix-locale-archive.patch
rename to pkgs/development/libraries/glibc/2.19/nix-locale-archive.patch
diff --git a/pkgs/development/libraries/glibc/2.18/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.19/rpcgen-path.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/rpcgen-path.patch
rename to pkgs/development/libraries/glibc/2.19/rpcgen-path.patch
diff --git a/pkgs/development/libraries/glibc/2.18/scanf.patch b/pkgs/development/libraries/glibc/2.19/scanf.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/scanf.patch
rename to pkgs/development/libraries/glibc/2.19/scanf.patch
diff --git a/pkgs/development/libraries/glibc/2.18/strstr-sse42-hack.patch b/pkgs/development/libraries/glibc/2.19/strstr-sse42-hack.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.18/strstr-sse42-hack.patch
rename to pkgs/development/libraries/glibc/2.19/strstr-sse42-hack.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90e59c96c29..246caa8ecf7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4197,7 +4197,7 @@ let
   glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
   glfw3 = callPackage ../development/libraries/glfw/3.x.nix { };
 
-  glibc = callPackage ../development/libraries/glibc/2.18 {
+  glibc = callPackage ../development/libraries/glibc/2.19 {
     kernelHeaders = linuxHeaders;
     installLocales = config.glibc.locales or false;
     machHeaders = null;
@@ -4205,13 +4205,13 @@ let
     gccCross = null;
   };
 
-  glibc_memusage = callPackage ../development/libraries/glibc/2.18 {
+  glibc_memusage = callPackage ../development/libraries/glibc/2.19 {
     kernelHeaders = linuxHeaders;
     installLocales = false;
     withGd = true;
   };
 
-  glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.18)
+  glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.19)
     (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu";
      in {
        inherit stdenv fetchurl;
@@ -4240,9 +4240,9 @@ let
     installLocales = config.glibc.locales or false;
   };
 
-  glibcLocales = callPackage ../development/libraries/glibc/2.18/locales.nix { };
+  glibcLocales = callPackage ../development/libraries/glibc/2.19/locales.nix { };
 
-  glibcInfo = callPackage ../development/libraries/glibc/2.18/info.nix { };
+  glibcInfo = callPackage ../development/libraries/glibc/2.19/info.nix { };
 
   glibc_multi =
     runCommand "${glibc.name}-multi"
-- 
GitLab


From ad4e2bd4995555d1d3b05a47f134046917a4f93c Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 16:50:39 +0200
Subject: [PATCH 1244/3789] linux_3_4: update from 3.4.79 to 3.4.80

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 0e2dade27aa..6e94cb5807e 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.79";
+  version = "3.4.80";
   extraMeta.branch = "3.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "07xd01b5vl6gl4p2cs75fsn295jvwmlq2j9jw582b2ii8vsaavvv";
+    sha256 = "1vma3bxydryhcg7iimndq4rbpzbpjvnq7qa5md6wm6iill011pil";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 699509db149744d1da09a868a6d1ae4a46f4fe3d Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 16:54:31 +0200
Subject: [PATCH 1245/3789] linux_3_10: update from 3.10.29 to 3.10.30

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index f2e8ef355e7..a5c096491c3 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.29";
+  version = "3.10.30";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "14g8z5g2xwf0s6r7m9586xdpd56nc810dny70cz6zq8c03kfq594";
+    sha256 = "0a9x27g026gvy64w2xkpkdf3kzjfzzgy0kgikdyk604zdz4ha2hm";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From fc213ccfa8e922be80d5bb3cfcb57c454bd9a7e6 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 16:56:34 +0200
Subject: [PATCH 1246/3789] linux_3_13: update from 3.13.2 to 3.13.3

---
 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 da9f5583d82..24f10ecb478 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.2";
+  version = "3.13.3";
   extraMeta.branch = "3.13";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1bvxcdzjff514zwk18b9dfkhhk12fjjbb4a1saynqnisdn7b78dl";
+    sha256 = "0x277h0ccdjivi16w20aj59ncazr7zs07zprazm0ph4qyffv0r4g";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From a5ea0a3f50c9f9d2d8ee7280fdebe0c23f8c351c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Feb 2014 16:01:47 +0100
Subject: [PATCH 1247/3789] glibc: Update to 2.19

---
 .../libraries/glibc/2.19/common.nix           |   20 +-
 .../glibc/2.19/cve-2012-4412+4424.patch       | 1006 -----------------
 .../libraries/glibc/2.19/cve-2013-4237.patch  |  302 -----
 .../libraries/glibc/2.19/cve-2013-4332.patch  |   56 -
 .../libraries/glibc/2.19/cve-2013-4458.patch  |   50 -
 .../libraries/glibc/2.19/cve-2013-4788.patch  |  222 ----
 .../libraries/glibc/2.19/glibc-rh739743.patch |   55 -
 .../libraries/glibc/2.19/scanf.patch          |   21 -
 .../glibc/2.19/strstr-sse42-hack.patch        |   14 -
 9 files changed, 2 insertions(+), 1744 deletions(-)
 delete mode 100644 pkgs/development/libraries/glibc/2.19/cve-2012-4412+4424.patch
 delete mode 100644 pkgs/development/libraries/glibc/2.19/cve-2013-4237.patch
 delete mode 100644 pkgs/development/libraries/glibc/2.19/cve-2013-4332.patch
 delete mode 100644 pkgs/development/libraries/glibc/2.19/cve-2013-4458.patch
 delete mode 100644 pkgs/development/libraries/glibc/2.19/cve-2013-4788.patch
 delete mode 100644 pkgs/development/libraries/glibc/2.19/glibc-rh739743.patch
 delete mode 100644 pkgs/development/libraries/glibc/2.19/scanf.patch
 delete mode 100644 pkgs/development/libraries/glibc/2.19/strstr-sse42-hack.patch

diff --git a/pkgs/development/libraries/glibc/2.19/common.nix b/pkgs/development/libraries/glibc/2.19/common.nix
index 518615b1739..07baefa9281 100644
--- a/pkgs/development/libraries/glibc/2.19/common.nix
+++ b/pkgs/development/libraries/glibc/2.19/common.nix
@@ -13,7 +13,7 @@ cross:
 
 let
 
-  version = "2.18";
+  version = "2.19";
 
 in
 
@@ -49,26 +49,10 @@ stdenv.mkDerivation ({
          to default to blowfish). */
       ./glibc-crypt-blowfish.patch
 
-      /* Fix for random "./sysdeps/posix/getaddrinfo.c:1467:
-         rfc3484_sort: Assertion `src->results[i].native == -1 ||
-         src->results[i].native == a2_native' failed." crashes. */
-      ./glibc-rh739743.patch
-
-      ./scanf.patch
-
       /* The command "getconf CS_PATH" returns the default search path
          "/bin:/usr/bin", which is inappropriate on NixOS machines. This
          patch extends the search path by "/run/current-system/sw/bin". */
       ./fix_path_attribute_in_getconf.patch
-
-
-      ./cve-2012-4412+4424.patch
-      ./cve-2013-4237.patch
-      ./cve-2013-4332.patch
-      ./cve-2013-4458.patch
-      ./cve-2013-4788.patch
-
-      ./strstr-sse42-hack.patch
     ];
 
   postPatch = ''
@@ -152,7 +136,7 @@ stdenv.mkDerivation ({
     }
     else fetchurl {
       url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
-      sha256 = "0d3pnh6kg5r48ga5rg4lhwlc1062brr6fiqs4j23327gzssjgry8";
+      sha256 = "15n7x9mmzhd7w6s5hd9srx0h23b32gwb306x98k9ss940yvnvb8q";
     };
 
   # Remove absolute paths from `configure' & co.; build out-of-tree.
diff --git a/pkgs/development/libraries/glibc/2.19/cve-2012-4412+4424.patch b/pkgs/development/libraries/glibc/2.19/cve-2012-4412+4424.patch
deleted file mode 100644
index 67ffbbc217b..00000000000
--- a/pkgs/development/libraries/glibc/2.19/cve-2012-4412+4424.patch
+++ /dev/null
@@ -1,1006 +0,0 @@
-https://projects.archlinux.org/svntogit/packages.git/tree/trunk/glibc-2.18-strcoll-CVE-2012-4412+4424.patch?h=packages/glibc
-
-diff --git a/string/strcoll_l.c b/string/strcoll_l.c
-index ecda08f..bb34a72 100644
---- a/string/strcoll_l.c
-+++ b/string/strcoll_l.c
-@@ -41,11 +41,434 @@
- 
- #include "../locale/localeinfo.h"
- 
-+/* Track status while looking for sequences in a string.  */
-+typedef struct
-+{
-+  int len;			/* Length of the current sequence.  */
-+  size_t val;			/* Position of the sequence relative to the
-+				   previous non-ignored sequence.  */
-+  size_t idxnow;		/* Current index in sequences.  */
-+  size_t idxmax;		/* Maximum index in sequences.  */
-+  size_t idxcnt;		/* Current count of indices.  */
-+  size_t backw;			/* Current Backward sequence index.  */
-+  size_t backw_stop;		/* Index where the backward sequences stop.  */
-+  const USTRING_TYPE *us;	/* The string.  */
-+  int32_t *idxarr;		/* Array to cache weight indices.  */
-+  unsigned char *rulearr;	/* Array to cache rules.  */
-+  unsigned char rule;		/* Saved rule for the first sequence.  */
-+  int32_t idx;			/* Index to weight of the current sequence.  */
-+  int32_t save_idx;		/* Save looked up index of a forward
-+				   sequence after the last backward
-+				   sequence.  */
-+  const USTRING_TYPE *back_us;	/* Beginning of the backward sequence.  */
-+} coll_seq;
-+
-+/* Get next sequence.  The weight indices are cached, so we don't need to
-+   traverse the string.  */
-+static void
-+get_next_seq_cached (coll_seq *seq, int nrules, int pass,
-+		     const unsigned char *rulesets,
-+		     const USTRING_TYPE *weights)
-+{
-+  size_t val = seq->val = 0;
-+  int len = seq->len;
-+  size_t backw_stop = seq->backw_stop;
-+  size_t backw = seq->backw;
-+  size_t idxcnt = seq->idxcnt;
-+  size_t idxmax = seq->idxmax;
-+  size_t idxnow = seq->idxnow;
-+  unsigned char *rulearr = seq->rulearr;
-+  int32_t *idxarr = seq->idxarr;
-+
-+  while (len == 0)
-+    {
-+      ++val;
-+      if (backw_stop != ~0ul)
-+	{
-+	  /* There is something pushed.  */
-+	  if (backw == backw_stop)
-+	    {
-+	      /* The last pushed character was handled.  Continue
-+		 with forward characters.  */
-+	      if (idxcnt < idxmax)
-+		{
-+		  idxnow = idxcnt;
-+		  backw_stop = ~0ul;
-+		}
-+	      else
-+		{
-+		  /* Nothing any more.  The backward sequence
-+		     ended with the last sequence in the string.  */
-+		  idxnow = ~0ul;
-+		  break;
-+		}
-+	    }
-+	  else
-+	    idxnow = --backw;
-+	}
-+      else
-+	{
-+	  backw_stop = idxcnt;
-+
-+	  while (idxcnt < idxmax)
-+	    {
-+	      if ((rulesets[rulearr[idxcnt] * nrules + pass]
-+		   & sort_backward) == 0)
-+		/* No more backward characters to push.  */
-+		break;
-+	      ++idxcnt;
-+	    }
-+
-+	  if (backw_stop == idxcnt)
-+	    {
-+	      /* No sequence at all or just one.  */
-+	      if (idxcnt == idxmax)
-+		/* Note that LEN is still zero.  */
-+		break;
-+
-+	      backw_stop = ~0ul;
-+	      idxnow = idxcnt++;
-+	    }
-+	  else
-+	    /* We pushed backward sequences.  */
-+	    idxnow = backw = idxcnt - 1;
-+	}
-+      len = weights[idxarr[idxnow]++];
-+    }
-+
-+  /* Update the structure.  */
-+  seq->val = val;
-+  seq->len = len;
-+  seq->backw_stop = backw_stop;
-+  seq->backw = backw;
-+  seq->idxcnt = idxcnt;
-+  seq->idxnow = idxnow;
-+}
-+
-+/* Get next sequence.  Traverse the string as required.  */
-+static void
-+get_next_seq (coll_seq *seq, int nrules, const unsigned char *rulesets,
-+	      const USTRING_TYPE *weights, const int32_t *table,
-+	      const USTRING_TYPE *extra, const int32_t *indirect)
-+{
-+#include WEIGHT_H
-+  size_t val = seq->val = 0;
-+  int len = seq->len;
-+  size_t backw_stop = seq->backw_stop;
-+  size_t backw = seq->backw;
-+  size_t idxcnt = seq->idxcnt;
-+  size_t idxmax = seq->idxmax;
-+  size_t idxnow = seq->idxnow;
-+  unsigned char *rulearr = seq->rulearr;
-+  int32_t *idxarr = seq->idxarr;
-+  const USTRING_TYPE *us = seq->us;
-+
-+  while (len == 0)
-+    {
-+      ++val;
-+      if (backw_stop != ~0ul)
-+	{
-+	  /* There is something pushed.  */
-+	  if (backw == backw_stop)
-+	    {
-+	      /* The last pushed character was handled.  Continue
-+		 with forward characters.  */
-+	      if (idxcnt < idxmax)
-+		{
-+		  idxnow = idxcnt;
-+		  backw_stop = ~0ul;
-+		}
-+	      else
-+		/* Nothing any more.  The backward sequence ended with
-+		   the last sequence in the string.  Note that LEN
-+		   is still zero.  */
-+		break;
-+	    }
-+	  else
-+	    idxnow = --backw;
-+	}
-+      else
-+	{
-+	  backw_stop = idxmax;
-+
-+	  while (*us != L('\0'))
-+	    {
-+	      int32_t tmp = findidx (&us, -1);
-+	      rulearr[idxmax] = tmp >> 24;
-+	      idxarr[idxmax] = tmp & 0xffffff;
-+	      idxcnt = idxmax++;
-+
-+	      if ((rulesets[rulearr[idxcnt] * nrules]
-+		   & sort_backward) == 0)
-+		/* No more backward characters to push.  */
-+		break;
-+	      ++idxcnt;
-+	    }
-+
-+	  if (backw_stop >= idxcnt)
-+	    {
-+	      /* No sequence at all or just one.  */
-+	      if (idxcnt == idxmax || backw_stop > idxcnt)
-+		/* Note that LEN is still zero.  */
-+		break;
-+
-+	      backw_stop = ~0ul;
-+	      idxnow = idxcnt;
-+	    }
-+	  else
-+	    /* We pushed backward sequences.  */
-+	    idxnow = backw = idxcnt - 1;
-+	}
-+      len = weights[idxarr[idxnow]++];
-+    }
-+
-+  /* Update the structure.  */
-+  seq->val = val;
-+  seq->len = len;
-+  seq->backw_stop = backw_stop;
-+  seq->backw = backw;
-+  seq->idxcnt = idxcnt;
-+  seq->idxmax = idxmax;
-+  seq->idxnow = idxnow;
-+  seq->us = us;
-+}
-+
-+/* Get next sequence.  Traverse the string as required.  This function does not
-+   set or use any index or rule cache.  */
-+static void
-+get_next_seq_nocache (coll_seq *seq, int nrules, const unsigned char *rulesets,
-+		      const USTRING_TYPE *weights, const int32_t *table,
-+		      const USTRING_TYPE *extra, const int32_t *indirect,
-+		      int pass)
-+{
-+#include WEIGHT_H
-+  size_t val = seq->val = 0;
-+  int len = seq->len;
-+  size_t backw_stop = seq->backw_stop;
-+  size_t backw = seq->backw;
-+  size_t idxcnt = seq->idxcnt;
-+  size_t idxmax = seq->idxmax;
-+  int32_t idx = seq->idx;
-+  const USTRING_TYPE *us = seq->us;
-+
-+  while (len == 0)
-+    {
-+      ++val;
-+      if (backw_stop != ~0ul)
-+	{
-+	  /* There is something pushed.  */
-+	  if (backw == backw_stop)
-+	    {
-+	      /* The last pushed character was handled.  Continue
-+		 with forward characters.  */
-+	      if (idxcnt < idxmax)
-+		{
-+		  idx = seq->save_idx;
-+		  backw_stop = ~0ul;
-+		}
-+	      else
-+		{
-+		  /* Nothing anymore.  The backward sequence ended with
-+		     the last sequence in the string.  Note that len is
-+		     still zero.  */
-+		  idx = 0;
-+		  break;
-+	        }
-+	    }
-+	  else
-+	    {
-+	      /* XXX Traverse BACKW sequences from the beginning of
-+		 BACKW_STOP to get the next sequence.  Is ther a quicker way
-+	         to do this?  */
-+	      size_t i = backw_stop;
-+	      us = seq->back_us;
-+	      while (i < backw)
-+		{
-+		  int32_t tmp = findidx (&us, -1);
-+		  idx = tmp & 0xffffff;
-+		  i++;
-+		}
-+	      --backw;
-+	      us = seq->us;
-+	    }
-+	}
-+      else
-+	{
-+	  backw_stop = idxmax;
-+	  int32_t prev_idx = idx;
-+
-+	  while (*us != L('\0'))
-+	    {
-+	      int32_t tmp = findidx (&us, -1);
-+	      unsigned char rule = tmp >> 24;
-+	      prev_idx = idx;
-+	      idx = tmp & 0xffffff;
-+	      idxcnt = idxmax++;
-+
-+	      /* Save the rule for the first sequence.  */
-+	      if (__glibc_unlikely (idxcnt == 0))
-+	        seq->rule = rule;
-+
-+	      if ((rulesets[rule * nrules + pass]
-+		   & sort_backward) == 0)
-+		/* No more backward characters to push.  */
-+		break;
-+	      ++idxcnt;
-+	    }
-+
-+	  if (backw_stop >= idxcnt)
-+	    {
-+	      /* No sequence at all or just one.  */
-+	      if (idxcnt == idxmax || backw_stop > idxcnt)
-+		/* Note that len is still zero.  */
-+		break;
-+
-+	      backw_stop = ~0ul;
-+	    }
-+	  else
-+	    {
-+	      /* We pushed backward sequences.  If the stream ended with the
-+		 backward sequence, then we process the last sequence we
-+		 found.  Otherwise we process the sequence before the last
-+		 one since the last one was a forward sequence.  */
-+	      seq->back_us = seq->us;
-+	      seq->us = us;
-+	      backw = idxcnt;
-+	      if (idxmax > idxcnt)
-+		{
-+		  backw--;
-+		  seq->save_idx = idx;
-+		  idx = prev_idx;
-+		}
-+	      if (backw > backw_stop)
-+		backw--;
-+	    }
-+	}
-+
-+      len = weights[idx++];
-+      /* Skip over indices of previous levels.  */
-+      for (int i = 0; i < pass; i++)
-+	{
-+	  idx += len;
-+	  len = weights[idx];
-+	  idx++;
-+	}
-+    }
-+
-+  /* Update the structure.  */
-+  seq->val = val;
-+  seq->len = len;
-+  seq->backw_stop = backw_stop;
-+  seq->backw = backw;
-+  seq->idxcnt = idxcnt;
-+  seq->idxmax = idxmax;
-+  seq->us = us;
-+  seq->idx = idx;
-+}
-+
-+/* Compare two sequences.  This version does not use the index and rules
-+   cache.  */
-+static int
-+do_compare_nocache (coll_seq *seq1, coll_seq *seq2, int position,
-+		    const USTRING_TYPE *weights)
-+{
-+  int seq1len = seq1->len;
-+  int seq2len = seq2->len;
-+  size_t val1 = seq1->val;
-+  size_t val2 = seq2->val;
-+  int idx1 = seq1->idx;
-+  int idx2 = seq2->idx;
-+  int result = 0;
-+
-+  /* Test for position if necessary.  */
-+  if (position && val1 != val2)
-+    {
-+      result = val1 > val2 ? 1 : -1;
-+      goto out;
-+    }
-+
-+  /* Compare the two sequences.  */
-+  do
-+    {
-+      if (weights[idx1] != weights[idx2])
-+	{
-+	  /* The sequences differ.  */
-+	  result = weights[idx1] - weights[idx2];
-+	  goto out;
-+	}
-+
-+      /* Increment the offsets.  */
-+      ++idx1;
-+      ++idx2;
-+
-+      --seq1len;
-+      --seq2len;
-+    }
-+  while (seq1len > 0 && seq2len > 0);
-+
-+  if (position && seq1len != seq2len)
-+    result = seq1len - seq2len;
-+
-+out:
-+  seq1->len = seq1len;
-+  seq2->len = seq2len;
-+  seq1->idx = idx1;
-+  seq2->idx = idx2;
-+  return result;
-+}
-+
-+/* Compare two sequences using the index cache.  */
-+static int
-+do_compare (coll_seq *seq1, coll_seq *seq2, int position,
-+	    const USTRING_TYPE *weights)
-+{
-+  int seq1len = seq1->len;
-+  int seq2len = seq2->len;
-+  size_t val1 = seq1->val;
-+  size_t val2 = seq2->val;
-+  int32_t *idx1arr = seq1->idxarr;
-+  int32_t *idx2arr = seq2->idxarr;
-+  int idx1now = seq1->idxnow;
-+  int idx2now = seq2->idxnow;
-+  int result = 0;
-+
-+  /* Test for position if necessary.  */
-+  if (position && val1 != val2)
-+    {
-+      result = val1 > val2 ? 1 : -1;
-+      goto out;
-+    }
-+
-+  /* Compare the two sequences.  */
-+  do
-+    {
-+      if (weights[idx1arr[idx1now]] != weights[idx2arr[idx2now]])
-+	{
-+	  /* The sequences differ.  */
-+	  result = weights[idx1arr[idx1now]] - weights[idx2arr[idx2now]];
-+	  goto out;
-+	}
-+
-+      /* Increment the offsets.  */
-+      ++idx1arr[idx1now];
-+      ++idx2arr[idx2now];
-+
-+      --seq1len;
-+      --seq2len;
-+    }
-+  while (seq1len > 0 && seq2len > 0);
-+
-+  if (position && seq1len != seq2len)
-+    result = seq1len - seq2len;
-+
-+out:
-+  seq1->len = seq1len;
-+  seq2->len = seq2len;
-+  return result;
-+}
-+
- int
--STRCOLL (s1, s2, l)
--     const STRING_TYPE *s1;
--     const STRING_TYPE *s2;
--     __locale_t l;
-+STRCOLL (const STRING_TYPE *s1, const STRING_TYPE *s2, __locale_t l)
- {
-   struct __locale_data *current = l->__locales[LC_COLLATE];
-   uint_fast32_t nrules = current->values[_NL_ITEM_INDEX (_NL_COLLATE_NRULES)].word;
-@@ -56,34 +479,6 @@ STRCOLL (s1, s2, l)
-   const USTRING_TYPE *weights;
-   const USTRING_TYPE *extra;
-   const int32_t *indirect;
--  uint_fast32_t pass;
--  int result = 0;
--  const USTRING_TYPE *us1;
--  const USTRING_TYPE *us2;
--  size_t s1len;
--  size_t s2len;
--  int32_t *idx1arr;
--  int32_t *idx2arr;
--  unsigned char *rule1arr;
--  unsigned char *rule2arr;
--  size_t idx1max;
--  size_t idx2max;
--  size_t idx1cnt;
--  size_t idx2cnt;
--  size_t idx1now;
--  size_t idx2now;
--  size_t backw1_stop;
--  size_t backw2_stop;
--  size_t backw1;
--  size_t backw2;
--  int val1;
--  int val2;
--  int position;
--  int seq1len;
--  int seq2len;
--  int use_malloc;
--
--#include WEIGHT_H
- 
-   if (nrules == 0)
-     return STRCMP (s1, s2);
-@@ -98,7 +493,6 @@ STRCOLL (s1, s2, l)
-     current->values[_NL_ITEM_INDEX (CONCAT(_NL_COLLATE_EXTRA,SUFFIX))].string;
-   indirect = (const int32_t *)
-     current->values[_NL_ITEM_INDEX (CONCAT(_NL_COLLATE_INDIRECT,SUFFIX))].string;
--  use_malloc = 0;
- 
-   assert (((uintptr_t) table) % __alignof__ (table[0]) == 0);
-   assert (((uintptr_t) weights) % __alignof__ (weights[0]) == 0);
-@@ -106,18 +500,13 @@ STRCOLL (s1, s2, l)
-   assert (((uintptr_t) indirect) % __alignof__ (indirect[0]) == 0);
- 
-   /* We need this a few times.  */
--  s1len = STRLEN (s1);
--  s2len = STRLEN (s2);
-+  size_t s1len = STRLEN (s1);
-+  size_t s2len = STRLEN (s2);
- 
-   /* Catch empty strings.  */
--  if (__builtin_expect (s1len == 0, 0) || __builtin_expect (s2len == 0, 0))
-+  if (__glibc_unlikely (s1len == 0) || __glibc_unlikely (s2len == 0))
-     return (s1len != 0) - (s2len != 0);
- 
--  /* We need the elements of the strings as unsigned values since they
--     are used as indeces.  */
--  us1 = (const USTRING_TYPE *) s1;
--  us2 = (const USTRING_TYPE *) s2;
--
-   /* Perform the first pass over the string and while doing this find
-      and store the weights for each character.  Since we want this to
-      be as fast as possible we are using `alloca' to store the temporary
-@@ -127,411 +516,124 @@ STRCOLL (s1, s2, l)
- 
-      Please note that the localedef programs makes sure that `position'
-      is not used at the first level.  */
--  if (! __libc_use_alloca ((s1len + s2len) * (sizeof (int32_t) + 1)))
--    {
--      idx1arr = (int32_t *) malloc ((s1len + s2len) * (sizeof (int32_t) + 1));
--      idx2arr = &idx1arr[s1len];
--      rule1arr = (unsigned char *) &idx2arr[s2len];
--      rule2arr = &rule1arr[s1len];
--
--      if (idx1arr == NULL)
--	/* No memory.  Well, go with the stack then.
--
--	   XXX Once this implementation is stable we will handle this
--	   differently.  Instead of precomputing the indeces we will
--	   do this in time.  This means, though, that this happens for
--	   every pass again.  */
--	goto try_stack;
--      use_malloc = 1;
--    }
--  else
--    {
--    try_stack:
--      idx1arr = (int32_t *) alloca (s1len * sizeof (int32_t));
--      idx2arr = (int32_t *) alloca (s2len * sizeof (int32_t));
--      rule1arr = (unsigned char *) alloca (s1len);
--      rule2arr = (unsigned char *) alloca (s2len);
--    }
- 
--  idx1cnt = 0;
--  idx2cnt = 0;
--  idx1max = 0;
--  idx2max = 0;
--  idx1now = 0;
--  idx2now = 0;
--  backw1_stop = ~0ul;
--  backw2_stop = ~0ul;
--  backw1 = ~0ul;
--  backw2 = ~0ul;
--  seq1len = 0;
--  seq2len = 0;
--  position = rulesets[0] & sort_position;
--  while (1)
--    {
--      val1 = 0;
--      val2 = 0;
--
--      /* Get the next non-IGNOREd element for string `s1'.  */
--      if (seq1len == 0)
--	do
--	  {
--	    ++val1;
--
--	    if (backw1_stop != ~0ul)
--	      {
--		/* The is something pushed.  */
--		if (backw1 == backw1_stop)
--		  {
--		    /* The last pushed character was handled.  Continue
--		       with forward characters.  */
--		    if (idx1cnt < idx1max)
--		      {
--			idx1now = idx1cnt;
--			backw1_stop = ~0ul;
--		      }
--		    else
--		      /* Nothing anymore.  The backward sequence ended with
--			 the last sequence in the string.  Note that seq1len
--			 is still zero.  */
--		      break;
--		  }
--		else
--		  idx1now = --backw1;
--	      }
--	    else
--	      {
--		backw1_stop = idx1max;
--
--		while (*us1 != L('\0'))
--		  {
--		    int32_t tmp = findidx (&us1, -1);
--		    rule1arr[idx1max] = tmp >> 24;
--		    idx1arr[idx1max] = tmp & 0xffffff;
--		    idx1cnt = idx1max++;
--
--		    if ((rulesets[rule1arr[idx1cnt] * nrules]
--			 & sort_backward) == 0)
--		      /* No more backward characters to push.  */
--		      break;
--		    ++idx1cnt;
--		  }
--
--		if (backw1_stop >= idx1cnt)
--		  {
--		    /* No sequence at all or just one.  */
--		    if (idx1cnt == idx1max || backw1_stop > idx1cnt)
--		      /* Note that seq1len is still zero.  */
--		      break;
--
--		    backw1_stop = ~0ul;
--		    idx1now = idx1cnt;
--		  }
--		else
--		  /* We pushed backward sequences.  */
--		  idx1now = backw1 = idx1cnt - 1;
--	      }
--	  }
--	while ((seq1len = weights[idx1arr[idx1now]++]) == 0);
--
--      /* And the same for string `s2'.  */
--      if (seq2len == 0)
--	do
--	  {
--	    ++val2;
--
--	    if (backw2_stop != ~0ul)
--	      {
--		/* The is something pushed.  */
--		if (backw2 == backw2_stop)
--		  {
--		    /* The last pushed character was handled.  Continue
--		       with forward characters.  */
--		    if (idx2cnt < idx2max)
--		      {
--			idx2now = idx2cnt;
--			backw2_stop = ~0ul;
--		      }
--		    else
--		      /* Nothing anymore.  The backward sequence ended with
--			 the last sequence in the string.  Note that seq2len
--			 is still zero.  */
--		      break;
--		  }
--		else
--		  idx2now = --backw2;
--	      }
--	    else
--	      {
--		backw2_stop = idx2max;
--
--		while (*us2 != L('\0'))
--		  {
--		    int32_t tmp = findidx (&us2, -1);
--		    rule2arr[idx2max] = tmp >> 24;
--		    idx2arr[idx2max] = tmp & 0xffffff;
--		    idx2cnt = idx2max++;
--
--		    if ((rulesets[rule2arr[idx2cnt] * nrules]
--			 & sort_backward) == 0)
--		      /* No more backward characters to push.  */
--		      break;
--		    ++idx2cnt;
--		  }
--
--		if (backw2_stop >= idx2cnt)
--		  {
--		    /* No sequence at all or just one.  */
--		    if (idx2cnt == idx2max || backw2_stop > idx2cnt)
--		      /* Note that seq1len is still zero.  */
--		      break;
--
--		    backw2_stop = ~0ul;
--		    idx2now = idx2cnt;
--		  }
--		else
--		  /* We pushed backward sequences.  */
--		  idx2now = backw2 = idx2cnt - 1;
--	      }
--	  }
--	while ((seq2len = weights[idx2arr[idx2now]++]) == 0);
--
--      /* See whether any or both strings are empty.  */
--      if (seq1len == 0 || seq2len == 0)
--	{
--	  if (seq1len == seq2len)
--	    /* Both ended.  So far so good, both strings are equal at the
--	       first level.  */
--	    break;
--
--	  /* This means one string is shorter than the other.  Find out
--	     which one and return an appropriate value.  */
--	  result = seq1len == 0 ? -1 : 1;
--	  goto free_and_return;
--	}
-+  coll_seq seq1, seq2;
-+  bool use_malloc = false;
-+  int result = 0;
- 
--      /* Test for position if necessary.  */
--      if (position && val1 != val2)
--	{
--	  result = val1 - val2;
--	  goto free_and_return;
--	}
-+  memset (&seq1, 0, sizeof (seq1));
-+  seq2 = seq1;
- 
--      /* Compare the two sequences.  */
--      do
--	{
--	  if (weights[idx1arr[idx1now]] != weights[idx2arr[idx2now]])
--	    {
--	      /* The sequences differ.  */
--	      result = weights[idx1arr[idx1now]] - weights[idx2arr[idx2now]];
--	      goto free_and_return;
--	    }
-+  size_t size_max = SIZE_MAX / (sizeof (int32_t) + 1);
- 
--	  /* Increment the offsets.  */
--	  ++idx1arr[idx1now];
--	  ++idx2arr[idx2now];
-+  /* If the strings are long enough to cause overflow in the size request, then
-+     skip the allocation and proceed with the non-cached routines.  */
-+  if (MIN (s1len, s2len) > size_max
-+      || MAX (s1len, s2len) > size_max - MIN (s1len, s2len))
-+    goto begin_collate;
- 
--	  --seq1len;
--	  --seq2len;
--	}
--      while (seq1len > 0 && seq2len > 0);
-+  if (! __libc_use_alloca ((s1len + s2len) * (sizeof (int32_t) + 1)))
-+    {
-+      seq1.idxarr = (int32_t *) malloc ((s1len + s2len) * (sizeof (int32_t) + 1));
- 
--      if (position && seq1len != seq2len)
-+      /* If we failed to allocate memory, we leave everything as NULL so that
-+	 we use the nocache version of traversal and comparison functions.  */
-+      if (seq1.idxarr != NULL)
- 	{
--	  result = seq1len - seq2len;
--	  goto free_and_return;
-+	  seq2.idxarr = &seq1.idxarr[s1len];
-+	  seq1.rulearr = (unsigned char *) &seq2.idxarr[s2len];
-+	  seq2.rulearr = &seq1.rulearr[s1len];
-+	  use_malloc = true;
- 	}
-     }
-+  else
-+    {
-+      seq1.idxarr = (int32_t *) alloca (s1len * sizeof (int32_t));
-+      seq2.idxarr = (int32_t *) alloca (s2len * sizeof (int32_t));
-+      seq1.rulearr = (unsigned char *) alloca (s1len);
-+      seq2.rulearr = (unsigned char *) alloca (s2len);
-+    }
- 
--  /* Now the remaining passes over the weights.  We now use the
--     indeces we found before.  */
--  for (pass = 1; pass < nrules; ++pass)
-+  int rule;
-+
-+ begin_collate:
-+  rule = 0;
-+  /* Cache values in the first pass and if needed, use them in subsequent
-+     passes.  */
-+  for (int pass = 0; pass < nrules; ++pass)
-     {
-+      seq1.idxcnt = 0;
-+      seq1.idx = 0;
-+      seq2.idx = 0;
-+      seq1.backw_stop = ~0ul;
-+      seq1.backw = ~0ul;
-+      seq2.idxcnt = 0;
-+      seq2.backw_stop = ~0ul;
-+      seq2.backw = ~0ul;
-+
-+      /* We need the elements of the strings as unsigned values since they
-+	 are used as indices.  */
-+      seq1.us = (const USTRING_TYPE *) s1;
-+      seq2.us = (const USTRING_TYPE *) s2;
-+
-       /* We assume that if a rule has defined `position' in one section
- 	 this is true for all of them.  */
--      idx1cnt = 0;
--      idx2cnt = 0;
--      backw1_stop = ~0ul;
--      backw2_stop = ~0ul;
--      backw1 = ~0ul;
--      backw2 = ~0ul;
--      position = rulesets[rule1arr[0] * nrules + pass] & sort_position;
-+      int position = rulesets[rule * nrules + pass] & sort_position;
- 
-       while (1)
- 	{
--	  val1 = 0;
--	  val2 = 0;
--
--	  /* Get the next non-IGNOREd element for string `s1'.  */
--	  if (seq1len == 0)
--	    do
--	      {
--		++val1;
--
--		if (backw1_stop != ~0ul)
--		  {
--		    /* The is something pushed.  */
--		    if (backw1 == backw1_stop)
--		      {
--			/* The last pushed character was handled.  Continue
--			   with forward characters.  */
--			if (idx1cnt < idx1max)
--			  {
--			    idx1now = idx1cnt;
--			    backw1_stop = ~0ul;
--			  }
--			else
--			  {
--			    /* Nothing anymore.  The backward sequence
--			       ended with the last sequence in the string.  */
--			    idx1now = ~0ul;
--			    break;
--			  }
--		      }
--		    else
--		      idx1now = --backw1;
--		  }
--		else
--		  {
--		    backw1_stop = idx1cnt;
--
--		    while (idx1cnt < idx1max)
--		      {
--			if ((rulesets[rule1arr[idx1cnt] * nrules + pass]
--			     & sort_backward) == 0)
--			  /* No more backward characters to push.  */
--			  break;
--			++idx1cnt;
--		      }
--
--		    if (backw1_stop == idx1cnt)
--		      {
--			/* No sequence at all or just one.  */
--			if (idx1cnt == idx1max)
--			  /* Note that seq1len is still zero.  */
--			  break;
--
--			backw1_stop = ~0ul;
--			idx1now = idx1cnt++;
--		      }
--		    else
--		      /* We pushed backward sequences.  */
--		      idx1now = backw1 = idx1cnt - 1;
--		  }
--	      }
--	    while ((seq1len = weights[idx1arr[idx1now]++]) == 0);
--
--	  /* And the same for string `s2'.  */
--	  if (seq2len == 0)
--	    do
--	      {
--		++val2;
--
--		if (backw2_stop != ~0ul)
--		  {
--		    /* The is something pushed.  */
--		    if (backw2 == backw2_stop)
--		      {
--			/* The last pushed character was handled.  Continue
--			   with forward characters.  */
--			if (idx2cnt < idx2max)
--			  {
--			    idx2now = idx2cnt;
--			    backw2_stop = ~0ul;
--			  }
--			else
--			  {
--			    /* Nothing anymore.  The backward sequence
--			       ended with the last sequence in the string.  */
--			    idx2now = ~0ul;
--			    break;
--			  }
--		      }
--		    else
--		      idx2now = --backw2;
--		  }
--		else
--		  {
--		    backw2_stop = idx2cnt;
--
--		    while (idx2cnt < idx2max)
--		      {
--			if ((rulesets[rule2arr[idx2cnt] * nrules + pass]
--			     & sort_backward) == 0)
--			  /* No more backward characters to push.  */
--			  break;
--			++idx2cnt;
--		      }
--
--		    if (backw2_stop == idx2cnt)
--		      {
--			/* No sequence at all or just one.  */
--			if (idx2cnt == idx2max)
--			  /* Note that seq2len is still zero.  */
--			  break;
--
--			backw2_stop = ~0ul;
--			idx2now = idx2cnt++;
--		      }
--		    else
--		      /* We pushed backward sequences.  */
--		      idx2now = backw2 = idx2cnt - 1;
--		  }
--	      }
--	    while ((seq2len = weights[idx2arr[idx2now]++]) == 0);
-+	  if (__glibc_unlikely (seq1.idxarr == NULL))
-+	    {
-+	      get_next_seq_nocache (&seq1, nrules, rulesets, weights, table,
-+				    extra, indirect, pass);
-+	      get_next_seq_nocache (&seq2, nrules, rulesets, weights, table,
-+				    extra, indirect, pass);
-+	    }
-+	  else if (pass == 0)
-+	    {
-+	      get_next_seq (&seq1, nrules, rulesets, weights, table, extra,
-+			    indirect);
-+	      get_next_seq (&seq2, nrules, rulesets, weights, table, extra,
-+			    indirect);
-+	    }
-+	  else
-+	    {
-+	      get_next_seq_cached (&seq1, nrules, pass, rulesets, weights);
-+	      get_next_seq_cached (&seq2, nrules, pass, rulesets, weights);
-+	    }
- 
- 	  /* See whether any or both strings are empty.  */
--	  if (seq1len == 0 || seq2len == 0)
-+	  if (seq1.len == 0 || seq2.len == 0)
- 	    {
--	      if (seq1len == seq2len)
-+	      if (seq1.len == seq2.len)
- 		/* Both ended.  So far so good, both strings are equal
- 		   at this level.  */
- 		break;
- 
- 	      /* This means one string is shorter than the other.  Find out
- 		 which one and return an appropriate value.  */
--	      result = seq1len == 0 ? -1 : 1;
-+	      result = seq1.len == 0 ? -1 : 1;
- 	      goto free_and_return;
- 	    }
- 
--	  /* Test for position if necessary.  */
--	  if (position && val1 != val2)
--	    {
--	      result = val1 - val2;
--	      goto free_and_return;
--	    }
--
--	  /* Compare the two sequences.  */
--	  do
--	    {
--	      if (weights[idx1arr[idx1now]] != weights[idx2arr[idx2now]])
--		{
--		  /* The sequences differ.  */
--		  result = (weights[idx1arr[idx1now]]
--			    - weights[idx2arr[idx2now]]);
--		  goto free_and_return;
--		}
--
--	      /* Increment the offsets.  */
--	      ++idx1arr[idx1now];
--	      ++idx2arr[idx2now];
--
--	      --seq1len;
--	      --seq2len;
--	    }
--	  while (seq1len > 0 && seq2len > 0);
--
--	  if (position && seq1len != seq2len)
--	    {
--	      result = seq1len - seq2len;
--	      goto free_and_return;
--	    }
-+	  if (__glibc_unlikely (seq1.idxarr == NULL))
-+	    result = do_compare_nocache (&seq1, &seq2, position, weights);
-+	  else
-+	    result = do_compare (&seq1, &seq2, position, weights);
-+	  if (result != 0)
-+	    goto free_and_return;
- 	}
-+
-+      if (__glibc_likely (seq1.rulearr != NULL))
-+	rule = seq1.rulearr[0];
-+      else
-+	rule = seq1.rule;
-     }
- 
-   /* Free the memory if needed.  */
-  free_and_return:
-   if (use_malloc)
--    free (idx1arr);
-+    free (seq1.idxarr);
- 
-   return result;
- }
diff --git a/pkgs/development/libraries/glibc/2.19/cve-2013-4237.patch b/pkgs/development/libraries/glibc/2.19/cve-2013-4237.patch
deleted file mode 100644
index f745cb003aa..00000000000
--- a/pkgs/development/libraries/glibc/2.19/cve-2013-4237.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-commit 91ce40854d0b7f865cf5024ef95a8026b76096f3
-Author: Florian Weimer <fweimer@redhat.com>
-Date:   Fri Aug 16 09:38:52 2013 +0200
-
-    CVE-2013-4237, BZ #14699: Buffer overflow in readdir_r
-    
-    	* sysdeps/posix/dirstream.h (struct __dirstream): Add errcode
-    	member.
-    	* sysdeps/posix/opendir.c (__alloc_dir): Initialize errcode
-    	member.
-    	* sysdeps/posix/rewinddir.c (rewinddir): Reset errcode member.
-    	* sysdeps/posix/readdir_r.c (__READDIR_R): Enforce NAME_MAX limit.
-    	Return delayed error code.  Remove GETDENTS_64BIT_ALIGNED
-    	conditional.
-    	* sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c: Do not define
-    	GETDENTS_64BIT_ALIGNED.
-    	* sysdeps/unix/sysv/linux/i386/readdir64_r.c: Likewise.
-    	* manual/filesys.texi (Reading/Closing Directory): Document
-    	ENAMETOOLONG return value of readdir_r.  Recommend readdir more
-    	strongly.
-    	* manual/conf.texi (Limits for Files): Add portability note to
-    	NAME_MAX, PATH_MAX.
-    	(Pathconf): Add portability note for _PC_NAME_MAX, _PC_PATH_MAX.
-
-diff --git a/manual/conf.texi b/manual/conf.texi
-index 7eb8b36..c720063 100644
---- a/manual/conf.texi
-+++ b/manual/conf.texi
-@@ -1149,6 +1149,9 @@ typed ahead as input.  @xref{I/O Queues}.
- @deftypevr Macro int NAME_MAX
- The uniform system limit (if any) for the length of a file name component, not
- including the terminating null character.
-+
-+@strong{Portability Note:} On some systems, @theglibc{} defines
-+@code{NAME_MAX}, but does not actually enforce this limit.
- @end deftypevr
- 
- @comment limits.h
-@@ -1157,6 +1160,9 @@ including the terminating null character.
- The uniform system limit (if any) for the length of an entire file name (that
- is, the argument given to system calls such as @code{open}), including the
- terminating null character.
-+
-+@strong{Portability Note:} @Theglibc{} does not enforce this limit
-+even if @code{PATH_MAX} is defined.
- @end deftypevr
- 
- @cindex limits, pipe buffer size
-@@ -1476,6 +1482,9 @@ Inquire about the value of @code{POSIX_REC_MIN_XFER_SIZE}.
- Inquire about the value of @code{POSIX_REC_XFER_ALIGN}.
- @end table
- 
-+@strong{Portability Note:} On some systems, @theglibc{} does not
-+enforce @code{_PC_NAME_MAX} or @code{_PC_PATH_MAX} limits.
-+
- @node Utility Limits
- @section Utility Program Capacity Limits
- 
-diff --git a/manual/filesys.texi b/manual/filesys.texi
-index 1df9cf2..814c210 100644
---- a/manual/filesys.texi
-+++ b/manual/filesys.texi
-@@ -444,9 +444,9 @@ symbols are declared in the header file @file{dirent.h}.
- @comment POSIX.1
- @deftypefun {struct dirent *} readdir (DIR *@var{dirstream})
- This function reads the next entry from the directory.  It normally
--returns a pointer to a structure containing information about the file.
--This structure is statically allocated and can be rewritten by a
--subsequent call.
-+returns a pointer to a structure containing information about the
-+file.  This structure is associated with the @var{dirstream} handle
-+and can be rewritten by a subsequent call.
- 
- @strong{Portability Note:} On some systems @code{readdir} may not
- return entries for @file{.} and @file{..}, even though these are always
-@@ -461,19 +461,61 @@ conditions are defined for this function:
- The @var{dirstream} argument is not valid.
- @end table
- 
--@code{readdir} is not thread safe.  Multiple threads using
--@code{readdir} on the same @var{dirstream} may overwrite the return
--value.  Use @code{readdir_r} when this is critical.
-+To distinguish between an end-of-directory condition or an error, you
-+must set @code{errno} to zero before calling @code{readdir}.  To avoid
-+entering an infinite loop, you should stop reading from the directory
-+after the first error.
-+
-+In POSIX.1-2008, @code{readdir} is not thread-safe.  In @theglibc{}
-+implementation, it is safe to call @code{readdir} concurrently on
-+different @var{dirstream}s, but multiple threads accessing the same
-+@var{dirstream} result in undefined behavior.  @code{readdir_r} is a
-+fully thread-safe alternative, but suffers from poor portability (see
-+below).  It is recommended that you use @code{readdir}, with external
-+locking if multiple threads access the same @var{dirstream}.
- @end deftypefun
- 
- @comment dirent.h
- @comment GNU
- @deftypefun int readdir_r (DIR *@var{dirstream}, struct dirent *@var{entry}, struct dirent **@var{result})
--This function is the reentrant version of @code{readdir}.  Like
--@code{readdir} it returns the next entry from the directory.  But to
--prevent conflicts between simultaneously running threads the result is
--not stored in statically allocated memory.  Instead the argument
--@var{entry} points to a place to store the result.
-+This function is a version of @code{readdir} which performs internal
-+locking.  Like @code{readdir} it returns the next entry from the
-+directory.  To prevent conflicts between simultaneously running
-+threads the result is stored inside the @var{entry} object.
-+
-+@strong{Portability Note:} It is recommended to use @code{readdir}
-+instead of @code{readdir_r} for the following reasons:
-+
-+@itemize @bullet
-+@item
-+On systems which do not define @code{NAME_MAX}, it may not be possible
-+to use @code{readdir_r} safely because the caller does not specify the
-+length of the buffer for the directory entry.
-+
-+@item
-+On some systems, @code{readdir_r} cannot read directory entries with
-+very long names.  If such a name is encountered, @theglibc{}
-+implementation of @code{readdir_r} returns with an error code of
-+@code{ENAMETOOLONG} after the final directory entry has been read.  On
-+other systems, @code{readdir_r} may return successfully, but the
-+@code{d_name} member may not be NUL-terminated or may be truncated.
-+
-+@item
-+POSIX-1.2008 does not guarantee that @code{readdir} is thread-safe,
-+even when access to the same @var{dirstream} is serialized.  But in
-+current implementations (including @theglibc{}), it is safe to call
-+@code{readdir} concurrently on different @var{dirstream}s, so there is
-+no need to use @code{readdir_r} in most multi-threaded programs.  In
-+the rare case that multiple threads need to read from the same
-+@var{dirstream}, it is still better to use @code{readdir} and external
-+synchronization.
-+
-+@item
-+It is expected that future versions of POSIX will obsolete
-+@code{readdir_r} and mandate the level of thread safety for
-+@code{readdir} which is provided by @theglibc{} and other
-+implementations today.
-+@end itemize
- 
- Normally @code{readdir_r} returns zero and sets @code{*@var{result}}
- to @var{entry}.  If there are no more entries in the directory or an
-@@ -481,15 +523,6 @@ error is detected, @code{readdir_r} sets @code{*@var{result}} to a
- null pointer and returns a nonzero error code, also stored in
- @code{errno}, as described for @code{readdir}.
- 
--@strong{Portability Note:} On some systems @code{readdir_r} may not
--return a NUL terminated string for the file name, even when there is no
--@code{d_reclen} field in @code{struct dirent} and the file
--name is the maximum allowed size.  Modern systems all have the
--@code{d_reclen} field, and on old systems multi-threading is not
--critical.  In any case there is no such problem with the @code{readdir}
--function, so that even on systems without the @code{d_reclen} member one
--could use multiple threads by using external locking.
--
- It is also important to look at the definition of the @code{struct
- dirent} type.  Simply passing a pointer to an object of this type for
- the second parameter of @code{readdir_r} might not be enough.  Some
-diff --git a/sysdeps/posix/dirstream.h b/sysdeps/posix/dirstream.h
-index a7a074d..8e8570d 100644
---- a/sysdeps/posix/dirstream.h
-+++ b/sysdeps/posix/dirstream.h
-@@ -39,6 +39,8 @@ struct __dirstream
- 
-     off_t filepos;		/* Position of next entry to read.  */
- 
-+    int errcode;		/* Delayed error code.  */
-+
-     /* Directory block.  */
-     char data[0] __attribute__ ((aligned (__alignof__ (void*))));
-   };
-diff --git a/sysdeps/posix/opendir.c b/sysdeps/posix/opendir.c
-index ddfc3a7..fc05b0f 100644
---- a/sysdeps/posix/opendir.c
-+++ b/sysdeps/posix/opendir.c
-@@ -231,6 +231,7 @@ __alloc_dir (int fd, bool close_fd, int flags, const struct stat64 *statp)
-   dirp->size = 0;
-   dirp->offset = 0;
-   dirp->filepos = 0;
-+  dirp->errcode = 0;
- 
-   return dirp;
- }
-diff --git a/sysdeps/posix/readdir_r.c b/sysdeps/posix/readdir_r.c
-index b5a8e2e..8ed5c3f 100644
---- a/sysdeps/posix/readdir_r.c
-+++ b/sysdeps/posix/readdir_r.c
-@@ -40,6 +40,7 @@ __READDIR_R (DIR *dirp, DIRENT_TYPE *entry, DIRENT_TYPE **result)
-   DIRENT_TYPE *dp;
-   size_t reclen;
-   const int saved_errno = errno;
-+  int ret;
- 
-   __libc_lock_lock (dirp->lock);
- 
-@@ -70,10 +71,10 @@ __READDIR_R (DIR *dirp, DIRENT_TYPE *entry, DIRENT_TYPE **result)
- 		  bytes = 0;
- 		  __set_errno (saved_errno);
- 		}
-+	      if (bytes < 0)
-+		dirp->errcode = errno;
- 
- 	      dp = NULL;
--	      /* Reclen != 0 signals that an error occurred.  */
--	      reclen = bytes != 0;
- 	      break;
- 	    }
- 	  dirp->size = (size_t) bytes;
-@@ -106,29 +107,46 @@ __READDIR_R (DIR *dirp, DIRENT_TYPE *entry, DIRENT_TYPE **result)
-       dirp->filepos += reclen;
- #endif
- 
--      /* Skip deleted files.  */
-+#ifdef NAME_MAX
-+      if (reclen > offsetof (DIRENT_TYPE, d_name) + NAME_MAX + 1)
-+	{
-+	  /* The record is very long.  It could still fit into the
-+	     caller-supplied buffer if we can skip padding at the
-+	     end.  */
-+	  size_t namelen = _D_EXACT_NAMLEN (dp);
-+	  if (namelen <= NAME_MAX)
-+	    reclen = offsetof (DIRENT_TYPE, d_name) + namelen + 1;
-+	  else
-+	    {
-+	      /* The name is too long.  Ignore this file.  */
-+	      dirp->errcode = ENAMETOOLONG;
-+	      dp->d_ino = 0;
-+	      continue;
-+	    }
-+	}
-+#endif
-+
-+      /* Skip deleted and ignored files.  */
-     }
-   while (dp->d_ino == 0);
- 
-   if (dp != NULL)
-     {
--#ifdef GETDENTS_64BIT_ALIGNED
--      /* The d_reclen value might include padding which is not part of
--	 the DIRENT_TYPE data structure.  */
--      reclen = MIN (reclen,
--		    offsetof (DIRENT_TYPE, d_name) + sizeof (dp->d_name));
--#endif
-       *result = memcpy (entry, dp, reclen);
--#ifdef GETDENTS_64BIT_ALIGNED
-+#ifdef _DIRENT_HAVE_D_RECLEN
-       entry->d_reclen = reclen;
- #endif
-+      ret = 0;
-     }
-   else
--    *result = NULL;
-+    {
-+      *result = NULL;
-+      ret = dirp->errcode;
-+    }
- 
-   __libc_lock_unlock (dirp->lock);
- 
--  return dp != NULL ? 0 : reclen ? errno : 0;
-+  return ret;
- }
- 
- #ifdef __READDIR_R_ALIAS
-diff --git a/sysdeps/posix/rewinddir.c b/sysdeps/posix/rewinddir.c
-index 2935a8e..d4991ad 100644
---- a/sysdeps/posix/rewinddir.c
-+++ b/sysdeps/posix/rewinddir.c
-@@ -33,6 +33,7 @@ rewinddir (dirp)
-   dirp->filepos = 0;
-   dirp->offset = 0;
-   dirp->size = 0;
-+  dirp->errcode = 0;
- #ifndef NOT_IN_libc
-   __libc_lock_unlock (dirp->lock);
- #endif
-diff --git a/sysdeps/unix/sysv/linux/i386/readdir64_r.c b/sysdeps/unix/sysv/linux/i386/readdir64_r.c
-index 8ebbcfd..a7d114e 100644
---- a/sysdeps/unix/sysv/linux/i386/readdir64_r.c
-+++ b/sysdeps/unix/sysv/linux/i386/readdir64_r.c
-@@ -18,7 +18,6 @@
- #define __READDIR_R __readdir64_r
- #define __GETDENTS __getdents64
- #define DIRENT_TYPE struct dirent64
--#define GETDENTS_64BIT_ALIGNED 1
- 
- #include <sysdeps/posix/readdir_r.c>
- 
-diff --git a/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c b/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c
-index 5ed8e95..290f2c8 100644
---- a/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c
-+++ b/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c
-@@ -1,5 +1,4 @@
- #define readdir64_r __no_readdir64_r_decl
--#define GETDENTS_64BIT_ALIGNED 1
- #include <sysdeps/posix/readdir_r.c>
- #undef readdir64_r
- weak_alias (__readdir_r, readdir64_r)
diff --git a/pkgs/development/libraries/glibc/2.19/cve-2013-4332.patch b/pkgs/development/libraries/glibc/2.19/cve-2013-4332.patch
deleted file mode 100644
index 94d25d7bbe1..00000000000
--- a/pkgs/development/libraries/glibc/2.19/cve-2013-4332.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://projects.archlinux.org/svntogit/packages.git/tree/trunk/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch?h=packages/glibc
-
-diff --git a/malloc/malloc.c b/malloc/malloc.c
-index dd295f5..7f43ba3 100644
---- a/malloc/malloc.c
-+++ b/malloc/malloc.c
-@@ -3082,6 +3082,13 @@ __libc_pvalloc(size_t bytes)
-   size_t page_mask = GLRO(dl_pagesize) - 1;
-   size_t rounded_bytes = (bytes + page_mask) & ~(page_mask);
- 
-+  /* Check for overflow.  */
-+  if (bytes > SIZE_MAX - 2*pagesz - MINSIZE)
-+    {
-+      __set_errno (ENOMEM);
-+      return 0;
-+    }
-+
-   void *(*hook) (size_t, size_t, const void *) =
-     force_reg (__memalign_hook);
-   if (__builtin_expect (hook != NULL, 0))
-diff --git a/malloc/malloc.c b/malloc/malloc.c
-index 7f43ba3..3148c5f 100644
---- a/malloc/malloc.c
-+++ b/malloc/malloc.c
-@@ -3046,6 +3046,13 @@ __libc_valloc(size_t bytes)
- 
-   size_t pagesz = GLRO(dl_pagesize);
- 
-+  /* Check for overflow.  */
-+  if (bytes > SIZE_MAX - pagesz - MINSIZE)
-+    {
-+      __set_errno (ENOMEM);
-+      return 0;
-+    }
-+
-   void *(*hook) (size_t, size_t, const void *) =
-     force_reg (__memalign_hook);
-   if (__builtin_expect (hook != NULL, 0))
-diff --git a/malloc/malloc.c b/malloc/malloc.c
-index 3148c5f..f7718a9 100644
---- a/malloc/malloc.c
-+++ b/malloc/malloc.c
-@@ -3015,6 +3015,13 @@ __libc_memalign(size_t alignment, size_t bytes)
-   /* Otherwise, ensure that it is at least a minimum chunk size */
-   if (alignment <  MINSIZE) alignment = MINSIZE;
- 
-+  /* Check for overflow.  */
-+  if (bytes > SIZE_MAX - alignment - MINSIZE)
-+    {
-+      __set_errno (ENOMEM);
-+      return 0;
-+    }
-+
-   arena_get(ar_ptr, bytes + alignment + MINSIZE);
-   if(!ar_ptr)
-     return 0;
diff --git a/pkgs/development/libraries/glibc/2.19/cve-2013-4458.patch b/pkgs/development/libraries/glibc/2.19/cve-2013-4458.patch
deleted file mode 100644
index bec4acde754..00000000000
--- a/pkgs/development/libraries/glibc/2.19/cve-2013-4458.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit 7cbcdb3699584db8913ca90f705d6337633ee10f
-Author: Siddhesh Poyarekar <siddhesh@redhat.com>
-Date:   Fri Oct 25 10:22:12 2013 +0530
-
-    Fix stack overflow due to large AF_INET6 requests
-    
-    Resolves #16072 (CVE-2013-4458).
-    
-    This patch fixes another stack overflow in getaddrinfo when it is
-    called with AF_INET6.  The AF_UNSPEC case was fixed as CVE-2013-1914,
-    but the AF_INET6 case went undetected back then.
-
-diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
-index e6ce4cf..8ff74b4 100644
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -197,7 +197,22 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp,
- 				&rc, &herrno, NULL, &localcanon));	      \
-     if (rc != ERANGE || herrno != NETDB_INTERNAL)			      \
-       break;								      \
--    tmpbuf = extend_alloca (tmpbuf, tmpbuflen, 2 * tmpbuflen);		      \
-+    if (!malloc_tmpbuf && __libc_use_alloca (alloca_used + 2 * tmpbuflen))    \
-+      tmpbuf = extend_alloca_account (tmpbuf, tmpbuflen, 2 * tmpbuflen,	      \
-+				      alloca_used);			      \
-+    else								      \
-+      {									      \
-+	char *newp = realloc (malloc_tmpbuf ? tmpbuf : NULL,		      \
-+			      2 * tmpbuflen);				      \
-+	if (newp == NULL)						      \
-+	  {								      \
-+	    result = -EAI_MEMORY;					      \
-+	    goto free_and_return;					      \
-+	  }								      \
-+	tmpbuf = newp;							      \
-+	malloc_tmpbuf = true;						      \
-+	tmpbuflen = 2 * tmpbuflen;					      \
-+      }									      \
-   }									      \
-   if (status == NSS_STATUS_SUCCESS && rc == 0)				      \
-     h = &th;								      \
-@@ -209,7 +224,8 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp,
- 	{								      \
- 	  __set_h_errno (herrno);					      \
- 	  _res.options |= old_res_options & RES_USE_INET6;		      \
--	  return -EAI_SYSTEM;						      \
-+	  result = -EAI_SYSTEM;						      \
-+	  goto free_and_return;						      \
- 	}								      \
-       if (herrno == TRY_AGAIN)						      \
- 	no_data = EAI_AGAIN;						      \
diff --git a/pkgs/development/libraries/glibc/2.19/cve-2013-4788.patch b/pkgs/development/libraries/glibc/2.19/cve-2013-4788.patch
deleted file mode 100644
index cf8c7911f68..00000000000
--- a/pkgs/development/libraries/glibc/2.19/cve-2013-4788.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-commit c61b4d41c9647a54a329aa021341c0eb032b793e
-Author: Carlos O'Donell <carlos@redhat.com>
-Date:   Mon Sep 23 00:52:09 2013 -0400
-
-    BZ #15754: CVE-2013-4788
-    
-    The pointer guard used for pointer mangling was not initialized for
-    static applications resulting in the security feature being disabled.
-    The pointer guard is now correctly initialized to a random value for
-    static applications. Existing static applications need to be
-    recompiled to take advantage of the fix.
-    
-    The test tst-ptrguard1-static and tst-ptrguard1 add regression
-    coverage to ensure the pointer guards are sufficiently random
-    and initialized to a default value.
-
-diff --git a/csu/libc-start.c b/csu/libc-start.c
-index e5da3ef..c898d06 100644
---- a/csu/libc-start.c
-+++ b/csu/libc-start.c
-@@ -37,6 +37,12 @@ extern void __pthread_initialize_minimal (void);
-    in thread local area.  */
- uintptr_t __stack_chk_guard attribute_relro;
- # endif
-+# ifndef  THREAD_SET_POINTER_GUARD
-+/* Only exported for architectures that don't store the pointer guard
-+   value in thread local area.  */
-+uintptr_t __pointer_chk_guard_local
-+	attribute_relro attribute_hidden __attribute__ ((nocommon));
-+# endif
- #endif
- 
- #ifdef HAVE_PTR_NTHREADS
-@@ -195,6 +201,16 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
- # else
-   __stack_chk_guard = stack_chk_guard;
- # endif
-+
-+  /* Set up the pointer guard value.  */
-+  uintptr_t pointer_chk_guard = _dl_setup_pointer_guard (_dl_random,
-+							 stack_chk_guard);
-+# ifdef THREAD_SET_POINTER_GUARD
-+  THREAD_SET_POINTER_GUARD (pointer_chk_guard);
-+# else
-+  __pointer_chk_guard_local = pointer_chk_guard;
-+# endif
-+
- #endif
- 
-   /* Register the destructor of the dynamic linker if there is any.  */
-diff --git a/ports/sysdeps/ia64/stackguard-macros.h b/ports/sysdeps/ia64/stackguard-macros.h
-index dc683c2..3907293 100644
---- a/ports/sysdeps/ia64/stackguard-macros.h
-+++ b/ports/sysdeps/ia64/stackguard-macros.h
-@@ -2,3 +2,6 @@
- 
- #define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("adds %0 = -8, r13;; ld8 %0 = [%0]" : "=r" (x)); x; })
-+
-+#define POINTER_CHK_GUARD \
-+  ({ uintptr_t x; asm ("adds %0 = -16, r13;; ld8 %0 = [%0]" : "=r" (x)); x; })
-diff --git a/ports/sysdeps/tile/stackguard-macros.h b/ports/sysdeps/tile/stackguard-macros.h
-index 589ea2b..f2e041b 100644
---- a/ports/sysdeps/tile/stackguard-macros.h
-+++ b/ports/sysdeps/tile/stackguard-macros.h
-@@ -4,11 +4,17 @@
- # if __WORDSIZE == 64
- #  define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("addi %0, tp, -16; ld %0, %0" : "=r" (x)); x; })
-+#  define POINTER_CHK_GUARD \
-+  ({ uintptr_t x; asm ("addi %0, tp, -24; ld %0, %0" : "=r" (x)); x; })
- # else
- #  define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("addi %0, tp, -8; ld4s %0, %0" : "=r" (x)); x; })
-+#  define POINTER_CHK_GUARD \
-+  ({ uintptr_t x; asm ("addi %0, tp, -12; ld4s %0, %0" : "=r" (x)); x; })
- # endif
- #else
- # define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("addi %0, tp, -8; lw %0, %0" : "=r" (x)); x; })
-+# define POINTER_CHK_GUARD \
-+  ({ uintptr_t x; asm ("addi %0, tp, -12; lw %0, %0" : "=r" (x)); x; })
- #endif
-diff --git a/sysdeps/generic/stackguard-macros.h b/sysdeps/generic/stackguard-macros.h
-index ababf65..4fa3d96 100644
---- a/sysdeps/generic/stackguard-macros.h
-+++ b/sysdeps/generic/stackguard-macros.h
-@@ -2,3 +2,6 @@
- 
- extern uintptr_t __stack_chk_guard;
- #define STACK_CHK_GUARD __stack_chk_guard
-+
-+extern uintptr_t __pointer_chk_guard_local;
-+#define POINTER_CHK_GUARD __pointer_chk_guard_local
-diff --git a/sysdeps/i386/stackguard-macros.h b/sysdeps/i386/stackguard-macros.h
-index 8c31e19..0397629 100644
---- a/sysdeps/i386/stackguard-macros.h
-+++ b/sysdeps/i386/stackguard-macros.h
-@@ -2,3 +2,11 @@
- 
- #define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("movl %%gs:0x14, %0" : "=r" (x)); x; })
-+
-+#define POINTER_CHK_GUARD \
-+  ({							\
-+     uintptr_t x;					\
-+     asm ("movl %%gs:%c1, %0" : "=r" (x)		\
-+	  : "i" (offsetof (tcbhead_t, pointer_guard)));	\
-+     x;							\
-+   })
-diff --git a/sysdeps/powerpc/powerpc32/stackguard-macros.h b/sysdeps/powerpc/powerpc32/stackguard-macros.h
-index 839f6a4..b3d0af8 100644
---- a/sysdeps/powerpc/powerpc32/stackguard-macros.h
-+++ b/sysdeps/powerpc/powerpc32/stackguard-macros.h
-@@ -2,3 +2,13 @@
- 
- #define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("lwz %0,-28680(2)" : "=r" (x)); x; })
-+
-+#define POINTER_CHK_GUARD \
-+  ({												\
-+     uintptr_t x;										\
-+     asm ("lwz %0,%1(2)"									\
-+	  : "=r" (x)										\
-+	  : "i" (offsetof (tcbhead_t, pointer_guard) - TLS_TCB_OFFSET - sizeof (tcbhead_t))	\
-+         );											\
-+     x;												\
-+   })
-diff --git a/sysdeps/powerpc/powerpc64/stackguard-macros.h b/sysdeps/powerpc/powerpc64/stackguard-macros.h
-index 9da879c..4620f96 100644
---- a/sysdeps/powerpc/powerpc64/stackguard-macros.h
-+++ b/sysdeps/powerpc/powerpc64/stackguard-macros.h
-@@ -2,3 +2,13 @@
- 
- #define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("ld %0,-28688(13)" : "=r" (x)); x; })
-+
-+#define POINTER_CHK_GUARD \
-+  ({												\
-+     uintptr_t x;										\
-+     asm ("ld %0,%1(2)"										\
-+	  : "=r" (x)										\
-+	  : "i" (offsetof (tcbhead_t, pointer_guard) - TLS_TCB_OFFSET - sizeof (tcbhead_t))	\
-+         );											\
-+     x;												\
-+   })
-diff --git a/sysdeps/s390/s390-32/stackguard-macros.h b/sysdeps/s390/s390-32/stackguard-macros.h
-index b74c579..449e8d4 100644
---- a/sysdeps/s390/s390-32/stackguard-macros.h
-+++ b/sysdeps/s390/s390-32/stackguard-macros.h
-@@ -2,3 +2,14 @@
- 
- #define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("ear %0,%%a0; l %0,0x14(%0)" : "=a" (x)); x; })
-+
-+/* On s390/s390x there is no unique pointer guard, instead we use the
-+   same value as the stack guard.  */
-+#define POINTER_CHK_GUARD \
-+  ({							\
-+     uintptr_t x;					\
-+     asm ("ear %0,%%a0; l %0,%1(%0)"			\
-+	  : "=a" (x)					\
-+	  : "i" (offsetof (tcbhead_t, stack_guard)));	\
-+     x;							\
-+   })
-diff --git a/sysdeps/s390/s390-64/stackguard-macros.h b/sysdeps/s390/s390-64/stackguard-macros.h
-index 0cebb5f..c8270fb 100644
---- a/sysdeps/s390/s390-64/stackguard-macros.h
-+++ b/sysdeps/s390/s390-64/stackguard-macros.h
-@@ -2,3 +2,17 @@
- 
- #define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("ear %0,%%a0; sllg %0,%0,32; ear %0,%%a1; lg %0,0x28(%0)" : "=a" (x)); x; })
-+
-+/* On s390/s390x there is no unique pointer guard, instead we use the
-+   same value as the stack guard.  */
-+#define POINTER_CHK_GUARD \
-+  ({							\
-+     uintptr_t x;					\
-+     asm ("ear %0,%%a0;"				\
-+	  "sllg %0,%0,32;"				\
-+	  "ear %0,%%a1;"				\
-+	  "lg %0,%1(%0)"				\
-+	 : "=a" (x)					\
-+	 : "i" (offsetof (tcbhead_t, stack_guard)));	\
-+     x;							\
-+   })
-diff --git a/sysdeps/sparc/sparc32/stackguard-macros.h b/sysdeps/sparc/sparc32/stackguard-macros.h
-index c0b02b0..1eef0f1 100644
---- a/sysdeps/sparc/sparc32/stackguard-macros.h
-+++ b/sysdeps/sparc/sparc32/stackguard-macros.h
-@@ -2,3 +2,6 @@
- 
- #define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("ld [%%g7+0x14], %0" : "=r" (x)); x; })
-+
-+#define POINTER_CHK_GUARD \
-+  ({ uintptr_t x; asm ("ld [%%g7+0x18], %0" : "=r" (x)); x; })
-diff --git a/sysdeps/sparc/sparc64/stackguard-macros.h b/sysdeps/sparc/sparc64/stackguard-macros.h
-index 80f0635..cc0c12c 100644
---- a/sysdeps/sparc/sparc64/stackguard-macros.h
-+++ b/sysdeps/sparc/sparc64/stackguard-macros.h
-@@ -2,3 +2,6 @@
- 
- #define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("ldx [%%g7+0x28], %0" : "=r" (x)); x; })
-+
-+#define POINTER_CHK_GUARD \
-+  ({ uintptr_t x; asm ("ldx [%%g7+0x30], %0" : "=r" (x)); x; })
-diff --git a/sysdeps/x86_64/stackguard-macros.h b/sysdeps/x86_64/stackguard-macros.h
-index d7fedb3..1948800 100644
---- a/sysdeps/x86_64/stackguard-macros.h
-+++ b/sysdeps/x86_64/stackguard-macros.h
-@@ -4,3 +4,8 @@
-   ({ uintptr_t x;						\
-      asm ("mov %%fs:%c1, %0" : "=r" (x)				\
- 	  : "i" (offsetof (tcbhead_t, stack_guard))); x; })
-+
-+#define POINTER_CHK_GUARD \
-+  ({ uintptr_t x;						\
-+     asm ("mov %%fs:%c1, %0" : "=r" (x)				\
-+	  : "i" (offsetof (tcbhead_t, pointer_guard))); x; })
diff --git a/pkgs/development/libraries/glibc/2.19/glibc-rh739743.patch b/pkgs/development/libraries/glibc/2.19/glibc-rh739743.patch
deleted file mode 100644
index c390b772b16..00000000000
--- a/pkgs/development/libraries/glibc/2.19/glibc-rh739743.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-2009-04-26  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/posix/getaddrinfo.c (rfc3484_sort): don't assign native
-	result if the result has no associated interface.
-
----
- sysdeps/posix/getaddrinfo.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -1456,13 +1456,13 @@
- 
- 	      /* Fill in the results in all the records.  */
- 	      for (int i = 0; i < src->nresults; ++i)
--		if (src->results[i].index == a1_index)
-+		if (a1_index != -1 && src->results[i].index == a1_index)
- 		  {
- 		    assert (src->results[i].native == -1
- 			    || src->results[i].native == a1_native);
- 		    src->results[i].native = a1_native;
- 		  }
--		else if (src->results[i].index == a2_index)
-+		else if (a2_index != -1 && src->results[i].index == a2_index)
- 		  {
- 		    assert (src->results[i].native == -1
- 			    || src->results[i].native == a2_native);
-
-2009-03-15  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/posix/getaddrinfo.c (getaddrinfo): correctly detect 
-	interface for all 127.X.Y.Z addresses.
-
----
- sysdeps/posix/getaddrinfo.c |    9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -2265,7 +2265,14 @@
- 			  tmp.addr[0] = 0;
- 			  tmp.addr[1] = 0;
- 			  tmp.addr[2] = htonl (0xffff);
--			  tmp.addr[3] = sinp->sin_addr.s_addr;
-+			  /* Special case for lo interface, the source address
-+			     being possibly different than the interface 
-+			     address. */
-+			  if ((ntohl(sinp->sin_addr.s_addr) & 0xff000000)
-+			      == 0x7f000000)
-+			    tmp.addr[3] = htonl(0x7f000001);
-+			  else
-+			    tmp.addr[3] = sinp->sin_addr.s_addr;
- 			}
- 		      else
- 			{
diff --git a/pkgs/development/libraries/glibc/2.19/scanf.patch b/pkgs/development/libraries/glibc/2.19/scanf.patch
deleted file mode 100644
index 4eed86ca110..00000000000
--- a/pkgs/development/libraries/glibc/2.19/scanf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://sourceware.org/bugzilla/show_bug.cgi?id=15917
-
-commit a4966c6104918ac884ee1131a4ed23c5ad6b4c5a
-Author: Andreas Schwab <schwab@suse.de>
-Date:   Thu Oct 31 12:51:03 2013 +0100
-
-    Fix parsing of 0e+0 as float
-
-diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
-index 78dc2fc..e6fa8f3 100644
---- a/stdio-common/vfscanf.c
-+++ b/stdio-common/vfscanf.c
-@@ -1966,6 +1966,8 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
- 		  if (width > 0)
- 		    --width;
- 		}
-+	      else
-+		got_digit = 1;
- 	    }
- 
- 	  while (1)
diff --git a/pkgs/development/libraries/glibc/2.19/strstr-sse42-hack.patch b/pkgs/development/libraries/glibc/2.19/strstr-sse42-hack.patch
deleted file mode 100644
index cdf4c025316..00000000000
--- a/pkgs/development/libraries/glibc/2.19/strstr-sse42-hack.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.archlinux.org/task/36556
-diff --git a/sysdeps/x86_64/multiarch/strstr.c b/sysdeps/x86_64/multiarch/strstr.c
-index cd63b68..03d8b9a 100644
---- a/sysdeps/x86_64/multiarch/strstr.c
-+++ b/sysdeps/x86_64/multiarch/strstr.c
-@@ -86,7 +86,7 @@
- /* Simple replacement of movdqu to address 4KB boundary cross issue.
-    If EOS occurs within less than 16B before 4KB boundary, we don't
-    cross to next page.  */
--static __m128i
-+static inline __m128i
- __m128i_strloadu (const unsigned char * p, __m128i zero)
- {
-   if (__builtin_expect ((int) ((size_t) p & 0xfff) > 0xff0, 0))
-- 
GitLab


From daa2827b99248ba986443b0503000466e27d4b18 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 18:13:05 +0200
Subject: [PATCH 1248/3789] grsecurity: update patch

---
 pkgs/os-specific/linux/kernel/patches.nix | 8 ++++----
 pkgs/top-level/all-packages.nix           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 5ade01014f9..c36779c295f 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -89,11 +89,11 @@ rec {
       features.apparmor = true;
     };
 
-  grsecurity_3_0_3_13_2 =
-    { name = "grsecurity-3.0-3.13.2";
+  grsecurity_3_0_3_13_3 =
+    { name = "grsecurity-3.0-3.13.3";
       patch = fetchurl {
-        url = https://grsecurity.net/test/grsecurity-3.0-3.13.2-201402062224.patch;
-        sha256 = "0w42d76bv7yzpr23bicsadf64csbmq988kmpzxg4yv5qwzhhbyh7";
+        url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402132113.patch;
+        sha256 = "143givk7xk54c2f9q7h2v5gdc3sy1kcd8j83vn1jfcyipzqkdqnk";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90e59c96c29..7b4e092f992 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6680,7 +6680,7 @@ let
   })) (args: grsecurityOverrider args));
 
   linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_2 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_3 kernelPatches.grsec_path ];
     argsOverride = {
       modDirVersion = "${linux_3_13.modDirVersion}-grsec";
     };
-- 
GitLab


From 5cd0a886fe62ac63b35ad61b75d4b49a9799e441 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Fri, 14 Feb 2014 16:24:26 +0000
Subject: [PATCH 1249/3789] elasticsearch: Update to 1.0.0

close #1746
---
 pkgs/servers/search/elasticsearch/default.nix |  4 +-
 .../search/elasticsearch/es-home.patch        | 97 ++++++++-----------
 2 files changed, 40 insertions(+), 61 deletions(-)

diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix
index f99ecded098..165a01517b4 100644
--- a/pkgs/servers/search/elasticsearch/default.nix
+++ b/pkgs/servers/search/elasticsearch/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, makeWrapper, jre, utillinux }:
 stdenv.mkDerivation rec {
-  name = "elasticsearch-0.90.3";
+  name = "elasticsearch-1.0.0";
 
   src = fetchurl {
     url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz";
-    sha256 = "1l6rnp4yvlz4z6z4v3af08yd4sl91c4zz20a8yyif2p234lh3n2s";
+    sha256 = "06ym7hl47339a5dav2hawnxv820y0lbvh9xxd0lfp1f815vbql01";
   };
 
   patches = [ ./es-home.patch ];
diff --git a/pkgs/servers/search/elasticsearch/es-home.patch b/pkgs/servers/search/elasticsearch/es-home.patch
index d75a5a8c052..9b96149e5ad 100644
--- a/pkgs/servers/search/elasticsearch/es-home.patch
+++ b/pkgs/servers/search/elasticsearch/es-home.patch
@@ -1,59 +1,38 @@
-diff -rc elasticsearch-0.90.3/bin/elasticsearch elasticsearch-0.90.3-new/bin/elasticsearch
-*** elasticsearch-0.90.3/bin/elasticsearch	2013-08-06 15:19:22.000000000 +0200
---- elasticsearch-0.90.3-new/bin/elasticsearch	2013-08-27 16:42:00.935880011 +0200
-***************
-*** 62,68 ****
-  done
-  
-  # determine elasticsearch home
-! ES_HOME=`dirname "$SCRIPT"`/..
-  
-  # make ELASTICSEARCH_HOME absolute
-  ES_HOME=`cd "$ES_HOME"; pwd`
---- 62,71 ----
-  done
-  
-  # determine elasticsearch home
-! if [ -z "$ES_HOME" ]; then
-!     echo "You must set the ES_HOME var" >&2
-!     exit 1
-! fi
-  
-  # make ELASTICSEARCH_HOME absolute
-  ES_HOME=`cd "$ES_HOME"; pwd`
-diff -rc elasticsearch-0.90.3/bin/plugin elasticsearch-0.90.3-new/bin/plugin
-*** elasticsearch-0.90.3/bin/plugin	2013-08-06 15:19:22.000000000 +0200
---- elasticsearch-0.90.3-new/bin/plugin	2013-08-27 16:49:01.024160295 +0200
-***************
-*** 16,22 ****
-  done
-  
-  # determine elasticsearch home
-! ES_HOME=`dirname "$SCRIPT"`/..
-  
-  # make ELASTICSEARCH_HOME absolute
-  ES_HOME=`cd "$ES_HOME"; pwd`
---- 16,25 ----
-  done
-  
-  # determine elasticsearch home
-! if [ -z "$ES_HOME" ]; then
-!     echo "You must set the ES_HOME var" >&2
-!     exit 1
-! fi
-  
-  # make ELASTICSEARCH_HOME absolute
-  ES_HOME=`cd "$ES_HOME"; pwd`
-***************
-*** 46,50 ****
-    shift
-  done
-  
-! exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginManager $args
-  
---- 49,53 ----
-    shift
-  done
-  
-! exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args
-  
+diff --git a/bin/elasticsearch b/bin/elasticsearch
+index c7c9263..0fcecf6 100755
+--- a/bin/elasticsearch
++++ b/bin/elasticsearch
+@@ -76,7 +76,10 @@ while [ -h "$SCRIPT" ] ; do
+ done
+ 
+ # determine elasticsearch home
+-ES_HOME=`dirname "$SCRIPT"`/..
++if [ -z "$ES_HOME" ]; then
++    echo "You must set the ES_HOME var" >&2
++    exit 1
++fi
+ 
+ # make ELASTICSEARCH_HOME absolute
+ ES_HOME=`cd "$ES_HOME"; pwd`
+diff --git a/bin/plugin b/bin/plugin
+index a8c796a..daf7b99 100755
+--- a/bin/plugin
++++ b/bin/plugin
+@@ -16,7 +16,10 @@ while [ -h "$SCRIPT" ] ; do
+ done
+ 
+ # determine elasticsearch home
+-ES_HOME=`dirname "$SCRIPT"`/..
++if [ -z "$ES_HOME" ]; then
++    echo "You must set the ES_HOME var" >&2
++    exit 1
++fi
+ 
+ # make ELASTICSEARCH_HOME absolute
+ ES_HOME=`cd "$ES_HOME"; pwd`
+@@ -45,4 +48,4 @@ while [ $# -gt 0 ]; do
+   shift
+ done
+ 
+-exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginManager $args
++exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args
-- 
GitLab


From 47dccc85110f0a83d1b3ac0fe302eda78959a79b Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 20:07:53 +0200
Subject: [PATCH 1250/3789] oxygen_gtk: update from 1.4.1 to 1.4.3

---
 pkgs/misc/themes/gtk2/oxygen-gtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
index fb51985afd1..9bee6c81a8a 100644
--- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
+++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
@@ -2,12 +2,12 @@
   cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.1";
+  version = "1.4.3";
   name = "oxygen-gtk2-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2";
-    sha256 = "13vrdlzg8h5gxn04f488f65yfy9m0amqpqdbs9l304yxgm7mkawd";
+    sha256 = "1611zkblfy8ahadyz4a1hc0vjfwkh8mdbnwjqm02i30vnhv3iy1j";
   };
 
   buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf
-- 
GitLab


From 7cc98001dc997879eae554a1f3f3df5a89792cc6 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 20:09:56 +0200
Subject: [PATCH 1251/3789] perlPackages.Clone: update from 0.34 to 0.36

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1ff07770947..14f402f496a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1289,10 +1289,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Clone = buildPerlPackage {
-    name = "Clone-0.34";
+    name = "Clone-0.36";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GARU/Clone-0.34.tar.gz;
-      sha256 = "0qk32i2ncmn7wm2dbjpwhwa4js079bgfs4ayb90mnxjhwq5358ix";
+      url = mirror://cpan/authors/id/G/GA/GARU/Clone-0.36.tar.gz;
+      sha256 = "1i90l24l46dyadmdz82klyh3y1lhfn75wjjpfmgl1kbr4plgdph3";
     };
     meta = {
       description = "Recursively copy Perl datatypes";
-- 
GitLab


From 3d41e4ebdec3c25fa3b2c4aa16ad1893c1277df7 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 20:11:46 +0200
Subject: [PATCH 1252/3789] perlPackages.ConvertASN1: update from 0.22 to 0.26

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 14f402f496a..0d113277d2a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1430,10 +1430,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ConvertASN1 = buildPerlPackage rec {
-    name = "Convert-ASN1-0.22";
+    name = "Convert-ASN1-0.26";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.22.tar.gz";
-      sha256 = "1vpny8smwl23rai1kxngi5i31jhp6s6cdls19gjhcwsxf76daqxy";
+      url = "mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.26.tar.gz";
+      sha256 = "188wpjnp4j2m1l1zzw9ak9ymiba1g7hzysf8mc6bsdnhl0pvdf2x";
     };
   };
 
-- 
GitLab


From 4ac42fcb767923b6561db5c74f5da778b1da706f Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 20:15:15 +0200
Subject: [PATCH 1253/3789] perlPackages.DateTime: update from 1.04 to 1.07

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0d113277d2a..8e051e93b2f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1936,10 +1936,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DateTime = buildPerlModule {
-    name = "DateTime-1.04";
+    name = "DateTime-1.07";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.04.tar.gz;
-      sha256 = "1krnrp8hv0m4v1lxrvwgc3vvcycld21ygvjy5p7vaf5h1jpjzrwz";
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.07.tar.gz;
+      sha256 = "1cm4zsgzz4phigak0nb48l661vkqhz93kfbb9jd83d1hq74myq31";
     };
     buildInputs = [ TestFatal ];
     propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ];
-- 
GitLab


From 26dd63e54fb27b34972deca6dcc995d94d3306de Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 20:16:07 +0200
Subject: [PATCH 1254/3789] perlPackages.DevelFindPerl: update from 0.006 to
 0.012

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8e051e93b2f..8bae4cdffa4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2369,10 +2369,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DevelFindPerl = buildPerlPackage {
-    name = "Devel-FindPerl-0.006";
+    name = "Devel-FindPerl-0.012";
     src = fetchurl {
-      url = mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.006.tar.gz;
-      sha256 = "60d5a0fd6880e5cfda381159acd3dbbc21c1121dc44c94ecd323ad5a148e03ff";
+      url = mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.012.tar.gz;
+      sha256 = "075p340m4pi761sjc3l0ymfsdwy4rrq48sqj38cyy80vg9scljh2";
     };
     buildInputs = [ CaptureTiny ];
     propagatedBuildInputs = [ ExtUtilsConfig ];
-- 
GitLab


From a0bbe58a194934f4f503f3215a5a40e6b112c79e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Feb 2014 19:17:23 +0100
Subject: [PATCH 1255/3789] coreutils: Disable parallel building

---
 pkgs/tools/misc/coreutils/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index e5f9eb1be2c..b0dbb049cbf 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -58,7 +58,9 @@ let
     # and {Open,Free}BSD.
     doCheck = stdenv ? glibc;
 
-    enableParallelBuilding = true;
+    # Saw random failures like ‘help2man: can't get '--help' info from
+    # man/sha512sum.td/sha512sum’.
+    enableParallelBuilding = false;
 
     NIX_LDFLAGS = optionalString selinuxSupport "-lsepol";
 
-- 
GitLab


From 24375083e04b41455e514d7ecde9cbceb5f44bbb Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 20:18:34 +0200
Subject: [PATCH 1256/3789] perlPackages.TestFailWarnings: update from 0.005 to
 0.008

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8bae4cdffa4..ec7dc66d522 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8079,10 +8079,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestFailWarnings = buildPerlPackage {
-    name = "Test-FailWarnings-0.005";
+    name = "Test-FailWarnings-0.008";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.005.tar.gz;
-      sha256 = "014f909e6c171f77b811139c49c1dca9d0f1e2d1c41b5dca332b6b55b3eb0b4e";
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.008.tar.gz;
+      sha256 = "0vx9chcp5x8m0chq574p9fnfckh5gl94j7904rh9v17n568fyd6s";
     };
     buildInputs = [ CaptureTiny ];
     meta = {
-- 
GitLab


From e63abf17f42a3a6fac31f3a75d41198d5025d076 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 20:20:16 +0200
Subject: [PATCH 1257/3789] perlPackages.TextTabularDisplay: update from 1.22
 to 1.35

---
 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 ec7dc66d522..1faede4b800 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8768,10 +8768,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextTabularDisplay = buildPerlPackage rec {
-    name = "Text-TabularDisplay-1.22";
+    name = "Text-TabularDisplay-1.35";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DA/DARREN/${name}.tar.gz";
-      sha256 = "05r3jvdf8av16hgy0i3wnc581ski08q1bnllq5cq1fnc7h2nm1c7";
+      sha256 = "0sbyfdiln6q2g66mv64alayfcqnqg17kihdzgpslxdsn14vpvjq5";
     };
     propagatedBuildInputs = [TextAligner];
   };
-- 
GitLab


From ac92b3aebdb4ea058ad8d7a9364bdb5a5d47482f Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 20:21:17 +0200
Subject: [PATCH 1258/3789] perlPackages.UNIVERSALrequire: update from 0.11 to
 0.16

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1faede4b800..8411e32bfbf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9020,10 +9020,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   UNIVERSALrequire = buildPerlPackage {
-    name = "UNIVERSAL-require-0.11";
+    name = "UNIVERSAL-require-0.16";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MS/MSCHWERN/UNIVERSAL-require-0.11.tar.gz;
-      sha256 = "1rh7i3gva4m96m31g6yfhlqcabszhghbb3k3qwxbgx3mkf5s6x6i";
+      url = mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.16.tar.gz;
+      sha256 = "0fbx3f39lvck3n4ksqwji5m1hfdagx25jk5kg2h0gkb01jwz3za2";
     };
   };
 
-- 
GitLab


From 4d7f525aec26340498c790df7cbb0b9c76411d46 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 20:22:33 +0200
Subject: [PATCH 1259/3789] perlPackages.XMLLibXSLT: update from 1.70 to 1.87

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8411e32bfbf..d0d5f42d704 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9266,10 +9266,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   XMLLibXSLT = buildPerlPackage rec {
-    name = "XML-LibXSLT-1.70";
+    name = "XML-LibXSLT-1.87";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/XML/${name}.tar.gz";
-      sha256 = "0x8lqlxr6xhgwwa6zj4shrwrqlgbgs0piripc1fsnw4z1yl2gf9p";
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "18kxa51a0prr8dx0w7q7wa8gdgalswzqa24sjkxmgs0f9yhcixz1";
     };
     buildInputs = [ pkgs.zlib pkgs.libxml2 pkgs.libxslt ];
     propagatedBuildInputs = [ XMLLibXML ];
-- 
GitLab


From 1193d8c34d659c1839e8d9750d0fe619f246c95b Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 20:23:34 +0200
Subject: [PATCH 1260/3789] perlPackages.YAML: update from 0.84 to 0.90

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d0d5f42d704..c1b772401dc 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9372,10 +9372,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   YAML = buildPerlPackage {
-    name = "YAML-0.84";
+    name = "YAML-0.90";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MS/MSTROUT/YAML-0.84.tar.gz;
-      sha256 = "03349n2z32gwjqiq7l3g57avvphl2rw3lmwc8i5cl9hmfw51yd8a";
+      url = mirror://cpan/authors/id/I/IN/INGY/YAML-0.90.tar.gz;
+      sha256 = "0kfsmhv1lmqw2g1038azpxkfb91valwkh4i4gfjvqrj2wsr2hzhq";
     };
     meta = {
       homepage = https://github.com/ingydotnet/yaml-pm/tree;
-- 
GitLab


From 3777998a3135f545623ba0fe712a011892f0456b Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 20:24:47 +0200
Subject: [PATCH 1261/3789] perlPackages.YAMLLibYAML: update from 0.38 to 0.41

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c1b772401dc..6de2d1dd4f3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9406,10 +9406,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   YAMLLibYAML = buildPerlPackage rec {
-    name = "YAML-LibYAML-0.38";
+    name = "YAML-LibYAML-0.41";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/YAML/${name}.tar.gz";
-      sha256 = "eb98f304d14f6557b07adfa24da16e00cfa54a9d9484b6e898e35f919c5eb7ba";
+      url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
+      sha256 = "1kj506lpg3fhqq0726p6y2h7pk24l6xihfyhqqsf8gd6lckl8rcs";
     };
   };
 
-- 
GitLab


From f1ebc4a0193b01cab01975a8660318cce0aeeb82 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 20:27:41 +0200
Subject: [PATCH 1262/3789] youtubeDL: update from 2014.02.10 to 2014.02.13

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index a8863da4038..c1b3cd57530 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.02.10";
+  version = "2014.02.13";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0grxdbvzjnxd26c80rr22mjp89y4i6bghmqyp5bpzd53sgkpl0zs";
+    sha256 = "0l88n1qrhjj2dvxlpd4hpqrdpxihqv3y9mrf1jgra3jyvb9pbnxq";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From 97be6e295cd35f1ad1fd6517484d8ac543ad0af9 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 21:16:22 +0200
Subject: [PATCH 1263/3789] wineUnstable: update from 1.7.11 to 1.7.12

---
 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 a0f03fa7b99..b6eb1038f93 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.11";
+    version = "1.7.12";
     name = "wine-${version}";
 
     src = fetchurl {
       url = "mirror://sourceforge/wine/${name}.tar.bz2";
-      sha256 = "14sg0kqwawqb5sx4q2kshpb4igjbbr61c7diid15vi4nxmqjfzf0";
+      sha256 = "14mkh32lxjmbacz1f5pl5kr31n5dx0rfdqw5v88brhmsz1xzzk9d";
     };
 
     gecko = fetchurl {
-- 
GitLab


From 8ba1fdef002e5540429cf6e7366065813a74bf29 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Feb 2014 20:29:19 +0100
Subject: [PATCH 1264/3789] debian: Update to 7.4

---
 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 625f93c874f..0521b12fd59 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1505,22 +1505,22 @@ rec {
     debian70x86_64 = debian7x86_64;
 
     debian7i386 = {
-      name = "debian-7.3-wheezy-i386";
-      fullName = "Debian 7.3 Wheezy (i386)";
+      name = "debian-7.4-wheezy-i386";
+      fullName = "Debian 7.4 Wheezy (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2;
-        sha256 = "037637520ce371a50beb5446fd27a731f30b51bc362c2f4a5dcfce9c7e30ffb6";
+        sha256 = "9f19822c82e25cd149f82b0d16fdbc00d1080db7f34e41de456498dc7c54f2b4";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian7x86_64 = {
-      name = "debian-7.3-wheezy-amd64";
-      fullName = "Debian 7.3 Wheezy (amd64)";
+      name = "debian-7.4-wheezy-amd64";
+      fullName = "Debian 7.4 Wheezy (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2;
-        sha256 = "c2ed55a2a263d482826c934b97ad910984fa5695ab1c480841741b828d0590a5";
+        sha256 = "160ee0917693bc2e8f69b233c220857f35a70d906540d99d2779def576daf5f7";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
-- 
GitLab


From 882721b6d0f349f2915ab3c08501992b963d6d4d Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 14 Feb 2014 21:47:57 +0200
Subject: [PATCH 1265/3789] librecad: update from 1.0.2 to 1.0.4

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

diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index 59bd4888e4a..b225519f486 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, qt4, muparser, which}:
 
 stdenv.mkDerivation {
-  name = "librecad-1.0.2";
+  name = "librecad-1.0.4";
 
   src = fetchurl {
-    url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.2;
-    name = "librecad-1.0.2.tar.gz";
-    sha256 = "13ee7e401e4f5fbc68c2e017b7189bec788038f4f6e77f559861ceb8cfb1907d";
+    url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.4;
+    name = "librecad-1.0.4.tar.gz";
+    sha256 = "00nzbijw7pn1zkj4256da501xcm6rkcvycpa79y6dr2p6c43yc6m";
   };
 
   patchPhase = ''
-- 
GitLab


From 25a719033621124578c29f9acc4bc0ad32593c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Fri, 14 Feb 2014 23:37:08 +0100
Subject: [PATCH 1266/3789] Chromedriver: fix download URL, update from 2.0 to
 2.9, add a required lib

---
 .../tools/selenium/chromedriver/default.nix            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index bccaa70ead7..bbe21378248 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, cairo, fontconfig, freetype, gdk_pixbuf, glib
 , glibc, gtk, libX11, makeWrapper, nspr, nss, pango, unzip, gconf
-, libXrender, libXext
+, libXi, libXrender, libXext
 }:
 
 # note: there is a i686 version available as well
 assert stdenv.system == "x86_64-linux";
 
 stdenv.mkDerivation rec {
-  name = "chromedriver_linux64_2.0";
+  name = "chromedriver_linux64";
 
   src = fetchurl {
-    url = "http://chromedriver.googlecode.com/files/${name}.zip";
-    sha256 = "165dq5550fs6262qa2jnjvm9smwjvws2zkkz7z5v4ibfg2j3409m";
+    url = "http://chromedriver.storage.googleapis.com/2.9/${name}.zip";
+    sha256 = "1m5xl5pz445igvhj31hby97xbizlw05b8fc6w53zq7faw7mzm665";
   };
 
   buildInputs = [ unzip makeWrapper ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     mv chromedriver $out/bin
     patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
     wrapProgram "$out/bin/chromedriver" \
-      --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:\$LD_LIBRARY_PATH"
+      --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH"
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From abd80598024eadc6761d4fe5b67bfac8a66bf0fa Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Wed, 29 Jan 2014 23:42:11 +0100
Subject: [PATCH 1267/3789] cmake: Update to latest upstream (2.8.12.2).

---
 .../development/tools/build-managers/cmake/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index c71592c8ec8..9ce69374cd8 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -7,7 +7,7 @@ with stdenv.lib;
 let
   os = stdenv.lib.optionalString;
   majorVersion = "2.8";
-  minorVersion = "11.2";
+  minorVersion = "12.2";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -18,19 +18,15 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "0qh5dhd7ff08n2h569j7g9m92gb3bz14wvhwjhwl7lgx794cnamk";
+    sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc";
   };
 
   enableParallelBuilding = true;
 
   patches =
-    # See https://github.com/NixOS/nixpkgs/issues/762
-    # and http://public.kitware.com/Bug/view.php?id=13887
-    # Remove this patch when a CMake release contains the corresponding fix
-    [ ./762-13887.patch ]
     # 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;
 
   buildInputs = [ curl expat zlib bzip2 libarchive ]
     ++ optional useNcurses ncurses
-- 
GitLab


From ae4e0ce73a565bf91c1e40f0febe2b2c296ed081 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Wed, 29 Jan 2014 23:43:41 +0100
Subject: [PATCH 1268/3789] libmpdclient: Update to latest upstream (2.9).

---
 pkgs/servers/mpd/clientlib.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index 612ec0456f2..cd65234855f 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -5,15 +5,15 @@ stdenv.mkDerivation rec {
   name = "libmpdclient-${version}";
 
   src = fetchurl {
-    url = "http://www.musicpd.org/download/libmpdclient/2/${name}.tar.bz2";
-    sha256 = "1qwjkb56rsbk0hwhg7fl15d6sf580a19gh778zcdg374j4yym3hh";
+    url = "http://www.musicpd.org/download/libmpdclient/2/${name}.tar.xz";
+    sha256 = "1jlrfqxqq3gscwrppr2h0xqxd5abl1ypwpwpwnpxs6p9c2jppjbw";
   };
 
   buildInputs = [ doxygen ];
 
   passthru = {
     majorVersion = "2";
-    minorVersion = "8";
+    minorVersion = "9";
   };
 
   meta = {
-- 
GitLab


From a03a0337e9d9ec5f554f75769054c71c1fcf82d2 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Wed, 12 Feb 2014 22:09:39 +0100
Subject: [PATCH 1269/3789] telepathy-qt: Fix build (broken by cmake 2.8.12 and
 farstream 0.2).

---
 .../libraries/telepathy/qt/cmake-2.8.12.diff  | 25 +++++++++++++++++
 .../libraries/telepathy/qt/default.nix        |  1 +
 .../libraries/telepathy/qt/farstream-0.2.diff | 28 +++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff
 create mode 100644 pkgs/development/libraries/telepathy/qt/farstream-0.2.diff

diff --git a/pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff b/pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff
new file mode 100644
index 00000000000..f6e57c626c3
--- /dev/null
+++ b/pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff
@@ -0,0 +1,25 @@
+diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake
+index c2eac76..b3131f0 100644
+--- a/cmake/modules/FindQt.cmake
++++ b/cmake/modules/FindQt.cmake
+@@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS)
+ 
+ MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
+   IF(QT_VERSION_MAJOR MATCHES 4)
+-    QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
++    IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++      QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
++    ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++      QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
++    ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+   ELSE(QT_VERSION_MAJOR MATCHES 4)
+     IF(QT_VERSION_MAJOR MATCHES 5)
+-      QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
++      IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++        QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
++      ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++        QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
++      ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+     ENDIF(QT_VERSION_MAJOR MATCHES 5)
+   ENDIF(QT_VERSION_MAJOR MATCHES 4)
+ ENDMACRO(QT_CREATE_MOC_COMMAND)
diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index b535961357b..f2e0d194562 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig python libxslt ];
   propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
+  patches = [ ./cmake-2.8.12.diff ./farstream-0.2.diff ];
   preBuild = ''
     NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
   '';
diff --git a/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff b/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff
new file mode 100644
index 00000000000..86d392fe1ac
--- /dev/null
+++ b/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff
@@ -0,0 +1,28 @@
+diff -urB telepathy-qt/cmake/modules/FindFarstream.cmake new/cmake/modules/FindFarstream.cmake
+--- telepathy-qt/cmake/modules/FindFarstream.cmake      2012-04-25 22:14:22.275967164 +0200
++++ new/cmake/modules/FindFarstream.cmake       2012-10-07 12:19:46.543103512 +0200
+@@ -23,9 +23,9 @@
+     # in the find_path() and find_library() calls
+     find_package(PkgConfig)
+     if (FARSTREAM_MIN_VERSION)
+-        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1>=${FARSTREAM_MIN_VERSION})
++        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2>=${FARSTREAM_MIN_VERSION})
+     else (FARSTREAM_MIN_VERSION)
+-        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1)
++        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2)
+     endif (FARSTREAM_MIN_VERSION)
+     set(FARSTREAM_DEFINITIONS ${PC_FARSTREAM_CFLAGS_OTHER})
+ endif (NOT WIN32)
+@@ -34,10 +34,10 @@
+    PATHS
+    ${PC_FARSTREAM_INCLUDEDIR}
+    ${PC_FARSTREAM_INCLUDE_DIRS}
+-   PATH_SUFFIXES farstream-0.1
++   PATH_SUFFIXES farstream-0.2
+    )
+ 
+-find_library(FARSTREAM_LIBRARIES NAMES farstream-0.1
++find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2
+    PATHS
+    ${PC_FARSTREAM_LIBDIR}
+    ${PC_FARSTREAM_LIBRARY_DIRS}
-- 
GitLab


From d2758ce017c569d0146a5aa5e1ebf4dacb5292ee Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sat, 15 Feb 2014 10:23:56 +0100
Subject: [PATCH 1270/3789] freecad: Fix build with current cmake.

---
 pkgs/applications/graphics/freecad/cmake.patch | 12 ++++++++++++
 pkgs/applications/graphics/freecad/default.nix |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/graphics/freecad/cmake.patch

diff --git a/pkgs/applications/graphics/freecad/cmake.patch b/pkgs/applications/graphics/freecad/cmake.patch
new file mode 100644
index 00000000000..e54e16da977
--- /dev/null
+++ b/pkgs/applications/graphics/freecad/cmake.patch
@@ -0,0 +1,12 @@
+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 @@
+         foreach(it ${moc_files})
+             get_filename_component(it ${it} ABSOLUTE)
+             QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile)
+-            QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}")
++            QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "")
+             set(${outfiles} ${${outfiles}} ${outfile})
+             add_file_dependencies(${it} ${outfile})
+         endforeach(it)
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index 37265c954e8..770a7ee8212 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1
   '';
 
-  patches = [ ./pythonpath.patch ];
+  patches = [ ./pythonpath.patch ./cmake.patch ];
 
   meta = {
     homepage = http://free-cad.sourceforge.net/;
-- 
GitLab


From 38c59c97b332b5c52f0b1cd656dcb15d5c474f97 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sat, 15 Feb 2014 10:24:22 +0100
Subject: [PATCH 1271/3789] kadu: Fix build with current cmake.

---
 .../networking/instant-messengers/kadu/cmake.patch  | 13 +++++++++++++
 .../networking/instant-messengers/kadu/default.nix  |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/kadu/cmake.patch

diff --git a/pkgs/applications/networking/instant-messengers/kadu/cmake.patch b/pkgs/applications/networking/instant-messengers/kadu/cmake.patch
new file mode 100644
index 00000000000..bb2d2d39d25
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/kadu/cmake.patch
@@ -0,0 +1,13 @@
+diff -ru kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt
+--- kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt	2012-08-30 16:13:17.000000000 +0200
++++ kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt	2014-02-15 10:20:33.368716013 +0100
+@@ -26,7 +26,7 @@
+ 					get_filename_component (_basename ${_current_MOC} NAME_WE)
+ 					set (_header ${_abs_FILE})
+ 					set (_moc ${_abs_PATH}/${_current_MOC})
+-					QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "")
++					QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "")
+ 					MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc})
+ 				endforeach (_current_MOC_INC)
+ 			endif (_match)
+Only in kadu-0.12.2/plugins/jabber_protocol/3rdparty: CMakeLists.txt~
diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix
index 03cbb1ce073..4e176ec56dc 100644
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation {
     sed -i -e '/mpd_mediaplayer/d' \
            -e '/encryption_ng/d'   \
            -e '/encryption_ng_simlite/d' Plugins.cmake
+    patch -p1 < ${./cmake.patch}
   '';
 
   NIX_LDFLAGS="-lX11";
-- 
GitLab


From 68b3fd33a78ce51268f0eec31386a056d760ffc1 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Sat, 15 Feb 2014 08:03:20 +0800
Subject: [PATCH 1272/3789] git: Update to 1.9.0

---
 .../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 d9d09def5ca..0e067a64928 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.8.5.4";
+  version = "1.9.0";
 
   svn = subversionClient.override { perlBindings = true; };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "062z4j4hfhfdlvkxs2mzarsyvbqvfy4kv8j5h4c75ymb5yp8iklk";
+    sha256 = "10lq71vrg1zbqm923wb0p36ily6y5x057f2bryk4wqkdqgyrfc6y";
   };
 
   patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
-- 
GitLab


From 99f5d2edb423194540a2bf83365e7b78b1ffccc9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jan 2014 03:25:49 -0600
Subject: [PATCH 1273/3789] db: Reorganize Berkeley Database Packaging

Currently, the berkeley databases resuses a lot of the same code for the
expressions of each version. This consolidates all of the build routines
similar to that of the linux kernel.

This patch also adds version 6 of BDB.
---
 .../libraries/{db4 => db}/cygwin-4.4.patch    |  0
 .../libraries/{db4 => db}/cygwin-4.5.patch    |  0
 pkgs/development/libraries/db/db-4.4.nix      |  7 ++++
 pkgs/development/libraries/db/db-4.5.nix      |  7 ++++
 pkgs/development/libraries/db/db-4.7.nix      |  6 +++
 pkgs/development/libraries/db/db-4.8.nix      |  6 +++
 pkgs/development/libraries/db/db-5.3.nix      | 36 +++-------------
 pkgs/development/libraries/db/db-6.0.nix      |  7 ++++
 pkgs/development/libraries/db/generic.nix     | 41 +++++++++++++++++++
 .../{db4 => db}/register-race-fix.patch       |  0
 pkgs/development/libraries/db4/builder.sh     | 12 ------
 pkgs/development/libraries/db4/db4-4.4.nix    | 22 ----------
 pkgs/development/libraries/db4/db4-4.5.nix    | 19 ---------
 pkgs/development/libraries/db4/db4-4.7.nix    | 18 --------
 pkgs/development/libraries/db4/db4-4.8.nix    | 18 --------
 pkgs/top-level/all-packages.nix               | 19 ++++-----
 16 files changed, 88 insertions(+), 130 deletions(-)
 rename pkgs/development/libraries/{db4 => db}/cygwin-4.4.patch (100%)
 rename pkgs/development/libraries/{db4 => db}/cygwin-4.5.patch (100%)
 create mode 100644 pkgs/development/libraries/db/db-4.4.nix
 create mode 100644 pkgs/development/libraries/db/db-4.5.nix
 create mode 100644 pkgs/development/libraries/db/db-4.7.nix
 create mode 100644 pkgs/development/libraries/db/db-4.8.nix
 create mode 100644 pkgs/development/libraries/db/db-6.0.nix
 create mode 100644 pkgs/development/libraries/db/generic.nix
 rename pkgs/development/libraries/{db4 => db}/register-race-fix.patch (100%)
 delete mode 100644 pkgs/development/libraries/db4/builder.sh
 delete mode 100644 pkgs/development/libraries/db4/db4-4.4.nix
 delete mode 100644 pkgs/development/libraries/db4/db4-4.5.nix
 delete mode 100644 pkgs/development/libraries/db4/db4-4.7.nix
 delete mode 100644 pkgs/development/libraries/db4/db4-4.8.nix

diff --git a/pkgs/development/libraries/db4/cygwin-4.4.patch b/pkgs/development/libraries/db/cygwin-4.4.patch
similarity index 100%
rename from pkgs/development/libraries/db4/cygwin-4.4.patch
rename to pkgs/development/libraries/db/cygwin-4.4.patch
diff --git a/pkgs/development/libraries/db4/cygwin-4.5.patch b/pkgs/development/libraries/db/cygwin-4.5.patch
similarity index 100%
rename from pkgs/development/libraries/db4/cygwin-4.5.patch
rename to pkgs/development/libraries/db/cygwin-4.5.patch
diff --git a/pkgs/development/libraries/db/db-4.4.nix b/pkgs/development/libraries/db/db-4.4.nix
new file mode 100644
index 00000000000..4a182353f25
--- /dev/null
+++ b/pkgs/development/libraries/db/db-4.4.nix
@@ -0,0 +1,7 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.4.20";
+  extraPatches = [ ./cygwin-4.4.patch ];
+  sha256 = "0y9vsq8dkarx1mhhip1vaciz6imbbyv37c1dm8b20l7p064bg2i9";
+})
diff --git a/pkgs/development/libraries/db/db-4.5.nix b/pkgs/development/libraries/db/db-4.5.nix
new file mode 100644
index 00000000000..6a0a921d8de
--- /dev/null
+++ b/pkgs/development/libraries/db/db-4.5.nix
@@ -0,0 +1,7 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.5.20";
+  extraPatches = [ ./cygwin-4.5.patch ./register-race-fix.patch ];
+  sha256 = "0bd81k0qv5i8w5gbddrvld45xi9k1gvmcrfm0393v0lrm37dab7m";
+})
diff --git a/pkgs/development/libraries/db/db-4.7.nix b/pkgs/development/libraries/db/db-4.7.nix
new file mode 100644
index 00000000000..62ccfd7d3a5
--- /dev/null
+++ b/pkgs/development/libraries/db/db-4.7.nix
@@ -0,0 +1,6 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.7.25";
+  sha256 = "0gi667v9cw22c03hddd6xd6374l0pczsd56b7pba25c9sdnxjkzi";
+})
diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix
new file mode 100644
index 00000000000..e77307d6fa5
--- /dev/null
+++ b/pkgs/development/libraries/db/db-4.8.nix
@@ -0,0 +1,6 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.8.30";
+  sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0";
+})
diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix
index a59d28ba963..af16f1ddf54 100644
--- a/pkgs/development/libraries/db/db-5.3.nix
+++ b/pkgs/development/libraries/db/db-5.3.nix
@@ -1,32 +1,6 @@
-{ stdenv, fetchurl
-, cxxSupport ? true
-}:
+{ stdenv, fetchurl, ... } @ args:
 
-stdenv.mkDerivation rec {
-  name = "db-5.3.28";
-
-  src = fetchurl {
-    url = "http://download.oracle.com/berkeley-db/${name}.tar.gz";
-    sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
-  };
-
-  configureFlags = [
-    (if cxxSupport then "--enable-cxx" else "--disable-cxx")
-  ];
-
-  preConfigure = ''
-    cd build_unix
-    configureScript=../dist/configure
-  '';
-
-  postInstall = ''
-    rm -rf $out/docs
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html";
-    description = "Berkeley DB";
-    license = "Berkeley Database License";
-    platforms = platforms.unix;
-  };
-}
+import ./generic.nix (args // rec {
+  version = "5.3.28";
+  sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
+})
diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix
new file mode 100644
index 00000000000..22e858a9d18
--- /dev/null
+++ b/pkgs/development/libraries/db/db-6.0.nix
@@ -0,0 +1,7 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "6.0.20";
+  sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0";
+  license = stdenv.lib.licenses.agpl3;
+})
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
new file mode 100644
index 00000000000..de9fb27b4ec
--- /dev/null
+++ b/pkgs/development/libraries/db/generic.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl
+, cxxSupport ? true
+, compat185 ? true
+
+# Options from inherited versions
+, version, sha256
+, extraPatches ? [ ]
+, license ? "Berkeley Database License"
+}:
+
+stdenv.mkDerivation rec {
+  name = "db-${version}";
+
+  src = fetchurl {
+    url = "http://download.oracle.com/berkeley-db/${name}.tar.gz";
+    sha256 = sha256;
+  };
+  
+  patches = extraPatches;
+
+  configureFlags = [
+    (if cxxSupport then "--enable-cxx" else "--disable-cxx")
+    (if compat185 then "--enable-compat185" else "--disable-compat185")
+  ];
+
+  preConfigure = ''
+    cd build_unix
+    configureScript=../dist/configure
+  '';
+
+  postInstall = ''
+    rm -rf $out/docs
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html";
+    description = "Berkeley DB";
+    license = license;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/db4/register-race-fix.patch b/pkgs/development/libraries/db/register-race-fix.patch
similarity index 100%
rename from pkgs/development/libraries/db4/register-race-fix.patch
rename to pkgs/development/libraries/db/register-race-fix.patch
diff --git a/pkgs/development/libraries/db4/builder.sh b/pkgs/development/libraries/db4/builder.sh
deleted file mode 100644
index b9d48b60803..00000000000
--- a/pkgs/development/libraries/db4/builder.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-source $stdenv/setup
-
-preConfigure() {
-    cd build_unix
-    configureScript=../dist/configure
-}
-
-postInstall() {
-    rm -rf $out/docs
-}
-
-genericBuild
diff --git a/pkgs/development/libraries/db4/db4-4.4.nix b/pkgs/development/libraries/db4/db4-4.4.nix
deleted file mode 100644
index ab3ffa85cf2..00000000000
--- a/pkgs/development/libraries/db4/db4-4.4.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
-
-stdenv.mkDerivation {
-  name = "db4-4.4.20";
-  
-  builder = ./builder.sh;
-  
-  src = fetchurl {
-    urls = [
-      http://download.oracle.com/berkeley-db/db-4.4.20.NC.tar.gz
-      http://tarballs.nixos.org/db-4.4.20.NC.tar.gz
-    ];
-    md5 = "afd9243ea353bbaa04421488d3b37900";
-  };
-  
-  configureFlags = [
-    (if cxxSupport then "--enable-cxx" else "--disable-cxx")
-    (if compat185 then "--enable-compat185" else "--disable-compat185")
-  ];
-
-  patches = [ ./cygwin-4.4.patch ];
-}
diff --git a/pkgs/development/libraries/db4/db4-4.5.nix b/pkgs/development/libraries/db4/db4-4.5.nix
deleted file mode 100644
index e5cf6f35a01..00000000000
--- a/pkgs/development/libraries/db4/db4-4.5.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
-
-stdenv.mkDerivation {
-  name = "db4-4.5.20";
-  
-  builder = ./builder.sh;
-  
-  src = fetchurl {
-    url = http://download-east.oracle.com/berkeley-db/db-4.5.20.tar.gz;
-    md5 = "b0f1c777708cb8e9d37fb47e7ed3312d";
-  };
-  
-  configureFlags = [
-    (if cxxSupport then "--enable-cxx" else "--disable-cxx")
-    (if compat185 then "--enable-compat185" else "--disable-compat185")
-  ];
-  
-  patches = [./cygwin-4.5.patch ./register-race-fix.patch];
-}
diff --git a/pkgs/development/libraries/db4/db4-4.7.nix b/pkgs/development/libraries/db4/db4-4.7.nix
deleted file mode 100644
index 9fb0d6587c0..00000000000
--- a/pkgs/development/libraries/db4/db4-4.7.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
-
-stdenv.mkDerivation {
-  name = "db4-4.7.25";
-  
-  builder = ./builder.sh;
-  
-  src = fetchurl {
-    url = http://download-east.oracle.com/berkeley-db/db-4.7.25.tar.gz;
-    sha256 = "0gi667v9cw22c03hddd6xd6374l0pczsd56b7pba25c9sdnxjkzi";
-  };
-  
-  configureFlags = [
-    (if cxxSupport then "--enable-cxx" else "--disable-cxx")
-    (if compat185 then "--enable-compat185" else "--disable-compat185")
-  ];
-  
-}
diff --git a/pkgs/development/libraries/db4/db4-4.8.nix b/pkgs/development/libraries/db4/db4-4.8.nix
deleted file mode 100644
index a56a42f22ae..00000000000
--- a/pkgs/development/libraries/db4/db4-4.8.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
-
-stdenv.mkDerivation {
-  name = "db4-4.8.30";
-  
-  builder = ./builder.sh;
-  
-  src = fetchurl {
-    url = http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz;
-    sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0";
-  };
-  
-  configureFlags = [
-    (if cxxSupport then "--enable-cxx" else "--disable-cxx")
-    (if compat185 then "--enable-compat185" else "--disable-compat185")
-  ];
-  
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b4e092f992..b38f408d967 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3997,19 +3997,18 @@ let
 
   cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { };
 
+  # Make bdb5 the default as it is the last release under the custom
+  # bsd-like license
+  db = db5;
   db4 = db48;
-
-  db44 = callPackage ../development/libraries/db4/db4-4.4.nix { };
-
-  db45 = callPackage ../development/libraries/db4/db4-4.5.nix { };
-
-  db47 = callPackage ../development/libraries/db4/db4-4.7.nix { };
-
-  db48 = callPackage ../development/libraries/db4/db4-4.8.nix { };
-
+  db44 = callPackage ../development/libraries/db/db-4.4.nix { };
+  db45 = callPackage ../development/libraries/db/db-4.5.nix { };
+  db47 = callPackage ../development/libraries/db/db-4.7.nix { };
+  db48 = callPackage ../development/libraries/db/db-4.8.nix { };
   db5 = db53;
-
   db53 = callPackage ../development/libraries/db/db-5.3.nix { };
+  db6 = db60;
+  db60 = callPackage ../development/libraries/db/db-6.0.nix { };
 
   dbus = callPackage ../development/libraries/dbus { };
   dbus_cplusplus  = callPackage ../development/libraries/dbus-cplusplus { };
-- 
GitLab


From bdb842d5ebb8fd5aea400312373eaeb0126b726c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jan 2014 14:05:37 -0600
Subject: [PATCH 1274/3789] Move all db4 packages to the default db5

---
 doc/language-support.xml                               |  6 +++---
 pkgs/applications/audio/moc/default.nix                |  4 ++--
 pkgs/applications/misc/bitcoin/default.nix             |  4 ++--
 pkgs/applications/misc/freicoin/default.nix            |  4 ++--
 pkgs/applications/misc/jigdo/default.nix               |  4 ++--
 .../networking/instant-messengers/ekiga/default.nix    |  2 +-
 pkgs/applications/office/libreoffice/default.nix       |  4 ++--
 .../version-management/codeville/0.8.0.nix             |  2 +-
 .../applications/version-management/kdesvn/default.nix |  4 ++--
 .../gnome-3/core/evolution-data-server/default.nix     |  4 ++--
 pkgs/development/interpreters/python/2.6/default.nix   |  4 ++--
 pkgs/development/interpreters/python/2.7/default.nix   |  4 ++--
 pkgs/development/interpreters/python/3.2/default.nix   |  6 +++---
 pkgs/development/interpreters/python/3.3/default.nix   |  6 +++---
 pkgs/development/libraries/apr-util/default.nix        |  8 ++++----
 pkgs/development/libraries/cyrus-sasl/default.nix      |  4 ++--
 pkgs/development/libraries/kerberos/heimdal.nix        |  4 ++--
 pkgs/development/libraries/libchop/default.nix         |  4 ++--
 pkgs/development/libraries/librdf/redland.nix          |  6 +++---
 pkgs/development/libraries/log4cxx/default.nix         |  4 ++--
 pkgs/development/libraries/openldap/default.nix        |  4 ++--
 pkgs/development/perl-modules/BerkeleyDB/default.nix   |  6 +++---
 pkgs/development/perl-modules/DB_File/default.nix      |  6 +++---
 pkgs/development/python-modules/bsddb3/default.nix     |  4 ++--
 pkgs/os-specific/linux/iproute/default.nix             |  4 ++--
 pkgs/servers/mail/opensmtpd/default.nix                |  4 ++--
 pkgs/servers/mail/postfix/default.nix                  |  4 ++--
 pkgs/servers/prayer/default.nix                        |  4 ++--
 pkgs/servers/squid/squids.nix                          |  2 +-
 pkgs/tools/filesystems/netatalk/default.nix            |  6 +++---
 pkgs/tools/misc/bogofilter/default.nix                 |  4 ++--
 pkgs/tools/misc/man-db/default.nix                     |  4 ++--
 pkgs/tools/networking/isync/default.nix                |  4 ++--
 pkgs/tools/networking/webalizer/default.nix            |  4 ++--
 pkgs/tools/package-management/rpm/default.nix          |  4 ++--
 pkgs/top-level/all-packages.nix                        | 10 +++-------
 pkgs/top-level/perl-packages.nix                       |  4 ++--
 37 files changed, 81 insertions(+), 85 deletions(-)

diff --git a/doc/language-support.xml b/doc/language-support.xml
index 69361e3be6c..f5e89df57fc 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -108,7 +108,7 @@ a <varname>preConfigure</varname> hook to generate a configuration
 file used by <filename>Makefile.PL</filename>:
 
 <programlisting>
-{buildPerlPackage, fetchurl, db4}:
+{buildPerlPackage, fetchurl, db}:
 
 buildPerlPackage rec {
   name = "BerkeleyDB-0.36";
@@ -119,8 +119,8 @@ buildPerlPackage rec {
   };
 
   preConfigure = ''
-    echo "LIB = ${db4}/lib" > config.in
-    echo "INCLUDE = ${db4}/include" >> config.in
+    echo "LIB = ${db}/lib" > config.in
+    echo "INCLUDE = ${db}/include" >> config.in
   '';
 }
 </programlisting>
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index 74ae3dcf22b..5356d4ce298 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db4, libmodplug, timidity, libid3tag, libtool }:
+{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }:
 
 stdenv.mkDerivation rec {
   name = "moc-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   configurePhase = "./configure prefix=$out";
 
-  buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db4 libmodplug timidity libid3tag libtool ];
+  buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 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.";
diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix
index 9e20be0dcbc..1785526d14a 100644
--- a/pkgs/applications/misc/bitcoin/default.nix
+++ b/pkgs/applications/misc/bitcoin/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }:
+{ fetchurl, stdenv, openssl, db, boost, zlib, miniupnpc, qt4 }:
 
 stdenv.mkDerivation rec {
   version = "0.8.6";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "036xx06gyrfh65rpdapff3viz1f38vzkj7lnhil6fc0s7pjmsjbk";
   };
 
-  buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ];
+  buildInputs = [ openssl db boost zlib miniupnpc qt4 ];
 
   configurePhase = ''
     cd src
diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix
index d5ed057f56b..33d8585bb2d 100644
--- a/pkgs/applications/misc/freicoin/default.nix
+++ b/pkgs/applications/misc/freicoin/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, db4, boost, gmp, mpfr, miniupnpc, qt4, unzip }:
+{ fetchurl, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, unzip }:
 
 stdenv.mkDerivation rec {
   version = "0.8.3-1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   # I think that openssl and zlib are required, but come through other
   # packages
-  buildInputs = [ db4 boost gmp mpfr miniupnpc qt4 unzip ];
+  buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip ];
 
   configurePhase = "qmake";
 
diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix
index 24edc0e128a..fe4c0287fdd 100644
--- a/pkgs/applications/misc/jigdo/default.nix
+++ b/pkgs/applications/misc/jigdo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, db4, gtk, bzip2 }:
+{ stdenv, fetchurl, db, gtk, bzip2 }:
 
 stdenv.mkDerivation {
   name = "jigdo-0.7.3";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3";
   };
 
-  buildInputs = [ db4 gtk bzip2 ];
+  buildInputs = [ db gtk bzip2 ];
 
   configureFlags = "--without-libdb";
 
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index 276df1ae7a1..9de14cae6f0 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -2,7 +2,7 @@ x@{builderDefsPackage
   , cyrus_sasl, gettext, openldap, ptlib, opal, GConf, libXv, rarian, intltool
   , perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi
   , libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, automake
-  , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db4, nspr, nss, zlib
+  , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib
   , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle
   , ...}:
 builderDefsPackage
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 67cbd7996ff..58e657f8b2e 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -6,7 +6,7 @@
 
 { stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip
 , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
-, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
+, libxml2, db, sablotron, curl, libXaw, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler
@@ -248,7 +248,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
-      CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig
+      CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig
       freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk
       hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
diff --git a/pkgs/applications/version-management/codeville/0.8.0.nix b/pkgs/applications/version-management/codeville/0.8.0.nix
index 5c1910d6c6f..0c0f3c4c19c 100644
--- a/pkgs/applications/version-management/codeville/0.8.0.nix
+++ b/pkgs/applications/version-management/codeville/0.8.0.nix
@@ -1,6 +1,6 @@
 args : with args; 
 
-if (! python ? db4Support) || (! python.db4Support) then 
+if (! python ? dbSupport) || (! python.dbSupport) then 
   throw ''Python DB4 support is required for codeville.'' 
 else
 
diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix
index 6373eb9f7f9..60f5d8bb9e0 100644
--- a/pkgs/applications/version-management/kdesvn/default.nix
+++ b/pkgs/applications/version-management/kdesvn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }:
+{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db, kdelibs, expat }:
 
 # the homepage mentions this is the final release.
 # from now on, kdesvn will be part of the official kde software distribution
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake
   '';
 
-  buildInputs = [ apr aprutil subversion db4 kdelibs expat ];
+  buildInputs = [ apr aprutil subversion db kdelibs expat ];
 
   nativeBuildInputs = [ gettext ];
 
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 cb3db8432b6..d0c15bd96ff 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret
-, p11_kit, db4, nspr, nss, libical, gperf }:
+, p11_kit, db, nspr, nss, libical, gperf }:
 
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with gnome3;
     [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret
-      gcr p11_kit db4 nspr nss libgweather libical libgdata gperf ];
+      gcr p11_kit db nspr nss libgweather libical libgdata gperf ];
 
   # uoa irrelevant for now
   configureFlags = "--disable-uoa --with-nspr-includes=${nspr}/include/nspr --with-nss-includes=${nss}/include/nss";
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 7c6516fe668..0302513e6fc 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
-, sqlite, tcl, tk, x11, openssl, readline, db45, ncurses, gdbm
+, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm
 }:
 
 assert zlibSupport -> zlib != null;
@@ -146,7 +146,7 @@ let
 
     bsddb = buildInternalPythonModule {
       moduleName = "bsddb";
-      deps = [ db45 ];
+      deps = [ db ];
     };
 
     crypt = buildInternalPythonModule {
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 043094c0303..4897c0a5141 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
-, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm, libX11 }:
+, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11 }:
 
 assert zlibSupport -> zlib != null;
 
@@ -156,7 +156,7 @@ let
 
     bsddb = buildInternalPythonModule {
       moduleName = "bsddb";
-      deps = [ db4 ];
+      deps = [ db ];
     };
 
     curses = buildInternalPythonModule {
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
index e09602e7381..03f2d392bd1 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , bzip2
-, db4
+, db
 , gdbm
 , libX11, xproto
 , ncurses
@@ -20,7 +20,7 @@ let
   version = "${majorVersion}.5";
 
   buildInputs = filter (p: p != null) [
-    zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
+    zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
   ];
 in
 stdenv.mkDerivation {
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
   passthru = {
     zlibSupport = zlib != null;
     sqliteSupport = sqlite != null;
-    db4Support = db4 != null;
+    dbSupport = db != null;
     readlineSupport = readline != null;
     opensslSupport = openssl != null;
     tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index 84cb9dd141a..18af6487e55 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , bzip2
-, db4
+, db
 , gdbm
 , libX11, xproto
 , ncurses
@@ -20,7 +20,7 @@ let
   version = "${majorVersion}.3";
 
   buildInputs = filter (p: p != null) [
-    zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
+    zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
   ];
 in
 stdenv.mkDerivation {
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
   passthru = {
     zlibSupport = zlib != null;
     sqliteSupport = sqlite != null;
-    db4Support = db4 != null;
+    dbSupport = db != null;
     readlineSupport = readline != null;
     opensslSupport = openssl != null;
     tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index e2d72fc7d6b..229529f08ce 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, apr, expat, gnused
 , sslSupport ? true, openssl
-, bdbSupport ? false, db4
+, bdbSupport ? false, db
 , ldapSupport ? true, openldap
 }:
 
 assert sslSupport -> openssl != null;
-assert bdbSupport -> db4 != null;
+assert bdbSupport -> db != null;
 assert ldapSupport -> openldap != null;
 
 let
@@ -24,13 +24,13 @@ stdenv.mkDerivation rec {
     --with-apr=${apr} --with-expat=${expat}
     --with-crypto
     ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"}
-    ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db4}"}
+    ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"}
     ${stdenv.lib.optionalString ldapSupport "--with-ldap"}
   '';
 
   propagatedBuildInputs = [ makeWrapper apr expat ]
     ++ optional sslSupport openssl
-    ++ optional bdbSupport db4
+    ++ optional bdbSupport db
     ++ optional ldapSupport openldap;
 
   # Give apr1 access to sed for runtime invocations
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index e90ec422661..712f05b8d65 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, db4, gettext, pam }:
+{ stdenv, fetchurl, openssl, db, gettext, pam }:
 
 stdenv.mkDerivation rec {
   name = "cyrus-sasl-2.1.26";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g";
   };
 
-  buildInputs = [ openssl db4 gettext ] ++ stdenv.lib.optional stdenv.isLinux pam;
+  buildInputs = [ openssl db gettext ] ++ stdenv.lib.optional stdenv.isLinux pam;
 
   patches = [ ./missing-size_t.patch ]; # https://bugzilla.redhat.com/show_bug.cgi?id=906519
   patchFlags = "-p0";
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index d4728273d34..8f4138282f0 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} :
+{ stdenv, fetchurl, openldap, readline, db, openssl, cyrus_sasl, sqlite} :
 
 stdenv.mkDerivation rec {
   name = "heimdal-1.5.3";
@@ -23,5 +23,5 @@ stdenv.mkDerivation rec {
     rmdir $out/libexec
   '';
 
-  propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl sqlite];
+  propagatedBuildInputs = [ readline db openssl openldap cyrus_sasl sqlite];
 }
diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix
index 9a1b4122365..1b16d361c6d 100644
--- a/pkgs/development/libraries/libchop/default.nix
+++ b/pkgs/development/libraries/libchop/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db4
+{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db
 , libuuid, lzo, pkgconfig, guile }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ zlib bzip2 lzo
       libgcrypt
-      gdbm db4 tdb
+      gdbm db tdb
       gnutls libuuid
       guile
     ];
diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix
index 26b3de70dcd..4863c928988 100644
--- a/pkgs/development/libraries/librdf/redland.nix
+++ b/pkgs/development/libraries/librdf/redland.nix
@@ -3,7 +3,7 @@
 , mysql, withMysql ? false
 , postgresql, withPostgresql ? false
 , sqlite, withSqlite ? true
-, db4, withBdb ? false
+, db, withBdb ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional withMysql mysql
     ++ stdenv.lib.optional withSqlite sqlite
     ++ stdenv.lib.optional withPostgresql postgresql
-    ++ stdenv.lib.optional withBdb db4;
+    ++ stdenv.lib.optional withBdb db;
 
   propagatedBuildInputs = [ librdf_rasqal ];
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   configureFlags =
     [ "--with-threads" ]
-    ++ stdenv.lib.optional withBdb "--with-bdb=${db4}";
+    ++ stdenv.lib.optional withBdb "--with-bdb=${db}";
 
   meta = {
     homepage = http://librdf.org/;
diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix
index e62fa2fa1c5..b2e13a1e9ab 100644
--- a/pkgs/development/libraries/log4cxx/default.nix
+++ b/pkgs/development/libraries/log4cxx/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoconf, automake, libtool, libxml2, cppunit, boost
-, apr, aprutil, db4, expat
+, apr, aprutil, db, expat
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
        src/main/cpp/socketoutputstream.cpp
   '';
 
-  buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db4 expat];
+  buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db expat];
 
   meta = {
     homepage = http://logging.apache.org/log4cxx/index.html;
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 8f26f29c377..c4be3358049 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}:
+{stdenv, fetchurl, openssl, cyrus_sasl, db, groff}:
 
 stdenv.mkDerivation rec {
   name = "openldap-2.4.38";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1l8zng86alhcmmmw09r1c4dzl7yvk6dy5fq9zia96pgck4srl848";
   };
 
-  buildInputs = [ openssl cyrus_sasl db4 groff ];
+  buildInputs = [ openssl cyrus_sasl db groff ];
 
   configureFlags =
     [ "--enable-overlays"
diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix
index 01f698da232..a6af84a6581 100644
--- a/pkgs/development/perl-modules/BerkeleyDB/default.nix
+++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix
@@ -1,4 +1,4 @@
-{buildPerlPackage, fetchurl, db4}:
+{buildPerlPackage, fetchurl, db}:
 
 buildPerlPackage rec {
   name = "BerkeleyDB-0.54";
@@ -9,7 +9,7 @@ buildPerlPackage rec {
   };
 
   preConfigure = ''
-    echo "LIB = ${db4}/lib" > config.in
-    echo "INCLUDE = ${db4}/include" >> config.in
+    echo "LIB = ${db}/lib" > config.in
+    echo "INCLUDE = ${db}/include" >> config.in
   '';
 }
diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix
index 4017d8f5ca5..4195f8d613e 100644
--- a/pkgs/development/perl-modules/DB_File/default.nix
+++ b/pkgs/development/perl-modules/DB_File/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, buildPerlPackage, db4}:
+{fetchurl, buildPerlPackage, db}:
 
 buildPerlPackage rec {
   name = "DB_File-1.831";
@@ -12,8 +12,8 @@ buildPerlPackage rec {
     cat > config.in <<EOF
     PREFIX = size_t
     HASH = u_int32_t
-    LIB = ${db4}/lib
-    INCLUDE = ${db4}/include
+    LIB = ${db}/lib
+    INCLUDE = ${db}/include
     EOF
   '';
 
diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix
index c26347c5243..574796e2c68 100644
--- a/pkgs/development/python-modules/bsddb3/default.nix
+++ b/pkgs/development/python-modules/bsddb3/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python, db4}:
+{stdenv, fetchurl, python, db}:
 
 stdenv.mkDerivation rec {
   name = "bsddb3-6.0.1";
@@ -8,5 +8,5 @@ stdenv.mkDerivation rec {
   };
   buildInputs = [python];
   buildPhase = "true";
-  installPhase = "python ./setup.py install --prefix=$out --berkeley-db=${db4}";
+  installPhase = "python ./setup.py install --prefix=$out --berkeley-db=${db}";
 }
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 9e8faa6a02e..2cfbc2a1df1 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, flex, bison, db4, iptables, pkgconfig }:
+{ fetchurl, stdenv, flex, bison, db, iptables, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "iproute2-3.12.0";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}"
     + " MANDIR=$(out)/share/man";
 
-  buildInputs = [ db4 iptables ];
+  buildInputs = [ db iptables ];
   nativeBuildInputs = [ bison flex pkgconfig ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index fc518e4f889..49550647921 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, libevent, zlib, openssl, db4, bison, pam }:
+{ stdenv, fetchurl, libevent, zlib, openssl, db, bison, pam }:
 
 stdenv.mkDerivation rec {
   name = "opensmtpd-${version}";
   version = "201307151923p1";
 
-  buildInputs = [ libevent zlib openssl db4 bison pam ];
+  buildInputs = [ libevent zlib openssl db bison pam ];
 
   src = fetchurl {
     url = "http://www.opensmtpd.org/archives/${name}.tar.gz";
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index a435eea8663..0bfc31580e1 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, db4, glibc, openssl, cyrus_sasl
+{ stdenv, fetchurl, db, glibc, openssl, cyrus_sasl
 , coreutils, findutils, gnused, gnugrep, bison, perl
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "11z07mjy53l1fnl7k4101yk4ilibgqr1164628mqcbmmr8bh2szl";
   };
 
-  buildInputs = [db4 openssl cyrus_sasl bison perl];
+  buildInputs = [db openssl cyrus_sasl bison perl];
 
   patches = [ ./postfix-2.2.9-db.patch  ./postfix-2.2.9-lib.patch ./db-linux3.patch ];
 
diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix
index 8a23e480e1f..a398a3ccdf9 100644
--- a/pkgs/servers/prayer/default.nix
+++ b/pkgs/servers/prayer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, openssl, db4, zlib, uwimap, htmlTidy, pam}:
+{ stdenv, fetchurl, perl, openssl, db, zlib, uwimap, htmlTidy, pam}:
 
 let
   ssl = stdenv.lib.optionals uwimap.withSSL
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda";
   };
 
-  buildInputs = [ openssl db4 zlib uwimap htmlTidy pam ];
+  buildInputs = [ openssl db zlib uwimap htmlTidy pam ];
   nativeBuildInputs = [ perl ];
 
   NIX_LDFLAGS = "-lpam";
diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
index a41343c0cf9..18778aa80db 100644
--- a/pkgs/servers/squid/squids.nix
+++ b/pkgs/servers/squid/squids.nix
@@ -35,7 +35,7 @@ rec {
       url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2";
       sha256 = "0dafqv00dr3nyrm9k47d6r7gv2r3f9hjd1ykl3kkvjca11r4n54j";
     };
-    buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2
+    buildInputs = [openldap pam db cyrus_sasl libcap expat libxml2
       libtool openssl];
   };
 
diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix
index 26ffc9d50c2..850e1681248 100644
--- a/pkgs/tools/filesystems/netatalk/default.nix
+++ b/pkgs/tools/filesystems/netatalk/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, db4, libgcrypt, avahi, libiconv, pam, openssl }:
+{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl }:
 
 stdenv.mkDerivation rec {
   name = "netatalk-3.1.0";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq";
   };
 
-  buildInputs = [ pkgconfig db4 libgcrypt avahi libiconv pam openssl ];
+  buildInputs = [ pkgconfig db libgcrypt avahi libiconv pam openssl ];
 
   configureFlags = [
-    "--with-bdb=${db4}"
+    "--with-bdb=${db}"
     "--with-openssl=${openssl}"
   ];
 
diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix
index 09d8e888837..f7c121d825e 100644
--- a/pkgs/tools/misc/bogofilter/default.nix
+++ b/pkgs/tools/misc/bogofilter/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, stdenv, flex, db4}:
+{fetchurl, stdenv, flex, db}:
 
 stdenv.mkDerivation rec {
   name = "bogofilter-1.2.4";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   # FIXME: We would need `pax' as a "propagated build input" (for use
   # by the `bf_tar' script) but we don't have it currently.
 
-  buildInputs = [ flex db4 ];
+  buildInputs = [ flex db ];
 
   meta = {
     homepage = http://bogofilter.sourceforge.net/;
diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index 5374cb74361..121a92b845d 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, db4, groff}:
+{stdenv, fetchurl, db, groff}:
  
 stdenv.mkDerivation {
   name = "man-db-2.5.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "178w1fk23ffh8vabj29cn0yyg5ps7bwy1zrrrcsw8aypbh3sfjy3";
   };
   
-  buildInputs = [db4 groff];
+  buildInputs = [db groff];
   
   configureFlags = ''
     --disable-setuid
diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix
index 30ee63f257a..86986ed9b95 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/pkgs/tools/networking/isync/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, openssl, pkgconfig, db4 }:
+{ fetchurl, stdenv, openssl, pkgconfig, db }:
 
 stdenv.mkDerivation rec {
   name = "isync-1.0.6";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [ ./isync-recursice-imap.patch ]; # usefull patch to enable subfolders listing
-  buildInputs = [ openssl pkgconfig db4 ];
+  buildInputs = [ openssl pkgconfig db ];
 
   meta = {
     homepage = http://isync.sourceforge.net/;
diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix
index efa29e81407..99fde387129 100644
--- a/pkgs/tools/networking/webalizer/default.nix
+++ b/pkgs/tools/networking/webalizer/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib, libpng, gd, geoip, db4}:
+{stdenv, fetchurl, zlib, libpng, gd, geoip, db}:
 
 stdenv.mkDerivation {
   name = "webalizer-2.23-05";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
         --replace "--static" "" 
     '';
 
-  buildInputs = [zlib libpng gd geoip db4]; 
+  buildInputs = [zlib libpng gd geoip db]; 
 
   configureFlags = "--enable-dns --enable-geoip --disable-static --enable-shared";
 }
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 9a96baf5fe0..4b1b8aeb28d 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4, xz, python }:
+{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db, xz, python }:
 
 stdenv.mkDerivation rec {
   name = "rpm-4.7.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0";
   };
 
-  buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 xz python ];
+  buildInputs = [ cpio zlib bzip2 file nspr nss popt db xz python ];
 
   # Note: we don't add elfutils to buildInputs, since it provides a
   # bad `ld' and other stuff.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b38f408d967..9bc23af3b6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1795,9 +1795,7 @@ let
     inherit ppp;
   };
 
-  rpm = callPackage ../tools/package-management/rpm {
-    db4 = db45;
-  };
+  rpm = callPackage ../tools/package-management/rpm { };
 
   rrdtool = callPackage ../tools/misc/rrdtool { };
 
@@ -6378,7 +6376,7 @@ let
 
   squids = recurseIntoAttrs( import ../servers/squid/squids.nix {
     inherit fetchurl stdenv perl lib composableDerivation
-      openldap pam db4 cyrus_sasl kerberos libcap expat libxml2 libtool
+      openldap pam db cyrus_sasl kerberos libcap expat libxml2 libtool
       openssl;
   });
   squid = squids.squid31; # has ipv6 support
@@ -6956,9 +6954,7 @@ let
 
   # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader )
 
-  pam_ccreds = callPackage ../os-specific/linux/pam_ccreds {
-    db = db4;
-  };
+  pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { };
 
   pam_console = callPackage ../os-specific/linux/pam_console {
     libtool = libtool_1_5;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6de2d1dd4f3..a42af772046 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -306,7 +306,7 @@ let self = _self // overrides; _self = with self; {
 
   BerkeleyDB = import ../development/perl-modules/BerkeleyDB {
     inherit buildPerlPackage fetchurl;
-    inherit (pkgs) db4;
+    inherit (pkgs) db;
   };
 
   BHooksEndOfScope = buildPerlPackage {
@@ -2201,7 +2201,7 @@ let self = _self // overrides; _self = with self; {
 
   DBFile = import ../development/perl-modules/DB_File {
     inherit fetchurl buildPerlPackage;
-    inherit (pkgs) db4;
+    inherit (pkgs) db;
   };
 
   DBI = buildPerlPackage {
-- 
GitLab


From 534654e118dd96ea211e85bd6db8cc7f4a57dec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 15 Feb 2014 12:04:10 +0100
Subject: [PATCH 1275/3789] git: fix typos in comments

---
 .../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 0e067a64928..c14eb36acf9 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
       mkdir -p $out/etc/bash_completion.d
       ln -s $out/share/git/contrib/completion/git-completion.bash $out/etc/bash_completion.d/
 
-      # grep is a runtime dependence, need to patch so that it's found
+      # grep is a runtime dependency, need to patch so that it's found
       substituteInPlace $out/libexec/git-core/git-sh-setup \
           --replace ' grep' ' ${gnugrep}/bin/grep' \
           --replace ' egrep' ' ${gnugrep}/bin/egrep'
@@ -77,7 +77,7 @@ stdenv.mkDerivation {
              -e 's|	perl -e|	${perl}/bin/perl -e|g' \
              $out/libexec/git-core/{git-am,git-submodule}
 
-      # gzip (and optionally bzip2, xz, zip) are a runtime dependencies for
+      # gzip (and optionally bzip2, xz, zip) are runtime dependencies for
       # gitweb.cgi, need to patch so that it's found
       sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \
           $out/share/gitweb/gitweb.cgi
-- 
GitLab


From e5a21b7bed721a8f5a2f932775a94ba44af3aa88 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 4 Feb 2014 16:33:54 -0600
Subject: [PATCH 1276/3789] libpipeline: Add package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn Forsman: modify meta.description so that it doesn't include the
package name and doesn't end in a period.]
---
 .../libraries/libpipeline/default.nix           | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix                 |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/libpipeline/default.nix

diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix
new file mode 100644
index 00000000000..e56a45c92fc
--- /dev/null
+++ b/pkgs/development/libraries/libpipeline/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+ 
+stdenv.mkDerivation rec {
+  name = "libpipeline-1.2.6";
+  
+  src = fetchurl {
+    url = "mirror://savannah/libpipeline/${name}.tar.gz";
+    sha256 = "0wjsigim422ilzs46hxzv98l10zprpbk53gq3jzj6s9kn9n1wljc";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "http://libpipeline.nongnu.org";
+    description = "C library for manipulating pipelines of subprocesses in a flexible and convenient way";
+    platforms = platforms.unix;
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9bc23af3b6b..d67ec187d2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4948,6 +4948,8 @@ let
 
   libpcap = callPackage ../development/libraries/libpcap { };
 
+  libpipeline = callPackage ../development/libraries/libpipeline { };
+
   libpng = callPackage ../development/libraries/libpng { };
   libpng_apng = libpng.override { apngSupport = true; };
   libpng12 = callPackage ../development/libraries/libpng/12.nix { };
-- 
GitLab


From 42358f0cd02d48e88a79c86406820afb7bd4f24f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 4 Feb 2014 16:34:31 -0600
Subject: [PATCH 1277/3789] man-db: Upgrade package from 2.5.1 -> 2.6.6

Additionally, remove the uneeded share.patch since share/man is now
searched within upstream code.
---
 pkgs/tools/misc/man-db/default.nix |  29 +++-----
 pkgs/tools/misc/man-db/share.patch | 110 -----------------------------
 2 files changed, 10 insertions(+), 129 deletions(-)
 delete mode 100644 pkgs/tools/misc/man-db/share.patch

diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index 121a92b845d..f664bcc6917 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -1,32 +1,23 @@
-{stdenv, fetchurl, db, groff}:
+{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff }:
  
-stdenv.mkDerivation {
-  name = "man-db-2.5.1";
+stdenv.mkDerivation rec {
+  name = "man-db-2.6.6";
   
   src = fetchurl {
-    url = mirror://savannah/man-db/man-db-2.5.1.tar.gz;
-    sha256 = "178w1fk23ffh8vabj29cn0yyg5ps7bwy1zrrrcsw8aypbh3sfjy3";
+    url = "mirror://savannah/man-db/${name}.tar.xz";
+    sha256 = "1hv6byj6sg6cp3jyf08gbmdm4pwhvd5hzmb94xl0w7prin6hzabx";
   };
   
-  buildInputs = [db groff];
+  buildInputs = [ pkgconfig libpipeline db groff ];
   
   configureFlags = ''
     --disable-setuid
-    --with-nroff=${groff}/bin/nroff
-    --with-tbl=${groff}/bin/tbl
-    --with-eqn=${groff}/bin/eqn
-    --with-neqn=${groff}/bin/neqn
   '';
 
-  troff = "${groff}/bin/troff";
-  
-  patches = [
-    # Search in "share/man" relative to each path in $PATH (in addition to "man").
-    ./share.patch
-  ];
-
-  meta = {
-    homepage = http://www.nongnu.org/man-db/;
+  meta = with stdenv.lib; {
+    homepage = "http://man-db.nongnu.org";
     description = "An implementation of the standard Unix documentation system accessed using the man command";
+    license = licenses.gpl2;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/misc/man-db/share.patch b/pkgs/tools/misc/man-db/share.patch
deleted file mode 100644
index 95582a50269..00000000000
--- a/pkgs/tools/misc/man-db/share.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -rc man-db-2.5.1-orig/src/manp.c man-db-2.5.1/src/manp.c
-*** man-db-2.5.1-orig/src/manp.c	2008-01-07 03:23:11.000000000 +0100
---- man-db-2.5.1/src/manp.c	2008-02-07 14:20:20.000000000 +0100
-***************
-*** 96,102 ****
-  
-  static void mkcatdirs (const char *mandir, const char *catdir);
-  static inline char *get_manpath_from_path (const char *path);
-! static inline char *has_mandir (const char *p);
-  static inline char *fsstnd (const char *path);
-  static char *def_path (int flag);
-  static void add_dir_to_list (char **lp, const char *dir);
---- 96,102 ----
-  
-  static void mkcatdirs (const char *mandir, const char *catdir);
-  static inline char *get_manpath_from_path (const char *path);
-! static inline char *has_mandir (const char *p, const char *mandir);
-  static inline char *fsstnd (const char *path);
-  static char *def_path (int flag);
-  static void add_dir_to_list (char **lp, const char *dir);
-***************
-*** 928,934 ****
-  		} else {
-  			debug ("is not in the config file\n");
-  
-! 		 	t = has_mandir (p);
-  		 	if (t) {
-  				debug ("but does have a ../man or man "
-  				       "subdirectory\n");
---- 928,934 ----
-  		} else {
-  			debug ("is not in the config file\n");
-  
-! 		 	t = has_mandir (p, "man");
-  		 	if (t) {
-  				debug ("but does have a ../man or man "
-  				       "subdirectory\n");
-***************
-*** 938,943 ****
---- 938,952 ----
-  		 	} else
-  				debug ("and doesn't have ../man or man "
-  				       "subdirectories\n");
-+  
-+  		 	t = has_mandir (p, "share/man");
-+  		 	if (t) {
-+                                 debug ("but does have a ../share/man or share/man subdirectory\n");
-+  	
-+  				add_dir_to_list (tmplist, t);
-+  				free (t);
-+  		 	} else
-+  				debug ("and doesn't have ../share/man or share/man subdirectories\n");
-  		}
-  	}
-  
-***************
-*** 1013,1019 ****
-  
-  /* path does not exist in config file: check to see if path/../man or 
-     path/man exist.  If so return it, if not return NULL. */
-! static inline char *has_mandir (const char *path)
-  {
-  	char *newpath = NULL;
-  
---- 1022,1028 ----
-  
-  /* path does not exist in config file: check to see if path/../man or 
-     path/man exist.  If so return it, if not return NULL. */
-! static inline char *has_mandir (const char *path, const char *mandir)
-  {
-  	char *newpath = NULL;
-  
-***************
-*** 1023,1031 ****
-  	char *subdir = strrchr (path, '/');
-  	if (subdir) {
-  		const int prefix_len = subdir + 1 - path;
-! 		newpath = xmalloc (prefix_len + sizeof ("man") + 1);
-  		strncpy (newpath, path, prefix_len);
-! 		strcpy (newpath + prefix_len, "man");
-  
-  		if (is_directory (newpath) == 1)
-  			return newpath;
---- 1032,1040 ----
-  	char *subdir = strrchr (path, '/');
-  	if (subdir) {
-  		const int prefix_len = subdir + 1 - path;
-! 		newpath = xmalloc (prefix_len + strlen (mandir) + 2);
-  		strncpy (newpath, path, prefix_len);
-! 		strcpy (newpath + prefix_len, mandir);
-  
-  		if (is_directory (newpath) == 1)
-  			return newpath;
-***************
-*** 1033,1039 ****
-  			*newpath = '\0';
-  	}
-  
-! 	newpath = appendstr (newpath, path, "/man", NULL);
-  
-  	if (is_directory (newpath) == 1)
-  		return newpath;
---- 1042,1048 ----
-  			*newpath = '\0';
-  	}
-  
-! 	newpath = appendstr (newpath, path, "/", mandir, NULL);
-  
-  	if (is_directory (newpath) == 1)
-  		return newpath;
-- 
GitLab


From bf3ca4cb484cdd9d1767f5cd6ef41704e8998009 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 4 Feb 2014 17:12:39 -0600
Subject: [PATCH 1278/3789] fish: Fix propagatedBuildInputs and other assorted
 changes

Currently, fish does not depend on python27 which is necessary for many
of the built in commands such as the manpage completion generator and
the web configuration sevice. This patch adds support for python27 as
well as man_db for the manpage completion generator. It also attempts to
replace more shell functions with binaries contained in the nix store.
---
 pkgs/shells/fish/default.nix | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 27f2b032476..7b70e98d2cd 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -1,34 +1,35 @@
-{ stdenv, fetchurl, autoconf, ncurses, which, groff, gettext }:
+{ stdenv, fetchurl, ncurses, python27, which, groff, gettext, man_db, bc }:
 
 stdenv.mkDerivation rec {
-  name = "fish-2.1.0";
+  name = "fish-${version}";
+  version = "2.1.0";
 
   src = fetchurl {
-    url = http://fishshell.com/files/2.1.0/fish-2.1.0.tar.gz;
-    sha1 = "b1764cba540055cb8e2a96a7ea4c844b04a32522";
+    url = "http://fishshell.com/files/${version}/${name}.tar.gz";
+    sha256 = "0i7h3hx8iszli3d4kphw79sz9m07f2lc2c9hr9smdps5s7wpllmg";
   };
 
-  nativeBuildInputs = [ autoconf ];
+  buildInputs = [ ncurses ];
 
-  buildInputs = [ ncurses which ];
-
-  preConfigure = ''
-    autoconf
-  '';
+  # Required binaries during execution
+  # Python27: Autocompletion generated from manpages and config editing
+  propagatedBuildInputs = [ python27 which groff gettext man_db bc ];
 
   postInstall = ''
-    sed -i "s|which |command -v |" "$out/share/fish/functions/type.fish"
+    sed -i "s|bc|${bc}/bin/bc|" "$out/share/fish/functions/seq.fish"
+    sed -i "s|which |${which}/bin/which |" "$out/share/fish/functions/type.fish"
     sed -i "s|nroff |${groff}/bin/nroff |" "$out/share/fish/functions/__fish_print_help.fish"
     sed -e "s|gettext |${gettext}/bin/gettext |" \
-        -e "s|which |command -v |" \
+        -e "s|which |${which}/bin/which |" \
         -i "$out/share/fish/functions/_.fish"
+    sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py"
   '';
 
   meta = with stdenv.lib; {
     description = "Smart and user-friendly command line shell";
-    homepage = http://fishshell.com/;
+    homepage = "http://fishshell.com/";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.ocharles ];
+    maintainers = with maintainers; [ ocharles ];
   };
 }
-- 
GitLab


From a4e3f362feacb421d3f15dc3b75e44d6a8a11df3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 9 Feb 2014 21:47:20 -0600
Subject: [PATCH 1279/3789] znc: Update from 1.0 -> 1.2

---
 pkgs/applications/networking/znc/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index a43d8fa9d11..dbf886de978 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl, pkgconfig
+{ stdenv, fetchurl, openssl, pkgconfig
 , withPerl ? false, perl
 , withPython ? false, python3
 , withTcl ? false, tcl
@@ -7,10 +7,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "znc-1.0";
+  name = "znc-1.2";
+
   src = fetchurl {
     url = "http://znc.in/releases/${name}.tar.gz";
-    sha256 = "0ah6890ngvj97kah3x7fd8yzi6dpdgrxw1b2skj2cyv98bd3jmd8";
+    sha256 = "07bh306wl5494sqsgz4a526wvyrylkc8vpnbr5pkxwjg90mcv8nr";
   };
 
   buildInputs = [ openssl pkgconfig ]
@@ -24,11 +25,11 @@ stdenv.mkDerivation rec {
     + optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib "
     + optionalString withCyrus "--enable-cyrus ";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Advanced IRC bouncer";
     homepage = http://wiki.znc.in/ZNC;
-    maintainers = [ stdenv.lib.maintainers.viric ];
-    license = "ASL2.0";
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = with maintainers; [ viric ];
+    license = licenses.asl20;
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From 42ce480a52c52ad5c3d5744830e7871483147a04 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Mon, 3 Feb 2014 23:25:24 +0100
Subject: [PATCH 1280/3789] nixos: Try harder to get LVM-hosted filesystems up
 in stage1.

---
 nixos/modules/system/boot/stage-1-init.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 1f65026b5de..97c688ce590 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -320,6 +320,10 @@ while read -u 3 mountPoint; do
         echo -n "waiting for device $device to appear..."
         for try in $(seq 1 20); do
             sleep 1
+            # also re-try lvm activation now that new block devices might have appeared
+            lvm vgchange -ay
+            # and tell udev to create nodes for the new LVs
+            udevadm trigger --action=add
             if test -e $device; then break; fi
             echo -n "."
         done
-- 
GitLab


From 97721af469383c389960a8a8a8e6b880ca9bdc84 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Thu, 16 May 2013 16:28:39 +0200
Subject: [PATCH 1281/3789] VMs: Add Fedora 17 to the list of distros (only had
 16 and 18).

---
 pkgs/build-support/vm/default.nix | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 0521b12fd59..c6b774fc06c 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -924,6 +924,32 @@ rec {
       packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
     };
 
+    fedora17i386 = {
+      name = "fedora-17-i386";
+      fullName = "Fedora 17 (i386)";
+      packagesList = fetchurl {
+        url = mirror://fedora/linux/releases/17/Everything/i386/os/repodata/82dc1ea6d26e53a367dc6e7472113c4454c9a8ac7c98d4bfb11fd0b6f311450f-primary.xml.gz;
+        sha256 = "03s527rvdl0zn6zx963wmjlcjm247h8p4x3fviks6lvfsak1xp42";
+      };
+      urlPrefix = mirror://fedora/linux/releases/17/Everything/i386/os;
+      archs = ["noarch" "i386" "i586" "i686"];
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
+      unifiedSystemDir = true;
+    };
+
+    fedora17x86_64 = {
+      name = "fedora-17-x86_64";
+      fullName = "Fedora 17 (x86_64)";
+      packagesList = fetchurl {
+        url = mirror://fedora/linux/releases/17/Everything/x86_64/os/repodata/7009de56f1a1c399930fa72094a310a40d38153c96d0b5af443914d3d6a7d811-primary.xml.gz;
+        sha256 = "04fqlzbd651r8jpvbl4n7hakh3d422ir88571y9rkhx1y5bdw2bh";
+      };
+      urlPrefix = mirror://fedora/linux/releases/17/Everything/x86_64/os;
+      archs = ["noarch" "x86_64"];
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
+      unifiedSystemDir = true;
+    };
+
     fedora18i386 = {
       name = "fedora-18-i386";
       fullName = "Fedora 18 (i386)";
-- 
GitLab


From 01d7e79eafc48c92997e5cd3d5e60d5706279bb4 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Mon, 3 Feb 2014 23:20:41 +0100
Subject: [PATCH 1282/3789] nixos: Make serial agetty's bitrates configurable.

---
 nixos/modules/services/ttys/agetty.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index ae4fa87d4b7..211008fa7e4 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -28,6 +28,17 @@ with pkgs.lib;
         '';
       };
 
+      serialSpeed = mkOption {
+        type = types.listOf types.int;
+        default = [ 115200 57600 38400 9600 ];
+        example = [ 38400 9600 ];
+        description = ''
+            Bitrates to allow for agetty's listening on serial ports. Listing more
+            bitrates gives more interoperability but at the cost of long delays
+            for getting a sync on the line.
+        '';
+      };
+
     };
 
   };
@@ -78,8 +89,9 @@ with pkgs.lib;
         X-RestartIfChanged=false
       '';
     
-    systemd.units."serial-getty@.service".text =
-      ''
+    systemd.units."serial-getty@.service".text = let
+        speeds = with pkgs.lib; concatStringsSep "," (map toString config.services.mingetty.serialSpeed);
+      in ''
         [Unit]
         Description=Serial Getty on %I
         Documentation=man:agetty(8) man:systemd-getty-generator(8)
@@ -95,7 +107,7 @@ with pkgs.lib;
         [Service]
         Environment=TERM=linux
         Environment=LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
-        ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login %I 115200,57600,38400,9600
+        ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login %I ${speeds}
         Type=idle
         Restart=always
         RestartSec=0
-- 
GitLab


From 2c37c23fcec2c24f4f5a954acd8741ab521464bf Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Wed, 12 Feb 2014 23:47:05 +0100
Subject: [PATCH 1283/3789] qca2: Update the source of qca-ossl.cpp to qca's
 git (anonsvn.kde.org no longer serves it), and bump it to a latest version
 that builds with our qca version.

---
 pkgs/development/libraries/qca2/ossl.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/qca2/ossl.nix b/pkgs/development/libraries/qca2/ossl.nix
index 153d3ba5746..d2b8778aa14 100644
--- a/pkgs/development/libraries/qca2/ossl.nix
+++ b/pkgs/development/libraries/qca2/ossl.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchsvn, qt4, qca2, openssl, which}:
+{stdenv, fetchurl, fetchgit, qt4, qca2, openssl, which}:
 
 stdenv.mkDerivation rec {
   version = "2.0.0-beta3";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
   };
   # SVN version has stabilized and has a lot of fixes for fresh OpenSSL
   # Take the main source from there
-  svn_src = fetchsvn {
-    url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca/plugins/qca-ossl ; 
-    rev = 1115936;
-    sha256 =  "ef2c0307e8834e1e7cb23b6fea1cc22486328a37186301a6c11161b1c93d834b";
+  git_src = fetchgit {
+    url = git://anongit.kde.org/qca;
+    rev = "0a8b9db6613f2282fe492ff454412f502a6be410";
+    sha256 =  "1ebb97092f21b9152c6dda56cb33795bea4e83c82800848e800ddaaaf23a31e1";
   };
   buildInputs = [ qt4 qca2 openssl ];
   nativeBuildInputs = [ which ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   configureFlags="--no-separate-debug-info --with-qca=${qca2}
     --with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib";
   preConfigure=''
-    cp ${svn_src}/qca-ossl.cpp .
+    cp ${git_src}/plugins/qca-ossl/qca-ossl.cpp .
 
     configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins"
   '';
-- 
GitLab


From e2151230ab4da530b9843d4a6b3ca9de38c6bd25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 15 Feb 2014 18:49:18 +0100
Subject: [PATCH 1284/3789] darktable: update from 1.2.3 to 1.4.1

---
 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 76669626581..d4983ca04d8 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.2.3";
+  version = "1.4.1";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/darktable/darktable/1.2/darktable-${version}.tar.xz";
-    sha256 = "05kkkz13a5rhb246rq1nxv7h91pcvm15filvik8n8gn143h64sv8";
+    sha256 = "1pkixhiyyjx5wx4dlkvabga9glcx374f1ic2kxmzzdprfm6kkqfd";
   };
 
   buildInputs =
-- 
GitLab


From 6a2ac21602b11c016d8311a9bc1269c745d65a08 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sat, 15 Feb 2014 19:00:27 +0100
Subject: [PATCH 1285/3789] rpm: Revert to using db4, fails to build with db5.

---
 pkgs/tools/package-management/rpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 4b1b8aeb28d..9a96baf5fe0 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db, xz, python }:
+{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4, xz, python }:
 
 stdenv.mkDerivation rec {
   name = "rpm-4.7.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0";
   };
 
-  buildInputs = [ cpio zlib bzip2 file nspr nss popt db xz python ];
+  buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 xz python ];
 
   # Note: we don't add elfutils to buildInputs, since it provides a
   # bad `ld' and other stuff.
-- 
GitLab


From 93f7b7706768a2b9c9c167df447cfa4751c7dadf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 15 Feb 2014 20:45:10 +0100
Subject: [PATCH 1286/3789] xf86_input_wacom: update from 0.20.0 to 0.23.0

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

diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index 4350694c13a..e59fd695f78 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -3,11 +3,11 @@
 , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
 
 stdenv.mkDerivation rec {
-  name = "xf86-input-wacom-0.20.0";
+  name = "xf86-input-wacom-0.23.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
-    sha256 = "1408zjqsakcyx6v81qwh4q7m49cc6vcaad54jaw8ycw4i832jvjq";
+    sha256 = "13capyywk4k3z0va8dawvvdbyschwid0075ji67kyabz1y431h6v";
   };
 
   buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender
-- 
GitLab


From 3dd129c02b3e7b48900651eb4022264273ff4267 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 15 Feb 2014 14:53:13 -0600
Subject: [PATCH 1287/3789] rpm: Upgrade from 4.7.2 -> 4.11.2

---
 pkgs/tools/package-management/rpm/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 9a96baf5fe0..7997603a706 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4, xz, python }:
+{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db, xz, python }:
 
 stdenv.mkDerivation rec {
-  name = "rpm-4.7.2";
+  name = "rpm-4.11.2";
 
   src = fetchurl {
-    url = "http://rpm.org/releases/rpm-4.7.x/${name}.tar.bz2";
-    sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0";
+    url = "http://rpm.org/releases/rpm-4.11.x/${name}.tar.bz2";
+    sha256 = "1m2859js0dwg26sg2mnbkpzhvx303b12kx26az74cf5k6bk8sgs0";
   };
 
-  buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 xz python ];
+  buildInputs = [ cpio zlib bzip2 file nspr nss popt db xz python ];
 
   # Note: we don't add elfutils to buildInputs, since it provides a
   # bad `ld' and other stuff.
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
   
   configureFlags = "--with-external-db --without-lua --enable-python";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.rpm.org/;
-    license = "GPLv2";
+    license = licenses.gpl2;
     description = "The RPM Package Manager";
-    maintainers = stdenv.lib.maintainers.mornfall;
+    maintainers = with maintainers; [ mornfall ];
   };
 }
-- 
GitLab


From 402c1d582ed230f4ad02e42385471983a9df25b2 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 15 Feb 2014 22:21:06 +0100
Subject: [PATCH 1288/3789] baobab: new package

Graphical application to analyse disk usage in any Gnome environment.

https://wiki.gnome.org/Apps/Baobab
---
 lib/maintainers.nix                           |  1 +
 pkgs/desktops/gnome-3/core/baobab/default.nix | 45 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 50 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/baobab/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d859728c9f8..fa004c859b4 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -34,6 +34,7 @@
   jcumming = "Jack Cummings <jack@mudshark.org>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
+  lethalman = "Luca Bruno <lucabru@src.gnome.org>";
   linquize = "Linquize <linquize@yahoo.com.hk>";
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
new file mode 100644
index 00000000000..b905a05474d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, intltool, fetchurl, vala, libgtop, pkgconfig, gtk3, glib
+, bash, makeWrapper, itstool, libxml2, gnome3 }:
+
+# TODO: icons and theme still does not work
+# use packaged gnome3.gnome_icon_theme_symbolic 
+
+stdenv.mkDerivation rec {
+  name = "baobab-3.10.1";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/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 ];
+
+  buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
+
+  postInstall = ''
+    wrapProgram "$out/bin/baobab" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
+  '';
+
+  preFixup = ''
+    rm $out/share/icons/hicolor/icon-theme.cache
+    rm $out/share/icons/HighContrast/icon-theme.cache
+  '';
+
+  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/default.nix b/pkgs/desktops/gnome-3/default.nix
index 197a135dcaa..204a7600cf1 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -14,6 +14,8 @@ rec {
 
   at_spi2_core = callPackage ./core/at-spi2-core { };
 
+  baobab = callPackage ./core/baobab { };
+
   caribou = callPackage ./core/caribou { };
 
   dconf = callPackage ./core/dconf { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88feaa12091..5f1728b599f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7447,6 +7447,8 @@ let
   };
   awesome = awesome-3-5;
 
+  inherit (gnome3) baobab;
+
   baresip = callPackage ../applications/networking/instant-messengers/baresip {
     ffmpeg = ffmpeg_1;
   };
-- 
GitLab


From 85d830334a7c4957f0c2718135ac5bc19f3f9c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 15 Feb 2014 22:52:22 +0100
Subject: [PATCH 1289/3789] duply: update 1.5.11 -> 1.6.0

---
 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 b184dff11cd..91718fc02f7 100644
--- a/pkgs/tools/backup/duply/default.nix
+++ b/pkgs/tools/backup/duply/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "duply-1.5.11";
+  name = "duply-1.6.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.5.x/duply_1.5.11.tgz";
-    sha256 = "07z4wl75z227v8y9xwc2pfdp307a5jzx4sif598vprqync0g6mmk";
+    url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.6.x/duply_1.6.0.tgz";
+    sha256 = "1i1yy4z6fcf3lq2k72cqcyqspm7pa1m949f8l9yscjm47bwp5g8f";
   };
 
   buildInputs = [ txt2man makeWrapper ];
-- 
GitLab


From 3250375f20f5f1d87ce29719182ba3c689226e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 16 Feb 2014 01:19:16 +0100
Subject: [PATCH 1290/3789] Remove dvswitch: I don't use it, and it's broken

---
 pkgs/applications/video/dvswitch/default.nix | 29 --------------------
 pkgs/top-level/all-packages.nix              |  2 --
 2 files changed, 31 deletions(-)
 delete mode 100644 pkgs/applications/video/dvswitch/default.nix

diff --git a/pkgs/applications/video/dvswitch/default.nix b/pkgs/applications/video/dvswitch/default.nix
deleted file mode 100644
index 8803fe0a786..00000000000
--- a/pkgs/applications/video/dvswitch/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, alsaLib, boost, cmake, gtkmm, libXau, libXdmcp
-, libXv, libav, pixman, libpthreadstubs, pkgconfig 
-}:
-
-stdenv.mkDerivation rec {
-  name = "dvswitch-${version}";
-  version = "0.8.3.6";
-
-  src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/3615/${name}.tar.gz";
-    sha256 = "7bd196389f9913ae08e12a29e168d79324c508bb545eab114df77b0375cd87f0";
-  };
-
-  buildInputs = [
-    alsaLib boost cmake gtkmm libXau libXdmcp libXv libav
-    libpthreadstubs pixman pkgconfig
-  ];
-
-  patchPhase = ''
-    sed -e "s@prefix /usr/local@prefix $out@" -i CMakeLists.txt
-  '';
-
-  meta =  with stdenv.lib; {
-    description = "interactive live video mixer for DV streams";
-    homepage = "http://dvswitch.alioth.debian.org";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1dba884a2c0..09597b9dbc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7632,8 +7632,6 @@ let
 
   dvdauthor = callPackage ../applications/video/dvdauthor { };
 
-  dvswitch = callPackage ../applications/video/dvswitch { };
-
   dwb = callPackage ../applications/networking/browsers/dwb { };
 
   dwm = callPackage ../applications/window-managers/dwm {
-- 
GitLab


From 180e5ca0db96e28721b523527e59e251f35aa344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 16 Feb 2014 09:53:15 +0100
Subject: [PATCH 1291/3789] nvidia driver: fix eval with older kernels (e.g.
 3.10)

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 98bbaef8770..6d3bdd90849 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -8,6 +8,8 @@
 
 with stdenv.lib;
 
+assert (!libsOnly) -> kernel != null;
+
 let
 
   versionNumber = "331.38";
@@ -19,7 +21,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
 
-  patches = optional (versionAtLeast kernel.version "3.13") ./kernel-3.13.patch ;
+  patches = optional (kernel ? version && versionAtLeast kernel.version "3.13") ./kernel-3.13.patch ;
 
   src =
     if stdenv.system == "i686-linux" then
-- 
GitLab


From 57240400cb1f5ed8a0637e1198001d66f5d93b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 16 Feb 2014 10:00:56 +0100
Subject: [PATCH 1292/3789] nvidia driver: allow building on Hydra, maintain

The stuff is unfree, but distribution in any form *is* encouraged, c.f.
http://metadata.ftp-master.debian.org/changelogs//non-free/n/nvidia-graphics-drivers/nvidia-graphics-drivers_319.82-1_copyright
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 6d3bdd90849..1632f4f4ecb 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -53,11 +53,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ perl ];
 
-  meta = {
+  meta = with stdenv.lib.meta; {
     homepage = http://www.nvidia.com/object/unix.html;
     description = "X.org driver and kernel module for NVIDIA graphics cards";
-    license = stdenv.lib.licenses.unfreeRedistributable;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
+    license = licenses.unfreeRedistributable;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.vcunat ];
   };
 }
-- 
GitLab


From 47ead60c031445d374136dfad35884f77637cbb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 15 Feb 2014 23:08:18 +0100
Subject: [PATCH 1293/3789] plantuml: update 7982 -> 7991

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

diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 10886e969a2..6ba3d9a4f59 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "7982";
+  version = "7991";
   name = "plantuml-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/plantuml.${version}.jar";
-    sha256 = "0hxs0whjgx36j5azdcna40rw2c7smhg0qm3kzld9vx88m0c51dgl";
+    sha256 = "0afhgiq2165ahj8ww0pmk69nqgpibllp9nhpk8wapg3zknh2hx5r";
   };
 
   # It's only a .jar file and a shell wrapper
-- 
GitLab


From 9a86ad2f7f3c4fd37b90cba98b935e2f64902bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 16 Feb 2014 11:25:49 +0100
Subject: [PATCH 1294/3789] xorg.xkeyboard-config: commit forgotten fixups

Without these there was also a mysterious collision in nixos etc generation.
---
 pkgs/servers/x11/xorg/overrides.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 499d78b947e..8b2617f0621 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -197,7 +197,16 @@ in
   };
 
   xkeyboardconfig = attrs: attrs // {
+    #TODO: resurrect patches for US_intl and Esperanto?
+
     buildInputs = attrs.buildInputs ++ [args.intltool];
+
+    # 1: compatibility for X11/xkb location
+    # 2: I think pkgconfig/ is supposed to be in /lib/
+    postInstall = ''
+      ln -s share "$out/etc"
+      mkdir "$out/lib" && ln -s ../share/pkgconfig "$out/lib/"
+    '';
   };
 
   xmodmap = attrs: attrs // {
-- 
GitLab


From 26d7645b6bccbf91fc74060bae47899d12f639f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 16 Feb 2014 11:23:26 +0100
Subject: [PATCH 1295/3789] python26: unbreak build (revert from db5 to db44)

The bsddb module is apparently not compatible with db5 (or db48), so switch
back to db44. Fixes the following build error:

  $ nix-build -A python26.modules
  these derivations will be built:
    /nix/store/5zcqmpa4iby0aa342psjph0byiyikm6h-python-bsddb-2.6.8.drv
  building path(s) `/nix/store/qpsjyx7nmxhm9zq40674wr67dx8w6ycl-python-bsddb-2.6.8'
  building /nix/store/qpsjyx7nmxhm9zq40674wr67dx8w6ycl-python-bsddb-2.6.8
  unpacking sources
  unpacking source archive /nix/store/2qwc1kd8allnaljm1z360lv9jsf8cfqy-Python-2.6.8.tar.bz2
  source root is Python-2.6.8
  patching sources
  applying patch /nix/store/cfk04ans56xql9l6waqhqzzd60g9rzxi-search-path.patch
  patching file setup.py
  Hunk #1 succeeded at 424 (offset 145 lines).
  applying patch /nix/store/dxscwf37hgq0xafs54h0c8xx47vg6d5g-nix-store-mtime.patch
  patching file Python/import.c
  Hunk #1 succeeded at 747 (offset -4 lines).
  configuring
  building
  running build_ext
  INFO: Can't locate Tcl/Tk libs and/or headers
  Traceback (most recent call last):
    File "./setup.py", line 2037, in <module>
      main()
    File "./setup.py", line 2032, in main
      'Lib/smtpd.py']
    File "/nix/store/xxzwak31qql6vq7v35xmq68zmjpfr5py-python-2.6.8/lib/python2.6/distutils/core.py", line 152, in setup
      dist.run_commands()
    File "/nix/store/xxzwak31qql6vq7v35xmq68zmjpfr5py-python-2.6.8/lib/python2.6/distutils/dist.py", line 975, in run_commands
      self.run_command(cmd)
    File "/nix/store/xxzwak31qql6vq7v35xmq68zmjpfr5py-python-2.6.8/lib/python2.6/distutils/dist.py", line 995, in run_command
      cmd_obj.run()
    File "/nix/store/xxzwak31qql6vq7v35xmq68zmjpfr5py-python-2.6.8/lib/python2.6/distutils/command/build_ext.py", line 340, in run
      self.build_extensions()
    File "./setup.py", line 249, in build_extensions
      longest = max([len(e.name) for e in self.extensions])
  ValueError: max() arg is an empty sequence
  builder for `/nix/store/5zcqmpa4iby0aa342psjph0byiyikm6h-python-bsddb-2.6.8.drv' failed with exit code 1
  error: build of `/nix/store/5zcqmpa4iby0aa342psjph0byiyikm6h-python-bsddb-2.6.8.drv' failed
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09597b9dbc2..cfeb49bc6bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3231,7 +3231,9 @@ let
   python32 = callPackage ../development/interpreters/python/3.2 { };
 
   python = python27;
-  python26 = callPackage ../development/interpreters/python/2.6 { };
+  python26 = callPackage ../development/interpreters/python/2.6 {
+    db = db44;
+  };
   python27 = callPackage ../development/interpreters/python/2.7 {
     libX11 = xlibs.libX11;
   };
-- 
GitLab


From 923681d576009ca9a18a18d8494e778cb8e568ae Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 16 Feb 2014 11:25:25 +0100
Subject: [PATCH 1296/3789] yelp-xsl: new package

Yelp's universal stylesheets for Mallard and DocBook.

https://wiki.gnome.org/Apps/Yelp
---
 .../gnome-3/core/yelp-xsl/default.nix         | 23 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/yelp-xsl/default.nix

diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
new file mode 100644
index 00000000000..708a8ff32d6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/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 ];
+    license = [licenses.gpl2 licenses.lgpl2];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 204a7600cf1..343f110aedc 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -84,6 +84,8 @@ rec {
 
   vte = callPackage ./core/vte { };
 
+  yelp_xsl = callPackage ./core/yelp-xsl { };
+
   zenity = callPackage ./core/zenity { };
 
 
-- 
GitLab


From da36d7d2207cda0413deeee9af0f42c071dc6d60 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 16 Feb 2014 11:42:22 +0100
Subject: [PATCH 1297/3789] yelp: new package

Yelp is the help viewer in Gnome.

https://wiki.gnome.org/Apps/Yelp
---
 pkgs/desktops/gnome-3/core/yelp/default.nix | 43 +++++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix           |  2 +
 pkgs/top-level/all-packages.nix             |  2 +
 3 files changed, 47 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/yelp/default.nix

diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
new file mode 100644
index 00000000000..b5f6600fb60
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib, file
+, bash, makeWrapper, itstool, libxml2, libxslt, gnome3, icu }:
+
+# TODO: icons and theme still does not work
+# use packaged gnome3.gnome_icon_theme_symbolic 
+
+stdenv.mkDerivation rec {
+  name = "yelp-3.10.1";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/yelp/3.10/${name}.tar.xz";
+    sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816";
+  };
+
+  configureFlags = [ "--disable-static" ];
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
+
+  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool libxml2 libxslt icu file
+                  gnome3.gsettings_desktop_schemas makeWrapper gnome3.yelp_xsl ];
+
+  installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
+
+  postInstall = ''
+    wrapProgram "$out/bin/yelp" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
+  '';
+
+  preFixup = ''
+  '';
+
+  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/default.nix b/pkgs/desktops/gnome-3/default.nix
index 343f110aedc..07e1a8bf841 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -84,6 +84,8 @@ rec {
 
   vte = callPackage ./core/vte { };
 
+  yelp = callPackage ./core/yelp { };
+
   yelp_xsl = callPackage ./core/yelp-xsl { };
 
   zenity = callPackage ./core/zenity { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f1728b599f..3be72edb240 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9235,6 +9235,8 @@ let
 
   yate = callPackage ../applications/misc/yate { };
 
+  inherit (gnome3) yelp;
+
   qgis = callPackage ../applications/misc/qgis {};
 
   ykpers = callPackage ../applications/misc/ykpers {};
-- 
GitLab


From bb8a8914121ff966ed0ec6c883899dcfd9488197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 16 Feb 2014 12:01:14 +0100
Subject: [PATCH 1298/3789] python26: update dependency 'db44' to 'db47'

I downgraded too aggressively from db5 to db4. db48 doesn't work but
db47 does, so there is no need to downgrade further.
---
 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 cfeb49bc6bd..4b1605240b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3232,7 +3232,7 @@ let
 
   python = python27;
   python26 = callPackage ../development/interpreters/python/2.6 {
-    db = db44;
+    db = db47;
   };
   python27 = callPackage ../development/interpreters/python/2.7 {
     libX11 = xlibs.libX11;
-- 
GitLab


From abf901484c67e385a99f9fcdf4f7a2abfe208ba6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 16 Feb 2014 07:33:07 -0500
Subject: [PATCH 1299/3789] Allow directly setting hashedPassword for root

---
 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 a0fd99732bd..2d9b941a2ca 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -369,7 +369,7 @@ in
         home = "/root";
         shell = cfg.defaultUserShell;
         group = "root";
-        hashedPassword = config.security.initialRootPassword;
+        hashedPassword = mkDefault config.security.initialRootPassword;
       };
       nobody = {
         uid = ids.uids.nobody;
-- 
GitLab


From d34f77fd1fdbb781ef2e70874b09e234c2768991 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 16 Feb 2014 14:08:48 +0100
Subject: [PATCH 1300/3789] feh: add jpeg image manipulation support

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

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 53c8fa5bf76..1e920ff65c5 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib
+{ stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng, giblib
 , libXinerama, curl }:
 
 stdenv.mkDerivation rec {
@@ -9,12 +9,16 @@ stdenv.mkDerivation rec {
     sha256 = "1wlhfbglzc1jzsh80s4s1fawclgzyjy2105ffzx2mw9s0c1xds5l";
   };
 
-  buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl ];
+  buildInputs = [makeWrapper x11 imlib2 giblib libjpeg libpng libXinerama curl ];
 
   preBuild = ''
     makeFlags="PREFIX=$out"
   '';
 
+  postInstall = ''
+    wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg}/bin"
+  '';
+
   meta = {
     description = "A light-weight image viewer";
     homepage = https://derf.homelinux.org/projects/feh/;
-- 
GitLab


From 52248aa7a20f707afdd42cdb3973a5df2d5807ae Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 13 Feb 2014 22:04:07 -0600
Subject: [PATCH 1301/3789] kernel: 3.12.10 -> 3.12.11 (close #1743)

---
 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 cd2e5cdae87..352b3cc483d 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.10";
+  version = "3.12.11";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0p30mfrf3jfp353k0fbfpbmz3sfkhlyzcispqg22dc0lzcj76aj7";
+    sha256 = "1zqwfzb0hmx69caw54np6if2nybmin4mhxj9milfflc6z40fn06r";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 0b5d523b84aa87221fe6b52ad25c055f0e2dfe56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 16 Feb 2014 14:22:24 +0100
Subject: [PATCH 1302/3789] redshift: default to string type for option
 brightness

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

diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 332d742a141..02416f5ef12 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -38,12 +38,12 @@ in {
     services.redshift.brightness = {
       day = mkOption {
         description = "Screen brightness to apply during the day (between 0.1 and 1.0)";
-        default = 1;
+        default = "1";
         type = types.uniq types.string;
       };
       night = mkOption {
         description = "Screen brightness to apply during the night (between 0.1 and 1.0)";
-        default = 1;
+        default = "1";
         type = types.uniq types.string;
       };
     };
-- 
GitLab


From efa7adcca1a4108887c8cd8ccd993ed9de7e76b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 16 Feb 2014 14:23:56 +0100
Subject: [PATCH 1303/3789] xulrunner: disable parallel builds (until fixed)

cf. https://github.com/NixOS/nixpkgs/pull/1699#issuecomment-35196282
---
 pkgs/applications/networking/browsers/firefox/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 3b2911a97ac..c0cfb60420b 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -82,7 +82,7 @@ rec {
         "--disable-javaxpcom"
       ] ++ commonConfigureFlags;
 
-    enableParallelBuilding = true;
+    #enableParallelBuilding = true; # cf. https://github.com/NixOS/nixpkgs/pull/1699#issuecomment-35196282
 
     preConfigure =
       ''
-- 
GitLab


From a345912b65dbb5b337a7e3db1528bffaf70792c0 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sun, 16 Feb 2014 15:48:06 +0100
Subject: [PATCH 1304/3789] pngcrush: update from 1.7.70 to 1.7.71

---
 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 2abc84e78e4..e5c7fbeb0d7 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.70";
+  name = "pngcrush-1.7.71";
 
   src = fetchurl {
     url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
-    sha256 = "04zgnqdfq7mcsgml719wb552v8cfg52d8knbhqv55kwgw7y822jh";
+    sha256 = "095al1l86h55aiig3y1aqlwkxcwwf215lq3f29z1hdgz4a0sbcyd";
   };
 
   configurePhase = ''
-- 
GitLab


From 5228c2b94ee49da542c15deefda15ca60a7c2247 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sun, 16 Feb 2014 15:50:24 +0100
Subject: [PATCH 1305/3789] elixir: update from 0.12.3 to 0.12.4

---
 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 56fc15b0511..698c75cfd16 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.3";
+  version = "0.12.4";
 in
 stdenv.mkDerivation {
   name = "elixir-${version}";
 
   src = fetchurl {
     url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "1im00cki38ldsig93djlsap8zbgwv74kpgw7xg9l6ik2cbpk0131";
+    sha256 = "0f9jbijby8alwn9yv1fncr2yn0pghdqsvixkdcd6s8yvjyhylm1l";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];
-- 
GitLab


From c7eb4982f35b1a798fce8151afe4a5c39c9a59cd Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sun, 16 Feb 2014 16:30:30 +0100
Subject: [PATCH 1306/3789] vlc: update from 2.1.2 to 2.1.3

---
 pkgs/applications/video/vlc/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index d75cca14b3a..c38e4dea443 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchurl {
     url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
-    sha256 = "1i4fzjv2x8mzx0bg52mgh1rrlircmb81jr58z90blbmww4mq36r1";
+    sha256 = "04d1lr7lxrq2767rjy4j0wr3sirx5sf1s9wdl3p4x500r7z64dp0";
   };
 
   buildInputs =
@@ -49,5 +49,6 @@ stdenv.mkDerivation rec {
     description = "Cross-platform media player and streaming server";
     homepage = http://www.videolan.org/vlc/;
     platforms = platforms.linux;
+    license = licenses.lgpl21Plus;
   };
 }
-- 
GitLab


From 4fab99a1959f92816d932c8a1e72ebc8766f253a Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 16 Feb 2014 14:34:39 +0100
Subject: [PATCH 1307/3789] perl.Finance::Quote 1.19 (close #1759)

This restores access to Yahoo. It is not available on CPAN yet, so the
download refers to Sourceforge directly.
---
 .../perl-modules/finance-quote-yahoo.patch           | 12 ------------
 pkgs/top-level/perl-packages.nix                     |  9 ++++-----
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/perl-modules/finance-quote-yahoo.patch

diff --git a/pkgs/development/perl-modules/finance-quote-yahoo.patch b/pkgs/development/perl-modules/finance-quote-yahoo.patch
deleted file mode 100644
index 213d96c31c8..00000000000
--- a/pkgs/development/perl-modules/finance-quote-yahoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru Finance-Quote-1.18-orig/lib/Finance/Quote/Yahoo/USA.pm Finance-Quote-1.18/lib/Finance/Quote/Yahoo/USA.pm
---- Finance-Quote-1.18-orig/lib/Finance/Quote/Yahoo/USA.pm	2012-09-30 13:37:20.000000000 +0000
-+++ Finance-Quote-1.18/lib/Finance/Quote/Yahoo/USA.pm	2014-02-13 22:02:53.538698928 +0000
-@@ -41,7 +41,7 @@
- 
- # URLs of where to obtain information.
- 
--$YAHOO_URL = ("http://finance.yahoo.com/d");
-+$YAHOO_URL = ("http://finance.yahoo.com/d/quotes.csv");
- 
- sub methods {return (canada   => \&yahoo,
-                      usa      => \&yahoo,
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a42af772046..55243cb7371 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3552,13 +3552,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   FinanceQuote = buildPerlPackage {
-    name = "Finance-Quote-1.18";
+    name = "Finance-Quote-1.19";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/EC/ECOCODE/Finance-Quote-1.18.tar.gz;
-      sha256 = "4240faabe0646defd4ec76ca9e111977b9e8060eaec41adeb284eb422a428393";
+      url = mirror://sourceforge/finance-quote/1.19/Finance-Quote-1.19.tar.gz;
+      sha256 = "0z1dqxw4by7rkwm113qp2mlhl5r0znr22kzinvr1p82svn0zvm2d";
     };
-    propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP ];
-    patches = [ ../development/perl-modules/finance-quote-yahoo.patch ];
+    propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc JSON ];
     meta = {
       homepage = http://finance-quote.sourceforge.net/;
       description = "Get stock and mutual fund quotes from various exchanges";
-- 
GitLab


From 5fefa65747b573775733ccd8f4520634f12b0b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 16 Feb 2014 18:16:33 +0100
Subject: [PATCH 1308/3789] gnome-terminator: update 0.96 -> 0.97

---
 pkgs/applications/misc/gnome_terminator/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/gnome_terminator/default.nix b/pkgs/applications/misc/gnome_terminator/default.nix
index b394719611d..c445c2b13d6 100644
--- a/pkgs/applications/misc/gnome_terminator/default.nix
+++ b/pkgs/applications/misc/gnome_terminator/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, python, pygtk, vte, gettext, intltool, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-terminator-0.96";
+  name = "gnome-terminator-${version}";
+  version = "0.97";
   
   src = fetchurl {
-    url = "https://launchpad.net/terminator/trunk/0.96/+download/terminator_0.96.tar.gz";
-    sha256 = "d708c783c36233fcafbd0139a91462478ae40f5cf696ef4acfcaf5891a843201";
+    url = "https://launchpad.net/terminator/trunk/${version}/+download/terminator-${version}.tar.gz";
+    sha256 = "1xykpx10g2zssx0ss6351ca6vmmma7zwxxhjz0fg28ps4dq88cci";
   };
   
   buildInputs =
-- 
GitLab


From 351951f315d3f57d53668052b761c432b44b7928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 16 Feb 2014 18:26:06 +0100
Subject: [PATCH 1309/3789] gnome-terminal: clean up a bit and add/update meta
 attributes

* No need to set 'phases', the default works.
* Use shell globbing instead of running 'ls' in a subshell.
* Quote shell variables.
* The project has got a new homepage; the old one points users to the
  new one (or the launchpad page)
* Make it available in the channel (meta.platforms = linux)
---
 .../misc/gnome_terminator/default.nix         | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/gnome_terminator/default.nix b/pkgs/applications/misc/gnome_terminator/default.nix
index c445c2b13d6..c9c53430bb5 100644
--- a/pkgs/applications/misc/gnome_terminator/default.nix
+++ b/pkgs/applications/misc/gnome_terminator/default.nix
@@ -9,23 +9,28 @@ stdenv.mkDerivation rec {
     sha256 = "1xykpx10g2zssx0ss6351ca6vmmma7zwxxhjz0fg28ps4dq88cci";
   };
   
-  buildInputs =
-    [ python pygtk vte gettext intltool makeWrapper
-    ];
-
-  phases = "unpackPhase installPhase";
+  buildInputs = [ python pygtk vte gettext intltool makeWrapper ];
 
   installPhase = ''
-    python setup.py --without-icon-cache install --prefix=$out
-    for i in $(cd $out/bin && ls); do
-        wrapProgram $out/bin/$i \
+    python setup.py --without-icon-cache install --prefix="$out"
+
+    for file in "$out"/bin/*; do
+        wrapProgram "$file" \
             --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
     done
   '';
 
-  meta = {
-    description = "Gnome terminal emulator with support for tiling and tabs";
-    homepage = http://www.tenshu.net/p/terminator.html;
-    license = "GPLv2";
+  meta = with stdenv.lib; {
+    description = "Terminal emulator with support for tiling and tabs";
+    longDescription = ''
+      The goal of this project is to produce a useful tool for arranging
+      terminals. It is inspired by programs such as gnome-multi-term,
+      quadkonsole, etc. in that the main focus is arranging terminals in grids
+      (tabs is the most common default method, which Terminator also supports).
+    '';
+    homepage = http://gnometerminator.blogspot.no/p/introduction.html;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.bjornfor ];
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From 89f710f18e3bc86e6feec6661a3910ea32bb662c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 16 Feb 2014 20:36:31 +0100
Subject: [PATCH 1310/3789] upgrade video-intel stack to 2.99.906

---
 pkgs/development/libraries/libva/default.nix       |  4 ++--
 pkgs/development/libraries/vaapi-intel/default.nix |  4 ++--
 pkgs/servers/x11/xorg/default.nix                  | 10 +++++-----
 pkgs/servers/x11/xorg/tarballs-7.7.list            |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 5b35d2b24ad..b0dbf1f8970 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }:
 
 stdenv.mkDerivation rec {
-  name = "libva-1.1.1";
+  name = "libva-1.2.1";
   
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
-    sha256 = "0kfdcrzcr82g15l0vvmm6rqr0f0604d4dgrza78gn6bfx7rppby0";
+    sha256 = "0fx8ivaghpq8g099bzwy5dm3bqnkbbhjq3qhgrpk390c4s5hy23h";
   };
 
   buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ];
diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index f05c01bf58d..1bb0b5732cb 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -2,11 +2,11 @@
 , intelgen4asm }:
 
 stdenv.mkDerivation rec {
-  name = "libva-intel-driver-1.0.20";
+  name = "libva-intel-driver-1.2.2";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2";
-    sha256 = "1jfl8909j3a3in6m8b5bx3dn7pzr8a1sw3sk4vzm7h3j2dkgpzhj";
+    sha256 = "0i3h9g8flnxf8gmag65xkvz7rib51dvx841ym3am5v3p51w79i0r";
   };
 
   buildInputs = [ pkgconfig libdrm libva libX11 ];
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 13c17cebde3..2b5e2629e25 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1510,14 +1510,14 @@ let
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) {
-    name = "xf86-video-intel-2.21.15";
+    name = "xf86-video-intel-2.99.906";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2;
-      sha256 = "1z6ncmpszmwqi9xr590c4kp4gjjf7mndcr56r35x2bx7h87i8nkx";
+      url = mirror://xorg/individual/driver/xf86-video-intel-2.99.906.tar.bz2;
+      sha256 = "1miwyv20q8bz5wml9n16l9vbrcnwpy7a3d3cmc92dy2p0b7474rd";
     };
-    buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ];
-  })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;};
+    buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ];
+  })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ;};
 
   xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) {
     name = "xf86-video-mach64-6.9.4";
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 175c9894694..8c193600833 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -129,7 +129,7 @@ mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2
 mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2
 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2
 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2
-mirror://xorg/individual/driver/xf86-video-intel-2.21.9.tar.bz2
+mirror://xorg/individual/driver/xf86-video-intel-2.99.906.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2
-- 
GitLab


From e24b01f6152c50090c96cdba8bcbee667124a300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 16 Feb 2014 21:37:18 +0100
Subject: [PATCH 1311/3789] desktop-manager.gnome3: add dconf support

---
 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 ecb6706544a..0507d298110 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -46,6 +46,7 @@ in {
     environment.systemPackages =
       [ gnome3.evince
         gnome3.eog
+        gnome3.dconf
         pkgs.ibus
         gnome3.gnome_shell
         gnome3.gnome_settings_daemon
@@ -56,4 +57,6 @@ in {
       ];
   };
 
+  environment.variables.GIO_EXTRA_MODULES = "${gnome3.dconf}/lib/gio/modules";
+
 }
-- 
GitLab


From 1c18c001b9bafcb22abf331ede3be7043afc1e11 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 16 Feb 2014 11:02:30 +0100
Subject: [PATCH 1312/3789] gnome3.gnome-common: new package

---
 pkgs/desktops/gnome-3/core/gnome-common/default.nix | 12 ++++++++++++
 pkgs/desktops/gnome-3/default.nix                   |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-common/default.nix

diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
new file mode 100644
index 00000000000..991630c72e1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, which }:
+
+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";
+  };
+
+  propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 07e1a8bf841..b0c0f6c7f78 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -4,7 +4,7 @@ rec {
   inherit (pkgs) glib gtk2 gtk3 gnome2;
   gtk = gtk3; # just to be sure
   libcanberra = pkgs.libcanberra_gtk3; # just to be sure
-  inherit (pkgs.gnome2) gnome_common ORBit2;
+  inherit (pkgs.gnome2) ORBit2;
   orbit = ORBit2;
   inherit (pkgs) libsoup;
 
@@ -36,6 +36,8 @@ rec {
 
   gnome_control_center = callPackage ./core/gnome-control-center { };
 
+  gnome_common = callPackage ./core/gnome-common { };
+
   gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
 
   gnome-menus = callPackage ./core/gnome-menus { };
-- 
GitLab


From e80b520a9deca97d8bea6e415c09263545f8ae1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 16 Feb 2014 23:45:47 +0100
Subject: [PATCH 1313/3789] gnome3.gnome_common: patch ACLOCAL like for gnome2

---
 pkgs/desktops/gnome-3/core/gnome-common/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
index 991630c72e1..5ae7ece6864 100644
--- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
@@ -8,5 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "aed69474a671e046523827f73ba5e936d57235b661db97900db7356e1e03b0a3";
   };
 
+  patches = [(fetchurl {
+    url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
+    sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
+  })];
+
   propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which
 }
-- 
GitLab


From 4b201b27bfb34d9494a517e34e1e81bf7b17b6db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 17 Feb 2014 00:24:13 +0100
Subject: [PATCH 1314/3789] gnome3: correctly place GIO_EXTRA_MODULES

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

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 0507d298110..063c9bb03bc 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -43,6 +43,7 @@ in {
         '';
       };
 
+    environment.variables.GIO_EXTRA_MODULES = "${gnome3.dconf}/lib/gio/modules";
     environment.systemPackages =
       [ gnome3.evince
         gnome3.eog
@@ -57,6 +58,5 @@ in {
       ];
   };
 
-  environment.variables.GIO_EXTRA_MODULES = "${gnome3.dconf}/lib/gio/modules";
 
 }
-- 
GitLab


From 561378ad030ef911b1aadf63678a21444a127e9a Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Mon, 17 Feb 2014 09:48:34 +0800
Subject: [PATCH 1315/3789] guile-xcb: fix hash

---
 pkgs/development/guile-modules/guile-xcb/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix
index a192025df69..fc02ab305a3 100644
--- a/pkgs/development/guile-modules/guile-xcb/default.nix
+++ b/pkgs/development/guile-modules/guile-xcb/default.nix
@@ -12,13 +12,8 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    name = "guile-xcb-1.3.tar.gz";
-    sha256 = "1gna9h3536s880p4bd9n2jyh2a8igwya6x7v3vfx19f4rppmai60";
-
-    urls = [
-     "http://www.markwitmer.com/dist/guile-xcb-1.3.tar.gz"
-     "https://github.com/mwitmer/guile-xcb/archive/1.3.tar.gz"
-    ];
+    url = "http://www.markwitmer.com/dist/guile-xcb-1.3.tar.gz";
+    sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149";
   };
 
   buildInputs = [ pkgconfig guile texinfo ];
-- 
GitLab


From cc0bc747e27f23bad23e599a48ecfc5b4a2c0f64 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 17 Feb 2014 10:36:26 +0800
Subject: [PATCH 1316/3789] gstreamer: update from 1.2.2 to 1.2.3

---
 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 5e7548627fe..85730c1bf25 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.2";
+  name = "gstreamer-1.2.3";
 
   meta = {
     description = "Open source multimedia framework";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
-    sha256 = "b9f12137ab663edc6c37429b38ca7911074b9c2a829267fe855d4e57d916a0b6";
+    sha256 = "1syqn0kki5disx01q3y0z6p5qhr2a5g388wc6s649cw4lcbri6hg";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From bc304449675a1dd4aeb80ae23f3479c5a0e9c71e Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 17 Feb 2014 10:37:29 +0800
Subject: [PATCH 1317/3789] gst-plugins-base: update from 1.2.2 to 1.2.3

---
 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 01a75ce5211..0c8dbb21cfb 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.2";
+  name = "gst-plugins-base-1.2.3";
 
   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 = "fa90cf21eac0a77f9393100356aef99ae42072c31dc218d3ae2e7f86cd5ced69";
+    sha256 = "1qfs4lv91ggcck61pw0ybn3gzvx4kl2vsd6lp8l6ky3hq8syrvb1";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 396b9d760fc5b1332d8a1af9d218ed2dfa51cf49 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 17 Feb 2014 10:37:35 +0800
Subject: [PATCH 1318/3789] gst-plugins-good: update from 1.2.2 to 1.2.3

---
 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 616f63d7da7..71151c4e559 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.2";
+  name = "gst-plugins-good-1.2.3";
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
-    sha256 = "6c090f00e8e4588f12807bd9fbb06a03b84a512c93e84d928123ee4a42228a81";
+    sha256 = "0w74hms2zg0rnhilj9cbhx9wfiryrkcvhr1g90scrg8mllv3bcxz";
   };
 
   nativeBuildInputs = [ pkgconfig python ];
-- 
GitLab


From a96f3e2e8d07e5ff9c839aea96db85f5c29fcd61 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 17 Feb 2014 10:37:42 +0800
Subject: [PATCH 1319/3789] gst-plugins-bad: update from 1.2.2 to 1.2.3

---
 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 81207155625..a9137ad46a7 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-bad-1.2.2";
+  name = "gst-plugins-bad-1.2.3";
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
-    sha256 = "63e78db11b482d0529a0bde01e2ac23fd32c7cb99a5508b53ee4ca1051871b2c";
+    sha256 = "1317hik9fdmy300p7c2y3aw43y6v9dr8f1906zm7s876m48pjpar";
   };
 
   nativeBuildInputs = [ pkgconfig python ];
-- 
GitLab


From 7814a08a1ed9efdce9d96beb8ca2e8776fa3cf66 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 17 Feb 2014 10:37:45 +0800
Subject: [PATCH 1320/3789] gst-plugins-ugly: update from 1.2.2 to 1.2.3

---
 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 8dafbf013f3..50005004135 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.2";
+  name = "gst-plugins-ugly-1.2.3";
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
-    sha256 = "4b6aac272a5be0d68f365ef6fba0f829fc5c1d1d601bb4dd9e85f5289b2b56c3";
+    sha256 = "0fzbazgqrbyckbh2xqlzslzmm638bddp1fw8cc19kr7f0xv0lysk";
   };
 
   nativeBuildInputs = [ pkgconfig python ];
-- 
GitLab


From aab0ccaa931e0e7fe1c2cf6c46591b41c3c504a0 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 17 Feb 2014 10:37:48 +0800
Subject: [PATCH 1321/3789] gst-libav: update from 1.2.2 to 1.2.3

---
 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 47be4c8f4a0..ee2cb8830b0 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.2";
+  name = "gst-libav-1.2.3";
 
   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 = "585eb7971006100ad771a852e07bd2f3e23bcc6eb0b1253a40b5a0e40e4e7418";
+    sha256 = "1mmwyp6wahrx73zxiv67bwh9dqp7fn86igy4rkv0vx2m17hzpizb";
   };
 
   configureFlags = stdenv.lib.optionalString withSystemLibav
-- 
GitLab


From 2eedf210d300168d2a90103732007f8472f360a6 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 16 Feb 2014 18:18:35 +0100
Subject: [PATCH 1322/3789] celestia: fix install location

---
 pkgs/applications/science/astronomy/celestia/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index 6f9de9d981f..d4da5c113c9 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
     )
   '';
 
-  installPhase = ''make DESTDIR="$out" MKDIR_P="mkdir -p" install'';
+  installPhase = ''make MKDIR_P="mkdir -p" install'';
 
   enableParallelBuilding = true;
 
-- 
GitLab


From 72cf0e2280024b69b4ea73a7a53d17e1cbaba8b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 17 Feb 2014 12:32:43 +0100
Subject: [PATCH 1323/3789] gnome3.yelp-tools: add

---
 .../gnome-3/core/yelp-tools/default.nix       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/yelp-tools/default.nix

diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
new file mode 100644
index 00000000000..39ff3838f4a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/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;
+  };
+}
-- 
GitLab


From d8dd998ff0bc1d3ee6c7d897d12124c1a948190a Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Mon, 17 Feb 2014 12:35:02 +0100
Subject: [PATCH 1324/3789] gnome3: Add missing yelp_tools in
 gnome-3/default.nix

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

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index b0c0f6c7f78..bc6a2ff6842 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -90,6 +90,8 @@ rec {
 
   yelp_xsl = callPackage ./core/yelp-xsl { };
 
+  yelp_tools = callPackage ./core/yelp-tools { };
+
   zenity = callPackage ./core/zenity { };
 
 
-- 
GitLab


From 9d34103a57c835380b6b9c10ba55b7d94cd467fb Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Mon, 17 Feb 2014 12:20:01 +0100
Subject: [PATCH 1325/3789] gucharmap: new package

GNOME Character Map, based on the Unicode Character Database

https://wiki.gnome.org/Apps/Gucharmap
---
 .../gnome-3/core/gucharmap/default.nix        | 42 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gucharmap/default.nix

diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
new file mode 100644
index 00000000000..bf630e1947d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -0,0 +1,42 @@
+{ 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 ];
+
+  installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
+
+  postInstall = ''
+    wrapProgram "$out/bin/gucharmap" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
+  '';
+
+  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/default.nix b/pkgs/desktops/gnome-3/default.nix
index bc6a2ff6842..bb37d2fa2da 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -60,6 +60,8 @@ rec {
 
   gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
 
+  gucharmap = callPackage ./core/gucharmap { };
+
   gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; };
 
   eog = callPackage ./core/eog { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2592799d1b..ba46fff4df0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7880,6 +7880,8 @@ let
 
   gtimelog = pythonPackages.gtimelog;
 
+  inherit (gnome3) gucharmap;
+  
   guitarix = callPackage ../applications/audio/guitarix {
     fftw = fftwSinglePrec;
   };
-- 
GitLab


From 8e349e721cb17619c202aeadb3fbd3b6998bae40 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 17 Feb 2014 07:25:06 -0600
Subject: [PATCH 1326/3789] linux: 3.2.54 -> 3.2.55

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index f9135ea3e11..cee4bf31dfe 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.54";
+  version = "3.2.55";
   extraMeta.branch = "3.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "15mr1mrsldvs3jx9nc25pfmmdbz2ykiaxnqc26chn6k425l4kn67";
+    sha256 = "15fj7kd3ba52in1siqbdq45i7xzb53yy88l9k4bgfgds3j8wxj9m";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From c13701532843024e8cb1be070a9b293c6d527fa0 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 17 Feb 2014 04:09:17 -0600
Subject: [PATCH 1327/3789] grsecurity updates.

  - stable:  3.0-3.2.54-201402062221 -> 3.0-3.2.55-201402152203
  - testing: 3.0-3.13.3-201402132113 -> 3.0-3.13.3-201402152204

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/patches.nix | 12 ++++++------
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index c36779c295f..2480936b08c 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -78,11 +78,11 @@ rec {
   };
 
 
-  grsecurity_3_0_3_2_54 =
-    { name = "grsecurity-3.0-3.2.54";
+  grsecurity_3_0_3_2_55 =
+    { name = "grsecurity-3.0-3.2.55";
       patch = fetchurl {
-        url = https://grsecurity.net/stable/grsecurity-3.0-3.2.54-201402062221.patch;
-        sha256 = "14x887xibl7d50a1pxmi0snnwcnh27z8bnidhxg2xfasxxp248m5";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402152203.patch;
+        sha256 = "1600hydfq2dwyqqzfmsvy50kcicdm2lq44yiiwgnbiykq2135fwx";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54
@@ -92,8 +92,8 @@ rec {
   grsecurity_3_0_3_13_3 =
     { name = "grsecurity-3.0-3.13.3";
       patch = fetchurl {
-        url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402132113.patch;
-        sha256 = "143givk7xk54c2f9q7h2v5gdc3sy1kcd8j83vn1jfcyipzqkdqnk";
+        url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402152204.patch;
+        sha256 = "0c4mswka95zivil3a28ipsbnv2nhrmqwj4l4dig3n8pr6d2vgwc9";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba46fff4df0..c094bb2b9a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6674,7 +6674,7 @@ let
   # config options you need (e.g. by overriding extraConfig). See list of options here:
   # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
   linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_54 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_55 kernelPatches.grsec_path ];
     argsOverride = {
       modDirVersion = "${linux_3_2.modDirVersion}-grsec";
     };
-- 
GitLab


From f3a3119bd07e00c64bab7ac9631f259dc7e832ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:47:45 +0100
Subject: [PATCH 1328/3789] haskell-chunked-data: add version 0.1.0.0

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

diff --git a/pkgs/development/libraries/haskell/chunked-data/default.nix b/pkgs/development/libraries/haskell/chunked-data/default.nix
new file mode 100644
index 00000000000..95b52d50b4d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/chunked-data/default.nix
@@ -0,0 +1,19 @@
+{ cabal, blazeBuilder, monoTraversable, semigroups, systemFilepath
+, text, transformers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "chunked-data";
+  version = "0.1.0.0";
+  sha256 = "1wdgvhf170rv557dwsiqy6nhys965xhs6w24ays273fv8hn3yk9l";
+  buildDepends = [
+    blazeBuilder monoTraversable semigroups systemFilepath text
+    transformers vector
+  ];
+  meta = {
+    homepage = "https://github.com/fpco/chunked-data";
+    description = "Typeclasses for dealing with various chunked data representations";
+    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 2c3fc2d4d7c..2539b7fe917 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -754,6 +754,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   checkers = callPackage ../development/libraries/haskell/checkers {};
 
+  chunkedData = callPackage ../development/libraries/haskell/chunked-data {};
+
   citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {};
 
   cipherAes = callPackage ../development/libraries/haskell/cipher-aes {};
-- 
GitLab


From ba53ddcbb52ec0fd04a602cc0a9547d53aa1f229 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:02 +0100
Subject: [PATCH 1329/3789] haskell-conduit-combinators: add version 0.1.0.0

---
 .../haskell/conduit-combinators/default.nix   | 24 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/conduit-combinators/default.nix

diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
new file mode 100644
index 00000000000..8425c465331
--- /dev/null
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -0,0 +1,24 @@
+{ cabal, basicPrelude, chunkedData, conduit, hspec, monoTraversable
+, primitive, silently, systemFileio, systemFilepath, text
+, transformers, transformersBase, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "conduit-combinators";
+  version = "0.1.0.0";
+  sha256 = "0m4qfcm66likasvsvfriw8xiz5ibqhq5sk1wiwx0gk2d1qcnb3wx";
+  buildDepends = [
+    chunkedData conduit monoTraversable primitive systemFileio
+    systemFilepath text transformers transformersBase vector
+  ];
+  testDepends = [
+    basicPrelude chunkedData hspec monoTraversable silently text
+    transformers vector
+  ];
+  meta = {
+    homepage = "https://github.com/fpco/conduit-combinators";
+    description = "Commonly used conduit functions, for both chunked and unchunked data";
+    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 2539b7fe917..99fd4ebdd55 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -806,6 +806,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   conduit = callPackage ../development/libraries/haskell/conduit {};
 
+  conduitCombinators = callPackage ../development/libraries/haskell/conduit-combinators {};
+
   ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
 
   configurator = callPackage ../development/libraries/haskell/configurator {};
-- 
GitLab


From aaa4d951dd0c03452e53b932171b427737eddb15 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:17 +0100
Subject: [PATCH 1330/3789] haskell-enclosed-exceptions: add version 1.0.0.1

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

diff --git a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix
new file mode 100644
index 00000000000..113c454d6db
--- /dev/null
+++ b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix
@@ -0,0 +1,21 @@
+{ cabal, async, deepseq, hspec, liftedBase, monadControl
+, QuickCheck, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "enclosed-exceptions";
+  version = "1.0.0.1";
+  sha256 = "0imq5kp45yfkhkz51ld869pf9hnlkbh92nk0aig1z8cc6akjnjw0";
+  buildDepends = [
+    async deepseq liftedBase monadControl transformers
+  ];
+  testDepends = [
+    async deepseq hspec liftedBase monadControl QuickCheck transformers
+  ];
+  meta = {
+    homepage = "https://github.com/jcristovao/enclosed-exceptions";
+    description = "Catching all exceptions from within an enclosed computation";
+    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 99fd4ebdd55..c20afcd9275 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1019,6 +1019,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   emailValidate = callPackage ../development/libraries/haskell/email-validate {};
 
+  enclosedExceptions = callPackage ../development/libraries/haskell/enclosed-exceptions {};
+
   encoding = callPackage ../development/libraries/haskell/encoding {};
 
   enumerator = callPackage ../development/libraries/haskell/enumerator {};
-- 
GitLab


From 6e28b6ebb8471f12765096c0b6af0eb0664a62f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:28 +0100
Subject: [PATCH 1331/3789] haskell-text-stream-decode: add version 0.1.0.3

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

diff --git a/pkgs/development/libraries/haskell/text-stream-decode/default.nix b/pkgs/development/libraries/haskell/text-stream-decode/default.nix
new file mode 100644
index 00000000000..9954dc4f6a2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/text-stream-decode/default.nix
@@ -0,0 +1,15 @@
+{ cabal, deepseq, hspec, text }:
+
+cabal.mkDerivation (self: {
+  pname = "text-stream-decode";
+  version = "0.1.0.3";
+  sha256 = "0gz5w7n7yb6z5mfzlg3yg9s89wsqnmmk4j94invj2da0rw7d03xv";
+  buildDepends = [ text ];
+  testDepends = [ deepseq hspec text ];
+  meta = {
+    homepage = "http://github.com/fpco/text-stream-decode";
+    description = "Streaming decoding functions for UTF encodings";
+    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 c20afcd9275..c95fbfb0ad0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2371,6 +2371,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   textIcu = callPackage ../development/libraries/haskell/text-icu {};
 
+  textStreamDecode = callPackage ../development/libraries/haskell/text-stream-decode {};
+
   thespian = callPackage ../development/libraries/haskell/thespian {};
 
   thExtras = callPackage ../development/libraries/haskell/th-extras {};
-- 
GitLab


From e1993d4c922805479e8e6369215c7988da454465 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:35 +0100
Subject: [PATCH 1332/3789] haskell-JuicyPixels: update to version 3.1.3.3

---
 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 57c37139d4f..be9c67f797e 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.3.2";
-  sha256 = "0c0vavqisljsl8v8hvmxj8q3hmjq5layanbbyp0zcbj6yxv8s62a";
+  version = "3.1.3.3";
+  sha256 = "1j1kdr6x7rhpa45is04haxgf4i2jghcgak4km0f2i0k3pyiv647x";
   buildDepends = [
     binary deepseq mtl primitive transformers vector zlib
   ];
-- 
GitLab


From 4379ea19298ff556e5a3c089e8ab05350ad26873 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:37 +0100
Subject: [PATCH 1333/3789] haskell-classy-prelude-conduit: update to version
 0.8.0

---
 .../haskell/classy-prelude-conduit/default.nix      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
index af740197765..eec5677a89f 100644
--- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
@@ -1,14 +1,15 @@
-{ cabal, classyPrelude, conduit, hspec, monadControl, QuickCheck
-, resourcet, systemFileio, transformers, void
+{ cabal, classyPrelude, conduit, conduitCombinators, hspec
+, monadControl, QuickCheck, resourcet, systemFileio, transformers
+, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude-conduit";
-  version = "0.7.0";
-  sha256 = "0njhfqbcbsy1rv61fc4xqzqlb68hzqg9cr31f8bs6h7pa12n38zq";
+  version = "0.8.0";
+  sha256 = "1br2gjzafxgq6ksxl895m5acaffnswd1dhcjppx6gnyfa6i3fq1m";
   buildDepends = [
-    classyPrelude conduit monadControl resourcet systemFileio
-    transformers void
+    classyPrelude conduit conduitCombinators monadControl resourcet
+    systemFileio transformers void
   ];
   testDepends = [ conduit hspec QuickCheck transformers ];
   meta = {
-- 
GitLab


From c6855fc5a9c304901a5e677d28c68621c50901a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:39 +0100
Subject: [PATCH 1334/3789] haskell-classy-prelude: update to version 0.8.0

---
 .../libraries/haskell/classy-prelude/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
index d2c0ccaf652..f5429fb024d 100644
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@@ -1,15 +1,15 @@
-{ cabal, async, basicPrelude, deepseq, hashable, hspec, liftedBase
-, monadControl, monoTraversable, QuickCheck, semigroups
+{ cabal, basicPrelude, chunkedData, enclosedExceptions, hashable
+, hspec, liftedBase, monoTraversable, QuickCheck, semigroups
 , systemFilepath, text, time, transformers, unorderedContainers
 , vector, vectorInstances
 }:
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude";
-  version = "0.7.0";
-  sha256 = "19n2kzzskrdwyacq14y8gf1avcy7clp7gzqh36dhw7pypy3x0k9n";
+  version = "0.8.0";
+  sha256 = "02zf6v7a6bjf9z391bravx10mw0w4m4p5b78zap08z2i6fk5h91g";
   buildDepends = [
-    async basicPrelude deepseq hashable liftedBase monadControl
+    basicPrelude chunkedData enclosedExceptions hashable liftedBase
     monoTraversable semigroups systemFilepath text time transformers
     unorderedContainers vector vectorInstances
   ];
-- 
GitLab


From 58b51c95bdb92d77a7f6c72c7d348ee1a6bf18bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:40 +0100
Subject: [PATCH 1335/3789] haskell-conduit: update to version 1.0.15

---
 .../development/libraries/haskell/conduit/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index d2d221177c8..bf28c20e714 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -1,14 +1,15 @@
 { cabal, hspec, liftedBase, mmorph, monadControl, mtl, QuickCheck
-, resourcet, text, transformers, transformersBase, void
+, resourcet, text, textStreamDecode, transformers, transformersBase
+, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.13.1";
-  sha256 = "0kxfck6d72fdnymf2rj6m7h97svq1d2fq1ss5mlhsrks5fflia9y";
+  version = "1.0.15";
+  sha256 = "1ciys2b7a6n5k0ld66wpjxnrs5ys5dvg9n5k8282bc5zsd54mb59";
   buildDepends = [
-    liftedBase mmorph monadControl mtl resourcet text transformers
-    transformersBase void
+    liftedBase mmorph monadControl mtl resourcet text textStreamDecode
+    transformers transformersBase void
   ];
   testDepends = [
     hspec mtl QuickCheck resourcet text transformers void
-- 
GitLab


From b5ec3460b2c1f3a28d6aeab600f9ccfc231ec801 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:42 +0100
Subject: [PATCH 1336/3789] haskell-dbus: update to version 0.10.6

---
 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 a96f1499f97..304b9e84942 100644
--- a/pkgs/development/libraries/haskell/dbus/default.nix
+++ b/pkgs/development/libraries/haskell/dbus/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dbus";
-  version = "0.10.5";
-  sha256 = "1wblqkwlwv3bxhz2n4qm0w0npawng86y2hyacjxmx8cw25gkw41x";
+  version = "0.10.6";
+  sha256 = "0jbysa7czhp7yl3fb6sxiqppg8yb3cdk4v8hcs4y8yzwjj0lm7mf";
   buildDepends = [
     cereal libxmlSax network parsec random text transformers vector
     xmlTypes
-- 
GitLab


From 663e179856f898f02a603f8efe55a745990cba1e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:44 +0100
Subject: [PATCH 1337/3789] haskell-dns: update to version 1.1.1

---
 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 9dd35804f43..5434db27087 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.0.0";
-  sha256 = "16h7c332qdj77dw8kvrdn1jzhzsnrcybbbm5x7pxvgpnn0wzz8si";
+  version = "1.1.1";
+  sha256 = "1vyi0rqddaqpnh87gjracp0j3f7ai18qzr6zl6rjkszw3zfngww9";
   buildDepends = [
     attoparsec attoparsecConduit binary blazeBuilder conduit iproute
     mtl network networkConduit random
-- 
GitLab


From 87ddf3963a22226f9f9113316b0f0c854ca17700 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:46 +0100
Subject: [PATCH 1338/3789] haskell-hit: update to version 0.5.5

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

diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix
index 4dc73996cd1..abfe150c163 100644
--- a/pkgs/development/libraries/haskell/hit/default.nix
+++ b/pkgs/development/libraries/haskell/hit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hit";
-  version = "0.5.4";
-  sha256 = "1gr2f1bzncg8zlxk343p1ifnf2a2px000syzmr7hcf4yhhfavrhz";
+  version = "0.5.5";
+  sha256 = "18k2fgwflzs2lpkhxg2xvni3l9cdn3hk9ajrd4flz12j7vp0ga4c";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 1683378b3a1d1139c21d25e8a12a315dd3dcec25 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:48 +0100
Subject: [PATCH 1339/3789] haskell-irc: update to version 0.6.0.0

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

diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix
index 89d277d1f40..524c2de1f73 100644
--- a/pkgs/development/libraries/haskell/irc/default.nix
+++ b/pkgs/development/libraries/haskell/irc/default.nix
@@ -1,10 +1,10 @@
-{ cabal, parsec }:
+{ cabal, attoparsec }:
 
 cabal.mkDerivation (self: {
   pname = "irc";
-  version = "0.5.1.0";
-  sha256 = "1xkgqcjxlxqg60qlv26ypmvf9x288sjz1n47rb7zfvjhdimws8gj";
-  buildDepends = [ parsec ];
+  version = "0.6.0.0";
+  sha256 = "037hpdb4b6nb5w62w34alwybchzybz0bq2cgp0mv4xlw7bks2nqv";
+  buildDepends = [ attoparsec ];
   meta = {
     description = "A small library for parsing IRC messages";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From f5fb0e043d1d3216db96dea37590d907be7de1f5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:49 +0100
Subject: [PATCH 1340/3789] haskell-language-javascript: update to version
 0.5.9

---
 .../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 abf8df4f556..d2cc342c477 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.8";
-  sha256 = "0slwj2bi9v7qjr6ai5dwql7fqgsh8k9k2bzlsq407iacsv0w3b9h";
+  version = "0.5.9";
+  sha256 = "1m1fs2vaw3yn9ryd49aprxc5l10xkr86mlxxf5bk6qp51wnp9xqh";
   buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
   testDepends = [
     blazeBuilder Cabal HUnit mtl QuickCheck testFramework
-- 
GitLab


From 2a25467ece3be2f06e18c74d1f4f0ebf89e2b8fd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:51 +0100
Subject: [PATCH 1341/3789] haskell-libxml-sax: update to version 0.7.5

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

diff --git a/pkgs/development/libraries/haskell/libxml-sax/default.nix b/pkgs/development/libraries/haskell/libxml-sax/default.nix
index afdd782fe09..320a6f20699 100644
--- a/pkgs/development/libraries/haskell/libxml-sax/default.nix
+++ b/pkgs/development/libraries/haskell/libxml-sax/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "libxml-sax";
-  version = "0.7.4";
-  sha256 = "1vbxrmxxb6a58hd6dd81kz8fh198jkvwv4gxzbbfw44170946c0z";
+  version = "0.7.5";
+  sha256 = "0lbdq6lmiyrnzk6gkx09vvp928wj8qnqnqfzy14mfv0drj21f54r";
   buildDepends = [ text xmlTypes ];
   extraLibraries = [ libxml2 ];
   pkgconfigDepends = [ libxml2 ];
-- 
GitLab


From 669c336164d5c8cdf6a849bd42d25d5c02dab79c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:53 +0100
Subject: [PATCH 1342/3789] haskell-mono-traversable: update to version 0.3.0.1

---
 .../haskell/mono-traversable/default.nix         | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix
index ed88e24ffa9..03eb64da753 100644
--- a/pkgs/development/libraries/haskell/mono-traversable/default.nix
+++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix
@@ -1,16 +1,20 @@
-{ cabal, comonad, hashable, hspec, semigroupoids, semigroups, text
-, transformers, unorderedContainers, vector
+{ cabal, comonad, hashable, hspec, QuickCheck, semigroupoids
+, semigroups, text, transformers, unorderedContainers, vector
+, vectorInstances
 }:
 
 cabal.mkDerivation (self: {
   pname = "mono-traversable";
-  version = "0.2.0.0";
-  sha256 = "1wg0yzim3ql73w5rsxjnglwlg8r2hqliddmdk8vwsbvg02kgwxvz";
+  version = "0.3.0.1";
+  sha256 = "14vh6qhl6v46r857pfwkyhn8g8dh7q7vbm6z64zq1lhdw91ywn4f";
   buildDepends = [
     comonad hashable semigroupoids semigroups text transformers
-    unorderedContainers vector
+    unorderedContainers vector vectorInstances
+  ];
+  testDepends = [
+    hspec QuickCheck semigroups text transformers unorderedContainers
+    vector
   ];
-  testDepends = [ hspec text ];
   meta = {
     homepage = "https://github.com/snoyberg/mono-traversable";
     description = "Type classes for mapping, folding, and traversing monomorphic containers";
-- 
GitLab


From 641891a7c4749a82dc93668eb89e3168e83201d3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:55 +0100
Subject: [PATCH 1343/3789] haskell-network-conduit: update to version 1.0.2.2

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

diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index 024cf9b1d41..b859858b8be 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit";
-  version = "1.0.2.1";
-  sha256 = "1dq7pwimjkr0wpyjphbvjy3klkcjl8jin76am5jbz3cxk1dr20jk";
+  version = "1.0.2.2";
+  sha256 = "1l7r40raqbhfgwgp5knkqfg2b7pqm4h23c9slbx55r829if8c54h";
   buildDepends = [
     conduit liftedBase monadControl network transformers
   ];
-- 
GitLab


From 95b1e11618d127a95f74c8e4482d63b5f5c2bd68 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:56 +0100
Subject: [PATCH 1344/3789] haskell-network-protocol-xmpp: update to version
 0.4.6

---
 .../libraries/haskell/network-protocol-xmpp/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
index 910d2cc6774..cd56082d8b5 100644
--- a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
+++ b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-protocol-xmpp";
-  version = "0.4.5";
-  sha256 = "1phnd9nygpc8gmyriwaqjnvygxi5zg4nx2i1m3vwwxql221420gg";
+  version = "0.4.6";
+  sha256 = "0xmafjz11v2dlbyg2ny90ycz315s23yprdpxz3l06igjxw6h3v6n";
   buildDepends = [
     gnuidn gnutls gsasl libxmlSax monadsTf network text transformers
     xmlTypes
-- 
GitLab


From 641e37519b42bd5fe5118cc8e1f573c04aae80bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:48:58 +0100
Subject: [PATCH 1345/3789] haskell-pipes-attoparsec: update to version 0.4.0.1

---
 .../libraries/haskell/pipes-attoparsec/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
index 27f9d8a0b87..7204286671e 100644
--- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-attoparsec";
-  version = "0.4.0";
-  sha256 = "0xffqxsh8yvfdk39mdgkf0l2v284fr31nz5k16dq752p63fnczkw";
+  version = "0.4.0.1";
+  sha256 = "0f536x0l135b5pd14l6lri7kinwh2m4p7qw054lacw362y7004zf";
   buildDepends = [ attoparsec pipes pipesParse text transformers ];
   testDepends = [
     attoparsec HUnit mmorph pipes pipesParse tasty tastyHunit text
-- 
GitLab


From 9e15812d400bc1ef57d59ac7b0823137d0f70aca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:49:00 +0100
Subject: [PATCH 1346/3789] haskell-quickcheck-instances: update to version
 0.3.7

---
 .../libraries/haskell/quickcheck-instances/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
index 44e912514fc..3260fd17e9e 100644
--- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
+++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "quickcheck-instances";
-  version = "0.3.6";
-  sha256 = "1vaqwsdgi2mirplzg66zysc1ivjjr0qxyiibsh6j771hxs9qk2pr";
+  version = "0.3.7";
+  sha256 = "0zf2b2zisfx7j7i4jnb79w5hhk5dy53w23fi876flx3vl6mfvszw";
   buildDepends = [
     hashable QuickCheck text time unorderedContainers
   ];
-- 
GitLab


From be4b35eb15e4bb885ae546fdd7766da0889232e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:49:02 +0100
Subject: [PATCH 1347/3789] haskell-timezone-olson: update to version 0.1.3

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

diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix
index c46090cda9b..4cce59f6165 100644
--- a/pkgs/development/libraries/haskell/timezone-olson/default.nix
+++ b/pkgs/development/libraries/haskell/timezone-olson/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "timezone-olson";
-  version = "0.1.2";
-  sha256 = "1dp0nppvx732c27pybbyqw6jkx4kdgfc6vnc539m0xv005afpq9y";
+  version = "0.1.3";
+  sha256 = "02x3wq03h2zjhxrcv6vnq9hrzggdvpnj7zj8rcrq4scf67q6h8gc";
   buildDepends = [ binary extensibleExceptions time timezoneSeries ];
   meta = {
     homepage = "http://projects.haskell.org/time-ng/";
-- 
GitLab


From 2668493a14637f43dcfabaeb3279e061bbddaaa9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 12:49:04 +0100
Subject: [PATCH 1348/3789] haskell-websockets: update to version 0.8.2.0

---
 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 24b0554ea01..c0d500ace71 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.1.3";
-  sha256 = "16iq2grgafshjwhjxwb0qdxiawr6z6hxaksix52nr8l4wm9ibhjv";
+  version = "0.8.2.0";
+  sha256 = "1gphlil7n0g9y6vqwyn9fc4sl2ccninznc59p11052j8q6yb34ia";
   buildDepends = [
     attoparsec base64Bytestring binary blazeBuilder caseInsensitive
     entropy ioStreams mtl network random SHA text
-- 
GitLab


From ba9cc84ad0e72666cc3abac8f398f768ac3675a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Feb 2014 17:11:58 +0100
Subject: [PATCH 1349/3789] gnulib: update to version 0.1-83-g8008cac

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

diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix
index 0d298558e5e..2e5701375a4 100644
--- a/pkgs/development/tools/gnulib/default.nix
+++ b/pkgs/development/tools/gnulib/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation {
-  name = "gnulib-0.0-8015-gf0aab22";
+  name = "gnulib-0.1-83-g8008cac";
 
   src = fetchgit {
     url = "http://git.savannah.gnu.org/r/gnulib.git";
-    rev = "f0aab227265173908ecaa2353de6cf791cec3304";
-    sha256 = "162i39wvrmjhkg8w07i92vg9l0f0lk57zl1ynf0lvs70rkdd8a82";
+    rev = "8008cac0568ee76a4a9b7002f839e1abbad78af6";
+    sha256 = "1w8wh5ljh1qpssnj2lxizf45ggd7fgk5ggwhrnzjxxhn9m7rdvwm";
   };
 
   buildPhase = ":";
-- 
GitLab


From 958df8b9d12985431f7ec82978d7e8e6f852eb57 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 17 Feb 2014 20:46:33 +0100
Subject: [PATCH 1350/3789] i18n.consoleKeyMap: Accept string or path.

i18n.consoleKeyMap maps to KEYMAP=... in vconsole.conf and `loadkeymap'
in stage1. Both of these accept paths to a keymap file in addition to
a string containing the name of the keymap.

With this commit, it's possible to use your own keymap via:

i18n.consoleKeyMap = ./path/to/something.kmap
---
 nixos/modules/config/i18n.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 56d541cb9b3..310739aa170 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -53,7 +53,11 @@ in
       };
 
       consoleKeyMap = mkOption {
-        type = types.str;
+        type = mkOptionType {
+          name = "string or path";
+          check = t: (isString t || types.path.check t);
+        };
+
         default = "us";
         example = "fr";
         description = ''
-- 
GitLab


From 1d1667b7b0e34a4ef361386cb58dfc2ca3e1eb65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 17 Feb 2014 20:37:55 +0100
Subject: [PATCH 1351/3789] keybinder: new package

keybinder is a library for registering global keyboard shortcuts.
keybinder works with GTK-based applications using the X Window System.

https://github.com/engla/keybinder/
---
 .../libraries/keybinder/default.nix           | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/libraries/keybinder/default.nix

diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix
new file mode 100644
index 00000000000..20e2cd2218f
--- /dev/null
+++ b/pkgs/development/libraries/keybinder/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome_common
+, gtk_doc, gtk2, python, pygtk, pygobject, lua
+}:
+
+stdenv.mkDerivation rec {
+  name = "keybinder-${version}";
+  version = "0.3.0";
+
+  src = fetchurl {
+    name = "${name}.tar.gz";
+    url = "https://github.com/engla/keybinder/archive/v${version}.tar.gz";
+    sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf";
+  };
+
+  buildInputs = [
+    autoconf automake libtool pkgconfig gnome_common gtk_doc gtk2
+    python pygtk pygobject lua
+  ];
+
+  preConfigure = ''
+    ./autogen.sh --prefix="$out"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Library for registering global key bindings";
+    longDescription = ''
+      keybinder is a library for registering global keyboard shortcuts.
+      Keybinder works with GTK-based applications using the X Window System.
+
+      The library contains:
+
+      * A C library, ``libkeybinder``
+      * Gobject-Introspection (gir)  generated bindings
+      * Lua bindings, ``lua-keybinder``
+      * Python bindings, ``python-keybinder``
+      * An ``examples`` directory with programs in C, Lua, Python and Vala.
+    '';
+    homepage = https://github.com/engla/keybinder/;
+    license = licenses.gpl2Plus;
+    platform = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c094bb2b9a7..03c313b21b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4547,6 +4547,12 @@ let
 
   judy = callPackage ../development/libraries/judy { };
 
+  keybinder = callPackage ../development/libraries/keybinder {
+    inherit (gnome2) gnome_common;
+    automake = automake111x;
+    lua = lua5_1;
+  };
+
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
 
   lcms = lcms1;
-- 
GitLab


From 0fa9dca3624e6971babf57a00a284e50b8fe31ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 17 Feb 2014 20:39:38 +0100
Subject: [PATCH 1352/3789] gnome-terminator: add missing dependencies (for
 extra features)

Add 'keybinder' and 'python-notify' as dependencies. Fixes this:

  $ terminator
  [...]
  Warning: python-keybinder is not installed. This means the hide_window shortcut will be unavailable
  [...]
  ActivityWatch plugin unavailable: please install python-notify
---
 pkgs/applications/misc/gnome_terminator/default.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix                     | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gnome_terminator/default.nix b/pkgs/applications/misc/gnome_terminator/default.nix
index c9c53430bb5..71d8bbfd8e7 100644
--- a/pkgs/applications/misc/gnome_terminator/default.nix
+++ b/pkgs/applications/misc/gnome_terminator/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, python, pygtk, vte, gettext, intltool, makeWrapper }:
+{ stdenv, fetchurl, python, pygtk, notify, keybinder, vte, gettext, intltool
+, makeWrapper
+}:
 
 stdenv.mkDerivation rec {
   name = "gnome-terminator-${version}";
@@ -9,7 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1xykpx10g2zssx0ss6351ca6vmmma7zwxxhjz0fg28ps4dq88cci";
   };
   
-  buildInputs = [ python pygtk vte gettext intltool makeWrapper ];
+  buildInputs = [
+    python pygtk notify keybinder vte gettext intltool makeWrapper
+  ];
 
   installPhase = ''
     python setup.py --without-icon-cache install --prefix="$out"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03c313b21b6..d20cee5501f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8109,6 +8109,7 @@ let
 
   gnome_terminator = callPackage ../applications/misc/gnome_terminator {
     vte = gnome.vte.override { pythonSupport = true; };
+    inherit (pythonPackages) notify;
   };
 
   googleearth = callPackage_i686 ../applications/misc/googleearth { };
-- 
GitLab


From 493adc9227e5e2649e71756679b2527c144a8441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 17 Feb 2014 20:43:35 +0100
Subject: [PATCH 1353/3789] Rename 'gnome-terminator' to 'terminator'

Align the package name with what other distros call it.

Other distros: Fedora, Debian, Archlinux, OpenSUSE, Mageia, Slackware
(and probably more).
---
 .../misc/{gnome_terminator => terminator}/default.nix  |  4 ++--
 pkgs/top-level/all-packages.nix                        | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/applications/misc/{gnome_terminator => terminator}/default.nix (94%)

diff --git a/pkgs/applications/misc/gnome_terminator/default.nix b/pkgs/applications/misc/terminator/default.nix
similarity index 94%
rename from pkgs/applications/misc/gnome_terminator/default.nix
rename to pkgs/applications/misc/terminator/default.nix
index 71d8bbfd8e7..c337cd329c9 100644
--- a/pkgs/applications/misc/gnome_terminator/default.nix
+++ b/pkgs/applications/misc/terminator/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-terminator-${version}";
+  name = "terminator-${version}";
   version = "0.97";
   
   src = fetchurl {
-    url = "https://launchpad.net/terminator/trunk/${version}/+download/terminator-${version}.tar.gz";
+    url = "https://launchpad.net/terminator/trunk/${version}/+download/${name}.tar.gz";
     sha256 = "1xykpx10g2zssx0ss6351ca6vmmma7zwxxhjz0fg28ps4dq88cci";
   };
   
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d20cee5501f..c7b554de6e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8107,11 +8107,6 @@ let
     inherit (gnome) GConf;
   };
 
-  gnome_terminator = callPackage ../applications/misc/gnome_terminator {
-    vte = gnome.vte.override { pythonSupport = true; };
-    inherit (pythonPackages) notify;
-  };
-
   googleearth = callPackage_i686 ../applications/misc/googleearth { };
 
   google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin {
@@ -8912,6 +8907,11 @@ let
 
   telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {};
 
+  terminator = callPackage ../applications/misc/terminator {
+    vte = gnome.vte.override { pythonSupport = true; };
+    inherit (pythonPackages) notify;
+  };
+
   tesseract = callPackage ../applications/graphics/tesseract { };
 
   thinkingRock = callPackage ../applications/misc/thinking-rock { };
-- 
GitLab


From 668e81ad5a1824f80348904761662d41aefeaf4c Mon Sep 17 00:00:00 2001
From: Mihaly Barasz <klao@nilcons.com>
Date: Mon, 17 Feb 2014 23:04:13 +0100
Subject: [PATCH 1354/3789] Add nc-indicators-0.1 Haskell package

---
 pkgs/applications/misc/nc-indicators/default.nix | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/applications/misc/nc-indicators/default.nix

diff --git a/pkgs/applications/misc/nc-indicators/default.nix b/pkgs/applications/misc/nc-indicators/default.nix
new file mode 100644
index 00000000000..dec605daf58
--- /dev/null
+++ b/pkgs/applications/misc/nc-indicators/default.nix
@@ -0,0 +1,16 @@
+{ cabal, attoparsec, gtk, hflags, lens, pipes, stm }:
+
+cabal.mkDerivation (self: {
+  pname = "nc-indicators";
+  version = "0.1";
+  sha256 = "19amwfcbwfxcj0gr7w0vgxl427l43q3l2s3n3zsxhqwkfblxmfy5";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ attoparsec gtk hflags lens pipes stm ];
+  meta = {
+    homepage = "https://github.com/nilcons/nc-indicators";
+    description = "CPU load and memory usage indicators for i3bar";
+    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 c95fbfb0ad0..dd996a0d576 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2793,6 +2793,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     QuickCheck = self.QuickCheck2;
   };
 
+  nc-indicators = callPackage ../applications/misc/nc-indicators {};
+
   taffybar = callPackage ../applications/misc/taffybar {};
 
   yi = callPackage ../applications/editors/yi/yi.nix {};
-- 
GitLab


From e1801a83f0f08619f7f0303787f314b13b91be20 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 18 Feb 2014 00:09:53 +0100
Subject: [PATCH 1355/3789] gnome-common: Propagate autoconf and automake build
 inputs

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
index 5ae7ece6864..12b2510dc43 100644
--- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, which }:
+{ stdenv, fetchurl, which, autoconf, automake }:
 
 stdenv.mkDerivation rec {
   name = "gnome-common-3.10.0";
@@ -13,5 +13,5 @@ stdenv.mkDerivation rec {
     sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
   })];
 
-  propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which
+  propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which
 }
-- 
GitLab


From 92f9949e09163226da041865544ca9cde399fee1 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 15 Feb 2014 23:27:29 +0100
Subject: [PATCH 1356/3789] epiphany: new package

WebKit based web browser for GNOME

https://wiki.gnome.org/Apps/Epiphany
---
 .../gnome-3/core/epiphany/default.nix         | 49 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 53 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/epiphany/default.nix

diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
new file mode 100644
index 00000000000..7da49dbc738
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -0,0 +1,49 @@
+{ 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 }:
+
+# TODO: icons and theme still does not work
+# use packaged gnome3.gnome_icon_theme_symbolic 
+
+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 ];
+
+  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";
+
+  installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    wrapProgram "$out/bin/epiphany" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
+  '';
+
+  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/default.nix b/pkgs/desktops/gnome-3/default.nix
index bb37d2fa2da..b8832f6207a 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -20,6 +20,8 @@ rec {
 
   dconf = callPackage ./core/dconf { };
 
+  epiphany = callPackage ./core/epiphany { };
+
   evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
 
   evolution_data_server = callPackage ./core/evolution-data-server { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba46fff4df0..7c116010703 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7806,6 +7806,8 @@ let
 
   epdfview = callPackage ../applications/misc/epdfview { };
 
+  inherit (gnome3) epiphany;
+
   espeak = callPackage ../applications/audio/espeak { };
 
   espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
-- 
GitLab


From 8b4003c102673438a22a1519cfb6de0a8c56d74c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 18 Feb 2014 00:33:29 +0100
Subject: [PATCH 1357/3789] libgee: Update to 0.13.90 and enable checks

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

diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix
index 2775e87720c..03922778652 100644
--- a/pkgs/desktops/gnome-3/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgee/default.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  name = "libgee-0.13.4";
+  name = "libgee-0.13.90";
 
   src = fetchurl {
     url = "https://download.gnome.org/sources/libgee/0.13/${name}.tar.xz";
-    sha256 = "1gzyx8gy5m6r8km3xbb1kszz0v3p9vsbzwb78pf3fw122gwbjj4k";
+    sha256 = "9496f8fb249f7850db32b50e8675998db8b5276d4568cbf043faa7e745d7b7d6";
   };
 
+  doCheck = true;
+
   patches = [ ./fix_introspection_paths.patch ];
 
   buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
-- 
GitLab


From 53b6744646ecf850de545da5bdb2192b0a911883 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 18 Feb 2014 01:02:47 +0100
Subject: [PATCH 1358/3789] teensy-loader: New package

Firmware uploader for the teensy microcontroller board family.
---
 .../development/tools/misc/teensy/default.nix | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/tools/misc/teensy/default.nix

diff --git a/pkgs/development/tools/misc/teensy/default.nix b/pkgs/development/tools/misc/teensy/default.nix
new file mode 100644
index 00000000000..9902cd03453
--- /dev/null
+++ b/pkgs/development/tools/misc/teensy/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, unzip, libusb }:
+let
+  version = "2.1";
+in
+stdenv.mkDerivation {
+  name = "teensy-loader-${version}";
+  src = fetchurl {
+    url = "http://www.pjrc.com/teensy/teensy_loader_cli.2.1.zip";
+    sha256 = "0iidj3q0l2hds1gaadnwgni4qdgk6r0nv101986jxda8cw6h9zfs";
+  };
+
+  buildInputs = [ unzip libusb ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -v teensy_loader_cli $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    license = licenses.gpl3;
+    description = "Firmware uploader for the Teensy microcontroller board";
+    homepage = http://www.pjrc.com/teensy/;
+    maintainers = with maintainers; [ the-kenny ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7b554de6e1..4f781502e3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3771,6 +3771,8 @@ let
 
   tcptrack = callPackage ../development/tools/misc/tcptrack { };
 
+  teensy-loader = callPackage ../development/tools/misc/teensy { };
+
   texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
   texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
   texinfo4 = texinfo413;
-- 
GitLab


From 5174a694006ef1bf338e53163273088da3e12a41 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 18 Feb 2014 02:58:56 +0200
Subject: [PATCH 1359/3789] KDE 4.10: add branch info

---
 pkgs/desktops/kde-4.10/default.nix             | 5 +++--
 pkgs/desktops/kde-4.10/kde-package/default.nix | 3 ++-
 pkgs/desktops/kde-4.10/l10n/default.nix        | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-4.10/default.nix b/pkgs/desktops/kde-4.10/default.nix
index f56e64e2d15..feb6ed21409 100644
--- a/pkgs/desktops/kde-4.10/default.nix
+++ b/pkgs/desktops/kde-4.10/default.nix
@@ -1,9 +1,10 @@
 { callPackage, callPackageOrig, stdenv, qt48, release ? "4.10.5" }:
 
 let
+  branch = "4.10";
   # Need callPackageOrig to avoid infinite cycle
   kde = callPackageOrig ./kde-package {
-    inherit release ignoreList extraSubpkgs callPackage;
+    inherit release branch ignoreList extraSubpkgs callPackage;
   };
 
   # The list of igored individual modules
@@ -64,7 +65,7 @@ kde.modules // kde.individual //
   full = stdenv.lib.attrValues kde.modules;
 
   l10n = callPackage ./l10n {
-    inherit release;
+    inherit release branch;
     inherit (kde.manifest) stable;
   };
 }
diff --git a/pkgs/desktops/kde-4.10/kde-package/default.nix b/pkgs/desktops/kde-4.10/kde-package/default.nix
index 8a6e8e16751..9424a762c8f 100644
--- a/pkgs/desktops/kde-4.10/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.10/kde-package/default.nix
@@ -1,5 +1,5 @@
 { callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
-, release, ignoreList, extraSubpkgs
+, release, branch, ignoreList, extraSubpkgs
 }:
 
 let
@@ -19,6 +19,7 @@ rec {
   # Default meta attribute
   defMeta = {
     homepage = http://www.kde.org;
+    inherit branch;
     platforms = stdenv.lib.platforms.linux;
     inherit (qt4.meta) maintainers;
   };
diff --git a/pkgs/desktops/kde-4.10/l10n/default.nix b/pkgs/desktops/kde-4.10/l10n/default.nix
index c9fab80bffb..fa6406043b1 100644
--- a/pkgs/desktops/kde-4.10/l10n/default.nix
+++ b/pkgs/desktops/kde-4.10/l10n/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
+{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
 
 let
 
@@ -22,6 +22,7 @@ let
 
       meta = {
         description = "KDE translation for ${lang}";
+        inherit branch;
         license = "GPL";
         platforms = stdenv.lib.platforms.linux;
         inherit (kdelibs.meta) maintainers homepage;
-- 
GitLab


From 586188fa7d0bd4851a8c3ef30603a0efeaaa9430 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 18 Feb 2014 03:10:25 +0200
Subject: [PATCH 1360/3789] KDE 4.11: add branch meta

---
 pkgs/desktops/kde-4.11/default.nix             | 6 ++++--
 pkgs/desktops/kde-4.11/kde-package/default.nix | 3 ++-
 pkgs/desktops/kde-4.11/l10n/default.nix        | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-4.11/default.nix b/pkgs/desktops/kde-4.11/default.nix
index 95bf4b512c7..269bdc0d3a7 100644
--- a/pkgs/desktops/kde-4.11/default.nix
+++ b/pkgs/desktops/kde-4.11/default.nix
@@ -1,9 +1,11 @@
 { callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.5" }:
 
 let
+  branch = "4.11";
+
   # Need callPackageOrig to avoid infinite cycle
   kde = callPackageOrig ./kde-package {
-    inherit release ignoreList extraSubpkgs callPackage;
+    inherit release branch ignoreList extraSubpkgs callPackage;
   };
 
   # The list of igored individual modules
@@ -36,7 +38,7 @@ kde.modules // kde.individual //
   full = stdenv.lib.attrValues kde.modules;
 
   l10n = callPackage ./l10n {
-    inherit release;
+    inherit release branch;
     inherit (kde.manifest) stable;
   };
 }
diff --git a/pkgs/desktops/kde-4.11/kde-package/default.nix b/pkgs/desktops/kde-4.11/kde-package/default.nix
index 8a6e8e16751..9424a762c8f 100644
--- a/pkgs/desktops/kde-4.11/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.11/kde-package/default.nix
@@ -1,5 +1,5 @@
 { callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
-, release, ignoreList, extraSubpkgs
+, release, branch, ignoreList, extraSubpkgs
 }:
 
 let
@@ -19,6 +19,7 @@ rec {
   # Default meta attribute
   defMeta = {
     homepage = http://www.kde.org;
+    inherit branch;
     platforms = stdenv.lib.platforms.linux;
     inherit (qt4.meta) maintainers;
   };
diff --git a/pkgs/desktops/kde-4.11/l10n/default.nix b/pkgs/desktops/kde-4.11/l10n/default.nix
index c9fab80bffb..fa6406043b1 100644
--- a/pkgs/desktops/kde-4.11/l10n/default.nix
+++ b/pkgs/desktops/kde-4.11/l10n/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
+{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
 
 let
 
@@ -22,6 +22,7 @@ let
 
       meta = {
         description = "KDE translation for ${lang}";
+        inherit branch;
         license = "GPL";
         platforms = stdenv.lib.platforms.linux;
         inherit (kdelibs.meta) maintainers homepage;
-- 
GitLab


From 952fa02b9075f8d2bb7783e1cda3df491261fc6c Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 18 Feb 2014 03:18:02 +0200
Subject: [PATCH 1361/3789] KDE 4.12: add branch meta

---
 pkgs/desktops/kde-4.12/default.nix             | 6 ++++--
 pkgs/desktops/kde-4.12/kde-package/default.nix | 3 ++-
 pkgs/desktops/kde-4.12/l10n/default.nix        | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-4.12/default.nix b/pkgs/desktops/kde-4.12/default.nix
index b8e0a828a88..6d3dd46df35 100644
--- a/pkgs/desktops/kde-4.12/default.nix
+++ b/pkgs/desktops/kde-4.12/default.nix
@@ -1,9 +1,11 @@
 { callPackage, callPackageOrig, stdenv, qt48, release ? "4.12.2" }:
 
 let
+  branch = "4.12";
+
   # Need callPackageOrig to avoid infinite cycle
   kde = callPackageOrig ./kde-package {
-    inherit release ignoreList extraSubpkgs callPackage;
+    inherit release branch ignoreList extraSubpkgs callPackage;
   };
 
   # The list of igored individual modules
@@ -36,7 +38,7 @@ kde.modules // kde.individual //
   full = stdenv.lib.attrValues kde.modules;
 
   l10n = callPackage ./l10n {
-    inherit release;
+    inherit release branch;
     inherit (kde.manifest) stable;
   };
 }
diff --git a/pkgs/desktops/kde-4.12/kde-package/default.nix b/pkgs/desktops/kde-4.12/kde-package/default.nix
index 04f798c233a..6b4e1ba0ad8 100644
--- a/pkgs/desktops/kde-4.12/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.12/kde-package/default.nix
@@ -1,5 +1,5 @@
 { callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
-, release, ignoreList, extraSubpkgs
+, release, branch, ignoreList, extraSubpkgs
 }:
 
 let
@@ -19,6 +19,7 @@ rec {
   # Default meta attribute
   defMeta = {
     homepage = http://www.kde.org;
+    inherit branch;
     platforms = stdenv.lib.platforms.linux;
     inherit (qt4.meta) maintainers;
   };
diff --git a/pkgs/desktops/kde-4.12/l10n/default.nix b/pkgs/desktops/kde-4.12/l10n/default.nix
index c9fab80bffb..fa6406043b1 100644
--- a/pkgs/desktops/kde-4.12/l10n/default.nix
+++ b/pkgs/desktops/kde-4.12/l10n/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
+{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
 
 let
 
@@ -22,6 +22,7 @@ let
 
       meta = {
         description = "KDE translation for ${lang}";
+        inherit branch;
         license = "GPL";
         platforms = stdenv.lib.platforms.linux;
         inherit (kdelibs.meta) maintainers homepage;
-- 
GitLab


From c67f562d5e46808b0581c4368e3755819daa12ec Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 18 Feb 2014 04:13:45 +0200
Subject: [PATCH 1362/3789] add branch info

---
 pkgs/applications/audio/ardour/default.nix    | 1 +
 pkgs/development/tools/misc/autoconf/2.13.nix | 1 +
 pkgs/servers/http/apache-httpd/2.2.nix        | 1 +
 3 files changed, 3 insertions(+)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 3ed650d4ae7..08cecfea064 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
       Also read "The importance of Paying Something" on their homepage, please!
     '';
     homepage = http://ardour.org/;
+    branch  = "2";
     license = "GPLv2";
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix
index 2d8169d408f..f6793e3aeec 100644
--- a/pkgs/development/tools/misc/autoconf/2.13.nix
+++ b/pkgs/development/tools/misc/autoconf/2.13.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.gnu.org/software/autoconf/;
     description = "Part of the GNU Build System";
+    branch = "2.13";
 
     longDescription = ''
       GNU Autoconf is an extensible package of M4 macros that produce
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index f6b31177157..64dd15be3df 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Apache HTTPD, the world's most popular web server";
+    branch      = "2.2";
     homepage    = http://httpd.apache.org/;
     license     = stdenv.lib.licenses.asl20;
     platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-- 
GitLab


From f10280fc1984603f6d0093d8dfdbef5b4208454f Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 18 Feb 2014 04:14:05 +0200
Subject: [PATCH 1363/3789] youtubeDL: update from 2014.02.13 to 2014.02.17

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index c1b3cd57530..c769645edc3 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.02.13";
+  version = "2014.02.17";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0l88n1qrhjj2dvxlpd4hpqrdpxihqv3y9mrf1jgra3jyvb9pbnxq";
+    sha256 = "0yv13k8cqrv3i8zv5ad286niwxk5a4ggngcx6b0d6kg7c03rkgkq";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From 64ddd8671444d603213724d817ac00f7c87dfad0 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 18 Feb 2014 04:22:27 +0200
Subject: [PATCH 1364/3789] perlPackages.ExceptionClass: update from 1.30 to
 1.37

---
 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 55243cb7371..902d28c685f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3053,10 +3053,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ExceptionClass = buildPerlPackage rec {
-    name = "Exception-Class-1.30";
+    name = "Exception-Class-1.37";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "54e256fdb317c1736c2c257fa63d5b87cfb382870711b24937c36eb5171b3154";
+      sha256 = "1p6f20fi82mr5bz7d2c7nqh0322r8n2kszfw37c77g8b1b4r72w3";
     };
     propagatedBuildInputs = [ ClassDataInheritable DevelStackTrace ];
   };
-- 
GitLab


From 68d8f67c0418702ec013bafa4f5d4227a677cf96 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 17 Feb 2014 08:23:49 +0100
Subject: [PATCH 1365/3789] e17/terminology: upgrade to 0.4.0

---
 pkgs/desktops/e17/terminology/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/e17/terminology/default.nix b/pkgs/desktops/e17/terminology/default.nix
index f060d81bd00..25dd95c7f19 100644
--- a/pkgs/desktops/e17/terminology/default.nix
+++ b/pkgs/desktops/e17/terminology/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "terminology-${version}";
-  version = "0.3.0";
+  version = "0.4.0";
   src = fetchurl {
-    url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "1dn5bjswqgnqza7bngc6afqza47yh27xfwf5qg2kzfgs008hp1bp";
+    url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz";
+    sha256 = "1ing9l19h7f1f843rcabbjaynps1as4mpc31xz2adkafb3xd3wk3";
   };
   buildInputs = [ pkgconfig elementary eina eet evas ecore edje emotion ecore ethumb efreet ];
 
-- 
GitLab


From fb2d903a630035a4eab157cbaac966a9f67c6769 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 18 Feb 2014 04:36:00 -0600
Subject: [PATCH 1366/3789] Add myself to the maintainers list.

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fa004c859b4..ee3830e6d35 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -65,6 +65,7 @@
   sprock = "Roger Mason <rmason@mun.ca>";
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
   the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
+  thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
   tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
   urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
   vcunat = "Vladimír Čunát <vcunat@gmail.com>";
-- 
GitLab


From 5181cbd7c6b9449b78ef859d473a13b7a7101971 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Tue, 18 Feb 2014 13:22:02 +0100
Subject: [PATCH 1367/3789] libgit2-glib: Fix build after gnome3.gnome_common
 changes

---
 pkgs/desktops/gnome-3/default.nix                   | 2 +-
 pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index b0c0f6c7f78..1cb990b726b 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -113,6 +113,6 @@ rec {
 
   gitg = callPackage ./misc/gitg { };
 
-  libgit2-glib = callPackage ./misc/libgit2-glib { automake = pkgs.automake111x; };
+  libgit2-glib = callPackage ./misc/libgit2-glib { };
 
 }
diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
index 12d37ab5db5..17c3b4fa0a8 100644
--- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, which, gnome3, autoconf, automake, libtool, pkgconfig
+{ stdenv, fetchurl, gnome3, libtool, pkgconfig
 , gtk_doc, gobjectIntrospection, libgit2, glib }:
 
 stdenv.mkDerivation rec {
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
 
   configureScript = "sh ./autogen.sh";
 
-  buildInputs = [ which gnome3.gnome_common autoconf automake libtool
-                  pkgconfig gtk_doc gobjectIntrospection libgit2 glib ];
+  buildInputs = [ gnome3.gnome_common libtool pkgconfig
+                  gtk_doc gobjectIntrospection libgit2 glib ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-- 
GitLab


From 4247a34463f18febfa146e344ae4e355954e146f Mon Sep 17 00:00:00 2001
From: Dario Bertini <berdario@gmail.com>
Date: Tue, 18 Feb 2014 15:23:16 +0100
Subject: [PATCH 1368/3789] Updated vagrant to 1.4.3

---
 pkgs/development/tools/vagrant/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 80fc093822f..d0870e82b72 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -4,18 +4,18 @@
 assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
 
 stdenv.mkDerivation rec {
-  name = "vagrant-1.4.0";
+  name = "vagrant-1.4.3";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url    = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.0_x86_64.deb;
-        sha256 = "0hggajqdwk1qlkhf5sgdlmyxhan33q3pdgks9n5i2cw6f2ckw3rh";
+        url    = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_x86_64.deb;
+        sha256 = "dbd06de0f3560e2d046448d627bca0cbb0ee34b036ef605aa87ed20e6ad2684b";
       }
     else
       fetchurl {
-        url    = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.0_i686.deb;
-        sha256 = "03jcmsdl4na5n08phyvx65dnfv1gq9vgn07kcyqc2f8nq7vmcmkm";
+        url    = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_i686.deb;
+        sha256 = "66e613fc1c9e31ecaf8e5f1d07d2ae4fca3d4fc2e43593543962664258d9af9b";
       };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 70798243a221c4cf1e9a30135d5ea7f326a7c8b2 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 18 Feb 2014 16:34:34 +0100
Subject: [PATCH 1369/3789] titaniumsdk: Add 3.2 SDK option

---
 .../mobile/titaniumenv/build-app.nix          |   11 +-
 .../mobile/titaniumenv/default.nix            |   15 +-
 .../mobile/titaniumenv/examples/default.nix   |   13 +-
 .../examples/kitchensink/default.nix          |    8 +-
 .../{titaniumsdk.nix => titaniumsdk-3.1.nix}  |    0
 .../mobile/titaniumenv/titaniumsdk-3.2.nix    |   78 +
 pkgs/top-level/node-packages-generated.nix    | 1352 ++++++++++-------
 pkgs/top-level/node-packages.json             |    2 +-
 8 files changed, 952 insertions(+), 527 deletions(-)
 rename pkgs/development/mobile/titaniumenv/{titaniumsdk.nix => titaniumsdk-3.1.nix} (100%)
 create mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 55e9d63d727..8c46033152f 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -1,4 +1,4 @@
-{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python}:
+{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which}:
 { name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
 , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
 , iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   name = stdenv.lib.replaceChars [" "] [""] name;
   inherit src;
   
-  buildInputs = [ titanium jdk python ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
+  buildInputs = [ titanium jdk python which ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
   
   buildPhase = ''
     export HOME=$TMPDIR
@@ -38,16 +38,21 @@ stdenv.mkDerivation {
     
     echo "{}" > $TMPDIR/config.json
     titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation ${titaniumsdk}
-
+    
+    titanium --config-file $TMPDIR/config.json --no-colors config paths.modules ${titaniumsdk}
+    
     mkdir -p $out
     
     ${if target == "android" then
         ''
+          cat $TMPDIR/config.json
+          
           titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec/android-sdk-*
           
           ${if release then
             ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out''
           else
+            # /run/current-system/sw/bin/strace -f -y 
             ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only --output $out''}
         ''
       else if target == "iphone" then
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index b77468a0953..6c80cdae3e2 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -1,4 +1,4 @@
-{pkgs, pkgs_i686, xcodeVersion ? "5.0"}:
+{pkgs, pkgs_i686, xcodeVersion ? "5.0", tiVersion ? "3.2.1.GA"}:
 
 let
   # We have to use Oracle's JDK. On Darwin, just simply expose the host system's
@@ -27,12 +27,17 @@ rec {
     version = xcodeVersion;
   } else null;
   
-  titaniumsdk = import ./titaniumsdk.nix {
-    inherit (pkgs) stdenv fetchurl unzip makeWrapper python jdk;
-  };
+  titaniumsdk = let
+    titaniumSdkFile = if tiVersion == "3.1.4.GA" then ./titaniumsdk-3.1.nix
+      else if tiVersion == "3.2.1.GA" then ./titaniumsdk-3.2.nix
+      else throw "Titanium version not supported: "+tiVersion;
+    in
+    import titaniumSdkFile {
+      inherit (pkgs) stdenv fetchurl unzip makeWrapper python jdk;
+    };
   
   buildApp = import ./build-app.nix {
-    inherit (pkgs) stdenv python;
+    inherit (pkgs) stdenv python which;
     jdk = if pkgs.stdenv.isLinux then pkgs.oraclejdk7
       else if pkgs.stdenv.isDarwin then jdkWrapper
       else throw "Platform not supported: ${pkgs.stdenv.system}";
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index e955a1d8865..c9f32f8bb6b 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -1,6 +1,7 @@
 { nixpkgs ? <nixpkgs>
 , systems ? [ "x86_64-linux" "x86_64-darwin" ]
 , xcodeVersion ? "5.0"
+, tiVersion ? "3.2.1.GA"
 , rename ? false
 , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? ""
 }:
@@ -15,7 +16,8 @@ rec {
   in
   import ./kitchensink {
     inherit (pkgs) fetchgit;
-    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion; };
+    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; };
+    inherit tiVersion;
     target = "android";
   });
   
@@ -25,7 +27,8 @@ rec {
   in
   import ./kitchensink {
     inherit (pkgs) fetchgit;
-    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion; };
+    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; };
+    inherit tiVersion;
     target = "android";
     release = true;
   });
@@ -55,7 +58,8 @@ rec {
   rec {
   kitchensink_ios_development = import ./kitchensink {
     inherit (pkgs) fetchgit;
-    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion; };
+    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; };
+    inherit tiVersion;
     target = "iphone";
   };
 
@@ -79,8 +83,9 @@ rec {
   {
     kitchensink_ipa = import ./kitchensink {
       inherit (pkgs) stdenv fetchgit;
-      titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion; };
+      titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; };
       target = "iphone";
+      inherit tiVersion;
       release = true;
       rename = true;
       inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword;
diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
index a5cd156a8ff..95dd09be30d 100644
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -1,4 +1,4 @@
-{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "11" ], release ? false
+{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "11" ], tiVersion ? "3.2.1.GA", release ? false
 , rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null
 }:
 
@@ -7,8 +7,8 @@ assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioning
 let
   src = fetchgit {
     url = https://github.com/appcelerator/KitchenSink.git;
-    rev = "d9f39950c0137a1dd67c925ef9e8046a9f0644ff";
-    sha256 = "0aj42ac262hw9n9blzhfibg61kkbp3wky69rp2yhd11vwjlcq1qc";
+    rev = "0b8175f20f0aa71f93921025dec5d0f3299960ae";
+    sha256 = "0b2p4wbnlp46wpanqj5h3yfb2hdbh20nxbis8zscj4qlgrnyjdjz";
   };
   
   # Rename the bundle id to something else
@@ -28,7 +28,7 @@ in
 titaniumenv.buildApp {
   name = "KitchenSink-${target}-${if release then "release" else "debug"}";
   src = if rename then renamedSrc else src;
-  tiVersion = "3.1.4.GA";
+  inherit tiVersion;
   
   inherit target androidPlatformVersions release;
   
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
similarity index 100%
rename from pkgs/development/mobile/titaniumenv/titaniumsdk.nix
rename to pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
new file mode 100644
index 00000000000..96428f4a99b
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
@@ -0,0 +1,78 @@
+{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
+
+stdenv.mkDerivation {
+  name = "mobilesdk-3.2.1.v20140206170116";
+  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
+    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_2_X/mobilesdk-3.2.1.v20140206170116-linux.zip;
+    sha1 = "89955d31d48875aca64dd0131baac5ed82abcfc9";
+  }
+  else if stdenv.system == "x86_64-darwin" then fetchurl {
+    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_2_X/mobilesdk-3.2.1.v20140206170116-osx.zip;
+    sha1 = "06d9338c619b787be83baf3c0d93748b0e430182";
+  }
+  else throw "Platform: ${stdenv.system} not supported!";
+  
+  buildInputs = [ unzip makeWrapper ];
+  
+  buildCommand = ''
+    mkdir -p $out
+    cd $out
+    yes y | unzip $src
+    
+    # Fix shebang header for python scripts
+    
+    find . -name \*.py | while read i
+    do
+        sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
+    done
+   
+    # Rename ugly version number
+    cd mobilesdk/*
+    mv 3.2.1.v20140206170116 3.2.1.GA
+    cd 3.2.1.GA
+    
+    # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
+    # Yes, I know it's nasty :-)
+    
+    cd android
+    
+    sed -i -f ${./fixtiverify.sed} builder.py
+    sed -i -f ${./fixtiprofiler.sed} builder.py
+    sed -i -f ${./fixso.sed} builder.py
+    sed -i -f ${./fixnativelibs.sed} builder.py
+    
+    # Patch some executables
+    
+    ${if stdenv.system == "i686-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
+      ''
+      else if stdenv.system == "x86_64-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
+      ''
+      else ""}
+    
+    # Wrap builder script
+    
+    mv builder.py .builder.py
+    cat > builder.py <<EOF
+    #!${python}/bin/python
+    
+    import os, sys
+    
+    os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)'
+    os.environ['JAVA_HOME'] = '${if stdenv.system == "x86_64-darwin" then jdk else "${jdk}/lib/openjdk"}'
+    
+    os.execv('$(pwd)/.builder.py', sys.argv)
+    EOF
+    
+    chmod +x builder.py
+    
+  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+    # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
+    sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
+    
+    sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js
+  '';
+}
diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 139c948298a..f2b7328f35a 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -2,37 +2,58 @@
 
 {
   by-spec."CSSselect"."0.x" =
-    self.by-version."CSSselect"."0.4.0";
-  by-version."CSSselect"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-CSSselect-0.4.0";
+    self.by-version."CSSselect"."0.5.0";
+  by-version."CSSselect"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-CSSselect-0.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.0.tgz";
-        name = "CSSselect-0.4.0.tgz";
-        sha1 = "0ddaecd7d157f482d101dfbe154d3accd9166331";
+        url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.5.0.tgz";
+        name = "CSSselect-0.5.0.tgz";
+        sha1 = "cd12727a4e3a85d1e862611b349c9e3c6b7e0452";
       })
     ];
     buildInputs =
       (self.nativeDeps."CSSselect" or []);
     deps = [
-      self.by-version."CSSwhat"."0.4.1"
-      self.by-version."domutils"."1.3.0"
+      self.by-version."CSSwhat"."0.4.2"
+      self.by-version."domutils"."1.4.0"
+      self.by-version."boolbase"."1.0.0"
+      self.by-version."nth-check"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "CSSselect" ];
   };
   by-spec."CSSselect"."~0.4.0" =
-    self.by-version."CSSselect"."0.4.0";
+    self.by-version."CSSselect"."0.4.1";
+  by-version."CSSselect"."0.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-CSSselect-0.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz";
+        name = "CSSselect-0.4.1.tgz";
+        sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."CSSselect" or []);
+    deps = [
+      self.by-version."CSSwhat"."0.4.2"
+      self.by-version."domutils"."1.4.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "CSSselect" ];
+  };
   by-spec."CSSwhat"."0.4" =
-    self.by-version."CSSwhat"."0.4.1";
-  by-version."CSSwhat"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-CSSwhat-0.4.1";
+    self.by-version."CSSwhat"."0.4.2";
+  by-version."CSSwhat"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-CSSwhat-0.4.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.1.tgz";
-        name = "CSSwhat-0.4.1.tgz";
-        sha1 = "fe6580461b2a3ad550d2a7785a051234974dfca7";
+        url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.2.tgz";
+        name = "CSSwhat-0.4.2.tgz";
+        sha1 = "7291585b71c5707ee7f49bbf3e9ae413ea715ff5";
       })
     ];
     buildInputs =
@@ -106,14 +127,14 @@
     passthru.names = [ "active-x-obfuscator" ];
   };
   by-spec."addressparser"."~0.2.0" =
-    self.by-version."addressparser"."0.2.0";
-  by-version."addressparser"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-addressparser-0.2.0";
+    self.by-version."addressparser"."0.2.1";
+  by-version."addressparser"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-addressparser-0.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.0.tgz";
-        name = "addressparser-0.2.0.tgz";
-        sha1 = "853383313b7b60259ba4558ef1c0bc30efac08fc";
+        url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz";
+        name = "addressparser-0.2.1.tgz";
+        sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607";
       })
     ];
     buildInputs =
@@ -392,7 +413,7 @@
       (self.nativeDeps."archiver" or []);
     deps = [
       self.by-version."readable-stream"."1.0.25"
-      self.by-version."zip-stream"."0.1.3"
+      self.by-version."zip-stream"."0.1.4"
       self.by-version."lazystream"."0.1.0"
       self.by-version."file-utils"."0.1.5"
       self.by-version."lodash"."2.4.1"
@@ -486,14 +507,14 @@
     passthru.names = [ "asn1" ];
   };
   by-spec."assert"."*" =
-    self.by-version."assert"."1.1.0";
-  by-version."assert"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-assert-1.1.0";
+    self.by-version."assert"."1.1.1";
+  by-version."assert"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-assert-1.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/assert/-/assert-1.1.0.tgz";
-        name = "assert-1.1.0.tgz";
-        sha1 = "851f832b880525bb9f6c1bb1dfd93ea028247f23";
+        url = "http://registry.npmjs.org/assert/-/assert-1.1.1.tgz";
+        name = "assert-1.1.1.tgz";
+        sha1 = "766549ef4a6014b1e19c7c53f9816eabda440760";
       })
     ];
     buildInputs =
@@ -505,7 +526,7 @@
     ];
     passthru.names = [ "assert" ];
   };
-  "assert" = self.by-version."assert"."1.1.0";
+  "assert" = self.by-version."assert"."1.1.1";
   by-spec."assert-plus"."0.1.2" =
     self.by-version."assert-plus"."0.1.2";
   by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -736,26 +757,26 @@
     passthru.names = [ "aws-sign2" ];
   };
   by-spec."backbone"."*" =
-    self.by-version."backbone"."1.1.0";
-  by-version."backbone"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-backbone-1.1.0";
+    self.by-version."backbone"."1.1.1";
+  by-version."backbone"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-backbone-1.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/backbone/-/backbone-1.1.0.tgz";
-        name = "backbone-1.1.0.tgz";
-        sha1 = "a3c845ea707dc210aa12b0dc16fceca4bbc18a3e";
+        url = "http://registry.npmjs.org/backbone/-/backbone-1.1.1.tgz";
+        name = "backbone-1.1.1.tgz";
+        sha1 = "8091197fef3a58fdeae24de70d96e23ce432f399";
       })
     ];
     buildInputs =
       (self.nativeDeps."backbone" or []);
     deps = [
-      self.by-version."underscore"."1.5.2"
+      self.by-version."underscore"."1.6.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "backbone" ];
   };
-  "backbone" = self.by-version."backbone"."1.1.0";
+  "backbone" = self.by-version."backbone"."1.1.1";
   by-spec."backoff"."2.1.0" =
     self.by-version."backoff"."2.1.0";
   by-version."backoff"."2.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -934,6 +955,25 @@
     ];
     passthru.names = [ "blueimp-md5" ];
   };
+  by-spec."boolbase"."~1.0.0" =
+    self.by-version."boolbase"."1.0.0";
+  by-version."boolbase"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-boolbase-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz";
+        name = "boolbase-1.0.0.tgz";
+        sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."boolbase" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "boolbase" ];
+  };
   by-spec."boom"."0.3.x" =
     self.by-version."boom"."0.3.8";
   by-version."boom"."0.3.8" = lib.makeOverridable self.buildNodePackage {
@@ -1002,7 +1042,7 @@
       self.by-version."fstream"."0.1.25"
       self.by-version."fstream-ignore"."0.0.7"
       self.by-version."glob"."3.2.8"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."handlebars"."1.0.12"
       self.by-version."inquirer"."0.3.5"
       self.by-version."junk"."0.2.2"
@@ -1052,7 +1092,7 @@
     buildInputs =
       (self.nativeDeps."bower-config" or []);
     deps = [
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."mout"."0.6.0"
       self.by-version."optimist"."0.6.1"
       self.by-version."osenv"."0.0.3"
@@ -1075,7 +1115,7 @@
     buildInputs =
       (self.nativeDeps."bower-config" or []);
     deps = [
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."mout"."0.6.0"
       self.by-version."optimist"."0.6.1"
       self.by-version."osenv"."0.0.3"
@@ -1120,7 +1160,7 @@
       (self.nativeDeps."bower-json" or []);
     deps = [
       self.by-version."deep-extend"."0.2.8"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."intersect"."0.0.3"
     ];
     peerDependencies = [
@@ -1183,7 +1223,7 @@
     deps = [
       self.by-version."async"."0.2.10"
       self.by-version."bower-config"."0.4.5"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."lru-cache"."2.3.1"
       self.by-version."request"."2.27.0"
       self.by-version."request-replay"."0.2.0"
@@ -1262,7 +1302,7 @@
       (self.nativeDeps."browserchannel" or []);
     deps = [
       self.by-version."hat"."0.0.3"
-      self.by-version."connect"."2.12.0"
+      self.by-version."connect"."2.13.0"
       self.by-version."request"."2.33.0"
     ];
     peerDependencies = [
@@ -1327,6 +1367,26 @@
     ];
     passthru.names = [ "bson" ];
   };
+  by-spec."bson"."0.2.6" =
+    self.by-version."bson"."0.2.6";
+  by-version."bson"."0.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bson-0.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bson/-/bson-0.2.6.tgz";
+        name = "bson-0.2.6.tgz";
+        sha1 = "d001aa3d20b92e3f9cbc19d542515a748586a743";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bson" or []);
+    deps = [
+      self.by-version."nan"."0.8.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bson" ];
+  };
   by-spec."buffer-crc32"."0.1.1" =
     self.by-version."buffer-crc32"."0.1.1";
   by-version."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -1602,7 +1662,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.3"
+      self.by-version."has-color"."0.1.4"
       self.by-version."ansi-styles"."0.1.2"
     ];
     peerDependencies = [
@@ -1623,7 +1683,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.3"
+      self.by-version."has-color"."0.1.4"
       self.by-version."ansi-styles"."0.2.0"
     ];
     peerDependencies = [
@@ -1646,7 +1706,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.3"
+      self.by-version."has-color"."0.1.4"
       self.by-version."ansi-styles"."0.2.0"
     ];
     peerDependencies = [
@@ -1667,7 +1727,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.3"
+      self.by-version."has-color"."0.1.4"
       self.by-version."ansi-styles"."1.0.0"
       self.by-version."strip-ansi"."0.1.1"
     ];
@@ -1711,7 +1771,7 @@
       self.by-version."cheerio-select"."0.0.3"
       self.by-version."htmlparser2"."3.1.4"
       self.by-version."underscore"."1.4.4"
-      self.by-version."entities"."0.3.0"
+      self.by-version."entities"."0.5.0"
     ];
     peerDependencies = [
     ];
@@ -1733,8 +1793,8 @@
     deps = [
       self.by-version."htmlparser2"."3.4.0"
       self.by-version."underscore"."1.5.2"
-      self.by-version."entities"."0.3.0"
-      self.by-version."CSSselect"."0.4.0"
+      self.by-version."entities"."0.5.0"
+      self.by-version."CSSselect"."0.4.1"
     ];
     peerDependencies = [
     ];
@@ -1754,7 +1814,7 @@
     buildInputs =
       (self.nativeDeps."cheerio-select" or []);
     deps = [
-      self.by-version."CSSselect"."0.4.0"
+      self.by-version."CSSselect"."0.5.0"
     ];
     peerDependencies = [
     ];
@@ -1857,14 +1917,14 @@
     passthru.names = [ "class-extend" ];
   };
   by-spec."clean-css"."2.0.x" =
-    self.by-version."clean-css"."2.0.7";
-  by-version."clean-css"."2.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "clean-css-2.0.7";
+    self.by-version."clean-css"."2.0.8";
+  by-version."clean-css"."2.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "clean-css-2.0.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.7.tgz";
-        name = "clean-css-2.0.7.tgz";
-        sha1 = "b973f1370019ad9b05c456ffc4950a6b95cb38f0";
+        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.8.tgz";
+        name = "clean-css-2.0.8.tgz";
+        sha1 = "e937cdfdcc5781a00817aec4079e85b3ec157a20";
       })
     ];
     buildInputs =
@@ -1876,8 +1936,26 @@
     ];
     passthru.names = [ "clean-css" ];
   };
-  by-spec."clean-css"."~2.0.0" =
-    self.by-version."clean-css"."2.0.7";
+  by-spec."clean-css"."~2.1.0" =
+    self.by-version."clean-css"."2.1.0";
+  by-version."clean-css"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "clean-css-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.0.tgz";
+        name = "clean-css-2.1.0.tgz";
+        sha1 = "2884698408337a94c33cc028acd13ea4a532132e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."clean-css" or []);
+    deps = [
+      self.by-version."commander"."2.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "clean-css" ];
+  };
   by-spec."cli"."0.4.x" =
     self.by-version."cli"."0.4.5";
   by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage {
@@ -2037,7 +2115,7 @@
       (self.nativeDeps."cmd-shim" or []);
     deps = [
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
     ];
     peerDependencies = [
     ];
@@ -2390,8 +2468,29 @@
     ];
     passthru.names = [ "commander" ];
   };
+  by-spec."commander"."2.1.x" =
+    self.by-version."commander"."2.1.0";
   by-spec."commander"."~0.6.1" =
     self.by-version."commander"."0.6.1";
+  by-spec."compressible"."1.0.0" =
+    self.by-version."compressible"."1.0.0";
+  by-version."compressible"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-compressible-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz";
+        name = "compressible-1.0.0.tgz";
+        sha1 = "f83e49c1cb61421753545125a8011d68b492427d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."compressible" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "compressible" ];
+  };
   by-spec."config"."0.4.15" =
     self.by-version."config"."0.4.15";
   by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage {
@@ -2455,7 +2554,32 @@
       self.by-version."mkdirp"."0.3.5"
       self.by-version."js-yaml"."2.1.3"
       self.by-version."osenv"."0.0.3"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "configstore" ];
+  };
+  by-spec."configstore"."~0.2.1" =
+    self.by-version."configstore"."0.2.2";
+  by-version."configstore"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-configstore-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/configstore/-/configstore-0.2.2.tgz";
+        name = "configstore-0.2.2.tgz";
+        sha1 = "ae0eb4f75833a4436f33456a4d2db11d69cc61ed";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."configstore" or []);
+    deps = [
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."js-yaml"."3.0.1"
+      self.by-version."osenv"."0.0.3"
+      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."uuid"."1.4.1"
+      self.by-version."object-assign"."0.1.2"
     ];
     peerDependencies = [
     ];
@@ -2636,7 +2760,40 @@
     passthru.names = [ "connect" ];
   };
   by-spec."connect"."~2" =
-    self.by-version."connect"."2.12.0";
+    self.by-version."connect"."2.13.0";
+  by-version."connect"."2.13.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-connect-2.13.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect/-/connect-2.13.0.tgz";
+        name = "connect-2.13.0.tgz";
+        sha1 = "a1974986381b4ea52ded726c2b4598e88ed527d3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect" or []);
+    deps = [
+      self.by-version."compressible"."1.0.0"
+      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.7.4"
+      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.12.0" =
     self.by-version."connect"."2.12.0";
   by-spec."connect-flash"."*" =
@@ -3011,32 +3168,30 @@
     ];
     passthru.names = [ "couch-login" ];
   };
-  by-spec."couch-login"."~0.1.18" =
-    self.by-version."couch-login"."0.1.20";
   by-spec."coveralls"."*" =
-    self.by-version."coveralls"."2.7.1";
-  by-version."coveralls"."2.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "coveralls-2.7.1";
+    self.by-version."coveralls"."2.8.0";
+  by-version."coveralls"."2.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "coveralls-2.8.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.7.1.tgz";
-        name = "coveralls-2.7.1.tgz";
-        sha1 = "86e91436d248ca9c202504e9e022d77946eded41";
+        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.8.0.tgz";
+        name = "coveralls-2.8.0.tgz";
+        sha1 = "959b1b3cb9b5ce2ca502b025fd69eb1700756e63";
       })
     ];
     buildInputs =
       (self.nativeDeps."coveralls" or []);
     deps = [
-      self.by-version."yaml"."0.2.3"
+      self.by-version."js-yaml"."3.0.1"
       self.by-version."request"."2.16.2"
-      self.by-version."lcov-parse"."0.0.4"
+      self.by-version."lcov-parse"."0.0.6"
       self.by-version."log-driver"."1.2.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "coveralls" ];
   };
-  "coveralls" = self.by-version."coveralls"."2.7.1";
+  "coveralls" = self.by-version."coveralls"."2.8.0";
   by-spec."crc"."0.2.0" =
     self.by-version."crc"."0.2.0";
   by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -3213,25 +3368,6 @@
     ];
     passthru.names = [ "css-stringify" ];
   };
-  by-spec."cssom"."0.2.x" =
-    self.by-version."cssom"."0.2.5";
-  by-version."cssom"."0.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cssom-0.2.5";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cssom/-/cssom-0.2.5.tgz";
-        name = "cssom-0.2.5.tgz";
-        sha1 = "2682709b5902e7212df529116ff788cd5b254894";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cssom" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "cssom" ];
-  };
   by-spec."ctype"."0.5.0" =
     self.by-version."ctype"."0.5.0";
   by-version."ctype"."0.5.0" = lib.makeOverridable self.buildNodePackage {
@@ -3656,7 +3792,7 @@
     buildInputs =
       (self.nativeDeps."dkim-signer" or []);
     deps = [
-      self.by-version."punycode"."1.2.3"
+      self.by-version."punycode"."1.2.4"
       self.by-version."mimelib"."0.2.14"
     ];
     peerDependencies = [
@@ -3782,6 +3918,26 @@
     ];
     passthru.names = [ "domutils" ];
   };
+  by-spec."domutils"."1.4" =
+    self.by-version."domutils"."1.4.0";
+  by-version."domutils"."1.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-domutils-1.4.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/domutils/-/domutils-1.4.0.tgz";
+        name = "domutils-1.4.0.tgz";
+        sha1 = "330b95212944e340c6e0227e9ec3d35242d4dd05";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."domutils" or []);
+    deps = [
+      self.by-version."domelementtype"."1.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "domutils" ];
+  };
   by-spec."download"."~0.1.6" =
     self.by-version."download"."0.1.10";
   by-version."download"."0.1.10" = lib.makeOverridable self.buildNodePackage {
@@ -3797,7 +3953,7 @@
       (self.nativeDeps."download" or []);
     deps = [
       self.by-version."decompress"."0.1.6"
-      self.by-version."each-async"."0.1.1"
+      self.by-version."each-async"."0.1.2"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."request"."2.31.0"
       self.by-version."through2"."0.4.1"
@@ -3866,14 +4022,14 @@
     passthru.names = [ "duplexer" ];
   };
   by-spec."each-async"."~0.1.1" =
-    self.by-version."each-async"."0.1.1";
-  by-version."each-async"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/each-async/-/each-async-0.1.1.tgz";
-        name = "each-async-0.1.1.tgz";
-        sha1 = "32bcef7e3cdc741d630e29846348be4ecca624ff";
+        url = "http://registry.npmjs.org/each-async/-/each-async-0.1.2.tgz";
+        name = "each-async-0.1.2.tgz";
+        sha1 = "d5b900bd92705ed5b8cad3307a6536adb0f134c6";
       })
     ];
     buildInputs =
@@ -3981,14 +4137,14 @@
     passthru.names = [ "encoding" ];
   };
   by-spec."entities"."0.x" =
-    self.by-version."entities"."0.3.0";
-  by-version."entities"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-entities-0.3.0";
+    self.by-version."entities"."0.5.0";
+  by-version."entities"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-entities-0.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/entities/-/entities-0.3.0.tgz";
-        name = "entities-0.3.0.tgz";
-        sha1 = "6ccead6010fee0c5a06f538d242792485cbfa256";
+        url = "http://registry.npmjs.org/entities/-/entities-0.5.0.tgz";
+        name = "entities-0.5.0.tgz";
+        sha1 = "f611cb5ae221050e0012c66979503fd7ae19cc49";
       })
     ];
     buildInputs =
@@ -4039,14 +4195,14 @@
   };
   "escape-html" = self.by-version."escape-html"."1.0.1";
   by-spec."escodegen"."*" =
-    self.by-version."escodegen"."1.1.0";
-  by-version."escodegen"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "escodegen-1.1.0";
+    self.by-version."escodegen"."1.2.0";
+  by-version."escodegen"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "escodegen-1.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz";
-        name = "escodegen-1.1.0.tgz";
-        sha1 = "c663923f6e20aad48d0c0fa49f31c6d4f49360cf";
+        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.2.0.tgz";
+        name = "escodegen-1.2.0.tgz";
+        sha1 = "09de7967791cc958b7f89a2ddb6d23451af327e1";
       })
     ];
     buildInputs =
@@ -4055,7 +4211,7 @@
       self.by-version."esprima"."1.0.4"
       self.by-version."estraverse"."1.5.0"
       self.by-version."esutils"."1.0.0"
-      self.by-version."source-map"."0.1.31"
+      self.by-version."source-map"."0.1.32"
     ];
     peerDependencies = [
     ];
@@ -4077,7 +4233,7 @@
     deps = [
       self.by-version."esprima"."1.0.4"
       self.by-version."estraverse"."0.0.4"
-      self.by-version."source-map"."0.1.31"
+      self.by-version."source-map"."0.1.32"
     ];
     peerDependencies = [
     ];
@@ -4100,7 +4256,7 @@
       self.by-version."esprima"."1.0.4"
       self.by-version."estraverse"."1.5.0"
       self.by-version."esutils"."1.0.0"
-      self.by-version."source-map"."0.1.31"
+      self.by-version."source-map"."0.1.32"
     ];
     peerDependencies = [
     ];
@@ -4892,7 +5048,7 @@
     buildInputs =
       (self.nativeDeps."follow-redirects" or []);
     deps = [
-      self.by-version."underscore"."1.5.2"
+      self.by-version."underscore"."1.6.0"
     ];
     peerDependencies = [
     ];
@@ -5304,7 +5460,7 @@
     deps = [
       self.by-version."rimraf"."2.2.6"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."inherits"."2.0.1"
     ];
     peerDependencies = [
@@ -5515,7 +5671,7 @@
       self.by-version."copy-paste"."0.1.0"
       self.by-version."moment"."2.4.0"
       self.by-version."handlebars"."1.0.11"
-      self.by-version."github"."0.1.13"
+      self.by-version."github"."0.1.14"
       self.by-version."inquirer"."0.3.5"
       self.by-version."wordwrap"."0.0.2"
       self.by-version."nopt"."2.1.2"
@@ -5531,14 +5687,14 @@
   };
   "gh" = self.by-version."gh"."1.8.2";
   by-spec."github"."~0.1.12" =
-    self.by-version."github"."0.1.13";
-  by-version."github"."0.1.13" = lib.makeOverridable self.buildNodePackage {
-    name = "node-github-0.1.13";
+    self.by-version."github"."0.1.14";
+  by-version."github"."0.1.14" = lib.makeOverridable self.buildNodePackage {
+    name = "node-github-0.1.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/github/-/github-0.1.13.tgz";
-        name = "github-0.1.13.tgz";
-        sha1 = "90567238d0eb54f7c58ad3a6a2bea0fa495c94fb";
+        url = "http://registry.npmjs.org/github/-/github-0.1.14.tgz";
+        name = "github-0.1.14.tgz";
+        sha1 = "2a4fc150c9aee8c7a7702fa1e620d29599246322";
       })
     ];
     buildInputs =
@@ -5644,7 +5800,28 @@
       (self.nativeDeps."glob" or []);
     deps = [
       self.by-version."minimatch"."0.2.14"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."inherits"."2.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob" ];
+  };
+  by-spec."glob"."3.2.7" =
+    self.by-version."glob"."3.2.7";
+  by-version."glob"."3.2.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-glob-3.2.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob/-/glob-3.2.7.tgz";
+        name = "glob-3.2.7.tgz";
+        sha1 = "275f39a0eee805694790924f36eac38e1db6d802";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob" or []);
+    deps = [
+      self.by-version."minimatch"."0.2.14"
       self.by-version."inherits"."2.0.1"
     ];
     peerDependencies = [
@@ -5690,14 +5867,14 @@
   by-spec."glob"."~3.2.7" =
     self.by-version."glob"."3.2.8";
   by-spec."graceful-fs"."2" =
-    self.by-version."graceful-fs"."2.0.1";
-  by-version."graceful-fs"."2.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-graceful-fs-2.0.1";
+    self.by-version."graceful-fs"."2.0.2";
+  by-version."graceful-fs"."2.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-graceful-fs-2.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.1.tgz";
-        name = "graceful-fs-2.0.1.tgz";
-        sha1 = "7fd6e0a4837c35d0cc15330294d9584a3898cf84";
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.2.tgz";
+        name = "graceful-fs-2.0.2.tgz";
+        sha1 = "26806eaca4bff8fc5dbc935e696135792175c46f";
       })
     ];
     buildInputs =
@@ -5708,6 +5885,8 @@
     ];
     passthru.names = [ "graceful-fs" ];
   };
+  by-spec."graceful-fs"."^2.0.2" =
+    self.by-version."graceful-fs"."2.0.2";
   by-spec."graceful-fs"."~1" =
     self.by-version."graceful-fs"."1.2.3";
   by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -5749,11 +5928,11 @@
   by-spec."graceful-fs"."~1.2.0" =
     self.by-version."graceful-fs"."1.2.3";
   by-spec."graceful-fs"."~2" =
-    self.by-version."graceful-fs"."2.0.1";
+    self.by-version."graceful-fs"."2.0.2";
   by-spec."graceful-fs"."~2.0.0" =
-    self.by-version."graceful-fs"."2.0.1";
+    self.by-version."graceful-fs"."2.0.2";
   by-spec."graceful-fs"."~2.0.1" =
-    self.by-version."graceful-fs"."2.0.1";
+    self.by-version."graceful-fs"."2.0.2";
   by-spec."gridfs-stream"."*" =
     self.by-version."gridfs-stream"."0.4.1";
   by-version."gridfs-stream"."0.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -5888,20 +6067,21 @@
   by-spec."grunt-cli"."~0.1.7" =
     self.by-version."grunt-cli"."0.1.13";
   by-spec."grunt-contrib-cssmin"."*" =
-    self.by-version."grunt-contrib-cssmin"."0.7.0";
-  by-version."grunt-contrib-cssmin"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-cssmin-0.7.0";
+    self.by-version."grunt-contrib-cssmin"."0.8.0";
+  by-version."grunt-contrib-cssmin"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-cssmin-0.8.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.7.0.tgz";
-        name = "grunt-contrib-cssmin-0.7.0.tgz";
-        sha1 = "a5735e9f1d263149e49fe035294e429d8c670bab";
+        url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.8.0.tgz";
+        name = "grunt-contrib-cssmin-0.8.0.tgz";
+        sha1 = "eb58cbfa466e6c96136c0220f191789eb22908b8";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-cssmin" or []);
     deps = [
-      self.by-version."clean-css"."2.0.7"
+      self.by-version."chalk"."0.4.0"
+      self.by-version."clean-css"."2.1.0"
       self.by-version."grunt-lib-contrib"."0.6.1"
     ];
     peerDependencies = [
@@ -5909,7 +6089,7 @@
     ];
     passthru.names = [ "grunt-contrib-cssmin" ];
   };
-  "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.7.0";
+  "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.8.0";
   by-spec."grunt-contrib-jshint"."*" =
     self.by-version."grunt-contrib-jshint"."0.8.0";
   by-version."grunt-contrib-jshint"."0.8.0" = lib.makeOverridable self.buildNodePackage {
@@ -5946,7 +6126,7 @@
     buildInputs =
       (self.nativeDeps."grunt-contrib-less" or []);
     deps = [
-      self.by-version."less"."1.6.2"
+      self.by-version."less"."1.6.3"
       self.by-version."grunt-lib-contrib"."0.6.1"
       self.by-version."chalk"."0.4.0"
     ];
@@ -5970,7 +6150,7 @@
     buildInputs =
       (self.nativeDeps."grunt-contrib-requirejs" or []);
     deps = [
-      self.by-version."requirejs"."2.1.10"
+      self.by-version."requirejs"."2.1.11"
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.2"
@@ -6181,14 +6361,14 @@
   by-spec."handlebars"."~1.0.11" =
     self.by-version."handlebars"."1.0.12";
   by-spec."has-color"."~0.1.0" =
-    self.by-version."has-color"."0.1.3";
-  by-version."has-color"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-has-color-0.1.3";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/has-color/-/has-color-0.1.3.tgz";
-        name = "has-color-0.1.3.tgz";
-        sha1 = "b249acb22a6b481c572eeddb28b8f346c0b242a1";
+        url = "http://registry.npmjs.org/has-color/-/has-color-0.1.4.tgz";
+        name = "has-color-0.1.4.tgz";
+        sha1 = "d1dadeea5b9e8b446bf08603532333710c95a290";
       })
     ];
     buildInputs =
@@ -6703,7 +6883,7 @@
       self.by-version."coffee-script-redux"."2.0.0-beta4"
       self.by-version."istanbul"."0.2.4"
       self.by-version."optimist"."0.6.1"
-      self.by-version."escodegen"."1.1.0"
+      self.by-version."escodegen"."1.2.0"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."which"."1.0.5"
       self.by-version."estraverse"."1.5.0"
@@ -6818,7 +6998,7 @@
     deps = [
       self.by-version."promzard"."0.2.1"
       self.by-version."read"."1.0.5"
-      self.by-version."read-package-json"."1.1.6"
+      self.by-version."read-package-json"."1.1.7"
       self.by-version."semver"."2.2.1"
       self.by-version."glob"."3.2.8"
     ];
@@ -6826,29 +7006,6 @@
     ];
     passthru.names = [ "init-package-json" ];
   };
-  by-spec."inquirer"."~0.2.4" =
-    self.by-version."inquirer"."0.2.5";
-  by-version."inquirer"."0.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-inquirer-0.2.5";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.5.tgz";
-        name = "inquirer-0.2.5.tgz";
-        sha1 = "6b49a9cbe03de776122211f174ef9fe2822c08f6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."inquirer" or []);
-    deps = [
-      self.by-version."lodash"."1.2.1"
-      self.by-version."async"."0.2.10"
-      self.by-version."cli-color"."0.2.3"
-      self.by-version."mute-stream"."0.0.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "inquirer" ];
-  };
   by-spec."inquirer"."~0.3.0" =
     self.by-version."inquirer"."0.3.5";
   by-version."inquirer"."0.3.5" = lib.makeOverridable self.buildNodePackage {
@@ -6901,25 +7058,26 @@
     passthru.names = [ "inquirer" ];
   };
   by-spec."insight"."~0.3.0" =
-    self.by-version."insight"."0.3.0";
-  by-version."insight"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-insight-0.3.0";
+    self.by-version."insight"."0.3.1";
+  by-version."insight"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-insight-0.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/insight/-/insight-0.3.0.tgz";
-        name = "insight-0.3.0.tgz";
-        sha1 = "9d922133f560f7633abfc8f91451bda5e2cf2f71";
+        url = "http://registry.npmjs.org/insight/-/insight-0.3.1.tgz";
+        name = "insight-0.3.1.tgz";
+        sha1 = "1a14f32c06115c0850338c38a253d707b611d448";
       })
     ];
     buildInputs =
       (self.nativeDeps."insight" or []);
     deps = [
-      self.by-version."chalk"."0.2.1"
+      self.by-version."chalk"."0.4.0"
       self.by-version."request"."2.27.0"
-      self.by-version."configstore"."0.1.7"
+      self.by-version."configstore"."0.2.2"
       self.by-version."async"."0.2.10"
-      self.by-version."lodash"."1.3.1"
-      self.by-version."inquirer"."0.2.5"
+      self.by-version."inquirer"."0.4.0"
+      self.by-version."object-assign"."0.1.2"
+      self.by-version."lodash.debounce"."2.4.1"
     ];
     peerDependencies = [
     ];
@@ -6968,11 +7126,11 @@
       self.by-version."passport"."0.2.0"
       self.by-version."passport-http"."0.2.2"
       self.by-version."js-yaml"."3.0.1"
-      self.by-version."mongoose"."3.8.6"
+      self.by-version."mongoose"."3.8.7"
       self.by-version."gridfs-stream"."0.4.1"
       self.by-version."temp"."0.6.0"
-      self.by-version."kue"."0.7.4"
-      self.by-version."redis"."0.10.0"
+      self.by-version."kue"."0.7.5"
+      self.by-version."redis"."0.10.1"
       self.by-version."hiredis"."0.1.16"
     ];
     peerDependencies = [
@@ -7170,6 +7328,8 @@
     ];
     passthru.names = [ "jade" ];
   };
+  by-spec."jade"."1.1.5" =
+    self.by-version."jade"."1.1.5";
   by-spec."jade".">= 0.0.1" =
     self.by-version."jade"."1.1.5";
   by-spec."jade"."~0.35.0" =
@@ -7300,6 +7460,8 @@
     ];
     passthru.names = [ "js-yaml" ];
   };
+  by-spec."js-yaml"."3.0.1" =
+    self.by-version."js-yaml"."3.0.1";
   by-spec."js-yaml"."3.x" =
     self.by-version."js-yaml"."3.0.1";
   by-spec."js-yaml"."~2.0.5" =
@@ -7344,6 +7506,8 @@
     ];
     passthru.names = [ "js-yaml" ];
   };
+  by-spec."js-yaml"."~3.0.1" =
+    self.by-version."js-yaml"."3.0.1";
   by-spec."jsesc"."0.4.3" =
     self.by-version."jsesc"."0.4.3";
   by-version."jsesc"."0.4.3" = lib.makeOverridable self.buildNodePackage {
@@ -7557,11 +7721,11 @@
       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.9"
+      self.by-version."log4js"."0.6.10"
       self.by-version."useragent"."2.0.7"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."connect"."2.12.0"
-      self.by-version."source-map"."0.1.31"
+      self.by-version."source-map"."0.1.32"
     ];
     peerDependencies = [
     ];
@@ -7598,14 +7762,14 @@
   };
   "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.2";
   by-spec."karma-coverage"."*" =
-    self.by-version."karma-coverage"."0.1.5";
-  by-version."karma-coverage"."0.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-coverage-0.1.5";
+    self.by-version."karma-coverage"."0.2.0";
+  by-version."karma-coverage"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-coverage-0.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.5.tgz";
-        name = "karma-coverage-0.1.5.tgz";
-        sha1 = "a4dcbe87d4a7765456ca64218b5f0601018e1371";
+        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.0.tgz";
+        name = "karma-coverage-0.2.0.tgz";
+        sha1 = "d8edc429c35ab7c68fa90a5cd2f2ecb3aa31fde8";
       })
     ];
     buildInputs =
@@ -7620,7 +7784,7 @@
     ];
     passthru.names = [ "karma-coverage" ];
   };
-  "karma-coverage" = self.by-version."karma-coverage"."0.1.5";
+  "karma-coverage" = self.by-version."karma-coverage"."0.2.0";
   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 {
@@ -7682,7 +7846,7 @@
     ];
     peerDependencies = [
       self.by-version."karma"."0.11.14"
-      self.by-version."requirejs"."2.1.10"
+      self.by-version."requirejs"."2.1.11"
     ];
     passthru.names = [ "karma-requirejs" ];
   };
@@ -7850,14 +8014,14 @@
     passthru.names = [ "knockout" ];
   };
   by-spec."knox"."*" =
-    self.by-version."knox"."0.8.8";
-  by-version."knox"."0.8.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-knox-0.8.8";
+    self.by-version."knox"."0.8.9";
+  by-version."knox"."0.8.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-knox-0.8.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/knox/-/knox-0.8.8.tgz";
-        name = "knox-0.8.8.tgz";
-        sha1 = "aeeadd22b0a4b1e4d858a15174af2da060ab6774";
+        url = "http://registry.npmjs.org/knox/-/knox-0.8.9.tgz";
+        name = "knox-0.8.9.tgz";
+        sha1 = "b96ec0b4ec1be75d8006f80cb302bfa818d7001c";
       })
     ];
     buildInputs =
@@ -7872,25 +8036,25 @@
     ];
     passthru.names = [ "knox" ];
   };
-  "knox" = self.by-version."knox"."0.8.8";
+  "knox" = self.by-version."knox"."0.8.9";
   by-spec."kue"."*" =
-    self.by-version."kue"."0.7.4";
-  by-version."kue"."0.7.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-kue-0.7.4";
+    self.by-version."kue"."0.7.5";
+  by-version."kue"."0.7.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-kue-0.7.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/kue/-/kue-0.7.4.tgz";
-        name = "kue-0.7.4.tgz";
-        sha1 = "bb3315580bbf4ec8663ce4203aec92e560a044ef";
+        url = "http://registry.npmjs.org/kue/-/kue-0.7.5.tgz";
+        name = "kue-0.7.5.tgz";
+        sha1 = "d815a8a35b22dd28df3f54f0b874403a257dc807";
       })
     ];
     buildInputs =
       (self.nativeDeps."kue" or []);
     deps = [
-      self.by-version."redis"."0.10.0"
+      self.by-version."redis"."0.10.1"
       self.by-version."express"."3.1.2"
-      self.by-version."jade"."0.26.3"
-      self.by-version."stylus"."0.27.2"
+      self.by-version."jade"."1.1.5"
+      self.by-version."stylus"."0.42.2"
       self.by-version."nib"."0.5.0"
       self.by-version."reds"."0.2.4"
     ];
@@ -7898,7 +8062,7 @@
     ];
     passthru.names = [ "kue" ];
   };
-  "kue" = self.by-version."kue"."0.7.4";
+  "kue" = self.by-version."kue"."0.7.5";
   by-spec."lazy"."~1.0.11" =
     self.by-version."lazy"."1.0.11";
   by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage {
@@ -7938,15 +8102,15 @@
     ];
     passthru.names = [ "lazystream" ];
   };
-  by-spec."lcov-parse"."0.0.4" =
-    self.by-version."lcov-parse"."0.0.4";
-  by-version."lcov-parse"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lcov-parse-0.0.4";
+  by-spec."lcov-parse"."0.0.6" =
+    self.by-version."lcov-parse"."0.0.6";
+  by-version."lcov-parse"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lcov-parse-0.0.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.4.tgz";
-        name = "lcov-parse-0.0.4.tgz";
-        sha1 = "3853a4f132f04581db0e74c180542d90f0d1c66b";
+        url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz";
+        name = "lcov-parse-0.0.6.tgz";
+        sha1 = "819e5da8bf0791f9d3f39eea5ed1868187f11175";
       })
     ];
     buildInputs =
@@ -7979,14 +8143,14 @@
   };
   "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2";
   by-spec."less"."~1.6.0" =
-    self.by-version."less"."1.6.2";
-  by-version."less"."1.6.2" = lib.makeOverridable self.buildNodePackage {
-    name = "less-1.6.2";
+    self.by-version."less"."1.6.3";
+  by-version."less"."1.6.3" = lib.makeOverridable self.buildNodePackage {
+    name = "less-1.6.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/less/-/less-1.6.2.tgz";
-        name = "less-1.6.2.tgz";
-        sha1 = "86556e6ab8f9af4d8b853db16c5f262e94fc98a0";
+        url = "http://registry.npmjs.org/less/-/less-1.6.3.tgz";
+        name = "less-1.6.3.tgz";
+        sha1 = "71ce89ec30b774b3567f254c67958f2f2c193bde";
       })
     ];
     buildInputs =
@@ -7995,8 +8159,8 @@
       self.by-version."mime"."1.2.11"
       self.by-version."request"."2.33.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."clean-css"."2.0.7"
-      self.by-version."source-map"."0.1.31"
+      self.by-version."clean-css"."2.0.8"
+      self.by-version."source-map"."0.1.32"
     ];
     peerDependencies = [
     ];
@@ -8273,6 +8437,28 @@
     ];
     passthru.names = [ "lodash._shimkeys" ];
   };
+  by-spec."lodash.debounce"."~2.4.1" =
+    self.by-version."lodash.debounce"."2.4.1";
+  by-version."lodash.debounce"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash.debounce-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.4.1.tgz";
+        name = "lodash.debounce-2.4.1.tgz";
+        sha1 = "d8cead246ec4b926e8b85678fc396bfeba8cc6fc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.debounce" or []);
+    deps = [
+      self.by-version."lodash.isfunction"."2.4.1"
+      self.by-version."lodash.isobject"."2.4.1"
+      self.by-version."lodash.now"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.debounce" ];
+  };
   by-spec."lodash.defaults"."~2.4.1" =
     self.by-version."lodash.defaults"."2.4.1";
   by-version."lodash.defaults"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -8294,6 +8480,25 @@
     ];
     passthru.names = [ "lodash.defaults" ];
   };
+  by-spec."lodash.isfunction"."~2.4.1" =
+    self.by-version."lodash.isfunction"."2.4.1";
+  by-version."lodash.isfunction"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash.isfunction-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz";
+        name = "lodash.isfunction-2.4.1.tgz";
+        sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.isfunction" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.isfunction" ];
+  };
   by-spec."lodash.isobject"."~2.4.1" =
     self.by-version."lodash.isobject"."2.4.1";
   by-version."lodash.isobject"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -8336,6 +8541,26 @@
     ];
     passthru.names = [ "lodash.keys" ];
   };
+  by-spec."lodash.now"."~2.4.1" =
+    self.by-version."lodash.now"."2.4.1";
+  by-version."lodash.now"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash.now-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.now/-/lodash.now-2.4.1.tgz";
+        name = "lodash.now-2.4.1.tgz";
+        sha1 = "6872156500525185faf96785bb7fe7fe15b562c6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.now" or []);
+    deps = [
+      self.by-version."lodash._isnative"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.now" ];
+  };
   by-spec."log-driver"."1.2.1" =
     self.by-version."log-driver"."1.2.1";
   by-version."log-driver"."1.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -8356,14 +8581,14 @@
     passthru.names = [ "log-driver" ];
   };
   by-spec."log4js"."~0.6.3" =
-    self.by-version."log4js"."0.6.9";
-  by-version."log4js"."0.6.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-log4js-0.6.9";
+    self.by-version."log4js"."0.6.10";
+  by-version."log4js"."0.6.10" = lib.makeOverridable self.buildNodePackage {
+    name = "node-log4js-0.6.10";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.9.tgz";
-        name = "log4js-0.6.9.tgz";
-        sha1 = "2e327189c1c0dec17448ec5255f58cd0fddf4596";
+        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.10.tgz";
+        name = "log4js-0.6.10.tgz";
+        sha1 = "3a47a2551dc6362672901b73f7f47aee6310f785";
       })
     ];
     buildInputs =
@@ -8531,15 +8756,15 @@
   };
   by-spec."lru-cache"."~2.5.0" =
     self.by-version."lru-cache"."2.5.0";
-  by-spec."lsmod"."0.0.2" =
-    self.by-version."lsmod"."0.0.2";
-  by-version."lsmod"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lsmod-0.0.2";
+  by-spec."lsmod"."~0.0.3" =
+    self.by-version."lsmod"."0.0.3";
+  by-version."lsmod"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lsmod-0.0.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/lsmod/-/lsmod-0.0.2.tgz";
-        name = "lsmod-0.0.2.tgz";
-        sha1 = "ebfe765bbfcbe85006eb315862445158b7baf613";
+        url = "http://registry.npmjs.org/lsmod/-/lsmod-0.0.3.tgz";
+        name = "lsmod-0.0.3.tgz";
+        sha1 = "17e13d4e1ae91750ea5653548cd89e7147ad0244";
       })
     ];
     buildInputs =
@@ -8567,7 +8792,7 @@
       self.by-version."mimelib"."0.2.14"
       self.by-version."mime"."1.2.9"
       self.by-version."he"."0.3.6"
-      self.by-version."punycode"."1.2.3"
+      self.by-version."punycode"."1.2.4"
       self.by-version."follow-redirects"."0.0.3"
       self.by-version."dkim-signer"."0.1.0"
     ];
@@ -8802,7 +9027,7 @@
       (self.nativeDeps."mimelib" or []);
     deps = [
       self.by-version."encoding"."0.1.7"
-      self.by-version."addressparser"."0.2.0"
+      self.by-version."addressparser"."0.2.1"
     ];
     peerDependencies = [
     ];
@@ -8870,14 +9095,14 @@
   by-spec."minimatch"."~0.2.9" =
     self.by-version."minimatch"."0.2.14";
   by-spec."minimist"."~0.0.1" =
-    self.by-version."minimist"."0.0.5";
-  by-version."minimist"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-minimist-0.0.5";
+    self.by-version."minimist"."0.0.7";
+  by-version."minimist"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-minimist-0.0.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz";
-        name = "minimist-0.0.5.tgz";
-        sha1 = "d7aa327bcecf518f9106ac6b8f003fa3bcea8566";
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.7.tgz";
+        name = "minimist-0.0.7.tgz";
+        sha1 = "dc4c620253c542eda0d2eb91c3c6a971a11e63e7";
       })
     ];
     buildInputs =
@@ -9110,27 +9335,27 @@
     passthru.names = [ "moment" ];
   };
   by-spec."mongodb"."*" =
-    self.by-version."mongodb"."1.4.0-rc6";
-  by-version."mongodb"."1.4.0-rc6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mongodb-1.4.0-rc6";
+    self.by-version."mongodb"."1.4.0-rc7";
+  by-version."mongodb"."1.4.0-rc7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mongodb-1.4.0-rc7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc6.tgz";
-        name = "mongodb-1.4.0-rc6.tgz";
-        sha1 = "dd2f6a03d9e9da019d6aa5da66c4d5de7993aedd";
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc7.tgz";
+        name = "mongodb-1.4.0-rc7.tgz";
+        sha1 = "efa6da4ef5d1bf0fdf48b4f0e369e3d2186d3401";
       })
     ];
     buildInputs =
       (self.nativeDeps."mongodb" or []);
     deps = [
-      self.by-version."bson"."0.2.5"
+      self.by-version."bson"."0.2.6"
       self.by-version."kerberos"."0.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "mongodb" ];
   };
-  "mongodb" = self.by-version."mongodb"."1.4.0-rc6";
+  "mongodb" = self.by-version."mongodb"."1.4.0-rc7";
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
   by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
@@ -9196,14 +9421,14 @@
   by-spec."mongodb"."1.3.x" =
     self.by-version."mongodb"."1.3.23";
   by-spec."mongoose"."*" =
-    self.by-version."mongoose"."3.8.6";
-  by-version."mongoose"."3.8.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mongoose-3.8.6";
+    self.by-version."mongoose"."3.8.7";
+  by-version."mongoose"."3.8.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mongoose-3.8.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.6.tgz";
-        name = "mongoose-3.8.6.tgz";
-        sha1 = "c8a282d3c74915864b6ed1e01884388c6e91d146";
+        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.7.tgz";
+        name = "mongoose-3.8.7.tgz";
+        sha1 = "0ce98a491097944c25b9d0d1bfe2899198284a00";
       })
     ];
     buildInputs =
@@ -9650,6 +9875,25 @@
     ];
     passthru.names = [ "nan" ];
   };
+  by-spec."nan"."~0.8.0" =
+    self.by-version."nan"."0.8.0";
+  by-version."nan"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-nan-0.8.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nan/-/nan-0.8.0.tgz";
+        name = "nan-0.8.0.tgz";
+        sha1 = "022a8fa5e9fe8420964ac1fb3dc94e17f449f5fd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nan" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nan" ];
+  };
   by-spec."natural"."0.1.17" =
     self.by-version."natural"."0.1.17";
   by-version."natural"."0.1.17" = lib.makeOverridable self.buildNodePackage {
@@ -9666,7 +9910,7 @@
     deps = [
       self.by-version."sylvester"."0.0.21"
       self.by-version."apparatus"."0.0.8"
-      self.by-version."underscore"."1.5.2"
+      self.by-version."underscore"."1.6.0"
     ];
     peerDependencies = [
     ];
@@ -9884,7 +10128,7 @@
       self.by-version."semver"."2.1.0"
       self.by-version."sprintf"."0.1.3"
       self.by-version."temp"."0.6.0"
-      self.by-version."wrench"."1.5.6"
+      self.by-version."wrench"."1.5.7"
       self.by-version."uglify-js"."2.3.6"
       self.by-version."xmldom"."0.1.19"
     ];
@@ -9928,11 +10172,11 @@
       (self.nativeDeps."node-gyp" or []);
     deps = [
       self.by-version."glob"."3.2.8"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."fstream"."0.1.25"
       self.by-version."minimatch"."0.2.14"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."nopt"."2.1.2"
+      self.by-version."nopt"."2.2.0"
       self.by-version."npmlog"."0.0.6"
       self.by-version."osenv"."0.0.3"
       self.by-version."request"."2.33.0"
@@ -10185,7 +10429,7 @@
       (self.nativeDeps."nodemailer" or []);
     deps = [
       self.by-version."mailcomposer"."0.2.8"
-      self.by-version."simplesmtp"."0.3.20"
+      self.by-version."simplesmtp"."0.3.21"
       self.by-version."optimist"."0.6.1"
     ];
     peerDependencies = [
@@ -10236,14 +10480,14 @@
     passthru.names = [ "nomnom" ];
   };
   by-spec."nopt"."2" =
-    self.by-version."nopt"."2.1.2";
-  by-version."nopt"."2.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "nopt-2.1.2";
+    self.by-version."nopt"."2.2.0";
+  by-version."nopt"."2.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-2.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
-        name = "nopt-2.1.2.tgz";
-        sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
+        url = "http://registry.npmjs.org/nopt/-/nopt-2.2.0.tgz";
+        name = "nopt-2.2.0.tgz";
+        sha1 = "3d106676f3607ac466af9bf82bd707b1501d3bd5";
       })
     ];
     buildInputs =
@@ -10277,6 +10521,26 @@
   };
   by-spec."nopt"."2.1.x" =
     self.by-version."nopt"."2.1.2";
+  by-version."nopt"."2.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-2.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
+        name = "nopt-2.1.2.tgz";
+        sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nopt" or []);
+    deps = [
+      self.by-version."abbrev"."1.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nopt" ];
+  };
+  by-spec."nopt"."^2.2.0" =
+    self.by-version."nopt"."2.2.0";
   by-spec."nopt"."https://github.com/Filirom1/nopt/tarball/master#pull-request-in-progress" =
     self.by-version."nopt"."1.0.10";
   by-version."nopt"."1.0.10" = lib.makeOverridable self.buildNodePackage {
@@ -10303,15 +10567,15 @@
     self.by-version."nopt"."2.1.2";
   by-spec."nopt"."~2.1.2" =
     self.by-version."nopt"."2.1.2";
-  by-spec."normalize-package-data"."~0.2.7" =
-    self.by-version."normalize-package-data"."0.2.8";
-  by-version."normalize-package-data"."0.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-normalize-package-data-0.2.8";
+  by-spec."normalize-package-data"."~0.2.9" =
+    self.by-version."normalize-package-data"."0.2.9";
+  by-version."normalize-package-data"."0.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-normalize-package-data-0.2.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.8.tgz";
-        name = "normalize-package-data-0.2.8.tgz";
-        sha1 = "95dc1bcb54c8d46b3be345c05afbab27e48e2f69";
+        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.9.tgz";
+        name = "normalize-package-data-0.2.9.tgz";
+        sha1 = "8be8a1c0a0b55a7df07bee2b488c67c1d8862a4b";
       })
     ];
     buildInputs =
@@ -10326,14 +10590,14 @@
     passthru.names = [ "normalize-package-data" ];
   };
   by-spec."npm"."*" =
-    self.by-version."npm"."1.3.26";
-  by-version."npm"."1.3.26" = lib.makeOverridable self.buildNodePackage {
-    name = "npm-1.3.26";
+    self.by-version."npm"."1.4.3";
+  by-version."npm"."1.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-1.4.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm/-/npm-1.3.26.tgz";
-        name = "npm-1.3.26.tgz";
-        sha1 = "bc07bf7cb58710078141c885c2d492fd570f606d";
+        url = "http://registry.npmjs.org/npm/-/npm-1.4.3.tgz";
+        name = "npm-1.4.3.tgz";
+        sha1 = "c0b18a662731d93cfdac37df5c2b3a0cda39613c";
       })
     ];
     buildInputs =
@@ -10343,9 +10607,9 @@
       self.by-version."ini"."1.1.0"
       self.by-version."slide"."1.1.5"
       self.by-version."abbrev"."1.0.4"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."minimatch"."0.2.14"
-      self.by-version."nopt"."2.1.2"
+      self.by-version."nopt"."2.2.0"
       self.by-version."rimraf"."2.2.6"
       self.by-version."request"."2.30.0"
       self.by-version."which"."1.0.5"
@@ -10357,15 +10621,15 @@
       self.by-version."lru-cache"."2.5.0"
       self.by-version."node-gyp"."0.12.2"
       self.by-version."fstream-npm"."0.1.6"
-      self.by-version."uid-number"."0.0.3"
+      self.by-version."uid-number"."0.0.4"
       self.by-version."archy"."0.0.2"
       self.by-version."chownr"."0.0.1"
       self.by-version."npmlog"."0.0.6"
       self.by-version."ansi"."0.2.1"
-      self.by-version."npm-registry-client"."0.3.5"
-      self.by-version."read-package-json"."1.1.6"
-      self.by-version."read-installed"."0.2.5"
-      self.by-version."glob"."3.2.8"
+      self.by-version."npm-registry-client"."0.4.4"
+      self.by-version."read-package-json"."1.1.7"
+      self.by-version."read-installed"."1.0.0"
+      self.by-version."glob"."3.2.7"
       self.by-version."init-package-json"."0.0.14"
       self.by-version."osenv"."0.0.3"
       self.by-version."lockfile"."0.4.2"
@@ -10386,12 +10650,34 @@
       self.by-version."ansistyles"."0.1.3"
       self.by-version."path-is-inside"."1.0.0"
       self.by-version."columnify"."0.1.2"
+      self.by-version."npm-install-checks"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm" ];
   };
-  "npm" = self.by-version."npm"."1.3.26";
+  "npm" = self.by-version."npm"."1.4.3";
+  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 {
+    name = "node-npm-install-checks-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.0.tgz";
+        name = "npm-install-checks-1.0.0.tgz";
+        sha1 = "7e1469b5e0c693b2ae2a8830b5fc4e7bf76c88fd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npm-install-checks" or []);
+    deps = [
+      self.by-version."npmlog"."0.0.6"
+      self.by-version."semver"."2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npm-install-checks" ];
+  };
   by-spec."npm-registry-client"."0.2.27" =
     self.by-version."npm-registry-client"."0.2.27";
   by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage {
@@ -10407,7 +10693,7 @@
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
       self.by-version."request"."2.33.0"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."semver"."2.0.11"
       self.by-version."slide"."1.1.5"
       self.by-version."chownr"."0.0.1"
@@ -10421,37 +10707,62 @@
     ];
     passthru.names = [ "npm-registry-client" ];
   };
+  by-spec."npm-registry-client"."^0.4.4" =
+    self.by-version."npm-registry-client"."0.4.4";
+  by-version."npm-registry-client"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-registry-client-0.4.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.4.4.tgz";
+        name = "npm-registry-client-0.4.4.tgz";
+        sha1 = "f9dbc383a49069d8c7f67755a3ff6e424aff584f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npm-registry-client" or []);
+    deps = [
+      self.by-version."request"."2.33.0"
+      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."semver"."2.2.1"
+      self.by-version."slide"."1.1.5"
+      self.by-version."chownr"."0.0.1"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."rimraf"."2.2.6"
+      self.by-version."retry"."0.6.0"
+      self.by-version."npmlog"."0.0.6"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npm-registry-client" ];
+  };
   by-spec."npm-registry-client"."~0.3.3" =
-    self.by-version."npm-registry-client"."0.3.5";
-  by-version."npm-registry-client"."0.3.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npm-registry-client-0.3.5";
+    self.by-version."npm-registry-client"."0.3.6";
+  by-version."npm-registry-client"."0.3.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-registry-client-0.3.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.5.tgz";
-        name = "npm-registry-client-0.3.5.tgz";
-        sha1 = "98ba1ac851a3939a3fb9917c28fa8da522dc635f";
+        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.6.tgz";
+        name = "npm-registry-client-0.3.6.tgz";
+        sha1 = "c48a2a03643769acc49672860f7920ec6bffac6e";
       })
     ];
     buildInputs =
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
       self.by-version."request"."2.33.0"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."semver"."2.2.1"
       self.by-version."slide"."1.1.5"
       self.by-version."chownr"."0.0.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."rimraf"."2.2.6"
       self.by-version."retry"."0.6.0"
-      self.by-version."couch-login"."0.1.20"
       self.by-version."npmlog"."0.0.6"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm-registry-client" ];
   };
-  by-spec."npm-registry-client"."~0.3.5" =
-    self.by-version."npm-registry-client"."0.3.5";
   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 {
@@ -10472,14 +10783,14 @@
     passthru.names = [ "npm-user-validate" ];
   };
   by-spec."npm2nix"."*" =
-    self.by-version."npm2nix"."5.5.0";
-  by-version."npm2nix"."5.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "npm2nix-5.5.0";
+    self.by-version."npm2nix"."5.6.0";
+  by-version."npm2nix"."5.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "npm2nix-5.6.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.5.0.tgz";
-        name = "npm2nix-5.5.0.tgz";
-        sha1 = "79729928cc4d2f4e765797491eeb4ced2b1d9e9e";
+        url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.6.0.tgz";
+        name = "npm2nix-5.6.0.tgz";
+        sha1 = "75680a36a24fe7f434a18199552cd3e7a576e875";
       })
     ];
     buildInputs =
@@ -10498,7 +10809,7 @@
     ];
     passthru.names = [ "npm2nix" ];
   };
-  "npm2nix" = self.by-version."npm2nix"."5.5.0";
+  "npm2nix" = self.by-version."npm2nix"."5.6.0";
   by-spec."npmconf"."0.0.24" =
     self.by-version."npmconf"."0.0.24";
   by-version."npmconf"."0.0.24" = lib.makeOverridable self.buildNodePackage {
@@ -10518,7 +10829,7 @@
       self.by-version."once"."1.1.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."osenv"."0.0.3"
-      self.by-version."nopt"."2.1.2"
+      self.by-version."nopt"."2.2.0"
       self.by-version."semver"."1.1.4"
       self.by-version."ini"."1.1.0"
     ];
@@ -10545,7 +10856,7 @@
       self.by-version."once"."1.1.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."osenv"."0.0.3"
-      self.by-version."nopt"."2.1.2"
+      self.by-version."nopt"."2.2.0"
       self.by-version."semver"."2.2.1"
       self.by-version."ini"."1.1.0"
     ];
@@ -10572,7 +10883,7 @@
       self.by-version."once"."1.3.0"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."osenv"."0.0.3"
-      self.by-version."nopt"."2.1.2"
+      self.by-version."nopt"."2.2.0"
       self.by-version."semver"."2.2.1"
       self.by-version."ini"."1.1.0"
     ];
@@ -10627,6 +10938,26 @@
     ];
     passthru.names = [ "nssocket" ];
   };
+  by-spec."nth-check"."~1.0.0" =
+    self.by-version."nth-check"."1.0.0";
+  by-version."nth-check"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-nth-check-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nth-check/-/nth-check-1.0.0.tgz";
+        name = "nth-check-1.0.0.tgz";
+        sha1 = "02fc1277aa2bf8e6083be456104d6a646101a49d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nth-check" or []);
+    deps = [
+      self.by-version."boolbase"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nth-check" ];
+  };
   by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" =
     self.by-version."oauth"."0.9.11";
   by-version."oauth"."0.9.11" = lib.makeOverridable self.buildNodePackage {
@@ -10703,6 +11034,27 @@
     ];
     passthru.names = [ "object-additions" ];
   };
+  by-spec."object-assign"."~0.1.1" =
+    self.by-version."object-assign"."0.1.2";
+  by-version."object-assign"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-object-assign-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/object-assign/-/object-assign-0.1.2.tgz";
+        name = "object-assign-0.1.2.tgz";
+        sha1 = "036992f073aff7b2db83d06b3fb3155a5ccac37f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."object-assign" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "object-assign" ];
+  };
+  by-spec."object-assign"."~0.1.2" =
+    self.by-version."object-assign"."0.1.2";
   by-spec."object-keys"."~0.4.0" =
     self.by-version."object-keys"."0.4.0";
   by-version."object-keys"."0.4.0" = lib.makeOverridable self.buildNodePackage {
@@ -10857,7 +11209,7 @@
       (self.nativeDeps."optimist" or []);
     deps = [
       self.by-version."wordwrap"."0.0.2"
-      self.by-version."minimist"."0.0.5"
+      self.by-version."minimist"."0.0.7"
     ];
     peerDependencies = [
     ];
@@ -10919,7 +11271,7 @@
       (self.nativeDeps."optimist" or []);
     deps = [
       self.by-version."wordwrap"."0.0.2"
-      self.by-version."minimist"."0.0.5"
+      self.by-version."minimist"."0.0.7"
     ];
     peerDependencies = [
     ];
@@ -11459,14 +11811,14 @@
     passthru.names = [ "proto-list" ];
   };
   by-spec."protobufjs".">= 1.1.4" =
-    self.by-version."protobufjs"."2.0.4";
-  by-version."protobufjs"."2.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "protobufjs-2.0.4";
+    self.by-version."protobufjs"."2.0.5";
+  by-version."protobufjs"."2.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "protobufjs-2.0.5";
     src = [
       (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.4.tgz";
-        name = "protobufjs-2.0.4.tgz";
-        sha1 = "109de55527459ce5bc91d72f1fd86b5a9c7f1058";
+        url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.5.tgz";
+        name = "protobufjs-2.0.5.tgz";
+        sha1 = "7f351178c959b333d2327b773325ca4b2627a242";
       })
     ];
     buildInputs =
@@ -11500,14 +11852,14 @@
     passthru.names = [ "ps-tree" ];
   };
   by-spec."punycode".">=0.2.0" =
-    self.by-version."punycode"."1.2.3";
-  by-version."punycode"."1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-punycode-1.2.3";
+    self.by-version."punycode"."1.2.4";
+  by-version."punycode"."1.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-punycode-1.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/punycode/-/punycode-1.2.3.tgz";
-        name = "punycode-1.2.3.tgz";
-        sha1 = "b4e304471082d783c73b3bafabf2fd9b6a486266";
+        url = "http://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz";
+        name = "punycode-1.2.4.tgz";
+        sha1 = "54008ac972aec74175def9cba6df7fa9d3918740";
       })
     ];
     buildInputs =
@@ -11519,7 +11871,7 @@
     passthru.names = [ "punycode" ];
   };
   by-spec."punycode"."~1.2.3" =
-    self.by-version."punycode"."1.2.3";
+    self.by-version."punycode"."1.2.4";
   by-spec."q".">= 0.0.1" =
     self.by-version."q"."1.0.0";
   by-version."q"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -11763,14 +12115,14 @@
     passthru.names = [ "range-parser" ];
   };
   by-spec."raven"."~0.6.0" =
-    self.by-version."raven"."0.6.1";
-  by-version."raven"."0.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-raven-0.6.1";
+    self.by-version."raven"."0.6.2";
+  by-version."raven"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+    name = "raven-0.6.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/raven/-/raven-0.6.1.tgz";
-        name = "raven-0.6.1.tgz";
-        sha1 = "2c307e90295517ce2d45354b0c2d905311f66a5d";
+        url = "http://registry.npmjs.org/raven/-/raven-0.6.2.tgz";
+        name = "raven-0.6.2.tgz";
+        sha1 = "391a7395b6088518a01697f639f21ce6ea9841a3";
       })
     ];
     buildInputs =
@@ -11778,7 +12130,7 @@
     deps = [
       self.by-version."node-uuid"."1.4.1"
       self.by-version."stack-trace"."0.0.7"
-      self.by-version."lsmod"."0.0.2"
+      self.by-version."lsmod"."0.0.3"
       self.by-version."cookie"."0.1.0"
     ];
     peerDependencies = [
@@ -11929,22 +12281,22 @@
     deps = [
       self.by-version."semver"."2.2.1"
       self.by-version."slide"."1.1.5"
-      self.by-version."read-package-json"."1.1.6"
+      self.by-version."read-package-json"."1.1.7"
       self.by-version."graceful-fs"."1.2.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "read-installed" ];
   };
-  by-spec."read-installed"."~0.2.2" =
-    self.by-version."read-installed"."0.2.5";
-  by-version."read-installed"."0.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-read-installed-0.2.5";
+  by-spec."read-installed"."~1.0.0" =
+    self.by-version."read-installed"."1.0.0";
+  by-version."read-installed"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-read-installed-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.5.tgz";
-        name = "read-installed-0.2.5.tgz";
-        sha1 = "134df8b326d8b54b11e18f7dd8c81bf5e976ef86";
+        url = "http://registry.npmjs.org/read-installed/-/read-installed-1.0.0.tgz";
+        name = "read-installed-1.0.0.tgz";
+        sha1 = "4db88d5a363f9c68eaa07e1626974bc2e0a1b3a5";
       })
     ];
     buildInputs =
@@ -11952,22 +12304,22 @@
     deps = [
       self.by-version."semver"."2.2.1"
       self.by-version."slide"."1.1.5"
-      self.by-version."read-package-json"."1.1.6"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."read-package-json"."1.1.7"
+      self.by-version."graceful-fs"."2.0.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "read-installed" ];
   };
   by-spec."read-package-json"."1" =
-    self.by-version."read-package-json"."1.1.6";
-  by-version."read-package-json"."1.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-read-package-json-1.1.6";
+    self.by-version."read-package-json"."1.1.7";
+  by-version."read-package-json"."1.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-read-package-json-1.1.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.6.tgz";
-        name = "read-package-json-1.1.6.tgz";
-        sha1 = "a851dbbaca48ff78a87f890f0a9fdf43b1759d5a";
+        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.7.tgz";
+        name = "read-package-json-1.1.7.tgz";
+        sha1 = "a28da23cb4330106a0d45e86065e0fc3b79d263e";
       })
     ];
     buildInputs =
@@ -11975,15 +12327,15 @@
     deps = [
       self.by-version."glob"."3.2.8"
       self.by-version."lru-cache"."2.5.0"
-      self.by-version."normalize-package-data"."0.2.8"
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."normalize-package-data"."0.2.9"
+      self.by-version."graceful-fs"."2.0.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "read-package-json" ];
   };
-  by-spec."read-package-json"."~1.1.6" =
-    self.by-version."read-package-json"."1.1.6";
+  by-spec."read-package-json"."~1.1.7" =
+    self.by-version."read-package-json"."1.1.7";
   by-spec."readable-stream"."1.0" =
     self.by-version."readable-stream"."1.0.25";
   by-version."readable-stream"."1.0.25" = lib.makeOverridable self.buildNodePackage {
@@ -12077,14 +12429,14 @@
     passthru.names = [ "redeyed" ];
   };
   by-spec."redis"."*" =
-    self.by-version."redis"."0.10.0";
-  by-version."redis"."0.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-redis-0.10.0";
+    self.by-version."redis"."0.10.1";
+  by-version."redis"."0.10.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-redis-0.10.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/redis/-/redis-0.10.0.tgz";
-        name = "redis-0.10.0.tgz";
-        sha1 = "76864475f71a745cbc3bbb27d794a6d01a96505c";
+        url = "http://registry.npmjs.org/redis/-/redis-0.10.1.tgz";
+        name = "redis-0.10.1.tgz";
+        sha1 = "4f09258931d961377239fdbd495e1d99a263a8ec";
       })
     ];
     buildInputs =
@@ -12095,7 +12447,7 @@
     ];
     passthru.names = [ "redis" ];
   };
-  "redis" = self.by-version."redis"."0.10.0";
+  "redis" = self.by-version."redis"."0.10.1";
   by-spec."redis"."0.7.2" =
     self.by-version."redis"."0.7.2";
   by-version."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage {
@@ -12155,7 +12507,7 @@
     passthru.names = [ "redis" ];
   };
   by-spec."redis"."~0.10.0" =
-    self.by-version."redis"."0.10.0";
+    self.by-version."redis"."0.10.1";
   by-spec."reds"."~0.2.4" =
     self.by-version."reds"."0.2.4";
   by-version."reds"."0.2.4" = lib.makeOverridable self.buildNodePackage {
@@ -12522,14 +12874,14 @@
     passthru.names = [ "request-replay" ];
   };
   by-spec."requirejs"."~2.1" =
-    self.by-version."requirejs"."2.1.10";
-  by-version."requirejs"."2.1.10" = lib.makeOverridable self.buildNodePackage {
-    name = "requirejs-2.1.10";
+    self.by-version."requirejs"."2.1.11";
+  by-version."requirejs"."2.1.11" = lib.makeOverridable self.buildNodePackage {
+    name = "requirejs-2.1.11";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.10.tgz";
-        name = "requirejs-2.1.10.tgz";
-        sha1 = "1e1d7f608790e532a422c6199dad2abe15484b54";
+        url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.11.tgz";
+        name = "requirejs-2.1.11.tgz";
+        sha1 = "0eafaa6b46ca9b5b1e13406f119c020190a24442";
       })
     ];
     buildInputs =
@@ -12541,7 +12893,7 @@
     passthru.names = [ "requirejs" ];
   };
   by-spec."requirejs"."~2.1.0" =
-    self.by-version."requirejs"."2.1.10";
+    self.by-version."requirejs"."2.1.11";
   by-spec."resolve"."0.5.x" =
     self.by-version."resolve"."0.5.1";
   by-version."resolve"."0.5.1" = lib.makeOverridable self.buildNodePackage {
@@ -12649,7 +13001,7 @@
     buildInputs =
       (self.nativeDeps."rethinkdb" or []);
     deps = [
-      self.by-version."protobufjs"."2.0.4"
+      self.by-version."protobufjs"."2.0.5"
     ];
     peerDependencies = [
     ];
@@ -13152,7 +13504,7 @@
     buildInputs =
       (self.nativeDeps."sha" or []);
     deps = [
-      self.by-version."graceful-fs"."2.0.1"
+      self.by-version."graceful-fs"."2.0.2"
       self.by-version."readable-stream"."1.0.25"
     ];
     peerDependencies = [
@@ -13281,14 +13633,14 @@
     passthru.names = [ "simple-lru-cache" ];
   };
   by-spec."simplesmtp".">= 0.1.22" =
-    self.by-version."simplesmtp"."0.3.20";
-  by-version."simplesmtp"."0.3.20" = lib.makeOverridable self.buildNodePackage {
-    name = "node-simplesmtp-0.3.20";
+    self.by-version."simplesmtp"."0.3.21";
+  by-version."simplesmtp"."0.3.21" = lib.makeOverridable self.buildNodePackage {
+    name = "node-simplesmtp-0.3.21";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.20.tgz";
-        name = "simplesmtp-0.3.20.tgz";
-        sha1 = "9de032acd3f4dfee69aed80ea9843b09419bd001";
+        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.21.tgz";
+        name = "simplesmtp-0.3.21.tgz";
+        sha1 = "79aa14d72a915bb5853ff53a8a44b0823fbe1a8f";
       })
     ];
     buildInputs =
@@ -13589,14 +13941,14 @@
   };
   "sockjs" = self.by-version."sockjs"."0.3.8";
   by-spec."source-map"."*" =
-    self.by-version."source-map"."0.1.31";
-  by-version."source-map"."0.1.31" = lib.makeOverridable self.buildNodePackage {
-    name = "node-source-map-0.1.31";
+    self.by-version."source-map"."0.1.32";
+  by-version."source-map"."0.1.32" = lib.makeOverridable self.buildNodePackage {
+    name = "node-source-map-0.1.32";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz";
-        name = "source-map-0.1.31.tgz";
-        sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61";
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz";
+        name = "source-map-0.1.32.tgz";
+        sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266";
       })
     ];
     buildInputs =
@@ -13608,17 +13960,17 @@
     ];
     passthru.names = [ "source-map" ];
   };
-  "source-map" = self.by-version."source-map"."0.1.31";
+  "source-map" = self.by-version."source-map"."0.1.32";
   by-spec."source-map"."0.1.x" =
-    self.by-version."source-map"."0.1.31";
+    self.by-version."source-map"."0.1.32";
   by-spec."source-map".">= 0.1.2" =
-    self.by-version."source-map"."0.1.31";
+    self.by-version."source-map"."0.1.32";
   by-spec."source-map"."~0.1.30" =
-    self.by-version."source-map"."0.1.31";
+    self.by-version."source-map"."0.1.32";
   by-spec."source-map"."~0.1.31" =
-    self.by-version."source-map"."0.1.31";
+    self.by-version."source-map"."0.1.32";
   by-spec."source-map"."~0.1.7" =
-    self.by-version."source-map"."0.1.31";
+    self.by-version."source-map"."0.1.32";
   by-spec."spdy"."1.7.1" =
     self.by-version."spdy"."1.7.1";
   by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage {
@@ -13983,28 +14335,8 @@
     passthru.names = [ "stylus" ];
   };
   "stylus" = self.by-version."stylus"."0.42.2";
-  by-spec."stylus"."0.27.2" =
-    self.by-version."stylus"."0.27.2";
-  by-version."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage {
-    name = "stylus-0.27.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stylus/-/stylus-0.27.2.tgz";
-        name = "stylus-0.27.2.tgz";
-        sha1 = "1121f7f8cd152b0f8a4aa6a24a9adea10c825117";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stylus" or []);
-    deps = [
-      self.by-version."cssom"."0.2.5"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."debug"."0.7.4"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "stylus" ];
-  };
+  by-spec."stylus"."0.42.2" =
+    self.by-version."stylus"."0.42.2";
   by-spec."sudo-block"."~0.2.0" =
     self.by-version."sudo-block"."0.2.1";
   by-version."sudo-block"."0.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -14135,7 +14467,7 @@
     buildInputs =
       (self.nativeDeps."swig" or []);
     deps = [
-      self.by-version."underscore"."1.5.2"
+      self.by-version."underscore"."1.6.0"
     ];
     peerDependencies = [
     ];
@@ -14399,14 +14731,14 @@
     passthru.names = [ "timespan" ];
   };
   by-spec."timezone"."*" =
-    self.by-version."timezone"."0.0.23";
-  by-version."timezone"."0.0.23" = lib.makeOverridable self.buildNodePackage {
-    name = "node-timezone-0.0.23";
+    self.by-version."timezone"."0.0.28";
+  by-version."timezone"."0.0.28" = lib.makeOverridable self.buildNodePackage {
+    name = "node-timezone-0.0.28";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/timezone/-/timezone-0.0.23.tgz";
-        name = "timezone-0.0.23.tgz";
-        sha1 = "5e89359e0c01c92b495c725e81ecce6ddbdb9bac";
+        url = "http://registry.npmjs.org/timezone/-/timezone-0.0.28.tgz";
+        name = "timezone-0.0.28.tgz";
+        sha1 = "a3fb234b48093c8edd36de5662e92ece6477a88c";
       })
     ];
     buildInputs =
@@ -14417,7 +14749,7 @@
     ];
     passthru.names = [ "timezone" ];
   };
-  "timezone" = self.by-version."timezone"."0.0.23";
+  "timezone" = self.by-version."timezone"."0.0.28";
   by-spec."tinycolor"."0.x" =
     self.by-version."tinycolor"."0.0.1";
   by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -14437,15 +14769,15 @@
     ];
     passthru.names = [ "tinycolor" ];
   };
-  by-spec."titanium"."3.2.0" =
-    self.by-version."titanium"."3.2.0";
-  by-version."titanium"."3.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "titanium-3.2.0";
+  by-spec."titanium"."3.2.1" =
+    self.by-version."titanium"."3.2.1";
+  by-version."titanium"."3.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "titanium-3.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/titanium/-/titanium-3.2.0.tgz";
-        name = "titanium-3.2.0.tgz";
-        sha1 = "97b25af99e99d4543f5cc2c7025b2c2f6199de6e";
+        url = "http://registry.npmjs.org/titanium/-/titanium-3.2.1.tgz";
+        name = "titanium-3.2.1.tgz";
+        sha1 = "b1d432c6c853c22096fb3ed03626e8263b27e39e";
       })
     ];
     buildInputs =
@@ -14465,13 +14797,13 @@
       self.by-version."sprintf"."0.1.3"
       self.by-version."temp"."0.6.0"
       self.by-version."winston"."0.6.2"
-      self.by-version."wrench"."1.5.6"
+      self.by-version."wrench"."1.5.7"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "titanium" ];
   };
-  "titanium" = self.by-version."titanium"."3.2.0";
+  "titanium" = self.by-version."titanium"."3.2.1";
   by-spec."tmp"."~0.0.20" =
     self.by-version."tmp"."0.0.23";
   by-version."tmp"."0.0.23" = lib.makeOverridable self.buildNodePackage {
@@ -14525,7 +14857,7 @@
     buildInputs =
       (self.nativeDeps."tough-cookie" or []);
     deps = [
-      self.by-version."punycode"."1.2.3"
+      self.by-version."punycode"."1.2.4"
     ];
     peerDependencies = [
     ];
@@ -14545,7 +14877,7 @@
     buildInputs =
       (self.nativeDeps."tough-cookie" or []);
     deps = [
-      self.by-version."punycode"."1.2.3"
+      self.by-version."punycode"."1.2.4"
     ];
     peerDependencies = [
     ];
@@ -14721,7 +15053,7 @@
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.31"
+      self.by-version."source-map"."0.1.32"
       self.by-version."optimist"."0.3.7"
       self.by-version."uglify-to-browserify"."1.0.2"
     ];
@@ -14762,7 +15094,7 @@
     buildInputs =
       (self.nativeDeps."uglify-js" or []);
     deps = [
-      self.by-version."source-map"."0.1.31"
+      self.by-version."source-map"."0.1.32"
       self.by-version."optimist"."0.3.7"
     ];
     peerDependencies = [
@@ -14784,7 +15116,7 @@
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.31"
+      self.by-version."source-map"."0.1.32"
       self.by-version."optimist"."0.3.7"
     ];
     peerDependencies = [
@@ -14808,7 +15140,7 @@
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.31"
+      self.by-version."source-map"."0.1.32"
       self.by-version."optimist"."0.3.7"
       self.by-version."uglify-to-browserify"."1.0.2"
     ];
@@ -14836,14 +15168,14 @@
     passthru.names = [ "uglify-to-browserify" ];
   };
   by-spec."uid-number"."0" =
-    self.by-version."uid-number"."0.0.3";
-  by-version."uid-number"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-uid-number-0.0.3";
+    self.by-version."uid-number"."0.0.4";
+  by-version."uid-number"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-uid-number-0.0.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz";
-        name = "uid-number-0.0.3.tgz";
-        sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc";
+        url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.4.tgz";
+        name = "uid-number-0.0.4.tgz";
+        sha1 = "5ea1d068b8c0dd1866c13aa0b76fa6e4f240cbdf";
       })
     ];
     buildInputs =
@@ -14874,14 +15206,14 @@
     passthru.names = [ "uid2" ];
   };
   by-spec."underscore"."*" =
-    self.by-version."underscore"."1.5.2";
-  by-version."underscore"."1.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-underscore-1.5.2";
+    self.by-version."underscore"."1.6.0";
+  by-version."underscore"."1.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-underscore-1.6.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz";
-        name = "underscore-1.5.2.tgz";
-        sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
+        name = "underscore-1.6.0.tgz";
+        sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
       })
     ];
     buildInputs =
@@ -14892,7 +15224,7 @@
     ];
     passthru.names = [ "underscore" ];
   };
-  "underscore" = self.by-version."underscore"."1.5.2";
+  "underscore" = self.by-version."underscore"."1.6.0";
   by-spec."underscore"."1.4.x" =
     self.by-version."underscore"."1.4.4";
   by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage {
@@ -14913,13 +15245,13 @@
     passthru.names = [ "underscore" ];
   };
   by-spec."underscore".">=1.1.7" =
-    self.by-version."underscore"."1.5.2";
+    self.by-version."underscore"."1.6.0";
   by-spec."underscore".">=1.3.1" =
-    self.by-version."underscore"."1.5.2";
-  by-spec."underscore".">=1.4.3" =
-    self.by-version."underscore"."1.5.2";
+    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.5.2";
+    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" =
@@ -14928,6 +15260,23 @@
     self.by-version."underscore"."1.4.4";
   by-spec."underscore"."~1.5" =
     self.by-version."underscore"."1.5.2";
+  by-version."underscore"."1.5.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-underscore-1.5.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz";
+        name = "underscore-1.5.2.tgz";
+        sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."underscore" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "underscore" ];
+  };
   by-spec."underscore"."~1.5.2" =
     self.by-version."underscore"."1.5.2";
   by-spec."underscore.string"."~2.2.1" =
@@ -14993,14 +15342,14 @@
     passthru.names = [ "unfunk-diff" ];
   };
   by-spec."ungit"."*" =
-    self.by-version."ungit"."0.6.1";
-  by-version."ungit"."0.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "ungit-0.6.1";
+    self.by-version."ungit"."0.6.2";
+  by-version."ungit"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+    name = "ungit-0.6.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ungit/-/ungit-0.6.1.tgz";
-        name = "ungit-0.6.1.tgz";
-        sha1 = "7fc1527eb183acf65eb72752b9c54324184d6fff";
+        url = "http://registry.npmjs.org/ungit/-/ungit-0.6.2.tgz";
+        name = "ungit-0.6.2.tgz";
+        sha1 = "e1a01531bdd987c27bd9890d973c0a8549f1e191";
       })
     ];
     buildInputs =
@@ -15031,9 +15380,9 @@
       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.1"
+      self.by-version."raven"."0.6.2"
       self.by-version."knockout"."3.0.0"
-      self.by-version."npm-registry-client"."0.3.5"
+      self.by-version."npm-registry-client"."0.3.6"
       self.by-version."npmconf"."0.1.12"
       self.by-version."mkdirp"."0.3.5"
     ];
@@ -15041,7 +15390,7 @@
     ];
     passthru.names = [ "ungit" ];
   };
-  "ungit" = self.by-version."ungit"."0.6.1";
+  "ungit" = self.by-version."ungit"."0.6.2";
   by-spec."update-notifier"."~0.1.3" =
     self.by-version."update-notifier"."0.1.7";
   by-version."update-notifier"."0.1.7" = lib.makeOverridable self.buildNodePackage {
@@ -15223,6 +15572,8 @@
   };
   by-spec."uuid"."~1.4.0" =
     self.by-version."uuid"."1.4.1";
+  by-spec."uuid"."~1.4.1" =
+    self.by-version."uuid"."1.4.1";
   by-spec."validator"."0.4.x" =
     self.by-version."validator"."0.4.28";
   by-version."validator"."0.4.28" = lib.makeOverridable self.buildNodePackage {
@@ -15489,14 +15840,14 @@
     passthru.names = [ "wd" ];
   };
   by-spec."webdrvr"."*" =
-    self.by-version."webdrvr"."2.38.0-0";
-  by-version."webdrvr"."2.38.0-0" = lib.makeOverridable self.buildNodePackage {
-    name = "webdrvr-2.38.0-0";
+    self.by-version."webdrvr"."2.39.0-0";
+  by-version."webdrvr"."2.39.0-0" = lib.makeOverridable self.buildNodePackage {
+    name = "webdrvr-2.39.0-0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.38.0-0.tgz";
-        name = "webdrvr-2.38.0-0.tgz";
-        sha1 = "b5388a672ac512e09df24d00f80b3d619dc15e5c";
+        url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.39.0-0.tgz";
+        name = "webdrvr-2.39.0-0.tgz";
+        sha1 = "07b4867993c2d3e35869269cb8fe096e81571e0f";
       })
     ];
     buildInputs =
@@ -15514,7 +15865,7 @@
     ];
     passthru.names = [ "webdrvr" ];
   };
-  "webdrvr" = self.by-version."webdrvr"."2.38.0-0";
+  "webdrvr" = self.by-version."webdrvr"."2.39.0-0";
   by-spec."websocket-driver".">=0.3.0" =
     self.by-version."websocket-driver"."0.3.2";
   by-version."websocket-driver"."0.3.2" = lib.makeOverridable self.buildNodePackage {
@@ -15764,14 +16115,14 @@
     passthru.names = [ "wrench" ];
   };
   by-spec."wrench"."~1.5.0" =
-    self.by-version."wrench"."1.5.6";
-  by-version."wrench"."1.5.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-wrench-1.5.6";
+    self.by-version."wrench"."1.5.7";
+  by-version."wrench"."1.5.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-wrench-1.5.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wrench/-/wrench-1.5.6.tgz";
-        name = "wrench-1.5.6.tgz";
-        sha1 = "247b7dfe5d7d4374d5e449761fba634190d9b871";
+        url = "http://registry.npmjs.org/wrench/-/wrench-1.5.7.tgz";
+        name = "wrench-1.5.7.tgz";
+        sha1 = "95fcbb5a35b748ba8e29d755c9490ba69f033819";
       })
     ];
     buildInputs =
@@ -15783,7 +16134,7 @@
     passthru.names = [ "wrench" ];
   };
   by-spec."wrench"."~1.5.4" =
-    self.by-version."wrench"."1.5.6";
+    self.by-version."wrench"."1.5.7";
   by-spec."ws"."0.4.x" =
     self.by-version."ws"."0.4.31";
   by-version."ws"."0.4.31" = lib.makeOverridable self.buildNodePackage {
@@ -15943,7 +16294,7 @@
     buildInputs =
       (self.nativeDeps."xmlbuilder" or []);
     deps = [
-      self.by-version."underscore"."1.5.2"
+      self.by-version."underscore"."1.6.0"
     ];
     peerDependencies = [
     ];
@@ -16026,25 +16377,6 @@
     ];
     passthru.names = [ "xtend" ];
   };
-  by-spec."yaml"."0.2.3" =
-    self.by-version."yaml"."0.2.3";
-  by-version."yaml"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-yaml-0.2.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/yaml/-/yaml-0.2.3.tgz";
-        name = "yaml-0.2.3.tgz";
-        sha1 = "b5450e92e76ef36b5dd24e3660091ebaeef3e5c7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."yaml" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "yaml" ];
-  };
   by-spec."yeoman-generator"."~0.13.0" =
     self.by-version."yeoman-generator"."0.13.4";
   by-version."yeoman-generator"."0.13.4" = lib.makeOverridable self.buildNodePackage {
@@ -16183,7 +16515,7 @@
       self.by-version."nopt"."2.1.2"
       self.by-version."lodash"."2.4.1"
       self.by-version."update-notifier"."0.1.7"
-      self.by-version."insight"."0.3.0"
+      self.by-version."insight"."0.3.1"
       self.by-version."sudo-block"."0.3.0"
       self.by-version."async"."0.2.10"
       self.by-version."open"."0.0.4"
@@ -16222,20 +16554,20 @@
     passthru.names = [ "zeparser" ];
   };
   by-spec."zip-stream"."~0.1.0" =
-    self.by-version."zip-stream"."0.1.3";
-  by-version."zip-stream"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-zip-stream-0.1.3";
+    self.by-version."zip-stream"."0.1.4";
+  by-version."zip-stream"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-zip-stream-0.1.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.1.3.tgz";
-        name = "zip-stream-0.1.3.tgz";
-        sha1 = "06d8787133ab397ab60ef6ee688d76dd5fb10de1";
+        url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz";
+        name = "zip-stream-0.1.4.tgz";
+        sha1 = "fe5b565bc366b8d73d5d4c1606e07c8947de1654";
       })
     ];
     buildInputs =
       (self.nativeDeps."zip-stream" or []);
     deps = [
-      self.by-version."readable-stream"."1.1.10"
+      self.by-version."readable-stream"."1.0.25"
       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 e2adc137aa9..c7660c7a0a2 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -114,6 +114,6 @@
 , "rethinkdb"
 , "bower2nix"
 , "fetch-bower"
-, { "titanium": "3.2.0" }
+, { "titanium": "3.2.1" }
 , "gh"
 ]
-- 
GitLab


From c3126080fd6393718b67f1e2d63d1cee094807de Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Mon, 17 Feb 2014 20:15:01 +0100
Subject: [PATCH 1370/3789] vaapi-vdpau: apply a patch to delete dropped types
 from VA API

Close #1766.
---
 pkgs/development/libraries/vaapi-vdpau/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix
index fb24ba98b45..9a81b840b35 100644
--- a/pkgs/development/libraries/vaapi-vdpau/default.nix
+++ b/pkgs/development/libraries/vaapi-vdpau/default.nix
@@ -8,13 +8,18 @@ stdenv.mkDerivation rec {
     sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m";
   };
 
+  patches = [ ./glext85.patch
+              (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch?revision=1.1";
+                          name = "libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch";
+                          sha256 = "166svcav6axkrlb3i4rbf6dkwjnqdf69xw339az1f5yabj72pqqs";
+                        }) ];
+
   buildInputs = [ libvdpau mesa libva pkgconfig ];
 
   preConfigure = ''
     sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
   '';
 
-  patches = [ ./glext85.patch ];
 
   meta = {
     homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/;
-- 
GitLab


From 44a9ebac4743b5bc6fd7cb34161a056537159a98 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 18 Feb 2014 18:07:04 +0100
Subject: [PATCH 1371/3789] axis2: bump to version 1.6.2

---
 pkgs/servers/http/tomcat/axis2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix
index 0208420d132..f263c8c2e7e 100644
--- a/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/pkgs/servers/http/tomcat/axis2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, apacheAnt, jdk, unzip}:
 
 stdenv.mkDerivation {
-  name = "axis2-1.6.1";
+  name = "axis2-1.6.2";
 
   src = fetchurl {
-    url = http://apache.mirror.versatel.nl//axis/axis2/java/core/1.6.1/axis2-1.6.1-bin.zip;
-    sha256 = "1a0p85qh9924dv3y7zivf62hy1jzdaxnndqh93g6lndmacfhkk64";
+    url = http://apache.proserve.nl//axis/axis2/java/core/1.6.2/axis2-1.6.2-bin.zip;
+    sha256 = "02i6fv11ksd5ql81i501bcb11ib5gyhq3zxwrz5jm4ic80r097fp";
   };
 
   buildInputs = [ unzip apacheAnt jdk ];
-- 
GitLab


From d2aa2ac494fc7eda18ce1316201015c6603e23b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Feb 2014 17:05:19 +0100
Subject: [PATCH 1372/3789] memtest.nix: Use toString

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

diff --git a/nixos/modules/system/boot/loader/grub/memtest.nix b/nixos/modules/system/boot/loader/grub/memtest.nix
index 2461d1f80c7..afe194e672a 100644
--- a/nixos/modules/system/boot/loader/grub/memtest.nix
+++ b/nixos/modules/system/boot/loader/grub/memtest.nix
@@ -7,7 +7,6 @@ with pkgs.lib;
 let
   memtest86 = pkgs.memtest86plus;
   cfg = config.boot.loader.grub.memtest86;
-  params = concatStringsSep " " cfg.params;
 in
 
 {
@@ -82,7 +81,7 @@ in
       if config.boot.loader.grub.version == 2 then
         ''
           menuentry "Memtest86+" {
-            linux16 @bootRoot@/memtest.bin ${params}
+            linux16 @bootRoot@/memtest.bin ${toString cfg.params}
           }
         ''
       else
-- 
GitLab


From ca70ccb5c1c19dd945419e8c5b2e319570585f7e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Feb 2014 17:05:34 +0100
Subject: [PATCH 1373/3789] Start of 14.02 release notes

---
 nixos/doc/manual/installation.xml | 19 ++++++++++---------
 nixos/doc/manual/manual.xml       |  7 +++++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml
index 92e7625555b..6ccb12b115e 100644
--- a/nixos/doc/manual/installation.xml
+++ b/nixos/doc/manual/installation.xml
@@ -295,7 +295,7 @@ $ reboot</screen>
 }</screen>
 </example>
 
-<section>
+<section xml:id="sec-uefi-installation">
 
 <title>UEFI Installation</title>
 
@@ -305,14 +305,15 @@ changes:
 
 <itemizedlist>
   <listitem>
-    <para>You should boot the livecd in UEFI mode (consult your specific
-    hardware's documentation for instructions how).</para>
+    <para>You should boot the live CD in UEFI mode (consult your
+    specific hardware's documentation for instructions).</para>
   </listitem>
   <listitem>
-    <para>Instead of <command>fdisk</command>, you should use <command>
-    gdisk</command> to partition your disks. You will need to have a
-    separate partition for <filename>/boot</filename> with partition code
-    EF00, and it should be formatted with a vfat filesystem.</para>
+    <para>Instead of <command>fdisk</command>, you should use
+    <command>gdisk</command> to partition your disks. You will need to
+    have a separate partition for <filename>/boot</filename> with
+    partition code EF00, and it should be formatted as a
+    <literal>vfat</literal> filesystem.</para>
   </listitem>
   <listitem>
     <para>You must set <option>boot.loader.gummiboot.enable</option> to
@@ -327,8 +328,8 @@ changes:
     as well.</para>
   </listitem>
   <listitem>
-    <para>To see console messages during early boot, put <literal>"fbcon"</literal>
-    in your <option>boot.initrd.kernelModules</option></para>
+    <para>To see console messages during early boot, add <literal>"fbcon"</literal>
+    to your <option>boot.initrd.kernelModules</option>.</para>
   </listitem>
 </itemizedlist>
 </para>
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index 6e13281cbd9..f9775f4f017 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -55,9 +55,12 @@
   <!-- <xi:include href="userconfiguration.xml" /> -->
   <xi:include href="troubleshooting.xml" />
   <xi:include href="development.xml" />
-  <chapter xml:id="ch-options">
+
+  <xi:include href="release-notes.xml" />
+
+  <appendix xml:id="ch-options">
     <title>List of options</title>
     <xi:include href="options-db.xml" />
-  </chapter>
+  </appendix>
 
 </book>
-- 
GitLab


From 3c7aa5aa8f8eee82671a2fcb47eb28553115acbc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Feb 2014 19:05:59 +0100
Subject: [PATCH 1374/3789] cjdns: Don't include "-git" in the package name

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

diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index ffe22a93d0d..b42f202099b 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -4,7 +4,7 @@ let
   rev = "f7b02ac0cc";
 in
 stdenv.mkDerivation {
-  name = "cjdns-git-20130620-${stdenv.lib.strings.substring 0 7 rev}";
+  name = "cjdns-20130620-${stdenv.lib.strings.substring 0 7 rev}";
 
   src = fetchgit {
     url = "https://github.com/cjdelisle/cjdns.git";
-- 
GitLab


From a8ded9d5d36ddbf7200a1693c74bd83d1403a8c1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Feb 2014 19:11:57 +0100
Subject: [PATCH 1375/3789] fetchgit: Require a content hash

Without this, the result will not be a fixed-output derivation and
won't work in general.
---
 pkgs/build-support/fetchgit/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 01424bae30b..b22bdc88f83 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -23,6 +23,8 @@
    server admins start using the new version?
 */
 
+assert md5 != "" || sha256 != "";
+
 stdenv.mkDerivation {
   name = "git-export";
   builder = ./builder.sh;
-- 
GitLab


From 623627f097f2d52d3b1f72281b2d7c2c43cffb31 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Feb 2014 12:05:58 +0100
Subject: [PATCH 1376/3789] haskell-charset: update to version 0.3.7

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

diff --git a/pkgs/development/libraries/haskell/charset/default.nix b/pkgs/development/libraries/haskell/charset/default.nix
index 6907a33744f..8a0f1e62179 100644
--- a/pkgs/development/libraries/haskell/charset/default.nix
+++ b/pkgs/development/libraries/haskell/charset/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "charset";
-  version = "0.3.6";
-  sha256 = "1g8m8nd5f100jlhvs6hbny96wy8iaggmp1lv36a5jxc54gmyxjd1";
+  version = "0.3.7";
+  sha256 = "1x912dx5650x8ql3ivhpiwmxd6kv7zghark3s8ljvl1g3qr1pxd6";
   buildDepends = [ semigroups unorderedContainers ];
   meta = {
     homepage = "http://github.com/ekmett/charset";
-- 
GitLab


From eab179c39f3d6c5860eb93c6fed1ea7b95d1752a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Feb 2014 12:06:00 +0100
Subject: [PATCH 1377/3789] haskell-hamlet: update to version 1.1.8

---
 pkgs/development/libraries/haskell/hamlet/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 739b800e28d..b393aed07d5 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -1,13 +1,15 @@
 { cabal, blazeBuilder, blazeHtml, blazeMarkup, failure, hspec
-, HUnit, parsec, shakespeare, text
+, HUnit, parsec, shakespeare, systemFileio, systemFilepath, text
+, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.1.7.7";
-  sha256 = "1qwx0gn367gp2a4kb1q3xc23addjyawr9gvs7bzv8vfx5xnkxglx";
+  version = "1.1.8";
+  sha256 = "093igcaycg2d29ncj9l8qbzi21drynjk8kvqfl70zqvgsm8nai7x";
   buildDepends = [
-    blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
+    blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare
+    systemFileio systemFilepath text time
   ];
   testDepends = [ blazeHtml blazeMarkup hspec HUnit parsec text ];
   meta = {
-- 
GitLab


From c13ececdc529882942662f50ae0bbdc38c534a9e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Feb 2014 12:06:01 +0100
Subject: [PATCH 1378/3789] haskell-iteratee: update to version 0.8.9.5

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

diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix
index c4438d97364..62bc3f7a2a4 100644
--- a/pkgs/development/libraries/haskell/iteratee/default.nix
+++ b/pkgs/development/libraries/haskell/iteratee/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "iteratee";
-  version = "0.8.9.4";
-  sha256 = "0j8q5i3kf1ld7630z65hj55p2jlhl23f6qjag4zwrhrh38bfr531";
+  version = "0.8.9.5";
+  sha256 = "0akv7zcyb3c213f8qz1xv1qyq04wa427a4mh8rmz1jlmcwiznk7z";
   buildDepends = [
     ListLike MonadCatchIOTransformers monadControl parallel
     transformers transformersBase
-- 
GitLab


From dd49144d4484ea78a8a9d6166b3910fe25e8145b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Feb 2014 12:06:03 +0100
Subject: [PATCH 1379/3789] haskell-shakespeare-css: update to version 1.0.7

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

diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 853a6294131..f9681995513 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.6.6";
-  sha256 = "1xjavlw88nj5ila2b4m44zj0qgkpq147b30x1arwv0ik8szgml9k";
+  version = "1.0.7";
+  sha256 = "108vlxbis8g7pkldsd6r2b8il7fdqb98n64idc4l2lvkwz3lnr36";
   buildDepends = [ parsec shakespeare text transformers ];
   testDepends = [ hspec HUnit shakespeare text ];
   meta = {
-- 
GitLab


From 9dce1a82e8e673ca4629358cdc64a4dc68a50a49 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Feb 2014 12:06:05 +0100
Subject: [PATCH 1380/3789] haskell-shakespeare-js: update to version 1.2.0.4

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

diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index 36d3443c958..12dcea223a9 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "1.2.0.3";
-  sha256 = "1zcqq8880rsdx3xwf1czl4vn5l9igw181snbfv5k1gxpif6myhp1";
+  version = "1.2.0.4";
+  sha256 = "1y7bqv3yrlzbhd5s8w36z6vcc9jk5b9i8chhsqda5qay85rd0ipz";
   buildDepends = [ aeson shakespeare text ];
   testDepends = [ aeson hspec HUnit shakespeare text ];
   meta = {
-- 
GitLab


From cba685279d0487805fd5c9c81b3e8b3d1d207087 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Feb 2014 12:06:07 +0100
Subject: [PATCH 1381/3789] haskell-shakespeare: update to version 1.2.1.1

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

diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 444eae23560..0a0a8f18b03 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "1.2.0.4";
-  sha256 = "0pgh4sxy5plhmm55mqbcmicn28vlplk4pasgfnyy5wjaz28n6z97";
+  version = "1.2.1.1";
+  sha256 = "1if3mfkcdfls17pcfgn8grxykq8ia91i7qr4q6m1gy6q4gqs6fkg";
   buildDepends = [ parsec systemFileio systemFilepath text time ];
   testDepends = [
     hspec parsec systemFileio systemFilepath text time
-- 
GitLab


From e68b54eda89eef7aeede125130e793c430ba83d0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Feb 2014 12:06:08 +0100
Subject: [PATCH 1382/3789] haskell-warp: update to version 2.0.3.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 84f653cde16..d3c1bdbd4c7 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.0.3.1";
-  sha256 = "0rbl9p1kdgvya2ah2bpaqfv73hlvhsd46nk5f5wgx244pm714kc5";
+  version = "2.0.3.2";
+  sha256 = "1aapwhgqn693cvdhj4zafyww2xrpjn8wzdgrwxz8k6mq0f2lh599";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpDate httpTypes liftedBase network networkConduit simpleSendfile
-- 
GitLab


From 029967dca63a94e69b6044ee220961d382aec189 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Feb 2014 12:06:10 +0100
Subject: [PATCH 1383/3789] haskell-cpphs: update to version 1.18.1

---
 pkgs/development/tools/misc/cpphs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
index 4ec9358a388..fca4efc8661 100644
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "cpphs";
-  version = "1.18";
-  sha256 = "0b5hpqbzvw5dzkbjxqyc2d7ll2c6zf9wd8k182zhvz3kyxmkvs2s";
+  version = "1.18.1";
+  sha256 = "1fshsd1dzmrl3qbpwf7r2c30d08l77080j9cfchcgy1lijjr9vhm";
   isLibrary = true;
   isExecutable = true;
   meta = {
-    homepage = "http://haskell.org/cpphs/";
+    homepage = "http://projects.haskell.org/cpphs/";
     description = "A liberalised re-implementation of cpp, the C pre-processor";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From dcf6cbf5b383eb66bafbdbaaf972eb1c7264c35c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 18 Feb 2014 20:03:03 +0100
Subject: [PATCH 1384/3789] glib: add -tested variant, also to the unstable job

Replaces #1753.
---
 pkgs/development/libraries/glib/default.nix | 38 +++++++++++++--------
 pkgs/top-level/all-packages.nix             |  2 +-
 pkgs/top-level/release.nix                  |  2 ++
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index de0a02c56e2..6fa77b233c6 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,5 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, gettext, perl, python, autoconf, automake, libtool
-, libiconvOrEmpty, libintlOrEmpty, zlib, libffi, pcre, libelf, dbus }:
+{ stdenv, fetchurl, pkgconfig, gettext, perl, python
+, libiconvOrEmpty, libintlOrEmpty, zlib, libffi, pcre, libelf
+
+# this is just for tests (not in closure of any regular package)
+, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false
+}:
 
 # TODO:
 # * Add gio-module-fam
@@ -17,7 +21,6 @@
       https://wiki.gnome.org/GnomeGoals/InstalledTests
   * Support org.freedesktop.Application, including D-Bus activation from desktop files
 */
-
 let
   # Some packages don't get "Cflags" from pkgconfig correctly
   # and then fail to build when directly including like <glib/...>.
@@ -35,7 +38,7 @@ let
   ver_maj = "2.38";
   ver_min = "2";
 in
-with { inherit (stdenv.lib) optional optionalString; };
+with { inherit (stdenv.lib) optional optionals optionalString; };
 
 stdenv.mkDerivation rec {
   name = "glib-${ver_maj}.${ver_min}";
@@ -45,28 +48,33 @@ stdenv.mkDerivation rec {
     sha256 = "0d2px8m77603s5pm3md4bcm5d0ksbcsb6ik1w52hjslnq1a9hsh5";
   };
 
-  # configure script looks for d-bus but it is (probably) only needed for tests
-  buildInputs = [ libelf ];
+  buildInputs = [ libelf ]
+    ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ];
 
-  # I don't know why the autotools are needed now, even without modifying configure scripts
-  nativeBuildInputs = [ pkgconfig gettext perl python ] ++ [ autoconf automake libtool ];
+  nativeBuildInputs = [ pkgconfig gettext perl python ];
 
   propagatedBuildInputs = [ pcre zlib libffi ] ++ libiconvOrEmpty ++ libintlOrEmpty;
 
-  preConfigure = "autoreconf -fi";
-
   configureFlags =
     optional stdenv.isDarwin "--disable-compile-warnings"
     ++ optional stdenv.isSunOS "--disable-modular-tests";
 
-  CPPFLAGS = optionalString stdenv.isSunOS "-DBSD_COMP";
-
-  NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-lintl";
+  NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
+    + optionalString stdenv.isSunOS " -DBSD_COMP";
 
   enableParallelBuilding = true;
 
-  doCheck = false; # ToDo: fix the remaining problems, so we have checked glib by default
-  LD_LIBRARY_PATH = optionalString doCheck "${stdenv.gcc.gcc}/lib";
+  inherit doCheck;
+  preCheck = optionalString doCheck
+    # libgcc_s.so.1 must be installed for pthread_cancel to work
+    # also point to the glib/.libs path
+    '' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib*/libgcc_s.so)):$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH"
+       export TZDIR="${tzdata}/share/zoneinfo"
+       export XDG_CACHE_HOME="$TMP"
+       export XDG_RUNTIME_HOME="$TMP"
+       export HOME="$TMP"
+       export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share"
+    '';
 
   postInstall = ''rm -rvf $out/share/gtk-doc'';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62fcfaca5f4..a87a68ae366 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4388,8 +4388,8 @@ let
     stdenv = if stdenv.isDarwin
       then overrideGCC stdenv gccApple
       else stdenv;
-    automake = automake113x;
   };
+  glib-tested = glib.override { doCheck = true; }; # checked version separate to break cycles
   glibmm = callPackage ../development/libraries/glibmm { };
 
   glib_networking = callPackage ../development/libraries/glib-networking {};
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 33ecef8b3a2..84ae44ec449 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -35,6 +35,8 @@ let
               # Ensure that X11/GTK+ are in order.
               jobs.thunderbird.x86_64-linux
               jobs.thunderbird.i686-linux
+              jobs.glib-tested.x86_64-linux # standard glib doesn't do checks
+              jobs.glib-tested.i686-linux
             ];
         };
 
-- 
GitLab


From 2539acf351537b34ce3c7ba7ba7e7e3c45ea1f1e Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 18 Feb 2014 20:08:48 +0100
Subject: [PATCH 1385/3789] manpages: Update from 3.54 -> 3.60.

---
 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 1b3454c8ce5..4a177327e0e 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.54";
+  name = "man-pages-3.60";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "0rb75dl9hh4v2s95bcssy12j8qrbd2dmlzry68gphyxk5c7yipbl";
+    sha256 = "0h4wzjcrz1hqbzwn1g0q11byzss7l4f1ynj7vzgbxar7z10gr5b6";
   };
 
   preBuild =
-- 
GitLab


From 134e65b15054ede94f30f78dd811a530633f2c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Mon, 17 Feb 2014 23:43:11 +0100
Subject: [PATCH 1386/3789] aubio: update from 0.3.2 to 0.4.0

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

diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index abfb3985f26..d0a95b5d773 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -2,11 +2,11 @@
 , python, alsaLib, jackaudio }:
 
 stdenv.mkDerivation rec {
-  name = "aubio-0.3.2";
+  name = "aubio-0.4.0";
 
   src = fetchurl {
-    url = "http://aubio.org/pub/${name}.tar.gz";
-    sha256 = "1k8j2m8wdpa54hvrqy6nqfcx42x6nwa77hi3ym0n22k192q8f4yw";
+    url = "http://aubio.org/pub/${name}.tar.bz2";
+    sha256 = "18ik5nn8n984f0wnrwdfhc06b8blqgm9b2hrm7hc9m0rr039mpj9";
   };
 
   buildInputs =
-- 
GitLab


From 78f961e217494d9c290c406f2fd4c7beeadd3276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Tue, 18 Feb 2014 21:24:33 +0100
Subject: [PATCH 1387/3789] aubio: Fix the build, tidy up and add myself as a
 maintainer

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

diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index d0a95b5d773..180de0e0bd5 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, fftw, libsndfile, libsamplerate
-, python, alsaLib, jackaudio }:
+{ stdenv, fetchurl, alsaLib, fftw, jackaudio, libsamplerate
+, libsndfile, pkgconfig, python
+}:
 
 stdenv.mkDerivation rec {
   name = "aubio-0.4.0";
@@ -9,17 +10,21 @@ stdenv.mkDerivation rec {
     sha256 = "18ik5nn8n984f0wnrwdfhc06b8blqgm9b2hrm7hc9m0rr039mpj9";
   };
 
-  buildInputs =
-    [ pkgconfig fftw libsndfile libsamplerate python
-      # optional:
-      alsaLib jackaudio
-    ];
+  buildInputs = [
+    alsaLib fftw jackaudio libsamplerate libsndfile pkgconfig python
+  ];
 
-  meta = { 
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; { 
     description = "Library for audio labelling";
     homepage = http://aubio.org/;
-    license = "GPLv2";
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.goibhniu maintainers.marcweber ];
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From b532c03fbe2e597a98e78c23488fed3a6d7e8872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Tue, 18 Feb 2014 21:26:06 +0100
Subject: [PATCH 1388/3789] ardour3: update from 3.0 to 3.5.308

---
 pkgs/applications/audio/ardour/ardour3.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix
index bf2ee04cbce..4d725b43aae 100644
--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ b/pkgs/applications/audio/ardour/ardour3.nix
@@ -6,17 +6,18 @@
 , perl, pkgconfig, python, serd, sord, sratom, suil }:
 
 let
-  # Ardour 3.0 tag
-  rev = "79db9422";
+  # Ardour 3.5.308 tag
+  rev = "40d8c5ae";
 in
 
-stdenv.mkDerivation {
-  name = "ardour-3.0";
+stdenv.mkDerivation rec {
+  name = "ardour-${version}";
+  version = "3.5.308";
 
   src = fetchgit {
     url = git://git.ardour.org/ardour/ardour.git;
     inherit rev;
-    sha256 = "cdbe4ca6d4b639fcd66a3d1cf9c2816b4755655c9d81bdd2417263f413aa7096";
+    sha256 = "7473c19c2aeb68bd93d512c2d4e976b23dd36d2453c877c859ad37a76f50dc8a";
   };
 
   buildInputs = 
@@ -28,13 +29,16 @@ stdenv.mkDerivation {
     ];
 
   patchPhase = ''
-    printf '#include "ardour/svn_revision.h"\nnamespace ARDOUR { const char* svn_revision = \"${rev}\"; }\n' > libs/ardour/svn_revision.cc
+    # The funny revision number is from `git describe ${rev}
+    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${version}-g40d8c5a\"; }\n' > libs/ardour/revision.cc
+    # Note the different version number
+    sed -i '33i rev = \"3.5-308-g40d8c5a\"' 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
-    sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
   '';
 
-  configurePhase = "python waf configure --prefix=$out";
+  configurePhase = "python waf configure --optimize --prefix=$out";
 
   buildPhase = "python waf";
 
@@ -43,7 +47,7 @@ stdenv.mkDerivation {
   installPhase = ''
     python waf install
     mkdir -pv $out/gtk2/engines
-    mv $out/lib/ardour3/libclearlooks.so $out/gtk2/engines/
+    cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/
     wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
   '';
 
-- 
GitLab


From 8c83ae965fc81bc7c647ffbe705d4d5e7d2fbfe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Tue, 18 Feb 2014 22:11:39 +0100
Subject: [PATCH 1389/3789] blender: upgrade from 2.67 to 2.69 and add myself
 as maintainter

---
 pkgs/applications/misc/blender/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 0951340ee94..683c4242a9c 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.67";
+  name = "blender-2.69";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "066lwrm85455gs187bxr3jhqidc2f6f0791b4216jkagbszd9a8l";
+    sha256 = "02ffakkbax1kl4ycakxq20yp9hmw1qj1qndjjqxnhhhdxifpyjn9";
   };
 
   buildInputs = [
@@ -35,11 +35,14 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "3D Creation/Animation/Publishing System";
     homepage = http://www.blender.org;
     # They comment two licenses: GPLv2 and Blender License, but they
     # say: "We've decided to cancel the BL offering for an indefinite period."
-    license = "GPLv2+";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+
   };
 }
-- 
GitLab


From 516cdc25a46bfd42638a032123be5eb9c6f0b39b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 18 Feb 2014 23:11:49 +0100
Subject: [PATCH 1390/3789] Renamed obsolete option
 services.xserver.videoDrivers to hardware.opengl.videoDrivers

---
 nixos/doc/manual/configuration.xml                           | 4 ++--
 nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 2 +-
 nixos/modules/installer/tools/nixos-generate-config.pl       | 2 +-
 nixos/modules/installer/virtualbox-demo.nix                  | 2 +-
 nixos/modules/services/x11/terminal-server.nix               | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml
index da08098ddda..307719d2cd2 100644
--- a/nixos/doc/manual/configuration.xml
+++ b/nixos/doc/manual/configuration.xml
@@ -1183,7 +1183,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>
-services.xserver.videoDrivers = [ "r128" ];
+hardware.opengl.videoDrivers = [ "r128" ];
 </programlisting>
 to enable X.org’s <literal>xf86-video-r128</literal> driver.</para>
 
@@ -1226,7 +1226,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>
-services.xserver.videoDrivers = [ "nvidia" ];
+hardware.opengl.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/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 7f253d595dc..fa1be17436b 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -139,7 +139,7 @@ in
 
   # Setting vesa, we don't get the nvidia driver, which can't work in arm.
   services.xserver.videoDriver = "vesa";
-  services.xserver.videoDrivers = [];
+  hardware.opengl.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 1365f3b9396..b6bc0458477 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -163,7 +163,7 @@ foreach my $path (glob "/sys/bus/pci/devices/*") {
     pciCheck $path;
 }
 
-push @attrs, "services.xserver.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver;
+push @attrs, "hardware.opengl.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 76cc29a1fac..9ef41e47074 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -15,5 +15,5 @@ with pkgs.lib;
 
   # Add some more video drivers to give X11 a shot at working in
   # VMware and QEMU.
-  services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ];
+  hardware.opengl.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ];
 }
diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix
index bf9c3435503..f16a424b457 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;
-    services.xserver.videoDrivers = [];
+    hardware.opengl.videoDrivers = [];
 
     # Enable KDM.  Any display manager will do as long as it supports XDMCP.
     services.xserver.displayManager.kdm.enable = true;
-- 
GitLab


From ff7e234fb40701b94398b0938038b915dc958b25 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 18 Feb 2014 23:13:00 +0100
Subject: [PATCH 1391/3789] Removed obsolete option
 services.xserver.videoDriver

---
 nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 1 -
 nixos/modules/virtualisation/qemu-vm.nix                     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index fa1be17436b..c3ced849001 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -138,7 +138,6 @@ in
   };
 
   # Setting vesa, we don't get the nvidia driver, which can't work in arm.
-  services.xserver.videoDriver = "vesa";
   hardware.opengl.videoDrivers = [ "vesa" ];
   services.nixosManual.enable = false;
 
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 4f7f6ae8f2b..a866b513f0f 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -386,7 +386,6 @@ in
 
     # When building a regular system configuration, override whatever
     # video driver the host uses.
-    services.xserver.videoDriver = mkVMOverride null;
     hardware.opengl.videoDrivers = mkVMOverride [ "vesa" ];
     services.xserver.defaultDepth = mkVMOverride 0;
     services.xserver.resolutions = mkVMOverride [ { x = 1024; y = 768; } ];
-- 
GitLab


From 6af0b814f5cc468c0f7d1056fda96c8c9056dc63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Tue, 18 Feb 2014 23:41:15 +0100
Subject: [PATCH 1392/3789] kde_wacomtablet: upgrade from 1.3.5 to 2.0

---
 pkgs/applications/misc/kde-wacomtablet/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix
index 22587a1bae0..3e652c717ec 100644
--- a/pkgs/applications/misc/kde-wacomtablet/default.nix
+++ b/pkgs/applications/misc/kde-wacomtablet/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, kdelibs, gettext }:
+{ stdenv, fetchurl, kdelibs, gettext, xf86_input_wacom }:
 
 stdenv.mkDerivation rec {
-  name = "wacomtablet-1.3.5";
+  name = "wacomtablet-2.0";
 
   src = fetchurl {
-    url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-v1.3.5.tar.bz2";
-    sha256 = "0dgsp3izx2v44f6j8mhxc6zybjn5sj9038w6b4v2fgix47fri0ja";
+    url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.tar.bz2";
+    sha256 = "1vqdmkfl0awsjxl6p8bihz198hlc75d3zn7xwwryc674l76s25ax";
   };
 
-  buildInputs = [ kdelibs ];
+  buildInputs = [ kdelibs xf86_input_wacom ];
 
   nativeBuildInputs = [ gettext ];
 
-- 
GitLab


From 2f08652ccecf4233971f9296369cfc243685cecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Tue, 18 Feb 2014 00:32:45 +0100
Subject: [PATCH 1393/3789] rubberband: update from 1.7.0 to 1.8.1

Tidy up, and add myself to the maintainers. Tested that qtractor and
sonic_visualiser compile and run with this version of rubberband.
---
 pkgs/development/libraries/rubberband/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix
index 9e606967ab1..b0707ad15f0 100644
--- a/pkgs/development/libraries/rubberband/default.nix
+++ b/pkgs/development/libraries/rubberband/default.nix
@@ -2,20 +2,21 @@
 , vampSDK, ladspaH }:
 
 stdenv.mkDerivation {
-  name = "rubberband-1.7.0";
+  name = "rubberband-1.8.1";
 
   src = fetchurl {
-    url = http://code.breakfastquay.com/attachments/download/23/rubberband-1.7.0.tar.bz2;
-    sha256 = "10pnfzaiws6bi17qlyj3r0alj2nvm11pkd14nms6yxas8c7gwdw0";
+    url = http://code.breakfastquay.com/attachments/download/23/rubberband-1.8.1.tar.bz2;
+    sha256 = "0x9bm2nqd6w2f35w2sqcp7h5z34i4w7mdg53m0vzjhffnnq6637z";
   };
 
   buildInputs = [ pkgconfig libsamplerate libsndfile fftw vampSDK ladspaH ];
 
-  meta = { 
+  meta = with stdenv.lib; {
     description = "High quality software library for audio time-stretching and pitch-shifting";
     homepage = http://www.breakfastquay.com/rubberband/index.html;
-    license = ["GPL"]; # commercial license availible as well, see homepage. You'll get some more optimized routines
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    # commercial license available as well, see homepage. You'll get some more optimized routines
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.goibhniu maintainers.marcweber ];
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From c7aedd58050daa7ecab58851af2ee8281ec623e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Feb 2014 10:37:57 +0100
Subject: [PATCH 1394/3789] Add missing file

---
 nixos/doc/manual/release-notes.xml | 53 ++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 nixos/doc/manual/release-notes.xml

diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes.xml
new file mode 100644
index 00000000000..4a0fc6a52e4
--- /dev/null
+++ b/nixos/doc/manual/release-notes.xml
@@ -0,0 +1,53 @@
+<appendix xmlns="http://docbook.org/ns/docbook"
+          xml:id="ch-release-notes">
+
+<title>Release notes</title>
+
+<!--==================================================================-->
+
+<section xml:id="sec-release-14.02">
+
+<title>Release 14.02 (“Baboon”, 2014/02/??)</title>
+
+<para>This is the second stable release branch of NixOS.  The main
+enhancements are the following:
+
+<itemizedlist>
+
+  <listitem><para>Installation on UEFI systems is now supported.  See
+  <xref linkend="sec-uefi-installation"/> for
+  details.</para></listitem>
+
+  <listitem><para>NixOS is now based on Glibc 2.18 and GCC
+  4.8.</para></listitem>
+
+</itemizedlist>
+
+</para>
+
+<para>When upgrading from a previous release, please be aware of the
+following incompatible changes:
+
+<itemizedlist>
+
+  <listitem><para>The option
+  <option>boot.loader.grub.memtest86</option> has been renamed to
+  <option>boot.loader.grub.memtest86.enable</option>.</para></listitem>
+
+</itemizedlist>
+
+</para>
+
+</section>
+
+<!--==================================================================-->
+
+<section xml:id="sec-release-13.10">
+
+<title>Release 13.10 (“Aardvark”, 2013/10/31)</title>
+
+<para>This is the first stable release branch of NixOS.</para>
+
+</section>
+
+</appendix>
-- 
GitLab


From aea043aec0d716b87b4901c6fa977cb3d603460e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 19 Feb 2014 12:35:52 +0100
Subject: [PATCH 1395/3789] Revert "upgrade video-intel stack to 2.99.906"

This reverts commit 89f710f18e3bc86e6feec6661a3910ea32bb662c.

Reported by others for xorg-server to crash on different kernel
versions.
---
 pkgs/development/libraries/libva/default.nix       |  4 ++--
 pkgs/development/libraries/vaapi-intel/default.nix |  4 ++--
 pkgs/servers/x11/xorg/default.nix                  | 10 +++++-----
 pkgs/servers/x11/xorg/tarballs-7.7.list            |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index b0dbf1f8970..5b35d2b24ad 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }:
 
 stdenv.mkDerivation rec {
-  name = "libva-1.2.1";
+  name = "libva-1.1.1";
   
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
-    sha256 = "0fx8ivaghpq8g099bzwy5dm3bqnkbbhjq3qhgrpk390c4s5hy23h";
+    sha256 = "0kfdcrzcr82g15l0vvmm6rqr0f0604d4dgrza78gn6bfx7rppby0";
   };
 
   buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ];
diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index 1bb0b5732cb..f05c01bf58d 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -2,11 +2,11 @@
 , intelgen4asm }:
 
 stdenv.mkDerivation rec {
-  name = "libva-intel-driver-1.2.2";
+  name = "libva-intel-driver-1.0.20";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2";
-    sha256 = "0i3h9g8flnxf8gmag65xkvz7rib51dvx841ym3am5v3p51w79i0r";
+    sha256 = "1jfl8909j3a3in6m8b5bx3dn7pzr8a1sw3sk4vzm7h3j2dkgpzhj";
   };
 
   buildInputs = [ pkgconfig libdrm libva libX11 ];
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 2b5e2629e25..13c17cebde3 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1510,14 +1510,14 @@ let
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) {
-    name = "xf86-video-intel-2.99.906";
+    name = "xf86-video-intel-2.21.15";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-intel-2.99.906.tar.bz2;
-      sha256 = "1miwyv20q8bz5wml9n16l9vbrcnwpy7a3d3cmc92dy2p0b7474rd";
+      url = mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2;
+      sha256 = "1z6ncmpszmwqi9xr590c4kp4gjjf7mndcr56r35x2bx7h87i8nkx";
     };
-    buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ];
-  })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ;};
+    buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ];
+  })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;};
 
   xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) {
     name = "xf86-video-mach64-6.9.4";
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 8c193600833..175c9894694 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -129,7 +129,7 @@ mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2
 mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2
 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2
 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2
-mirror://xorg/individual/driver/xf86-video-intel-2.99.906.tar.bz2
+mirror://xorg/individual/driver/xf86-video-intel-2.21.9.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2
-- 
GitLab


From 7a51e17775a42388930cd19e1d037812b07a0f37 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Feb 2014 13:01:33 +0100
Subject: [PATCH 1396/3789] Fix updating of the tarball mirror

---
 maintainers/scripts/copy-tarball.sh   | 45 -------------
 maintainers/scripts/copy-tarballs.pl  | 95 +++++++++++++++++++++++++++
 maintainers/scripts/copy-tarballs.sh  | 27 --------
 maintainers/scripts/find-tarballs.nix | 45 +++++++++++++
 pkgs/top-level/make-tarball.nix       |  4 ++
 5 files changed, 144 insertions(+), 72 deletions(-)
 delete mode 100755 maintainers/scripts/copy-tarball.sh
 create mode 100755 maintainers/scripts/copy-tarballs.pl
 delete mode 100755 maintainers/scripts/copy-tarballs.sh
 create mode 100644 maintainers/scripts/find-tarballs.nix

diff --git a/maintainers/scripts/copy-tarball.sh b/maintainers/scripts/copy-tarball.sh
deleted file mode 100755
index 792071c129b..00000000000
--- a/maintainers/scripts/copy-tarball.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh -e
-
-distDir=${NIX_TARBALLS_CACHE:-/tarballs}
-
-url="$1"
-file="$2"
-if [ -z "$url" ]; then echo "syntax: $0 URL"; exit 0; fi
-
-base="$(basename "$url")"
-if [ -z "$base" ]; then echo "bad URL"; exit 1; fi
-dstPath="$distDir/$base"
-
-if [ -e "$dstPath" ]; then if [ -n "$VERBOSE" ]; then echo "$dstPath already exists"; fi; exit 0; fi
-
-if [ -z "$file" ]; then
-
-    echo "downloading $url to $dstPath"
-
-    if [ -n "$DRY_RUN" ]; then exit 0; fi
-
-    declare -a res
-    if ! res=($(PRINT_PATH=1 nix-prefetch-url "$url")); then
-        exit
-    fi
-
-    storePath=${res[1]}
-
-else
-    storePath="$file"
-fi
-
-cp $storePath "$dstPath.tmp.$$"
-mv -f "$dstPath.tmp.$$" "$dstPath"
-
-echo "hashing $dstPath"
-
-md5=$(nix-hash --flat --type md5 "$dstPath")
-ln -sfn "../$base" $distDir/md5/$md5
-
-sha1=$(nix-hash --flat --type sha1 "$dstPath")
-ln -sfn "../$base" $distDir/sha1/$sha1
-
-sha256=$(nix-hash --flat --type sha256 "$dstPath")
-ln -sfn "../$base" $distDir/sha256/$sha256
-ln -sfn "../$base" $distDir/sha256/$(nix-hash --type sha256 --to-base32 "$sha256")
diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl
new file mode 100755
index 00000000000..0746fb21069
--- /dev/null
+++ b/maintainers/scripts/copy-tarballs.pl
@@ -0,0 +1,95 @@
+#! /run/current-system/sw/bin/perl -w
+
+use strict;
+use XML::Simple;
+use File::Basename;
+use File::Path;
+use File::Copy 'cp';
+use IPC::Open2;
+use Nix::Store;
+
+my $myDir = dirname($0);
+
+my $tarballsCache = $ENV{'NIX_TARBALLS_CACHE'} // "/tarballs";
+
+my $xml = `nix-instantiate --eval-only --xml --strict '<nixpkgs/maintainers/scripts/find-tarballs.nix>'`;
+die "$0: evaluation failed\n" if $? != 0;
+
+my $data = XMLin($xml) or die;
+
+mkpath($tarballsCache);
+mkpath("$tarballsCache/md5");
+mkpath("$tarballsCache/sha1");
+mkpath("$tarballsCache/sha256");
+
+foreach my $file (@{$data->{list}->{attrs}}) {
+    my $url = $file->{attr}->{url}->{string}->{value};
+    my $algo = $file->{attr}->{type}->{string}->{value};
+    my $hash = $file->{attr}->{hash}->{string}->{value};
+
+    if ($url !~ /^http:/ && $url !~ /^https:/ && $url !~ /^ftp:/ && $url !~ /^mirror:/) {
+        print STDERR "skipping $url (unsupported scheme)\n";
+        next;
+    }
+
+    $url =~ /([^\/]+)$/;
+    my $fn = $1;
+
+    if (!defined $fn) {
+        print STDERR "skipping $url (no file name)\n";
+        next;
+    }
+
+    if ($fn =~ /[&?=%]/ || $fn =~ /^\./) {
+        print STDERR "skipping $url (bad character in file name)\n";
+        next;
+    }
+
+    if ($fn !~ /[a-zA-Z]/) {
+        print STDERR "skipping $url (no letter in file name)\n";
+        next;
+    }
+
+    if ($fn !~ /[0-9]/) {
+        print STDERR "skipping $url (no digit in file name)\n";
+        next;
+    }
+
+    if ($fn !~ /[-_\.]/) {
+        print STDERR "skipping $url (no dash/dot/underscore in file name)\n";
+        next;
+    }
+
+    my $dstPath = "$tarballsCache/$fn";
+
+    next if -e $dstPath;
+
+    print "downloading $url to $dstPath...\n";
+
+    next if $ENV{DRY_RUN};
+
+    $ENV{QUIET} = 1;
+    $ENV{PRINT_PATH} = 1;
+    my $fh;
+    my $pid = open($fh, "-|", "nix-prefetch-url", "--type", $algo, $url, $hash) or die;
+    waitpid($pid, 0) or die;
+    if ($? != 0) {
+        print STDERR "failed to fetch $url: $?\n";
+        last if $? >> 8 == 255;
+        next;
+    }
+    <$fh>; my $storePath = <$fh>; chomp $storePath;
+
+    die unless -e $storePath;
+
+    cp($storePath, $dstPath) or die;
+
+    my $md5 = hashFile("md5", 0, $storePath) or die;
+    symlink("../$fn", "$tarballsCache/md5/$md5");
+
+    my $sha1 = hashFile("sha1", 0, $storePath) or die;
+    symlink("../$fn", "$tarballsCache/sha1/$sha1");
+
+    my $sha256 = hashFile("sha256", 0, $storePath) or die;
+    symlink("../$fn", "$tarballsCache/sha256/$sha256");
+}
diff --git a/maintainers/scripts/copy-tarballs.sh b/maintainers/scripts/copy-tarballs.sh
deleted file mode 100755
index a261f817585..00000000000
--- a/maintainers/scripts/copy-tarballs.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh -e
-
-urls=$(nix-instantiate --eval-only --xml --strict '<nixpkgs/maintainers/scripts/eval-release.nix>' \
-    | grep -A2 'name="urls"' \
-    | grep '<string value=' \
-    | sed 's/.*"\(.*\)".*/\1/' \
-    | sort | uniq)
-
-for url in $urls; do
-    if echo "$url" | grep -q -E "www.cs.uu.nl|nixos.org|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe|belastingdienst|microsoft|armijn/.nix|sun.com|archive.eclipse.org"; then continue; fi
-
-    # Check the URL scheme.
-    if ! echo "$url" | grep -q -E "^[a-z]+://"; then echo "skipping $url (no URL scheme)"; continue; fi
-
-    # Check the basename.  It should include something resembling a version.
-    base="$(basename "$url")"
-    #if ! echo "$base" | grep -q -E "[-_].*[0-9].*"; then echo "skipping $url (no version)"; continue; fi
-    if ! echo "$base" | grep -q -E "[a-zA-Z]"; then echo "skipping $url (no letter in name)"; continue; fi
-    if ! echo "$base" | grep -q -E "[0-9]"; then echo "skipping $url (no digit in name)"; continue; fi
-    if ! echo "$base" | grep -q -E "[-_\.]"; then echo "skipping $url (no dot/underscore in name)"; continue; fi
-    if echo "$base" | grep -q -E "[&?=%]"; then echo "skipping $url (bad character in name)"; continue; fi
-    if [ "${base:0:1}" = "." ]; then echo "skipping $url (starts with a dot)"; continue; fi
-
-    $(dirname $0)/copy-tarball.sh "$url"
-done
-
-echo DONE
diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix
new file mode 100644
index 00000000000..5d0cb19aba4
--- /dev/null
+++ b/maintainers/scripts/find-tarballs.nix
@@ -0,0 +1,45 @@
+# This expression returns a list of all fetchurl calls used by all
+# packages reachable from release.nix.
+
+with import ../.. { };
+with lib;
+
+let
+
+  root = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" ];
+
+  uniqueUrls = map (x: x.file) (genericClosure {
+    startSet = map (file: { key = file.url; inherit file; }) urls;
+    operator = const [ ];
+  });
+
+  urls = map (drv: { url = head drv.urls; hash = drv.outputHash; type = drv.outputHashAlgo; }) fetchurlDependencies;
+
+  fetchurlDependencies = filter (drv: drv.outputHash or "" != "" && drv ? urls) dependencies;
+
+  dependencies = map (x: x.value) (genericClosure {
+    startSet = map keyDrv (derivationsIn' root);
+    operator = { key, value }: map keyDrv (immediateDependenciesOf value);
+  });
+
+  derivationsIn' = x:
+    if !canEval x then []
+    else if isDerivation x then optional (canEval x.drvPath) x
+    else if isList x then concatLists (map derivationsIn' x)
+    else if isAttrs x then concatLists (mapAttrsToList (n: v: derivationsIn' v) x)
+    else [ ];
+
+  keyDrv = drv: if canEval drv.drvPath then { key = drv.drvPath; value = drv; } else { };
+
+  immediateDependenciesOf = drv:
+    concatLists (mapAttrsToList (n: v: derivationsIn v) (removeAttrs drv ["meta" "passthru"]));
+
+  derivationsIn = x:
+    if !canEval x then []
+    else if isDerivation x then optional (canEval x.drvPath) x
+    else if isList x then concatLists (map derivationsIn x)
+    else [ ];
+
+  canEval = val: (builtins.tryEval val).success;
+
+in uniqueUrls
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index b50f064af0c..8e5bab29474 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -65,6 +65,10 @@ releaseTools.sourceTarball rec {
     header "checking eval-release.nix"
     nix-instantiate --eval-only --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
+    stopNest
   '';
 
   distPhase = ''
-- 
GitLab


From 83ca2c272a8952828f17c5aa8f918561ca798f8a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Feb 2014 13:36:39 +0100
Subject: [PATCH 1397/3789] =?UTF-8?q?fetchurl:=20Ensure=20that=20=E2=80=98?=
 =?UTF-8?q?urls=E2=80=99=20is=20a=20list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/build-support/fetchurl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 294d9a43ef7..af4a6700153 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -66,6 +66,7 @@ in
   showURLs ? false
 }:
 
+assert builtins.isList urls;
 assert urls != [] -> url == "";
 assert url != "" -> urls == [];
 
-- 
GitLab


From 6aef8266f06deb676593493c117b1f4495c30a5b Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Wed, 19 Feb 2014 14:25:27 +0100
Subject: [PATCH 1398/3789] gnome-icon-theme-symbolic: new package

---
 .../gnome-icon-theme-symbolic/default.nix     | 24 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix

diff --git a/pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix
new file mode 100644
index 00000000000..0d2d406876b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/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];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index b8832f6207a..3ba51f94eba 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -42,6 +42,8 @@ rec {
 
   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 { };
-- 
GitLab


From df2661953ee36a37721d9410fbeaf4392cafb0a1 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Wed, 19 Feb 2014 14:29:07 +0100
Subject: [PATCH 1399/3789] yelp: Show icons in the application

---
 pkgs/desktops/gnome-3/core/yelp/default.nix | 28 +++++++++------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index b5f6600fb60..e6779abcffa 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -1,8 +1,6 @@
-{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib, file
-, bash, makeWrapper, itstool, libxml2, libxslt, gnome3, icu }:
-
-# TODO: icons and theme still does not work
-# use packaged gnome3.gnome_icon_theme_symbolic 
+{ 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";
@@ -12,25 +10,23 @@ stdenv.mkDerivation rec {
     sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816";
   };
 
-  configureFlags = [ "--disable-static" ];
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedUserEnvPkgs = [ librsvg gdk_pixbuf gnome3.gnome_themes_standard
+                            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
-                  gnome3.gsettings_desktop_schemas makeWrapper gnome3.yelp_xsl ];
+  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
+                  libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
+                  gnome3.gsettings_desktop_schemas ];
 
   installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
 
   postInstall = ''
+    cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/loaders.cache
     wrapProgram "$out/bin/yelp" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
-  '';
-
-  preFixup = ''
+      --set GDK_PIXBUF_MODULE_FILE `readlink -e $out/loaders.cache` \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme_symbolic}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gnome_icon_theme}/share:${hicolor_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From a52f17e4e1a305a85cd1b52a7ad48832ff0d7103 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 19 Feb 2014 15:56:13 +0200
Subject: [PATCH 1400/3789] youtubeDL: update from 2014.02.17 to 2014.02.19.1

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index c769645edc3..ef4bc68b1c8 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.02.17";
+  version = "2014.02.19.1";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0yv13k8cqrv3i8zv5ad286niwxk5a4ggngcx6b0d6kg7c03rkgkq";
+    sha256 = "0bilardg46xikw4gl4n50bg9wrmarmnzhrhhwhdcyrx0p0idl4fn";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From 40debd63cad078775cccdcfaded72d6a4fcb4d0f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Feb 2014 11:10:54 +0100
Subject: [PATCH 1401/3789] nc-indicators: re-generate with cabal2nix

---
 pkgs/applications/misc/nc-indicators/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/nc-indicators/default.nix b/pkgs/applications/misc/nc-indicators/default.nix
index dec605daf58..a33cfbdf159 100644
--- a/pkgs/applications/misc/nc-indicators/default.nix
+++ b/pkgs/applications/misc/nc-indicators/default.nix
@@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [ attoparsec gtk hflags lens pipes stm ];
   meta = {
-    homepage = "https://github.com/nilcons/nc-indicators";
+    homepage = "https://github.com/nilcons/nc-indicators/issues";
     description = "CPU load and memory usage indicators for i3bar";
     license = self.stdenv.lib.licenses.asl20;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From 0c008eb857210e6b675a86f4a415bd0c945047d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Feb 2014 11:11:26 +0100
Subject: [PATCH 1402/3789] haskell-bert: update to version 1.2.2.1

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

diff --git a/pkgs/development/libraries/haskell/bert/default.nix b/pkgs/development/libraries/haskell/bert/default.nix
index 2857a21a8d9..e2d482b364e 100644
--- a/pkgs/development/libraries/haskell/bert/default.nix
+++ b/pkgs/development/libraries/haskell/bert/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bert";
-  version = "1.2.2";
-  sha256 = "1dlq9fl5d2adprcybs4d4cyhj9q2c1l4kcc6vnnyhbyn201gxgpn";
+  version = "1.2.2.1";
+  sha256 = "1x23grykamyclx6a5jzyqwp3hwr2ma61zvmz89f3cj06sa49cgs0";
   buildDepends = [
     binary binaryConduit conduit mtl network networkConduit parsec time
     void
-- 
GitLab


From 65972a572432ff6ca052392395feb8fa2159f4f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Feb 2014 11:11:28 +0100
Subject: [PATCH 1403/3789] haskell-css-text: update to version 0.1.2.0.1

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

diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix
index f59a80b2b65..2cb78af7ba9 100644
--- a/pkgs/development/libraries/haskell/css-text/default.nix
+++ b/pkgs/development/libraries/haskell/css-text/default.nix
@@ -1,11 +1,11 @@
-{ cabal, attoparsec, hspec, HUnit, QuickCheck, text }:
+{ cabal, attoparsec, hspec, QuickCheck, text }:
 
 cabal.mkDerivation (self: {
   pname = "css-text";
-  version = "0.1.1";
-  sha256 = "10vb08rnfq987w7wrirw8ib1kzafxaaancswm4xpw46ha3rq1m0y";
+  version = "0.1.2.0.1";
+  sha256 = "0j8d9kfs9j01gqlapaahyziphkx0f55g9bbz2wwix1si7954xxhp";
   buildDepends = [ attoparsec text ];
-  testDepends = [ attoparsec hspec HUnit QuickCheck text ];
+  testDepends = [ attoparsec hspec QuickCheck text ];
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "CSS parser and renderer";
-- 
GitLab


From 8a81d2c20017b560cbb9413ef92ba3f9257719c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Feb 2014 11:11:30 +0100
Subject: [PATCH 1404/3789] haskell-http-conduit: update to version 2.0.0.6

---
 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 04c88c257c1..8719028bf3d 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -11,8 +11,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "2.0.0.5";
-  sha256 = "1vgfg2jgr7gavfbys33rd2l0dxyqk7ig7v357jhy8imxsm0xykp9";
+  version = "2.0.0.6";
+  sha256 = "0jgv17cxf8javcy4vcaayw9ajbr7dj43pba23xr6416hs6cv21hl";
   buildDepends = [
     conduit httpClient httpClientConduit httpClientTls httpTypes
     liftedBase resourcet transformers
-- 
GitLab


From fe92d6bbed63bd42e022520ef927d8822fa0df4c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Feb 2014 11:11:31 +0100
Subject: [PATCH 1405/3789] haskell-multiarg: update to version 0.24.0.2

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

diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
index 3c5239b4737..737ddbda5d6 100644
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ b/pkgs/development/libraries/haskell/multiarg/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "multiarg";
-  version = "0.24.0.0";
-  sha256 = "0vdhrsqwa2wq9cvf96x3hqml2vbjcvik9mpz1kbbhb61f9lbhas6";
+  version = "0.24.0.2";
+  sha256 = "0jqkqw0v9dzby6cm0ijj1ff5dpps8hbjnhrscf2qwja9x974686s";
   buildDepends = [ utf8String ];
   meta = {
     homepage = "https://github.com/massysett/multiarg";
-- 
GitLab


From 9f7aa5e224c9ef79a355db164175a63715ce564b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Feb 2014 11:11:33 +0100
Subject: [PATCH 1406/3789] haskell-shake: update to version 0.11.2

---
 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 d0c5f220099..f3ec1471cbe 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.1";
-  sha256 = "0fk3b4c9r4ybdv7x533afy91dcyf3ji2xsyfpi72z7637vmgv202";
+  version = "0.11.2";
+  sha256 = "1mhll4h6za67pjcm4amdcibfd7ny2kfx4mfws0lrd903j1p5b00q";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From baffeb2b6604830ae939519a7618c2c6e208f4b8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Feb 2014 11:11:35 +0100
Subject: [PATCH 1407/3789] haskell-shakespeare-css: update to version 1.0.7.1

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

diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index f9681995513..4a2305cce2a 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.7";
-  sha256 = "108vlxbis8g7pkldsd6r2b8il7fdqb98n64idc4l2lvkwz3lnr36";
+  version = "1.0.7.1";
+  sha256 = "1qw8hlldzdijp0vgikrbj83q4wmx6i1vswn4314dwjxcihljl8ls";
   buildDepends = [ parsec shakespeare text transformers ];
   testDepends = [ hspec HUnit shakespeare text ];
   meta = {
-- 
GitLab


From 731e3c186ebea338e6d410c0b56b9eda954493e0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Feb 2014 11:11:37 +0100
Subject: [PATCH 1408/3789] haskell-skein: update to version 1.0.9

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

diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index bb7a3a7bc7a..2824c1c8f1c 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "skein";
-  version = "1.0.8.1";
-  sha256 = "1xh8hx1d8hk3kqg07pb2ikc814037bw1xhawskrpxq3x37xff4q4";
+  version = "1.0.9";
+  sha256 = "08hy40c0gzlalrpmgcvhc1v51a44idipamjjbh7zzwsvbxmp1cbb";
   buildDepends = [ cereal cryptoApi tagged ];
   testDepends = [ cereal cryptoApi filepath hspec tagged ];
   jailbreak = true;
-- 
GitLab


From 2a1f4c82b20624fc6bdd41e110f63f67991162df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Feb 2014 11:15:37 +0100
Subject: [PATCH 1409/3789] haskell-cabal2nix: update to version 1.60

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

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 342eb3ecfd1..9dc8536a4c0 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.59";
-  sha256 = "1prm07mnnasfn042635kc6h6mymvninic0y9zimii7k4rqblf598";
+  version = "1.60";
+  sha256 = "1jp4rq8gfdz5knm9cbralhjyw2a391cck49422bskl7c23p94y3l";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
-- 
GitLab


From 189273af3898bf4961df8f52d7f4e4f21858dd4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 19 Feb 2014 16:36:58 +0100
Subject: [PATCH 1410/3789] add gnome3.vino

---
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 pkgs/desktops/gnome-3/core/vino/default.nix   | 31 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/vino/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 063c9bb03bc..154130e793e 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -48,6 +48,7 @@ in {
       [ gnome3.evince
         gnome3.eog
         gnome3.dconf
+        gnome3.vino
         pkgs.ibus
         gnome3.gnome_shell
         gnome3.gnome_settings_daemon
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
new file mode 100644
index 00000000000..b431a199bf7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/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 ];
+
+  postInstall = ''
+    for f in "$out/bin/vino-passwd" "$out/libexec/vino-server"; do
+      wrapProgram $f --prefix XDG_DATA_DIRS : "${gtk3}/share:$out/share"
+    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/default.nix b/pkgs/desktops/gnome-3/default.nix
index 114f58beb21..1c26c6949ca 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -92,6 +92,8 @@ rec {
 
   vte = callPackage ./core/vte { };
 
+  vino = callPackage ./core/vino { };
+
   yelp = callPackage ./core/yelp { };
 
   yelp_xsl = callPackage ./core/yelp-xsl { };
-- 
GitLab


From 746c42d10f1a13ef7e3b48fcbafed6c35ed95912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 19 Feb 2014 16:38:17 +0100
Subject: [PATCH 1411/3789] gnome3: add some default core packages to be
 installed

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

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 154130e793e..5e31247843e 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -49,6 +49,11 @@ in {
         gnome3.eog
         gnome3.dconf
         gnome3.vino
+        gnome3.epiphany
+        gnome3.baobab
+        gnome3.gucharmap
+        gnome3.nautilus
+        gnome3.yelp
         pkgs.ibus
         gnome3.gnome_shell
         gnome3.gnome_settings_daemon
-- 
GitLab


From 5caaa5e0bade258ac0856f10a99a76eeeb31fe9e Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 19 Feb 2014 10:44:58 +0100
Subject: [PATCH 1412/3789] pythonPackages: fix and upate graphite, carbon and
 whisper

Twisted needed downgrade for carbon to start
---
 pkgs/top-level/python-packages.nix | 40 ++++++++++++++++--------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1afadd1a276..2958120f907 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7104,11 +7104,13 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   });
 
   twisted = buildPythonPackage rec {
-    name = "twisted-13.2.0";
+    # NOTE: When updating please check if new versions still cause issues
+    # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem)
 
+    name = "Twisted-11.1.0";
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/T/Twisted/Twisted-13.2.0.tar.bz2";
-      sha256 = "1wrcqv5lvgwk2aq83qb2s2ng2vx14hbjjk2gc30cg6h1iiipal89";
+      url = "https://pypi.python.org/packages/source/T/Twisted/${name}.tar.bz2";
+      sha256 = "05agfp17cndhv2w0p559lvknl7nv0xqkg10apc47fm53m8llbfvz";
     };
 
     propagatedBuildInputs = [ zope_interface ];
@@ -8251,30 +8253,30 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
   whisper = buildPythonPackage rec {
     name = "whisper-${version}";
-    version = "0.9.10";
+    version = "0.9.12";
 
-    src = fetchurl rec {
-      url = "https://launchpad.net/graphite/0.9/${version}/+download/${name}.tar.gz";
-      sha256 = "1zy4z4hrbiqj4ipcv2m9197hf03d4xphllqav9w4c8i6fn8zmd9n";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/w/whisper/${name}.tar.gz";
+      md5 = "5fac757cc4822ab0678dbe0d781d904e";
     };
 
     # error: invalid command 'test'
     doCheck = false;
 
-    meta = {
+    meta = with stdenv.lib; {
       homepage = http://graphite.wikidot.com/;
       description = "Fixed size round-robin style database";
-      maintainers = [ stdenv.lib.maintainers.rickynils ];
+      maintainers = with maintainers; [ rickynils offline ];
     };
   };
 
   carbon = buildPythonPackage rec {
     name = "carbon-${version}";
-    version = "0.9.10";
+    version = "0.9.12";
 
-    src = fetchurl rec {
-      url = "https://launchpad.net/graphite/0.9/${version}/+download/${name}.tar.gz";
-      sha256 = "0wjhd87pvpcpvaj3wql2d92g8lpp33iwmxdkp7npic5mjl2y0dsg";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/c/carbon/${name}.tar.gz";
+      md5 = "66967d5a622fd29973838fcd10eb34f3";
     };
 
     propagatedBuildInputs = [ whisper txamqp zope_interface twisted ];
@@ -8282,10 +8284,10 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     # error: invalid command 'test'
     doCheck = false;
 
-    meta = {
+    meta = with stdenv.lib; {
       homepage = http://graphite.wikidot.com/;
       description = "Backend data caching and persistence daemon for Graphite";
-      maintainers = [ stdenv.lib.maintainers.rickynils ];
+      maintainers = with maintainers; [ rickynils offline ];
     };
   };
 
@@ -8326,11 +8328,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
   graphite_web = buildPythonPackage rec {
     name = "graphite-web-${version}";
-    version = "0.9.11";
+    version = "0.9.12";
 
     src = fetchurl rec {
       url = "https://pypi.python.org/packages/source/g/graphite-web/${name}.tar.gz";
-      md5 = "1499b5dded3d1054d598760fd450a6f9";
+      md5 = "8edbb61f1ffe11c181bd2cb9ec977c72";
     };
 
     propagatedBuildInputs = [ django_1_3 django_tagging modules.sqlite3 whisper pkgs.pycairo ldap memcached ];
@@ -8350,10 +8352,10 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     # error: invalid command 'test'
     doCheck = false;
 
-    meta = {
+    meta = with stdenv.lib; {
       homepage = http://graphite.wikidot.com/;
       description = "Enterprise scalable realtime graphing";
-      maintainers = [ stdenv.lib.maintainers.rickynils ];
+      maintainers = with maintainers; [ rickynils offline ];
     };
   };
 
-- 
GitLab


From ad0732313d1d512f0cc504e7a5b354236ced49f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 19 Feb 2014 16:53:08 +0100
Subject: [PATCH 1413/3789] gnome3: typo

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

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 5e31247843e..456975015a2 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -34,7 +34,7 @@ in {
           export GTK_DATA_PREFIX=${config.system.path}
 
           # find theme engines
-          export GTK_PATH=${config.system.path}/lib/gtk-3.0:{config.system.path}/lib/gtk-2.0
+          export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
 
           export XDG_MENU_PREFIX=gnome
 
-- 
GitLab


From cea9a1a242af60adb99e98a4eae50950dfd1ff92 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 19 Feb 2014 16:56:25 +0100
Subject: [PATCH 1414/3789] nixos-generate-config: Don't generate
 /var/lib/nfs/rpc_pipefs filesystem

It's automatically mounted if the system has support for NFS.
---
 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 b6bc0458477..67ba7956022 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -256,7 +256,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
     $mountPoint = "/" if $mountPoint eq "";
 
     # Skip special filesystems.
-    next if in($mountPoint, "/proc") || in($mountPoint, "/dev") || in($mountPoint, "/sys") || in($mountPoint, "/run");
+    next if in($mountPoint, "/proc") || in($mountPoint, "/dev") || in($mountPoint, "/sys") || in($mountPoint, "/run") || $mountPoint eq "/var/lib/nfs/rpc_pipefs";
 
     # Skip the optional fields.
     my $n = 6; $n++ while $fields[$n] ne "-"; $n++;
-- 
GitLab


From a146fdab808ddacc2ea0b950d753807d75eae2db Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 19 Feb 2014 17:13:21 +0100
Subject: [PATCH 1415/3789] nixos-generate-config: Don't generate filesystem
 options

We don't want to hardcode configuration options that the current kernel chose
for us when mounting the filesystem, since the defaults can change in the
future.
---
 nixos/modules/installer/tools/nixos-generate-config.pl | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 67ba7956022..bf7cdcd3711 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -305,7 +305,15 @@ EOF
   fileSystems.\"$mountPoint\" =
     { device = \"$device\";
       fsType = \"$fsType\";
-      options = \"${\join ",", uniq(@extraOptions, @superOptions, @mountOptions)}\";
+EOF
+
+    if (scalar @extraOptions > 0) {
+      $fileSystems .= <<EOF;
+      options = \"${\join ",", uniq(@extraOptions)}\";
+EOF
+    }
+
+    $fileSystems .= <<EOF;
     };
 
 EOF
-- 
GitLab


From 484403bf0e229f857cafb67ec2e516ed7dfdc2d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Feb 2014 18:47:48 +0100
Subject: [PATCH 1416/3789] =?UTF-8?q?Add=20a=20constant=20=E2=80=98nixpkgs?=
 =?UTF-8?q?Version=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes it a bit easier to find out the current Nixpkgs version,
e.g.

  $ nix-instantiate --eval '<nixpkgs>' -A lib.nixpkgsVersion
  "14.02.35657.66f51a9"
---
 lib/trivial.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index 760a74ce666..190cda6abd6 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -41,4 +41,10 @@ rec {
     pathExists readFile isBool isFunction
     isInt add sub lessThan;
 
+  # Return the Nixpkgs version number.
+  nixpkgsVersion =
+    let suffixFile = ../.version-suffix; in
+    readFile ../.version
+    + (if pathExists suffixFile then readFile suffixFile else "pre-git");
+
 }
-- 
GitLab


From 4a91cfd32b44fede17f135b47ff0f035652f203e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Feb 2014 19:00:51 +0100
Subject: [PATCH 1417/3789] =?UTF-8?q?Add=20a=20global=20variable=20?=
 =?UTF-8?q?=E2=80=98inNixShell=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is primarily useful in Nix expressions that are also intended to
be used by nix-shell.  It allows saying things like:

  buildInputs = [ ... ] ++ (if inNixShell then [ emacs ] else [ ]);

This should not be used in Nixpkgs (since the question of what
constitutes a useful nix-shell environment is very subjective).
---
 lib/trivial.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index 190cda6abd6..e073da4900c 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -47,4 +47,7 @@ rec {
     readFile ../.version
     + (if pathExists suffixFile then readFile suffixFile else "pre-git");
 
+  # Whether we're being called by nix-shell.  This is useful to  
+  inNixShell = builtins.getEnv "IN_NIX_SHELL" == "1";
+
 }
-- 
GitLab


From 208d4241ff9db3939bd9f4a579b8524dd80ffe42 Mon Sep 17 00:00:00 2001
From: Tom Hinton <tom.hinton@cse.org.uk>
Date: Wed, 19 Feb 2014 13:07:20 +0100
Subject: [PATCH 1418/3789] - Add openobex's unusual pkgconfig to pkgconfig
 path - Prepend dbus_libs pkgconfig to pkgconfig path, as otherwise the
 dbus-daemon pkgconfig wins,   as it has the same name (dbus-1.pc), which
 doesn't provide all the dbus headers that are needed - Apply the included
 patch to obex-data-server which lets it build against current openobex

---
 .../bluetooth/obex-data-server/default.nix    | 11 +++-
 ...obex-data-server-0.4.6-build-fixes-1.patch | 56 +++++++++++++++++++
 2 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch

diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix
index 790b57f4a76..53e854c34eb 100644
--- a/pkgs/tools/bluetooth/obex-data-server/default.nix
+++ b/pkgs/tools/bluetooth/obex-data-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus_glib, bluez, openobex }:
+{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus_glib, bluez, openobex, dbus_libs }:
    
 stdenv.mkDerivation rec {
   name = "obex-data-server-0.4.6";
@@ -8,7 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk";
   };
 
-  buildInputs = [ pkgconfig libusb glib dbus_glib bluez openobex ];
+  buildInputs = [ pkgconfig libusb glib dbus_glib bluez openobex dbus_libs ];
+
+  patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ];
+
+  preConfigure = ''
+  addToSearchPath PKG_CONFIG_PATH ${openobex}/lib64/pkgconfig
+  export PKG_CONFIG_PATH="${dbus_libs}/lib/pkgconfig:$PKG_CONFIG_PATH"
+  '';
 
   meta = {
     homepage = http://wiki.muiline.com/obex-data-server;
diff --git a/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch b/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch
new file mode 100644
index 00000000000..b5fde8db589
--- /dev/null
+++ b/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch
@@ -0,0 +1,56 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2012-07-06
+Initial Package Version: 0.4.6
+Upstream Status:         Unknown
+Origin:                  Self
+Description:             Some build fixes.
+
+--- obex-data-server.orig/src/ods-obex.c	2011-02-10 10:14:42.000000000 +0100
++++ obex-data-server/src/ods-obex.c	2012-07-06 20:10:09.208712553 +0200
+@@ -412,7 +412,7 @@
+ 		goto err;
+ 	}
+ 
+-	interfaces_num = OBEX_FindInterfaces(obex_context->obex_handle, &obex_intf);
++	interfaces_num = OBEX_EnumerateInterfaces(obex_context->obex_handle);
+ 	if (intf_num >= interfaces_num) {
+ 		g_set_error (error, ODS_ERROR, ODS_ERROR_FAILED, "Invalid interface number");
+ 		goto err;
+@@ -1928,7 +1928,7 @@
+ 	gchar	*uname;
+ 	gsize	uname_len;
+ 
+-	if (action != OBEX_ACTION_SETPERM)
++	if (action != 0x03)
+ 		g_assert (src && dst);
+ 
+ 	object = OBEX_ObjectNew (obex_context->obex_handle, OBEX_CMD_ACTION);
+@@ -1974,7 +1974,7 @@
+ 	                      OBEX_HDR_ACTION_ID, hv, 1, 0);
+ 
+ 	/* permissions header */
+-	if (action == OBEX_ACTION_SETPERM) {
++	if (action == 0x03) {
+ 		hv.bq4 = perms;
+ 		ret = OBEX_ObjectAddHeader (obex_context->obex_handle, object,
+ 		                            OBEX_HDR_PERMISSIONS, hv, 4, 0);
+--- obex-data-server.orig/src/ods-session.c	2011-02-10 09:57:31.000000000 +0100
++++ obex-data-server/src/ods-session.c	2012-07-06 20:10:09.208712553 +0200
+@@ -1761,7 +1761,7 @@
+                          DBusGMethodInvocation *context)
+ {
+ 	return ods_session_remote_action (session, remote_source,
+-	                                  remote_destination, OBEX_ACTION_COPY,
++	                                  remote_destination, 0x00,
+ 	                                  context);
+ }
+ 
+@@ -1772,7 +1772,7 @@
+                          DBusGMethodInvocation *context)
+ {
+ 	return ods_session_remote_action (session, remote_source,
+-	                                  remote_destination, OBEX_ACTION_MOVE,
++	                                  remote_destination, 0x01,
+ 	                                  context);
+ }
+ 
-- 
GitLab


From 058ed07fb80bfeeec8c7623c1cc145a8d92aec8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 19 Feb 2014 20:12:19 +0100
Subject: [PATCH 1419/3789] vamp-sdk: update from 2.2.1 to 2.5

Tested with mixxx, qtractor, rubberband and sonic-visualiser
---
 .../development/libraries/audio/vamp/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix
index bfca4a52304..f4c4220a879 100644
--- a/pkgs/development/libraries/audio/vamp/default.nix
+++ b/pkgs/development/libraries/audio/vamp/default.nix
@@ -6,21 +6,21 @@
 rec {
 
   vampSDK = stdenv.mkDerivation {
-    name = "vamp-sdk-2.2.1";
+    name = "vamp-sdk-2.5";
 
     src = fetchurl {
-      url = mirror://sourceforge/vamp/vamp-plugin-sdk-2.2.1.tar.gz;
-      sha256 = "09iw6gv8aqq5v322fhi872mrhjp0a2w63966g0mks4vhh84q252p";
+      url = http://code.soundsoftware.ac.uk/attachments/download/690/vamp-plugin-sdk-2.5.tar.gz;
+      sha256 = "178kfgq08cmgdzv7g8dwyjp4adwx8q04riimncq4nqkm8ng9ywbv";
     };
 
-    buildInputs = [pkgconfig libsndfile];
+    buildInputs = [ pkgconfig libsndfile ];
 
-    meta = { 
+    meta = with stdenv.lib; {
       description = "Audio processing plugin system for plugins that extract descriptive information from audio data";
       homepage = http://sourceforge.net/projects/vamp;
-      license = "BSD";
-      maintainers = [ stdenv.lib.maintainers.marcweber ];
-      platforms = stdenv.lib.platforms.linux;
+      license = licenses.bsd3;
+      maintainers = [ maintainers.goibhniu maintainers.marcweber ];
+      platforms = platforms.linux;
     };
   };
 
-- 
GitLab


From 845f30aa6a994b084f36928ad6fcb734c70daa08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 19 Feb 2014 00:13:26 +0100
Subject: [PATCH 1420/3789] sonic-visualiser: upgrade from 1.9 to 2.3

remove obsolete patch, add new inputs
---
 .../audio/sonic-visualiser/default.nix        | 39 ++++++++-----------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index 6e15478ff63..7704397e6d0 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -2,27 +2,25 @@
 
 { stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo
 , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
-, libsndfile, makeWrapper, pkgconfig, pulseaudio, qt4, redland
-, rubberband, vampSDK 
+, libsndfile, pkgconfig, pulseaudio, qt5, redland
+, rubberband, serd, sord, vampSDK
 }:
 
 stdenv.mkDerivation rec {
   name = "sonic-visualiser-${version}";
-  version = "1.9";
+  version = "2.3";
 
   src = fetchurl {
-    url = "http://code.soundsoftware.ac.uk/attachments/download/194/${name}.tar.gz";
-    sha256 = "00igf7j6s8xfyxnlkbqma0yby9pknxqzy8cmh0aw95ix80cw56fq";
+
+    url = "http://code.soundsoftware.ac.uk/attachments/download/918/${name}.tar.gz";
+    sha256 = "1f06w2rin4r2mbi00bg3nmqdi2xdy9vq4jcmfanxzj3ld66ik40c";
   };
-  patches = [(fetchurl {
-    url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch;
-    sha256 = "0dhh111crvjvhcjqp7j9jqnvs8zmd6xrcirmzqrrnca1h0vbpkay";
-    name = "gcc47.patch";
-  })];
 
   buildInputs =
-    [ libsndfile qt4 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
+    [ libsndfile qt5 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
       libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
+      serd
+      sord
       pkgconfig
       # optional
       jackaudio
@@ -33,11 +31,10 @@ stdenv.mkDerivation rec {
       # fishsound
       liblo
       libX11
-      makeWrapper
     ];
 
   buildPhase = ''
-    for i in sonic-visualiser svapp svcore svgui; 
+    for i in sonic-visualiser svapp svcore svgui;
       do cd $i && qmake -makefile PREFIX=$out && cd ..;
     done
     make
@@ -45,19 +42,15 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/{bin,share/sonic-visualiser}
-    cp sonic-visualiser/sonic-visualiser $out/bin
-    cp -r sonic-visualiser/samples $out/share/sonic-visualiser/samples
-    wrapProgram $out/bin/sonic-visualiser --prefix LD_LIBRARY_PATH : ${libX11}/lib
+    cp sonic-visualiser $out/bin/
+    cp -r samples $out/share/sonic-visualiser/
   '';
 
-  meta = { 
+  meta = with stdenv.lib; {
     description = "View and analyse contents of music audio files";
     homepage = http://www.sonicvisualiser.org/;
-    license = "GPLv2";
-    maintainers = 
-      [ stdenv.lib.maintainers.marcweber 
-        stdenv.lib.maintainers.goibhniu 
-      ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.goibhniu maintainers.marcweber ];
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From 68f9e604352407ebabd55365d8955c8dbd97cbf1 Mon Sep 17 00:00:00 2001
From: Badi' Abdul-Wahid <abdulwahidc@gmail.com>
Date: Tue, 18 Feb 2014 11:15:17 -0500
Subject: [PATCH 1421/3789] gnutls: fix linking on Darwin (close #1779)

---
 pkgs/development/libraries/gnutls/3.2.nix     | 13 +++-
 ...gnutls_x86_cpuid_s_multi_definitions.patch | 59 +++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch

diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix
index 03a0c001979..e256dc44ace 100644
--- a/pkgs/development/libraries/gnutls/3.2.nix
+++ b/pkgs/development/libraries/gnutls/3.2.nix
@@ -70,4 +70,15 @@ stdenv.mkDerivation (rec {
 (stdenv.lib.optionalAttrs stdenv.isFreeBSD {
   # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
   patches = [ ./guile-gnulib-includes.patch ];
-}))
+})
+
+//
+
+(stdenv.lib.optionalAttrs stdenv.isDarwin {
+  # multiple definitions of '_gnutls_x86_cpuid_s' cause linker to fail.
+  # the patch is: https://www.gitorious.org/gnutls/gnutls/commit/54768ca1cd9049bbd1c695696ef3c8595c6052db
+  # discussion: http://osdir.com/ml/gnutls-devel-gnu/2014-02/msg00012.html
+  patches = [ ./fix_gnutls_x86_cpuid_s_multi_definitions.patch ];
+})
+
+)
diff --git a/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch b/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch
new file mode 100644
index 00000000000..1bc3086faeb
--- /dev/null
+++ b/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch
@@ -0,0 +1,59 @@
+From 54768ca1cd9049bbd1c695696ef3c8595c6052db Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@redhat.com>
+Date: Mon, 10 Feb 2014 10:43:52 +0100
+Subject: [PATCH] do not redefine the _gnutls_x86_cpuid_s symbol
+
+---
+ lib/accelerated/x86/aes-cbc-x86-aesni.c |    2 --
+ lib/accelerated/x86/aes-cbc-x86-ssse3.c |    2 --
+ lib/accelerated/x86/x86.h               |    3 ++-
+ 3 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/lib/accelerated/x86/aes-cbc-x86-aesni.c b/lib/accelerated/x86/aes-cbc-x86-aesni.c
+index 6d4526f..1a2681f 100644
+--- a/lib/accelerated/x86/aes-cbc-x86-aesni.c
++++ b/lib/accelerated/x86/aes-cbc-x86-aesni.c
+@@ -39,8 +39,6 @@ struct aes_ctx {
+ 	int enc;
+ };
+ 
+-unsigned int _gnutls_x86_cpuid_s[4];
+-
+ static int
+ aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc)
+ {
+diff --git a/lib/accelerated/x86/aes-cbc-x86-ssse3.c b/lib/accelerated/x86/aes-cbc-x86-ssse3.c
+index ff24578..2b2440a 100644
+--- a/lib/accelerated/x86/aes-cbc-x86-ssse3.c
++++ b/lib/accelerated/x86/aes-cbc-x86-ssse3.c
+@@ -39,8 +39,6 @@ struct aes_ctx {
+ 	int enc;
+ };
+ 
+-unsigned int _gnutls_x86_cpuid_s[4];
+-
+ static int
+ aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc)
+ {
+diff --git a/lib/accelerated/x86/x86.h b/lib/accelerated/x86/x86.h
+index ae04d32..03fc8de 100644
+--- a/lib/accelerated/x86/x86.h
++++ b/lib/accelerated/x86/x86.h
+@@ -22,6 +22,8 @@
+ 
+ #include <config.h>
+ 
++extern unsigned int _gnutls_x86_cpuid_s[4];
++
+ #if defined(ASM_X86)
+ 
+ void gnutls_cpuid(unsigned int func, unsigned int *ax, unsigned int *bx,
+@@ -43,5 +45,4 @@ unsigned int gnutls_have_cpuid(void);
+  (nettle_hash_digest_func *) digest_func	\
+ } 
+ 
+-
+ #endif
+-- 
+1.7.1
+
-- 
GitLab


From 048a85f952b31502dc41b0e1783fe11dd0517a13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 19 Feb 2014 20:42:51 +0100
Subject: [PATCH 1422/3789] gnutls: add platforms for the default version

---
 pkgs/development/libraries/gnutls/3.2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix
index e256dc44ace..ad873b3eae8 100644
--- a/pkgs/development/libraries/gnutls/3.2.nix
+++ b/pkgs/development/libraries/gnutls/3.2.nix
@@ -62,6 +62,7 @@ stdenv.mkDerivation (rec {
     homepage = http://www.gnu.org/software/gnutls/;
     license = "LGPLv2.1+";
     maintainers = [ ];
+    platforms = platforms.all;
   };
 }
 
-- 
GitLab


From a629aaee7203aa6540d8c84068f700e72f0ff695 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Wed, 19 Feb 2014 11:16:03 +0400
Subject: [PATCH 1423/3789] viewnior: version bump (1.4) (close #1781)

---
 pkgs/applications/graphics/viewnior/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix
index 99e1ec1c169..aa09fb705f1 100644
--- a/pkgs/applications/graphics/viewnior/default.nix
+++ b/pkgs/applications/graphics/viewnior/default.nix
@@ -2,11 +2,11 @@
 , intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}:
 
 stdenv.mkDerivation rec {
-  name = "viewnior-1.3";
+  name = "viewnior-1.4";
 
   src = fetchurl {
-    url = "http://cloud.github.com/downloads/xsisqox/Viewnior/${name}.tar.gz";
-    sha256 = "46c97c1a85361519b42fe008cfb8911e66f709f3a3a988c11047ab3726889f10";
+    url = "https://www.dropbox.com/s/zytq0suabesv933/${name}.tar.gz";
+    sha256 = "0vv1133phgfzm92md6bbccmcvfiqb4kz28z1572c0qj971yz457a";
   };
 
   buildInputs =
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
       shared_mime_info glib gdk_pixbuf perl
     ];
 
+  preFixup = ''
+    rm $out/share/icons/*/icon-theme.cache
+  '';
+
   meta = {
     description = "Viewnior is a fast and simple image viewer for GNU/Linux";
     longDescription =
-- 
GitLab


From 2142d7542bf6d6ccce4b965fda0dbcac1ccb129b Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Wed, 19 Feb 2014 12:20:21 +0400
Subject: [PATCH 1424/3789] zathura: version bump (0.2.6 -> 0.2.7) (close
 #1782)

---
 pkgs/applications/misc/girara/default.nix              | 4 ++--
 pkgs/applications/misc/zathura/core/default.nix        | 4 ++--
 pkgs/applications/misc/zathura/pdf-poppler/default.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index 7af8cbeccc6..4db4e4b1091 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gtk, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "girara-0.1.9";
+  name = "girara-0.2.0";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
-    sha256 = "1kd20dalnpy07hajv0rkmkbsym4bpfxh0gby7j2mvkvl5qr3vx70";
+    sha256 = "0k8p5sgazqw7r78ssqh8bm2hn98xjml5w76l9awa66yq0k5m8jyi";
   };
 
   buildInputs = [ pkgconfig gtk gettext ];
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 00e1e6cd28a..b86107890d8 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.6";
+  version = "0.2.7";
   name = "zathura-core-${version}";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
-    sha1 = "d84878388969d523027a1661f49fd29638bd460b";
+    sha256 = "ef43be7705612937d095bfbe719a03503bf7e45493ea9409cb43a45cf96f0daf";
   };
 
   buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ];
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 71c418f168c..ce4894e6c0f 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.4";
+  version = "0.2.5";
   name = "zathura-pdf-poppler-${version}";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "1x1n21naixb87g1knznjfjfibazzwbn1cv7d42kxgwlnf1p1wbzm";
+    sha256 = "1b0chsds8iwjm4g629p6a67nb6wgra65pw2vvngd7g35dmcjgcv0";
   };
 
   buildInputs = [ pkgconfig poppler gettext zathura_core girara ];
-- 
GitLab


From 927ed152f437ab14b8966cf2d5f1b906dab6b75c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 19 Feb 2014 21:53:49 +0100
Subject: [PATCH 1425/3789] minixml: upgrade from 2.6 to 2.8

Tested with yoshimi and zynaddsubfx
---
 pkgs/development/libraries/minixml/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix
index 33b713239c8..f3b1c2c72a7 100644
--- a/pkgs/development/libraries/minixml/default.nix
+++ b/pkgs/development/libraries/minixml/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation  rec {
   name = "mxml-${version}";
-  version = "2.6";
+  version = "2.8";
 
   src = fetchurl {
-    url = "http://ftp.easysw.com/pub/mxml/${version}/${name}.tar.gz";
-    sha256 = "15cpqr43cwvy1ms67rfav8l9fjgybkaqfq7nhag8qnhd3bd4glxh";
+    url = "http://www.msweet.org/files/project3/${name}.tar.gz";
+    sha256 = "1m8i62dfmgfc1v8y3zx0r4i2hr5n86yw01xh5kiq53bi3bwnk4qc";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From e43130d3797c9b48faff2431a94478b66f4a6f02 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 19 Feb 2014 15:04:59 -0600
Subject: [PATCH 1426/3789] reptyr: version 0.5

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

diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix
index 573f1a578c7..e5e579081f6 100644
--- a/pkgs/os-specific/linux/reptyr/default.nix
+++ b/pkgs/os-specific/linux/reptyr/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchgit}:
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation rec {
-  version = "0.4";
+  version = "0.5";
   name = "reptyr-${version}";
-  src = fetchgit {
-    url = "https://github.com/nelhage/reptyr.git";
-    rev = "refs/tags/${name}";
-    sha256 = "2d2814c210e4bde6f9bcf3aa20477287d7e4a5aa7ee09110b37d2eaaf7e5ecae";
+  src = fetchurl {
+    url = "https://github.com/nelhage/reptyr/archive/reptyr-${version}.tar.gz";
+    sha256 = "077cvjjf534nxh7qqisw27a0wa61mdgyik43k50f8v090rggz2xm";
   };
   makeFlags = ["PREFIX=$(out)"];
   meta = {
-- 
GitLab


From f2b59904e5fe1e7d6a18b66572fe2c5b730a13d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 19 Feb 2014 22:00:54 +0100
Subject: [PATCH 1427/3789] opencolorio: update from 1.0.8 to 1.0.9

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

diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index 513b340e132..28d361ea7b8 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ocio-${version}";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchurl {
-    url = "https://github.com/imageworks/OpenColorIO/archive/v1.0.8.zip";
-    sha256 = "1l70bf40dz2znm9rh3r6xs9d6kp719y1djayb7dc89khfqqbx2di";
+    url = "https://github.com/imageworks/OpenColorIO/archive/v1.0.9.zip";
+    sha256 = "14j80dgbb6f09z63aqh2874vhzpga6zksz8jmqnj1zh87x15pqnr";
   };
 
   buildInputs = [ cmake unzip ];
-- 
GitLab


From 30fb0365df8223d4769dd0ff6825a2d97dd21f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 19 Feb 2014 22:02:54 +0100
Subject: [PATCH 1428/3789] openimageio: update from 1.1.12 to 1.3.12

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

diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index 8748c808dc0..f63f41a8ed1 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "oiio-${version}";
-  version = "1.1.12";
+  version = "1.3.12";
 
   src = fetchurl {
     url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
-    sha256 = "0v84xna2vp83njxbizlxnindcp2i67xd89kgl9nic1hz6ywlylz6";
+    sha256 = "114jx4pcqhzdchzpxbwrfzqmnxr2bm8cw13g4akz1hg8pvr1dhsb";
   };
 
   buildInputs = [
-- 
GitLab


From 77041cbf4514eea42322b02ef4135cfbecd64321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 19 Feb 2014 23:50:24 +0100
Subject: [PATCH 1429/3789] linuxsampler: fix the build by using bison2

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed811f549ce..056d80b7bda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8344,7 +8344,9 @@ let
     libosip = libosip_3;
   };
 
-  linuxsampler = callPackage ../applications/audio/linuxsampler { };
+  linuxsampler = callPackage ../applications/audio/linuxsampler {
+    bison = bison2;
+  };
 
   lmms = callPackage ../applications/audio/lmms { };
 
-- 
GitLab


From 0441bb1b7a5ba6c4c84cafee38ce052173f0b13e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 18 Feb 2014 20:39:27 -0600
Subject: [PATCH 1430/3789] virtualbox: 4.2.18 -> 4.2.22

This is needed to compile the Virtual Box guest additions with the 3.13
kernel (and thus the grsecurity testing kernel).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../applications/virtualization/virtualbox/default.nix | 10 +++++-----
 .../virtualbox/guest-additions/default.nix             |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 2ce134090fe..79a208fa54c 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.2.18"; # changes ./guest-additions as well
+  version = "4.2.22"; # 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 = "88780";
+  extpackRevision = "91556";
   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.2.18/SHA256SUMS
-    sha256 = "1d1737b59d0f30f5d42beeabaff168bdc0a75b8b28df685979be6173e5adbbba";
+    # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.2.22/SHA256SUMS
+    sha256 = "79c0da87451cab3868f64d48bf9a7fdd710786c05ed4b3070b008c3aa1ce4f7a";
     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 = "9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74";
+    sha256 = "4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 805e0b867d9..595698abcaa 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 = "f11a7f13dfe7bf9f246fb877144bb467fe6deadcd876568ec79b6ccd3b59d767";
+    sha256 = "222e003d038b757cd761361bb5da33123e0f9574af246fb95eb558593c8c7c76";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";
-- 
GitLab


From 342ed631a46ac1efe093dce624b6aa17cb8432f6 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Thu, 20 Feb 2014 00:23:05 +0100
Subject: [PATCH 1431/3789] speedtest_cli: update from 0.2.4 to 0.2.5

---
 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 26b4b680a6e..4f54404b713 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.4";
+  version = "0.2.5";
   
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-${version}.tar.gz";
-    sha256 = "1mz9lx0sdgjz5w3w2lrfh4g7mdyas0ywqfvwh7hwmmpg0fvqiq5q";
+    sha256 = "0a19kyn6064jbxda4yq1rfrlqlh8ha40fgwkj4rckdzk9bnxkhdn";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 67cc87a35af2bb6e915e5845f25a25ef63da7183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 20 Feb 2014 00:44:08 +0100
Subject: [PATCH 1432/3789] python2.6: 2.6.8 -> 2.6.9

---
 pkgs/development/interpreters/python/2.6/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 0302513e6fc..d51838af5ad 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -9,13 +9,12 @@ with stdenv.lib;
 let
 
   majorVersion = "2.6";
-  version = "${majorVersion}.8";
+  version = "${majorVersion}.9";
 
-  # http://www.python.org/download/releases/2.6.8/
-  # md5 taken from webpage, python 2.6 will receive security fixes until Oct 2013
+  # python 2.6 will receive security fixes until Oct 2013
   src = fetchurl {
-    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
-    md5 = "c6e0420a21d8b23dee8b0195c9b9a125";
+    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
+    sha256 = "0hbfs2691b60c7arbysbzr0w9528d5pl8a4x7mq5psh6a2cvprya";
   };
 
   patches =
-- 
GitLab


From 31949ead32b6deec59c859577d38378c3bda9c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 20 Feb 2014 00:44:27 +0100
Subject: [PATCH 1433/3789] python2.7: 2.7.5 -> 2.7.6

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

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 4897c0a5141..e9277ce2daf 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}.5";
+  version = "${majorVersion}.6";
 
   src = fetchurl {
-    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
-    sha256 = "0nc091f19sllibvxm6n3qw5pflcphkwwxmz43q26lqafhra7airv";
+    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
+    sha256 = "18gnpyh071dxa0rv3silrz92jw9qpblswzwv4gzqcwxzz20qxmhz";
   };
 
   patches =
-- 
GitLab


From a0ff8f687f95c7eb2ff6716d77cc889dfce4a370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 20 Feb 2014 00:44:51 +0100
Subject: [PATCH 1434/3789] python3.3: 3.3.3 -> 3.3.4

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

diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index 18af6487e55..af37b4372b7 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -17,7 +17,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.3";
-  version = "${majorVersion}.3";
+  version = "${majorVersion}.4";
 
   buildInputs = filter (p: p != null) [
     zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
@@ -28,8 +28,8 @@ stdenv.mkDerivation {
   inherit majorVersion version;
 
   src = fetchurl {
-    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
-    sha256 = "1jwd9pw7vx6xpjyi7iv5j3rwwkf3vzrwj36kcj1qh8zn2avfj9p5";
+    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
+    sha256 = "12ank7in8xyncim3yyn3mi84wkc4g9nx7yrci1406kn0j5ni5k66";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
-- 
GitLab


From 6cbc1d554f7a724fcb8b8e98c6c8e41f86a640c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 3 Jan 2014 18:05:35 +0100
Subject: [PATCH 1435/3789] remove unused setuptools/site.nix

---
 .../python-modules/setuptools/site.nix           | 16 ----------------
 pkgs/top-level/python-packages.nix               |  5 -----
 2 files changed, 21 deletions(-)
 delete mode 100644 pkgs/development/python-modules/setuptools/site.nix

diff --git a/pkgs/development/python-modules/setuptools/site.nix b/pkgs/development/python-modules/setuptools/site.nix
deleted file mode 100644
index 34e7b478595..00000000000
--- a/pkgs/development/python-modules/setuptools/site.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# Propagated by buildPythonPackge to process pth files
-
-{ stdenv, python, setuptools }:
-
-stdenv.mkDerivation {
-  name = "python-setuptools-site-${setuptools.version}";
-
-  buildInputs = [ python setuptools ];
-
-  unpackPhase = "true";
-  installPhase = ''
-    dst="$out/lib/${python.libPrefix}/site-packages"
-    ensureDir $dst
-    ln -s ${setuptools}/lib/${python.libPrefix}/site-packages/site.* $dst/
-  '';
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2958120f907..fe80ab70e36 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -48,11 +48,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     inherit python wrapPython;
   };
 
-  setuptoolsSite = import ../development/python-modules/setuptools/site.nix {
-    inherit (pkgs) stdenv;
-    inherit python setuptools;
-  };
-
   # packages defined elsewhere
 
   blivet = callPackage ../development/python-modules/blivet { };
-- 
GitLab


From 29b7f2e1824ad42e8a71df6f45d82290df463b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 3 Jan 2014 18:06:04 +0100
Subject: [PATCH 1436/3789] setuptools: remove obsolete patch

---
 ...kip-sdist_with_utf8_encoded_filename.patch | 28 -------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch

diff --git a/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch b/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch
deleted file mode 100644
index 96a4f81ee58..00000000000
--- a/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -r f5ac515f062a setuptools/tests/test_sdist.py
---- a/setuptools/tests/test_sdist.py	Fri Jul 26 09:52:26 2013 +0200
-+++ b/setuptools/tests/test_sdist.py	Sat Jul 27 20:22:17 2013 +0200
-@@ -3,12 +3,14 @@
- 
- 
- import os
-+import locale
- import shutil
- import sys
- import tempfile
- import unittest
- import unicodedata
- 
-+from setuptools.tests.py26compat import skipIf
- from setuptools.compat import StringIO, unicode
- from setuptools.command.sdist import sdist
- from setuptools.command.egg_info import manifest_maker
-@@ -318,6 +320,9 @@
-             filename = filename.decode('latin-1')
-             self.assertFalse(filename in cmd.filelist.files)
- 
-+
-+    @skipIf(sys.version_info >= (3,) and locale.getpreferredencoding() != 'UTF-8',
-+            'Unittest fails if locale is not utf-8 but the manifests is recorded correctly')
-     def test_sdist_with_utf8_encoded_filename(self):
-         # Test for #303.
-         dist = Distribution(SETUP_ATTRS)
-- 
GitLab


From e9923c649955dfdadeb016482049a8747e5fc454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 6 Jan 2014 22:21:15 +0000
Subject: [PATCH 1437/3789] pythonPackages: update a bunch of them

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fe80ab70e36..3aff5627732 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1236,11 +1236,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   };
 
   pytest = buildPythonPackage rec {
-    name = "pytest-2.3.5";
+    name = "pytest-2.5.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pytest/${name}.tar.gz";
-      md5 = "18f150e7be96b5fe3c388b0e817b8087";
+      md5 = "4e155a0134e6757b37cc6698c20f3e9f";
     };
 
     propagatedBuildInputs = [ pythonPackages.py ]
@@ -1250,7 +1250,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
     meta = with stdenv.lib; {
       maintainers = with maintainers; [ iElectric lovek323 ];
-      platforms   = platforms.unix;
+      platforms = platforms.unix;
     };
   };
 
@@ -2471,11 +2471,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   dulwich = buildPythonPackage rec {
-    name = "dulwich-0.8.1";
+    name = "dulwich-0.8.7";
 
     src = fetchurl {
       url = "http://samba.org/~jelmer/dulwich/${name}.tar.gz";
-      sha256 = "1a1619e9c7e63fe9bdc93356ee893be1016b7ea12ad953f4e1f1f5c0c5056ee8";
+      sha256 = "041qp5v2x8fbwkmws6hwwiny74lavkz723dj8gwbm40b2383d8vv";
     };
 
     buildPhase = "make build";
@@ -4613,11 +4613,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   };
 
   pip = buildPythonPackage rec {
-    version = "1.4.1";
+    version = "1.5";
     name = "pip-${version}";
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pip/pip-${version}.tar.gz";
-      sha256 = "0knhj3c1nqqzxgqin8l0gzy6nzsbcxinyr0cbp1j99hi8xahcyjf";
+      sha256 = "0j700f70mj0brdlvs2cz4a7h4jwmzgymgp8qk1qb3lsm1qd1vy15";
     };
     buildInputs = [ mock scripttest virtualenv nose ];
     # ValueError: Working directory tests not found, or not a directory
@@ -4639,11 +4639,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   pillow = buildPythonPackage rec {
-    name = "Pillow-2.2.1";
+    name = "Pillow-2.3.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/P/Pillow/${name}.zip";
-      md5 = "d1d20d3db5d1ab312da0951ff061e6bf";
+      md5 = "56b6614499aacb7d6b5983c4914daea7";
     };
 
     buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib pkgs.libtiff pkgs.libwebp ];
@@ -5748,11 +5748,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   pyyaml = buildPythonPackage (rec {
-    name = "PyYAML-3.09";
+    name = "PyYAML-3.10";
 
     src = fetchurl {
-      url = "http://pyyaml.org/download/pyyaml/PyYAML-3.09.zip";
-      sha256 = "204aca8b42dbe90e460794d743dd16182011da85507bfd4f092f9f76e0688040";
+      url = "http://pyyaml.org/download/pyyaml/${name}.zip";
+      sha256 = "1r127fa354ppb667f4acxlzwxixap1jgzjrr790bw8mcpxv2hqaa";
     };
 
     buildInputs = [ pkgs.unzip pkgs.pyrex ];
@@ -6195,15 +6195,15 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   scripttest = buildPythonPackage rec {
-    version = "1.1.1";
+    version = "1.3";
     name = "scripttest-${version}";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/S/ScriptTest/ScriptTest-${version}.tar.gz";
-      md5 = "592ce890764c3f546d35b4d7c40c32ef";
+      url = "http://pypi.python.org/packages/source/s/scripttest/scripttest-${version}.tar.gz";
+      md5 = "1d1c5117ccfc7b5961cae6c1020c0848";
     };
 
-    buildInputs = [ nose ];
+    buildInputs = [ nose pytest ];
 
     meta = {
       description = "A library for testing interactive command-line applications";
@@ -6317,7 +6317,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "93c93725674c0702583a638f5a09c9e4";
     };
 
-    propagatedBuildInputs = [ jinja2 markdown pillow pilkit clint argh ];
+    propagatedBuildInputs = [ jinja2 markdown pillow pilkit clint argh pytest ];
 
     meta = with stdenv.lib; {
       description = "Yet another simple static gallery generator";
@@ -7201,10 +7201,10 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   });
 
   virtualenv = buildPythonPackage rec {
-    name = "virtualenv-1.10";
+    name = "virtualenv-1.11";
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz";
-      md5 = "9745c28256c70c76d36adb3767a00212";
+      md5 = "d1a7cf95b539a861a8215827f387c4eb";
     };
 
     inherit recursivePthLoader;
-- 
GitLab


From bf5d6fb9b1c12a919853f15571b5a012f87fd928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 6 Jan 2014 22:24:05 +0000
Subject: [PATCH 1438/3789] Refactor buildPythonPackage to modularize building
 process.

Before we used `easy_install` command to handle installation
in one shot, now this is split into two phases:

 - buildPhase: python setup.py build
 - installPhase: python setup.py install

Each of those commands have the ability to pass extra
parameters through buildPythonPackage parameters as
`setupPyInstallFlags` and `setupPyBuildFlags`.

Phases now correctly execute post/pre hooks.

In configurePhase we inject setuptools dependency before distutils
is imported to apply monkeypatching by setuptools that is needed
for special features to apply.

We don't have to reorder default phases anymore, as test
phase comes after build and that works.

I rewrote offineDistutils into distutils-cfg with a bit cleaner
syntax and ability to specify extraCfg to the config file.

Plone packages are failing and garbas said he will adopt them to
the new functions. The rest of the packages I fixed and these commits
shouldn't break any package (according to my testings) and they introduce
16 new jobs and fix 38 that were broken before.
---
 .../python-modules/distutils-cfg/default.nix  |  31 +++++
 .../python-modules/generic/default.nix        | 121 ++++++++++--------
 .../offline-distutils/default.nix             |  21 ---
 pkgs/top-level/python-packages.nix            |  13 +-
 4 files changed, 106 insertions(+), 80 deletions(-)
 create mode 100644 pkgs/development/python-modules/distutils-cfg/default.nix
 delete mode 100644 pkgs/development/python-modules/offline-distutils/default.nix

diff --git a/pkgs/development/python-modules/distutils-cfg/default.nix b/pkgs/development/python-modules/distutils-cfg/default.nix
new file mode 100644
index 00000000000..7b0f3628698
--- /dev/null
+++ b/pkgs/development/python-modules/distutils-cfg/default.nix
@@ -0,0 +1,31 @@
+# global distutils configuration, see http://docs.python.org/2/install/index.html#distutils-configuration-files
+
+{ stdenv, python, writeText, extraCfg ? "" }:
+
+
+let
+  distutilsCfg = writeText "distutils.cfg" ''
+    [easy_install]
+
+    # don't allow network connections during build to ensure purity
+    allow-hosts = None
+
+    # make sure we always unzip installed packages otherwise setup hooks won't work
+    zip_ok = 0
+
+    ${extraCfg}
+  '';
+in stdenv.mkDerivation {
+  name = "distutils.cfg-python${python.version}";
+
+  buildInputs = [ python ];
+
+  unpackPhase = "true";
+
+  installPhase = ''
+    dest="$out/lib/${python.libPrefix}/site-packages/distutils"
+    mkdir -p $dest
+    ln -s ${python}/lib/${python.libPrefix}/distutils/* $dest
+    ln -s ${distutilsCfg} $dest/distutils.cfg
+  '';
+}
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 6a7d5e5f3d5..51af437265d 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -1,84 +1,95 @@
 /* This function provides a generic Python package builder.  It is
-   intended to work with packages that use `setuptools'
+   intended to work with packages that use `distutils/setuptools'
    (http://pypi.python.org/pypi/setuptools/), which represents a large
    number of Python packages nowadays.  */
 
-{ python, setuptools, wrapPython, lib, offlineDistutils, recursivePthLoader }:
+{ python, setuptools, wrapPython, lib, recursivePthLoader, distutils-cfg }:
 
-{ name, namePrefix ? python.libPrefix + "-"
+{ name
 
-, buildInputs ? []
+# by default prefix name with python version name, e.g. "python3.3-"
+, namePrefix ? python.libPrefix + "-"
 
-, propagatedBuildInputs ? []
+, buildInputs ? []
 
-, # List of packages that should be added to the PYTHONPATH
-  # environment variable in programs built by this function.  Packages
-  # in the standard `propagatedBuildInputs' variable are also added.
-  # The difference is that `pythonPath' is not propagated to the user
-  # environment.  This is preferrable for programs because it doesn't
-  # pollute the user environment.
-  pythonPath ? []
+# TODO: document
+, distutilsExtraCfg ? ""
 
-, installCommand ?
-    ''
-      easy_install --always-unzip --prefix="$out" .
-    ''
+# TODO: say what it does
+, propagatedBuildInputs ? []
 
-, preConfigure ? "true"
+# passed to "python setup.py install"
+, setupPyInstallFlags ? []
 
-, buildPhase ? "true"
+# passed to "python setup.py build"
+, setupPyBuildFlags ? []
 
+# enable tests by default
 , doCheck ? true
 
-, checkPhase ?
-    ''
-      runHook preCheck
-      ${python}/bin/${python.executable} setup.py test
-      runHook postCheck
-    ''
-
-, preInstall ? ""
-, postInstall ? ""
+# List of packages that should be added to the PYTHONPATH
+# environment variable in programs built by this function.  Packages
+# in the standard `propagatedBuildInputs' variable are also added.
+# The difference is that `pythonPath' is not propagated to the user
+# environment.  This is preferrable for programs because it doesn't
+# pollute the user environment.
+,  pythonPath ? []
 
-, meta ? {}
+, meta ? {} 
 
 , ... } @ attrs:
 
-# Keep extra attributes from ATTR, e.g., `patchPhase', etc.
+# Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
 python.stdenv.mkDerivation (attrs // {
-  inherit doCheck buildPhase checkPhase;
+  inherit doCheck;
 
   name = namePrefix + name;
 
-  # default to python's platforms and add maintainer(s) to every
-  # package
-  meta = {
-    platforms = python.meta.platforms;
-  } // meta // {
-    maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow lib.maintainers.iElectric ];
-  };
-
-  # checkPhase after installPhase to run tests on installed packages
-  phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase";
-
-  buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath;
+  buildInputs = [ python wrapPython setuptools (distutils-cfg.override { extraCfg = distutilsExtraCfg; }) ] ++ buildInputs ++ pythonPath;
 
   propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ];
 
   pythonPath = [ setuptools ] ++ pythonPath;
 
-  preConfigure = ''
+  configurePhase = attrs.configurePhase or ''
+    runHook preConfigure
+
+    # TODO: document
     export DETERMINISTIC_BUILD=1
-    PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
-    ${preConfigure}
+
+    # we need to prepend following line to monkeypatch distutils commands
+    sed -i '0,/import distutils/s//import setuptools;import distutils/' setup.py
+    sed -i '0,/from distutils/s//import setuptools;from distutils/' setup.py
+
+
+    runHook postConfigure
+  '';
+
+  checkPhase = attrs.checkPhase or ''
+      runHook preCheck
+
+      ${python}/bin/${python.executable} setup.py test -q
+
+      runHook postCheck
+  '';
+
+  buildPhase = attrs.buildPhase or ''
+    runHook preBuild
+
+    ${python}/bin/${python.executable} setup.py build ${lib.concatStringsSep " " setupPyBuildFlags}
+
+    runHook postBuild
   '';
 
-  installPhase = preInstall + ''
+  installPhase = attrs.installPhase or ''
+    runHook preInstall
+
     mkdir -p "$out/lib/${python.libPrefix}/site-packages"
 
-    echo "installing \`${name}' with \`easy_install'..."
     export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
-    ${installCommand}
+
+    ${python}/bin/${python.executable} setup.py install --install-lib=$out/lib/${python.libPrefix}/site-packages \
+                                                        --prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags}
 
     # A pth file might have been generated to load the package from
     # within its own site-packages, rename this package not to
@@ -94,17 +105,18 @@ python.stdenv.mkDerivation (attrs // {
     # corresponding site.py needs to be included in the PYTHONPATH.
     rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
 
-    ${postInstall}
+    runHook postInstall
   '';
 
   postFixup =
     ''
       wrapPythonPrograms
 
-      # If a user installs a Python package, she probably also wants its
+      # If a user installs a Python package, they probably also wants its
       # dependencies in the user environment (since Python modules don't
       # have something like an RPATH, so the only way to find the
       # dependencies is to have them in the PYTHONPATH variable).
+      # TODO: better docs
       if test -e $out/nix-support/propagated-build-inputs; then
           ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
       fi
@@ -116,4 +128,13 @@ python.stdenv.mkDerivation (attrs // {
         fi
       done
     '';
+
+  meta = {
+    # default to python's platforms
+    platforms = python.meta.platforms;
+  } // meta // {
+    # add extra maintainer(s) to every package
+    maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow lib.maintainers.iElectric ];
+  };
+
 })
diff --git a/pkgs/development/python-modules/offline-distutils/default.nix b/pkgs/development/python-modules/offline-distutils/default.nix
deleted file mode 100644
index 269f67bf5cd..00000000000
--- a/pkgs/development/python-modules/offline-distutils/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# Used during module installation to prevent easy_install and python
-# setup.py install/test from downloading
-
-{ stdenv, python }:
-
-stdenv.mkDerivation {
-  name = "python-offline-distutils-${python.version}";
-
-  buildInputs = [ python ];
-
-  unpackPhase = "true";
-  installPhase = ''
-    dst="$out/lib/${python.libPrefix}/site-packages"
-    ensureDir $dst/distutils
-    ln -s ${python}/lib/${python.libPrefix}/distutils/* $dst/distutils/
-    cat <<EOF > $dst/distutils/distutils.cfg
-[easy_install]
-allow-hosts = None
-EOF
-  '';
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3aff5627732..0ccd5d5da26 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20,10 +20,10 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
   callPackage = pkgs.lib.callPackageWith (pkgs // pythonPackages);
 
-  buildPythonPackage = import ../development/python-modules/generic {
-    inherit (pkgs) lib;
-    inherit python wrapPython setuptools recursivePthLoader offlineDistutils;
-  };
+  # global distutils config used by buildPythonPackage
+  distutils-cfg = callPackage ../development/python-modules/distutils-cfg { };
+
+  buildPythonPackage = callPackage ../development/python-modules/generic { };
 
   wrapPython = pkgs.makeSetupHook
     { deps = pkgs.makeWrapper;
@@ -33,11 +33,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
   # specials
 
-  offlineDistutils = import ../development/python-modules/offline-distutils {
-    inherit (pkgs) stdenv;
-    inherit python;
-  };
-
   recursivePthLoader = import ../development/python-modules/recursive-pth-loader {
     inherit (pkgs) stdenv;
     inherit python;
-- 
GitLab


From 6adfd13dd4b28546e4ea0dfa4e28727b94c891e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 6 Jan 2014 22:34:01 +0000
Subject: [PATCH 1439/3789] adopt setuptools to new python infrastructure (also
 make sure we unzip setuptools while building)

---
 .../python-modules/setuptools/default.nix     |  9 ++++--
 .../setuptools/fix_python3_egg_fetcher.patch  | 28 +++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/setuptools/fix_python3_egg_fetcher.patch

diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index e0c3e7837b4..f585d758c2d 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, wrapPython }:
+{ stdenv, fetchurl, python, wrapPython, distutils-cfg }:
 
 stdenv.mkDerivation rec {
   shortName = "setuptools-${version}";
@@ -11,9 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "09nv5x45y8fgc0kjmmw4gig3hr0is9xlc5rq053vnbmkxr5q5xmi";
   };
 
-  buildInputs = [ python wrapPython ];
+  # see https://bitbucket.org/pypa/setuptools/commits/976b839801a3a181f2e14f305ddbe0b410fa8fc0.patch
+  patches = [ ./fix_python3_egg_fetcher.patch ];
 
-  buildPhase = "${python}/bin/${python.executable} setup.py build --build-base $out";
+  buildInputs = [ python wrapPython distutils-cfg ];
+
+  buildPhase = "${python}/bin/${python.executable} setup.py build";
 
   installPhase =
     ''
diff --git a/pkgs/development/python-modules/setuptools/fix_python3_egg_fetcher.patch b/pkgs/development/python-modules/setuptools/fix_python3_egg_fetcher.patch
new file mode 100644
index 00000000000..17ab473a502
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools/fix_python3_egg_fetcher.patch
@@ -0,0 +1,28 @@
+diff --git a/CHANGES.txt b/CHANGES.txt
+--- a/CHANGES.txt
++++ b/CHANGES.txt
+@@ -3,6 +3,12 @@
+ =======
+ 
+ -----
++2.0.3
++-----
++
++* Issue #131: Fix RuntimeError when constructing an egg fetcher.
++
++-----
+ 2.0.2
+ -----
+ 
+diff --git a/setuptools/dist.py b/setuptools/dist.py
+--- a/setuptools/dist.py
++++ b/setuptools/dist.py
+@@ -295,7 +295,7 @@
+                 'find_links', 'site_dirs', 'index_url', 'optimize',
+                 'site_dirs', 'allow_hosts'
+             )
+-            for key in opts.keys():
++            for key in list(opts):
+                 if key not in keep:
+                     del opts[key]   # don't use any other settings
+             if self.dependency_links:
-- 
GitLab


From fae6079a01b604cdaaab2ecb9bf48368be31255e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 6 Jan 2014 22:35:39 +0000
Subject: [PATCH 1440/3789] adopt rest of the packages that were failing with
 the buildPythonPackage changes

---
 pkgs/applications/audio/lastwatch/default.nix |   2 -
 pkgs/applications/audio/quodlibet/default.nix |   4 +-
 pkgs/applications/video/miro/default.nix      |  12 +-
 .../python-modules/pycrypto/default.nix       |  12 +-
 .../python-modules/pygtk/default.nix          |   7 +-
 pkgs/tools/X11/winswitch/default.nix          |  10 +-
 pkgs/tools/X11/xpra/default.nix               |  14 +-
 pkgs/tools/admin/gtk-vnc/default.nix          |  71 +++------
 pkgs/tools/networking/getmail/default.nix     |   2 -
 pkgs/tools/security/fail2ban/default.nix      |   4 -
 pkgs/top-level/python-packages.nix            | 142 +++++++++---------
 11 files changed, 129 insertions(+), 151 deletions(-)

diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix
index 324a0b0bebc..c09d397eefa 100644
--- a/pkgs/applications/audio/lastwatch/default.nix
+++ b/pkgs/applications/audio/lastwatch/default.nix
@@ -19,8 +19,6 @@ pythonPackages.buildPythonPackage rec {
 
   propagatedBuildInputs = pythonPath;
 
-  installCommand = "python setup.py install --prefix=$out";
-
   meta = {
     homepage = "https://github.com/aszlig/LastWatch";
     description = "An inotify-based last.fm audio scrobbler";
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index c865314cb17..3ab7688cde3 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject
+{ stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject, intltool
 , pythonDBus, gst_python, withGstPlugins ? false, gst_plugins_base ? null
 , gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }:
 
@@ -42,7 +42,7 @@ buildPythonPackage {
   ];
 
   propagatedBuildInputs = [
-    mutagen pygtk pygobject pythonDBus gst_python
+    mutagen pygtk pygobject pythonDBus gst_python intltool
   ];
 
   postInstall = stdenv.lib.optionalString withGstPlugins ''
diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 5ca6c80dc7c..516f12f2051 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -40,10 +40,6 @@ buildPythonPackage rec {
            plat/resources.py
   '';
 
-  installCommand = ''
-    python setup.py install --prefix= --root="$out"
-  '';
-
   # Disabled for now, because it requires networking and even if we skip those
   # tests, the whole test run takes around 10-20 minutes.
   doCheck = false;
@@ -51,8 +47,14 @@ buildPythonPackage rec {
     HOME="$TEMPDIR" LANG=en_US.UTF-8 python miro.real --unittest
   '';
 
+  preInstall = ''
+    # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix
+    ${python}/bin/${python.executable} setup.py install_data --root=$out
+    sed -i '/data_files=data_files/d' setup.py
+  '';
+
   postInstall = ''
-    mv "$out/bin/miro.real" "$out/bin/miro"
+    mv $out/bin/miro.real $out/bin/miro
   '';
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix
index ec741ba247e..5da727a08db 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -9,17 +9,7 @@ buildPythonPackage rec {
     sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj";
   };
 
-  buildInputs = [ python gmp ];
-
-  buildPhase =
-    ''
-      python ./setup.py build_ext --library-dirs=${gmp}/lib
-    '';
-
-#  installPhase =
-#    ''
-#      python ./setup.py install --prefix=$out
-#    '';
+  buildInputs = [ gmp ];
 
   meta = {
     homepage = "http://www.pycrypto.org/";
diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index e291544911c..dfe805ec9e4 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -14,7 +14,12 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ gtk pygobject pycairo ];
 
-  installCommand = "make install";
+  configurePhase = "configurePhase";
+
+  buildPhase = "buildPhase";
+
+  installPhase = "installPhase";
+
   checkPhase = stdenv.lib.optionalString (libglade == null)
     ''
       sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \
diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix
index bd160940b57..2db0d172173 100644
--- a/pkgs/tools/X11/winswitch/default.nix
+++ b/pkgs/tools/X11/winswitch/default.nix
@@ -29,12 +29,10 @@ let
       }' winswitch/util/distro_packaging_util.py
     '';
 
-    buildPhase = ''
-      python setup.py build
-    '';
-
-    installCommand = ''
-      PREFIX="$out" python ./setup.py install --prefix="$out"
+    preInstall = ''
+      # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix
+      python setup.py install_data --install-dir=$out --root=$out
+      sed -i '/data_files = data_files/d' setup.py
     '';
 
     doCheck = false;
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 35370ae2128..f96fa577323 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   };
 
   buildInputs = [
-    python cython pkgconfig
+    cython pkgconfig
 
     xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto
     xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto
@@ -33,9 +33,15 @@ buildPythonPackage rec {
   # they don't have automated testing out of the box? http://xpra.org/trac/ticket/177
   doCheck = false;
 
-  buildPhase = ''
-    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
-    python ./setup.py build --enable-Xdummy
+  preBuild = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
+  '';
+  setupPyBuildFlags = ["--enable-Xdummy"];
+
+  preInstall = ''
+    # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix
+    ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out
+    sed -i '/ = data_files/d' setup.py
   '';
 
   meta = {
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index 44a421e2ba3..d4c45b7ba96 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -1,62 +1,41 @@
-x@{builderDefsPackage
-  , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
-  , libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs
-  , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    ["perlPackages" "firefoxPkgs"];
-
-  buildInputs = (map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames)))
-    ++ [perlPackages.TextCSV firefoxPkgs.xulrunner ];
-  sourceInfo = rec {
-    baseName="gtk-vnc";
-    majorVersion="0.4";
-    minorVersion="2";
-    version="${majorVersion}.${minorVersion}";
-    name="${baseName}-${version}";
-    url="mirror://gnome/sources/${baseName}/${majorVersion}/${name}.tar.gz";
-    hash="1fkhzwpw50rnwp51lsbny16p2ckzx5rkcaiaqvkd90vwnm2cccls";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+{ stdenv, fetchurl
+, python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
+, libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs, pulseaudio
+, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt }:
+
+
+stdenv.mkDerivation rec {
+  name = "gtk-vnc-${version}";
+  version = "0.5.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtk-vnc/0.5/${name}.tar.xz";
+    sha256 = "1bww2ihxb3zzvifdrcsy1lifr664pvikq17hmr1hsm8fyk4ad46l";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [
+    python gtk pygtk gnutls cairo libtool pkgconfig glib libffi libgcrypt
+    intltool cyrus_sasl pulseaudio pygobject perl perlPackages.TextCSV
+  ];
 
+  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
   configureFlags = [
     "--with-python"
     "--with-examples"
   ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["fixMakefiles" "doConfigure" "doMakeInstall"];
+  makeFlags = "CODEGENDIR=${pygobject}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/";
 
-  fixMakefiles = a.fullDepEntry ''
-    find . -name 'Makefile*' -exec sed -i '{}' -e 's@=codegendir pygtk-2.0@=codegendir pygobject-2.0@' ';'
-  '' ["minInit" "doUnpack"];
-      
-  meta = {
+  meta = with stdenv.lib; {
     description = "A GTK VNC widget";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.lgpl21;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
+    license = licenses.lgpl21;
   };
+
   passthru = {
     updateInfo = {
       downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/gtk-vnc";
     };
   };
-}) x
-
+}
diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 80d29835da5..6d9666506b8 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -11,8 +11,6 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  installCommand = "python setup.py install --prefix=\"\$prefix\"";
-  
   meta = {
     description = "A program for retrieving mail";
     maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.iElectric ];
diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index aa387eff3e7..b28c761ec2c 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -39,10 +39,6 @@ pythonPackages.buildPythonPackage {
 
   doCheck = false;
 
-  installCommand = ''
-    python setup.py install --prefix=$out
-  '';
-
   meta = with stdenv.lib; {
     homepage    = http://www.fail2ban.org/;
     description = "A program that scans log files for repeated failing login attempts and bans IP addresses";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0ccd5d5da26..c65eea99123 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -40,7 +40,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
   setuptools = import ../development/python-modules/setuptools {
     inherit (pkgs) stdenv fetchurl;
-    inherit python wrapPython;
+    inherit python wrapPython distutils-cfg;
   };
 
   # packages defined elsewhere
@@ -287,10 +287,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     ];
 
     postInstall = ''
-      ln -s ${pyramid}/bin/pserve $out/bin
       ln -s ${pkgs.bacula}/bin/bconsole $out/bin
-      wrapProgram "$out/bin/pserve" \
-        --suffix PYTHONPATH : "$out/lib/python2.7/site-packages"
     '';
 
     meta = {
@@ -544,7 +541,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
 
     # tests depend on $HOME setting
-    configurePhase = "export HOME=$TMPDIR";
+    preConfigure = "export HOME=$TMPDIR";
 
     propagatedBuildInputs =
       [ pythonPackages.pyyaml
@@ -1238,7 +1235,22 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "4e155a0134e6757b37cc6698c20f3e9f";
     };
 
-    propagatedBuildInputs = [ pythonPackages.py ]
+    preCheck = ''
+      # broken on python3, fixed in master, remove in next release
+      rm doc/en/plugins_index/test_plugins_index.py
+
+      # see https://bitbucket.org/hpk42/pytest/issue/418/test-failures-with-python-275-and-pytest
+      sed -i "/test_unicode/i\    @pytest.mark.xfail" testing/test_assertion.py
+
+      # don't test bash builtins
+      rm testing/test_argcomplete.py
+
+      # yaml test are failing
+      rm doc/en/example/nonpython/test_simple.yml
+
+    '';
+
+    propagatedBuildInputs = [ py ]
       ++ stdenv.lib.optional
         pkgs.config.pythonPackages.pytest.selenium or false
         pythonPackages.selenium;
@@ -1687,14 +1699,23 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   };
 
   gtimelog = buildPythonPackage rec {
-    name = "gtimelog-0.8.1";
+    name = "gtimelog-${version}";
+    version = "0.8.1";
+
     src = fetchurl {
-      url = https://launchpad.net/gtimelog/devel/0.8.1/+download/gtimelog-0.8.1.tar.gz;
-      sha256 = "010sbw4rmslf5ifg9bgicn0f6mgsy76v8218xi0jndi9z6pva7y6";
+      url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz";
+      sha256 = "0nwpfv284b26q97mfpagqkqb4n2ilw46cx777qsyi3plnywk1xa0";
     };
+
     propagatedBuildInputs = [ pygtk ];
+
+    checkPhase = ''
+      patchShebangs ./runtests
+      ./runtests
+    '';
+
     meta = with stdenv.lib; {
-      description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible.";
+      description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible";
       homepage = http://mg.pov.lt/gtimelog/;
       license = licenses.gpl2Plus;
       maintainers = [ maintainers.ocharles ];
@@ -2185,6 +2206,10 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       sha256 = "0d2if633m3kbiricd5hgn1csccd8xab6lnab1bq9prdr9ks9i8h6";
     };
 
+    preConfigure = ''
+      sed -i "/use_setuptools/d" setup.py
+    '';
+
     buildInputs = [ pkgs.alsaLib pkgs.jackaudio ];
 
     meta = with stdenv.lib; {
@@ -2474,9 +2499,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
 
     buildPhase = "make build";
-    installCommand = ''
-      ${python}/bin/${python.executable} setup.py install --prefix="$out" --root=/ --record="$out/lib/${python.libPrefix}/site-packages/dulwich/list.txt" --single-version-externally-managed
-    '';
 
     # For some reason "python setup.py test" doesn't work with Python 2.6.
     # pretty sure that is about import behaviour.
@@ -3438,9 +3460,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
     propagatedBuildInputs = [  ];
     doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
 
     meta = {
       description = "Pythonic binding for the libxml2 and libxslt libraries";
@@ -3492,21 +3511,15 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
-  magic = pkgs.stdenv.mkDerivation rec {
-    name = "python-${pkgs.file.name}";
+  magic = buildPythonPackage rec {
+    name = "${pkgs.file.name}";
 
     src = pkgs.file.src;
 
     patches = [ ../tools/misc/file/python.patch ];
     buildInputs = [ python pkgs.file ];
 
-    configurePhase = "cd python";
-
-    buildPhase = "${python}/bin/${python.executable} setup.py build";
-
-    installPhase = ''
-      ${python}/bin/${python.executable} setup.py install --prefix=$out
-    '';
+    preConfigure = "cd python";
 
     meta = {
       description = "A Python wrapper around libmagic";
@@ -3526,7 +3539,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
     buildInputs = [ pkgs.swig pkgs.openssl ];
 
-    buildPhase = "${python}/bin/${python.executable} setup.py build_ext --openssl=${pkgs.openssl}";
+    preBuild = "${python}/bin/${python.executable} setup.py build_ext --openssl=${pkgs.openssl}";
 
     doCheck = false; # another test that depends on the network.
 
@@ -4200,19 +4213,14 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   });
 
-  notmuch = pkgs.stdenv.mkDerivation rec {
+  notmuch = buildPythonPackage rec {
     name = "python-${pkgs.notmuch.name}";
 
     src = pkgs.notmuch.src;
 
-    buildInputs = [ python pkgs.notmuch ];
-    #propagatedBuildInputs = [ python pkgs.notmuch ];
-
-    configurePhase = "cd bindings/python";
+    sourceRoot = "${pkgs.notmuch.name}/bindings/python";
 
-    buildPhase = "python setup.py build";
-
-    installPhase = "python setup.py install --prefix=$out";
+    buildInputs = [ python pkgs.notmuch ];
 
     meta = {
       description = "A Python wrapper around notmuch";
@@ -4233,13 +4241,12 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       sed -i 's/-faltivec//' numpy/distutils/system_info.py
     '';
 
-    # TODO: add ATLAS=${pkgs.atlas}
-    installCommand = ''
+    preBuild = ''
       export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack}
-      ${python}/bin/${python.executable} setup.py build --fcompiler="gnu95"
-      ${python}/bin/${python.executable} setup.py install --prefix=$out
     '';
 
+    setupPyBuildFlags = ["--fcompiler='gnu95'"];
+
     # error: invalid command 'test'
     doCheck = false;
 
@@ -4614,10 +4621,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "http://pypi.python.org/packages/source/p/pip/pip-${version}.tar.gz";
       sha256 = "0j700f70mj0brdlvs2cz4a7h4jwmzgymgp8qk1qb3lsm1qd1vy15";
     };
-    buildInputs = [ mock scripttest virtualenv nose ];
-    # ValueError: Working directory tests not found, or not a directory
-    # see https://github.com/pypa/pip/issues/92
-    doCheck = false;
+    buildInputs = [ mock scripttest virtualenv pytest ];
   };
 
 
@@ -4644,7 +4648,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib pkgs.libtiff pkgs.libwebp ];
 
     # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
-    configurePhase = ''
+    preConfigure = ''
       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 ;
@@ -4653,7 +4657,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
               s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;'
     '';
 
-    doCheck = true;
+    
 
     meta = {
       homepage = http://python-imaging.github.com/Pillow;
@@ -4764,10 +4768,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   protobuf = buildPythonPackage rec {
     inherit (pkgs.protobuf) name src;
 
-    buildPhase = ''
-      python setup.py build
-    '';
-
     propagatedBuildInputs = [pkgs.protobuf];
     sourceRoot = "${name}/python";
 
@@ -4838,7 +4838,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/p/py/${name}.tar.gz";
-      md5 = "3857dc8309d5f284669b81184253c2bb";
+      md5 = "d2e24b4363d834bf9192247f143435bc";
     };
   };
 
@@ -5189,6 +5189,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     propagatedBuildInputs = [ urlgrabber ];
 
     checkPhase = ''
+      export PYTHONPATH="$PYTHONPATH:."
       ${python}/bin/${python.executable} tests/baseclass.py -vv
     '';
 
@@ -5267,7 +5268,8 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     propagatedBuildInputs = [ pkgs.parted ];
 
     checkPhase = ''
-      ${python}/bin/${python.executable} -m unittest discover -v
+      patchShebangs Makefile
+      make test PYTHON=${python.executable}
     '';
 
     meta = {
@@ -5621,7 +5623,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     # There seems to be no way to pass that path to configure.
     NIX_CFLAGS_COMPILE="-I${pkgs.aprutil}/include/apr-1";
 
-    configurePhase = ''
+    preConfigure = ''
       cd Source
       python setup.py backport
       python setup.py configure \
@@ -6172,16 +6174,16 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     buildInputs = [pkgs.gfortran];
     propagatedBuildInputs = [ numpy ];
 
-    # error: invalid command 'test'
-    doCheck = false;
-
     # TODO: add ATLAS=${pkgs.atlas}
-    installCommand = ''
+    preConfigure = ''
       export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack}
-      ${python}/bin/${python.executable} setup.py build --fcompiler="gnu95"
-      ${python}/bin/${python.executable} setup.py install --prefix=$out
     '';
 
+    setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
+
+    # error: invalid command 'test'
+    doCheck = false;
+
     meta = {
       description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. ";
       homepage = http://www.scipy.org/;
@@ -6573,7 +6575,10 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
 
     buildInputs = [ mock ];
-    propagatedBuildInputs = [ meld3  ];
+    propagatedBuildInputs = [ meld3 ];
+
+    # failing tests when building under chroot as root user doesn't exist
+    doCheck = false;
 
     meta = {
       description = "A system for controlling process state under UNIX";
@@ -6713,10 +6718,16 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "051dd9de0757714d33c3ecd5ab37b97d";
     };
 
-    buildInputs = [ pytest webob pkgs.imagemagick ];
+    buildInputs = [ pytest webob pkgs.imagemagick nose ];
     propagatedBuildInputs = [ sqlalchemy8 wand ];
 
-    checkPhase = "cd tests && LD_LIBRARY_PATH=${pkgs.imagemagick}/lib py.test";
+    checkPhase = ''
+      cd tests
+      export LD_LIBRARY_PATH=${pkgs.imagemagick}/lib
+      export PYTHONPATH=$PYTHONPATH:../
+      py.test
+      cd ..
+    '';
 
     meta = {
       homepage = https://github.com/crosspop/sqlalchemy-imageattach;
@@ -7816,8 +7827,8 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     propagatedBuildInputs = [ zope_proxy ];
 
     # ignore circular dependency on zope_schema
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
+    preBuild = ''
+      sed -i '/zope.schema/d' setup.py
     '';
 
     doCheck = false;
@@ -7870,12 +7881,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "e7e581af8193551831560a736a53cf58";
     };
 
-    propagatedBuildInputs = [ zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict;
-
-    # ignore circular dependency on zope_location
-    installCommand = ''
-      easy_install  --no-deps --prefix="$out" .
-    '';
+    propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict;
 
     meta = {
         maintainers = [ stdenv.lib.maintainers.goibhniu ];
-- 
GitLab


From 7cdab2c02470d9a410298495a678aff9bd3afd85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 10 Jan 2014 21:50:03 +0100
Subject: [PATCH 1441/3789] pythonPackages.setuptools: 2.0.2 -> 2.1

---
 .../python-modules/setuptools/default.nix     |  7 ++---
 .../setuptools/fix_python3_egg_fetcher.patch  | 28 -------------------
 2 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/development/python-modules/setuptools/fix_python3_egg_fetcher.patch

diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index f585d758c2d..35630be2255 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -4,16 +4,13 @@ stdenv.mkDerivation rec {
   shortName = "setuptools-${version}";
   name = "${python.executable}-${shortName}";
 
-  version = "2.0.2";
+  version = "2.1";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz";
-    sha256 = "09nv5x45y8fgc0kjmmw4gig3hr0is9xlc5rq053vnbmkxr5q5xmi";
+    sha256 = "1m8qjvj5bfbphdags5s6pgmvk3xnw509lgdlq9whkq5a9mgxf8m7";
   };
 
-  # see https://bitbucket.org/pypa/setuptools/commits/976b839801a3a181f2e14f305ddbe0b410fa8fc0.patch
-  patches = [ ./fix_python3_egg_fetcher.patch ];
-
   buildInputs = [ python wrapPython distutils-cfg ];
 
   buildPhase = "${python}/bin/${python.executable} setup.py build";
diff --git a/pkgs/development/python-modules/setuptools/fix_python3_egg_fetcher.patch b/pkgs/development/python-modules/setuptools/fix_python3_egg_fetcher.patch
deleted file mode 100644
index 17ab473a502..00000000000
--- a/pkgs/development/python-modules/setuptools/fix_python3_egg_fetcher.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/CHANGES.txt b/CHANGES.txt
---- a/CHANGES.txt
-+++ b/CHANGES.txt
-@@ -3,6 +3,12 @@
- =======
- 
- -----
-+2.0.3
-+-----
-+
-+* Issue #131: Fix RuntimeError when constructing an egg fetcher.
-+
-+-----
- 2.0.2
- -----
- 
-diff --git a/setuptools/dist.py b/setuptools/dist.py
---- a/setuptools/dist.py
-+++ b/setuptools/dist.py
-@@ -295,7 +295,7 @@
-                 'find_links', 'site_dirs', 'index_url', 'optimize',
-                 'site_dirs', 'allow_hosts'
-             )
--            for key in opts.keys():
-+            for key in list(opts):
-                 if key not in keep:
-                     del opts[key]   # don't use any other settings
-             if self.dependency_links:
-- 
GitLab


From ab6865c3a486ebd5ec4e6d95572268aae4303e2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 10 Jan 2014 21:54:07 +0100
Subject: [PATCH 1442/3789] distutils.cfg: name as others coding conventions
 for python packages

---
 pkgs/development/python-modules/distutils-cfg/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/distutils-cfg/default.nix b/pkgs/development/python-modules/distutils-cfg/default.nix
index 7b0f3628698..190c663b471 100644
--- a/pkgs/development/python-modules/distutils-cfg/default.nix
+++ b/pkgs/development/python-modules/distutils-cfg/default.nix
@@ -16,7 +16,7 @@ let
     ${extraCfg}
   '';
 in stdenv.mkDerivation {
-  name = "distutils.cfg-python${python.version}";
+  name = "${python.libPrefix}-distutils.cfg";
 
   buildInputs = [ python ];
 
-- 
GitLab


From 21ada5b105aa863a01388275d7aaf226253f9d82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 10 Jan 2014 21:57:28 +0100
Subject: [PATCH 1443/3789] garden

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

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 51af437265d..fc91fcd3d8a 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -35,7 +35,7 @@
 # pollute the user environment.
 ,  pythonPath ? []
 
-, meta ? {} 
+, meta ? {}
 
 , ... } @ attrs:
 
-- 
GitLab


From c80feaf542d437d0bc6d4461ba49643dd9eac1ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 10 Jan 2014 22:04:05 +0100
Subject: [PATCH 1444/3789] document setuptools monkeypatching and
 DETERMINISTIC_BUILD=1

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

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index fc91fcd3d8a..c2a389a78be 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -54,14 +54,17 @@ python.stdenv.mkDerivation (attrs // {
   configurePhase = attrs.configurePhase or ''
     runHook preConfigure
 
-    # TODO: document
+    # patch python interpreter to write null timestamps when compiling python files
+    # with following var we tell python to activate the patch so that python doesn't
+    # try to update them when we freeze timestamps in nix store
     export DETERMINISTIC_BUILD=1
 
-    # we need to prepend following line to monkeypatch distutils commands
+    # prepend following line to import setuptools before distutils
+    # this way we make sure setuptools monkeypatches distutils commands
+    # this way setuptools provides extra helpers such as "python setup.py test"
     sed -i '0,/import distutils/s//import setuptools;import distutils/' setup.py
     sed -i '0,/from distutils/s//import setuptools;from distutils/' setup.py
 
-
     runHook postConfigure
   '';
 
-- 
GitLab


From b1ffb9ede468fec2845960e2b37b6dfeb922d3d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 11 Jan 2014 11:44:24 +0100
Subject: [PATCH 1445/3789] buildPythonPackage: Add --old-and-unmanageable flag
 to install command and add more docs.

For explanation see inline comments.
---
 .../python-modules/generic/default.nix        | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index c2a389a78be..5253c52df42 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -7,15 +7,16 @@
 
 { name
 
-# by default prefix name with python version name, e.g. "python3.3-"
+# by default prefix `name` e.g. "python3.3-${name}"
 , namePrefix ? python.libPrefix + "-"
 
 , buildInputs ? []
 
-# TODO: document
+# pass extra information to the distutils global configuration (think as global setup.cfg)
 , distutilsExtraCfg ? ""
 
-# TODO: say what it does
+# propagate build dependencies so in case we have A -> B -> C,
+# C can import propagated packages by A
 , propagatedBuildInputs ? []
 
 # passed to "python setup.py install"
@@ -71,6 +72,7 @@ python.stdenv.mkDerivation (attrs // {
   checkPhase = attrs.checkPhase or ''
       runHook preCheck
 
+      # reduce output to only dots, if a test fails error output will include verbose info
       ${python}/bin/${python.executable} setup.py test -q
 
       runHook postCheck
@@ -91,8 +93,17 @@ python.stdenv.mkDerivation (attrs // {
 
     export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
 
-    ${python}/bin/${python.executable} setup.py install --install-lib=$out/lib/${python.libPrefix}/site-packages \
-                                                        --prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags}
+    ${python}/bin/${python.executable} setup.py install \
+      # sometimes packages specify where files should be installed outside the usual
+      # python lib prefix, we override that back so all infrastructure (setup hooks)
+      # work as expected
+      --install-lib=$out/lib/${python.libPrefix}/site-packages \
+      # instruct setuptools not to use eggs but fallback to plan package install
+      # this also reduces one .pth file in the chain, but the main reason is to
+      # force install process to install only scripts for the package we are
+      # installing (otherwise it will install scripts also for dependencies)
+      --old-and-unmanageable \
+      --prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags}
 
     # A pth file might have been generated to load the package from
     # within its own site-packages, rename this package not to
@@ -116,14 +127,14 @@ python.stdenv.mkDerivation (attrs // {
       wrapPythonPrograms
 
       # If a user installs a Python package, they probably also wants its
-      # dependencies in the user environment (since Python modules don't
-      # have something like an RPATH, so the only way to find the
+      # dependencies in the user environment profile (only way to find the
       # dependencies is to have them in the PYTHONPATH variable).
-      # TODO: better docs
+      # Allows you to do: $ PYTHONPATH=~/.nix-profile/lib/python2.7/site-packages python
       if test -e $out/nix-support/propagated-build-inputs; then
           ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
       fi
 
+      # TODO: document
       createBuildInputsPth build-inputs "$buildInputStrings"
       for inputsfile in propagated-build-inputs propagated-native-build-inputs; do
         if test -e $out/nix-support/$inputsfile; then
@@ -135,9 +146,9 @@ python.stdenv.mkDerivation (attrs // {
   meta = {
     # default to python's platforms
     platforms = python.meta.platforms;
-  } // meta // {
+  } // meta // with lib.maintainers; {
     # add extra maintainer(s) to every package
-    maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow lib.maintainers.iElectric ];
+    maintainers = (meta.maintainers or []) ++ [ chaoflow iElectric ];
   };
 
 })
-- 
GitLab


From dfa8ac64ad35cb8525d441f7ae92911b4b367074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 11 Jan 2014 20:14:58 +0100
Subject: [PATCH 1446/3789] miro: keep quotes

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

diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 516f12f2051..14aeca62a71 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage rec {
   '';
 
   postInstall = ''
-    mv $out/bin/miro.real $out/bin/miro
+    mv "$out/bin/miro.real" "$out/bin/miro"
   '';
 
   buildInputs = [
-- 
GitLab


From fa98edf2b13a568735e7098a0f1156e8975eaad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 22 Jan 2014 10:15:26 +0100
Subject: [PATCH 1447/3789] fix eval

---
 pkgs/development/python-modules/generic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 5253c52df42..f95278b5e99 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -143,10 +143,10 @@ python.stdenv.mkDerivation (attrs // {
       done
     '';
 
-  meta = {
+  meta = with lib.maintainers; {
     # default to python's platforms
     platforms = python.meta.platforms;
-  } // meta // with lib.maintainers; {
+  } // meta // {
     # add extra maintainer(s) to every package
     maintainers = (meta.maintainers or []) ++ [ chaoflow iElectric ];
   };
-- 
GitLab


From c72d59881fa79be33f8bc2c20c5fc0dfd81c6f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 22 Jan 2014 10:15:43 +0100
Subject: [PATCH 1448/3789] remove unneeded pytest test skip

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c65eea99123..b05c670aab6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1239,15 +1239,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       # broken on python3, fixed in master, remove in next release
       rm doc/en/plugins_index/test_plugins_index.py
 
-      # see https://bitbucket.org/hpk42/pytest/issue/418/test-failures-with-python-275-and-pytest
-      sed -i "/test_unicode/i\    @pytest.mark.xfail" testing/test_assertion.py
-
       # don't test bash builtins
       rm testing/test_argcomplete.py
 
       # yaml test are failing
       rm doc/en/example/nonpython/test_simple.yml
-
     '';
 
     propagatedBuildInputs = [ py ]
-- 
GitLab


From 567e67f05fb7ddcaa8d788661b81de5a678644ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 22 Jan 2014 10:17:34 +0100
Subject: [PATCH 1449/3789] bash doesn't allow comments between multiline
 statements

---
 .../python-modules/generic/default.nix         | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index f95278b5e99..2b901db7643 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -94,17 +94,21 @@ python.stdenv.mkDerivation (attrs // {
     export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
 
     ${python}/bin/${python.executable} setup.py install \
-      # sometimes packages specify where files should be installed outside the usual
-      # python lib prefix, we override that back so all infrastructure (setup hooks)
-      # work as expected
       --install-lib=$out/lib/${python.libPrefix}/site-packages \
-      # instruct setuptools not to use eggs but fallback to plan package install
-      # this also reduces one .pth file in the chain, but the main reason is to
-      # force install process to install only scripts for the package we are
-      # installing (otherwise it will install scripts also for dependencies)
       --old-and-unmanageable \
       --prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags}
 
+    # --install-lib:
+    # sometimes packages specify where files should be installed outside the usual
+    # python lib prefix, we override that back so all infrastructure (setup hooks)
+    # work as expected
+
+    # --old-and-unmanagable:
+    # instruct setuptools not to use eggs but fallback to plan package install 
+    # this also reduces one .pth file in the chain, but the main reason is to
+    # force install process to install only scripts for the package we are
+    # installing (otherwise it will install scripts also for dependencies)
+
     # A pth file might have been generated to load the package from
     # within its own site-packages, rename this package not to
     # collide with others.
-- 
GitLab


From 21d1e7deb1ac64bbb49a6b0e6d777b6a6e6975e6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 19 Feb 2014 20:03:30 -0500
Subject: [PATCH 1450/3789] libev: bump

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

diff --git a/pkgs/development/libraries/libev/src-for-default.nix b/pkgs/development/libraries/libev/src-for-default.nix
index 49624fc6bd2..3e4f58a5ce0 100644
--- a/pkgs/development/libraries/libev/src-for-default.nix
+++ b/pkgs/development/libraries/libev/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="4.11";
-   name="libev-4.11";
-   hash="1pwcjch21xc7cfmjldkw1n7lcs4pyqm9dx573wdhmmp4yrpz2mcz";
+   version="4.15";
+   name="libev-4.15";
+   hash="1svgc1hq4i5zsw4i02sf7xb4pk2d8kpvc1gdrd856vsmffh47pdj";
    url="http://dist.schmorp.de/libev/Attic/libev-${version}.tar.gz";
-   advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-4.11.tar.gz";
+   advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-4.15.tar.gz";
   
   
 }
-- 
GitLab


From f6ba040bdce29da6072d1a0a86387ebe5d79869d Mon Sep 17 00:00:00 2001
From: Tom Hinton <tom.hinton@cse.org.uk>
Date: Wed, 19 Feb 2014 15:38:44 +0000
Subject: [PATCH 1451/3789] Add me to maintainers list Add a derivation for
 davmail Add a derivation for lxappearance Add both new derivations to
 all-packages

---
 lib/maintainers.nix                           |  1 +
 .../misc/lxappearance/default.nix             | 18 +++++++++++++
 .../networking/davmail/default.nix            | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 4 files changed, 48 insertions(+)
 create mode 100644 pkgs/applications/misc/lxappearance/default.nix
 create mode 100644 pkgs/applications/networking/davmail/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index ee3830e6d35..fe9c2d62a01 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -28,6 +28,7 @@
   garbas = "Rok Garbas <rok@garbas.si>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
   guibert = "David Guibert <david.guibert@gmail.com>";
+  hinton = "Tom Hinton <t@larkery.com>";
   ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
   iElectric = "Domen Kozar <domen@dev.si>";
   iyzsong = "Song Wenwu <iyzsong@gmail.com>";
diff --git a/pkgs/applications/misc/lxappearance/default.nix b/pkgs/applications/misc/lxappearance/default.nix
new file mode 100644
index 00000000000..032c664b926
--- /dev/null
+++ b/pkgs/applications/misc/lxappearance/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "lxappearance-0.5.5";
+  src = fetchurl{
+    url = "http://downloads.sourceforge.net/project/lxde/LXAppearance/${name}.tar.xz";
+    sha256 = "8cae82e6425ba8a0267774e4d10096df2d91b0597520058331684a5ece068b4c";
+  };
+  buildInputs = [ intltool libX11 pkgconfig gtk ];
+  meta = {
+    description = "A lightweight program for configuring the theme and fonts of gtk applications";
+    maintainers = [ stdenv.lib.maintainers.hinton ];
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.gpl2;
+    homepage = "http://lxappearance.sourceforce.net/";
+  };
+}
+
diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix
new file mode 100644
index 00000000000..7dc54a9c871
--- /dev/null
+++ b/pkgs/applications/networking/davmail/default.nix
@@ -0,0 +1,25 @@
+{ fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "davmail-4.4.1";
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/davmail/davmail/4.4.1/davmail-linux-x86_64-4.4.1-2225.tgz";
+	sha256 = "66c7ae23c0242860cca1576e5fc29343431789a821f7623e420b91ba91e480a9";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  meta = {
+    description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers";
+    maintainers = [ stdenv.lib.maintainers.hinton ];
+	platforms = stdenv.lib.platforms.all;
+	homepage = "http://davmail.sourceforce.net/";
+	license = stdenv.lib.licenses.gpl2;
+  };
+
+  installPhase = ''
+  mkdir -p $out/bin
+  cp ./* $out/bin/ -R
+  wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib
+   '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed811f549ce..0e2d9945fd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3136,6 +3136,10 @@ let
 
   jmeter = callPackage ../applications/networking/jmeter {};
 
+  davmail = callPackage ../applications/networking/davmail {};
+
+  lxappearance = callPackage ../applications/misc/lxappearance {};
+
   kona = callPackage ../development/interpreters/kona {};
 
   love = callPackage ../development/interpreters/love {lua=lua5;};
-- 
GitLab


From 7411fabd3e19de6820db71dd0dbc1ce2b267bdbd Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 19 Feb 2014 05:48:46 -0600
Subject: [PATCH 1452/3789] checksec: version 1.5

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 ...dprobe-config-before-checking-kernel.patch | 27 ++++++++++++
 pkgs/os-specific/linux/checksec/default.nix   | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 70 insertions(+)
 create mode 100644 pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
 create mode 100644 pkgs/os-specific/linux/checksec/default.nix

diff --git a/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch b/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
new file mode 100644
index 00000000000..2caf52f3c0a
--- /dev/null
+++ b/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
@@ -0,0 +1,27 @@
+From 6503848d9e0eb009e5f462116a963beacb208930 Mon Sep 17 00:00:00 2001
+From: Austin Seipp <aseipp@pobox.com>
+Date: Thu, 20 Feb 2014 00:11:44 -0600
+Subject: [PATCH] attempt to 'modprobe config' before checking kernel
+
+Signed-off-by: Austin Seipp <aseipp@pobox.com>
+---
+ checksec.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/checksec.sh b/checksec.sh
+index dd1f72e..63acc29 100644
+--- a/checksec.sh
++++ b/checksec.sh
+@@ -337,7 +337,8 @@ kernelcheck() {
+   printf "  userspace processes, this option lists the status of kernel configuration\n"
+   printf "  options that harden the kernel itself against attack.\n\n"
+   printf "  Kernel config: "
+- 
++
++  modprobe configs 2> /dev/null
+   if [ -f /proc/config.gz ] ; then
+     kconfig="zcat /proc/config.gz"
+     printf "\033[32m/proc/config.gz\033[m\n\n"
+-- 
+1.8.3.2
+
diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix
new file mode 100644
index 00000000000..5e5ed6da1c9
--- /dev/null
+++ b/pkgs/os-specific/linux/checksec/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, file, findutils, elfutils, glibc }:
+
+stdenv.mkDerivation rec {
+  name = "checksec-${version}";
+  version = "1.5";
+  src = fetchurl {
+    url    = "http://www.trapkit.de/tools/checksec.sh";
+    sha256 = "0iq9v568mk7g7ksa1939g5f5sx7ffq8s8n2ncvphvlckjgysgf3p";
+  };
+
+  patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ];
+
+  unpackPhase = ''
+    mkdir ${name}-${version}
+    cp $src ${name}-${version}/checksec.sh
+    cd ${name}-${version}
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp checksec.sh $out/bin/checksec
+    chmod +x $out/bin/checksec
+    substituteInPlace $out/bin/checksec --replace /bin/bash ${stdenv.shell}
+    substituteInPlace $out/bin/checksec --replace /lib/libc.so.6 ${glibc}/lib/libc.so.6
+    substituteInPlace $out/bin/checksec --replace find ${findutils}/bin/find
+    substituteInPlace $out/bin/checksec --replace "file $" "${file}/bin/file $"
+    substituteInPlace $out/bin/checksec --replace "xargs file" "xargs ${file}/bin/file"
+    substituteInPlace $out/bin/checksec --replace " readelf -" " ${elfutils}/bin/readelf -"
+    substituteInPlace $out/bin/checksec --replace "(readelf -" "(${elfutils}/bin/readelf -"
+    substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${elfutils}/bin/readelf"
+  '';
+
+  phases = "unpackPhase patchPhase installPhase";
+
+  meta = {
+    description = "A tool for checking security bits on executables";
+    platforms   = stdenv.lib.platforms.linux;
+    license     = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed811f549ce..4c01bd892c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6504,6 +6504,8 @@ let
 
   checkpolicy = callPackage ../os-specific/linux/checkpolicy { };
 
+  checksec = callPackage ../os-specific/linux/checksec { };
+
   cifs_utils = callPackage ../os-specific/linux/cifs-utils { };
 
   conky = callPackage ../os-specific/linux/conky { };
-- 
GitLab


From 58e08a1a4f1a7f70d436ded3197e600ba08a9296 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 20 Feb 2014 04:53:16 -0600
Subject: [PATCH 1453/3789] grsecurity: stable/testing updates

  - stable:  3.0-3.2.55-201402152203 -> 3.0-3.2.55-201402192249
  - testing: 3.0-3.13.3-201402152204 -> 3.0-3.13.3-201402192252

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

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 2480936b08c..d14a124dd05 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -81,8 +81,8 @@ rec {
   grsecurity_3_0_3_2_55 =
     { name = "grsecurity-3.0-3.2.55";
       patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402152203.patch;
-        sha256 = "1600hydfq2dwyqqzfmsvy50kcicdm2lq44yiiwgnbiykq2135fwx";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402192249.patch;
+        sha256 = "16q531j9gphqgqw6v0g45l9hzpz6gnsmh72b9435xs3pjwz1wp44";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54
@@ -92,8 +92,8 @@ rec {
   grsecurity_3_0_3_13_3 =
     { name = "grsecurity-3.0-3.13.3";
       patch = fetchurl {
-        url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402152204.patch;
-        sha256 = "0c4mswka95zivil3a28ipsbnv2nhrmqwj4l4dig3n8pr6d2vgwc9";
+        url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402192252.patch;
+        sha256 = "09f2ym9hyfff83yvaflj7zzk78c2xw4xvn70bj1x3ybawv3sw83k";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2
-- 
GitLab


From 2b92e90f91c8c50ccb1d9a7a84c71aee6e51be60 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 20 Feb 2014 06:17:15 -0500
Subject: [PATCH 1454/3789] opensmtpd: Add sendmail to systemPackages

---
 nixos/modules/services/mail/opensmtpd.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index 2732fd60200..0c18c464520 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -79,5 +79,10 @@ in {
       preStart = "mkdir -p /var/spool";
       serviceConfig.ExecStart = "${opensmtpd}/sbin/smtpd -d -f ${conf} ${args}";
     };
+
+    environment.systemPackages = [ (pkgs.runCommand "opensmtpd-sendmail" {} ''
+      mkdir -p $out/bin
+      ln -s ${opensmtpd}/sbin/smtpctl $out/bin/sendmail
+    '') ];
   };
 }
-- 
GitLab


From 94591762fed83447e68548bd4da281070ae2f865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 20 Feb 2014 12:27:38 +0100
Subject: [PATCH 1455/3789] Updating rdesktop to 1.8.1.

---
 .../networking/remote/rdesktop/default.nix             | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix
index c8c72160b34..9ba9e3aa3fc 100644
--- a/pkgs/applications/networking/remote/rdesktop/default.nix
+++ b/pkgs/applications/networking/remote/rdesktop/default.nix
@@ -2,17 +2,21 @@
 
 stdenv.mkDerivation (rec {
   pname = "rdesktop";
-  version = "1.7.1";
+  version = "1.8.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "0yc4xz95w40m8ailpjgqp9h7bkc758vp0dlq4nj1pvr3xfnl7sni";
+    sha256 = "0il248cdsxvwjsl4bswf27ld9r1a7d48jf6bycr86kf3i55q7k3n";
   };
 
   buildInputs = [openssl libX11];
 
-  configureFlags = [ "--with-openssl=${openssl}" ];
+  configureFlags = [
+    "--with-openssl=${openssl}"
+    "--disable-credssp"
+    "--disable-smartcard"
+  ];
 
   meta = {
     description = "rdesktop is an open source client for Windows Terminal Services";
-- 
GitLab


From cf00cd5e36920533f213d5087b7658d292dad428 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 20 Feb 2014 12:30:49 +0100
Subject: [PATCH 1456/3789] Add support for printing qr code for
 google-authenticator.

---
 pkgs/os-specific/linux/google-authenticator/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix
index d7acc6778b4..a9278f0c7ce 100644
--- a/pkgs/os-specific/linux/google-authenticator/default.nix
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pam }:
+{ stdenv, fetchurl, pam, qrencode }:
 
 stdenv.mkDerivation rec {
   name = "google-authenticator-1.0";
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pam ];
 
+  preConfigure = ''
+    sed -i 's|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|' google-authenticator.c
+  '';
+
   installPhase = ''
     ensureDir $out/bin $out/lib/security
     cp pam_google_authenticator.so $out/lib/security
-- 
GitLab


From 2537b7c679abd5d45d820869f47694521df6451f Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 29 Aug 2013 21:27:48 +0000
Subject: [PATCH 1457/3789] vim: add config option to generate vimrc

---
 pkgs/applications/editors/vim/default.nix |  8 +++---
 pkgs/applications/editors/vim/wrapper.nix | 30 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  5 ++++
 3 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/editors/vim/wrapper.nix

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 7dd4a0519ce..67317490412 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -1,8 +1,10 @@
 { stdenv, fetchhg, ncurses, gettext, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "vim-7.4.131";
- 
+  name = "vim-${version}";
+
+  version = "7.4.131";
+
   src = fetchhg {
     url = "https://vim.googlecode.com/hg/";
     tag = "v7-4-131";
@@ -10,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
- 
+
   buildInputs = [ ncurses pkgconfig ];
   nativeBuildInputs = [ gettext ];
 
diff --git a/pkgs/applications/editors/vim/wrapper.nix b/pkgs/applications/editors/vim/wrapper.nix
new file mode 100644
index 00000000000..709753ff8eb
--- /dev/null
+++ b/pkgs/applications/editors/vim/wrapper.nix
@@ -0,0 +1,30 @@
+{ stdenv, makeWrapper, writeText, vim, vimrc }:
+
+let
+
+  vimrcfile = writeText "vimrc" (if vimrc == null then "" else vimrc);
+
+in stdenv.mkDerivation rec {
+  name = "vimwrapper-${vim.version}";
+
+  buildInputs = [ makeWrapper vim vimrcfile ];
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r ${vim}/* $out/
+
+    chmod u+w $out/bin
+    chmod u+w $out/share/vim
+
+    ln -s ${vimrcfile} $out/share/vim/vimrc
+    wrapProgram $out/bin/vim --set VIM "$out/share/vim"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The most popular clone of the VI editor";
+    homepage    = http://www.vim.org;
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e8a3d89f39..ded6a364512 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9009,6 +9009,11 @@ let
       else stdenv;
   };
 
+  vimwrapper = callPackage ../applications/editors/vim/wrapper.nix {
+    inherit vim;
+    vimrc = config.vim.vimrc or null;
+  };
+
   vimHugeX = vim_configurable;
 
   vim_configurable = callPackage ../applications/editors/vim/configurable.nix {
-- 
GitLab


From f5a9e5188d654f8a0102a5dcdd00fc5e0d9fdeac Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 20 Feb 2014 14:19:11 +0100
Subject: [PATCH 1458/3789] titaniumsdk: remove some obsolete debugging stuff

---
 pkgs/development/mobile/titaniumenv/build-app.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 8c46033152f..8a0a8f460de 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -45,14 +45,11 @@ stdenv.mkDerivation {
     
     ${if target == "android" then
         ''
-          cat $TMPDIR/config.json
-          
           titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec/android-sdk-*
           
           ${if release then
             ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out''
           else
-            # /run/current-system/sw/bin/strace -f -y 
             ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only --output $out''}
         ''
       else if target == "iphone" then
-- 
GitLab


From 3c871ccbc9f588a7b70f9aaf276b7e7183e3360e Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 20 Feb 2014 13:24:06 +0000
Subject: [PATCH 1459/3789] chromium: Update all channels

stable: 32.0.1700.107 -> 33.0.1750.115
beta:   33.0.1750.46  -> 33.0.1750.115
dev:    34.0.1809.0   -> 34.0.1847.3
---
 .../networking/browsers/chromium/sources.nix   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index ffce71ef09f..64866243261 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "34.0.1809.0";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1809.0.tar.xz";
-    sha256 = "0hyqqqq2hzbzk325pk9bc70lsh0al2nqf1mlahybp5vigy5jzy88";
+    version = "34.0.1847.3";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.3.tar.xz";
+    sha256 = "1jm9cr1qqfqd82fy3f1q4d0qg94vsrzyq8dbn4hrxyzqbjc4sclg";
   };
   beta = {
-    version = "33.0.1750.46";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.46.tar.xz";
-    sha256 = "04n43c4vn8i7qhlybqb19c2c8kri8nc1wpa2l83vin4sqxkq519h";
+    version = "33.0.1750.115";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.115.tar.xz";
+    sha256 = "1whr5vz8w8h9la219ah1bcsa5r84jby306w12gfzlsbk9czxchrp";
   };
   stable = {
-    version = "32.0.1700.107";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.107.tar.xz";
-    sha256 = "1bf1gbjf4r9nf3xdn7zgq0ny1ihak21ka4rkkiadxsg8aq9vdsqz";
+    version = "33.0.1750.115";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.115.tar.xz";
+    sha256 = "1whr5vz8w8h9la219ah1bcsa5r84jby306w12gfzlsbk9czxchrp";
   };
 }
-- 
GitLab


From 83c98e4dd6c264b480550c6ae90d4038d99b317d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 20 Feb 2014 10:40:49 -0500
Subject: [PATCH 1460/3789] loaOf: Allow merging definitions from a list into
 other definitions IFF there is a name attribute

---
 lib/types.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index afc8f80eb0e..9bce56bf807 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -132,7 +132,7 @@ rec {
             { inherit (def) file;
               value = listToAttrs (
                 imap (elemIdx: elem:
-                  { name = "${elem.name or "unnamed"}-${toString defIdx}.${toString elemIdx}";
+                  { name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}";
                     value = elem;
                   }) def.value);
             }
-- 
GitLab


From fefc0d9917aebab210a62fd80b09af8622c64e94 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 20 Feb 2014 12:34:54 -0500
Subject: [PATCH 1461/3789] Add module to enable the server for the ssh
 substituter

---
 nixos/modules/misc/ids.nix                    |  1 +
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/misc/nix-ssh-serve.nix | 45 +++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 nixos/modules/services/misc/nix-ssh-serve.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 6d833551604..7e4c9b9b948 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -112,6 +112,7 @@
       cgminer = 101;
       munin = 102;
       logcheck = 103;
+      nix-ssh = 104;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c66cccb3975..391cc2503bd 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -125,6 +125,7 @@
   ./services/misc/gpsd.nix
   ./services/misc/nix-daemon.nix
   ./services/misc/nix-gc.nix
+  ./services/misc/nix-ssh-serve.nix
   ./services/misc/nixos-manual.nix
   ./services/misc/rogue.nix
   ./services/misc/svnserve.nix
diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix
new file mode 100644
index 00000000000..80e7961b1f8
--- /dev/null
+++ b/nixos/modules/services/misc/nix-ssh-serve.nix
@@ -0,0 +1,45 @@
+{ config, lib, pkgs, ... }:
+
+let
+  serveOnly = pkgs.writeScript "nix-store-serve" ''
+    #!${pkgs.stdenv.shell}
+    if [ "$SSH_ORIGINAL_COMMAND" != "nix-store --serve" ]; then
+      echo 'Error: You are only allowed to run `nix-store --serve'\'''!' >&2
+      exit 1
+    fi
+    exec /run/current-system/sw/bin/nix-store --serve
+  '';
+
+  inherit (lib) mkIf mkOption types;
+in {
+  options = {
+    nix.sshServe = {
+      enable = mkOption {
+        description = "Whether to enable serving the nix store over ssh.";
+        default = false;
+        type = types.bool;
+      };
+    };
+  };
+
+  config = mkIf config.nix.sshServe.enable {
+    users.extraUsers.nix-ssh = {
+      description = "User for running nix-store --serve.";
+      uid = config.ids.uids.nix-ssh;
+      shell = pkgs.stdenv.shell;
+    };
+
+    services.openssh.enable = true;
+
+    services.openssh.extraConfig = ''
+      Match User nix-ssh
+        AllowAgentForwarding no
+        AllowTcpForwarding no
+        PermitTTY no
+        PermitTunnel no
+        X11Forwarding no
+        ForceCommand ${serveOnly}
+      Match All
+    '';
+  };
+}
-- 
GitLab


From 17f88453f67bc1c54f5900a771c47d883a4a6c54 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 20 Feb 2014 13:34:12 -0500
Subject: [PATCH 1462/3789] Don't complain if HOME isn't writable

---
 nixos/modules/programs/shell.nix | 52 +++++++++++++++++---------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index 8052502c21e..226105a0c97 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -28,34 +28,36 @@ in
             echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2
         fi
 
-        if ! test -L $HOME/.nix-profile; then
-            if test "$USER" != root; then
-                ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile
-            else
-                # Root installs in the system-wide profile by default.
-                ln -s /nix/var/nix/profiles/default $HOME/.nix-profile
-            fi
-        fi
+        if test -w $HOME; then
+          if ! test -L $HOME/.nix-profile; then
+              if test "$USER" != root; then
+                  ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile
+              else
+                  # Root installs in the system-wide profile by default.
+                  ln -s /nix/var/nix/profiles/default $HOME/.nix-profile
+              fi
+          fi
 
-        # Subscribe the root user to the NixOS channel by default.
-        if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
-            echo "${config.system.defaultChannel} nixos" > $HOME/.nix-channels
-        fi
+          # Subscribe the root user to the NixOS channel by default.
+          if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
+              echo "${config.system.defaultChannel} nixos" > $HOME/.nix-channels
+          fi
 
-        # Create the per-user garbage collector roots directory.
-        NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER
-        mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR
-        if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
-            echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
-        fi
+          # Create the per-user garbage collector roots directory.
+          NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER
+          mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR
+          if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
+              echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
+          fi
 
-        # Set up a default Nix expression from which to install stuff.
-        if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
-            rm -f $HOME/.nix-defexpr
-            mkdir $HOME/.nix-defexpr
-            if [ "$USER" != root ]; then
-                ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root
-            fi
+          # Set up a default Nix expression from which to install stuff.
+          if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
+              rm -f $HOME/.nix-defexpr
+              mkdir $HOME/.nix-defexpr
+              if [ "$USER" != root ]; then
+                  ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root
+              fi
+          fi
         fi
       '';
 
-- 
GitLab


From 95a77ea39fa5870955e5fbb6414640f7b1ec62c6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 20 Feb 2014 14:17:30 -0500
Subject: [PATCH 1463/3789] Unconditionally add ssh to nix-daemon's path for
 the ssh substitituer

---
 nixos/modules/services/misc/nix-daemon.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index cca42aa1100..1a957993f98 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -286,8 +286,8 @@ in
     systemd.services."nix-daemon" =
       { description = "Nix Daemon";
 
-        path = [ nix pkgs.openssl pkgs.utillinux ]
-          ++ optionals cfg.distributedBuilds [ pkgs.openssh pkgs.gzip ];
+        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"; };
 
-- 
GitLab


From e40a059714c3ac438f0a9108f55bde1f3931b14c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 20 Feb 2014 20:52:27 +0100
Subject: [PATCH 1464/3789] Revert "fontconfig: update 2.10.2 -> 2.11.0"

This reverts commit 32a4081a7f8a162cb10f3afb8cec57165f05e0b2.

After ec985c8ff the apps linked to 2.11 fontconfig run fine on nixos
with older /etc/fonts/, but the other way won't work.

Unfortunately, I see no easy work-around ATM.
---
 pkgs/development/libraries/fontconfig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 75e28ffe748..89feb3df8d5 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, freetype, expat }:
 
 stdenv.mkDerivation rec {
-  name = "fontconfig-2.11.0";
+  name = "fontconfig-2.10.2";
 
   src = fetchurl {
     url = "http://fontconfig.org/release/${name}.tar.bz2";
-    sha256 = "0rx4q7wcrz4lkpgcmqkwkp49v1fm0yxl0f35jn75dj1vy3v0w3nb";
+    sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f";
   };
 
   infinality_patch = with freetype.infinality; if useInfinality
-- 
GitLab


From 8534fdf3fe555f1fd392b534da38e87003f05cb8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 20 Feb 2014 03:36:11 -0600
Subject: [PATCH 1465/3789] dbus: Update from 1.6.12 -> 1.8.0

---
 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 794128d054a..2101f99bbb9 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.6.16"; # 1.7.* isn't recommended, even for gnome 3.8
-  sha256 = "0wrmh5azszb54zpy7d0zjsy456khcv8yc19ivqrygkdg7a3l4gs6";
+  version = "1.8.0";
+  sha256 = "04qbsyw92279hfkwic5h6jc5999p87qsaqqgc6zcqddmh9r8r7vn";
 
   inherit (stdenv) lib;
 
-- 
GitLab


From 2cf1f0b2298edb2831d56c232681239c669258b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 20 Feb 2014 21:35:42 +0100
Subject: [PATCH 1466/3789] Revert "pango: major update 1.32.5 -> 1.36.1"

This reverts commit 9c4d6561029aebd8e7ad96f24e256d0de7ae8097 (modified).

We can't have newer pango with fontconfig-2.10.*
---
 pkgs/development/libraries/pango/default.nix | 27 +++++++++-----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index bd4e6354895..b94a00b1b54 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,28 +1,25 @@
-{ stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng, harfbuzz
-, fontconfig, freetype, libintlOrEmpty, gobjectIntrospection
-}:
-
-let
-  ver_maj = "1.36";
-  ver_min = "1";
-in
+{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz, fontconfig
+, libintlOrEmpty, gobjectIntrospection }:
+
 stdenv.mkDerivation rec {
-  name = "pango-${ver_maj}.${ver_min}";
+  name = "pango-1.32.5"; #.6 and higher need fontconfig-2.11.* which is troublesome
 
   src = fetchurl {
-    url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
-    sha256 = "1y2r1v4m8g4afggjd1siz0ri175p64myz9d2ks58grlrvhfbbr22";
+    url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz";
+    sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx";
   };
 
+  buildInputs = [ gobjectIntrospection ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];
+
+
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gobjectIntrospection ];
 
-  propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty;
+  propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ] ++ libintlOrEmpty;
 
   enableParallelBuilding = true;
 
-  #doCheck = true; # testiter fails to find fontconfig configuration
-
+  doCheck = true;
   postInstall = "rm -rf $out/share/gtk-doc";
 
   meta = {
-- 
GitLab


From c5e1cc5f377c165d8cee75bad4d1c8f7f0be5c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Thu, 20 Feb 2014 23:12:54 +0100
Subject: [PATCH 1467/3789] Minor whitespace cleanup

---
 pkgs/applications/misc/lxappearance/default.nix  | 1 -
 pkgs/applications/networking/davmail/default.nix | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/lxappearance/default.nix b/pkgs/applications/misc/lxappearance/default.nix
index 032c664b926..9295eaabf32 100644
--- a/pkgs/applications/misc/lxappearance/default.nix
+++ b/pkgs/applications/misc/lxappearance/default.nix
@@ -15,4 +15,3 @@ stdenv.mkDerivation rec {
     homepage = "http://lxappearance.sourceforce.net/";
   };
 }
-
diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix
index 7dc54a9c871..b95d2903154 100644
--- a/pkgs/applications/networking/davmail/default.nix
+++ b/pkgs/applications/networking/davmail/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "davmail-4.4.1";
   src = fetchurl {
     url = "http://downloads.sourceforge.net/project/davmail/davmail/4.4.1/davmail-linux-x86_64-4.4.1-2225.tgz";
-	sha256 = "66c7ae23c0242860cca1576e5fc29343431789a821f7623e420b91ba91e480a9";
+    sha256 = "66c7ae23c0242860cca1576e5fc29343431789a821f7623e420b91ba91e480a9";
   };
 
   buildInputs = [ makeWrapper ];
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers";
     maintainers = [ stdenv.lib.maintainers.hinton ];
-	platforms = stdenv.lib.platforms.all;
-	homepage = "http://davmail.sourceforce.net/";
-	license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.all;
+    homepage = "http://davmail.sourceforce.net/";
+    license = stdenv.lib.licenses.gpl2;
   };
 
   installPhase = ''
-- 
GitLab


From cc2b86d13357c1ba9d544eed10717529c8159439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 21 Feb 2014 00:10:40 +0100
Subject: [PATCH 1468/3789] google_talk_plugin: 4.2.1.0 -> 5.1.4.0

---
 .../browsers/mozilla-plugins/google-talk-plugin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 4f7d3feb8ad..d9cd8f9be53 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -47,18 +47,18 @@ stdenv.mkDerivation rec {
   name = "google-talk-plugin-${version}";
   # Use the following to determine the current upstream version:
   # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p'
-  version = "4.2.1.0";
+  version = "5.1.4.0";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
-        sha256 = "1g7kpz2lzzz1gri5rd3isp7cfyls6gzwcw2kc8jgrgrixq9iixfd";
+        sha256 = "19x1ss6kx7w8833f40pg1mwqr6sygz4ij4a7r7h3flmk67zywj4c";
       }
     else if stdenv.system == "i686-linux" then
       fetchurl {
         url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
-        sha256 = "1z0zbblzlky9nyifxmnl49v4zafpqp3l08b9v1486sinm35rf58r";
+        sha256 = "1jxcridpqx46sdy4bw381rvffn1z93s280vhihwbgmiwjq5h4g41";
       }
     else throw "Google Talk does not support your platform.";
 
-- 
GitLab


From 864c75b7fdb4e6716ae765d8e0aec9171dac6c2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Thu, 20 Feb 2014 23:33:37 +0100
Subject: [PATCH 1469/3789] guitarix: update from 0.25.2 to 0.28.3

Add new required inputs: lv2 and avahi, tidy up
---
 pkgs/applications/audio/guitarix/default.nix | 26 +++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 17d53a621ca..868fbc2cbc4 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, jackaudio, libsndfile
-, glib, gtk, glibmm, gtkmm, fftw, librdf, ladspaH, boost }:
+{ stdenv, fetchurl, avahi, boost fftw, gettext, glib, glibmm, gtk
+, gtkmm, intltool, jackaudio, ladspaH, librdf, libsndfile lv2 
+, pkgconfig, python
+}:
 
 stdenv.mkDerivation rec {
   name = "guitarix-${version}";
-  version = "0.25.2";
+  version = "0.28.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
-    sha256 = "1wcg3yc2iy72hj6z9l88393f00by0iwhhn8xrc3q55p4rj0mnrga";
+    sha256 = "0ks5avylyicqfj9l1wf4gj62i8m6is2jmp0h11h5l2wbg3xiwxjd";
   };
 
-  buildInputs =
-    [ python gettext intltool pkgconfig jackaudio libsndfile glib gtk glibmm
-      gtkmm fftw librdf ladspaH boost
-    ];
+  buildInputs = [
+    avahi boost fftw gettext glib glibmm gtk gtkmm intltool jackaudio
+    ladspaH librdf libsndfile lv2 pkgconfig python
+  ];
 
   configurePhase = "python waf configure --prefix=$out";
 
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
 
   installPhase = "python waf install";
 
-  meta = { 
+  meta = with stdenv.lib; { 
     description = "A virtual guitar amplifier for Linux running with JACK";
     longDescription = ''
         guitarix is a virtual guitar amplifier for Linux running with
@@ -46,8 +48,8 @@ stdenv.mkDerivation rec {
       crazy sounds never heard before.
     '';
     homepage = http://guitarix.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [ stdenv.lib.maintainers.astsmtl ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ astsmtl goibhniu ];
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From a1dc5ea7072158fb2371108210ccad5eda5c8f41 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 20 Feb 2014 19:53:34 -0600
Subject: [PATCH 1470/3789] kernel: stable updates

 - 3.13 stable:   3.13.3  -> 3.13.4
 - 3.12 stable:   3.12.11 -> 3.12.12
 - 3.10 longterm: 3.10.30 -> 3.10.31
 - 3.4  longterm: 3.4.80  -> 3.4.81

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.12.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.13.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 a5c096491c3..748611ab1b5 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.30";
+  version = "3.10.31";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0a9x27g026gvy64w2xkpkdf3kzjfzzgy0kgikdyk604zdz4ha2hm";
+    sha256 = "1nz8203avjjin3sivx6h6ddsramk37vp02g9lw2ix3hxji0lsz1m";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 352b3cc483d..84c865b6542 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.11";
+  version = "3.12.12";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1zqwfzb0hmx69caw54np6if2nybmin4mhxj9milfflc6z40fn06r";
+    sha256 = "0wndjj5bdjfl4i9s5mj9wylhspygsvnl3pnwps6d65q2jm813lrv";
   };
 
   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 24f10ecb478..827910ca28b 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.3";
+  version = "3.13.4";
   extraMeta.branch = "3.13";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0x277h0ccdjivi16w20aj59ncazr7zs07zprazm0ph4qyffv0r4g";
+    sha256 = "0hzxr8gsafnyc96x5p2clgi827ahidk1hma0yd48gdx9dhynrq2r";
   };
 
   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 6e94cb5807e..a7bfee210ad 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.80";
+  version = "3.4.81";
   extraMeta.branch = "3.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1vma3bxydryhcg7iimndq4rbpzbpjvnq7qa5md6wm6iill011pil";
+    sha256 = "17m8b9wcsz8ryakhk8v85iknylkjlbsx69wkj1rbvqi2f1sjihx5";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 18f65f3640e49c119d984444223a436ac9d91fad Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 20 Feb 2014 19:55:45 -0600
Subject: [PATCH 1471/3789] grsecurity: stable/testing updates

  - stable:  3.0-3.2.55-201402192249 -> 3.0-3.2.55-201402201903
  - testing: 3.0-3.13.3-201402192252 -> 3.0-3.13.4-201402201908

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/patches.nix | 12 ++++++------
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index d14a124dd05..49d0d37586c 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -81,19 +81,19 @@ rec {
   grsecurity_3_0_3_2_55 =
     { name = "grsecurity-3.0-3.2.55";
       patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402192249.patch;
-        sha256 = "16q531j9gphqgqw6v0g45l9hzpz6gnsmh72b9435xs3pjwz1wp44";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402201903.patch;
+        sha256 = "01kvs5z4ia5d5s4z8kfqyvh06qlw4v14hfll9n9qav6z8s5wyx10";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54
       features.apparmor = true;
     };
 
-  grsecurity_3_0_3_13_3 =
-    { name = "grsecurity-3.0-3.13.3";
+  grsecurity_3_0_3_13_4 =
+    { name = "grsecurity-3.0-3.13.4";
       patch = fetchurl {
-        url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402192252.patch;
-        sha256 = "09f2ym9hyfff83yvaflj7zzk78c2xw4xvn70bj1x3ybawv3sw83k";
+        url = http://grsecurity.net/test/grsecurity-3.0-3.13.4-201402201908.patch;
+        sha256 = "140rp57hzbjljhcgvdcczfhw0ghyw1x1ga2xv5ma2pk3dml158lh";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f19613bd88b..53326d6e6fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6695,7 +6695,7 @@ let
   })) (args: grsecurityOverrider args));
 
   linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_3 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_4 kernelPatches.grsec_path ];
     argsOverride = {
       modDirVersion = "${linux_3_13.modDirVersion}-grsec";
     };
-- 
GitLab


From b1a2c840a7ca8dfd462ac90c5f6d74a8d0cc41a8 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 19 Feb 2014 23:20:33 +0100
Subject: [PATCH 1472/3789] cogl: Compile with gstreamer

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

diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index 1fc1021156d..0f1c1dd82e2 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
-, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland }:
+, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland
+, gstreamerSupport ? true, gst_all_1 }:
 
 let
   ver_maj = "1.16";
@@ -22,13 +23,15 @@ stdenv.mkDerivation rec {
     "--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;
+    ++ libintlOrEmpty
+    ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
+                                               gst_all_1.gst-plugins-base ];
 
   buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
 
-- 
GitLab


From 9f5beec66f9c417f61b29f772d1826b4f0be36a9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 19 Feb 2014 23:21:19 +0100
Subject: [PATCH 1473/3789] clutter-gst: new package

---
 .../libraries/clutter-gst/default.nix         | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/clutter-gst/default.nix

diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
new file mode 100644
index 00000000000..8297dc9d5da
--- /dev/null
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -0,0 +1,26 @@
+{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }:
+
+stdenv.mkDerivation rec {
+  name = "clutter-gst-2.0.10";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/clutter-gst/2.0/${name}.tar.xz";
+    sha256 = "f00cf492a6d4f1036c70d8a0ebd2f0f47586ea9a9b49b1ffda79c9dc7eadca00";
+  };
+
+  propagatedBuildInputs = [ clutter gtk3 glib cogl ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  postBuild = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    description = "Clutter-GST";
+
+    homepage = http://www.clutter-project.org/;
+
+    license = "LGPLv2+";
+
+    maintainers = with stdenv.lib.maintainers; [ lethalman ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e8a3d89f39..e91329c866b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3970,6 +3970,8 @@ let
 
   clutter = callPackage ../development/libraries/clutter { };
 
+  clutter-gst = callPackage ../development/libraries/clutter-gst { };
+
   clutter_gtk = callPackage ../development/libraries/clutter-gtk { };
   clutter_gtk_0_10 = callPackage ../development/libraries/clutter-gtk/0.10.8.nix { };
 
-- 
GitLab


From 668a0bbfc762e61a2b501e86253585a4102ed69d Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Thu, 20 Feb 2014 10:27:10 +0100
Subject: [PATCH 1474/3789] telepathy-glib: Generate vala bindings

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

diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index 615641a8309..516ebc5f273 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt
-, gobjectIntrospection }:
+, gobjectIntrospection, valaSupport ? true, vala }:
 
 stdenv.mkDerivation rec {
   name = "telepathy-glib-0.22.0";
@@ -9,9 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "0mqrq2azw70rm50vy21acfnzn8mmh0w7dxh87mwr1lyk0jn1n232";
   };
 
+  configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings";
+
   propagatedBuildInputs = [dbus_glib glib python gobjectIntrospection];
 
-  buildInputs = [pkgconfig libxslt];
+  buildInputs = [pkgconfig libxslt] ++ stdenv.lib.optional valaSupport vala;
 
   meta = {
     homepage = http://telepathy.freedesktop.org;
-- 
GitLab


From 4232f21de37da8c7cbc4fd4af869ac496a45dc97 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 19 Feb 2014 23:55:48 +0100
Subject: [PATCH 1475/3789] evolution-data-server: Generate vala bindings

---
 .../gnome-3/core/evolution-data-server/default.nix        | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 d0c15bd96ff..0ded30b11ab 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret
-, p11_kit, db, nspr, nss, libical, gperf }:
+, p11_kit, db, nspr, nss, libical, gperf, valaSupport ? true, vala }:
 
 
 stdenv.mkDerivation rec {
@@ -12,10 +12,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = with gnome3;
     [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret
-      gcr p11_kit db nspr nss libgweather libical libgdata gperf ];
+      gcr p11_kit db nspr nss libgweather libical libgdata gperf ]
+    ++ stdenv.lib.optional valaSupport vala;
 
   # uoa irrelevant for now
-  configureFlags = "--disable-uoa --with-nspr-includes=${nspr}/include/nspr --with-nss-includes=${nss}/include/nss";
+  configureFlags = ["--disable-uoa" "--with-nspr-includes=${nspr}/include/nspr" "--with-nss-includes=${nss}/include/nss"]
+                   ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-- 
GitLab


From 226be5a247deeabcb079b66b148dfb19a567f19c Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Thu, 20 Feb 2014 14:43:18 +0100
Subject: [PATCH 1476/3789] evolution-data-server: install gschemas in
 share/evolution-data-server

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

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 0ded30b11ab..30805c1c597 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
   configureFlags = ["--disable-uoa" "--with-nspr-includes=${nspr}/include/nspr" "--with-nss-includes=${nss}/include/nss"]
                    ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
 
+  installFlags = "gsettingsschemadir=\${out}/share/evolution-data-server/glib-2.0/schemas/";
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
   };
-- 
GitLab


From 9f2187478190cf30193b45cf769519315fac704d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 20 Feb 2014 02:27:49 +0100
Subject: [PATCH 1477/3789] telepathy-logger: install gschemas in
 share/telepathy-logger

---
 .../networking/instant-messengers/telepathy/logger/default.nix  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 173dfe9c929..bd8cffd40e4 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--enable-call";
 
+  installFlags = "gsettingsschemadir=\${out}/share/telepathy/logger/glib-2.0/schemas/";
+
   meta = {
     description = "Logger service for Telepathy framework";
     homepage = http://telepathy.freedesktop.org/wiki/Logger ;
-- 
GitLab


From aa292356219bce8a583d8e53e517d0a7cc415105 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 20 Feb 2014 02:28:28 +0100
Subject: [PATCH 1478/3789] clutter-gtk: update to 1.4.4

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

diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 58732446111..040123d4276 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, clutter, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "clutter-gtk-1.0.4";
+  name = "clutter-gtk-1.4.4";
 
   src = fetchurl {
-    url = mirror://gnome/sources/clutter-gtk/1.0/clutter-gtk-1.0.4.tar.xz;
-    sha256 = "0kj6vsvaqxx6vqqk9acc8b0p40klrpwlf2wsjkams1kxxcpzsh87";
+    url = "mirror://gnome/sources/clutter-gtk/1.4/${name}.tar.xz";
+    sha256 = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e";
   };
 
   propagatedBuildInputs = [ clutter gtk3 ];
-- 
GitLab


From dfa357c3e46ce87557feeca74ea3dbd5bc9de22d Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Thu, 20 Feb 2014 14:44:00 +0100
Subject: [PATCH 1479/3789] yelp: save loaders.cache in yelp-specific directory

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

diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index e6779abcffa..ee98f96bc27 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -23,9 +23,10 @@ stdenv.mkDerivation rec {
   installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
 
   postInstall = ''
-    cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/loaders.cache
+    mkdir -p $out/lib/yelp/gdk-pixbuf-2.0/2.10.0
+    cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/lib/yelp/gdk-pixbuf-2.0/2.10.0/loaders.cache
     wrapProgram "$out/bin/yelp" \
-      --set GDK_PIXBUF_MODULE_FILE `readlink -e $out/loaders.cache` \
+      --set GDK_PIXBUF_MODULE_FILE `readlink -e $out/lib/yelp/gdk-pixbuf-2.0/2.10.0/loaders.cache` \
       --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme_symbolic}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gnome_icon_theme}/share:${hicolor_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
   '';
 
-- 
GitLab


From d50909f56bd8c0f1eed8c3e941f442e63e123778 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 20 Feb 2014 00:36:16 +0100
Subject: [PATCH 1480/3789] folks: new package

---
 pkgs/desktops/gnome-3/core/folks/default.nix | 42 ++++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix            |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/folks/default.nix

diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix
new file mode 100644
index 00000000000..9b0f403b079
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/folks/default.nix
@@ -0,0 +1,42 @@
+{ 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";
+
+  installFlags = "gsettingsschemadir=\${out}/share/folks/glib-2.0/schemas/";
+
+  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/default.nix b/pkgs/desktops/gnome-3/default.nix
index 1c26c6949ca..7ab56f08814 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -50,6 +50,8 @@ rec {
 
   libgnome_keyring = callPackage ./core/libgnome-keyring { };
 
+  folks = callPackage ./core/folks { };
+
   gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
 
   gnome_session = callPackage ./core/gnome-session { };
-- 
GitLab


From 3991f590f4b1df383997ef51b959a1b270f36e37 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 20 Feb 2014 22:38:26 +0100
Subject: [PATCH 1481/3789] empathy: new package

Messaging program which supports text, voice, video chat,
and file transfers over many different protocols

https://wiki.gnome.org/Apps/Empathy
---
 .../desktops/gnome-3/core/empathy/default.nix | 59 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 63 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/empathy/default.nix

diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
new file mode 100644
index 00000000000..cfa774599e1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -0,0 +1,59 @@
+{ 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 = [ librsvg gdk_pixbuf 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
+                  libnotify clutter libsoup gnutls libgee p11_kit
+                  libcanberra_gtk3 telepathy_farstream farstream
+                  gnome3.gsettings_desktop_schemas file libtool ];
+
+  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" ];
+
+  enableParallelBuilding = true;
+
+  installFlags = "gsettingsschemadir=\${out}/share/empathy/glib-2.0/schemas/";
+
+  postInstall = ''
+    mkdir -p $out/lib/empathy/gdk-pixbuf-2.0/2.10.0
+    cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/lib/empathy/gdk-pixbuf-2.0/2.10.0/loaders.cache
+    wrapProgram "$out/bin/empathy" \
+      --set GDK_PIXBUF_MODULE_FILE `readlink -e $out/lib/empathy/gdk-pixbuf-2.0/2.10.0/loaders.cache` \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme_symbolic}/share:${gnome3.gnome_icon_theme}/share:${hicolor_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/empathy:${telepathy_logger}/share/telepathy/logger:${folks}/share/folks:${evolution_data_server}/share/evolution-data-server"
+  '';
+
+  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 ];
+    license = [ licenses.gpl2 licenses.lgpl2 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 7ab56f08814..15544eff922 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -20,6 +20,8 @@ rec {
 
   dconf = callPackage ./core/dconf { };
 
+  empathy = callPackage ./core/empathy { };
+
   epiphany = callPackage ./core/epiphany { };
 
   evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e91329c866b..b790057b860 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7816,6 +7816,8 @@ let
   emacs23Packages = emacsPackages emacs23 pkgs.emacs23Packages;
   emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages);
 
+  inherit (gnome3) empathy;
+
   epdfview = callPackage ../applications/misc/epdfview { };
 
   inherit (gnome3) epiphany;
-- 
GitLab


From 68a5b5e5fbaf0c379bc2185b03eda4673bb3d448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 21 Feb 2014 13:18:56 +0100
Subject: [PATCH 1482/3789] add xarchiver: GTK+2 only frontend to
 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)

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

diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix
new file mode 100644
index 00000000000..fc5b984bd90
--- /dev/null
+++ b/pkgs/tools/archivers/xarchiver/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, gtk2, pkgconfig, intltool }:
+
+stdenv.mkDerivation rec {
+  version = "0.5.3";
+  name = "xarchiver-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/xarchiver/${name}.tar.bz2";
+    sha256 = "10bdq406xkl2q6rl6qvvipdr3ini5lnh1sjykgw66fp8jns9r2f5";
+  };
+
+  buildInputs = [ gtk2 pkgconfig intltool ];
+
+  meta = {
+    description = "GTK+2 only frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
+    homepage = http://sourceforge.net/projects/xarchiver/;
+    mainatainers = [ stdenv.lib.maintainers.iElectric ];
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 229a5c8ac3b..f7eb13f00d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2121,6 +2121,8 @@ let
 
   xarchive = callPackage ../tools/archivers/xarchive { };
 
+  xarchiver = callPackage ../tools/archivers/xarchiver { };
+
   unarj = callPackage ../tools/archivers/unarj { };
 
   unshield = callPackage ../tools/archivers/unshield { };
-- 
GitLab


From fc4e653167708666bbb917ccb4478fa4f22657d6 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 21 Feb 2014 16:20:27 +0100
Subject: [PATCH 1483/3789] titaniumsdk: Fix issue with APK with spaces in them

---
 pkgs/development/mobile/titaniumenv/build-app.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 8a0a8f460de..1e32cce9c72 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation {
     ${if target == "android" && release then ""
       else
         if target == "android" then
-          ''cp $(ls build/android/bin/*.apk | grep -v '\-unsigned.apk') $out''
+          ''cp "$(ls build/android/bin/*.apk | grep -v '\-unsigned.apk')" $out''
         else if target == "iphone" && release then
            ''
              cp -av build/iphone/build/* $out
-- 
GitLab


From f1db57f1fe3ac9f33a7c212981293f5d864ecf69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 21 Feb 2014 14:29:32 +0100
Subject: [PATCH 1484/3789] buildPythonPackage: fix more borken packages

---
 pkgs/applications/audio/quodlibet/default.nix   |  5 +++++
 .../python-modules/generic/default.nix          |  3 +--
 pkgs/development/python-modules/pil/default.nix |  5 ++---
 pkgs/os-specific/linux/iotop/default.nix        |  6 ------
 pkgs/top-level/python-packages.nix              | 17 ++++++++++-------
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 3ab7688cde3..fa63c9f654a 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -29,6 +29,11 @@ buildPythonPackage {
      })
   ];       
 
+  preConfigure = ''
+    # TODO: for now don't a apply gdist overrides, will be needed for shipping icons, gtk, etc
+    sed -i /distclass/d setup.py
+  '';
+
   sourceRoot = "quodlibet-${version}";
   postUnpack = ''
     # the patch searches for plugins in directory ../plugins
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 2b901db7643..067a1cdf2e2 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -72,8 +72,7 @@ python.stdenv.mkDerivation (attrs // {
   checkPhase = attrs.checkPhase or ''
       runHook preCheck
 
-      # reduce output to only dots, if a test fails error output will include verbose info
-      ${python}/bin/${python.executable} setup.py test -q
+      ${python}/bin/${python.executable} setup.py test
 
       runHook postCheck
   '';
diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix
index 1dfdfee08fb..0b462cb4e52 100644
--- a/pkgs/development/python-modules/pil/default.nix
+++ b/pkgs/development/python-modules/pil/default.nix
@@ -14,16 +14,15 @@ buildPythonPackage {
 
   doCheck = true;
 
-  configurePhase = ''
+  preConfigure = ''
     sed -i "setup.py" \
         -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ;
             s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ;
             s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;'
   '';
 
-  buildPhase   = "python setup.py build_ext -i";
   checkPhase   = "python selftest.py";
-  #installPhase = "python setup.py install --prefix=$out";
+  buildPhase   = "python setup.py build_ext -i";
 
   meta = {
     homepage = http://www.pythonware.com/products/pil/;
diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix
index 8e181d3d5cf..7481edeee7b 100644
--- a/pkgs/os-specific/linux/iotop/default.nix
+++ b/pkgs/os-specific/linux/iotop/default.nix
@@ -11,12 +11,6 @@ buildPythonPackage rec {
 
   pythonPath = [ pythonPackages.curses ];
 
-  postInstall =
-    ''
-      # Put the man page in the right place.
-      mv $out/lib/python*/site-packages/iotop-*/share $out
-    '';
-
   doCheck = false;
 
   meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b05c670aab6..73919c330ba 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1719,6 +1719,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  # TODO: this shouldn't use a buildPythonPackage
   koji = buildPythonPackage (rec {
     name = "koji-1.8";
     meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
@@ -1728,8 +1729,9 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1";
     };
 
+    configurePhase = ":";
     buildPhase = ":";
-    installCommand = "make install DESTDIR=$out/ && cp -R $out/nix/store/*/* $out/ && rm -rf $out/nix";
+    installPhase = "make install DESTDIR=$out/ && cp -R $out/nix/store/*/* $out/ && rm -rf $out/nix";
     doCheck = false;
     propagatedBuildInputs = [ pythonPackages.pycurl ];
 
@@ -1748,12 +1750,12 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   paver = buildPythonPackage rec {
-    version = "1.2.1";
+    version = "1.2.2";
     name    = "Paver-${version}";
 
     src = fetchurl {
       url    = "https://pypi.python.org/packages/source/P/Paver/Paver-${version}.tar.gz";
-      sha256 = "1b1023jks1gi1rwphdy3y2zx7dh4bvwk2050kclp95j7xym1ya0y";
+      sha256 = "0lix9d33ndb3yk56sm1zlj80fbmxp0w60yk0d9pr2xqxiwi88sqy";
     };
 
     buildInputs = [ cogapp mock virtualenv ];
@@ -4235,6 +4237,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
     preConfigure = ''
       sed -i 's/-faltivec//' numpy/distutils/system_info.py
+      sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
     '';
 
     preBuild = ''
@@ -5307,14 +5310,14 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   });
 
   python_fedora = buildPythonPackage (rec {
-    name = "python-fedora-0.3.32.3";
+    name = "python-fedora-0.3.33";
     meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
 
     src = fetchurl {
-      url = "https://fedorahosted.org/releases/p/y/python-fedora/python-fedora-0.3.32.3.tar.gz";
-      sha256 = "0qwmbid4pkdj6z9gwa43fzs97fr6ci2h2vj1hyk0gp0vqim4kv4l";
+      url = "https://fedorahosted.org/releases/p/y/python-fedora/${name}.tar.gz";
+      sha256 = "1g05bh7d5d0gzrlnhpnca7jpqbgs2rgnlzzbvzzxmdbmlkqi3mws";
     };
-    propagatedBuildInputs = [ kitchen requests bunch ];
+    propagatedBuildInputs = [ kitchen requests bunch paver ];
     doCheck = false;
   });
 
-- 
GitLab


From e65eb02a35c5e70f8411f2be4e3008b32f018107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 21 Feb 2014 18:38:02 +0100
Subject: [PATCH 1485/3789] fix eval

---
 pkgs/applications/audio/guitarix/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 868fbc2cbc4..44b0e9ef0d7 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,7 +1,6 @@
-{ stdenv, fetchurl, avahi, boost fftw, gettext, glib, glibmm, gtk
-, gtkmm, intltool, jackaudio, ladspaH, librdf, libsndfile lv2 
-, pkgconfig, python
-}:
+{ stdenv, fetchurl, avahi, boost, fftw, gettext, glib, glibmm, gtk
+, gtkmm, intltool, jackaudio, ladspaH, librdf, libsndfile, lv2 
+, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
   name = "guitarix-${version}";
-- 
GitLab


From 96c481b8a0ef211967f6f6c078771d05830456b6 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 21 Feb 2014 18:35:56 +0100
Subject: [PATCH 1486/3789] flashplayer: Update from 11.2.202.336 ->
 11.2.202.341

---
 .../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 ecd51f7c110..8317f94e079 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.336";
+  version = "11.2.202.341";
 
   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 = "1wri6y5vllgs452dfklv23k7bp5daajnaqblkn5cb2gl28l5xcni";
+        sha256 = "0d1ic70awdig0v699svmq8mmnil8xmmwsap30sgi0r94saxmq49j";
       }
     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 = "0mjxjbj75r74gqpmqzqa6vlrk2wv7r358wcqbmg132bhv8kaph85";
+        sha256 = "0bfz1id4035jnkwy4xm0dj8l9lygrrzqdbf8dgc9pcy8c63d1hac";
       }
     else throw "Flash Player is not supported on this platform";
 
-- 
GitLab


From 239112930747530e4043b8761cfba70be3575de9 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 21 Feb 2014 18:31:20 +0000
Subject: [PATCH 1487/3789] chromium: Update stable and beta channels

stable: 33.0.1750.115 -> 33.0.1750.117
beta:   33.0.1750.115 -> 33.0.1750.117
---
 .../networking/browsers/chromium/sources.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index 64866243261..0a8adfee40a 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -6,13 +6,13 @@
     sha256 = "1jm9cr1qqfqd82fy3f1q4d0qg94vsrzyq8dbn4hrxyzqbjc4sclg";
   };
   beta = {
-    version = "33.0.1750.115";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.115.tar.xz";
-    sha256 = "1whr5vz8w8h9la219ah1bcsa5r84jby306w12gfzlsbk9czxchrp";
+    version = "33.0.1750.117";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.117.tar.xz";
+    sha256 = "0nyaqrxz8kcnppcya68qpr47fw4d959p4l63kqzvd9ifdqfgk18f";
   };
   stable = {
-    version = "33.0.1750.115";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.115.tar.xz";
-    sha256 = "1whr5vz8w8h9la219ah1bcsa5r84jby306w12gfzlsbk9czxchrp";
+    version = "33.0.1750.117";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.117.tar.xz";
+    sha256 = "0nyaqrxz8kcnppcya68qpr47fw4d959p4l63kqzvd9ifdqfgk18f";
   };
 }
-- 
GitLab


From f1459cd4b0225c07a2a818eb1cf0aad2fe5d16ed Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 17 Feb 2014 08:23:31 -0600
Subject: [PATCH 1488/3789] grsecurity: add gradm-3.0-201401291757

This also ensures the appropriate udev rules are installed.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/gradm/default.nix | 51 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/os-specific/linux/gradm/default.nix

diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix
new file mode 100644
index 00000000000..7272b5a22fa
--- /dev/null
+++ b/pkgs/os-specific/linux/gradm/default.nix
@@ -0,0 +1,51 @@
+{ fetchurl, stdenv, bison, flex, pam,
+  gcc, coreutils, findutils, binutils, bash }:
+
+stdenv.mkDerivation rec {
+  name    = "gradm-${version}";
+  version = "3.0-201401291757";
+
+  src  = fetchurl {
+    url    = "http://grsecurity.net/stable/${name}-${version}.tar.gz";
+    sha256 = "19p7kaqbvf41scc63n69b5v5xzpw3mbf5zy691rply8hdm7736cw";
+  };
+
+  buildInputs = [ gcc coreutils findutils binutils pam flex bison bash ];
+  preBuild = ''
+    substituteInPlace ./Makefile --replace "/usr/include/security/pam_" "${pam}/include/security/pam_"
+    substituteInPlace ./gradm_defs.h --replace "/sbin/grlearn"   "$out/sbin/grlearn"
+    substituteInPlace ./gradm_defs.h --replace "/sbin/gradm"     "$out/sbin/gradm"
+    substituteInPlace ./gradm_defs.h --replace "/sbin/gradm_pam" "$out/sbin/gradm_pam"
+  '';
+
+  postInstall = ''
+    mkdir -p $out/lib/udev/rules.d
+    cat > $out/lib/udev/rules.d/80-grsec.rules <<EOF
+    ACTION!="add|change", GOTO="permissions_end"
+    KERNEL=="grsec",          MODE="0622"
+    LABEL="permissions_end"
+    EOF
+  '';
+
+  makeFlags =
+    [ "DESTDIR=$(out)"
+      "CC=${gcc}/bin/gcc"
+      "FLEX=${flex}/bin/flex"
+      "BISON=${bison}/bin/bison"
+      "FIND=${findutils}/bin/find"
+      "STRIP=${binutils}/bin/strip"
+      "INSTALL=${coreutils}/bin/install"
+      "MANDIR=/share/man"
+      "MKNOD=true"
+    ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "grsecurity RBAC administration and policy analysis utility";
+    homepage    = "https://grsecurity.net";
+    license     = stdenv.lib.licenses.gpl2;
+    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 4f781502e3d..18ebecb2bec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6578,6 +6578,8 @@ let
 
   gpm = callPackage ../servers/gpm { };
 
+  gradm = callPackage ../os-specific/linux/gradm { };
+
   hdparm = callPackage ../os-specific/linux/hdparm { };
 
   hibernate = callPackage ../os-specific/linux/hibernate { };
-- 
GitLab


From c2e4ccd4adb3d3e69c0701104196f6561e877d0f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 17 Feb 2014 08:24:20 -0600
Subject: [PATCH 1489/3789] grsecurity: add paxctl-0.7

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/paxctl/default.nix | 28 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/os-specific/linux/paxctl/default.nix

diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix
new file mode 100644
index 00000000000..253c0dd5ed2
--- /dev/null
+++ b/pkgs/os-specific/linux/paxctl/default.nix
@@ -0,0 +1,28 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "paxctl-${version}";
+  version = "0.7";
+
+  src = fetchurl {
+    url = "https://pax.grsecurity.net/${name}-${version}.tar.bz2";
+    sha256 = "1j6dg6wd1v7na5i4xj8zmbff0mdqdnw6cvqy0rsbz5anra27f1zp";
+  };
+
+  preBuild = ''
+    sed "s|--owner 0 --group 0||g" -i Makefile
+  '';
+
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "MANDIR=share/man/man1"
+  ];
+
+  meta = {
+    description = "A tool for controlling PaX flags on a per binary basis";
+    homepage    = "https://pax.grsecurity.net";
+    license     = stdenv.lib.licenses.gpl2;
+    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 18ebecb2bec..6012c39bc85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6986,6 +6986,8 @@ let
 
   pam_usb = callPackage ../os-specific/linux/pam_usb { };
 
+  paxctl = callPackage ../os-specific/linux/paxctl { };
+
   pcmciaUtils = callPackage ../os-specific/linux/pcmciautils {
     firmware = config.pcmciaUtils.firmware or [];
     config = config.pcmciaUtils.config or null;
-- 
GitLab


From 4631a65c4383a2f544154912e7fac878d4f8f7ca Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 17 Feb 2014 08:24:43 -0600
Subject: [PATCH 1490/3789] grsecurity: add pax-utils-0.7

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/pax-utils/default.nix | 24 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/os-specific/linux/pax-utils/default.nix

diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
new file mode 100644
index 00000000000..9ab3183e92a
--- /dev/null
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -0,0 +1,24 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "pax-utils-${version}";
+  version = "0.7";
+
+  src = fetchurl {
+    url = "http://dev.gentoo.org/~vapier/dist/${name}-${version}.tar.xz";
+    sha256 = "111vmwn0ikrmy3s0w3rzpbzwrphawljrmcjya0isg5yam7lwxi0s";
+  };
+
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "PREFIX=$(out)"
+  ];
+
+  meta = {
+    description = "A suite of tools for PaX/grsecurity";
+    homepage    = "http://dev.gentoo.org/~vapier/dist/";
+    license     = stdenv.lib.licenses.gpl2;
+    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 6012c39bc85..bbe1b4ce51a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6988,6 +6988,8 @@ let
 
   paxctl = callPackage ../os-specific/linux/paxctl { };
 
+  pax-utils = callPackage ../os-specific/linux/pax-utils { };
+
   pcmciaUtils = callPackage ../os-specific/linux/pcmciautils {
     firmware = config.pcmciaUtils.firmware or [];
     config = config.pcmciaUtils.config or null;
-- 
GitLab


From 2a462ff6ae48465d744755441ddfa2c532a2886c Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 21 Feb 2014 19:56:35 +0000
Subject: [PATCH 1491/3789] firefox: Update from 27.0 -> 27.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 c0cfb60420b..e7aedc6c009 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -17,9 +17,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "27.0";
+  firefoxVersion = "27.0.1";
 
-  xulVersion = "27.0"; # this attribute is used by other packages
+  xulVersion = "27.0.1"; # this attribute is used by other packages
 
 
   src = fetchurl {
@@ -29,7 +29,7 @@ rec {
         # 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"
     ];
-    sha1 = "ec2031385237e30be829817ac79caa8e80cc2a14";
+    sha256 = "197icqnk3mpizb8c2iz86gfw3kh7x4x3szzd6s3f43x9hmyyafvh";
   };
 
   commonConfigureFlags =
-- 
GitLab


From 92794f775a6e7ab7639d6548a6234ab8401648ae Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 21 Feb 2014 20:21:10 +0000
Subject: [PATCH 1492/3789] firefox: Fix hash

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index e7aedc6c009..db89903c3ad 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -29,7 +29,7 @@ rec {
         # 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 = "197icqnk3mpizb8c2iz86gfw3kh7x4x3szzd6s3f43x9hmyyafvh";
+    sha256 = "13qd53yf8dn9m03p4x5ml9h3mys60nba5nz82lcvaq7ycp1pl1bn";
   };
 
   commonConfigureFlags =
-- 
GitLab


From 40b8b3206e329ebe6725e25b7d057af75fc666bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 21 Feb 2014 23:26:56 +0100
Subject: [PATCH 1493/3789] fix remaining broken python packages due to
 refactoring

---
 pkgs/applications/graphics/mirage/default.nix | 4 ----
 pkgs/top-level/python-packages.nix            | 9 ++++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix
index cd5388c1b88..67b91fd6857 100644
--- a/pkgs/applications/graphics/mirage/default.nix
+++ b/pkgs/applications/graphics/mirage/default.nix
@@ -9,10 +9,6 @@ buildPythonPackage rec {
       sha256 = "d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c";
     };
 
-    postInstall = ''
-      mv $out/lib/${python.libPrefix}/site-packages/*.egg/share $out
-    '';
-
     doCheck = false;
 
     buildInputs = [ stdenv libX11 gettext ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 73919c330ba..7f5f176ebc3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1594,7 +1594,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     buildInputs = [ fudge nose ];
   };
 
-  fedora_cert = buildPythonPackage (rec {
+  fedora_cert = stdenv.mkDerivation (rec {
     name = "fedora-cert-0.5.9.2";
     meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
 
@@ -1602,10 +1602,12 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2";
       sha256 = "105swvzshgn3g6bjwk67xd8pslnhpxwa63mdsw6cl4c7cjp2blx9";
     };
-    installCommand = "make install";
-    propagatedBuildInputs = [ python_fedora ];
+
+    propagatedBuildInputs = [ python python_fedora wrapPython ];
     postInstall = "mv $out/bin/fedpkg $out/bin/fedora-cert-fedpkg";
     doCheck = false;
+
+    postFixup = "wrapPythonPrograms";
   });
 
   fedpkg = buildPythonPackage (rec {
@@ -6176,6 +6178,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     # TODO: add ATLAS=${pkgs.atlas}
     preConfigure = ''
       export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack}
+      sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
     '';
 
     setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
-- 
GitLab


From 5306d974ce8aa96b6a95702b9d1565075b77654d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Feb 2014 16:29:01 +0100
Subject: [PATCH 1494/3789] haskell-aeson-0.7.x: fix build with older versions
 of ByteString

Closes <https://github.com/bos/aeson/issues/185>.
Closes <https://github.com/ekmett/lens/issues/397>.
---
 pkgs/development/libraries/haskell/aeson/0.7.0.1.nix | 11 ++++++-----
 pkgs/top-level/haskell-packages.nix                  |  4 +++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix
index 551f62d0756..dd58c12473d 100644
--- a/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix
+++ b/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix
@@ -1,6 +1,7 @@
-{ cabal, attoparsec, deepseq, dlist, hashable, HUnit, mtl
-, QuickCheck, scientific, syb, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, text, time, unorderedContainers, vector
+{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit
+, mtl, QuickCheck, scientific, syb, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2, text, time
+, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
@@ -8,8 +9,8 @@ cabal.mkDerivation (self: {
   version = "0.7.0.1";
   sha256 = "17cwclxh2f2m0mvs867lfzrv14gd9grw8a9f8l95j3nd76y58kb3";
   buildDepends = [
-    attoparsec deepseq dlist hashable mtl scientific syb text time
-    unorderedContainers vector
+    attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
+    text time unorderedContainers vector
   ];
   testDepends = [
     attoparsec HUnit QuickCheck testFramework testFrameworkHunit
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index dd996a0d576..ba3f60d7246 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -527,7 +527,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   adjunctions = callPackage ../development/libraries/haskell/adjunctions {};
 
   aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {};
-  aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix {};
+  aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix {
+    blazeBuilder = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") then self.blazeBuilder else null;
+  };
   aeson = self.aeson_0_6_2_1;
 
   aesonLens = callPackage ../development/libraries/haskell/aeson-lens {};
-- 
GitLab


From 2e079fd608e733d692ccbb73f3623c18b3a1ce42 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Feb 2014 16:29:32 +0100
Subject: [PATCH 1495/3789] haskell-aeson-0.7.x: enable test suite

---
 pkgs/development/libraries/haskell/aeson/0.7.0.1.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix
index dd58c12473d..4b5c137d89b 100644
--- a/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix
+++ b/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix
@@ -16,7 +16,6 @@ cabal.mkDerivation (self: {
     attoparsec HUnit QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2 text time unorderedContainers vector
   ];
-  doCheck = false;
   meta = {
     homepage = "https://github.com/bos/aeson";
     description = "Fast JSON parsing and encoding";
-- 
GitLab


From 269955a521a1855005a394a3b16d1d6d21ff7deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 21 Feb 2014 23:46:45 +0100
Subject: [PATCH 1496/3789] pythonPackages.psycopg2: 2.5.1 -> 2.5.2

---
 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 7f5f176ebc3..5772d7a7ed5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4798,14 +4798,14 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   psycopg2 = buildPythonPackage rec {
-    name = "psycopg2-2.5.1";
+    name = "psycopg2-2.5.2";
 
     # error: invalid command 'test'
     doCheck = false;
 
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.1.tar.gz";
-      sha256 = "1v7glzzzykbaqj7dhpr0qds9cf4maxmn7f5aazpqnbg0ly40r9v5";
+      url = "https://pypi.python.org/packages/source/p/psycopg2/${name}.tar.gz";
+      sha256 = "0bmxlmi9k995n6pz16awjaap0y02y1v2d31jbxhkqv510f3jsf2h";
     };
 
     propagatedBuildInputs = [ pkgs.postgresql ];
-- 
GitLab


From 9ad8ce91a336b718f779cf9ff21514b8207785a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 22 Feb 2014 00:55:26 +0100
Subject: [PATCH 1497/3789] New expression: ghc-events-analyze

---
 .../haskell/ghc-events-analyze/default.nix    | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/ghc-events-analyze/default.nix

diff --git a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix
new file mode 100644
index 00000000000..7744a3071cc
--- /dev/null
+++ b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix
@@ -0,0 +1,20 @@
+{ cabal, diagramsLib, diagramsSvg, filepath, ghcEvents, lens, mtl
+, optparseApplicative, parsec, SVGFonts, thLift, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "ghc-events-analyze";
+  version = "0.2.0";
+  sha256 = "04px1p0pnx54414m7sdpmdhj2dpsi1z8bjm8jq2yzh66854xiyh4";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    diagramsLib diagramsSvg filepath ghcEvents lens mtl
+    optparseApplicative parsec SVGFonts thLift transformers
+  ];
+  meta = {
+    description = "Analyze and visualize event logs";
+    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 dd996a0d576..b89865c5fc2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1134,6 +1134,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   ghcEvents = callPackage ../development/libraries/haskell/ghc-events {};
 
+  ghcEventsAnalyze = callPackage ../development/tools/haskell/ghc-events-analyze {};
+
   ghcHeapView = callPackage ../development/libraries/haskell/ghc-heap-view {
     cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled
   };
-- 
GitLab


From 864db9c0881a4be91e3bd04bb152c46f16a28492 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2014 23:33:22 +0100
Subject: [PATCH 1498/3789] haskell-HTTP: update to version 4000.2.11

---
 .../libraries/haskell/HTTP/{4000.2.10.nix => 4000.2.11.nix} | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/HTTP/{4000.2.10.nix => 4000.2.11.nix} (88%)

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.11.nix
similarity index 88%
rename from pkgs/development/libraries/haskell/HTTP/4000.2.10.nix
rename to pkgs/development/libraries/haskell/HTTP/4000.2.11.nix
index c893d2f1e75..f48642462c6 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.11.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
-  version = "4000.2.10";
-  sha256 = "1l97l6am45xgyg0dyxpfgbxc00wp8ishm7spd0hbgmwc5sgnvppg";
+  version = "4000.2.11";
+  sha256 = "17jlmh3v6k0mhd9nh1y5pf2br17lkx4wp9sa7q81wvprw998nw97";
   buildDepends = [ mtl network parsec ];
   testDepends = [
     caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ba3f60d7246..02e93b3360e 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_5;
     hashable     = self.hashable_1_2_1_0;
     html         = self.html_1_0_1_2;
-    HTTP         = self.HTTP_4000_2_10;
+    HTTP         = self.HTTP_4000_2_11;
     HUnit        = self.HUnit_1_2_5_2;
     mtl          = self.mtl_2_1_2;
     network      = self.network_2_4_2_2;
@@ -1305,8 +1305,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_10 = callPackage ../development/libraries/haskell/HTTP/4000.2.10.nix {};
-  HTTP = self.HTTP_4000_2_10;
+  HTTP_4000_2_11 = callPackage ../development/libraries/haskell/HTTP/4000.2.11.nix {};
+  HTTP = self.HTTP_4000_2_11;
 
   httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {};
 
-- 
GitLab


From 007611cf4bdf2cea29f6b6db379ba543feb945e7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2014 23:33:28 +0100
Subject: [PATCH 1499/3789] haskell-git-annex: update to version 5.20140221

---
 .../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 fb00474e567..3019785a40c 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
@@ -15,8 +15,8 @@
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140210";
-  sha256 = "0l5fny743v27yv7spppms64qca0mizh776b6wv8wca0wmcbc6j88";
+  version = "5.20140221";
+  sha256 = "0z6awqbk6kagssx26ddixbrl381c1kmsmlgaqmx087g4rwp43wqb";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 1cfc55518b97d33243baf02ed95aadfb69a46d59 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2014 23:33:29 +0100
Subject: [PATCH 1500/3789] haskell-HList: update to version 0.3.4.0

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

diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix
index aafa2fae825..fda43c09baf 100644
--- a/pkgs/development/libraries/haskell/HList/default.nix
+++ b/pkgs/development/libraries/haskell/HList/default.nix
@@ -1,12 +1,12 @@
 { cabal, cmdargs, diffutils, doctest, filepath, hspec, lens, mtl
-, syb
+, syb, tagged
 }:
 
 cabal.mkDerivation (self: {
   pname = "HList";
-  version = "0.3.2.0";
-  sha256 = "1cv27y8jg38yvfca83zn3fzq7mkzhqw7j1y7kg5fkfh4wd8ixs1f";
-  buildDepends = [ mtl ];
+  version = "0.3.4.0";
+  sha256 = "0jx0bfsc17c6bx621n7k0wfa5s59kcpi45p6wr8g4gyw846hjw9q";
+  buildDepends = [ mtl tagged ];
   testDepends = [ cmdargs doctest filepath hspec lens mtl syb ];
   buildTools = [ diffutils ];
   doCheck = false;
-- 
GitLab


From 358f4de889ea12367d1104a9ae2fee469630f050 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2014 23:33:30 +0100
Subject: [PATCH 1501/3789] haskell-amqp: update to version 0.8.1

---
 .../development/libraries/haskell/amqp/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix
index 432d353a0af..200a736f331 100644
--- a/pkgs/development/libraries/haskell/amqp/default.nix
+++ b/pkgs/development/libraries/haskell/amqp/default.nix
@@ -1,18 +1,20 @@
-{ cabal, binary, clock, dataBinaryIeee754, hspec, hspecExpectations
-, network, split, text, xml
+{ cabal, binary, clock, connection, dataBinaryIeee754, hspec
+, hspecExpectations, monadControl, network, split, text, xml
 }:
 
 cabal.mkDerivation (self: {
   pname = "amqp";
-  version = "0.7.0";
-  sha256 = "09zazmbdw8nphbjkmixn2dpwdgkjqjfbn6jv522ykvrcnsn35kc4";
+  version = "0.8.1";
+  sha256 = "10infzs2siw9vv8jgsndv7c82bsh22cs2drrb73nxpwf73hy3rzm";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary clock dataBinaryIeee754 network split text xml
+    binary clock connection dataBinaryIeee754 monadControl network
+    split text xml
   ];
   testDepends = [
-    binary dataBinaryIeee754 hspec hspecExpectations network split text
+    binary clock connection dataBinaryIeee754 hspec hspecExpectations
+    network split text
   ];
   meta = {
     homepage = "https://github.com/hreinhardt/amqp";
-- 
GitLab


From ca3491f514f02b4c1a22e6024f52b7adfcf05816 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2014 23:33:31 +0100
Subject: [PATCH 1502/3789] haskell-classy-prelude: update to version 0.8.0.1

---
 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 f5429fb024d..abc0841c58e 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.8.0";
-  sha256 = "02zf6v7a6bjf9z391bravx10mw0w4m4p5b78zap08z2i6fk5h91g";
+  version = "0.8.0.1";
+  sha256 = "0mj6zz53w6irs16w1pk65imhvnhp1rq3vq8s1n1xkf9gr13v3y9r";
   buildDepends = [
     basicPrelude chunkedData enclosedExceptions hashable liftedBase
     monoTraversable semigroups systemFilepath text time transformers
-- 
GitLab


From b4cc157cb590a3fd03d8296abb4ca364e5d949f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2014 23:33:33 +0100
Subject: [PATCH 1503/3789] haskell-dns: update to version 1.2.0

---
 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 5434db27087..5b2d99fb90e 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.1.1";
-  sha256 = "1vyi0rqddaqpnh87gjracp0j3f7ai18qzr6zl6rjkszw3zfngww9";
+  version = "1.2.0";
+  sha256 = "1pzwvb1qycjw6qw34xhd4ap9jl0cc79d3i09b23bg0vqcz80vmpr";
   buildDepends = [
     attoparsec attoparsecConduit binary blazeBuilder conduit iproute
     mtl network networkConduit random
-- 
GitLab


From f7ad96cbb5c4831317ff03b289dc1ba1ed3eebfc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2014 23:33:34 +0100
Subject: [PATCH 1504/3789] haskell-hamlet: update to version 1.1.9

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

diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index b393aed07d5..f7456f1fdaf 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.1.8";
-  sha256 = "093igcaycg2d29ncj9l8qbzi21drynjk8kvqfl70zqvgsm8nai7x";
+  version = "1.1.9";
+  sha256 = "194a4qnmpgralhvrv6813qfjjy80919famh824lyl9iryqwsbfkc";
   buildDepends = [
     blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare
     systemFileio systemFilepath text time
-- 
GitLab


From 36bc104279452ecb18cc5c1e4918db037930cbdb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2014 23:33:35 +0100
Subject: [PATCH 1505/3789] haskell-haskell-names: update to version 0.3.2.5

---
 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 4d5e8388ea2..db9e92fc8ce 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.2.4";
-  sha256 = "1m3p64kkm8zv2diwila0zdincykavf2fvxpqzpsmfndwb24f5b3p";
+  version = "0.3.2.5";
+  sha256 = "1jp3109b742gr6ii7syacl167i1i91xsyw0200ghaad3ymrqkcvq";
   buildDepends = [
     aeson Cabal dataLens dataLensTemplate filepath haskellPackages
     haskellSrcExts hseCpp mtl tagged transformers traverseWithClass
-- 
GitLab


From d55f488a6134264d0718b7d79df9cc9e81970e9c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2014 23:33:36 +0100
Subject: [PATCH 1506/3789] haskell-haskell-packages: update to version 0.2.3.4

---
 .../libraries/haskell/haskell-packages/default.nix        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/haskell-packages/default.nix b/pkgs/development/libraries/haskell/haskell-packages/default.nix
index 537ff52e3ff..4081e246a34 100644
--- a/pkgs/development/libraries/haskell/haskell-packages/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-packages/default.nix
@@ -1,13 +1,13 @@
-{ cabal, aeson, Cabal, deepseq, EitherT, filepath, haskellSrcExts
+{ cabal, aeson, Cabal, deepseq, either, filepath, haskellSrcExts
 , hseCpp, mtl, optparseApplicative, tagged
 }:
 
 cabal.mkDerivation (self: {
   pname = "haskell-packages";
-  version = "0.2.3.3";
-  sha256 = "1i3x392dwryhw6k02bd2r9wn9iwwmcqzjhk7gx5lx1vhyb470qr2";
+  version = "0.2.3.4";
+  sha256 = "0qj5n1yc481n5c8gi5dgk22pxj58gf7z30621spr7gwlv001sk1y";
   buildDepends = [
-    aeson Cabal deepseq EitherT filepath haskellSrcExts hseCpp mtl
+    aeson Cabal deepseq either filepath haskellSrcExts hseCpp mtl
     optparseApplicative tagged
   ];
   meta = {
-- 
GitLab


From 2d8aa999c33dbbc6f6750e24750b984b22694b59 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2014 23:33:37 +0100
Subject: [PATCH 1507/3789] haskell-http-conduit: update to version 2.0.0.7

---
 .../haskell/http-conduit/default.nix          | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index 8719028bf3d..3f938332c02 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -1,30 +1,23 @@
-{ cabal, asn1Data, base64Bytestring, blazeBuilder
-, blazeBuilderConduit, caseInsensitive, certificate, conduit
-, connection, cookie, cprngAes, dataDefaultClass, deepseq, failure
-, filepath, hspec, httpClient, httpClientConduit
+{ cabal, blazeBuilder, caseInsensitive, conduit, connection, cookie
+, dataDefaultClass, hspec, httpClient, httpClientConduit
 , httpClientMultipart, httpClientTls, httpTypes, HUnit, liftedBase
-, mimeTypes, monadControl, mtl, network, networkConduit
-, publicsuffixlist, random, regexCompat, resourcet, socks, text
-, time, transformers, transformersBase, utf8String, void, wai, warp
-, warpTls, zlibConduit
+, network, networkConduit, resourcet, text, time, transformers
+, utf8String, wai, warp, warpTls
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "2.0.0.6";
-  sha256 = "0jgv17cxf8javcy4vcaayw9ajbr7dj43pba23xr6416hs6cv21hl";
+  version = "2.0.0.7";
+  sha256 = "0rizmshpypllfbmipbrad7hkrs2asx0ijfhr53w3pj58w6h80m0i";
   buildDepends = [
     conduit httpClient httpClientConduit httpClientTls httpTypes
     liftedBase resourcet transformers
   ];
   testDepends = [
-    asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
-    caseInsensitive certificate conduit connection cookie cprngAes
-    dataDefaultClass deepseq failure filepath hspec httpClient
-    httpClientMultipart httpTypes HUnit liftedBase mimeTypes
-    monadControl mtl network networkConduit publicsuffixlist random
-    regexCompat resourcet socks text time transformers transformersBase
-    utf8String void wai warp warpTls zlibConduit
+    blazeBuilder caseInsensitive conduit connection cookie
+    dataDefaultClass hspec httpClient httpClientMultipart httpTypes
+    HUnit liftedBase network networkConduit text time transformers
+    utf8String wai warp warpTls
   ];
   doCheck = false;
   meta = {
-- 
GitLab


From aa654a5857d0f7037d46ba145913af42738ef69d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2014 23:33:38 +0100
Subject: [PATCH 1508/3789] haskell-mono-traversable: update to version 0.3.0.2

---
 .../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 03eb64da753..9c6e2c70cdf 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.3.0.1";
-  sha256 = "14vh6qhl6v46r857pfwkyhn8g8dh7q7vbm6z64zq1lhdw91ywn4f";
+  version = "0.3.0.2";
+  sha256 = "1aa6dm75ff822fazdnjfgggy3y2zxa8vy4dn2vvx0y8i9pgh0m0l";
   buildDepends = [
     comonad hashable semigroupoids semigroups text transformers
     unorderedContainers vector vectorInstances
-- 
GitLab


From 6522d4254f63a4c7ed3435134e3f7e631d62f883 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2014 23:35:28 +0100
Subject: [PATCH 1509/3789] haskell-primitive: update to version 0.5.2.1

---
 .../libraries/haskell/primitive/0.5.2.1.nix        | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/primitive/0.5.2.1.nix

diff --git a/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix
new file mode 100644
index 00000000000..8f1090c09b1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix
@@ -0,0 +1,14 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "primitive";
+  version = "0.5.2.1";
+  sha256 = "1vn3y5gh4lwvgvklhn8k1z7gxjy27ik621f4gpa9cb7gqa0nnl8f";
+  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 02e93b3360e..0a81703b035 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -177,7 +177,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     alex         = self.alex_3_1_3;
     haddock      = self.haddock_2_13_2_1;
     happy        = self.happy_1_19_3;
-    primitive    = self.primitive_0_5_1_0;      # semi-official, but specified
+    primitive    = self.primitive_0_5_2_1;      # semi-official, but specified
   };
 
   haskellPlatformArgs_2013_2_0_0 = self : {
@@ -1958,8 +1958,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_1_0 = callPackage ../development/libraries/haskell/primitive/0.5.1.0.nix   {};
-  primitive = self.primitive_0_5_1_0;
+  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 {};
 
-- 
GitLab


From a35d4a9d4e2d4435e53fdfd1698f2118828c773f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 22 Feb 2014 10:38:13 +0100
Subject: [PATCH 1510/3789] unstable job: don't depend on glib-tested yet
 (fails)

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 84ae44ec449..cb22983e6c3 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -35,8 +35,10 @@ let
               # Ensure that X11/GTK+ are in order.
               jobs.thunderbird.x86_64-linux
               jobs.thunderbird.i686-linux
+              /* not ready yet
               jobs.glib-tested.x86_64-linux # standard glib doesn't do checks
               jobs.glib-tested.i686-linux
+              */
             ];
         };
 
-- 
GitLab


From f21abed131198355b7623613472dd30330155d28 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Fri, 21 Feb 2014 12:40:05 +0100
Subject: [PATCH 1511/3789] nixos: Assign uid/gid to dictd's service user.

---
 nixos/modules/misc/ids.nix            | 2 ++
 nixos/modules/services/misc/dictd.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 7e4c9b9b948..95b7683ba2f 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -113,6 +113,7 @@
       munin = 102;
       logcheck = 103;
       nix-ssh = 104;
+      dictd = 105;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -204,6 +205,7 @@
       connman = 94;
       munin = 95;
       keys = 96;
+      dictd = 105;
 
       # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix
index b84fbb3e128..fd68f847010 100644
--- a/nixos/modules/services/misc/dictd.nix
+++ b/nixos/modules/services/misc/dictd.nix
@@ -43,10 +43,12 @@ with pkgs.lib;
         group = "dictd";
         description = "DICT.org dictd server";
         home = "${dictdb}/share/dictd";
+        uid = config.ids.uids.dictd;
       };
 
     users.extraGroups = singleton
       { name = "dictd";
+        gid = config.ids.gids.dictd;
       };
 
     jobs.dictd =
-- 
GitLab


From afaee01ed395f254c2a64d00dbc32d4dba808145 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Fri, 14 Feb 2014 23:32:12 +0800
Subject: [PATCH 1512/3789] pycairo: Update to 1.10.0 and support both python 2
 and python 3

Close #1802.
---
 .../python-modules/pycairo/default.nix        | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 1e8ceed6878..54a50a2b71f 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -1,11 +1,24 @@
 { stdenv, fetchurl, python, pkgconfig, cairo, x11 }:
 
-stdenv.mkDerivation {
-  name = "pycairo-1.8.8";
-  src = fetchurl {
-    url = http://cairographics.org/releases/pycairo-1.8.8.tar.gz;
-    sha256 = "0q18hd4ai4raljlvd76ylgi30kxpr2qq83ka6gzwh0ya8fcmjlig";
-  };
+stdenv.mkDerivation rec {
+  version = "1.10.0";
+  name = "pycairo-${version}";
+  src = if python.is_py3k or false
+    then fetchurl {
+      url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2";
+      sha256 = "1gjkf8x6hyx1skq3hhwcbvwifxvrf9qxis5vx8x5igmmgs70g94s";
+    }
+    else fetchurl {
+      url = "http://cairographics.org/releases/py2cairo-${version}.tar.bz2";
+      sha256 = "0cblk919wh6w0pgb45zf48xwxykfif16qk264yga7h9fdkq3j16k";
+    };
 
   buildInputs = [ python pkgconfig cairo x11 ];
+  preConfigure = ''
+    sed -e 's@#!/usr/bin/env python@#!${python.executable}@' -i waf
+    head waf
+  '';
+  configurePhase = "${python.executable} waf configure --prefix=$out";
+  buildPhase = "${python.executable} waf";
+  installPhase = "${python.executable} waf install";
 }
-- 
GitLab


From fb1028813c948bd017e9bcaba06654b30924fc70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 22 Feb 2014 17:04:34 +0100
Subject: [PATCH 1513/3789] subversion: minor bump to fix CVE-2014-0032

---
 pkgs/applications/version-management/subversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 7a27611496b..e699b82f2b0 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null;
 
 stdenv.mkDerivation rec {
 
-  version = "1.8.5";
+  version = "1.8.8";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "mirror://apache/subversion/${name}.tar.bz2";
-    sha256 = "0r3mxrrlr1l9s2nh829bf0qmrfaafkq3di6ndr10j76sxkqjnlpx";
+    sha256 = "1cqxwydjidyf59y4lgkxl7bra1sy28abqm2mi5971qjsv0f96s8m";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]
-- 
GitLab


From 0f4942ecbc7d7dcd4fbfaed31dc67936e4ccce2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 22 Feb 2014 17:13:40 +0100
Subject: [PATCH 1514/3789] gnome3.libgee: downgrade to latest stable, add meta

Tests started to fail, and stable is preferred anyway.
Cf. #1770 discussion.
---
 pkgs/desktops/gnome-3/core/libgee/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix
index 03922778652..c7ed541082d 100644
--- a/pkgs/desktops/gnome-3/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgee/default.nix
@@ -1,11 +1,14 @@
 { stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }:
-
+let
+  ver_maj = "0.12";
+  ver_min = "0";
+in
 stdenv.mkDerivation rec {
-  name = "libgee-0.13.90";
+  name = "libgee-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = "https://download.gnome.org/sources/libgee/0.13/${name}.tar.xz";
-    sha256 = "9496f8fb249f7850db32b50e8675998db8b5276d4568cbf043faa7e745d7b7d6";
+    url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz";
+    sha256 = "19bf94ia1h5z8h0hdhwcd2b2p6ngffirg0dai7pdb98dzriys1ni";
   };
 
   doCheck = true;
@@ -15,6 +18,8 @@ stdenv.mkDerivation rec {
   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;
   };
 }
-- 
GitLab


From 5a8a3195a0d7dcdb53cb21fef367aac07968380a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 22 Feb 2014 17:40:01 +0100
Subject: [PATCH 1515/3789] xorg.xcb-util-wm: minor update 0.4.0 -> .1

---
 pkgs/servers/x11/xorg/default.nix | 6 +++---
 pkgs/servers/x11/xorg/extra.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 a0cc0c7b148..be08477a1d2 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1180,11 +1180,11 @@ let
   })) // {inherit gperf m4 libxcb xproto ;};
 
   xcbutilwm = (stdenv.mkDerivation ((if overrides ? xcbutilwm then overrides.xcbutilwm else x: x) {
-    name = "xcb-util-wm-0.4.0";
+    name = "xcb-util-wm-0.4.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.0.tar.bz2;
-      sha256 = "07zmlaaqkasihmkfwcac4wclb8zws915inz57y3kr3frywc7ryb6";
+      url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2;
+      sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
   })) // {inherit gperf m4 libxcb xproto ;};
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 90c8e489e1e..867e050bce0 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -5,5 +5,5 @@ http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2
-http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.0.tar.bz2
+http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2
 http://xorg.freedesktop.org/releases/individual/util/util-macros-1.17.tar.bz2
-- 
GitLab


From c541462cb4fc901578a531f326eb8c5b55eb09a5 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sat, 22 Feb 2014 11:31:10 +0000
Subject: [PATCH 1516/3789] haskellPackages.fb: New expression

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

diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix
new file mode 100644
index 00000000000..122c2329668
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fb/default.nix
@@ -0,0 +1,32 @@
+{ cabal, aeson, attoparsec, attoparsecConduit, base16Bytestring
+, base64Bytestring, cereal, conduit, cryptoApi, cryptohash
+, cryptohashCryptoapi, dataDefault, hspec, httpConduit, httpTypes
+, HUnit, liftedBase, monadControl, monadLogger, QuickCheck
+, resourcet, text, time, transformers, transformersBase
+, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "fb";
+  version = "0.15.2";
+  sha256 = "1nkgw4978kwhqs7h6rlsspx2f9dbmsywjn57v2fg1c1lg271rz1d";
+  buildDepends = [
+    aeson attoparsec attoparsecConduit base16Bytestring
+    base64Bytestring cereal conduit cryptoApi cryptohash
+    cryptohashCryptoapi dataDefault httpConduit httpTypes liftedBase
+    monadControl monadLogger resourcet text time transformers
+    transformersBase unorderedContainers
+  ];
+  testDepends = [
+    aeson conduit dataDefault hspec httpConduit HUnit liftedBase
+    monadControl QuickCheck text time transformers
+  ];
+  meta = {
+    homepage = "https://github.com/meteficha/fb";
+    description = "Bindings to Facebook's API";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+  # The tests require Facebook API keys
+  doCheck = false;
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0a81703b035..21f608b8b74 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1083,6 +1083,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   fastLogger = callPackage ../development/libraries/haskell/fast-logger {};
 
+  fb = callPackage ../development/libraries/haskell/fb {};
+
   fclabels = callPackage ../development/libraries/haskell/fclabels {};
 
   FerryCore = callPackage ../development/libraries/haskell/FerryCore {};
-- 
GitLab


From e310dd17745eebe8978f5c20c6a600642d7e3a7c Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Sat, 22 Feb 2014 16:49:40 +0100
Subject: [PATCH 1517/3789] searx: new package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5772d7a7ed5..e9c7668c151 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4915,11 +4915,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   Babel = buildPythonPackage (rec {
-    name = "Babel-0.9.6";
+    name = "Babel-1.3";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/B/Babel/${name}.tar.gz";
-      sha256 = "4a3a085ecf1fcd2736573538ffa114f1f4331b3bbbdd69381e6e172c49c9750f";
+      sha256 = "0bnin777lc53nxd1hp3apq410jj5wx92n08h7h4izpl4f4sx00lz";
     };
 
     buildInputs = [ pytz ];
@@ -8526,6 +8526,73 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  searx = buildPythonPackage rec {
+    name = "searx-${version}";
+    version = "0.2.0";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/s/searx/${name}.tar.gz";
+      sha256 = "19hxjg3vhq7fygcvfhsr3i40c8kbi7i76ym9cv2s03b3zijd38w0";
+    };
+
+    propagatedBuildInputs = [ pyyaml lxml grequests flaskbabel flask requests gevent speaklater Babel pytz ];
+
+    meta = {
+      homepage = https://github.com/asciimoo/searx;
+      description = "A privacy-respecting, hackable metasearch engine.";
+      license = stdenv.lib.licenses.agpl3Plus;
+    };
+  };
+
+  grequests = buildPythonPackage rec {
+    name = "grequests-0.2.0";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/g/grequests/${name}.tar.gz";
+      sha256 = "0lafzax5igbh8y4x0krizr573wjsxz7bhvwygiah6qwrzv83kv5c";
+    };
+
+    buildInputs = [ requests gevent ];
+
+    meta = {
+      description = "GRequests allows you to use Requests with Gevent to make asyncronous HTTP Requests easily.";
+      homepage = https://github.com/kennethreitz/grequests;
+      license = "bsd";
+    };
+  };
+
+  flaskbabel = buildPythonPackage rec {
+    name = "Flask-Babel-0.9";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/F/Flask-Babel/${name}.tar.gz";
+      sha256 = "0k7vk4k54y55ma0nx2k5s0phfqbriwslhy5shh3b0d046q7ibzaa";
+    };
+
+    buildInputs = [ flask jinja2 speaklater Babel pytz ];
+
+    meta = {
+      description = "Adds i18n/l10n support to Flask applications";
+      homepage = https://github.com/mitsuhiko/flask-babel;
+      license = "bsd";
+    };
+  };
+
+  speaklater = buildPythonPackage rec {
+    name = "speaklater-1.3";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/s/speaklater/${name}.tar.gz";
+      sha256 = "1ab5dbfzzgz6cnz4xlwx79gz83id4bhiw67k1cgqrlzfs0va7zjr";
+    };
+
+    meta = {
+      description = "implements a lazy string for python useful for use with gettext";
+      homepage = https://github.com/mitsuhiko/speaklater;
+      license = "bsd";
+    };
+  };
+
 # python2.7 specific eggs
 } // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") {
 
-- 
GitLab


From e07c7d233ba6415475f8e52ca59470ef2db611d1 Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Sat, 22 Feb 2014 18:03:28 +0100
Subject: [PATCH 1518/3789] add matejc as maintainer

---
 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 e9c7668c151..b599279d884 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8541,6 +8541,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       homepage = https://github.com/asciimoo/searx;
       description = "A privacy-respecting, hackable metasearch engine.";
       license = stdenv.lib.licenses.agpl3Plus;
+      maintainers = [ stdenv.lib.maintainers.matejc ];
     };
   };
 
@@ -8558,6 +8559,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       description = "GRequests allows you to use Requests with Gevent to make asyncronous HTTP Requests easily.";
       homepage = https://github.com/kennethreitz/grequests;
       license = "bsd";
+      maintainers = [ stdenv.lib.maintainers.matejc ];
     };
   };
 
@@ -8575,6 +8577,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       description = "Adds i18n/l10n support to Flask applications";
       homepage = https://github.com/mitsuhiko/flask-babel;
       license = "bsd";
+      maintainers = [ stdenv.lib.maintainers.matejc ];
     };
   };
 
@@ -8590,6 +8593,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       description = "implements a lazy string for python useful for use with gettext";
       homepage = https://github.com/mitsuhiko/speaklater;
       license = "bsd";
+      maintainers = [ stdenv.lib.maintainers.matejc ];
     };
   };
 
-- 
GitLab


From a188cfd37da21481a6e799593f713d2f1b4fce0b Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sat, 22 Feb 2014 11:37:10 +0000
Subject: [PATCH 1519/3789] postgresql: Update to latest releases

---
 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 b027d0093e8..6f2fd4fa2dc 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.19"; in
+let version = "8.4.20"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "f744d04a5d9feeea516fa57fea92be5568527bab03a84cf660a06ce90f90dcea";
+    sha256 = "e84e46083a6accd2bf37f0bd7253415649afcafc49f2564bc8481c10ed90d7c1";
   };
 
   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 40878fc6e78..f27fdfb9c5e 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.15"; in
+let version = "9.0.16"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "a45acd27d546e425911ecd371247066be5dafd96304e50e0708c84b918c28f9d";
+    sha256 = "900f6ab00fc36c94b17430e7cb22499708025da1e34d7a70aefaf9a875f0fabf";
   };
 
   buildInputs = [ zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 9eefe708798..4d1bdbf17ab 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.11"; in
+let version = "9.1.12"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "ccbc35aae1490ee5878b97a6aea48dad7465cdad296b380542e4303b68cc6f74";
+    sha256 = "0b267ebab5feb39ad6ef945b9588787886e7f7e5284467921d18cc7b76bcb383";
   };
 
   buildInputs = [ zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index 8f78dffb4ba..3414424e8ca 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.6"; in
+let version = "9.2.7"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "4ba98053a66e5678af93dbc2956e8b04623f759e174f48940c41f4251cf0f886";
+    sha256 = "83c042c3f61c69b176d3e4344e59104f844bc8b8628dad2bb9022a64cf5afe86";
   };
 
   buildInputs = [ zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index cb33c6f2921..711bdade813 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline }:
 
-let version = "9.3.2"; in
+let version = "9.3.3"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "700da51a71857e092f6af1c85fcd86b46d7d5cd2f2ba343cafb1f206c20232d7";
+    sha256 = "e925d8abe7157bd8bece6b7c0dd0c343d87a2b4336f85f4681ce596af99c3879";
   };
 
   buildInputs = [ zlib readline ];
-- 
GitLab


From 72fb60117edd01e8fda94ae57eee7b042fe2564c Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Sat, 4 Jan 2014 01:28:24 +0100
Subject: [PATCH 1520/3789] twmn: new package

---
 pkgs/applications/misc/twmn/default.nix | 28 +++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pkgs/applications/misc/twmn/default.nix

diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
new file mode 100644
index 00000000000..1c0a44da7eb
--- /dev/null
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -0,0 +1,28 @@
+{ fetchurl, stdenv, fetchgit, qt4, pkgconfig, boost, dbus }:
+
+stdenv.mkDerivation rec {
+  rev = "9f52882688ba03d7aaab2e3fd83cb05cfbf1a374";
+  name = "twmn-${rev}";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/sboli/twmn.git";
+    sha256 = "1jd2y0ydcpjdmjbx77lw35710sqfwbgyrnpv66mi3gwvrbyiwpf3";
+  };
+
+  buildInputs = [ qt4 pkgconfig boost ];
+  propagatedBuildInputs = [ dbus ];
+
+  configurePhase = "qmake";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp bin/* "$out/bin"
+  '';
+
+  meta = {
+    description = "A notification system for tiling window managers.";
+    homepage = "https://github.com/sboli/twmn";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
-- 
GitLab


From 9f06f92fd2b97bbead5e39a9d4ed7fa29f3189fc Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Sat, 22 Feb 2014 17:59:22 +0100
Subject: [PATCH 1521/3789] remove a dot; add matejc as maintainer

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

diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
index 1c0a44da7eb..65c2ccb5ff0 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -21,8 +21,9 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "A notification system for tiling window managers.";
+    description = "A notification system for tiling window managers";
     homepage = "https://github.com/sboli/twmn";
     platforms = with stdenv.lib.platforms; linux;
+    maintainers = [ stdenv.lib.maintainers.matejc ];
   };
 }
-- 
GitLab


From 0df7152c8f7c685f6b3701bcb2900689851ebe68 Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Sat, 22 Feb 2014 18:13:26 +0100
Subject: [PATCH 1522/3789] twmn: add twmn to all-packages.nix

---
 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 c0c4155d606..a4642483648 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8973,6 +8973,8 @@ let
 
   tribler = callPackage ../applications/networking/p2p/tribler { };
 
+  twmn = callPackage ../applications/misc/twmn { };
+
   twinkle = callPackage ../applications/networking/instant-messengers/twinkle {
     ccrtp = ccrtp_1_8;
     libzrtpcpp = libzrtpcpp_1_6;
-- 
GitLab


From fc9022bea1cf99085df4c1f023a69b08dcfcfa99 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 19 Feb 2014 05:19:19 -0600
Subject: [PATCH 1523/3789] firewall: add support for TCP/UDP port ranges

This is useful for packages like mosh, which use a wide UDP port range
by default for incoming connections.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../modules/services/networking/firewall.nix  | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 3c0c51e6ec8..babde3e942b 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -128,6 +128,17 @@ in
         '';
     };
 
+    networking.firewall.allowedTCPPortRanges = mkOption {
+      default = [];
+      example = [ { from = 8999; to = 9003; } ];
+      type = types.listOf (types.attrsOf types.int);
+      description =
+        ''
+          A range of TCP ports on which incoming connections are
+          accepted.
+        '';
+    };
+
     networking.firewall.allowedUDPPorts = mkOption {
       default = [];
       example = [ 53 ];
@@ -138,6 +149,16 @@ in
         '';
     };
 
+    networking.firewall.allowedUDPPortRanges = mkOption {
+      default = [];
+      example = [ { from = 60000; to = 61000; } ];
+      type = types.listOf (types.attrsOf types.int);
+      description =
+        ''
+          Range of open UDP ports.
+        '';
+    };
+
     networking.firewall.allowPing = mkOption {
       default = false;
       type = types.bool;
@@ -322,6 +343,15 @@ in
               ) cfg.allowedTCPPorts
             }
 
+            # Accept connections to the allowed TCP port ranges.
+            ${concatMapStrings (rangeAttr:
+                let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in
+                ''
+                  ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept
+                ''
+              ) cfg.allowedTCPPortRanges
+            }
+
             # Accept packets on the allowed UDP ports.
             ${concatMapStrings (port:
                 ''
@@ -330,6 +360,15 @@ in
               ) cfg.allowedUDPPorts
             }
 
+            # Accept packets on the allowed UDP port ranges.
+            ${concatMapStrings (rangeAttr:
+                let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in
+                ''
+                  ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept
+                ''
+              ) cfg.allowedUDPPortRanges
+            }
+
             # Accept IPv4 multicast.  Not a big security risk since
             # probably nobody is listening anyway.
             #iptables -A nixos-fw -d 224.0.0.0/4 -j nixos-fw-accept
-- 
GitLab


From c895bb910d40c84062c311a18cffb1aea1caae6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 22 Feb 2014 18:20:08 +0100
Subject: [PATCH 1524/3789] xfce4-power-manager: update patch hash (no idea
 what's changed)

---
 pkgs/desktops/xfce/core/xfce4-power-manager.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
index 5f38308f6d4..91ec6b40e23 100644
--- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix
+++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   brightness_patch = fetchurl {
     url = "http://git.xfce.org/xfce/xfce4-power-manager/patch/?id=05d12e12596512f7a31d3cdb4845a69dc2d4c611";
-    sha256 = "0rbldvjwpj93hx59xrmvbdql1pgkbqzjh4vp6gkavn4z6sv535v8";
+    sha256 = "1y8520s0s4d7x1abdwsm5qig4vgm3np7hhagfbdwd5ymiz5nn9mw";
   };
 
   name = "${p_name}-${ver_maj}.${ver_min}";
-- 
GitLab


From 72d3ce1431ec80a69388cd9ea573a91d6f9a3e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 22 Feb 2014 18:29:04 +0100
Subject: [PATCH 1525/3789] pythonPackages.eggdeps: disable tests, they've been
 failing for ages and author is not responding

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b599279d884..b58e84f9efa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7057,6 +7057,9 @@ pythonPackages = modules // import ./python-packages-generated.nix {
        md5 = "2472204a2abd0d8cd4d11ff0fbf36ae7";
      };
 
+     # tests fail, see http://hydra.nixos.org/build/4316603/log/raw
+     doCheck = false;
+
      propagatedBuildInputs = [ zope_interface zope_testing ];
      meta = {
        description = "A tool which computes a dependency graph between active Python eggs";
-- 
GitLab


From 88d490588d336d41b851f15bac8865f4b7bc3a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 22 Feb 2014 18:35:52 +0100
Subject: [PATCH 1526/3789] xorg: add some modules

I was testing whether 10.1 mesa might solve the LLVM RTTI problems,
and it seems mesa will need these (and the problems aren't solved).
---
 pkgs/servers/x11/xorg/default.nix       | 30 +++++++++++++++++++++++++
 pkgs/servers/x11/xorg/tarballs-7.7.list |  3 +++
 2 files changed, 33 insertions(+)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index be08477a1d2..beca7414c36 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -79,6 +79,16 @@ let
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
 
+  dri3proto = (stdenv.mkDerivation ((if overrides ? dri3proto then overrides.dri3proto else x: x) {
+    name = "dri3proto-1.0";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2;
+      sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1";
+    };
+    buildInputs = [pkgconfig ];
+  })) // {inherit ;};
+
   encodings = (stdenv.mkDerivation ((if overrides ? encodings then overrides.encodings else x: x) {
     name = "encodings-1.0.4";
     builder = ./builder.sh;
@@ -909,6 +919,16 @@ let
     buildInputs = [pkgconfig kbproto libX11 ];
   })) // {inherit kbproto libX11 ;};
 
+  libxshmfence = (stdenv.mkDerivation ((if overrides ? libxshmfence then overrides.libxshmfence else x: x) {
+    name = "libxshmfence-1.1";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2;
+      sha256 = "1gnfb1z8sbbdc3xpz1zmm94lv7yvfh4kvip9s5pj37ya4llxphnv";
+    };
+    buildInputs = [pkgconfig xproto ];
+  })) // {inherit xproto ;};
+
   lndir = (stdenv.mkDerivation ((if overrides ? lndir then overrides.lndir else x: x) {
     name = "lndir-1.0.3";
     builder = ./builder.sh;
@@ -959,6 +979,16 @@ let
     buildInputs = [pkgconfig libfontenc freetype xproto zlib ];
   })) // {inherit libfontenc freetype xproto zlib ;};
 
+  presentproto = (stdenv.mkDerivation ((if overrides ? presentproto then overrides.presentproto else x: x) {
+    name = "presentproto-1.0";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/proto/presentproto-1.0.tar.bz2;
+      sha256 = "1kir51aqg9cwazs14ivcldcn3mzadqgykc9cg87rm40zf947sb41";
+    };
+    buildInputs = [pkgconfig ];
+  })) // {inherit ;};
+
   printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) {
     name = "printproto-1.0.5";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 2eb08b1831d..24279ac70f9 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -5,6 +5,8 @@ mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2
 mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2
+mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2
+mirror://xorg/individual/proto/presentproto-1.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2
@@ -50,6 +52,7 @@ mirror://xorg/individual/proto/inputproto-2.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2
 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2
+mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2
 mirror://xorg/individual/lib/libFS-1.0.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2
-- 
GitLab


From 5b223d457e523da555cf7bc293b808f5bab4560f Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Thu, 20 Feb 2014 13:31:16 +0400
Subject: [PATCH 1527/3789] zathura: set default window-icon

---
 pkgs/applications/misc/zathura/core/default.nix | 9 +++++++--
 pkgs/applications/misc/zathura/default.nix      | 7 ++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index b86107890d8..933882c940b 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper, zathura_icon }:
 
 stdenv.mkDerivation rec {
   version = "0.2.7";
@@ -21,7 +21,12 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ];
 
   postInstall = ''
-    wrapProgram "$out/bin/zathura" --prefix PATH ":" "${file}/bin"
+    wrapProgram "$out/bin/zathura" \
+      --prefix PATH ":" "${file}/bin" \
+      --prefix XDG_CONFIG_DIRS ":" "$out/etc"
+
+    mkdir -pv $out/etc
+    echo "set window-icon ${zathura_icon}" > $out/etc/zathurarc
   '';
 
   meta = {
diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index 2ee32f77c1e..f943bff7bf0 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -3,8 +3,11 @@
 rec {
   inherit (pkgs) stdenv;
 
+  icon = ./icon.xpm;
+
   zathura_core = callPackage ./core {
     gtk = pkgs.gtk3;
+    zathura_icon = icon;
   };
 
   zathura_pdf_poppler = callPackage ./pdf-poppler { };
@@ -19,7 +22,7 @@ rec {
 
   zathuraWrapper = stdenv.mkDerivation {
 
-    inherit zathura_core;
+    inherit zathura_core icon;
 
     name = "zathura-${zathura_core.version}";
 
@@ -29,8 +32,6 @@ rec {
       zathura_ps
     ];
 
-    icon = ./icon.xpm;
-
     builder = ./builder.sh;
 
     preferLocalBuild = true;
-- 
GitLab


From 83c5d12d4c2b895941fe4e41b8dce7f50cb07b4b Mon Sep 17 00:00:00 2001
From: Malcolm Matalka <mmatalka@gmail.com>
Date: Sat, 22 Feb 2014 19:08:54 +0100
Subject: [PATCH 1528/3789] Add opam 1.1.1

---
 pkgs/development/tools/ocaml/opam/1.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ocaml/opam/1.1.nix b/pkgs/development/tools/ocaml/opam/1.1.nix
index c5093db107d..2c71f8ba49f 100644
--- a/pkgs/development/tools/ocaml/opam/1.1.nix
+++ b/pkgs/development/tools/ocaml/opam/1.1.nix
@@ -30,13 +30,13 @@ let
       sha256 = "5421559aa12b4debffef947f7e1039c22e9dffd87a4aa68445a687a20764ae81";
     };
     opam = fetchurl {
-      url = "https://github.com/ocaml/opam/archive/1.1.0.zip";
-      sha256 = "38a5edc1428f9e8e0d13e7017c97e1614dd651b75b4c234c80ff22f103d38bf7";
+      url = "https://github.com/ocaml/opam/archive/1.1.1.zip";
+      sha256 = "9c69eeb448af5a38950b2664446401ce240b9f028e0b4d26b6ac1a96938a5f03";
     };
   };
 in
 stdenv.mkDerivation rec {
-  name = "opam-1.1.0";
+  name = "opam-1.1.1";
 
   buildInputs = [unzip curl ncurses ocaml];
 
-- 
GitLab


From 1b60ee5f67f81cc7c89e838700ffa3f2b4cf0975 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 22 Feb 2014 19:15:46 +0100
Subject: [PATCH 1529/3789] paxctl: Fix URL

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

diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix
index 253c0dd5ed2..36afde6a736 100644
--- a/pkgs/os-specific/linux/paxctl/default.nix
+++ b/pkgs/os-specific/linux/paxctl/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.7";
 
   src = fetchurl {
-    url = "https://pax.grsecurity.net/${name}-${version}.tar.bz2";
+    url = "https://pax.grsecurity.net/${name}.tar.bz2";
     sha256 = "1j6dg6wd1v7na5i4xj8zmbff0mdqdnw6cvqy0rsbz5anra27f1zp";
   };
 
-- 
GitLab


From bf02ae28d666fb37f76641b108b8c1d342e1fe58 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 22 Feb 2014 19:23:27 +0100
Subject: [PATCH 1530/3789] gradm: Fix URL

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

diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix
index 7272b5a22fa..9bce50f464f 100644
--- a/pkgs/os-specific/linux/gradm/default.nix
+++ b/pkgs/os-specific/linux/gradm/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.0-201401291757";
 
   src  = fetchurl {
-    url    = "http://grsecurity.net/stable/${name}-${version}.tar.gz";
+    url    = "http://grsecurity.net/stable/${name}.tar.gz";
     sha256 = "19p7kaqbvf41scc63n69b5v5xzpw3mbf5zy691rply8hdm7736cw";
   };
 
-- 
GitLab


From 4ee12df331602bcb1017aa269606607a63308472 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 22 Feb 2014 19:24:31 +0100
Subject: [PATCH 1531/3789] pax-utils: Fix URL

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

diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index 9ab3183e92a..46f0ecf457e 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.7";
 
   src = fetchurl {
-    url = "http://dev.gentoo.org/~vapier/dist/${name}-${version}.tar.xz";
+    url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz";
     sha256 = "111vmwn0ikrmy3s0w3rzpbzwrphawljrmcjya0isg5yam7lwxi0s";
   };
 
-- 
GitLab


From 6554a490f68a64287429188ee1d222989b2919e7 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 22 Feb 2014 20:11:33 +0100
Subject: [PATCH 1532/3789] gradm, pax-utils, paxctl: Add myself as a
 maintainer

---
 lib/maintainers.nix                          | 1 +
 pkgs/os-specific/linux/gradm/default.nix     | 8 ++++----
 pkgs/os-specific/linux/pax-utils/default.nix | 8 ++++----
 pkgs/os-specific/linux/paxctl/default.nix    | 8 ++++----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fe9c2d62a01..195e77b5820 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -74,6 +74,7 @@
   vizanto = "Danny Wilson <danny@prime.vc>";
   vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
+  wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";
   z77z = "Marco Maggesi <maggesi@math.unifi.it>";
   zef = "Zef Hemel <zef@zef.me>";
   zimbatm = "zimbatm <zimbatm@zimbatm.com>";
diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix
index 9bce50f464f..680547be57c 100644
--- a/pkgs/os-specific/linux/gradm/default.nix
+++ b/pkgs/os-specific/linux/gradm/default.nix
@@ -41,11 +41,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "grsecurity RBAC administration and policy analysis utility";
     homepage    = "https://grsecurity.net";
-    license     = stdenv.lib.licenses.gpl2;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = licenses.gpl2;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ thoughtpolice wizeman ];
   };
 }
diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index 46f0ecf457e..8d58873d5c1 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
     "PREFIX=$(out)"
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A suite of tools for PaX/grsecurity";
     homepage    = "http://dev.gentoo.org/~vapier/dist/";
-    license     = stdenv.lib.licenses.gpl2;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = licenses.gpl2;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ thoughtpolice wizeman ];
   };
 }
diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix
index 36afde6a736..d664f119c34 100644
--- a/pkgs/os-specific/linux/paxctl/default.nix
+++ b/pkgs/os-specific/linux/paxctl/default.nix
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
     "MANDIR=share/man/man1"
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A tool for controlling PaX flags on a per binary basis";
     homepage    = "https://pax.grsecurity.net";
-    license     = stdenv.lib.licenses.gpl2;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = licenses.gpl2;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ thoughtpolice wizeman ];
   };
 }
-- 
GitLab


From 7f4b97d495db22940b7e7dc2f85eedf93b5707ce Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 22 Feb 2014 12:30:24 -0600
Subject: [PATCH 1533/3789] grsecurity: stable/testing updates

 - stable:  3.0-3.2.55-201402201903 -> 3.0-3.2.55-201402221305
 - testing: 3.0-3.13.4-201402201908 -> 3.0-3.13.4-201402221308

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

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 49d0d37586c..49fa176d783 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -81,8 +81,8 @@ rec {
   grsecurity_3_0_3_2_55 =
     { name = "grsecurity-3.0-3.2.55";
       patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402201903.patch;
-        sha256 = "01kvs5z4ia5d5s4z8kfqyvh06qlw4v14hfll9n9qav6z8s5wyx10";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402221305.patch;
+        sha256 = "0g6mqbmjmqz4xh18cq5mn3d0zlzjlk76x0lmpwbrcapdcg5apcp5";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54
@@ -92,8 +92,8 @@ rec {
   grsecurity_3_0_3_13_4 =
     { name = "grsecurity-3.0-3.13.4";
       patch = fetchurl {
-        url = http://grsecurity.net/test/grsecurity-3.0-3.13.4-201402201908.patch;
-        sha256 = "140rp57hzbjljhcgvdcczfhw0ghyw1x1ga2xv5ma2pk3dml158lh";
+        url = http://grsecurity.net/test/grsecurity-3.0-3.13.4-201402221308.patch;
+        sha256 = "0783an79485wwbsvcf8ggsmc2bwsbj1i7q6r8g22b19i9hzqmr64";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2
-- 
GitLab


From 1efb6e65d24c7139d8036c8ea67c93b72ce49c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 23 Feb 2014 08:00:59 +0100
Subject: [PATCH 1534/3789] doc: document current conventions on package naming

Mostly: encourage using dashes instead of underscores.
---
 doc/coding-conventions.xml | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index e55f86ae3d3..61d373738f9 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -235,12 +235,7 @@ Most of the time, these are the same.  For instance, the package
 bound to the variable name <varname>e2fsprogs</varname> in
 <filename>all-packages.nix</filename>, and the Nix expression is in
 <filename>pkgs/os-specific/linux/e2fsprogs/default.nix</filename>.
-However, identifiers in the Nix language don’t allow certain
-characters (e.g. dashes), so sometimes a different variable name
-should be used.  For instance, the
-<literal>module-init-tools</literal> package is bound to the
-<literal>module_init_tools</literal> variable in
-<filename>all-packages.nix</filename>.</para>
+</para>
 
 <para>There are a few naming guidelines:
 
@@ -261,17 +256,20 @@ should be used.  For instance, the
   a package named <literal>hello-svn</literal> by
   <command>nix-env</command>.</para></listitem>
 
-  <listitem><para>Dashes in the package name should be changed to
-  underscores in variable names, rather than to camel case — e.g.,
-  <varname>module_init_tools</varname> instead of
-  <varname>moduleInitTools</varname>.</para></listitem>
+  <listitem><para>Dashes in the package name should be preserved
+  in new variable names, rather than converted to underscores
+  (which was convention up to around 2013 and most names
+   still have underscores instead of dashes) — e.g.,
+  <varname>http-parser</varname> instead of
+  <varname>http_parser</varname>.</para></listitem>
 
   <listitem><para>If there are multiple versions of a package, this
   should be reflected in the variable names in
   <filename>all-packages.nix</filename>,
-  e.g. <varname>hello_0_3</varname> and <varname>hello_0_4</varname>.
+  e.g. <varname>json-c-0-9</varname> and <varname>json-c-0-11</varname>.
   If there is an obvious “default” version, make an attribute like
-  <literal>hello = hello_0_4;</literal>.</para></listitem>
+  <literal>json-c = json-c-0-9;</literal>.
+  See also <xref linkend="sec-versioning" /></para></listitem>
 
 </itemizedlist>
 
@@ -288,7 +286,7 @@ dashes between words — not in camel case.  For instance, it should be
 <filename>allPackages.nix</filename> or
 <filename>AllPackages.nix</filename>.</para>
 
-<section><title>Hierachy</title>
+<section><title>Hierarchy</title>
 
 <para>Each package should be stored in its own directory somewhere in
 the <filename>pkgs/</filename> tree, i.e. in
@@ -567,7 +565,7 @@ splitting up an existing category.</para>
 
 </section>
 
-<section><title>Versioning</title>
+<section xml:id="sec-versioning"><title>Versioning</title>
 
 <para>Because every version of a package in Nixpkgs creates a
 potential maintenance burden, old versions of a package should not be
-- 
GitLab


From 3f95f39baba418b04bc56f979edb263005942ba6 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Thu, 13 Feb 2014 18:49:30 +0000
Subject: [PATCH 1535/3789] postgresql: Build all versions on Hydra (Linux)

Additionally, add @ocharles to the list of maintainers.

I am only building these on Linux environments in Hydra for now, as
that's the only environment I can be a maintainer for.
---
 pkgs/servers/sql/postgresql/8.4.x.nix | 2 ++
 pkgs/servers/sql/postgresql/9.0.x.nix | 2 ++
 pkgs/servers/sql/postgresql/9.1.x.nix | 2 ++
 pkgs/servers/sql/postgresql/9.2.x.nix | 2 ++
 pkgs/servers/sql/postgresql/9.3.x.nix | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 6f2fd4fa2dc..f91f78c4d57 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -20,5 +20,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
     license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.ocharles ];
+    hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index f27fdfb9c5e..c50c6a4aba2 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -23,5 +23,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
     license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.ocharles ];
+    hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 4d1bdbf17ab..9bc971b9dfd 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -31,5 +31,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
     license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.ocharles ];
+    hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index 3414424e8ca..3d1e0d6ec33 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -31,5 +31,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
     license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.ocharles ];
+    hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index 711bdade813..2230c370335 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -31,5 +31,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
     license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.ocharles ];
+    hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From 9f08c21c2b7106ded1e6212abcf631098a0f125d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 23 Feb 2014 12:21:19 +0100
Subject: [PATCH 1536/3789] gnucash: enable aqbanking support for online
 banking

This requires recent versions of aqbanking and gwenhywfar:
https://devel.aqbanking.de/trac/aqbanking/ticket/197

It seems as if the developers have changed their version numbering
scheme in 2012 and have only released versions with the "beta" suffix
since then.
---
 pkgs/applications/office/gnucash/default.nix  |  6 +++---
 .../libraries/aqbanking/default.nix           | 20 +++++++++++--------
 .../libraries/gwenhywfar/default.nix          | 17 +++++++++++-----
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index c8ebe6e2b12..ee0475d45ec 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk, libgnomeui, libofx
 , libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
 , intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade
-, libgsf, libart_lgpl, perlPackages
+, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar
 }:
 
 /* If you experience GConf errors when running GnuCash on NixOS, see
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
     pkgconfig libxml2 gconf glib gtk libgnomeui libgtkhtml gtkhtml
     libgnomeprint goffice enchant gettext intltool perl guile slibGuile
     swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
-    perlPackages.DateManip perlPackages.FinanceQuote
+    perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar
   ];
 
-  configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx";
+  configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking";
 
   postInstall = ''
     # Auto-updaters don't make sense in Nix.
diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix
index 7dfc6a60a99..e162d870052 100644
--- a/pkgs/development/libraries/aqbanking/default.nix
+++ b/pkgs/development/libraries/aqbanking/default.nix
@@ -1,23 +1,27 @@
-{ stdenv, fetchurl, gwenhywfar, pkgconfig, gmp, zlib }:
+{ stdenv, fetchurl, gmp, gwenhywfar, libtool, libxml2, libxslt
+, pkgconfig, xmlsec, zlib
+}:
 
 stdenv.mkDerivation rec {
-  name = "aqbanking-5.0.21";
+  name = "aqbanking-5.4.0beta";
 
   src = fetchurl {
-    url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=91&file=01&dummy=aqbanking-5.0.21.tar.gz";
+    url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=112&file=01&dummy=aqbanking-5.4.0beta.tar.gz";
     name = "${name}.tar.gz";
-    sha256 = "1xvzg640fswkrjrkrqzj0j9lnij7kcpnyvzd7nsg1by40wxwgp52";
+    sha256 = "0yd588sw9grc2c0bfyx8h39mr30pa1zxrcbv31p6pz6szilk2agh";
   };
 
-  buildInputs = [ gwenhywfar gmp zlib ];
+  buildInputs = [ gmp gwenhywfar libtool libxml2 libxslt xmlsec zlib ];
 
   nativeBuildInputs = [ pkgconfig ];
 
   configureFlags = "--with-gwen-dir=${gwenhywfar}";
 
-  meta = {
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    # Tries to install gwenhywfar plugin, thus `make install` fails
+  meta = with stdenv.lib; {
+    description = "An interface to banking tasks, file formats and country information";
+    homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1";
     hydraPlatforms = [];
+    maintainers = with maintainers; [ goibhniu urkud ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gwenhywfar/default.nix b/pkgs/development/libraries/gwenhywfar/default.nix
index 724524e2b26..41e784bac3c 100644
--- a/pkgs/development/libraries/gwenhywfar/default.nix
+++ b/pkgs/development/libraries/gwenhywfar/default.nix
@@ -1,19 +1,26 @@
-{ stdenv, fetchurl, qt4, gtk, pkgconfig, gnutls, libgcrypt }:
+{ stdenv, fetchurl, gnutls, gtk, libgcrypt, pkgconfig, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "gwenhywfar-4.3.1";
+  name = "gwenhywfar-4.10.0beta";
 
   src = fetchurl {
-    url = "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=65&file=01&dummy=gwenhywfar-4.3.1.tar.gz";
+    url = "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=73&file=01&dummy=gwenhywfar-4.10.0beta.tar.gz";
     name = "${name}.tar.gz";
-    sha256 = "1r8ayi1nwcdcs4mncd7zigl8pk707j7whb85klsyir4nif52fxrs";
+    sha256 = "1ihg2s263g540hl42y6g9wqcc4am70kv01yivsqfrpa9fnhbxm7f";
   };
 
   propagatedBuildInputs = [ gnutls libgcrypt ];
 
-  buildInputs = [ qt4 gtk ];
+  buildInputs = [ gtk qt4 ];
 
   nativeBuildInputs = [ pkgconfig ];
 
   QTDIR = qt4;
+
+  meta = with stdenv.lib; {
+    description = "OS abstraction functions used by aqbanking and related tools";
+    homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1";
+    maintainers = with maintainers; [ goibhniu ];
+    platforms = platforms.linux;
+  };
 }
-- 
GitLab


From 169b452e0c62581edd488ad7df060b8312b497c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 23 Feb 2014 12:44:18 +0100
Subject: [PATCH 1537/3789] aqbanking, gwenhywfar: add license info

---
 pkgs/development/libraries/aqbanking/default.nix  | 1 +
 pkgs/development/libraries/gwenhywfar/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix
index e162d870052..226f792c45a 100644
--- a/pkgs/development/libraries/aqbanking/default.nix
+++ b/pkgs/development/libraries/aqbanking/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
     description = "An interface to banking tasks, file formats and country information";
     homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1";
     hydraPlatforms = [];
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ goibhniu urkud ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/gwenhywfar/default.nix b/pkgs/development/libraries/gwenhywfar/default.nix
index 41e784bac3c..b8ad3442729 100644
--- a/pkgs/development/libraries/gwenhywfar/default.nix
+++ b/pkgs/development/libraries/gwenhywfar/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "OS abstraction functions used by aqbanking and related tools";
     homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1";
+    license = licenses.lgpl21;
     maintainers = with maintainers; [ goibhniu ];
     platforms = platforms.linux;
   };
-- 
GitLab


From a131bf9be71110d6cd9934dd9169328b4701f0fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 23 Feb 2014 16:57:37 +0100
Subject: [PATCH 1538/3789] i3minator: 0.0.3 -> 0.0.4

---
 pkgs/tools/misc/i3minator/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix
index cb12cb33c76..08e012128c2 100644
--- a/pkgs/tools/misc/i3minator/default.nix
+++ b/pkgs/tools/misc/i3minator/default.nix
@@ -15,11 +15,11 @@ let
   };
 in buildPythonPackage rec {
   name = "i3minator-${version}";
-  version = "0.0.3";
+  version = "0.0.4";
 
   src = fetchurl {
-    url = "https://github.com/carlesso/i3minator/archive/v${version}.tar.gz";
-    sha256 = "0ksb0frrhq10k5rjzk72kj5rjzak1irr9q4x4f22w2vylxq19xxa";
+    url = "https://github.com/carlesso/i3minator/archive/${version}.tar.gz";
+    sha256 = "11dn062788kwfs8k2ry4v8zr2gn40r6lsw770s9g2gvhl5n469dw";
   };
 
   propagatedBuildInputs = [ pythonPackages.pyyaml i3-py ];
-- 
GitLab


From f6aba32af3f6d060181f1915c38f4c3d13820445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 23 Feb 2014 19:14:27 +0100
Subject: [PATCH 1539/3789] ardour3: update 3.5.308 -> 3.5.357

---
 pkgs/applications/audio/ardour/ardour3.nix | 16 +++++++---------
 pkgs/top-level/all-packages.nix            |  1 -
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix
index 4d725b43aae..4315a5a7547 100644
--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ b/pkgs/applications/audio/ardour/ardour3.nix
@@ -6,18 +6,16 @@
 , perl, pkgconfig, python, serd, sord, sratom, suil }:
 
 let
-  # Ardour 3.5.308 tag
-  rev = "40d8c5ae";
+  tag = "3.5.357";
 in
 
 stdenv.mkDerivation rec {
-  name = "ardour-${version}";
-  version = "3.5.308";
+  name = "ardour-${tag}";
 
   src = fetchgit {
     url = git://git.ardour.org/ardour/ardour.git;
-    inherit rev;
-    sha256 = "7473c19c2aeb68bd93d512c2d4e976b23dd36d2453c877c859ad37a76f50dc8a";
+    rev = "refs/tags/${tag}";
+    sha256 = "1e026fb9a6ad4179d52c4b578cc3861bdfd3629b9e7b7a7341d431c7d3692c42";
   };
 
   buildInputs = 
@@ -29,10 +27,10 @@ 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 = \"${version}-g40d8c5a\"; }\n' > libs/ardour/revision.cc
+    # 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
     # Note the different version number
-    sed -i '33i rev = \"3.5-308-g40d8c5a\"' wscript
+    sed -i '33i rev = \"3.5-357-gce4d125\"' 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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4642483648..64f2bb688c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7425,7 +7425,6 @@ let
 
   ardour3 =  lowPrio (callPackage ../applications/audio/ardour/ardour3.nix {
     inherit (gnome) libgnomecanvas libgnomecanvasmm;
-    boost = boost149;
   });
 
   arora = callPackage ../applications/networking/browsers/arora { };
-- 
GitLab


From dc700e09255592bc41c91401476c94feea4a0b19 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 18 Feb 2014 02:09:01 -0600
Subject: [PATCH 1540/3789] etc: uid/gid support for copied files

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/system/etc/etc.nix      | 20 ++++++++++++++++++++
 nixos/modules/system/etc/make-etc.sh  |  4 ++++
 nixos/modules/system/etc/setup-etc.pl |  8 ++++++++
 3 files changed, 32 insertions(+)

diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix
index a8f0a59b6fa..e9c03df2ba3 100644
--- a/nixos/modules/system/etc/etc.nix
+++ b/nixos/modules/system/etc/etc.nix
@@ -19,6 +19,8 @@ let
     sources = map (x: x.source) etc';
     targets = map (x: x.target) etc';
     modes = map (x: x.mode) etc';
+    uids  = map (x: x.uid) etc';
+    gids  = map (x: x.gid) etc';
   };
 
 in
@@ -87,6 +89,24 @@ in
               '';
             };
 
+            uid = mkOption {
+              default = 0;
+              type = types.int;
+              description = ''
+                UID of created file. Only takes affect when the file is
+                copied (that is, the mode is not 'symlink').
+                '';
+            };
+
+            gid = mkOption {
+              default = 0;
+              type = types.int;
+              description = ''
+                GID of created file. Only takes affect when the file is
+                copied (that is, the mode is not 'symlink').
+              '';
+            };
+
           };
 
           config = {
diff --git a/nixos/modules/system/etc/make-etc.sh b/nixos/modules/system/etc/make-etc.sh
index 7cf68db9ddc..60d4ba1301a 100644
--- a/nixos/modules/system/etc/make-etc.sh
+++ b/nixos/modules/system/etc/make-etc.sh
@@ -6,6 +6,8 @@ set -f
 sources_=($sources)
 targets_=($targets)
 modes_=($modes)
+uids_=($uids)
+gids_=($gids)
 set +f
 
 for ((i = 0; i < ${#targets_[@]}; i++)); do
@@ -35,6 +37,8 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
         
         if test "${modes_[$i]}" != symlink; then
             echo "${modes_[$i]}" > $out/etc/$target.mode
+            echo "${uids_[$i]}" > $out/etc/$target.uid
+            echo "${gids_[$i]}" > $out/etc/$target.gid
         fi
         
     fi
diff --git a/nixos/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl
index 4b79dbaab89..8ba9a370b27 100644
--- a/nixos/modules/system/etc/setup-etc.pl
+++ b/nixos/modules/system/etc/setup-etc.pl
@@ -60,7 +60,15 @@ sub link {
         if ($mode eq "direct-symlink") {
             atomicSymlink readlink("$static/$fn"), $target or warn;
         } else {
+            open UID, "<$_.uid";
+            my $uid = <UID>; chomp $uid;
+            close UID;
+            open GID, "<$_.gid";
+            my $gid = <GID>; chomp $gid;
+            close GID;
+
             copy "$static/$fn", "$target.tmp" or warn;
+            chown int($uid), int($gid), "$target.tmp" or warn;
             chmod oct($mode), "$target.tmp" or warn;
             rename "$target.tmp", $target or warn;
         }
-- 
GitLab


From 4670b503b18521770c3405fcaf2455808dfbac5a Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 24 Feb 2014 00:01:43 -0300
Subject: [PATCH 1541/3789] New package: 8086tiny, a tiny 8086 emulator

---
 .../virtualization/8086tiny/builder.sh        | 45 +++++++++++++++++++
 .../virtualization/8086tiny/default.nix       | 37 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 84 insertions(+)
 create mode 100644 pkgs/applications/virtualization/8086tiny/builder.sh
 create mode 100644 pkgs/applications/virtualization/8086tiny/default.nix

diff --git a/pkgs/applications/virtualization/8086tiny/builder.sh b/pkgs/applications/virtualization/8086tiny/builder.sh
new file mode 100644
index 00000000000..0f321e06754
--- /dev/null
+++ b/pkgs/applications/virtualization/8086tiny/builder.sh
@@ -0,0 +1,45 @@
+
+source $stdenv/setup
+
+mkdir -p ./$name $out/bin $out/share/$name $out/share/doc/$name/images
+
+cd $name
+tar xf $src
+make 8086tiny
+
+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
+for i in docs/images/*.gif
+do
+    install $i $out/share/doc/$name/images
+done
+
+# Refactoring "runme" script
+
+cat << 'EOF' >> run-8086tiny
+#!/bin/sh
+
+# Setting vars: $1 = bios file, $2 = floppy image, $3= harddisk image
+if [ $# -ne 2 -a $# -ne 3 ]; then
+   echo "Usage: $0 <bios file> <floppy image> [harddisk image]"
+   exit 1
+fi
+
+bios="$1"
+floppy="$2"
+hdimage="$3"
+
+clear
+stty cbreak raw -echo min 0
+8086tiny $bios $floppy $hdimage
+stty cooked echo
+
+EOF
+
+patchShebangs run-8086tiny
+install run-8086tiny $out/bin
+
diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix
new file mode 100644
index 00000000000..0b4ff90e409
--- /dev/null
+++ b/pkgs/applications/virtualization/8086tiny/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl
+, localBios ? false, nasm ? null
+, sdlSupport ? true, SDL ? null
+}:
+
+
+assert sdlSupport -> (SDL != null);
+
+
+stdenv.mkDerivation rec {
+
+  name = "8086tiny-${version}";
+  version = "1.20";
+
+  src = fetchurl {
+    url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_120.tar.bz2"; 
+    sha256 = "0yapnr8wvlx7h1q1w98yfy2vsbf0rlp4wd99r3xb0b7l70b36mpw";
+  };
+  
+  buildInputs = with stdenv.lib;
+  optionals localBios [ nasm ] 
+  ++  optionals sdlSupport [ SDL ];
+
+  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 based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :)
+    '';
+    homepage = http://www.megalith.co.uk/8086tiny/index.html;
+    license = "MIT";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2592799d1b..da606148b34 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1970,6 +1970,8 @@ let
 
   tinc = callPackage ../tools/networking/tinc { };
 
+  tiny8086 = callPackage ../applications/virtualization/8086tiny { };
+
   tmpwatch = callPackage ../tools/misc/tmpwatch  { };
 
   tmux = callPackage ../tools/misc/tmux { };
-- 
GitLab


From ad6bdfaf56b4b6a74850c39adde0e6a7d2a3ad20 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 24 Feb 2014 00:12:00 -0300
Subject: [PATCH 1542/3789] Deleting the "runme" stuff - it is not needed at
 all, and the run method is fully documented

---
 .../virtualization/8086tiny/builder.sh        | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/pkgs/applications/virtualization/8086tiny/builder.sh b/pkgs/applications/virtualization/8086tiny/builder.sh
index 0f321e06754..36c381becec 100644
--- a/pkgs/applications/virtualization/8086tiny/builder.sh
+++ b/pkgs/applications/virtualization/8086tiny/builder.sh
@@ -17,29 +17,3 @@ for i in docs/images/*.gif
 do
     install $i $out/share/doc/$name/images
 done
-
-# Refactoring "runme" script
-
-cat << 'EOF' >> run-8086tiny
-#!/bin/sh
-
-# Setting vars: $1 = bios file, $2 = floppy image, $3= harddisk image
-if [ $# -ne 2 -a $# -ne 3 ]; then
-   echo "Usage: $0 <bios file> <floppy image> [harddisk image]"
-   exit 1
-fi
-
-bios="$1"
-floppy="$2"
-hdimage="$3"
-
-clear
-stty cbreak raw -echo min 0
-8086tiny $bios $floppy $hdimage
-stty cooked echo
-
-EOF
-
-patchShebangs run-8086tiny
-install run-8086tiny $out/bin
-
-- 
GitLab


From ff79e2f9005b8e0c973a5ee91358e1730fe78eef Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 17 Feb 2014 23:15:18 -0600
Subject: [PATCH 1543/3789] duo_unix: version 1.9.7

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/duo-unix/default.nix | 26 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/security/duo-unix/default.nix

diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix
new file mode 100644
index 00000000000..a7cd61d7f67
--- /dev/null
+++ b/pkgs/tools/security/duo-unix/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pam, openssl, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "duo-unix";
+  version = "1.9.7";
+
+  src = fetchurl {
+    url    = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz";
+    sha256 = "090kx9nixlhvy5nw0ywqmi7yhd4nz7wvdv38cpkgrspkridfl07j";
+  };
+
+  buildInputs = [ pam openssl zlib ];
+  configureFlags =
+    [ "--with-pam=$(out)/lib/security"
+      "--prefix=$(out)"
+      "--sysconfdir=$(out)/etc/duo"
+    ];
+
+  meta = {
+    description = "Duo Security Unix login integration";
+    homepage    = "https://duosecurity.com";
+    license     = stdenv.lib.licenses.gpl2;
+    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 64f2bb688c4..508a8681baf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -832,6 +832,8 @@ let
 
   dtach = callPackage ../tools/misc/dtach { };
 
+  duo-unix = callPackage ../tools/security/duo-unix { };
+
   duplicity = callPackage ../tools/backup/duplicity {
     inherit (pythonPackages) boto;
     gnupg = gnupg1;
-- 
GitLab


From 55ac3b0a93d66e1a7f80cfcfbbe615b788d8816f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 20 Feb 2014 05:54:04 -0600
Subject: [PATCH 1544/3789] spark: version 0.9.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../networking/cluster/spark/default.nix      | 127 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 2 files changed, 129 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/spark/default.nix

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
new file mode 100644
index 00000000000..18aae784cbc
--- /dev/null
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -0,0 +1,127 @@
+{ stdenv, fetchurl, jre, bash, simpleBuildTool, python27Packages }:
+
+stdenv.mkDerivation rec {
+  name    = "spark-${version}";
+  version = "0.9.0";
+
+  src = fetchurl {
+    url    = "http://d3kbcqa49mib13.cloudfront.net/${name}-incubating-bin-cdh4.tgz";
+    sha256 = "0dgirq2ws25accijijanqij6d1mwxkrcqkmq1xsslfpz26svs1w1";
+  };
+
+  unpackPhase = ''tar zxf $src'';
+
+  untarDir = "spark-${version}-incubating-bin-cdh4";
+  installPhase = ''
+    set -x
+    mkdir -p $out/lib $out/bin
+    mv ${untarDir} $out/lib
+
+    cat > $out/bin/spark-class <<EOF
+    #!${bash}/bin/bash
+    export JAVA_HOME=${jre}
+    export SPARK_HOME=$out/lib/${untarDir}
+
+    if [ -z "\$1" ]; then
+      echo "Usage: spark-class <class> [<args>]" >&2
+      exit 1
+    fi
+
+    export SPARK_MEM=\''${SPARK_MEM:-1024m}
+
+    JAVA_OPTS=""
+    JAVA_OPTS="\$JAVA_OPTS -Djava.library.path=\"\$SPARK_LIBRARY_PATH\""
+    JAVA_OPTS="\$JAVA_OPTS -Xms\$SPARK_MEM -Xmx\$SPARK_MEM"
+    export JAVA_OPTS
+
+    CLASSPATH=\`$out/lib/${untarDir}/bin/compute-classpath.sh\`
+    export CLASSPATH
+
+    exec ${jre}/bin/java -cp "\$CLASSPATH" \$JAVA_OPTS "\$@"
+    EOF
+    chmod +x $out/bin/spark-class
+
+    cat > $out/bin/spark-shell <<EOF
+    #!${bash}/bin/bash
+    set -o posix
+    export JAVA_HOME=${jre}
+    export SPARK_HOME=$out/lib/${untarDir}
+    for o in "\$@"; do
+      if [ "\$1" = "-c" -o "\$1" = "--cores" ]; then
+        shift
+        if [ -n "\$1" ]; then
+          OPTIONS="-Dspark.cores.max=\$1"
+          shift
+        fi
+      fi
+    done
+
+    exit_status=127
+    saved_stty=""
+
+    function restoreSttySettings() {
+      stty \$saved_stty
+      saved_stty=""
+    }
+
+    function onExit() {
+      if [[ "\$saved_stty" != "" ]]; then
+        restoreSttySettings
+      fi
+      exit \$exit_status
+    }
+
+    trap onExit INT
+
+    saved_stty=\$(stty -g 2>/dev/null)
+    if [[ ! \$? ]]; then
+      saved_stty=""
+    fi
+
+    $out/bin/spark-class \$OPTIONS org.apache.spark.repl.Main "\$@"
+
+    exit_status=\$?
+    onExit
+    EOF
+    chmod +x $out/bin/spark-shell
+
+    cat > $out/bin/pyspark <<EOF
+    #!${bash}/bin/bash
+    export JAVA_HOME=${jre}
+    export SPARK_HOME=$out/lib/${untarDir}
+    export PYTHONPATH=$out/lib/${untarDir}/python:\$PYTHONPATH
+    export OLD_PYTHONSTARTUP=\$PYTHONSTARTUP
+    export PYTHONSTARTUP=$out/lib/${untarDir}/python/pyspark/shell.py
+    export SPARK_MEM=\''${SPARK_MEM:-1024m}
+    exec ${python27Packages.ipythonLight}/bin/ipython \$@
+    EOF
+    chmod +x $out/bin/pyspark
+
+    cat > $out/bin/spark-upload-scala <<EOF
+    #!${bash}/bin/bash
+    export JAVA_HOME=${jre}
+    export SPARK_HOME=$out/lib/${untarDir}
+    export SPARK_MEM=\''${SPARK_MEM:-1024m}
+
+    CLASS=\$1; shift
+    exec ${simpleBuildTool}/bin/sbt package "run-main \$CLASS \$@"
+    EOF
+    chmod +x $out/bin/spark-upload-scala
+
+    cat > $out/bin/spark-upload-python <<EOF
+    #!${bash}/bin/bash
+    exec $out/bin/pyspark \$@
+    EOF
+    chmod +x $out/bin/spark-upload-python
+  '';
+
+  phases = "unpackPhase installPhase";
+
+  meta    = {
+    description = "Spark cluster computing";
+    homepage    = "http://spark.incubator.apache.org";
+    platforms   = stdenv.lib.platforms.all;
+    license     = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64f2bb688c4..d29bd9c1c33 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3309,6 +3309,8 @@ let
 
   scheme48 = callPackage ../development/interpreters/scheme48 { };
 
+  spark = callPackage ../applications/networking/cluster/spark { };
+
   spidermonkey = callPackage ../development/interpreters/spidermonkey { };
   spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { };
   spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { };
-- 
GitLab


From 60728bc46c913c0c32163710ba4a482494666765 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 19 Feb 2014 05:00:45 -0600
Subject: [PATCH 1545/3789] ktap: add v0.5-dev from git

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/ktap/default.nix | 29 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/os-specific/linux/ktap/default.nix

diff --git a/pkgs/os-specific/linux/ktap/default.nix b/pkgs/os-specific/linux/ktap/default.nix
new file mode 100644
index 00000000000..21996e26131
--- /dev/null
+++ b/pkgs/os-specific/linux/ktap/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, kernel }:
+
+stdenv.mkDerivation rec {
+  name = "ktap-${version}";
+  version = "0.5-7ee59b19";
+  src = fetchgit {
+    url    = "https://github.com/ktap/ktap.git";
+    rev    = "7ee59b19d536fd3d3164ff0a0623faff827e5d97";
+    sha256 = "0a46836469d0afb088e72fd6310406a86c487d17bac40e390cec8bc869e7379c";
+  };
+
+  buildPhase = ''
+    make FFI=1 KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
+  '';
+
+  installPhase = ''
+    mkdir -p $out/sbin
+    cp ktap $out/sbin
+    make modules_install KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build INSTALL_MOD_PATH=$out
+  '';
+
+  meta = {
+    description = "A lightweight script-based dynamic tracing tool for Linux.";
+    homepage    = "http://www.ktap.org";
+    platforms   = stdenv.lib.platforms.linux;
+    license     = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64f2bb688c4..0d3eb10b9fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6823,6 +6823,8 @@ let
 
     frandom = callPackage ../os-specific/linux/frandom { };
 
+    ktap = callPackage ../os-specific/linux/ktap { };
+
     lttngModules = callPackage ../os-specific/linux/lttng-modules { };
 
     broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
-- 
GitLab


From 3db6fc36f67ea713e5a78c6356d8a0ed75e41132 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Mon, 24 Feb 2014 17:30:40 +0800
Subject: [PATCH 1546/3789] gradle: update to 1.11

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

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 97b50d0019f..f8466e5aafd 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, jdk, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "gradle-1.8";
+  name = "gradle-1.11";
 
   src = fetchurl {
     url = "http://services.gradle.org/distributions/${name}-bin.zip";
-    sha256 = "00spxad9b5vddshp02cic0ds8icgb1clknl7494f467x2pxbnhm3";
+    sha256 = "14a0qdzjiar97l9a0i3ds2y48p1lrqkj7skkkvhz0r29hbgkbqh7";
   };
 
   installPhase = ''
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
     makeWrapper ${jdk}/bin/java $out/bin/gradle \
       --set JAVA_HOME ${jdk} \
-      --add-flags "-classpath $out/lib/gradle-launcher-1.8.jar org.gradle.launcher.GradleMain"
+      --add-flags "-classpath $out/lib/gradle-launcher-1.11.jar org.gradle.launcher.GradleMain"
   '';
 
   phases = "unpackPhase installPhase";
-- 
GitLab


From aa23a9943679dc3977e7d18f486d96646d24931f Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 24 Feb 2014 12:02:21 +0100
Subject: [PATCH 1547/3789] Add
 stackdriver-statsd-backend/statsd-librato-backend node packages and update
 existing node packages.

---
 pkgs/top-level/node-packages-generated.nix | 546 +++++++++++++--------
 pkgs/top-level/node-packages.json          |   2 +
 2 files changed, 334 insertions(+), 214 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index f2b7328f35a..d3220d30e5c 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -412,7 +412,7 @@
     buildInputs =
       (self.nativeDeps."archiver" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.25"
+      self.by-version."readable-stream"."1.0.26"
       self.by-version."zip-stream"."0.1.4"
       self.by-version."lazystream"."0.1.0"
       self.by-version."file-utils"."0.1.5"
@@ -757,14 +757,14 @@
     passthru.names = [ "aws-sign2" ];
   };
   by-spec."backbone"."*" =
-    self.by-version."backbone"."1.1.1";
-  by-version."backbone"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-backbone-1.1.1";
+    self.by-version."backbone"."1.1.2";
+  by-version."backbone"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-backbone-1.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/backbone/-/backbone-1.1.1.tgz";
-        name = "backbone-1.1.1.tgz";
-        sha1 = "8091197fef3a58fdeae24de70d96e23ce432f399";
+        url = "http://registry.npmjs.org/backbone/-/backbone-1.1.2.tgz";
+        name = "backbone-1.1.2.tgz";
+        sha1 = "c2c04c66bf87268fb82c177acebeff7d37ba6f2d";
       })
     ];
     buildInputs =
@@ -776,7 +776,7 @@
     ];
     passthru.names = [ "backbone" ];
   };
-  "backbone" = self.by-version."backbone"."1.1.1";
+  "backbone" = self.by-version."backbone"."1.1.2";
   by-spec."backoff"."2.1.0" =
     self.by-version."backoff"."2.1.0";
   by-version."backoff"."2.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -1303,7 +1303,7 @@
     deps = [
       self.by-version."hat"."0.0.3"
       self.by-version."connect"."2.13.0"
-      self.by-version."request"."2.33.0"
+      self.by-version."request"."2.34.0"
     ];
     peerDependencies = [
     ];
@@ -1937,14 +1937,14 @@
     passthru.names = [ "clean-css" ];
   };
   by-spec."clean-css"."~2.1.0" =
-    self.by-version."clean-css"."2.1.0";
-  by-version."clean-css"."2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "clean-css-2.1.0";
+    self.by-version."clean-css"."2.1.1";
+  by-version."clean-css"."2.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "clean-css-2.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.0.tgz";
-        name = "clean-css-2.1.0.tgz";
-        sha1 = "2884698408337a94c33cc028acd13ea4a532132e";
+        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.1.tgz";
+        name = "clean-css-2.1.1.tgz";
+        sha1 = "eb0a46987629bee4550e2a1b8e6b6d6259d1e677";
       })
     ];
     buildInputs =
@@ -3162,7 +3162,7 @@
     buildInputs =
       (self.nativeDeps."couch-login" or []);
     deps = [
-      self.by-version."request"."2.33.0"
+      self.by-version."request"."2.34.0"
     ];
     peerDependencies = [
     ];
@@ -3593,7 +3593,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.10"
+      self.by-version."readable-stream"."1.1.11"
       self.by-version."nopt"."2.1.2"
     ];
     peerDependencies = [
@@ -4495,7 +4495,7 @@
     ];
     passthru.names = [ "execSync" ];
   };
-  by-spec."exit"."~0.1.1" =
+  by-spec."exit"."0.1.x" =
     self.by-version."exit"."0.1.2";
   by-version."exit"."0.1.2" = lib.makeOverridable self.buildNodePackage {
     name = "node-exit-0.1.2";
@@ -4514,6 +4514,8 @@
     ];
     passthru.names = [ "exit" ];
   };
+  by-spec."exit"."~0.1.1" =
+    self.by-version."exit"."0.1.2";
   by-spec."express"."*" =
     self.by-version."express"."3.4.8";
   by-version."express"."3.4.8" = lib.makeOverridable self.buildNodePackage {
@@ -5358,14 +5360,14 @@
     passthru.names = [ "fresh" ];
   };
   by-spec."fresh"."~0.2.1" =
-    self.by-version."fresh"."0.2.1";
-  by-version."fresh"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-fresh-0.2.1";
+    self.by-version."fresh"."0.2.2";
+  by-version."fresh"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-fresh-0.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/fresh/-/fresh-0.2.1.tgz";
-        name = "fresh-0.2.1.tgz";
-        sha1 = "13cc0b1f53fe0e6fa6a70c18d52ce3c5c56be066";
+        url = "http://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
+        name = "fresh-0.2.2.tgz";
+        sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77";
       })
     ];
     buildInputs =
@@ -6081,7 +6083,7 @@
       (self.nativeDeps."grunt-contrib-cssmin" or []);
     deps = [
       self.by-version."chalk"."0.4.0"
-      self.by-version."clean-css"."2.1.0"
+      self.by-version."clean-css"."2.1.1"
       self.by-version."grunt-lib-contrib"."0.6.1"
     ];
     peerDependencies = [
@@ -6104,7 +6106,7 @@
     buildInputs =
       (self.nativeDeps."grunt-contrib-jshint" or []);
     deps = [
-      self.by-version."jshint"."2.4.3"
+      self.by-version."jshint"."2.4.4"
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.2"
@@ -6267,7 +6269,7 @@
       self.by-version."jade"."1.1.5"
       self.by-version."q"."1.0.0"
       self.by-version."xml2js"."0.4.1"
-      self.by-version."msgpack"."0.2.1"
+      self.by-version."msgpack"."0.2.2"
     ];
     peerDependencies = [
     ];
@@ -6644,7 +6646,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.25"
+      self.by-version."readable-stream"."1.0.26"
     ];
     peerDependencies = [
     ];
@@ -6667,7 +6669,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.25"
+      self.by-version."readable-stream"."1.0.26"
     ];
     peerDependencies = [
     ];
@@ -6690,7 +6692,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.10"
+      self.by-version."readable-stream"."1.1.11"
     ];
     peerDependencies = [
     ];
@@ -7034,14 +7036,14 @@
   by-spec."inquirer"."~0.3.4" =
     self.by-version."inquirer"."0.3.5";
   by-spec."inquirer"."~0.4.0" =
-    self.by-version."inquirer"."0.4.0";
-  by-version."inquirer"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-inquirer-0.4.0";
+    self.by-version."inquirer"."0.4.1";
+  by-version."inquirer"."0.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-inquirer-0.4.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.4.0.tgz";
-        name = "inquirer-0.4.0.tgz";
-        sha1 = "62782d60c8a71d6328d8b4e9a5a71933cfda8f33";
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.4.1.tgz";
+        name = "inquirer-0.4.1.tgz";
+        sha1 = "6cf74eb1a347f97a1a207bea8ad1c987d0ff4b81";
       })
     ];
     buildInputs =
@@ -7052,6 +7054,7 @@
       self.by-version."cli-color"."0.2.3"
       self.by-version."mute-stream"."0.0.4"
       self.by-version."through"."2.3.4"
+      self.by-version."readline2"."0.1.0"
     ];
     peerDependencies = [
     ];
@@ -7075,7 +7078,7 @@
       self.by-version."request"."2.27.0"
       self.by-version."configstore"."0.2.2"
       self.by-version."async"."0.2.10"
-      self.by-version."inquirer"."0.4.0"
+      self.by-version."inquirer"."0.4.1"
       self.by-version."object-assign"."0.1.2"
       self.by-version."lodash.debounce"."2.4.1"
     ];
@@ -7126,7 +7129,7 @@
       self.by-version."passport"."0.2.0"
       self.by-version."passport-http"."0.2.2"
       self.by-version."js-yaml"."3.0.1"
-      self.by-version."mongoose"."3.8.7"
+      self.by-version."mongoose"."3.8.8"
       self.by-version."gridfs-stream"."0.4.1"
       self.by-version."temp"."0.6.0"
       self.by-version."kue"."0.7.5"
@@ -7359,26 +7362,26 @@
     passthru.names = [ "jade" ];
   };
   by-spec."jayschema"."*" =
-    self.by-version."jayschema"."0.2.3";
-  by-version."jayschema"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "jayschema-0.2.3";
+    self.by-version."jayschema"."0.2.4";
+  by-version."jayschema"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "jayschema-0.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.3.tgz";
-        name = "jayschema-0.2.3.tgz";
-        sha1 = "8f2e99d7f9dabda8d171eef2093ce9054671790d";
+        url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.4.tgz";
+        name = "jayschema-0.2.4.tgz";
+        sha1 = "de51c61702a472c579cf50adf70652b7e23977ae";
       })
     ];
     buildInputs =
       (self.nativeDeps."jayschema" or []);
     deps = [
-      self.by-version."when"."2.2.1"
+      self.by-version."when"."2.8.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "jayschema" ];
   };
-  "jayschema" = self.by-version."jayschema"."0.2.3";
+  "jayschema" = self.by-version."jayschema"."0.2.4";
   by-spec."jedediah"."~0.1.0" =
     self.by-version."jedediah"."0.1.1";
   by-version."jedediah"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -7530,14 +7533,14 @@
   by-spec."jsesc"."~0.4.3" =
     self.by-version."jsesc"."0.4.3";
   by-spec."jshint"."*" =
-    self.by-version."jshint"."2.4.3";
-  by-version."jshint"."2.4.3" = lib.makeOverridable self.buildNodePackage {
-    name = "jshint-2.4.3";
+    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.3.tgz";
-        name = "jshint-2.4.3.tgz";
-        sha1 = "1beb074b4d9f817773bb5aa16882fd67164c216a";
+        url = "http://registry.npmjs.org/jshint/-/jshint-2.4.4.tgz";
+        name = "jshint-2.4.4.tgz";
+        sha1 = "4162238314c649f987752651e8e064e30a68706e";
       })
     ];
     buildInputs =
@@ -7549,14 +7552,15 @@
       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" ];
   };
-  "jshint" = self.by-version."jshint"."2.4.3";
+  "jshint" = self.by-version."jshint"."2.4.4";
   by-spec."jshint"."~2.4.0" =
-    self.by-version."jshint"."2.4.3";
+    self.by-version."jshint"."2.4.4";
   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 {
@@ -8096,7 +8100,7 @@
     buildInputs =
       (self.nativeDeps."lazystream" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.25"
+      self.by-version."readable-stream"."1.0.26"
     ];
     peerDependencies = [
     ];
@@ -8157,7 +8161,7 @@
       (self.nativeDeps."less" or []);
     deps = [
       self.by-version."mime"."1.2.11"
-      self.by-version."request"."2.33.0"
+      self.by-version."request"."2.34.0"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."clean-css"."2.0.8"
       self.by-version."source-map"."0.1.32"
@@ -8596,7 +8600,7 @@
     deps = [
       self.by-version."async"."0.1.15"
       self.by-version."semver"."1.1.4"
-      self.by-version."readable-stream"."1.0.25"
+      self.by-version."readable-stream"."1.0.26"
     ];
     peerDependencies = [
     ];
@@ -9095,14 +9099,14 @@
   by-spec."minimatch"."~0.2.9" =
     self.by-version."minimatch"."0.2.14";
   by-spec."minimist"."~0.0.1" =
-    self.by-version."minimist"."0.0.7";
-  by-version."minimist"."0.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-minimist-0.0.7";
+    self.by-version."minimist"."0.0.8";
+  by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-minimist-0.0.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.7.tgz";
-        name = "minimist-0.0.7.tgz";
-        sha1 = "dc4c620253c542eda0d2eb91c3c6a971a11e63e7";
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        name = "minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       })
     ];
     buildInputs =
@@ -9113,6 +9117,8 @@
     ];
     passthru.names = [ "minimist" ];
   };
+  by-spec."minimist"."~0.0.7" =
+    self.by-version."minimist"."0.0.8";
   by-spec."ministyle"."~0.1.3" =
     self.by-version."ministyle"."0.1.3";
   by-version."ministyle"."0.1.3" = lib.makeOverridable self.buildNodePackage {
@@ -9421,14 +9427,14 @@
   by-spec."mongodb"."1.3.x" =
     self.by-version."mongodb"."1.3.23";
   by-spec."mongoose"."*" =
-    self.by-version."mongoose"."3.8.7";
-  by-version."mongoose"."3.8.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mongoose-3.8.7";
+    self.by-version."mongoose"."3.8.8";
+  by-version."mongoose"."3.8.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mongoose-3.8.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.7.tgz";
-        name = "mongoose-3.8.7.tgz";
-        sha1 = "0ce98a491097944c25b9d0d1bfe2899198284a00";
+        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.8.tgz";
+        name = "mongoose-3.8.8.tgz";
+        sha1 = "ab046f1fa17b0bdf090a04b6d034d87d240a47c2";
       })
     ];
     buildInputs =
@@ -9442,7 +9448,7 @@
       self.by-version."mpromise"."0.4.3"
       self.by-version."mpath"."0.1.1"
       self.by-version."regexp-clone"."0.0.1"
-      self.by-version."mquery"."0.5.2"
+      self.by-version."mquery"."0.5.3"
     ];
     peerDependencies = [
     ];
@@ -9678,15 +9684,15 @@
     ];
     passthru.names = [ "mpromise" ];
   };
-  by-spec."mquery"."0.5.2" =
-    self.by-version."mquery"."0.5.2";
-  by-version."mquery"."0.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mquery-0.5.2";
+  by-spec."mquery"."0.5.3" =
+    self.by-version."mquery"."0.5.3";
+  by-version."mquery"."0.5.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mquery-0.5.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mquery/-/mquery-0.5.2.tgz";
-        name = "mquery-0.5.2.tgz";
-        sha1 = "3b844d772af24e370c52e6eca1ddbb87af8b5a71";
+        url = "http://registry.npmjs.org/mquery/-/mquery-0.5.3.tgz";
+        name = "mquery-0.5.3.tgz";
+        sha1 = "b8a04d096ecf90bf17a81cc39b80dd4e5abcecec";
       })
     ];
     buildInputs =
@@ -9720,14 +9726,14 @@
     passthru.names = [ "ms" ];
   };
   by-spec."msgpack".">= 0.0.1" =
-    self.by-version."msgpack"."0.2.1";
-  by-version."msgpack"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "msgpack-0.2.1";
+    self.by-version."msgpack"."0.2.2";
+  by-version."msgpack"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "msgpack-0.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.1.tgz";
-        name = "msgpack-0.2.1.tgz";
-        sha1 = "5da246daa2138b4163640e486c00c4f3961e92ac";
+        url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.2.tgz";
+        name = "msgpack-0.2.2.tgz";
+        sha1 = "e7aec9bea24d9b07940dee6cfa536c469cd1776c";
       })
     ];
     buildInputs =
@@ -9752,7 +9758,7 @@
     buildInputs =
       (self.nativeDeps."multiparty" or []);
     deps = [
-      self.by-version."readable-stream"."1.1.10"
+      self.by-version."readable-stream"."1.1.11"
       self.by-version."stream-counter"."0.2.0"
     ];
     peerDependencies = [
@@ -10179,7 +10185,7 @@
       self.by-version."nopt"."2.2.0"
       self.by-version."npmlog"."0.0.6"
       self.by-version."osenv"."0.0.3"
-      self.by-version."request"."2.33.0"
+      self.by-version."request"."2.34.0"
       self.by-version."rimraf"."2.2.6"
       self.by-version."semver"."2.2.1"
       self.by-version."tar"."0.1.19"
@@ -10193,32 +10199,35 @@
   by-spec."node-gyp"."~0.12.2" =
     self.by-version."node-gyp"."0.12.2";
   by-spec."node-inspector"."*" =
-    self.by-version."node-inspector"."0.7.0-2";
-  by-version."node-inspector"."0.7.0-2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-inspector-0.7.0-2";
+    self.by-version."node-inspector"."0.7.0";
+  by-version."node-inspector"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-inspector-0.7.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.0-2.tgz";
-        name = "node-inspector-0.7.0-2.tgz";
-        sha1 = "e26d3c5ee74fe99fc5c8b2adb5634dac0ca86e81";
+        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.0.tgz";
+        name = "node-inspector-0.7.0.tgz";
+        sha1 = "b035e94e4bca3279ebabbb4df871ad8931919d9c";
       })
     ];
     buildInputs =
       (self.nativeDeps."node-inspector" or []);
     deps = [
-      self.by-version."socket.io"."0.9.16"
       self.by-version."express"."3.4.8"
       self.by-version."async"."0.2.10"
       self.by-version."glob"."3.2.8"
-      self.by-version."rc"."0.3.3"
+      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."ws"."0.4.31"
+      self.by-version."opener"."1.3.0"
+      self.by-version."yargs"."1.1.3"
+      self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "node-inspector" ];
   };
-  "node-inspector" = self.by-version."node-inspector"."0.7.0-2";
+  "node-inspector" = self.by-version."node-inspector"."0.7.0";
   by-spec."node-protobuf"."*" =
     self.by-version."node-protobuf"."1.0.10";
   by-version."node-protobuf"."1.0.10" = lib.makeOverridable self.buildNodePackage {
@@ -10437,14 +10446,14 @@
     passthru.names = [ "nodemailer" ];
   };
   by-spec."nodemon"."*" =
-    self.by-version."nodemon"."1.0.14";
-  by-version."nodemon"."1.0.14" = lib.makeOverridable self.buildNodePackage {
-    name = "nodemon-1.0.14";
+    self.by-version."nodemon"."1.0.15";
+  by-version."nodemon"."1.0.15" = lib.makeOverridable self.buildNodePackage {
+    name = "nodemon-1.0.15";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.14.tgz";
-        name = "nodemon-1.0.14.tgz";
-        sha1 = "415499efd9262b6a76cbf37385876c3343f4f0c6";
+        url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.15.tgz";
+        name = "nodemon-1.0.15.tgz";
+        sha1 = "32efa6b8134d579dca8894cd9e8a27d381387f11";
       })
     ];
     buildInputs =
@@ -10457,7 +10466,7 @@
     ];
     passthru.names = [ "nodemon" ];
   };
-  "nodemon" = self.by-version."nodemon"."1.0.14";
+  "nodemon" = self.by-version."nodemon"."1.0.15";
   by-spec."nomnom"."1.6.x" =
     self.by-version."nomnom"."1.6.2";
   by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage {
@@ -10568,14 +10577,14 @@
   by-spec."nopt"."~2.1.2" =
     self.by-version."nopt"."2.1.2";
   by-spec."normalize-package-data"."~0.2.9" =
-    self.by-version."normalize-package-data"."0.2.9";
-  by-version."normalize-package-data"."0.2.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-normalize-package-data-0.2.9";
+    self.by-version."normalize-package-data"."0.2.12";
+  by-version."normalize-package-data"."0.2.12" = lib.makeOverridable self.buildNodePackage {
+    name = "node-normalize-package-data-0.2.12";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.9.tgz";
-        name = "normalize-package-data-0.2.9.tgz";
-        sha1 = "8be8a1c0a0b55a7df07bee2b488c67c1d8862a4b";
+        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.12.tgz";
+        name = "normalize-package-data-0.2.12.tgz";
+        sha1 = "c8284cf0cb0466ea60ee64276b9070722c1da768";
       })
     ];
     buildInputs =
@@ -10590,14 +10599,14 @@
     passthru.names = [ "normalize-package-data" ];
   };
   by-spec."npm"."*" =
-    self.by-version."npm"."1.4.3";
-  by-version."npm"."1.4.3" = lib.makeOverridable self.buildNodePackage {
-    name = "npm-1.4.3";
+    self.by-version."npm"."1.4.4";
+  by-version."npm"."1.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-1.4.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm/-/npm-1.4.3.tgz";
-        name = "npm-1.4.3.tgz";
-        sha1 = "c0b18a662731d93cfdac37df5c2b3a0cda39613c";
+        url = "http://registry.npmjs.org/npm/-/npm-1.4.4.tgz";
+        name = "npm-1.4.4.tgz";
+        sha1 = "076616f7af95bcd08a4c5ad5cce18c5f370e0935";
       })
     ];
     buildInputs =
@@ -10621,7 +10630,7 @@
       self.by-version."lru-cache"."2.5.0"
       self.by-version."node-gyp"."0.12.2"
       self.by-version."fstream-npm"."0.1.6"
-      self.by-version."uid-number"."0.0.4"
+      self.by-version."uid-number"."0.0.5"
       self.by-version."archy"."0.0.2"
       self.by-version."chownr"."0.0.1"
       self.by-version."npmlog"."0.0.6"
@@ -10635,7 +10644,7 @@
       self.by-version."lockfile"."0.4.2"
       self.by-version."retry"."0.6.0"
       self.by-version."once"."1.3.0"
-      self.by-version."npmconf"."0.1.12"
+      self.by-version."npmconf"."0.1.13"
       self.by-version."opener"."1.3.0"
       self.by-version."chmodr"."0.1.0"
       self.by-version."cmd-shim"."1.1.1"
@@ -10656,7 +10665,7 @@
     ];
     passthru.names = [ "npm" ];
   };
-  "npm" = self.by-version."npm"."1.4.3";
+  "npm" = self.by-version."npm"."1.4.4";
   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 {
@@ -10692,7 +10701,7 @@
     buildInputs =
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
-      self.by-version."request"."2.33.0"
+      self.by-version."request"."2.34.0"
       self.by-version."graceful-fs"."2.0.2"
       self.by-version."semver"."2.0.11"
       self.by-version."slide"."1.1.5"
@@ -10721,7 +10730,7 @@
     buildInputs =
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
-      self.by-version."request"."2.33.0"
+      self.by-version."request"."2.34.0"
       self.by-version."graceful-fs"."2.0.2"
       self.by-version."semver"."2.2.1"
       self.by-version."slide"."1.1.5"
@@ -10749,7 +10758,7 @@
     buildInputs =
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
-      self.by-version."request"."2.33.0"
+      self.by-version."request"."2.34.0"
       self.by-version."graceful-fs"."2.0.2"
       self.by-version."semver"."2.2.1"
       self.by-version."slide"."1.1.5"
@@ -10865,14 +10874,14 @@
     passthru.names = [ "npmconf" ];
   };
   by-spec."npmconf"."~0.1.12" =
-    self.by-version."npmconf"."0.1.12";
-  by-version."npmconf"."0.1.12" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npmconf-0.1.12";
+    self.by-version."npmconf"."0.1.13";
+  by-version."npmconf"."0.1.13" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npmconf-0.1.13";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.12.tgz";
-        name = "npmconf-0.1.12.tgz";
-        sha1 = "7b89bbbb93fbbc449d7fac109e8164b47d105e90";
+        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.13.tgz";
+        name = "npmconf-0.1.13.tgz";
+        sha1 = "d47241b5b074f554ced90cd888d0dc96e4b1a4da";
       })
     ];
     buildInputs =
@@ -10892,7 +10901,7 @@
     passthru.names = [ "npmconf" ];
   };
   by-spec."npmconf"."~0.1.2" =
-    self.by-version."npmconf"."0.1.12";
+    self.by-version."npmconf"."0.1.13";
   by-spec."npmlog"."*" =
     self.by-version."npmlog"."0.0.6";
   by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage {
@@ -11209,7 +11218,7 @@
       (self.nativeDeps."optimist" or []);
     deps = [
       self.by-version."wordwrap"."0.0.2"
-      self.by-version."minimist"."0.0.7"
+      self.by-version."minimist"."0.0.8"
     ];
     peerDependencies = [
     ];
@@ -11271,7 +11280,7 @@
       (self.nativeDeps."optimist" or []);
     deps = [
       self.by-version."wordwrap"."0.0.2"
-      self.by-version."minimist"."0.0.7"
+      self.by-version."minimist"."0.0.8"
     ];
     peerDependencies = [
     ];
@@ -11281,8 +11290,6 @@
     self.by-version."optimist"."0.6.1";
   by-spec."optimist"."~0.3" =
     self.by-version."optimist"."0.3.7";
-  by-spec."optimist"."~0.3.4" =
-    self.by-version."optimist"."0.3.7";
   by-spec."optimist"."~0.3.5" =
     self.by-version."optimist"."0.3.7";
   by-spec."optimist"."~0.6.0" =
@@ -11629,14 +11636,14 @@
   by-spec."pkginfo"."0.x.x" =
     self.by-version."pkginfo"."0.3.0";
   by-spec."plist-native"."*" =
-    self.by-version."plist-native"."0.2.2";
-  by-version."plist-native"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-plist-native-0.2.2";
+    self.by-version."plist-native"."0.2.3";
+  by-version."plist-native"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-plist-native-0.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/plist-native/-/plist-native-0.2.2.tgz";
-        name = "plist-native-0.2.2.tgz";
-        sha1 = "6abde856b07a52f0d6bc027f7750f4d97ff93858";
+        url = "http://registry.npmjs.org/plist-native/-/plist-native-0.2.3.tgz";
+        name = "plist-native-0.2.3.tgz";
+        sha1 = "76843a2da80d587b75dcbcc1634c6f3968a2af17";
       })
     ];
     buildInputs =
@@ -11648,7 +11655,7 @@
     ];
     passthru.names = [ "plist-native" ];
   };
-  "plist-native" = self.by-version."plist-native"."0.2.2";
+  "plist-native" = self.by-version."plist-native"."0.2.3";
   by-spec."policyfile"."0.0.4" =
     self.by-version."policyfile"."0.0.4";
   by-version."policyfile"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -12216,20 +12223,20 @@
   };
   "rbytes" = self.by-version."rbytes"."1.0.0";
   by-spec."rc"."~0.3.0" =
-    self.by-version."rc"."0.3.3";
-  by-version."rc"."0.3.3" = lib.makeOverridable self.buildNodePackage {
-    name = "rc-0.3.3";
+    self.by-version."rc"."0.3.4";
+  by-version."rc"."0.3.4" = lib.makeOverridable self.buildNodePackage {
+    name = "rc-0.3.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rc/-/rc-0.3.3.tgz";
-        name = "rc-0.3.3.tgz";
-        sha1 = "2eac52d221dfdf5ba512def3ea27500a68dc3c07";
+        url = "http://registry.npmjs.org/rc/-/rc-0.3.4.tgz";
+        name = "rc-0.3.4.tgz";
+        sha1 = "01101660fb38363c22afbddfad46ecdb92b42df9";
       })
     ];
     buildInputs =
       (self.nativeDeps."rc" or []);
     deps = [
-      self.by-version."optimist"."0.3.7"
+      self.by-version."minimist"."0.0.8"
       self.by-version."deep-extend"."0.2.8"
       self.by-version."ini"."1.1.0"
     ];
@@ -12238,7 +12245,7 @@
     passthru.names = [ "rc" ];
   };
   by-spec."rc"."~0.3.2" =
-    self.by-version."rc"."0.3.3";
+    self.by-version."rc"."0.3.4";
   by-spec."read"."1" =
     self.by-version."read"."1.0.5";
   by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -12327,7 +12334,7 @@
     deps = [
       self.by-version."glob"."3.2.8"
       self.by-version."lru-cache"."2.5.0"
-      self.by-version."normalize-package-data"."0.2.9"
+      self.by-version."normalize-package-data"."0.2.12"
       self.by-version."graceful-fs"."2.0.2"
     ];
     peerDependencies = [
@@ -12337,14 +12344,14 @@
   by-spec."read-package-json"."~1.1.7" =
     self.by-version."read-package-json"."1.1.7";
   by-spec."readable-stream"."1.0" =
-    self.by-version."readable-stream"."1.0.25";
-  by-version."readable-stream"."1.0.25" = lib.makeOverridable self.buildNodePackage {
-    name = "node-readable-stream-1.0.25";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.25.tgz";
-        name = "readable-stream-1.0.25.tgz";
-        sha1 = "df19f64e6f74fd37ecf9d3ab8dbf1e2d11c9a045";
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.26.tgz";
+        name = "readable-stream-1.0.26.tgz";
+        sha1 = "12a9c4415f6a85374abe18b7831ba52d43105766";
       })
     ];
     buildInputs =
@@ -12357,14 +12364,14 @@
     passthru.names = [ "readable-stream" ];
   };
   by-spec."readable-stream"."1.1" =
-    self.by-version."readable-stream"."1.1.10";
-  by-version."readable-stream"."1.1.10" = lib.makeOverridable self.buildNodePackage {
-    name = "node-readable-stream-1.1.10";
+    self.by-version."readable-stream"."1.1.11";
+  by-version."readable-stream"."1.1.11" = lib.makeOverridable self.buildNodePackage {
+    name = "node-readable-stream-1.1.11";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.10.tgz";
-        name = "readable-stream-1.1.10.tgz";
-        sha1 = "d4dc2e5319e9c90d1e71c69390ef62cd90827f65";
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.11.tgz";
+        name = "readable-stream-1.1.11.tgz";
+        sha1 = "76ae0d88df2ac36c59e7c205e0cafc81c57bc07d";
       })
     ];
     buildInputs =
@@ -12379,15 +12386,15 @@
     passthru.names = [ "readable-stream" ];
   };
   by-spec."readable-stream"."~1.0.17" =
-    self.by-version."readable-stream"."1.0.25";
+    self.by-version."readable-stream"."1.0.26";
   by-spec."readable-stream"."~1.0.2" =
-    self.by-version."readable-stream"."1.0.25";
+    self.by-version."readable-stream"."1.0.26";
   by-spec."readable-stream"."~1.0.24" =
-    self.by-version."readable-stream"."1.0.25";
+    self.by-version."readable-stream"."1.0.26";
   by-spec."readable-stream"."~1.1.8" =
-    self.by-version."readable-stream"."1.1.10";
+    self.by-version."readable-stream"."1.1.11";
   by-spec."readable-stream"."~1.1.9" =
-    self.by-version."readable-stream"."1.1.10";
+    self.by-version."readable-stream"."1.1.11";
   by-spec."readdirp"."~0.2.3" =
     self.by-version."readdirp"."0.2.5";
   by-version."readdirp"."0.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -12408,6 +12415,28 @@
     ];
     passthru.names = [ "readdirp" ];
   };
+  by-spec."readline2"."~0.1.0" =
+    self.by-version."readline2"."0.1.0";
+  by-version."readline2"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-readline2-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/readline2/-/readline2-0.1.0.tgz";
+        name = "readline2-0.1.0.tgz";
+        sha1 = "6a272ef89731225b448e4c6799b6e50d5be12b98";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."readline2" or []);
+    deps = [
+      self.by-version."mute-stream"."0.0.4"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."chalk"."0.4.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "readline2" ];
+  };
   by-spec."redeyed"."~0.4.0" =
     self.by-version."redeyed"."0.4.2";
   by-version."redeyed"."0.4.2" = lib.makeOverridable self.buildNodePackage {
@@ -12590,14 +12619,14 @@
     passthru.names = [ "replace" ];
   };
   by-spec."request"."2" =
-    self.by-version."request"."2.33.0";
-  by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-request-2.33.0";
+    self.by-version."request"."2.34.0";
+  by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-request-2.34.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz";
-        name = "request-2.33.0.tgz";
-        sha1 = "5167878131726070ec633752ea230a2379dc65ff";
+        url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz";
+        name = "request-2.34.0.tgz";
+        sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
       })
     ];
     buildInputs =
@@ -12621,9 +12650,9 @@
     passthru.names = [ "request" ];
   };
   by-spec."request"."2 >=2.20.0" =
-    self.by-version."request"."2.33.0";
+    self.by-version."request"."2.34.0";
   by-spec."request"."2 >=2.25.0" =
-    self.by-version."request"."2.33.0";
+    self.by-version."request"."2.34.0";
   by-spec."request"."2.16.2" =
     self.by-version."request"."2.16.2";
   by-version."request"."2.16.2" = lib.makeOverridable self.buildNodePackage {
@@ -12704,9 +12733,9 @@
     passthru.names = [ "request" ];
   };
   by-spec."request".">=2.12.0" =
-    self.by-version."request"."2.33.0";
+    self.by-version."request"."2.34.0";
   by-spec."request"."~2" =
-    self.by-version."request"."2.33.0";
+    self.by-version."request"."2.34.0";
   by-spec."request"."~2.25.0" =
     self.by-version."request"."2.25.0";
   by-version."request"."2.25.0" = lib.makeOverridable self.buildNodePackage {
@@ -12833,6 +12862,35 @@
   };
   by-spec."request"."~2.33.0" =
     self.by-version."request"."2.33.0";
+  by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-request-2.33.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz";
+        name = "request-2.33.0.tgz";
+        sha1 = "5167878131726070ec633752ea230a2379dc65ff";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request" or []);
+    deps = [
+      self.by-version."qs"."0.6.6"
+      self.by-version."json-stringify-safe"."5.0.0"
+      self.by-version."forever-agent"."0.5.2"
+      self.by-version."node-uuid"."1.4.1"
+      self.by-version."mime"."1.2.11"
+      self.by-version."tough-cookie"."0.12.1"
+      self.by-version."form-data"."0.1.2"
+      self.by-version."tunnel-agent"."0.3.0"
+      self.by-version."http-signature"."0.10.0"
+      self.by-version."oauth-sign"."0.3.0"
+      self.by-version."hawk"."1.0.0"
+      self.by-version."aws-sign2"."0.5.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
   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 {
@@ -13246,14 +13304,14 @@
     passthru.names = [ "sax" ];
   };
   by-spec."selenium-webdriver"."*" =
-    self.by-version."selenium-webdriver"."2.39.0";
-  by-version."selenium-webdriver"."2.39.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-selenium-webdriver-2.39.0";
+    self.by-version."selenium-webdriver"."2.40.0";
+  by-version."selenium-webdriver"."2.40.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-selenium-webdriver-2.40.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.39.0.tgz";
-        name = "selenium-webdriver-2.39.0.tgz";
-        sha1 = "546225f2f4f53f1f490a3077e5f14092fad3d205";
+        url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.40.0.tgz";
+        name = "selenium-webdriver-2.40.0.tgz";
+        sha1 = "ca4603c08311ec3688d67e1c8e8263cb9c1c1450";
       })
     ];
     buildInputs =
@@ -13264,7 +13322,7 @@
     ];
     passthru.names = [ "selenium-webdriver" ];
   };
-  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.39.0";
+  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.40.0";
   by-spec."semver"."*" =
     self.by-version."semver"."2.2.1";
   by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -13393,7 +13451,7 @@
     deps = [
       self.by-version."debug"."0.7.4"
       self.by-version."mime"."1.2.11"
-      self.by-version."fresh"."0.2.1"
+      self.by-version."fresh"."0.2.2"
       self.by-version."range-parser"."1.0.0"
     ];
     peerDependencies = [
@@ -13505,7 +13563,7 @@
       (self.nativeDeps."sha" or []);
     deps = [
       self.by-version."graceful-fs"."2.0.2"
-      self.by-version."readable-stream"."1.0.25"
+      self.by-version."readable-stream"."1.0.26"
     ];
     peerDependencies = [
     ];
@@ -13870,8 +13928,6 @@
   };
   by-spec."socket.io"."~0.9.13" =
     self.by-version."socket.io"."0.9.16";
-  by-spec."socket.io"."~0.9.14" =
-    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";
   by-version."socket.io-client"."0.9.11" = lib.makeOverridable self.buildNodePackage {
@@ -14073,14 +14129,14 @@
     passthru.names = [ "stack-trace" ];
   };
   by-spec."stack-trace"."0.0.x" =
-    self.by-version."stack-trace"."0.0.8";
-  by-version."stack-trace"."0.0.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-stack-trace-0.0.8";
+    self.by-version."stack-trace"."0.0.9";
+  by-version."stack-trace"."0.0.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-stack-trace-0.0.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.8.tgz";
-        name = "stack-trace-0.0.8.tgz";
-        sha1 = "8a9c30543ed9697f77739c67b053d8b030d86f3e";
+        url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
+        name = "stack-trace-0.0.9.tgz";
+        sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
       })
     ];
     buildInputs =
@@ -14091,6 +14147,26 @@
     ];
     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";
+    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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."stackdriver-statsd-backend" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "stackdriver-statsd-backend" ];
+  };
+  "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.1.5";
   by-spec."statsd"."*" =
     self.by-version."statsd"."0.7.1";
   by-version."statsd"."0.7.1" = lib.makeOverridable self.buildNodePackage {
@@ -14114,6 +14190,26 @@
     passthru.names = [ "statsd" ];
   };
   "statsd" = self.by-version."statsd"."0.7.1";
+  by-spec."statsd-librato-backend"."*" =
+    self.by-version."statsd-librato-backend"."0.1.2";
+  by-version."statsd-librato-backend"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-statsd-librato-backend-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.2.tgz";
+        name = "statsd-librato-backend-0.1.2.tgz";
+        sha1 = "228718018361ef352109bb69e2e6b3af9ab7d12d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."statsd-librato-backend" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "statsd-librato-backend" ];
+  };
+  "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.2";
   by-spec."stream-combiner"."~0.0.2" =
     self.by-version."stream-combiner"."0.0.4";
   by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -14148,7 +14244,7 @@
     buildInputs =
       (self.nativeDeps."stream-counter" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.25"
+      self.by-version."readable-stream"."1.0.26"
     ];
     peerDependencies = [
     ];
@@ -14168,7 +14264,7 @@
     buildInputs =
       (self.nativeDeps."stream-counter" or []);
     deps = [
-      self.by-version."readable-stream"."1.1.10"
+      self.by-version."readable-stream"."1.1.11"
     ];
     peerDependencies = [
     ];
@@ -14704,7 +14800,7 @@
     buildInputs =
       (self.nativeDeps."through2" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.25"
+      self.by-version."readable-stream"."1.0.26"
       self.by-version."xtend"."2.1.2"
     ];
     peerDependencies = [
@@ -15167,15 +15263,15 @@
     ];
     passthru.names = [ "uglify-to-browserify" ];
   };
-  by-spec."uid-number"."0" =
-    self.by-version."uid-number"."0.0.4";
-  by-version."uid-number"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-uid-number-0.0.4";
+  by-spec."uid-number"."0.0.5" =
+    self.by-version."uid-number"."0.0.5";
+  by-version."uid-number"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-uid-number-0.0.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.4.tgz";
-        name = "uid-number-0.0.4.tgz";
-        sha1 = "5ea1d068b8c0dd1866c13aa0b76fa6e4f240cbdf";
+        url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz";
+        name = "uid-number-0.0.5.tgz";
+        sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e";
       })
     ];
     buildInputs =
@@ -15363,7 +15459,7 @@
       self.by-version."moment"."2.5.1"
       self.by-version."async"."0.2.9"
       self.by-version."ssh2"."0.2.17"
-      self.by-version."rc"."0.3.3"
+      self.by-version."rc"."0.3.4"
       self.by-version."uuid"."1.4.1"
       self.by-version."winston"."0.7.2"
       self.by-version."passport"."0.1.18"
@@ -15383,7 +15479,7 @@
       self.by-version."raven"."0.6.2"
       self.by-version."knockout"."3.0.0"
       self.by-version."npm-registry-client"."0.3.6"
-      self.by-version."npmconf"."0.1.12"
+      self.by-version."npmconf"."0.1.13"
       self.by-version."mkdirp"."0.3.5"
     ];
     peerDependencies = [
@@ -15856,7 +15952,7 @@
       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.12"
+      self.by-version."npmconf"."0.1.13"
       self.by-version."phantomjs"."1.9.7-1"
       self.by-version."tmp"."0.0.23"
       self.by-version."follow-redirects"."0.0.3"
@@ -15887,15 +15983,15 @@
   };
   by-spec."websocket-driver".">=0.3.1" =
     self.by-version."websocket-driver"."0.3.2";
-  by-spec."when"."~2.2.1" =
-    self.by-version."when"."2.2.1";
-  by-version."when"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-when-2.2.1";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/when/-/when-2.2.1.tgz";
-        name = "when-2.2.1.tgz";
-        sha1 = "b1def994017350b8087f6e9a7596ab2833bdc712";
+        url = "http://registry.npmjs.org/when/-/when-2.8.0.tgz";
+        name = "when-2.8.0.tgz";
+        sha1 = "a15eda8b6998ce74c6f4e220dbda18ce2ab3b026";
       })
     ];
     buildInputs =
@@ -15972,7 +16068,7 @@
       self.by-version."eyes"."0.1.8"
       self.by-version."pkginfo"."0.3.0"
       self.by-version."request"."2.16.6"
-      self.by-version."stack-trace"."0.0.8"
+      self.by-version."stack-trace"."0.0.9"
     ];
     peerDependencies = [
     ];
@@ -15999,7 +16095,7 @@
       self.by-version."eyes"."0.1.8"
       self.by-version."pkginfo"."0.2.3"
       self.by-version."request"."2.9.203"
-      self.by-version."stack-trace"."0.0.8"
+      self.by-version."stack-trace"."0.0.9"
     ];
     peerDependencies = [
     ];
@@ -16158,6 +16254,8 @@
     ];
     passthru.names = [ "ws" ];
   };
+  by-spec."ws"."~0.4.31" =
+    self.by-version."ws"."0.4.31";
   by-spec."wu"."*" =
     self.by-version."wu"."0.1.8";
   by-version."wu"."0.1.8" = lib.makeOverridable self.buildNodePackage {
@@ -16377,6 +16475,26 @@
     ];
     passthru.names = [ "xtend" ];
   };
+  by-spec."yargs"."~1.1.2" =
+    self.by-version."yargs"."1.1.3";
+  by-version."yargs"."1.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-yargs-1.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/yargs/-/yargs-1.1.3.tgz";
+        name = "yargs-1.1.3.tgz";
+        sha1 = "c44ed2bb9c86d55b557f2179fea7c7013fe4c42a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."yargs" or []);
+    deps = [
+      self.by-version."minimist"."0.0.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "yargs" ];
+  };
   by-spec."yeoman-generator"."~0.13.0" =
     self.by-version."yeoman-generator"."0.13.4";
   by-version."yeoman-generator"."0.13.4" = lib.makeOverridable self.buildNodePackage {
@@ -16482,7 +16600,7 @@
       self.by-version."isbinaryfile"."2.0.1"
       self.by-version."dargs"."0.1.0"
       self.by-version."async"."0.2.10"
-      self.by-version."inquirer"."0.4.0"
+      self.by-version."inquirer"."0.4.1"
       self.by-version."iconv-lite"."0.2.11"
       self.by-version."shelljs"."0.2.6"
       self.by-version."findup-sync"."0.1.2"
@@ -16567,7 +16685,7 @@
     buildInputs =
       (self.nativeDeps."zip-stream" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.25"
+      self.by-version."readable-stream"."1.0.26"
       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 c7660c7a0a2..6539fc3e6dd 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -73,6 +73,8 @@
 , "generator-webapp"
 , "generator-angular"
 , "statsd"
+, "statsd-librato-backend"
+, "stackdriver-statsd-backend"
 , "ungit"
 , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
 , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
-- 
GitLab


From 51c9dbc9f3ad4cf3142d0e50b040f4ba14b84ad2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 12:41:12 +0100
Subject: [PATCH 1548/3789] python-wrapper: add 'ignoreCollisions' parameter
 (which default to 'false')

---
 pkgs/development/interpreters/python/wrapper.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 34af23740d5..ccfbcfcdd42 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -1,5 +1,5 @@
 { stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [], postBuild ? ""
-, stdLibs ? stdenv.lib.attrValues python.modules
+, stdLibs ? stdenv.lib.attrValues python.modules, ignoreCollisions ? false
 }:
 
 # Create a python executable that knows about additional packages.
@@ -7,7 +7,8 @@
 (buildEnv {
   name = "python-${python.version}-wrapper";
   paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ stdLibs ++ [ python recursivePthLoader ];
-  ignoreCollisions = false;
+
+  inherit ignoreCollisions;
 
   postBuild = ''
     . "${makeWrapper}/nix-support/setup-hook"
-- 
GitLab


From d5211b0e0e45c840d415733b56d9be93224f1616 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 24 Feb 2014 18:05:26 +0100
Subject: [PATCH 1549/3789] Make initialRootPassword overrideable in all
 virtualisation modules, not just virtualbox.

---
 nixos/modules/virtualisation/amazon-image.nix         | 2 +-
 nixos/modules/virtualisation/containers.nix           | 4 ++--
 nixos/modules/virtualisation/google-compute-image.nix | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index abd2a1084bd..99d6f927ef0 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -164,5 +164,5 @@ with pkgs.lib;
   # 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 = "!";
+  security.initialRootPassword = mkDefault "!";
 }
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index bcbfaacd703..d87284de4fc 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -55,7 +55,7 @@ with pkgs.lib;
                   modules =
                     let extraConfig =
                       { boot.isContainer = true;
-                        security.initialRootPassword = "!";
+                        security.initialRootPassword = mkDefault "!";
                         networking.hostName = mkDefault name;
                       };
                     in [ extraConfig config.config ];
@@ -134,4 +134,4 @@ with pkgs.lib;
       }) config.systemd.containers;
 
   };
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 098c9ede853..634932ff007 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -114,7 +114,7 @@ with pkgs.lib;
   # 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 = "!";
+  security.initialRootPassword = mkDefault "!";
 
   # Configure default metadata hostnames
   networking.extraHosts = ''
-- 
GitLab


From 9c36f01edd6b339f16938fcf66b191e363edd504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 24 Feb 2014 19:17:46 +0100
Subject: [PATCH 1550/3789] Updating toxic and toxcore to newer code.

---
 .../networking/instant-messengers/toxic/default.nix         | 6 +++---
 pkgs/development/libraries/libtoxcore/default.nix           | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index 23b09cf8fa1..ded2bbf9250 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -2,8 +2,8 @@
 , libtoxcore, pkgconfig }:
 
 let
-  version = "da99d776df";
-  date = "20140203";
+  version = "b308e19e6b";
+  date = "20140224";
 in
 stdenv.mkDerivation rec {
   name = "toxic-${date}-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://github.com/Tox/toxic/tarball/${version}";
     name = "${name}.tar.gz";
-    sha256 = "0d97crkslyk7sgcsawnnwyzp31azp80yprpd6xqjcraxd442dfyj";
+    sha256 = "0fgkvnpy3dl2h378h796z9md0zg05b3174fgx17b919av6j9x4ma";
   };
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 91f9e4f2f2b..81336aed8aa 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -2,8 +2,8 @@
 , libconfig, pkgconfig }:
 
 let
-  version = "dbe256cc82";
-  date = "20140203";
+  version = "388b1229b";
+  date = "20140220";
 in
 stdenv.mkDerivation rec {
   name = "tox-core-${date}-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://github.com/irungentoo/ProjectTox-Core/tarball/${version}";
     name = "${name}.tar.gz";
-    sha256 = "0mqbwwqbm15p16ya8nlij23fgbafjdmnc44nm2vh47m8pyb119lc";
+    sha256 = "12vggiv0gyv8a2rd5qrv04b7yhfhxb7r0yh75gg5n4jdpcbhvgsd";
   };
 
   preConfigure = ''
-- 
GitLab


From abca8f64f224a9ffc27c861367a0e9c9c455b08a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:16:58 +0100
Subject: [PATCH 1551/3789] lxc: update from 1.0.0.beta4 to 1.0.0

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

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 825c241e53a..e6895bb517f 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "lxc-1.0.0.beta4";
+  name = "lxc-1.0.0";
 
   src = fetchurl {
     url = "http://github.com/lxc/lxc/archive/${name}.tar.gz";
-    sha256 = "174grvh5086pmbaladp5ivy2azlm7q9v5xwgc5yww2mggx99w41j";
+    sha256 = "1dv78xd7mdb50x8dgjvnv2v6sdj2xv2vvar7y402ll2wh8ixmi91";
   };
 
   buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ];
-- 
GitLab


From df4919f07027519e3f4774ded920a700a0287d96 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:17:09 +0100
Subject: [PATCH 1552/3789] duplicity: update from 0.6.22 to 0.6.23

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

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 48f2757db86..ec4c00880d4 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper }:
 
 let
-  version = "0.6.22";
+  version = "0.6.23";
 in
 stdenv.mkDerivation {
   name = "duplicity-${version}";
 
   src = fetchurl {
     url = "http://code.launchpad.net/duplicity/0.6-series/${version}/+download/duplicity-${version}.tar.gz";
-    sha256 = "04jskh1j85s35vfzm9gylpl7ysn5njbl0gcg92bhc7v88l29nj3g";
+    sha256 = "0q0ckkmyq9z7xfbb1jajflmbzjwxpcjkkiab43rxrplm0ghz25vs";
   };
 
   installPhase = ''
-- 
GitLab


From b05d3e77f185277b60f746c88e940f41fde86aeb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:17:24 +0100
Subject: [PATCH 1553/3789] spamassassin: update from 3.3.2 to 3.4.0

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

diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix
index dc316267e6c..03e579bda20 100644
--- a/pkgs/servers/mail/spamassassin/default.nix
+++ b/pkgs/servers/mail/spamassassin/default.nix
@@ -13,11 +13,11 @@
 #
 
 buildPerlPackage rec {
-  name = "SpamAssassin-3.3.2";
+  name = "SpamAssassin-3.4.0";
 
   src = fetchurl {
     url = "http://apache.imsam.info/spamassassin/source/Mail-${name}.tar.bz2";
-    sha256 = "01d2jcpy423zfnhg123wlhzysih1hmb93nxfspiaajzh9r5rn8y7";
+    sha256 = "0527rv6m5qd41l756fqh9q7sm9m2xfhhy2jchlhbmd39x6x3jfsm";
   };
 
   buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM
-- 
GitLab


From a0a94308692495d1f4947ffb37444a80ab7f3730 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 24 Feb 2014 15:34:57 -0500
Subject: [PATCH 1554/3789] Add mariadb

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

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
new file mode 100644
index 00000000000..e09943d86c8
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff }:
+
+stdenv.mkDerivation rec {
+  name = "mariadb-10.0.8";
+
+  src = fetchurl {
+    url = "http://tweedo.com/mirror/mariadb/${name}/kvm-tarbake-jaunty-x86/${name}.tar.gz";
+    md5 = "2b925d0beae8101f1f3f98102da91bf7";
+  };
+
+  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" ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "An enhanced, drop-in replacement for MySQL";
+    homepage    = https://mariadb.org/;
+    license     = stdenv.lib.licenses.gpl2;
+    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 64f2bb688c4..44a23e828df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6294,6 +6294,8 @@ let
 
   #monetdb = callPackage ../servers/sql/monetdb { };
 
+  mariadb = callPackage ../servers/sql/mariadb {};
+
   mongodb = callPackage ../servers/nosql/mongodb { };
 
   riak = callPackage ../servers/nosql/riak/1.3.1.nix { };
-- 
GitLab


From 01aaf816c937d90fefca4e68703ecb9fb5650926 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:30:27 +0100
Subject: [PATCH 1555/3789] acpid: update from 2.0.20 to 2.0.21

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

diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix
index c1f92476b87..a0ae59a5a5b 100644
--- a/pkgs/os-specific/linux/acpid/default.nix
+++ b/pkgs/os-specific/linux/acpid/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "acpid-2.0.20";
+  name = "acpid-2.0.21";
 
   src = fetchurl {
     url = "mirror://sourceforge/acpid2/${name}.tar.xz";
-    sha256 = "0l7pzjcpf1935bn44kzgc16h00clbx73cjm2dlyhzvvb5ksvl7ka";
+    sha256 = "0vv3zz8p3wxhlp35aqgqvzn6lda595wzn7php3k47jwci1cpxrn4";
   };
 
   preBuild = ''
-- 
GitLab


From 4d7ee5246c4e5cb0d42b2fda971f528da4b15f3e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:30:40 +0100
Subject: [PATCH 1556/3789] isocodes: update from 3.49 to 3.51

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

diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index 3c408e6bc78..987e1a25d35 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/pkgs/development/libraries/iso-codes/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, gettext, python, xz}:
 
 stdenv.mkDerivation rec {
-  name = "iso-codes-3.49";
+  name = "iso-codes-3.51";
   src = fetchurl {
     url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz";
-    sha256 = "1ryk5i467p7xxrbrqynb35ci046yj9k9b4d3hfxzass962lz9q04";
+    sha256 = "0zyp99l4m8cd6301x8zi3xxhziam6v0ic1h8qxb1l0mcjafzf8jj";
   };
   patchPhase = ''
     for i in `find . -name \*.py`
-- 
GitLab


From 9f714fbafa05f3b5bc78726252224fc58f25f5ef Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:30:47 +0100
Subject: [PATCH 1557/3789] iw: update from 3.11 to 3.14

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

diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix
index 2609e1880b4..ab01231f334 100644
--- a/pkgs/os-specific/linux/iw/default.nix
+++ b/pkgs/os-specific/linux/iw/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libnl, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  name = "iw-3.11";
+  name = "iw-3.14";
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz";
-    sha256 = "1zrh0pjcy0kg6n8wlr34cg3bmi3nj28rhqn5pad23a1170r2f0z9";
+    sha256 = "16fr13cl02702d9yjqlgvnxvpv0w0mqn0acba39iwn2lln5b4747";
   };
 
   buildInputs = [ libnl pkgconfig ];
-- 
GitLab


From 77f03b973d137857c62d9afd4329ba3b5d575ec6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:31:02 +0100
Subject: [PATCH 1558/3789] libmilter: update from 8.14.4 to 8.14.8

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

diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix
index c8fa978534d..7f925cd9b2a 100644
--- a/pkgs/development/libraries/libmilter/default.nix
+++ b/pkgs/development/libraries/libmilter/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, m4}:
 
 stdenv.mkDerivation rec {
-  name = "libmilter-8.14.4";
+  name = "libmilter-8.14.8";
   
   src = fetchurl {
-    url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.4.tar.gz";
-    sha256 = "1cbwz5ynl8snrdkl7ay1qhqknbyv0qsvdvcri7mb662hgi1hj0dw";
+    url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.8.tar.gz";
+    sha256 = "1zmhzkj3gzx8022hsrysr3nzlcmv1qisb5i4jbx91661bw96ksq2";
   };
 
   buildPhase = '' 
-- 
GitLab


From 9a409ee3fd9d5eb9fe60a6853d19df7e60a406f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:31:19 +0100
Subject: [PATCH 1559/3789] libpcap: update from 1.4.0 to 1.5.3

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

diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index 87e2a641654..11eccb0a0e3 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "libpcap-1.4.0";
+  name = "libpcap-1.5.3";
   
   src = fetchurl {
     url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    sha256 = "01klphfqxvkyjvic0hmc10qmiicqz6pv6kvb9s00kaz8f57jlskw";
+    sha256 = "14wyjywrdi1ikaj6yc9c72m6m2r64z94lb0gm7k1a3q6q5cj3scs";
   };
   
   nativeBuildInputs = [ flex bison ];
-- 
GitLab


From 2dc6bcbc40b2b20fbc306d9e7917b0cf20f9b534 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:31:30 +0100
Subject: [PATCH 1560/3789] libselinux: update from 2.2.1 to 2.2.2

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

diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 2dd5bdfb24c..e125ac3fe8e 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -8,12 +8,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libselinux-${version}";
-  version = "2.2.1";
+  version = "2.2.2";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/libselinux-${version}.tar.gz";
-    sha256 = "17navgvljgq35bljzcdwjdj3khajc27s15binr51xkp0h29qgbcd";
+    sha256 = "0gjs5cqwhqzmf0avnn0343ip69153k9z35vbp03sjvc02qs3darh";
   };
 
   buildInputs = [ pkgconfig libsepol pcre ]
-- 
GitLab


From 17f7c664f64e3c61affa15c652cba14e6038d487 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:31:42 +0100
Subject: [PATCH 1561/3789] libzip: update from 0.11.1 to 0.11.2

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

diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix
index 914157c7a0c..be50a58c54a 100644
--- a/pkgs/development/libraries/libzip/default.nix
+++ b/pkgs/development/libraries/libzip/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libzip-0.11.1";
+  name = "libzip-0.11.2";
   
   src = fetchurl {
     url = "http://www.nih.at/libzip/${name}.tar.gz";
-    sha256 = "15fwscng2lk0ypg45awk4y2grjqm987frnjcsnbxznfgpckrq7yy";
+    sha256 = "1mcqrz37vjrfr4gnss37z1m7xih9x9miq3mms78zf7wn7as1znw3";
   };
   
   propagatedBuildInputs = [ zlib ];
-- 
GitLab


From ce365835d7c16ff9b20513e42e1988ba31f3326e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:31:54 +0100
Subject: [PATCH 1562/3789] links2: update from 2.5 to 2.8

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

diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index 7efdf7ed015..9b9d9ab6db1 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.5";
+  version = "2.8";
   name = "links2-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
-    sha256 = "1wlmj8s6bxgznh0pnawihyvhffzryciz3lkagcxhf7fp64zz5izm";
+    sha256 = "15h07498z52jfdahzgvkphg1f7qvxnpbyfn2xmsls0d2dwwdll3r";
   };
 
   buildInputs =
-- 
GitLab


From 20a150a1dff8482c2a5324e2ca361b5d990bfc82 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:32:04 +0100
Subject: [PATCH 1563/3789] memtest86: update from 4.1.0 to 4.3.3

---
 pkgs/tools/misc/memtest86/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix
index 978bb2729f8..ebf0a89a707 100644
--- a/pkgs/tools/misc/memtest86/default.nix
+++ b/pkgs/tools/misc/memtest86/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "memtest86-4.1.0";
+  name = "memtest86-4.3.3";
   
   src = fetchurl {
-    url = http://www.memtest86.com/downloads/memtest86-4.1.0-src.tar.gz;
-    sha256 = "1kdvq16s8hvk7plprws33mfh7cnhmfl1m32sfgbmzygbhk5wqxxq";
+    url = http://www.memtest86.com/downloads/memtest86-4.3.3-src.tar.gz;
+    sha256 = "1fzpk0s97lx8h1wbv2bgr6m8v4ag8i58kzr8fa25bvwyl8hks9sl";
   };
 
   preBuild = ''
-- 
GitLab


From 684e06c2e6089d0a4ea7297f0661dca2c32aa72a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:32:13 +0100
Subject: [PATCH 1564/3789] mtools: update from 4.0.17 to 4.0.18

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

diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix
index f5c07b031b8..0b666f38942 100644
--- a/pkgs/tools/filesystems/mtools/default.nix
+++ b/pkgs/tools/filesystems/mtools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mtools-4.0.17";
+  name = "mtools-4.0.18";
 
   src = fetchurl {
     url = "mirror://gnu/mtools/${name}.tar.bz2";
-    sha256 = "1dpch2wsiwhyg7xhsdvmc1pws8biwqkmnqjc3mdj2bd76273bk0f";
+    sha256 = "119gdfnsxc6hzicnsf718k0fxgy2q14pxn7557rc96aki20czsar";
   };
 
   doCheck = true;
-- 
GitLab


From 65aaf865a7339015a1980b927cbec9e1b4ccd345 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:32:23 +0100
Subject: [PATCH 1565/3789] nasm: update from 2.10 to 2.11.01

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

diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index cbbb5608a46..76359de6575 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "nasm-2.10";
+  name = "nasm-2.11.01";
   
   src = fetchurl {
-    url = "http://www.nasm.us/pub/nasm/releasebuilds/2.10/${name}.tar.bz2";
-    sha256 = "1wcxm0il06b17wjarw8pbf9bagjhfcf7yayahmyip03qkfka2yk8";
+    url = "http://www.nasm.us/pub/nasm/releasebuilds/2.11.01/${name}.tar.bz2";
+    sha256 = "0p0rhq18in2hyv3gircgxj72n2b1mvr8bvjlqscpaz8m62cyvam7";
   };
 
   meta = {
-- 
GitLab


From dfff43fe5977b2c2ba741c22700bd6f93fb8f16a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:33:11 +0100
Subject: [PATCH 1566/3789] nspr: update from 4.10.2 to 4.10.3

---
 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 2b6f952696c..8aa8edfd3b9 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.2"; in
+let version = "4.10.3"; 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 = "650e4aa35d58624bc1083ed585c81c4af09cf23c";
+    sha256 = "1r81rc2v8rlvc9wfsmi98h7k4qwsqb37v5ww1c4v1nk5lsqpjmzj";
   };
 
   preConfigure = "cd nspr";
-- 
GitLab


From 02a475bf75eca230725d777185d3076a66bed689 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:33:21 +0100
Subject: [PATCH 1567/3789] pylint: update from 0.26.0 to 0.28.0

---
 pkgs/development/python-modules/pylint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index d45d724ae58..df95e56377d 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "pylint-0.26.0";
+  name = "pylint-0.28.0";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://download.logilab.org/pub/pylint/${name}.tar.gz";
-    sha256 = "1mg1ywpj0klklv63s2hwn5xwxi3wfwgnyz9d4pz32hzb53azq835";
+    sha256 = "1077hs8zpl1q5yc6wcg645nfqc4pwbdk8vjcv0qrldbb87f3yv7a";
   };
 
   propagatedBuildInputs = [ pythonPackages.logilab_astng ];
-- 
GitLab


From ddbeda014291661f4d71026020c40918c146e203 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:44:31 +0100
Subject: [PATCH 1568/3789] python-logilab-astng: update to version 0.24.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b58e84f9efa..ff2d3be97eb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1740,11 +1740,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   });
 
   logilab_astng = buildPythonPackage rec {
-    name = "logilab-astng-0.24.1";
+    name = "logilab-astng-0.24.3";
 
     src = fetchurl {
       url = "http://download.logilab.org/pub/astng/${name}.tar.gz";
-      sha256 = "00qxaxsax80sknwv25xl1r49lc4gbhkxs1kjywji4ad8y1npax0s";
+      sha256 = "0np4wpxyha7013vkkrdy54dvnil67gzi871lg60z8lap0l5h67wn";
     };
 
     propagatedBuildInputs = [ logilab_common ];
-- 
GitLab


From 199afbe062569cd751146c49e4acfabd3400d8f4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:44:46 +0100
Subject: [PATCH 1569/3789] python-logilab-common: update to version 0.61.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 ff2d3be97eb..e6ae4b37c6e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3441,11 +3441,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   };
 
   logilab_common = buildPythonPackage rec {
-    name = "logilab-common-0.58.2";
+    name = "logilab-common-0.61.0";
 
     src = fetchurl {
       url = "http://download.logilab.org/pub/common/${name}.tar.gz";
-      sha256 = "0qfdyj2is0scpnkgpnqm12lh4yl27617l0irlilhk25cpgbbfbf9";
+      sha256 = "09apsrcvjliawbxmfrmi1l8hlbaj87mb7n4lrlivy5maxs6yg4hd";
     };
 
     propagatedBuildInputs = [ unittest2 ];
-- 
GitLab


From 2955a481073f223d039df8105906525acb0241fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:45:15 +0100
Subject: [PATCH 1570/3789] python-packages.nix: strip trailing whitespace

---
 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 e6ae4b37c6e..3340e3059f2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4658,7 +4658,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
               s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;'
     '';
 
-    
+
 
     meta = {
       homepage = http://python-imaging.github.com/Pillow;
-- 
GitLab


From bac47e81686b1b56319d0fd717bc580e9842230d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 10:09:47 +0100
Subject: [PATCH 1571/3789] haskell-lens: update to version 4.0.4

---
 .../libraries/haskell/lens/{4.0.3.nix => 4.0.4.nix}  |  4 ++--
 pkgs/top-level/haskell-packages.nix                  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename pkgs/development/libraries/haskell/lens/{4.0.3.nix => 4.0.4.nix} (94%)

diff --git a/pkgs/development/libraries/haskell/lens/4.0.3.nix b/pkgs/development/libraries/haskell/lens/4.0.4.nix
similarity index 94%
rename from pkgs/development/libraries/haskell/lens/4.0.3.nix
rename to pkgs/development/libraries/haskell/lens/4.0.4.nix
index 9aca42a77df..cd85c7a4e94 100644
--- a/pkgs/development/libraries/haskell/lens/4.0.3.nix
+++ b/pkgs/development/libraries/haskell/lens/4.0.4.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "4.0.3";
-  sha256 = "01gf0hxpd136555r9ilzjrc6fyw0ng9bmr8bmkhfnkba127y7hgx";
+  version = "4.0.4";
+  sha256 = "14xa500afjpdfx3qqxr9dg5x8mxrna7c3b5xchqsrwck9d00cphd";
   buildDepends = [
     aeson bifunctors comonad constraints contravariant distributive
     exceptions filepath hashable mtl parallel primitive profunctors
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ed5417dfa6e..7677173fb46 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -960,7 +960,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   digestiveFunctorsAeson = callPackage ../development/libraries/haskell/digestive-functors-aeson {
     aeson = self.aeson_0_7_0_1;
-    lens = self.lens_4_0_3;
+    lens = self.lens_4_0_4;
   };
 
   digestiveFunctorsHeist = callPackage ../development/libraries/haskell/digestive-functors-heist {};
@@ -1531,7 +1531,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {
     aeson = self.aeson_0_7_0_1;
-    lens = self.lens_4_0_3;
+    lens = self.lens_4_0_4;
   };
 
   jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
@@ -1567,7 +1567,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {};
 
   lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {};
-  lens_4_0_3 = callPackage ../development/libraries/haskell/lens/4.0.3.nix {
+  lens_4_0_4 = callPackage ../development/libraries/haskell/lens/4.0.4.nix {
     aeson = self.aeson_0_7_0_1;
   };
   lens = self.lens_3_10_2;
@@ -1593,7 +1593,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   liftedBase = callPackage ../development/libraries/haskell/lifted-base {};
 
   linear = callPackage ../development/libraries/haskell/linear {
-    lens = self.lens_4_0_3;
+    lens = self.lens_4_0_4;
   };
 
   List = callPackage ../development/libraries/haskell/List {};
@@ -2171,8 +2171,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   socks = callPackage ../development/libraries/haskell/socks {};
 
   sparse = callPackage ../development/libraries/haskell/sparse {
-    lens = self.lens_4_0_3;
-    linear = self.linear.override { lens = self.lens_4_0_3; };
+    lens = self.lens_4_0_4;
+    linear = self.linear.override { lens = self.lens_4_0_4; };
   };
 
   srcloc = callPackage ../development/libraries/haskell/srcloc {};
-- 
GitLab


From c20be9610c04eaa5662e6292d3b82d24df043c52 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 10:10:12 +0100
Subject: [PATCH 1572/3789] haskell-fb: re-generate package with cabal2nix

---
 pkgs/development/libraries/haskell/fb/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix
index 122c2329668..dbade4c9f84 100644
--- a/pkgs/development/libraries/haskell/fb/default.nix
+++ b/pkgs/development/libraries/haskell/fb/default.nix
@@ -21,12 +21,11 @@ cabal.mkDerivation (self: {
     aeson conduit dataDefault hspec httpConduit HUnit liftedBase
     monadControl QuickCheck text time transformers
   ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/meteficha/fb";
     description = "Bindings to Facebook's API";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-  # The tests require Facebook API keys
-  doCheck = false;
 })
-- 
GitLab


From eedfd782188402a58a50c2692b570f0203cc2d5c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 10:11:55 +0100
Subject: [PATCH 1573/3789] haskell-asn1-encoding: update to version 0.8.1.3

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

diff --git a/pkgs/development/libraries/haskell/asn1-encoding/default.nix b/pkgs/development/libraries/haskell/asn1-encoding/default.nix
index c151da0c7dd..623657ee762 100644
--- a/pkgs/development/libraries/haskell/asn1-encoding/default.nix
+++ b/pkgs/development/libraries/haskell/asn1-encoding/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "asn1-encoding";
-  version = "0.8.1.2";
-  sha256 = "01i7zga9nfvccgjixnxza9mi7jj4k6308g8asnljr44s1k8rikwm";
+  version = "0.8.1.3";
+  sha256 = "000rajx9gdxfyx521yg2mvp1z8h61sr96w1lzwawiw7n5ng6v8ni";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ asn1Types mtl text time ];
-- 
GitLab


From 75a2d1b2f03bed1f1e2804101562c6baa65e8d6c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 10:11:57 +0100
Subject: [PATCH 1574/3789] haskell-crypto-pubkey-types: update to version
 0.4.2.1

---
 .../libraries/haskell/crypto-pubkey-types/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
index ba5007e789f..7d6a5c1b615 100644
--- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-pubkey-types";
-  version = "0.4.1";
-  sha256 = "1zs0hhpqcfsdyfr3z96m8lwxrxr3mf27wvjrpvih9jlvh64vp1pr";
+  version = "0.4.2.1";
+  sha256 = "01jxvx4bjk4qj024ydwskp942gsgy15i9jfh3diq9la8yqnidwj2";
   buildDepends = [ asn1Types ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";
-- 
GitLab


From efcaa154440dd7a13dc0c2688be98b7688e72048 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 10:11:58 +0100
Subject: [PATCH 1575/3789] haskell-hoogle: update to version 4.2.29

---
 .../libraries/haskell/hoogle/default.nix            | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index 7744a705efc..9f8c10f86fb 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -1,19 +1,20 @@
 { cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive
 , cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes
-, parsec, random, safe, shake, tagsoup, text, time, transformers
-, uniplate, wai, warp
+, parsec, QuickCheck, random, safe, shake, tagsoup, text, time
+, transformers, uniplate, vector, vectorAlgorithms, wai, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.28";
-  sha256 = "0dd8qsspbcb76ld9v61x2jjsyxakrasww69gzzprb4dxzm58lsid";
+  version = "4.2.29";
+  sha256 = "0w4fgf0qvd5zsa7dk99vcbr2pnyyg1hl3k0zwvp5v26v1lfijzil";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit
-    deepseq filepath haskellSrcExts httpTypes parsec random safe shake
-    tagsoup text time transformers uniplate wai warp
+    deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random
+    safe shake tagsoup text time transformers uniplate vector
+    vectorAlgorithms wai warp
   ];
   testDepends = [ filepath ];
   testTarget = "--test-option=--no-net";
-- 
GitLab


From 3912c15aa8a021260124e502f97e139a4540c019 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 10:12:00 +0100
Subject: [PATCH 1576/3789] haskell-io-streams: update to version 1.1.4.2

---
 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 e582b0bce8f..fcc39dfad57 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.0";
-  sha256 = "0fkys15ih3ld4l5rqjlsmhdkf9w3xnhj6hbbahazx7pj0xsv1hyh";
+  version = "1.1.4.2";
+  sha256 = "0x6d0j41wnxl2h9xzbybmzqrrna3hc17786k65cpiby2x3nlp799";
   buildDepends = [
     attoparsec blazeBuilder network primitive text time transformers
     vector zlibBindings
-- 
GitLab


From 3b3afdce578e80019785b4386933aa7c89cb8549 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 10:12:04 +0100
Subject: [PATCH 1577/3789] haskell-shakespeare-text: update to version 1.0.2

---
 .../libraries/haskell/shakespeare-text/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index 95ae94a8f26..fa5b91dd469 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-text";
-  version = "1.0.1";
-  sha256 = "1vxy1d8r9wd8qijmy2jm7c7y7wg77qnzsh1ga0rlh3nklj9w01ml";
+  version = "1.0.2";
+  sha256 = "0vhk5g5pm3gz8gzr7cbvkp920x4lmb9pkb9k6yhlj8wfb93bg93q";
   buildDepends = [ shakespeare text ];
   testDepends = [ hspec HUnit text ];
   meta = {
-- 
GitLab


From 7fc5eea0f3a1c621f457c0ebb52afbf356629557 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 10:12:05 +0100
Subject: [PATCH 1578/3789] haskell-x509: update to version 1.4.9

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

diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix
index 0aababd4715..979f477e085 100644
--- a/pkgs/development/libraries/haskell/x509/default.nix
+++ b/pkgs/development/libraries/haskell/x509/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "x509";
-  version = "1.4.7";
-  sha256 = "0bm5sijahpih2c6scz3y32904wzvmllgslg9d547cksbgy7lyx1h";
+  version = "1.4.9";
+  sha256 = "0yrlkmrc0ygki61wlfvavvrm5aklircrj5w1nbvjlimrc4j8vq9g";
   buildDepends = [
     asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes
     filepath mtl pem time
-- 
GitLab


From e4f4e42896bc8d05eb62f95e7f3418b62bf3a115 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:22:58 +0100
Subject: [PATCH 1579/3789] haskell-multiarg: update to version 0.24.0.4

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

diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
index 737ddbda5d6..ba2249c717a 100644
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ b/pkgs/development/libraries/haskell/multiarg/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "multiarg";
-  version = "0.24.0.2";
-  sha256 = "0jqkqw0v9dzby6cm0ijj1ff5dpps8hbjnhrscf2qwja9x974686s";
+  version = "0.24.0.4";
+  sha256 = "1f572046hlv2yngqa4bcxc4kwi8sc5q7v2dw2aap6pv7jfm8m8ws";
   buildDepends = [ utf8String ];
   meta = {
     homepage = "https://github.com/massysett/multiarg";
-- 
GitLab


From 38d51bdf3b4b1f939f51fdd5761b189f8ba96cc3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:22:59 +0100
Subject: [PATCH 1580/3789] haskell-multirec: update to version 0.7.4

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

diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix
index 61de0cace5b..85c2a671dbf 100644
--- a/pkgs/development/libraries/haskell/multirec/default.nix
+++ b/pkgs/development/libraries/haskell/multirec/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "multirec";
-  version = "0.7.3";
-  sha256 = "0k1wbjsvkl08nwjikflc8yyalk654mf8bvi1rhm28i4na52myi5y";
+  version = "0.7.4";
+  sha256 = "01mligrin7fp3fnnwgv8nrww5938ryghgyw9xyw153a615ryj8i9";
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
     description = "Generic programming for families of recursive datatypes";
-- 
GitLab


From f49ce8adc7523bd585ee8a43f3f2ff69cdbc48de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:23:00 +0100
Subject: [PATCH 1581/3789] haskell-threepenny-gui: update to version 0.4.1.0

---
 .../libraries/haskell/threepenny-gui/default.nix  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/threepenny-gui/default.nix b/pkgs/development/libraries/haskell/threepenny-gui/default.nix
index 70f96c8ac9d..1855f493812 100644
--- a/pkgs/development/libraries/haskell/threepenny-gui/default.nix
+++ b/pkgs/development/libraries/haskell/threepenny-gui/default.nix
@@ -1,17 +1,18 @@
-{ cabal, attoparsecEnumerator, dataDefault, deepseq, filepath
-, hashable, json, MonadCatchIOTransformers, network, safe, snapCore
-, snapServer, stm, text, time, transformers, unorderedContainers
-, utf8String, vault, websockets, websocketsSnap
+{ cabal, aeson, attoparsecEnumerator, dataDefault, deepseq
+, filepath, hashable, MonadCatchIOTransformers, network, safe
+, snapCore, snapServer, stm, text, time, transformers
+, unorderedContainers, utf8String, vault, websockets
+, websocketsSnap
 }:
 
 cabal.mkDerivation (self: {
   pname = "threepenny-gui";
-  version = "0.4.0.2";
-  sha256 = "0dx6jrpxvd6ypz314hmq8nngy0wjx3bwx3r9h1c6y70id31lr9pg";
+  version = "0.4.1.0";
+  sha256 = "0fafwnlbl96z9m5fr3wiyv090fga78cr9hrd4yd3vyiz44gfrpcw";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    attoparsecEnumerator dataDefault deepseq filepath hashable json
+    aeson attoparsecEnumerator dataDefault deepseq filepath hashable
     MonadCatchIOTransformers network safe snapCore snapServer stm text
     time transformers unorderedContainers utf8String vault websockets
     websocketsSnap
-- 
GitLab


From ec09c7d34e6edf9c503cde439252f0dd5d721a7e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Feb 2014 21:23:01 +0100
Subject: [PATCH 1582/3789] haskell-cpphs: update to version 1.18.2

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

diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
index fca4efc8661..2f86e8ad012 100644
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cpphs";
-  version = "1.18.1";
-  sha256 = "1fshsd1dzmrl3qbpwf7r2c30d08l77080j9cfchcgy1lijjr9vhm";
+  version = "1.18.2";
+  sha256 = "0b8hkb2sfacmpi3rwr62myn4kfpwbfdlv9k0vnhk3wvl1v4wf29l";
   isLibrary = true;
   isExecutable = true;
   meta = {
-- 
GitLab


From 20567eba1f740350932ba5643c2613204488a396 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Sun, 16 Feb 2014 23:58:51 -0800
Subject: [PATCH 1583/3789] correct tapButtons in synaptics config. Dont rely
 on the X11 input settings to take the last option.

---
 .../services/x11/hardware/synaptics.nix       | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index 91e01f2e30b..fe9dcd51a7a 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -2,9 +2,23 @@
 
 with pkgs.lib;
 
-let cfg = config.services.xserver.synaptics; in
-
-{
+let cfg = config.services.xserver.synaptics;
+    tapConfig = if cfg.tapButtons then enabledTapConfig else disabledTapConfig;
+    enabledTapConfig = ''
+      Option "MaxTapTime" "180"
+      Option "MaxTapMove" "220"
+      Option "TapButton1" "${builtins.elemAt cfg.buttonsMap 0}"
+      Option "TapButton2" "${builtins.elemAt cfg.buttonsMap 1}"
+      Option "TapButton3" "${builtins.elemAt cfg.buttonsMap 2}"
+    '';
+    disabledTapConfig = ''
+      Option "MaxTapTime" "0"
+      Option "MaxTapMove" "0"
+      Option "TapButton1" "0"
+      Option "TapButton2" "0"
+      Option "TapButton3" "0"
+    '';
+in {
 
   options = {
 
@@ -106,15 +120,10 @@ let cfg = config.services.xserver.synaptics; in
           MatchIsTouchpad "on"
           ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
           Driver "synaptics"
-          Option "MaxTapTime" "180"
-          Option "MaxTapMove" "220"
           Option "MinSpeed" "${cfg.minSpeed}"
           Option "MaxSpeed" "${cfg.maxSpeed}"
           Option "AccelFactor" "${cfg.accelFactor}"
-          ${if cfg.tapButtons then "" else ''Option "MaxTapTime" "0"''}
-          Option "TapButton1" "${builtins.elemAt cfg.buttonsMap 0}"
-          Option "TapButton2" "${builtins.elemAt cfg.buttonsMap 1}"
-          Option "TapButton3" "${builtins.elemAt cfg.buttonsMap 2}"
+          ${optionalString cfg.tapButtons tapConfig}
           Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}"
           Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}"
           Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}"
-- 
GitLab


From 0d4a9e3aa68da5f82fff724baee9168b50a485c8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 25 Feb 2014 07:44:45 -0500
Subject: [PATCH 1584/3789] Allow httpd subservices to set the document root

Only the main service OR one of the subservices can set the document
root. This is used by mediawiki when it is hosted at the root of the
vhost.
---
 .../services/web-servers/apache-httpd/default.nix        | 9 +++++++--
 .../services/web-servers/apache-httpd/mediawiki.nix      | 4 +++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index b96f5cf159b..f239d4fd6c3 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -63,6 +63,7 @@ let
           enablePHP = false;
           phpOptions = "";
           options = {};
+          documentRoot = null;
         };
         res = defaults // svcFunction { inherit config pkgs serverInfo php; };
       in res;
@@ -188,7 +189,11 @@ let
 
     subservices = callSubservices serverInfo cfg.extraSubservices;
 
-    documentRoot = if cfg.documentRoot != null then cfg.documentRoot else
+    maybeDocumentRoot = fold (svc: acc:
+      if acc == null then svc.documentRoot else assert svc.documentRoot == null; acc
+    ) null ([ cfg ] ++ subservices);
+
+    documentRoot = if maybeDocumentRoot != null then maybeDocumentRoot else
       pkgs.runCommand "empty" {} "ensureDir $out";
 
     documentRootConf = ''
@@ -240,7 +245,7 @@ let
 
     ${robotsConf}
 
-    ${if isMainServer || cfg.documentRoot != null then documentRootConf else ""}
+    ${if isMainServer || maybeDocumentRoot != null then documentRootConf else ""}
 
     ${if cfg.enableUserDir then ''
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index af2e2cae797..7cb513f6302 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -126,7 +126,7 @@ in
         </Directory>
       ''}
 
-      Alias ${config.urlPrefix} ${mediawikiRoot}
+      ${optionalString (config.urlPrefix != "") "Alias ${config.urlPrefix} ${mediawikiRoot}"}
 
       <Directory ${mediawikiRoot}>
           Order allow,deny
@@ -139,6 +139,8 @@ in
       ''}
     '';
 
+  documentRoot = if config.urlPrefix == "" then mediawikiRoot else null;
+
   enablePHP = true;
 
   options = {
-- 
GitLab


From 793328e1eee25513c974fc491af5e32fc38f40d8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 25 Feb 2014 09:13:40 -0500
Subject: [PATCH 1585/3789] Mediawiki: Add some needed rewrites

---
 .../services/web-servers/apache-httpd/mediawiki.nix        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index 7cb513f6302..9f4189e4d49 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -137,6 +137,13 @@ in
       ${optionalString (config.articleUrlPrefix != "") ''
         Alias ${config.articleUrlPrefix} ${mediawikiRoot}/index.php
       ''}
+
+      RewriteEngine On
+      RewriteCond ${mediawikiRoot}/$0 !-f
+      RewriteCond ${mediawikiRoot}/$0 !-d
+      RewriteRule ^(.*)$ ${mediawikiRoot}/index.php [L]
+
+      RewriteRule ^/*$ ${mediawikiRoot}/index.php [L] # For syntax hilighter: */
     '';
 
   documentRoot = if config.urlPrefix == "" then mediawikiRoot else null;
-- 
GitLab


From 1f42fa7cc0bfd89975ba3193414fb1caed36e76f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 25 Feb 2014 10:49:15 -0500
Subject: [PATCH 1586/3789] Add hspec-expectations-lens haskell package

---
 .../haskell/hspec-expectations-lens/default.nix   | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  4 ++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix

diff --git a/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix b/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix
new file mode 100644
index 00000000000..9ea5ff57efc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix
@@ -0,0 +1,15 @@
+{ cabal, hspec, hspecExpectations, HUnit, lens, silently }:
+
+cabal.mkDerivation (self: {
+  pname = "hspec-expectations-lens";
+  version = "0.3.0.0";
+  sha256 = "1v6j4z3gv41jlhbi8ngx7h6d78l1fazvd3bw3c67zsnlgqrvl1x5";
+  buildDepends = [ hspec hspecExpectations HUnit lens ];
+  testDepends = [ hspec lens silently ];
+  meta = {
+    homepage = "http://supki.github.io/hspec-expectations-lens/";
+    description = "Hspec expectations for the lens stuff";
+    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 7677173fb46..4e98564e132 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1430,6 +1430,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {};
 
+  hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {
+    lens = self.lens_4_0_4;
+  };
+
   hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {};
 
   hstatsd = callPackage ../development/libraries/haskell/hstatsd {};
-- 
GitLab


From 9ef06bd3871c9452badb6f1c71f1609c6787e84b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 25 Feb 2014 11:09:26 -0500
Subject: [PATCH 1587/3789] Add libjenkins haskell package

---
 .../libraries/haskell/libjenkins/default.nix  | 26 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 +++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/libjenkins/default.nix

diff --git a/pkgs/development/libraries/haskell/libjenkins/default.nix b/pkgs/development/libraries/haskell/libjenkins/default.nix
new file mode 100644
index 00000000000..977ef112f09
--- /dev/null
+++ b/pkgs/development/libraries/haskell/libjenkins/default.nix
@@ -0,0 +1,26 @@
+{ cabal, async, conduit, doctest, filepath, free, hspec
+, hspecExpectationsLens, httpClient, httpConduit, httpTypes, lens
+, monadControl, network, text, transformers, xmlConduit
+}:
+
+cabal.mkDerivation (self: {
+  pname = "libjenkins";
+  version = "0.4.2.0";
+  sha256 = "11013klk2gvcaf2d2gmi0bf3jg2m82li19szqlwb325kdjmdf546";
+  buildDepends = [
+    async conduit free httpClient httpConduit httpTypes lens
+    monadControl network text transformers xmlConduit
+  ];
+  testDepends = [
+    async conduit doctest filepath free hspec hspecExpectationsLens
+    httpClient httpConduit httpTypes lens monadControl network text
+    transformers xmlConduit
+  ];
+  meta = {
+    description = "Jenkins API interface";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+  # Test wants access to /etc/ssl
+  doCheck = false;
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4e98564e132..227e6be1eb2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1586,6 +1586,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     libffi = pkgs.libffi;
   };
 
+  libjenkins = callPackage ../development/libraries/haskell/libjenkins {
+    lens = self.lens_4_0_4;
+  };
+
   libmpd = callPackage ../development/libraries/haskell/libmpd {};
 
   liblastfm = callPackage ../development/libraries/haskell/liblastfm {};
-- 
GitLab


From c11f32acdf736614b5df7a76b93c3b690038df25 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 25 Feb 2014 11:14:07 -0500
Subject: [PATCH 1588/3789] scotty: jailbreak

Needed when overriding aeson to the new version, which in turn is needed
if using scotty on a project that also uses lens 4.0.
---
 pkgs/development/libraries/haskell/scotty/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
index b3ca635ac21..5d354af308d 100644
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -17,4 +17,5 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
+  jailbreak = true;
 })
-- 
GitLab


From 276b72fb93d60ae0e59088ea0e0029da87e6f31c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 15 Feb 2014 03:47:57 +0100
Subject: [PATCH 1589/3789] vm: Introduce new Windows VM installer for Cygwin.

After quite a lot of fighting against Windows and its various
limitations, this new is the base architecture for installing and
accessing the Windows VM and thus the Cygwin environment inside it:

                .------------.
          .---> | vde_switch |
          |     `-[#]----[#]-'
          |        |      |
         ,'       .'      `---.___
       ,'    192.168.0.1          `.
       |          |            192.168.0.2
      ,'    _____[#]____           |
    ,'     |            |   ______[#]______
    |      | Windows VM |  |    .--'       |
    |      |____________|  |    |          |
    |             |  /|\   |  .-|          |
    | .---------. |   |    |  | |          |
  .-|-| manager |-'   |    |  | |          |
  | | `---------'     |    |  | |          |
  | |                 |    |  | |          |
  | | .-------------. |    | Samba         |
  | | | BOOTSTRAP   | |    |  | |          |
  | | |-------------| |    |  | |   .------|
  | `-| spawn VMs   |-+--> |  | `---| xchg | <-------.
  |   |-------------|      |  | .---^------|         |
  |   | install     |---.  |  `-| nixstore | <----.  |
  |   |-------------|   |  |    `----------|      |  |
  |---| suspend VM  |   |  |               |      |  |
  |   `------.------'   |  | Controller VM |      |  |
  |          |          |  |_______________|      |  |
  |       .--'          |         /|\            VirtIO
  |       |           __|__________:____________  |  |
  |      \|/         |  |          `.           | |  |
  | .------------.   |  |           :           | |  |
  | | REAL BUILD |   |  |   .-------^--------.  | |  |
  | |------------|   |  `-> | serial console |  | |  |
  `-| revive VM  |   |      `----------------'  | |  |
    |------------|   |------------.             | |  |
    | build      |-->| /nix/store >>>-----------|-'  |
    |------------|   |------------|             |    |
    | collect    |<--| xchg       >>>-----------|----'
    `-----.------'   |------------'             |
          |          |                          |
         \|/         |    |  |  __   ___  |     |
                     |    |--| |  | (__  -|-    |
    F I N I S H E D  |    |  | |__| ___)  |     |
                     |__________________________|

This might look a bit overwhelming, but let me try to explain:

We're starting at the base derivation ("BOOTSTRAP" above), where we
actually install the Cygwin envirenment. Over there we basically fire up
a vde_switch process and two virtual machines: One is the Windows
machine, the other is a NixOS machine, which serves as some kind of
proxy between the host and the Windows machine.

The reason we're doing this, is because we don't have a lot of options
for sharing files between a stock Windows machine and the host. In
earlier experiments, I've tried to communicate with the Windows guest by
using pipes and OpenSSH, but obviously this wasn't a big speed rush (or
to say it bluntly: It was fucking slow).

Using TCP/IP directly for accessing the guest would have been another
option, but it could lead to possible errors when the port or a range of
ports are in use at the Host system. Also, we would need to punch a hole
into the sandbox of the Nix builder (as it doesn't allow networking),
which in turn will possibly undermine deterministic builds/runs (well,
at least as deterministic as it can be, we're running Windows,
remember?).

So, let's continue: The responsibility of the NixOS (controller) VM is
to just wait until an SSH port becomes available on the Windows VM,
whereas the Windows VM itself is installed using an unattended
installation file provided via a virtual floppy image.

With the installation of the basic Windows OS, we directly install
Cygwin and start up an OpenSSH service.

At this point the bootstrapping is almost finished and as soon as the
port is available, the controller VM sets up Samba shares and makes it
available as drive letters within Windows and as bind mounts (for
example /nix/store) within Cygwin.

Finally we're making a snapshot of the memory of the Windows VM in order
to revive it within a few seconds when we want to build something.

Now, the build process itself is fairly straightforward: Revive VM and
build based on existing store derivations and collect the result _and_
the exit code from the xchg share/directory.

Conclusion: This architecture may sound a bit complicated, but we're
trying to achieve deterministic and reproducable builds and/or test
runs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/default.nix  | 348 +++++++++++++++++++++
 pkgs/build-support/vm/windows/mkclosure.py |  78 +++++
 2 files changed, 426 insertions(+)
 create mode 100644 pkgs/build-support/vm/windows/default.nix
 create mode 100644 pkgs/build-support/vm/windows/mkclosure.py

diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
new file mode 100644
index 00000000000..03b66e9f504
--- /dev/null
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -0,0 +1,348 @@
+with import <nixpkgs> {};
+
+with import <nixpkgs/nixos/lib/build-vms.nix> {
+  inherit system;
+  minimal = false;
+};
+
+let
+  winISO = /path/to/iso/XXX;
+
+  bootstrapAfterLogin = runCommand "bootstrap.sh" {} ''
+    cat > "$out" <<EOF
+    mkdir -p ~/.ssh
+    cat > ~/.ssh/authorized_keys <<PUBKEY
+    $(cat "${snakeOilSSH}/key.pub")
+    PUBKEY
+    ssh-host-config -y -c 'binmode ntsec' -w dummy
+    cygrunsrv -S sshd
+
+    net use S: '\\192.168.0.2\nixstore'
+    mkdir -p /nix/store
+    mount -o bind /cygdrives/s /nix/store
+    EOF
+  '';
+
+  productKey = "XXX";
+
+  unattended = /* productKey: */ let
+    installCygwin = [ "openssh" ];
+    cygwinRoot = "C:\\cygwin";
+    afterSetup = [
+      "E:\\setup.exe"
+      "-L -n -q"
+      "-l E:\\"
+      "-R ${cygwinRoot}"
+      "-C base"
+    ] ++ map (p: "-P ${p}") installCygwin;
+    runCygShell = args: "${cygwinRoot}\\bin\\bash -l ${args}";
+  in writeText "winnt.sif" ''
+    [Data]
+    AutoPartition = 1
+    AutomaticUpdates = 0
+    MsDosInitiated = 0
+    UnattendedInstall = Yes
+
+    [Unattended]
+    DUDisable = Yes
+    DriverSigningPolicy = Ignore
+    Hibernation = No
+    OemPreinstall = No
+    OemSkipEula = Yes
+    Repartition = Yes
+    TargetPath = \WINDOWS
+    UnattendMode = FullUnattended
+    UnattendSwitch = Yes
+    WaitForReboot = No
+
+    [GuiUnattended]
+    AdminPassword = "nopasswd"
+    AutoLogon = Yes
+    AutoLogonCount = 1
+    OEMSkipRegional = 1
+    OemSkipWelcome = 1
+    ServerWelcome = No
+    TimeZone = 85
+
+    [UserData]
+    ComputerName = "cygwin"
+    FullName = "cygwin"
+    OrgName = ""
+    ProductKey = "${productKey}"
+
+    [Networking]
+    InstallDefaultComponents = Yes
+
+    [Identification]
+    JoinWorkgroup = cygwin
+
+    [NetAdapters]
+    PrimaryAdapter = params.PrimaryAdapter
+
+    [params.PrimaryAdapter]
+    InfID = *
+
+    [params.MS_MSClient]
+
+    [NetProtocols]
+    MS_TCPIP = params.MS_TCPIP
+
+    [params.MS_TCPIP]
+    AdapterSections=params.MS_TCPIP.PrimaryAdapter
+
+    [params.MS_TCPIP.PrimaryAdapter]
+    DHCP = No
+    IPAddress = 192.168.0.1
+    SpecificTo = PrimaryAdapter
+    SubnetMask = 255.255.255.0
+    WINS = No
+
+    ; Turn off all components
+    [Components]
+    ${lib.concatMapStrings (comp: "${comp} = Off\n") [
+      "AccessOpt" "Appsrv_console" "Aspnet" "BitsServerExtensionsISAPI"
+      "BitsServerExtensionsManager" "Calc" "Certsrv" "Certsrv_client"
+      "Certsrv_server" "Charmap" "Chat" "Clipbook" "Cluster" "Complusnetwork"
+      "Deskpaper" "Dialer" "Dtcnetwork" "Fax" "Fp_extensions" "Fp_vdir_deploy"
+      "Freecell" "Hearts" "Hypertrm" "IEAccess" "IEHardenAdmin" "IEHardenUser"
+      "Iis_asp" "Iis_common" "Iis_ftp" "Iis_inetmgr" "Iis_internetdataconnector"
+      "Iis_nntp" "Iis_serversideincludes" "Iis_smtp" "Iis_webdav" "Iis_www"
+      "Indexsrv_system" "Inetprint" "Licenseserver" "Media_clips" "Media_utopia"
+      "Minesweeper" "Mousepoint" "Msmq_ADIntegrated" "Msmq_Core"
+      "Msmq_HTTPSupport" "Msmq_LocalStorage" "Msmq_MQDSService"
+      "Msmq_RoutingSupport" "Msmq_TriggersService" "Msnexplr" "Mswordpad"
+      "Netcis" "Netoc" "OEAccess" "Objectpkg" "Paint" "Pinball" "Pop3Admin"
+      "Pop3Service" "Pop3Srv" "Rec" "Reminst" "Rootautoupdate" "Rstorage" "SCW"
+      "Sakit_web" "Solitaire" "Spider" "TSWebClient" "Templates"
+      "TerminalServer" "UDDIAdmin" "UDDIDatabase" "UDDIWeb" "Vol" "WMAccess"
+      "WMPOCM" "WbemMSI" "Wms" "Wms_admin_asp" "Wms_admin_mmc" "Wms_isapi"
+      "Wms_server" "Zonegames"
+    ]}
+
+    [WindowsFirewall]
+    Profiles = WindowsFirewall.TurnOffFirewall
+
+    [WindowsFirewall.TurnOffFirewall]
+    Mode = 0
+
+    [SetupParams]
+    UserExecute = "${lib.concatStringsSep " " afterSetup}"
+
+    [GuiRunOnce]
+    Command0 = "${cygwinRoot}\bin\bash -l E:\bootstrap.sh"
+  '';
+
+  floppyImg = stdenv.mkDerivation {
+    name = "unattended-floppy.img";
+    buildCommand = ''
+      dd if=/dev/zero of="$out" count=1440 bs=1024
+      ${dosfstools}/sbin/mkfs.msdos "$out"
+      ${mtools}/bin/mcopy -i "$out" "${unattended}" ::winnt.sif
+      ${mtools}/bin/mcopy -i "$out" "${snakeOilSSH}/key.pub" ::ssh.pub
+    '';
+  };
+
+  qemuCommandWindows = ''
+    ${vmTools.qemuProg} \
+      ${lib.optionalString (stdenv.system == "x86_64-linux") "-cpu kvm64"} \
+      -nographic -no-reboot \
+      -virtfs local,path=/nix/store,security_model=none,mount_tag=store \
+      -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
+      -drive file=$diskImage,if=virtio,cache=writeback,werror=report \
+      $QEMU_OPTS
+  '';
+
+  cygwinMirror = "http://ftp.gwdg.de/pub/linux/sources.redhat.com/cygwin";
+
+  cygPkgList = fetchurl {
+    url = "${cygwinMirror}/x86_64/setup.ini";
+    sha256 = "0d54pli0gnm3010w9iq2bar3r2sc4syyblg62q75inc2cq341bi3";
+  };
+
+  makeCygwinClosure = { packages, packageList }: let
+    expr = import (runCommand "cygwin.nix" { buildInputs = [ python ]; } ''
+      python ${./mkclosure.py} "${packages}" ${toString packageList} > "$out"
+    '');
+    gen = { url, md5 }: {
+      source = fetchurl {
+        url = "${cygwinMirror}/${url}";
+        inherit md5;
+      };
+      target = url;
+    };
+  in map gen expr;
+
+  cygiso = import <nixpkgs/nixos/lib/make-iso9660-image.nix> {
+    inherit (pkgs) stdenv perl cdrkit pathsFromGraph;
+    contents = [
+      { source = bootstrapAfterLogin;
+        target = "bootstrap.sh";
+      }
+      { source = fetchurl {
+          url = "http://cygwin.com/setup-x86_64.exe";
+          sha256 = "1bjmq9h1p6mmiqp6f1kvmg94jbsdi1pxfa07a5l497zzv9dsfivm";
+        };
+        target = "setup.exe";
+      }
+      { source = cygPkgList;
+        target = "setup.ini";
+      }
+    ] ++ makeCygwinClosure {
+      packages = cygPkgList;
+      packageList = [ "openssh" ];
+    };
+  };
+
+  maybeKvm64 = lib.optional (stdenv.system == "x86_64-linux") "-cpu kvm64";
+
+  cygwinQemuArgs = lib.concatStringsSep " " (maybeKvm64 ++ [
+    "-monitor unix:$MONITOR_SOCKET,server,nowait"
+    "-nographic"
+    "-boot order=c,once=d"
+    "-drive file=${floppyImg},readonly,index=0,if=floppy"
+    "-drive file=winvm.img,index=0,media=disk"
+    "-drive file=${winISO},index=1,media=cdrom"
+    "-drive file=${cygiso}/iso/cd.iso,index=2,media=cdrom"
+    "-net nic,vlan=0,macaddr=52:54:00:12:01:01"
+    "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET"
+    "-rtc base=2010-01-01,clock=vm"
+  ]);
+
+  modulesClosure = lib.overrideDerivation vmTools.modulesClosure (o: {
+    rootModules = o.rootModules ++ lib.singleton "virtio_net";
+  });
+
+  snakeOilSSH = stdenv.mkDerivation {
+    name = "snakeoil-ssh-cygwin";
+    buildCommand = ''
+      ensureDir "$out"
+      ${openssh}/bin/ssh-keygen -t ecdsa -f "$out/key" -N ""
+    '';
+  };
+
+  controllerQemuArgs = cmd: let
+    preInitScript = writeScript "preinit.sh" ''
+      #!${vmTools.initrdUtils}/bin/ash -e
+      export PATH=${vmTools.initrdUtils}/bin
+      mount -t proc none /proc
+      mount -t sysfs none /sys
+      for arg in $(cat /proc/cmdline); do
+        if [ "x''${arg#command=}" != "x$arg" ]; then
+          command="''${arg#command=}"
+        fi
+      done
+
+      for i in $(cat ${modulesClosure}/insmod-list); do
+        insmod $i
+      done
+
+      mkdir -p /tmp /dev
+      mknod /dev/null    c 1 3
+      mknod /dev/zero    c 1 5
+      mknod /dev/random  c 1 8
+      mknod /dev/urandom c 1 9
+      mknod /dev/tty     c 5 0
+
+      ifconfig lo up
+      ifconfig eth0 up 192.168.0.2
+
+      mkdir -p /nix/store /etc /var/run /var/log
+
+      cat > /etc/passwd <<PASSWD
+      root:x:0:0::/root:/bin/false
+      nobody:x:65534:65534::/var/empty:/bin/false
+      PASSWD
+
+      mount -t 9p \
+        -o trans=virtio,version=9p2000.L,msize=262144,cache=loose \
+        store /nix/store
+
+      exec "$command"
+    '';
+    initrd = makeInitrd {
+      contents = lib.singleton {
+        object = preInitScript;
+        symlink = "/init";
+      };
+    };
+    initScript = writeScript "init.sh" ''
+      #!${stdenv.shell}
+      ${coreutils}/bin/mkdir -p /etc/samba /etc/samba/private /var/lib/samba
+      ${coreutils}/bin/cat > /etc/samba/smb.conf <<CONFIG
+      [global]
+      security = user
+      map to guest = Bad User
+      workgroup = cygwin
+      netbios name = controller
+      server string = %h
+      log level = 1
+      max log size = 1000
+      log file = /var/log/samba.log
+
+      [nixstore]
+      path = /nix/store
+      read only = no
+      guest ok = yes
+      CONFIG
+
+      ${samba}/sbin/nmbd -D
+      ${samba}/sbin/smbd -D
+      ${coreutils}/bin/cp -L "${snakeOilSSH}/key" /ssh.key
+      ${coreutils}/bin/chmod 600 /ssh.key
+
+      echo -n "Waiting for Windows VM to become ready"
+      while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
+        echo -n .
+        ${coreutils}/bin/sleep 1
+      done
+      echo " ready."
+
+      ${openssh}/bin/ssh \
+        -o UserKnownHostsFile=/dev/null \
+        -o StrictHostKeyChecking=no \
+        -i /ssh.key \
+        -l Administrator \
+        192.168.0.1 -- "${cmd}"
+
+      ${busybox}/sbin/poweroff -f
+    '';
+    kernelAppend = lib.concatStringsSep " " [
+      "panic=1"
+      "loglevel=4"
+      "console=tty1"
+      "console=ttyS0"
+      "command=${initScript}"
+    ];
+  in lib.concatStringsSep " " (maybeKvm64 ++ [
+    "-nographic"
+    "-no-reboot"
+    "-virtfs local,path=/nix/store,security_model=none,mount_tag=store"
+    "-kernel ${modulesClosure.kernel}/bzImage"
+    "-initrd ${initrd}/initrd"
+    "-append \"${kernelAppend}\""
+    "-net nic,vlan=0,macaddr=52:54:00:12:01:02,model=virtio"
+    "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET"
+  ]);
+
+  bootstrap = stdenv.mkDerivation {
+    name = "windown-vm";
+
+    buildCommand = ''
+      ${qemu}/bin/qemu-img create -f qcow2 winvm.img 2G
+      QEMU_VDE_SOCKET="$(pwd)/vde.ctl"
+      MONITOR_SOCKET="$(pwd)/monitor"
+      ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" &
+      ${vmTools.qemuProg} ${cygwinQemuArgs} &
+      ${vmTools.qemuProg} ${controllerQemuArgs "sync"}
+
+      ensureDir "$out"
+      ${socat}/bin/socat - UNIX-CONNECT:$MONITOR_SOCKET <<CMD
+      stop
+      migrate_set_speed 4095m
+      migrate "exec:${gzip}/bin/gzip -c > '$out/state.gz'"
+      CMD
+      cp winvm.img "$out/disk.img"
+    '';
+  };
+
+in bootstrap
diff --git a/pkgs/build-support/vm/windows/mkclosure.py b/pkgs/build-support/vm/windows/mkclosure.py
new file mode 100644
index 00000000000..48d569a6bd3
--- /dev/null
+++ b/pkgs/build-support/vm/windows/mkclosure.py
@@ -0,0 +1,78 @@
+# Ugliest Python code I've ever written. -- aszlig
+import sys
+
+def get_plist(path):
+    in_pack = False
+    in_str = False
+    current_key = None
+    buf = ""
+    packages = {}
+    package_name = None
+    package_attrs = {}
+    with open(path, 'r') as setup:
+        for line in setup:
+            if in_str and line.rstrip().endswith('"'):
+                package_attrs[current_key] = buf + line.rstrip()[:-1]
+                in_str = False
+                continue
+            elif in_str:
+                buf += line
+                continue
+
+            if line.startswith('@'):
+                in_pack = True
+                package_name = line[1:].strip()
+                package_attrs = {}
+            elif in_pack and ':' in line:
+                key, value = line.split(':', 1)
+                if value.lstrip().startswith('"'):
+                    if value.lstrip()[1:].rstrip().endswith('"'):
+                        value = value.strip().strip('"')
+                    else:
+                        in_str = True
+                        current_key = key.strip().lower()
+                        buf = value.lstrip()[1:]
+                        continue
+                package_attrs[key.strip().lower()] = value.strip()
+            elif in_pack:
+                in_pack = False
+                packages[package_name] = package_attrs
+    return packages
+
+def main():
+    packages = get_plist(sys.argv[1])
+    to_include = set()
+
+    def traverse(package):
+        to_include.add(package)
+        attrs = packages.get(package, {})
+        deps = attrs.get('requires', '').split()
+        for new_dep in set(deps) - to_include:
+            traverse(new_dep)
+
+    map(traverse, sys.argv[2:])
+
+    sys.stdout.write('[\n')
+    for package, attrs in packages.iteritems():
+        if package not in to_include:
+            cats = [c.lower() for c in attrs.get('category', '').split()]
+            if 'base' not in cats:
+                continue
+
+        install_line = attrs.get('install')
+        if install_line is None:
+            continue
+
+        url, size, md5 = install_line.split(' ', 2)
+
+        pack = [
+            '  {',
+            '    url = "{0}";'.format(url),
+            '    md5 = "{0}";'.format(md5),
+            '  }',
+        ];
+        sys.stdout.write('\n'.join(pack) + '\n')
+    sys.stdout.write(']\n')
+
+if __name__ == '__main__':
+    main()
-- 
GitLab


From 4e21215d52025be5338e89020874b5ed7c903e19 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 15 Feb 2014 18:17:21 +0100
Subject: [PATCH 1590/3789] vm/windows: Move the installer into install/.

At least the largest portion of the installer, because in the end we
don't want the installer to *actually* save the state but only prepare
the base image.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../vm/windows/cygwin-iso/default.nix         |  43 ++++
 .../vm/windows/{ => cygwin-iso}/mkclosure.py  |   0
 pkgs/build-support/vm/windows/default.nix     | 191 +-----------------
 .../vm/windows/install/default.nix            |  39 ++++
 .../vm/windows/install/unattended-image.nix   | 123 +++++++++++
 5 files changed, 211 insertions(+), 185 deletions(-)
 create mode 100644 pkgs/build-support/vm/windows/cygwin-iso/default.nix
 rename pkgs/build-support/vm/windows/{ => cygwin-iso}/mkclosure.py (100%)
 create mode 100644 pkgs/build-support/vm/windows/install/default.nix
 create mode 100644 pkgs/build-support/vm/windows/install/unattended-image.nix

diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
new file mode 100644
index 00000000000..9df07bdb667
--- /dev/null
+++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
@@ -0,0 +1,43 @@
+{ packages ? []
+, mirror ? "http://ftp.gwdg.de/pub/linux/sources.redhat.com/cygwin"
+, extraContents ? []
+}:
+
+let
+  inherit (import <nixpkgs> {}) fetchurl runCommand python;
+
+  cygPkgList = fetchurl {
+    url = "${mirror}/x86_64/setup.ini";
+    sha256 = "0d54pli0gnm3010w9iq2bar3r2sc4syyblg62q75inc2cq341bi3";
+  };
+
+  makeCygwinClosure = { packages, packageList }: let
+    expr = import (runCommand "cygwin.nix" { buildInputs = [ python ]; } ''
+      python ${./mkclosure.py} "${packages}" ${toString packageList} > "$out"
+    '');
+    gen = { url, md5 }: {
+      source = fetchurl {
+        url = "${mirror}/${url}";
+        inherit md5;
+      };
+      target = url;
+    };
+  in map gen expr;
+
+in import <nixpkgs/nixos/lib/make-iso9660-image.nix> {
+  inherit (import <nixpkgs> {}) stdenv perl cdrkit pathsFromGraph;
+  contents = [
+    { source = fetchurl {
+        url = "http://cygwin.com/setup-x86_64.exe";
+        sha256 = "1bjmq9h1p6mmiqp6f1kvmg94jbsdi1pxfa07a5l497zzv9dsfivm";
+      };
+      target = "setup.exe";
+    }
+    { source = cygPkgList;
+      target = "setup.ini";
+    }
+  ] ++ makeCygwinClosure {
+    packages = cygPkgList;
+    packageList = packages;
+  } ++ extraContents;
+}
diff --git a/pkgs/build-support/vm/windows/mkclosure.py b/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py
similarity index 100%
rename from pkgs/build-support/vm/windows/mkclosure.py
rename to pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py
diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index 03b66e9f504..06bf6c9bb6d 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -8,189 +8,10 @@ with import <nixpkgs/nixos/lib/build-vms.nix> {
 let
   winISO = /path/to/iso/XXX;
 
-  bootstrapAfterLogin = runCommand "bootstrap.sh" {} ''
-    cat > "$out" <<EOF
-    mkdir -p ~/.ssh
-    cat > ~/.ssh/authorized_keys <<PUBKEY
-    $(cat "${snakeOilSSH}/key.pub")
-    PUBKEY
-    ssh-host-config -y -c 'binmode ntsec' -w dummy
-    cygrunsrv -S sshd
-
-    net use S: '\\192.168.0.2\nixstore'
-    mkdir -p /nix/store
-    mount -o bind /cygdrives/s /nix/store
-    EOF
-  '';
-
-  productKey = "XXX";
-
-  unattended = /* productKey: */ let
-    installCygwin = [ "openssh" ];
-    cygwinRoot = "C:\\cygwin";
-    afterSetup = [
-      "E:\\setup.exe"
-      "-L -n -q"
-      "-l E:\\"
-      "-R ${cygwinRoot}"
-      "-C base"
-    ] ++ map (p: "-P ${p}") installCygwin;
-    runCygShell = args: "${cygwinRoot}\\bin\\bash -l ${args}";
-  in writeText "winnt.sif" ''
-    [Data]
-    AutoPartition = 1
-    AutomaticUpdates = 0
-    MsDosInitiated = 0
-    UnattendedInstall = Yes
-
-    [Unattended]
-    DUDisable = Yes
-    DriverSigningPolicy = Ignore
-    Hibernation = No
-    OemPreinstall = No
-    OemSkipEula = Yes
-    Repartition = Yes
-    TargetPath = \WINDOWS
-    UnattendMode = FullUnattended
-    UnattendSwitch = Yes
-    WaitForReboot = No
-
-    [GuiUnattended]
-    AdminPassword = "nopasswd"
-    AutoLogon = Yes
-    AutoLogonCount = 1
-    OEMSkipRegional = 1
-    OemSkipWelcome = 1
-    ServerWelcome = No
-    TimeZone = 85
-
-    [UserData]
-    ComputerName = "cygwin"
-    FullName = "cygwin"
-    OrgName = ""
-    ProductKey = "${productKey}"
-
-    [Networking]
-    InstallDefaultComponents = Yes
-
-    [Identification]
-    JoinWorkgroup = cygwin
-
-    [NetAdapters]
-    PrimaryAdapter = params.PrimaryAdapter
-
-    [params.PrimaryAdapter]
-    InfID = *
-
-    [params.MS_MSClient]
-
-    [NetProtocols]
-    MS_TCPIP = params.MS_TCPIP
-
-    [params.MS_TCPIP]
-    AdapterSections=params.MS_TCPIP.PrimaryAdapter
-
-    [params.MS_TCPIP.PrimaryAdapter]
-    DHCP = No
-    IPAddress = 192.168.0.1
-    SpecificTo = PrimaryAdapter
-    SubnetMask = 255.255.255.0
-    WINS = No
-
-    ; Turn off all components
-    [Components]
-    ${lib.concatMapStrings (comp: "${comp} = Off\n") [
-      "AccessOpt" "Appsrv_console" "Aspnet" "BitsServerExtensionsISAPI"
-      "BitsServerExtensionsManager" "Calc" "Certsrv" "Certsrv_client"
-      "Certsrv_server" "Charmap" "Chat" "Clipbook" "Cluster" "Complusnetwork"
-      "Deskpaper" "Dialer" "Dtcnetwork" "Fax" "Fp_extensions" "Fp_vdir_deploy"
-      "Freecell" "Hearts" "Hypertrm" "IEAccess" "IEHardenAdmin" "IEHardenUser"
-      "Iis_asp" "Iis_common" "Iis_ftp" "Iis_inetmgr" "Iis_internetdataconnector"
-      "Iis_nntp" "Iis_serversideincludes" "Iis_smtp" "Iis_webdav" "Iis_www"
-      "Indexsrv_system" "Inetprint" "Licenseserver" "Media_clips" "Media_utopia"
-      "Minesweeper" "Mousepoint" "Msmq_ADIntegrated" "Msmq_Core"
-      "Msmq_HTTPSupport" "Msmq_LocalStorage" "Msmq_MQDSService"
-      "Msmq_RoutingSupport" "Msmq_TriggersService" "Msnexplr" "Mswordpad"
-      "Netcis" "Netoc" "OEAccess" "Objectpkg" "Paint" "Pinball" "Pop3Admin"
-      "Pop3Service" "Pop3Srv" "Rec" "Reminst" "Rootautoupdate" "Rstorage" "SCW"
-      "Sakit_web" "Solitaire" "Spider" "TSWebClient" "Templates"
-      "TerminalServer" "UDDIAdmin" "UDDIDatabase" "UDDIWeb" "Vol" "WMAccess"
-      "WMPOCM" "WbemMSI" "Wms" "Wms_admin_asp" "Wms_admin_mmc" "Wms_isapi"
-      "Wms_server" "Zonegames"
-    ]}
-
-    [WindowsFirewall]
-    Profiles = WindowsFirewall.TurnOffFirewall
-
-    [WindowsFirewall.TurnOffFirewall]
-    Mode = 0
-
-    [SetupParams]
-    UserExecute = "${lib.concatStringsSep " " afterSetup}"
-
-    [GuiRunOnce]
-    Command0 = "${cygwinRoot}\bin\bash -l E:\bootstrap.sh"
-  '';
-
-  floppyImg = stdenv.mkDerivation {
-    name = "unattended-floppy.img";
-    buildCommand = ''
-      dd if=/dev/zero of="$out" count=1440 bs=1024
-      ${dosfstools}/sbin/mkfs.msdos "$out"
-      ${mtools}/bin/mcopy -i "$out" "${unattended}" ::winnt.sif
-      ${mtools}/bin/mcopy -i "$out" "${snakeOilSSH}/key.pub" ::ssh.pub
-    '';
-  };
-
-  qemuCommandWindows = ''
-    ${vmTools.qemuProg} \
-      ${lib.optionalString (stdenv.system == "x86_64-linux") "-cpu kvm64"} \
-      -nographic -no-reboot \
-      -virtfs local,path=/nix/store,security_model=none,mount_tag=store \
-      -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
-      -drive file=$diskImage,if=virtio,cache=writeback,werror=report \
-      $QEMU_OPTS
-  '';
-
-  cygwinMirror = "http://ftp.gwdg.de/pub/linux/sources.redhat.com/cygwin";
-
-  cygPkgList = fetchurl {
-    url = "${cygwinMirror}/x86_64/setup.ini";
-    sha256 = "0d54pli0gnm3010w9iq2bar3r2sc4syyblg62q75inc2cq341bi3";
-  };
-
-  makeCygwinClosure = { packages, packageList }: let
-    expr = import (runCommand "cygwin.nix" { buildInputs = [ python ]; } ''
-      python ${./mkclosure.py} "${packages}" ${toString packageList} > "$out"
-    '');
-    gen = { url, md5 }: {
-      source = fetchurl {
-        url = "${cygwinMirror}/${url}";
-        inherit md5;
-      };
-      target = url;
-    };
-  in map gen expr;
-
-  cygiso = import <nixpkgs/nixos/lib/make-iso9660-image.nix> {
-    inherit (pkgs) stdenv perl cdrkit pathsFromGraph;
-    contents = [
-      { source = bootstrapAfterLogin;
-        target = "bootstrap.sh";
-      }
-      { source = fetchurl {
-          url = "http://cygwin.com/setup-x86_64.exe";
-          sha256 = "1bjmq9h1p6mmiqp6f1kvmg94jbsdi1pxfa07a5l497zzv9dsfivm";
-        };
-        target = "setup.exe";
-      }
-      { source = cygPkgList;
-        target = "setup.ini";
-      }
-    ] ++ makeCygwinClosure {
-      packages = cygPkgList;
-      packageList = [ "openssh" ];
-    };
+  base = import ./install {
+    isoFile = winISO;
+    productKey = "XXX";
+    sshPublicKey = "${snakeOilSSH}/key.pub";
   };
 
   maybeKvm64 = lib.optional (stdenv.system == "x86_64-linux") "-cpu kvm64";
@@ -199,10 +20,10 @@ let
     "-monitor unix:$MONITOR_SOCKET,server,nowait"
     "-nographic"
     "-boot order=c,once=d"
-    "-drive file=${floppyImg},readonly,index=0,if=floppy"
+    "-drive file=${base.floppy},readonly,index=0,if=floppy"
     "-drive file=winvm.img,index=0,media=disk"
     "-drive file=${winISO},index=1,media=cdrom"
-    "-drive file=${cygiso}/iso/cd.iso,index=2,media=cdrom"
+    "-drive file=${base.iso}/iso/cd.iso,index=2,media=cdrom"
     "-net nic,vlan=0,macaddr=52:54:00:12:01:01"
     "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET"
     "-rtc base=2010-01-01,clock=vm"
diff --git a/pkgs/build-support/vm/windows/install/default.nix b/pkgs/build-support/vm/windows/install/default.nix
new file mode 100644
index 00000000000..fec7dac0714
--- /dev/null
+++ b/pkgs/build-support/vm/windows/install/default.nix
@@ -0,0 +1,39 @@
+{ isoFile
+, productKey
+, sshPublicKey
+}:
+
+let
+  inherit (import <nixpkgs> {}) lib runCommand;
+
+  bootstrapAfterLogin = runCommand "bootstrap.sh" {} ''
+    cat > "$out" <<EOF
+    mkdir -p ~/.ssh
+    cat > ~/.ssh/authorized_keys <<PUBKEY
+    $(cat "${sshPublicKey}")
+    PUBKEY
+    ssh-host-config -y -c 'binmode ntsec' -w dummy
+    cygrunsrv -S sshd
+
+    net use S: '\\192.168.0.2\nixstore'
+    mkdir -p /nix/store
+    mount -o bind /cygdrives/s /nix/store
+    EOF
+  '';
+
+  packages = [ "openssh" ];
+
+in {
+  iso = import ../cygwin-iso {
+    inherit packages;
+    extraContents = lib.singleton {
+      source = bootstrapAfterLogin;
+      target = "bootstrap.sh";
+    };
+  };
+
+  floppy = import ./unattended-image.nix {
+    cygwinPackages = packages;
+    inherit productKey;
+  };
+}
diff --git a/pkgs/build-support/vm/windows/install/unattended-image.nix b/pkgs/build-support/vm/windows/install/unattended-image.nix
new file mode 100644
index 00000000000..27736d08f4f
--- /dev/null
+++ b/pkgs/build-support/vm/windows/install/unattended-image.nix
@@ -0,0 +1,123 @@
+{ productKey
+, shExecAfterwards ? "E:\\bootstrap.sh"
+, cygwinRoot ? "C:\\cygwin"
+, cygwinSetup ? "E:\\setup.exe"
+, cygwinRepository ? "E:\\"
+, cygwinPackages ? [ "openssh" ]
+}:
+
+let
+  inherit (import <nixpkgs> {}) lib stdenv writeText dosfstools mtools;
+
+  afterSetup = [
+    cygwinSetup
+    "-L -n -q"
+    "-l ${cygwinRepository}"
+    "-R ${cygwinRoot}"
+    "-C base"
+  ] ++ map (p: "-P ${p}") cygwinPackages;
+
+  winXpUnattended = writeText "winnt.sif" ''
+    [Data]
+    AutoPartition = 1
+    AutomaticUpdates = 0
+    MsDosInitiated = 0
+    UnattendedInstall = Yes
+
+    [Unattended]
+    DUDisable = Yes
+    DriverSigningPolicy = Ignore
+    Hibernation = No
+    OemPreinstall = No
+    OemSkipEula = Yes
+    Repartition = Yes
+    TargetPath = \WINDOWS
+    UnattendMode = FullUnattended
+    UnattendSwitch = Yes
+    WaitForReboot = No
+
+    [GuiUnattended]
+    AdminPassword = "nopasswd"
+    AutoLogon = Yes
+    AutoLogonCount = 1
+    OEMSkipRegional = 1
+    OemSkipWelcome = 1
+    ServerWelcome = No
+    TimeZone = 85
+
+    [UserData]
+    ComputerName = "cygwin"
+    FullName = "cygwin"
+    OrgName = ""
+    ProductKey = "${productKey}"
+
+    [Networking]
+    InstallDefaultComponents = Yes
+
+    [Identification]
+    JoinWorkgroup = cygwin
+
+    [NetAdapters]
+    PrimaryAdapter = params.PrimaryAdapter
+
+    [params.PrimaryAdapter]
+    InfID = *
+
+    [params.MS_MSClient]
+
+    [NetProtocols]
+    MS_TCPIP = params.MS_TCPIP
+
+    [params.MS_TCPIP]
+    AdapterSections=params.MS_TCPIP.PrimaryAdapter
+
+    [params.MS_TCPIP.PrimaryAdapter]
+    DHCP = No
+    IPAddress = 192.168.0.1
+    SpecificTo = PrimaryAdapter
+    SubnetMask = 255.255.255.0
+    WINS = No
+
+    ; Turn off all components
+    [Components]
+    ${lib.concatMapStrings (comp: "${comp} = Off\n") [
+      "AccessOpt" "Appsrv_console" "Aspnet" "BitsServerExtensionsISAPI"
+      "BitsServerExtensionsManager" "Calc" "Certsrv" "Certsrv_client"
+      "Certsrv_server" "Charmap" "Chat" "Clipbook" "Cluster" "Complusnetwork"
+      "Deskpaper" "Dialer" "Dtcnetwork" "Fax" "Fp_extensions" "Fp_vdir_deploy"
+      "Freecell" "Hearts" "Hypertrm" "IEAccess" "IEHardenAdmin" "IEHardenUser"
+      "Iis_asp" "Iis_common" "Iis_ftp" "Iis_inetmgr" "Iis_internetdataconnector"
+      "Iis_nntp" "Iis_serversideincludes" "Iis_smtp" "Iis_webdav" "Iis_www"
+      "Indexsrv_system" "Inetprint" "Licenseserver" "Media_clips" "Media_utopia"
+      "Minesweeper" "Mousepoint" "Msmq_ADIntegrated" "Msmq_Core"
+      "Msmq_HTTPSupport" "Msmq_LocalStorage" "Msmq_MQDSService"
+      "Msmq_RoutingSupport" "Msmq_TriggersService" "Msnexplr" "Mswordpad"
+      "Netcis" "Netoc" "OEAccess" "Objectpkg" "Paint" "Pinball" "Pop3Admin"
+      "Pop3Service" "Pop3Srv" "Rec" "Reminst" "Rootautoupdate" "Rstorage" "SCW"
+      "Sakit_web" "Solitaire" "Spider" "TSWebClient" "Templates"
+      "TerminalServer" "UDDIAdmin" "UDDIDatabase" "UDDIWeb" "Vol" "WMAccess"
+      "WMPOCM" "WbemMSI" "Wms" "Wms_admin_asp" "Wms_admin_mmc" "Wms_isapi"
+      "Wms_server" "Zonegames"
+    ]}
+
+    [WindowsFirewall]
+    Profiles = WindowsFirewall.TurnOffFirewall
+
+    [WindowsFirewall.TurnOffFirewall]
+    Mode = 0
+
+    [SetupParams]
+    UserExecute = "${lib.concatStringsSep " " afterSetup}"
+
+    [GuiRunOnce]
+    Command0 = "${cygwinRoot}\bin\bash -l ${shExecAfterwards}"
+  '';
+
+in stdenv.mkDerivation {
+  name = "unattended-floppy.img";
+  buildCommand = ''
+    dd if=/dev/zero of="$out" count=1440 bs=1024
+    ${dosfstools}/sbin/mkfs.msdos "$out"
+    ${mtools}/bin/mcopy -i "$out" "${winXpUnattended}" ::winnt.sif
+  '';
+}
-- 
GitLab


From 9b1862ca1fad149275e4d3e9241579b9aec9b952 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 15 Feb 2014 18:23:43 +0100
Subject: [PATCH 1591/3789] vm/windows: Move creating SSH key into install/.

This SSH key is specifically only for accessing the installed Cygwin
within the Windows VM, so we only need to expose the private key. Yes,
you heard right, the private key. It's not security-relevant because the
machine is completely read-only, only exposed to the filesystem and
networking is not available.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/default.nix         | 11 +----------
 pkgs/build-support/vm/windows/install/default.nix | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index 06bf6c9bb6d..470fac0437d 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -11,7 +11,6 @@ let
   base = import ./install {
     isoFile = winISO;
     productKey = "XXX";
-    sshPublicKey = "${snakeOilSSH}/key.pub";
   };
 
   maybeKvm64 = lib.optional (stdenv.system == "x86_64-linux") "-cpu kvm64";
@@ -33,14 +32,6 @@ let
     rootModules = o.rootModules ++ lib.singleton "virtio_net";
   });
 
-  snakeOilSSH = stdenv.mkDerivation {
-    name = "snakeoil-ssh-cygwin";
-    buildCommand = ''
-      ensureDir "$out"
-      ${openssh}/bin/ssh-keygen -t ecdsa -f "$out/key" -N ""
-    '';
-  };
-
   controllerQemuArgs = cmd: let
     preInitScript = writeScript "preinit.sh" ''
       #!${vmTools.initrdUtils}/bin/ash -e
@@ -108,7 +99,7 @@ let
 
       ${samba}/sbin/nmbd -D
       ${samba}/sbin/smbd -D
-      ${coreutils}/bin/cp -L "${snakeOilSSH}/key" /ssh.key
+      ${coreutils}/bin/cp -L "${base.sshKey}" /ssh.key
       ${coreutils}/bin/chmod 600 /ssh.key
 
       echo -n "Waiting for Windows VM to become ready"
diff --git a/pkgs/build-support/vm/windows/install/default.nix b/pkgs/build-support/vm/windows/install/default.nix
index fec7dac0714..0021bae87bc 100644
--- a/pkgs/build-support/vm/windows/install/default.nix
+++ b/pkgs/build-support/vm/windows/install/default.nix
@@ -1,16 +1,15 @@
 { isoFile
 , productKey
-, sshPublicKey
 }:
 
 let
-  inherit (import <nixpkgs> {}) lib runCommand;
+  inherit (import <nixpkgs> {}) lib stdenv runCommand openssh;
 
   bootstrapAfterLogin = runCommand "bootstrap.sh" {} ''
     cat > "$out" <<EOF
     mkdir -p ~/.ssh
     cat > ~/.ssh/authorized_keys <<PUBKEY
-    $(cat "${sshPublicKey}")
+    $(cat "${cygwinSshKey}/key.pub")
     PUBKEY
     ssh-host-config -y -c 'binmode ntsec' -w dummy
     cygrunsrv -S sshd
@@ -21,6 +20,14 @@ let
     EOF
   '';
 
+  cygwinSshKey = stdenv.mkDerivation {
+    name = "snakeoil-ssh-cygwin";
+    buildCommand = ''
+      ensureDir "$out"
+      ${openssh}/bin/ssh-keygen -t ecdsa -f "$out/key" -N ""
+    '';
+  };
+
   packages = [ "openssh" ];
 
 in {
@@ -36,4 +43,6 @@ in {
     cygwinPackages = packages;
     inherit productKey;
   };
+
+  sshKey = "${cygwinSshKey}/key";
 }
-- 
GitLab


From 5105e7f0bfc3a9131df5a8f3bf4d899a01b0106b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 15 Feb 2014 19:46:01 +0100
Subject: [PATCH 1592/3789] vm/windows: Update sha256 of Cygwin's setup.ini.

This is kinda stupid to do every little time the file is automatically
regenerated upstream. But let's see how often that happens and whether
it will become a major annoyance or not, and if yes, we might be forced
to include it in our source tree.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/cygwin-iso/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
index 9df07bdb667..17e4cff855b 100644
--- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix
+++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
@@ -8,7 +8,7 @@ let
 
   cygPkgList = fetchurl {
     url = "${mirror}/x86_64/setup.ini";
-    sha256 = "0d54pli0gnm3010w9iq2bar3r2sc4syyblg62q75inc2cq341bi3";
+    sha256 = "19vfm7zr8kcp1algmggk8vsilkccycx22mdf0ynfl6lcmp6dkfsz";
   };
 
   makeCygwinClosure = { packages, packageList }: let
-- 
GitLab


From c731467e2c83f3df0b59c44575616e6241a63c7d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 15 Feb 2014 23:23:47 +0100
Subject: [PATCH 1593/3789] vm/windows: Split install into several stages.

These stages are in particular:

 * Install of the bare Windows VM with Cygwin and shut down.
 * Boot up the same VM again without the installation media and dump the
   VMs memory to state.gz.
 * Resume from state.gz and build whatever we want to build.

Every single stage involves a new "controller", which is more like an
abstraction on the Nix side that constructs the madness described in
276b72fb93d60ae0e59088ea0e0029da87e6f31c.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../vm/windows/controller/default.nix         | 173 +++++++++++++++++
 pkgs/build-support/vm/windows/default.nix     | 175 ++++--------------
 .../vm/windows/install/default.nix            |  43 ++++-
 3 files changed, 238 insertions(+), 153 deletions(-)
 create mode 100644 pkgs/build-support/vm/windows/controller/default.nix

diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix
new file mode 100644
index 00000000000..49d6815a3dc
--- /dev/null
+++ b/pkgs/build-support/vm/windows/controller/default.nix
@@ -0,0 +1,173 @@
+{ sshKey
+, qemuArgs ? []
+, command ? "sync"
+, suspendTo ? null
+, resumeFrom ? null
+, installMode ? false
+}:
+
+let
+  inherit (import <nixpkgs> {}) lib stdenv writeScript vmTools makeInitrd;
+  inherit (import <nixpkgs> {}) samba vde2 busybox openssh;
+  inherit (import <nixpkgs> {}) socat netcat coreutils gzip;
+
+  preInitScript = writeScript "preinit.sh" ''
+    #!${vmTools.initrdUtils}/bin/ash -e
+    export PATH=${vmTools.initrdUtils}/bin
+    mount -t proc none /proc
+    mount -t sysfs none /sys
+    for arg in $(cat /proc/cmdline); do
+      if [ "x''${arg#command=}" != "x$arg" ]; then
+        command="''${arg#command=}"
+      fi
+    done
+
+    for i in $(cat ${modulesClosure}/insmod-list); do
+      insmod $i
+    done
+
+    mkdir -p /tmp /dev
+    mknod /dev/null    c 1 3
+    mknod /dev/zero    c 1 5
+    mknod /dev/random  c 1 8
+    mknod /dev/urandom c 1 9
+    mknod /dev/tty     c 5 0
+
+    ifconfig lo up
+    ifconfig eth0 up 192.168.0.2
+
+    mkdir -p /nix/store /etc /var/run /var/log
+
+    cat > /etc/passwd <<PASSWD
+    root:x:0:0::/root:/bin/false
+    nobody:x:65534:65534::/var/empty:/bin/false
+    PASSWD
+
+    mount -t 9p \
+      -o trans=virtio,version=9p2000.L,msize=262144,cache=loose \
+      store /nix/store
+
+    exec "$command"
+  '';
+
+  initrd = makeInitrd {
+    contents = lib.singleton {
+      object = preInitScript;
+      symlink = "/init";
+    };
+  };
+
+  initScript = writeScript "init.sh" (''
+    #!${stdenv.shell}
+    ${coreutils}/bin/mkdir -p /etc/samba /etc/samba/private /var/lib/samba
+    ${coreutils}/bin/cat > /etc/samba/smb.conf <<CONFIG
+    [global]
+    security = user
+    map to guest = Bad User
+    workgroup = cygwin
+    netbios name = controller
+    server string = %h
+    log level = 1
+    max log size = 1000
+    log file = /var/log/samba.log
+
+    [nixstore]
+    path = /nix/store
+    read only = no
+    guest ok = yes
+    CONFIG
+
+    ${samba}/sbin/nmbd -D
+    ${samba}/sbin/smbd -D
+    ${coreutils}/bin/cp -L "${sshKey}" /ssh.key
+    ${coreutils}/bin/chmod 600 /ssh.key
+  '' + (if installMode then ''
+    echo -n "Waiting for Windows installation to finish..."
+    while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
+      echo -n .
+      # Print a dot every 10 seconds only to shorten line length.
+      ${coreutils}/bin/sleep 10
+    done
+    echo " success."
+    # Loop forever, because this VM is going to be killed.
+    while :; do ${coreutils}/bin/sleep 1; done
+  '' else ''
+    echo -n "Waiting for Windows VM to become available..."
+    while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
+      echo -n .
+      ${coreutils}/bin/sleep 1
+    done
+    echo " success."
+
+    ${openssh}/bin/ssh \
+      -o UserKnownHostsFile=/dev/null \
+      -o StrictHostKeyChecking=no \
+      -i /ssh.key \
+      -l Administrator \
+      192.168.0.1 -- "${command}"
+
+    ${busybox}/sbin/poweroff -f
+  ''));
+
+  kernelAppend = lib.concatStringsSep " " [
+    "panic=1"
+    "loglevel=4"
+    "console=tty1"
+    "console=ttyS0"
+    "command=${initScript}"
+  ];
+
+  controllerQemuArgs = lib.concatStringsSep " " (maybeKvm64 ++ [
+    "-nographic"
+    "-no-reboot"
+    "-virtfs local,path=/nix/store,security_model=none,mount_tag=store"
+    "-kernel ${modulesClosure.kernel}/bzImage"
+    "-initrd ${initrd}/initrd"
+    "-append \"${kernelAppend}\""
+    "-net nic,vlan=0,macaddr=52:54:00:12:01:02,model=virtio"
+    "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET"
+  ]);
+
+  maybeKvm64 = lib.optional (stdenv.system == "x86_64-linux") "-cpu kvm64";
+
+  cygwinQemuArgs = lib.concatStringsSep " " (maybeKvm64 ++ [
+    "-monitor unix:$MONITOR_SOCKET,server,nowait"
+    "-nographic"
+    "-net nic,vlan=0,macaddr=52:54:00:12:01:01"
+    "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET"
+    "-rtc base=2010-01-01,clock=vm"
+  ] ++ qemuArgs ++ lib.optionals (resumeFrom != null) [
+    "-incoming 'exec: ${gzip}/bin/gzip -c -d \"${resumeFrom}\"'"
+  ]);
+
+  modulesClosure = lib.overrideDerivation vmTools.modulesClosure (o: {
+    rootModules = o.rootModules ++ lib.singleton "virtio_net";
+  });
+
+  preVM = ''
+    QEMU_VDE_SOCKET="$(pwd)/vde.ctl"
+    MONITOR_SOCKET="$(pwd)/monitor"
+    ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" &
+  '';
+
+  vmExec = if installMode then ''
+    ${vmTools.qemuProg} ${controllerQemuArgs} &
+    ${vmTools.qemuProg} ${cygwinQemuArgs}
+  '' else ''
+    ${vmTools.qemuProg} ${cygwinQemuArgs} &
+    ${vmTools.qemuProg} ${controllerQemuArgs}
+  '' + lib.optionalString (suspendTo != null) ''
+    ${socat}/bin/socat - UNIX-CONNECT:$MONITOR_SOCKET <<CMD
+    stop
+    migrate_set_speed 4095m
+    migrate "exec:${gzip}/bin/gzip -c > '${suspendTo}'"
+    quit
+    CMD
+    wait %%
+  '';
+
+in writeScript "run-cygwin-vm.sh" ''
+  #!${stdenv.shell} -e
+  ${preVM}
+  ${vmExec}
+''
diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index 470fac0437d..2ecadbae7cf 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -1,160 +1,49 @@
-with import <nixpkgs> {};
-
-with import <nixpkgs/nixos/lib/build-vms.nix> {
-  inherit system;
-  minimal = false;
-};
-
 let
+  inherit (import <nixpkgs> {}) lib stdenv requireFile writeText qemu;
+
   winISO = /path/to/iso/XXX;
 
-  base = import ./install {
+  installedVM = import ./install {
     isoFile = winISO;
     productKey = "XXX";
   };
 
-  maybeKvm64 = lib.optional (stdenv.system == "x86_64-linux") "-cpu kvm64";
-
-  cygwinQemuArgs = lib.concatStringsSep " " (maybeKvm64 ++ [
-    "-monitor unix:$MONITOR_SOCKET,server,nowait"
-    "-nographic"
-    "-boot order=c,once=d"
-    "-drive file=${base.floppy},readonly,index=0,if=floppy"
-    "-drive file=winvm.img,index=0,media=disk"
-    "-drive file=${winISO},index=1,media=cdrom"
-    "-drive file=${base.iso}/iso/cd.iso,index=2,media=cdrom"
-    "-net nic,vlan=0,macaddr=52:54:00:12:01:01"
-    "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET"
-    "-rtc base=2010-01-01,clock=vm"
-  ]);
-
-  modulesClosure = lib.overrideDerivation vmTools.modulesClosure (o: {
-    rootModules = o.rootModules ++ lib.singleton "virtio_net";
+  runInVM = img: attrs: import ./controller (attrs // {
+    inherit (installedVM) sshKey;
+    qemuArgs = attrs.qemuArgs or [] ++ [
+      "-boot order=c"
+      "-drive file=${img},index=0,media=disk"
+    ];
   });
 
-  controllerQemuArgs = cmd: let
-    preInitScript = writeScript "preinit.sh" ''
-      #!${vmTools.initrdUtils}/bin/ash -e
-      export PATH=${vmTools.initrdUtils}/bin
-      mount -t proc none /proc
-      mount -t sysfs none /sys
-      for arg in $(cat /proc/cmdline); do
-        if [ "x''${arg#command=}" != "x$arg" ]; then
-          command="''${arg#command=}"
-        fi
-      done
-
-      for i in $(cat ${modulesClosure}/insmod-list); do
-        insmod $i
-      done
-
-      mkdir -p /tmp /dev
-      mknod /dev/null    c 1 3
-      mknod /dev/zero    c 1 5
-      mknod /dev/random  c 1 8
-      mknod /dev/urandom c 1 9
-      mknod /dev/tty     c 5 0
-
-      ifconfig lo up
-      ifconfig eth0 up 192.168.0.2
-
-      mkdir -p /nix/store /etc /var/run /var/log
-
-      cat > /etc/passwd <<PASSWD
-      root:x:0:0::/root:/bin/false
-      nobody:x:65534:65534::/var/empty:/bin/false
-      PASSWD
-
-      mount -t 9p \
-        -o trans=virtio,version=9p2000.L,msize=262144,cache=loose \
-        store /nix/store
-
-      exec "$command"
-    '';
-    initrd = makeInitrd {
-      contents = lib.singleton {
-        object = preInitScript;
-        symlink = "/init";
-      };
-    };
-    initScript = writeScript "init.sh" ''
-      #!${stdenv.shell}
-      ${coreutils}/bin/mkdir -p /etc/samba /etc/samba/private /var/lib/samba
-      ${coreutils}/bin/cat > /etc/samba/smb.conf <<CONFIG
-      [global]
-      security = user
-      map to guest = Bad User
-      workgroup = cygwin
-      netbios name = controller
-      server string = %h
-      log level = 1
-      max log size = 1000
-      log file = /var/log/samba.log
-
-      [nixstore]
-      path = /nix/store
-      read only = no
-      guest ok = yes
-      CONFIG
-
-      ${samba}/sbin/nmbd -D
-      ${samba}/sbin/smbd -D
-      ${coreutils}/bin/cp -L "${base.sshKey}" /ssh.key
-      ${coreutils}/bin/chmod 600 /ssh.key
-
-      echo -n "Waiting for Windows VM to become ready"
-      while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
-        echo -n .
-        ${coreutils}/bin/sleep 1
-      done
-      echo " ready."
-
-      ${openssh}/bin/ssh \
-        -o UserKnownHostsFile=/dev/null \
-        -o StrictHostKeyChecking=no \
-        -i /ssh.key \
-        -l Administrator \
-        192.168.0.1 -- "${cmd}"
+  runAndSuspend = runInVM "winvm.img" {
+    suspendTo = "state.gz";
+  };
 
-      ${busybox}/sbin/poweroff -f
+  suspendedVM = stdenv.mkDerivation {
+    name = "cygwin-suspended-vm";
+    buildCommand = ''
+      ${qemu}/bin/qemu-img create \
+        -b "${installedVM}/disk.img" \
+        -f qcow2 winvm.img
+      ${runAndSuspend}
+      ensureDir "$out"
+      cp winvm.img "$out/disk.img"
+      cp state.gz "$out/state.gz"
     '';
-    kernelAppend = lib.concatStringsSep " " [
-      "panic=1"
-      "loglevel=4"
-      "console=tty1"
-      "console=ttyS0"
-      "command=${initScript}"
-    ];
-  in lib.concatStringsSep " " (maybeKvm64 ++ [
-    "-nographic"
-    "-no-reboot"
-    "-virtfs local,path=/nix/store,security_model=none,mount_tag=store"
-    "-kernel ${modulesClosure.kernel}/bzImage"
-    "-initrd ${initrd}/initrd"
-    "-append \"${kernelAppend}\""
-    "-net nic,vlan=0,macaddr=52:54:00:12:01:02,model=virtio"
-    "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET"
-  ]);
+  };
 
-  bootstrap = stdenv.mkDerivation {
-    name = "windown-vm";
+  resumeAndRun = command: runInVM "${suspendedVM}/disk.img" {
+    resumeFrom = "${suspendedVM}/state.gz";
+    qemuArgs = lib.singleton "-snapshot";
+    inherit command;
+  };
 
+  runFromSuspended = command: stdenv.mkDerivation {
+    name = "cygwin-vm-run";
     buildCommand = ''
-      ${qemu}/bin/qemu-img create -f qcow2 winvm.img 2G
-      QEMU_VDE_SOCKET="$(pwd)/vde.ctl"
-      MONITOR_SOCKET="$(pwd)/monitor"
-      ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" &
-      ${vmTools.qemuProg} ${cygwinQemuArgs} &
-      ${vmTools.qemuProg} ${controllerQemuArgs "sync"}
-
-      ensureDir "$out"
-      ${socat}/bin/socat - UNIX-CONNECT:$MONITOR_SOCKET <<CMD
-      stop
-      migrate_set_speed 4095m
-      migrate "exec:${gzip}/bin/gzip -c > '$out/state.gz'"
-      CMD
-      cp winvm.img "$out/disk.img"
+      ${resumeAndRun command}
     '';
   };
 
-in bootstrap
+in runFromSuspended "uname -a"
diff --git a/pkgs/build-support/vm/windows/install/default.nix b/pkgs/build-support/vm/windows/install/default.nix
index 0021bae87bc..d766cbcf8e3 100644
--- a/pkgs/build-support/vm/windows/install/default.nix
+++ b/pkgs/build-support/vm/windows/install/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  inherit (import <nixpkgs> {}) lib stdenv runCommand openssh;
+  inherit (import <nixpkgs> {}) lib stdenv runCommand openssh qemu;
 
   bootstrapAfterLogin = runCommand "bootstrap.sh" {} ''
     cat > "$out" <<EOF
@@ -12,11 +12,11 @@ let
     $(cat "${cygwinSshKey}/key.pub")
     PUBKEY
     ssh-host-config -y -c 'binmode ntsec' -w dummy
-    cygrunsrv -S sshd
 
     net use S: '\\192.168.0.2\nixstore'
     mkdir -p /nix/store
-    mount -o bind /cygdrives/s /nix/store
+    echo "/cygdrives/s /nix/store none bind 0 0" >> /etc/fstab
+    shutdown -s now
     EOF
   '';
 
@@ -28,10 +28,16 @@ let
     '';
   };
 
-  packages = [ "openssh" ];
+  sshKey = "${cygwinSshKey}/key";
+
+  packages = [ "openssh" "shutdown" ];
+
+  instfloppy = import ./unattended-image.nix {
+    cygwinPackages = packages;
+    inherit productKey;
+  };
 
-in {
-  iso = import ../cygwin-iso {
+  cygiso = import ../cygwin-iso {
     inherit packages;
     extraContents = lib.singleton {
       source = bootstrapAfterLogin;
@@ -39,10 +45,27 @@ in {
     };
   };
 
-  floppy = import ./unattended-image.nix {
-    cygwinPackages = packages;
-    inherit productKey;
+  installController = import ../controller {
+    inherit sshKey;
+    installMode = true;
+    qemuArgs = [
+      "-boot order=c,once=d"
+      "-drive file=${instfloppy},readonly,index=0,if=floppy"
+      "-drive file=winvm.img,index=0,media=disk"
+      "-drive file=${isoFile},index=1,media=cdrom"
+      "-drive file=${cygiso}/iso/cd.iso,index=2,media=cdrom"
+    ];
   };
 
-  sshKey = "${cygwinSshKey}/key";
+in stdenv.mkDerivation {
+  name = "cygwin-base-vm";
+  buildCommand = ''
+    ${qemu}/bin/qemu-img create -f qcow2 winvm.img 2G
+    ${installController}
+    ensureDir "$out"
+    cp winvm.img "$out/disk.img"
+  '';
+  passthru = {
+    inherit sshKey;
+  };
 }
-- 
GitLab


From 3e91192f079c2eac4bd15d564bb2fd4702506b36 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 16 Feb 2014 00:27:43 +0100
Subject: [PATCH 1594/3789] vm/windows: Wait for VDE switch to startup.

This could possibly cause flapping whenever qemu is too fast in starting
up. As we are running with the shell's -e flag, the socat check also
ensures that the VDE switch is properly started and causes the whole
build to fail, should it not start up within 20 seconds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/controller/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix
index 49d6815a3dc..22451e0e394 100644
--- a/pkgs/build-support/vm/windows/controller/default.nix
+++ b/pkgs/build-support/vm/windows/controller/default.nix
@@ -148,6 +148,8 @@ let
     QEMU_VDE_SOCKET="$(pwd)/vde.ctl"
     MONITOR_SOCKET="$(pwd)/monitor"
     ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" &
+    echo 'alive?' | ${socat}/bin/socat - \
+      UNIX-CONNECT:$QEMU_VDE_SOCKET/ctl,retry=20
   '';
 
   vmExec = if installMode then ''
-- 
GitLab


From cfa859d79222d034a9fe493192150b80faae4ee8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 16 Feb 2014 00:48:01 +0100
Subject: [PATCH 1595/3789] vm/windows: Don't init /nix/store on install.

We're going to do this during the suspendedVM phase, so we're able to
more easily change the shares without reinstalling the whole VM.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/install/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/vm/windows/install/default.nix b/pkgs/build-support/vm/windows/install/default.nix
index d766cbcf8e3..64177ea1713 100644
--- a/pkgs/build-support/vm/windows/install/default.nix
+++ b/pkgs/build-support/vm/windows/install/default.nix
@@ -12,11 +12,8 @@ let
     $(cat "${cygwinSshKey}/key.pub")
     PUBKEY
     ssh-host-config -y -c 'binmode ntsec' -w dummy
-
-    net use S: '\\192.168.0.2\nixstore'
-    mkdir -p /nix/store
-    echo "/cygdrives/s /nix/store none bind 0 0" >> /etc/fstab
-    shutdown -s now
+    cygrunsrv -S sshd
+    shutdown -s 5
     EOF
   '';
 
-- 
GitLab


From aa65a7057f3abba32726ed17853090bcb86992f9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 16 Feb 2014 01:42:10 +0100
Subject: [PATCH 1596/3789] vm/windows: Properly escape shell command.

Security-wise it's not a big issue because we're still sandboxed, but I
really don't want to write something like \\\\\\\\192.168.0.2\\\\share
in order to set up network shares.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/controller/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix
index 22451e0e394..6abf87f82c8 100644
--- a/pkgs/build-support/vm/windows/controller/default.nix
+++ b/pkgs/build-support/vm/windows/controller/default.nix
@@ -57,6 +57,8 @@ let
     };
   };
 
+  shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'";
+
   initScript = writeScript "init.sh" (''
     #!${stdenv.shell}
     ${coreutils}/bin/mkdir -p /etc/samba /etc/samba/private /var/lib/samba
@@ -104,7 +106,7 @@ let
       -o StrictHostKeyChecking=no \
       -i /ssh.key \
       -l Administrator \
-      192.168.0.1 -- "${command}"
+      192.168.0.1 -- ${shellEscape command}
 
     ${busybox}/sbin/poweroff -f
   ''));
-- 
GitLab


From 0ce1fd07fe7e59115af60dd33a9e668cbb1ebd4c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 16 Feb 2014 01:46:28 +0100
Subject: [PATCH 1597/3789] vm/windows: Reintroduce setting up /nix/store.

Now we're doing this at the point where we're saving the VM state.
Unfortunately it's not quite right, because the controller VM is shut
down _before_ we're saving the state, so the share gets disconnected
despite autodisconnect being deactivated during setup.

We can get around this issue by finally introducing the xchg share,
which is the last item to be implemented before we can merge to master.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index 2ecadbae7cf..b7c18f6d16c 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -17,6 +17,13 @@ let
   });
 
   runAndSuspend = runInVM "winvm.img" {
+    command = lib.concatStringsSep "; " [
+      "set -e"
+      "net config server /autodisconnect:-1"
+      "net use S: '\\\\192.168.0.2\\nixstore' /persistent:yes"
+      "mkdir -p /nix/store"
+      "mount -o bind /cygdrive/s /nix/store"
+    ];
     suspendTo = "state.gz";
   };
 
-- 
GitLab


From fedf13e6cfb94bad00df71aba66f0b6fea233e0f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 16 Feb 2014 03:19:40 +0100
Subject: [PATCH 1598/3789] vm/windows: Implement and use "xchg" share.

This now finally introduces our xchg share and also uses it for
exchanging state while suspending a VM. However, accessing the _real_
Nix store still isn't possible because we're shadowing the directory in
the initrd.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../vm/windows/controller/default.nix         | 30 +++++++++++++++----
 pkgs/build-support/vm/windows/default.nix     |  3 ++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix
index 6abf87f82c8..da3be51c102 100644
--- a/pkgs/build-support/vm/windows/controller/default.nix
+++ b/pkgs/build-support/vm/windows/controller/default.nix
@@ -36,13 +36,17 @@ let
     ifconfig lo up
     ifconfig eth0 up 192.168.0.2
 
-    mkdir -p /nix/store /etc /var/run /var/log
+    mkdir -p /xchg /nix/store /etc /var/run /var/log
 
     cat > /etc/passwd <<PASSWD
     root:x:0:0::/root:/bin/false
     nobody:x:65534:65534::/var/empty:/bin/false
     PASSWD
 
+    mount -t 9p \
+      -o trans=virtio,version=9p2000.L,msize=262144,cache=loose \
+      xchg /xchg
+
     mount -t 9p \
       -o trans=virtio,version=9p2000.L,msize=262144,cache=loose \
       store /nix/store
@@ -59,6 +63,8 @@ let
 
   shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'";
 
+  loopForever = "while :; do ${coreutils}/bin/sleep 1; done";
+
   initScript = writeScript "init.sh" (''
     #!${stdenv.shell}
     ${coreutils}/bin/mkdir -p /etc/samba /etc/samba/private /var/lib/samba
@@ -77,6 +83,11 @@ let
     path = /nix/store
     read only = no
     guest ok = yes
+
+    [xchg]
+    path = /xchg
+    read only = no
+    guest ok = yes
     CONFIG
 
     ${samba}/sbin/nmbd -D
@@ -92,7 +103,7 @@ let
     done
     echo " success."
     # Loop forever, because this VM is going to be killed.
-    while :; do ${coreutils}/bin/sleep 1; done
+    ${loopForever}
   '' else ''
     echo -n "Waiting for Windows VM to become available..."
     while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
@@ -108,6 +119,10 @@ let
       -l Administrator \
       192.168.0.1 -- ${shellEscape command}
 
+    ${lib.optionalString (suspendTo != null) ''
+    ${coreutils}/bin/touch /xchg/suspend_now
+    ${loopForever}
+    ''}
     ${busybox}/sbin/poweroff -f
   ''));
 
@@ -123,6 +138,7 @@ let
     "-nographic"
     "-no-reboot"
     "-virtfs local,path=/nix/store,security_model=none,mount_tag=store"
+    "-virtfs local,path=$XCHG_DIR,security_model=none,mount_tag=xchg"
     "-kernel ${modulesClosure.kernel}/bzImage"
     "-initrd ${initrd}/initrd"
     "-append \"${kernelAppend}\""
@@ -147,6 +163,7 @@ let
   });
 
   preVM = ''
+    XCHG_DIR="$(${coreutils}/bin/mktemp -d nix-vm.XXXXXXXXXX --tmpdir)"
     QEMU_VDE_SOCKET="$(pwd)/vde.ctl"
     MONITOR_SOCKET="$(pwd)/monitor"
     ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" &
@@ -154,20 +171,23 @@ let
       UNIX-CONNECT:$QEMU_VDE_SOCKET/ctl,retry=20
   '';
 
+  bgBoth = lib.optionalString (suspendTo != null) " &";
+
   vmExec = if installMode then ''
     ${vmTools.qemuProg} ${controllerQemuArgs} &
-    ${vmTools.qemuProg} ${cygwinQemuArgs}
+    ${vmTools.qemuProg} ${cygwinQemuArgs}${bgBoth}
   '' else ''
     ${vmTools.qemuProg} ${cygwinQemuArgs} &
-    ${vmTools.qemuProg} ${controllerQemuArgs}
+    ${vmTools.qemuProg} ${controllerQemuArgs}${bgBoth}
   '' + lib.optionalString (suspendTo != null) ''
+    while ! test -e "$XCHG_DIR/suspend_now"; do 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 %-
   '';
 
 in writeScript "run-cygwin-vm.sh" ''
diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index b7c18f6d16c..89acb9a2d68 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -21,8 +21,11 @@ let
       "set -e"
       "net config server /autodisconnect:-1"
       "net use S: '\\\\192.168.0.2\\nixstore' /persistent:yes"
+      "net use X: '\\\\192.168.0.2\\xchg' /persistent:yes"
       "mkdir -p /nix/store"
       "mount -o bind /cygdrive/s /nix/store"
+      "mkdir -p /tmp/xchg"
+      "mount -o bind /cygdrive/x /tmp/xchg"
     ];
     suspendTo = "state.gz";
   };
-- 
GitLab


From a1d7974acd1a6c7d527dd0adc9fe711983990074 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 16 Feb 2014 16:47:23 +0100
Subject: [PATCH 1599/3789] vm/windows: Remove Samba from installMode.

This should trim down possible dependencies on the base installation and
hereby reduce the need for reinstallation of the damn VM to only changes
that affect the Windows installation and the base Cygwin + OpenSSH
setup.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../vm/windows/controller/default.nix         | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix
index da3be51c102..3d763468113 100644
--- a/pkgs/build-support/vm/windows/controller/default.nix
+++ b/pkgs/build-support/vm/windows/controller/default.nix
@@ -67,6 +67,19 @@ let
 
   initScript = writeScript "init.sh" (''
     #!${stdenv.shell}
+    ${coreutils}/bin/cp -L "${sshKey}" /ssh.key
+    ${coreutils}/bin/chmod 600 /ssh.key
+  '' + (if installMode then ''
+    echo -n "Waiting for Windows installation to finish..."
+    while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
+      echo -n .
+      # Print a dot every 10 seconds only to shorten line length.
+      ${coreutils}/bin/sleep 10
+    done
+    echo " success."
+    # Loop forever, because this VM is going to be killed.
+    ${loopForever}
+  '' else ''
     ${coreutils}/bin/mkdir -p /etc/samba /etc/samba/private /var/lib/samba
     ${coreutils}/bin/cat > /etc/samba/smb.conf <<CONFIG
     [global]
@@ -92,19 +105,6 @@ let
 
     ${samba}/sbin/nmbd -D
     ${samba}/sbin/smbd -D
-    ${coreutils}/bin/cp -L "${sshKey}" /ssh.key
-    ${coreutils}/bin/chmod 600 /ssh.key
-  '' + (if installMode then ''
-    echo -n "Waiting for Windows installation to finish..."
-    while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
-      echo -n .
-      # Print a dot every 10 seconds only to shorten line length.
-      ${coreutils}/bin/sleep 10
-    done
-    echo " success."
-    # Loop forever, because this VM is going to be killed.
-    ${loopForever}
-  '' else ''
     echo -n "Waiting for Windows VM to become available..."
     while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
       echo -n .
-- 
GitLab


From 5241bb1d5e088ec3906cbc32afcdeb68953badef Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 16 Feb 2014 16:53:02 +0100
Subject: [PATCH 1600/3789] vm/windows: Avoid shadowing the Nix store.

This is done by putting the non-initrd /nix/store into a subdirectory,
which we then chroot to and pass along the SSH command.

Also, we now collect the exit code after the chroot command and power
off the VM thereafter, because the store is no longer shadowed and we
have still access to the busybox inside the initrd.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../vm/windows/controller/default.nix         | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix
index 3d763468113..60ec1d4783a 100644
--- a/pkgs/build-support/vm/windows/controller/default.nix
+++ b/pkgs/build-support/vm/windows/controller/default.nix
@@ -8,8 +8,7 @@
 
 let
   inherit (import <nixpkgs> {}) lib stdenv writeScript vmTools makeInitrd;
-  inherit (import <nixpkgs> {}) samba vde2 busybox openssh;
-  inherit (import <nixpkgs> {}) socat netcat coreutils gzip;
+  inherit (import <nixpkgs> {}) samba vde2 openssh socat netcat coreutils gzip;
 
   preInitScript = writeScript "preinit.sh" ''
     #!${vmTools.initrdUtils}/bin/ash -e
@@ -26,7 +25,9 @@ let
       insmod $i
     done
 
-    mkdir -p /tmp /dev
+    mkdir -p /dev /fs
+
+    mount -t tmpfs none /dev
     mknod /dev/null    c 1 3
     mknod /dev/zero    c 1 5
     mknod /dev/random  c 1 8
@@ -36,22 +37,31 @@ let
     ifconfig lo up
     ifconfig eth0 up 192.168.0.2
 
-    mkdir -p /xchg /nix/store /etc /var/run /var/log
+    mount -t tmpfs none /fs
+    mkdir -p /fs/nix/store /fs/xchg /fs/dev /fs/sys /fs/proc /fs/etc /fs/tmp
 
-    cat > /etc/passwd <<PASSWD
-    root:x:0:0::/root:/bin/false
-    nobody:x:65534:65534::/var/empty:/bin/false
-    PASSWD
+    mount -o bind /dev /fs/dev
+    mount -t sysfs none /fs/sys
+    mount -t proc none /fs/proc
 
     mount -t 9p \
       -o trans=virtio,version=9p2000.L,msize=262144,cache=loose \
-      xchg /xchg
+      store /fs/nix/store
 
     mount -t 9p \
       -o trans=virtio,version=9p2000.L,msize=262144,cache=loose \
-      store /nix/store
+      xchg /fs/xchg
+
+    cat > /fs/etc/passwd <<PASSWD
+    root:x:0:0::/root:/bin/false
+    nobody:x:65534:65534::/var/empty:/bin/false
+    PASSWD
 
-    exec "$command"
+    set +e
+    chroot /fs $command $out
+    echo $? > /fs/xchg/in-vm-exit
+
+    poweroff -f
   '';
 
   initrd = makeInitrd {
@@ -80,7 +90,8 @@ let
     # Loop forever, because this VM is going to be killed.
     ${loopForever}
   '' else ''
-    ${coreutils}/bin/mkdir -p /etc/samba /etc/samba/private /var/lib/samba
+    ${coreutils}/bin/mkdir -p /etc/samba /etc/samba/private \
+                              /var/lib/samba /var/log /var/run
     ${coreutils}/bin/cat > /etc/samba/smb.conf <<CONFIG
     [global]
     security = user
@@ -105,6 +116,7 @@ let
 
     ${samba}/sbin/nmbd -D
     ${samba}/sbin/smbd -D
+
     echo -n "Waiting for Windows VM to become available..."
     while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do
       echo -n .
@@ -123,7 +135,6 @@ let
     ${coreutils}/bin/touch /xchg/suspend_now
     ${loopForever}
     ''}
-    ${busybox}/sbin/poweroff -f
   ''));
 
   kernelAppend = lib.concatStringsSep " " [
-- 
GitLab


From 084238c6ec740d61f2e5f30e2c4ceb663dd1770f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 16 Feb 2014 18:58:08 +0100
Subject: [PATCH 1601/3789] vm/windows: Fix perms of the Samba shares.

We now map all guest accounts to the root user, because in the end the
permissions of the current user boil down to the build user of the Nix
builder of the host. That way it's not possible to gain more permissions
at all and just makes the VM communication a lot easier.

However, setting "writable" to yes instead of "read only" to no doesn't
change anything here, I just found it to be clearer.

Also, we now no longer need to have a "nobody" user.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/controller/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix
index 60ec1d4783a..fd6ad6354aa 100644
--- a/pkgs/build-support/vm/windows/controller/default.nix
+++ b/pkgs/build-support/vm/windows/controller/default.nix
@@ -52,10 +52,7 @@ let
       -o trans=virtio,version=9p2000.L,msize=262144,cache=loose \
       xchg /fs/xchg
 
-    cat > /fs/etc/passwd <<PASSWD
-    root:x:0:0::/root:/bin/false
-    nobody:x:65534:65534::/var/empty:/bin/false
-    PASSWD
+    echo root:x:0:0::/root:/bin/false > /fs/etc/passwd
 
     set +e
     chroot /fs $command $out
@@ -96,6 +93,7 @@ let
     [global]
     security = user
     map to guest = Bad User
+    guest account = root
     workgroup = cygwin
     netbios name = controller
     server string = %h
@@ -105,12 +103,12 @@ let
 
     [nixstore]
     path = /nix/store
-    read only = no
+    writable = yes
     guest ok = yes
 
     [xchg]
     path = /xchg
-    read only = no
+    writable = yes
     guest ok = yes
     CONFIG
 
-- 
GitLab


From d16dae8d3215c82070132694d82a1309d140f124 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 16 Feb 2014 22:12:42 +0100
Subject: [PATCH 1602/3789] vm/windows: Use &&, not set -e in runAndSuspend.

We now have proper quoting, so we no longer need the workaround using
"set -e".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index 89acb9a2d68..36795fbb78e 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -17,8 +17,7 @@ let
   });
 
   runAndSuspend = runInVM "winvm.img" {
-    command = lib.concatStringsSep "; " [
-      "set -e"
+    command = lib.concatStringsSep " && " [
       "net config server /autodisconnect:-1"
       "net use S: '\\\\192.168.0.2\\nixstore' /persistent:yes"
       "net use X: '\\\\192.168.0.2\\xchg' /persistent:yes"
-- 
GitLab


From 5258bbe4c97113dfa663a32408691fc93ee2dd9b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 16 Feb 2014 22:27:39 +0100
Subject: [PATCH 1603/3789] vm/windows: Create fstab entries in suspended VM.

Cygwin initializes mounts on _every_ login via SSH and doesn't keep them
consistently like on Unix systems, that's why we need to also add fstab
entries for the bind mounts to the store and xchg shares.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index 36795fbb78e..bb0833beec2 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -23,8 +23,10 @@ let
       "net use X: '\\\\192.168.0.2\\xchg' /persistent:yes"
       "mkdir -p /nix/store"
       "mount -o bind /cygdrive/s /nix/store"
+      "echo /cygdrive/s /nix/store none bind 0 0 >> /etc/fstab"
       "mkdir -p /tmp/xchg"
       "mount -o bind /cygdrive/x /tmp/xchg"
+      "echo /cygdrive/x /tmp/xchg none bind 0 0 >> /etc/fstab"
     ];
     suspendTo = "state.gz";
   };
-- 
GitLab


From 707b7ad1bddf8b95ca1348260dea132b0514089d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 16 Feb 2014 22:30:40 +0100
Subject: [PATCH 1604/3789] vm/windows: Generate mounts from an attribute set.

This is mainly to make it easier to quickly change mappings, without
making room for errors such as typos.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/default.nix | 32 +++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index bb0833beec2..8ca31bc39d7 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -16,18 +16,28 @@ let
     ];
   });
 
-  runAndSuspend = runInVM "winvm.img" {
-    command = lib.concatStringsSep " && " [
-      "net config server /autodisconnect:-1"
-      "net use S: '\\\\192.168.0.2\\nixstore' /persistent:yes"
-      "net use X: '\\\\192.168.0.2\\xchg' /persistent:yes"
-      "mkdir -p /nix/store"
-      "mount -o bind /cygdrive/s /nix/store"
-      "echo /cygdrive/s /nix/store none bind 0 0 >> /etc/fstab"
-      "mkdir -p /tmp/xchg"
-      "mount -o bind /cygdrive/x /tmp/xchg"
-      "echo /cygdrive/x /tmp/xchg none bind 0 0 >> /etc/fstab"
+  runAndSuspend = let
+    drives = {
+      s = {
+        source = "nixstore";
+        target = "/nix/store";
+      };
+      x = {
+        source = "xchg";
+        target = "/tmp/xchg";
+      };
+    };
+
+    genDriveCmds = letter: { source, target }: [
+      "net use ${letter}: '\\\\192.168.0.2\\${source}' /persistent:yes"
+      "mkdir -p '${target}'"
+      "mount -o bind '/cygdrive/${letter}' '${target}'"
+      "echo '/cygdrive/${letter} ${target} none bind 0 0' >> /etc/fstab"
     ];
+  in runInVM "winvm.img" {
+    command = lib.concatStringsSep " && " ([
+      "net config server /autodisconnect:-1"
+    ] ++ lib.concatLists (lib.mapAttrsToList genDriveCmds drives));
     suspendTo = "state.gz";
   };
 
-- 
GitLab


From dd8b0fcf527fa33e5dfe71b589ccb1044412bfad Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 16 Feb 2014 22:34:45 +0100
Subject: [PATCH 1605/3789] vm/windows: Save envirenoment before running VM.

Later, when we start the actual builder, we're going to restore those
environment variables. We're using "(set; declare -p)", here, because
the former is just printing _all_ environment variables, even those not
supported, and the latter only lists specifically declared variables,
which also encludes exports.

The "declare -p" command also emits those variables in a format similar
to the "export" command.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/controller/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix
index fd6ad6354aa..4a3e88a22c6 100644
--- a/pkgs/build-support/vm/windows/controller/default.nix
+++ b/pkgs/build-support/vm/windows/controller/default.nix
@@ -172,7 +172,9 @@ let
   });
 
   preVM = ''
+    (set; declare -p) > saved-env
     XCHG_DIR="$(${coreutils}/bin/mktemp -d nix-vm.XXXXXXXXXX --tmpdir)"
+    ${coreutils}/bin/mv saved-env "$XCHG_DIR/"
     QEMU_VDE_SOCKET="$(pwd)/vde.ctl"
     MONITOR_SOCKET="$(pwd)/monitor"
     ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" &
-- 
GitLab


From b01c9624cf0c77837e1928a49778f74446ddfaa0 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 16 Feb 2014 22:42:10 +0100
Subject: [PATCH 1606/3789] vm/windows: Add new runInWindowsVM function.

This function is quite similar to runInLinuxVM, but also ensures that
the builder is run decoupled of the Nix store and using the userland
inside the VM.

We're now picking up the environment variables saved in the previous
commit.

The reason we suppress all errors from the source operation is that it
would emit a ton of errors because we're trying to set read-only
variables.

Also, detecting whether the origBuilder is using the default builder
from the stdenv is currently a bit of a workaround until we have a
specialized pseudo-cross-stdenv someday in the future[TM].

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/default.nix | 40 +++++++++++++++++++----
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index 8ca31bc39d7..9d870633ff1 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -60,11 +60,39 @@ let
     inherit command;
   };
 
-  runFromSuspended = command: stdenv.mkDerivation {
-    name = "cygwin-vm-run";
-    buildCommand = ''
-      ${resumeAndRun command}
+  builder = ''
+    source /tmp/xchg/saved-env 2> /dev/null || true
+    export NIX_STORE=/nix/store
+    export NIX_BUILD_TOP=/tmp
+    export TMPDIR=/tmp
+    export PATH=/empty
+    cd "$NIX_BUILD_TOP"
+    exec $origBuilder $origArgs
+  '';
+
+in {
+  runInWindowsVM = drv: let
+    newDrv = drv.override {
+      stdenv = drv.stdenv.override {
+        shell = "/bin/sh";
+      };
+    };
+  in lib.overrideDerivation drv (attrs: {
+    requiredSystemFeatures = [ "kvm" ];
+    buildur = "${stdenv.shell}";
+    args = ["-e" (resumeAndRun builder)];
+    origArgs = attrs.args;
+    origBuilder = if attrs.builder == attrs.stdenv.shell
+                  then "/bin/sh"
+                  else attrs.builder;
+
+    postHook = ''
+      PATH=/usr/bin:/bin:/usr/sbin:/sbin
+      SHELL=/bin/sh
+      eval "$origPostHook"
     '';
-  };
 
-in runFromSuspended "uname -a"
+    origPostHook = attrs.postHook or "";
+    fixupPhase = ":";
+  });
+}
-- 
GitLab


From e40f41e50562873fcdb78bec891a8f19141d4b42 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 17 Feb 2014 00:34:19 +0100
Subject: [PATCH 1607/3789] vm/windows: Collect exit code from xchg.

This is the last item that was missing to get a fully working
runInWindowsVM function. Apart from checking exit codes, we also now
have preVM/postVM hooks which we can use to write arbitrary constructs
around this architecture, without the need to worry about specific
details.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../vm/windows/controller/default.nix         | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix
index 4a3e88a22c6..621729eaabb 100644
--- a/pkgs/build-support/vm/windows/controller/default.nix
+++ b/pkgs/build-support/vm/windows/controller/default.nix
@@ -128,12 +128,10 @@ let
       -i /ssh.key \
       -l Administrator \
       192.168.0.1 -- ${shellEscape command}
-
-    ${lib.optionalString (suspendTo != null) ''
+  '') + lib.optionalString (suspendTo != null) ''
     ${coreutils}/bin/touch /xchg/suspend_now
     ${loopForever}
-    ''}
-  ''));
+  '');
 
   kernelAppend = lib.concatStringsSep " " [
     "panic=1"
@@ -175,6 +173,9 @@ let
     (set; declare -p) > saved-env
     XCHG_DIR="$(${coreutils}/bin/mktemp -d nix-vm.XXXXXXXXXX --tmpdir)"
     ${coreutils}/bin/mv saved-env "$XCHG_DIR/"
+
+    eval "$preVM"
+
     QEMU_VDE_SOCKET="$(pwd)/vde.ctl"
     MONITOR_SOCKET="$(pwd)/monitor"
     ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" &
@@ -190,7 +191,9 @@ let
   '' else ''
     ${vmTools.qemuProg} ${cygwinQemuArgs} &
     ${vmTools.qemuProg} ${controllerQemuArgs}${bgBoth}
-  '' + lib.optionalString (suspendTo != null) ''
+  '';
+
+  postVM = if suspendTo != null then ''
     while ! test -e "$XCHG_DIR/suspend_now"; do sleep 1; done
     ${socat}/bin/socat - UNIX-CONNECT:$MONITOR_SOCKET <<CMD
     stop
@@ -199,10 +202,25 @@ let
     quit
     CMD
     wait %-
+
+    eval "$postVM"
+    exit 0
+  '' else if installMode then ''
+    eval "$postVM"
+    exit 0
+  '' else ''
+    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")
   '';
 
 in writeScript "run-cygwin-vm.sh" ''
   #!${stdenv.shell} -e
   ${preVM}
   ${vmExec}
+  ${postVM}
 ''
-- 
GitLab


From d8e66722a3c5e1fceb36ef956062efdbf5f55d20 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 17 Feb 2014 02:10:00 +0100
Subject: [PATCH 1608/3789] vm/windows: Factor out bootstrapping process.

This now isolates the vmTools integration from the bootstrap process and
thus removes our fixed Windows ISO and product key. The latter can now
be provided by an attribute "windowsImage" to runInWindowsVM.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/bootstrap.nix | 61 ++++++++++++++++++
 pkgs/build-support/vm/windows/default.nix   | 68 ++-------------------
 2 files changed, 67 insertions(+), 62 deletions(-)
 create mode 100644 pkgs/build-support/vm/windows/bootstrap.nix

diff --git a/pkgs/build-support/vm/windows/bootstrap.nix b/pkgs/build-support/vm/windows/bootstrap.nix
new file mode 100644
index 00000000000..26aa6c7a686
--- /dev/null
+++ b/pkgs/build-support/vm/windows/bootstrap.nix
@@ -0,0 +1,61 @@
+{ isoFile, productKey }:
+
+let
+  inherit (import <nixpkgs> {}) lib stdenv qemu;
+in rec {
+  installedVM = import ./install {
+    inherit isoFile productKey;
+  };
+
+  runInVM = img: attrs: import ./controller (attrs // {
+    inherit (installedVM) sshKey;
+    qemuArgs = attrs.qemuArgs or [] ++ [
+      "-boot order=c"
+      "-drive file=${img},index=0,media=disk"
+    ];
+  });
+
+  runAndSuspend = let
+    drives = {
+      s = {
+        source = "nixstore";
+        target = "/nix/store";
+      };
+      x = {
+        source = "xchg";
+        target = "/tmp/xchg";
+      };
+    };
+
+    genDriveCmds = letter: { source, target }: [
+      "net use ${letter}: '\\\\192.168.0.2\\${source}' /persistent:yes"
+      "mkdir -p '${target}'"
+      "mount -o bind '/cygdrive/${letter}' '${target}'"
+      "echo '/cygdrive/${letter} ${target} none bind 0 0' >> /etc/fstab"
+    ];
+  in runInVM "winvm.img" {
+    command = lib.concatStringsSep " && " ([
+      "net config server /autodisconnect:-1"
+    ] ++ lib.concatLists (lib.mapAttrsToList genDriveCmds drives));
+    suspendTo = "state.gz";
+  };
+
+  suspendedVM = stdenv.mkDerivation {
+    name = "cygwin-suspended-vm";
+    buildCommand = ''
+      ${qemu}/bin/qemu-img create \
+        -b "${installedVM}/disk.img" \
+        -f qcow2 winvm.img
+      ${runAndSuspend}
+      ensureDir "$out"
+      cp winvm.img "$out/disk.img"
+      cp state.gz "$out/state.gz"
+    '';
+  };
+
+  resumeAndRun = command: runInVM "${suspendedVM}/disk.img" {
+    resumeFrom = "${suspendedVM}/state.gz";
+    qemuArgs = lib.singleton "-snapshot";
+    inherit command;
+  };
+}
diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index 9d870633ff1..8e8809f370f 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -1,64 +1,5 @@
 let
-  inherit (import <nixpkgs> {}) lib stdenv requireFile writeText qemu;
-
-  winISO = /path/to/iso/XXX;
-
-  installedVM = import ./install {
-    isoFile = winISO;
-    productKey = "XXX";
-  };
-
-  runInVM = img: attrs: import ./controller (attrs // {
-    inherit (installedVM) sshKey;
-    qemuArgs = attrs.qemuArgs or [] ++ [
-      "-boot order=c"
-      "-drive file=${img},index=0,media=disk"
-    ];
-  });
-
-  runAndSuspend = let
-    drives = {
-      s = {
-        source = "nixstore";
-        target = "/nix/store";
-      };
-      x = {
-        source = "xchg";
-        target = "/tmp/xchg";
-      };
-    };
-
-    genDriveCmds = letter: { source, target }: [
-      "net use ${letter}: '\\\\192.168.0.2\\${source}' /persistent:yes"
-      "mkdir -p '${target}'"
-      "mount -o bind '/cygdrive/${letter}' '${target}'"
-      "echo '/cygdrive/${letter} ${target} none bind 0 0' >> /etc/fstab"
-    ];
-  in runInVM "winvm.img" {
-    command = lib.concatStringsSep " && " ([
-      "net config server /autodisconnect:-1"
-    ] ++ lib.concatLists (lib.mapAttrsToList genDriveCmds drives));
-    suspendTo = "state.gz";
-  };
-
-  suspendedVM = stdenv.mkDerivation {
-    name = "cygwin-suspended-vm";
-    buildCommand = ''
-      ${qemu}/bin/qemu-img create \
-        -b "${installedVM}/disk.img" \
-        -f qcow2 winvm.img
-      ${runAndSuspend}
-      ensureDir "$out"
-      cp winvm.img "$out/disk.img"
-      cp state.gz "$out/state.gz"
-    '';
-  };
-
-  resumeAndRun = command: runInVM "${suspendedVM}/disk.img" {
-    resumeFrom = "${suspendedVM}/state.gz";
-    qemuArgs = lib.singleton "-snapshot";
-    inherit command;
-  };
+  inherit (import <nixpkgs> {}) lib stdenv;
 
   builder = ''
     source /tmp/xchg/saved-env 2> /dev/null || true
@@ -77,10 +18,13 @@ in {
         shell = "/bin/sh";
       };
     };
-  in lib.overrideDerivation drv (attrs: {
+  in lib.overrideDerivation drv (attrs: let
+    bootstrap = import ./bootstrap.nix attrs.windowsImage;
+  in {
     requiredSystemFeatures = [ "kvm" ];
     buildur = "${stdenv.shell}";
-    args = ["-e" (resumeAndRun builder)];
+    args = ["-e" (bootstrap.resumeAndRun builder)];
+    windowsImage = bootstrap.suspendedVM;
     origArgs = attrs.args;
     origBuilder = if attrs.builder == attrs.stdenv.shell
                   then "/bin/sh"
-- 
GitLab


From 623f1940c0a9f8fcc150fb9c72ee08496025605a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 26 Feb 2014 05:43:34 +0100
Subject: [PATCH 1609/3789] vm/windows: Make list of dependencies explicit.

So far, the VMs have always been using the native architecture, because
it was reimporting <nixpkgs> several times. Now, we propagate a list of
packages down to all sub-imports, which not only makes clearer which
dependencies a part actually has, but also will make it easier in case
we want to refactor those parts to use callPackage.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/bootstrap.nix   | 31 +++++++++++++++----
 .../vm/windows/controller/default.nix         | 31 ++++++++++---------
 .../vm/windows/cygwin-iso/default.nix         |  4 +--
 pkgs/build-support/vm/windows/default.nix     | 14 ++++++---
 .../vm/windows/install/default.nix            | 18 +++++++----
 .../vm/windows/install/unattended-image.nix   |  8 ++---
 6 files changed, 70 insertions(+), 36 deletions(-)

diff --git a/pkgs/build-support/vm/windows/bootstrap.nix b/pkgs/build-support/vm/windows/bootstrap.nix
index 26aa6c7a686..b2febf19a89 100644
--- a/pkgs/build-support/vm/windows/bootstrap.nix
+++ b/pkgs/build-support/vm/windows/bootstrap.nix
@@ -1,13 +1,32 @@
+{ stdenv, fetchurl, vmTools, writeScript, writeText, runCommand, makeInitrd
+, python, perl, coreutils, dosfstools, gzip, mtools, netcat, openssh, qemu
+, samba, socat, vde2, cdrkit, pathsFromGraph
+}:
+
 { isoFile, productKey }:
 
+with stdenv.lib;
+
 let
-  inherit (import <nixpkgs> {}) lib stdenv qemu;
+  controller = import ./controller {
+    inherit stdenv writeScript vmTools makeInitrd;
+    inherit samba vde2 openssh socat netcat coreutils gzip;
+  };
+
+  mkCygwinImage = import ./cygwin-iso {
+    inherit stdenv fetchurl runCommand python perl cdrkit pathsFromGraph;
+  };
+
+  installer = import ./install {
+    inherit controller mkCygwinImage;
+    inherit stdenv runCommand openssh qemu writeText dosfstools mtools;
+  };
 in rec {
-  installedVM = import ./install {
+  installedVM = installer {
     inherit isoFile productKey;
   };
 
-  runInVM = img: attrs: import ./controller (attrs // {
+  runInVM = img: attrs: controller (attrs // {
     inherit (installedVM) sshKey;
     qemuArgs = attrs.qemuArgs or [] ++ [
       "-boot order=c"
@@ -34,9 +53,9 @@ in rec {
       "echo '/cygdrive/${letter} ${target} none bind 0 0' >> /etc/fstab"
     ];
   in runInVM "winvm.img" {
-    command = lib.concatStringsSep " && " ([
+    command = concatStringsSep " && " ([
       "net config server /autodisconnect:-1"
-    ] ++ lib.concatLists (lib.mapAttrsToList genDriveCmds drives));
+    ] ++ concatLists (mapAttrsToList genDriveCmds drives));
     suspendTo = "state.gz";
   };
 
@@ -55,7 +74,7 @@ in rec {
 
   resumeAndRun = command: runInVM "${suspendedVM}/disk.img" {
     resumeFrom = "${suspendedVM}/state.gz";
-    qemuArgs = lib.singleton "-snapshot";
+    qemuArgs = singleton "-snapshot";
     inherit command;
   };
 }
diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix
index 621729eaabb..fe4b5b7f6c2 100644
--- a/pkgs/build-support/vm/windows/controller/default.nix
+++ b/pkgs/build-support/vm/windows/controller/default.nix
@@ -1,3 +1,7 @@
+{ stdenv, writeScript, vmTools, makeInitrd
+, samba, vde2, openssh, socat, netcat, coreutils, gzip
+}:
+
 { sshKey
 , qemuArgs ? []
 , command ? "sync"
@@ -6,10 +10,9 @@
 , installMode ? false
 }:
 
-let
-  inherit (import <nixpkgs> {}) lib stdenv writeScript vmTools makeInitrd;
-  inherit (import <nixpkgs> {}) samba vde2 openssh socat netcat coreutils gzip;
+with stdenv.lib;
 
+let
   preInitScript = writeScript "preinit.sh" ''
     #!${vmTools.initrdUtils}/bin/ash -e
     export PATH=${vmTools.initrdUtils}/bin
@@ -62,13 +65,13 @@ let
   '';
 
   initrd = makeInitrd {
-    contents = lib.singleton {
+    contents = singleton {
       object = preInitScript;
       symlink = "/init";
     };
   };
 
-  shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'";
+  shellEscape = x: "'${replaceChars ["'"] [("'\\'" + "'")] x}'";
 
   loopForever = "while :; do ${coreutils}/bin/sleep 1; done";
 
@@ -128,12 +131,12 @@ let
       -i /ssh.key \
       -l Administrator \
       192.168.0.1 -- ${shellEscape command}
-  '') + lib.optionalString (suspendTo != null) ''
+  '') + optionalString (suspendTo != null) ''
     ${coreutils}/bin/touch /xchg/suspend_now
     ${loopForever}
   '');
 
-  kernelAppend = lib.concatStringsSep " " [
+  kernelAppend = concatStringsSep " " [
     "panic=1"
     "loglevel=4"
     "console=tty1"
@@ -141,7 +144,7 @@ let
     "command=${initScript}"
   ];
 
-  controllerQemuArgs = lib.concatStringsSep " " (maybeKvm64 ++ [
+  controllerQemuArgs = concatStringsSep " " (maybeKvm64 ++ [
     "-nographic"
     "-no-reboot"
     "-virtfs local,path=/nix/store,security_model=none,mount_tag=store"
@@ -153,20 +156,20 @@ let
     "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET"
   ]);
 
-  maybeKvm64 = lib.optional (stdenv.system == "x86_64-linux") "-cpu kvm64";
+  maybeKvm64 = optional (stdenv.system == "x86_64-linux") "-cpu kvm64";
 
-  cygwinQemuArgs = lib.concatStringsSep " " (maybeKvm64 ++ [
+  cygwinQemuArgs = concatStringsSep " " (maybeKvm64 ++ [
     "-monitor unix:$MONITOR_SOCKET,server,nowait"
     "-nographic"
     "-net nic,vlan=0,macaddr=52:54:00:12:01:01"
     "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET"
     "-rtc base=2010-01-01,clock=vm"
-  ] ++ qemuArgs ++ lib.optionals (resumeFrom != null) [
+  ] ++ qemuArgs ++ optionals (resumeFrom != null) [
     "-incoming 'exec: ${gzip}/bin/gzip -c -d \"${resumeFrom}\"'"
   ]);
 
-  modulesClosure = lib.overrideDerivation vmTools.modulesClosure (o: {
-    rootModules = o.rootModules ++ lib.singleton "virtio_net";
+  modulesClosure = overrideDerivation vmTools.modulesClosure (o: {
+    rootModules = o.rootModules ++ singleton "virtio_net";
   });
 
   preVM = ''
@@ -183,7 +186,7 @@ let
       UNIX-CONNECT:$QEMU_VDE_SOCKET/ctl,retry=20
   '';
 
-  bgBoth = lib.optionalString (suspendTo != null) " &";
+  bgBoth = optionalString (suspendTo != null) " &";
 
   vmExec = if installMode then ''
     ${vmTools.qemuProg} ${controllerQemuArgs} &
diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
index 17e4cff855b..c7b1cc8bbcb 100644
--- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix
+++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
@@ -1,11 +1,11 @@
+{ stdenv, fetchurl, runCommand, python, perl, cdrkit, pathsFromGraph }:
+
 { packages ? []
 , mirror ? "http://ftp.gwdg.de/pub/linux/sources.redhat.com/cygwin"
 , extraContents ? []
 }:
 
 let
-  inherit (import <nixpkgs> {}) fetchurl runCommand python;
-
   cygPkgList = fetchurl {
     url = "${mirror}/x86_64/setup.ini";
     sha256 = "19vfm7zr8kcp1algmggk8vsilkccycx22mdf0ynfl6lcmp6dkfsz";
diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index 8e8809f370f..758120ed4f2 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -1,5 +1,11 @@
+pkgs:
+
 let
-  inherit (import <nixpkgs> {}) lib stdenv;
+  bootstrapper = import ./bootstrap.nix {
+    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;
+  };
 
   builder = ''
     source /tmp/xchg/saved-env 2> /dev/null || true
@@ -18,11 +24,11 @@ in {
         shell = "/bin/sh";
       };
     };
-  in lib.overrideDerivation drv (attrs: let
-    bootstrap = import ./bootstrap.nix attrs.windowsImage;
+  in pkgs.lib.overrideDerivation drv (attrs: let
+    bootstrap = bootstrapper attrs.windowsImage;
   in {
     requiredSystemFeatures = [ "kvm" ];
-    buildur = "${stdenv.shell}";
+    buildur = "${pkgs.stdenv.shell}";
     args = ["-e" (bootstrap.resumeAndRun builder)];
     windowsImage = bootstrap.suspendedVM;
     origArgs = attrs.args;
diff --git a/pkgs/build-support/vm/windows/install/default.nix b/pkgs/build-support/vm/windows/install/default.nix
index 64177ea1713..10690bf6b28 100644
--- a/pkgs/build-support/vm/windows/install/default.nix
+++ b/pkgs/build-support/vm/windows/install/default.nix
@@ -1,10 +1,12 @@
+{ stdenv, runCommand, openssh, qemu, controller, mkCygwinImage
+, writeText, dosfstools, mtools
+}:
+
 { isoFile
 , productKey
 }:
 
 let
-  inherit (import <nixpkgs> {}) lib stdenv runCommand openssh qemu;
-
   bootstrapAfterLogin = runCommand "bootstrap.sh" {} ''
     cat > "$out" <<EOF
     mkdir -p ~/.ssh
@@ -29,20 +31,24 @@ let
 
   packages = [ "openssh" "shutdown" ];
 
-  instfloppy = import ./unattended-image.nix {
+  floppyCreator = import ./unattended-image.nix {
+    inherit stdenv writeText dosfstools mtools;
+  };
+
+  instfloppy = floppyCreator {
     cygwinPackages = packages;
     inherit productKey;
   };
 
-  cygiso = import ../cygwin-iso {
+  cygiso = mkCygwinImage {
     inherit packages;
-    extraContents = lib.singleton {
+    extraContents = stdenv.lib.singleton {
       source = bootstrapAfterLogin;
       target = "bootstrap.sh";
     };
   };
 
-  installController = import ../controller {
+  installController = controller {
     inherit sshKey;
     installMode = true;
     qemuArgs = [
diff --git a/pkgs/build-support/vm/windows/install/unattended-image.nix b/pkgs/build-support/vm/windows/install/unattended-image.nix
index 27736d08f4f..5b1ff84cf44 100644
--- a/pkgs/build-support/vm/windows/install/unattended-image.nix
+++ b/pkgs/build-support/vm/windows/install/unattended-image.nix
@@ -1,3 +1,5 @@
+{ stdenv, writeText, dosfstools, mtools }:
+
 { productKey
 , shExecAfterwards ? "E:\\bootstrap.sh"
 , cygwinRoot ? "C:\\cygwin"
@@ -7,8 +9,6 @@
 }:
 
 let
-  inherit (import <nixpkgs> {}) lib stdenv writeText dosfstools mtools;
-
   afterSetup = [
     cygwinSetup
     "-L -n -q"
@@ -80,7 +80,7 @@ let
 
     ; Turn off all components
     [Components]
-    ${lib.concatMapStrings (comp: "${comp} = Off\n") [
+    ${stdenv.lib.concatMapStrings (comp: "${comp} = Off\n") [
       "AccessOpt" "Appsrv_console" "Aspnet" "BitsServerExtensionsISAPI"
       "BitsServerExtensionsManager" "Calc" "Certsrv" "Certsrv_client"
       "Certsrv_server" "Charmap" "Chat" "Clipbook" "Cluster" "Complusnetwork"
@@ -107,7 +107,7 @@ let
     Mode = 0
 
     [SetupParams]
-    UserExecute = "${lib.concatStringsSep " " afterSetup}"
+    UserExecute = "${stdenv.lib.concatStringsSep " " afterSetup}"
 
     [GuiRunOnce]
     Command0 = "${cygwinRoot}\bin\bash -l ${shExecAfterwards}"
-- 
GitLab


From 895a683d399afca1b6e7ab8e02b9508dd81b281b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 26 Feb 2014 06:19:05 +0100
Subject: [PATCH 1610/3789] vm/windows: Add setup.ini for 32bit architecture.

Also update 64bit setup.ini and check whether we have a 64 bit stdenv in
order to choose the proper Cygwin version. Otherwise we now have the
setup.ini for 32bit available as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/cygwin-iso/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
index c7b1cc8bbcb..a806ea9571f 100644
--- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix
+++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
@@ -6,9 +6,12 @@
 }:
 
 let
-  cygPkgList = fetchurl {
+  cygPkgList = if stdenv.is64bit then fetchurl {
     url = "${mirror}/x86_64/setup.ini";
-    sha256 = "19vfm7zr8kcp1algmggk8vsilkccycx22mdf0ynfl6lcmp6dkfsz";
+    sha256 = "142f8zyfwgi6s2djxv3z5wn0ysl94pxwa79z8rjfqz4kvnpgz120";
+  } else fetchurl {
+    url = "${mirror}/x86/setup.ini";
+    sha256 = "1v596lln2iip5h7wxjnig5rflzvqa21zzd2iyhx07zs28q5h76i9";
   };
 
   makeCygwinClosure = { packages, packageList }: let
-- 
GitLab


From 88ea17284eea19315137638c8fe0c720ea5e3ad9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 26 Feb 2014 06:21:48 +0100
Subject: [PATCH 1611/3789] vmTools: Hook in runInWindowsVM function.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index c6b774fc06c..3dcb8aa1705 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1714,5 +1714,4 @@ rec {
       };
 
     };
-
-}
+} // import ./windows pkgs
-- 
GitLab


From 2294553cb1c458d9cde5d9ae4baae886f4d07c93 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Tue, 25 Feb 2014 21:33:51 -0800
Subject: [PATCH 1612/3789] apt-offline: offline APT package manager

---
 lib/maintainers.nix                     |  1 +
 pkgs/tools/misc/apt-offline/default.nix | 27 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/misc/apt-offline/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fa0d1d81e61..a781dcdc419 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -25,6 +25,7 @@
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
   ertes = "Ertugrul Söylemez <es@ertes.de>";
+  falsifian = "James Cook <james.cook@utoronto.ca>";
   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/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix
new file mode 100644
index 00000000000..bac0b94555b
--- /dev/null
+++ b/pkgs/tools/misc/apt-offline/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, bash, buildPythonPackage }:
+
+buildPythonPackage rec {
+  version = "1.3";
+  name = "apt-offline-${version}";
+
+  src = fetchurl {
+    #url = "https://alioth.debian.org/frs/download.php/file/3855/${name}.tar.gz";
+    # The above URL has two problems: it requires one to be logged in, and it
+    # uses a CA that curl doesn't know about.  Instead, we use this mirror:
+    url = "http://www.falsifian.org/a/cFi5/${name}.tar.gz";
+    sha256 = "1sp7ai2abzhbg9y84700qziybphvpzl2nk3mz1d1asivzyjvxlxy";
+  };
+
+  buildInputs = [ ];
+
+  doCheck = false;
+
+  # Requires python-qt4 (feel free to get it working).
+  preFixup = ''rm "$out/bin/apt-offline-gui"'';
+
+  meta = with stdenv.lib; {
+    description = "offline APT package manager";
+    license = licences.gpl3;
+    maintainers = [ maintainers.falsifian ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2302c5bb700..d0e7a44fbb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -430,6 +430,8 @@ let
 
   analog = callPackage ../tools/admin/analog {};
 
+  apt-offline = callPackage ../tools/misc/apt-offline { };
+
   archivemount = callPackage ../tools/filesystems/archivemount { };
 
   arandr = callPackage ../tools/X11/arandr { };
-- 
GitLab


From a03f23440c0605fc6c1bd131b175499c0476eaa6 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Tue, 25 Feb 2014 21:48:36 -0800
Subject: [PATCH 1613/3789] apt-offline: fixed typo

---
 pkgs/tools/misc/apt-offline/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix
index bac0b94555b..7c1c65af6c3 100644
--- a/pkgs/tools/misc/apt-offline/default.nix
+++ b/pkgs/tools/misc/apt-offline/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "offline APT package manager";
-    license = licences.gpl3;
+    license = licenses.gpl3;
     maintainers = [ maintainers.falsifian ];
   };
 }
-- 
GitLab


From 78e7d5db0014b9ee4d60e4c0ee3fb8e1e08b0949 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 26 Feb 2014 09:35:28 +0100
Subject: [PATCH 1614/3789] calibre: upgrade from 1.23.0 to 1.25.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index c2672393bc5..f3d7c26fe5c 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-1.23.0";
+  name = "calibre-1.25.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "1sm6v53c12nkqnpv7n4g1mzkwmzbn74a8v83bzvvjiz0i9c7cl59";
+    sha256 = "1y221r5vgq426ldqjrx3qvgf3j3v2wncwzra747psvhwf95zd5fd";
   };
 
   inherit python;
-- 
GitLab


From 2fd60ee9484fbbb412f80672367199409d58147c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 26 Feb 2014 06:07:22 -0500
Subject: [PATCH 1615/3789] Add graph-wrapper haskell package

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

diff --git a/pkgs/development/libraries/haskell/graph-wrapper/default.nix b/pkgs/development/libraries/haskell/graph-wrapper/default.nix
new file mode 100644
index 00000000000..86d25c24fda
--- /dev/null
+++ b/pkgs/development/libraries/haskell/graph-wrapper/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "graph-wrapper";
+  version = "0.2.4.2";
+  sha256 = "0cf70xvmzn4w5pg1bxizajqgcbjwwk6jrd7hnb3kfqy1v3apifyf";
+  meta = {
+    homepage = "http://www.github.com/batterseapower/graph-wrapper";
+    description = "A wrapper around the standard Data.Graph with a less awkward interface";
+    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 227e6be1eb2..88ebf6f5ae1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1237,6 +1237,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   graphviz = callPackage ../development/libraries/haskell/graphviz {};
 
+  graphWrapper = callPackage ../development/libraries/haskell/graph-wrapper {};
+
   groups = callPackage ../development/libraries/haskell/groups {};
 
   groupoids = callPackage ../development/libraries/haskell/groupoids {};
-- 
GitLab


From 687fe455824fea27fd019fb907e7eab993daf430 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Wed, 26 Feb 2014 19:18:29 +0800
Subject: [PATCH 1616/3789] renpy: update to 6.17.1

---
 pkgs/development/interpreters/renpy/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 60884fce69d..4cd719842b6 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, python, pkgconfig, wrapPython
+{ stdenv, fetchurl, python, cython, pkgconfig, wrapPython
 , pygame, SDL, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib
 }:
 
 stdenv.mkDerivation {
-  name = "renpy-6.16.3";
+  name = "renpy-6.17.1";
 
   meta = {
     description = "Ren'Py Visual Novel Engine";
@@ -14,12 +14,12 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = "http://www.renpy.org/dl/6.16.3/renpy-6.16.3-source.tar.bz2";
-    sha256 = "0yd7wj85kp0hlaqlrhl40irhkmcng89vcxypyx40pqmk87gjagqn";
+    url = "http://www.renpy.org/dl/6.17.1/renpy-6.17.1-source.tar.bz2";
+    sha256 = "024v05yifs6c13chpg0azjpi6xk1srrhd1d0hcs946xbjvbbadpc";
   };
 
   buildInputs = [
-    python pkgconfig wrapPython
+    python cython pkgconfig wrapPython
     SDL libpng ffmpeg freetype glew mesa fribidi zlib pygame
   ];
 
-- 
GitLab


From 77a49e5813351bcfb6541a1ff4be62cbe70e590a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Feb 2014 12:39:46 +0100
Subject: [PATCH 1617/3789] valgrind: Support Glibc 2.19

---
 .../tools/analysis/valgrind/default.nix       |  4 +-
 .../tools/analysis/valgrind/glibc-2.19.patch  | 39 +++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/analysis/valgrind/glibc-2.19.patch

diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 97565bec98e..a6ea2c2f59d 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1w6n5qvxy2ssbczcl1c2yd2ggjn3ipay2hvpn10laly2dfh73bz6";
   };
 
+  patches = [ ./glibc-2.19.patch ];
+
   # Perl is needed for `cg_annotate'.
   # GDB is needed to provide a sane default for `--db-command'.
   nativeBuildInputs = [ perl ];
@@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  patchPhase =
+  postPatch =
     # Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666).
     ''
       echo "getting rid of the \`-arch' GCC option..."
diff --git a/pkgs/development/tools/analysis/valgrind/glibc-2.19.patch b/pkgs/development/tools/analysis/valgrind/glibc-2.19.patch
new file mode 100644
index 00000000000..137b0a325b0
--- /dev/null
+++ b/pkgs/development/tools/analysis/valgrind/glibc-2.19.patch
@@ -0,0 +1,39 @@
+https://projects.archlinux.org/svntogit/packages.git/plain/trunk/valgrind-3.9.0-glibc-2.19.patch?h=packages/valgrind
+
+diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure
+--- valgrind-3.9.0-orig/configure	2013-11-01 09:33:32.000000000 +1000
++++ valgrind-3.9.0/configure	2014-02-08 09:28:06.063248544 +1000
+@@ -6689,6 +6689,16 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.19)
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5
++$as_echo "2.19 family" >&6; }
++
++$as_echo "#define GLIBC_2_19 1" >>confdefs.h
++
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      darwin)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+ $as_echo "Darwin" >&6; }
+diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac
+--- valgrind-3.9.0-orig/configure.ac	2013-11-01 09:28:16.000000000 +1000
++++ valgrind-3.9.0/configure.ac	2014-02-08 09:27:38.870385366 +1000
+@@ -918,6 +918,13 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.19)
++	AC_MSG_RESULT(2.19 family)
++	AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x])
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      darwin)
+ 	AC_MSG_RESULT(Darwin)
+ 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
-- 
GitLab


From 1ce6fff4e21906a3e6cfd26fdf4372f7501541cd Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 26 Feb 2014 07:54:04 -0500
Subject: [PATCH 1618/3789] Merge mysql55 module into mysql

This also removes the default for services.mysql.package, as this should
not generally be updated automatically if we change the mysql attribute
---
 nixos/modules/rename.nix                     |   2 +
 nixos/modules/services/databases/mysql.nix   |  21 +-
 nixos/modules/services/databases/mysql55.nix | 248 -------------------
 pkgs/servers/sql/mariadb/default.nix         |   2 +
 pkgs/servers/sql/mysql/5.1.x.nix             |   2 +
 pkgs/servers/sql/mysql/5.5.x.nix             |   2 +
 6 files changed, 26 insertions(+), 251 deletions(-)
 delete mode 100644 nixos/modules/services/databases/mysql55.nix

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 8393b5758f3..f41bababd29 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -124,6 +124,8 @@ in zipModules ([]
 ++ obsolete [ "services" "mesa" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ]
 ++ obsolete [ "services" "mesa" "videoDrivers" ] [ "hardware" "opengl" "videoDrivers" ]
 
+++ obsolete [ "services" "mysql55" ] [ "services" "mysql" ]
+
 # Options that are obsolete and have no replacement.
 ++ obsolete' [ "boot" "loader" "grub" "bootDevice" ]
 ++ obsolete' [ "boot" "initrd" "luks" "enable" ]
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 8be05a27cdc..62fbc2a1415 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -8,6 +8,10 @@ let
 
   mysql = cfg.package;
 
+  is55 = mysql.mysqlVersion == "5.5";
+
+  mysqldDir = if is55 then "${mysql}/bin" else "${mysql}/libexec";
+
   pidFile = "${cfg.pidDir}/mysqld.pid";
 
   mysqldOptions =
@@ -19,7 +23,7 @@ let
     [mysqld]
     ${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")
+    ${optionalString (cfg.replication.role == "slave" && !is55)
     ''
       master-host = ${cfg.replication.masterHost}
       master-user = ${cfg.replication.masterUser}
@@ -47,7 +51,8 @@ in
       };
 
       package = mkOption {
-        default = pkgs.mysql;
+        type = types.package;
+        example = literalExample "pkgs.mysql";
         description = "
           Which MySQL derivation to use.
         ";
@@ -176,7 +181,7 @@ in
             chown -R ${cfg.user} ${cfg.pidDir}
           '';
 
-        serviceConfig.ExecStart = "${mysql}/libexec/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
+        serviceConfig.ExecStart = "${mysqldDir}/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
 
         postStart =
           ''
@@ -216,6 +221,16 @@ in
                     fi
                   '') cfg.initialDatabases}
 
+                ${optionalString (cfg.replication.role == "slave" && is55)
+                  ''
+                    # Set up the replication master
+
+                    ( echo "stop slave;"
+                      echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';"
+                      echo "start slave;"
+                    ) | ${mysql}/bin/mysql -u root -N
+                  ''}
+
                 ${optionalString (cfg.initialScript != null)
                   ''
                     # Execute initial script
diff --git a/nixos/modules/services/databases/mysql55.nix b/nixos/modules/services/databases/mysql55.nix
deleted file mode 100644
index fe8b29e3c6b..00000000000
--- a/nixos/modules/services/databases/mysql55.nix
+++ /dev/null
@@ -1,248 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-
-  cfg = config.services.mysql55;
-
-  mysql = cfg.package;
-
-  pidFile = "${cfg.pidDir}/mysqld.pid";
-
-  mysqldOptions =
-    "--user=${cfg.user} --datadir=${cfg.dataDir} " +
-    "--pid-file=${pidFile}";
-
-  myCnf = pkgs.writeText "my.cnf"
-  ''
-    [mysqld]
-    ${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}"}
-    ${cfg.extraOptions}
-  '';
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.mysql55 = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable the MySQL server.
-        ";
-      };
-
-      package = mkOption {
-        default = pkgs.mysql55;
-        description = "
-          Which MySQL derivation to use.
-        ";
-      };
-
-      port = mkOption {
-        default = "3306";
-        description = "Port of MySQL";
-      };
-
-      user = mkOption {
-        default = "mysql";
-        description = "User account under which MySQL runs";
-      };
-
-      dataDir = mkOption {
-        default = "/var/mysql"; # !!! should be /var/db/mysql
-        description = "Location where MySQL stores its table files";
-      };
-
-      pidDir = mkOption {
-        default = "/var/run/mysql";
-        description = "Location of the file which stores the PID of the MySQL server";
-      };
-
-      extraOptions = mkOption {
-        default = "";
-        example = ''
-          key_buffer_size = 6G
-          table_cache = 1600
-          log-error = /var/log/mysql_err.log
-        '';
-        description = ''
-          Provide extra options to the MySQL configuration file.
-
-          Please note, that these options are added to the
-          <literal>[mysqld]</literal> section so you don't need to explicitly
-          state it again.
-        '';
-      };
-
-      initialDatabases = mkOption {
-        default = [];
-        description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL";
-        example = [
-          { name = "foodatabase"; schema = literalExample "./foodatabase.sql"; }
-          { name = "bardatabase"; schema = literalExample "./bardatabase.sql"; }
-        ];
-      };
-
-      initialScript = mkOption {
-        default = null;
-        description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database";
-      };
-
-      # FIXME: remove this option; it's a really bad idea.
-      rootPassword = mkOption {
-        default = null;
-        description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty.";
-      };
-
-      replication = {
-        role = mkOption {
-          default = "none";
-          description = "Role of the MySQL server instance. Can be either: master, slave or none";
-        };
-
-        serverId = mkOption {
-          default = 1;
-          description = "Id of the MySQL server instance. This number must be unique for each instance";
-        };
-
-        masterHost = mkOption {
-          description = "Hostname of the MySQL master server";
-        };
-
-        masterUser = mkOption {
-          description = "Username of the MySQL replication user";
-        };
-
-        masterPassword = mkOption {
-          description = "Password of the MySQL replication user";
-        };
-
-        masterPort = mkOption {
-          default = 3306;
-          description = "Port number on which the MySQL master server runs";
-        };
-      };
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf config.services.mysql55.enable {
-
-    users.extraUsers.mysql = {
-      description = "MySQL server user";
-      group = "mysql";
-      uid = config.ids.uids.mysql;
-    };
-
-    users.extraGroups.mysql.gid = config.ids.gids.mysql;
-
-    environment.systemPackages = [mysql];
-
-    systemd.services.mysql =
-      { description = "MySQL Server";
-
-        wantedBy = [ "multi-user.target" ];
-
-        unitConfig.RequiresMountsFor = "${cfg.dataDir}";
-
-        preStart =
-          ''
-            if ! test -e ${cfg.dataDir}/mysql; then
-                mkdir -m 0700 -p ${cfg.dataDir}
-                chown -R ${cfg.user} ${cfg.dataDir}
-                ${mysql}/bin/mysql_install_db ${mysqldOptions}
-                touch /tmp/mysql_init
-            fi
-
-            mkdir -m 0700 -p ${cfg.pidDir}
-            chown -R ${cfg.user} ${cfg.pidDir}
-          '';
-
-        serviceConfig.ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
-
-        postStart =
-          ''
-            # Wait until the MySQL server is available for use
-            count=0
-            while [ ! -e /tmp/mysql.sock ]
-            do
-                if [ $count -eq 30 ]
-                then
-                    echo "Tried 30 times, giving up..."
-                    exit 1
-                fi
-
-                echo "MySQL daemon not yet started. Waiting for 1 second..."
-                count=$((count++))
-                sleep 1
-            done
-
-            if [ -f /tmp/mysql_init ]
-            then
-                ${concatMapStrings (database:
-                  ''
-                    # Create initial databases
-                    if ! test -e "${cfg.dataDir}/${database.name}"; then
-                        echo "Creating initial database: ${database.name}"
-                        ( echo "create database ${database.name};"
-                          echo "use ${database.name};"
-
-                          if [ -f "${database.schema}" ]
-                          then
-                              cat ${database.schema}
-                          elif [ -d "${database.schema}" ]
-                          then
-                              cat ${database.schema}/mysql-databases/*.sql
-                          fi
-                        ) | ${mysql}/bin/mysql -u root -N
-                    fi
-                  '') cfg.initialDatabases}
-                
-                ${optionalString (cfg.replication.role == "slave")
-                  ''
-                    # Set up the replication master
-                    
-                    ( echo "stop slave;"
-                      echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';"
-                      echo "start slave;"
-                    ) | ${mysql}/bin/mysql -u root -N
-                  ''}
-
-                ${optionalString (cfg.initialScript != null)
-                  ''
-                    # Execute initial script
-                    cat ${cfg.initialScript} | ${mysql}/bin/mysql -u root -N
-                  ''}
-
-                ${optionalString (cfg.rootPassword != null)
-                  ''
-                    # Change root password
-
-                    ( echo "use mysql;"
-                      echo "update user set Password=password('$(cat ${cfg.rootPassword})') where User='root';"
-                      echo "flush privileges;"
-                    ) | ${mysql}/bin/mysql -u root -N
-                  ''}
-
-              rm /tmp/mysql_init
-            fi
-          ''; # */
-
-        serviceConfig.ExecStop =
-          "${mysql}/bin/mysqladmin ${optionalString (cfg.rootPassword != null) "--user=root --password=\"$(cat ${cfg.rootPassword})\""} shutdown";
-      };
-
-  };
-
-}
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index e09943d86c8..db6797a8d68 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  passthru.mysqlVersion = "5.5";
+
   meta = {
     description = "An enhanced, drop-in replacement for MySQL";
     homepage    = https://mariadb.org/;
diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix
index c210c996532..c309158a670 100644
--- a/pkgs/servers/sql/mysql/5.1.x.nix
+++ b/pkgs/servers/sql/mysql/5.1.x.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
       rm -rf $out/mysql-test $out/sql-bench $out/share/info
     '';
 
+  passthru.mysqlVersion = "5.1";
+
   meta = {
     homepage = http://www.mysql.com/;
     description = "The world's most popular open source database";
diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index bd30b7db75f..e8da8a48d65 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
     rm -rf $out/mysql-test $out/sql-bench
   '';
 
+  passthru.mysqlVersion = "5.5";
+
   meta = {
     homepage = http://www.mysql.com/;
     description = "The world's most popular open source database";
-- 
GitLab


From c9f9835ddaad104f4d917d6af6e787aaf9b4becf Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 26 Feb 2014 07:56:59 -0500
Subject: [PATCH 1619/3789] Document mysql changes

---
 nixos/doc/manual/release-notes.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes.xml
index 4a0fc6a52e4..8899cbb2149 100644
--- a/nixos/doc/manual/release-notes.xml
+++ b/nixos/doc/manual/release-notes.xml
@@ -21,6 +21,10 @@ enhancements are the following:
   <listitem><para>NixOS is now based on Glibc 2.18 and GCC
   4.8.</para></listitem>
 
+  <listitem><para>The mysql55 service has been merged into the
+  mysql service, which no longer sets a default for the 'package
+  option.</para></listitem>
+
 </itemizedlist>
 
 </para>
-- 
GitLab


From efb18d9aa5b82414b39668afdd9d975e2906ac3a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 26 Feb 2014 08:49:21 -0500
Subject: [PATCH 1620/3789] D'oh

---
 nixos/modules/module-list.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 391cc2503bd..f6f95564d4a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -87,7 +87,6 @@
   ./services/databases/mongodb.nix
   ./services/databases/redis.nix
   ./services/databases/mysql.nix
-  ./services/databases/mysql55.nix
   ./services/databases/openldap.nix
   ./services/databases/postgresql.nix
   ./services/databases/virtuoso.nix
-- 
GitLab


From 28d992bf6de10f8680d478d72daa41629c54b677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 26 Feb 2014 15:56:06 +0100
Subject: [PATCH 1621/3789] checkinstall: fix build with glibc-2.19

---
 .../checkinstall/default.nix                  |  3 +++
 .../checkinstall/readlink-types.patch         | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/package-management/checkinstall/readlink-types.patch

diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix
index 2fbf5282ee1..1320720ed17 100644
--- a/pkgs/tools/package-management/checkinstall/default.nix
+++ b/pkgs/tools/package-management/checkinstall/default.nix
@@ -29,6 +29,9 @@ stdenv.mkDerivation {
 
     # Fix a `conflicting types for 'scandir'' error on Glibc 2.11.
     ./scandir.patch
+
+    # Fix a `conflicting types for 'readlink'' error since Glibc 2.19
+    ./readlink-types.patch
   ]
 
   ++ stdenv.lib.optional (stdenv.system == "x86_64-linux") 
diff --git a/pkgs/tools/package-management/checkinstall/readlink-types.patch b/pkgs/tools/package-management/checkinstall/readlink-types.patch
new file mode 100644
index 00000000000..a860607fcf6
--- /dev/null
+++ b/pkgs/tools/package-management/checkinstall/readlink-types.patch
@@ -0,0 +1,19 @@
+Extracted from Arch's patch
+https://projects.archlinux.org/svntogit/community.git/tree/trunk/build-fix.patch?h=packages/checkinstall
+diff -wbBur checkinstall-1.6.2/installwatch/installwatch.c checkinstall-1.6.2.my/installwatch/installwatch.c
+--- checkinstall-1.6.2/installwatch/installwatch.c	2008-11-16 19:20:53.000000000 +0300
++++ checkinstall-1.6.2.my/installwatch/installwatch.c	2010-01-15 18:55:50.112716628 +0300
+@@ -2938,13 +2938,8 @@
+ 	return result;
+ }
+ 
+-#if (GLIBC_MINOR <= 4)
+-int readlink(const char *path,char *buf,size_t bufsiz) {
+-	int result;
+-#else
+ ssize_t readlink(const char *path,char *buf,size_t bufsiz) {
+ 	ssize_t result;
+-#endif
+ 	instw_t instw;
+ 	int status;
+ 
-- 
GitLab


From a78f47917ab9d0a6eda034dc47f96d30a2555815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 26 Feb 2014 15:57:13 +0100
Subject: [PATCH 1622/3789] go: don't assume sse2 on i686 (maybe fixes build)

---
 pkgs/development/compilers/go/1.2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
index 2abdc51e4c6..da74419b2f3 100644
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -60,6 +60,7 @@ stdenv.mkDerivation {
           else if stdenv.system == "armv5tel-linux" then "arm"
           else throw "Unsupported system";
   GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
+  GO386 = 387; # from Arch: don't assume sse2 on i686
 
   installPhase = ''
     mkdir -p "$out/bin"
-- 
GitLab


From 69b6b939efbc17ec9cedde521763ea26c29982b3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 26 Feb 2014 10:06:28 -0500
Subject: [PATCH 1623/3789] rename.nix: Handle renaming of a whole set of
 options

mkIf was pushed down, making the obsoleted argument unconditionally evaluated

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 nixos/modules/rename.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index f41bababd29..1a08a1cf4f3 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -56,7 +56,7 @@ let
             inherit visible;
           });
         }
-        { config = setTo (mkIf (fromOf options).isDefined (define (mkMerge (fromOf options).definitions)));
+        { config = setTo (mkMerge (if (fromOf options).isDefined then [ (define (mkMerge (fromOf options).definitions)) ] else []));
         }
       ];
 
-- 
GitLab


From 08dfbebbf1f12e5d32f49c4f6270abd9fb9e2785 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Wed, 26 Feb 2014 16:19:42 +0000
Subject: [PATCH 1624/3789] haskellPackages.singletons: New expression

Haddock's are disabled for the singletons library as it can't yet
understand some of the extensions that this library uses.
---
 .../libraries/haskell/singletons/default.nix     | 16 ++++++++++++++++
 .../libraries/haskell/th-desugar/default.nix     | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  4 ++++
 3 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/singletons/default.nix
 create mode 100644 pkgs/development/libraries/haskell/th-desugar/default.nix

diff --git a/pkgs/development/libraries/haskell/singletons/default.nix b/pkgs/development/libraries/haskell/singletons/default.nix
new file mode 100644
index 00000000000..692cc528454
--- /dev/null
+++ b/pkgs/development/libraries/haskell/singletons/default.nix
@@ -0,0 +1,16 @@
+{ cabal, mtl, syb, thDesugar }:
+
+cabal.mkDerivation (self: {
+  pname = "singletons";
+  version = "0.9.3";
+  sha256 = "0m90k3ygm04c0gjfiaw5rmajyn2yz0ldcqm2xmm39d10270skpb4";
+  buildDepends = [ mtl syb thDesugar ];
+  meta = {
+    homepage = "http://www.cis.upenn.edu/~eir/packages/singletons";
+    description = "A framework for generating singleton types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+  noHaddock = true;
+})
diff --git a/pkgs/development/libraries/haskell/th-desugar/default.nix b/pkgs/development/libraries/haskell/th-desugar/default.nix
new file mode 100644
index 00000000000..f3aa1628aae
--- /dev/null
+++ b/pkgs/development/libraries/haskell/th-desugar/default.nix
@@ -0,0 +1,15 @@
+{ cabal, mtl, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "th-desugar";
+  version = "1.2.1";
+  sha256 = "12a8m1vzfbn728psaiqxwngmksrbybci3g7a47z04rjbsjf3cy4v";
+  buildDepends = [ mtl syb ];
+  meta = {
+    homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar";
+    description = "Functions to desugar Template Haskell";
+    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 88ebf6f5ae1..ca4e9424c8e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2267,6 +2267,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   show = callPackage ../development/libraries/haskell/show {};
 
+  singletons = callPackage ../development/libraries/haskell/singletons {};
+
   SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {};
 
   socketActivation = callPackage ../development/libraries/haskell/socket-activation {};
@@ -2391,6 +2393,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   thespian = callPackage ../development/libraries/haskell/thespian {};
 
+  thDesugar = callPackage ../development/libraries/haskell/th-desugar {};
+
   thExtras = callPackage ../development/libraries/haskell/th-extras {};
 
   thLift = callPackage ../development/libraries/haskell/th-lift {};
-- 
GitLab


From 32470621d51fce499dfcabccfbdecbf93c0388b9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 26 Feb 2014 13:35:04 -0500
Subject: [PATCH 1625/3789] Restart keys.target on reconfiguration

---
 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 e0773c1fab4..2d1bb5ae980 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -649,6 +649,7 @@ in
 
     systemd.targets.keys =
       { description = "Security Keys";
+        unitConfig.X-StopOnReconfiguration = true;
       };
 
     systemd.units =
-- 
GitLab


From 68e9829134590abb6fcac238baf4dac51cdd0c22 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 26 Feb 2014 20:47:30 +0200
Subject: [PATCH 1626/3789] youtubeDL: update from 2014.02.19.1 to 2014.02.26

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index ef4bc68b1c8..29463a358e9 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.02.19.1";
+  version = "2014.02.26";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0bilardg46xikw4gl4n50bg9wrmarmnzhrhhwhdcyrx0p0idl4fn";
+    sha256 = "069p3iyh96xc7y9ixzl4v5smq8i6d4gnhyy2yyzphjlfnpvwhb7j";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From 05c19ced9b6997edb00fca5a96282921303564c9 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 26 Feb 2014 20:49:27 +0200
Subject: [PATCH 1627/3789] linuxPackages_3_12.perf: update from 3.12.12 to
 3.12.13

---
 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 84c865b6542..d276de69446 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.12";
+  version = "3.12.13";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0wndjj5bdjfl4i9s5mj9wylhspygsvnl3pnwps6d65q2jm813lrv";
+    sha256 = "08r4k64v0nkr0dnmir3n3x7f4i83akl3ahx9cl7rbj29zc4ninmd";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 2059d4c3395922b2f969a12a5d55e31812f75467 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 25 Feb 2014 21:39:30 -0600
Subject: [PATCH 1628/3789] cb0cat: version 20131216153906

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/cb0cat/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/security/cb0cat/default.nix

diff --git a/pkgs/tools/security/cb0cat/default.nix b/pkgs/tools/security/cb0cat/default.nix
new file mode 100644
index 00000000000..e35434f3cc2
--- /dev/null
+++ b/pkgs/tools/security/cb0cat/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name    = "cb0cat-${version}";
+  version = "20131216153906";
+
+  src = fetchurl {
+    url    = "https://www.cblnk.com/cb0cat/dist/${name}.tgz";
+    sha256 = "182767nxfyiis7ac8bn5v8rxb9vlly8n5w42pz1dd0751xwdlp82";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv cb0cat $out/bin
+  '';
+
+  meta = {
+    description = "cryptographic tool based on the CBEAMr0 sponge function";
+    homepage    = "https://www.cblnk.com";
+    license     = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44a23e828df..e7b9a078a8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -424,6 +424,8 @@ let
 
   aescrypt = callPackage ../tools/misc/aescrypt { };
 
+  cb0cat = callPackage ../tools/security/cb0cat { };
+
   ahcpd = callPackage ../tools/networking/ahcpd { };
 
   aircrackng = callPackage ../tools/networking/aircrack-ng { };
-- 
GitLab


From c23ec33c7743a9c7f9eb5055e8425475321dc2e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Feb 2014 13:06:23 +0100
Subject: [PATCH 1629/3789] Add selenium-server-standalone (submitted by
 coreyoconnor)

---
 .../tools/selenium/server/default.nix         | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/tools/selenium/server/default.nix

diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix
new file mode 100644
index 00000000000..efb1e85c2d7
--- /dev/null
+++ b/pkgs/development/tools/selenium/server/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "selenium-server-standalone-${version}";
+  version = "2.39.0";
+
+  src = fetchurl {
+    url = "https://selenium.googlecode.com/files/${name}.jar";
+    sha256 = "11ixh5x5f9kia2va8wssd3n7y57dkv3snw6xvk85y4qhzg64b65f";
+  };
+
+  unpack = "";
+
+  buildCommand = ''
+    mkdir -p $out/share/lib/${name}
+    cp $src $out/share/lib/${name}/${name}.jar
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://code.google.com/p/selenium;
+    description = "Selenium Server for remote WebDriver.";
+    maintainers = [ maintainers.coconnor ];
+    platforms = platforms.all;
+    hydraPlatforms = [];
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44a23e828df..b54648613b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3736,6 +3736,8 @@ let
     jre = jdk;
   };
 
+  selenium-server-standalone = callPackage ../development/tools/selenium/server { };
+
   scons = callPackage ../development/tools/build-managers/scons { };
 
   simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { };
-- 
GitLab


From 1e7300ad676d91717ef36a8eeee46763287c0ee2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 27 Feb 2014 06:37:22 -0500
Subject: [PATCH 1630/3789] mediawiki rewrite rules only needed with no
 urlPrefix

---
 .../web-servers/apache-httpd/mediawiki.nix    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index 9f4189e4d49..29efc975a38 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -126,7 +126,17 @@ in
         </Directory>
       ''}
 
-      ${optionalString (config.urlPrefix != "") "Alias ${config.urlPrefix} ${mediawikiRoot}"}
+      ${if config.urlPrefix != "" then "Alias ${config.urlPrefix} ${mediawikiRoot}" else ''
+        RewriteEngine On
+        RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
+        RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d
+        RewriteRule ^(.*)$ %{DOCUMENT_ROOT}/${if config.articleUrlPrefix == ""
+          then ""
+          else "${config.articleUrlPrefix}/"
+        }index.php [L]
+
+        RewriteRule ^/*$ ${mediawikiRoot}/index.php [L] # For syntax hilighter: */
+      ''}
 
       <Directory ${mediawikiRoot}>
           Order allow,deny
@@ -137,13 +147,6 @@ in
       ${optionalString (config.articleUrlPrefix != "") ''
         Alias ${config.articleUrlPrefix} ${mediawikiRoot}/index.php
       ''}
-
-      RewriteEngine On
-      RewriteCond ${mediawikiRoot}/$0 !-f
-      RewriteCond ${mediawikiRoot}/$0 !-d
-      RewriteRule ^(.*)$ ${mediawikiRoot}/index.php [L]
-
-      RewriteRule ^/*$ ${mediawikiRoot}/index.php [L] # For syntax hilighter: */
     '';
 
   documentRoot = if config.urlPrefix == "" then mediawikiRoot else null;
-- 
GitLab


From f7c04b1e6b43114c6ffa822c29e93621e97ed35a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 27 Feb 2014 07:17:05 -0500
Subject: [PATCH 1631/3789] mediawiki: Don't rewrite /images if uploads are
 enabled

---
 .../services/web-servers/apache-httpd/mediawiki.nix        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index 29efc975a38..f5669faebc9 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -130,12 +130,13 @@ in
         RewriteEngine On
         RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
         RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d
-        RewriteRule ^(.*)$ %{DOCUMENT_ROOT}/${if config.articleUrlPrefix == ""
+        RewriteRule ${if config.enableUploads
+          then "!^/images"
+          else "^.*\$"
+        } %{DOCUMENT_ROOT}/${if config.articleUrlPrefix == ""
           then ""
           else "${config.articleUrlPrefix}/"
         }index.php [L]
-
-        RewriteRule ^/*$ ${mediawikiRoot}/index.php [L] # For syntax hilighter: */
       ''}
 
       <Directory ${mediawikiRoot}>
-- 
GitLab


From 97a0dd9eb92014be027ccc89cb39e43baabe090d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Feb 2014 13:22:04 +0100
Subject: [PATCH 1632/3789] nixos: set all package options to have type package

---
 nixos/modules/config/pulseaudio.nix                         | 2 +-
 nixos/modules/services/databases/firebird.nix               | 1 +
 nixos/modules/services/databases/mongodb.nix                | 1 +
 nixos/modules/services/databases/postgresql.nix             | 2 +-
 nixos/modules/services/databases/redis.nix                  | 1 +
 nixos/modules/services/misc/cgminer.nix                     | 1 +
 nixos/modules/services/misc/nix-daemon.nix                  | 2 +-
 nixos/modules/services/web-servers/apache-httpd/default.nix | 2 +-
 nixos/modules/services/web-servers/nginx/default.nix        | 1 +
 9 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index e7cbe7a28f3..db4f1b43a11 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -77,7 +77,7 @@ in {
       };
 
       package = mkOption {
-        type = types.path;
+        type = types.package;
         default = pulseaudio;
         example = literalExample "pulseaudio.override { jackaudioSupport = true; }";
         description = ''
diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix
index 75c225bdb67..f9f7e9d7c51 100644
--- a/nixos/modules/services/databases/firebird.nix
+++ b/nixos/modules/services/databases/firebird.nix
@@ -49,6 +49,7 @@ in
 
       package = mkOption {
         default = pkgs.firebirdSuper;
+        type = types.package;
         /*
           Example: <code>package = pkgs.firebirdSuper.override { icu =
             pkgs.icu; };</code> which is not recommended for compatibility
diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
index 213a60687b2..a2f2593e797 100644
--- a/nixos/modules/services/databases/mongodb.nix
+++ b/nixos/modules/services/databases/mongodb.nix
@@ -39,6 +39,7 @@ in
 
       package = mkOption {
         default = pkgs.mongodb;
+        type = types.package;
         description = "
           Which MongoDB derivation to use.
         ";
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 265d26e8ce9..cc4230d4d6a 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -55,7 +55,7 @@ in
       };
 
       package = mkOption {
-        type = types.path;
+        type = types.package;
         example = literalExample "pkgs.postgresql92";
         description = ''
           PostgreSQL package to use.
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index ea6399ba4f4..9a4ce36a5cb 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -45,6 +45,7 @@ in
       package = mkOption {
         default = pkgs.redis;
         description = "Which Redis derivation to use.";
+        type = types.package;
       };
 
       user = mkOption {
diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix
index f715013b51f..20b7c34e886 100644
--- a/nixos/modules/services/misc/cgminer.nix
+++ b/nixos/modules/services/misc/cgminer.nix
@@ -42,6 +42,7 @@ in
       package = mkOption {
         default = pkgs.cgminer;
         description = "Which cgminer derivation to use.";
+        type = types.package;
       };
 
       user = mkOption {
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 1a957993f98..785d4397347 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -58,7 +58,7 @@ in
     nix = {
 
       package = mkOption {
-        type = types.path;
+        type = types.package;
         default = pkgs.nix;
         description = ''
           This option specifies the Nix package instance to use throughout the system.
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index f239d4fd6c3..a22ef10312d 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -419,7 +419,7 @@ in
       };
 
       package = mkOption {
-        type = types.path;
+        type = types.package;
         default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; };
         example = "pkgs.apacheHttpd_2_4";
         description = ''
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 512da831aa3..1a39fe43bbe 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -25,6 +25,7 @@ in
 
       package = mkOption {
         default = pkgs.nginx;
+        type = types.package;
         description = "
           Nginx package to use.
         ";
-- 
GitLab


From 62438c09f7cc811f994510550614c9265b3b1d18 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 17 Jan 2014 00:30:16 +0000
Subject: [PATCH 1633/3789] update couchdb to 1.5.0(current latest) and add
 service for it

---
 nixos/modules/module-list.nix                |   1 +
 nixos/modules/services/databases/couchdb.nix | 214 +++++++++++++++++++
 pkgs/servers/http/couchdb/default.nix        |  36 +++-
 3 files changed, 242 insertions(+), 9 deletions(-)
 create mode 100644 nixos/modules/services/databases/couchdb.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f6f95564d4a..76620f1d02a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -82,6 +82,7 @@
   ./services/backup/rsnapshot.nix
   ./services/databases/4store-endpoint.nix
   ./services/databases/4store.nix
+  ./services/databases/couchdb.nix
   ./services/databases/firebird.nix
   ./services/databases/memcached.nix
   ./services/databases/mongodb.nix
diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
new file mode 100644
index 00000000000..4dc2429786d
--- /dev/null
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -0,0 +1,214 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.couchdb;
+  configFile = pkgs.writeText "couchdb.ini"
+    ''
+      [couchdb]
+      database_dir = ${cfg.databaseDir}
+      uri_file = ${cfg.uriFile}
+      view_index_dir = ${cfg. viewIndexDir}
+
+      [httpd]
+      port = ${toString cfg.port}
+      bind_address = ${cfg.bindAddress}
+
+      [log]
+      file = ${cfg.logFile}
+    '';
+  configExtraFile = pkgs.writeText "couchdb-extra.ini" cfg.extraConfig;
+
+in
+{
+
+  ###### interface
+
+  options = {
+
+    services.couchdb = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to run CouchDB Server.
+        '';
+      };
+
+      package = mkOption {
+        type = types.path;
+        default = pkgs.couchdb;
+        example = literalExample "pkgs.couchdb";
+        description = ''
+          CouchDB package to use.
+        '';
+      };
+
+
+      user = mkOption {
+        type = types.string;
+        default = "couchdb";
+        description = ''
+          User account under which couchdb runs.
+        '';
+      };
+
+      group = mkOption {
+        type = types.string;
+        default = "couchdb";
+        description = ''
+          Group account under which couchdb runs.
+        '';
+      };
+
+      pidFile = mkOption {
+        type = types.string;
+        default = "/var/run/couchdb/couchdb.pid";
+        description = ''
+          pid file.
+        '';
+      };
+
+      # couchdb options: http://docs.couchdb.org/en/latest/config/index.html
+
+      databaseDir = mkOption {
+        type = types.string;
+        default = "/var/lib/couchdb";
+        description = ''
+          Specifies location of CouchDB database files (*.couch named). This
+          location should be writable and readable for the user the CouchDB
+          service runs as (couchdb by default).
+        '';
+      };
+
+      uriFile = mkOption {
+        type = types.string;
+        default = "/var/run/couchdb/couchdb.uri";
+        description = ''
+          This file contains the full URI that can be used to access this
+          instance of CouchDB. It is used to help discover the port CouchDB is
+          running on (if it was set to 0 (e.g. automatically assigned any free
+          one). This file should be writable and readable for the user that
+          runs the CouchDB service (couchdb by default).
+        '';
+      };
+
+      viewIndexDir = mkOption {
+        type = types.string;
+        default = "/var/lib/couchdb";
+        description = ''
+          Specifies location of CouchDB view index files. This location should
+          be writable and readable for the user that runs the CouchDB service
+          (couchdb by default).
+        '';
+      };
+
+      bindAddress = mkOption {
+        type = types.string;
+        default = "127.0.0.1";
+        description = ''
+          Defines the IP address by which CouchDB will be accessible.
+        '';
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 5984;
+        description = ''
+          Defined the port number to listen.
+        '';
+      };
+
+      logFile = mkOption {
+        type = types.string;
+        default = "/var/log/couchdb.log";
+        description = ''
+          Specifies the location of file for logging output.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.string;
+        default = "";
+        description = ''
+          Extra configuration. Overrides any other cofiguration.
+        '';
+      };
+
+      customConfigFile = mkOption {
+        type = types.string;
+        default = "/var/lib/couchdb/custom.ini";
+        description = ''
+          Custom configuration file. File needs to be readable and writable
+          from couchdb user/group.
+        '';
+      };
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf config.services.couchdb.enable {
+
+    environment.systemPackages = [ cfg.package ];
+
+    systemd.services.couchdb = {
+      description = "CouchDB Server";
+      wantedBy = [ "multi-user.target" ];
+
+      preStart =
+        ''
+        if ! test -e ${cfg.pidFile}; then
+          mkdir -p `dirname ${cfg.pidFile}`;
+        fi
+        if ! test -e ${cfg.uriFile}; then
+          mkdir -p `dirname ${cfg.uriFile}`;
+          touch ${cfg.uriFile};
+        fi
+        if ! test -e ${cfg.logFile}; then
+          mkdir -p `dirname ${cfg.logFile}`;
+          touch ${cfg.logFile};
+        fi
+        if ! test -e ${cfg.customConfigFile}; then
+          mkdir -p `dirname ${cfg.customConfigFile}`;
+          touch ${cfg.customConfigFile};
+        fi
+        if ! test -e ${cfg.databaseDir}; then
+          mkdir -p ${cfg.databaseDir};
+        fi
+        if ! test -e ${cfg.viewIndexDir}; then
+          mkdir -p ${cfg.viewIndexDir};
+        fi
+        chown ${cfg.user}:${cfg.group} ${cfg.pidFile}
+        chown ${cfg.user}:${cfg.group} ${cfg.uriFile}
+        chown ${cfg.user}:${cfg.group} ${cfg.logFile}
+        chown ${cfg.user}:${cfg.group} ${cfg.customConfigFile}
+        chown ${cfg.user}:${cfg.group} ${cfg.databaseDir}
+        chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir}
+        '';
+
+      serviceConfig = {
+        PermissionsStartOnly = true;
+        User = cfg.user;
+        Group = cfg.group;
+        Type = "forking";
+        ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile} -a ${cfg.customConfigFile}";
+        #ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile} -a ${cfg.customConfigFile}";
+        ExecStop = "${cfg.package}/bin/couchdb -d";
+      };
+    };
+
+    users.extraUsers.couchdb = {
+      description = "CouchDB Server user";
+      group = "couchdb";
+      uid = config.ids.uids.couchdb;
+    };
+
+    users.extraGroups.couchdb.gid = config.ids.gids.couchdb;
+
+  };
+}
diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 08bc45443a3..808a86946b0 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -1,21 +1,39 @@
-args @ {stdenv, fetchurl, erlang, spidermonkey,
-	icu, getopt, curl, ...}:
-
-let s = import ./src-for-default.nix; in
+{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man, python
+, sphinx, which, file, pkgconfig, getopt }:
 
 stdenv.mkDerivation rec {
-  inherit (s) name;
+  name = "couchdb-${version}";
+  version = "1.5.0";
+
   src = fetchurl {
-    inherit (s) url;
-    sha256 = s.hash;
+  url = "mirror://apache/couchdb/source/${version}/apache-couchdb-${version}.tar.gz";
+  sha256 = "1vwgcckp3svgifmagyjmgazm6387i9m6z182p6ja891i8fkb5gdb";
   };
 
-  buildInputs = [erlang spidermonkey icu curl];
+  buildInputs = [
+ erlang icu openssl spidermonkey curl help2man sphinx which file pkgconfig
+ ];
 
   postInstall = ''
     sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb
   '';
 
-  configureFlags = "--with-erlang=${erlang}/lib/erlang/usr/include --with-js-include=${spidermonkey}/include --with-js-lib=${spidermonkey}/lib";
+  /*
+  Versions of SpiderMonkey after the js185-1.0.0 release remove the optional
+  enforcement of preventing anonymous functions in a statement context. This
+  will most likely break your existing JavaScript code as well as render all
+  example code invalid.
 
+  If you wish to ignore this error pass --enable-js-trunk to ./configure.
+  */
+  configureFlags = ''
+    --enable-js-trunk
+  '';
+
+  meta = {
+    description = "Apache CouchDB is a database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";
+    homepage = "http://couchdb.apache.org";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = with stdenv.lib.maintainers; [ viric garbas ];
+  };
 }
-- 
GitLab


From a6a3b22bc03bfa0934bf79248d6b4db2ec4c6b18 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 17 Jan 2014 00:32:03 +0000
Subject: [PATCH 1634/3789] removing unused couchdb files

---
 pkgs/servers/http/couchdb/src-for-default.nix      | 9 ---------
 pkgs/servers/http/couchdb/src-info-for-default.nix | 7 -------
 2 files changed, 16 deletions(-)
 delete mode 100644 pkgs/servers/http/couchdb/src-for-default.nix
 delete mode 100644 pkgs/servers/http/couchdb/src-info-for-default.nix

diff --git a/pkgs/servers/http/couchdb/src-for-default.nix b/pkgs/servers/http/couchdb/src-for-default.nix
deleted file mode 100644
index 6e07077d333..00000000000
--- a/pkgs/servers/http/couchdb/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="1.2.0";
-   name="couchdb-1.2.0";
-   hash="0dswinmg32zn217049dkbx3pab3qwihzmlbc7i6vq7a7lbg4s98g";
-   url="mirror://apache/couchdb/releases/1.2.0/apache-couchdb-${version}.tar.gz";
-   advertisedUrl="http://www.apache.org/dist/couchdb/releases/1.2.0/apache-couchdb-1.2.0.tar.gz";
-  
-  
-}
diff --git a/pkgs/servers/http/couchdb/src-info-for-default.nix b/pkgs/servers/http/couchdb/src-info-for-default.nix
deleted file mode 100644
index 5904bdcb232..00000000000
--- a/pkgs/servers/http/couchdb/src-info-for-default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  downloadPage = "http://couchdb.apache.org/downloads.html";
-  baseName = "couchdb";
-  choiceCommand = ''head -1 | sed -re "$skipRedirectApache" '';
-  mirrorSedScript = ''$apacheMirror'';
-}
-
-- 
GitLab


From 55cff93f042fb0af7f0a6b0195121980492cc944 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 18 Jan 2014 18:24:03 +0000
Subject: [PATCH 1635/3789] couchdb(nixos): removing whitespace and line that
 was commented

---
 nixos/modules/services/databases/couchdb.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index 4dc2429786d..926cb02c5e5 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -10,7 +10,7 @@ let
       [couchdb]
       database_dir = ${cfg.databaseDir}
       uri_file = ${cfg.uriFile}
-      view_index_dir = ${cfg. viewIndexDir}
+      view_index_dir = ${cfg.viewIndexDir}
 
       [httpd]
       port = ${toString cfg.port}
@@ -197,7 +197,6 @@ in
         Group = cfg.group;
         Type = "forking";
         ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile} -a ${cfg.customConfigFile}";
-        #ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile} -a ${cfg.customConfigFile}";
         ExecStop = "${cfg.package}/bin/couchdb -d";
       };
     };
-- 
GitLab


From 0bebcd7d1fb10a9d4a191e1766597b08f3eff8c2 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 18 Jan 2014 19:38:13 +0000
Subject: [PATCH 1636/3789] folders of pidFile and uriFile should be writable
 by couchdb user/group

---
 nixos/modules/services/databases/couchdb.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index 926cb02c5e5..334b0ac7729 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -167,7 +167,6 @@ in
         fi
         if ! test -e ${cfg.uriFile}; then
           mkdir -p `dirname ${cfg.uriFile}`;
-          touch ${cfg.uriFile};
         fi
         if ! test -e ${cfg.logFile}; then
           mkdir -p `dirname ${cfg.logFile}`;
@@ -183,8 +182,8 @@ in
         if ! test -e ${cfg.viewIndexDir}; then
           mkdir -p ${cfg.viewIndexDir};
         fi
-        chown ${cfg.user}:${cfg.group} ${cfg.pidFile}
-        chown ${cfg.user}:${cfg.group} ${cfg.uriFile}
+        chown ${cfg.user}:${cfg.group} `dirname ${cfg.pidFile}`
+        chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}`
         chown ${cfg.user}:${cfg.group} ${cfg.logFile}
         chown ${cfg.user}:${cfg.group} ${cfg.customConfigFile}
         chown ${cfg.user}:${cfg.group} ${cfg.databaseDir}
-- 
GitLab


From 9d55a4c513392fb1c6b3625c070cf03ab400c5fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Feb 2014 14:33:30 +0100
Subject: [PATCH 1637/3789] couchdb: add ids

---
 nixos/modules/misc/ids.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 95b7683ba2f..ae7a8234e07 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -114,6 +114,7 @@
       logcheck = 103;
       nix-ssh = 104;
       dictd = 105;
+      couchdb = 106;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -206,6 +207,7 @@
       munin = 95;
       keys = 96;
       dictd = 105;
+      couchdb = 106;
 
       # When adding a gid, make sure it doesn't match an existing uid.
 
-- 
GitLab


From d6a3cada9ba08a8610068af2ec3d467615932a93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Feb 2014 14:33:50 +0100
Subject: [PATCH 1638/3789] couchdb: stricter types

---
 nixos/modules/services/databases/couchdb.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index 334b0ac7729..46f0e5c6ee9 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -39,7 +39,7 @@ in
       };
 
       package = mkOption {
-        type = types.path;
+        type = types.package;
         default = pkgs.couchdb;
         example = literalExample "pkgs.couchdb";
         description = ''
@@ -65,7 +65,7 @@ in
       };
 
       pidFile = mkOption {
-        type = types.string;
+        type = types.path;
         default = "/var/run/couchdb/couchdb.pid";
         description = ''
           pid file.
@@ -75,7 +75,7 @@ in
       # couchdb options: http://docs.couchdb.org/en/latest/config/index.html
 
       databaseDir = mkOption {
-        type = types.string;
+        type = types.path;
         default = "/var/lib/couchdb";
         description = ''
           Specifies location of CouchDB database files (*.couch named). This
@@ -85,7 +85,7 @@ in
       };
 
       uriFile = mkOption {
-        type = types.string;
+        type = types.path;
         default = "/var/run/couchdb/couchdb.uri";
         description = ''
           This file contains the full URI that can be used to access this
@@ -97,7 +97,7 @@ in
       };
 
       viewIndexDir = mkOption {
-        type = types.string;
+        type = types.path;
         default = "/var/lib/couchdb";
         description = ''
           Specifies location of CouchDB view index files. This location should
@@ -123,7 +123,7 @@ in
       };
 
       logFile = mkOption {
-        type = types.string;
+        type = types.path;
         default = "/var/log/couchdb.log";
         description = ''
           Specifies the location of file for logging output.
-- 
GitLab


From ab0aae42a402e56c9003ef6d034684acb2007ee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Feb 2014 14:34:19 +0100
Subject: [PATCH 1639/3789] couchdb: remove redundant customConfigFile

---
 nixos/modules/services/databases/couchdb.nix | 40 ++++----------------
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index 46f0e5c6ee9..01631e9879a 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -131,21 +131,12 @@ in
       };
 
       extraConfig = mkOption {
-        type = types.string;
+        type = types.lines;
         default = "";
         description = ''
           Extra configuration. Overrides any other cofiguration.
         '';
       };
-
-      customConfigFile = mkOption {
-        type = types.string;
-        default = "/var/lib/couchdb/custom.ini";
-        description = ''
-          Custom configuration file. File needs to be readable and writable
-          from couchdb user/group.
-        '';
-      };
     };
 
   };
@@ -162,30 +153,15 @@ in
 
       preStart =
         ''
-        if ! test -e ${cfg.pidFile}; then
-          mkdir -p `dirname ${cfg.pidFile}`;
-        fi
-        if ! test -e ${cfg.uriFile}; then
-          mkdir -p `dirname ${cfg.uriFile}`;
-        fi
-        if ! test -e ${cfg.logFile}; then
-          mkdir -p `dirname ${cfg.logFile}`;
-          touch ${cfg.logFile};
-        fi
-        if ! test -e ${cfg.customConfigFile}; then
-          mkdir -p `dirname ${cfg.customConfigFile}`;
-          touch ${cfg.customConfigFile};
-        fi
-        if ! test -e ${cfg.databaseDir}; then
-          mkdir -p ${cfg.databaseDir};
-        fi
-        if ! test -e ${cfg.viewIndexDir}; then
-          mkdir -p ${cfg.viewIndexDir};
-        fi
+        mkdir -p `dirname ${cfg.pidFile}`;
+        mkdir -p `dirname ${cfg.uriFile}`;
+        mkdir -p `dirname ${cfg.logFile}`;
+        touch ${cfg.logFile};
+        mkdir -p ${cfg.databaseDir};
+        mkdir -p ${cfg.viewIndexDir};
         chown ${cfg.user}:${cfg.group} `dirname ${cfg.pidFile}`
         chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}`
         chown ${cfg.user}:${cfg.group} ${cfg.logFile}
-        chown ${cfg.user}:${cfg.group} ${cfg.customConfigFile}
         chown ${cfg.user}:${cfg.group} ${cfg.databaseDir}
         chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir}
         '';
@@ -195,7 +171,7 @@ in
         User = cfg.user;
         Group = cfg.group;
         Type = "forking";
-        ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile} -a ${cfg.customConfigFile}";
+        ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile}";
         ExecStop = "${cfg.package}/bin/couchdb -d";
       };
     };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b54648613b0..824d7458505 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6175,6 +6175,8 @@ let
 
   couchdb = callPackage ../servers/http/couchdb {
     spidermonkey = spidermonkey_185;
+    python = python27;
+    sphinx = python27Packages.sphinx;
   };
 
   dico = callPackage ../servers/dico { };
-- 
GitLab


From 991b23c3821041bee45618dc3c07e347e6603f65 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 27 Feb 2014 14:56:13 +0100
Subject: [PATCH 1640/3789] Added a static identifier to the installing nixos
 chapter

---
 nixos/doc/manual/installation.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml
index 6ccb12b115e..f6b477ed69b 100644
--- a/nixos/doc/manual/installation.xml
+++ b/nixos/doc/manual/installation.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="installing-nixos">
 
 <title>Installing NixOS</title>
 
-- 
GitLab


From 50c4291251c008724f6bb8be3b45852cbf60b80f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 27 Feb 2014 14:57:28 +0100
Subject: [PATCH 1641/3789] Fixed link to the installation instructions

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4a220e28ba6..8ded8807ede 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/#idm139984689550080)
+* [NixOS installation instructions](http://nixos.org/nixos/manual/#installing-nixos)
 * [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)
-- 
GitLab


From d7df8b41a3f5b5ede3b95932f3617392176ef22f Mon Sep 17 00:00:00 2001
From: Mihaly Barasz <klao@nilcons.com>
Date: Thu, 27 Feb 2014 15:05:29 +0100
Subject: [PATCH 1642/3789] Byte-compile Agda's elisp files

---
 pkgs/development/libraries/haskell/Agda/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix
index 749802f95b2..5a1f00a995c 100644
--- a/pkgs/development/libraries/haskell/Agda/default.nix
+++ b/pkgs/development/libraries/haskell/Agda/default.nix
@@ -1,4 +1,4 @@
-{ cabal, alex, binary, deepseq, filepath, geniplate, happy
+{ cabal, alex, binary, deepseq, emacs, filepath, geniplate, happy
 , hashable, hashtables, haskeline, haskellSrcExts, mtl, parallel
 , QuickCheck, text, time, unorderedContainers, xhtml, zlib
 }:
@@ -14,8 +14,11 @@ cabal.mkDerivation (self: {
     haskellSrcExts mtl parallel QuickCheck text time
     unorderedContainers xhtml zlib
   ];
-  buildTools = [ alex happy ];
+  buildTools = [ alex emacs happy ];
   jailbreak = true;
+  postInstall = ''
+    $out/bin/agda-mode compile
+  '';
   meta = {
     homepage = "http://wiki.portal.chalmers.se/agda/";
     description = "A dependently typed functional programming language and proof assistant";
-- 
GitLab


From 901999857676ff1f285d2850c484cee2a506d6ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Feb 2014 16:35:37 +0100
Subject: [PATCH 1643/3789] refactor cython into pythonPackages, fixes #1803

---
 .../interpreters/cython/2/default.nix         | 21 -------------------
 .../interpreters/cython/3/default.nix         | 21 -------------------
 pkgs/top-level/all-packages.nix               |  4 ++--
 pkgs/top-level/python-packages.nix            | 18 ++++++++++++++++
 4 files changed, 20 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/development/interpreters/cython/2/default.nix
 delete mode 100644 pkgs/development/interpreters/cython/3/default.nix

diff --git a/pkgs/development/interpreters/cython/2/default.nix b/pkgs/development/interpreters/cython/2/default.nix
deleted file mode 100644
index 5b3cfd588c9..00000000000
--- a/pkgs/development/interpreters/cython/2/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, python, pkgconfig }:
-
-stdenv.mkDerivation {
-  name = "cython-0.20";
-
-  src = fetchurl {
-    url = http://www.cython.org/release/Cython-0.20.tar.gz;
-    sha256 = "1a3m7zhw8mdyr95fwx7n1scrz82drr433i99dzm1n9dxi0cx2qah";
-  };
-
-  buildPhase = "python setup.py build --build-base $out";
-
-  installPhase = "python setup.py install --prefix=$out";
-
-  buildInputs = [ python pkgconfig ];
-
-  meta = {
-    description = "An interpreter to help writing C extensions for Python 2";
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/interpreters/cython/3/default.nix b/pkgs/development/interpreters/cython/3/default.nix
deleted file mode 100644
index d977ea87b3e..00000000000
--- a/pkgs/development/interpreters/cython/3/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, python3, pkgconfig }:
-
-stdenv.mkDerivation {
-  name = "cython3-0.20";
-
-  src = fetchurl {
-    url = http://www.cython.org/release/Cython-0.20.tar.gz;
-    sha256 = "1a3m7zhw8mdyr95fwx7n1scrz82drr433i99dzm1n9dxi0cx2qah";
-  };
-
-  buildPhase = "python3 setup.py build --build-base $out";
-
-  installPhase = "python3 setup.py install --prefix=$out";
-
-  buildInputs = [ python3 pkgconfig ];
-
-  meta = {
-    description = "An interpreter to help writing C extensions for Python3";
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 824d7458505..2005c432780 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2360,8 +2360,8 @@ let
 
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
 
-  cython = callPackage ../development/interpreters/cython/2 { };
-  cython3 = callPackage ../development/interpreters/cython/3 { };
+  cython = pythonPackages.cython;
+  cython3 = python3Packages.cython;
 
   dylan = callPackage ../development/compilers/gwydion-dylan {
     dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix {  };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3340e3059f2..1c36dc7fcd5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1122,6 +1122,24 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     propagatedBuildInputs = [ pythonPackages.coverage ];
   };
 
+  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;
+    };
+  };
+
   cryptacular = buildPythonPackage rec {
     name = "cryptacular-1.4.1";
 
-- 
GitLab


From 65a34b7f85cbd0b04049ba7313df2aa9881dc184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Feb 2014 16:37:29 +0100
Subject: [PATCH 1644/3789] add kazam

---
 .../video/kazam/bug_1190693.patch             | 14 ++++++
 pkgs/applications/video/kazam/datadir.patch   | 11 ++++
 pkgs/applications/video/kazam/default.nix     | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 77 insertions(+)
 create mode 100644 pkgs/applications/video/kazam/bug_1190693.patch
 create mode 100644 pkgs/applications/video/kazam/datadir.patch
 create mode 100644 pkgs/applications/video/kazam/default.nix

diff --git a/pkgs/applications/video/kazam/bug_1190693.patch b/pkgs/applications/video/kazam/bug_1190693.patch
new file mode 100644
index 00000000000..9f00c6b6079
--- /dev/null
+++ b/pkgs/applications/video/kazam/bug_1190693.patch
@@ -0,0 +1,14 @@
+=== modified file 'kazam/frontend/indicator.py'
+--- a/kazam/frontend/indicator.py	2013-01-26 01:53:53 +0000
++++ b/kazam/frontend/indicator.py	2013-06-13 18:18:37 +0000
+@@ -291,3 +291,9 @@
+         def start_recording(self):
+             logger.debug("Recording started.")
+             self.indicator.set_from_icon_name("kazam-recording")
++
++        def hide_it(self):
++            self.indicator.set_visible(False)
++
++        def show_it(self):
++            self.indicator.set_visible(True)
+
diff --git a/pkgs/applications/video/kazam/datadir.patch b/pkgs/applications/video/kazam/datadir.patch
new file mode 100644
index 00000000000..114d4228be2
--- /dev/null
+++ b/pkgs/applications/video/kazam/datadir.patch
@@ -0,0 +1,11 @@
+--- a/bin/kazam       2014-02-03 23:11:38.465614061 +0100
++++ b/bin/kazam-1     2014-02-03 23:12:28.447058700 +0100
+@@ -68,7 +68,7 @@
+         # when base install path is not /usr
+         curpath = os.path.abspath(__file__)
+         curpath = os.path.realpath(curpath)
+-        datadir = curpath.split('bin/')[0] + "share/kazam/"
++        datadir = os.path.realpath(os.path.join(curpath, "./../../", "share/kazam/"))
+ 
+     try:
+         import platform
diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix
new file mode 100644
index 00000000000..ed93f81b662
--- /dev/null
+++ b/pkgs/applications/video/kazam/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, python3Packages, gst_all_1, makeWrapper, gobjectIntrospection
+, gtk3, libwnck3, keybinder, intltool, libcanberra }:
+
+
+python3Packages.buildPythonPackage rec {
+  name = "kazam-${version}";
+  version = "1.4.3";
+
+  src = fetchurl {
+    url = "https://launchpad.net/kazam/stable/${version}/+download/kazam-${version}.tar.gz";
+    sha256 = "00bcn0yj9xrv87sf6xd3wpilsjgjpsj15zzpjh351ffpjnr0ica8";
+  };
+
+  # TODO: keybinder, appindicator3
+  buildInputs = with python3Packages;
+    [ pygobject3 pyxdg pycairo gst_all_1.gstreamer gst_all_1.gst-plugins-base
+      gst_all_1.gst-plugins-good gobjectIntrospection gtk3 libwnck3 distutils_extra
+      intltool dbus ];
+
+  # TODO: figure out why PYTHONPATH is not passed automatically for those programs
+  pythonPath = with python3Packages;
+    [ pygobject3 pyxdg pycairo dbus ];
+
+  patches = [ ./datadir.patch ./bug_1190693.patch ];
+  prePatch = ''
+    rm setup.cfg
+    substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra}/bin/canberra-gtk-play"
+  '';
+
+  # no tests
+  doCheck = false;
+
+  preFixup = ''
+    wrapProgram $out/bin/kazam \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix LD_LIBRARY_PATH ":" "${gtk3}/lib:${gst_all_1.gstreamer}/lib:${keybinder}/lib" \
+      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share" \
+      --set GST_REGISTRY "/tmp/kazam.gstreamer.registry";
+  '';
+
+
+  meta = with stdenv.lib; {
+    description = "Cross-platform, Friend-2-Friend and secure decentralised communication platform";
+    homepage = https://code.launchpad.net/kazam;
+    #license = licenses.bsd2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.iElectric ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2005c432780..ae6742ebd2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1225,6 +1225,8 @@ let
   jscoverage = callPackage ../development/tools/misc/jscoverage { };
 
   jwhois = callPackage ../tools/networking/jwhois { };
+ 
+  kazam = callPackage ../applications/video/kazam { };
 
   kexectools = callPackage ../os-specific/linux/kexectools { };
 
-- 
GitLab


From d380290640a56863c9d083e8fc931e5495c62b00 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 27 Feb 2014 18:35:34 +0200
Subject: [PATCH 1645/3789] vlc: update from 2.1.3 to 2.1.4

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

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index c38e4dea443..3df447fad62 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "2.1.3";
+  version = "2.1.4";
 
   src = fetchurl {
     url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
-    sha256 = "04d1lr7lxrq2767rjy4j0wr3sirx5sf1s9wdl3p4x500r7z64dp0";
+    sha256 = "1lymhbb2bns73qivdaqanhggjjhyc9fwfgf5ikhng0a74msnqmiy";
   };
 
   buildInputs =
-- 
GitLab


From 8121dc2aa6431662e043b885d9a48abf3067ca52 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 27 Feb 2014 18:37:44 +0200
Subject: [PATCH 1646/3789] libtorrentRasterbar: update from 0.16.14 to 0.16.15

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

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 6e8567d2c46..9c4d3bfd2dd 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libtorrent-rasterbar-${version}";
-  version = "0.16.14";
+  version = "0.16.15";
   
   src = fetchurl {
-    url = mirror://sourceforge/libtorrent/libtorrent-rasterbar-0.16.14.tar.gz;
-    sha256 = "0s4f36f28cgq55pgx4h99q18a0p566bhifxmqxjhlb63a1w20m2c";
+    url = mirror://sourceforge/libtorrent/libtorrent-rasterbar-0.16.15.tar.gz;
+    sha256 = "0xcz4hphgkcdxcbmgzk27mxn7478hy417pn55zn5hnpllgndy3w2";
   };
 
   buildInputs = [ boost pkgconfig openssl zlib python libiconvOrNull geoip ];
-- 
GitLab


From de2de21e4a6d1e369d5d8d82c270115e5a46d043 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 27 Feb 2014 18:41:00 +0200
Subject: [PATCH 1647/3789] libmicrohttpd: update from 0.9.33 to 0.9.34

---
 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 3354161baef..d9dfaa004de 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.33";
+  name = "libmicrohttpd-0.9.34";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "0nfm3h7mfb03hf4kfyap8dr35shm6sppsq6da03853sljy27wn6r";
+    sha256 = "122snbhhn10s8az46f0lrkirhj0k38lq7hmqav3n1prdzpabz8i9";
   };
 
   buildInputs = [ curl libgcrypt ];
-- 
GitLab


From 638957269bce7c171516eb238b15b8c0b7a8e21e Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 27 Feb 2014 18:45:04 +0200
Subject: [PATCH 1648/3789] mjpegtools: update from 2.0.0 to 2.1.0

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

diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix
index b70d8f4c9ba..33b497fa3eb 100644
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/pkgs/tools/video/mjpegtools/default.nix
@@ -6,10 +6,10 @@
 # - libXxf86dga support? checking for XF86DGAQueryExtension in -lXxf86dga... no
 
 stdenv.mkDerivation rec {
-  name = "mjpegtools-2.0.0";
+  name = "mjpegtools-2.1.0";
   src = fetchurl {
     url = "mirror://sourceforge/mjpeg/${name}.tar.gz";
-    sha256 = "bf3541593e71602f7b440c2e7d81b433f53d0511e74642f35bea9b3feded7a97";
+    sha256 = "01y4xpfdvd4zgv6fmcjny9mr1gbfd4y2i4adp657ydw6fqyi8kw6";
   };
   buildInputs = [ gtk libdv libjpeg libpng libX11 pkgconfig SDL SDL_gfx ];
 }
-- 
GitLab


From 6ef0c3220edb7c11dc1f0aef8d885887ac68467f Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 27 Feb 2014 18:48:22 +0200
Subject: [PATCH 1649/3789] mpd: update from 0.18.5 to 0.18.8

---
 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 3b0069b8118..c39045cd9af 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -27,10 +27,10 @@ let
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
 
 in stdenv.mkDerivation rec {
-  name = "mpd-0.18.5";
+  name = "mpd-0.18.8";
   src = fetchurl {
     url    = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz";
-    sha256 = "1jhkpbwjmzicnkjl8nsfjdgsvqvkcdjm497rl081sy8mq1jzr80c";
+    sha256 = "1ryqh0xf76xv4mpwy1gjwy275ar4wmbzifa9ccjim9r7lk2hgp5v";
   };
 
   buildInputs = [ pkgconfig glib ]
-- 
GitLab


From d189a57fd7decb26ea743f3e3c09e14f79f38148 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 27 Feb 2014 18:49:28 +0200
Subject: [PATCH 1650/3789] ncdu: update from 1.8 to 1.10

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

diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix
index 47b96023ce0..ff751eb40da 100644
--- a/pkgs/tools/misc/ncdu/default.nix
+++ b/pkgs/tools/misc/ncdu/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ncdu-${version}";
-  version = "1.8";
+  version = "1.10";
 
   src = fetchurl {
     url = "http://dev.yorhel.nl/download/${name}.tar.gz";
-    sha256 = "42aaf0418c05e725b39b220166a9c604a9c54c0fbf7692c9c119b36d0ed5d099";
+    sha256 = "0rqc5wpqcbfqpcwxgh3jxwa0yw2py0hv0acpsf0a9g6v9144m6gm";
   };
 
   buildInputs = [ ncurses ];
-- 
GitLab


From 6eecf5f03f0237a601b10471e60034472d1413c3 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 27 Feb 2014 18:52:05 +0200
Subject: [PATCH 1651/3789] parallel: update from 20130422 to 20140222

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index d58b57196d2..fa6f147efe4 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20130422";
+  name = "parallel-20140222";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0aygc6d2sf2xrnyldv62a17masfs5am4zfm68k4fhvymwcfbp41h";
+    sha256 = "0zb3hg92br6a53jn0pzfl16ffc1hfw81jk7nzw5spkshsdrcqx3y";
   };
 
   patchPhase =
-- 
GitLab


From 3b6d3eebc52f49626987c93cda851f7d7d0bba85 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 27 Feb 2014 18:53:48 +0200
Subject: [PATCH 1652/3789] nodejs: update from 0.10.25 to 0.10.26

---
 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 2c2d343838c..062d7f4ec06 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.25";
+  version = "0.10.26";
 
   # !!! Should we also do shared libuv?
   deps = {
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "0vxkyvl8hyhxxpkh96zws4j6i9f3ykqpqbrbvj0j0nj7snwz7vj6";
+    sha256 = "1ahx9cf2irp8injh826sk417wd528awi4l1mh7vxg7k8yak4wppg";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);
-- 
GitLab


From fb448ba4a1f7ef02ab28090717cb47680ea76803 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 27 Feb 2014 18:56:09 +0200
Subject: [PATCH 1653/3789] p11_kit: update from 0.20.1 to 0.20.2

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

diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index 67be64921e7..be6216b758c 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libiconv, pkgconfig, libffi, libtasn1 }:
 
 stdenv.mkDerivation rec {
-  name = "p11-kit-0.20.1";
+  name = "p11-kit-0.20.2";
 
   src = fetchurl {
     url = "${meta.homepage}releases/${name}.tar.gz";
-    sha256 = "0lsaxd1rg74ax1vkclq7r52b43rhy14mn5i14xqvb8dzlgq4hiaj";
+    sha256 = "0z7gwmsj9hcmpk3ai2lwla59y3h9jc13xmqk5rijnv645zcm3v84";
   };
 
   postInstall = "rm -frv $out/share/gtk-doc";
-- 
GitLab


From 416db1de92304cf683ef1492c409824f54aab1c1 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 27 Feb 2014 18:46:06 +0100
Subject: [PATCH 1654/3789] androidsdk: Make AVD storage dir configurable and
 make activation step optional

---
 .../mobile/androidenv/emulate-app.nix          | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
index 53687868102..5117c8aa247 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -2,9 +2,9 @@
 { name, app ? null
 , platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false
 , enableGPU ? false, extraAVDFiles ? []
-, package ? null, activity ? null}:
-
-assert app != null -> package != null && activity != null;
+, package ? null, activity ? null
+, avdHomeDir ? null
+}:
 
 let
   androidsdkComposition = androidsdk {
@@ -28,8 +28,12 @@ stdenv.mkDerivation {
         export TMPDIR=/tmp
     fi
     
-    # Store the virtual devices somewhere else, instead of polluting a user's HOME directory
-    export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX)
+    ${if avdHomeDir == null then ''
+      # Store the virtual devices somewhere else, instead of polluting a user's HOME directory
+      export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX)
+    '' else ''
+      export ANDROID_SDK_HOME=${avdHomeDir}
+    ''}
     
     # We have to look for a free TCP port
     
@@ -106,7 +110,9 @@ stdenv.mkDerivation {
       ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install "$appPath"
     
       # Start the application
-      ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity}
+      ${stdenv.lib.optionalString (package != null && activity != null) ''
+          ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/${activity}
+      ''}
     ''}
     EOF
     chmod +x $out/bin/run-test-emulator
-- 
GitLab


From 5e091757657b0dea0a0988f47ad1aa45190f238d Mon Sep 17 00:00:00 2001
From: Matthew Sackman <matthew@rabbitmq.com>
Date: Thu, 27 Feb 2014 19:11:08 +0100
Subject: [PATCH 1655/3789] add serfdom (close #1672)

---
 lib/maintainers.nix              |   1 +
 pkgs/servers/serfdom/default.nix | 101 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |   2 +
 3 files changed, 104 insertions(+)
 create mode 100644 pkgs/servers/serfdom/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 195e77b5820..7bef639ca7c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -44,6 +44,7 @@
   matejc = "Matej Cotman <cotman.matej@gmail.com>";
   modulistic = "Pablo Costa <modulistic@gmail.com>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
+  msackman = "Matthew Sackman <matthew@wellquite.org>";
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
diff --git a/pkgs/servers/serfdom/default.nix b/pkgs/servers/serfdom/default.nix
new file mode 100644
index 00000000000..13c878888e2
--- /dev/null
+++ b/pkgs/servers/serfdom/default.nix
@@ -0,0 +1,101 @@
+{ stdenv, fetchurl, fetchgit, go, lib }:
+
+let
+  goDeps = [
+    {
+      dir    = "github.com/hashicorp";
+      name   = "serf";
+      rev    = "21113c8207d8e02b7ff738c9be80fcaabf67251d";
+      sha256 = "10lmgb0caffp0x02nriahyfq9p6qkhr8carfq38m8cjxqxs2v0nk";
+    }
+    {
+      dir    = "github.com/armon";
+      name   = "go-metrics";
+      rev    = "8ceaed1d0bc3a25db6e65e79ee4f895013313c17";
+      sha256 = "1yzajmx26br4812m9gz4v7qj6fcmhg4a9jz9l3i20hh2x06srmpg";
+    }
+    {
+      dir    = "github.com/hashicorp";
+      name   = "logutils";
+      rev    = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8";
+      sha256 = "184lnn7x1v3xvj6zz1rg9s0252wkkd59kij2iyrrm7y80bym2jys";
+    }
+    {
+      dir    = "github.com/hashicorp";
+      name   = "memberlist";
+      rev    = "825ad4aca57c7323e8dadde149bfdec9d9621ffe";
+      sha256 = "0mm0hm2kncafq5ml58ki7ilh3b47ni0w19n50ilahhhm4lsfry7z";
+    }
+    {
+      dir    = "github.com/ugorji";
+      name   = "go";
+      rev    = "cdeae7b76625959e4164eab9eb303087a794f2cc";
+      sha256 = "0pcjlbhp6vxnksy12rav6c8bvi2v010407l5hibxqdvnampvhlkb";
+    }
+    {
+      dir    = "github.com/mitchellh";
+      name   = "cli";
+      rev    = "69f0b65ce53b27f729b1b807b88dc88007f41dd3";
+      sha256 = "0hnnqd8vg5ca2hglkrj141ba2akdh7crl2lsrgz8d6ipw6asszx3";
+    }
+    {
+      dir    = "github.com/armon";
+      name   = "mdns";
+      rev    = "17be83de467449f38a8395c30534a9cf0c03e5ea";
+      sha256 = "1fhb6vldclgdx9aqqh1gl87cl5sw3nbq9b7mibkljhbk3cdajyxn";
+    }
+    {
+      dir    = "github.com/miekg";
+      name   = "dns";
+      rev    = "5eec7f362c392f0a7eaadea69b13667d665feb82";
+      sha256 = "0irlzhd78qmn3lyfbkxmwajv0mm6jp6x0cg7hb9hyj6d01ynlv09";
+    }
+    {
+      dir    = "github.com/mitchellh";
+      name   = "mapstructure";
+      rev    = "57bb2fa7a7e00b26c80e4c4b0d4f15a210d94039";
+      sha256 = "13lvd5vw8y6h5zl3samkrb7237kk778cky7k7ys1cm46mfd957zy";
+    }
+  ];
+  createGoPathCmds =
+    lib.concatStrings
+      (map (desc:
+            let
+              fetched = fetchgit { url = "https://${desc.dir}/${desc.name}";
+                                   inherit (desc) rev sha256; };
+            in ''
+              mkdir -p $GOPATH/src/${desc.dir}
+              ln -s ${fetched} $GOPATH/src/${desc.dir}/${desc.name}
+            '') goDeps);
+in
+  stdenv.mkDerivation rec {
+    version = "0.4.1";
+    name = "serfdom-${version}";
+
+    src = fetchurl {
+      url = "https://github.com/hashicorp/serf/archive/v${version}.tar.gz";
+      sha256 = "0f4fxhw2r31ks9rs9h3wx9lsymnp8szk0gzggvibwhl2bm6kn6d8";
+    };
+
+    buildInputs = [ go ];
+
+    buildPhase = ''
+      mkdir $TMPDIR/go
+      export GOPATH=$TMPDIR/go
+      ${createGoPathCmds}
+      go build -v -o bin/serf
+    '';
+
+    installPhase = ''
+      ensureDir $out/bin
+      cp bin/serf $out/bin
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Serf is a service discovery and orchestration tool that is decentralized, highly available, and fault tolerant";
+      homepage = http://www.serfdom.io/;
+      license = licenses.mpl20;
+      maintainers = [ maintainers.msackman ];
+      platforms = platforms.linux;
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae6742ebd2f..bbfaee4dafd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6396,6 +6396,8 @@ let
     libunwind = null;
   });
 
+  serfdom = callPackage ../servers/serfdom { };
+
   shishi = callPackage ../servers/shishi { };
 
   sipwitch = callPackage ../servers/sip/sipwitch { };
-- 
GitLab


From 9d7b1dca8ffedfbab7f157d5c3e60ad214e8cc1a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 27 Feb 2014 19:26:18 +0100
Subject: [PATCH 1656/3789] androidsdk: only create AVD if needed + some fixes

---
 .../mobile/androidenv/emulate-app.nix         | 45 +++++++++++--------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
index 5117c8aa247..f5cacbcba88 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     mkdir -p $out/bin
     
     cat > $out/bin/run-test-emulator << "EOF"
-    #!/bin/sh -e
+    #! ${stdenv.shell} -e
     
     # We need a TMPDIR
     if [ "$TMPDIR" = "" ]
@@ -32,7 +32,8 @@ stdenv.mkDerivation {
       # Store the virtual devices somewhere else, instead of polluting a user's HOME directory
       export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX)
     '' else ''
-      export ANDROID_SDK_HOME=${avdHomeDir}
+      mkdir -p "${avdHomeDir}"
+      export ANDROID_SDK_HOME="${avdHomeDir}"
     ''}
     
     # We have to look for a free TCP port
@@ -58,17 +59,22 @@ stdenv.mkDerivation {
     
     export ANDROID_SERIAL="emulator-$port"
     
-    # Create a virtual android device
-    yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS
+    # Create a virtual android device for testing if it does not exists
     
-    ${stdenv.lib.optionalString enableGPU ''
-      # Enable GPU acceleration
-      echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini
-    ''}
+    if [ "$(android list avd | grep 'Name: device')" = "" ]
+    then
+        # Create a virtual android device
+        yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS
     
-    ${stdenv.lib.concatMapStrings (extraAVDFile: ''
-      ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd
-    '') extraAVDFiles}
+        ${stdenv.lib.optionalString enableGPU ''
+          # Enable GPU acceleration
+          echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini
+        ''}
+    
+        ${stdenv.lib.concatMapStrings (extraAVDFile: ''
+          ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd
+        '') extraAVDFiles}
+    fi
     
     # Launch the emulator
     ${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS &
@@ -98,16 +104,19 @@ stdenv.mkDerivation {
     echo "ready" >&2
     
     ${stdenv.lib.optionalString (app != null) ''
-      # Install the App through the debugger
+      # Install the App through the debugger, if it has not been installed yet
       
-      if [ -d "${app}" ]
+      if [ -z "${package}" ] || [ "$(adb -s emulator-$port shell 'pm list packages | grep -x package:${package}')" = "" ]
       then
-          appPath="$(echo ${app}/*.apk)"
-      else
-          appPath="${app}"
+          if [ -d "${app}" ]
+          then
+              appPath="$(echo ${app}/*.apk)"
+          else
+              appPath="${app}"
+          fi
+          
+          ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install "$appPath"
       fi
-      
-      ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install "$appPath"
     
       # Start the application
       ${stdenv.lib.optionalString (package != null && activity != null) ''
-- 
GitLab


From ebe57b1ac83792128c8ef613f9009e2234bb05b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Feb 2014 21:27:29 +0100
Subject: [PATCH 1657/3789] Remove lib.typeOf

It clashes with builtins.typeOf.
---
 lib/types.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index 9bce56bf807..baf8aa5e574 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -10,7 +10,6 @@ with import ./strings.nix;
 rec {
 
   isType = type: x: (x._type or "") == type;
-  typeOf = x: x._type or "";
 
   setType = typeName: value: value // {
     _type = typeName;
-- 
GitLab


From 70449b220d31e27a95c0d54841fcd3f1ee9df920 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 27 Feb 2014 23:08:13 +0100
Subject: [PATCH 1658/3789] androidsdk: fix activity launching

---
 pkgs/development/mobile/androidenv/emulate-app.nix              | 2 +-
 .../mobile/titaniumenv/examples/emulate-kitchensink/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
index f5cacbcba88..278c073dc58 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation {
     ${stdenv.lib.optionalString (app != null) ''
       # Install the App through the debugger, if it has not been installed yet
       
-      if [ -z "${package}" ] || [ "$(adb -s emulator-$port shell 'pm list packages | grep -x package:${package}')" = "" ]
+      if [ -z "${package}" ] || [ "$(adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ]
       then
           if [ -d "${app}" ]
           then
diff --git a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
index 5187b0e0238..cad4503dc96 100644
--- a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
@@ -6,5 +6,5 @@ androidenv.emulateApp {
   platformVersion = "16";
   useGoogleAPIs = true;
   package = "com.appcelerator.kitchensink";
-  activity = "KitchensinkActivity";
+  activity = ".KitchensinkActivity";
 }
-- 
GitLab


From 84011efb7474dfb12bd56140327dc49197b3341a Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 27 Feb 2014 13:08:09 +0100
Subject: [PATCH 1659/3789] paxctl: Use http instead of https

This is needed since paxctl is going to be added to stdenv but
early stdenv curl does not support https.
---
 pkgs/os-specific/linux/paxctl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix
index d664f119c34..69656f51042 100644
--- a/pkgs/os-specific/linux/paxctl/default.nix
+++ b/pkgs/os-specific/linux/paxctl/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.7";
 
   src = fetchurl {
-    url = "https://pax.grsecurity.net/${name}.tar.bz2";
+    url = "http://pax.grsecurity.net/${name}.tar.bz2";
     sha256 = "1j6dg6wd1v7na5i4xj8zmbff0mdqdnw6cvqy0rsbz5anra27f1zp";
   };
 
-- 
GitLab


From 53fbbe3262072e99e36fe167ae8a7d6538b6a54a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 27 Feb 2014 20:37:28 +0100
Subject: [PATCH 1660/3789] gnome3: Setup hook for gdk-pixbuf and
 gnome-icon-theme

Add necessary paths to the environment so that
applications can find icons.
---
 pkgs/desktops/gnome-3/core/baobab/default.nix | 18 ++++++++++--------
 .../gnome-3/core/gnome-icon-theme/default.nix |  2 ++
 .../core/gnome-icon-theme/setup-hook.sh       | 10 ++++++++++
 pkgs/desktops/gnome-3/core/yelp/default.nix   | 18 ++++++++----------
 .../libraries/gdk-pixbuf/default.nix          |  2 ++
 .../libraries/gdk-pixbuf/setup-hook.sh        | 19 +++++++++++++++++++
 6 files changed, 51 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-icon-theme/setup-hook.sh
 create mode 100644 pkgs/development/libraries/gdk-pixbuf/setup-hook.sh

diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index b905a05474d..07805644d90 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -1,14 +1,13 @@
-{ stdenv, intltool, fetchurl, vala, libgtop, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libxml2, gnome3 }:
-
-# TODO: icons and theme still does not work
-# use packaged gnome3.gnome_icon_theme_symbolic 
+{ stdenv, intltool, fetchurl, vala, libgtop
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, libxml2
+, gnome3, librsvg, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
   name = "baobab-3.10.1";
 
   src = fetchurl {
-    url = "https://download.gnome.org/sources/baobab/3.10/${name}.tar.xz";
+    url = "mirror://gnome/sources/baobab/3.10/${name}.tar.xz";
     sha256 = "23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9";
   };
 
@@ -19,15 +18,18 @@ 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 = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
                   gnome3.gsettings_desktop_schemas makeWrapper ];
 
-  installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
+  installFlags = "gsettingsschemadir=\${out}/share/baobab/glib-2.0/schemas/";
 
   postInstall = ''
     wrapProgram "$out/bin/baobab" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/baobab:$XDG_ICON_DIRS"
   '';
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix
index 474a2ccb9a4..5b16f827ae0 100644
--- a/pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1xinbgkkvlhazj887ajcl13i7kdc1wcca02jwxzvjrvchjsp4m66";
   };
 
+  setupHook = ./setup-hook.sh;
+
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/gnome-icon-theme/setup-hook.sh b/pkgs/desktops/gnome-3/core/gnome-icon-theme/setup-hook.sh
new file mode 100644
index 00000000000..d7156f3d463
--- /dev/null
+++ b/pkgs/desktops/gnome-3/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/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index ee98f96bc27..d84bd288707 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -1,18 +1,18 @@
 { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
 , file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
-, bash, makeWrapper, itstool, libxml2, libxslt, icu  }:
+, bash, makeWrapper, itstool, libxml2, libxslt, icu }:
 
 stdenv.mkDerivation rec {
   name = "yelp-3.10.1";
 
   src = fetchurl {
-    url = "https://download.gnome.org/sources/yelp/3.10/${name}.tar.xz";
+    url = "mirror://gnome/sources/yelp/3.10/${name}.tar.xz";
     sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816";
   };
 
-  propagatedUserEnvPkgs = [ librsvg gdk_pixbuf gnome3.gnome_themes_standard
-                            gnome3.gnome_icon_theme hicolor_icon_theme
-                            gnome3.gnome_icon_theme_symbolic ];
+  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";
 
@@ -20,14 +20,12 @@ stdenv.mkDerivation rec {
                   libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
                   gnome3.gsettings_desktop_schemas ];
 
-  installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
+  installFlags = "gsettingsschemadir=\${out}/share/yelp/glib-2.0/schemas/";
 
   postInstall = ''
-    mkdir -p $out/lib/yelp/gdk-pixbuf-2.0/2.10.0
-    cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/lib/yelp/gdk-pixbuf-2.0/2.10.0/loaders.cache
     wrapProgram "$out/bin/yelp" \
-      --set GDK_PIXBUF_MODULE_FILE `readlink -e $out/lib/yelp/gdk-pixbuf-2.0/2.10.0/loaders.cache` \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme_symbolic}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gnome_icon_theme}/share:${hicolor_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
+      --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"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 7a06f08aea6..cd3e7631618 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "0ldhpdalbyi6q5k1dz498i9hqcsd51yxq0f91ck9p0h4v38blfx1";
   };
 
+  setupHook = ./setup-hook.sh;
+
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
   buildInputs = [ libX11 libintlOrEmpty ];
 
diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
new file mode 100644
index 00000000000..280d9aa4f1b
--- /dev/null
+++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
@@ -0,0 +1,19 @@
+make_gtk_applications_find_pixbuf_loaders() {
+
+    # 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 [ -f "$1/lib/gdk-pixbuf/loaders.cache" ]; then
+		cat "$1/lib/gdk-pixbuf/loaders.cache" >> "$out/lib/$name/gdk-pixbuf/loaders.cache"
+	fi
+	
+	# note, this is not a search path
+	export GDK_PIXBUF_MODULE_FILE=$(readlink -e "$out/lib/$name/gdk-pixbuf/loaders.cache")
+
+}
+
+envHooks+=(make_gtk_applications_find_pixbuf_loaders)
-- 
GitLab


From 5726600c042c4a46e830ebf20b7cd7c2d307327f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 28 Feb 2014 01:39:11 +0100
Subject: [PATCH 1661/3789] doc: gdk-pixbuf setup-hook

---
 doc/stdenv.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index f0cabe425a3..a0741c4aa22 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1156,6 +1156,13 @@ echo @foo@
     to Qt’s path.</para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term>gdk-pixbuf</term>
+    <listitem><para>Exports <envvar>GDK_PIXBUF_MODULE_FILE</envvar>
+    environment variable the the builder. Add librsvg package
+    to <varname>buildInputs</varname> to get svg support.</para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term>GHC</term>
     <listitem><para>Creates a temporary package database and registers
-- 
GitLab


From b192f9ee13ec1bb7067ff6bceccc7d5610ba45c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 28 Feb 2014 01:40:04 +0100
Subject: [PATCH 1662/3789] gnome3 apps: correctly render icons

---
 pkgs/desktops/gnome-3/core/empathy/default.nix      |  6 ++----
 pkgs/desktops/gnome-3/core/eog/default.nix          |  3 ++-
 pkgs/desktops/gnome-3/core/evince/default.nix       | 13 +++++++------
 .../core/gnome-icon-theme-symbolic/default.nix      |  2 +-
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix  |  3 ++-
 .../gnome-3/core/gnome-themes-standard/default.nix  |  6 ------
 pkgs/desktops/gnome-3/core/nautilus/default.nix     |  9 +++++----
 pkgs/desktops/gnome-3/misc/gitg/default.nix         |  5 +++--
 pkgs/misc/solfege/default.nix                       |  3 +--
 9 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index cfa774599e1..2d0c22213a4 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -42,11 +42,9 @@ stdenv.mkDerivation rec {
   installFlags = "gsettingsschemadir=\${out}/share/empathy/glib-2.0/schemas/";
 
   postInstall = ''
-    mkdir -p $out/lib/empathy/gdk-pixbuf-2.0/2.10.0
-    cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/lib/empathy/gdk-pixbuf-2.0/2.10.0/loaders.cache
     wrapProgram "$out/bin/empathy" \
-      --set GDK_PIXBUF_MODULE_FILE `readlink -e $out/lib/empathy/gdk-pixbuf-2.0/2.10.0/loaders.cache` \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme_symbolic}/share:${gnome3.gnome_icon_theme}/share:${hicolor_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/empathy:${telepathy_logger}/share/telepathy/logger:${folks}/share/folks:${evolution_data_server}/share/evolution-data-server"
+      --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:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/empathy:${telepathy_logger}/share/telepathy/logger:${folks}/share/folks:${evolution_data_server}/share/evolution-data-server"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index d117964b196..99e87b3c584 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
   postInstall = ''
     wrapProgram "$out/bin/eog" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix XDG_DATA_DIRS : "${shared_mime_info}/share:${gnome3.gnome_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share"
+      --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.gsettings_desktop_schemas}/share:${gnome3.gtk}/share:$out/share"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index b4282c41007..de8f28ddaab 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -15,19 +15,20 @@ stdenv.mkDerivation rec {
   buildInputs = [
     pkgconfig intltool perl perlXMLParser libxml2
     glib gtk3 pango atk gdk_pixbuf
-    itstool gnome3.gnome_icon_theme gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
+    itstool gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
+    gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
     poppler ghostscriptX djvulibre libspectre
-    makeWrapper libsecret
+    makeWrapper libsecret librsvg
   ];
 
-
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
   configureFlags = [
     "--disable-nautilus" # Do not use nautilus
-    "--disable-dbus" # strange compilation error
   ];
 
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
   preConfigure = with stdenv.lib;
     optionalString doCheck ''
       for file in test/*.py; do
@@ -43,8 +44,8 @@ stdenv.mkDerivation rec {
     # 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 ${librsvg}/lib/gdk-pixbuf/loaders.cache \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:${gtk3}/share:${shared_mime_info}/share:$out/share"
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gsettings_desktop_schemas}/share:${gtk3}/share:${shared_mime_info}/share:$out/share"
   '';
 
   doCheck = false; # would need pythonPackages.dogTail, which is missing
diff --git a/pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix
index 0d2d406876b..feb3d84b994 100644
--- a/pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     make -C src install
   '';
 
-  buildInputs = [ pkgconfig iconnamingutils gtk];
+  buildInputs = [ pkgconfig iconnamingutils gtk gnome3.gnome_icon_theme ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 7dee64a8aff..59f62b6948d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -33,8 +33,9 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/bin/gnome-shell" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \
-      --set GDK_PIXBUF_MODULE_FILE ${gnome_themes_standard}/lib/gdk-pixbuf/loaders.cache \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
       --prefix XDG_DATA_DIRS : "${gnome-menus}:/share:${ibus}/share:${gnome_settings_daemon}/share:${gnome_control_center}/share:${gdm}/share:${glib}/share:${gnome_themes_standard}/share:${mutter}/share:${gnome_icon_theme}/share:${gsettings_desktop_schemas}/share:${gtk}/share:$out/share"
+
     wrapProgram "$out/libexec/gnome-shell-calendar-server" \
       --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share"
   '';
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
index e3de21806d3..08d82b7ae91 100644
--- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
@@ -9,12 +9,6 @@ stdenv.mkDerivation rec {
   
   buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ];
 
-  preConfigure = ''
-    mkdir -p $out/lib/gdk-pixbuf/
-    cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/lib/gdk-pixbuf/loaders.cache
-    export GDK_PIXBUF_MODULE_FILE=`readlink -e $out/lib/gdk-pixbuf/loaders.cache`
-  '';
-
   meta = with stdenv.lib; {
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 551b9db1246..091e48626ae 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
 , gtk, gnome3, libunique, intltool, gobjectIntrospection
-, libnotify, makeWrapper, exempi }:
+, libnotify, makeWrapper, exempi, librsvg }:
 
 stdenv.mkDerivation rec {
   name = "nautilus-3.10.1";
@@ -12,13 +12,14 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-tracker=no" ];
 
-  buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi 
-                  gnome3.gnome_desktop gnome3.gsettings_desktop_schemas libnotify makeWrapper ];
+  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 ];
 
   postInstall = ''
     wrapProgram "$out/bin/nautilus" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix XDG_DATA_DIRS : "${gtk}/share:${gnome3.gnome_icon_theme}:${gnome3.gsettings_desktop_schemas}/share:$out/share"
+      --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"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
index 629ff4a7700..7ae43f6c206 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix
@@ -27,12 +27,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
                   libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview
-                  gobjectIntrospection makeWrapper ];
+                  gobjectIntrospection makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ];
 
   postInstall = ''
     wrapProgram "$out/bin/gitg" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share"
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share"
   '';
 
   preFixup = ''
diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix
index b40ebe84bcb..9426684165d 100644
--- a/pkgs/misc/solfege/default.nix
+++ b/pkgs/misc/solfege/default.nix
@@ -28,10 +28,9 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
       set -x
-      find "${librsvg}" "${gdk_pixbuf}" -name loaders.cache -print0 | xargs -0 cat > "$out/gdk-pixbuf.loaders"
       wrapProgram "$out/bin/solfege" \
           --prefix PYTHONPATH ':' "$PYTHONPATH" \
-          --set GDK_PIXBUF_MODULE_FILE "$out/gdk-pixbuf.loaders"
+          --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 0e58538fa86fb33ec264f1c3a8eb82fed90c36a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 28 Feb 2014 02:02:27 +0100
Subject: [PATCH 1663/3789] doc: gstreamer setup-hook

---
 doc/stdenv.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index a0741c4aa22..afea416da8a 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1169,6 +1169,14 @@ echo @foo@
     every Haskell build input in it (TODO: how?).</para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term>GStreamer</term>
+    <listitem><para>Adds the
+    GStreamer plugins subdirectory of
+    each build input to the <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> or
+    <envar>GST_PLUGIN_SYSTEM_PATH</envar> environment variable.</para>
+  </varlistentry>
+
 </variablelist>
 
 </para>
-- 
GitLab


From e9f3199973ea5c7ad5507d928d2f315117a2c0a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 28 Feb 2014 02:03:07 +0100
Subject: [PATCH 1664/3789] add gstreamer 1.0 setup-hook and use it where
 appropriate

---
 nixos/modules/programs/environment.nix                |  2 +-
 pkgs/applications/audio/mopidy/default.nix            |  5 ++---
 pkgs/applications/audio/quodlibet/default.nix         |  9 ++-------
 pkgs/applications/video/gnash/default.nix             |  4 +---
 pkgs/desktops/xfce/applications/parole.nix            | 11 +++--------
 pkgs/development/libraries/gstreamer/core/default.nix |  2 ++
 .../libraries/gstreamer/core/setup-hook.sh            |  9 +++++++++
 .../gstreamer/legacy/gstreamer/setup-hook.sh          |  2 +-
 8 files changed, 21 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/libraries/gstreamer/core/setup-hook.sh

diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 7c1922cdfd8..489a7a4d269 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -45,7 +45,7 @@ in
         TERMINFO_DIRS = [ "${i}/share/terminfo" ];
         PERL5LIB = [ "${i}/lib/perl5/site_perl" ];
         ALSA_PLUGIN_DIRS = [ "${i}/lib/alsa-lib" ];
-        GST_PLUGIN_PATH = [ "${i}/lib/gstreamer-0.10" ];
+        GST_PLUGIN_SYSTEM_PATH = [ "${i}/lib/gstreamer-0.10" ];
         KDEDIRS = [ "${i}" ];
         STRIGI_PLUGIN_PATH = [ "${i}/lib/strigi/" ];
         QT_PLUGIN_PATH = [ "${i}/lib/qt4/plugins" "${i}/lib/kde4/plugins" ];
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index b684fee37d5..04393372cf3 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -13,7 +13,7 @@ pythonPackages.buildPythonPackage rec {
   };
 
   propagatedBuildInputs = with pythonPackages; [
-   gst_python pygobject pykka pyspotify pylast cherrypy ws4py
+   gst_python pygobject pykka pyspotify pylast cherrypy ws4py gst_plugins_base gst_plugins_good
   ];
 
   # python zip complains about old timestamps
@@ -27,8 +27,7 @@ pythonPackages.buildPythonPackage rec {
   postInstall = ''
     for p in $out/bin/mopidy $out/bin/mopidy-scan; do
       wrapProgram $p \
-        --prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-0.10 \
-        --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-0.10
+        --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
     done
   '';
 
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index fa63c9f654a..de1aba2a7f6 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -52,13 +52,8 @@ buildPythonPackage {
 
   postInstall = stdenv.lib.optionalString withGstPlugins ''
     # Wrap quodlibet so it finds the GStreamer plug-ins
-    wrapProgram "$out/bin/quodlibet" --prefix                                 \
-      GST_PLUGIN_PATH ":"                                                     \
-      ${ stdenv.lib.concatStringsSep ":"
-         (map (s: s+"/lib/gstreamer-0.10")
-           (stdenv.lib.filter (s: s != null) [
-             gst_plugins_base gst_plugins_good gst_plugins_ugly gst_plugins_bad
-           ])) }
+    wrapProgram "$out/bin/quodlibet" --prefix \
+      GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH"                                                     \
   '';
 
   meta = {
diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index c3b78b64d93..ef40d614a39 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -97,9 +97,7 @@ stdenv.mkDerivation rec {
     # (e.g., gst-ffmpeg is needed to watch movies such as YouTube's).
     for prog in "$out/bin/"*
     do
-      wrapProgram "$prog" --prefix                                            \
-        GST_PLUGIN_PATH ":"                                                     \
-        "${gst_plugins_base}/lib/gstreamer-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_ffmpeg}/lib/gstreamer-0.10"
+      wrapProgram "$prog" --prefix GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH"
     done
   '';
 
diff --git a/pkgs/desktops/xfce/applications/parole.nix b/pkgs/desktops/xfce/applications/parole.nix
index c1a4ecd787d..491bb0112d9 100644
--- a/pkgs/desktops/xfce/applications/parole.nix
+++ b/pkgs/desktops/xfce/applications/parole.nix
@@ -18,21 +18,16 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool ];
 
   buildInputs = [
-    makeWrapper gst_all_1.gst-plugins-base
+    makeWrapper 
     gtk dbus_glib libxfce4ui libxfce4util xfconf
     taglib libnotify
-  ];
+  ] ++ with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav];
 
   configureFlags = [ "--with-gstreamer=1.0" ];
 
   postInstall = stdenv.lib.optionalString withGstPlugins ''
     wrapProgram "$out/bin/parole" --prefix \
-      GST_PLUGIN_PATH ":" ${stdenv.lib.concatStringsSep ":"
-        (map (s: s+"/lib/gstreamer-1.0") (with gst_all_1; [
-          gst-plugins-base gst-plugins-good
-          gst-plugins-bad gst-plugins-ugly
-          gst-libav
-        ])) }
+      GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 85730c1bf25..881f31c66a6 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -23,4 +23,6 @@ stdenv.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [ glib ];
+
+  setupHook = ./setup-hook.sh;
 }
diff --git a/pkgs/development/libraries/gstreamer/core/setup-hook.sh b/pkgs/development/libraries/gstreamer/core/setup-hook.sh
new file mode 100644
index 00000000000..4e75044e732
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/core/setup-hook.sh
@@ -0,0 +1,9 @@
+addGstreamerLibPath () {
+    if test -d "$1/lib/gstreamer-1.0"
+    then
+        export GST_PLUGIN_SYSTEM_PATH_1_0="${GST_PLUGIN_SYSTEM_PATH_1_0}${GST_PLUGIN_SYSTEM_PATH_1_0:+:}$1/lib/gstreamer-1.0"
+    fi
+}
+
+envHooks=(${envHooks[@]} addGstreamerLibPath)
+
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
index ad184dc21e9..10671f9d227 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
@@ -1,7 +1,7 @@
 addGstreamerLibPath () {
     if test -d "$1/lib/gstreamer-0.10"
     then
-        export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}${GST_PLUGIN_PATH:+:}$1/lib/gstreamer-0.10"
+        export GST_PLUGIN_SYSTEM_PATH="${GST_PLUGIN_SYSTEM_PATH}${GST_PLUGIN_SYSTEM_PATH:+:}$1/lib/gstreamer-0.10"
     fi
 }
 
-- 
GitLab


From a8c77b6084caaf9b7f8582fcdfea4cfe24f362c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 28 Feb 2014 09:11:50 +0100
Subject: [PATCH 1665/3789] fix eval

---
 pkgs/desktops/xfce/applications/parole.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/xfce/applications/parole.nix b/pkgs/desktops/xfce/applications/parole.nix
index 491bb0112d9..598c5038092 100644
--- a/pkgs/desktops/xfce/applications/parole.nix
+++ b/pkgs/desktops/xfce/applications/parole.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     makeWrapper 
     gtk dbus_glib libxfce4ui libxfce4util xfconf
     taglib libnotify
-  ] ++ with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav];
+  ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav]);
 
   configureFlags = [ "--with-gstreamer=1.0" ];
 
-- 
GitLab


From 9fc9fcde6c519f673ad488eead845bd88cbeef2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 28 Feb 2014 10:17:33 +0100
Subject: [PATCH 1666/3789] gnome3.gitg, gnome3.empathy: fix icons

---
 pkgs/desktops/gnome-3/core/empathy/default.nix | 6 +++---
 pkgs/desktops/gnome-3/misc/gitg/default.nix    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 2d0c22213a4..1e0c94d0c7f 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "49366acdd3c3ef9a74f63eb09920803c4c9df83056acbf8a7899e7890a9fb196";
   };
 
-  propagatedUserEnvPkgs = [ librsvg gdk_pixbuf gnome3.gnome_themes_standard
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
                             gnome3.gnome_icon_theme hicolor_icon_theme
                             gnome_online_accounts shared_mime_info
                             gnome3.gnome_icon_theme_symbolic ];
@@ -28,10 +28,10 @@ stdenv.mkDerivation rec {
                   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
+                  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 ];
+                  gnome3.gsettings_desktop_schemas file libtool librsvg ];
 
   NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
                          "-I${dbus_libs}/include/dbus-1.0"
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
index 7ae43f6c206..26268f4c90c 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib
 , json_glib, webkitgtk,  makeWrapper, libpeas, bash, gobjectIntrospection
-, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib }:
+, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg }:
 
 # TODO: icons and theme still does not work
 # use packaged gnome3.gnome_icon_theme_symbolic 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
                             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
+                  libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg
                   gobjectIntrospection makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ];
 
   postInstall = ''
-- 
GitLab


From 21234d5f1af02c5851b38c75352e23f4494a22bb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 11:02:31 +0100
Subject: [PATCH 1667/3789] flashtool: add version 0.9.14.0

---
 pkgs/development/mobile/flashtool/default.nix | 71 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++
 2 files changed, 76 insertions(+)
 create mode 100644 pkgs/development/mobile/flashtool/default.nix

diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix
new file mode 100644
index 00000000000..6f85ee648f6
--- /dev/null
+++ b/pkgs/development/mobile/flashtool/default.nix
@@ -0,0 +1,71 @@
+{ stdenv, requireFile, p7zip, jre, libusb1, androidsdk, gtk2, glib, libXtst }:
+
+# TODO:
+#
+#   The FlashTool and FlashToolConsole scripts are messy and should probably we
+#   replaced entirely. All these scripts do is try to guess the environment in
+#   which to run the Java binary (and they guess wrong on NixOS).
+#
+#   The release contains a freaky mixture of 32 and 64 bit binaries.
+#   Personally, I run these things (as 'root') in 32 bit Linux by way of:
+#
+#      setarch i686 ./FlashTool
+#
+#   It should be possible to run them in 64 bit mode, too.
+#
+#   The FlashTool scripts run 'chmod' on the binaries installed in the Nix
+#   store. These commands fail, naturally, because the Nix story is (hopefully)
+#   mounted read-only. This doesn't matter, though, because the build
+#   instructions fix the executable bits already.
+
+stdenv.mkDerivation rec {
+  name = "flashtool-0.9.14.0";
+
+  src = requireFile {
+    url = "http://dfiles.eu/files/n8c1c3pgc";
+    name = "flashtool-0.9.14.0-linux.tar.7z";
+    sha256 = "0mfjdjj7clz2dhkg7lzy1m8hk8ngla7zgcryf51aki1gnpbb2zc1";
+  };
+
+  buildInputs = [ p7zip jre ];
+
+  unpackPhase = ''
+    7z e ${src}
+    tar xf ${name}-linux.tar
+    sourceRoot=FlashTool
+  '';
+
+  buildPhase = ''
+    for n in x10flasher_lib/adb.linux.*; do
+      ln -sfv ${androidsdk}/bin/adb $n
+    done
+    for n in x10flasher_lib/fastboot.linux.*; do
+      ln -sfv ${androidsdk}/bin/fastboot $n
+    done
+    for n in "x10flasher_lib/linux/lib"*"/"*"/libus"*".so"* ; do
+      ln -sfv ${libusb1}/lib/libusb-1.0.so.0 $n
+    done
+    sed -i \
+      -e 's|ln -sf libusbx-1.0.so.0.1.0|ln -sf ${libusb1}/lib/libusb-1.0.so.0|' \
+      -e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \
+      -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${libXtst}/lib:${glib}/lib:${gtk2}/lib:./x10flasher_lib/linux/lib32|' \
+      FlashTool FlashToolConsole
+    chmod +x x10flasher_lib/unyaffs.linux.x86
+    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86
+    ln -sf unyaffs.linux.x86 x10flasher_lib/unyaffs.linux.x64
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    mv * $out/
+  '';
+
+  meta = {
+    homepage = "http://www.flashtool.net/";
+    description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra";
+
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = stdenv.lib.platforms.none;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a113188cacd..7e013cab7c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -925,6 +925,11 @@ let
 
   fio = callPackage ../tools/system/fio { };
 
+  flashtool = callPackage_i686 ../development/mobile/flashtool {
+    androidsdk = pkgs.pkgsi686Linux.androidsdk_4_1;
+    inherit (pkgs.pkgsi686Linux.xlibs) libXtst;
+  };
+
   flpsed = callPackage ../applications/editors/flpsed { };
 
   flvstreamer = callPackage ../tools/networking/flvstreamer { };
-- 
GitLab


From 6c6c145ffcb31fab2d4e7c073bfd6f70fa8bba8d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 11:02:46 +0100
Subject: [PATCH 1668/3789] all-packages.nix: strip trailing whitespace

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e013cab7c0..c50fbdb4d82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1232,7 +1232,7 @@ let
   jscoverage = callPackage ../development/tools/misc/jscoverage { };
 
   jwhois = callPackage ../tools/networking/jwhois { };
- 
+
   kazam = callPackage ../applications/video/kazam { };
 
   kexectools = callPackage ../os-specific/linux/kexectools { };
@@ -7923,7 +7923,7 @@ let
   gtimelog = pythonPackages.gtimelog;
 
   inherit (gnome3) gucharmap;
-  
+
   guitarix = callPackage ../applications/audio/guitarix {
     fftw = fftwSinglePrec;
   };
@@ -8189,7 +8189,7 @@ let
     inherit (xorg) libxkbfile;
     cairo = cairo.override { xcbSupport = true; };
   };
-  
+
   i3minator = callPackage ../tools/misc/i3minator { };
 
   i3status = callPackage ../applications/window-managers/i3/status.nix { };
-- 
GitLab


From 19350fac6606e15e57650622e0f7092dbb398a19 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Feb 2014 11:01:05 +0100
Subject: [PATCH 1669/3789] nixUnstable: Update to 1.7pre3520_1017bd6

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index a340d51fd7d..33b304eec4c 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.7pre3327_0e2ca26";
+  name = "nix-1.7pre3520_1017bd6";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/8316406/download/5/${name}.tar.xz";
-    sha256 = "52cc082f4ce8ec3c316f032c0201cc76980df2845b15714e71acb2ef7715f1de";
+    url = "http://hydra.nixos.org/build/9253720/download/4/${name}.tar.xz";
+    sha256 = "7144ad4b4a7ff77165dc96424366fa28fb1a9e19b4f7c26d123b5f6bccf53d2d";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];
-- 
GitLab


From 34874dac7a7dc4ba3c552bbcda38a0434c1f5d8c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Feb 2014 11:01:32 +0100
Subject: [PATCH 1670/3789] google-talk-plugin: Update to 5.1.5.0

---
 .../mozilla-plugins/google-talk-plugin/default.nix   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index d9cd8f9be53..e319425d0b1 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -45,20 +45,22 @@ in
 
 stdenv.mkDerivation rec {
   name = "google-talk-plugin-${version}";
-  # Use the following to determine the current upstream version:
-  # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p'
-  version = "5.1.4.0";
+
+  # You can get the upstream version and SHA-1 hash from the following URLs:
+  # http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Package
+  # http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages
+  version = "5.1.5.0";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
-        sha256 = "19x1ss6kx7w8833f40pg1mwqr6sygz4ij4a7r7h3flmk67zywj4c";
+        sha1 = "fc830f4c7f5816f4578ec73e6d4aef059ad4a0b1";
       }
     else if stdenv.system == "i686-linux" then
       fetchurl {
         url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
-        sha256 = "1jxcridpqx46sdy4bw381rvffn1z93s280vhihwbgmiwjq5h4g41";
+        sha1 = "9b7043c3585b3479ba11aabb7b8af755a61df963";
       }
     else throw "Google Talk does not support your platform.";
 
-- 
GitLab


From 88078e4379dc84d2faccfbf2eb3bcb64d94f79f9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 12:13:29 +0100
Subject: [PATCH 1671/3789] flashtool: clean up the build some more

---
 pkgs/development/mobile/flashtool/default.nix | 35 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix
index 6f85ee648f6..b193709d90d 100644
--- a/pkgs/development/mobile/flashtool/default.nix
+++ b/pkgs/development/mobile/flashtool/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, requireFile, p7zip, jre, libusb1, androidsdk, gtk2, glib, libXtst }:
+{ stdenv, requireFile, p7zip, jre, libusb1, platformTools, gtk2, glib, libXtst }:
+
+assert stdenv.system == "i686-linux";
 
 # TODO:
 #
@@ -6,13 +8,6 @@
 #   replaced entirely. All these scripts do is try to guess the environment in
 #   which to run the Java binary (and they guess wrong on NixOS).
 #
-#   The release contains a freaky mixture of 32 and 64 bit binaries.
-#   Personally, I run these things (as 'root') in 32 bit Linux by way of:
-#
-#      setarch i686 ./FlashTool
-#
-#   It should be possible to run them in 64 bit mode, too.
-#
 #   The FlashTool scripts run 'chmod' on the binaries installed in the Nix
 #   store. These commands fail, naturally, because the Nix story is (hopefully)
 #   mounted read-only. This doesn't matter, though, because the build
@@ -36,23 +31,21 @@ stdenv.mkDerivation rec {
   '';
 
   buildPhase = ''
-    for n in x10flasher_lib/adb.linux.*; do
-      ln -sfv ${androidsdk}/bin/adb $n
-    done
-    for n in x10flasher_lib/fastboot.linux.*; do
-      ln -sfv ${androidsdk}/bin/fastboot $n
-    done
-    for n in "x10flasher_lib/linux/lib"*"/"*"/libus"*".so"* ; do
-      ln -sfv ${libusb1}/lib/libusb-1.0.so.0 $n
-    done
+    ln -s ${platformTools}/platform-tools/adb x10flasher_lib/adb.linux
+    ln -s ${platformTools}/platform-tools/fastboot x10flasher_lib/fastboot.linux
+    ln -s ${libusb1}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so
+
+    chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin
+    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86
+    ln -sf unyaffs.linux.x86 x10flasher_lib/unyaffs.linux
+
+    ln -s swt32.jar x10flasher_lib/swtlin/swt.jar
+
     sed -i \
-      -e 's|ln -sf libusbx-1.0.so.0.1.0|ln -sf ${libusb1}/lib/libusb-1.0.so.0|' \
+      -e 's|$(uname -m)|i686|' \
       -e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \
       -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${libXtst}/lib:${glib}/lib:${gtk2}/lib:./x10flasher_lib/linux/lib32|' \
       FlashTool FlashToolConsole
-    chmod +x x10flasher_lib/unyaffs.linux.x86
-    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86
-    ln -sf unyaffs.linux.x86 x10flasher_lib/unyaffs.linux.x64
   '';
 
   installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c50fbdb4d82..4c79f3a7d32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -926,8 +926,7 @@ let
   fio = callPackage ../tools/system/fio { };
 
   flashtool = callPackage_i686 ../development/mobile/flashtool {
-    androidsdk = pkgs.pkgsi686Linux.androidsdk_4_1;
-    inherit (pkgs.pkgsi686Linux.xlibs) libXtst;
+    platformTools = androidenv.platformTools;
   };
 
   flpsed = callPackage ../applications/editors/flpsed { };
-- 
GitLab


From 893fc5e2f39d9fef2a43fcbda9522ea45eedab26 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 12:13:37 +0100
Subject: [PATCH 1672/3789] flashtool: add a license tag

---
 pkgs/development/mobile/flashtool/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix
index b193709d90d..060c1a5bdb9 100644
--- a/pkgs/development/mobile/flashtool/default.nix
+++ b/pkgs/development/mobile/flashtool/default.nix
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.flashtool.net/";
     description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra";
+    license = stdenv.lib.license.unfreeRedistributableFirmware;
 
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = stdenv.lib.platforms.none;
-- 
GitLab


From 691f6c4c5907bd0db7b8f64b44d0f000ce4087b5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 28 Feb 2014 06:16:57 -0500
Subject: [PATCH 1673/3789] Fix mysql test evaluation

---
 nixos/tests/mysql-replication.nix | 1 +
 nixos/tests/mysql.nix             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index 28a1187dd18..a68d21c82b4 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
@@ -11,6 +11,7 @@ in
 
       {
         services.mysql.enable = true;
+        services.mysql.package = pkgs.mysql;
 	services.mysql.replication.role = "master";
 	services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
 	services.mysql.initialScript = pkgs.writeText "initmysql"
diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix
index b48850738b7..abdd3909221 100644
--- a/nixos/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
@@ -9,6 +9,7 @@
         services.mysql.enable = true;
 	services.mysql.replication.role = "master";
 	services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
+        services.mysql.package = pkgs.mysql;
       };
   };
 
-- 
GitLab


From dbafe00eba6f01257316437c9f2f22df64b8a4c2 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Fri, 7 Feb 2014 16:20:47 +0400
Subject: [PATCH 1674/3789] haskell-lushtags: add version 0.0.1

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

diff --git a/pkgs/development/libraries/haskell/lushtags/default.nix b/pkgs/development/libraries/haskell/lushtags/default.nix
new file mode 100644
index 00000000000..bf05cd5e63d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lushtags/default.nix
@@ -0,0 +1,17 @@
+{ cabal, haskellSrcExts, text, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "lushtags";
+  version = "0.0.1";
+  sha256 = "0325c064nsczypapvwdchx7x5n69jxjbyjs90ah7q5ydxbjl6w9c";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ haskellSrcExts text vector ];
+  jailbreak = true;
+  meta = {
+    homepage = "https://github.com/bitc/lushtags";
+    description = "Create ctags compatible tags files for Haskell programs";
+    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 ca4e9424c8e..c0112f22718 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1638,6 +1638,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   logict = callPackage ../development/libraries/haskell/logict {};
 
+  lushtags = callPackage ../development/libraries/haskell/lushtags {};
+
   maccatcher = callPackage ../development/libraries/haskell/maccatcher {};
 
   markdownUnlit = callPackage ../development/libraries/haskell/markdown-unlit {};
-- 
GitLab


From f019d8e101c7681f5980697537d1a3147a30abcf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:27:50 +0100
Subject: [PATCH 1675/3789] haskell-libjenkins: re-generate with cabal2nix

---
 pkgs/development/libraries/haskell/libjenkins/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/libjenkins/default.nix b/pkgs/development/libraries/haskell/libjenkins/default.nix
index 977ef112f09..722e280c6e5 100644
--- a/pkgs/development/libraries/haskell/libjenkins/default.nix
+++ b/pkgs/development/libraries/haskell/libjenkins/default.nix
@@ -16,11 +16,10 @@ cabal.mkDerivation (self: {
     httpClient httpConduit httpTypes lens monadControl network text
     transformers xmlConduit
   ];
+  doCheck = false;
   meta = {
     description = "Jenkins API interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-  # Test wants access to /etc/ssl
-  doCheck = false;
 })
-- 
GitLab


From e5b65b7f1dde4878bcea69ad43e6a43ccd8cae86 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:28:02 +0100
Subject: [PATCH 1676/3789] haskell-scotty: re-generate with cabal2nix

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

diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
index 5d354af308d..e51c2a7a64c 100644
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -11,11 +11,11 @@ cabal.mkDerivation (self: {
     aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes
     mtl regexCompat text transformers wai waiExtra warp
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/scotty-web/scotty";
     description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-  jailbreak = true;
 })
-- 
GitLab


From 723f85d29346b5828daae2ac0d1fef0f381f6c77 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:28:25 +0100
Subject: [PATCH 1677/3789] haskell-singletons: re-generate with cabal2nix

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

diff --git a/pkgs/development/libraries/haskell/singletons/default.nix b/pkgs/development/libraries/haskell/singletons/default.nix
index 692cc528454..48f12cd8825 100644
--- a/pkgs/development/libraries/haskell/singletons/default.nix
+++ b/pkgs/development/libraries/haskell/singletons/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.9.3";
   sha256 = "0m90k3ygm04c0gjfiaw5rmajyn2yz0ldcqm2xmm39d10270skpb4";
   buildDepends = [ mtl syb thDesugar ];
+  noHaddock = true;
   meta = {
     homepage = "http://www.cis.upenn.edu/~eir/packages/singletons";
     description = "A framework for generating singleton types";
@@ -12,5 +13,4 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
-  noHaddock = true;
 })
-- 
GitLab


From 849b16129c51d5856ea429359866cadf927bd0e5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:43:37 +0100
Subject: [PATCH 1678/3789] haskell-largeword: update to version 1.1.0

The latest version of largeword needs "jailbreak" to fix inconsistent version
requirements within its own Cabal file:

  https://github.com/idontgetoutmuch/largeword/issues/6
---
 .../libraries/haskell/largeword/default.nix          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix
index da0cafb9ba7..c9ee79e4760 100644
--- a/pkgs/development/libraries/haskell/largeword/default.nix
+++ b/pkgs/development/libraries/haskell/largeword/default.nix
@@ -1,15 +1,17 @@
-{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2
+{ cabal, binary, HUnit, QuickCheck, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2
 }:
 
 cabal.mkDerivation (self: {
   pname = "largeword";
-  version = "1.0.5";
-  sha256 = "0icwqwpn59xd0qfpaihvwz1waax617qqcl05jv9f26sjdr8688dl";
+  version = "1.1.0";
+  sha256 = "1xpyzgwhjz625jkr8ax21g8cdkrk89jknrx4nxscwfaw67rla8ja";
+  buildDepends = [ binary ];
   testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
+    binary HUnit QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/idontgetoutmuch/largeword";
     description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required";
-- 
GitLab


From fbd57958521c7c9f9b3320db39928cc21fcaf80c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:43:45 +0100
Subject: [PATCH 1679/3789] haskell-yi-contrib: update to version 0.7.1

---
 pkgs/applications/editors/yi/yi-contrib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/yi/yi-contrib.nix b/pkgs/applications/editors/yi/yi-contrib.nix
index e2fadcca345..0ed6e877862 100644
--- a/pkgs/applications/editors/yi/yi-contrib.nix
+++ b/pkgs/applications/editors/yi/yi-contrib.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yi-contrib";
-  version = "0.7.0";
-  sha256 = "12x9ps5yrszr8dlj15kmsm9myq3gzd9x9nacvl3x6cq91wk53mzj";
+  version = "0.7.1";
+  sha256 = "0915ikck01kc5npbvywd9r7azylqrhfymzc72rf4iaghz4w939li";
   buildDepends = [ dataAccessor filepath mtl split yi ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/Yi";
-- 
GitLab


From 861061cf65507b58bcb43da663c2a887f32f4927 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:43:47 +0100
Subject: [PATCH 1680/3789] haskell-yi: update to version 0.7.1

---
 pkgs/applications/editors/yi/yi.nix | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix
index 4dfc60bef76..b504af14904 100644
--- a/pkgs/applications/editors/yi/yi.nix
+++ b/pkgs/applications/editors/yi/yi.nix
@@ -1,25 +1,24 @@
 { cabal, alex, binary, Cabal, cautiousFile, concreteTyperep
 , dataAccessor, dataAccessorMtl, dataAccessorTemplate, derive, Diff
-, dlist, dyre, filepath, fingertree, ghcPaths, glib, gtk, hashable
-, hint, HUnit, mtl, pango, parsec, pointedlist, pureMD5, QuickCheck
-, random, regexBase, regexTdfa, split, testFramework
-, testFrameworkHunit, time, uniplate, unixCompat
-, unorderedContainers, utf8String, vty, xdgBasedir
+, dlist, dyre, filepath, fingertree, glib, gtk, hashable, hint
+, HUnit, mtl, pango, parsec, pointedlist, QuickCheck, random
+, regexBase, regexTdfa, split, testFramework, testFrameworkHunit
+, time, uniplate, unixCompat, unorderedContainers, utf8String, vty
+, xdgBasedir
 }:
 
 cabal.mkDerivation (self: {
   pname = "yi";
-  version = "0.7.0";
-  sha256 = "0mzcjgp12k5mxb37r6chxsk726b1qxds49ch656bpgrg7n22w2j1";
+  version = "0.7.1";
+  sha256 = "111xg7qpjhsqf6pfr136wh8km3lrgpzghd9h5rlypafr61w59vly";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     binary Cabal cautiousFile concreteTyperep dataAccessor
     dataAccessorMtl dataAccessorTemplate derive Diff dlist dyre
-    filepath fingertree ghcPaths glib gtk hashable hint mtl pango
-    parsec pointedlist pureMD5 QuickCheck random regexBase regexTdfa
-    split time uniplate unixCompat unorderedContainers utf8String vty
-    xdgBasedir
+    filepath fingertree glib gtk hashable hint mtl pango parsec
+    pointedlist QuickCheck random regexBase regexTdfa split time
+    uniplate unixCompat unorderedContainers utf8String vty xdgBasedir
   ];
   testDepends = [
     filepath HUnit QuickCheck testFramework testFrameworkHunit
-- 
GitLab


From 8cd17a8b0312fcb455195a4c1f45f9a652184e12 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:43:49 +0100
Subject: [PATCH 1681/3789] haskell-git-annex: update to version 5.20140227

---
 .../git-and-tools/git-annex/default.nix       | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 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 3019785a40c..8a6244525e6 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
@@ -2,35 +2,35 @@
 , caseInsensitive, clientsession, cryptoApi, cryptohash, curl
 , dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance
 , extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet
-, hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, IfElse
-, json, lsof, MissingH, MonadCatchIOTransformers, monadControl, mtl
-, network, networkConduit, networkInfo, networkMulticast
+, hinotify, hS3, hslogger, HTTP, httpClient, httpConduit, httpTypes
+, IfElse, json, liftedBase, lsof, MissingH
+, MonadCatchIOTransformers, monadControl, mtl, network
+, networkConduit, networkInfo, networkMulticast
 , networkProtocolXmpp, openssh, optparseApplicative, perl
 , QuickCheck, random, regexTdfa, rsync, SafeSemaphore, SHA, stm
 , tasty, tastyHunit, tastyQuickcheck, tastyRerun, text, time
 , transformers, unixCompat, utf8String, uuid, wai, waiLogger, warp
-, which, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault
-, yesodForm, yesodStatic
+, which, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm
+, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140221";
-  sha256 = "0z6awqbk6kagssx26ddixbrl381c1kmsmlgaqmx087g4rwp43wqb";
+  version = "5.20140227";
+  sha256 = "0zdaryvfpbmc454798z3z3sshf0br8v3sw0vnksqng3zm3w73dah";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     aeson async blazeBuilder bloomfilter caseInsensitive clientsession
     cryptoApi cryptohash dataDefault dataenc DAV dbus dlist dns
     editDistance extensibleExceptions feed filepath gnutls hamlet
-    hinotify hS3 hslogger HTTP httpConduit httpTypes IfElse json
-    MissingH MonadCatchIOTransformers monadControl mtl network
-    networkConduit networkInfo networkMulticast networkProtocolXmpp
-    optparseApplicative QuickCheck random regexTdfa SafeSemaphore SHA
-    stm tasty tastyHunit tastyQuickcheck tastyRerun text time
-    transformers unixCompat utf8String uuid wai waiLogger warp
-    xmlConduit xmlTypes yesod yesodCore yesodDefault yesodForm
-    yesodStatic
+    hinotify hS3 hslogger HTTP httpClient httpConduit httpTypes IfElse
+    json liftedBase MissingH MonadCatchIOTransformers monadControl mtl
+    network networkConduit networkInfo networkMulticast
+    networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa
+    SafeSemaphore SHA stm tasty tastyHunit tastyQuickcheck tastyRerun
+    text time transformers unixCompat utf8String uuid wai waiLogger
+    warp xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic
   ];
   buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
   configureFlags = "-fS3
-- 
GitLab


From f9fd012c03c60564483001d46a1fc3618447224d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:43:51 +0100
Subject: [PATCH 1682/3789] haskell-JuicyPixels: update to version 3.1.4.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 be9c67f797e..5e12adc39a8 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.3.3";
-  sha256 = "1j1kdr6x7rhpa45is04haxgf4i2jghcgak4km0f2i0k3pyiv647x";
+  version = "3.1.4.1";
+  sha256 = "12yq6wv0hs8kdckw1wgfssvnl8nvfanic8ciz8r2cjcwnlidh324";
   buildDepends = [
     binary deepseq mtl primitive transformers vector zlib
   ];
-- 
GitLab


From dfa12250a6c1b4a993eaa8268aa9973b1a154923 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:43:53 +0100
Subject: [PATCH 1683/3789] haskell-MemoTrie: update to version 0.6.2

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

diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix
index f3bd183d137..5d8fc314819 100644
--- a/pkgs/development/libraries/haskell/MemoTrie/default.nix
+++ b/pkgs/development/libraries/haskell/MemoTrie/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MemoTrie";
-  version = "0.6.1";
-  sha256 = "1bx0xd28irxjrq181wirx0vdrdj4qg4n4wj7ya27lkh408mwsxm6";
+  version = "0.6.2";
+  sha256 = "1g4b82s30bqkfids3iywf873nyn8h7l8rp8l3xl58smj5lbi3p4x";
   buildDepends = [ void ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/MemoTrie";
-- 
GitLab


From 417d6bd4f6307b47dd750595f69311a891993e56 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:43:54 +0100
Subject: [PATCH 1684/3789] haskell-conduit: update to version 1.0.15.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 bf28c20e714..c5fe6d9d379 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.15";
-  sha256 = "1ciys2b7a6n5k0ld66wpjxnrs5ys5dvg9n5k8282bc5zsd54mb59";
+  version = "1.0.15.1";
+  sha256 = "0pbrsa00x8qr856532iinw9lyliwh7gwzyd1pshdmj3gkbqpf2bv";
   buildDepends = [
     liftedBase mmorph monadControl mtl resourcet text textStreamDecode
     transformers transformersBase void
-- 
GitLab


From e515209b0d2ebffba5cff223ca58a18cafbf8d37 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:43:56 +0100
Subject: [PATCH 1685/3789] haskell-hamlet: update to version 1.1.9.2

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

diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index f7456f1fdaf..445fb67386e 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.1.9";
-  sha256 = "194a4qnmpgralhvrv6813qfjjy80919famh824lyl9iryqwsbfkc";
+  version = "1.1.9.2";
+  sha256 = "122wfkk23a2bvz29hrgxj24k6cf315fwdbz70ih3nclawh0bhani";
   buildDepends = [
     blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare
     systemFileio systemFilepath text time
-- 
GitLab


From 40d3105e81662a745fdaea6f1668f6a4be955fc1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:43:58 +0100
Subject: [PATCH 1686/3789] haskell-iproute: update to version 1.2.12

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

diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix
index 045bb64035c..89a57614160 100644
--- a/pkgs/development/libraries/haskell/iproute/default.nix
+++ b/pkgs/development/libraries/haskell/iproute/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "iproute";
-  version = "1.2.11";
-  sha256 = "14f96sb41f5m14186900rz84vwv7idjiylp8m5nsm6gganvh4sh4";
+  version = "1.2.12";
+  sha256 = "19pr6my4nw7qq9lsp6xvz55lm9svwzqka5qcqy79sfdkxg459rg5";
   buildDepends = [ appar byteorder network ];
   testDepends = [
     appar byteorder doctest hspec network QuickCheck safe
-- 
GitLab


From 56201a4996682609c6446437155403de5440a61f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:44:00 +0100
Subject: [PATCH 1687/3789] haskell-mime: update to version 0.4.0.1

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

diff --git a/pkgs/development/libraries/haskell/mime/default.nix b/pkgs/development/libraries/haskell/mime/default.nix
index b4d2f7d7e50..6e1a3482c04 100644
--- a/pkgs/development/libraries/haskell/mime/default.nix
+++ b/pkgs/development/libraries/haskell/mime/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mime";
-  version = "0.4.0";
-  sha256 = "159jp7dcyx26slda2743zdr2prnm707mnglcb9p66hr1wjh98kx4";
+  version = "0.4.0.1";
+  sha256 = "1m987sqnns54qbsg68332mnrjkh71z6s83cma2kwavf0y305mrp0";
   buildDepends = [ text ];
   meta = {
     homepage = "https://github.com/GaloisInc/mime";
-- 
GitLab


From 648adb54479f85fb519def1c2511f10fe700178a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:44:01 +0100
Subject: [PATCH 1688/3789] haskell-mono-traversable: update to version 0.3.0.3

---
 .../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 9c6e2c70cdf..e0cb6e3a3de 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.3.0.2";
-  sha256 = "1aa6dm75ff822fazdnjfgggy3y2zxa8vy4dn2vvx0y8i9pgh0m0l";
+  version = "0.3.0.3";
+  sha256 = "0n8bgynapx43f4agbp596ywnfv0cm12x3ihifr3vzv78iixnl0xh";
   buildDepends = [
     comonad hashable semigroupoids semigroups text transformers
     unorderedContainers vector vectorInstances
-- 
GitLab


From 057bbc47a2eb292187e4d1eb6d25405e0f5a19fd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:44:03 +0100
Subject: [PATCH 1689/3789] haskell-network-conduit-tls: update to version
 1.0.4.2

---
 .../haskell/network-conduit-tls/default.nix      | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
index 28cf920cf28..4884a462a6d 100644
--- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
@@ -1,17 +1,15 @@
-{ cabal, aeson, certificate, conduit, connection, cprngAes
-, cryptoApi, cryptoRandomApi, dataDefault, HUnit, monadControl, mtl
-, network, networkConduit, pem, systemFileio, systemFilepath, tls
-, transformers
+{ cabal, conduit, connection, cprngAes, dataDefault, HUnit
+, monadControl, mtl, network, networkConduit, systemFileio
+, systemFilepath, tls, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "network-conduit-tls";
-  version = "1.0.4.1";
-  sha256 = "1l79v4ippyfw6pl4h3vqswh79vcif80phf6kq5fr4xmv3b6nbc06";
+  version = "1.0.4.2";
+  sha256 = "1pgb6k6g10hy2k4sihj88n6w7400d4grja2crhhv1cydqdn858rc";
   buildDepends = [
-    aeson certificate conduit connection cprngAes cryptoApi
-    cryptoRandomApi dataDefault monadControl network networkConduit pem
-    systemFileio systemFilepath tls transformers
+    conduit connection cprngAes dataDefault monadControl network
+    networkConduit systemFileio systemFilepath tls transformers
   ];
   testDepends = [ conduit connection HUnit mtl networkConduit ];
   meta = {
-- 
GitLab


From 8d5a80645e00a5062fc4ba427ed035cc47405587 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:44:05 +0100
Subject: [PATCH 1690/3789] haskell-pipes-postgresql-simple: update to version
 0.1.2.0

---
 .../libraries/haskell/pipes-postgresql-simple/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix
index aced7c741ab..830f188fed8 100644
--- a/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-postgresql-simple";
-  version = "0.1.1.2";
-  sha256 = "0m9p3ddrv73c24yh0a2q14zkr4iibfysy2q9bwp6m100z3qk1bgy";
+  version = "0.1.2.0";
+  sha256 = "12ij2msdwjzzc93mlvvizh6amam5ld9j1a0b9xsa2awdjd21mwc1";
   buildDepends = [
     async exceptions mtl pipes pipesConcurrency pipesSafe
     postgresqlSimple stm text transformers
-- 
GitLab


From cbc1e6fa6f413c668c23e83acf87660e070128e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:44:07 +0100
Subject: [PATCH 1691/3789] haskell-shake: update to version 0.11.3

---
 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 f3ec1471cbe..f7505c62fc1 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.2";
-  sha256 = "1mhll4h6za67pjcm4amdcibfd7ny2kfx4mfws0lrd903j1p5b00q";
+  version = "0.11.3";
+  sha256 = "0j4b9fd60kvkayf5zgr8d8w0i4k8ly2v0vnfg80k0lkwpka7nwzl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 5b497746516f0d05cf78a23000b462a4f41a4cce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:44:08 +0100
Subject: [PATCH 1692/3789] haskell-text-stream-decode: update to version
 0.1.0.4

---
 .../libraries/haskell/text-stream-decode/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/text-stream-decode/default.nix b/pkgs/development/libraries/haskell/text-stream-decode/default.nix
index 9954dc4f6a2..eb55d68666c 100644
--- a/pkgs/development/libraries/haskell/text-stream-decode/default.nix
+++ b/pkgs/development/libraries/haskell/text-stream-decode/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "text-stream-decode";
-  version = "0.1.0.3";
-  sha256 = "0gz5w7n7yb6z5mfzlg3yg9s89wsqnmmk4j94invj2da0rw7d03xv";
+  version = "0.1.0.4";
+  sha256 = "041winxbqkz1y6vx6sgbhl925n5qxii2q7ijcwa85sj4dkrqpafr";
   buildDepends = [ text ];
   testDepends = [ deepseq hspec text ];
   meta = {
-- 
GitLab


From 2438017f300bf3d2cf95eef909fd347d87f933b6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 10:44:10 +0100
Subject: [PATCH 1693/3789] haskell-yesod-form: update to version 1.3.5.2

---
 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 7474884d4a0..7a7d1f16e05 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.5.1";
-  sha256 = "0jvza4ly3kjfsbayjcggf8fq0lcb8n9f6cp0q6fcif1xkwkkhmdh";
+  version = "1.3.5.2";
+  sha256 = "0ppzj04c5y02k2daw52g2pkzf85mhsg7n4hbkm05xk1crzbrbcxj";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
     dataDefault emailValidate hamlet network persistent resourcet
-- 
GitLab


From b792394119b8ffc4a2fd34a67048fe205a08dcd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 28 Feb 2014 13:32:08 +0100
Subject: [PATCH 1694/3789] nixos-manual: show manual on tty8 by default

---
 nixos/modules/services/misc/nixos-manual.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 1a8b85db329..9a5b170d5e6 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -63,7 +63,7 @@ in
 
     services.nixosManual.showManual = mkOption {
       type = types.bool;
-      default = false;
+      default = true;
       description = ''
         Whether to show the NixOS manual on one of the virtual
         consoles.
-- 
GitLab


From 9f67bfe7d2847a57b898e1abef238d07fe9e2fa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 28 Feb 2014 16:11:53 +0100
Subject: [PATCH 1695/3789] pythonPackages.pytz: 2012c -> 2013.9, fix Babel

---
 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 1c36dc7fcd5..5d2b8efd446 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4940,7 +4940,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       sha256 = "0bnin777lc53nxd1hp3apq410jj5wx92n08h7h4izpl4f4sx00lz";
     };
 
-    buildInputs = [ pytz ];
+    propagatedBuildInputs = [ pytz ];
 
     meta = {
       homepage = http://babel.edgewall.org;
@@ -5674,11 +5674,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   pytz = buildPythonPackage rec {
-    name = "pytz-2012c";
+    name = "pytz-2013.9";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pytz/${name}.tar.bz2";
-      md5 = "660e0cee7f6c419ca2665db460f65131";
+      md5 = "ec7076947a46a8a3cb33cbf2983a562c";
     };
 
     meta = {
-- 
GitLab


From ed4fd067bc0925598221aea1d38887f3d0a26576 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Feb 2014 16:09:24 +0100
Subject: [PATCH 1696/3789] doxygen: Update to 1.8.6

---
 .../tools/documentation/doxygen/default.nix         | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 69c1f4181cc..9a8979aaa6c 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchurl, perl, flex, bison, qt4 }:
+{ stdenv, fetchurl, perl, python, flex, bison, qt4 }:
 
 let
-  name = "doxygen-1.8.5";
+  name = "doxygen-1.8.6";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz";
-    sha256 = "09fcsz1rd4a9njsz3as7z8s3mk621pvcclavxbb6ib8jvdkqnfi4";
+    sha256 = "0pskjlkbj76m9ka7zi66yj8ffjcv821izv3qxqyyphf0y0jqcwba";
   };
 
   patches = [ ./tmake.patch ];
 
   buildInputs =
-    [ perl flex bison ]
+    [ perl python flex bison ]
     ++ stdenv.lib.optional (qt4 != null) qt4;
 
   prefixKey = "--prefix ";
@@ -23,7 +23,10 @@ stdenv.mkDerivation {
     [ "--dot dot" ]
     ++ stdenv.lib.optional (qt4 != null) "--with-doxywizard";
 
-  preConfigure = stdenv.lib.optionalString (qt4 != null)
+  preConfigure =
+    ''
+      patchShebangs .
+    '' + stdenv.lib.optionalString (qt4 != null)
     ''
       echo "using QTDIR=${qt4}..."
       export QTDIR=${qt4}
-- 
GitLab


From 4c2d1184fae99797476c3ad7847d83510ad05cd3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Feb 2014 16:14:11 +0100
Subject: [PATCH 1697/3789] flashtool: Fix evaluation

---
 pkgs/development/mobile/flashtool/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix
index 060c1a5bdb9..92b8c9a1845 100644
--- a/pkgs/development/mobile/flashtool/default.nix
+++ b/pkgs/development/mobile/flashtool/default.nix
@@ -56,8 +56,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.flashtool.net/";
     description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra";
-    license = stdenv.lib.license.unfreeRedistributableFirmware;
-
+    license = stdenv.lib.licenses.unfreeRedistributableFirmware;
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = stdenv.lib.platforms.none;
     maintainers = [ stdenv.lib.maintainers.simons ];
-- 
GitLab


From da2a336a3c79c6cd302fde4801c5d1cbc31c9f19 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Feb 2014 16:16:57 +0100
Subject: [PATCH 1698/3789] Remove tabs

---
 nixos/tests/mysql-replication.nix | 28 ++++++++++++++--------------
 nixos/tests/mysql.nix             |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index a68d21c82b4..94532189586 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
@@ -12,11 +12,11 @@ in
       {
         services.mysql.enable = true;
         services.mysql.package = pkgs.mysql;
-	services.mysql.replication.role = "master";
-	services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
-	services.mysql.initialScript = pkgs.writeText "initmysql"
+        services.mysql.replication.role = "master";
+        services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
+        services.mysql.initialScript = pkgs.writeText "initmysql"
         ''
-	  create user '${replicateUser}'@'%' identified by '${replicatePassword}';
+          create user '${replicateUser}'@'%' identified by '${replicatePassword}';
           grant replication slave on *.* to '${replicateUser}'@'%';
         '';
       };
@@ -26,11 +26,11 @@ in
 
       {
         services.mysql.enable = true;
-	services.mysql.replication.role = "slave";
-	services.mysql.replication.serverId = 2;
-	services.mysql.replication.masterHost = nodes.master.config.networking.hostName;
-	services.mysql.replication.masterUser = replicateUser;
-	services.mysql.replication.masterPassword = replicatePassword;
+        services.mysql.replication.role = "slave";
+        services.mysql.replication.serverId = 2;
+        services.mysql.replication.masterHost = nodes.master.config.networking.hostName;
+        services.mysql.replication.masterUser = replicateUser;
+        services.mysql.replication.masterPassword = replicatePassword;
       };
 
     slave2 =
@@ -38,11 +38,11 @@ in
 
       {
         services.mysql.enable = true;
-	services.mysql.replication.role = "slave";
-	services.mysql.replication.serverId = 3;
-	services.mysql.replication.masterHost = nodes.master.config.networking.hostName;
-	services.mysql.replication.masterUser = replicateUser;
-	services.mysql.replication.masterPassword = replicatePassword;
+        services.mysql.replication.role = "slave";
+        services.mysql.replication.serverId = 3;
+        services.mysql.replication.masterHost = nodes.master.config.networking.hostName;
+        services.mysql.replication.masterUser = replicateUser;
+        services.mysql.replication.masterPassword = replicatePassword;
       };
   };
 
diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix
index abdd3909221..bceeb8beabc 100644
--- a/nixos/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
@@ -7,8 +7,8 @@
 
       {
         services.mysql.enable = true;
-	services.mysql.replication.role = "master";
-	services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
+        services.mysql.replication.role = "master";
+        services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
         services.mysql.package = pkgs.mysql;
       };
   };
-- 
GitLab


From 1d9cd24d0baaaf1deebaf41c51830be473ee4789 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Feb 2014 16:17:34 +0100
Subject: [PATCH 1699/3789] Fix mysql-replication test

---
 nixos/tests/mysql-replication.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index 94532189586..f8c82f7ce9c 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
@@ -26,6 +26,7 @@ in
 
       {
         services.mysql.enable = true;
+        services.mysql.package = pkgs.mysql;
         services.mysql.replication.role = "slave";
         services.mysql.replication.serverId = 2;
         services.mysql.replication.masterHost = nodes.master.config.networking.hostName;
@@ -38,6 +39,7 @@ in
 
       {
         services.mysql.enable = true;
+        services.mysql.package = pkgs.mysql;
         services.mysql.replication.role = "slave";
         services.mysql.replication.serverId = 3;
         services.mysql.replication.masterHost = nodes.master.config.networking.hostName;
-- 
GitLab


From 05068ac554f92c2d588c39aa2df970abd0e765e8 Mon Sep 17 00:00:00 2001
From: Ian-Woo Kim <ianwookim@gmail.com>
Date: Wed, 19 Feb 2014 01:44:33 +0100
Subject: [PATCH 1700/3789] glibc: do not use system ld.so.preload (close
 #1788)

Modified according to the PR comment.
---
 pkgs/development/libraries/glibc/2.19/common.nix     |  3 +++
 .../glibc/2.19/dont-use-system-ld-so-preload.patch   | 12 ++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-preload.patch

diff --git a/pkgs/development/libraries/glibc/2.19/common.nix b/pkgs/development/libraries/glibc/2.19/common.nix
index 07baefa9281..6823e4d9f66 100644
--- a/pkgs/development/libraries/glibc/2.19/common.nix
+++ b/pkgs/development/libraries/glibc/2.19/common.nix
@@ -44,6 +44,9 @@ stdenv.mkDerivation ({
       /* Don't use /etc/ld.so.cache, for non-NixOS systems.  */
       ./dont-use-system-ld-so-cache.patch
 
+      /* Don't use /etc/ld.so.preload, but /etc/ld-nix.so.preload.  */
+      ./dont-use-system-ld-so-preload.patch
+
       /* Add blowfish password hashing support.  This is needed for
          compatibility with old NixOS installations (since NixOS used
          to default to blowfish). */
diff --git a/pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-preload.patch b/pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-preload.patch
new file mode 100644
index 00000000000..fabb6c3ec5e
--- /dev/null
+++ b/pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-preload.patch
@@ -0,0 +1,12 @@
+diff -rupN a/elf/rtld.c b/elf/rtld.c
+--- a/elf/rtld.c	2013-08-11 00:52:55.000000001 +0200
++++ b/elf/rtld.c	2014-02-18 13:56:19.000000001 +0100
+@@ -1639,7 +1639,7 @@ ERROR: ld.so: object '%s' cannot be load
+      open().  So we do this first.  If it succeeds we do almost twice
+      the work but this does not matter, since it is not for production
+      use.  */
+-  static const char preload_file[] = "/etc/ld.so.preload";
++  static const char preload_file[] = "/etc/ld-nix.so.preload";
+   if (__builtin_expect (__access (preload_file, R_OK) == 0, 0))
+     {
+       /* Read the contents of the file.  */
-- 
GitLab


From 037684283af7561026374930a8c7c51874ce46a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 28 Feb 2014 16:47:05 +0100
Subject: [PATCH 1701/3789] typo

---
 .../browsers/mozilla-plugins/google-talk-plugin/default.nix     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index e319425d0b1..e1bc4e977f6 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   name = "google-talk-plugin-${version}";
 
   # You can get the upstream version and SHA-1 hash from the following URLs:
-  # http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Package
+  # http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages
   # http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages
   version = "5.1.5.0";
 
-- 
GitLab


From 9e4b5366f843e70a2f854c9ae9fce373a76e5274 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Feb 2014 16:56:17 +0100
Subject: [PATCH 1702/3789] Bump the overly optimistic version number

---
 .version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.version b/.version
index 07167f90842..af805b45bd8 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-14.02
\ No newline at end of file
+14.04
\ No newline at end of file
-- 
GitLab


From 0fef1c502b3de6e28596308e5e6208a8ea1e3f71 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Fri, 28 Feb 2014 17:06:18 +0100
Subject: [PATCH 1703/3789] Add indentation for multi-line strings in
 seafile-client expression

---
 .../networking/seafile-client/default.nix      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 82e5d08da41..4ab0a9f8069 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -14,19 +14,19 @@ stdenv.mkDerivation rec
   buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ];
 
   builder = writeScript "${name}-builder.sh" ''
-  source $stdenv/setup
+    source $stdenv/setup
 
-  tar xvfz $src
-  cd seafile-client-*
+    tar xvfz $src
+    cd seafile-client-*
 
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_INSTALL_PREFIX="$out" .
-  make -j1
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_INSTALL_PREFIX="$out" .
+    make -j1
 
-  make install
+    make install
 
-  wrapProgram $out/bin/seafile-applet \
-    --suffix PATH : ${ccnet}/bin:${seafile-shared}/bin
-  '';
+    wrapProgram $out/bin/seafile-applet \
+      --suffix PATH : ${ccnet}/bin:${seafile-shared}/bin
+    '';
 
   meta =
   {
-- 
GitLab


From 53e743fa08623317b43c341bb17c764348fccbf4 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Fri, 28 Feb 2014 17:19:48 +0100
Subject: [PATCH 1704/3789] Update Virtualbox and Guest Additions to 4.3.8,
 Oracle Extensions to 92456

---
 .../applications/virtualization/virtualbox/default.nix | 10 +++++-----
 .../virtualbox/guest-additions/default.nix             |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 440bcd2d9cd..819b06be012 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.6"; # changes ./guest-additions as well
+  version = "4.3.8"; # 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 = "91406";
+  extpackRevision = "92456";
   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.6/SHA256SUMS
-    sha256 = "983f87e4746a2e6739090d0ce905c24a71e209e87f11c449bdc3d0ca5bb4fde2";
+    # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.8/SHA256SUMS
+    sha256 = "eb364239fc399416af6c985b3082bfbdd206d42a60e7af98ffba13d60912b864";
     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 = "09xvrk5g14q71lmprcdaci6fks6yilpq99scxslzn1hb5viy2iy5";
+    sha256 = "ffabd8735bdc80753cec29d01b499769f41e083f37a3f58b3055f19d3b1b9641";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 3cbd59ccabf..f9b8fd457a8 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 = "95648fcdb5d028e64145a2fe2f2f28c946d219da366389295a61fed296ca79f0";
+    sha256 = "a1e58f3a15cab81b82424c6382a490bb02377d78d537a57538692fa83ce448c7";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";
-- 
GitLab


From 997fffb54e9fa969db9e3a31e8aece744016312d Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Fri, 28 Feb 2014 17:10:43 +0100
Subject: [PATCH 1705/3789] Set meta.platforms attribute to platforms.linux for
 Seafile packages and their prerequisites

---
 pkgs/applications/networking/seafile-client/default.nix | 1 +
 pkgs/development/libraries/libsearpc/default.nix        | 1 +
 pkgs/development/libraries/libzdb/default.nix           | 1 +
 pkgs/misc/seafile-shared/default.nix                    | 1 +
 pkgs/tools/networking/ccnet/default.nix                 | 1 +
 5 files changed, 5 insertions(+)

diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 4ab0a9f8069..d24437aabb6 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec
     homepage = "https://github.com/haiwen/seafile-clients";
     description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage";
     license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.calrama ];
   };
 }
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix
index b27519fa66c..863a42b741b 100644
--- a/pkgs/development/libraries/libsearpc/default.nix
+++ b/pkgs/development/libraries/libsearpc/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec
     homepage = "https://github.com/haiwen/libsearpc";
     description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System.";
     license = stdenv.lib.licenses.lgpl3;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.calrama ];
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix
index 25eef6c7a99..90692569f08 100644
--- a/pkgs/development/libraries/libzdb/default.nix
+++ b/pkgs/development/libraries/libzdb/default.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec
     homepage = "http://www.tildeslash.com/libzdb/";
     description = "A small, easy to use Open Source Database Connection Pool Library.";
     license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.calrama ];
   };
 }
\ No newline at end of file
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index f392e9ece7a..53092e3a8b7 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec
     homepage = "https://github.com/haiwen/seafile";
     description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons";
     license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.calrama ];
   };
 }
diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix
index 95479b8598e..14b88ddafe8 100644
--- a/pkgs/tools/networking/ccnet/default.nix
+++ b/pkgs/tools/networking/ccnet/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec
     homepage = "https://github.com/haiwen/ccnet";
     description = "A framework for writing networked applications in C.";
     license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.calrama ];
   };
 }
-- 
GitLab


From 6c77e15f19a4984bbcd112ef271fcec4ec221893 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Feb 2014 18:33:45 +0100
Subject: [PATCH 1706/3789] doxygen: Remove 1.7

Current 1.8 seems to generate LaTeX output fine.
---
 .../tools/documentation/doxygen/1.7.nix       | 52 -------------------
 pkgs/top-level/all-packages.nix               |  6 ---
 2 files changed, 58 deletions(-)
 delete mode 100644 pkgs/development/tools/documentation/doxygen/1.7.nix

diff --git a/pkgs/development/tools/documentation/doxygen/1.7.nix b/pkgs/development/tools/documentation/doxygen/1.7.nix
deleted file mode 100644
index f530ed70e37..00000000000
--- a/pkgs/development/tools/documentation/doxygen/1.7.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv, fetchurl, perl, flex, bison, qt4 }:
-
-let
-  name = "doxygen-1.7.4";
-in
-stdenv.mkDerivation {
-  inherit name;
-
-  src = fetchurl {
-    url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz";
-    sha256 = "0rnzyp5f8c454fdkgpg5hpxwmx642spgxcpw3blbvnyw8129jp44";
-  };
-
-  patches = [ ./tmake.patch ];
-
-  buildInputs =
-    [ perl flex bison ]
-    ++ stdenv.lib.optional (qt4 != null) qt4;
-
-  prefixKey = "--prefix ";
-
-  configureFlags =
-    [ "--dot dot" ]
-    ++ stdenv.lib.optional (qt4 != null) "--with-doxywizard";
-
-  preConfigure = stdenv.lib.optionalString (qt4 != null)
-    ''
-      echo "using QTDIR=${qt4}..."
-      export QTDIR=${qt4}
-    '';
-
-  makeFlags = "MAN1DIR=share/man/man1";
-
-  enableParallelBuilding = true;
-
-  meta = {
-    license = "GPLv2+";
-    homepage = "http://doxygen.org/";
-    description = "Doxygen, a source code documentation generator tool";
-
-    longDescription = ''
-      Doxygen is a documentation system for C++, C, Java, Objective-C,
-      Python, IDL (CORBA and Microsoft flavors), Fortran, VHDL, PHP,
-      C\#, and to some extent D.  It can generate an on-line
-      documentation browser (in HTML) and/or an off-line reference
-      manual (in LaTeX) from a set of documented source files.
-    '';
-
-    maintainers = [stdenv.lib.maintainers.simons];
-    platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c79f3a7d32..6e0b9b1b4ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3574,12 +3574,6 @@ let
 
   doxygen = lowPrio (doxygen_gui.override { qt4 = null; });
 
-  /* XXX: The LaTeX output with Doxygen 1.8.0 makes LaTeX barf.
-     See <https://bugzilla.gnome.org/show_bug.cgi?id=670973>.  */
-  doxygen_1_7 = callPackage ../development/tools/documentation/doxygen/1.7.nix {
-    qt4 = null;
-  };
-
   doxygen_gui = callPackage ../development/tools/documentation/doxygen { };
 
   drush = callPackage ../development/tools/misc/drush { };
-- 
GitLab


From 72783a8c5bd09e2e5402d9068270b3091062dde7 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Fri, 28 Feb 2014 21:55:07 +0400
Subject: [PATCH 1707/3789] Add Symbola font

---
 pkgs/data/fonts/symbola/default.nix | 40 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/data/fonts/symbola/default.nix

diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix
new file mode 100644
index 00000000000..993a4c4f46d
--- /dev/null
+++ b/pkgs/data/fonts/symbola/default.nix
@@ -0,0 +1,40 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "symbola-7.12";
+
+  ttf = fetchurl {
+    url = "http://users.teilar.gr/~g1951d/Symbola.ttf";
+    sha256 = "7acc058bd4e56cc986b2a46420520f59be402c3565c202b5dcebca7f3bfd8b5a";
+  };
+  docs_pdf = fetchurl {
+    url = "http://users.teilar.gr/~g1951d/Symbola.pdf";
+    sha256 = "11bb082ba5c2780a6f94a9bcddf4f314a54e2650bb63ce3081d1dc867c5e6843";
+  };
+  docs_docx = fetchurl {
+    url = "http://users.teilar.gr/~g1951d/Symbola.docx";
+    sha256 = "4f0ab494e1e5a7aac147aa7bb8b8bdba7278aee2da942a35f995feb9051515b9";
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp -v "$ttf" $out/share/fonts/truetype/"${ttf.name}"
+
+    mkdir -p "$out/doc/${name}"
+    cp -v "$docs_pdf" "$out/doc/${name}/${docs_pdf.name}"
+    cp -v "$docs_docx" "$out/doc/${name}/${docs_docx.name}"
+  '';
+
+  meta = {
+    description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode...";
+
+    # In lieu of a licence:
+    # Fonts in this site are offered free for any use;
+    # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed.
+    license = "Unicode Fonts for Ancient Scripts";
+
+    homepage = http://users.teilar.gr/~g1951d/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c79f3a7d32..109dea68232 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7355,6 +7355,8 @@ let
 
   stdmanpages = callPackage ../data/documentation/std-man-pages { };
 
+  symbola = callPackage ../data/fonts/symbola { };
+
   iana_etc = callPackage ../data/misc/iana-etc { };
 
   poppler_data = callPackage ../data/misc/poppler-data { };
-- 
GitLab


From 6180ed8af3750380d2a585def7bd64ca46473aca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Feb 2014 16:13:07 +0100
Subject: [PATCH 1708/3789] haskell-packages.nix: switch default versions to
 aeson 0.7.x and lens 4.x

The only package remaining user of lens 3.x is the 'diagrams' package.
---
 pkgs/top-level/haskell-packages.nix | 63 ++++++++++++++---------------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c0112f22718..cb34eff7b2f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -530,7 +530,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix {
     blazeBuilder = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") then self.blazeBuilder else null;
   };
-  aeson = self.aeson_0_6_2_1;
+  aeson = self.aeson_0_7_0_1;
 
   aesonLens = callPackage ../development/libraries/haskell/aeson-lens {};
 
@@ -941,12 +941,24 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   dice = callPackage ../development/libraries/haskell/dice {};
 
   diagrams = callPackage ../development/libraries/haskell/diagrams/diagrams.nix {};
-  diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix {};
-  diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {};
-  diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix {};
-  diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {};
-  diagramsPostscript = callPackage ../development/libraries/haskell/diagrams/postscript.nix {};
-  diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix {};
+  diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix {
+    lens = self.lens_3_10_2;
+  };
+  diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {
+    lens = self.lens_3_10_2;
+  };
+  diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix {
+    lens = self.lens_3_10_2;
+  };
+  diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {
+    lens = self.lens_3_10_2;
+  };
+  diagramsPostscript = callPackage ../development/libraries/haskell/diagrams/postscript.nix {
+     lens = self.lens_3_10_2;
+  };
+  diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix {
+    lens = self.lens_3_10_2;
+  };
 
   Diff = callPackage ../development/libraries/haskell/Diff {};
 
@@ -958,10 +970,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   digestiveFunctors = callPackage ../development/libraries/haskell/digestive-functors {};
 
-  digestiveFunctorsAeson = callPackage ../development/libraries/haskell/digestive-functors-aeson {
-    aeson = self.aeson_0_7_0_1;
-    lens = self.lens_4_0_4;
-  };
+  digestiveFunctorsAeson = callPackage ../development/libraries/haskell/digestive-functors-aeson {};
 
   digestiveFunctorsHeist = callPackage ../development/libraries/haskell/digestive-functors-heist {};
 
@@ -1116,7 +1125,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   foldl = callPackage ../development/libraries/haskell/foldl {};
 
-  forceLayout = callPackage ../development/libraries/haskell/force-layout {};
+  forceLayout = callPackage ../development/libraries/haskell/force-layout {
+    lens = self.lens_3_10_2;
+  };
 
   free = callPackage ../development/libraries/haskell/free {};
 
@@ -1432,9 +1443,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {};
 
-  hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {
-    lens = self.lens_4_0_4;
-  };
+  hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {};
 
   hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {};
 
@@ -1535,10 +1544,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   json = callPackage ../development/libraries/haskell/json {};
 
-  jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {
-    aeson = self.aeson_0_7_0_1;
-    lens = self.lens_4_0_4;
-  };
+  jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {};
 
   jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
 
@@ -1573,10 +1579,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {};
 
   lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {};
-  lens_4_0_4 = callPackage ../development/libraries/haskell/lens/4.0.4.nix {
-    aeson = self.aeson_0_7_0_1;
-  };
-  lens = self.lens_3_10_2;
+  lens_4_0_4 = callPackage ../development/libraries/haskell/lens/4.0.4.nix {};
+  lens = self.lens_4_0_4;
 
   lensAeson = callPackage ../development/libraries/haskell/lens-aeson {};
 
@@ -1588,9 +1592,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     libffi = pkgs.libffi;
   };
 
-  libjenkins = callPackage ../development/libraries/haskell/libjenkins {
-    lens = self.lens_4_0_4;
-  };
+  libjenkins = callPackage ../development/libraries/haskell/libjenkins {};
 
   libmpd = callPackage ../development/libraries/haskell/libmpd {};
 
@@ -1602,9 +1604,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   liftedBase = callPackage ../development/libraries/haskell/lifted-base {};
 
-  linear = callPackage ../development/libraries/haskell/linear {
-    lens = self.lens_4_0_4;
-  };
+  linear = callPackage ../development/libraries/haskell/linear {};
 
   List = callPackage ../development/libraries/haskell/List {};
 
@@ -2182,10 +2182,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   socks = callPackage ../development/libraries/haskell/socks {};
 
-  sparse = callPackage ../development/libraries/haskell/sparse {
-    lens = self.lens_4_0_4;
-    linear = self.linear.override { lens = self.lens_4_0_4; };
-  };
+  sparse = callPackage ../development/libraries/haskell/sparse {};
 
   srcloc = callPackage ../development/libraries/haskell/srcloc {};
 
-- 
GitLab


From 6478f4da8193cbf7f4ccac9ac59ae607a28c4a79 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2014 13:55:40 +0100
Subject: [PATCH 1709/3789] haskell-largeword: update to version 1.1.1

---
 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 c9ee79e4760..18ea22d6cd0 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.0";
-  sha256 = "1xpyzgwhjz625jkr8ax21g8cdkrk89jknrx4nxscwfaw67rla8ja";
+  version = "1.1.1";
+  sha256 = "0dizzyicfj41cmdr9s0k75gf7cqbd2z1qk9kkvlq6rcz0249fz0x";
   buildDepends = [ binary ];
   testDepends = [
     binary HUnit QuickCheck testFramework testFrameworkHunit
-- 
GitLab


From 2bbe3130903f421f1c0a2966ccbd4ddc47222019 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Feb 2014 11:48:59 +0100
Subject: [PATCH 1710/3789] haskell-Chart: jailbreak to fix build with lens 4.x

Fixes <https://github.com/timbod7/haskell-chart/issues/21>.
---
 pkgs/development/libraries/haskell/Chart/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix
index 3b08c2d0e2c..5f7e8c2cb4b 100644
--- a/pkgs/development/libraries/haskell/Chart/default.nix
+++ b/pkgs/development/libraries/haskell/Chart/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     colour dataDefaultClass lens mtl operational time
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/timbod7/haskell-chart/wiki";
     description = "A library for generating 2D Charts and Plots";
-- 
GitLab


From 1f822d3b5f8b2e7e4b20476b3ed51775d33a18c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 28 Feb 2014 23:21:53 +0100
Subject: [PATCH 1711/3789] fix tarball

---
 doc/stdenv.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index afea416da8a..1846886919d 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1158,7 +1158,7 @@ echo @foo@
 
   <varlistentry>
     <term>gdk-pixbuf</term>
-    <listitem><para>Exports <envvar>GDK_PIXBUF_MODULE_FILE</envvar>
+    <listitem><para>Exports <envar>GDK_PIXBUF_MODULE_FILE</envar>
     environment variable the the builder. Add librsvg package
     to <varname>buildInputs</varname> to get svg support.</para></listitem>
   </varlistentry>
@@ -1174,7 +1174,7 @@ echo @foo@
     <listitem><para>Adds the
     GStreamer plugins subdirectory of
     each build input to the <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> or
-    <envar>GST_PLUGIN_SYSTEM_PATH</envar> environment variable.</para>
+    <envar>GST_PLUGIN_SYSTEM_PATH</envar> environment variable.</para></listitem>
   </varlistentry>
 
 </variablelist>
-- 
GitLab


From 7f01311f53c9d6cc35ddbdce81a1ef11b99a420d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 24 Feb 2014 18:18:30 +0100
Subject: [PATCH 1712/3789] networkmanager: add opensresolv

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

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 8a8306ea30c..ce7f2635b6c 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz
 , udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
 , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll
-, gobjectIntrospection, modemmanager }:
+, gobjectIntrospection, modemmanager, openresolv }:
 
 stdenv.mkDerivation rec {
   name = "network-manager-${version}";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     "--with-dhcpcd=no"
     "--with-iptables=${iptables}/sbin/iptables"
     "--with-udev-dir=\${out}/lib/udev"
-    "--without-resolvconf"
+    "--with-resolvconf=${openresolv}/sbin/openresolv"
     "--sysconfdir=/etc" "--localstatedir=/var"
     "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d"
     "--with-crypto=gnutls" "--disable-more-warnings"
-- 
GitLab


From f3e23d60ef5cd8350c48c81af150f1504fbfa886 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 28 Feb 2014 08:48:28 -0600
Subject: [PATCH 1713/3789] NetworkManager: correct resolvconf executable name

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

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index ce7f2635b6c..20102aedeb9 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     "--with-dhcpcd=no"
     "--with-iptables=${iptables}/sbin/iptables"
     "--with-udev-dir=\${out}/lib/udev"
-    "--with-resolvconf=${openresolv}/sbin/openresolv"
+    "--with-resolvconf=${openresolv}/sbin/resolvconf"
     "--sysconfdir=/etc" "--localstatedir=/var"
     "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d"
     "--with-crypto=gnutls" "--disable-more-warnings"
-- 
GitLab


From c2e26097a775820ed3f00073f356b485bc42fcb2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 28 Feb 2014 11:33:21 -0600
Subject: [PATCH 1714/3789] openresolv: wrap resolvconf to set PATH

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

diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix
index 36d3bfeca56..98a76dc98b1 100644
--- a/pkgs/tools/networking/openresolv/default.nix
+++ b/pkgs/tools/networking/openresolv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, makeWrapper, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "openresolv-3.5.6";
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1n3cw1vbm7mh5d95ykhzdn2mrrf3pm65sp61p8iwydz1gqkp2inv";
   };
 
+  buildInputs = [ makeWrapper ];
+
   configurePhase =
     ''
       cat > config.mk <<EOF
@@ -23,6 +25,10 @@ stdenv.mkDerivation rec {
 
   installFlags = "SYSCONFDIR=$(out)/etc";
 
+  postInstall = ''
+    wrapProgram "$out/sbin/resolvconf" --set PATH "${coreutils}/bin"
+  '';
+
   meta = {
     description = "A program to manage /etc/resolv.conf";
     homepage = http://roy.marples.name/projects/openresolv;
-- 
GitLab


From e38341fee23236940eb4314116664de1efc6d192 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 1 Mar 2014 05:13:49 +0200
Subject: [PATCH 1715/3789] manpages: update from 3.60 to 3.61

---
 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 4a177327e0e..e997dd487c5 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.60";
+  name = "man-pages-3.61";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "0h4wzjcrz1hqbzwn1g0q11byzss7l4f1ynj7vzgbxar7z10gr5b6";
+    sha256 = "1qh1rwh0klk9s1wja6rzr5gdyvijh88i0fwqap83grbgqs661c61";
   };
 
   preBuild =
-- 
GitLab


From e346341b95882cf5f4a637946bbc069729c59487 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 1 Mar 2014 05:17:16 +0200
Subject: [PATCH 1716/3789] libmemcached: update from 1.0.8 to 1.0.18

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

diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix
index 9ab1962806a..ebd0d08717d 100644
--- a/pkgs/development/libraries/libmemcached/default.nix
+++ b/pkgs/development/libraries/libmemcached/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cyrus_sasl, libevent }:
 
 stdenv.mkDerivation rec {
-  name = "libmemcached-1.0.8";
+  name = "libmemcached-1.0.18";
   
   src = fetchurl {
-    url = https://launchpad.net/libmemcached/1.0/1.0.8/+download/libmemcached-1.0.8.tar.gz;
-    sha256 = "198wcvhrqjnak0cjnkxmjsr3xkjc1k6yq2a77nlk852gcf8ypx03";
+    url = https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz;
+    sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72";
   };
   
   buildInputs = [ cyrus_sasl libevent ];
-- 
GitLab


From 26514f98d08c34320c38cf11a0f70e78f28a98ec Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 1 Mar 2014 05:19:40 +0200
Subject: [PATCH 1717/3789] libinfinity: update from 0.5.4 to 0.5.5

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

diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix
index c305239e6e2..c7513b0a167 100644
--- a/pkgs/development/libraries/libinfinity/default.nix
+++ b/pkgs/development/libraries/libinfinity/default.nix
@@ -11,10 +11,10 @@ let
 
 in stdenv.mkDerivation rec {
 
-  name = "libinfinity-0.5.4";
+  name = "libinfinity-0.5.5";
   src = fetchurl {
     url = "http://releases.0x539.de/libinfinity/${name}.tar.gz";
-    sha256 = "1i7nj8qjay6amg455mwhhfqjvxnfyyql9y40a6a4a3ky170ly004";
+    sha256 = "1i4cnwbvfv56m7zyyf9wki2bj000r8md414yv3cf1jdz4jbyxij7";
   };
 
   buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ]
-- 
GitLab


From 2291ae241cdfc32647bdc38e756ef42de346eeee Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 1 Mar 2014 05:25:28 +0200
Subject: [PATCH 1718/3789] homebank: update from 4.5.4 to 4.5.5

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

diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index d531a327d7c..5e5c98e8260 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,7 +2,7 @@
 
 let
    download_root = "http://homebank.free.fr/public/";
-   name = "homebank-4.5.4";
+   name = "homebank-4.5.5";
    lastrelease = download_root + name + ".tar.gz";
    oldrelease = download_root + "old/" + name + ".tar.gz";
 in
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     urls = [ lastrelease oldrelease ];
-    sha256 = "10xh76mxwbl56xp118gg3b4isv16yvhsvqxwqc28pqqxkpr7vpdk";
+    sha256 = "05k4497qsb6fzr662h9yxz1amsavd287wh0sabrpr9jdbh3jcfkg";
   };
 
   buildInputs = [ pkgconfig gtk libofx intltool ];
-- 
GitLab


From 399269e6e09194a73facb955dda32fc431747f37 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 1 Mar 2014 05:26:44 +0200
Subject: [PATCH 1719/3789] help2man: update from 1.43.3 to 1.44.1

---
 pkgs/development/tools/misc/help2man/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index a3e1348f940..2d60a06fb3e 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "help2man-1.43.3";
+  name = "help2man-1.44.1";
 
   src = fetchurl {
-    url = "mirror://gnu/help2man/${name}.tar.gz";
-    sha256 = "00yk86rvvaavg7y6i5bvk5xhm417jl9dpr8bqvqdksw0i48qv5v7";
+    url = "mirror://gnu/help2man/${name}.tar.xz";
+    sha256 = "1yyyfw9zrfdvslnv91bnhyqmazwx243wmkc9wdaz888rfx36ipi2";
   };
 
   buildInputs = [ makeWrapper perl gettext LocaleGettext ];
-- 
GitLab


From 031a44a817ed101883e148344836e9e935d2a2d8 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 1 Mar 2014 05:29:14 +0200
Subject: [PATCH 1720/3789] inetutils: update from 1.9.1 to 1.9.2

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

diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index 24d73ff4d6f..295cb0bf139 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "inetutils-1.9.1";
+  name = "inetutils-1.9.2";
 
   src = fetchurl {
     url = "mirror://gnu/inetutils/${name}.tar.gz";
-    sha256 = "0azzg6njgq79byl6960kb0wihfhhzf49snslhxgvi30ribgfpa82";
+    sha256 = "04wrm0v7l4890mmbaawd6wjwdv08bkglgqhpz0q4dkb0l50fl8q4";
   };
 
   buildInputs = [ ncurses /* for `talk' */ ];
-- 
GitLab


From 1425fa5b3b264917d784b3e1950370e147a8b554 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 1 Mar 2014 09:51:28 -0500
Subject: [PATCH 1721/3789] Disable efi tests again

OVMF sucks
---
 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 419f71bc259..94bc2f796eb 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -44,7 +44,7 @@ in rec {
         (all nixos.iso_graphical)
         (all nixos.ova)
 
-        (all nixos.tests.efi-installer.simple)
+        # (all nixos.tests.efi-installer.simple)
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         (all nixos.tests.installer.grub1)
-- 
GitLab


From 405ea01e676de953ff418bc8ca49e4fccd566800 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 1 Mar 2014 16:54:07 +0100
Subject: [PATCH 1722/3789] Add aangifte-2013

---
 .../taxes/aangifte-2005/builder.sh            | 17 --------
 .../taxes/aangifte-2005/default.nix           | 13 ------
 .../taxes/aangifte-2006/default.nix           |  3 ++
 .../taxes/aangifte-2007/default.nix           |  3 ++
 .../taxes/aangifte-2008/default.nix           |  3 ++
 .../taxes/aangifte-2009/default.nix           |  3 ++
 .../taxes/aangifte-2010/default.nix           |  3 ++
 .../taxes/aangifte-2011/default.nix           |  3 ++
 .../taxes/aangifte-2012/default.nix           |  3 ++
 .../taxes/aangifte-2013/default.nix           | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 11 files changed, 64 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/applications/taxes/aangifte-2005/builder.sh
 delete mode 100644 pkgs/applications/taxes/aangifte-2005/default.nix
 create mode 100644 pkgs/applications/taxes/aangifte-2013/default.nix

diff --git a/pkgs/applications/taxes/aangifte-2005/builder.sh b/pkgs/applications/taxes/aangifte-2005/builder.sh
deleted file mode 100644
index 8d284176d44..00000000000
--- a/pkgs/applications/taxes/aangifte-2005/builder.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-source $stdenv/setup
-
-buildPhase() {
-    for i in bin/*; do
-        patchelf \
-            --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-            --set-rpath $libX11/lib:$libXext/lib \
-            $i
-    done
-}
-
-installPhase() {
-    mkdir -p $out
-    cp -prvd * $out/
-}
-
-genericBuild
diff --git a/pkgs/applications/taxes/aangifte-2005/default.nix b/pkgs/applications/taxes/aangifte-2005/default.nix
deleted file mode 100644
index 03ba20b11da..00000000000
--- a/pkgs/applications/taxes/aangifte-2005/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, libX11, libXext}:
-
-stdenv.mkDerivation {
-  name = "aangifte2005-1";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2005_linux.tar.gz;
-    md5 = "9cc709b8ad041f4b20154ff1491d0436";
-  };
-
-  inherit libX11 libXext;
-}
diff --git a/pkgs/applications/taxes/aangifte-2006/default.nix b/pkgs/applications/taxes/aangifte-2006/default.nix
index 8bf5ddeee40..72d6999fa1d 100644
--- a/pkgs/applications/taxes/aangifte-2006/default.nix
+++ b/pkgs/applications/taxes/aangifte-2006/default.nix
@@ -14,5 +14,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Elektronische aangifte IB 2006";
     url = "http://www.belastingdienst.nl/download/1341.html";
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/applications/taxes/aangifte-2007/default.nix b/pkgs/applications/taxes/aangifte-2007/default.nix
index 3cd472b51c2..15c826feb6e 100644
--- a/pkgs/applications/taxes/aangifte-2007/default.nix
+++ b/pkgs/applications/taxes/aangifte-2007/default.nix
@@ -17,5 +17,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Elektronische aangifte IB 2007";
     url = "http://www.belastingdienst.nl/download/1341.html";
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/applications/taxes/aangifte-2008/default.nix b/pkgs/applications/taxes/aangifte-2008/default.nix
index 85d5b3045be..905471cb76b 100644
--- a/pkgs/applications/taxes/aangifte-2008/default.nix
+++ b/pkgs/applications/taxes/aangifte-2008/default.nix
@@ -18,5 +18,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Elektronische aangifte IB 2008 (Dutch Tax Return Program)";
     url = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html;
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix
index eeeb4a1d1e5..9aa7a817271 100644
--- a/pkgs/applications/taxes/aangifte-2009/default.nix
+++ b/pkgs/applications/taxes/aangifte-2009/default.nix
@@ -33,5 +33,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Elektronische aangifte IB 2009 (Dutch Tax Return Program)";
     url = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix
index 65ff561ee9e..23338c01ec3 100644
--- a/pkgs/applications/taxes/aangifte-2010/default.nix
+++ b/pkgs/applications/taxes/aangifte-2010/default.nix
@@ -33,5 +33,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Elektronische aangifte IB 2010 (Dutch Tax Return Program)";
     url = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix
index 0bffad95d50..e5bc233affa 100644
--- a/pkgs/applications/taxes/aangifte-2011/default.nix
+++ b/pkgs/applications/taxes/aangifte-2011/default.nix
@@ -33,5 +33,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Elektronische aangifte IB 2011 (Dutch Tax Return Program)";
     url = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix
index 8f36fd485dd..544fe4ec55f 100644
--- a/pkgs/applications/taxes/aangifte-2012/default.nix
+++ b/pkgs/applications/taxes/aangifte-2012/default.nix
@@ -34,5 +34,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)";
     url = http://www.belastingdienst.nl/particulier/aangifte2012/download/;
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix
new file mode 100644
index 00000000000..5cf90320adc
--- /dev/null
+++ b/pkgs/applications/taxes/aangifte-2013/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
+
+stdenv.mkDerivation {
+  name = "aangifte2013-1";
+
+  src = fetchurl {
+    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2013_linux.tar.gz;
+    sha256 = "05biqxz39gwln960xj31yg8s2chdn9vs0lzm4rlcwcavxy8lam1c";
+  };
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  buildInputs = [ makeWrapper ];
+
+  buildPhase =
+    ''
+      for i in bin/*; do
+          patchelf \
+              --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
+              $i
+      done
+    '';
+
+  installPhase =
+    ''
+      mkdir -p $out
+      cp -prvd * $out/
+      wrapProgram $out/bin/ib2013ux --prefix PATH : ${xdg_utils}/bin \
+                                    --prefix LD_PRELOAD : $(cat $NIX_GCC/nix-support/orig-gcc)/lib/libgcc_s.so.1
+    '';
+
+  meta = {
+    description = "Elektronische aangifte IB 2013 (Dutch Tax Return Program)";
+    url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e0b9b1b4ad..08854c2974a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7396,8 +7396,6 @@ let
 
   a2jmidid = callPackage ../applications/audio/a2jmidid { };
 
-  aangifte2005 = callPackage_i686 ../applications/taxes/aangifte-2005 { };
-
   aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { };
 
   aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { };
@@ -7412,6 +7410,8 @@ let
 
   aangifte2012 = callPackage_i686 ../applications/taxes/aangifte-2012 { };
 
+  aangifte2013 = callPackage_i686 ../applications/taxes/aangifte-2013 { };
+
   abcde = callPackage ../applications/audio/abcde {
     inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID;
     libcdio = libcdio082;
-- 
GitLab


From 350277d9c555f085fb925eabfe5c53ea998731c5 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sat, 1 Mar 2014 22:21:06 +0400
Subject: [PATCH 1723/3789] dwb: update version

---
 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 e10acf294bf..c638e2b1adb 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-01-29";
+  name = "dwb-2014-03-01";
 
   src = fetchgit {
     url = "https://bitbucket.org/portix/dwb.git";
-    rev = "eaf090af9ad63341a846377cb9ce473feee8f032";
-    sha256 = "1wqa5dry9p3x3y07zpq3km8ycr8wvz8c11754vf99pv1kzk8gq0n";
+    rev = "e8d4b8d7937b70279d006da4938dfe52fb85f9e8";
+    sha256 = "0m4730zqmnvb9k6xyydi221sh0wbanzbhg07xvwil3kn1d29340w";
   };
 
   buildInputs = [ pkgconfig makeWrapper libsoup webkit gtk3 gnutls json_c m4  ];
-- 
GitLab


From 90759ebf6307a7c7a1f54296ad2ab85550cb1ae1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 1 Mar 2014 12:37:39 -0600
Subject: [PATCH 1724/3789] Add pcmanfm-1.2.0

---
 pkgs/applications/misc/pcmanfm/default.nix      | 17 +++++++++++++++++
 pkgs/development/libraries/libfm/default.nix    | 17 +++++++++++++++++
 .../libraries/menu-cache/default.nix            | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix                 |  6 ++++++
 4 files changed, 57 insertions(+)
 create mode 100644 pkgs/applications/misc/pcmanfm/default.nix
 create mode 100644 pkgs/development/libraries/libfm/default.nix
 create mode 100644 pkgs/development/libraries/menu-cache/default.nix

diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix
new file mode 100644
index 00000000000..3700dc34d3d
--- /dev/null
+++ b/pkgs/applications/misc/pcmanfm/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, glib, gtk, intltool, libfm, libX11, pango, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "pcmanfm-1.2.0";
+  src = fetchurl {
+    url = "mirror://sourceforge/pcmanfm/pcmanfm-1.2.0.tar.xz";
+    sha256 = "1cmskj7dpjgrrn89z7cc1h1nsmd6qq3bakf207ldrhrxxv3fxl2j";
+  };
+
+  buildInputs = [ glib gtk intltool libfm libX11 pango pkgconfig ];
+
+  meta = {
+    homepage = "http://blog.lxde.org/?cat=28/";
+    license = stdenv.lib.licenses.gpl2Plus;
+    description = "File manager with GTK+ interface";
+  };
+}
diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix
new file mode 100644
index 00000000000..2a901d36761
--- /dev/null
+++ b/pkgs/development/libraries/libfm/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala }:
+
+stdenv.mkDerivation {
+  name = "libfm-1.2.0";
+  src = fetchurl {
+    url = "mirror://sourceforge/pcmanfm/libfm-1.2.0.tar.xz";
+    sha256 = "08pwdrmfm9rl41lj2niyjqq2bdvydxk7v2shjxh5gk1xwj238lgh";
+  };
+
+  buildInputs = [ glib gtk intltool menu-cache pango pkgconfig vala ];
+
+  meta = {
+    homepage = "http://blog.lxde.org/?cat=28/";
+    license = stdenv.lib.licenses.gpl2Plus;
+    description = "A glib-based library for file management";
+  };
+}
diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix
new file mode 100644
index 00000000000..b22d1e7669f
--- /dev/null
+++ b/pkgs/development/libraries/menu-cache/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, glib, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "menu-cache-0.5.1";
+  src = fetchurl {
+    url = "mirror://sourceforge/lxde/menu-cache-0.5.1.tar.gz";
+    sha256 = "08m1msgbl6j7j72cwcg18klb99jif8h1phkcnbplxkdf3w15irh8";
+  };
+
+  buildInputs = [ glib pkgconfig ];
+
+  meta = {
+    homepage = "http://blog.lxde.org/?tag=menu-cache";
+    license = stdenv.lib.licenses.gpl2Plus;
+    description = "Library to read freedesktop.org menu files";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44a23e828df..a09ee4d5466 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4714,6 +4714,8 @@ let
 
   libelf = callPackage ../development/libraries/libelf { };
 
+  libfm = callPackage ../development/libraries/libfm { };
+
   libgadu = callPackage ../development/libraries/libgadu { };
 
   libgdata = gnome3.libgdata;
@@ -5182,6 +5184,8 @@ let
   # failed to build
   mediastreamer = callPackage ../development/libraries/mediastreamer { };
 
+  menu-cache = callPackage ../development/libraries/menu-cache { };
+
   mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
 
   mesa_original = callPackage ../development/libraries/mesa { llvm = llvm_33; };
@@ -8515,6 +8519,8 @@ let
 
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
 
+  pcmanfm = callPackage ../applications/misc/pcmanfm { };
+
   ruby_gpgme = callPackage ../development/libraries/ruby_gpgme {
     ruby = ruby19;
     hoe = rubyLibs.hoe;
-- 
GitLab


From f4a3ea123bf9faeac026c7b70df4502d75e50c74 Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Sat, 1 Mar 2014 22:37:39 +0100
Subject: [PATCH 1725/3789] fix torbrowser build by adding /lib64 for 64 bit
 systems

---
 pkgs/tools/security/tor/torbrowser.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index cd1fda47e43..2554e999e0d 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -15,6 +15,9 @@ let
     ];
   };
 
+  ldLibraryPath = if bits == "64" then torEnv+"/lib:"+torEnv+"/lib64"
+        else torEnv+"/lib";
+
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
   version = "3.5";
@@ -36,7 +39,7 @@ in stdenv.mkDerivation rec {
     # Just do a simple test if all libraries get loaded by running help on
     # firefox and tor
     echo "Checking firefox..."
-    LD_LIBRARY_PATH=${torEnv}/lib Browser/firefox --help 1> /dev/null
+    LD_LIBRARY_PATH=${ldLibraryPath} Browser/firefox --help 1> /dev/null
     echo "Checking tor..."
     LD_LIBRARY_PATH=${torEnv}/lib:Tor Tor/tor --help 1> /dev/null
   '';
@@ -53,7 +56,7 @@ in stdenv.mkDerivation rec {
         echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \
           ~/Data/Browser/profile.default/preferences/extension-overrides.js
       fi
-      export LD_LIBRARY_PATH=${torEnv}/lib:$out/share/tor-browser/Tor
+      export LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Tor
       $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@"
     EOF
     chmod +x $out/bin/tor-browser
@@ -65,6 +68,6 @@ in stdenv.mkDerivation rec {
     description = "Tor Browser Bundle for GNU/Linux, everything you need to safely browse the Internet";
     homepage = https://www.torproject.org/;
     platforms = ["i686-linux" "x86_64-linux"];
-    maintainers = [ maintainers.offline ];
+    maintainers = [ maintainers.offline maintainers.matejc ];
   };
 }
-- 
GitLab


From 2bd2747a504bd6e4ce8ebdc942716a9035b1a239 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 1 Mar 2014 18:46:53 -0600
Subject: [PATCH 1726/3789] arpack: version 3.1.5, fix pkgconfig

---
 .../libraries/science/math/arpack/default.nix            | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 48bbd3aa785..20b24d10fe6 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -1,17 +1,22 @@
 { stdenv, fetchurl, gfortran, openblas }:
 
-let version = "3.1.4";
+let version = "3.1.5";
 in
 stdenv.mkDerivation {
   name = "arpack-${version}";
   src = fetchurl {
     url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/arpack-ng_${version}.tar.gz";
-    sha256 = "0m4cqy3d7fpzx1nac3brhr298qj7vx3fchjdz5b7n0pp616cmcm1";
+    sha256 = "05fmg4m0yri47rzgsl2mnr1qbzrs7qyd557p3v9wwxxw0rwcwsd2";
   };
 
   buildInputs = [ gfortran ];
   propagatedBuildInputs = [ openblas ];
 
+  preConfigure = ''
+    substituteInPlace arpack.pc.in \
+      --replace "@BLAS_LIBS@" "-L${openblas}/lib @BLAS_LIBS@"
+  '';
+
   # Auto-detection fails because gfortran brings in BLAS by default
   configureFlags="--with-blas=-lopenblas --with-lapack=-lopenblas";
 
-- 
GitLab


From 2e99141805317cf3a8603f2a337275d3f5b09867 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Sun, 2 Mar 2014 12:46:47 +0800
Subject: [PATCH 1727/3789] renpy: update to 6.17.2

---
 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 4cd719842b6..9c7b08d8010 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.1";
+  name = "renpy-6.17.2";
 
   meta = {
     description = "Ren'Py Visual Novel Engine";
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = "http://www.renpy.org/dl/6.17.1/renpy-6.17.1-source.tar.bz2";
-    sha256 = "024v05yifs6c13chpg0azjpi6xk1srrhd1d0hcs946xbjvbbadpc";
+    url = "http://www.renpy.org/dl/6.17.2/renpy-6.17.2-source.tar.bz2";
+    sha256 = "1iadhdi8g2a7gyg08y0190bv56cc8csckdj4p9f4m2hgg1ybw1qx";
   };
 
   buildInputs = [
-- 
GitLab


From d2dd22651d1ffcc5a248bb6930ee691644538a9f Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 2 Mar 2014 08:17:22 +0100
Subject: [PATCH 1728/3789] idris-mode: upgrade to current version

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

diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix
index 572ca8cdb22..289c8868876 100644
--- a/pkgs/applications/editors/emacs-modes/idris/default.nix
+++ b/pkgs/applications/editors/emacs-modes/idris/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, emacs }:
 
 stdenv.mkDerivation rec {
-  name = "idris-mode-20140106";
+  name = "idris-mode-20140223";
 
   src = fetchgit {
     url = https://github.com/idris-hackers/idris-mode.git;
-    rev = "47df65dd5b554c1d7cf70a07c3bd06d80867f870";
-    sha256 = "55df66d1bace134bea83f0547e01daf068fc96dc080cf88ea8945ddcb2d08ea4";
+    rev = "486470533e74c55192e92a1afa050475915ee1e7";
+    sha256 = "ff2e6bd8fbf421e8f2db0789d2ff56c5103775b911b99bab64e4652d332bad43";
   };
 
   buildInputs = [ emacs ];
-- 
GitLab


From 3a7e38eb1a8c0f628db445985d3b188436877e52 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 1 Mar 2014 20:03:26 +0100
Subject: [PATCH 1729/3789] idris: no longer depends on old versions of
 trifecta and parsers

---
 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 cb34eff7b2f..ea09d5d7f5d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2800,8 +2800,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   darcs = callPackage ../applications/version-management/darcs {};
 
   idris_plain = callPackage ../development/compilers/idris {
-    parsers = self.parsers_0_9;
-    trifecta = self.trifecta_1_1;
     llvmGeneral = self.llvmGeneral_3_3_8_2;
     llvmGeneralPure = self.llvmGeneralPure_3_3_8_2;
   };
-- 
GitLab


From 13f8c07b54f51b3e49476212a67a406cfa8ab48a Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 1 Mar 2014 20:03:49 +0100
Subject: [PATCH 1730/3789] haskell-trifecta: remove old versions

---
 .../libraries/haskell/trifecta/1.1.nix        | 34 -------------------
 .../libraries/haskell/trifecta/1.2.nix        | 34 -------------------
 .../haskell/trifecta/{1.4.nix => default.nix} |  0
 pkgs/top-level/haskell-packages.nix           |  7 +---
 4 files changed, 1 insertion(+), 74 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/trifecta/1.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/trifecta/1.2.nix
 rename pkgs/development/libraries/haskell/trifecta/{1.4.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/trifecta/1.1.nix b/pkgs/development/libraries/haskell/trifecta/1.1.nix
deleted file mode 100644
index 4f5841d6881..00000000000
--- a/pkgs/development/libraries/haskell/trifecta/1.1.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml
-, blazeMarkup, charset, comonad, deepseq, doctest, filepath
-, fingertree, hashable, lens, mtl, parsers, reducers, semigroups
-, transformers, unorderedContainers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "trifecta";
-  version = "1.1";
-  sha256 = "19wnblpn31hvdi5dc8ir24s0hfjj4vvzr43gg9ydl2qdjq6s166w";
-  buildDepends = [
-    ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup
-    charset comonad deepseq fingertree hashable lens mtl parsers
-    reducers semigroups transformers unorderedContainers utf8String
-  ];
-  testDepends = [ doctest filepath ];
-  postPatch = ''
-    substituteInPlace trifecta.cabal \
-      --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.8," \
-      --replace "blaze-html           >= 0.5     && < 0.7," "blaze-html           >= 0.5     && < 0.8," \
-      --replace "blaze-markup         >= 0.5     && < 0.6," "blaze-markup         >= 0.5     && < 0.7," \
-      --replace "hashable             >= 1.2.1   && < 1.3," "hashable             >= 1.1     && < 1.3," \
-      --replace "hashable             >= 1.2     && < 1.3," "hashable             >= 1.1     && < 1.3," \
-      --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2," \
-      --replace "comonad              == 3.*,"              "comonad              >= 3       && < 5," \
-      --replace "comonad              >= 3       && < 4,"   "comonad              >= 3       && < 5,"
-  '';
-  meta = {
-    homepage = "http://github.com/ekmett/trifecta/";
-    description = "A modern parser combinator library with convenient diagnostics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/trifecta/1.2.nix b/pkgs/development/libraries/haskell/trifecta/1.2.nix
deleted file mode 100644
index fae592e73f0..00000000000
--- a/pkgs/development/libraries/haskell/trifecta/1.2.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml
-, blazeMarkup, charset, comonad, deepseq, doctest, filepath
-, fingertree, hashable, lens, mtl, parsers, reducers, semigroups
-, transformers, unorderedContainers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "trifecta";
-  version = "1.2.1.1";
-  sha256 = "1bv35ip7g0h7r2w0s8pkcbvm0b9hx91vblf5w57q3jr843v9314c";
-  buildDepends = [
-    ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup
-    charset comonad deepseq fingertree hashable lens mtl parsers
-    reducers semigroups transformers unorderedContainers utf8String
-  ];
-  testDepends = [ doctest filepath ];
-  postPatch = ''
-    substituteInPlace trifecta.cabal \
-      --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.8," \
-      --replace "blaze-html           >= 0.5     && < 0.7," "blaze-html           >= 0.5     && < 0.8," \
-      --replace "blaze-markup         >= 0.5     && < 0.6," "blaze-markup         >= 0.5     && < 0.7," \
-      --replace "hashable             >= 1.2.1   && < 1.3," "hashable             >= 1.1     && < 1.3," \
-      --replace "hashable             >= 1.2     && < 1.3," "hashable             >= 1.1     && < 1.3," \
-      --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2," \
-      --replace "comonad              == 3.*,"              "comonad              >= 3       && < 5," \
-      --replace "comonad              >= 3       && < 4,"   "comonad              >= 3       && < 5,"
-  '';
-  meta = {
-    homepage = "http://github.com/ekmett/trifecta/";
-    description = "A modern parser combinator library with convenient diagnostics";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/trifecta/1.4.nix b/pkgs/development/libraries/haskell/trifecta/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/trifecta/1.4.nix
rename to pkgs/development/libraries/haskell/trifecta/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ea09d5d7f5d..539564f94c3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2441,12 +2441,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   traverseWithClass = callPackage ../development/libraries/haskell/traverse-with-class {};
 
-  trifecta_1_1 = callPackage ../development/libraries/haskell/trifecta/1.1.nix {
-    parsers = self.parsers_0_9;
-  };
-  trifecta_1_2 = callPackage ../development/libraries/haskell/trifecta/1.2.nix {};
-  trifecta_1_4 = callPackage ../development/libraries/haskell/trifecta/1.4.nix {};
-  trifecta = self.trifecta_1_4;
+  trifecta = callPackage ../development/libraries/haskell/trifecta {};
 
   tuple = callPackage ../development/libraries/haskell/tuple {};
 
-- 
GitLab


From cba5d36df1649d028bb6d6265c0ec90989147dfa Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 1 Mar 2014 20:04:04 +0100
Subject: [PATCH 1731/3789] haskell-parsers: remove old versions

---
 .../libraries/haskell/parsers/0.9.nix           | 17 -----------------
 .../haskell/parsers/{0.10.3.nix => default.nix} |  0
 pkgs/top-level/haskell-packages.nix             |  4 +---
 3 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/parsers/0.9.nix
 rename pkgs/development/libraries/haskell/parsers/{0.10.3.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/parsers/0.9.nix b/pkgs/development/libraries/haskell/parsers/0.9.nix
deleted file mode 100644
index dc42228df66..00000000000
--- a/pkgs/development/libraries/haskell/parsers/0.9.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, charset, doctest, filepath, text, transformers
-, unorderedContainers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "parsers";
-  version = "0.9";
-  sha256 = "04lbayvdv2hax4s9sqlnia7jpzv1sgls41ylql0xbi2zhz5rvyyi";
-  buildDepends = [ charset text transformers unorderedContainers ];
-  testDepends = [ doctest filepath ];
-  meta = {
-    homepage = "http://github.com/ekmett/parsers/";
-    description = "Parsing combinators";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parsers/0.10.3.nix b/pkgs/development/libraries/haskell/parsers/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/parsers/0.10.3.nix
rename to pkgs/development/libraries/haskell/parsers/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 539564f94c3..b35e1714226 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1880,9 +1880,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   parsec3 = self.parsec_3_1_5;
   parsec  = self.parsec3;
 
-  parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {};
-  parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {};
-  parsers = self.parsers_0_10_3;
+  parsers = callPackage ../development/libraries/haskell/parsers {};
 
   parsimony = callPackage ../development/libraries/haskell/parsimony {};
 
-- 
GitLab


From 08d739ea4cd9f6b4174655806946de42528ae649 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Sun, 2 Mar 2014 12:21:50 +0800
Subject: [PATCH 1732/3789] libass: update to 0.11.1, add more meta attributes

Close #1865.
---
 pkgs/development/libraries/libass/default.nix | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index 499639b3a87..15b80053218 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -1,17 +1,34 @@
-{ stdenv, fetchurl, freetype, fontconfig, pkgconfig, enca ? null }:
+{ stdenv, fetchurl, pkgconfig, yasm
+, freetype, fribidi, fontconfig
+, enca ? null
+, harfbuzz ? null
+}:
 
-stdenv.mkDerivation rec {
-  name = "libass-0.9.11";
+let
+  version = "0.11.1";
+  sha256 = "1b0ki1zdkhflszzj5qr45j9qsd0rfbb6ws5pqkny8jhih0l3lxwx";
+  baseurl = "https://github.com/libass/libass/releases/download";
+in stdenv.mkDerivation rec {
+  name = "libass-${version}";
 
   src = fetchurl {
-    url = "http://libass.googlecode.com/files/${name}.tar.bz2";
-    sha256 = "0p3li523s8n85kfh5xdbbfffr17z8xdh2qcgvdg7ki1myv6agl7z";
+    url = "${baseurl}/${version}/${name}.tar.xz";
+    inherit sha256;
   };
 
-  buildInputs = [ freetype fontconfig enca pkgconfig ];
+  nativeBuildInputs = [ pkgconfig yasm ];
+
+  buildInputs = [
+    freetype fribidi fontconfig
+    enca harfbuzz
+  ];
 
   meta = {
+    description = "Portable ASS/SSA subtitle renderer";
     homepage = http://code.google.com/p/libass/;
+    license = stdenv.lib.licenses.isc;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.urkud ];
+    repositories.git = git://github.com/libass/libass.git;
   };
 }
-- 
GitLab


From 433257ad94e892ff3cf302c5d955889582392c9e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 2 Mar 2014 05:50:35 -0600
Subject: [PATCH 1733/3789] cb0cat: add 'unix' to platforms list

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/cb0cat/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/cb0cat/default.nix b/pkgs/tools/security/cb0cat/default.nix
index e35434f3cc2..251c9126056 100644
--- a/pkgs/tools/security/cb0cat/default.nix
+++ b/pkgs/tools/security/cb0cat/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "cryptographic tool based on the CBEAMr0 sponge function";
     homepage    = "https://www.cblnk.com";
+    platforms   = stdenv.lib.platforms.unix;
     license     = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
-- 
GitLab


From 7d561c5ba9627fc705ac9da893d9928d46d709f1 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 2 Mar 2014 05:51:22 -0600
Subject: [PATCH 1734/3789] spark: Remove unneeded whitespace.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/networking/cluster/spark/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 18aae784cbc..34c3af16126 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
 
   phases = "unpackPhase installPhase";
 
-  meta    = {
+  meta = {
     description = "Spark cluster computing";
     homepage    = "http://spark.incubator.apache.org";
     platforms   = stdenv.lib.platforms.all;
-- 
GitLab


From 6a88b95ac7092475e37ab7d907ed77fab4c9de51 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 2 Mar 2014 05:51:49 -0600
Subject: [PATCH 1735/3789] checksec: add homepage

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/checksec/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix
index 5e5ed6da1c9..0f3b87361f8 100644
--- a/pkgs/os-specific/linux/checksec/default.nix
+++ b/pkgs/os-specific/linux/checksec/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A tool for checking security bits on executables";
+    homepage    = "http://www.trapkit.de/tools/checksec.html";
     platforms   = stdenv.lib.platforms.linux;
     license     = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
-- 
GitLab


From 73bcce319b5836808788ff024b887b46620b07af Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 2 Mar 2014 05:52:34 -0600
Subject: [PATCH 1736/3789] ktap: Update to 0.5-e7a38ef0

This adds a new, useful net library as well.

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

diff --git a/pkgs/os-specific/linux/ktap/default.nix b/pkgs/os-specific/linux/ktap/default.nix
index 21996e26131..7a54f0aeebe 100644
--- a/pkgs/os-specific/linux/ktap/default.nix
+++ b/pkgs/os-specific/linux/ktap/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ktap-${version}";
-  version = "0.5-7ee59b19";
+  version = "0.5-e7a38ef0";
   src = fetchgit {
     url    = "https://github.com/ktap/ktap.git";
-    rev    = "7ee59b19d536fd3d3164ff0a0623faff827e5d97";
-    sha256 = "0a46836469d0afb088e72fd6310406a86c487d17bac40e390cec8bc869e7379c";
+    rev    = "e7a38ef06bec9a651c9e8bdb3ad66a104210d475";
+    sha256 = "07acf20e1926d3afd89b13855154b8cc792c57261e7d3cae2da70cb08844f9c8";
   };
 
   buildPhase = ''
-- 
GitLab


From 812d17f177e3013e9088b716c45866ce4d32d967 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 2 Mar 2014 05:53:08 -0600
Subject: [PATCH 1737/3789] ktap: don't use FFI by default

It's not yet supported on i386 - instead, make it optional and
controlled by a `useFFI` attribute.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/ktap/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ktap/default.nix b/pkgs/os-specific/linux/ktap/default.nix
index 7a54f0aeebe..54209673359 100644
--- a/pkgs/os-specific/linux/ktap/default.nix
+++ b/pkgs/os-specific/linux/ktap/default.nix
@@ -1,5 +1,8 @@
-{ stdenv, fetchgit, kernel }:
+{ stdenv, fetchgit, kernel, useFFI ? false }:
 
+let
+  ffiArgs = stdenv.lib.optionalString useFFI "FFI=1";
+in
 stdenv.mkDerivation rec {
   name = "ktap-${version}";
   version = "0.5-e7a38ef0";
@@ -10,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildPhase = ''
-    make FFI=1 KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
+    make ${ffiArgs} KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
   '';
 
   installPhase = ''
-- 
GitLab


From bb2d066140a7828e0a616bc1cf14ea8660c4c0c7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 1 Mar 2014 14:25:59 -0600
Subject: [PATCH 1738/3789] Add haskell-gnuplot-0.5.2

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

diff --git a/pkgs/development/libraries/haskell/gnuplot/default.nix b/pkgs/development/libraries/haskell/gnuplot/default.nix
new file mode 100644
index 00000000000..8390ef2520a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gnuplot/default.nix
@@ -0,0 +1,22 @@
+{ cabal, dataAccessor, dataAccessorTransformers, deepseq, filepath
+, temporary, time, transformers, utilityHt
+}:
+
+cabal.mkDerivation (self: {
+  pname = "gnuplot";
+  version = "0.5.2";
+  sha256 = "11gma33bikx97jra04vgnhikylw9wm1l37hdrsknl7mgk2qbrs74";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    dataAccessor dataAccessorTransformers deepseq filepath temporary
+    time transformers utilityHt
+  ];
+  jailbreak = true;
+  meta = {
+    homepage = "http://www.haskell.org/haskellwiki/Gnuplot";
+    description = "2D and 3D plots using gnuplot";
+    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 cb34eff7b2f..1a3d4538b77 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1227,6 +1227,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   gnuidn = callPackage ../development/libraries/haskell/gnuidn {};
 
+  gnuplot = callPackage ../development/libraries/haskell/gnuplot {};
+
   gnutls = callPackage ../development/libraries/haskell/gnutls { inherit (pkgs) gnutls; };
 
   gsasl = callPackage ../development/libraries/haskell/gsasl { inherit (pkgs) gsasl; };
-- 
GitLab


From 8109de905a7f27f21079e7cff2e5bd5a939a3372 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 26 Feb 2014 20:34:23 +0000
Subject: [PATCH 1739/3789] linux: Update to 3.13.5

---
 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 827910ca28b..05a4f55d020 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.4";
+  version = "3.13.5";
   extraMeta.branch = "3.13";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0hzxr8gsafnyc96x5p2clgi827ahidk1hma0yd48gdx9dhynrq2r";
+    sha256 = "03yggix59k2i2lf0m3kkqslcvvfcg19xx96ywbrfkfbb7vplw67w";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 69a83ba99f9d5f6aff7477f5074687512401f414 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 26 Feb 2014 20:35:29 +0000
Subject: [PATCH 1740/3789] grsecurity: Update stable and test patches

stable: 3.0-3.2.55-201402221305 -> 3.0-3.2.55-201402241936
test:   3.0-3.13.4-201402221308 -> 3.0-3.13.5-201402241943
---
 pkgs/os-specific/linux/kernel/patches.nix | 16 ++++++++--------
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 49fa176d783..a5a8cbff0ba 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -81,22 +81,22 @@ rec {
   grsecurity_3_0_3_2_55 =
     { name = "grsecurity-3.0-3.2.55";
       patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402221305.patch;
-        sha256 = "0g6mqbmjmqz4xh18cq5mn3d0zlzjlk76x0lmpwbrcapdcg5apcp5";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402241936.patch;
+        sha256 = "0kd6bc9kyvn8y6b32fpn778hc8xfm2y4wmpiglia6dqybpyry600";
       };
       features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54
+      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55
       features.apparmor = true;
     };
 
-  grsecurity_3_0_3_13_4 =
-    { name = "grsecurity-3.0-3.13.4";
+  grsecurity_3_0_3_13_5 =
+    { name = "grsecurity-3.0-3.13.5";
       patch = fetchurl {
-        url = http://grsecurity.net/test/grsecurity-3.0-3.13.4-201402221308.patch;
-        sha256 = "0783an79485wwbsvcf8ggsmc2bwsbj1i7q6r8g22b19i9hzqmr64";
+        url = http://grsecurity.net/test/grsecurity-3.0-3.13.5-201402241943.patch;
+        sha256 = "1xv4plviarjprg7bcb4h88wsbrj7x2biypibhzb1pifksmxx25fn";
       };
       features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2
+      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.5
       features.apparmor = true;
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08854c2974a..d73e535911f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6710,7 +6710,7 @@ let
   })) (args: grsecurityOverrider args));
 
   linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_4 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_5 kernelPatches.grsec_path ];
     argsOverride = {
       modDirVersion = "${linux_3_13.modDirVersion}-grsec";
     };
-- 
GitLab


From 669e3520fd5eed92fc483939f585b4b4e3ad20c6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:03:01 +0100
Subject: [PATCH 1741/3789] gtypist: update from 2.9.3 to 2.9.4

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

diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix
index 19567918377..3db7aecfe1a 100644
--- a/pkgs/games/gtypist/default.nix
+++ b/pkgs/games/gtypist/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation {
-  name = "gtypist-2.9.3";
+  name = "gtypist-2.9.4";
 
   src = fetchurl {
-    url = "mirror://gnu/gtypist/gtypist-2.9.3.tar.xz";
-    sha256 = "0srwa841caci69hzqb47xfbxxf7fvz3640qka083p72vm8z9hsxw";
+    url = "mirror://gnu/gtypist/gtypist-2.9.4.tar.xz";
+    sha256 = "18f54lh7ihhfvgwk3xd9d087kmganrgi2jd7avhvwn5gcc31vrqq";
   };
 
   buildInputs = [ncurses];
-- 
GitLab


From 691df2ab8365695953d7f8068647e120e3a153bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:39 +0100
Subject: [PATCH 1742/3789] imlib2: update from 1.4.5 to 1.4.6

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

diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index b1c154badd8..2210976ff90 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, x11, libjpeg, libtiff, libungif, libpng, bzip2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "imlib2-1.4.5";
+  name = "imlib2-1.4.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/enlightenment/${name}.tar.bz2";
-    sha256 = "0nllbhf8vfwdm40z35yj27n83k2mjf5vbd62khad4f0qjf9hsw14";
+    sha256 = "0x1j0ylpclkp8cfpwfpkjywqz124bqskyxbw8pvwzkv2gmrbwldg";
   };
 
   buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ];
-- 
GitLab


From f9af98f1fd7c4862922611c0e3941d4183eea17d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:41 +0100
Subject: [PATCH 1743/3789] ipsecTools: update from 0.8.1 to 0.8.2

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

diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix
index f1faa5c4884..6a42784d1f0 100644
--- a/pkgs/os-specific/linux/ipsec-tools/default.nix
+++ b/pkgs/os-specific/linux/ipsec-tools/default.nix
@@ -7,11 +7,11 @@
 # the time being.
 
 stdenv.mkDerivation rec {
-  name = "ipsec-tools-0.8.1";
+  name = "ipsec-tools-0.8.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/ipsec-tools/${name}.tar.bz2";
-    sha256 = "1m1x2planqqxi0587g7d8xhy0gkyfaxs3ry4hhdh0bw46sxrajps";
+    sha256 = "0b9gfbz78k2nj0k7jdlm5kajig628ja9qm0z5yksiwz22s3v7dlf";
   };
 
   buildInputs = [ readline openssl flex krb5 pam ];
-- 
GitLab


From 05c7578c3d6075083293c7e4f52be39985736615 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:41 +0100
Subject: [PATCH 1744/3789] lout: update from 3.39 to 3.40

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

diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix
index 0d160214376..61e94d4d618 100644
--- a/pkgs/tools/typesetting/lout/default.nix
+++ b/pkgs/tools/typesetting/lout/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, ghostscript}:
 
 stdenv.mkDerivation rec {
-  name = "lout-3.39";
+  name = "lout-3.40";
 
   src = fetchurl {
     urls = [
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
       # XXX: We could add the CTAN mirrors
       # (see http://www.ctan.org/tex-archive/support/lout/).
     ];
-    sha256 = "12gkyqrn0kaa8xq7sc7v3wm407pz2fxg9ngc75aybhi5z825b9vq";
+    sha256 = "1gb8vb1wl7ikn269dd1c7ihqhkyrwk19jwx5kd0rdvbk6g7g25ix";
   };
 
   buildInputs = [ ghostscript ];
-- 
GitLab


From 43eb9e6d536a063c975d44a99cd7025d6917722b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:41 +0100
Subject: [PATCH 1745/3789] mpg123: update from 1.16.0 to 1.18.1

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

diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index f14e2764211..8d4b8d4d778 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, alsaLib }:
 
 stdenv.mkDerivation {
-  name = "mpg123-1.16.0";
+  name = "mpg123-1.18.1";
 
   src = fetchurl {
-    url = mirror://sourceforge/mpg123/mpg123-1.16.0.tar.bz2;
-    sha256 = "1lznnfdvg69a9qbbhvhfc9i86hxdmdqx67lvbkqbh8mmhpip43zh";
+    url = mirror://sourceforge/mpg123/mpg123-1.18.1.tar.bz2;
+    sha256 = "0bb5hv0qw3ln09xisi7d19gb4p2y69sx3905rdc293q3gr7khvdw";
   };
 
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
-- 
GitLab


From 65cce5c38bacb66eac2aa35f5aa8b420d7ed22da Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:41 +0100
Subject: [PATCH 1746/3789] opensmtpd: update from 201307151923p1 to
 201402281146p1

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

diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index 49550647921..3d7a32a00c9 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "opensmtpd-${version}";
-  version = "201307151923p1";
+  version = "201402281146p1";
 
   buildInputs = [ libevent zlib openssl db bison pam ];
 
   src = fetchurl {
     url = "http://www.opensmtpd.org/archives/${name}.tar.gz";
-    sha256 = "0cggq60zzz5mgj093pmgwjp4bm6znnhyv6ibp1vhkba7cxjavr4g";
+    sha256 = "0q287lx6pcz1bz6b334fb977dpbcg4rpyli3zrxj27wql4x0dg6b";
   };  
 
   configureFlags = [ 
-- 
GitLab


From d14df722a71f3d6c5d6c4ef545960e26fc18294b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:41 +0100
Subject: [PATCH 1747/3789] plan9port: update from 20110103 to 20140228

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

diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index e1e515aaf01..e5ec557a79a 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, libX11, xproto, libXt, xextproto, libXext}:
 
 stdenv.mkDerivation rec {
-  name = "plan9port-20110103";
+  name = "plan9port-20140228";
   
   builder = ./builder.sh;
 
   src = fetchurl {
     url = "http://swtch.com/plan9port/${name}.tgz";
-    sha256 = "12hq3k03jgva72498qa1dyndakbhbfg0sc1jhcap9cxqj04xf0dc";
+    sha256 = "1l7nsjfrrcq0l43kw0f1437jz3nyl9qw7i2vn0sbmcsv5vmsj0cr";
   };
 
   buildInputs = [ libX11 xproto libXt xextproto libXext ];
-- 
GitLab


From e816a7fe5337a24ce48260595f1e0e228f15fcbd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:42 +0100
Subject: [PATCH 1748/3789] pstoedit: update from 3.50 to 3.62

---
 pkgs/tools/graphics/pstoedit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix
index efdeffe1ad7..62816705b8f 100644
--- a/pkgs/tools/graphics/pstoedit/default.nix
+++ b/pkgs/tools/graphics/pstoedit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, ghostscript, gd, zlib, plotutils }:
 
 stdenv.mkDerivation {
-  name = "pstoedit-3.50";
+  name = "pstoedit-3.62";
 
   src = fetchurl {
-    url = mirror://sourceforge/pstoedit/pstoedit-3.50.tar.gz;
-    sha256 = "04ap21fxj2zn6vj9mv7zknj4svcbkb1gxwfzxkw5i0sksx969c92";
+    url = mirror://sourceforge/pstoedit/pstoedit-3.62.tar.gz;
+    sha256 = "0j410dm9nqwa7n03yiyz0jwvln0jlqc3n9iv4nls33yl6x3c8x40";
   };
 
   buildInputs = [ pkgconfig ghostscript gd zlib plotutils ];
-- 
GitLab


From 506da15579aa3969ccad35b97472ad067c8f8e83 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:42 +0100
Subject: [PATCH 1749/3789] pv: update from 1.4.12 to 1.5.2

---
 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 bf0c44de141..480e00c850d 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.4.12";
+  name = "pv-1.5.2";
 
   src = fetchurl {
     url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2";
-    sha256 = "0hnpv4l5kidfwxzba7ibm9wjs71ing9gzx0m80bgr3ia8k4s8nka";
+    sha256 = "1sz5ishd66xliwnhv0x3vr48fbp7id4xd8fsrbm66y7f5mfd7qp2";
   };
 
   meta = {
-- 
GitLab


From 19cb32a36cfb6232d2e5eb290b2f921f6e2e1f6d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:42 +0100
Subject: [PATCH 1750/3789] root: update from 5.34.14 to 5.34.15

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

diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index f4de3ba6eea..53a045ac6f0 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "root-${version}";
-  version = "5.34.14";
+  version = "5.34.15";
 
   src = fetchurl {
     url = "ftp://root.cern.ch/root/root_v${version}.source.tar.gz";
-    sha256 = "d5347ba1b614eb083cf08050b784d66a93c125ed89938708da1adb33323dee2b";
+    sha256 = "1bkiggcyya39a794d3d2rzzmmkbdymf86hbqhh0l1pl4f38xvp6i";
   };
 
   buildInputs = [ cmake gfortran mesa libX11 libXpm libXft libXext zlib ];
-- 
GitLab


From bc3008846de7fcbfefef348c5edd76e003ef4485 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:42 +0100
Subject: [PATCH 1751/3789] scons: update from 2.3.0 to 2.3.1

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

diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 11d81c3beb7..c6856dae565 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -2,7 +2,7 @@
 
 let
   name = "scons";
-  version = "2.3.0";
+  version = "2.3.1";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/scons/${name}-${version}.tar.gz";
-    sha256 = "0jrv8v5dpdp231n1gsfmirqy27f7qas6m255jjm2qjygk6chchll";
+    sha256 = "00822ax62cfi2fvz9zhw80hl1273524d97xfycq4q276z1lb86h9";
   };
 
   buildInputs = [python makeWrapper];
-- 
GitLab


From dd3f07e0f2094f450f89334fc97ebbdda7ce8a3f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:42 +0100
Subject: [PATCH 1752/3789] skype: update from 4.2.0.11 to 4.2.0.13

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

diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix
index ebd84ff47b8..20a304952a7 100644
--- a/pkgs/applications/networking/instant-messengers/skype/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skype/default.nix
@@ -5,11 +5,11 @@
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation rec {
-  name = "skype-4.2.0.11";
+  name = "skype-4.2.0.13";
 
   src = fetchurl {
     url = "http://download.skype.com/linux/${name}.tar.bz2";
-    sha256 = "0kh66p50m3x4ql6j8ciz73c30npcizd00ya9qrhid711rar0mlw7";
+    sha256 = "137kp6c0v4z7n7pp4hwrx4gjgk4knwj815dc6swh44lb5cj1c5m5";
   };
 
   buildInputs =
-- 
GitLab


From 0968d527fa16c870e3a463b27a272264ab5cfbb6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:42 +0100
Subject: [PATCH 1753/3789] xlockmore: update from 5.38 to 5.43

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

diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index b3c71c89191..7e750d9c9b3 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
 
-  name = "xlockmore-5.38";
+  name = "xlockmore-5.43";
   src = fetchurl {
     url = "http://www.tux.org/~bagleyd/xlock/${name}/${name}.tar.bz2";
-    sha256 = "15x5l43zdjn881xf2m9psz9s2hvd2l8py2kzdhdh1v9m4ml20nf4";
+    sha256 = "1l36n8x51j7lwdalv6yi37cil290vzd3djjqydhsm0pnm8hiz499";
   };
 
   # Optionally, it can use GTK+.
-- 
GitLab


From 34ef383d452db195087b253abb3dc8ecc11e7703 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:43 +0100
Subject: [PATCH 1754/3789] xterm: update from 300 to 301

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

diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 1d050182da3..a13dd76fd03 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "xterm-300";
+  name = "xterm-301";
 
   src = fetchurl {
     url = "ftp://invisible-island.net/xterm/${name}.tgz";
-    sha256 = "1k8p7q4d1gpk6zikb8hys8b30yq2v001nlp3r9g40my31ij9al31";
+    sha256 = "040rarvv18zg0lk7qy0m3n7gv10mh40jic708wvng01z4rlbpfhz";
   };
 
   buildInputs =
-- 
GitLab


From 98cb9c073f89c65ca5a1f7bb4a1a3c5067c7ee66 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:43 +0100
Subject: [PATCH 1755/3789] xsel: update from 0.9.6 to 1.2.0

---
 pkgs/tools/misc/xsel/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix
index 5c8d6f37c7c..74eadaf5e2e 100644
--- a/pkgs/tools/misc/xsel/default.nix
+++ b/pkgs/tools/misc/xsel/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, x11}:
 
 stdenv.mkDerivation {
-  name = "xsel-0.9.6";
+  name = "xsel-1.2.0";
   src = fetchurl {
-    url = http://www.vergenet.net/~conrad/software/xsel/download/xsel-0.9.6.tar.gz;
-    md5 = "cec2fb09a4101b7f2beab8094234e2f4";
+    url = http://www.vergenet.net/~conrad/software/xsel/download/xsel-1.2.0.tar.gz;
+    sha256 = "070lbcpw77j143jrbkh0y1v10ppn1jwmjf92800w7x42vh4cw9xr";
   };
 
   buildInputs = [x11];
-- 
GitLab


From c4873add803cde6cb50f29f5ac896ef8b16a6958 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:43 +0100
Subject: [PATCH 1756/3789] youtubeDL: update from 2014.02.26 to 2014.02.28

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 29463a358e9..ded669a6feb 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.02.26";
+  version = "2014.02.28";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "069p3iyh96xc7y9ixzl4v5smq8i6d4gnhyy2yyzphjlfnpvwhb7j";
+    sha256 = "1xizqk47f3wd1g1mqs87iand4v3pjxxdzh4z7s6525hlkb8z5813";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From db2776ee8aa7ec9175326f98987fbf0c610dee77 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:43 +0100
Subject: [PATCH 1757/3789] feh: update from 2.9.3 to 2.10

---
 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 1e920ff65c5..4f52e6dec0f 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.9.3";
+  name = "feh-2.10";
 
   src = fetchurl {
     url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "1wlhfbglzc1jzsh80s4s1fawclgzyjy2105ffzx2mw9s0c1xds5l";
+    sha256 = "10ya8j0mxlni08qli3gdkyjhy54g4d2q2kc0hhragmzd9s42ly5w";
   };
 
   buildInputs = [makeWrapper x11 imlib2 giblib libjpeg libpng libXinerama curl ];
-- 
GitLab


From 97298922e560a3a85a2df8a13f4e8df11adaf52c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:43 +0100
Subject: [PATCH 1758/3789] gitAndTools.hub: update from 1.11.1 to 1.12.0

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

diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 87bb0a6d285..28484322d35 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "hub-${version}";
-  version = "1.11.1";
+  version = "1.12.0";
 
   src = fetchurl {
     url = "https://github.com/github/hub/archive/v${version}.tar.gz";
-    sha256 = "09wqxxzgrgcx6p3n3bhrb5ka3194qfwnli5j3frv37448hx6wd4n";
+    sha256 = "1lbl4dl7483q320qw4jm6mqq4dbbk3xncypxgg86zcdigxvw6igv";
   };
 
   buildInputs = [ rake makeWrapper ];
-- 
GitLab


From aa8ef327e410ca10dec65885a08cab8d6626570c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:44 +0100
Subject: [PATCH 1759/3789] gitAndTools.gitflow: update from 1.6.1 to 1.7.0

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

diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
index 26a7826d4f0..0898345c30b 100644
--- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gitflow-${version}";
-  version = "1.6.1";
+  version = "1.7.0";
 
   src = fetchurl {
     url = "https://github.com/petervanderdoes/gitflow/archive/${version}.tar.gz";
-    sha256 = "1f4879ahi8diddn7qvhr0dkj96gh527xnfihbf1ha83fn9cvvcls";
+    sha256 = "0rppgyqgk0drip6852bdm2479zks16cb3mj1jdw6jq80givrqnjx";
   };
 
   preBuild = ''
-- 
GitLab


From 9c2c002a3b81c9a50258ae93d9ab355e9156ed03 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:08:44 +0100
Subject: [PATCH 1760/3789] gparted: update from 0.15.0 to 0.18.0

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

diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 00d2f759be4..50af2a12c24 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -2,11 +2,11 @@
 , pkgconfig, gtkmm, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "gparted-0.15.0";
+  name = "gparted-0.18.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/gparted/${name}.tar.bz2";
-    sha256 = "03s9dp2q281lkkfjgk9ahc8i6dk4d2a03z4bh2d19a7r3b2mmdww";
+    sha256 = "0slyf0sbv7a7xvdcpn9ibnixpy0w4s6zwpz6sklkxcyfybw1j7xz";
   };
 
   configureFlags = "--disable-doc";
-- 
GitLab


From 7bf77e413d848c863a13950dfa1ef2d54d08aedf Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Mon, 3 Mar 2014 15:08:56 +1100
Subject: [PATCH 1761/3789] lesstif: fix build on Darwin

* x11 = xlibsWrapper on non-Darwin systems, but is darwinX11AndOpenGL on
  Darwin systems, so pass in xlibsWrapper to the lesstif build instead
---
 pkgs/development/libraries/lesstif/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index 21b4eac30af..8d01c2f2f43 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, x11, libXp, libXau}:
+{stdenv, fetchurl, xlibsWrapper, libXp, libXau}:
 
 stdenv.mkDerivation {
   name = "lesstif-0.95.0-p2";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
     url = mirror://sourceforge/lesstif/lesstif-0.95.0.tar.bz2;
     md5 = "ab895165c149d7f95843c7584b1c7ad4";
   };
-  buildInputs = [x11];
+  buildInputs = [xlibsWrapper];
   propagatedBuildInputs = [libXp libXau];
 
   # The last stable release of lesstif was in June 2006. These
-- 
GitLab


From ff4ec6d5f06edf07daf9e9df07f5131b7dd4795a Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Mon, 3 Mar 2014 15:10:37 +1100
Subject: [PATCH 1762/3789] t1lib: fix build on Darwin

* x11 = xlibsWrapper on non-Darwin systems, but is darwinX11AndOpenGL on
  Darwin systems, so pass in xlibsWrapper to the t1lib build instead
---
 pkgs/development/libraries/t1lib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix
index 9a4ba00e1d3..ebd8699dc17 100644
--- a/pkgs/development/libraries/t1lib/default.nix
+++ b/pkgs/development/libraries/t1lib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, x11, libXaw, libXpm}:
+{stdenv, fetchurl, xlibsWrapper, libXaw, libXpm}:
 
 stdenv.mkDerivation {
   name = "t1lib-5.1.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2";
   };
 
-  buildInputs = [x11 libXaw libXpm];
+  buildInputs = [xlibsWrapper libXaw libXpm];
   buildFlags = "without_doc";
 }
 
-- 
GitLab


From af3cf0dbeb56eb0e67d949ea7126640f4f394a43 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 1 Mar 2014 10:00:36 +0100
Subject: [PATCH 1763/3789] Add structured-haskell-mode

---
 .../structured-haskell-mode/default.nix       | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix
new file mode 100644
index 00000000000..25055df8ea3
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix
@@ -0,0 +1,23 @@
+{ cabal, emacs, haskellSrcExts }:
+
+cabal.mkDerivation (self: {
+  pname = "structured-haskell-mode";
+  version = "1.0.2";
+  sha256 = "1lwdhlr38y5hdr78nplplr3q0hrjhryw378f1857qh0lvp03gwl2";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ haskellSrcExts ];
+  buildTools = [ emacs ];
+  postInstall = ''
+    emacs -L elisp --batch -f batch-byte-compile "elisp/"*.el
+    install -d $out/share/emacs/site-lisp
+    install "elisp/"*.elc $out/share/emacs/site-lisp
+  '';
+  meta = {
+    homepage = "https://github.com/chrisdone/structured-haskell-mode";
+    description = "Structured editing Emacs mode for Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.pSub ];
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d73e535911f..0d22468e5ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7778,6 +7778,10 @@ let
 
     ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { };
 
+    structuredHaskellMode = callPackage ../applications/editors/emacs-modes/structured-haskell-mode {
+      inherit (haskellPackages) cabal haskellSrcExts;
+    };
+
     tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { };
 
     hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { };
-- 
GitLab


From de6792a4604a7e74bda29a57d35417a11b2b52ae Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Mon, 3 Mar 2014 15:11:51 +1100
Subject: [PATCH 1764/3789] graphite2: enable build on Darwin

This builds on Darwin without any modifications, so it has been added to
the platforms array
---
 pkgs/development/libraries/silgraphite/graphite2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index f6aa7c35f39..f874804c001 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An advanced font engine";
     maintainers = [ stdenv.lib.maintainers.raskin ];
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = stdenv.lib.platforms.unix;
   };
 }
-- 
GitLab


From a577082e5e9765e72b40e559f48b256e7944bb1f Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Mon, 3 Mar 2014 16:31:22 +1100
Subject: [PATCH 1765/3789] re-enable au debian mirror

---
 pkgs/build-support/fetchurl/mirrors.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index c6c294d5504..c4841c50d94 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -159,7 +159,7 @@ rec {
 
   # Debian.
   debian = [
-    #ftp://ftp.au.debian.org/debian/
+    ftp://ftp.au.debian.org/debian/
     ftp://ftp.de.debian.org/debian/
     ftp://ftp.es.debian.org/debian/
     ftp://ftp.fr.debian.org/debian/
-- 
GitLab


From 13979ab58cb8e45f48722aa71ec6363fc7c9b444 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Mon, 3 Mar 2014 16:31:44 +1100
Subject: [PATCH 1766/3789] upgrade texlive-extra to 2013.20140215

The old version (2013.20131112) was no longer available on the debian
mirrors, hence building from source was impossible.
---
 pkgs/tools/typesetting/tex/texlive/extra.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix
index c6624e469e5..056c7e0bf4e 100644
--- a/pkgs/tools/typesetting/tex/texlive/extra.nix
+++ b/pkgs/tools/typesetting/tex/texlive/extra.nix
@@ -1,9 +1,11 @@
 args: with args;
 rec {
-  name = "texlive-extra-2013";
+  name    = "texlive-extra-2013";
+  version = "2013.20140215";
+
   src = fetchurl {
-    url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2013.20131219.orig.tar.xz;
-    sha256 = "09iijzq0y5kq16f3lv2jrln190ldbbzywpwr33hrmnw5yp3izmrh";
+    url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz";
+    sha256 = "04a67pns6q8kw1nl2v6x5p443kvhk8fr26qkcj7z098n68fpwls8";
   };
 
   buildInputs = [texLive xz];
-- 
GitLab


From 30da7690985c8deac78c72c7acf982d28872440e Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Mon, 3 Mar 2014 16:33:12 +1100
Subject: [PATCH 1767/3789] upgrade texlive-base, texlive-lang

Upgraded to 2013.20140215. The old version (2013.20131112) was no longer
available on the debian FTP server, so building from source was
impossible.
---
 pkgs/tools/typesetting/tex/texlive/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 3158f285933..8fab16de674 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -5,14 +5,16 @@ rec {
     sha256 = "1idgyim6r4bi3id245k616qrdarfh65xv3gi2psarqqmsw504yhd";
   };
 
+  texmfVersion = "2013.20140215";
   texmfSrc = fetchurl {
-    url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20140123.orig.tar.xz;
-    sha256 = "1lwvqryfykz0d9pcjkhq1qh7dlcb6lsvjp7fizl18ji6166159iw";
+    url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz";
+    sha256 = "0f1xqa1a1yklsiqz12rgihdc6viw8ghdbx2s2pw2k3h0dfsd6ss3";
   };
 
+  langTexmfVersion = "2013.20140215";
   langTexmfSrc = fetchurl {
-    url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2013.20140123.orig.tar.xz;
-    sha256 = "1smzkg31msn9ci7fc69xq5klhxab00z8bcxmz5daqzcal8ak3d2d";
+    url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz";
+    sha256 = "0igz9kpd1rfbq7smb1wyd75cz396rinbh25rk19lxqh25dix0xzj";
   };
 
   passthru = { inherit texmfSrc langTexmfSrc; };
-- 
GitLab


From f0680440191f3dcd774d9f2a1971defc2b139e64 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Mon, 3 Mar 2014 16:34:53 +1100
Subject: [PATCH 1768/3789] texLiveFull: fix build on Darwin

Added --with-system-icu=no, --with-system-harfbuzz=no (looks like the
omission of --with-system-icu was not sufficient to force the builder
not to look for system ICU libs).

Disable building bibtex-x: complains about missing ICU directory.

Disable building dvisvgm: a test fails (and I can't work out how to
prevent the tests from running just for this).

Disable building devnag: failing tests.
---
 .../tools/typesetting/tex/texlive/default.nix | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 8fab16de674..98a8a0fd810 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -45,7 +45,7 @@ rec {
 
     NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout";
 
-    ./Build --prefix="$out" --datadir="$out/share" --mandir "$out/share/man" --infodir "$out/share/info" \
+    ./Build --prefix="$out" --datadir="$out/share" --mandir="$out/share/man" --infodir="$out/share/info" \
       ${args.lib.concatStringsSep " " configureFlags}
     cd Work
   '' ) [ "minInit" "doUnpack" "addInputs" "defEnsureDir" ];
@@ -116,14 +116,22 @@ rec {
 
   configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt"
     "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib"
-    "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2"
-    "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2"
-    ]
-    ++ ( if stdenv.isDarwin
-         # ironically, couldn't get xetex compiling on darwin
-         then [ "--disable-xetex" "--disable-xdv2pdf" "--disable-xdvipdfmx" ]
-         # couldn't seem to get system icu working on darwin
-         else [ "--with-system-icu" ] );
+    "--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" ];
 
-- 
GitLab


From b0c23548095f464fbb4bae866300c1446e9720e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 13:10:05 +0100
Subject: [PATCH 1769/3789] bind: update to version 9.9.5-W1 (fixes
 CVE-2013-6230 and CVE 2014-0591)

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

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index b609c6686a2..db8db908d1e 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, openssl, libtool, perl, libxml2 }:
 
-let version = "9.9.4-P2"; in
+let version = "9.9.5-W1"; in
 
 stdenv.mkDerivation rec {
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "128aqizcjbakrqrijjpy54qffqz1jafa94lhnqig7lr63r1wdwsh";
+    sha256 = "1b3ycb376b1j2fc0k6w16k8j9vgsfrzy3nlw1vxzzi41fgyqmcd3";
   };
 
   patchPhase = ''
-- 
GitLab


From ad7c518e45221533e2094acb20fea6ade477da75 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 3 Mar 2014 13:37:44 +0100
Subject: [PATCH 1770/3789] Sync /tmp/xchg to ensure that the coverage data is
 flushed

---
 nixos/lib/test-driver/test-driver.pl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl
index c6a707cdf6b..31f3281cefe 100644
--- a/nixos/lib/test-driver/test-driver.pl
+++ b/nixos/lib/test-driver/test-driver.pl
@@ -144,6 +144,13 @@ sub runTests {
         }
     });
 
+    $log->nest("syncing", sub {
+        foreach my $vm (values %vms) {
+            next unless $vm->isUp();
+            $vm->execute("sync /tmp/xchg");
+        }
+    });
+
     if ($nrTests != 0) {
         $log->log("$nrSucceeded out of $nrTests tests succeeded",
             ($nrSucceeded < $nrTests ? { error => 1 } : { }));
-- 
GitLab


From 497997cc388ce791ca0b4dc55f46ab515e8fb5d9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 3 Mar 2014 13:39:30 +0100
Subject: [PATCH 1771/3789] Move generation of coverage reports from
 nixos/lib/testing to releaseTools

Also, turn some stdenv adapters into setup hooks.
---
 nixos/lib/testing.nix                         | 54 ++-----------------
 nixos/release.nix                             |  3 +-
 nixos/tests/quake3.nix                        |  4 +-
 nixos/tests/subversion.nix                    |  2 +-
 pkgs/build-support/release/default.nix        |  6 ++-
 pkgs/build-support/release/gcov-report.nix    | 49 +++++++++++++++++
 pkgs/build-support/release/nix-build.nix      |  2 +-
 .../enable-coverage-instrumentation.sh        | 17 ++++++
 .../setup-hooks/keep-build-tree.sh            |  6 +++
 pkgs/stdenv/adapters.nix                      | 40 +-------------
 pkgs/top-level/all-packages.nix               |  8 +--
 11 files changed, 94 insertions(+), 97 deletions(-)
 create mode 100644 pkgs/build-support/release/gcov-report.nix
 create mode 100644 pkgs/build-support/setup-hooks/keep-build-tree.sh

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 3407229e921..d5338bc04ca 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -67,62 +67,16 @@ rec {
     };
 
 
-  # Generate a coverage report from the coverage data produced by
-  # runTests.
-  makeReport = x: runCommand "report" { buildInputs = [rsync]; }
-    ''
-      mkdir -p $TMPDIR/gcov/
-
-      for d in ${x}/coverage-data/*; do
-          echo "doing $d"
-          [ -n "$(ls -A "$d")" ] || continue
-
-          for i in $(cd $d/nix/store && ls); do
-              if ! test -e $TMPDIR/gcov/nix/store/$i; then
-                  echo "copying $i"
-                  mkdir -p $TMPDIR/gcov/$(echo $i | cut -c34-)
-                  rsync -rv /nix/store/$i/.build/* $TMPDIR/gcov/
-              fi
-          done
-
-          chmod -R u+w $TMPDIR/gcov
-
-          find $TMPDIR/gcov -name "*.gcda" -exec rm {} \;
-
-          for i in $(cd $d/nix/store && ls); do
-              rsync -rv $d/nix/store/$i/.build/* $TMPDIR/gcov/
-          done
-
-          find $TMPDIR/gcov -name "*.gcda" -exec chmod 644 {} \;
-
-          echo "producing info..."
-          ${pkgs.lcov}/bin/geninfo --ignore-errors source,gcov $TMPDIR/gcov --output-file $TMPDIR/app.info
-          cat $TMPDIR/app.info >> $TMPDIR/full.info
-      done
-
-      echo "making report..."
-      mkdir -p $out/coverage
-      ${pkgs.lcov}/bin/genhtml --show-details $TMPDIR/full.info -o $out/coverage
-      cp $TMPDIR/full.info $out/coverage/
-
-      mkdir -p $out/nix-support
-      cat ${x}/nix-support/hydra-build-products >> $out/nix-support/hydra-build-products
-      echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
-      [ ! -e ${x}/nix-support/failed ] || touch $out/nix-support/failed
-    ''; # */
-
-
   makeTest = testFun: complete (call testFun);
   makeTests = testsFun: lib.mapAttrs (name: complete) (call testsFun);
 
   apply = makeTest; # compatibility
   call = f: f { inherit pkgs system; };
 
-  complete = t: t // rec {
+  complete = { testScript, ... } @ t: t // rec {
+
     nodes = buildVirtualNetwork (
-      if t ? nodes then t.nodes else
-      if t ? machine then { machine = t.machine; }
-      else { } );
+      t.nodes or (if t ? machine then { machine = t.machine; } else { }));
 
     testScript =
       # Call the test script with the computed nodes.
@@ -162,7 +116,7 @@ rec {
 
     test = runTests driver;
 
-    report = makeReport test;
+    report = releaseTools.gcovReport { coverageRuns = [ test ]; };
   };
 
 
diff --git a/nixos/release.nix b/nixos/release.nix
index ff094cce05f..b98976c2cce 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -213,7 +213,8 @@ in rec {
     with lib;
     let
       testsFor = system:
-        mapAttrsRecursiveCond (x: !x ? test) (n: v: listToAttrs [(nameValuePair system v.test)])
+        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);
 }
diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix
index 92501107780..fefbd75b4a3 100644
--- a/nixos/tests/quake3.nix
+++ b/nixos/tests/quake3.nix
@@ -14,11 +14,13 @@ in
 
 rec {
 
+  makeCoverageReport = true;
+
   client =
     { config, pkgs, ... }:
 
     { imports = [ ./common/x11.nix ];
-      services.xserver.driSupport = true;
+      hardware.opengl.driSupport = true;
       services.xserver.defaultDepth = pkgs.lib.mkOverride 0 16;
       environment.systemPackages = [ pkgs.quake3demo ];
       nixpkgs.config.packageOverrides = overrides;
diff --git a/nixos/tests/subversion.nix b/nixos/tests/subversion.nix
index 309da90c5df..49450c78f3b 100644
--- a/nixos/tests/subversion.nix
+++ b/nixos/tests/subversion.nix
@@ -20,7 +20,7 @@ let
         # To build the kernel with coverage instrumentation, we need a
         # special patch to make coverage data available under /proc.
         linux = pkgs.linux.override (orig: {
-          stdenv = cleanupBuildTree (keepBuildTree orig.stdenv);
+          stdenv = overrideInStdenv pkgs.stdenv [ pkgs.keepBuildTree ];
           extraConfig =
             ''
               GCOV_KERNEL y
diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix
index acad3487dad..6288935ec2a 100644
--- a/pkgs/build-support/release/default.nix
+++ b/pkgs/build-support/release/default.nix
@@ -27,10 +27,14 @@ rec {
     } // args);
 
   coverageAnalysis = args: nixBuild (
-    { inherit lcov enableCoverageInstrumentation makeCoverageAnalysisReport;
+    { inherit lcov enableGCOVInstrumentation makeGCOVReport;
       doCoverageAnalysis = true;
     } // args);
 
+  gcovReport = args: import ./gcov-report.nix (
+    { inherit runCommand lcov rsync;
+    } // args);
+
   rpmBuild = args: import ./rpm-build.nix (
     { inherit vmTools;
     } // args);
diff --git a/pkgs/build-support/release/gcov-report.nix b/pkgs/build-support/release/gcov-report.nix
new file mode 100644
index 00000000000..8ce5c0488a7
--- /dev/null
+++ b/pkgs/build-support/release/gcov-report.nix
@@ -0,0 +1,49 @@
+{ runCommand, lcov, rsync, coverageRuns, lcovFilter ? [ "/nix/store/*" ], baseDirHack ? false }:
+
+runCommand "coverage"
+  { buildInputs = [ lcov rsync ];
+    inherit lcovFilter baseDirHack;
+  }
+  ''
+    mkdir -p $TMPDIR/gcov $out/nix-support $out/coverage
+    info=$out/coverage/full.info
+
+    for p in ${toString coverageRuns}; do
+        if [ -f $p/nix-support/hydra-build-products ]; then
+            cat $p/nix-support/hydra-build-products >> $out/nix-support/hydra-build-products
+        fi
+
+        [ ! -e $p/nix-support/failed ] || touch $out/nix-support/failed
+
+        opts=
+        for d in $p/coverage-data/*; do
+            for i in $(cd $d/nix/store && ls); do
+                if ! [ -e /nix/store/$i/.build ]; then continue; fi
+                if [ -e $TMPDIR/gcov/nix/store/$i ]; then continue; fi
+                echo "copying $i..."
+                rsync -a /nix/store/$i/.build/* $TMPDIR/gcov/
+                if [ -n "$baseDirHack" ]; then
+                    opts="-b $TMPDIR/gcov/$(cd /nix/store/$i/.build && ls)"
+                fi
+            done
+
+            for i in $(cd $d/nix/store && ls); do
+                rsync -a $d/nix/store/$i/.build/* $TMPDIR/gcov/ --include '*/' --include '*.gcda' --exclude '*'
+            done
+        done
+
+        chmod -R u+w $TMPDIR/gcov
+
+        echo "producing info..."
+        geninfo --ignore-errors source,gcov $TMPDIR/gcov --output-file $TMPDIR/app.info $opts
+        cat $TMPDIR/app.info >> $info
+    done
+
+    echo "making report..."
+    set -o noglob
+    lcov --remove $info ''$lcovFilter > $info.tmp
+    set +o noglob
+    mv $info.tmp $info
+    genhtml --show-details $info -o $out/coverage
+    echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
+  ''
diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index 993f12bc300..8ebae24c673 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (
 
     prePhases = ["initPhase"] ++ prePhases;
 
-    buildInputs = buildInputs ++ stdenv.lib.optional doCoverageAnalysis args.makeCoverageAnalysisReport;
+    buildInputs = buildInputs ++ stdenv.lib.optional doCoverageAnalysis args.makeGCOVReport;
 
     lcovFilter = ["/nix/store/*"] ++ lcovFilter;
 
diff --git a/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh b/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh
index 08ef490e244..7175b408b02 100644
--- a/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh
+++ b/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh
@@ -1,3 +1,5 @@
+postPhases+=" cleanupBuildDir"
+
 # Force GCC to build with coverage instrumentation.  Also disable
 # optimisation, since it may confuse things.
 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -O0 --coverage"
@@ -12,3 +14,18 @@ postUnpack() {
         substituteInPlace $i --replace '*.$objext)' '*.$objext | *.gcno)'
     done
 }
+
+# Get rid of everything that isn't a gcno file or a C source file.
+# Also strip the `.tmp_' prefix from gcno files.  (The Linux kernel
+# creates these.)
+cleanupBuildDir() {
+    if ! [ -e $out/.build ]; then return; fi
+
+    find $out/.build/ -type f -a ! \
+        \( -name "*.c" -o -name "*.cc" -o -name "*.cpp" -o -name "*.h" -o -name "*.hh" -o -name "*.y" -o -name "*.l" -o -name "*.gcno" \) \
+        | xargs rm -f --
+
+    for i in $(find $out/.build/ -name ".tmp_*.gcno"); do
+        mv "$i" "$(echo $i | sed s/.tmp_//)"
+    done
+}
diff --git a/pkgs/build-support/setup-hooks/keep-build-tree.sh b/pkgs/build-support/setup-hooks/keep-build-tree.sh
new file mode 100644
index 00000000000..754900bfc33
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/keep-build-tree.sh
@@ -0,0 +1,6 @@
+prePhases+=" moveBuildDir"
+
+moveBuildDir() {
+    mkdir -p $out/.build
+    cd $out/.build
+}
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index cb7e3ba925f..0e45ad05531 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -187,51 +187,13 @@ rec {
     { mkDerivation = args: stdenv.mkDerivation (args // extraAttrs); };
 
 
-  /* Return a modified stdenv that performs the build under $out/.build
-     instead of in $TMPDIR.  Thus, the sources are kept available.
-     This is useful for things like debugging or generation of
-     dynamic analysis reports. */
-  keepBuildTree = stdenv:
-    addAttrsToDerivation
-      { prePhases = "moveBuildDir";
-
-        moveBuildDir =
-          ''
-            mkdir -p $out/.build
-            cd $out/.build
-          '';
-      } stdenv;
-
-
-  cleanupBuildTree = stdenv:
-    addAttrsToDerivation
-      { postPhases = "cleanupBuildDir";
-
-        # Get rid of everything that isn't a gcno file or a C source
-        # file.  This also includes the gcda files; we're not
-        # interested in coverage resulting from the package's own test
-        # suite.  Also strip the `.tmp_' prefix from gcno files.  (The
-        # Linux kernel creates these.)
-        cleanupBuildDir =
-          ''
-            find $out/.build/ -type f -a ! \
-              \( -name "*.c" -o -name "*.h" -o -name "*.gcno" \) \
-              | xargs rm -f --
-
-            for i in $(find $out/.build/ -name ".tmp_*.gcno"); do
-                mv "$i" "$(echo $i | sed s/.tmp_//)"
-            done
-          '';
-      } stdenv;
-
-
   /* Return a modified stdenv that builds packages with GCC's coverage
      instrumentation.  The coverage note files (*.gcno) are stored in
      $out/.build, along with the source code of the package, to enable
      programs like lcov to produce pretty-printed reports.
   */
   addCoverageInstrumentation = stdenv:
-    cleanupBuildTree (keepBuildTree (overrideInStdenv stdenv [ pkgs.enableCoverageInstrumentation ]));
+    overrideInStdenv stdenv [ pkgs.enableGCOVInstrumentation pkgs.keepBuildTree ];
 
 
   /* Replace the meta.maintainers field of a derivation.  This is useful
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d22468e5ec..a79317cd6ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -396,10 +396,12 @@ let
 
   fixDarwinDylibNames = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-dylib-names.sh;
 
-  enableCoverageInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh;
+  keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh;
 
-  makeCoverageAnalysisReport = makeSetupHook
-    { deps = [ pkgs.lcov pkgs.enableCoverageInstrumentation ]; }
+  enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh;
+
+  makeGCOVReport = makeSetupHook
+    { deps = [ pkgs.lcov pkgs.enableGCOVInstrumentation ]; }
     ../build-support/setup-hooks/make-coverage-analysis-report.sh;
 
 
-- 
GitLab


From 6a9168ad06a8f6e851b4481c32a7bfa78e66deeb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 3 Mar 2014 13:55:50 +0100
Subject: [PATCH 1772/3789] Get rid of services.mesa.* message

---
 nixos/modules/rename.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 1a08a1cf4f3..a26f930eda1 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -115,14 +115,10 @@ in zipModules ([]
 # !!! this hardcodes bash, could we detect from config which shell is actually used?
 ++ obsolete [ "environment" "promptInit" ] [ "programs" "bash" "promptInit" ]
 
-++ obsolete [ "services" "xserver" "driSupport" ] [ "services" "mesa" "driSupport" ]
-++ obsolete [ "services" "xserver" "driSupport32Bit" ] [ "services" "mesa" "driSupport32Bit" ]
-++ obsolete [ "services" "xserver" "s3tcSupport" ] [ "services" "mesa" "s3tcSupport" ]
-++ obsolete [ "services" "xserver" "videoDrivers" ] [ "services" "mesa" "videoDrivers" ]
-++ obsolete [ "services" "mesa" "driSupport" ] [ "hardware" "opengl" "driSupport" ]
-++ obsolete [ "services" "mesa" "driSupport32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ]
-++ obsolete [ "services" "mesa" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ]
-++ obsolete [ "services" "mesa" "videoDrivers" ] [ "hardware" "opengl" "videoDrivers" ]
+++ 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 [ "services" "mysql55" ] [ "services" "mysql" ]
 
-- 
GitLab


From 38d69b08febe4b06e566055cd3868fc70a456929 Mon Sep 17 00:00:00 2001
From: Dario Bertini <berdario@gmail.com>
Date: Mon, 3 Mar 2014 14:06:12 +0100
Subject: [PATCH 1773/3789] Added pew and virtualenv-clone

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1afadd1a276..53b1cff64c3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1782,6 +1782,23 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  pew = buildPythonPackage rec {
+    name = "pew-0.1.9";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pew/${name}.tar.gz";
+      md5 = "90a82400074b50a9e73c3045ed9ac217";
+    };
+
+    buildInputs = [ virtualenv virtualenv-clone ];
+
+    meta = with stdenv.lib; {
+      description = "Tools to manage multiple virtualenvs written in pure python, a virtualenvwrapper rewrite";
+      license = licenses.mit;
+      platforms = platforms.all;
+    };
+  };
+
 
   pudb = buildPythonPackage rec {
     name = "pudb-2013.3.6";
@@ -7229,6 +7246,23 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  virtualenv-clone = buildPythonPackage rec {
+    name = "virtualenv-clone-0.2.4";
+    
+    src = fetchgit {
+      url = "https://github.com/berdario/virtualenv-clone.git";
+      rev = ''c302ca84e524cb22f88c834cccb23dd410cced97'';
+    };
+
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "Script to clone virtualenvs";
+      license = licenses.mit;
+      platforms = platforms.all;
+    };
+  };
+
   waitress = buildPythonPackage rec {
     name = "waitress-0.8.7";
 
-- 
GitLab


From 83771bd926d37158144c9e26aaf6af1404dd05ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 3 Mar 2014 14:21:07 +0100
Subject: [PATCH 1774/3789] add python 3.4.0rc2

---
 .../interpreters/python/3.4/default.nix       | 88 +++++++++++++++++++
 .../interpreters/python/3.4/setup-hook.sh     | 15 ++++
 pkgs/top-level/all-packages.nix               |  9 +-
 3 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/python/3.4/default.nix
 create mode 100644 pkgs/development/interpreters/python/3.4/setup-hook.sh

diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix
new file mode 100644
index 00000000000..8d7da9d91e6
--- /dev/null
+++ b/pkgs/development/interpreters/python/3.4/default.nix
@@ -0,0 +1,88 @@
+{ stdenv, fetchurl
+, bzip2
+, db
+, gdbm
+, libX11, xproto
+, ncurses
+, openssl
+, readline
+, sqlite
+, tcl, tk
+, zlib
+}:
+
+assert readline != null -> ncurses != null;
+
+with stdenv.lib;
+
+let
+  majorVersion = "3.4";
+  version = "${majorVersion}.0";
+  fullVersion = "${version}rc2";
+
+  buildInputs = filter (p: p != null) [
+    zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
+  ];
+in
+stdenv.mkDerivation {
+  name = "python3-${fullVersion}";
+  inherit majorVersion version;
+
+  src = fetchurl {
+    url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
+    sha256 = "0v37mlkwzbc8m54h3nb04x6xm2yx5fmd7flq2shn37ixf9d0ih6z";
+  };
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+
+  preConfigure = ''
+    for i in /usr /sw /opt /pkg; do	# improve purity
+      substituteInPlace ./setup.py --replace $i /no-such-path
+    done
+    ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
+
+    configureFlagsArray=( --enable-shared --with-threads
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
+                          LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}"
+                        )
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  postInstall = ''
+    rm -rf "$out/lib/python${majorVersion}/test"
+    ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
+  '';
+
+  passthru = {
+    zlibSupport = zlib != null;
+    sqliteSupport = sqlite != null;
+    dbSupport = db != null;
+    readlineSupport = readline != null;
+    opensslSupport = openssl != null;
+    tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
+    libPrefix = "python${majorVersion}";
+    executable = "python3.4m";
+    is_py3k = true;
+  };
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://python.org;
+    description = "A high-level dynamically-typed programming language";
+    longDescription = ''
+      Python is a remarkably powerful dynamic programming language that
+      is used in a wide variety of application domains. Some of its key
+      distinguishing features include: clear, readable syntax; strong
+      introspection capabilities; intuitive object orientation; natural
+      expression of procedural code; full modularity, supporting
+      hierarchical packages; exception-based error handling; and very
+      high level dynamic data types.
+    '';
+    license = stdenv.lib.licenses.psfl;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ];
+  };
+}
diff --git a/pkgs/development/interpreters/python/3.4/setup-hook.sh b/pkgs/development/interpreters/python/3.4/setup-hook.sh
new file mode 100644
index 00000000000..ae71b4147ab
--- /dev/null
+++ b/pkgs/development/interpreters/python/3.4/setup-hook.sh
@@ -0,0 +1,15 @@
+addPythonPath() {
+    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.4/site-packages
+}
+
+toPythonPath() {
+    local paths="$1"
+    local result=
+    for i in $paths; do
+        p="$i/lib/python3.4/site-packages"
+        result="${result}${result:+:}$p"
+    done
+    echo $result
+}
+
+envHooks=(${envHooks[@]} addPythonPath)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a79317cd6ba..12b0bc5e4f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3243,8 +3243,9 @@ let
   };
 
   python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { });
-  python33 = callPackage ../development/interpreters/python/3.3 { };
   python32 = callPackage ../development/interpreters/python/3.2 { };
+  python33 = callPackage ../development/interpreters/python/3.3 { };
+  python34 = callPackage ../development/interpreters/python/3.4 { };
 
   python = python27;
   python26 = callPackage ../development/interpreters/python/2.6 {
@@ -6061,6 +6062,12 @@ let
     python = python33;
   });
 
+  python34Packages = import ./python-packages.nix {
+    inherit pkgs;
+    inherit (lib) lowPrio;
+    python = python34;
+  };
+
   python32Packages = import ./python-packages.nix {
     inherit pkgs;
     inherit (lib) lowPrio;
-- 
GitLab


From 6c12e8d2bde6bd5d775230359ed5312908b4abbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 3 Mar 2014 14:58:34 +0100
Subject: [PATCH 1775/3789] pythonPackages.mrbob: 0.1a9 -> 0.1.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5d2b8efd446..00ef1ea8b0e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3844,13 +3844,19 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
   mrbob = buildPythonPackage rec {
     name = "mrbob-${version}";
-    version = "0.1a9";
+    version = "0.1.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/m/mr.bob/mr.bob-${version}.zip";
-      md5 = "2d27d9bd1fc6269a3ecfd1a1ae47cd8a";
+      md5 = "84a117c9a75b86842b0fa5f5c9c767f3";
     };
 
+    # some files in tests dir include unicode names
+    preBuild = ''
+      export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+      export LC_ALL="en_US.UTF-8"
+    '';
+
     buildInputs = [ pkgs.unzip ];
 
     propagatedBuildInputs = [ argparse jinja2 six modules.readline ] ++
-- 
GitLab


From ef7a5deaee1514e9aa546fd10df2954ceb6828f9 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 3 Mar 2014 15:40:07 +0000
Subject: [PATCH 1776/3789] haskellPackages.stripe: New expression

---
 .../libraries/haskell/stripe/default.nix      | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/stripe/default.nix

diff --git a/pkgs/development/libraries/haskell/stripe/default.nix b/pkgs/development/libraries/haskell/stripe/default.nix
new file mode 100644
index 00000000000..1759143eb9b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stripe/default.nix
@@ -0,0 +1,20 @@
+{ cabal, aeson, httpConduit, httpTypes, mtl, text, time
+, unorderedContainers, utf8String
+}:
+
+cabal.mkDerivation (self: {
+  pname = "stripe";
+  version = "0.7.0";
+  sha256 = "02kyxipifdaf08bk85cbgksvm3jn7i648h9afb3jfxqam5j4a7a0";
+  buildDepends = [
+    aeson httpConduit httpTypes mtl text time unorderedContainers
+    utf8String
+  ];
+  meta = {
+    homepage = "https://github.com/michaelschade/hs-stripe";
+    description = "A Haskell implementation of the Stripe API";
+    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 e0d68ea434a..0559c42315b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2304,6 +2304,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   stringbuilder = callPackage ../development/libraries/haskell/stringbuilder {};
 
+  stripe = callPackage ../development/libraries/haskell/stripe {
+    aeson = self.aeson_0_6_2_1;
+  };
+
   svgcairo = callPackage ../development/libraries/haskell/svgcairo {
     libc = pkgs.stdenv.gcc.libc;
   };
-- 
GitLab


From a19cf91652400fbea2ce8c2fdff2c809ab0f4b19 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 20 Feb 2014 14:09:49 -0600
Subject: [PATCH 1777/3789] wpa_supplicant: Update 2.0 -> 2.1

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

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index ec2c704cfb5..bd2caed265f 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -5,13 +5,13 @@
 assert readlineSupport -> readline != null;
 
 stdenv.mkDerivation rec {
-  version = "2.0";
+  version = "2.1";
 
   name = "wpa_supplicant-${version}";
 
   src = fetchurl {
     url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
-    sha256 = "02cy6wrs4nzm7wbq9mc1vby8lnj58k4sb10h718ks8mmzc4mc49c";
+    sha256 = "0xxjw7lslvql1ykfbwmbhdrnjsjljf59fbwf837418s97dz2wqwi";
   };
 
   extraConfig =
-- 
GitLab


From f0125f019e3492b3ca4042bd1cbf66a2f4a99258 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Mar 2014 10:34:26 -0600
Subject: [PATCH 1778/3789] paypalrestsdk: 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 5d2b8efd446..08ba1ca40c4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4544,6 +4544,22 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  paypalrestsdk = buildPythonPackage rec {
+    name = "paypalrestsdk-0.7.0";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/paypalrestsdk/${name}.tar.gz";
+      sha256 = "117kfipzfahf9ysv414bh1mmm5cc9ck5zb6rhpslx1f8gk3frvd6";
+    };
+
+    propagatedBuildInputs = [ httplib2 ];
+
+    meta = {
+      homepage = https://developer.paypal.com/;
+      description = "Python APIs to create, process and manage payment";
+      license = "PayPal SDK License";
+    };
+  };
 
   pep8 = buildPythonPackage rec {
     name = "pep8-${version}";
-- 
GitLab


From ea5d87fedfbdcf9722a9daaa5822ce5e5e43690c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Mar 2014 10:25:33 -0600
Subject: [PATCH 1779/3789] sorl_thumbnail: 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 08ba1ca40c4..fef5a7aac23 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6601,6 +6601,22 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  sorl_thumbnail = buildPythonPackage rec {
+    name = "sorl-thumbnail-11.12";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/s/sorl-thumbnail/${name}.tar.gz";
+      sha256 = "050b9kzbx7jvs3qwfxxshhis090hk128maasy8pi5wss6nx5kyw4";
+    };
+
+    doCheck = false;
+
+    meta = {
+      homepage = http://sorl-thumbnail.readthedocs.org/en/latest/;
+      description = "Thumbnails for Django";
+      license = stdenv.lib.licenses.bsd3;
+    };
+  };
 
   supervisor = buildPythonPackage rec {
     name = "supervisor-3.0";
-- 
GitLab


From 347681ef74c4787052b442b5f6e60c3baa8b20f2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Mar 2014 12:30:58 -0600
Subject: [PATCH 1780/3789] sorl: Describe test failures

---
 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 fef5a7aac23..4e444d939fd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6609,6 +6609,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       sha256 = "050b9kzbx7jvs3qwfxxshhis090hk128maasy8pi5wss6nx5kyw4";
     };
 
+    # Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl.
     doCheck = false;
 
     meta = {
-- 
GitLab


From 9597c8f8fe43427503ee8feaa3dbdde821f42ab0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:52:42 +0100
Subject: [PATCH 1781/3789] haskell-SVGFonts: update to version 1.4.0.2

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

diff --git a/pkgs/development/libraries/haskell/SVGFonts/default.nix b/pkgs/development/libraries/haskell/SVGFonts/default.nix
index de47bd200ee..509efd61968 100644
--- a/pkgs/development/libraries/haskell/SVGFonts/default.nix
+++ b/pkgs/development/libraries/haskell/SVGFonts/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "SVGFonts";
-  version = "1.4.0.1";
-  sha256 = "0f878xg6qngl8ahk8zz03f1kyn2jq1dz05zw8av7s91x2ms8q3rg";
+  version = "1.4.0.2";
+  sha256 = "1a1f0jdz36zpj1196zv5qwg35rm4ra0b4z5spr1m3696292nj8ph";
   buildDepends = [
     attoparsec blazeMarkup blazeSvg dataDefaultClass diagramsLib parsec
     split text tuple vector vectorSpace xml
-- 
GitLab


From a72f47b2f87f0b9b53a849e85517ebe9323c7bd0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:52:45 +0100
Subject: [PATCH 1782/3789] haskell-assert-failure: update to version 0.1.1.0

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

diff --git a/pkgs/development/libraries/haskell/assert-failure/default.nix b/pkgs/development/libraries/haskell/assert-failure/default.nix
index bfb340147a8..b5cc0bdc446 100644
--- a/pkgs/development/libraries/haskell/assert-failure/default.nix
+++ b/pkgs/development/libraries/haskell/assert-failure/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "assert-failure";
-  version = "0.1";
-  sha256 = "1xwd6rhka9gzmldkaw3d7262h51wxw9dwgip39q8pjkvvfs5kwkr";
+  version = "0.1.1.0";
+  sha256 = "09djlhhyn9w822a5r41y7gk4cqk74a2fy7skzml2bah2an166gm1";
   buildDepends = [ prettyShow text ];
   jailbreak = true;
   meta = {
-- 
GitLab


From eeb8e36bad804c44503260aba1418efa760437ad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:52:47 +0100
Subject: [PATCH 1783/3789] haskell-base-compat: update to version 0.4.0

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

diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix
index 6ce94b0d6c0..9e5375a24d8 100644
--- a/pkgs/development/libraries/haskell/base-compat/default.nix
+++ b/pkgs/development/libraries/haskell/base-compat/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "base-compat";
-  version = "0.3.0";
-  sha256 = "0jjj953hr00jj99ld2977al6n6qk67ds9qfzkzwkh5ifgmi6f20i";
+  version = "0.4.0";
+  sha256 = "0ps26w4mjp465a3mh3hpzkdkc97yvfhzh86fcnlqszy9wgj13w65";
   buildDepends = [ errorcallEqInstance ];
   testDepends = [ hspec setenv ];
   meta = {
-- 
GitLab


From 2978b1c334a8a242412e6dd93c0f2305ad19a0ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:52:49 +0100
Subject: [PATCH 1784/3789] haskell-cairo: update to version 0.12.5.3

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

diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
index b009f6763ab..25029618b23 100644
--- a/pkgs/development/libraries/haskell/cairo/default.nix
+++ b/pkgs/development/libraries/haskell/cairo/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cairo";
-  version = "0.12.5.1";
-  sha256 = "02a57kg7s1bjfvk7cnkppfva5g7akhpwsrsa1qzm0kdld51cs86l";
+  version = "0.12.5.3";
+  sha256 = "1g5wn7dzz8cc7my09igr284j96d795jlnmy1q2hhlvssfhwbbvg7";
   buildDepends = [ mtl utf8String ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ cairo libc pkgconfig zlib ];
-- 
GitLab


From b6c93edded216b8011d9e6343d25345790cec4a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:52:51 +0100
Subject: [PATCH 1785/3789] haskell-crypto-pubkey-types: update to version
 0.4.2.2

---
 .../libraries/haskell/crypto-pubkey-types/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
index 7d6a5c1b615..264c420842a 100644
--- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-pubkey-types";
-  version = "0.4.2.1";
-  sha256 = "01jxvx4bjk4qj024ydwskp942gsgy15i9jfh3diq9la8yqnidwj2";
+  version = "0.4.2.2";
+  sha256 = "18z1fnh2xjq600ya8m175m64nwr6bwscr2q47zjy7k38zlm9c8h5";
   buildDepends = [ asn1Types ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";
-- 
GitLab


From f4883496825f349557e704ddd32b182abf418ff5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:52:52 +0100
Subject: [PATCH 1786/3789] haskell-gio: update to version 0.12.5.3

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

diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix
index 6506800a174..19d51d93aab 100644
--- a/pkgs/development/libraries/haskell/gio/default.nix
+++ b/pkgs/development/libraries/haskell/gio/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gio";
-  version = "0.12.5.0";
-  sha256 = "08gg3dh3xsgvj3hwylg5pgrhdrvi1chsybkd0l4hd4bycpm3sx98";
+  version = "0.12.5.3";
+  sha256 = "1n9sima0m30w1bmfk0wb4fawrg76vgpvlzki0kwdh6f0sfczxywc";
   buildDepends = [ glib mtl ];
   buildTools = [ gtk2hsBuildtools ];
   pkgconfigDepends = [ glib ];
-- 
GitLab


From 7e7dc6feff69254ea62195c4bc530e173341289d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:52:54 +0100
Subject: [PATCH 1787/3789] haskell-glib: update to version 0.12.5.3

---
 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 4761c35127e..9ae07187f5a 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.0";
-  sha256 = "0s3gw4xd6d84hylzniy3sjjzz2ia2q4249vplhqn6y64dj96l196";
+  version = "0.12.5.3";
+  sha256 = "0hn55x0bzc6xxsd5fhlnh2mpdn8n80295i2irgbgxqc1wn226frc";
   buildDepends = [ utf8String ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
-- 
GitLab


From 1095825fd2294af14e07e91e5312f2e437b5f21e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:52:56 +0100
Subject: [PATCH 1788/3789] haskell-gtk: update to version 0.12.5.4

---
 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 9ac6fb2f6f2..8198960854c 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.2";
-  sha256 = "06jlwln3w2pgzahhy8n4sqv1chmh899naz8avqabr9ni4hmbrssb";
+  version = "0.12.5.4";
+  sha256 = "0vs31lzrmd3546q8dqql8sf1vfagyr24p5i6ddi792vw14mj3why";
   buildDepends = [ cairo glib mtl pango ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
-- 
GitLab


From 011ca0210b0926e5bbb6b453abe3d0e5a7cfe8a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:52:58 +0100
Subject: [PATCH 1789/3789] haskell-http-reverse-proxy: update to version
 0.3.0.1

---
 .../libraries/haskell/http-reverse-proxy/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index a8e0afc786e..f78205c49a0 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -1,15 +1,15 @@
 { cabal, basicPrelude, blazeBuilder, caseInsensitive, conduit
-, dataDefault, hspec, httpClient, httpConduit, httpTypes
+, dataDefaultClass, hspec, httpClient, httpConduit, httpTypes
 , liftedBase, monadControl, network, networkConduit, resourcet
 , text, transformers, wai, waiLogger, warp, word8
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.3.0";
-  sha256 = "0wwrcm3hhbq9kawk3s12s8ws82vancmc8a5d29f6871jfq3vvzc2";
+  version = "0.3.0.1";
+  sha256 = "01rbczzf300ivb08wncm19wq64m7n6r5xfbgh82phjxjmmx9h6wj";
   buildDepends = [
-    basicPrelude blazeBuilder caseInsensitive conduit dataDefault
+    basicPrelude blazeBuilder caseInsensitive conduit dataDefaultClass
     httpClient httpTypes liftedBase monadControl network networkConduit
     resourcet text wai waiLogger word8
   ];
-- 
GitLab


From b6c59de5517cb7c9a54428ecab92835725040ade Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:53:00 +0100
Subject: [PATCH 1790/3789] haskell-miniutter: update to version 0.4.3.0

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

diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix
index 346e1c6a428..389a79dd6e1 100644
--- a/pkgs/development/libraries/haskell/miniutter/default.nix
+++ b/pkgs/development/libraries/haskell/miniutter/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "miniutter";
-  version = "0.4.2";
-  sha256 = "00027aqxa0631v3n1jsv4aj9kf39s5yivi3dl573s5nj0wibj008";
+  version = "0.4.3.0";
+  sha256 = "0hslks4vr1738pczgzzcl0mrb9jqs1986vjgw4xpvzz9p3ki1n50";
   buildDepends = [ binary minimorph text ];
   testDepends = [ HUnit testFramework testFrameworkHunit text ];
   meta = {
-- 
GitLab


From be693f08cbf24e4e1f65e837b54793cee8f1971d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:53:01 +0100
Subject: [PATCH 1791/3789] haskell-mono-traversable: update to version 0.3.1

---
 .../libraries/haskell/mono-traversable/default.nix     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix
index e0cb6e3a3de..f6c261145c1 100644
--- a/pkgs/development/libraries/haskell/mono-traversable/default.nix
+++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix
@@ -1,19 +1,19 @@
-{ cabal, comonad, hashable, hspec, QuickCheck, semigroupoids
+{ cabal, comonad, foldl, hashable, hspec, QuickCheck, semigroupoids
 , semigroups, text, transformers, unorderedContainers, vector
 , vectorInstances
 }:
 
 cabal.mkDerivation (self: {
   pname = "mono-traversable";
-  version = "0.3.0.3";
-  sha256 = "0n8bgynapx43f4agbp596ywnfv0cm12x3ihifr3vzv78iixnl0xh";
+  version = "0.3.1";
+  sha256 = "0a0vy0hp34sw1q7153jd614mqydzg79pw645kfxlihs3j7ac2b3j";
   buildDepends = [
     comonad hashable semigroupoids semigroups text transformers
     unorderedContainers vector vectorInstances
   ];
   testDepends = [
-    hspec QuickCheck semigroups text transformers unorderedContainers
-    vector
+    foldl hspec QuickCheck semigroups text transformers
+    unorderedContainers vector
   ];
   meta = {
     homepage = "https://github.com/snoyberg/mono-traversable";
-- 
GitLab


From 867b2cb42fe28049b14a5454f9c0ff7d700ddd69 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:53:03 +0100
Subject: [PATCH 1792/3789] haskell-multiarg: update to version 0.26.0.0

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

diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
index ba2249c717a..e8e608f0e0b 100644
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ b/pkgs/development/libraries/haskell/multiarg/default.nix
@@ -1,10 +1,10 @@
-{ cabal, utf8String }:
+{ cabal, bifunctors, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "multiarg";
-  version = "0.24.0.4";
-  sha256 = "1f572046hlv2yngqa4bcxc4kwi8sc5q7v2dw2aap6pv7jfm8m8ws";
-  buildDepends = [ utf8String ];
+  version = "0.26.0.0";
+  sha256 = "0fjzjr66yan62911kfndnr7xmy3waidh4cqazabk6yr1cznpsx8m";
+  buildDepends = [ bifunctors utf8String ];
   meta = {
     homepage = "https://github.com/massysett/multiarg";
     description = "Combinators to build command line parsers";
-- 
GitLab


From 18f1e8df59d63efa7aac03d6f5b8c54e7f873564 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:53:05 +0100
Subject: [PATCH 1793/3789] haskell-pango: update to version 0.12.5.3

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

diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix
index db426f39724..84823b90e47 100644
--- a/pkgs/development/libraries/haskell/pango/default.nix
+++ b/pkgs/development/libraries/haskell/pango/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pango";
-  version = "0.12.5.0";
-  sha256 = "06hchdnw4nfnpb46nb1gwgpwwk41dhp0xfimnbf310idiy0pavcg";
+  version = "0.12.5.3";
+  sha256 = "1n64ppz0jqrbzvimbz4avwnx3z0n5z2gbmbmca0hw9wqf9j6y79a";
   buildDepends = [ cairo glib mtl ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
-- 
GitLab


From e84bb182b2bcfd9da629ca644b4c6d9edaddbb25 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:53:06 +0100
Subject: [PATCH 1794/3789] haskell-poppler: update to version 0.12.3

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

diff --git a/pkgs/development/libraries/haskell/poppler/default.nix b/pkgs/development/libraries/haskell/poppler/default.nix
index 5af2ead5e8e..aecd54c3998 100644
--- a/pkgs/development/libraries/haskell/poppler/default.nix
+++ b/pkgs/development/libraries/haskell/poppler/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "poppler";
-  version = "0.12.2.2";
-  sha256 = "1ln5akiarv1ng5gjrzf8bnkm556xzl50m209qvi5nk98g7fyhqs7";
+  version = "0.12.3";
+  sha256 = "1ny2r1cpsshpg00w6bd0f5mw26xsy99l7dgx2xq8f01zcwdy4nrp";
   buildDepends = [ cairo glib gtk mtl ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc ];
-- 
GitLab


From e74767282c82135e16ff0d2005d28e416480caba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:53:08 +0100
Subject: [PATCH 1795/3789] haskell-shelly: update to version 1.4.4.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 72b3e280b3b..720bbea8933 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.4.4";
-  sha256 = "0gxmwwpg7p5ai35ng8fsx743w3q9p5jl0c1c3ckiqvz4jbwgyf7y";
+  version = "1.4.4.2";
+  sha256 = "01h08bw7j7f5vi3bffd4ipvj5nmab8j5rqgxav688n2jm2342jzk";
   buildDepends = [
     async mtl systemFileio systemFilepath text time unixCompat
   ];
-- 
GitLab


From 9dd8579769b00901b434dd9b43beadaaffe7efcd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:53:21 +0100
Subject: [PATCH 1796/3789] haskell-utility-ht: update to version 0.0.10

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

diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix
index 76ce975b11e..3a407cc4b59 100644
--- a/pkgs/development/libraries/haskell/utility-ht/default.nix
+++ b/pkgs/development/libraries/haskell/utility-ht/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "utility-ht";
-  version = "0.0.9";
-  sha256 = "1m5mjxwf51jd00swp1f4cimaqaral6827y1sidbq61qkw7l6ss8r";
+  version = "0.0.10";
+  sha256 = "17ydzb0p8xhddvfvm4wjv5yjmy0v7nj6fsj11srnnpj91wc9k0xd";
   testDepends = [ QuickCheck ];
   meta = {
     description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
-- 
GitLab


From 63a72b6ea04970393548c8473d1980744622f2b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:53:22 +0100
Subject: [PATCH 1797/3789] haskell-x509: update to version 1.4.10

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

diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix
index 979f477e085..24ebf746202 100644
--- a/pkgs/development/libraries/haskell/x509/default.nix
+++ b/pkgs/development/libraries/haskell/x509/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "x509";
-  version = "1.4.9";
-  sha256 = "0yrlkmrc0ygki61wlfvavvrm5aklircrj5w1nbvjlimrc4j8vq9g";
+  version = "1.4.10";
+  sha256 = "1xsq0g7f5ki6l9yx604j6bsl1k7s3p1xr6hh2086hsgl9fp1f9ap";
   buildDepends = [
     asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes
     filepath mtl pem time
-- 
GitLab


From ae8d12259e95c88a4922be60791fbd13c46b98ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:53:24 +0100
Subject: [PATCH 1798/3789] haskell-yesod-auth: update to version 1.2.6

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

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 56048aeb627..3831cac76e4 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.2.5.3";
-  sha256 = "0rpyx9p3si5453166v9paq18nz209w6lxz3hy5nxg1hyihwh8gy9";
+  version = "1.2.6";
+  sha256 = "1w7svh49zqdrw1qp8v7df6y6mvkf40cn27k5ckxjyfin00rz0x31";
   buildDepends = [
     aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
     fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network
-- 
GitLab


From cd262e83129ef3e8ec1728a326ef4dd55ec5c949 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 11:53:26 +0100
Subject: [PATCH 1799/3789] haskell-yesod-bin: update to version 1.2.6.1

---
 .../libraries/haskell/yesod-bin/default.nix   | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index a466da06d41..59eeac6e3cf 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -1,27 +1,27 @@
 { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit
-, dataDefault, fileEmbed, filepath, fsnotify, ghcPaths, httpConduit
-, httpReverseProxy, httpTypes, liftedBase, network, networkConduit
-, optparseApplicative, parsec, projectTemplate, resourcet
-, shakespeare, shakespeareCss, shakespeareJs, shakespeareText
-, split, systemFileio, systemFilepath, tar, text, time
-, transformers, unixCompat, unorderedContainers, wai, warp, yaml
-, zlib
+, dataDefaultClass, fileEmbed, filepath, fsnotify, ghcPaths
+, httpConduit, httpReverseProxy, httpTypes, liftedBase, network
+, networkConduit, optparseApplicative, parsec, projectTemplate
+, resourcet, shakespeare, shakespeareCss, shakespeareJs
+, shakespeareText, split, systemFileio, systemFilepath, tar, text
+, time, transformers, unixCompat, unorderedContainers, wai, warp
+, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.6";
-  sha256 = "10p0j5w8s2lfjlmkyw4f2lslfr4xb8mzx5ijwavcpc7q9zw9zjk5";
+  version = "1.2.6.1";
+  sha256 = "0w3qar315w96139j16fq4py4qs83bhm6pab9pzjbx8h451sqjarh";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    attoparsec base64Bytestring blazeBuilder Cabal conduit dataDefault
-    fileEmbed filepath fsnotify ghcPaths httpConduit httpReverseProxy
-    httpTypes liftedBase network networkConduit optparseApplicative
-    parsec projectTemplate resourcet shakespeare shakespeareCss
-    shakespeareJs shakespeareText split systemFileio systemFilepath tar
-    text time transformers unixCompat unorderedContainers wai warp yaml
-    zlib
+    attoparsec base64Bytestring blazeBuilder Cabal conduit
+    dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit
+    httpReverseProxy httpTypes liftedBase network networkConduit
+    optparseApplicative parsec projectTemplate resourcet shakespeare
+    shakespeareCss shakespeareJs shakespeareText split systemFileio
+    systemFilepath tar text time transformers unixCompat
+    unorderedContainers wai warp yaml zlib
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
-- 
GitLab


From 513073afc1d9ba71d15f7d9ce6c23bb23c08caeb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 13:28:06 +0100
Subject: [PATCH 1800/3789] haskell-scientific: jailbreak to fix build with
 recent versions of tasty

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

diff --git a/pkgs/development/libraries/haskell/scientific/default.nix b/pkgs/development/libraries/haskell/scientific/default.nix
index 24c0759d6e9..aa57f9dc5df 100644
--- a/pkgs/development/libraries/haskell/scientific/default.nix
+++ b/pkgs/development/libraries/haskell/scientific/default.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
   sha256 = "0xwxds884pqywjbc4j6qkx27nbi64sihig8ps9v884sk08021wrp";
   buildDepends = [ deepseq hashable text ];
   testDepends = [ smallcheck tasty tastySmallcheck text ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/basvandijk/scientific";
     description = "Arbitrary-precision floating-point numbers represented using scientific notation";
-- 
GitLab


From 164cf167b469b317448430791578e269ad1b527b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 20:25:01 +0100
Subject: [PATCH 1801/3789] xmobar: drop obsolete patch files

---
 .../misc/xmobar/add-freeration-variable.patch | 58 -------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 pkgs/applications/misc/xmobar/add-freeration-variable.patch

diff --git a/pkgs/applications/misc/xmobar/add-freeration-variable.patch b/pkgs/applications/misc/xmobar/add-freeration-variable.patch
deleted file mode 100644
index a8c10e1a30d..00000000000
--- a/pkgs/applications/misc/xmobar/add-freeration-variable.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/readme.md b/readme.md
-index f4f07e8..de679c7 100644
---- a/readme.md
-+++ b/readme.md
-@@ -645,7 +645,7 @@ something like:
- - Args: default monitor arguments
- - Variables that can be used with the `-t`/`--template` argument:
-              `total`, `free`, `buffer`, `cache`, `rest`, `used`,
--             `usedratio`, `usedbar`, `freebar`
-+             `usedratio`, `usedbar`, `freeratio`, `freebar`
- - Default template: `Mem: <usedratio>% (<cache>M)`
- 
- ### `Swap Args RefreshRate`
-diff --git a/src/Plugins/Monitors/Mem.hs b/src/Plugins/Monitors/Mem.hs
-index 5c55ee2..3cf46c7 100644
---- a/src/Plugins/Monitors/Mem.hs
-+++ b/src/Plugins/Monitors/Mem.hs
-@@ -19,8 +19,8 @@ import Plugins.Monitors.Common
- memConfig :: IO MConfig
- memConfig = mkMConfig
-        "Mem: <usedratio>% (<cache>M)" -- template
--       ["usedbar", "freebar", "usedratio", "total",
--        "free", "buffer", "cache", "rest", "used"]  -- available replacements
-+       ["usedbar", "freebar", "usedratio", "freeratio", "total",
-+        "free", "buffer", "cache", "rest", "used"] -- available replacements
- 
- fileMEM :: IO String
- fileMEM = readFile "/proc/meminfo"
-@@ -33,7 +33,8 @@ parseMEM =
-            rest = free + buffer + cache
-            used = total - rest
-            usedratio = used / total
--       return [usedratio, total, free, buffer, cache, rest, used]
-+           freeratio = free / total
-+       return [usedratio, freeratio, total, free, buffer, cache, rest, used, freeratio]
- 
- totalMem :: IO Float
- totalMem = fmap ((*1024) . (!!1)) parseMEM
-@@ -42,15 +43,16 @@ usedMem :: IO Float
- usedMem = fmap ((*1024) . (!!6)) parseMEM
- 
- formatMem :: [Float] -> Monitor [String]
--formatMem (r:xs) =
-+formatMem (r:fr:xs) =
-     do let f = showDigits 0
-            rr = 100 * r
-        ub <- showPercentBar rr r
-        fb <- showPercentBar (100 - rr) (1 - r)
-        rs <- showPercentWithColors r
-+       fs <- showPercentWithColors fr
-        s <- mapM (showWithColors f) xs
--       return (ub:fb:rs:s)
--formatMem _ = return $ replicate 9 "N/A"
-+       return (ub:fb:rs:fs:s)
-+formatMem _ = return $ replicate 10 "N/A"
- 
- runMem :: [String] -> Monitor String
- runMem _ =
-- 
GitLab


From 191dabf92342e1205a87b92f208add13001be939 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 21:45:08 +0100
Subject: [PATCH 1802/3789] haskell-control-monad-free: add version 0.5.3

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

diff --git a/pkgs/development/libraries/haskell/control-monad-free/default.nix b/pkgs/development/libraries/haskell/control-monad-free/default.nix
new file mode 100644
index 00000000000..93fed5fae06
--- /dev/null
+++ b/pkgs/development/libraries/haskell/control-monad-free/default.nix
@@ -0,0 +1,14 @@
+{ cabal, deepseq, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "control-monad-free";
+  version = "0.5.3";
+  sha256 = "1igwawcdpg8irayjax1xdrlpa9587k1v4y28ib3xfb7yk0xv7vk1";
+  buildDepends = [ deepseq transformers ];
+  meta = {
+    homepage = "http://github.com/pepeiborra/control-monad-free";
+    description = "Free monads and monad transformers";
+    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 0559c42315b..4144fb0701f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -818,6 +818,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   constraints = callPackage ../development/libraries/haskell/constraints {};
 
+  controlMonadFree = callPackage ../development/libraries/haskell/control-monad-free {};
+
   controlMonadLoop = callPackage ../development/libraries/haskell/control-monad-loop {};
 
   convertible = callPackage ../development/libraries/haskell/convertible {};
-- 
GitLab


From 2a46778cbf3632bbf133db6b11c4680fbd7c827f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Mar 2014 21:45:20 +0100
Subject: [PATCH 1803/3789] haskell-wizards: add version 1.0.1

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

diff --git a/pkgs/development/libraries/haskell/wizards/default.nix b/pkgs/development/libraries/haskell/wizards/default.nix
new file mode 100644
index 00000000000..08c88138101
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wizards/default.nix
@@ -0,0 +1,13 @@
+{ cabal, controlMonadFree, haskeline, mtl, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "wizards";
+  version = "1.0.1";
+  sha256 = "08dn24injfzvhs34yw39y336pyi6p98bdrafx3lhd6lcbp531sca";
+  buildDepends = [ controlMonadFree haskeline mtl transformers ];
+  meta = {
+    description = "High level, generic library for interrogative user interfaces";
+    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 4144fb0701f..401baa1d025 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2594,6 +2594,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   wlPprintText = callPackage ../development/libraries/haskell/wl-pprint-text {};
 
+  wizards = callPackage ../development/libraries/haskell/wizards {};
+
   word8 = callPackage ../development/libraries/haskell/word8 {};
 
   wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {};
-- 
GitLab


From ca8cdcda06b3a337056ac4514ef6e22460a4ea28 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 3 Mar 2014 22:42:10 +0100
Subject: [PATCH 1804/3789] vm/windows: Fix typo in runInWindowsVM.

Coincidentally, even with this typo, most tests work anyway, so I didn't
notice it in the first place.

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

diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index 758120ed4f2..f9b44d450d9 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -28,7 +28,7 @@ in {
     bootstrap = bootstrapper attrs.windowsImage;
   in {
     requiredSystemFeatures = [ "kvm" ];
-    buildur = "${pkgs.stdenv.shell}";
+    builder = "${pkgs.stdenv.shell}";
     args = ["-e" (bootstrap.resumeAndRun builder)];
     windowsImage = bootstrap.suspendedVM;
     origArgs = attrs.args;
-- 
GitLab


From 40635ed343f3f887189c0a929e13d30b68f8a45e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 3 Mar 2014 22:45:14 +0100
Subject: [PATCH 1805/3789] vm/windows: Remove stray "import <nixpkgs>".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/cygwin-iso/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
index a806ea9571f..cb31dd6e61c 100644
--- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix
+++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
@@ -28,7 +28,7 @@ let
   in map gen expr;
 
 in import <nixpkgs/nixos/lib/make-iso9660-image.nix> {
-  inherit (import <nixpkgs> {}) stdenv perl cdrkit pathsFromGraph;
+  inherit stdenv perl cdrkit pathsFromGraph;
   contents = [
     { source = fetchurl {
         url = "http://cygwin.com/setup-x86_64.exe";
-- 
GitLab


From 1771e07e205710ecd9c284d582eaa45ccfbbfa77 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 3 Mar 2014 22:47:05 +0100
Subject: [PATCH 1806/3789] os-specific/windows: Add new package cygwinSetup.

This is primarily going to be used for vmTools.runInWindowsVM, but in
theory, it could also work with Nix on CygWin which I haven't tested.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../windows/cygwin-setup/default.nix          | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/os-specific/windows/cygwin-setup/default.nix

diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix
new file mode 100644
index 00000000000..9f765a4cf0a
--- /dev/null
+++ b/pkgs/os-specific/windows/cygwin-setup/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkgconfig
+, zlib, bzip2, lzma, libgcrypt_1_6
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "cygwin-setup-${version}";
+  version = "20131101";
+
+  src = fetchcvs {
+    cvsRoot = ":pserver:anoncvs@cygwin.com:/cvs/cygwin-apps";
+    module = "setup";
+    date = version;
+    sha256 = "024wxaaxkf7p1i78bh5xrsqmfz7ss2amigbfl2r5w9h87zqn9aq3";
+  };
+
+  nativeBuildInputs = [ autoconf automake libtool flex bison pkgconfig ];
+
+  buildInputs = let
+    mkStatic = flip overrideDerivation (o: {
+      dontDisableStatic = true;
+      configureFlags = toList (o.configureFlags or []) ++ [ "--enable-static" ];
+      buildInputs = map mkStatic (o.buildInputs or []);
+      propagatedBuildInputs = map mkStatic (o.propagatedBuildInputs or []);
+    });
+  in map mkStatic [ zlib bzip2 lzma libgcrypt_1_6 ];
+
+  configureFlags = "--disable-shared";
+
+  dontDisableStatic = true;
+
+  preConfigure = ''
+    autoreconf -vfi
+  '';
+
+  installPhase = ''
+    install -vD setup.exe "$out/bin/setup.exe"
+  '';
+
+  meta = {
+    homepage = https://sourceware.org/cygwin-apps/setup.html;
+    description = "A tool for installing Cygwin";
+    license = licenses.gpl2Plus;
+    platforms = platforms.cygwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12b0bc5e4f8..6cd584e6f1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7170,6 +7170,8 @@ let
   };
 
   windows = rec {
+    cygwinSetup = callPackage ../os-specific/windows/cygwin-setup { };
+
     jom = callPackage ../os-specific/windows/jom { };
 
     w32api = callPackage ../os-specific/windows/w32api {
-- 
GitLab


From 5bd52771ba557eb0e8564ef18da3c863db331c9f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 3 Mar 2014 23:21:34 +0100
Subject: [PATCH 1807/3789] vm/windows: Replace binary with cross cygwinSetup.

As the official Cygwin setup binary download doesn't come in snapshots
or even versioned, the fetchurl of setup.exe will frequently fail, which
in turn will annoy us as hell (or at least me).

One warning though: The fetchurl is currently broken and the cross-build
might not work yet for example on mingw32 (mingw-w64 branch on its way),
but the upstream URL has already changed and the new version contains a
bug (not yet tracked down) which breaks our Windows bootstrap process.

So to conclude: If it's already broken, make it at least "less broken".

"Not broken" is coming soon with the merge of the mingw-w64 branch.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../vm/windows/cygwin-iso/default.nix         | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
index cb31dd6e61c..506aef7900e 100644
--- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix
+++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
@@ -14,6 +14,21 @@ let
     sha256 = "1v596lln2iip5h7wxjnig5rflzvqa21zzd2iyhx07zs28q5h76i9";
   };
 
+  cygwinCross = (import ../../../../top-level/all-packages.nix {
+    inherit (stdenv) system;
+    crossSystem = {
+      libc = "msvcrt";
+      platform = {};
+      openssl.system = "mingw64";
+    } // (if stdenv.is64bit then {
+      config = "x86_64-w64-mingw32";
+      arch = "x86_64";
+    } else {
+      config = "i686-w64-mingw32";
+      arch = "i686";
+    });
+  }).windows.cygwinSetup.crossDrv;
+
   makeCygwinClosure = { packages, packageList }: let
     expr = import (runCommand "cygwin.nix" { buildInputs = [ python ]; } ''
       python ${./mkclosure.py} "${packages}" ${toString packageList} > "$out"
@@ -30,10 +45,7 @@ let
 in import <nixpkgs/nixos/lib/make-iso9660-image.nix> {
   inherit stdenv perl cdrkit pathsFromGraph;
   contents = [
-    { source = fetchurl {
-        url = "http://cygwin.com/setup-x86_64.exe";
-        sha256 = "1bjmq9h1p6mmiqp6f1kvmg94jbsdi1pxfa07a5l497zzv9dsfivm";
-      };
+    { source = "${cygwinCross}/bin/setup.exe";
       target = "setup.exe";
     }
     { source = cygPkgList;
-- 
GitLab


From e86ffa08b7a885b655094d916c1c1d14683405b5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 3 Mar 2014 23:37:41 +0100
Subject: [PATCH 1808/3789] vm/windows: Update SHAs for Cygwin setup.ini.

Another very annoying part. Unfortunately, the only option we might have
here is to include it in nixpkgs or maybe make a fixed Hash on the
result of the closure fetcher.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/cygwin-iso/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
index 506aef7900e..038ceaa0f82 100644
--- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix
+++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
@@ -8,10 +8,10 @@
 let
   cygPkgList = if stdenv.is64bit then fetchurl {
     url = "${mirror}/x86_64/setup.ini";
-    sha256 = "142f8zyfwgi6s2djxv3z5wn0ysl94pxwa79z8rjfqz4kvnpgz120";
+    sha256 = "0ljsxdkx9s916wp28kcvql3bjx80zzzidan6jicby7i9s3sm96n9";
   } else fetchurl {
     url = "${mirror}/x86/setup.ini";
-    sha256 = "1v596lln2iip5h7wxjnig5rflzvqa21zzd2iyhx07zs28q5h76i9";
+    sha256 = "1slyj4qha7x649ggwdski9spmyrbs04z2d46vgk8krllg0kppnjv";
   };
 
   cygwinCross = (import ../../../../top-level/all-packages.nix {
-- 
GitLab


From c6cb3276dd4dfa78cac7d088c54db19e1e8924cf Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 4 Mar 2014 00:52:39 +0100
Subject: [PATCH 1809/3789] windows/cygwin-setup: Drop meta.platforms attr.

This prevents cross-builds, so let's drop it for now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/windows/cygwin-setup/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix
index 9f765a4cf0a..d0995ffc662 100644
--- a/pkgs/os-specific/windows/cygwin-setup/default.nix
+++ b/pkgs/os-specific/windows/cygwin-setup/default.nix
@@ -42,6 +42,5 @@ stdenv.mkDerivation rec {
     homepage = https://sourceware.org/cygwin-apps/setup.html;
     description = "A tool for installing Cygwin";
     license = licenses.gpl2Plus;
-    platforms = platforms.cygwin;
   };
 }
-- 
GitLab


From 19c59ab984e4256b92fefa2c97106deb635457c6 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Sat, 22 Feb 2014 20:56:05 -0800
Subject: [PATCH 1810/3789] upgrade bbswitch to 0.8

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

diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix
index 373f814f6e0..e12c80e0886 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "bbswitch";
-  version = "0.7";
+  version = "0.8";
   name = "${baseName}-${version}-${kernel.version}";
 
 in
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/Bumblebee-Project/${baseName}/archive/v${version}.tar.gz";
-    sha256 = "0na6gfnvmp5fjbm430ms342hmrsbr6cf78n6hldqb8js2ry3f8dw";
+    sha256 = "0xql1nv8dafnrcg54f3jsi3ny3cd2ca9iv73pxpgxd2gfczvvjkn";
   };
 
   preBuild = ''
-- 
GitLab


From c4d5757e294b9e894fc6781a04d546cff6e1da82 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 3 Mar 2014 15:33:11 -0600
Subject: [PATCH 1811/3789] grsecurity updates

  - stable:  3.0-3.2.55-201402241936 -> 3.0-3.2.55-201403022154
  - testing: 3.0-3.13.5-201402241943 -> 3.0-3.13.5-201403031445

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

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index a5a8cbff0ba..e63ff168a61 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -81,8 +81,8 @@ rec {
   grsecurity_3_0_3_2_55 =
     { name = "grsecurity-3.0-3.2.55";
       patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402241936.patch;
-        sha256 = "0kd6bc9kyvn8y6b32fpn778hc8xfm2y4wmpiglia6dqybpyry600";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403022154.patch;
+        sha256 = "0pqp8mfj4zbgb94c7g6ykh0amlwlilxjiqsyc6smmwwbg6klgvkr";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55
@@ -92,8 +92,8 @@ rec {
   grsecurity_3_0_3_13_5 =
     { name = "grsecurity-3.0-3.13.5";
       patch = fetchurl {
-        url = http://grsecurity.net/test/grsecurity-3.0-3.13.5-201402241943.patch;
-        sha256 = "1xv4plviarjprg7bcb4h88wsbrj7x2biypibhzb1pifksmxx25fn";
+        url = http://grsecurity.net/test/grsecurity-3.0-3.13.5-201403031445.patch;
+        sha256 = "0b22jbm9swghhj7a9c07z5yprk88bgp0iv3c8xmfqqyy0yighq1l";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.5
-- 
GitLab


From c2fcf07f06d1366e57a2852be0cc7ad2adbd1b9f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 4 Mar 2014 09:10:23 +0100
Subject: [PATCH 1812/3789] Use feh only as a fallback if the xserver is
 actually enabled. Otherwise feh is installed even though no xserver is
 available.

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

diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 70750770663..dde5b333f32 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -7,9 +7,9 @@ let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager;
 
-  # Whether desktop manager `d' is capable of setting a background.
-  # If it isn't, the `feh' program is used as a fallback.
-  needBGCond = d: ! (d ? bgSupport && d.bgSupport);
+  # If desktop manager `d' isn't capable of setting a background and
+  # the xserver is enabled, the `feh' program is used as a fallback.
+  needBGCond = d: ! (d ? bgSupport && d.bgSupport) && xcfg.enable;
 
 in
 
-- 
GitLab


From bd2d120c0856f0489869b7cdd78b3bc43a300aa3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 4 Mar 2014 08:13:22 +0100
Subject: [PATCH 1813/3789] vm/windows: Allow to specify a different arch.

So far, we determined this based on stdenv.is64bit, but there are cases
where you want to run/build a 32bit program on a 64 bit Windows.

This is now possible, by passing windowsImage.arch = "i686" | "x86_64"
to runInWindowsVM. Based an what was passed, the corresponding Cygwin
packages and setup.exe are bootstrapped.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/bootstrap.nix      |  5 ++++-
 .../vm/windows/cygwin-iso/default.nix            | 16 +++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/vm/windows/bootstrap.nix b/pkgs/build-support/vm/windows/bootstrap.nix
index b2febf19a89..47afce5b5a3 100644
--- a/pkgs/build-support/vm/windows/bootstrap.nix
+++ b/pkgs/build-support/vm/windows/bootstrap.nix
@@ -3,7 +3,7 @@
 , samba, socat, vde2, cdrkit, pathsFromGraph
 }:
 
-{ isoFile, productKey }:
+{ isoFile, productKey, arch ? null }:
 
 with stdenv.lib;
 
@@ -15,6 +15,9 @@ let
 
   mkCygwinImage = import ./cygwin-iso {
     inherit stdenv fetchurl runCommand python perl cdrkit pathsFromGraph;
+    arch = let
+      defaultArch = if stdenv.is64bit then "x86_64" else "i686";
+    in if arch == null then defaultArch else arch;
   };
 
   installer = import ./install {
diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
index 038ceaa0f82..d9801428a88 100644
--- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix
+++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, runCommand, python, perl, cdrkit, pathsFromGraph }:
+{ stdenv, fetchurl, runCommand, python, perl, cdrkit, pathsFromGraph
+, arch ? "x86_64"
+}:
 
 { packages ? []
 , mirror ? "http://ftp.gwdg.de/pub/linux/sources.redhat.com/cygwin"
@@ -6,7 +8,7 @@
 }:
 
 let
-  cygPkgList = if stdenv.is64bit then fetchurl {
+  cygPkgList = if arch == "x86_64" then fetchurl {
     url = "${mirror}/x86_64/setup.ini";
     sha256 = "0ljsxdkx9s916wp28kcvql3bjx80zzzidan6jicby7i9s3sm96n9";
   } else fetchurl {
@@ -20,13 +22,9 @@ let
       libc = "msvcrt";
       platform = {};
       openssl.system = "mingw64";
-    } // (if stdenv.is64bit then {
-      config = "x86_64-w64-mingw32";
-      arch = "x86_64";
-    } else {
-      config = "i686-w64-mingw32";
-      arch = "i686";
-    });
+      inherit arch;
+      config = "${arch}-w64-mingw32";
+    };
   }).windows.cygwinSetup.crossDrv;
 
   makeCygwinClosure = { packages, packageList }: let
-- 
GitLab


From 5d05dde655e2af07fb391ddaf70becef77085c46 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 4 Mar 2014 12:44:15 +0100
Subject: [PATCH 1814/3789] ldm: Use meta.repositories.git.

Improves reliability of nixpkgs-monitor.
---
 pkgs/os-specific/linux/ldm/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix
index df98b5260c6..202831309f0 100644
--- a/pkgs/os-specific/linux/ldm/default.nix
+++ b/pkgs/os-specific/linux/ldm/default.nix
@@ -3,17 +3,18 @@
 assert mountPath != "";
 
 let
-  name = "ldm-0.4.2";
+  version = "v0.4.2";
+  git = https://github.com/LemonBoy/ldm.git;
 in
-stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "ldm-${version}";
 
   # There is a stable release, but we'll use the lvm branch, which
   # contains important fixes for LVM setups.
   src = fetchgit {
-    url = "https://github.com/LemonBoy/ldm.git";
-    rev = "26633ce07b";
-    sha256 = "bb733d3b9b3bd5843b9cf1507a04a063c5aa45b398480411709fc727ae10b8b1";
+    url = meta.repositories.git;
+    rev = "refs/tags/${version}";
+    sha256 = "1fdm3l00csjyvz40py6wlsh8s441rbp4az3sc2i14ag7srh2yim8";
   };
 
   buildInputs = [ udev utillinux ];
@@ -34,5 +35,6 @@ stdenv.mkDerivation {
 
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.the-kenny ];
+    repositories.git = git;
   };
 }
-- 
GitLab


From e0fe5e7c38f7ba5c2989ba2a29d027e17172b6b1 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 16 Jan 2014 21:06:58 +0100
Subject: [PATCH 1815/3789] zfs: Fix libblkid detection (backport from
 upstream)

This fixes issues with importing ZFS pools, such as when the ZFS device is a
partition that covers the end of the disk.

See: https://github.com/zfsonlinux/zfs/issues/1684
---
 pkgs/os-specific/linux/zfs/default.nix        |   2 +-
 .../linux/zfs/libblkid-1db7b9b.patch          | 118 ++++++++++++++++++
 2 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/zfs/libblkid-1db7b9b.patch

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 67ed1312826..162824b1c5b 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "18b5f18k8mwb17r5ippsilmp1a2sqjw9fwn0z82159dkhsadg33b";
   };
 
-  patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ];
+  patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ./libblkid-1db7b9b.patch ];
 
   buildInputs = [ spl perl autoconf automake libtool zlib libuuid coreutils ];
 
diff --git a/pkgs/os-specific/linux/zfs/libblkid-1db7b9b.patch b/pkgs/os-specific/linux/zfs/libblkid-1db7b9b.patch
new file mode 100644
index 00000000000..894bf395ce8
--- /dev/null
+++ b/pkgs/os-specific/linux/zfs/libblkid-1db7b9b.patch
@@ -0,0 +1,118 @@
+commit 1db7b9be75a225cedb3b7a60028ca5695e5b8346
+Author: Richard Yao <ryao@gentoo.org>
+Date:   Wed Aug 28 16:17:47 2013 -0400
+
+    Fix libblkid support
+    
+    libblkid support is dormant because the autotools check is broken and
+    liblkid identifies ZFS vdevs as "zfs_member", not "zfs". We fix that
+    with a few changes:
+    
+    First, we fix the libblkid autotools check to do a few things:
+    
+    1. Make a 64MB file, which is the minimum size ZFS permits.
+    2. Make 4 fake uberblock entries to make libblkid's check succeed.
+    3. Return 0 upon success to make autotools use the success case.
+    4. Include stdlib.h to avoid implicit declration of free().
+    5. Check for "zfs_member", not "zfs"
+    6. Make --with-blkid disable autotools check (avoids Gentoo sandbox violation)
+    7. Pass '-lblkid' correctly using LIBS not LDFLAGS.
+    
+    Second, we change the libblkid support to scan for "zfs_member", not
+    "zfs".
+    
+    This makes --with-blkid work on Gentoo.
+    
+    Signed-off-by: Richard Yao <ryao@gentoo.org>
+    Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+    Issue #1751
+
+diff --git a/config/user-libblkid.m4 b/config/user-libblkid.m4
+index 276587f..2dd2623 100644
+--- a/config/user-libblkid.m4
++++ b/config/user-libblkid.m4
+@@ -22,26 +22,45 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBBLKID], [
+ 		[with_blkid=check])
+ 
+ 	LIBBLKID=
+-	AS_IF([test "x$with_blkid" != xno],
++	AS_IF([test "x$with_blkid" = xyes],
++	[
++		AC_SUBST([LIBBLKID], ["-lblkid"])
++		AC_DEFINE([HAVE_LIBBLKID], 1,
++			[Define if you have libblkid])
++	])
++
++	AS_IF([test "x$with_blkid" = xcheck],
+ 	[
+ 		AC_CHECK_LIB([blkid], [blkid_get_cache],
+ 		[
+ 			AC_MSG_CHECKING([for blkid zfs support])
+ 
+ 			ZFS_DEV=`mktemp`
+-			dd if=/dev/zero of=$ZFS_DEV bs=1024k count=8 \
++			truncate -s 64M $ZFS_DEV
++			echo -en "\x0c\xb1\xba\0\0\0\0\0" | \
++				dd of=$ZFS_DEV bs=1k count=8 \
++				seek=128 conv=notrunc &>/dev/null \
+ 				>/dev/null 2>/dev/null
+ 			echo -en "\x0c\xb1\xba\0\0\0\0\0" | \
+ 				dd of=$ZFS_DEV bs=1k count=8 \
+ 				seek=132 conv=notrunc &>/dev/null \
+ 				>/dev/null 2>/dev/null
++			echo -en "\x0c\xb1\xba\0\0\0\0\0" | \
++				dd of=$ZFS_DEV bs=1k count=8 \
++				seek=136 conv=notrunc &>/dev/null \
++				>/dev/null 2>/dev/null
++			echo -en "\x0c\xb1\xba\0\0\0\0\0" | \
++				dd of=$ZFS_DEV bs=1k count=8 \
++				seek=140 conv=notrunc &>/dev/null \
++				>/dev/null 2>/dev/null
+ 
+-			saved_LDFLAGS="$LDFLAGS"
+-			LDFLAGS="-lblkid"
++			saved_LIBS="$LIBS"
++			LIBS="-lblkid"
+ 
+ 			AC_RUN_IFELSE([AC_LANG_PROGRAM(
+ 			[
+ 				#include <stdio.h>
++				#include <stdlib.h>
+ 				#include <blkid/blkid.h>
+ 			],
+ 			[
+@@ -58,10 +77,10 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBBLKID], [
+ 					return 2;
+ 				}
+ 
+-				if (strcmp(value, "zfs")) {
++				if (strcmp(value, "zfs_member")) {
+ 					free(value);
+ 					blkid_put_cache(cache);
+-					return 3;
++					return 0;
+ 				}
+ 
+ 				free(value);
+@@ -82,7 +101,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBBLKID], [
+ 					[--with-blkid given but unavailable])])
+ 			])
+ 
+-			LDFLAGS="$saved_LDFLAGS"
++			LIBS="$saved_LIBS"
+ 		],
+ 		[
+ 			AS_IF([test "x$with_blkid" != xcheck],
+diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c
+index 53609f2..d1fa98e 100644
+--- a/lib/libzfs/libzfs_import.c
++++ b/lib/libzfs/libzfs_import.c
+@@ -965,7 +965,7 @@ zpool_find_import_blkid(libzfs_handle_t *hdl, pool_list_t *pools)
+ 		goto err_blkid2;
+ 	}
+ 
+-	err = blkid_dev_set_search(iter, "TYPE", "zfs");
++	err = blkid_dev_set_search(iter, "TYPE", "zfs_member");
+ 	if (err != 0) {
+ 		(void) zfs_error_fmt(hdl, EZFS_BADCACHE,
+ 		    dgettext(TEXT_DOMAIN, "blkid_dev_set_search() %d"), err);
-- 
GitLab


From 02e243166168ca65c225eef2f86091c7eb4c3c55 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 16 Jan 2014 21:37:44 +0100
Subject: [PATCH 1816/3789] zfs: Don't look for devices only in /dev

If we don't give out a directory to 'zpool import', it will use libblkid
to automatically find all existing ZFS devices.
---
 nixos/modules/tasks/filesystems/zfs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 7c3c662eeac..853cd833fd0 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -60,7 +60,7 @@ in
         '';
       postDeviceCommands =
         ''
-          zpool import -f -a -d /dev
+          zpool import -f -a
         '';
     };
 
@@ -71,7 +71,7 @@ in
         Type = "oneshot";
         RemainAfterExit = true;
         restartIfChanged = false;
-        ExecStart = "${kernel.zfs}/sbin/zpool import -f -a -d /dev";
+        ExecStart = "${kernel.zfs}/sbin/zpool import -f -a";
       };
     };
 
-- 
GitLab


From d01242edb853b24feea936f85f33702b3c148a70 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 3 Feb 2014 18:13:30 +0100
Subject: [PATCH 1817/3789] zfs: Fix minor filesystem corruption with gcc 4.8

It turns out that some of gcc 4.8's aggressive optimizations may
cause minor filesystem corruption in ZFS. To fix it, a patch was
cherry-picked from the upstream's git tree.

See: https://github.com/zfsonlinux/zfs/pull/2051
---
 pkgs/os-specific/linux/zfs/default.nix   |   2 +-
 pkgs/os-specific/linux/zfs/gcc-4.8.patch | 114 +++++++++++++++++++++++
 2 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/zfs/gcc-4.8.patch

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 162824b1c5b..565a80b23d2 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "18b5f18k8mwb17r5ippsilmp1a2sqjw9fwn0z82159dkhsadg33b";
   };
 
-  patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ./libblkid-1db7b9b.patch ];
+  patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ./libblkid-1db7b9b.patch ./gcc-4.8.patch ];
 
   buildInputs = [ spl perl autoconf automake libtool zlib libuuid coreutils ];
 
diff --git a/pkgs/os-specific/linux/zfs/gcc-4.8.patch b/pkgs/os-specific/linux/zfs/gcc-4.8.patch
new file mode 100644
index 00000000000..34136016376
--- /dev/null
+++ b/pkgs/os-specific/linux/zfs/gcc-4.8.patch
@@ -0,0 +1,114 @@
+commit 0f62f3f9abc4bfa0bcafee9bfa3d55e91dcb371d
+Author: Brian Behlendorf <behlendorf1@llnl.gov>
+Date:   Tue Jan 14 09:39:13 2014 -0800
+
+    Disable GCCs aggressive loop optimization
+    
+    GCC >+ 4.8's aggressive loop optimization breaks some of the iterators
+    over the dn_blkptr[] pseudo-array in dnode_phys. Since dn_blkptr[] is
+    defined as a single-element array, GCC believes an iterator can only
+    access index 0 and will unroll the loop into a single iteration.
+    
+    One way to resolve the issue would be to cast the array to a pointer
+    and fix all the iterators that might break.  The only loop where it
+    is known to cause a problem is this loop in dmu_objset_write_ready():
+    
+        for (i = 0; i < dnp->dn_nblkptr; i++)
+                bp->blk_fill += dnp->dn_blkptr[i].blk_fill;
+    
+    In the common case where dn_nblkptr is 3, the loop is only executed a
+    single time and "i" is equal to 1 following the loop.
+    
+    The specific breakage caused by this problem is that the blk_fill of
+    root block pointers wouldn't be set properly when more than one blkptr
+    is in use (when no indrect blocks are needed).
+    
+    The simple reproducing sequence is:
+    
+    zpool create tank /tank.img
+    zdb -ddddd tank 0
+    
+    Notice that "fill=31", however, there are two L0 indirect blocks with
+    "F=31" and "F=5". The fill count should be 36 rather than 31. This
+    problem causes an assert to be hit in a simple "zdb tank" when built
+    with --enable-debug.
+    
+    However, this approach was not taken because we need to be absolutely
+    sure we catch all instances of this unwanted optimization.  Therefore,
+    the build system has been updated to detect if GCC supports the
+    aggressive loop optimization.  If it does the optimization will be
+    explicitly disabled using the -fno-aggressive-loop-optimization option.
+    
+    Original-fix-by: Tim Chase <tim@chase2k.com>
+    Signed-off-by: Tim Chase <tim@chase2k.com>
+    Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+    Closes #2010
+    Closes #2051
+
+diff --git a/config/Rules.am b/config/Rules.am
+index e3fa5b5..24f9426 100644
+--- a/config/Rules.am
++++ b/config/Rules.am
+@@ -1,8 +1,10 @@
+ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h
+ 
+ AM_LIBTOOLFLAGS = --silent
+-AM_CFLAGS  = -Wall -Wstrict-prototypes
+-AM_CFLAGS += -fno-strict-aliasing ${NO_UNUSED_BUT_SET_VARIABLE} ${DEBUG_CFLAGS}
++AM_CFLAGS  = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes
++AM_CFLAGS += ${NO_UNUSED_BUT_SET_VARIABLE}
++AM_CFLAGS += ${NO_AGGRESSIVE_LOOP_OPTIMIZATIONS}
++AM_CFLAGS += -fno-strict-aliasing
+ AM_CPPFLAGS  = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT
+ AM_CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64
+ AM_CPPFLAGS += -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
+diff --git a/config/always-no-aggressive-loop-optimizations.m4 b/config/always-no-aggressive-loop-optimizations.m4
+new file mode 100644
+index 0000000..8f2115a
+--- /dev/null
++++ b/config/always-no-aggressive-loop-optimizations.m4
+@@ -0,0 +1,20 @@
++dnl #
++dnl # Check if gcc supports -fno-aggressive-loop-optimizations
++dnl #
++AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_NO_AGGRESSIVE_LOOP_OPTIMIZATIONS], [
++	AC_MSG_CHECKING([for -fno-aggressive-loop-optimizations support])
++
++	saved_flags="$CFLAGS"
++	CFLAGS="$CFLAGS -fno-aggressive-loop-optimizations"
++
++	AC_RUN_IFELSE([AC_LANG_PROGRAM([], [])], [
++		NO_AGGRESSIVE_LOOP_OPTIMIZATIONS=-fno-aggressive-loop-optimizations
++		AC_MSG_RESULT([yes])
++	], [
++		NO_AGGRESSIVE_LOOP_OPTIMIZATIONS=
++		AC_MSG_RESULT([no])
++	])
++
++	CFLAGS="$saved_flags"
++	AC_SUBST([NO_AGGRESSIVE_LOOP_OPTIMIZATIONS])
++])
+diff --git a/config/kernel.m4 b/config/kernel.m4
+index cbf0ca3..62a9b42 100644
+--- a/config/kernel.m4
++++ b/config/kernel.m4
+@@ -104,6 +104,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
+ 	dnl # -Wall -fno-strict-aliasing -Wstrict-prototypes and other
+ 	dnl # compiler options are added by the kernel build system.
+ 	KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_UNUSED_BUT_SET_VARIABLE"
++	KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_AGGRESSIVE_LOOP_OPTIMIZATIONS"
+ 	KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
+ 	KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
+ 
+diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
+index 005185b..477b916 100644
+--- a/config/zfs-build.m4
++++ b/config/zfs-build.m4
+@@ -62,6 +62,7 @@ AC_DEFUN([ZFS_AC_DEBUG_DMU_TX], [
+ 
+ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
+ 	ZFS_AC_CONFIG_ALWAYS_NO_UNUSED_BUT_SET_VARIABLE
++	ZFS_AC_CONFIG_ALWAYS_NO_AGGRESSIVE_LOOP_OPTIMIZATIONS
+ ])
+ 
+ AC_DEFUN([ZFS_AC_CONFIG], [
-- 
GitLab


From 17073197e903782d32d265072326eaaf9bfe82af Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 27 Nov 2013 02:20:34 +0100
Subject: [PATCH 1818/3789] spl: Fix compilation on 3.12 and later kernels

---
 pkgs/os-specific/linux/spl/3_12-compat.patch | 429 +++++++++++++++++++
 pkgs/os-specific/linux/spl/default.nix       |   2 +-
 2 files changed, 430 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/spl/3_12-compat.patch

diff --git a/pkgs/os-specific/linux/spl/3_12-compat.patch b/pkgs/os-specific/linux/spl/3_12-compat.patch
new file mode 100644
index 00000000000..b196098b7df
--- /dev/null
+++ b/pkgs/os-specific/linux/spl/3_12-compat.patch
@@ -0,0 +1,429 @@
+commit c3d9c0df3ee8d43db22815ebbfbe8b803fa46e46
+Author: Richard Yao <ryao@gentoo.org>
+Date:   Tue Nov 5 11:35:54 2013 -0500
+
+    Linux 3.12 compat: New shrinker API
+    
+    torvalds/linux@24f7c6 introduced a new shrinker API while
+    torvalds/linux@a0b021 dropped support for the old shrinker API.
+    This patch adds support for the new shrinker API by wrapping
+    the old one with the new one.
+    
+    This change also reorganizes the autotools checks on the shrinker
+    API such that the configure script will fail early if an unknown
+    API is encountered in the future.
+    
+    Support for the set_shrinker() API which was used by Linux 2.6.22
+    and older has been dropped.  As a general rule compatibility is
+    only maintained back to Linux 2.6.26.
+    
+    Signed-off-by: Richard Yao <ryao@gentoo.org>
+    Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+    Closes zfsonlinux/zfs#1732
+    Closes zfsonlinux/zfs#1822
+    Closes #293
+    Closes #307
+
+diff --git a/config/spl-build.m4 b/config/spl-build.m4
+index b0e3348..7d744db 100644
+--- a/config/spl-build.m4
++++ b/config/spl-build.m4
+@@ -27,8 +27,7 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
+ 	SPL_AC_TYPE_ATOMIC64_XCHG
+ 	SPL_AC_TYPE_UINTPTR_T
+ 	SPL_AC_2ARGS_REGISTER_SYSCTL
+-	SPL_AC_SET_SHRINKER
+-	SPL_AC_3ARGS_SHRINKER_CALLBACK
++	SPL_AC_SHRINKER_CALLBACK
+ 	SPL_AC_PATH_IN_NAMEIDATA
+ 	SPL_AC_TASK_CURR
+ 	SPL_AC_CTL_UNNUMBERED
+@@ -885,37 +884,18 @@ AC_DEFUN([SPL_AC_2ARGS_REGISTER_SYSCTL],
+ 	])
+ ])
+ 
+-dnl #
+-dnl # 2.6.23 API change
+-dnl # Old set_shrinker API replaced with register_shrinker
+-dnl #
+-AC_DEFUN([SPL_AC_SET_SHRINKER], [
+-	AC_MSG_CHECKING([whether set_shrinker() available])
+-	SPL_LINUX_TRY_COMPILE([
+-		#include <linux/mm.h>
+-	],[
+-		return set_shrinker(DEFAULT_SEEKS, NULL);
+-	],[
+-		AC_MSG_RESULT([yes])
+-		AC_DEFINE(HAVE_SET_SHRINKER, 1,
+-		          [set_shrinker() available])
+-	],[
+-		AC_MSG_RESULT([no])
+-	])
+-])
+-
+-dnl #
+-dnl # 2.6.35 API change,
+-dnl # Add context to shrinker callback
+-dnl #
+-AC_DEFUN([SPL_AC_3ARGS_SHRINKER_CALLBACK],
+-	[AC_MSG_CHECKING([whether shrinker callback wants 3 args])
++AC_DEFUN([SPL_AC_SHRINKER_CALLBACK],[
+ 	tmp_flags="$EXTRA_KCFLAGS"
+ 	EXTRA_KCFLAGS="-Werror"
++	dnl #
++	dnl # 2.6.23 to 2.6.34 API change
++	dnl # ->shrink(int nr_to_scan, gfp_t gfp_mask)
++	dnl #
++	AC_MSG_CHECKING([whether old 2-argument shrinker exists])
+ 	SPL_LINUX_TRY_COMPILE([
+ 		#include <linux/mm.h>
+ 
+-		int shrinker_cb(struct shrinker *, int, unsigned int);
++		int shrinker_cb(int nr_to_scan, gfp_t gfp_mask);
+ 	],[
+ 		struct shrinker cache_shrinker = {
+ 			.shrink = shrinker_cb,
+@@ -924,10 +904,86 @@ AC_DEFUN([SPL_AC_3ARGS_SHRINKER_CALLBACK],
+ 		register_shrinker(&cache_shrinker);
+ 	],[
+ 		AC_MSG_RESULT(yes)
+-		AC_DEFINE(HAVE_3ARGS_SHRINKER_CALLBACK, 1,
+-		          [shrinker callback wants 3 args])
++		AC_DEFINE(HAVE_2ARGS_OLD_SHRINKER_CALLBACK, 1,
++			[old shrinker callback wants 2 args])
+ 	],[
+ 		AC_MSG_RESULT(no)
++		dnl #
++		dnl # 2.6.35 - 2.6.39 API change
++		dnl # ->shrink(struct shrinker *,
++		dnl #          int nr_to_scan, gfp_t gfp_mask)
++		dnl #
++		AC_MSG_CHECKING([whether old 3-argument shrinker exists])
++		SPL_LINUX_TRY_COMPILE([
++			#include <linux/mm.h>
++
++			int shrinker_cb(struct shrinker *, int nr_to_scan,
++					gfp_t gfp_mask);
++		],[
++			struct shrinker cache_shrinker = {
++				.shrink = shrinker_cb,
++				.seeks = DEFAULT_SEEKS,
++			};
++			register_shrinker(&cache_shrinker);
++		],[
++			AC_MSG_RESULT(yes)
++			AC_DEFINE(HAVE_3ARGS_SHRINKER_CALLBACK, 1,
++				[old shrinker callback wants 3 args])
++		],[
++			AC_MSG_RESULT(no)
++			dnl #
++			dnl # 3.0 - 3.11 API change
++			dnl # ->shrink(struct shrinker *,
++			dnl #          struct shrink_control *sc)
++			dnl #
++			AC_MSG_CHECKING(
++				[whether new 2-argument shrinker exists])
++			SPL_LINUX_TRY_COMPILE([
++				#include <linux/mm.h>
++
++				int shrinker_cb(struct shrinker *,
++						struct shrink_control *sc);
++			],[
++				struct shrinker cache_shrinker = {
++					.shrink = shrinker_cb,
++					.seeks = DEFAULT_SEEKS,
++				};
++				register_shrinker(&cache_shrinker);
++			],[
++				AC_MSG_RESULT(yes)
++				AC_DEFINE(HAVE_2ARGS_NEW_SHRINKER_CALLBACK, 1,
++					[new shrinker callback wants 2 args])
++			],[
++				AC_MSG_RESULT(no)
++				dnl #
++				dnl # 3.12 API change,
++				dnl # ->shrink() is logically split in to
++				dnl # ->count_objects() and ->scan_objects()
++				dnl #
++				AC_MSG_CHECKING(
++				    [whether ->count_objects callback exists])
++				SPL_LINUX_TRY_COMPILE([
++					#include <linux/mm.h>
++
++					unsigned long shrinker_cb(
++						struct shrinker *,
++						struct shrink_control *sc);
++				],[
++					struct shrinker cache_shrinker = {
++						.count_objects = shrinker_cb,
++						.scan_objects = shrinker_cb,
++						.seeks = DEFAULT_SEEKS,
++					};
++					register_shrinker(&cache_shrinker);
++				],[
++					AC_MSG_RESULT(yes)
++					AC_DEFINE(HAVE_SPLIT_SHRINKER_CALLBACK,
++						1, [->count_objects exists])
++				],[
++					AC_MSG_ERROR(error)
++				])
++			])
++		])
+ 	])
+ 	EXTRA_KCFLAGS="$tmp_flags"
+ ])
+diff --git a/include/linux/mm_compat.h b/include/linux/mm_compat.h
+index cb1bef9..37c9b08 100644
+--- a/include/linux/mm_compat.h
++++ b/include/linux/mm_compat.h
+@@ -148,107 +148,167 @@ extern shrink_icache_memory_t shrink_icache_memory_fn;
+ #endif /* HAVE_SHRINK_ICACHE_MEMORY */
+ 
+ /*
+- * Linux 2.6. - 2.6. Shrinker API Compatibility.
++ * Due to frequent changes in the shrinker API the following
++ * compatibility wrappers should be used.  They are as follows:
++ *
++ * SPL_SHRINKER_DECLARE is used to declare the shrinker which is
++ * passed to spl_register_shrinker()/spl_unregister_shrinker().  Use
++ * shrinker_name to set the shrinker variable name, shrinker_callback
++ * to set the callback function, and seek_cost to define the cost of
++ * reclaiming an object.
++ *
++ *   SPL_SHRINKER_DECLARE(shrinker_name, shrinker_callback, seek_cost);
++ *
++ * SPL_SHRINKER_CALLBACK_FWD_DECLARE is used when a forward declaration
++ * of the shrinker callback function is required.  Only the callback
++ * function needs to be passed.
++ *
++ *   SPL_SHRINKER_CALLBACK_FWD_DECLARE(shrinker_callback);
++ *
++ * SPL_SHRINKER_CALLBACK_WRAPPER is used to declare the callback function
++ * which is registered with the shrinker.  This function will call your
++ * custom shrinker which must use the following prototype.  Notice the
++ * leading __'s, these must be appended to the callback_function name.
++ *
++ *   int  __shrinker_callback(struct shrinker *, struct shrink_control *)
++ *   SPL_SHRINKER_CALLBACK_WRAPPER(shrinker_callback);a
++ *
++ *
++ * Example:
++ *
++ * SPL_SHRINKER_CALLBACK_FWD_DECLARE(my_shrinker_fn);
++ * SPL_SHRINKER_DECLARE(my_shrinker, my_shrinker_fn, 1);
++ *
++ * static int
++ * __my_shrinker_fn(struct shrinker *shrink, struct shrink_control *sc)
++ * {
++ *	if (sc->nr_to_scan) {
++ *		...scan objects in the cache and reclaim them...
++ *	}
++ *
++ *	...calculate number of objects in the cache...
++ *
++ *	return (number of objects in the cache);
++ * }
++ * SPL_SHRINKER_CALLBACK_WRAPPER(my_shrinker_fn);
+  */
+-#ifdef HAVE_SET_SHRINKER
+-typedef struct spl_shrinker {
+-	struct shrinker *shrinker;
+-	shrinker_t fn;
+-	int seeks;
+-} spl_shrinker_t;
+-
+-static inline void
+-spl_register_shrinker(spl_shrinker_t *ss)
+-{
+-	ss->shrinker = set_shrinker(ss->seeks, ss->fn);
+-}
+ 
+-static inline void
+-spl_unregister_shrinker(spl_shrinker_t *ss)
+-{
+-	remove_shrinker(ss->shrinker);
+-}
++#define	spl_register_shrinker(x)	register_shrinker(x)
++#define	spl_unregister_shrinker(x)	unregister_shrinker(x)
+ 
+-# define SPL_SHRINKER_DECLARE(s, x, y)                                 \
+-	static spl_shrinker_t s = {                                    \
+-		.shrinker = NULL,                                      \
+-		.fn = x,                                               \
+-		.seeks = y                                             \
+-	}
+-
+-# define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn)                         \
+-	static int fn(int, unsigned int)
+-# define SPL_SHRINKER_CALLBACK_WRAPPER(fn)                             \
+-static int                                                             \
+-fn(int nr_to_scan, unsigned int gfp_mask)                              \
+-{                                                                      \
+-	struct shrink_control sc;                                      \
+-                                                                       \
+-        sc.nr_to_scan = nr_to_scan;                                    \
+-        sc.gfp_mask = gfp_mask;                                        \
+-                                                                       \
+-	return __ ## fn(NULL, &sc);                                    \
++/*
++ * Linux 2.6.23 - 2.6.34 Shrinker API Compatibility.
++ */
++#if defined(HAVE_2ARGS_OLD_SHRINKER_CALLBACK)
++#define	SPL_SHRINKER_DECLARE(s, x, y)					\
++static struct shrinker s = {						\
++	.shrink = x,							\
++	.seeks = y							\
+ }
+ 
+-#else
++#define	SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn)				\
++static int fn(int nr_to_scan, unsigned int gfp_mask)
+ 
+-# define spl_register_shrinker(x)	register_shrinker(x)
+-# define spl_unregister_shrinker(x)	unregister_shrinker(x)
+-# define SPL_SHRINKER_DECLARE(s, x, y)                                 \
+-	static struct shrinker s = {                                   \
+-		.shrink = x,                                           \
+-		.seeks = y                                             \
+-	}
++#define	SPL_SHRINKER_CALLBACK_WRAPPER(fn)				\
++static int								\
++fn(int nr_to_scan, unsigned int gfp_mask)				\
++{									\
++	struct shrink_control sc;					\
++									\
++	sc.nr_to_scan = nr_to_scan;					\
++	sc.gfp_mask = gfp_mask;						\
++									\
++	return (__ ## fn(NULL, &sc));					\
++}
+ 
+ /*
+- * Linux 2.6. - 2.6. Shrinker API Compatibility.
++ * Linux 2.6.35 to 2.6.39 Shrinker API Compatibility.
+  */
+-# if defined(HAVE_SHRINK_CONTROL_STRUCT)
+-#  define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn)                        \
+-	static int fn(struct shrinker *, struct shrink_control *)
+-#  define SPL_SHRINKER_CALLBACK_WRAPPER(fn)                            \
+-static int                                                             \
+-fn(struct shrinker *shrink, struct shrink_control *sc) {               \
+-	return __ ## fn(shrink, sc);                                   \
++#elif defined(HAVE_3ARGS_SHRINKER_CALLBACK)
++#define	SPL_SHRINKER_DECLARE(s, x, y)					\
++static struct shrinker s = {						\
++	.shrink = x,							\
++	.seeks = y							\
++}
++
++#define	SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn)				\
++static int fn(struct shrinker *, int, unsigned int)
++
++#define	SPL_SHRINKER_CALLBACK_WRAPPER(fn)				\
++static int								\
++fn(struct shrinker *shrink, int nr_to_scan, unsigned int gfp_mask)	\
++{									\
++	struct shrink_control sc;					\
++									\
++	sc.nr_to_scan = nr_to_scan;					\
++	sc.gfp_mask = gfp_mask;						\
++									\
++	return (__ ## fn(shrink, &sc));					\
+ }
+ 
+ /*
+- * Linux 2.6. - 2.6. Shrinker API Compatibility.
++ * Linux 3.0 to 3.11 Shrinker API Compatibility.
+  */
+-# elif defined(HAVE_3ARGS_SHRINKER_CALLBACK)
+-#  define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn)                       \
+-	static int fn(struct shrinker *, int, unsigned int)
+-#  define SPL_SHRINKER_CALLBACK_WRAPPER(fn)                           \
+-static int                                                            \
+-fn(struct shrinker *shrink, int nr_to_scan, unsigned int gfp_mask)    \
+-{                                                                     \
+-	struct shrink_control sc;                                     \
+-                                                                      \
+-        sc.nr_to_scan = nr_to_scan;                                   \
+-        sc.gfp_mask = gfp_mask;                                       \
+-                                                                      \
+-	return __ ## fn(shrink, &sc);                                 \
++#elif defined(HAVE_2ARGS_NEW_SHRINKER_CALLBACK)
++#define	SPL_SHRINKER_DECLARE(s, x, y)					\
++static struct shrinker s = {						\
++	.shrink = x,							\
++	.seeks = y							\
++}
++
++#define	SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn)				\
++static int fn(struct shrinker *, struct shrink_control *)
++
++#define	SPL_SHRINKER_CALLBACK_WRAPPER(fn)				\
++static int								\
++fn(struct shrinker *shrink, struct shrink_control *sc)			\
++{									\
++	return (__ ## fn(shrink, sc));					\
+ }
+ 
+ /*
+- * Linux 2.6. - 2.6. Shrinker API Compatibility.
++ * Linux 3.12 and later Shrinker API Compatibility.
+  */
+-# else
+-#  define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn)                       \
+-	static int fn(int, unsigned int)
+-#  define SPL_SHRINKER_CALLBACK_WRAPPER(fn)                           \
+-static int                                                            \
+-fn(int nr_to_scan, unsigned int gfp_mask)                             \
+-{                                                                     \
+-	struct shrink_control sc;                                     \
+-                                                                      \
+-        sc.nr_to_scan = nr_to_scan;                                   \
+-        sc.gfp_mask = gfp_mask;                                       \
+-                                                                      \
+-	return __ ## fn(NULL, &sc);                                   \
++#elif defined(HAVE_SPLIT_SHRINKER_CALLBACK)
++#define	SPL_SHRINKER_DECLARE(s, x, y)					\
++static struct shrinker s = {						\
++	.count_objects = x ## _count_objects,				\
++	.scan_objects = x ## _scan_objects,				\
++	.seeks = y							\
+ }
+ 
+-# endif
+-#endif /* HAVE_SET_SHRINKER */
++#define	SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn)				\
++static unsigned long fn ## _count_objects(struct shrinker *,		\
++    struct shrink_control *);						\
++static unsigned long fn ## _scan_objects(struct shrinker *,		\
++    struct shrink_control *)
++
++#define	SPL_SHRINKER_CALLBACK_WRAPPER(fn)				\
++static unsigned long							\
++fn ## _count_objects(struct shrinker *shrink, struct shrink_control *sc)\
++{									\
++	int __ret__;							\
++									\
++	sc->nr_to_scan = 0;						\
++	__ret__ = __ ## fn(NULL, sc);					\
++									\
++	/* Errors may not be returned and must be converted to zeros */	\
++	return ((__ret__ < 0) ? 0 : __ret__);				\
++}									\
++									\
++static unsigned long							\
++fn ## _scan_objects(struct shrinker *shrink, struct shrink_control *sc)	\
++{									\
++	int __ret__;							\
++									\
++	__ret__ = __ ## fn(NULL, sc);					\
++	return ((__ret__ < 0) ? SHRINK_STOP : __ret__);			\
++}
++#else
++/*
++ * Linux 2.x to 2.6.22, or a newer shrinker API has been introduced.
++ */
++#error "Unknown shrinker callback"
++#endif
+ 
+ #endif /* SPL_MM_COMPAT_H */
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index ee264f67127..9309804d007 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "196scl8q0bkkak6m0p1l1fz254cgsizqm73bf9wk3iynamq7qmrw";
   };
 
-  patches = [ ./install_prefix.patch ];
+  patches = [ ./install_prefix.patch ./3_12-compat.patch ];
 
   buildInputs = [ perl autoconf automake libtool ];
 
-- 
GitLab


From c5b3257388cf303122cbac7a6ef2d2d7fef716ed Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 4 Mar 2014 00:59:40 +0100
Subject: [PATCH 1819/3789] spl: Fix compilation on 3.13 and later kernels

---
 .../os-specific/linux/spl/3_13-compat-1.patch |  61 +++++++
 .../os-specific/linux/spl/3_13-compat-2.patch | 168 ++++++++++++++++++
 pkgs/os-specific/linux/spl/default.nix        |   4 +-
 3 files changed, 231 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/os-specific/linux/spl/3_13-compat-1.patch
 create mode 100644 pkgs/os-specific/linux/spl/3_13-compat-2.patch

diff --git a/pkgs/os-specific/linux/spl/3_13-compat-1.patch b/pkgs/os-specific/linux/spl/3_13-compat-1.patch
new file mode 100644
index 00000000000..40946931c80
--- /dev/null
+++ b/pkgs/os-specific/linux/spl/3_13-compat-1.patch
@@ -0,0 +1,61 @@
+From 3e96de17d723d6f6c9e2fd04b059b50d4e0bbef0 Mon Sep 17 00:00:00 2001
+From: Richard Yao <ryao@gentoo.org>
+Date: Thu, 8 Aug 2013 04:30:55 -0400
+Subject: [PATCH] Linux 3.13 compat: Remove unused flags variable from
+ __cv_init()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC 4.8.1 complained about an unused flags variable when building
+against Linux 2.6.26.8:
+
+/var/tmp/portage/sys-kernel/spl-9999/work/spl-9999/module/spl/../../module/spl/spl-condvar.c:
+In function ‘__cv_init’:
+/var/tmp/portage/sys-kernel/spl-9999/work/spl-9999/module/spl/../../module/spl/spl-condvar.c:39:6:
+error: variable ‘flags’ set but not used
+[-Werror=unused-but-set-variable]
+  int flags = KM_SLEEP;
+        ^
+	cc1: all warnings being treated as errors
+
+Additionally, the superfluous code uses a preempt_count variable that is
+no longer available on Linux 3.13. Deleting the unnecessary code fixes a
+Linux 3.13 compatibility issue.
+
+Signed-off-by: Richard Yao <ryao@gentoo.org>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #312
+---
+ module/spl/spl-condvar.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/module/spl/spl-condvar.c b/module/spl/spl-condvar.c
+index 283648a..8236412 100644
+--- a/module/spl/spl-condvar.c
++++ b/module/spl/spl-condvar.c
+@@ -36,8 +36,6 @@
+ void
+ __cv_init(kcondvar_t *cvp, char *name, kcv_type_t type, void *arg)
+ {
+-	int flags = KM_SLEEP;
+-
+ 	SENTRY;
+ 	ASSERT(cvp);
+ 	ASSERT(name == NULL);
+@@ -51,12 +49,6 @@
+ 	atomic_set(&cvp->cv_refs, 1);
+ 	cvp->cv_mutex = NULL;
+ 
+-        /* We may be called when there is a non-zero preempt_count or
+-	 * interrupts are disabled is which case we must not sleep.
+-	 */
+-        if (current_thread_info()->preempt_count || irqs_disabled())
+-		flags = KM_NOSLEEP;
+-
+ 	SEXIT;
+ }
+ EXPORT_SYMBOL(__cv_init);
+-- 
+1.8.5.5
+
diff --git a/pkgs/os-specific/linux/spl/3_13-compat-2.patch b/pkgs/os-specific/linux/spl/3_13-compat-2.patch
new file mode 100644
index 00000000000..1f487f042f8
--- /dev/null
+++ b/pkgs/os-specific/linux/spl/3_13-compat-2.patch
@@ -0,0 +1,168 @@
+From 50a0749eba31e821a7edf286f1e3b149f7d13c59 Mon Sep 17 00:00:00 2001
+From: Richard Yao <ryao@gentoo.org>
+Date: Mon, 25 Nov 2013 11:22:33 -0500
+Subject: [PATCH] Linux 3.13 compat: Pass NULL for new delegated inode argument
+
+This check was originally added for SLES10, a093c6a, to check for
+a 'struct vfsmount *' argument which they added.  However, since
+SLES10 is based on a 2.6.16 kernel which is no longer supported
+this functionality was dropped.  The checks were refactored to
+support Linux 3.13 without concern for historical versions.
+
+Signed-off-by: Richard Yao <ryao@gentoo.org>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #312
+---
+ config/spl-build.m4    | 52 ++++++++++++++++++++++++++++++++++++++++----------
+ module/spl/spl-vnode.c | 22 ++++++++++++---------
+ 2 files changed, 55 insertions(+), 19 deletions(-)
+
+diff --git a/config/spl-build.m4 b/config/spl-build.m4
+index 7d744db..8426780 100644
+--- a/config/spl-build.m4
++++ b/config/spl-build.m4
+@@ -1842,41 +1842,73 @@ AC_DEFUN([SPL_AC_SET_FS_PWD_WITH_CONST],
+ 	EXTRA_KCFLAGS="$tmp_flags"
+ ])
+ 
+-dnl #
+-dnl # SLES API change, never adopted in mainline,
+-dnl # Third 'struct vfsmount *' argument removed.
+-dnl #
+ AC_DEFUN([SPL_AC_2ARGS_VFS_UNLINK],
+ 	[AC_MSG_CHECKING([whether vfs_unlink() wants 2 args])
+ 	SPL_LINUX_TRY_COMPILE([
+ 		#include <linux/fs.h>
+ 	],[
+-		vfs_unlink(NULL, NULL);
++		vfs_unlink((struct inode *) NULL, (struct dentry *) NULL);
+ 	],[
+ 		AC_MSG_RESULT(yes)
+ 		AC_DEFINE(HAVE_2ARGS_VFS_UNLINK, 1,
+ 		          [vfs_unlink() wants 2 args])
+ 	],[
+ 		AC_MSG_RESULT(no)
++		dnl #
++		dnl # Linux 3.13 API change
++		dnl # Added delegated inode
++		dnl #
++		AC_MSG_CHECKING([whether vfs_unlink() wants 3 args])
++		SPL_LINUX_TRY_COMPILE([
++			#include <linux/fs.h>
++		],[
++			vfs_unlink((struct inode *) NULL,
++				(struct dentry *) NULL,
++				(struct inode **) NULL);
++		],[
++			AC_MSG_RESULT(yes)
++			AC_DEFINE(HAVE_3ARGS_VFS_UNLINK, 1,
++				  [vfs_unlink() wants 3 args])
++		],[
++			AC_MSG_ERROR(no)
++		])
++
+ 	])
+ ])
+ 
+-dnl #
+-dnl # SLES API change, never adopted in mainline,
+-dnl # Third and sixth 'struct vfsmount *' argument removed.
+-dnl #
+ AC_DEFUN([SPL_AC_4ARGS_VFS_RENAME],
+ 	[AC_MSG_CHECKING([whether vfs_rename() wants 4 args])
+ 	SPL_LINUX_TRY_COMPILE([
+ 		#include <linux/fs.h>
+ 	],[
+-		vfs_rename(NULL, NULL, NULL, NULL);
++		vfs_rename((struct inode *) NULL, (struct dentry *) NULL,
++			(struct inode *) NULL, (struct dentry *) NULL);
+ 	],[
+ 		AC_MSG_RESULT(yes)
+ 		AC_DEFINE(HAVE_4ARGS_VFS_RENAME, 1,
+ 		          [vfs_rename() wants 4 args])
+ 	],[
+ 		AC_MSG_RESULT(no)
++		dnl #
++		dnl # Linux 3.13 API change
++		dnl # Added delegated inode
++		dnl #
++		AC_MSG_CHECKING([whether vfs_rename() wants 5 args])
++		SPL_LINUX_TRY_COMPILE([
++			#include <linux/fs.h>
++		],[
++			vfs_rename((struct inode *) NULL,
++				(struct dentry *) NULL,
++				(struct inode *) NULL,
++				(struct dentry *) NULL,
++				(struct inode **) NULL);
++		],[
++			AC_MSG_RESULT(yes)
++			AC_DEFINE(HAVE_5ARGS_VFS_RENAME, 1,
++				  [vfs_rename() wants 5 args])
++		],[
++			AC_MSG_ERROR(no)
++		])
+ 	])
+ ])
+ 
+diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c
+index 0784ff2..5496067 100644
+--- a/module/spl/spl-vnode.c
++++ b/module/spl/spl-vnode.c
+@@ -334,7 +334,11 @@
+ 		if (inode)
+ 			ihold(inode);
+ 
++#ifdef HAVE_2ARGS_VFS_UNLINK
+ 		rc = vfs_unlink(parent.dentry->d_inode, dentry);
++#else
++		rc = vfs_unlink(parent.dentry->d_inode, dentry, NULL);
++#endif /* HAVE_2ARGS_VFS_UNLINK */
+ exit1:
+ 		dput(dentry);
+ 	} else {
+@@ -412,10 +416,10 @@
+ 
+ #ifdef HAVE_4ARGS_VFS_RENAME
+ 	rc = vfs_rename(old_dir->d_inode, old_dentry,
+-			new_dir->d_inode, new_dentry);
++	    new_dir->d_inode, new_dentry);
+ #else
+-	rc = vfs_rename(old_dir->d_inode, old_dentry, oldnd.nd_mnt,
+-			new_dir->d_inode, new_dentry, newnd.nd_mnt);
++	rc = vfs_rename(old_dir->d_inode, old_dentry,
++	    new_dir->d_inode, new_dentry, NULL);
+ #endif /* HAVE_4ARGS_VFS_RENAME */
+ exit4:
+ 	unlock_rename(new_dir, old_dir);
+@@ -478,9 +482,9 @@
+                 if (inode)
+                         atomic_inc(&inode->i_count);
+ #ifdef HAVE_2ARGS_VFS_UNLINK
+-                rc = vfs_unlink(nd.nd_dentry->d_inode, dentry);
++		rc = vfs_unlink(nd.nd_dentry->d_inode, dentry);
+ #else
+-                rc = vfs_unlink(nd.nd_dentry->d_inode, dentry, nd.nd_mnt);
++		rc = vfs_unlink(nd.nd_dentry->d_inode, dentry, NULL);
+ #endif /* HAVE_2ARGS_VFS_UNLINK */
+ exit2:
+                 dput(dentry);
+@@ -571,11 +575,11 @@
+                 SGOTO(exit5, rc);
+ 
+ #ifdef HAVE_4ARGS_VFS_RENAME
+-        rc = vfs_rename(old_dir->d_inode, old_dentry,
+-                        new_dir->d_inode, new_dentry);
++	rc = vfs_rename(old_dir->d_inode, old_dentry,
++	    new_dir->d_inode, new_dentry);
+ #else
+-        rc = vfs_rename(old_dir->d_inode, old_dentry, oldnd.nd_mnt,
+-                        new_dir->d_inode, new_dentry, newnd.nd_mnt);
++	rc = vfs_rename(old_dir->d_inode, old_dentry,
++	    new_dir->d_inode, new_dentry, NULL);
+ #endif /* HAVE_4ARGS_VFS_RENAME */
+ exit5:
+         dput(new_dentry);
+-- 
+1.8.5.5
+
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 9309804d007..56c41798780 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "196scl8q0bkkak6m0p1l1fz254cgsizqm73bf9wk3iynamq7qmrw";
   };
 
-  patches = [ ./install_prefix.patch ./3_12-compat.patch ];
+  patches = [ ./install_prefix.patch ./3_12-compat.patch ./3_13-compat-1.patch ./3_13-compat-2.patch ];
 
   buildInputs = [ perl autoconf automake libtool ];
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     ./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-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"
-- 
GitLab


From a7e65a8a957ceb752dd44d0447acee6c20309fe5 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 4 Mar 2014 02:22:06 +0100
Subject: [PATCH 1820/3789] zfs: Fix compilation on 3.13 and later kernels

---
 pkgs/os-specific/linux/zfs/3.13-compat.patch | 43 ++++++++++++++++++++
 pkgs/os-specific/linux/zfs/default.nix       |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/zfs/3.13-compat.patch

diff --git a/pkgs/os-specific/linux/zfs/3.13-compat.patch b/pkgs/os-specific/linux/zfs/3.13-compat.patch
new file mode 100644
index 00000000000..f89d38f72ac
--- /dev/null
+++ b/pkgs/os-specific/linux/zfs/3.13-compat.patch
@@ -0,0 +1,43 @@
+From 729210564a5325e190fc4fba22bf17bacf957ace Mon Sep 17 00:00:00 2001
+From: Richard Yao <ryao@gentoo.org>
+Date: Mon, 25 Nov 2013 12:21:21 -0500
+Subject: [PATCH] Properly ignore bdi_setup_and_register return value
+
+This broke compilation against Linux 3.13 and GCC 4.7.3.
+
+Signed-off-by: Richard Yao <ryao@gentoo.org>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #1906
+---
+ config/kernel-bdi-setup-and-register.m4 | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/config/kernel-bdi-setup-and-register.m4 b/config/kernel-bdi-setup-and-register.m4
+index 4196091..cb8ed67 100644
+--- a/config/kernel-bdi-setup-and-register.m4
++++ b/config/kernel-bdi-setup-and-register.m4
+@@ -1,12 +1,14 @@
+ dnl #
+ dnl # 2.6.34 API change
+-dnl # The bdi_setup_and_register() helper function is avilable and
++dnl # The bdi_setup_and_register() helper function is available and
+ dnl # exported by the kernel.  This is a trivial helper function but
+ dnl # using it significantly simplifies the code surrounding setting
+ dnl # up and tearing down the bdi structure.
+ dnl #
+ AC_DEFUN([ZFS_AC_KERNEL_BDI_SETUP_AND_REGISTER],
+ 	[AC_MSG_CHECKING([whether bdi_setup_and_register() is available])
++	tmp_flags="$EXTRA_KCFLAGS"
++	EXTRA_KCFLAGS="-Wno-unused-result"
+ 	ZFS_LINUX_TRY_COMPILE_SYMBOL([
+ 		#include <linux/backing-dev.h>
+ 	], [
+@@ -18,4 +20,5 @@ AC_DEFUN([ZFS_AC_KERNEL_BDI_SETUP_AND_REGISTER],
+ 	], [
+ 		AC_MSG_RESULT(no)
+ 	])
++	EXTRA_KCFLAGS="$tmp_flags"
+ ])
+-- 
+1.8.5.5
+
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 565a80b23d2..ef313e6ca1e 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "18b5f18k8mwb17r5ippsilmp1a2sqjw9fwn0z82159dkhsadg33b";
   };
 
-  patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ./libblkid-1db7b9b.patch ./gcc-4.8.patch ];
+  patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ./libblkid-1db7b9b.patch ./gcc-4.8.patch ./3.13-compat.patch ];
 
   buildInputs = [ spl perl autoconf automake libtool zlib libuuid coreutils ];
 
-- 
GitLab


From 56cf2cb396fc95cda513b0824f6213bb369218db Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 4 Mar 2014 13:03:08 +0100
Subject: [PATCH 1821/3789] imlib2: Remove @my_libs@ from config.in.

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

diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index 2210976ff90..5b19323f943 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
+  preConfigure = ''
+    substituteInPlace imlib2-config.in \
+      --replace "@my_libs@" ""
+  '';
+
   meta = {
     hydraPlatforms = stdenv.lib.platforms.linux;
   };
-- 
GitLab


From 26d42a894a9b229391aa32c1ad8ffbee845cddea Mon Sep 17 00:00:00 2001
From: Dario Bertini <berdario@gmail.com>
Date: Tue, 4 Mar 2014 13:17:57 +0100
Subject: [PATCH 1822/3789] Added jitsi

---
 .../instant-messengers/jitsi/default.nix      | 45 +++++++++++++++++++
 .../instant-messengers/jitsi/jitsi.patch      | 27 +++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/jitsi/default.nix
 create mode 100644 pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch

diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
new file mode 100644
index 00000000000..9cefee228c8
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, makeDesktopItem, unzip, ant, jdk }:
+
+stdenv.mkDerivation rec {
+
+  name = "jitsi-${version}";
+  version = "2.4.4997";
+
+  src = fetchurl {
+    url = "https://download.jitsi.org/jitsi/src/jitsi-src-${version}.zip";
+    sha256 = "f1c2688d7d6bf1916fed3b8b105a785662980c5b297dcab3c9e7d272647ef825";
+  };
+
+  patches = [ ./jitsi.patch ];
+
+  jitsiItem = makeDesktopItem {
+    name = "Jitsi";
+    exec = "jitsi";
+    comment = "VoIP and Instant Messaging client";
+    desktopName = "Jitsi";
+    genericName = "Instant Messaging";
+    categories = "Application;Internet;";
+  };
+
+  buildInputs = [unzip ant jdk];
+
+  buildPhase = ''ant make'';
+
+  installPhase = ''
+    mkdir -p $out
+    cp -a lib $out/
+    cp -a sc-bundles $out/
+    mkdir $out/bin
+    cp resources/install/generic/run.sh $out/bin/jitsi
+    chmod +x $out/bin/jitsi
+    patchShebangs $out
+  '';
+
+  meta = {
+    homepage = https://jitsi.org/;
+    description = "Open Source Video Calls and Chat";
+    license = stdenv.lib.licenses.lgpl21Plus.shortName;
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+}
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
new file mode 100644
index 00000000000..9163cecd175
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
@@ -0,0 +1,27 @@
+--- /home/dario/Downloads/jitsi/resources/install/generic/run.sh	2013-11-01 15:37:21.000000000 +0000
++++ jitsi/resources/install/generic/run.sh	2014-03-04 11:52:30.796397567 +0000
+@@ -1,4 +1,9 @@
+-mkdir -p $HOME/.sip-communicator/log
++#! /bin/bash
++# A modified version of the generic run.sh
++
++#mkdir -p $HOME/.sip-communicator/log
++
++cd "$( dirname "$( dirname "${BASH_SOURCE[0]}" )" )"
+ 
+ # Get architecture
+ ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/`
+@@ -6,10 +11,12 @@
+ # Additionnal JVM arguments
+ CLIENTARGS=""
+ 
++NATIVELIBS="lib/native/linux-64"
+ if [ $ARCH -eq 32 ]
+ then
+     CLIENTARGS="-client -Xmx256m"
++    NATIVELIBS="lib/native/linux"
+ fi
+ 
+ export PATH=$PATH:native
+-java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
++exec java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90e59c96c29..9f0b53030e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8150,7 +8150,7 @@ let
     inherit (xorg) libxkbfile;
     cairo = cairo.override { xcbSupport = true; };
   };
-  
+
   i3minator = callPackage ../tools/misc/i3minator { };
 
   i3status = callPackage ../applications/window-managers/i3/status.nix { };
@@ -8247,6 +8247,8 @@ let
 
   jigdo = callPackage ../applications/misc/jigdo { };
 
+  jitsi = callPackage ../applications/networking/instant-messengers/jitsi { };
+
   joe = callPackage ../applications/editors/joe { };
 
   jbrout = callPackage ../applications/graphics/jbrout {
-- 
GitLab


From 6d5176a28bd953c74682ed13eaf0d23d013b4df6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 4 Mar 2014 07:48:27 -0500
Subject: [PATCH 1823/3789] php54: enable fpm support

---
 pkgs/development/interpreters/php/5.4.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index bf60e90d634..cc6e34b76fe 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -167,6 +167,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
         configureFlags = ["--enable-ftp"];
       };
 
+      fpm = {
+        configureFlags = ["--enable-fpm"];
+      };
+
       /*
          php is build within this derivation in order to add the xdebug lines to the php.ini.
          So both Apache and command line php both use xdebug without having to configure anything.
@@ -208,6 +212,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     bz2Support = config.php.bz2 or false;
     zipSupport = config.php.zip or true;
     ftpSupport = config.php.ftp or true;
+    fpmSupport = config.php.fpm or true;
   };
 
   configurePhase = ''
-- 
GitLab


From adc2e191184b13b7051de09469a1d1d6656cb567 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 4 Mar 2014 09:01:35 -0500
Subject: [PATCH 1824/3789] Add interpolate haskell package

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

diff --git a/pkgs/development/libraries/haskell/interpolate/default.nix b/pkgs/development/libraries/haskell/interpolate/default.nix
new file mode 100644
index 00000000000..6b0ee4b6e36
--- /dev/null
+++ b/pkgs/development/libraries/haskell/interpolate/default.nix
@@ -0,0 +1,18 @@
+{ cabal, doctest, haskellSrcMeta, hspec, QuickCheck
+, quickcheckInstances, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "interpolate";
+  version = "0.0.2";
+  sha256 = "0l9hrgwmvp7h2mgw90gk45zgp0yy00201ki9hwg26sh2wd0sj6f8";
+  buildDepends = [ haskellSrcMeta ];
+  testDepends = [
+    doctest haskellSrcMeta hspec QuickCheck quickcheckInstances text
+  ];
+  meta = {
+    description = "String interpolation done right";
+    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 401baa1d025..040df54fc06 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1507,6 +1507,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   interlude = callPackage ../development/libraries/haskell/interlude {};
 
+  interpolate = callPackage ../development/libraries/haskell/interpolate {};
+
   interpolatedstringPerl6 = callPackage ../development/libraries/haskell/interpolatedstring-perl6 {};
 
   intervals = callPackage ../development/libraries/haskell/intervals {};
-- 
GitLab


From 7ab3adcaa2c009bf05fb762072425d2722d43280 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 4 Mar 2014 09:11:14 -0500
Subject: [PATCH 1825/3789] Add mysql haskell package

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

diff --git a/pkgs/development/libraries/haskell/mysql/default.nix b/pkgs/development/libraries/haskell/mysql/default.nix
new file mode 100644
index 00000000000..4deec5bb767
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mysql/default.nix
@@ -0,0 +1,15 @@
+{ cabal, mysqlConfig, zlib }:
+
+cabal.mkDerivation (self: {
+  pname = "mysql";
+  version = "0.1.1.6";
+  sha256 = "1sxzx5f4ysxhq1nimkj4xwf87i7prwp5wg0kjbhv9pbn65zc9mmj";
+  buildTools = [ mysqlConfig ];
+  extraLibraries = [ zlib ];
+  meta = {
+    homepage = "https://github.com/bos/mysql";
+    description = "A low-level MySQL client 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 040df54fc06..9b227088104 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1755,6 +1755,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   mwcRandom = callPackage ../development/libraries/haskell/mwc-random {};
 
+  mysql = callPackage ../development/libraries/haskell/mysql {
+    mysqlConfig = pkgs.mysql;
+    inherit (pkgs) zlib;
+  };
+
   NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {};
 
   nanospec = callPackage ../development/libraries/haskell/nanospec {};
-- 
GitLab


From 25476fe25afa569121bc28af1f84e93d9b734308 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 4 Mar 2014 09:12:41 -0500
Subject: [PATCH 1826/3789] Add mysql-simple haskell package

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

diff --git a/pkgs/development/libraries/haskell/mysql-simple/default.nix b/pkgs/development/libraries/haskell/mysql-simple/default.nix
new file mode 100644
index 00000000000..e61d493cdbe
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mysql-simple/default.nix
@@ -0,0 +1,19 @@
+{ cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual
+, mysql, pcreLight, text, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "mysql-simple";
+  version = "0.2.2.4";
+  sha256 = "044grjly1gyrgba2bfrii2pa14ff7v14ncyk3kj01g1zdxnwqjh6";
+  buildDepends = [
+    attoparsec base16Bytestring blazeBuilder blazeTextual mysql
+    pcreLight text time
+  ];
+  meta = {
+    homepage = "https://github.com/bos/mysql-simple";
+    description = "A mid-level MySQL client 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 9b227088104..ec624fa361e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1760,6 +1760,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     inherit (pkgs) zlib;
   };
 
+  mysqlSimple = callPackage ../development/libraries/haskell/mysql-simple {};
+
   NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {};
 
   nanospec = callPackage ../development/libraries/haskell/nanospec {};
-- 
GitLab


From b97d6b0318c98e2b2324ec633a7a54486138ec5f Mon Sep 17 00:00:00 2001
From: Mihaly Barasz <klao@nilcons.com>
Date: Tue, 4 Mar 2014 16:42:52 +0100
Subject: [PATCH 1827/3789] Add lens-family-core Haskell package

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

diff --git a/pkgs/development/libraries/haskell/lens-family-core/default.nix b/pkgs/development/libraries/haskell/lens-family-core/default.nix
new file mode 100644
index 00000000000..7bfb401c756
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lens-family-core/default.nix
@@ -0,0 +1,13 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "lens-family-core";
+  version = "1.0.0";
+  sha256 = "149wfxddw58h5q42r3nknmac8wsc9c8xzsw6vrlfb4yasg7bhw53";
+  buildDepends = [ transformers ];
+  meta = {
+    description = "Haskell 98 Lens Families";
+    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 ec624fa361e..d98b90debb4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1592,6 +1592,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {};
 
+  lensFamilyCore = callPackage ../development/libraries/haskell/lens-family-core {};
+
   lenses = callPackage ../development/libraries/haskell/lenses {};
 
   libffi = callPackage ../development/libraries/haskell/libffi {
-- 
GitLab


From 66c9ac3b7716860a3374eccaa31794ef6ad3b197 Mon Sep 17 00:00:00 2001
From: Mihaly Barasz <klao@nilcons.com>
Date: Tue, 4 Mar 2014 17:35:22 +0100
Subject: [PATCH 1828/3789] Add pipes-binary Haskell package

---
 .../haskell/pipes-binary/default.nix          | 24 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/pipes-binary/default.nix

diff --git a/pkgs/development/libraries/haskell/pipes-binary/default.nix b/pkgs/development/libraries/haskell/pipes-binary/default.nix
new file mode 100644
index 00000000000..33f9482ca3f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pipes-binary/default.nix
@@ -0,0 +1,24 @@
+{ cabal, binary, lensFamilyCore, pipes, pipesBytestring, pipesParse
+, smallcheck, tasty, tastyHunit, tastySmallcheck, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-binary";
+  version = "0.4.0";
+  sha256 = "021shl5czrr82b06awy7biy93qf6nh0wwiadhr7qsawzdnzqz2vc";
+  buildDepends = [
+    binary pipes pipesBytestring pipesParse transformers
+  ];
+  testDepends = [
+    binary lensFamilyCore pipes pipesParse smallcheck tasty tastyHunit
+    tastySmallcheck transformers
+  ];
+  # Depends on an out-of-date version of smallcheck
+  doCheck = false;
+  meta = {
+    homepage = "https://github.com/k0001/pipes-binary";
+    description = "Encode and decode binary streams using the pipes and binary libraries";
+    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 d98b90debb4..e006f66938b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1929,6 +1929,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   pipesAttoparsec = callPackage ../development/libraries/haskell/pipes-attoparsec {};
 
+  pipesBinary = callPackage ../development/libraries/haskell/pipes-binary {
+    binary = self.binary_0_7_1_0;
+  };
+
   pipesBytestring = callPackage ../development/libraries/haskell/pipes-bytestring {};
 
   pipesConcurrency = callPackage ../development/libraries/haskell/pipes-concurrency {};
-- 
GitLab


From fdf97c5df39292a877d5c700bec573f5b7a912fd Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 4 Mar 2014 13:02:51 +0100
Subject: [PATCH 1829/3789] chromium: Update all channels

stable: 33.0.1750.117 -> 33.0.1750.146
beta:   33.0.1750.117 -> 34.0.1847.14
dev:    34.0.1847.3   -> 35.0.1862.2
---
 .../networking/browsers/chromium/sources.nix   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index 0a8adfee40a..63b4c9033a3 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "34.0.1847.3";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.3.tar.xz";
-    sha256 = "1jm9cr1qqfqd82fy3f1q4d0qg94vsrzyq8dbn4hrxyzqbjc4sclg";
+    version = "35.0.1862.2";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-35.0.1862.2.tar.xz";
+    sha256 = "19426x4x3bnx21qjhqc4sk27k7dnhm1pw84079h6gk0hyjzcwn0f";
   };
   beta = {
-    version = "33.0.1750.117";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.117.tar.xz";
-    sha256 = "0nyaqrxz8kcnppcya68qpr47fw4d959p4l63kqzvd9ifdqfgk18f";
+    version = "34.0.1847.14";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.14.tar.xz";
+    sha256 = "038bz2d40rgjppkalal9ycjhfvkhph926k35v8pc3618z2fy10cn";
   };
   stable = {
-    version = "33.0.1750.117";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.117.tar.xz";
-    sha256 = "0nyaqrxz8kcnppcya68qpr47fw4d959p4l63kqzvd9ifdqfgk18f";
+    version = "33.0.1750.146";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.146.tar.xz";
+    sha256 = "0x2a5kyaj38661c5s33pywhrwkm8kj2fbr1z940c5al6y2hfgc6m";
   };
 }
-- 
GitLab


From 15d6da87408b14beaa8f4d3c9e7aaf9c6a73c3c8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 4 Mar 2014 14:52:43 -0500
Subject: [PATCH 1830/3789] psql: Use less as the default pager

less is more common and better than more

Fixes #1681
---
 pkgs/servers/sql/postgresql/8.4.x.nix          |  2 ++
 pkgs/servers/sql/postgresql/9.0.x.nix          |  2 ++
 pkgs/servers/sql/postgresql/9.1.x.nix          |  2 ++
 pkgs/servers/sql/postgresql/9.2.x.nix          |  2 +-
 pkgs/servers/sql/postgresql/9.3.x.nix          |  2 +-
 pkgs/servers/sql/postgresql/less-is-more.patch | 12 ++++++++++++
 6 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/servers/sql/postgresql/less-is-more.patch

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index f91f78c4d57..58d7159034a 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
 
   LC_ALL = "C";
 
+  patches = [ ./less-is-more.patch ];
+
   passthru = { inherit readline; };
 
   meta = {
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index c50c6a4aba2..033328cbcfe 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
 
   LC_ALL = "C";
 
+  patches = [ ./less-is-more.patch ];
+
   passthru = {
     inherit readline;
     psqlSchema = "9.0";
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 9bc971b9dfd..7e876322808 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
 
   LC_ALL = "C";
 
+  patches = [ ./less-is-more.patch ];
+
   postInstall =
     ''
       mkdir -p $out/share/man
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index 3d1e0d6ec33..da0516a9618 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "world" ];
 
-  patches = [ ./disable-resolve_symlinks.patch ];
+  patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ];
 
   installTargets = [ "install-world" ];
 
diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index 2230c370335..7f6e2d25d18 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "world" ];
 
-  patches = [ ./disable-resolve_symlinks.patch ];
+  patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ];
 
   installTargets = [ "install-world" ];
 
diff --git a/pkgs/servers/sql/postgresql/less-is-more.patch b/pkgs/servers/sql/postgresql/less-is-more.patch
new file mode 100644
index 00000000000..d640d24bdaa
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/less-is-more.patch
@@ -0,0 +1,12 @@
+diff -Naur postgresql-9.2.7-orig/src/bin/psql/print.h postgresql-9.2.7/src/bin/psql/print.h
+--- postgresql-9.2.7-orig/src/bin/psql/print.h	2014-02-17 14:38:15.000000000 -0500
++++ postgresql-9.2.7/src/bin/psql/print.h	2014-03-04 14:42:28.874014415 -0500
+@@ -178,7 +178,7 @@
+ extern const printTextFormat *get_line_style(const printTableOpt *opt);
+ 
+ #ifndef __CYGWIN__
+-#define DEFAULT_PAGER "more"
++#define DEFAULT_PAGER "less"
+ #else
+ #define DEFAULT_PAGER "less"
+ #endif
-- 
GitLab


From 738a5321bcd89452f65df19057367ce004402693 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Mar 2014 22:31:02 +0100
Subject: [PATCH 1831/3789] gnutls: Update to 3.2.12, 3.1.22

CVE-2014-0092

Unfortunately, 3.2.12 doesn't pass the tests with Guile bindings
enabled, so I've turned them off in the default build.
---
 pkgs/development/libraries/gnutls/2.12.nix    |  1 +
 pkgs/development/libraries/gnutls/3.2.nix     | 45 +++++++------------
 pkgs/development/libraries/gnutls/default.nix | 30 +++++--------
 pkgs/top-level/all-packages.nix               | 15 ++++---
 4 files changed, 38 insertions(+), 53 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/2.12.nix b/pkgs/development/libraries/gnutls/2.12.nix
index 59f0131b9d4..4a1332a7f15 100644
--- a/pkgs/development/libraries/gnutls/2.12.nix
+++ b/pkgs/development/libraries/gnutls/2.12.nix
@@ -59,5 +59,6 @@ stdenv.mkDerivation rec {
     license = "LGPLv2.1+";
 
     maintainers = [ ];
+    broken = true; # CVE-2014-0092
   };
 }
diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix
index ad873b3eae8..e950e463a9b 100644
--- a/pkgs/development/libraries/gnutls/3.2.nix
+++ b/pkgs/development/libraries/gnutls/3.2.nix
@@ -3,15 +3,22 @@
 
 assert guileBindings -> guile != null;
 
-stdenv.mkDerivation (rec {
-
-  name = "gnutls-3.2.10";
+stdenv.mkDerivation rec {
+  name = "gnutls-3.2.12";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz";
-    sha256 = "1g1w93d66sz51977zbqd56641r501a1djcwhykbjm8alhyz1564h";
+    sha256 = "1zwk9qkxn3190nssyamd7jsb3ag6mnnln3jwbgmjs1w306dzwafi";
   };
 
+  patches =
+    # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
+    stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch
+    # multiple definitions of '_gnutls_x86_cpuid_s' cause linker to fail.
+    # the patch is: https://www.gitorious.org/gnutls/gnutls/commit/54768ca1cd9049bbd1c695696ef3c8595c6052db
+    # discussion: http://osdir.com/ml/gnutls-devel-gnu/2014-02/msg00012.html
+    ++ stdenv.lib.optional stdenv.isDarwin ./fix_gnutls_x86_cpuid_s_multi_definitions.patch;
+
   # Note: GMP is a dependency of Nettle, whose public headers include
   # GMP headers, hence the hack.
   configurePhase = ''
@@ -21,15 +28,14 @@ stdenv.mkDerivation (rec {
       --with-lzo --with-libtasn1-prefix="${libtasn1}"           \
       --with-libnettle-prefix="${nettle}"                       \
       CPPFLAGS="-I${gmp}/include"                               \
-      ${if guileBindings
-        then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""
-        else ""}
+      ${stdenv.lib.optionalString guileBindings
+          "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""}
   '';
 
   # Build of the Guile bindings is not parallel-safe.  See
   # <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad>
   # for the actual fix.
-  enableParallelBuilding = false;
+  enableParallelBuilding = !guileBindings;
 
   buildInputs = [ zlib lzo lzip ]
     ++ stdenv.lib.optional guileBindings guile;
@@ -42,7 +48,7 @@ stdenv.mkDerivation (rec {
   # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
   doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "The GNU Transport Layer Security Library";
 
     longDescription = ''
@@ -61,25 +67,8 @@ stdenv.mkDerivation (rec {
 
     homepage = http://www.gnu.org/software/gnutls/;
     license = "LGPLv2.1+";
-    maintainers = [ ];
-    platforms = platforms.all;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.all;
   };
 }
 
-//
-
-(stdenv.lib.optionalAttrs stdenv.isFreeBSD {
-  # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
-  patches = [ ./guile-gnulib-includes.patch ];
-})
-
-//
-
-(stdenv.lib.optionalAttrs stdenv.isDarwin {
-  # multiple definitions of '_gnutls_x86_cpuid_s' cause linker to fail.
-  # the patch is: https://www.gitorious.org/gnutls/gnutls/commit/54768ca1cd9049bbd1c695696ef3c8595c6052db
-  # discussion: http://osdir.com/ml/gnutls-devel-gnu/2014-02/msg00012.html
-  patches = [ ./fix_gnutls_x86_cpuid_s_multi_definitions.patch ];
-})
-
-)
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 8750dd568f7..1046310946a 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -3,15 +3,17 @@
 
 assert guileBindings -> guile != null;
 
-stdenv.mkDerivation (rec {
-
-  name = "gnutls-3.1.20";
+stdenv.mkDerivation rec {
+  name = "gnutls-3.1.22";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${name}.tar.lz";
-    sha256 = "1a8pzc29sn1kmbqvldljf4kmbz60pdk931dirk5jdd0qpf8fzd5x";
+    sha256 = "177kmq4jn67s7mmb249722nwxmbjwjpphmib7bhzfk43z02j3pvh";
   };
 
+  # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
+  patches = stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch;
+
   # Note: GMP is a dependency of Nettle, whose public headers include
   # GMP headers, hence the hack.
   configurePhase = ''
@@ -21,15 +23,14 @@ stdenv.mkDerivation (rec {
       --with-lzo --with-libtasn1-prefix="${libtasn1}"           \
       --with-libnettle-prefix="${nettle}"                       \
       CPPFLAGS="-I${gmp}/include"                               \
-      ${if guileBindings
-        then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""
-        else ""}
+      ${stdenv.lib.optionalString guileBindings
+          "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""}
   '';
 
   # Build of the Guile bindings is not parallel-safe.  See
   # <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad>
   # for the actual fix.
-  enableParallelBuilding = false;
+  enableParallelBuilding = !guileBindings;
 
   buildInputs = [ zlib lzo lzip ]
     ++ stdenv.lib.optional guileBindings guile;
@@ -42,7 +43,7 @@ stdenv.mkDerivation (rec {
   # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
   doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "The GNU Transport Layer Security Library";
 
     longDescription = ''
@@ -61,13 +62,6 @@ stdenv.mkDerivation (rec {
 
     homepage = http://www.gnu.org/software/gnutls/;
     license = "LGPLv2.1+";
-    maintainers = [ ];
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
-}
-
-//
-
-(stdenv.lib.optionalAttrs stdenv.isFreeBSD {
-  # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
-  patches = [ ./guile-gnulib-includes.patch ];
-}))
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cd584e6f1f..08bb9de9168 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4361,20 +4361,21 @@ let
   gnu-efi = callPackage ../development/libraries/gnu-efi { };
 
   gnutls = gnutls32;
-  gnutls31 = callPackage ../development/libraries/gnutls {
-    guileBindings = config.gnutls.guile or true;
-  };
 
   gnutls2 = callPackage ../development/libraries/gnutls/2.12.nix {
-    guileBindings = config.gnutls.guile or true;
+    guileBindings = config.gnutls.guile or false;
+  };
+
+  gnutls31 = callPackage ../development/libraries/gnutls {
+    guileBindings = config.gnutls.guile or false;
   };
 
   gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix {
-    guileBindings = config.gnutls.guile or true;
+    guileBindings = config.gnutls.guile or false;
   };
 
-  gnutls_without_guile = lowPrio (gnutls.override { guileBindings = false; });
-  gnutls2_without_guile = lowPrio (gnutls2.override { guileBindings = false; });
+  gnutls_with_guile = lowPrio (gnutls.override { guileBindings = true; });
+  gnutls2_with_guile = lowPrio (gnutls2.override { guileBindings = true; });
 
   gpac = callPackage ../applications/video/gpac { };
 
-- 
GitLab


From c824acb84c6adb2fccf923cdf2b3af9e4ed3bef1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Mar 2014 22:33:20 +0100
Subject: [PATCH 1832/3789] Rename misleadingly named gnutls/default.nix (it's
 not the default)

---
 pkgs/development/libraries/gnutls/{default.nix => 3.1.nix} | 0
 pkgs/top-level/all-packages.nix                            | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/libraries/gnutls/{default.nix => 3.1.nix} (100%)

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/3.1.nix
similarity index 100%
rename from pkgs/development/libraries/gnutls/default.nix
rename to pkgs/development/libraries/gnutls/3.1.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08bb9de9168..7dd6058339d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4366,7 +4366,7 @@ let
     guileBindings = config.gnutls.guile or false;
   };
 
-  gnutls31 = callPackage ../development/libraries/gnutls {
+  gnutls31 = callPackage ../development/libraries/gnutls/3.1.nix {
     guileBindings = config.gnutls.guile or false;
   };
 
-- 
GitLab


From e0eb72cd179c7434b1aa1ee8e12412a78b66ec71 Mon Sep 17 00:00:00 2001
From: Ronny Esterluss <ronny.esterluss@autodesk.com>
Date: Tue, 4 Mar 2014 22:50:01 +0100
Subject: [PATCH 1833/3789] added telegram-cli as instant-messenger application

---
 .../telegram-cli/default.nix                  | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/telegram-cli/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
new file mode 100644
index 00000000000..51639f6050d
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, libconfig, lua5_2, openssl, readline, zlib
+}:
+
+stdenv.mkDerivation rec {
+  name = "telegram-cli";
+
+  src = fetchgit {
+    url = "https://github.com/vysheng/tg.git";
+    rev = "ac6079a00ac66bb37a3179a82af130b41ec39bc9";
+    sha256 = "1rpwnyzmqk7p97n5pd00m5c6rypc39mb3hs94qxxrdcpwpgcb73q";
+  };
+
+  buildInputs = [ libconfig lua5_2 openssl readline zlib ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ./telegram $out/bin/telegram-wo-key
+    cp ./tg.pub $out/
+    cat > $out/bin/telegram <<EOF
+    #!/usr/bin/env bash
+    $out/bin/telegram-wo-key -k $out/tg.pub
+    EOF
+    chmod +x $out/bin/telegram
+  '';
+
+  meta = {
+    description = "Command-line interface for Telegram messenger";
+    homepage = https://telegram.org/;
+    license = "GPLv2";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7dd6058339d..1cbeaa99863 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8940,6 +8940,8 @@ let
 
   taskwarrior = callPackage ../applications/misc/taskwarrior { };
 
+  telegram-cli = callPackage ../applications/networking/instant-messengers/telegram-cli/default.nix { };
+
   telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble {
     inherit (pkgs.gnome) libsoup;
   };
-- 
GitLab


From 20a2b1af9378075661566307f6bbe9378a5a53dc Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 5 Mar 2014 05:10:23 +0200
Subject: [PATCH 1834/3789] nginx: update from 1.4.5 to 1.4.6

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

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 4504d49edbb..f2bc0765636 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -5,10 +5,10 @@
 , moreheaders ? false}:
 
 let
-  version = "1.4.5";
+  version = "1.4.6";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "0zh7w1bz8rcxrs5bwp39m91nzm454mxlf3m5krkv1wm8ar1h5sdd";
+    sha256 = "1ihjb3dqw4icc5pvgaqbp740cyr4m8zxjfvj3v3bkd88swamp2vs";
   };
 
   rtmp-ext = fetchgit {
-- 
GitLab


From 2dd320a382929d86c704dd196afebe928b2a5551 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 5 Mar 2014 05:12:09 +0200
Subject: [PATCH 1835/3789] youtubeDL: update from 2014.02.28 to 2014.03.04.2

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index ded669a6feb..8f27798d08a 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.02.28";
+  version = "2014.03.04.2";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1xizqk47f3wd1g1mqs87iand4v3pjxxdzh4z7s6525hlkb8z5813";
+    sha256 = "1plqrjs7z4vbfa4h67zgd14j9ka9rnkzkqiwd948k9y3krxijg4p";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From db1e1d134fd17cbe66d98221ca735f5c5498a4d8 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 5 Mar 2014 05:23:59 +0200
Subject: [PATCH 1836/3789] mpd: update from 0.18.8 to 0.18.9

---
 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 c39045cd9af..7a2f3538fb8 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -27,10 +27,10 @@ let
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
 
 in stdenv.mkDerivation rec {
-  name = "mpd-0.18.8";
+  name = "mpd-0.18.9";
   src = fetchurl {
     url    = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz";
-    sha256 = "1ryqh0xf76xv4mpwy1gjwy275ar4wmbzifa9ccjim9r7lk2hgp5v";
+    sha256 = "0mgfyrhjlalwngx9j3xxfpfwygh9a31k1ni1isi898bb2x8zsl08";
   };
 
   buildInputs = [ pkgconfig glib ]
-- 
GitLab


From 265be593c86263eb51747a3255ffef18ccdba849 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Wed, 5 Mar 2014 12:22:38 +0800
Subject: [PATCH 1837/3789] renpy: update to 6.17.3

---
 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 9c7b08d8010..237e58b5f93 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.2";
+  name = "renpy-6.17.3";
 
   meta = {
     description = "Ren'Py Visual Novel Engine";
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = "http://www.renpy.org/dl/6.17.2/renpy-6.17.2-source.tar.bz2";
-    sha256 = "1iadhdi8g2a7gyg08y0190bv56cc8csckdj4p9f4m2hgg1ybw1qx";
+    url = "http://www.renpy.org/dl/6.17.3/renpy-6.17.3-source.tar.bz2";
+    sha256 = "1707xrjmnr4a209jqm4zkda0jyjd76f679g7d51g7vd5cs46s6ph";
   };
 
   buildInputs = [
-- 
GitLab


From 0142e4d6859edb898cbd2d40383f880f33337547 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 5 Mar 2014 13:05:56 +0400
Subject: [PATCH 1838/3789] Glib-networking apparently works with GNUTLS3 now

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

diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 1e9fdd4f0aa..53d447cf5ca 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls2, libproxy
+{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls, libproxy
 , gsettings_desktop_schemas, libgcrypt, libtasn1 }:
 
 stdenv.mkDerivation {
@@ -17,5 +17,5 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig intltool ];
   propagatedBuildInputs =
-    [ glib libtool gnutls2 libproxy libgcrypt libtasn1 gsettings_desktop_schemas ];
+    [ glib libtool gnutls libproxy libgcrypt libtasn1 gsettings_desktop_schemas ];
 }
-- 
GitLab


From a9a728af64fdc570925e4f24ce7a26cef6b50fc8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 5 Mar 2014 13:26:41 +0400
Subject: [PATCH 1839/3789] Fresh bitlbee builds with GNU TLS 3

---
 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 7dd6058339d..40d7b472872 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7517,7 +7517,7 @@ let
   bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee {
     # For some reason, TLS support is broken when using GnuTLS 3.0 (can't
     # connect to jabber.org, for instance.)
-    gnutls = gnutls2;
+    gnutls = gnutls;
     libotr = libotr_3_2;
   };
 
-- 
GitLab


From cfc2aabc846c9b7fcff3750c9c6a3fda021cb4ae Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 5 Mar 2014 10:54:25 +0100
Subject: [PATCH 1840/3789] requests2: Add new package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2525aacfffe..fe68d4617cb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5854,6 +5854,21 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       homepage = http://docs.python-requests.org/en/latest/;
     };
   };
+  
+  
+  requests2 = buildPythonPackage rec {
+    name = "requests-2.2.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz";
+      md5 = "ac27081135f58d1a43e4fb38258d6f4e";
+    };
+
+    meta = {
+      description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings..";
+      homepage = http://docs.python-requests.org/en/latest/;
+    };
+  };
 
 
   requests_oauthlib = buildPythonPackage rec {
-- 
GitLab


From 48ce981d13ea253bb203fda709c0bff4b00c5cf8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Mar 2014 11:28:42 +0100
Subject: [PATCH 1841/3789] mercurial: Update to 2.9.1

---
 pkgs/applications/version-management/mercurial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 10283c171db..609e2654d59 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -2,7 +2,7 @@
 , guiSupport ? false, tk ? null, curses }:
 
 let
-  name = "mercurial-2.9";
+  name = "mercurial-2.9.1";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "08m6h2zxik4hcqb5qq3k2anwgjrf0p9kj77lvikcaw8rqmz06y3h";
+    sha256 = "06n07di6cf57bglnbh8szimngclyvf9c5ismz470gnyb9r1v23x2";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
-- 
GitLab


From dffac3e40edd8bf593104e5ecbc137623abb2aea Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 5 Mar 2014 07:08:03 -0500
Subject: [PATCH 1842/3789] Update node packages

---
 pkgs/top-level/node-packages-generated.nix | 2570 ++++++++++++++++----
 1 file changed, 2122 insertions(+), 448 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index d3220d30e5c..93e965235fc 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -1,6 +1,25 @@
 { self, fetchurl, fetchgit ? null, lib }:
 
 {
+  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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/Base64/-/Base64-0.2.0.tgz";
+        name = "Base64-0.2.0.tgz";
+        sha1 = "448879efb6803979daaf7f36e7807e8a1d291205";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."Base64" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "Base64" ];
+  };
   by-spec."CSSselect"."0.x" =
     self.by-version."CSSselect"."0.5.0";
   by-version."CSSselect"."0.5.0" = lib.makeOverridable self.buildNodePackage {
@@ -15,7 +34,7 @@
     buildInputs =
       (self.nativeDeps."CSSselect" or []);
     deps = [
-      self.by-version."CSSwhat"."0.4.2"
+      self.by-version."CSSwhat"."0.4.5"
       self.by-version."domutils"."1.4.0"
       self.by-version."boolbase"."1.0.0"
       self.by-version."nth-check"."1.0.0"
@@ -38,7 +57,7 @@
     buildInputs =
       (self.nativeDeps."CSSselect" or []);
     deps = [
-      self.by-version."CSSwhat"."0.4.2"
+      self.by-version."CSSwhat"."0.4.5"
       self.by-version."domutils"."1.4.0"
     ];
     peerDependencies = [
@@ -46,14 +65,14 @@
     passthru.names = [ "CSSselect" ];
   };
   by-spec."CSSwhat"."0.4" =
-    self.by-version."CSSwhat"."0.4.2";
-  by-version."CSSwhat"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-CSSwhat-0.4.2";
+    self.by-version."CSSwhat"."0.4.5";
+  by-version."CSSwhat"."0.4.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-CSSwhat-0.4.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.2.tgz";
-        name = "CSSwhat-0.4.2.tgz";
-        sha1 = "7291585b71c5707ee7f49bbf3e9ae413ea715ff5";
+        url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.5.tgz";
+        name = "CSSwhat-0.4.5.tgz";
+        sha1 = "85d7b2799ff3d98055353c802949e39913e16a62";
       })
     ];
     buildInputs =
@@ -64,6 +83,48 @@
     ];
     passthru.names = [ "CSSwhat" ];
   };
+  by-spec."JSONStream"."~0.6.4" =
+    self.by-version."JSONStream"."0.6.4";
+  by-version."JSONStream"."0.6.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-JSONStream-0.6.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz";
+        name = "JSONStream-0.6.4.tgz";
+        sha1 = "4b2c8063f8f512787b2375f7ee9db69208fa2dcb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."JSONStream" or []);
+    deps = [
+      self.by-version."jsonparse"."0.0.5"
+      self.by-version."through"."2.2.7"
+    ];
+    peerDependencies = [
+    ];
+    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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.1.tgz";
+        name = "JSONStream-0.7.1.tgz";
+        sha1 = "0a6bf7f85459beb1319486927d293c7cef8a0260";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."JSONStream" or []);
+    deps = [
+      self.by-version."jsonparse"."0.0.5"
+      self.by-version."through"."2.2.7"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "JSONStream" ];
+  };
   by-spec."StringScanner"."~0.0.3" =
     self.by-version."StringScanner"."0.0.3";
   by-version."StringScanner"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -106,6 +167,27 @@
     self.by-version."abbrev"."1.0.4";
   by-spec."abbrev"."~1.0.4" =
     self.by-version."abbrev"."1.0.4";
+  by-spec."accepts"."1.0.0" =
+    self.by-version."accepts"."1.0.0";
+  by-version."accepts"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-accepts-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/accepts/-/accepts-1.0.0.tgz";
+        name = "accepts-1.0.0.tgz";
+        sha1 = "3604c765586c3b9cf7877b6937cdbd4587f947dc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."accepts" or []);
+    deps = [
+      self.by-version."mime"."1.2.11"
+      self.by-version."negotiator"."0.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "accepts" ];
+  };
   by-spec."active-x-obfuscator"."0.0.1" =
     self.by-version."active-x-obfuscator"."0.0.1";
   by-version."active-x-obfuscator"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -466,6 +548,25 @@
   };
   by-spec."argparse"."~ 0.1.11" =
     self.by-version."argparse"."0.1.15";
+  by-spec."ascii-json"."~0.2" =
+    self.by-version."ascii-json"."0.2.0";
+  by-version."ascii-json"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ascii-json-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ascii-json/-/ascii-json-0.2.0.tgz";
+        name = "ascii-json-0.2.0.tgz";
+        sha1 = "10ddb361fd48f72595309fd10a6ea2e7bf2c9218";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ascii-json" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ascii-json" ];
+  };
   by-spec."ascli"."*" =
     self.by-version."ascli"."0.3.0";
   by-version."ascli"."0.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -527,6 +628,8 @@
     passthru.names = [ "assert" ];
   };
   "assert" = self.by-version."assert"."1.1.1";
+  by-spec."assert"."~1.1.0" =
+    self.by-version."assert"."1.1.1";
   by-spec."assert-plus"."0.1.2" =
     self.by-version."assert-plus"."0.1.2";
   by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -565,6 +668,26 @@
     ];
     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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/astw/-/astw-0.1.0.tgz";
+        name = "astw-0.1.0.tgz";
+        sha1 = "098be2758a6e9e9e15465d4fc4ba36265de11085";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."astw" or []);
+    deps = [
+      self.by-version."esprima-six"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "astw" ];
+  };
   by-spec."async"."*" =
     self.by-version."async"."0.2.10";
   by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage {
@@ -648,6 +771,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" =
@@ -796,6 +921,25 @@
     ];
     passthru.names = [ "backoff" ];
   };
+  by-spec."base64-js"."~0.0.4" =
+    self.by-version."base64-js"."0.0.6";
+  by-version."base64-js"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-base64-js-0.0.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz";
+        name = "base64-js-0.0.6.tgz";
+        sha1 = "7b859f79f0bbbd55867ba67a7fab397e24a20947";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."base64-js" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "base64-js" ];
+  };
   by-spec."base64id"."0.1.0" =
     self.by-version."base64id"."0.1.0";
   by-version."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -1041,7 +1185,7 @@
       self.by-version."decompress-zip"."0.0.4"
       self.by-version."fstream"."0.1.25"
       self.by-version."fstream-ignore"."0.0.7"
-      self.by-version."glob"."3.2.8"
+      self.by-version."glob"."3.2.9"
       self.by-version."graceful-fs"."2.0.2"
       self.by-version."handlebars"."1.0.12"
       self.by-version."inquirer"."0.3.5"
@@ -1235,14 +1379,14 @@
     passthru.names = [ "bower-registry-client" ];
   };
   by-spec."bower2nix"."*" =
-    self.by-version."bower2nix"."3.0.0";
-  by-version."bower2nix"."3.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "bower2nix-3.0.0";
+    self.by-version."bower2nix"."2.1.0";
+  by-version."bower2nix"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "bower2nix-2.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bower2nix/-/bower2nix-3.0.0.tgz";
-        name = "bower2nix-3.0.0.tgz";
-        sha1 = "afe3c676baff67b86e06f5514a325be45b317184";
+        url = "http://registry.npmjs.org/bower2nix/-/bower2nix-2.1.0.tgz";
+        name = "bower2nix-2.1.0.tgz";
+        sha1 = "213f507a729b20a1c3cb48f995a034f9c05f53e6";
       })
     ];
     buildInputs =
@@ -1251,6 +1395,9 @@
       self.by-version."temp"."0.6.0"
       self.by-version."fs.extra"."1.2.1"
       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.2.8"
       self.by-version."argparse"."0.1.15"
       self.by-version."clone"."0.1.11"
       self.by-version."semver"."2.2.1"
@@ -1260,7 +1407,7 @@
     ];
     passthru.names = [ "bower2nix" ];
   };
-  "bower2nix" = self.by-version."bower2nix"."3.0.0";
+  "bower2nix" = self.by-version."bower2nix"."2.1.0";
   by-spec."broadway"."0.2.9" =
     self.by-version."broadway"."0.2.9";
   by-version."broadway"."0.2.9" = lib.makeOverridable self.buildNodePackage {
@@ -1287,15 +1434,59 @@
   };
   by-spec."broadway"."0.2.x" =
     self.by-version."broadway"."0.2.9";
+  by-spec."browser-pack"."~2.0.0" =
+    self.by-version."browser-pack"."2.0.1";
+  by-version."browser-pack"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "browser-pack-2.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/browser-pack/-/browser-pack-2.0.1.tgz";
+        name = "browser-pack-2.0.1.tgz";
+        sha1 = "5d1c527f56c582677411c4db2a128648ff6bf150";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."browser-pack" or []);
+    deps = [
+      self.by-version."JSONStream"."0.6.4"
+      self.by-version."through"."2.3.4"
+      self.by-version."combine-source-map"."0.3.0"
+    ];
+    peerDependencies = [
+    ];
+    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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.2.tgz";
+        name = "browser-resolve-1.2.2.tgz";
+        sha1 = "83b1eaed8f120b906f56078e134669db0a4a5c11";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."browser-resolve" or []);
+    deps = [
+      self.by-version."resolve"."0.6.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "browser-resolve" ];
+  };
+  by-spec."browser-resolve"."~1.2.2" =
+    self.by-version."browser-resolve"."1.2.2";
   by-spec."browserchannel"."*" =
-    self.by-version."browserchannel"."1.0.8";
-  by-version."browserchannel"."1.0.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-browserchannel-1.0.8";
+    self.by-version."browserchannel"."1.1.1";
+  by-version."browserchannel"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-browserchannel-1.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.8.tgz";
-        name = "browserchannel-1.0.8.tgz";
-        sha1 = "96da83d139d8943f5bd616c334f148bd008dbac4";
+        url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.1.1.tgz";
+        name = "browserchannel-1.1.1.tgz";
+        sha1 = "223aeddf06892314e11f15fd2d4e2ade64a1bba5";
       })
     ];
     buildInputs =
@@ -1304,12 +1495,77 @@
       self.by-version."hat"."0.0.3"
       self.by-version."connect"."2.13.0"
       self.by-version."request"."2.34.0"
+      self.by-version."ascii-json"."0.2.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "browserchannel" ];
   };
-  "browserchannel" = self.by-version."browserchannel"."1.0.8";
+  "browserchannel" = self.by-version."browserchannel"."1.1.1";
+  by-spec."browserify"."~3.31.2" =
+    self.by-version."browserify"."3.31.2";
+  by-version."browserify"."3.31.2" = lib.makeOverridable self.buildNodePackage {
+    name = "browserify-3.31.2";
+    src = [
+      (self.patchSource fetchurl {
+        url = "http://registry.npmjs.org/browserify/-/browserify-3.31.2.tgz";
+        name = "browserify-3.31.2.tgz";
+        sha1 = "ec5bbd7fff284645db59280c340d972868e0ab1b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."browserify" or []);
+    deps = [
+      self.by-version."module-deps"."1.7.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.1"
+      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.1"
+      self.by-version."console-browserify"."1.0.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.4"
+      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"."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.1"
+      self.by-version."glob"."3.2.9"
+      self.by-version."builtins"."0.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "browserify" ];
+  };
   by-spec."bson"."0.1.8" =
     self.by-version."bson"."0.1.8";
   by-version."bson"."0.1.8" = lib.makeOverridable self.buildNodePackage {
@@ -1367,15 +1623,15 @@
     ];
     passthru.names = [ "bson" ];
   };
-  by-spec."bson"."0.2.6" =
-    self.by-version."bson"."0.2.6";
-  by-version."bson"."0.2.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bson-0.2.6";
+  by-spec."bson"."0.2.7" =
+    self.by-version."bson"."0.2.7";
+  by-version."bson"."0.2.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bson-0.2.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bson/-/bson-0.2.6.tgz";
-        name = "bson-0.2.6.tgz";
-        sha1 = "d001aa3d20b92e3f9cbc19d542515a748586a743";
+        url = "http://registry.npmjs.org/bson/-/bson-0.2.7.tgz";
+        name = "bson-0.2.7.tgz";
+        sha1 = "6793161c40e5a9757091d7ee7d52a4717950236b";
       })
     ];
     buildInputs =
@@ -1387,6 +1643,27 @@
     ];
     passthru.names = [ "bson" ];
   };
+  by-spec."buffer"."~2.1.4" =
+    self.by-version."buffer"."2.1.4";
+  by-version."buffer"."2.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-buffer-2.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/buffer/-/buffer-2.1.4.tgz";
+        name = "buffer-2.1.4.tgz";
+        sha1 = "0283e62870b4f450b636e00eb9fd527cd9ae1341";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."buffer" or []);
+    deps = [
+      self.by-version."base64-js"."0.0.6"
+      self.by-version."ieee754"."1.1.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "buffer" ];
+  };
   by-spec."buffer-crc32"."0.1.1" =
     self.by-version."buffer-crc32"."0.1.1";
   by-version."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -1485,6 +1762,25 @@
     ];
     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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/builtins/-/builtins-0.0.2.tgz";
+        name = "builtins-0.0.2.tgz";
+        sha1 = "b738db1ea166b752f7e0144c76f6ad5289448e51";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."builtins" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "builtins" ];
+  };
   by-spec."bunyan"."0.21.1" =
     self.by-version."bunyan"."0.21.1";
   by-version."bunyan"."0.21.1" = lib.makeOverridable self.buildNodePackage {
@@ -1585,6 +1881,25 @@
   };
   by-spec."bytes"."~0.2.1" =
     self.by-version."bytes"."0.2.1";
+  by-spec."callsite"."~1.0.0" =
+    self.by-version."callsite"."1.0.0";
+  by-version."callsite"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-callsite-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz";
+        name = "callsite-1.0.0.tgz";
+        sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."callsite" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "callsite" ];
+  };
   by-spec."cardinal"."~0.4.0" =
     self.by-version."cardinal"."0.4.4";
   by-version."cardinal"."0.4.4" = lib.makeOverridable self.buildNodePackage {
@@ -1599,7 +1914,7 @@
     buildInputs =
       (self.nativeDeps."cardinal" or []);
     deps = [
-      self.by-version."redeyed"."0.4.2"
+      self.by-version."redeyed"."0.4.4"
       self.by-version."ansicolors"."0.2.1"
     ];
     peerDependencies = [
@@ -1648,6 +1963,28 @@
     ];
     passthru.names = [ "chainsaw" ];
   };
+  by-spec."chalk"."^0.4.0" =
+    self.by-version."chalk"."0.4.0";
+  by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-chalk-0.4.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";
+        name = "chalk-0.4.0.tgz";
+        sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."chalk" or []);
+    deps = [
+      self.by-version."has-color"."0.1.4"
+      self.by-version."ansi-styles"."1.0.0"
+      self.by-version."strip-ansi"."0.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "chalk" ];
+  };
   by-spec."chalk"."~0.1.1" =
     self.by-version."chalk"."0.1.1";
   by-version."chalk"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -1715,26 +2052,6 @@
   };
   by-spec."chalk"."~0.4.0" =
     self.by-version."chalk"."0.4.0";
-  by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-chalk-0.4.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";
-        name = "chalk-0.4.0.tgz";
-        sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."chalk" or []);
-    deps = [
-      self.by-version."has-color"."0.1.4"
-      self.by-version."ansi-styles"."1.0.0"
-      self.by-version."strip-ansi"."0.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "chalk" ];
-  };
   by-spec."character-parser"."1.2.0" =
     self.by-version."character-parser"."1.2.0";
   by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -1916,35 +2233,15 @@
     ];
     passthru.names = [ "class-extend" ];
   };
-  by-spec."clean-css"."2.0.x" =
-    self.by-version."clean-css"."2.0.8";
-  by-version."clean-css"."2.0.8" = lib.makeOverridable self.buildNodePackage {
-    name = "clean-css-2.0.8";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.8.tgz";
-        name = "clean-css-2.0.8.tgz";
-        sha1 = "e937cdfdcc5781a00817aec4079e85b3ec157a20";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."clean-css" or []);
-    deps = [
-      self.by-version."commander"."2.0.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "clean-css" ];
-  };
-  by-spec."clean-css"."~2.1.0" =
-    self.by-version."clean-css"."2.1.1";
-  by-version."clean-css"."2.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "clean-css-2.1.1";
+  by-spec."clean-css"."2.1.x" =
+    self.by-version."clean-css"."2.1.4";
+  by-version."clean-css"."2.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "clean-css-2.1.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.1.tgz";
-        name = "clean-css-2.1.1.tgz";
-        sha1 = "eb0a46987629bee4550e2a1b8e6b6d6259d1e677";
+        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.4.tgz";
+        name = "clean-css-2.1.4.tgz";
+        sha1 = "82b59182c8aa02d7050329b0b977f7651bf9875e";
       })
     ];
     buildInputs =
@@ -1956,6 +2253,8 @@
     ];
     passthru.names = [ "clean-css" ];
   };
+  by-spec."clean-css"."~2.1.0" =
+    self.by-version."clean-css"."2.1.4";
   by-spec."cli"."0.4.x" =
     self.by-version."cli"."0.4.5";
   by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage {
@@ -1970,7 +2269,7 @@
     buildInputs =
       (self.nativeDeps."cli" or []);
     deps = [
-      self.by-version."glob"."3.2.8"
+      self.by-version."glob"."3.2.9"
     ];
     peerDependencies = [
     ];
@@ -2349,6 +2648,28 @@
     ];
     passthru.names = [ "columnify" ];
   };
+  by-spec."combine-source-map"."~0.3.0" =
+    self.by-version."combine-source-map"."0.3.0";
+  by-version."combine-source-map"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-combine-source-map-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz";
+        name = "combine-source-map-0.3.0.tgz";
+        sha1 = "d9e74f593d9cd43807312cb5d846d451efaa9eb7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."combine-source-map" or []);
+    deps = [
+      self.by-version."inline-source-map"."0.3.0"
+      self.by-version."convert-source-map"."0.3.3"
+      self.by-version."source-map"."0.1.33"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "combine-source-map" ];
+  };
   by-spec."combined-stream"."~0.0.4" =
     self.by-version."combined-stream"."0.0.4";
   by-version."combined-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -2447,8 +2768,6 @@
     ];
     passthru.names = [ "commander" ];
   };
-  by-spec."commander"."2.0.x" =
-    self.by-version."commander"."2.0.0";
   by-spec."commander"."2.1.0" =
     self.by-version."commander"."2.1.0";
   by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -2472,6 +2791,25 @@
     self.by-version."commander"."2.1.0";
   by-spec."commander"."~0.6.1" =
     self.by-version."commander"."0.6.1";
+  by-spec."commondir"."0.0.1" =
+    self.by-version."commondir"."0.0.1";
+  by-version."commondir"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-commondir-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz";
+        name = "commondir-0.0.1.tgz";
+        sha1 = "89f00fdcd51b519c578733fec563e6a6da7f5be2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."commondir" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "commondir" ];
+  };
   by-spec."compressible"."1.0.0" =
     self.by-version."compressible"."1.0.0";
   by-version."compressible"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -2491,6 +2829,30 @@
     ];
     passthru.names = [ "compressible" ];
   };
+  by-spec."concat-stream"."^1.4.1" =
+    self.by-version."concat-stream"."1.4.1";
+  by-version."concat-stream"."1.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-concat-stream-1.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.1.tgz";
+        name = "concat-stream-1.4.1.tgz";
+        sha1 = "20358b86fe36e5ac3de29cec76f4d04ad8ff1423";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."concat-stream" or []);
+    deps = [
+      self.by-version."inherits"."2.0.1"
+      self.by-version."typedarray"."0.0.5"
+      self.by-version."readable-stream"."1.1.11"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "concat-stream" ];
+  };
+  by-spec."concat-stream"."~1.4.1" =
+    self.by-version."concat-stream"."1.4.1";
   by-spec."config"."0.4.15" =
     self.by-version."config"."0.4.15";
   by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage {
@@ -2575,7 +2937,7 @@
       (self.nativeDeps."configstore" or []);
     deps = [
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."js-yaml"."3.0.1"
+      self.by-version."js-yaml"."3.0.2"
       self.by-version."osenv"."0.0.3"
       self.by-version."graceful-fs"."2.0.2"
       self.by-version."uuid"."1.4.1"
@@ -2849,7 +3211,7 @@
     buildInputs =
       (self.nativeDeps."connect-jade-static" or []);
     deps = [
-      self.by-version."jade"."1.1.5"
+      self.by-version."jade"."1.3.0"
     ];
     peerDependencies = [
     ];
@@ -2915,6 +3277,25 @@
     ];
     passthru.names = [ "console-browserify" ];
   };
+  by-spec."console-browserify"."~1.0.1" =
+    self.by-version."console-browserify"."1.0.3";
+  by-version."console-browserify"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-console-browserify-1.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.0.3.tgz";
+        name = "console-browserify-1.0.3.tgz";
+        sha1 = "d3898d2c3a93102f364197f8874b4f92b5286a8e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."console-browserify" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "console-browserify" ];
+  };
   by-spec."constantinople"."~1.0.1" =
     self.by-version."constantinople"."1.0.2";
   by-version."constantinople"."1.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -2937,19 +3318,77 @@
   };
   by-spec."constantinople"."~1.0.2" =
     self.by-version."constantinople"."1.0.2";
-  by-spec."cookie"."0.0.4" =
-    self.by-version."cookie"."0.0.4";
-  by-version."cookie"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cookie-0.0.4";
+  by-spec."constantinople"."~2.0.0" =
+    self.by-version."constantinople"."2.0.0";
+  by-version."constantinople"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-constantinople-2.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz";
-        name = "cookie-0.0.4.tgz";
-        sha1 = "5456bd47aee2666eac976ea80a6105940483fe98";
+        url = "http://registry.npmjs.org/constantinople/-/constantinople-2.0.0.tgz";
+        name = "constantinople-2.0.0.tgz";
+        sha1 = "0558c3f340095a43acf2386149e5537074330e49";
       })
     ];
     buildInputs =
-      (self.nativeDeps."cookie" or []);
+      (self.nativeDeps."constantinople" or []);
+    deps = [
+      self.by-version."uglify-js"."2.4.12"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "constantinople" ];
+  };
+  by-spec."constants-browserify"."~0.0.1" =
+    self.by-version."constants-browserify"."0.0.1";
+  by-version."constants-browserify"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-constants-browserify-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz";
+        name = "constants-browserify-0.0.1.tgz";
+        sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."constants-browserify" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "constants-browserify" ];
+  };
+  by-spec."convert-source-map"."~0.3.0" =
+    self.by-version."convert-source-map"."0.3.3";
+  by-version."convert-source-map"."0.3.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-convert-source-map-0.3.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.3.tgz";
+        name = "convert-source-map-0.3.3.tgz";
+        sha1 = "f77f130ded4e611d313a1bcf78f988990831c69b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."convert-source-map" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "convert-source-map" ];
+  };
+  by-spec."cookie"."0.0.4" =
+    self.by-version."cookie"."0.0.4";
+  by-version."cookie"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cookie-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz";
+        name = "cookie-0.0.4.tgz";
+        sha1 = "5456bd47aee2666eac976ea80a6105940483fe98";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookie" or []);
     deps = [
     ];
     peerDependencies = [
@@ -3070,6 +3509,25 @@
     ];
     passthru.names = [ "cookie-signature" ];
   };
+  by-spec."cookie-signature"."1.0.3" =
+    self.by-version."cookie-signature"."1.0.3";
+  by-version."cookie-signature"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cookie-signature-1.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz";
+        name = "cookie-signature-1.0.3.tgz";
+        sha1 = "91cd997cc51fb641595738c69cda020328f50ff9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookie-signature" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cookie-signature" ];
+  };
   by-spec."cookiejar"."1.3.0" =
     self.by-version."cookiejar"."1.3.0";
   by-version."cookiejar"."1.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -3290,6 +3748,25 @@
     ];
     passthru.names = [ "crypto" ];
   };
+  by-spec."crypto-browserify"."~1.0.9" =
+    self.by-version."crypto-browserify"."1.0.9";
+  by-version."crypto-browserify"."1.0.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-crypto-browserify-1.0.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz";
+        name = "crypto-browserify-1.0.9.tgz";
+        sha1 = "cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."crypto-browserify" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "crypto-browserify" ];
+  };
   by-spec."css"."~1.0.8" =
     self.by-version."css"."1.0.8";
   by-version."css"."1.0.8" = lib.makeOverridable self.buildNodePackage {
@@ -3658,6 +4135,27 @@
     ];
     passthru.names = [ "deep-equal" ];
   };
+  by-spec."deep-equal"."~0.0.0" =
+    self.by-version."deep-equal"."0.0.0";
+  by-spec."deep-equal"."~0.1.0" =
+    self.by-version."deep-equal"."0.1.2";
+  by-version."deep-equal"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-deep-equal-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz";
+        name = "deep-equal-0.1.2.tgz";
+        sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."deep-equal" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "deep-equal" ];
+  };
   by-spec."deep-extend"."~0.2.5" =
     self.by-version."deep-extend"."0.2.8";
   by-version."deep-extend"."0.2.8" = lib.makeOverridable self.buildNodePackage {
@@ -3677,8 +4175,27 @@
     ];
     passthru.names = [ "deep-extend" ];
   };
-  by-spec."deep-extend"."~0.2.6" =
+  by-spec."deep-extend"."~0.2.8" =
     self.by-version."deep-extend"."0.2.8";
+  by-spec."defined"."~0.0.0" =
+    self.by-version."defined"."0.0.0";
+  by-version."defined"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-defined-0.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/defined/-/defined-0.0.0.tgz";
+        name = "defined-0.0.0.tgz";
+        sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."defined" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "defined" ];
+  };
   by-spec."delayed-stream"."0.0.5" =
     self.by-version."delayed-stream"."0.0.5";
   by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -3698,6 +4215,71 @@
     ];
     passthru.names = [ "delayed-stream" ];
   };
+  by-spec."deps-sort"."~0.1.1" =
+    self.by-version."deps-sort"."0.1.1";
+  by-version."deps-sort"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "deps-sort-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.1.tgz";
+        name = "deps-sort-0.1.1.tgz";
+        sha1 = "940d9da1f84a3891c7218ad240ec5ed6084bc8d6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."deps-sort" or []);
+    deps = [
+      self.by-version."through"."2.3.4"
+      self.by-version."JSONStream"."0.6.4"
+      self.by-version."minimist"."0.0.8"
+    ];
+    peerDependencies = [
+    ];
+    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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/derequire/-/derequire-0.6.1.tgz";
+        name = "derequire-0.6.1.tgz";
+        sha1 = "cce8ee25380de715deb61900f0bdd38222928788";
+      })
+    ];
+    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"
+    ];
+    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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/detective/-/detective-2.4.1.tgz";
+        name = "detective-2.4.1.tgz";
+        sha1 = "943b8eec4c346f6ac501de25da2ea1a57ed77819";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."detective" or []);
+    deps = [
+      self.by-version."escodegen"."1.1.0"
+      self.by-version."esprima-six"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "detective" ];
+  };
   by-spec."di"."~0.0.1" =
     self.by-version."di"."0.0.1";
   by-version."di"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -3799,6 +4381,25 @@
     ];
     passthru.names = [ "dkim-signer" ];
   };
+  by-spec."domain-browser"."~1.1.0" =
+    self.by-version."domain-browser"."1.1.1";
+  by-version."domain-browser"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-domain-browser-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.1.tgz";
+        name = "domain-browser-1.1.1.tgz";
+        sha1 = "0123c1b9afe3bb7c8a9e856177b2059440957de0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."domain-browser" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "domain-browser" ];
+  };
   by-spec."domelementtype"."1" =
     self.by-version."domelementtype"."1.1.1";
   by-version."domelementtype"."1.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -4194,6 +4795,8 @@
     passthru.names = [ "escape-html" ];
   };
   "escape-html" = self.by-version."escape-html"."1.0.1";
+  by-spec."escape-html"."1.0.1" =
+    self.by-version."escape-html"."1.0.1";
   by-spec."escodegen"."*" =
     self.by-version."escodegen"."1.2.0";
   by-version."escodegen"."1.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -4211,7 +4814,7 @@
       self.by-version."esprima"."1.0.4"
       self.by-version."estraverse"."1.5.0"
       self.by-version."esutils"."1.0.0"
-      self.by-version."source-map"."0.1.32"
+      self.by-version."source-map"."0.1.33"
     ];
     peerDependencies = [
     ];
@@ -4233,7 +4836,7 @@
     deps = [
       self.by-version."esprima"."1.0.4"
       self.by-version."estraverse"."0.0.4"
-      self.by-version."source-map"."0.1.32"
+      self.by-version."source-map"."0.1.33"
     ];
     peerDependencies = [
     ];
@@ -4256,12 +4859,55 @@
       self.by-version."esprima"."1.0.4"
       self.by-version."estraverse"."1.5.0"
       self.by-version."esutils"."1.0.0"
-      self.by-version."source-map"."0.1.32"
+      self.by-version."source-map"."0.1.33"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "escodegen" ];
+  };
+  by-spec."escodegen"."~1.1.0" =
+    self.by-version."escodegen"."1.1.0";
+  by-version."escodegen"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "escodegen-1.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz";
+        name = "escodegen-1.1.0.tgz";
+        sha1 = "c663923f6e20aad48d0c0fa49f31c6d4f49360cf";
+      })
+    ];
+    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."source-map"."0.1.33"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "escodegen" ];
   };
+  by-spec."escope"."~0.0.13" =
+    self.by-version."escope"."0.0.16";
+  by-version."escope"."0.0.16" = lib.makeOverridable self.buildNodePackage {
+    name = "node-escope-0.0.16";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/escope/-/escope-0.0.16.tgz";
+        name = "escope-0.0.16.tgz";
+        sha1 = "418c7a0afca721dafe659193fd986283e746538f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."escope" or []);
+    deps = [
+      self.by-version."estraverse"."1.5.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "escope" ];
+  };
   by-spec."esprima"."1.0.x" =
     self.by-version."esprima"."1.0.4";
   by-version."esprima"."1.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -4283,12 +4929,53 @@
   };
   by-spec."esprima"."~ 1.0.2" =
     self.by-version."esprima"."1.0.4";
-  by-spec."esprima"."~1.0.0" =
-    self.by-version."esprima"."1.0.4";
   by-spec."esprima"."~1.0.2" =
     self.by-version."esprima"."1.0.4";
   by-spec."esprima"."~1.0.4" =
     self.by-version."esprima"."1.0.4";
+  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."esrefactor"."~0.1.0" =
+    self.by-version."esrefactor"."0.1.0";
+  by-version."esrefactor"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-esrefactor-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/esrefactor/-/esrefactor-0.1.0.tgz";
+        name = "esrefactor-0.1.0.tgz";
+        sha1 = "d142795a282339ab81e936b5b7a21b11bf197b13";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."esrefactor" or []);
+    deps = [
+      self.by-version."esprima"."1.0.4"
+      self.by-version."estraverse"."0.0.4"
+      self.by-version."escope"."0.0.16"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "esrefactor" ];
+  };
   by-spec."estraverse"."*" =
     self.by-version."estraverse"."1.5.0";
   by-version."estraverse"."1.5.0" = lib.makeOverridable self.buildNodePackage {
@@ -4308,6 +4995,8 @@
     ];
     passthru.names = [ "estraverse" ];
   };
+  by-spec."estraverse".">= 0.0.2" =
+    self.by-version."estraverse"."1.5.0";
   by-spec."estraverse"."~0.0.4" =
     self.by-version."estraverse"."0.0.4";
   by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -4428,6 +5117,25 @@
   };
   by-spec."eventemitter2"."~0.4.13" =
     self.by-version."eventemitter2"."0.4.13";
+  by-spec."events"."~1.0.0" =
+    self.by-version."events"."1.0.0";
+  by-version."events"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-events-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/events/-/events-1.0.0.tgz";
+        name = "events-1.0.0.tgz";
+        sha1 = "63c0f80c74d1435e8eb03b54306a9d8e8f6f9da0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."events" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "events" ];
+  };
   by-spec."events.node".">= 0.4.0" =
     self.by-version."events.node"."0.4.9";
   by-version."events.node"."0.4.9" = lib.makeOverridable self.buildNodePackage {
@@ -4517,37 +5225,39 @@
   by-spec."exit"."~0.1.1" =
     self.by-version."exit"."0.1.2";
   by-spec."express"."*" =
-    self.by-version."express"."3.4.8";
-  by-version."express"."3.4.8" = lib.makeOverridable self.buildNodePackage {
-    name = "express-3.4.8";
+    self.by-version."express"."4.0.0-rc2";
+  by-version."express"."4.0.0-rc2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-4.0.0-rc2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-3.4.8.tgz";
-        name = "express-3.4.8.tgz";
-        sha1 = "aa7a8986de07053337f4bc5ed9a6453d9cc8e2e1";
+        url = "http://registry.npmjs.org/express/-/express-4.0.0-rc2.tgz";
+        name = "express-4.0.0-rc2.tgz";
+        sha1 = "0b3fc3b853b393cdb5042dc9960498015ed06b96";
       })
     ];
     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."accepts"."1.0.0"
+      self.by-version."type-is"."1.0.0"
+      self.by-version."range-parser"."1.0.0"
       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."fresh"."0.2.2"
       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."send"."0.2.0"
+      self.by-version."cookie-signature"."1.0.3"
+      self.by-version."merge-descriptors"."0.0.2"
+      self.by-version."utils-merge"."1.0.0"
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."qs"."0.6.6"
       self.by-version."debug"."0.7.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "express" ];
   };
-  "express" = self.by-version."express"."3.4.8";
+  "express" = self.by-version."express"."4.0.0-rc2";
   by-spec."express"."2.5.11" =
     self.by-version."express"."2.5.11";
   by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage {
@@ -4633,6 +5343,35 @@
   };
   by-spec."express"."3.x" =
     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.7.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "express" ];
+  };
   by-spec."express"."~3.1.1" =
     self.by-version."express"."3.1.2";
   by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -4668,14 +5407,14 @@
   by-spec."express"."~3.4.8" =
     self.by-version."express"."3.4.8";
   by-spec."express-form"."*" =
-    self.by-version."express-form"."0.10.1";
-  by-version."express-form"."0.10.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-express-form-0.10.1";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express-form/-/express-form-0.10.1.tgz";
-        name = "express-form-0.10.1.tgz";
-        sha1 = "542f43cf276c33f8ec8836b571aa3365505609a8";
+        url = "http://registry.npmjs.org/express-form/-/express-form-0.12.0.tgz";
+        name = "express-form-0.12.0.tgz";
+        sha1 = "0525ce1365760fd90fb785829a430122aceb893a";
       })
     ];
     buildInputs =
@@ -4690,7 +5429,7 @@
     ];
     passthru.names = [ "express-form" ];
   };
-  "express-form" = self.by-version."express-form"."0.10.1";
+  "express-form" = self.by-version."express-form"."0.12.0";
   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 {
@@ -4867,7 +5606,7 @@
       self.by-version."bower-endpoint-parser"."0.2.1"
       self.by-version."bower-logger"."0.2.1"
       self.by-version."bower"."1.2.8"
-      self.by-version."glob"."3.2.8"
+      self.by-version."glob"."3.2.9"
     ];
     peerDependencies = [
     ];
@@ -4915,7 +5654,7 @@
       self.by-version."lodash"."2.1.0"
       self.by-version."iconv-lite"."0.2.11"
       self.by-version."rimraf"."2.2.6"
-      self.by-version."glob"."3.2.8"
+      self.by-version."glob"."3.2.9"
       self.by-version."minimatch"."0.2.14"
       self.by-version."findup-sync"."0.1.2"
       self.by-version."isbinaryfile"."0.1.9"
@@ -4941,21 +5680,21 @@
       (self.nativeDeps."fileset" or []);
     deps = [
       self.by-version."minimatch"."0.2.14"
-      self.by-version."glob"."3.2.8"
+      self.by-version."glob"."3.2.9"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "fileset" ];
   };
   by-spec."findit".">=1.1.0 <2.0.0" =
-    self.by-version."findit"."1.1.0";
-  by-version."findit"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-findit-1.1.0";
+    self.by-version."findit"."1.1.1";
+  by-version."findit"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-findit-1.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/findit/-/findit-1.1.0.tgz";
-        name = "findit-1.1.0.tgz";
-        sha1 = "7104c60060f838d2298bd526b16add6ce733f9ac";
+        url = "http://registry.npmjs.org/findit/-/findit-1.1.1.tgz";
+        name = "findit-1.1.1.tgz";
+        sha1 = "b460e2f7633d78ed2c217c77c4209ecacaf8262a";
       })
     ];
     buildInputs =
@@ -5359,7 +6098,7 @@
     ];
     passthru.names = [ "fresh" ];
   };
-  by-spec."fresh"."~0.2.1" =
+  by-spec."fresh"."0.2.2" =
     self.by-version."fresh"."0.2.2";
   by-version."fresh"."0.2.2" = lib.makeOverridable self.buildNodePackage {
     name = "node-fresh-0.2.2";
@@ -5378,6 +6117,8 @@
     ];
     passthru.names = [ "fresh" ];
   };
+  by-spec."fresh"."~0.2.1" =
+    self.by-version."fresh"."0.2.2";
   by-spec."fs-extra"."~0.6.1" =
     self.by-version."fs-extra"."0.6.4";
   by-version."fs-extra"."0.6.4" = lib.makeOverridable self.buildNodePackage {
@@ -5767,14 +6508,14 @@
     passthru.names = [ "github-url-from-username-repo" ];
   };
   by-spec."glob"."3" =
-    self.by-version."glob"."3.2.8";
-  by-version."glob"."3.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-glob-3.2.8";
+    self.by-version."glob"."3.2.9";
+  by-version."glob"."3.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-glob-3.2.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/glob/-/glob-3.2.8.tgz";
-        name = "glob-3.2.8.tgz";
-        sha1 = "5506f4311721bcc618c7d8dba144188750307073";
+        url = "http://registry.npmjs.org/glob/-/glob-3.2.9.tgz";
+        name = "glob-3.2.9.tgz";
+        sha1 = "56af2289aa43d07d7702666480373eb814d91d40";
       })
     ];
     buildInputs =
@@ -5831,13 +6572,13 @@
     passthru.names = [ "glob" ];
   };
   by-spec."glob"."3.2.x" =
-    self.by-version."glob"."3.2.8";
+    self.by-version."glob"."3.2.9";
   by-spec."glob"."3.x" =
-    self.by-version."glob"."3.2.8";
+    self.by-version."glob"."3.2.9";
   by-spec."glob".">= 3.1.4" =
-    self.by-version."glob"."3.2.8";
+    self.by-version."glob"."3.2.9";
   by-spec."glob".">=3.2.7 <4" =
-    self.by-version."glob"."3.2.8";
+    self.by-version."glob"."3.2.9";
   by-spec."glob"."~3.1.21" =
     self.by-version."glob"."3.1.21";
   by-version."glob"."3.1.21" = lib.makeOverridable self.buildNodePackage {
@@ -5861,13 +6602,15 @@
     passthru.names = [ "glob" ];
   };
   by-spec."glob"."~3.2.0" =
-    self.by-version."glob"."3.2.8";
+    self.by-version."glob"."3.2.9";
   by-spec."glob"."~3.2.1" =
-    self.by-version."glob"."3.2.8";
+    self.by-version."glob"."3.2.9";
   by-spec."glob"."~3.2.6" =
-    self.by-version."glob"."3.2.8";
+    self.by-version."glob"."3.2.9";
   by-spec."glob"."~3.2.7" =
-    self.by-version."glob"."3.2.8";
+    self.by-version."glob"."3.2.9";
+  by-spec."glob"."~3.2.8" =
+    self.by-version."glob"."3.2.9";
   by-spec."graceful-fs"."2" =
     self.by-version."graceful-fs"."2.0.2";
   by-version."graceful-fs"."2.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -6011,6 +6754,8 @@
     ];
     passthru.names = [ "grunt" ];
   };
+  by-spec."grunt"."^0.4.0" =
+    self.by-version."grunt"."0.4.2";
   by-spec."grunt"."~0.4" =
     self.by-version."grunt"."0.4.2";
   by-spec."grunt"."~0.4.0" =
@@ -6069,29 +6814,29 @@
   by-spec."grunt-cli"."~0.1.7" =
     self.by-version."grunt-cli"."0.1.13";
   by-spec."grunt-contrib-cssmin"."*" =
-    self.by-version."grunt-contrib-cssmin"."0.8.0";
-  by-version."grunt-contrib-cssmin"."0.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-cssmin-0.8.0";
+    self.by-version."grunt-contrib-cssmin"."0.9.0";
+  by-version."grunt-contrib-cssmin"."0.9.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-cssmin-0.9.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.8.0.tgz";
-        name = "grunt-contrib-cssmin-0.8.0.tgz";
-        sha1 = "eb58cbfa466e6c96136c0220f191789eb22908b8";
+        url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.9.0.tgz";
+        name = "grunt-contrib-cssmin-0.9.0.tgz";
+        sha1 = "27241f0160a8866659dab40dc8c2776c01ec7ce2";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-cssmin" or []);
     deps = [
       self.by-version."chalk"."0.4.0"
-      self.by-version."clean-css"."2.1.1"
-      self.by-version."grunt-lib-contrib"."0.6.1"
+      self.by-version."clean-css"."2.1.4"
+      self.by-version."maxmin"."0.1.0"
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.2"
     ];
     passthru.names = [ "grunt-contrib-cssmin" ];
   };
-  "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.8.0";
+  "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.9.0";
   by-spec."grunt-contrib-jshint"."*" =
     self.by-version."grunt-contrib-jshint"."0.8.0";
   by-version."grunt-contrib-jshint"."0.8.0" = lib.makeOverridable self.buildNodePackage {
@@ -6115,20 +6860,20 @@
   };
   "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.8.0";
   by-spec."grunt-contrib-less"."*" =
-    self.by-version."grunt-contrib-less"."0.9.0";
-  by-version."grunt-contrib-less"."0.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-less-0.9.0";
+    self.by-version."grunt-contrib-less"."0.10.0";
+  by-version."grunt-contrib-less"."0.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-less-0.10.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.9.0.tgz";
-        name = "grunt-contrib-less-0.9.0.tgz";
-        sha1 = "af1e6e76511c2bc328ef8d284058643ca5887675";
+        url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.10.0.tgz";
+        name = "grunt-contrib-less-0.10.0.tgz";
+        sha1 = "542bf636ffb35f6e14c2e931855c1151b4a291b3";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-less" or []);
     deps = [
-      self.by-version."less"."1.6.3"
+      self.by-version."less"."1.7.0"
       self.by-version."grunt-lib-contrib"."0.6.1"
       self.by-version."chalk"."0.4.0"
     ];
@@ -6137,16 +6882,16 @@
     ];
     passthru.names = [ "grunt-contrib-less" ];
   };
-  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.9.0";
+  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.10.0";
   by-spec."grunt-contrib-requirejs"."*" =
-    self.by-version."grunt-contrib-requirejs"."0.4.1";
-  by-version."grunt-contrib-requirejs"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-requirejs-0.4.1";
+    self.by-version."grunt-contrib-requirejs"."0.4.3";
+  by-version."grunt-contrib-requirejs"."0.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-requirejs-0.4.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.1.tgz";
-        name = "grunt-contrib-requirejs-0.4.1.tgz";
-        sha1 = "862ba167141b8a8f36af5444feab3272bb8cf4bd";
+        url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.3.tgz";
+        name = "grunt-contrib-requirejs-0.4.3.tgz";
+        sha1 = "ac243dc312af5c85cd095169da1b3177bfe89c59";
       })
     ];
     buildInputs =
@@ -6159,31 +6904,31 @@
     ];
     passthru.names = [ "grunt-contrib-requirejs" ];
   };
-  "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.1";
+  "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.3";
   by-spec."grunt-contrib-uglify"."*" =
-    self.by-version."grunt-contrib-uglify"."0.3.2";
-  by-version."grunt-contrib-uglify"."0.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-uglify-0.3.2";
+    self.by-version."grunt-contrib-uglify"."0.4.0";
+  by-version."grunt-contrib-uglify"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-uglify-0.4.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.3.2.tgz";
-        name = "grunt-contrib-uglify-0.3.2.tgz";
-        sha1 = "865b00ae0d11d1f5fafca3967c9b099f8929684b";
+        url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.4.0.tgz";
+        name = "grunt-contrib-uglify-0.4.0.tgz";
+        sha1 = "6a4df3e85ccf4bbae484b0328cc71c9f102e80be";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-uglify" or []);
     deps = [
       self.by-version."uglify-js"."2.4.12"
-      self.by-version."grunt-lib-contrib"."0.6.1"
       self.by-version."chalk"."0.4.0"
+      self.by-version."maxmin"."0.1.0"
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.2"
     ];
     passthru.names = [ "grunt-contrib-uglify" ];
   };
-  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.3.2";
+  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.4.0";
   by-spec."grunt-karma"."*" =
     self.by-version."grunt-karma"."0.7.2";
   by-version."grunt-karma"."0.7.2" = lib.makeOverridable self.buildNodePackage {
@@ -6207,7 +6952,7 @@
     passthru.names = [ "grunt-karma" ];
   };
   "grunt-karma" = self.by-version."grunt-karma"."0.7.2";
-  by-spec."grunt-lib-contrib"."~0.6.0" =
+  by-spec."grunt-lib-contrib"."~0.6.1" =
     self.by-version."grunt-lib-contrib"."0.6.1";
   by-version."grunt-lib-contrib"."0.6.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-grunt-lib-contrib-0.6.1";
@@ -6227,8 +6972,6 @@
     ];
     passthru.names = [ "grunt-lib-contrib" ];
   };
-  by-spec."grunt-lib-contrib"."~0.6.1" =
-    self.by-version."grunt-lib-contrib"."0.6.1";
   by-spec."grunt-sed"."*" =
     self.by-version."grunt-sed"."0.1.1";
   by-version."grunt-sed"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -6266,7 +7009,7 @@
       (self.nativeDeps."guifi-earth" or []);
     deps = [
       self.by-version."coffee-script"."1.7.1"
-      self.by-version."jade"."1.1.5"
+      self.by-version."jade"."1.3.0"
       self.by-version."q"."1.0.0"
       self.by-version."xml2js"."0.4.1"
       self.by-version."msgpack"."0.2.2"
@@ -6276,21 +7019,42 @@
     passthru.names = [ "guifi-earth" ];
   };
   "guifi-earth" = self.by-version."guifi-earth"."0.2.1";
-  by-spec."gzippo"."*" =
-    self.by-version."gzippo"."0.2.0";
-  by-version."gzippo"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-gzippo-0.2.0";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/gzippo/-/gzippo-0.2.0.tgz";
-        name = "gzippo-0.2.0.tgz";
-        sha1 = "ffc594c482190c56531ed2d4a5864d0b0b7d2733";
+        url = "http://registry.npmjs.org/gzip-size/-/gzip-size-0.1.0.tgz";
+        name = "gzip-size-0.1.0.tgz";
+        sha1 = "2beaecdaf4917bd151fe9a9d43ae199392d6c32a";
       })
     ];
     buildInputs =
-      (self.nativeDeps."gzippo" or []);
+      (self.nativeDeps."gzip-size" or []);
     deps = [
-      self.by-version."send"."0.2.0"
+      self.by-version."concat-stream"."1.4.1"
+      self.by-version."zlib-browserify"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "gzip-size" ];
+  };
+  by-spec."gzippo"."*" =
+    self.by-version."gzippo"."0.2.0";
+  by-version."gzippo"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-gzippo-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/gzippo/-/gzippo-0.2.0.tgz";
+        name = "gzippo-0.2.0.tgz";
+        sha1 = "ffc594c482190c56531ed2d4a5864d0b0b7d2733";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."gzippo" or []);
+    deps = [
+      self.by-version."send"."0.2.0"
     ];
     peerDependencies = [
     ];
@@ -6719,6 +7483,27 @@
     ];
     passthru.names = [ "http-auth" ];
   };
+  by-spec."http-browserify"."~1.3.1" =
+    self.by-version."http-browserify"."1.3.2";
+  by-version."http-browserify"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-http-browserify-1.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.3.2.tgz";
+        name = "http-browserify-1.3.2.tgz";
+        sha1 = "b562c34479349a690d7a6597df495aefa8c604f5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."http-browserify" or []);
+    deps = [
+      self.by-version."Base64"."0.2.0"
+      self.by-version."inherits"."2.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "http-browserify" ];
+  };
   by-spec."http-proxy"."git://github.com/samalba/node-http-proxy" =
     self.by-version."http-proxy"."0.10.3";
   by-version."http-proxy"."0.10.3" = lib.makeOverridable self.buildNodePackage {
@@ -6809,6 +7594,25 @@
     ];
     passthru.names = [ "http-signature" ];
   };
+  by-spec."https-browserify"."~0.0.0" =
+    self.by-version."https-browserify"."0.0.0";
+  by-version."https-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-https-browserify-0.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz";
+        name = "https-browserify-0.0.0.tgz";
+        sha1 = "b3ffdfe734b2a3d4a9efd58e8654c91fce86eafd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."https-browserify" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "https-browserify" ];
+  };
   by-spec."humanize"."~0.0.9" =
     self.by-version."humanize"."0.0.9";
   by-version."humanize"."0.0.9" = lib.makeOverridable self.buildNodePackage {
@@ -6915,6 +7719,44 @@
   };
   by-spec."iconv-lite"."~0.2.11" =
     self.by-version."iconv-lite"."0.2.11";
+  by-spec."ieee754"."~1.1.1" =
+    self.by-version."ieee754"."1.1.3";
+  by-version."ieee754"."1.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ieee754-1.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ieee754/-/ieee754-1.1.3.tgz";
+        name = "ieee754-1.1.3.tgz";
+        sha1 = "1d4baae872e15ba69f6ab7588a965e09d485ec50";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ieee754" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ieee754" ];
+  };
+  by-spec."indexof"."0.0.1" =
+    self.by-version."indexof"."0.0.1";
+  by-version."indexof"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-indexof-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
+        name = "indexof-0.0.1.tgz";
+        sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."indexof" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "indexof" ];
+  };
   by-spec."inherits"."1" =
     self.by-version."inherits"."1.0.0";
   by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -6961,6 +7803,8 @@
     self.by-version."inherits"."1.0.0";
   by-spec."inherits"."~2.0.0" =
     self.by-version."inherits"."2.0.1";
+  by-spec."inherits"."~2.0.1" =
+    self.by-version."inherits"."2.0.1";
   by-spec."ini"."1" =
     self.by-version."ini"."1.1.0";
   by-version."ini"."1.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -7002,12 +7846,32 @@
       self.by-version."read"."1.0.5"
       self.by-version."read-package-json"."1.1.7"
       self.by-version."semver"."2.2.1"
-      self.by-version."glob"."3.2.8"
+      self.by-version."glob"."3.2.9"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "init-package-json" ];
   };
+  by-spec."inline-source-map"."~0.3.0" =
+    self.by-version."inline-source-map"."0.3.0";
+  by-version."inline-source-map"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-inline-source-map-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.0.tgz";
+        name = "inline-source-map-0.3.0.tgz";
+        sha1 = "ad2acca97d82fcb9d0a56221ee72e8043116424a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."inline-source-map" or []);
+    deps = [
+      self.by-version."source-map"."0.1.33"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "inline-source-map" ];
+  };
   by-spec."inquirer"."~0.3.0" =
     self.by-version."inquirer"."0.3.5";
   by-version."inquirer"."0.3.5" = lib.makeOverridable self.buildNodePackage {
@@ -7060,6 +7924,30 @@
     ];
     passthru.names = [ "inquirer" ];
   };
+  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";
+    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";
+      })
+    ];
+    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."through"."2.3.4"
+      self.by-version."JSONStream"."0.7.1"
+      self.by-version."concat-stream"."1.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "insert-module-globals" ];
+  };
   by-spec."insight"."~0.3.0" =
     self.by-version."insight"."0.3.1";
   by-version."insight"."0.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -7124,14 +8012,14 @@
       self.by-version."nconf"."0.6.9"
       self.by-version."fs-walk"."0.0.1"
       self.by-version."async"."0.2.10"
-      self.by-version."express"."3.4.8"
-      self.by-version."jade"."1.1.5"
+      self.by-version."express"."4.0.0-rc2"
+      self.by-version."jade"."1.3.0"
       self.by-version."passport"."0.2.0"
       self.by-version."passport-http"."0.2.2"
-      self.by-version."js-yaml"."3.0.1"
+      self.by-version."js-yaml"."3.0.2"
       self.by-version."mongoose"."3.8.8"
       self.by-version."gridfs-stream"."0.4.1"
-      self.by-version."temp"."0.6.0"
+      self.by-version."temp"."0.7.0"
       self.by-version."kue"."0.7.5"
       self.by-version."redis"."0.10.1"
       self.by-version."hiredis"."0.1.16"
@@ -7225,7 +8113,7 @@
       self.by-version."abbrev"."1.0.4"
       self.by-version."wordwrap"."0.0.2"
       self.by-version."resolve"."0.6.1"
-      self.by-version."js-yaml"."3.0.1"
+      self.by-version."js-yaml"."3.0.2"
     ];
     peerDependencies = [
     ];
@@ -7263,14 +8151,14 @@
     passthru.names = [ "istanbul" ];
   };
   by-spec."jade"."*" =
-    self.by-version."jade"."1.1.5";
-  by-version."jade"."1.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "jade-1.1.5";
+    self.by-version."jade"."1.3.0";
+  by-version."jade"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "jade-1.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jade/-/jade-1.1.5.tgz";
-        name = "jade-1.1.5.tgz";
-        sha1 = "e884d3d3565807e280f5ba760f68addb176627a3";
+        url = "http://registry.npmjs.org/jade/-/jade-1.3.0.tgz";
+        name = "jade-1.3.0.tgz";
+        sha1 = "776cae93f1ad5af6b61eff2340fcdc19a3225d48";
       })
     ];
     buildInputs =
@@ -7281,14 +8169,14 @@
       self.by-version."transformers"."2.1.0"
       self.by-version."character-parser"."1.2.0"
       self.by-version."monocle"."1.1.51"
-      self.by-version."with"."2.0.0"
-      self.by-version."constantinople"."1.0.2"
+      self.by-version."with"."3.0.0"
+      self.by-version."constantinople"."2.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "jade" ];
   };
-  "jade" = self.by-version."jade"."1.1.5";
+  "jade" = self.by-version."jade"."1.3.0";
   by-spec."jade"."0.26.3" =
     self.by-version."jade"."0.26.3";
   by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage {
@@ -7333,8 +8221,32 @@
   };
   by-spec."jade"."1.1.5" =
     self.by-version."jade"."1.1.5";
+  by-version."jade"."1.1.5" = lib.makeOverridable self.buildNodePackage {
+    name = "jade-1.1.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/jade/-/jade-1.1.5.tgz";
+        name = "jade-1.1.5.tgz";
+        sha1 = "e884d3d3565807e280f5ba760f68addb176627a3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."jade" or []);
+    deps = [
+      self.by-version."commander"."2.1.0"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."transformers"."2.1.0"
+      self.by-version."character-parser"."1.2.0"
+      self.by-version."monocle"."1.1.51"
+      self.by-version."with"."2.0.0"
+      self.by-version."constantinople"."1.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "jade" ];
+  };
   by-spec."jade".">= 0.0.1" =
-    self.by-version."jade"."1.1.5";
+    self.by-version."jade"."1.3.0";
   by-spec."jade"."~0.35.0" =
     self.by-version."jade"."0.35.0";
   by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage {
@@ -7362,14 +8274,14 @@
     passthru.names = [ "jade" ];
   };
   by-spec."jayschema"."*" =
-    self.by-version."jayschema"."0.2.4";
-  by-version."jayschema"."0.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "jayschema-0.2.4";
+    self.by-version."jayschema"."0.2.5";
+  by-version."jayschema"."0.2.5" = lib.makeOverridable self.buildNodePackage {
+    name = "jayschema-0.2.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.4.tgz";
-        name = "jayschema-0.2.4.tgz";
-        sha1 = "de51c61702a472c579cf50adf70652b7e23977ae";
+        url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.5.tgz";
+        name = "jayschema-0.2.5.tgz";
+        sha1 = "314e87687eac703a0a2557d77dbb3f175a0e7ada";
       })
     ];
     buildInputs =
@@ -7381,7 +8293,7 @@
     ];
     passthru.names = [ "jayschema" ];
   };
-  "jayschema" = self.by-version."jayschema"."0.2.4";
+  "jayschema" = self.by-version."jayschema"."0.2.5";
   by-spec."jedediah"."~0.1.0" =
     self.by-version."jedediah"."0.1.1";
   by-version."jedediah"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -7402,14 +8314,14 @@
     passthru.names = [ "jedediah" ];
   };
   by-spec."js-yaml"."*" =
-    self.by-version."js-yaml"."3.0.1";
-  by-version."js-yaml"."3.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "js-yaml-3.0.1";
+    self.by-version."js-yaml"."3.0.2";
+  by-version."js-yaml"."3.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "js-yaml-3.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz";
-        name = "js-yaml-3.0.1.tgz";
-        sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe";
+        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.2.tgz";
+        name = "js-yaml-3.0.2.tgz";
+        sha1 = "9937865f8e897a5e894e73c2c5cf2e89b32eb771";
       })
     ];
     buildInputs =
@@ -7422,7 +8334,7 @@
     ];
     passthru.names = [ "js-yaml" ];
   };
-  "js-yaml" = self.by-version."js-yaml"."3.0.1";
+  "js-yaml" = self.by-version."js-yaml"."3.0.2";
   by-spec."js-yaml"."0.3.x" =
     self.by-version."js-yaml"."0.3.7";
   by-version."js-yaml"."0.3.7" = lib.makeOverridable self.buildNodePackage {
@@ -7465,8 +8377,27 @@
   };
   by-spec."js-yaml"."3.0.1" =
     self.by-version."js-yaml"."3.0.1";
+  by-version."js-yaml"."3.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "js-yaml-3.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz";
+        name = "js-yaml-3.0.1.tgz";
+        sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."js-yaml" or []);
+    deps = [
+      self.by-version."argparse"."0.1.15"
+      self.by-version."esprima"."1.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "js-yaml" ];
+  };
   by-spec."js-yaml"."3.x" =
-    self.by-version."js-yaml"."3.0.1";
+    self.by-version."js-yaml"."3.0.2";
   by-spec."js-yaml"."~2.0.5" =
     self.by-version."js-yaml"."2.0.5";
   by-version."js-yaml"."2.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -7510,7 +8441,7 @@
     passthru.names = [ "js-yaml" ];
   };
   by-spec."js-yaml"."~3.0.1" =
-    self.by-version."js-yaml"."3.0.1";
+    self.by-version."js-yaml"."3.0.2";
   by-spec."jsesc"."0.4.3" =
     self.by-version."jsesc"."0.4.3";
   by-version."jsesc"."0.4.3" = lib.makeOverridable self.buildNodePackage {
@@ -7637,6 +8568,44 @@
     ];
     passthru.names = [ "jsonfile" ];
   };
+  by-spec."jsonify"."~0.0.0" =
+    self.by-version."jsonify"."0.0.0";
+  by-version."jsonify"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-jsonify-0.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
+        name = "jsonify-0.0.0.tgz";
+        sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."jsonify" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "jsonify" ];
+  };
+  by-spec."jsonparse"."0.0.5" =
+    self.by-version."jsonparse"."0.0.5";
+  by-version."jsonparse"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-jsonparse-0.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz";
+        name = "jsonparse-0.0.5.tgz";
+        sha1 = "330542ad3f0a654665b778f3eb2d9a9fa507ac64";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."jsonparse" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "jsonparse" ];
+  };
   by-spec."jsontool"."*" =
     self.by-version."jsontool"."7.0.1";
   by-version."jsontool"."7.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -7715,7 +8684,7 @@
       self.by-version."di"."0.0.1"
       self.by-version."socket.io"."0.9.16"
       self.by-version."chokidar"."0.8.1"
-      self.by-version."glob"."3.2.8"
+      self.by-version."glob"."3.2.9"
       self.by-version."minimatch"."0.2.14"
       self.by-version."http-proxy"."0.10.4"
       self.by-version."optimist"."0.6.1"
@@ -7725,11 +8694,11 @@
       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.10"
+      self.by-version."log4js"."0.6.12"
       self.by-version."useragent"."2.0.7"
       self.by-version."graceful-fs"."2.0.2"
       self.by-version."connect"."2.12.0"
-      self.by-version."source-map"."0.1.32"
+      self.by-version."source-map"."0.1.33"
     ];
     peerDependencies = [
     ];
@@ -7869,7 +8838,7 @@
     buildInputs =
       (self.nativeDeps."karma-sauce-launcher" or []);
     deps = [
-      self.by-version."wd"."0.2.10"
+      self.by-version."wd"."0.2.11"
       self.by-version."sauce-connect-launcher"."0.2.2"
       self.by-version."q"."0.9.7"
       self.by-version."saucelabs"."0.1.1"
@@ -8139,22 +9108,22 @@
     buildInputs =
       (self.nativeDeps."lcov-result-merger" or []);
     deps = [
-      self.by-version."glob"."3.2.8"
+      self.by-version."glob"."3.2.9"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "lcov-result-merger" ];
   };
   "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2";
-  by-spec."less"."~1.6.0" =
-    self.by-version."less"."1.6.3";
-  by-version."less"."1.6.3" = lib.makeOverridable self.buildNodePackage {
-    name = "less-1.6.3";
+  by-spec."less"."~1.7.0" =
+    self.by-version."less"."1.7.0";
+  by-version."less"."1.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "less-1.7.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/less/-/less-1.6.3.tgz";
-        name = "less-1.6.3.tgz";
-        sha1 = "71ce89ec30b774b3567f254c67958f2f2c193bde";
+        url = "http://registry.npmjs.org/less/-/less-1.7.0.tgz";
+        name = "less-1.7.0.tgz";
+        sha1 = "6f1293bac1f402c932c2ce21ba7337f7c635ba84";
       })
     ];
     buildInputs =
@@ -8163,13 +9132,33 @@
       self.by-version."mime"."1.2.11"
       self.by-version."request"."2.34.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."clean-css"."2.0.8"
-      self.by-version."source-map"."0.1.32"
+      self.by-version."clean-css"."2.1.4"
+      self.by-version."source-map"."0.1.33"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "less" ];
   };
+  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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.1.0.tgz";
+        name = "lexical-scope-0.1.0.tgz";
+        sha1 = "8f30004c80234ffac083b990079d7b267e18441b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lexical-scope" or []);
+    deps = [
+      self.by-version."astw"."0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lexical-scope" ];
+  };
   by-spec."libxmljs"."~0.8.1" =
     self.by-version."libxmljs"."0.8.1";
   by-version."libxmljs"."0.8.1" = lib.makeOverridable self.buildNodePackage {
@@ -8585,14 +9574,14 @@
     passthru.names = [ "log-driver" ];
   };
   by-spec."log4js"."~0.6.3" =
-    self.by-version."log4js"."0.6.10";
-  by-version."log4js"."0.6.10" = lib.makeOverridable self.buildNodePackage {
-    name = "node-log4js-0.6.10";
+    self.by-version."log4js"."0.6.12";
+  by-version."log4js"."0.6.12" = lib.makeOverridable self.buildNodePackage {
+    name = "node-log4js-0.6.12";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.10.tgz";
-        name = "log4js-0.6.10.tgz";
-        sha1 = "3a47a2551dc6362672901b73f7f47aee6310f785";
+        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.12.tgz";
+        name = "log4js-0.6.12.tgz";
+        sha1 = "ef806ec669ea3fc7bf5be92a95891fb67517e642";
       })
     ];
     buildInputs =
@@ -8804,6 +9793,30 @@
     ];
     passthru.names = [ "mailcomposer" ];
   };
+  by-spec."maxmin"."^0.1.0" =
+    self.by-version."maxmin"."0.1.0";
+  by-version."maxmin"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-maxmin-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/maxmin/-/maxmin-0.1.0.tgz";
+        name = "maxmin-0.1.0.tgz";
+        sha1 = "95d81c5289e3a9d30f7fc7dc559c024e5030c9d0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."maxmin" or []);
+    deps = [
+      self.by-version."gzip-size"."0.1.0"
+      self.by-version."pretty-bytes"."0.1.0"
+      self.by-version."chalk"."0.4.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "maxmin" ];
+  };
+  by-spec."maxmin"."~0.1.0" =
+    self.by-version."maxmin"."0.1.0";
   by-spec."meat"."*" =
     self.by-version."meat"."0.2.5";
   by-version."meat"."0.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -8871,6 +9884,25 @@
     ];
     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 {
+    name = "node-merge-descriptors-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
+        name = "merge-descriptors-0.0.2.tgz";
+        sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."merge-descriptors" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "merge-descriptors" ];
+  };
   by-spec."methods"."0.0.1" =
     self.by-version."methods"."0.0.1";
   by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -9117,6 +10149,8 @@
     ];
     passthru.names = [ "minimist" ];
   };
+  by-spec."minimist"."~0.0.5" =
+    self.by-version."minimist"."0.0.8";
   by-spec."minimist"."~0.0.7" =
     self.by-version."minimist"."0.0.8";
   by-spec."ministyle"."~0.1.3" =
@@ -9283,6 +10317,33 @@
     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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/module-deps/-/module-deps-1.7.1.tgz";
+        name = "module-deps-1.7.1.tgz";
+        sha1 = "1e9a6809727282323abf1d5eee5ce8860b2e7bbf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."module-deps" or []);
+    deps = [
+      self.by-version."through"."2.3.4"
+      self.by-version."JSONStream"."0.7.1"
+      self.by-version."browser-resolve"."1.2.2"
+      self.by-version."resolve"."0.6.1"
+      self.by-version."concat-stream"."1.4.1"
+      self.by-version."minimist"."0.0.8"
+      self.by-version."parents"."0.0.2"
+      self.by-version."detective"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "module-deps" ];
+  };
   by-spec."moment"."2.1.0" =
     self.by-version."moment"."2.1.0";
   by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -9321,7 +10382,7 @@
     ];
     passthru.names = [ "moment" ];
   };
-  by-spec."moment"."~2.5.0" =
+  by-spec."moment"."~2.5.1" =
     self.by-version."moment"."2.5.1";
   by-version."moment"."2.5.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-moment-2.5.1";
@@ -9341,27 +10402,27 @@
     passthru.names = [ "moment" ];
   };
   by-spec."mongodb"."*" =
-    self.by-version."mongodb"."1.4.0-rc7";
-  by-version."mongodb"."1.4.0-rc7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mongodb-1.4.0-rc7";
+    self.by-version."mongodb"."1.4.0-rc8";
+  by-version."mongodb"."1.4.0-rc8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mongodb-1.4.0-rc8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc7.tgz";
-        name = "mongodb-1.4.0-rc7.tgz";
-        sha1 = "efa6da4ef5d1bf0fdf48b4f0e369e3d2186d3401";
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc8.tgz";
+        name = "mongodb-1.4.0-rc8.tgz";
+        sha1 = "3c6048070935d2b1c7e997dd77be70119e33cced";
       })
     ];
     buildInputs =
       (self.nativeDeps."mongodb" or []);
     deps = [
-      self.by-version."bson"."0.2.6"
+      self.by-version."bson"."0.2.7"
       self.by-version."kerberos"."0.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "mongodb" ];
   };
-  "mongodb" = self.by-version."mongodb"."1.4.0-rc7";
+  "mongodb" = self.by-version."mongodb"."1.4.0-rc8";
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
   by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
@@ -10029,6 +11090,8 @@
     ];
     passthru.names = [ "negotiator" ];
   };
+  by-spec."negotiator"."~0.3.0" =
+    self.by-version."negotiator"."0.3.0";
   by-spec."net-ping"."1.1.7" =
     self.by-version."net-ping"."1.1.7";
   by-version."net-ping"."1.1.7" = lib.makeOverridable self.buildNodePackage {
@@ -10134,7 +11197,7 @@
       self.by-version."semver"."2.1.0"
       self.by-version."sprintf"."0.1.3"
       self.by-version."temp"."0.6.0"
-      self.by-version."wrench"."1.5.7"
+      self.by-version."wrench"."1.5.8"
       self.by-version."uglify-js"."2.3.6"
       self.by-version."xmldom"."0.1.19"
     ];
@@ -10164,6 +11227,39 @@
   };
   "node-expat" = self.by-version."node-expat"."2.1.4";
   by-spec."node-gyp"."*" =
+    self.by-version."node-gyp"."0.13.0";
+  by-version."node-gyp"."0.13.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-gyp-0.13.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.13.0.tgz";
+        name = "node-gyp-0.13.0.tgz";
+        sha1 = "84e216991a64ce5f03d50c95518bd72ca9e10f1e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."node-gyp" or []);
+    deps = [
+      self.by-version."glob"."3.2.9"
+      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."fstream"."0.1.25"
+      self.by-version."minimatch"."0.2.14"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."nopt"."2.2.0"
+      self.by-version."npmlog"."0.0.6"
+      self.by-version."osenv"."0.0.3"
+      self.by-version."request"."2.34.0"
+      self.by-version."rimraf"."2.2.6"
+      self.by-version."semver"."2.2.1"
+      self.by-version."tar"."0.1.19"
+      self.by-version."which"."1.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "node-gyp" ];
+  };
+  "node-gyp" = self.by-version."node-gyp"."0.13.0";
+  by-spec."node-gyp"."~0.12.2" =
     self.by-version."node-gyp"."0.12.2";
   by-version."node-gyp"."0.12.2" = lib.makeOverridable self.buildNodePackage {
     name = "node-gyp-0.12.2";
@@ -10177,7 +11273,7 @@
     buildInputs =
       (self.nativeDeps."node-gyp" or []);
     deps = [
-      self.by-version."glob"."3.2.8"
+      self.by-version."glob"."3.2.9"
       self.by-version."graceful-fs"."2.0.2"
       self.by-version."fstream"."0.1.25"
       self.by-version."minimatch"."0.2.14"
@@ -10195,9 +11291,6 @@
     ];
     passthru.names = [ "node-gyp" ];
   };
-  "node-gyp" = self.by-version."node-gyp"."0.12.2";
-  by-spec."node-gyp"."~0.12.2" =
-    self.by-version."node-gyp"."0.12.2";
   by-spec."node-inspector"."*" =
     self.by-version."node-inspector"."0.7.0";
   by-version."node-inspector"."0.7.0" = lib.makeOverridable self.buildNodePackage {
@@ -10214,7 +11307,7 @@
     deps = [
       self.by-version."express"."3.4.8"
       self.by-version."async"."0.2.10"
-      self.by-version."glob"."3.2.8"
+      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"
@@ -10438,7 +11531,7 @@
       (self.nativeDeps."nodemailer" or []);
     deps = [
       self.by-version."mailcomposer"."0.2.8"
-      self.by-version."simplesmtp"."0.3.21"
+      self.by-version."simplesmtp"."0.3.22"
       self.by-version."optimist"."0.6.1"
     ];
     peerDependencies = [
@@ -10657,7 +11750,7 @@
       self.by-version."text-table"."0.2.0"
       self.by-version."ansicolors"."0.3.2"
       self.by-version."ansistyles"."0.1.3"
-      self.by-version."path-is-inside"."1.0.0"
+      self.by-version."path-is-inside"."1.0.1"
       self.by-version."columnify"."0.1.2"
       self.by-version."npm-install-checks"."1.0.0"
     ];
@@ -10744,47 +11837,21 @@
     ];
     passthru.names = [ "npm-registry-client" ];
   };
-  by-spec."npm-registry-client"."~0.3.3" =
-    self.by-version."npm-registry-client"."0.3.6";
-  by-version."npm-registry-client"."0.3.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npm-registry-client-0.3.6";
+  by-spec."npm-registry-client"."~0.4.4" =
+    self.by-version."npm-registry-client"."0.4.4";
+  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 {
+    name = "node-npm-user-validate-0.0.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.6.tgz";
-        name = "npm-registry-client-0.3.6.tgz";
-        sha1 = "c48a2a03643769acc49672860f7920ec6bffac6e";
+        url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz";
+        name = "npm-user-validate-0.0.3.tgz";
+        sha1 = "818eca4312d13da648f9bc1d7f80bb4f151e0c2e";
       })
     ];
     buildInputs =
-      (self.nativeDeps."npm-registry-client" or []);
-    deps = [
-      self.by-version."request"."2.34.0"
-      self.by-version."graceful-fs"."2.0.2"
-      self.by-version."semver"."2.2.1"
-      self.by-version."slide"."1.1.5"
-      self.by-version."chownr"."0.0.1"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."retry"."0.6.0"
-      self.by-version."npmlog"."0.0.6"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "npm-registry-client" ];
-  };
-  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 {
-    name = "node-npm-user-validate-0.0.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz";
-        name = "npm-user-validate-0.0.3.tgz";
-        sha1 = "818eca4312d13da648f9bc1d7f80bb4f151e0c2e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npm-user-validate" or []);
+      (self.nativeDeps."npm-user-validate" or []);
     deps = [
     ];
     peerDependencies = [
@@ -10812,7 +11879,7 @@
       self.by-version."tar"."0.1.17"
       self.by-version."temp"."0.6.0"
       self.by-version."fs.extra"."1.2.1"
-      self.by-version."findit"."1.1.0"
+      self.by-version."findit"."1.1.1"
     ];
     peerDependencies = [
     ];
@@ -10900,6 +11967,8 @@
     ];
     passthru.names = [ "npmconf" ];
   };
+  by-spec."npmconf"."~0.1.13" =
+    self.by-version."npmconf"."0.1.13";
   by-spec."npmconf"."~0.1.2" =
     self.by-version."npmconf"."0.1.13";
   by-spec."npmlog"."*" =
@@ -11294,6 +12363,8 @@
     self.by-version."optimist"."0.3.7";
   by-spec."optimist"."~0.6.0" =
     self.by-version."optimist"."0.6.1";
+  by-spec."optimist"."~0.6.1" =
+    self.by-version."optimist"."0.6.1";
   by-spec."options".">=0.0.5" =
     self.by-version."options"."0.0.5";
   by-version."options"."0.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -11354,6 +12425,25 @@
   "optparse" = self.by-version."optparse"."1.0.5";
   by-spec."optparse".">= 1.0.3" =
     self.by-version."optparse"."1.0.5";
+  by-spec."os-browserify"."~0.1.1" =
+    self.by-version."os-browserify"."0.1.1";
+  by-version."os-browserify"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-os-browserify-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/os-browserify/-/os-browserify-0.1.1.tgz";
+        name = "os-browserify-0.1.1.tgz";
+        sha1 = "c1c6b8b27be18cb09da7fa87476e0bcf3b465cbe";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."os-browserify" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "os-browserify" ];
+  };
   by-spec."osenv"."0" =
     self.by-version."osenv"."0.0.3";
   by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -11417,6 +12507,27 @@
     ];
     passthru.names = [ "p-throttler" ];
   };
+  by-spec."parents"."0.0.2" =
+    self.by-version."parents"."0.0.2";
+  by-version."parents"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "parents-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/parents/-/parents-0.0.2.tgz";
+        name = "parents-0.0.2.tgz";
+        sha1 = "67147826e497d40759aaf5ba4c99659b6034d302";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."parents" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "parents" ];
+  };
+  by-spec."parents"."~0.0.1" =
+    self.by-version."parents"."0.0.2";
   by-spec."passport"."*" =
     self.by-version."passport"."0.2.0";
   by-version."passport"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -11460,10 +12571,10 @@
     ];
     passthru.names = [ "passport" ];
   };
-  by-spec."passport"."~0.1.18" =
-    self.by-version."passport"."0.1.18";
   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"."*" =
     self.by-version."passport-http"."0.2.2";
   by-version."passport-http"."0.2.2" = lib.makeOverridable self.buildNodePackage {
@@ -11529,15 +12640,34 @@
     ];
     passthru.names = [ "passport-strategy" ];
   };
+  by-spec."path-browserify"."~0.0.0" =
+    self.by-version."path-browserify"."0.0.0";
+  by-version."path-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-path-browserify-0.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz";
+        name = "path-browserify-0.0.0.tgz";
+        sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."path-browserify" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "path-browserify" ];
+  };
   by-spec."path-is-inside"."~1.0.0" =
-    self.by-version."path-is-inside"."1.0.0";
-  by-version."path-is-inside"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-path-is-inside-1.0.0";
+    self.by-version."path-is-inside"."1.0.1";
+  by-version."path-is-inside"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-path-is-inside-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.0.tgz";
-        name = "path-is-inside-1.0.0.tgz";
-        sha1 = "8ec1c42a4c1a039e3e75f6e9e6029bd0c699016e";
+        url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz";
+        name = "path-is-inside-1.0.1.tgz";
+        sha1 = "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89";
       })
     ];
     buildInputs =
@@ -11714,6 +12844,44 @@
     ];
     passthru.names = [ "posix-getopt" ];
   };
+  by-spec."pretty-bytes"."^0.1.0" =
+    self.by-version."pretty-bytes"."0.1.0";
+  by-version."pretty-bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "pretty-bytes-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.0.tgz";
+        name = "pretty-bytes-0.1.0.tgz";
+        sha1 = "2cad1cdd7838fe59018ae5e0ccf7cae741942f8e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."pretty-bytes" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "pretty-bytes" ];
+  };
+  by-spec."process"."~0.5.1" =
+    self.by-version."process"."0.5.2";
+  by-version."process"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-process-0.5.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/process/-/process-0.5.2.tgz";
+        name = "process-0.5.2.tgz";
+        sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf";
+      })
+    ];
+    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 {
@@ -11877,6 +13045,25 @@
     ];
     passthru.names = [ "punycode" ];
   };
+  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 {
+    name = "node-punycode-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/punycode/-/punycode-1.0.0.tgz";
+        name = "punycode-1.0.0.tgz";
+        sha1 = "ce9e6c6e9c1db5827174fceb12ff4938700a1bd3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."punycode" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "punycode" ];
+  };
   by-spec."punycode"."~1.2.3" =
     self.by-version."punycode"."1.2.4";
   by-spec."q".">= 0.0.1" =
@@ -12064,6 +13251,44 @@
     self.by-version."qs"."0.5.6";
   by-spec."qs"."~0.6.0" =
     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 {
+    name = "node-querystring-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/querystring/-/querystring-0.1.0.tgz";
+        name = "querystring-0.1.0.tgz";
+        sha1 = "cb76a26cda0a10a94163fcdb3e132827f04b7b10";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."querystring" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "querystring" ];
+  };
+  by-spec."querystring"."https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz" =
+    self.by-version."querystring"."0.2.0";
+  by-version."querystring"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-querystring-0.2.0";
+    src = [
+      (fetchurl {
+        url = "https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz";
+        name = "querystring-0.2.0.tgz";
+        sha256 = "9476079402605957bae231ea3ec5ae83b454b2de68ddaa3450096821996be8f5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."querystring" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "querystring" ];
+  };
   by-spec."rai"."~0.1" =
     self.by-version."rai"."0.1.9";
   by-version."rai"."0.1.9" = lib.makeOverridable self.buildNodePackage {
@@ -12102,7 +13327,7 @@
     ];
     passthru.names = [ "range-parser" ];
   };
-  by-spec."range-parser"."~1.0.0" =
+  by-spec."range-parser"."1.0.0" =
     self.by-version."range-parser"."1.0.0";
   by-version."range-parser"."1.0.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-range-parser-1.0.0";
@@ -12121,7 +13346,9 @@
     ];
     passthru.names = [ "range-parser" ];
   };
-  by-spec."raven"."~0.6.0" =
+  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";
@@ -12244,7 +13471,7 @@
     ];
     passthru.names = [ "rc" ];
   };
-  by-spec."rc"."~0.3.2" =
+  by-spec."rc"."~0.3.4" =
     self.by-version."rc"."0.3.4";
   by-spec."read"."1" =
     self.by-version."read"."1.0.5";
@@ -12332,7 +13559,7 @@
     buildInputs =
       (self.nativeDeps."read-package-json" or []);
     deps = [
-      self.by-version."glob"."3.2.8"
+      self.by-version."glob"."3.2.9"
       self.by-version."lru-cache"."2.5.0"
       self.by-version."normalize-package-data"."0.2.12"
       self.by-version."graceful-fs"."2.0.2"
@@ -12438,14 +13665,14 @@
     passthru.names = [ "readline2" ];
   };
   by-spec."redeyed"."~0.4.0" =
-    self.by-version."redeyed"."0.4.2";
-  by-version."redeyed"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-redeyed-0.4.2";
+    self.by-version."redeyed"."0.4.4";
+  by-version."redeyed"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-redeyed-0.4.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.2.tgz";
-        name = "redeyed-0.4.2.tgz";
-        sha1 = "f0133b990cb972bdbcf2d2dce0aec36595f419bc";
+        url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.4.tgz";
+        name = "redeyed-0.4.4.tgz";
+        sha1 = "37e990a6f2b21b2a11c2e6a48fd4135698cba97f";
       })
     ];
     buildInputs =
@@ -12732,7 +13959,7 @@
     ];
     passthru.names = [ "request" ];
   };
-  by-spec."request".">=2.12.0" =
+  by-spec."request".">=2.33.0" =
     self.by-version."request"."2.34.0";
   by-spec."request"."~2" =
     self.by-version."request"."2.34.0";
@@ -12971,7 +14198,7 @@
     ];
     passthru.names = [ "resolve" ];
   };
-  by-spec."resolve"."0.6.x" =
+  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";
@@ -12990,7 +14217,9 @@
     ];
     passthru.names = [ "resolve" ];
   };
-  by-spec."resolve"."~0.3.1" =
+  by-spec."resolve"."0.6.x" =
+    self.by-version."resolve"."0.6.1";
+  by-spec."resolve"."~0.3.0" =
     self.by-version."resolve"."0.3.1";
   by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-resolve-0.3.1";
@@ -13009,6 +14238,12 @@
     ];
     passthru.names = [ "resolve" ];
   };
+  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.1";
+  by-spec."resolve"."~0.6.1" =
+    self.by-version."resolve"."0.6.1";
   by-spec."restify"."2.4.1" =
     self.by-version."restify"."2.4.1";
   by-version."restify"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -13106,6 +14341,29 @@
     ];
     passthru.names = [ "revalidator" ];
   };
+  by-spec."rfile"."~1.0" =
+    self.by-version."rfile"."1.0.0";
+  by-version."rfile"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-rfile-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz";
+        name = "rfile-1.0.0.tgz";
+        sha1 = "59708cf90ca1e74c54c3cfc5c36fdb9810435261";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rfile" or []);
+    deps = [
+      self.by-version."callsite"."1.0.0"
+      self.by-version."resolve"."0.3.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "rfile" ];
+  };
+  by-spec."rfile"."~1.0.0" =
+    self.by-version."rfile"."1.0.0";
   by-spec."rimraf"."1.x.x" =
     self.by-version."rimraf"."1.0.9";
   by-version."rimraf"."1.0.9" = lib.makeOverridable self.buildNodePackage {
@@ -13196,6 +14454,29 @@
     self.by-version."rimraf"."2.2.6";
   by-spec."rimraf"."~2.2.5" =
     self.by-version."rimraf"."2.2.6";
+  by-spec."rimraf"."~2.2.6" =
+    self.by-version."rimraf"."2.2.6";
+  by-spec."ruglify"."~1.0.0" =
+    self.by-version."ruglify"."1.0.0";
+  by-version."ruglify"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ruglify-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz";
+        name = "ruglify-1.0.0.tgz";
+        sha1 = "dc8930e2a9544a274301cc9972574c0d0986b675";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ruglify" or []);
+    deps = [
+      self.by-version."rfile"."1.0.0"
+      self.by-version."uglify-js"."2.2.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ruglify" ];
+  };
   by-spec."s3http"."*" =
     self.by-version."s3http"."0.0.5";
   by-version."s3http"."0.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -13527,6 +14808,8 @@
     ];
     passthru.names = [ "send" ];
   };
+  by-spec."send"."0.2.0" =
+    self.by-version."send"."0.2.0";
   by-spec."sequence"."2.2.1" =
     self.by-version."sequence"."2.2.1";
   by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -13569,6 +14852,44 @@
     ];
     passthru.names = [ "sha" ];
   };
+  by-spec."shallow-copy"."0.0.1" =
+    self.by-version."shallow-copy"."0.0.1";
+  by-version."shallow-copy"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-shallow-copy-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz";
+        name = "shallow-copy-0.0.1.tgz";
+        sha1 = "415f42702d73d810330292cc5ee86eae1a11a170";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."shallow-copy" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "shallow-copy" ];
+  };
+  by-spec."shell-quote"."~0.0.1" =
+    self.by-version."shell-quote"."0.0.1";
+  by-version."shell-quote"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-shell-quote-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz";
+        name = "shell-quote-0.0.1.tgz";
+        sha1 = "1a41196f3c0333c482323593d6886ecf153dd986";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."shell-quote" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "shell-quote" ];
+  };
   by-spec."shelljs"."0.1.x" =
     self.by-version."shelljs"."0.1.4";
   by-version."shelljs"."0.1.4" = lib.makeOverridable self.buildNodePackage {
@@ -13610,14 +14931,14 @@
     passthru.names = [ "shelljs" ];
   };
   by-spec."should"."*" =
-    self.by-version."should"."3.1.2";
-  by-version."should"."3.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-should-3.1.2";
+    self.by-version."should"."3.1.3";
+  by-version."should"."3.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-should-3.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/should/-/should-3.1.2.tgz";
-        name = "should-3.1.2.tgz";
-        sha1 = "4bc206253d736c2fb902153477982c2b2e988c02";
+        url = "http://registry.npmjs.org/should/-/should-3.1.3.tgz";
+        name = "should-3.1.3.tgz";
+        sha1 = "900ff485c1497f873de0aa3bfcf9d8b913fdda24";
       })
     ];
     buildInputs =
@@ -13628,7 +14949,7 @@
     ];
     passthru.names = [ "should" ];
   };
-  "should" = self.by-version."should"."3.1.2";
+  "should" = self.by-version."should"."3.1.3";
   by-spec."sigmund"."~1.0.0" =
     self.by-version."sigmund"."1.0.0";
   by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -13691,14 +15012,14 @@
     passthru.names = [ "simple-lru-cache" ];
   };
   by-spec."simplesmtp".">= 0.1.22" =
-    self.by-version."simplesmtp"."0.3.21";
-  by-version."simplesmtp"."0.3.21" = lib.makeOverridable self.buildNodePackage {
-    name = "node-simplesmtp-0.3.21";
+    self.by-version."simplesmtp"."0.3.22";
+  by-version."simplesmtp"."0.3.22" = lib.makeOverridable self.buildNodePackage {
+    name = "node-simplesmtp-0.3.22";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.21.tgz";
-        name = "simplesmtp-0.3.21.tgz";
-        sha1 = "79aa14d72a915bb5853ff53a8a44b0823fbe1a8f";
+        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.22.tgz";
+        name = "simplesmtp-0.3.22.tgz";
+        sha1 = "5bef8fef60e7e3c4ff57117e3502190447de11e5";
       })
     ];
     buildInputs =
@@ -13997,14 +15318,14 @@
   };
   "sockjs" = self.by-version."sockjs"."0.3.8";
   by-spec."source-map"."*" =
-    self.by-version."source-map"."0.1.32";
-  by-version."source-map"."0.1.32" = lib.makeOverridable self.buildNodePackage {
-    name = "node-source-map-0.1.32";
+    self.by-version."source-map"."0.1.33";
+  by-version."source-map"."0.1.33" = lib.makeOverridable self.buildNodePackage {
+    name = "node-source-map-0.1.33";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz";
-        name = "source-map-0.1.32.tgz";
-        sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266";
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.33.tgz";
+        name = "source-map-0.1.33.tgz";
+        sha1 = "c659297a73af18c073b0aa2e7cc91e316b5c570c";
       })
     ];
     buildInputs =
@@ -14016,17 +15337,17 @@
     ];
     passthru.names = [ "source-map" ];
   };
-  "source-map" = self.by-version."source-map"."0.1.32";
+  "source-map" = self.by-version."source-map"."0.1.33";
   by-spec."source-map"."0.1.x" =
-    self.by-version."source-map"."0.1.32";
+    self.by-version."source-map"."0.1.33";
   by-spec."source-map".">= 0.1.2" =
-    self.by-version."source-map"."0.1.32";
+    self.by-version."source-map"."0.1.33";
   by-spec."source-map"."~0.1.30" =
-    self.by-version."source-map"."0.1.32";
+    self.by-version."source-map"."0.1.33";
   by-spec."source-map"."~0.1.31" =
-    self.by-version."source-map"."0.1.32";
+    self.by-version."source-map"."0.1.33";
   by-spec."source-map"."~0.1.7" =
-    self.by-version."source-map"."0.1.32";
+    self.by-version."source-map"."0.1.33";
   by-spec."spdy"."1.7.1" =
     self.by-version."spdy"."1.7.1";
   by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage {
@@ -14088,27 +15409,6 @@
     ];
     passthru.names = [ "ssh-agent" ];
   };
-  by-spec."ssh2"."~0.2.16" =
-    self.by-version."ssh2"."0.2.17";
-  by-version."ssh2"."0.2.17" = lib.makeOverridable self.buildNodePackage {
-    name = "node-ssh2-0.2.17";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.17.tgz";
-        name = "ssh2-0.2.17.tgz";
-        sha1 = "ce7773e4c7c4f78a8ab19227dcc3afae0b149291";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ssh2" or []);
-    deps = [
-      self.by-version."streamsearch"."0.1.2"
-      self.by-version."asn1"."0.1.11"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "ssh2" ];
-  };
   by-spec."stack-trace"."0.0.7" =
     self.by-version."stack-trace"."0.0.7";
   by-version."stack-trace"."0.0.7" = lib.makeOverridable self.buildNodePackage {
@@ -14210,6 +15510,27 @@
     passthru.names = [ "statsd-librato-backend" ];
   };
   "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.2";
+  by-spec."stream-browserify"."~0.1.0" =
+    self.by-version."stream-browserify"."0.1.3";
+  by-version."stream-browserify"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-stream-browserify-0.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-0.1.3.tgz";
+        name = "stream-browserify-0.1.3.tgz";
+        sha1 = "95cf1b369772e27adaf46352265152689c6c4be9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."stream-browserify" or []);
+    deps = [
+      self.by-version."inherits"."2.0.1"
+      self.by-version."process"."0.5.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "stream-browserify" ];
+  };
   by-spec."stream-combiner"."~0.0.2" =
     self.by-version."stream-combiner"."0.0.4";
   by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -14291,43 +15612,43 @@
     passthru.names = [ "stream-splitter-transform" ];
   };
   "stream-splitter-transform" = self.by-version."stream-splitter-transform"."0.0.4";
-  by-spec."streamsearch"."0.1.2" =
-    self.by-version."streamsearch"."0.1.2";
-  by-version."streamsearch"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-streamsearch-0.1.2";
+  by-spec."string"."1.6.1" =
+    self.by-version."string"."1.6.1";
+  by-version."string"."1.6.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-string-1.6.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
-        name = "streamsearch-0.1.2.tgz";
-        sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
+        url = "http://registry.npmjs.org/string/-/string-1.6.1.tgz";
+        name = "string-1.6.1.tgz";
+        sha1 = "eabe0956da7a8291c6de7486f7b35e58d031cd55";
       })
     ];
     buildInputs =
-      (self.nativeDeps."streamsearch" or []);
+      (self.nativeDeps."string" or []);
     deps = [
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "streamsearch" ];
+    passthru.names = [ "string" ];
   };
-  by-spec."string"."1.6.1" =
-    self.by-version."string"."1.6.1";
-  by-version."string"."1.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-string-1.6.1";
+  by-spec."string_decoder"."~0.0.0" =
+    self.by-version."string_decoder"."0.0.1";
+  by-version."string_decoder"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-string_decoder-0.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/string/-/string-1.6.1.tgz";
-        name = "string-1.6.1.tgz";
-        sha1 = "eabe0956da7a8291c6de7486f7b35e58d031cd55";
+        url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.0.1.tgz";
+        name = "string_decoder-0.0.1.tgz";
+        sha1 = "f5472d0a8d1650ec823752d24e6fd627b39bf141";
       })
     ];
     buildInputs =
-      (self.nativeDeps."string" or []);
+      (self.nativeDeps."string_decoder" or []);
     deps = [
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "string" ];
+    passthru.names = [ "string_decoder" ];
   };
   by-spec."string_decoder"."~0.10.x" =
     self.by-version."string_decoder"."0.10.25";
@@ -14407,6 +15728,31 @@
     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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stylus/-/stylus-0.42.3.tgz";
+        name = "stylus-0.42.3.tgz";
+        sha1 = "23e8b3e71eb7f60bc4a657de498c8feb9c366c32";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."stylus" or []);
+    deps = [
+      self.by-version."css-parse"."1.7.0"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."debug"."0.7.4"
+      self.by-version."sax"."0.5.8"
+      self.by-version."glob"."3.2.9"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "stylus" ];
+  };
+  "stylus" = self.by-version."stylus"."0.42.3";
+  by-spec."stylus"."0.42.2" =
     self.by-version."stylus"."0.42.2";
   by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage {
     name = "stylus-0.42.2";
@@ -14424,15 +15770,32 @@
       self.by-version."mkdirp"."0.3.5"
       self.by-version."debug"."0.7.4"
       self.by-version."sax"."0.5.8"
-      self.by-version."glob"."3.2.8"
+      self.by-version."glob"."3.2.9"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "stylus" ];
   };
-  "stylus" = self.by-version."stylus"."0.42.2";
-  by-spec."stylus"."0.42.2" =
-    self.by-version."stylus"."0.42.2";
+  by-spec."subarg"."0.0.1" =
+    self.by-version."subarg"."0.0.1";
+  by-version."subarg"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-subarg-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz";
+        name = "subarg-0.0.1.tgz";
+        sha1 = "3d56b07dacfbc45bbb63f7672b43b63e46368e3a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."subarg" or []);
+    deps = [
+      self.by-version."minimist"."0.0.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "subarg" ];
+  };
   by-spec."sudo-block"."~0.2.0" =
     self.by-version."sudo-block"."0.2.1";
   by-version."sudo-block"."0.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -14591,6 +15954,48 @@
   };
   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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.1.0.tgz";
+        name = "syntax-error-0.1.0.tgz";
+        sha1 = "8cb515e730fe4f19d3a887035f8630e6494aac65";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."syntax-error" or []);
+    deps = [
+      self.by-version."esprima-six"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "syntax-error" ];
+  };
+  by-spec."tape"."~0.2.2" =
+    self.by-version."tape"."0.2.2";
+  by-version."tape"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "tape-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tape/-/tape-0.2.2.tgz";
+        name = "tape-0.2.2.tgz";
+        sha1 = "64ccfa4b7ecf4a0060007e61716d424781671637";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tape" or []);
+    deps = [
+      self.by-version."jsonify"."0.0.0"
+      self.by-version."deep-equal"."0.0.0"
+      self.by-version."defined"."0.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tape" ];
+  };
   by-spec."tar"."*" =
     self.by-version."tar"."0.1.19";
   by-version."tar"."0.1.19" = lib.makeOverridable self.buildNodePackage {
@@ -14645,6 +16050,27 @@
   by-spec."tar"."~0.1.19" =
     self.by-version."tar"."0.1.19";
   by-spec."temp"."*" =
+    self.by-version."temp"."0.7.0";
+  by-version."temp"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-temp-0.7.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/temp/-/temp-0.7.0.tgz";
+        name = "temp-0.7.0.tgz";
+        sha1 = "d34bdc8e7f955da2a6a473fea07ad601d68ba78f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."temp" or []);
+    deps = [
+      self.by-version."rimraf"."2.2.6"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "temp" ];
+  };
+  "temp" = self.by-version."temp"."0.7.0";
+  by-spec."temp"."0.6.0" =
     self.by-version."temp"."0.6.0";
   by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-temp-0.6.0";
@@ -14665,9 +16091,6 @@
     ];
     passthru.names = [ "temp" ];
   };
-  "temp" = self.by-version."temp"."0.6.0";
-  by-spec."temp"."0.6.0" =
-    self.by-version."temp"."0.6.0";
   by-spec."temp"."~0.5.1" =
     self.by-version."temp"."0.5.1";
   by-version."temp"."0.5.1" = lib.makeOverridable self.buildNodePackage {
@@ -14690,6 +16113,8 @@
   };
   by-spec."temp"."~0.6.0" =
     self.by-version."temp"."0.6.0";
+  by-spec."temp"."~0.7.0" =
+    self.by-version."temp"."0.7.0";
   by-spec."tempfile"."~0.1.2" =
     self.by-version."tempfile"."0.1.2";
   by-version."tempfile"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -14767,6 +16192,25 @@
     ];
     passthru.names = [ "throttleit" ];
   };
+  by-spec."through"."~2.2.7" =
+    self.by-version."through"."2.2.7";
+  by-version."through"."2.2.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-through-2.2.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/through/-/through-2.2.7.tgz";
+        name = "through-2.2.7.tgz";
+        sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."through" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "through" ];
+  };
   by-spec."through"."~2.3.4" =
     self.by-version."through"."2.3.4";
   by-version."through"."2.3.4" = lib.makeOverridable self.buildNodePackage {
@@ -14807,6 +16251,26 @@
     ];
     passthru.names = [ "through2" ];
   };
+  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 {
+    name = "node-timers-browserify-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.1.tgz";
+        name = "timers-browserify-1.0.1.tgz";
+        sha1 = "7c93257b543cb1e3003d3663b57d560ee1d27057";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."timers-browserify" or []);
+    deps = [
+      self.by-version."process"."0.5.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "timers-browserify" ];
+  };
   by-spec."timespan"."~2.3.0" =
     self.by-version."timespan"."2.3.0";
   by-version."timespan"."2.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -14893,7 +16357,7 @@
       self.by-version."sprintf"."0.1.3"
       self.by-version."temp"."0.6.0"
       self.by-version."winston"."0.6.2"
-      self.by-version."wrench"."1.5.7"
+      self.by-version."wrench"."1.5.8"
     ];
     peerDependencies = [
     ];
@@ -15039,6 +16503,25 @@
     ];
     passthru.names = [ "truncate" ];
   };
+  by-spec."tty-browserify"."~0.0.0" =
+    self.by-version."tty-browserify"."0.0.0";
+  by-version."tty-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-tty-browserify-0.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz";
+        name = "tty-browserify-0.0.0.tgz";
+        sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tty-browserify" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tty-browserify" ];
+  };
   by-spec."tunnel-agent"."~0.2.0" =
     self.by-version."tunnel-agent"."0.2.0";
   by-version."tunnel-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -15096,6 +16579,26 @@
     ];
     passthru.names = [ "type-detect" ];
   };
+  by-spec."type-is"."1.0.0" =
+    self.by-version."type-is"."1.0.0";
+  by-version."type-is"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-type-is-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/type-is/-/type-is-1.0.0.tgz";
+        name = "type-is-1.0.0.tgz";
+        sha1 = "4ff424e97349a1ee1910b4bfc488595ecdc443fc";
+      })
+    ];
+    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 {
@@ -15115,6 +16618,25 @@
     ];
     passthru.names = [ "typechecker" ];
   };
+  by-spec."typedarray"."~0.0.5" =
+    self.by-version."typedarray"."0.0.5";
+  by-version."typedarray"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-typedarray-0.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.5.tgz";
+        name = "typedarray-0.0.5.tgz";
+        sha1 = "c4158fcd96c8ef91ef03cc72584c95e032877664";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."typedarray" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "typedarray" ];
+  };
   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 {
@@ -15149,7 +16671,30 @@
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.32"
+      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.4.0" =
+    self.by-version."uglify-js"."2.4.12";
+  by-version."uglify-js"."2.4.12" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-2.4.12";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.12.tgz";
+        name = "uglify-js-2.4.12.tgz";
+        sha1 = "2354d9659f85330c1e3e2910f8acd77fe14bb4a8";
+      })
+    ];
+    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"
     ];
@@ -15176,7 +16721,7 @@
     ];
     passthru.names = [ "uglify-js" ];
   };
-  by-spec."uglify-js"."~2.2.5" =
+  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 {
     name = "uglify-js-2.2.5";
@@ -15190,13 +16735,15 @@
     buildInputs =
       (self.nativeDeps."uglify-js" or []);
     deps = [
-      self.by-version."source-map"."0.1.32"
+      self.by-version."source-map"."0.1.33"
       self.by-version."optimist"."0.3.7"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "uglify-js" ];
   };
+  by-spec."uglify-js"."~2.2.5" =
+    self.by-version."uglify-js"."2.2.5";
   by-spec."uglify-js"."~2.3" =
     self.by-version."uglify-js"."2.3.6";
   by-version."uglify-js"."2.3.6" = lib.makeOverridable self.buildNodePackage {
@@ -15212,7 +16759,7 @@
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.32"
+      self.by-version."source-map"."0.1.33"
       self.by-version."optimist"."0.3.7"
     ];
     peerDependencies = [
@@ -15223,27 +16770,8 @@
     self.by-version."uglify-js"."2.3.6";
   by-spec."uglify-js"."~2.4.0" =
     self.by-version."uglify-js"."2.4.12";
-  by-version."uglify-js"."2.4.12" = lib.makeOverridable self.buildNodePackage {
-    name = "uglify-js-2.4.12";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.12.tgz";
-        name = "uglify-js-2.4.12.tgz";
-        sha1 = "2354d9659f85330c1e3e2910f8acd77fe14bb4a8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uglify-js" or []);
-    deps = [
-      self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.32"
-      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.4.12" =
+    self.by-version."uglify-js"."2.4.12";
   by-spec."uglify-to-browserify"."~1.0.0" =
     self.by-version."uglify-to-browserify"."1.0.2";
   by-version."uglify-to-browserify"."1.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -15301,6 +16829,29 @@
     ];
     passthru.names = [ "uid2" ];
   };
+  by-spec."umd"."~2.0.0" =
+    self.by-version."umd"."2.0.0";
+  by-version."umd"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "umd-2.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/umd/-/umd-2.0.0.tgz";
+        name = "umd-2.0.0.tgz";
+        sha1 = "749683b0d514728ae0e1b6195f5774afc0ad4f8f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."umd" or []);
+    deps = [
+      self.by-version."rfile"."1.0.0"
+      self.by-version."ruglify"."1.0.0"
+      self.by-version."through"."2.3.4"
+      self.by-version."uglify-js"."2.4.12"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "umd" ];
+  };
   by-spec."underscore"."*" =
     self.by-version."underscore"."1.6.0";
   by-version."underscore"."1.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -15438,14 +16989,14 @@
     passthru.names = [ "unfunk-diff" ];
   };
   by-spec."ungit"."*" =
-    self.by-version."ungit"."0.6.2";
-  by-version."ungit"."0.6.2" = lib.makeOverridable self.buildNodePackage {
-    name = "ungit-0.6.2";
+    self.by-version."ungit"."0.7.1";
+  by-version."ungit"."0.7.1" = lib.makeOverridable self.buildNodePackage {
+    name = "ungit-0.7.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ungit/-/ungit-0.6.2.tgz";
-        name = "ungit-0.6.2.tgz";
-        sha1 = "e1a01531bdd987c27bd9890d973c0a8549f1e191";
+        url = "http://registry.npmjs.org/ungit/-/ungit-0.7.1.tgz";
+        name = "ungit-0.7.1.tgz";
+        sha1 = "9b1b768ecd97a66f7b97b5d7a1b36f29682e2bf7";
       })
     ];
     buildInputs =
@@ -15454,20 +17005,19 @@
       self.by-version."express"."3.4.8"
       self.by-version."superagent"."0.16.0"
       self.by-version."lodash"."2.4.1"
-      self.by-version."temp"."0.6.0"
+      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.9"
-      self.by-version."ssh2"."0.2.17"
+      self.by-version."async"."0.2.10"
       self.by-version."rc"."0.3.4"
       self.by-version."uuid"."1.4.1"
       self.by-version."winston"."0.7.2"
-      self.by-version."passport"."0.1.18"
+      self.by-version."passport"."0.2.0"
       self.by-version."passport-local"."0.1.6"
       self.by-version."semver"."2.2.1"
       self.by-version."forever-monitor"."1.1.0"
       self.by-version."open"."0.0.4"
-      self.by-version."optimist"."0.6.0"
+      self.by-version."optimist"."0.6.1"
       self.by-version."crossroads"."0.12.0"
       self.by-version."signals"."1.0.0"
       self.by-version."hasher"."1.2.0"
@@ -15478,15 +17028,17 @@
       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.3.6"
+      self.by-version."npm-registry-client"."0.4.4"
       self.by-version."npmconf"."0.1.13"
       self.by-version."mkdirp"."0.3.5"
+      self.by-version."less"."1.7.0"
+      self.by-version."browserify"."3.31.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "ungit" ];
   };
-  "ungit" = self.by-version."ungit"."0.6.2";
+  "ungit" = self.by-version."ungit"."0.7.1";
   by-spec."update-notifier"."~0.1.3" =
     self.by-version."update-notifier"."0.1.7";
   by-version."update-notifier"."0.1.7" = lib.makeOverridable self.buildNodePackage {
@@ -15512,6 +17064,27 @@
   };
   by-spec."update-notifier"."~0.1.7" =
     self.by-version."update-notifier"."0.1.7";
+  by-spec."url"."~0.7.9" =
+    self.by-version."url"."0.7.9";
+  by-version."url"."0.7.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-url-0.7.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/url/-/url-0.7.9.tgz";
+        name = "url-0.7.9.tgz";
+        sha1 = "1959b1a8b361fc017b59513a7c7fa9827f5e4ed0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."url" or []);
+    deps = [
+      self.by-version."querystring"."0.1.0"
+      self.by-version."punycode"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "url" ];
+  };
   by-spec."useragent"."~2.0.4" =
     self.by-version."useragent"."2.0.7";
   by-version."useragent"."2.0.7" = lib.makeOverridable self.buildNodePackage {
@@ -15591,6 +17164,26 @@
     ];
     passthru.names = [ "util" ];
   };
+  by-spec."util"."~0.10.1" =
+    self.by-version."util"."0.10.3";
+  by-version."util"."0.10.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-util-0.10.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz";
+        name = "util-0.10.3.tgz";
+        sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."util" or []);
+    deps = [
+      self.by-version."inherits"."2.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "util" ];
+  };
   by-spec."utile"."0.1.x" =
     self.by-version."utile"."0.1.7";
   by-version."utile"."0.1.7" = lib.makeOverridable self.buildNodePackage {
@@ -15647,6 +17240,25 @@
     self.by-version."utile"."0.1.7";
   by-spec."utile"."~0.2.1" =
     self.by-version."utile"."0.2.1";
+  by-spec."utils-merge"."1.0.0" =
+    self.by-version."utils-merge"."1.0.0";
+  by-version."utils-merge"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-utils-merge-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
+        name = "utils-merge-1.0.0.tgz";
+        sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."utils-merge" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "utils-merge" ];
+  };
   by-spec."uuid"."1.4.1" =
     self.by-version."uuid"."1.4.1";
   by-version."uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -15809,6 +17421,26 @@
     passthru.names = [ "view-helpers" ];
   };
   "view-helpers" = self.by-version."view-helpers"."0.1.4";
+  by-spec."vm-browserify"."~0.0.1" =
+    self.by-version."vm-browserify"."0.0.4";
+  by-version."vm-browserify"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-vm-browserify-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz";
+        name = "vm-browserify-0.0.4.tgz";
+        sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."vm-browserify" or []);
+    deps = [
+      self.by-version."indexof"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "vm-browserify" ];
+  };
   by-spec."vows".">=0.5.13" =
     self.by-version."vows"."0.7.0";
   by-version."vows"."0.7.0" = lib.makeOverridable self.buildNodePackage {
@@ -15910,14 +17542,14 @@
     passthru.names = [ "watch" ];
   };
   by-spec."wd"."~0.2.8" =
-    self.by-version."wd"."0.2.10";
-  by-version."wd"."0.2.10" = lib.makeOverridable self.buildNodePackage {
-    name = "wd-0.2.10";
+    self.by-version."wd"."0.2.11";
+  by-version."wd"."0.2.11" = lib.makeOverridable self.buildNodePackage {
+    name = "wd-0.2.11";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wd/-/wd-0.2.10.tgz";
-        name = "wd-0.2.10.tgz";
-        sha1 = "c4ac58eff5f32cc8e79e8f272a4c365c4240a68e";
+        url = "http://registry.npmjs.org/wd/-/wd-0.2.11.tgz";
+        name = "wd-0.2.11.tgz";
+        sha1 = "27889d290facf3d19e050b3c789f2e852ca03f10";
       })
     ];
     buildInputs =
@@ -15936,14 +17568,14 @@
     passthru.names = [ "wd" ];
   };
   by-spec."webdrvr"."*" =
-    self.by-version."webdrvr"."2.39.0-0";
-  by-version."webdrvr"."2.39.0-0" = lib.makeOverridable self.buildNodePackage {
-    name = "webdrvr-2.39.0-0";
+    self.by-version."webdrvr"."2.40.0";
+  by-version."webdrvr"."2.40.0" = lib.makeOverridable self.buildNodePackage {
+    name = "webdrvr-2.40.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.39.0-0.tgz";
-        name = "webdrvr-2.39.0-0.tgz";
-        sha1 = "07b4867993c2d3e35869269cb8fe096e81571e0f";
+        url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.40.0.tgz";
+        name = "webdrvr-2.40.0.tgz";
+        sha1 = "689f5d3fad5008ffc7b273d607eea9dd7d26ca42";
       })
     ];
     buildInputs =
@@ -15961,7 +17593,7 @@
     ];
     passthru.names = [ "webdrvr" ];
   };
-  "webdrvr" = self.by-version."webdrvr"."2.39.0-0";
+  "webdrvr" = self.by-version."webdrvr"."2.40.0";
   by-spec."websocket-driver".">=0.3.0" =
     self.by-version."websocket-driver"."0.3.2";
   by-version."websocket-driver"."0.3.2" = lib.makeOverridable self.buildNodePackage {
@@ -16168,6 +17800,26 @@
     ];
     passthru.names = [ "with" ];
   };
+  by-spec."with"."~3.0.0" =
+    self.by-version."with"."3.0.0";
+  by-version."with"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-with-3.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/with/-/with-3.0.0.tgz";
+        name = "with-3.0.0.tgz";
+        sha1 = "38f5d5859bb974c9dad8812372b51dae4b9594cc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."with" or []);
+    deps = [
+      self.by-version."uglify-js"."2.4.12"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "with" ];
+  };
   by-spec."wordwrap"."0.0.x" =
     self.by-version."wordwrap"."0.0.2";
   by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -16211,14 +17863,14 @@
     passthru.names = [ "wrench" ];
   };
   by-spec."wrench"."~1.5.0" =
-    self.by-version."wrench"."1.5.7";
-  by-version."wrench"."1.5.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-wrench-1.5.7";
+    self.by-version."wrench"."1.5.8";
+  by-version."wrench"."1.5.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-wrench-1.5.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wrench/-/wrench-1.5.7.tgz";
-        name = "wrench-1.5.7.tgz";
-        sha1 = "95fcbb5a35b748ba8e29d755c9490ba69f033819";
+        url = "http://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
+        name = "wrench-1.5.8.tgz";
+        sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
       })
     ];
     buildInputs =
@@ -16230,7 +17882,7 @@
     passthru.names = [ "wrench" ];
   };
   by-spec."wrench"."~1.5.4" =
-    self.by-version."wrench"."1.5.7";
+    self.by-version."wrench"."1.5.8";
   by-spec."ws"."0.4.x" =
     self.by-version."ws"."0.4.31";
   by-version."ws"."0.4.31" = lib.makeOverridable self.buildNodePackage {
@@ -16518,7 +18170,7 @@
       self.by-version."underscore.string"."2.3.3"
       self.by-version."lodash"."1.3.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."glob"."3.2.8"
+      self.by-version."glob"."3.2.9"
       self.by-version."debug"."0.7.4"
       self.by-version."isbinaryfile"."0.1.9"
       self.by-version."dargs"."0.1.0"
@@ -16555,7 +18207,7 @@
       self.by-version."underscore.string"."2.3.3"
       self.by-version."lodash"."2.2.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."glob"."3.2.8"
+      self.by-version."glob"."3.2.9"
       self.by-version."debug"."0.7.4"
       self.by-version."isbinaryfile"."0.1.9"
       self.by-version."dargs"."0.1.0"
@@ -16595,7 +18247,7 @@
       self.by-version."underscore.string"."2.3.3"
       self.by-version."lodash"."2.4.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."glob"."3.2.8"
+      self.by-version."glob"."3.2.9"
       self.by-version."debug"."0.7.4"
       self.by-version."isbinaryfile"."2.0.1"
       self.by-version."dargs"."0.1.0"
@@ -16711,4 +18363,26 @@
     ];
     passthru.names = [ "zlib-browserify" ];
   };
+  by-spec."zlib-browserify"."^0.0.3" =
+    self.by-version."zlib-browserify"."0.0.3";
+  by-version."zlib-browserify"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-zlib-browserify-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.3.tgz";
+        name = "zlib-browserify-0.0.3.tgz";
+        sha1 = "240ccdbfd0203fa842b130deefb1414122c8cc50";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."zlib-browserify" or []);
+    deps = [
+      self.by-version."tape"."0.2.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "zlib-browserify" ];
+  };
+  by-spec."zlib-browserify"."~0.0.3" =
+    self.by-version."zlib-browserify"."0.0.3";
 }
-- 
GitLab


From 8f577c576c6d49a8e8342859cc79c092b5d1f216 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Mar 2014 14:23:05 +0100
Subject: [PATCH 1843/3789] filezilla: use default gnutls instead of vulnerable
 gnutls2

---
 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 b7c9a76e151..a8b4cfaf926 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext
+{ stdenv, fetchurl, dbus, gnutls, wxGTK28, libidn, tinyxml, gettext
 , pkgconfig, xdg_utils, gtk2, sqlite }:
 
 let version = "3.7.3"; in
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite
+    dbus gnutls wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite
   ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From 97d291d040c5e85b88f6c2695123de01de13a5c4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 5 Mar 2014 17:38:22 +0400
Subject: [PATCH 1844/3789] Remove obsolete comment

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40d7b472872..d5dcb45da17 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7515,8 +7515,6 @@ let
   bitcoin = callPackage ../applications/misc/bitcoin { };
 
   bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee {
-    # For some reason, TLS support is broken when using GnuTLS 3.0 (can't
-    # connect to jabber.org, for instance.)
     gnutls = gnutls;
     libotr = libotr_3_2;
   };
-- 
GitLab


From 6572708d3914a07a1c58f6162b999925ee3d695e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Mar 2014 15:20:59 +0100
Subject: [PATCH 1845/3789] Always load the "configs" kernel module

We used to have the configuration of the kernel available in a
somewhat convenient place (/run/booted-system/kernel-modules/config)
but that has disappeared.  So instead just make /proc/configs.gz
available.  It only eats a few kilobytes.
---
 nixos/modules/system/boot/kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 2b075bf6a6d..327f3b7e112 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -159,7 +159,7 @@ in
 
     boot.kernel.sysctl."kernel.printk" = config.boot.consoleLogLevel;
 
-    boot.kernelModules = [ "loop" ];
+    boot.kernelModules = [ "loop" "configs" ];
 
     boot.initrd.availableKernelModules =
       [ # Note: most of these (especially the SATA/PATA modules)
-- 
GitLab


From 5605b256a7030c9169248b9e0e65c21d556d2f44 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Mar 2014 15:23:30 +0100
Subject: [PATCH 1846/3789] nixUnstable: Update to 1.7pre3522_f7e077a

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 33b304eec4c..7f52950aa36 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.7pre3520_1017bd6";
+  name = "nix-1.7pre3522_f7e077a";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/9253720/download/4/${name}.tar.xz";
-    sha256 = "7144ad4b4a7ff77165dc96424366fa28fb1a9e19b4f7c26d123b5f6bccf53d2d";
+    url = "http://hydra.nixos.org/build/9342392/download/4/${name}.tar.xz";
+    sha256 = "f1fce2cc7bde1a7bd5d8d491153ed805542970768211ebb7b121d9630033afc2";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];
-- 
GitLab


From 41c662dcf68ce41c64ceb73a2f21a8aac09eb41e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Mar 2014 15:32:15 +0100
Subject: [PATCH 1847/3789] yap: update from 6.2.2 to 6.3.3

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

diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index a29c0de65b8..af604792f83 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, readline, gmp, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "6.2.2";
+  version = "6.3.3";
   name = "yap-${version}";
 
   src = fetchurl {
     url = "http://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz";
-    sha256 = "0l6p0vy667wws64cvwf74ssl6h9gypjzrsl3b2d32hs422186pzi";
+    sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf";
   };
 
   buildInputs = [ readline gmp zlib ];
-- 
GitLab


From a1439ae0c282e1c4e95269605f0be7c45b9772a4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Mar 2014 15:32:15 +0100
Subject: [PATCH 1848/3789] swiProlog: update from 6.6.1 to 6.6.2

---
 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 61655e1bd1f..aa027401b4d 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.1";
+  version = "6.6.2";
 in
 stdenv.mkDerivation {
   name = "swi-prolog-${version}";
 
   src = fetchurl {
     url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz";
-    sha256 = "033b7z60jd1907p9idaa3xzbid2aadhqcdwsa2g9c1c7q8fj1gy8";
+    sha256 = "1kdnc1r5c4320v5s6axk6w0jnqbkza295hdi9s5kyd8r78v6x6g4";
   };
 
   buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama
-- 
GitLab


From a2f90518a9acc6835e6a7d7bf76a1c4ef4b0f07c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Mar 2014 15:32:15 +0100
Subject: [PATCH 1849/3789] cppcheck: update from 1.63 to 1.64

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

diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 5b2de20e33f..b3769245bbe 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -4,14 +4,14 @@
 
 let
   name = "cppcheck";
-  version = "1.63";
+  version = "1.64";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2";
-    sha256 = "0r10z44qydqxxxlxiggl2nzksd3gkb7bp784dfmpnnr1jd2zqjwj";
+    sha256 = "0n2hrg99rsp77b3plpip315pyk0x4gh8gljs9z3iwcbcg14mliff";
   };
 
   configurePhase = "makeFlags=PREFIX=$out";
-- 
GitLab


From f1a707fc749407f923f9b1a2ea7b4ea28d47c005 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Mar 2014 15:40:08 +0100
Subject: [PATCH 1850/3789] sshfsFuse: update from 2.4 to 2.5

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

diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index 4befab17b6f..98cf3c533ae 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, fuse }:
 
 stdenv.mkDerivation rec {
-  name = "sshfs-fuse-2.4";
+  name = "sshfs-fuse-2.5";
   
   src = fetchurl {
     url = "mirror://sourceforge/fuse/${name}.tar.gz";
-    sha256 = "1ladfxflg0pzd5br0p9n5790sf1975va7igr9z4r702n4a2vm4rw";
+    sha256 = "0gp6qr33l2p0964j0kds0dfmvyyf5lpgsn11daf0n5fhwm9185z9";
   };
   
   buildInputs = [ pkgconfig glib fuse ];
-- 
GitLab


From c2cd9852acdea18f5ed425b17e2db4307cbb0319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Mar 2014 14:31:16 +0100
Subject: [PATCH 1851/3789] gnutls on darwin: drop patch that is integrated now

---
 pkgs/development/libraries/gnutls/3.2.nix     |  5 +-
 ...gnutls_x86_cpuid_s_multi_definitions.patch | 59 -------------------
 2 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch

diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix
index e950e463a9b..fff05ed8727 100644
--- a/pkgs/development/libraries/gnutls/3.2.nix
+++ b/pkgs/development/libraries/gnutls/3.2.nix
@@ -14,10 +14,7 @@ stdenv.mkDerivation rec {
   patches =
     # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
     stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch
-    # multiple definitions of '_gnutls_x86_cpuid_s' cause linker to fail.
-    # the patch is: https://www.gitorious.org/gnutls/gnutls/commit/54768ca1cd9049bbd1c695696ef3c8595c6052db
-    # discussion: http://osdir.com/ml/gnutls-devel-gnu/2014-02/msg00012.html
-    ++ stdenv.lib.optional stdenv.isDarwin ./fix_gnutls_x86_cpuid_s_multi_definitions.patch;
+    ;
 
   # Note: GMP is a dependency of Nettle, whose public headers include
   # GMP headers, hence the hack.
diff --git a/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch b/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch
deleted file mode 100644
index 1bc3086faeb..00000000000
--- a/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 54768ca1cd9049bbd1c695696ef3c8595c6052db Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@redhat.com>
-Date: Mon, 10 Feb 2014 10:43:52 +0100
-Subject: [PATCH] do not redefine the _gnutls_x86_cpuid_s symbol
-
----
- lib/accelerated/x86/aes-cbc-x86-aesni.c |    2 --
- lib/accelerated/x86/aes-cbc-x86-ssse3.c |    2 --
- lib/accelerated/x86/x86.h               |    3 ++-
- 3 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/lib/accelerated/x86/aes-cbc-x86-aesni.c b/lib/accelerated/x86/aes-cbc-x86-aesni.c
-index 6d4526f..1a2681f 100644
---- a/lib/accelerated/x86/aes-cbc-x86-aesni.c
-+++ b/lib/accelerated/x86/aes-cbc-x86-aesni.c
-@@ -39,8 +39,6 @@ struct aes_ctx {
- 	int enc;
- };
- 
--unsigned int _gnutls_x86_cpuid_s[4];
--
- static int
- aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc)
- {
-diff --git a/lib/accelerated/x86/aes-cbc-x86-ssse3.c b/lib/accelerated/x86/aes-cbc-x86-ssse3.c
-index ff24578..2b2440a 100644
---- a/lib/accelerated/x86/aes-cbc-x86-ssse3.c
-+++ b/lib/accelerated/x86/aes-cbc-x86-ssse3.c
-@@ -39,8 +39,6 @@ struct aes_ctx {
- 	int enc;
- };
- 
--unsigned int _gnutls_x86_cpuid_s[4];
--
- static int
- aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc)
- {
-diff --git a/lib/accelerated/x86/x86.h b/lib/accelerated/x86/x86.h
-index ae04d32..03fc8de 100644
---- a/lib/accelerated/x86/x86.h
-+++ b/lib/accelerated/x86/x86.h
-@@ -22,6 +22,8 @@
- 
- #include <config.h>
- 
-+extern unsigned int _gnutls_x86_cpuid_s[4];
-+
- #if defined(ASM_X86)
- 
- void gnutls_cpuid(unsigned int func, unsigned int *ax, unsigned int *bx,
-@@ -43,5 +45,4 @@ unsigned int gnutls_have_cpuid(void);
-  (nettle_hash_digest_func *) digest_func	\
- } 
- 
--
- #endif
--- 
-1.7.1
-
-- 
GitLab


From a13200352a15fd35db4cebf90d724230d310809b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Mar 2014 21:22:22 +0100
Subject: [PATCH 1852/3789] libssh: update, incl. features and CVE-2014-0017
 fix

Also add pkgconfig to inputs, as it was looked for by cmake.
Dependent packages seem to build fine.
---
 pkgs/development/libraries/libssh/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 0a06452d5d8..c201eda69e6 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, cmake, zlib, libgcrypt }:
+{ stdenv, fetchurl, pkgconfig, cmake, zlib, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "libssh-0.5.5";
+  name = "libssh-0.6.3";
 
   src = fetchurl {
-    url = "https://red.libssh.org/attachments/download/51/${name}.tar.gz";
-    sha256 = "17cfdff4hc0ijzrr15biq29fiabafz0bw621zlkbwbc1zh2hzpy0";
+    url = "https://red.libssh.org/attachments/download/87/${name}.tar.xz";
+    sha256 = "1jyaj9h1iglvn02hrvcchbx8ycjpj8b91h8mi459k7q5jp2xgd9b";
   };
 
   buildInputs = [ zlib libgcrypt ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   cmakeFlags = "-DWITH_GCRYPT=ON";
 
-- 
GitLab


From 765e119b33ec9fdd6968f97e45fd1b98ca06fa3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Mar 2014 21:30:55 +0100
Subject: [PATCH 1853/3789] ffmpeg_2: update 2.1.1 -> .4, fixing
 CVE-2014-209{7,8,9}

---
 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 dd29e1e9e6b..931881fd142 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.1";
+  name = "ffmpeg-2.1.4";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy";
+    sha256 = "00c1k84amgkc7vk5xkrg7z99q7jbfhbz3qk854cxnc38d2ynrd3z";
   };
 
   mp3Support = config.ffmpeg.mp3 or true;
-- 
GitLab


From ed4455a00328898845bd50cf2885a0f278684c81 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 6 Mar 2014 08:58:51 +0100
Subject: [PATCH 1854/3789] Security update: update to warp 2.0.3.3 See
 https://github.com/yesodweb/wai/issues/231 for details.

---
 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 d3c1bdbd4c7..f5b0f683553 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.0.3.2";
-  sha256 = "1aapwhgqn693cvdhj4zafyww2xrpjn8wzdgrwxz8k6mq0f2lh599";
+  version = "2.0.3.3";
+  sha256 = "02wh8jf8pcjb03xxdim9q92vr4jk9jibqqzl8kvccqlqfi5giq0f";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpDate httpTypes liftedBase network networkConduit simpleSendfile
-- 
GitLab


From e62bf9119c501fe90b5408ed79bfa8d77ad75f24 Mon Sep 17 00:00:00 2001
From: Dario Bertini <berdario@gmail.com>
Date: Thu, 6 Mar 2014 10:58:52 +0100
Subject: [PATCH 1855/3789] Changed virtualenv-clone to use the version from
 pypi (the author will keep updating it, so I don't need my fork on github
 anymore) Tried to made the tests run with tox: updating tox (and the
 dependencies: virtualenv and py) let the installation finish, but its tests
 still fail

---
 pkgs/top-level/python-packages.nix | 36 +++++++++++++++++-------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 53b1cff64c3..15863b2c22a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1790,7 +1790,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "90a82400074b50a9e73c3045ed9ac217";
     };
 
-    buildInputs = [ virtualenv virtualenv-clone ];
+    propagatedBuildInputs = [ virtualenv virtualenv-clone ];
 
     meta = with stdenv.lib; {
       description = "Tools to manage multiple virtualenvs written in pure python, a virtualenvwrapper rewrite";
@@ -4861,11 +4861,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   py = buildPythonPackage rec {
-    name = "py-1.4.19";
+    name = "py-1.4.20";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/p/py/${name}.tar.gz";
-      md5 = "3857dc8309d5f284669b81184253c2bb";
+      md5 = "5f1708be5482f3ff6711dfd6cafd45e0";
     };
   };
 
@@ -6997,16 +6997,18 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   # TODO
-  # py.error.EACCES: [Permission denied]: mkdir('/homeless-shelter',)
-  # builder for `/nix/store/0czwg0n3pfkmpjphqv1jxfjlgkbziwsx-python-tox-1.4.3.drv' failed with exit code 1
+  # Installs correctly but fails tests that involve simple things like:
+  # cmd.run("tox", "-h")
+  # also, buildPythonPackage needs to supply the tox.ini correctly for projects that use tox for their tests
+  #
   # tox = buildPythonPackage rec {
-  #   name = "tox-1.4.3";
+  #   name = "tox-1.7.0";
   #
-  #   buildInputs = [ py virtualenv ];
+  #   propagatedBuildInputs = [ py virtualenv ];
   #
   #   src = fetchurl {
-  #     url = "https://pypi.python.org/packages/source/t/tox/tox-1.4.3.tar.gz";
-  #     md5 = "3727d5b0600d92edf2229a7ce6a0f752";
+  #     url = "https://pypi.python.org/packages/source/t/tox/${name}.tar.gz";
+  #     md5 = "5314ceca2b179ad4a9c79f4d817b8a99";
   #   };
   # };
 
@@ -7221,10 +7223,10 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   });
 
   virtualenv = buildPythonPackage rec {
-    name = "virtualenv-1.10";
+    name = "virtualenv-1.11.4";
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz";
-      md5 = "9745c28256c70c76d36adb3767a00212";
+      md5 = "9accc2d3f0ec1da479ce2c3d1fdff06e";
     };
 
     inherit recursivePthLoader;
@@ -7248,12 +7250,16 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
   virtualenv-clone = buildPythonPackage rec {
     name = "virtualenv-clone-0.2.4";
-    
-    src = fetchgit {
-      url = "https://github.com/berdario/virtualenv-clone.git";
-      rev = ''c302ca84e524cb22f88c834cccb23dd410cced97'';
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/v/virtualenv-clone/${name}.tar.gz";
+      md5 = "71168b975eaaa91e65559bcc79290b3b";
     };
 
+    buildInputs = [pytest];
+    propagatedBuildInputs = [virtualenv];
+
+    # needs tox to run the tests
     doCheck = false;
 
     meta = with stdenv.lib; {
-- 
GitLab


From bd76470d9b7df8a46d2c2a3820c4c4d3a4a4385e Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 6 Mar 2014 11:31:29 +0100
Subject: [PATCH 1856/3789] opensmtpd: Update to 5.4.2p1

---
 pkgs/servers/mail/opensmtpd/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index 3d7a32a00c9..522d0b60f00 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "opensmtpd-${version}";
-  version = "201402281146p1";
+  version = "5.4.2p1";
 
   buildInputs = [ libevent zlib openssl db bison pam ];
 
   src = fetchurl {
     url = "http://www.opensmtpd.org/archives/${name}.tar.gz";
-    sha256 = "0q287lx6pcz1bz6b334fb977dpbcg4rpyli3zrxj27wql4x0dg6b";
+    sha256 = "18nrzfjhv9znb5dbhc5k3fi31a3vr1r8j36q3fzghkh47n6z9yjg";
   };  
 
   configureFlags = [ 
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
     "--with-sock-dir=/run"
     "--with-privsep-user=smtpd"
     "--with-queue-user=smtpq"
+    "--with-ca-file=/etc/ssl/certs/ca-bundle.crt"
   ];  
 
   meta = {
-- 
GitLab


From 322b7124a8768979dce9cb78245c39561746e389 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Thu, 6 Mar 2014 11:54:02 +0100
Subject: [PATCH 1857/3789] Allow ntpq locally

---
 nixos/modules/services/networking/ntpd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix
index cdab789cd28..3d388cb1064 100644
--- a/nixos/modules/services/networking/ntpd.nix
+++ b/nixos/modules/services/networking/ntpd.nix
@@ -17,6 +17,8 @@ let
 
     restrict default kod nomodify notrap nopeer noquery
     restrict -6 default kod nomodify notrap nopeer noquery
+    restrict 127.0.0.1
+    restrict -6 ::1
 
     ${toString (map (server: "server " + server + " iburst\n") config.services.ntp.servers)}
   '';
-- 
GitLab


From ec407aaa86446fecd183da002fe6761c4e80a9f7 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Thu, 6 Mar 2014 15:15:44 +0100
Subject: [PATCH 1858/3789] dd_rescue: 1.22 -> 1.42.1

---
 pkgs/tools/system/dd_rescue/default.nix | 74 ++++++++-----------------
 1 file changed, 24 insertions(+), 50 deletions(-)

diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix
index 57f9a1a57d5..9c7f0413421 100644
--- a/pkgs/tools/system/dd_rescue/default.nix
+++ b/pkgs/tools/system/dd_rescue/default.nix
@@ -1,63 +1,37 @@
-x@{builderDefsPackage
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, autoconf }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="dd_rescue";
-    version="1.22";
-    name="${baseName}-${version}";
+stdenv.mkDerivation rec {
+  name = "dd_rescue-1.42.1";
+
+  src = fetchurl {
+    sha256 = "0g2d292m1cnp8syy19hh5jvly3zy7lcvcj563wgjnf20ppm2diaq";
     url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.gz";
-    hash="0n0vs4cn5csdcsmlndg3z36ws68zlckj17zrbm6wynrbs8iirclp";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-  dd_rhelp_src = a.fetchurl {
-    url = "http://www.kalysto.org/pkg/dd_rhelp-0.1.2.tar.gz";
-    sha256 = "0fhzkflg1ygiaj5ha0bf594d76vlgjsfwlpcmwrbady9frxvlkvv";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  dd_rhelp_src = fetchurl {
+    url = "http://www.kalysto.org/pkg/dd_rhelp-0.3.0.tar.gz";
+    sha256 = "0br6fs23ybmic3i5s1w4k4l8c2ph85ax94gfp2lzjpxbvl73cz1g";
+  };
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doMakeInstall" "install_dd_rhelp" "fixPaths"];
-  makeFlags=[
-    ''prefix="$out"''
-    ''DESTDIR="$out"''
-    ''INSTASROOT=''
-  ];
+  buildInputs = [ autoconf ];
 
-  fixPaths = a.doPatchShebangs ''$out/bin'';
+  preBuild = ''
+    substituteInPlace Makefile \
+      --replace "\$(DESTDIR)/usr" "$out" \
+      --replace "-o root" "" \
+      --replace "-g root" "" 
+  '';
+  makeFlags = [ "LIBDIR=$out" ];
 
-  install_dd_rhelp = a.fullDepEntry (''
+  postInstall = ''
     mkdir -p "$out/share/dd_rescue" "$out/bin"
     tar xf "${dd_rhelp_src}" -C "$out/share/dd_rescue"
     cp "$out/share/dd_rescue"/dd_rhelp*/dd_rhelp "$out/bin"
-  '') ["minInit" "defEnsureDir"];
+  '';
       
-  meta = {
+  meta = with stdenv.lib; {
     description = "A tool to copy data from a damaged block device";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.garloff.de/kurt/linux/ddrescue/";
-    };
+    maintainers = with maintainers; [ raskin iElectric ];
+    platforms = with platforms; linux;
   };
-}) x
-
+}
-- 
GitLab


From 7d68a626a4dee1872b33d585ddd0e147a0498259 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Thu, 6 Mar 2014 15:22:37 +0100
Subject: [PATCH 1859/3789] ddrescue: 1.16 -> 1.17

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

diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index 9afad675bb9..d2ace27b1fd 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, lzip }:
 
 stdenv.mkDerivation rec {
-  name = "ddrescue-1.16";
+  name = "ddrescue-1.17";
 
   src = fetchurl {
-    url = "mirror://gnu/ddrescue/${name}.tar.gz";
-    sha256 = "1rixya7p8c4jrn4p0flf6h5dqwybrilf3hrj4r7x41h3zgjz5cvn";
+    url = "mirror://gnu/ddrescue/${name}.tar.lz";
+    sha256 = "0bvmsbzli2j4czwkabzs978n1y6vx31axh02kpgcf7033cc6rydy";
   };
 
+  buildInputs = [ lzip ];
+
   doCheck = true;
 
   meta = {
@@ -41,6 +43,6 @@ stdenv.mkDerivation rec {
     license = "GPLv3+";
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ ];
+    maintainers = with stdenv.lib.maintainers; [ iElectric ];
   };
 }
-- 
GitLab


From d1cc2c6c37ecb9eabaa951e195960cd14ddc3a9e Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 6 Mar 2014 16:58:23 +0100
Subject: [PATCH 1860/3789] Add nvidiabl kernel module

---
 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 d5dcb45da17..02378b7cb19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6851,6 +6851,8 @@ let
 
     broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
 
+    nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
+
     nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { };
 
     nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { };
-- 
GitLab


From 4120720823af3a4f977eccc14a9ac2769be2c2ed Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 6 Mar 2014 18:49:36 +0100
Subject: [PATCH 1861/3789] xlrd: Add python package

---
 pkgs/top-level/python-packages-generated.nix | 21 ++++++++++++++++++++
 pkgs/top-level/python-packages.json          |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
index e7308e2b816..29a9bc91a1e 100644
--- a/pkgs/top-level/python-packages-generated.nix
+++ b/pkgs/top-level/python-packages-generated.nix
@@ -5349,5 +5349,26 @@ in
   };
 
 
+  "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";
+    };
+  };
+
 }
 
diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json
index aefd911a558..b5b7afab85b 100644
--- a/pkgs/top-level/python-packages.json
+++ b/pkgs/top-level/python-packages.json
@@ -134,6 +134,8 @@
   { "name": "psycopg2",
     "buildInputs": [ "pkgs.postgresql" ],
     "doCheck": false
+  },
+  { "name": "xlrd",
+    "doCheck": false
   }
-
 ]
-- 
GitLab


From be58c4f9e484d054311ac062727c95690d24874b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 6 Mar 2014 21:21:03 +0100
Subject: [PATCH 1862/3789] mupdf: fix CVE-2014-2013 by upstream patch

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

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 17b86910de0..57ac7da9b78 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -8,6 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "0y247nka5gkr1ajn47jrlp5rcnf6h4ff7dfsprma3h4wxqdv7a5b";
   };
 
+  patches = [(fetchurl {
+    name = "CVE-2014-2013.patch";
+    url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;"
+      + "h=60dabde18d7fe12b19da8b509bdfee9cc886aafc";
+    sha256 = "1walj3wir9x50i6lph33bx14c8593r9xrn08gkd3v7r6d15lmjps";
+  })];
+
   buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ];
 
   enableParallelBuilding = true;
-- 
GitLab


From 29a906b2d83cf6e7bb5fcacdfe6499415d4a7fd0 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Fri, 7 Mar 2014 13:28:19 +0100
Subject: [PATCH 1863/3789] dfu-programmer: New package.

---
 .../tools/misc/dfu-programmer/default.nix     | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/tools/misc/dfu-programmer/default.nix

diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix
new file mode 100644
index 00000000000..93dceb60f8d
--- /dev/null
+++ b/pkgs/development/tools/misc/dfu-programmer/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, libusb1 }:
+let
+  version = "0.6.2";
+in
+stdenv.mkDerivation rec {
+  name="dfu-programmer-${version}";
+
+  buildInputs = [ libusb1 ];
+
+  src = fetchurl {
+    url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz";
+    sha256 = "0rdg4h5alpa3py3v3xgvn2vcgmnbj077am90jqj83nad89m9c801";
+  };
+
+  preConfigure = ''
+    substituteInPlace configure \
+     --replace "/usr/include/libusb-1.0" "${libusb1}/include/libusb-1.0"
+  '';
+
+  meta = with stdenv.lib; {
+    license = licenses.gpl2;
+    description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader.";
+    homepage = http://dfu-programmer.sourceforge.net/;
+    maintainers = [ maintainers.the-kenny ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4769d4170f0..821878cf386 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3547,6 +3547,8 @@ let
     inherit (gnome3) gnome_icon_theme;
   };
 
+  dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { };
+
   ddd = callPackage ../development/tools/misc/ddd { };
 
   distcc = callPackage ../development/tools/misc/distcc { };
-- 
GitLab


From be649496884f1a9242b3989f365d73c16eabfeba Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Fri, 7 Mar 2014 13:32:10 +0100
Subject: [PATCH 1864/3789] leiningen: Hardcode path to java.

...by setting JAVA_CMD in the wrapper.
---
 pkgs/development/tools/build-managers/leiningen/builder.sh  | 3 ++-
 pkgs/development/tools/build-managers/leiningen/default.nix | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh
index e1dd9d5a786..c28854ca089 100644
--- a/pkgs/development/tools/build-managers/leiningen/builder.sh
+++ b/pkgs/development/tools/build-managers/leiningen/builder.sh
@@ -20,4 +20,5 @@ patchShebangs $out
 
 wrapProgram $out_bin \
     --prefix PATH ":" "${rlwrap}/bin:${coreutils}/bin:${findutils}/bin" \
-    --set LEIN_GPG ${gnupg}/bin/gpg
+    --set LEIN_GPG ${gnupg}/bin/gpg \
+    --set JAVA_CMD ${jdk}/bin/java
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index 2c039b3fa0c..ff21e518936 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   patches = ./lein_2.3.0.patch;
 
-  inherit rlwrap clojure gnupg findutils coreutils;
+  inherit rlwrap clojure gnupg findutils coreutils jdk;
 
   builder = ./builder.sh;
 
-- 
GitLab


From fedd018d937f638494c48a9d7cae7d80842d134d Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 7 Mar 2014 14:33:59 +0100
Subject: [PATCH 1865/3789] fix pypy and pypyPackages

---
 pkgs/development/interpreters/pypy/2.2/default.nix     | 4 ++--
 pkgs/development/python-modules/generic/wrap.sh        | 4 ++--
 pkgs/development/python-modules/setuptools/default.nix | 2 +-
 pkgs/top-level/python-packages.nix                     | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix
index 231a0a7dfaa..2fee7bc74df 100644
--- a/pkgs/development/interpreters/pypy/2.2/default.nix
+++ b/pkgs/development/interpreters/pypy/2.2/default.nix
@@ -5,8 +5,8 @@ assert zlibSupport -> zlib != null;
 
 let
 
-  majorVersion = "2.2.1";
-  version = "${majorVersion}";
+  majorVersion = "2.2";
+  version = "${majorVersion}.1";
   pythonVersion = "2.7";
   libPrefix = "pypy${majorVersion}";
 
diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index a7c839799b1..bd1f526900a 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -5,7 +5,7 @@ wrapPythonPrograms() {
 wrapPythonProgramsIn() {
     local dir="$1"
     local pythonPath="$2"
-    local python="$(type -p python)"
+    local python="@executable@"
     local i
 
     declare -A pythonPathsSeen=()
@@ -22,7 +22,7 @@ wrapPythonProgramsIn() {
             sed -i "$i" -e "1 s^.*/env[ ]*python^#! $python^"
         fi
         
-        if head -n1 "$i" | grep -q /python; then
+        if head -n1 "$i" | grep -q /@executable_name@; then
             # dont wrap EGG-INFO scripts since they are called from python
             if echo "$i" | grep -v EGG-INFO/scripts; then
                 echo "wrapping \`$i'..."
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 35630be2255..e33c815d23b 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       dst=$out/lib/${python.libPrefix}/site-packages
       mkdir -p $dst
       PYTHONPATH="$dst:$PYTHONPATH"
-      ${python}/bin/${python.executable} setup.py install --prefix=$out
+      ${python}/bin/${python.executable} setup.py install --prefix=$out --install-lib=$out/lib/${python.libPrefix}/site-packages
       wrapPythonPrograms
     '';
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9cbfbe1b3f8..544ae1694b9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28,6 +28,8 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   wrapPython = pkgs.makeSetupHook
     { deps = pkgs.makeWrapper;
       substitutions.libPrefix = python.libPrefix;
+      substitutions.executable_name = python.executable;
+      substitutions.executable = "${python}/bin/${python.executable}";
     }
    ../development/python-modules/generic/wrap.sh;
 
-- 
GitLab


From 9fab4366bf33d1b7bafd2372bc692cddefef4c6d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 7 Mar 2014 07:23:17 -0600
Subject: [PATCH 1866/3789] Add ttuegel to maintainers list

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7bef639ca7c..6feafbcd3b1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -69,6 +69,7 @@
   the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
   thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
   tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
+  ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";
   urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
   vcunat = "Vladimír Čunát <vcunat@gmail.com>";
   viric = "Lluís Batlle i Rossell <viric@viric.name>";
-- 
GitLab


From 1b3360a28f04b239615b74be79ceed90bc22c9a3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 25 Feb 2014 10:37:32 -0600
Subject: [PATCH 1867/3789] Add biber-1.8 and dependencies

---
 pkgs/tools/typesetting/biber/default.nix |  40 +++++
 pkgs/top-level/all-packages.nix          |   9 ++
 pkgs/top-level/perl-packages.nix         | 195 +++++++++++++++++++++++
 3 files changed, 244 insertions(+)
 create mode 100644 pkgs/tools/typesetting/biber/default.nix

diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix
new file mode 100644
index 00000000000..1769a59520b
--- /dev/null
+++ b/pkgs/tools/typesetting/biber/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, buildPerlPackage, autovivification, BusinessISBN
+, BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple
+, EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder
+, FileSlurp, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils
+, ModuleBuild, MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate
+, UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter }:
+
+let
+  version = "1.8";
+  pn = "biblatex-biber";
+in
+buildPerlPackage {
+  name = "biber-${version}";
+  src = fetchurl {
+    url = "mirror://sourceforge/project/${pn}/${pn}/${version}/${pn}.tar.gz";
+    sha256 = "0ffry64pdvg5g487r7qab5b3cs4kq8rq8n3bymxrr1qh3mp79k4n";
+  };
+
+  buildInputs = [
+    autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
+    DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K
+    ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils
+    ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX
+    UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter
+  ];
+  preConfigure = "touch Makefile.PL";
+  buildPhase = "perl Build.PL --prefix=$out; ./Build build";
+  checkPhase = "./Build test";
+  installPhase = "./Build install";
+
+  # Tests seem to be broken
+  doCheck = false;
+
+  meta = {
+    description = "Backend for BibLaTeX";
+    license = "perl";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 959afdd7932..b8ceaee7ae7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -616,6 +616,15 @@ let
 
   bgs = callPackage ../tools/X11/bgs { };
 
+  biber = callPackage ../tools/typesetting/biber {
+    inherit (perlPackages)
+      autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
+      DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K
+      ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils
+      ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX
+      UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter;
+  };
+
   bibtextools = callPackage ../tools/typesetting/bibtex-tools {
     inherit (strategoPackages016) strategoxt sdf;
   };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 902d28c685f..c463fb9f83b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -304,6 +304,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  autovivification = buildPerlPackage {
+    name = "autovivification-0.12";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/V/VP/VPIT/autovivification-0.12.tar.gz;
+      sha256 = "6ef8686766c63571389880e5d87a0ca1d46f7d127982e8ef38aca7568c44840c";
+    };
+    meta = {
+      homepage = http://search.cpan.org/dist/autovivification/;
+      description = "Lexically disable autovivification";
+      license = "perl";
+    };
+  };
+
   BerkeleyDB = import ../development/perl-modules/BerkeleyDB {
     inherit buildPerlPackage fetchurl;
     inherit (pkgs) db;
@@ -385,6 +398,56 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsTypemapsDefault ];
   };
 
+  BusinessISBN = buildPerlPackage {
+    name = "Business-ISBN-2.07";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-2.07.tar.gz;
+      sha256 = "4c11279580872bf3cc7176bb75c25b165d4b59a2828fc43d9a355cec3d0a45ff";
+    };
+    propagatedBuildInputs = [ BusinessISBNData URI ];
+    meta = {
+      description = "Parse and validate ISBNs";
+      license = "perl";
+    };
+  };
+
+  BusinessISBNData = buildPerlPackage {
+    name = "Business-ISBN-Data-20120719.001";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20120719.001.tar.gz;
+      sha256 = "745f6bf8f7bd912c0a1865aa5f7e49343804de27783f544b2e2c714e14a704a3";
+    };
+    meta = {
+      description = "Data pack for Business::ISBN";
+      license = "perl";
+    };
+  };
+
+  BusinessISMN = buildPerlPackage {
+    name = "Business-ISMN-1.11";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.11.tar.gz;
+      sha256 = "76d5240a5672c7a8b1ba9e9ea8238a5c8882139911acbb67b7059b5ee3da342d";
+    };
+    propagatedBuildInputs = [ TieCycle ];
+    meta = {
+      description = "Work with International Standard Music Numbers";
+      license = "perl";
+    };
+  };
+
+  BusinessISSN = buildPerlPackage {
+    name = "Business-ISSN-0.91";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-0.91.tar.gz;
+      sha256 = "f15b192c0f547bb2967811072b3d343b94bc5ea58d02704c19122f7ae0a9d6b5";
+    };
+    meta = {
+      description = "Work with International Standard Serial Numbers";
+      license = "perl";
+    };
+  };
+
   CacheCache = buildPerlPackage rec {
     name = "Cache-Cache-1.06";
     src = fetchurl {
@@ -1935,6 +1998,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DateSimple = buildPerlPackage {
+    name = "Date-Simple-3.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/I/IZ/IZUT/Date-Simple-3.03.tar.gz;
+      sha256 = "29a1926314ce1681a312d6155c29590c771ddacf91b7485873ce449ef209dd04";
+    };
+    meta = {
+      license = "unknown";
+    };
+  };
+
   DateTime = buildPerlModule {
     name = "DateTime-1.07";
     src = fetchurl {
@@ -2996,6 +3070,40 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  EncodeEUCJPASCII = buildPerlPackage {
+    name = "Encode-EUCJPASCII-0.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-0.03.tar.gz;
+      sha256 = "f998d34d55fd9c82cf910786a0448d1edfa60bf68e2c2306724ca67c629de861";
+    };
+    meta = {
+      description = "EucJP-ascii - An eucJP-open mapping";
+      license = "perl";
+    };
+  };
+
+  EncodeHanExtra = buildPerlPackage {
+    name = "Encode-HanExtra-0.23";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AU/AUDREYT/Encode-HanExtra-0.23.tar.gz;
+      sha256 = "1fd4b06cada70858003af153f94c863b3b95f2e3d03ba18d0451a81d51db443a";
+    };
+    meta = {
+      description = "Extra sets of Chinese encodings";
+      license = "mit";
+    };
+  };
+
+  EncodeJIS2K = buildPerlPackage {
+    name = "Encode-JIS2K-0.02";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.02.tar.gz;
+      sha256 = "5d718add5857f37fc270f24360bc9d100b72e0e13a11ca3149fe4e4d7c7cc4bf";
+    };
+    meta = {
+    };
+  };
+
   EncodeLocale = buildPerlPackage rec {
     name = "Encode-Locale-1.03";
     src = fetchurl {
@@ -5027,6 +5135,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  MIMECharset = buildPerlPackage {
+    name = "MIME-Charset-1.011.1";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.011.1.tar.gz;
+      sha256 = "2955a3b617fe12654efc2a13ae1dc7d32aad81d35cfae21f74337213cf2435d5";
+    };
+    meta = {
+      description = "Charset Information for MIME";
+      license = "perl";
+    };
+  };
+
   mimeConstruct = buildPerlPackage rec {
     name = "mime-construct-1.11";
     src = fetchurl {
@@ -5138,6 +5258,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ModuleInfo = buildPerlPackage rec {
+    name = "Module-Info-0.35";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MB/MBARBON/Module-Info-0.35.tar.gz";
+      sha256 = "0r7vxg1iy3lam0jgb2sk8ghgpmp3x5fskvzqlgkb09bssq83s1xb";
+    };
+    buildInputs = [ TestPod TestPodCoverage ];
+    meta = {
+      description = "Information about Perl modules";
+      license = "perl";
+    };
+  };
+
   ModuleInstall = buildPerlPackage {
     name = "Module-Install-1.06";
     src = fetchurl {
@@ -5901,6 +6034,18 @@ let self = _self // overrides; _self = with self; {
     doCheck = false; # check can't find its own Mouse::Tiny module
   };
 
+  MozillaCA = buildPerlPackage {
+    name = "Mozilla-CA-20130114";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20130114.tar.gz;
+      sha256 = "82342614add1dbca8a00daa1ee55af3e0036245aed7d445537918c045008ccd7";
+    };
+    meta = {
+      description = "Mozilla's CA cert bundle in PEM format";
+      license = "unknown";
+    };
+  };
+
   MROCompat = buildPerlPackage {
     name = "MRO-Compat-0.12";
     src = fetchurl {
@@ -8885,6 +9030,18 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DevelStackTrace Moose ];
   };
 
+  TieCycle = buildPerlPackage {
+    name = "Tie-Cycle-1.19";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.19.tar.gz;
+      sha256 = "bd315874c85feaf8948eeb2f40fe2768a6ca00f089e35b32bfe88f3f384f9ca1";
+    };
+    meta = {
+      description = "Cycle through a list of values via a scalar";
+      license = "perl";
+    };
+  };
+
   TieIxHash = buildPerlPackage {
     name = "Tie-IxHash-1.22";
     src = fetchurl {
@@ -9037,6 +9194,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  UnicodeCollate = buildPerlPackage {
+    name = "Unicode-Collate-1.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SA/SADAHIRO/Unicode-Collate-1.04.tar.gz;
+      sha256 = "4e3a2300b961d3aaf3789cdbfb95601edaaffb4109ed6cdb912a664d5c7bd706";
+    };
+    meta = {
+      description = "Unicode Collation Algorithm";
+      license = "perl";
+    };
+  };
+
   UnicodeICUCollator = buildPerlPackage {
     name = "Unicode-ICU-Collator-0.002";
     src = fetchurl {
@@ -9052,6 +9221,19 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ pkgs.icu ];
   };
 
+  UnicodeLineBreak = buildPerlPackage {
+    name = "Unicode-LineBreak-2013.11";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2013.11.tar.gz;
+      sha256 = "8946b883ae687ff652e93d6185e23a936c7f337f2e115851fdfed72e1f73c7f9";
+    };
+    propagatedBuildInputs = [ MIMECharset ];
+    meta = {
+      description = "UAX #14 Unicode Line Breaking Algorithm";
+      license = "perl";
+    };
+  };
+
   UnixGetrusage = buildPerlPackage {
     name = "Unix-Getrusage-0.03";
     src = fetchurl {
@@ -9264,6 +9446,19 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ XMLSAX ];
   };
 
+  XMLLibXMLSimple = buildPerlPackage {
+    name = "XML-LibXML-Simple-0.93";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MA/MARKOV/XML-LibXML-Simple-0.93.tar.gz;
+      sha256 = "f2eb1c1523d6414cf2a646a289b0325b489954382c862928d165a03a7cce767c";
+    };
+    propagatedBuildInputs = [ FileSlurp XMLLibXML ];
+    meta = {
+      description = "XML::LibXML based XML::Simple clone";
+      license = "perl";
+    };
+  };
+
   XMLLibXSLT = buildPerlPackage rec {
     name = "XML-LibXSLT-1.87";
     src = fetchurl {
-- 
GitLab


From 45ee89222921250ac7330bb279e1c317cef4f6f3 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 7 Mar 2014 14:55:44 +0100
Subject: [PATCH 1868/3789] #1728: Build doxygen without checking for qt4
 (fails on darwin)

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8ceaee7ae7..61738a74406 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3592,9 +3592,11 @@ let
     inherit python pil makeWrapper;
   };
 
-  doxygen = lowPrio (doxygen_gui.override { qt4 = null; });
+  doxygen = callPackage ../development/tools/documentation/doxygen {
+    qt4 = null;
+  };
 
-  doxygen_gui = callPackage ../development/tools/documentation/doxygen { };
+  doxygen_gui = lowPrio (doxygen.override { inherit qt4; });
 
   drush = callPackage ../development/tools/misc/drush { };
 
-- 
GitLab


From ce2ac1f8a980df546b62a4fab34a3266bdd5d946 Mon Sep 17 00:00:00 2001
From: Matthew Sackman <matthew@rabbitmq.com>
Date: Wed, 26 Feb 2014 18:28:36 +0000
Subject: [PATCH 1869/3789] erl_call should be in bin. erl_call is very useful
 and other distributions make erl_call available on PATH.

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

diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix
index 9562a0dc452..077eaa9093b 100644
--- a/pkgs/development/interpreters/erlang/default.nix
+++ b/pkgs/development/interpreters/erlang/default.nix
@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-ssl=${openssl}";
 
+  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/"
-- 
GitLab


From 9906b7da34daec682f20bad6eff04b192af07950 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 28 Dec 2013 21:16:41 -0600
Subject: [PATCH 1870/3789] Add vobsub2srt-git-20140226-b70b6f5

---
 pkgs/tools/cd-dvd/vobsub2srt/default.nix | 25 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/cd-dvd/vobsub2srt/default.nix

diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix
new file mode 100644
index 00000000000..b0918bfb421
--- /dev/null
+++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchgit, cmake, libtiff, pkgconfig, tesseract }:
+
+let rev = "b70b6f584e8151f70f9d90df054af0911ea7475e";
+    shortRev = builtins.substring 0 7 rev;
+in
+stdenv.mkDerivation {
+  name = "vobsub2srt-git-20140226-${shortRev}";
+
+  src = fetchgit {
+    inherit rev;
+    url = https://github.com/ruediger/VobSub2SRT.git;
+    sha256 = "15437eba07e674cec66bc54cfa42ffe8b05816975401c9950bf9016e3881cd6a";
+  };
+
+  buildInputs = [ cmake libtiff pkgconfig ];
+  propagatedBuildInputs = [ tesseract ];
+
+  meta = {
+    homepage = https://github.com/ruediger/VobSub2SRT;
+    description = "Converts VobSub subtitles into SRT subtitles";
+    license = stdenv.lib.libraries.gpl3Plus;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61738a74406..bd1624c616c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2069,6 +2069,8 @@ let
 
   vobcopy = callPackage ../tools/cd-dvd/vobcopy { };
 
+  vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { };
+
   vorbisgain = callPackage ../tools/misc/vorbisgain { };
 
   vpnc = callPackage ../tools/networking/vpnc { };
-- 
GitLab


From 1d52f7bd68c8bb6e02cd97759b4838b9912d618f Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Fri, 7 Mar 2014 21:59:51 +0800
Subject: [PATCH 1871/3789] praat: update from 5323 to 5365

---
 pkgs/applications/audio/praat/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix
index f2f196acdd8..0c89f92edb5 100644
--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -1,14 +1,15 @@
-{stdenv, fetchurl, alsaLib, gtk, pkgconfig }:
+{ stdenv, fetchurl, alsaLib, gtk, pkgconfig }:
 
 stdenv.mkDerivation {
-  name = "praat-5323";
+  name = "praat-5365";
+
   src = fetchurl {
-    url = http://www.fon.hum.uva.nl/praat/praat5323_sources.tar.gz;
-    sha256 = "1m0m5165h74mw5xhmnnyzh5ans3cn78w5rs9572sa1512cams203";
+    url = http://www.fon.hum.uva.nl/praat/praat5365_sources.tar.gz;
+    sha256 = "1w3mcq0mipx88i7ckhvzhmdj0p67nhppnn7kbkp21d01yyyz5rgq";
   };
 
   configurePhase = ''
-    cp makefiles/makefile.defs.linux makefile.defs
+    cp makefiles/makefile.defs.linux.alsa makefile.defs
   '';
 
   installPhase = ''
-- 
GitLab


From 08fb4d6bc49c961f5f13a6e16f8a0c2757dabb9a Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Fri, 7 Mar 2014 22:01:13 +0800
Subject: [PATCH 1872/3789] praat: set meta.platforms to linux

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

diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix
index 0c89f92edb5..b8a283125fc 100644
--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -23,5 +23,6 @@ stdenv.mkDerivation {
     description = "Doing phonetics by computer";
     homepage = http://www.fon.hum.uva.nl/praat/;
     license = "GPLv2+"; # Has some 3rd-party code in it though
+    platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From eb6a290f5ea52b1037569f8aa0bd2f9dbfa894d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 7 Mar 2014 15:12:27 +0100
Subject: [PATCH 1873/3789] bittorrentSync: 1.2.82 -> 1.2.91

---
 .../networking/bittorrentsync/default.nix     |  6 +-
 pkgs/development/libraries/gnutls/2.12.nix    | 64 -------------------
 2 files changed, 3 insertions(+), 67 deletions(-)
 delete mode 100644 pkgs/development/libraries/gnutls/2.12.nix

diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix
index 895ebd7911b..c6277da704e 100644
--- a/pkgs/applications/networking/bittorrentsync/default.nix
+++ b/pkgs/applications/networking/bittorrentsync/default.nix
@@ -14,9 +14,9 @@ let
     else if stdenv.system == "i686-linux" then "ld-linux.so.2"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  version = "1.2.82";
-  sha256 = if stdenv.system == "x86_64-linux" then "0cqrscav57xwz7rag6wy06xw6z7ca97xailprgg6jdjv4pnc91ra"
-    else if stdenv.system == "i686-linux" then "1b9rnfk0wkhj1zybvfqwgd9dcqnxwdnp7m0vf6lhrgi75cydj7is"
+  version = "1.2.91";
+  sha256 = if stdenv.system == "x86_64-linux" then "1rx5mmk3ffkh6dbm0m33nyx6spsxqjw9djclcf9x9bs3zfyzgmnd"
+    else if stdenv.system == "i686-linux" then "1566mp01149gsb57dv87420w1vq2f3adp6g1c90xdxjxzd67yqpw"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
 in stdenv.mkDerivation {
diff --git a/pkgs/development/libraries/gnutls/2.12.nix b/pkgs/development/libraries/gnutls/2.12.nix
deleted file mode 100644
index 4a1332a7f15..00000000000
--- a/pkgs/development/libraries/gnutls/2.12.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle
-, guileBindings, guile, pkgconfig, perl }:
-
-assert guileBindings -> guile != null;
-
-stdenv.mkDerivation rec {
-
-  name = "gnutls-2.12.23";
-
-  src = fetchurl { # missing on standard mirrors
-    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/${name}.tar.bz2";
-    sha256 = "1lkys703z4yxfgzarmgas5ccvn6m254w9wvm7s8v0zkj81z7m9nz";
-  };
-
-  patches = [(fetchurl {
-    url = "http://anonscm.debian.org/viewvc/pkg-gnutls/packages/gnutls26/trunk/"
-      + "debian/patches/21_sanitycheck.diff?revision=1777&view=co";
-    sha256 = "0k18a7q6irmgjzp647bd18zccjpsr82n2s9arpamnkakgnny4ks9";
-    name = "CVE-2013-2116.patch";
-  })];
-
-  configurePhase = ''
-    patchShebangs .
-
-    ./configure --prefix="$out"                                 \
-      --disable-dependency-tracking --enable-fast-install       \
-      --with-lzo --with-libtasn1-prefix="${libtasn1}"		\
-      --without-p11-kit                                         \
-      ${if guileBindings
-        then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""
-        else ""}
-  '';
-
-  buildInputs = [ zlib lzo libtasn1 pkgconfig perl ]
-    ++ stdenv.lib.optional guileBindings guile;
-
-  propagatedBuildInputs = [ nettle ];
-
-  doCheck = true;
-
-  meta = {
-    description = "The GNU Transport Layer Security Library";
-
-    longDescription = ''
-       GnuTLS is a project that aims to develop a library which
-       provides a secure layer, over a reliable transport
-       layer. Currently the GnuTLS library implements the proposed
-       standards by the IETF's TLS working group.
-
-       Quoting from the TLS protocol specification:
-
-       "The TLS protocol provides communications privacy over the
-       Internet. The protocol allows client/server applications to
-       communicate in a way that is designed to prevent eavesdropping,
-       tampering, or message forgery."
-    '';
-
-    homepage = http://www.gnu.org/software/gnutls/;
-    license = "LGPLv2.1+";
-
-    maintainers = [ ];
-    broken = true; # CVE-2014-0092
-  };
-}
-- 
GitLab


From 24cf6afa05d6b6d3a207a928e4baa7588708ca8f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 23 Feb 2014 22:10:14 -0600
Subject: [PATCH 1874/3789] nixos: add Tarsnap backup service module

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/module-list.nix             |   3 +-
 nixos/modules/services/backup/tarsnap.nix | 200 ++++++++++++++++++++++
 2 files changed, 202 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/backup/tarsnap.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 76620f1d02a..94c1667d39d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -78,8 +78,9 @@
   ./services/backup/bacula.nix
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
-  ./services/backup/sitecopy-backup.nix
   ./services/backup/rsnapshot.nix
+  ./services/backup/sitecopy-backup.nix
+  ./services/backup/tarsnap.nix
   ./services/databases/4store-endpoint.nix
   ./services/databases/4store.nix
   ./services/databases/couchdb.nix
diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
new file mode 100644
index 00000000000..3395a0b5263
--- /dev/null
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -0,0 +1,200 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.tarsnap;
+
+  optionalNullStr = e: v: if e == null then "" else v;
+
+  configFile = pkgs.writeText "tarsnap.conf" ''
+    cachedir ${cfg.cachedir}
+    keyfile  ${cfg.keyfile}
+    ${optionalString cfg.nodump "nodump"}
+    ${optionalString cfg.printStats "print-stats"}
+    ${optionalNullStr cfg.checkpointBytes "checkpoint-bytes "+cfg.checkpointBytes}
+    ${optionalString cfg.aggressiveNetworking "aggressive-networking"}
+    ${concatStringsSep "\n" (map (v: "exclude "+v) cfg.excludes)}
+    ${concatStringsSep "\n" (map (v: "include "+v) cfg.includes)}
+    ${optionalString cfg.lowmem "lowmem"}
+    ${optionalString cfg.verylowmem "verylowmem"}
+  '';
+in
+{
+  options = {
+    services.tarsnap = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If enabled, NixOS will periodically create backups of the
+          specified directories using the <literal>tarsnap</literal>
+          backup service. This installs a <literal>systemd</literal>
+          service called <literal>tarsnap-backup</literal> which is
+          periodically run by cron, or you may run it on-demand.
+        '';
+      };
+
+      label = mkOption {
+        type = types.str;
+        default = "nixos";
+        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-20140301021501</literal>.
+        '';
+      };
+
+      cachedir = mkOption {
+        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.
+        '';
+      };
+
+      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.
+        '';
+      };
+
+      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 update 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.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions =
+      [ { assertion = cfg.directories != [];
+          message = "Must specify directories for Tarsnap to back up";
+        }
+        { assertion = cfg.lowmem -> !cfg.verylowmem && (cfg.verylowmem -> !cfg.lowmem);
+          message = "You cannot set both lowmem and verylowmem";
+        }
+      ];
+
+    systemd.services.tarsnap-backup = {
+      description = "Tarsnap Backup process";
+      path = [ pkgs.tarsnap pkgs.coreutils ];
+      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}
+      '';
+    };
+
+    services.cron.systemCronJobs = optional cfg.enable
+      "${cfg.period} root ${config.systemd.package}/bin/systemctl start tarsnap-backup.service";
+
+    environment.systemPackages = [ pkgs.tarsnap ];
+  };
+}
-- 
GitLab


From 10787951ab332f97746bf69750c78ee6b2312027 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 7 Mar 2014 15:37:02 +0100
Subject: [PATCH 1875/3789] tarsnap: mention getting started page

---
 nixos/modules/services/backup/tarsnap.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 3395a0b5263..03fbd29a191 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -32,6 +32,9 @@ in
           backup service. This installs a <literal>systemd</literal>
           service called <literal>tarsnap-backup</literal> which is
           periodically run by cron, or you may run it on-demand.
+
+          See <link xlink:href='http://www.tarsnap.com/gettingstarted.html'>Getting Started</link> 
+          Tarsnap page.
         '';
       };
 
-- 
GitLab


From 8de3d9976cae09eaf45196d17ec02ff82927e47f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 7 Mar 2014 16:02:29 +0100
Subject: [PATCH 1876/3789] Revert "Add nvidiabl kernel module"

This reverts commit d1cc2c6c37ecb9eabaa951e195960cd14ddc3a9e.
---
 pkgs/top-level/all-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd1624c616c..1715544711c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6880,8 +6880,6 @@ let
 
     broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
 
-    nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
-
     nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { };
 
     nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { };
-- 
GitLab


From 7047235acbff9ed298c1cd1b3753c5dec01b7336 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 7 Mar 2014 16:08:38 +0100
Subject: [PATCH 1877/3789] Now properly add nvidiabl.

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

diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix
new file mode 100644
index 00000000000..6260134bf11
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidiabl/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, kernel }:
+
+stdenv.mkDerivation {
+  name = "nvidiabl-0.85-${kernel.version}";
+
+  src = fetchurl {
+    url = "https://github.com/guillaumezin/nvidiabl/archive/v0.85.tar.gz";
+    sha256 = "1c7ar39wc8jpqh67sw03lwnyp0m9l6dad469ybqrgcywdiwxspwj";
+  };
+
+  preConfigure = ''
+    sed -i 's|/sbin/depmod|#/sbin/depmod|' Makefile
+  '';
+
+  makeFlags = [
+    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    "DESTDIR=$(out)"
+  ];
+
+  meta = {
+    description = "Linux driver for setting the backlight brightness on laptops using NVIDIA GPU";
+    homepage = https://github.com/guillaumezin/nvidiabl;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1715544711c..bd1624c616c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6880,6 +6880,8 @@ let
 
     broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
 
+    nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
+
     nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { };
 
     nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { };
-- 
GitLab


From 1dd36bc23fed1deb7fa3a066565a6d192804f4a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 7 Mar 2014 16:16:07 +0100
Subject: [PATCH 1878/3789] remove gnutls2 leftovers

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd1624c616c..6ef01129bf6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4383,10 +4383,6 @@ let
 
   gnutls = gnutls32;
 
-  gnutls2 = callPackage ../development/libraries/gnutls/2.12.nix {
-    guileBindings = config.gnutls.guile or false;
-  };
-
   gnutls31 = callPackage ../development/libraries/gnutls/3.1.nix {
     guileBindings = config.gnutls.guile or false;
   };
@@ -4396,7 +4392,6 @@ let
   };
 
   gnutls_with_guile = lowPrio (gnutls.override { guileBindings = true; });
-  gnutls2_with_guile = lowPrio (gnutls2.override { guileBindings = true; });
 
   gpac = callPackage ../applications/video/gpac { };
 
-- 
GitLab


From eb8cf5427e4e7d4fa6c4be1ac79581e14712b74c Mon Sep 17 00:00:00 2001
From: Dario Bertini <berdario@gmail.com>
Date: Fri, 7 Mar 2014 16:43:01 +0100
Subject: [PATCH 1879/3789] Avoid using a global implicitly defined java binary

---
 .../applications/networking/instant-messengers/jitsi/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index 9cefee228c8..e6dd6569a55 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
     mkdir $out/bin
     cp resources/install/generic/run.sh $out/bin/jitsi
     chmod +x $out/bin/jitsi
+    sed -i 's| java | ${jdk}/bin/java |' $out/bin/jitsi
     patchShebangs $out
   '';
 
-- 
GitLab


From 649e7d6fdb03bb29d477346f6e5466535dc94f1b Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 7 Mar 2014 16:50:40 +0100
Subject: [PATCH 1880/3789] python wrap.sh: wrap pypy and python shebangs

---
 pkgs/development/python-modules/generic/wrap.sh | 6 +++---
 pkgs/top-level/python-packages.nix              | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index bd1f526900a..282aeca9ed1 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -18,11 +18,11 @@ wrapPythonProgramsIn() {
     for i in $(find "$dir" -type f -perm +0100); do
 
         # Rewrite "#! .../env python" to "#! /nix/store/.../python".
-        if head -n1 "$i" | grep -q '#!.*/env.*python'; then
-            sed -i "$i" -e "1 s^.*/env[ ]*python^#! $python^"
+        if head -n1 "$i" | grep -q '#!.*/env.*\(python\|pypy\)'; then
+            sed -i "$i" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^"
         fi
         
-        if head -n1 "$i" | grep -q /@executable_name@; then
+        if head -n1 "$i" | grep -q '/python\|/pypy'; then
             # dont wrap EGG-INFO scripts since they are called from python
             if echo "$i" | grep -v EGG-INFO/scripts; then
                 echo "wrapping \`$i'..."
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 544ae1694b9..2c7123a98d4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28,7 +28,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   wrapPython = pkgs.makeSetupHook
     { deps = pkgs.makeWrapper;
       substitutions.libPrefix = python.libPrefix;
-      substitutions.executable_name = python.executable;
       substitutions.executable = "${python}/bin/${python.executable}";
     }
    ../development/python-modules/generic/wrap.sh;
-- 
GitLab


From fcc6d2812625e0a4189b7988c9a58abf430f78a3 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 7 Mar 2014 17:34:54 +0100
Subject: [PATCH 1881/3789] garden

---
 pkgs/tools/cd-dvd/vobsub2srt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix
index b0918bfb421..30ae07f9dbd 100644
--- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix
+++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = https://github.com/ruediger/VobSub2SRT;
     description = "Converts VobSub subtitles into SRT subtitles";
-    license = stdenv.lib.libraries.gpl3Plus;
+    license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.ttuegel ];
   };
-- 
GitLab


From df5639183c852614be773a2ec7655556224a3f23 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 7 Mar 2014 11:20:18 -0600
Subject: [PATCH 1882/3789] Claim maintainership of recently added packages

Also set platforms for some packages where it was missing.
---
 pkgs/applications/audio/clementine/default.nix             | 1 +
 pkgs/applications/misc/pcmanfm/default.nix                 | 6 ++++--
 pkgs/development/libraries/libfm/default.nix               | 6 ++++--
 pkgs/development/libraries/menu-cache/default.nix          | 6 ++++--
 pkgs/development/libraries/science/math/arpack/default.nix | 1 +
 pkgs/misc/themes/qtcurve/default.nix                       | 7 ++++---
 pkgs/tools/misc/kde-gtk-config/default.nix                 | 7 ++++---
 7 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index cf554f83c8b..4352e2e133a 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -44,5 +44,6 @@ stdenv.mkDerivation {
     description = "A multiplatform music player";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
+    maintainers = [ maintainers.ttuegel ];
   };
 }
diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix
index 3700dc34d3d..f7180097961 100644
--- a/pkgs/applications/misc/pcmanfm/default.nix
+++ b/pkgs/applications/misc/pcmanfm/default.nix
@@ -9,9 +9,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ glib gtk intltool libfm libX11 pango pkgconfig ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://blog.lxde.org/?cat=28/";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
     description = "File manager with GTK+ interface";
+    maintainers = [ maintainers.ttuegel ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix
index 2a901d36761..7a005c9fda2 100644
--- a/pkgs/development/libraries/libfm/default.nix
+++ b/pkgs/development/libraries/libfm/default.nix
@@ -9,9 +9,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ glib gtk intltool menu-cache pango pkgconfig vala ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://blog.lxde.org/?cat=28/";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
     description = "A glib-based library for file management";
+    maintainers = [ maintainers.ttuegel ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix
index b22d1e7669f..8e2e202f432 100644
--- a/pkgs/development/libraries/menu-cache/default.nix
+++ b/pkgs/development/libraries/menu-cache/default.nix
@@ -9,9 +9,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ glib pkgconfig ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://blog.lxde.org/?tag=menu-cache";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
     description = "Library to read freedesktop.org menu files";
+    maintainers = [ maintainers.ttuegel ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 20b24d10fe6..cd56287f6ca 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation {
     description = "A collection of Fortran77 subroutines to solve large scale eigenvalue problems";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.ttuegel ];
   };
 }
diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix
index 017a47349a9..ec5feb27c85 100644
--- a/pkgs/misc/themes/qtcurve/default.nix
+++ b/pkgs/misc/themes/qtcurve/default.nix
@@ -28,10 +28,11 @@ stdenv.mkDerivation {
     -DQTC_QT4_ENABLE_KWIN=ON
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/QtCurve/qtcurve;
     description = "Widget styles for Qt4/KDE4 and gtk2";
-    platforms = stdenv.lib.platforms.linux;
-    license = "LGPLv2.1+";
+    platforms = platforms.linux;
+    license = licenses.lgpl21Plus;
+    maintainers = [ maintainers.ttuegel ];
   };
 }
diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix
index e9f0af2815a..873d2adde7f 100644
--- a/pkgs/tools/misc/kde-gtk-config/default.nix
+++ b/pkgs/tools/misc/kde-gtk-config/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     -DKDE4_LIBEXEC_INSTALL_DIR=lib/kde4/libexec
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://projects.kde.org/projects/extragear/base/kde-gtk-config;
     description = "GTK configuration module for KDE System Settings";
     longDescription = ''
@@ -43,7 +43,8 @@ stdenv.mkDerivation {
       - Select GTK applications default fonts.
       - Easily browse and install new GTK2 and GTK3 themes.
     '';
-    platforms = stdenv.lib.platforms.linux;
-    license = "GPLv3";
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.ttuegel ];
   };
 }
-- 
GitLab


From 9af5d4731deb12d87d50ddf6ca3190d2c9da9bd6 Mon Sep 17 00:00:00 2001
From: Ellis Whitehead <ellis@ellisw.net>
Date: Fri, 7 Mar 2014 19:39:55 +0100
Subject: [PATCH 1883/3789] typo: occured -> occurred

---
 nixos/modules/installer/tools/nixos-option.sh | 2 +-
 nixos/modules/system/boot/stage-1-init.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index 60cee2519da..edc94d73208 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -228,7 +228,7 @@ else
     escapeQuotes () { eval echo "$1"; }
     nixMap escapeQuotes "$names"
   else
-    echo 1>&2 "An error occured while looking for attribute names."
+    echo 1>&2 "An error occurred while looking for attribute names."
     echo $result
   fi
 fi
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 97c688ce590..d0f4576f811 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -14,7 +14,7 @@ fail() {
     # in an interactive shell.
     cat <<EOF
 
-An error occured in stage 1 of the boot process, which must mount the
+An error occurred in stage 1 of the boot process, which must mount the
 root filesystem on \`$targetRoot' and then start stage 2.  Press one
 of the following keys:
 
-- 
GitLab


From ab75d0fd77600aed5b0189cb94e81ff91d555e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 7 Mar 2014 19:18:30 +0100
Subject: [PATCH 1884/3789] Add romildo to maintainers list

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 6feafbcd3b1..73c288231c8 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -59,6 +59,7 @@
   rob = "Rob Vermaas <rob.vermaas@gmail.com>";
   roconnor = "Russell O'Connor <roconnor@theorem.ca>";
   roelof = "Roelof Wobben <rwobben@hotmail.com>";
+  romildo = "José Romildo Malaquias <malaquias@gmail.com>";
   rszibele = "Richard Szibele <richard_szibele@hotmail.com>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
   shlevy = "Shea Levy <shea@shealevy.com>";
-- 
GitLab


From 69a3372f3f0e2f869c06a1005c9d4bd5e0337283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 7 Mar 2014 19:42:29 +0100
Subject: [PATCH 1885/3789] Added hexchat

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

diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
new file mode 100644
index 00000000000..f1cc7df1904
--- /dev/null
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, gtk, perl, python, gettext
+, libtool, pciutils, dbus_glib, libcanberra, libproxy
+, libsexy, enchant, libnotify, openssl
+, desktop_file_utils, hicolor_icon_theme
+}:
+
+stdenv.mkDerivation rec {
+  version = "2.9.6.1";
+  name = "hexchat-${version}";
+
+  src = fetchurl {
+    url = "http://dl.hexchat.net/hexchat/${name}.tar.xz";
+    sha256 = "0w34jr1pqril6r011fwxv40m17bnb88q9cv5hf08mv0a9lygyrv2";
+  };
+
+  buildInputs = [
+    pkgconfig gtk perl python gettext
+    libtool pciutils dbus_glib libcanberra libproxy
+    libsexy libnotify openssl
+    desktop_file_utils hicolor_icon_theme
+  ];
+
+  configureFlags = [ "--enable-shm" "--enable-textfe" ];
+
+  meta = {
+    description = "A popular and easy to use graphical IRC (chat) client";
+    homepage = http://hexchat.github.io/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66d7dda7d1a..9441da57ccd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8204,6 +8204,8 @@ let
 
   herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
 
+  hexchat = callPackage ../applications/networking/irc/hexchat { };
+
   hexedit = callPackage ../applications/editors/hexedit { };
 
   hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { };
-- 
GitLab


From 41e0214bb1ecc367190a60a805d36ff1e32d1948 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 22:51:39 +0100
Subject: [PATCH 1886/3789] R: update to version 3.0.3

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

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 6c8ec9e68c5..88f4653cf7b 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "R-3.0.2";
+  name = "R-3.0.3";
 
   src = fetchurl {
     url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "0jq2vk6bgksbvgmdjvv7vfj6llp091d0nhl5j825aya4c2nhavlm";
+    sha256 = "1mp6zp25nycn8bxnnq97gq6n21c6vprm6qc4drwap57j82azsz5r";
   };
 
   buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt
-- 
GitLab


From 51bb0bf69739ed98ca4499a3d6aca82a88b5adfe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Mar 2014 11:29:30 +0100
Subject: [PATCH 1887/3789] haskell-hsini: add version 0.2

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

diff --git a/pkgs/development/libraries/haskell/hsini/default.nix b/pkgs/development/libraries/haskell/hsini/default.nix
new file mode 100644
index 00000000000..256b6995af1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hsini/default.nix
@@ -0,0 +1,19 @@
+{ cabal, HUnit, mtl, parsec, QuickCheck, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hsini";
+  version = "0.2";
+  sha256 = "0d9dhzaw2v9r0hb4lywzw4f0inijbcw5brc5dh45zfkalmn3aqam";
+  buildDepends = [ mtl parsec ];
+  testDepends = [
+    HUnit mtl parsec QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 testFrameworkTh
+  ];
+  meta = {
+    description = "Package for user configuration files (INI)";
+    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 e006f66938b..3ff96831c00 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1431,6 +1431,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   HSH = callPackage ../development/libraries/haskell/HSH {};
 
+  hsini = callPackage ../development/libraries/haskell/hsini {};
+
   HsSyck = callPackage ../development/libraries/haskell/HsSyck {};
 
   HsOpenSSL = callPackage ../development/libraries/haskell/HsOpenSSL {};
-- 
GitLab


From 21bce30e6c02737d489a2624ee9a6fdab8af6cad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Mar 2014 11:29:35 +0100
Subject: [PATCH 1888/3789] haskell-esqueleto: update to version 1.3.4.6

---
 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 3bbd8681ddb..4d11aeaf700 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.4.5";
-  sha256 = "0fw57dn67gx5v7drd4g7xbj1z614sr3lxw7gcciypnjc7qkqjgv7";
+  version = "1.3.4.6";
+  sha256 = "1mqjgc1glnfivrmw77mk6mqr02gp6l3jlvpz5ysiii42c1bp55n0";
   buildDepends = [
     conduit monadLogger persistent resourcet tagged text transformers
     unorderedContainers
-- 
GitLab


From 97d6b9e9253a6aff22614aa653df23bf25723350 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Mar 2014 11:29:37 +0100
Subject: [PATCH 1889/3789] haskell-mime-mail: update to version 0.4.4.1

---
 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 e88dee9fa51..fe8a9a35176 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.4";
-  sha256 = "1y0fss53z1mvykpfkp28zwic2mb7zhf02lwxdr22n34hjzk34g9b";
+  version = "0.4.4.1";
+  sha256 = "0jzbkrd62alvgyx9bkrzicz88hjjnnavpv6hl22cxnirz41h8hw0";
   buildDepends = [
     base64Bytestring blazeBuilder filepath random text
   ];
-- 
GitLab


From 212fdb0afe429d3ae9bb54201ffe66f0d8557771 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Mar 2014 11:29:39 +0100
Subject: [PATCH 1890/3789] haskell-postgresql-libpq: update to version 0.9.0.0

---
 .../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 2208955a9d8..d630f063391 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.8.2.6";
-  sha256 = "0n3lqffscwc6pq0rfy4yjild9hcgnkpq9a8icbvgxv4si13ipsgh";
+  version = "0.9.0.0";
+  sha256 = "09bi0npvly02zjhp463bmzm1n8w1cqsln676z82xi2in86317pv3";
   extraLibraries = [ postgresql ];
   meta = {
     homepage = "http://github.com/lpsmith/postgresql-libpq";
-- 
GitLab


From 736bda8a0ee65c6aa5119560026aebcce0e4685e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Mar 2014 11:29:40 +0100
Subject: [PATCH 1891/3789] haskell-LambdaHack: update to version 0.2.12

---
 pkgs/games/LambdaHack/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix
index c9fd9706c0e..93277eb15a2 100644
--- a/pkgs/games/LambdaHack/default.nix
+++ b/pkgs/games/LambdaHack/default.nix
@@ -1,18 +1,19 @@
-{ cabal, assertFailure, binary, ConfigFile, deepseq, enummapsetTh
-, filepath, gtk, hashable, keys, miniutter, mtl, prettyShow, random
-, stm, text, transformers, unorderedContainers, zlib
+{ cabal, assertFailure, binary, deepseq, enummapsetTh, filepath
+, gtk, hashable, hsini, keys, miniutter, mtl, prettyShow, random
+, stm, text, transformers, unorderedContainers, vector
+, vectorBinaryInstances, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "LambdaHack";
-  version = "0.2.10.6";
-  sha256 = "19ak0ygw38b51wkm4p10xgdk3h9mh5vvb8c60qhs7cmgzjcph38n";
+  version = "0.2.12";
+  sha256 = "0ics1z376qyagkzg58mqqw7cbkjpkik57l8570qmk589nkhck86n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    assertFailure binary ConfigFile deepseq enummapsetTh filepath gtk
-    hashable keys miniutter mtl prettyShow random stm text transformers
-    unorderedContainers zlib
+    assertFailure binary deepseq enummapsetTh filepath gtk hashable
+    hsini keys miniutter mtl prettyShow random stm text transformers
+    unorderedContainers vector vectorBinaryInstances zlib
   ];
   jailbreak = true;
   meta = {
-- 
GitLab


From 757a690e2e17862cf0a7328cd661675eb2ebd21f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Mar 2014 15:14:30 +0100
Subject: [PATCH 1892/3789] haskell-hsini: disable test suite to avoid build
 errors caused by a bogus cabal file

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

diff --git a/pkgs/development/libraries/haskell/hsini/default.nix b/pkgs/development/libraries/haskell/hsini/default.nix
index 256b6995af1..45e03ad7144 100644
--- a/pkgs/development/libraries/haskell/hsini/default.nix
+++ b/pkgs/development/libraries/haskell/hsini/default.nix
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
     HUnit mtl parsec QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2 testFrameworkTh
   ];
+  doCheck = false;
   meta = {
     description = "Package for user configuration files (INI)";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From 5446f60e8af7a30c9a13963b01e049cc75d06b57 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Mar 2014 15:21:58 +0100
Subject: [PATCH 1893/3789] haskell-time: update to version 1.4.2

---
 .../libraries/haskell/time/{1.4.1.nix => 1.4.2.nix}           | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/development/libraries/haskell/time/{1.4.1.nix => 1.4.2.nix} (85%)

diff --git a/pkgs/development/libraries/haskell/time/1.4.1.nix b/pkgs/development/libraries/haskell/time/1.4.2.nix
similarity index 85%
rename from pkgs/development/libraries/haskell/time/1.4.1.nix
rename to pkgs/development/libraries/haskell/time/1.4.2.nix
index 1e675110190..ff9818a387d 100644
--- a/pkgs/development/libraries/haskell/time/1.4.1.nix
+++ b/pkgs/development/libraries/haskell/time/1.4.2.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "time";
-  version = "1.4.1";
-  sha256 = "04ndcp7m1a7mia4by15dqrwl5k0d2477x20s6xcrdb7in8w9ccvp";
+  version = "1.4.2";
+  sha256 = "1kpsak2wka23c8591ry6i1d7hmd54s7iw5n6hpx48jhcxf1w199h";
   buildDepends = [ deepseq ];
   testDepends = [
     Cabal deepseq QuickCheck testFramework testFrameworkQuickcheck2
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3ff96831c00..dd26587f583 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2432,7 +2432,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   threepennyGui = callPackage ../development/libraries/haskell/threepenny-gui {};
 
   time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {};
-  time_1_4_1 = callPackage ../development/libraries/haskell/time/1.4.1.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;
-- 
GitLab


From f5b3367e927e787ab836019f8d615013faa2ff25 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Mar 2014 15:23:36 +0100
Subject: [PATCH 1894/3789] haskell-Cabal: update to version 1.18.1.3

---
 .../haskell/Cabal/{1.18.1.2.nix => 1.18.1.3.nix}     |  4 ++--
 pkgs/top-level/haskell-defaults.nix                  |  6 +++---
 pkgs/top-level/haskell-packages.nix                  | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename pkgs/development/libraries/haskell/Cabal/{1.18.1.2.nix => 1.18.1.3.nix} (89%)

diff --git a/pkgs/development/libraries/haskell/Cabal/1.18.1.2.nix b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix
similarity index 89%
rename from pkgs/development/libraries/haskell/Cabal/1.18.1.2.nix
rename to pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix
index 024a4d5c135..0ef09dc49b1 100644
--- a/pkgs/development/libraries/haskell/Cabal/1.18.1.2.nix
+++ b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Cabal";
-  version = "1.18.1.2";
-  sha256 = "0pbg9d40lskcps248fdcnm4hnib3vl10mbcdf830zw45q29gfkjr";
+  version = "1.18.1.3";
+  sha256 = "1m1m6f00sc4w0s5hnqy2z05rnaihaw1jy03bidc5pl6r1llkdi15";
   buildDepends = [ deepseq filepath time ];
   testDepends = [
     extensibleExceptions filepath HUnit QuickCheck regexPosix
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index a3c3a10b44c..3034367c39e 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -80,7 +80,7 @@
       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_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; };
+      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;
@@ -102,7 +102,7 @@
       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_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; };
+      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;
@@ -126,7 +126,7 @@
       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_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; };
+      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;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index dd26587f583..b590eeb206a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -555,14 +555,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {};
 
   ariadne = callPackage ../development/libraries/haskell/ariadne {
-    Cabal = self.Cabal_1_18_1_2;
+    Cabal = self.Cabal_1_18_1_3;
     haskellPackages = self.haskellPackages.override {
-      Cabal = self.Cabal_1_18_1_2;
+      Cabal = self.Cabal_1_18_1_3;
     };
     haskellNames = self.haskellNames.override {
-      Cabal = self.Cabal_1_18_1_2;
+      Cabal = self.Cabal_1_18_1_3;
       haskellPackages = self.haskellPackages.override {
-        Cabal = self.Cabal_1_18_1_2;
+        Cabal = self.Cabal_1_18_1_3;
       };
     };
   };
@@ -709,7 +709,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_2 = callPackage ../development/libraries/haskell/Cabal/1.18.1.2.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 = null; # core package in GHC
 
   cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};
@@ -2863,7 +2863,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   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_2 = callPackage ../tools/package-management/cabal-install/1.18.0.2.nix {
-    Cabal = self.Cabal_1_18_1_2;
+    Cabal = self.Cabal_1_18_1_3;
   };
   cabalInstall = self.cabalInstall_1_18_0_2;
 
-- 
GitLab


From a9056be563025d8e72afeecec3410701edb0a342 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Mar 2014 15:25:13 +0100
Subject: [PATCH 1895/3789] persistent-postgresql: jailbrek to fix build with
 recent postgresql-libpq

---
 .../libraries/haskell/persistent-postgresql/default.nix          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
index 9853969d9f1..acb7b3ce5b5 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
     aeson blazeBuilder conduit monadControl persistent postgresqlLibpq
     postgresqlSimple text time transformers
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
     description = "Backend for the persistent library using postgresql";
-- 
GitLab


From 368ce12cd59ab9c88245ae735111db2346c01c04 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Mar 2014 13:49:00 +0100
Subject: [PATCH 1896/3789] LambdaHack: use consistent versions of the 'binary'
 package

---
 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 b590eeb206a..5ac472e27db 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2885,7 +2885,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   # Games.
 
-  LambdaHack = callPackage ../games/LambdaHack {};
+  LambdaHack = callPackage ../games/LambdaHack {
+    binary = self.binary_0_7_1_0;
+    vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_1_0; };
+  };
 
   MazesOfMonad = callPackage ../games/MazesOfMonad {};
 
-- 
GitLab


From 7b898a1d6a3d0504da6db668f35ca39ec6db55f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:16:33 +0100
Subject: [PATCH 1897/3789] yap: revert update from 6.2.2 to 6.3.3

This reverts commit 41c662dcf68ce41c64ceb73a2f21a8aac09eb41e. The update
doesn't compile in i686, and I don't have time to investigate at the moment.
---
 pkgs/development/compilers/yap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index af604792f83..a29c0de65b8 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, readline, gmp, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "6.3.3";
+  version = "6.2.2";
   name = "yap-${version}";
 
   src = fetchurl {
     url = "http://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz";
-    sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf";
+    sha256 = "0l6p0vy667wws64cvwf74ssl6h9gypjzrsl3b2d32hs422186pzi";
   };
 
   buildInputs = [ readline gmp zlib ];
-- 
GitLab


From 34caf106da56f631176f44be1501c056f3363175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 7 Mar 2014 23:04:41 +0100
Subject: [PATCH 1898/3789] swig: add meta.platforms (set to linux)

So that Hydra will build swig. This provides binary packages to users
and build breakage detection.
---
 pkgs/development/tools/misc/swig/2.x.nix     | 2 ++
 pkgs/development/tools/misc/swig/default.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix
index 2066ead51a1..b51ce0f2d5a 100644
--- a/pkgs/development/tools/misc/swig/2.x.nix
+++ b/pkgs/development/tools/misc/swig/2.x.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
     # 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/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index 1f37fd87f8a..d489feba4dc 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
     # Licensing is a mess: http://www.swig.org/Release/LICENSE .
     license = "BSD-style";
 
+    platforms = stdenv.lib.platforms.linux;
+
     maintainers = [ ];
   };
 }
-- 
GitLab


From 084ff142add143e8b622ab1f6d3910cb8a086880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 7 Mar 2014 23:06:15 +0100
Subject: [PATCH 1899/3789] gnuradio: wrap example programs too

Without this the examples don't work. Example:

$ /nix/store/HASH-gnuradio-3.7.1/share/gnuradio/examples/uhd/usrp_am_mw_rcv.py
Traceback (most recent call last):
  File "/nix/store/HASH-gnuradio-3.7.1/share/gnuradio/examples/uhd/usrp_am_mw_rcv.py", line 24, in <module>
    from gnuradio import gr, eng_notation
ImportError: No module named gnuradio
---
 pkgs/applications/misc/gnuradio/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index 08d2b29a92a..7ef9fbf351f 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc"
 
-    for file in "$out"/bin/*; do
+    for file in "$out"/bin/* "$out"/share/gnuradio/examples/*/*.py; do
         wrapProgram "$file" \
             --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") \
             --set MATPLOTLIBRC "$out/share/gnuradio"
-- 
GitLab


From b0ec4b54e760e70b15d524ef3dfd1991bac817dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 7 Mar 2014 23:41:36 +0100
Subject: [PATCH 1900/3789] gnuradio: update 3.7.1 -> 3.7.2.1

I verified that gnuradio-companion (the GUI) still starts.
---
 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 7ef9fbf351f..3fc3e1e8e5f 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.1";
+  version = "3.7.2.1";
 
   src = fetchurl {
     url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz";
-    sha256 = "1kfni8vpgr6v9rdiz3zsmwc07qj6zka9x22z2y0y4rak2xnzdxz9";
+    sha256 = "101wr19nxfc5x7i4s10vgrypaa0vj2pkg8b2vn5j5s9iv8gpwswc";
   };
 
   buildInputs = [
-- 
GitLab


From 09f0d1f66157fecfa057521603a087269f3d5add Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 7 Mar 2014 20:23:52 -0600
Subject: [PATCH 1901/3789] mono: 2.11.4 -> 3.2.8

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/mono/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index 88bef618f74..4b6bfca609c 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -1,10 +1,11 @@
 {stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11}:
 
 stdenv.mkDerivation rec {
-  name = "mono-2.11.4";
+  name = "mono-${version}";
+  version = "3.2.8";
   src = fetchurl {
     url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
-    sha256 = "0wv8pnj02mq012sihx2scx0avyw51b5wb976wn7x86zda0vfcsnr";
+    sha256 = "0h0s42pmgrhwqaym0b1401h70dcpr179ngcsp7f8i4hl4snqrd7x";
   };
 
   buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11];
-- 
GitLab


From fb055c10f6ef824d9ac7bee546bb8163064a9104 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 7 Mar 2014 20:27:02 -0600
Subject: [PATCH 1902/3789] Make my packages slightly more consistent.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/networking/cluster/spark/default.nix | 2 +-
 pkgs/os-specific/linux/checksec/default.nix            | 2 +-
 pkgs/os-specific/linux/ktap/default.nix                | 2 +-
 pkgs/tools/security/cb0cat/default.nix                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 34c3af16126..61f2d0c6e20 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -120,8 +120,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Spark cluster computing";
     homepage    = "http://spark.incubator.apache.org";
-    platforms   = stdenv.lib.platforms.all;
     license     = stdenv.lib.licenses.asl20;
+    platforms   = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix
index 0f3b87361f8..4701d774dfd 100644
--- a/pkgs/os-specific/linux/checksec/default.nix
+++ b/pkgs/os-specific/linux/checksec/default.nix
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A tool for checking security bits on executables";
     homepage    = "http://www.trapkit.de/tools/checksec.html";
-    platforms   = stdenv.lib.platforms.linux;
     license     = stdenv.lib.licenses.bsd3;
+    platforms   = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/pkgs/os-specific/linux/ktap/default.nix b/pkgs/os-specific/linux/ktap/default.nix
index 54209673359..a82804cb837 100644
--- a/pkgs/os-specific/linux/ktap/default.nix
+++ b/pkgs/os-specific/linux/ktap/default.nix
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A lightweight script-based dynamic tracing tool for Linux.";
     homepage    = "http://www.ktap.org";
-    platforms   = stdenv.lib.platforms.linux;
     license     = stdenv.lib.licenses.gpl2;
+    platforms   = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/pkgs/tools/security/cb0cat/default.nix b/pkgs/tools/security/cb0cat/default.nix
index 251c9126056..0f84cfa6ebc 100644
--- a/pkgs/tools/security/cb0cat/default.nix
+++ b/pkgs/tools/security/cb0cat/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "cryptographic tool based on the CBEAMr0 sponge function";
     homepage    = "https://www.cblnk.com";
-    platforms   = stdenv.lib.platforms.unix;
     license     = stdenv.lib.licenses.bsd3;
+    platforms   = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }
-- 
GitLab


From fa118fc6777d5ddaf8e91911b007a642c7e10b73 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 7 Mar 2014 20:52:26 -0600
Subject: [PATCH 1903/3789] coq: 8.4pl2 -> 8.4pl3

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 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 b4a7a203a3c..46706dded6d 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.4pl2";
+  version = "8.4pl3";
   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 = "1n52pky7bb45irk2jw6f4rd3kvy8lm2yfldjwdhiic0kyqw9lwgv";
+    sha256 = "0f7v3j4zsrhpswdh47bb30vwgsr0ck79jkkz01a5a74qgxiksn4p";
   };
 
   buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
-- 
GitLab


From c0f779ceee97f60dfcb9de8872a310e7390c15c6 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 7 Mar 2014 20:52:33 -0600
Subject: [PATCH 1904/3789] coq: add myself to maintainer list.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 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 46706dded6d..aa3ba878eb5 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
     '';
     homepage = "http://coq.inria.fr";
     license = "LGPL";
-    maintainers = [ stdenv.lib.maintainers.roconnor ];
+    maintainers = with stdenv.lib.maintainers; [ roconnor thoughtpolice ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From 3b69f4b109c384573b8107f7cf8518f1d4e19874 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 7 Mar 2014 20:53:12 -0600
Subject: [PATCH 1905/3789] mono: add myself to maintainer list.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 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 4b6bfca609c..1f4d8dcef6f 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     homepage = http://mono-project.com/;
     description = "Cross platform, open source .NET development framework";
     platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice ];
     license = "free"; # Combination of LGPL/X11/GPL ?
   };
 }
-- 
GitLab


From cbe7e0b5f0588a5a213605ef907ecabfad7c7293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 8 Mar 2014 10:23:38 +0100
Subject: [PATCH 1906/3789] glibc: fix a math problem by upstream patch

---
 .../libraries/glibc/2.19/common.nix           |   2 +
 .../libraries/glibc/2.19/fix-math.patch       | 336 ++++++++++++++++++
 2 files changed, 338 insertions(+)
 create mode 100644 pkgs/development/libraries/glibc/2.19/fix-math.patch

diff --git a/pkgs/development/libraries/glibc/2.19/common.nix b/pkgs/development/libraries/glibc/2.19/common.nix
index 6823e4d9f66..b153d91934b 100644
--- a/pkgs/development/libraries/glibc/2.19/common.nix
+++ b/pkgs/development/libraries/glibc/2.19/common.nix
@@ -56,6 +56,8 @@ stdenv.mkDerivation ({
          "/bin:/usr/bin", which is inappropriate on NixOS machines. This
          patch extends the search path by "/run/current-system/sw/bin". */
       ./fix_path_attribute_in_getconf.patch
+
+      ./fix-math.patch
     ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/glibc/2.19/fix-math.patch b/pkgs/development/libraries/glibc/2.19/fix-math.patch
new file mode 100644
index 00000000000..516f53954dd
--- /dev/null
+++ b/pkgs/development/libraries/glibc/2.19/fix-math.patch
@@ -0,0 +1,336 @@
+From: Siddhesh Poyarekar <siddhesh@redhat.com>
+Date: Thu, 27 Feb 2014 15:42:09 +0000 (+0530)
+Subject: Fix sign of input to bsloww1 (BZ #16623)
+X-Git-Url: http://repo.or.cz/w/glibc.git/commitdiff_plain/1cadc85813d736f7682fa2eeadae639ab6b66c65
+
+Fix sign of input to bsloww1 (BZ #16623)
+
+In 84ba214c, I removed some redundant sign computations and in the
+process, I incorrectly got rid of a temporary variable, thus passing
+the absolute value of the input to bsloww1.  This caused #16623.
+
+This fix undoes the incorrect change.
+
+[nix]: drop docs update (wouldn't apply)
+---
+
+diff --git a/math/auto-libm-test-in b/math/auto-libm-test-in
+index ac5348f..fafe96f 100644
+--- a/math/auto-libm-test-in
++++ b/math/auto-libm-test-in
+@@ -594,6 +594,7 @@ cos 0x1.0000010b239a9p0
+ cos 0x1.00000162a932bp0
+ cos 0x1.000002d452a10p0
+ cos 0x1.000005bc7d86dp0
++cos 0x1.200145a975ce6p32
+ cos 1
+ cos 2
+ cos 3
+@@ -1748,6 +1749,7 @@ sin 7
+ sin 8
+ sin 9
+ sin 10
++sin 0x1.2001469775ce6p32
+ 
+ sincos 0
+ sincos -0
+diff --git a/math/auto-libm-test-out b/math/auto-libm-test-out
+index 8f79359..59c08a7 100644
+--- a/math/auto-libm-test-out
++++ b/math/auto-libm-test-out
+@@ -74446,6 +74446,75 @@ cos 0x1.000005bc7d86dp0
+ = cos tonearest ldbl-128ibm 0x1.000005bc7d86dp+0L : 0x8.a513ba9f703d3ffffffcb92354p-4L : inexact-ok
+ = cos towardzero ldbl-128ibm 0x1.000005bc7d86dp+0L : 0x8.a513ba9f703d3ffffffcb92354p-4L : inexact-ok
+ = cos upward ldbl-128ibm 0x1.000005bc7d86dp+0L : 0x8.a513ba9f703d3ffffffcb92358p-4L : inexact-ok
++cos 0x1.200145a975ce6p32
++= cos downward flt-32 0x1.200146p+32f : -0xf.74fbep-4f : inexact-ok
++= cos tonearest flt-32 0x1.200146p+32f : -0xf.74fbdp-4f : inexact-ok
++= cos towardzero flt-32 0x1.200146p+32f : -0xf.74fbdp-4f : inexact-ok
++= cos upward flt-32 0x1.200146p+32f : -0xf.74fbdp-4f : inexact-ok
++= cos downward dbl-64 0x1.200146p+32 : -0xf.74fbd5498fe5p-4 : inexact-ok
++= cos tonearest dbl-64 0x1.200146p+32 : -0xf.74fbd5498fe5p-4 : inexact-ok
++= cos towardzero dbl-64 0x1.200146p+32 : -0xf.74fbd5498fe48p-4 : inexact-ok
++= cos upward dbl-64 0x1.200146p+32 : -0xf.74fbd5498fe48p-4 : inexact-ok
++= cos downward ldbl-96-intel 0x1.200146p+32L : -0xf.74fbd5498fe4c0dp-4L : inexact-ok
++= cos tonearest ldbl-96-intel 0x1.200146p+32L : -0xf.74fbd5498fe4c0cp-4L : inexact-ok
++= cos towardzero ldbl-96-intel 0x1.200146p+32L : -0xf.74fbd5498fe4c0cp-4L : inexact-ok
++= cos upward ldbl-96-intel 0x1.200146p+32L : -0xf.74fbd5498fe4c0cp-4L : inexact-ok
++= cos downward ldbl-96-m68k 0x1.200146p+32L : -0xf.74fbd5498fe4c0dp-4L : inexact-ok
++= cos tonearest ldbl-96-m68k 0x1.200146p+32L : -0xf.74fbd5498fe4c0cp-4L : inexact-ok
++= cos towardzero ldbl-96-m68k 0x1.200146p+32L : -0xf.74fbd5498fe4c0cp-4L : inexact-ok
++= cos upward ldbl-96-m68k 0x1.200146p+32L : -0xf.74fbd5498fe4c0cp-4L : inexact-ok
++= cos downward ldbl-128 0x1.200146p+32L : -0xf.74fbd5498fe4c0c71bd9e4ef59e8p-4L : inexact-ok
++= cos tonearest ldbl-128 0x1.200146p+32L : -0xf.74fbd5498fe4c0c71bd9e4ef59e8p-4L : inexact-ok
++= cos towardzero ldbl-128 0x1.200146p+32L : -0xf.74fbd5498fe4c0c71bd9e4ef59ep-4L : inexact-ok
++= cos upward ldbl-128 0x1.200146p+32L : -0xf.74fbd5498fe4c0c71bd9e4ef59ep-4L : inexact-ok
++= cos downward ldbl-128ibm 0x1.200146p+32L : -0xf.74fbd5498fe4c0c71bd9e4ef5cp-4L : inexact-ok
++= cos tonearest ldbl-128ibm 0x1.200146p+32L : -0xf.74fbd5498fe4c0c71bd9e4ef58p-4L : inexact-ok
++= cos towardzero ldbl-128ibm 0x1.200146p+32L : -0xf.74fbd5498fe4c0c71bd9e4ef58p-4L : inexact-ok
++= cos upward ldbl-128ibm 0x1.200146p+32L : -0xf.74fbd5498fe4c0c71bd9e4ef58p-4L : inexact-ok
++= cos downward flt-32 0x1.200144p+32f : 0xf.bc96cp-4f : inexact-ok
++= cos tonearest flt-32 0x1.200144p+32f : 0xf.bc96dp-4f : inexact-ok
++= cos towardzero flt-32 0x1.200144p+32f : 0xf.bc96cp-4f : inexact-ok
++= cos upward flt-32 0x1.200144p+32f : 0xf.bc96dp-4f : inexact-ok
++= cos downward dbl-64 0x1.200144p+32 : 0xf.bc96ca2c658a8p-4 : inexact-ok
++= cos tonearest dbl-64 0x1.200144p+32 : 0xf.bc96ca2c658a8p-4 : inexact-ok
++= cos towardzero dbl-64 0x1.200144p+32 : 0xf.bc96ca2c658a8p-4 : inexact-ok
++= cos upward dbl-64 0x1.200144p+32 : 0xf.bc96ca2c658bp-4 : inexact-ok
++= cos downward ldbl-96-intel 0x1.200144p+32L : 0xf.bc96ca2c658abf5p-4L : inexact-ok
++= cos tonearest ldbl-96-intel 0x1.200144p+32L : 0xf.bc96ca2c658abf6p-4L : inexact-ok
++= cos towardzero ldbl-96-intel 0x1.200144p+32L : 0xf.bc96ca2c658abf5p-4L : inexact-ok
++= cos upward ldbl-96-intel 0x1.200144p+32L : 0xf.bc96ca2c658abf6p-4L : inexact-ok
++= cos downward ldbl-96-m68k 0x1.200144p+32L : 0xf.bc96ca2c658abf5p-4L : inexact-ok
++= cos tonearest ldbl-96-m68k 0x1.200144p+32L : 0xf.bc96ca2c658abf6p-4L : inexact-ok
++= cos towardzero ldbl-96-m68k 0x1.200144p+32L : 0xf.bc96ca2c658abf5p-4L : inexact-ok
++= cos upward ldbl-96-m68k 0x1.200144p+32L : 0xf.bc96ca2c658abf6p-4L : inexact-ok
++= cos downward ldbl-128 0x1.200144p+32L : 0xf.bc96ca2c658abf5ace7b886a8fbp-4L : inexact-ok
++= cos tonearest ldbl-128 0x1.200144p+32L : 0xf.bc96ca2c658abf5ace7b886a8fbp-4L : inexact-ok
++= cos towardzero ldbl-128 0x1.200144p+32L : 0xf.bc96ca2c658abf5ace7b886a8fbp-4L : inexact-ok
++= cos upward ldbl-128 0x1.200144p+32L : 0xf.bc96ca2c658abf5ace7b886a8fb8p-4L : inexact-ok
++= cos downward ldbl-128ibm 0x1.200144p+32L : 0xf.bc96ca2c658abf5ace7b886a8cp-4L : inexact-ok
++= cos tonearest ldbl-128ibm 0x1.200144p+32L : 0xf.bc96ca2c658abf5ace7b886a9p-4L : inexact-ok
++= cos towardzero ldbl-128ibm 0x1.200144p+32L : 0xf.bc96ca2c658abf5ace7b886a8cp-4L : inexact-ok
++= cos upward ldbl-128ibm 0x1.200144p+32L : 0xf.bc96ca2c658abf5ace7b886a9p-4L : inexact-ok
++= cos downward dbl-64 0x1.200145a975ce6p+32 : -0x6.568e7ed3dffdp-4 : inexact-ok
++= cos tonearest dbl-64 0x1.200145a975ce6p+32 : -0x6.568e7ed3dffccp-4 : inexact-ok
++= cos towardzero dbl-64 0x1.200145a975ce6p+32 : -0x6.568e7ed3dffccp-4 : inexact-ok
++= cos upward dbl-64 0x1.200145a975ce6p+32 : -0x6.568e7ed3dffccp-4 : inexact-ok
++= cos downward ldbl-96-intel 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe8p-4L : inexact-ok
++= cos tonearest ldbl-96-intel 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfep-4L : inexact-ok
++= cos towardzero ldbl-96-intel 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfep-4L : inexact-ok
++= cos upward ldbl-96-intel 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfep-4L : inexact-ok
++= cos downward ldbl-96-m68k 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe8p-4L : inexact-ok
++= cos tonearest ldbl-96-m68k 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfep-4L : inexact-ok
++= cos towardzero ldbl-96-m68k 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfep-4L : inexact-ok
++= cos upward ldbl-96-m68k 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfep-4L : inexact-ok
++= cos downward ldbl-128 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe227fd726840e8p-4L : inexact-ok
++= cos tonearest ldbl-128 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe227fd726840e4p-4L : inexact-ok
++= cos towardzero ldbl-128 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe227fd726840e4p-4L : inexact-ok
++= cos upward ldbl-128 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe227fd726840e4p-4L : inexact-ok
++= cos downward ldbl-128ibm 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe227fd726842p-4L : inexact-ok
++= cos tonearest ldbl-128ibm 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe227fd72684p-4L : inexact-ok
++= cos towardzero ldbl-128ibm 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe227fd72684p-4L : inexact-ok
++= cos upward ldbl-128ibm 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe227fd72684p-4L : inexact-ok
+ cos 1
+ = cos downward flt-32 0x1p+0f : 0x8.a514p-4f : inexact-ok
+ = cos tonearest flt-32 0x1p+0f : 0x8.a514p-4f : inexact-ok
+@@ -157744,6 +157813,75 @@ sin 10
+ = sin tonearest ldbl-128ibm 0xap+0L : -0x8.b44f7af9a7a92ce7fb22be025p-4L : inexact-ok
+ = sin towardzero ldbl-128ibm 0xap+0L : -0x8.b44f7af9a7a92ce7fb22be024cp-4L : inexact-ok
+ = sin upward ldbl-128ibm 0xap+0L : -0x8.b44f7af9a7a92ce7fb22be024cp-4L : inexact-ok
++sin 0x1.2001469775ce6p32
++= sin downward flt-32 0x1.200148p+32f : -0x5.595d8p-4f : inexact-ok
++= sin tonearest flt-32 0x1.200148p+32f : -0x5.595d8p-4f : inexact-ok
++= sin towardzero flt-32 0x1.200148p+32f : -0x5.595d78p-4f : inexact-ok
++= sin upward flt-32 0x1.200148p+32f : -0x5.595d78p-4f : inexact-ok
++= sin downward dbl-64 0x1.200148p+32 : -0x5.595d7e536fe38p-4 : inexact-ok
++= sin tonearest dbl-64 0x1.200148p+32 : -0x5.595d7e536fe34p-4 : inexact-ok
++= sin towardzero dbl-64 0x1.200148p+32 : -0x5.595d7e536fe34p-4 : inexact-ok
++= sin upward dbl-64 0x1.200148p+32 : -0x5.595d7e536fe34p-4 : inexact-ok
++= sin downward ldbl-96-intel 0x1.200148p+32L : -0x5.595d7e536fe35eep-4L : inexact-ok
++= sin tonearest ldbl-96-intel 0x1.200148p+32L : -0x5.595d7e536fe35ed8p-4L : inexact-ok
++= sin towardzero ldbl-96-intel 0x1.200148p+32L : -0x5.595d7e536fe35ed8p-4L : inexact-ok
++= sin upward ldbl-96-intel 0x1.200148p+32L : -0x5.595d7e536fe35ed8p-4L : inexact-ok
++= sin downward ldbl-96-m68k 0x1.200148p+32L : -0x5.595d7e536fe35eep-4L : inexact-ok
++= sin tonearest ldbl-96-m68k 0x1.200148p+32L : -0x5.595d7e536fe35ed8p-4L : inexact-ok
++= sin towardzero ldbl-96-m68k 0x1.200148p+32L : -0x5.595d7e536fe35ed8p-4L : inexact-ok
++= sin upward ldbl-96-m68k 0x1.200148p+32L : -0x5.595d7e536fe35ed8p-4L : inexact-ok
++= sin downward ldbl-128 0x1.200148p+32L : -0x5.595d7e536fe35edbe2ad0df9d944p-4L : inexact-ok
++= sin tonearest ldbl-128 0x1.200148p+32L : -0x5.595d7e536fe35edbe2ad0df9d94p-4L : inexact-ok
++= sin towardzero ldbl-128 0x1.200148p+32L : -0x5.595d7e536fe35edbe2ad0df9d94p-4L : inexact-ok
++= sin upward ldbl-128 0x1.200148p+32L : -0x5.595d7e536fe35edbe2ad0df9d94p-4L : inexact-ok
++= sin downward ldbl-128ibm 0x1.200148p+32L : -0x5.595d7e536fe35edbe2ad0df9dap-4L : inexact-ok
++= sin tonearest ldbl-128ibm 0x1.200148p+32L : -0x5.595d7e536fe35edbe2ad0df9dap-4L : inexact-ok
++= sin towardzero ldbl-128ibm 0x1.200148p+32L : -0x5.595d7e536fe35edbe2ad0df9d8p-4L : inexact-ok
++= sin upward ldbl-128ibm 0x1.200148p+32L : -0x5.595d7e536fe35edbe2ad0df9d8p-4L : inexact-ok
++= sin downward flt-32 0x1.200146p+32f : 0x4.220ffp-4f : inexact-ok
++= sin tonearest flt-32 0x1.200146p+32f : 0x4.220ffp-4f : inexact-ok
++= sin towardzero flt-32 0x1.200146p+32f : 0x4.220ffp-4f : inexact-ok
++= sin upward flt-32 0x1.200146p+32f : 0x4.220ff8p-4f : inexact-ok
++= sin downward dbl-64 0x1.200146p+32 : 0x4.220ff25f5cfp-4 : inexact-ok
++= sin tonearest dbl-64 0x1.200146p+32 : 0x4.220ff25f5cf04p-4 : inexact-ok
++= sin towardzero dbl-64 0x1.200146p+32 : 0x4.220ff25f5cfp-4 : inexact-ok
++= sin upward dbl-64 0x1.200146p+32 : 0x4.220ff25f5cf04p-4 : inexact-ok
++= sin downward ldbl-96-intel 0x1.200146p+32L : 0x4.220ff25f5cf02a4p-4L : inexact-ok
++= sin tonearest ldbl-96-intel 0x1.200146p+32L : 0x4.220ff25f5cf02a48p-4L : inexact-ok
++= sin towardzero ldbl-96-intel 0x1.200146p+32L : 0x4.220ff25f5cf02a4p-4L : inexact-ok
++= sin upward ldbl-96-intel 0x1.200146p+32L : 0x4.220ff25f5cf02a48p-4L : inexact-ok
++= sin downward ldbl-96-m68k 0x1.200146p+32L : 0x4.220ff25f5cf02a4p-4L : inexact-ok
++= sin tonearest ldbl-96-m68k 0x1.200146p+32L : 0x4.220ff25f5cf02a48p-4L : inexact-ok
++= sin towardzero ldbl-96-m68k 0x1.200146p+32L : 0x4.220ff25f5cf02a4p-4L : inexact-ok
++= sin upward ldbl-96-m68k 0x1.200146p+32L : 0x4.220ff25f5cf02a48p-4L : inexact-ok
++= sin downward ldbl-128 0x1.200146p+32L : 0x4.220ff25f5cf02a464dbb3a679ccp-4L : inexact-ok
++= sin tonearest ldbl-128 0x1.200146p+32L : 0x4.220ff25f5cf02a464dbb3a679ccp-4L : inexact-ok
++= sin towardzero ldbl-128 0x1.200146p+32L : 0x4.220ff25f5cf02a464dbb3a679ccp-4L : inexact-ok
++= sin upward ldbl-128 0x1.200146p+32L : 0x4.220ff25f5cf02a464dbb3a679cc4p-4L : inexact-ok
++= sin downward ldbl-128ibm 0x1.200146p+32L : 0x4.220ff25f5cf02a464dbb3a679cp-4L : inexact-ok
++= sin tonearest ldbl-128ibm 0x1.200146p+32L : 0x4.220ff25f5cf02a464dbb3a679cp-4L : inexact-ok
++= sin towardzero ldbl-128ibm 0x1.200146p+32L : 0x4.220ff25f5cf02a464dbb3a679cp-4L : inexact-ok
++= sin upward ldbl-128ibm 0x1.200146p+32L : 0x4.220ff25f5cf02a464dbb3a679ep-4L : inexact-ok
++= sin downward dbl-64 0x1.2001469775ce6p+32 : -0x6.444fda50019fcp-4 : inexact-ok
++= sin tonearest dbl-64 0x1.2001469775ce6p+32 : -0x6.444fda50019f8p-4 : inexact-ok
++= sin towardzero dbl-64 0x1.2001469775ce6p+32 : -0x6.444fda50019f8p-4 : inexact-ok
++= sin upward dbl-64 0x1.2001469775ce6p+32 : -0x6.444fda50019f8p-4 : inexact-ok
++= sin downward ldbl-96-intel 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f6p-4L : inexact-ok
++= sin tonearest ldbl-96-intel 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f58p-4L : inexact-ok
++= sin towardzero ldbl-96-intel 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f58p-4L : inexact-ok
++= sin upward ldbl-96-intel 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f58p-4L : inexact-ok
++= sin downward ldbl-96-m68k 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f6p-4L : inexact-ok
++= sin tonearest ldbl-96-m68k 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f58p-4L : inexact-ok
++= sin towardzero ldbl-96-m68k 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f58p-4L : inexact-ok
++= sin upward ldbl-96-m68k 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f58p-4L : inexact-ok
++= sin downward ldbl-128 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f5ba3779ca70604p-4L : inexact-ok
++= sin tonearest ldbl-128 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f5ba3779ca706p-4L : inexact-ok
++= sin towardzero ldbl-128 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f5ba3779ca706p-4L : inexact-ok
++= sin upward ldbl-128 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f5ba3779ca706p-4L : inexact-ok
++= sin downward ldbl-128ibm 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f5ba3779ca708p-4L : inexact-ok
++= sin tonearest ldbl-128ibm 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f5ba3779ca706p-4L : inexact-ok
++= sin towardzero ldbl-128ibm 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f5ba3779ca706p-4L : inexact-ok
++= sin upward ldbl-128ibm 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f5ba3779ca706p-4L : inexact-ok
+ sincos 0
+ = sincos downward flt-32 0x0p+0f : 0x0p+0f 0x1p+0f : inexact-ok
+ = sincos tonearest flt-32 0x0p+0f : 0x0p+0f 0x1p+0f : inexact-ok
+diff --git a/sysdeps/ieee754/dbl-64/s_sin.c b/sysdeps/ieee754/dbl-64/s_sin.c
+index 6105e9f..50109b8 100644
+--- a/sysdeps/ieee754/dbl-64/s_sin.c
++++ b/sysdeps/ieee754/dbl-64/s_sin.c
+@@ -447,19 +447,21 @@ __sin (double x)
+ 	    }
+ 	  else
+ 	    {
++	      double t;
+ 	      if (a > 0)
+ 		{
+ 		  m = 1;
++		  t = a;
+ 		  db = da;
+ 		}
+ 	      else
+ 		{
+ 		  m = 0;
+-		  a = -a;
++		  t = -a;
+ 		  db = -da;
+ 		}
+-	      u.x = big + a;
+-	      y = a - (u.x - big);
++	      u.x = big + t;
++	      y = t - (u.x - big);
+ 	      res = do_sin (u, y, db, &cor);
+ 	      cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps;
+ 	      retval = ((res == res + cor) ? ((m) ? res : -res)
+@@ -671,19 +673,21 @@ __cos (double x)
+ 	    }
+ 	  else
+ 	    {
++	      double t;
+ 	      if (a > 0)
+ 		{
+ 		  m = 1;
++		  t = a;
+ 		  db = da;
+ 		}
+ 	      else
+ 		{
+ 		  m = 0;
+-		  a = -a;
++		  t = -a;
+ 		  db = -da;
+ 		}
+-	      u.x = big + a;
+-	      y = a - (u.x - big);
++	      u.x = big + t;
++	      y = t - (u.x - big);
+ 	      res = do_sin (u, y, db, &cor);
+ 	      cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps;
+ 	      retval = ((res == res + cor) ? ((m) ? res : -res)
+diff --git a/sysdeps/x86_64/fpu/libm-test-ulps b/sysdeps/x86_64/fpu/libm-test-ulps
+index f3980f8..544f1c7 100644
+--- a/sysdeps/x86_64/fpu/libm-test-ulps
++++ b/sysdeps/x86_64/fpu/libm-test-ulps
+@@ -10900,6 +10900,14 @@ idouble: 1
+ Test "cos_downward (0x1.0c152382d7365p+0)":
+ double: 1
+ idouble: 1
++Test "cos_downward (0x1.200145a975ce6p+32)":
++double: 1
++idouble: 1
++ildouble: 1
++ldouble: 1
++Test "cos_downward (0x1.200146p+32)":
++ildouble: 1
++ldouble: 1
+ Test "cos_downward (0x1.921fb4p+0)":
+ ildouble: 1
+ ldouble: 1
+@@ -11126,6 +11134,9 @@ idouble: 1
+ Test "cos_towardzero (0x1.0c152382d7365p+0)":
+ double: 1
+ idouble: 1
++Test "cos_towardzero (0x1.200146p+32)":
++double: 1
++idouble: 1
+ Test "cos_towardzero (0x1.921fb4p+0)":
+ ildouble: 1
+ ldouble: 1
+@@ -11258,6 +11269,17 @@ idouble: 1
+ Test "cos_upward (0x1.0c1524p+0)":
+ double: 1
+ idouble: 1
++Test "cos_upward (0x1.200144p+32)":
++double: 1
++idouble: 1
++Test "cos_upward (0x1.200145a975ce6p+32)":
++ildouble: 1
++ldouble: 1
++Test "cos_upward (0x1.200146p+32)":
++double: 1
++idouble: 1
++ildouble: 1
++ldouble: 1
+ Test "cos_upward (0x1.921fb4p+0)":
+ double: 1
+ idouble: 1
+@@ -15155,6 +15177,19 @@ double: 1
+ idouble: 1
+ ildouble: 1
+ ldouble: 1
++Test "sin_downward (0x1.2001469775ce6p+32)":
++double: 1
++idouble: 1
++ildouble: 1
++ldouble: 1
++Test "sin_downward (0x1.200146p+32)":
++double: 1
++idouble: 1
++Test "sin_downward (0x1.200148p+32)":
++double: 1
++idouble: 1
++ildouble: 1
++ldouble: 1
+ Test "sin_downward (0x1.921fb54442d18468p+0)":
+ ildouble: 1
+ ldouble: 1
+@@ -15383,6 +15418,9 @@ double: 1
+ idouble: 1
+ ildouble: 1
+ ldouble: 1
++Test "sin_towardzero (0x1.200146p+32)":
++double: 1
++idouble: 1
+ Test "sin_towardzero (0x1.921fb54442d18468p+0)":
+ ildouble: 1
+ ldouble: 1
+@@ -15532,6 +15570,12 @@ ldouble: 1
+ Test "sin_upward (-0x8.60a92p-4)":
+ ildouble: 1
+ ldouble: 1
++Test "sin_upward (0x1.2001469775ce6p+32)":
++ildouble: 1
++ldouble: 1
++Test "sin_upward (0x1.200148p+32)":
++ildouble: 1
++ldouble: 1
+ Test "sin_upward (0x1.921fb4p+0)":
+ double: 1
+ idouble: 1
-- 
GitLab


From 5d14048867ccc4a05b86875573e64a66c4382144 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Fri, 7 Mar 2014 19:13:54 -0800
Subject: [PATCH 1907/3789] ImageMagick: update to 6.8.8-7

Fixes CVE-2014-{1947,1958,2030}.
---
 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 66a7f334dbd..35659cbfe6f 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -18,14 +18,14 @@
 }:
 
 let
-  version = "6.8.7-6";
+  version = "6.8.8-7";
 in
 stdenv.mkDerivation rec {
   name = "ImageMagick-${version}";
 
   src = fetchurl {
     url = "mirror://imagemagick/${name}.tar.xz";
-    sha256 = "0cbfhk184kxdxz5czyyqxac29mbfiahygjji6k97z6hp8ngnqlvh";
+    sha256 = "1x5jkbrlc10rx7vm344j7xrs74c80xk3n1akqx8w5c194fj56mza";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 8db9fe47fec72ebecf75f6c8a8eb2cd0864786f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 8 Mar 2014 11:23:46 +0100
Subject: [PATCH 1908/3789] poppler_0_18: remove, only used by libreoffice

I need to test libreoffice still builds, so I push this to x-updates.
(I hate having to do such things to try a couple of jobs.)
---
 pkgs/development/libraries/poppler/0.18.nix | 53 ---------------------
 pkgs/top-level/all-packages.nix             |  8 ----
 2 files changed, 61 deletions(-)
 delete mode 100644 pkgs/development/libraries/poppler/0.18.nix

diff --git a/pkgs/development/libraries/poppler/0.18.nix b/pkgs/development/libraries/poppler/0.18.nix
deleted file mode 100644
index 123d229f2ba..00000000000
--- a/pkgs/development/libraries/poppler/0.18.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ fetchurl, stdenv, cairo, freetype, fontconfig, zlib
-, libjpeg, curl, libpthreadstubs, xorg, openjpeg
-, libxml2, pkgconfig, cmake, lcms, libiconvOrEmpty
-, glibSupport ? false, glib, gtk3Support ? false, gtk3 # gtk2 no longer accepted
-, qt4Support ? false, qt4 ? null
-}:
-
-stdenv.mkDerivation rec {
-  name = "poppler-0.18.4";
-
-  src = fetchurl {
-    url = "${meta.homepage}${name}.tar.gz";
-    sha256 = "0bnl05al7mjndp2h0355946j59nfw76f5v0x57d47q68rm412hik";
-  };
-
-  propagatedBuildInputs = with xorg;
-    [ zlib cairo freetype fontconfig libjpeg lcms curl
-      libpthreadstubs libxml2 stdenv.gcc.libc
-      libXau libXdmcp libxcb libXrender libXext
-      openjpeg
-    ]
-    ++ stdenv.lib.optional glibSupport glib
-    ++ stdenv.lib.optional gtk3Support gtk3
-    ++ stdenv.lib.optional qt4Support qt4;
-
-  nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty;
-
-  cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON";
-
-  patches = [ ./datadir_env.patch ];
-
-  # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files
-  # such as `../../../test/unittestcases/UseNone.pdf'.
-  #doCheck = !qt4Support;
-  checkTarget = "test";
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = http://poppler.freedesktop.org/;
-    description = "Poppler, a PDF rendering library";
-
-    longDescription = ''
-      Poppler is a PDF rendering library based on the xpdf-3.0 code base.
-    '';
-
-    platforms = if qt4Support
-      then qt4.meta.platforms
-      else stdenv.lib.platforms.all;
-
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9441da57ccd..05bede0bfd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5437,13 +5437,6 @@ let
   poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
   popplerQt4 = poppler.poppler_qt4;
 
-  poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix {
-    lcms = lcms2;
-    glibSupport = true;
-    gtk3Support = false;
-    qt4Support  = false;
-  };
-
   popt = callPackage ../development/libraries/popt { };
 
   portaudio = callPackage ../development/libraries/portaudio {
@@ -8390,7 +8383,6 @@ let
         freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
       ];
     };
-    poppler = poppler_0_18;
     clucene_core = clucene_core_2;
     lcms = lcms2;
     mdds = mdds_0_7_1;
-- 
GitLab


From dd2dee4e45ed8c0de39957c29f5c87128a84b150 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:03:23 +0100
Subject: [PATCH 1909/3789] haskell-stripe: build this package with latest
 version of aeson

---
 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 5ac472e27db..2faafc042fe 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2323,9 +2323,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   stringbuilder = callPackage ../development/libraries/haskell/stringbuilder {};
 
-  stripe = callPackage ../development/libraries/haskell/stripe {
-    aeson = self.aeson_0_6_2_1;
-  };
+  stripe = callPackage ../development/libraries/haskell/stripe {};
 
   svgcairo = callPackage ../development/libraries/haskell/svgcairo {
     libc = pkgs.stdenv.gcc.libc;
-- 
GitLab


From 19e168d0c32de2b6f8f304c1c22c7f79862edce2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:06:36 +0100
Subject: [PATCH 1910/3789] haskell-aeson: update to version 0.7.0.2 (and drop
 obsolete version 0.6.x)

---
 .../libraries/haskell/aeson/0.6.2.1.nix       | 26 -------------------
 .../aeson/{0.7.0.1.nix => default.nix}        |  4 +--
 pkgs/top-level/haskell-packages.nix           |  4 +--
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/aeson/0.6.2.1.nix
 rename pkgs/development/libraries/haskell/aeson/{0.7.0.1.nix => default.nix} (90%)

diff --git a/pkgs/development/libraries/haskell/aeson/0.6.2.1.nix b/pkgs/development/libraries/haskell/aeson/0.6.2.1.nix
deleted file mode 100644
index edd2a21040e..00000000000
--- a/pkgs/development/libraries/haskell/aeson/0.6.2.1.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, mtl
-, QuickCheck, syb, testFramework, testFrameworkQuickcheck2, text
-, time, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "aeson";
-  version = "0.6.2.1";
-  sha256 = "00fa13qr38s4c0fwfvpks3x3sb21kh71cv1v0x2zqg0adnaydknb";
-  buildDepends = [
-    attoparsec blazeBuilder deepseq dlist hashable mtl syb text time
-    unorderedContainers vector
-  ];
-  testDepends = [
-    attoparsec QuickCheck testFramework testFrameworkQuickcheck2 text
-    time unorderedContainers vector
-  ];
-  doCheck = false;
-  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.1.nix b/pkgs/development/libraries/haskell/aeson/default.nix
similarity index 90%
rename from pkgs/development/libraries/haskell/aeson/0.7.0.1.nix
rename to pkgs/development/libraries/haskell/aeson/default.nix
index 4b5c137d89b..960314920a1 100644
--- a/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix
+++ b/pkgs/development/libraries/haskell/aeson/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson";
-  version = "0.7.0.1";
-  sha256 = "17cwclxh2f2m0mvs867lfzrv14gd9grw8a9f8l95j3nd76y58kb3";
+  version = "0.7.0.2";
+  sha256 = "0li89xs4dlwc3ijs6w5gabjibj09x12qgxhzp7mch6gxjxwd3ihj";
   buildDepends = [
     attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
     text time unorderedContainers vector
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2faafc042fe..81c0a99e4a0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -526,11 +526,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   adjunctions = callPackage ../development/libraries/haskell/adjunctions {};
 
-  aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {};
-  aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix {
+  aeson = callPackage ../development/libraries/haskell/aeson {
     blazeBuilder = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") then self.blazeBuilder else null;
   };
-  aeson = self.aeson_0_7_0_1;
 
   aesonLens = callPackage ../development/libraries/haskell/aeson-lens {};
 
-- 
GitLab


From f2ff3edb63d11afbaf4046baaa9dbd7f665312ea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:07:52 +0100
Subject: [PATCH 1911/3789] haskell-attoparsec: update to version 0.11.2.1

---
 .../haskell/attoparsec/{0.11.1.0.nix => 0.11.2.1.nix}         | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/attoparsec/{0.11.1.0.nix => 0.11.2.1.nix} (86%)

diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.1.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.2.1.nix
similarity index 86%
rename from pkgs/development/libraries/haskell/attoparsec/0.11.1.0.nix
rename to pkgs/development/libraries/haskell/attoparsec/0.11.2.1.nix
index bd7bdc745b2..2a2117a1a05 100644
--- a/pkgs/development/libraries/haskell/attoparsec/0.11.1.0.nix
+++ b/pkgs/development/libraries/haskell/attoparsec/0.11.2.1.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec";
-  version = "0.11.1.0";
-  sha256 = "09mks6lbzmqmdz6s10lvdklmc0mydd1sk5hphhnybp3yr4pvh7jc";
+  version = "0.11.2.1";
+  sha256 = "1grvmhxiqn02wbng0wd9zqc4c51wrbxar1b26agc3p9i09ngbs1w";
   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 81c0a99e4a0..846c24204b8 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_1_0;
+    attoparsec   = self.attoparsec_0_11_2_1;
     caseInsensitive = self.caseInsensitive_1_1_0_3;
     cgi          = self.cgi_3001_1_8_5;
     fgl          = self.fgl_5_4_2_4;
@@ -593,7 +593,7 @@ 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_1_0 = callPackage ../development/libraries/haskell/attoparsec/0.11.1.0.nix {};
+  attoparsec_0_11_2_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.2.1.nix {};
   attoparsec = self.attoparsec_0_10_4_0;
 
   attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {};
-- 
GitLab


From e47f94e3610c47dc94f35c62e20fc8e45225aebc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:08:38 +0100
Subject: [PATCH 1912/3789] haskell-lens: update to version 4.0.5

---
 .../libraries/haskell/lens/{4.0.4.nix => 4.0.5.nix}           | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/lens/{4.0.4.nix => 4.0.5.nix} (94%)

diff --git a/pkgs/development/libraries/haskell/lens/4.0.4.nix b/pkgs/development/libraries/haskell/lens/4.0.5.nix
similarity index 94%
rename from pkgs/development/libraries/haskell/lens/4.0.4.nix
rename to pkgs/development/libraries/haskell/lens/4.0.5.nix
index cd85c7a4e94..7c347f69ce4 100644
--- a/pkgs/development/libraries/haskell/lens/4.0.4.nix
+++ b/pkgs/development/libraries/haskell/lens/4.0.5.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "4.0.4";
-  sha256 = "14xa500afjpdfx3qqxr9dg5x8mxrna7c3b5xchqsrwck9d00cphd";
+  version = "4.0.5";
+  sha256 = "1kjmi76zpkhkwn514inhpfhfh3pg5na1f2zw1faqnk3bylpp9h6g";
   buildDepends = [
     aeson bifunctors comonad constraints contravariant distributive
     exceptions filepath hashable mtl parallel primitive profunctors
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 846c24204b8..2bc148d84a3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1585,8 +1585,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {};
 
   lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {};
-  lens_4_0_4 = callPackage ../development/libraries/haskell/lens/4.0.4.nix {};
-  lens = self.lens_4_0_4;
+  lens_4_0_5 = callPackage ../development/libraries/haskell/lens/4.0.5.nix {};
+  lens = self.lens_4_0_5;
 
   lensAeson = callPackage ../development/libraries/haskell/lens-aeson {};
 
-- 
GitLab


From 3e6ef50ecd2fa81afdd1e2a7cce05af878ed9a79 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:11:10 +0100
Subject: [PATCH 1913/3789] cabal-install: update to version 1.18.0.3

---
 .../cabal-install/{1.18.0.2.nix => 1.18.0.3.nix}           | 7 ++-----
 pkgs/top-level/haskell-defaults.nix                        | 4 ++--
 pkgs/top-level/haskell-packages.nix                        | 6 +++---
 3 files changed, 7 insertions(+), 10 deletions(-)
 rename pkgs/tools/package-management/cabal-install/{1.18.0.2.nix => 1.18.0.3.nix} (83%)

diff --git a/pkgs/tools/package-management/cabal-install/1.18.0.2.nix b/pkgs/tools/package-management/cabal-install/1.18.0.3.nix
similarity index 83%
rename from pkgs/tools/package-management/cabal-install/1.18.0.2.nix
rename to pkgs/tools/package-management/cabal-install/1.18.0.3.nix
index 3c1c6ddd133..041cc471cab 100644
--- a/pkgs/tools/package-management/cabal-install/1.18.0.2.nix
+++ b/pkgs/tools/package-management/cabal-install/1.18.0.3.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-install";
-  version = "1.18.0.2";
-  sha256 = "0ah9yzp486p3cvs9b7nid0jmf0a56fg65s3jx2r8lb84pi50d92c";
+  version = "1.18.0.3";
+  sha256 = "0h01mz6p4fwl8h6k2ybrlp598f0j3n2zasrr63fy0vjbjibmgf41";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -20,9 +20,6 @@ cabal.mkDerivation (self: {
     mkdir $out/etc
     mv bash-completion $out/etc/bash_completion.d
   '';
-  patchPhase = ''
-    sed -i -e 's|array .*,|array,|' cabal-install.cabal
-  '';
   meta = {
     homepage = "http://www.haskell.org/cabal/";
     description = "The command-line interface for Cabal and Hackage";
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 3034367c39e..0856bf50378 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -19,8 +19,8 @@
     self : self.haskellPlatformArgs_future self // {
       haskellPlatform = null;
       extensibleExceptions = self.extensibleExceptions_0_1_1_4;
-      cabalInstall_1_18_0_2 = self.cabalInstall_1_18_0_2.override { Cabal = null; };
-      cabalInstall = self.cabalInstall_1_18_0_2.override { Cabal = null; };
+      cabalInstall_1_18_0_3 = self.cabalInstall_1_18_0_3.override { Cabal = null; };
+      cabalInstall = self.cabalInstall_1_18_0_3.override { Cabal = null; };
     };
 
   ghc763Prefs =
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2bc148d84a3..dc8655216e0 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_2;
+    cabalInstall = self.cabalInstall_1_18_0_3;
     alex         = self.alex_3_1_3;
     haddock      = self.haddock_2_13_2_1;
     happy        = self.happy_1_19_3;
@@ -2858,10 +2858,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   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_2 = callPackage ../tools/package-management/cabal-install/1.18.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 = self.cabalInstall_1_18_0_2;
+  cabalInstall = self.cabalInstall_1_18_0_3;
 
   gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {};
 
-- 
GitLab


From 8434415ffb71e0a0a94b7591f2d6a8c70cca70a4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:12:01 +0100
Subject: [PATCH 1914/3789] haskell-text: update to version 1.1.0.1

---
 .../libraries/haskell/text/{1.1.0.0.nix => 1.1.0.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.0.nix => 1.1.0.1.nix} (87%)

diff --git a/pkgs/development/libraries/haskell/text/1.1.0.0.nix b/pkgs/development/libraries/haskell/text/1.1.0.1.nix
similarity index 87%
rename from pkgs/development/libraries/haskell/text/1.1.0.0.nix
rename to pkgs/development/libraries/haskell/text/1.1.0.1.nix
index 87a89c43be4..eecb54f3c68 100644
--- a/pkgs/development/libraries/haskell/text/1.1.0.0.nix
+++ b/pkgs/development/libraries/haskell/text/1.1.0.1.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "text";
-  version = "1.1.0.0";
-  sha256 = "14mssz27f5ivhwcl9gvbw0s1mjh7hw9gviwxnimqiqzh4jlavwc0";
+  version = "1.1.0.1";
+  sha256 = "1f0zicvflfd17mr2h9s9idhi0215m2y208jbnh4fx1yj6snnvalw";
   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 dc8655216e0..bbf7658a842 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_2;
     syb          = self.syb_0_4_1;
-    text         = self.text_1_1_0_0;
+    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;
     vector       = self.vector_0_10_9_1;
@@ -2400,8 +2400,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_0 = callPackage ../development/libraries/haskell/text/1.1.0.0.nix {};
-  text = self.text_1_1_0_0;
+  text_1_1_0_1 = callPackage ../development/libraries/haskell/text/1.1.0.1.nix {};
+  text = self.text_1_1_0_1;
 
   textFormat = callPackage ../development/libraries/haskell/text-format {};
 
-- 
GitLab


From 39175f5117b0b087257373ab8688fb49a82e39e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:12:55 +0100
Subject: [PATCH 1915/3789] haskell-git-annex: update to version 5.20140306

---
 .../git-and-tools/git-annex/default.nix               | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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 8a6244525e6..49129e6b8ce 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
@@ -10,14 +10,14 @@
 , QuickCheck, random, regexTdfa, rsync, SafeSemaphore, SHA, stm
 , tasty, tastyHunit, tastyQuickcheck, tastyRerun, text, time
 , transformers, unixCompat, utf8String, uuid, wai, waiLogger, warp
-, which, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm
-, yesodStatic
+, warpTls, which, xmlTypes, yesod, yesodCore, yesodDefault
+, yesodForm, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140227";
-  sha256 = "0zdaryvfpbmc454798z3z3sshf0br8v3sw0vnksqng3zm3w73dah";
+  version = "5.20140306";
+  sha256 = "1kjgqrz0wnccylrbdiwj1yndg7v2k09f5h2vkk06bnx02xmwvjl9";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -30,7 +30,8 @@ cabal.mkDerivation (self: {
     networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa
     SafeSemaphore SHA stm tasty tastyHunit tastyQuickcheck tastyRerun
     text time transformers unixCompat utf8String uuid wai waiLogger
-    warp xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic
+    warp warpTls xmlTypes yesod yesodCore yesodDefault yesodForm
+    yesodStatic
   ];
   buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
   configureFlags = "-fS3
-- 
GitLab


From cccf30d2d04073b5d4a18866289dde2cf6a558d5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:12:56 +0100
Subject: [PATCH 1916/3789] haskell-base-compat: update to version 0.4.2

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

diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix
index 9e5375a24d8..5ee81698eb5 100644
--- a/pkgs/development/libraries/haskell/base-compat/default.nix
+++ b/pkgs/development/libraries/haskell/base-compat/default.nix
@@ -2,9 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "base-compat";
-  version = "0.4.0";
-  sha256 = "0ps26w4mjp465a3mh3hpzkdkc97yvfhzh86fcnlqszy9wgj13w65";
-  buildDepends = [ errorcallEqInstance ];
+  version = "0.4.2";
+  sha256 = "0rcra6bgx955c2yd52y6v7lmlm5r86sdmii3qapx6yghqhdslzry";
+  buildDepends = [ errorcallEqInstance setenv ];
   testDepends = [ hspec setenv ];
   meta = {
     description = "A compatibility layer for base";
-- 
GitLab


From 8ea0fb972caf176d209be079f6f0405598744807 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:12:58 +0100
Subject: [PATCH 1917/3789] haskell-blaze-textual: update to version 0.2.0.9

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

diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix
index ede82e5c2ed..508e68fa045 100644
--- a/pkgs/development/libraries/haskell/blaze-textual/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-textual";
-  version = "0.2.0.8";
-  sha256 = "0zzqh53ywzz8ss58glp3i8is8gry5yqzvdjw4xh95fbbzcz4cgc7";
+  version = "0.2.0.9";
+  sha256 = "1gwy1pjnc2ikxfxn9c751rnydry1hmlfk13k29xnns9vwglf81f0";
   buildDepends = [ blazeBuilder text time vector ];
   testDepends = [
     blazeBuilder doubleConversion QuickCheck testFramework
-- 
GitLab


From ce9ec1fbcf535e4c5ccfd01778cb62c6436a91ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:12:59 +0100
Subject: [PATCH 1918/3789] haskell-conduit-combinators: update to version
 0.2.0.0

---
 .../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 8425c465331..8372d465f01 100644
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.1.0.0";
-  sha256 = "0m4qfcm66likasvsvfriw8xiz5ibqhq5sk1wiwx0gk2d1qcnb3wx";
+  version = "0.2.0.0";
+  sha256 = "0r5s1m31ncg1m9sm8n2212r9mm4hjrxc3a92divkhcxwijadzghc";
   buildDepends = [
     chunkedData conduit monoTraversable primitive systemFileio
     systemFilepath text transformers transformersBase vector
-- 
GitLab


From a673dcde4b571bfa13e8fb0c1c08cf5325af81eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:00 +0100
Subject: [PATCH 1919/3789] haskell-criterion: update to version 0.8.0.1

---
 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 84eacff71a1..ba8f1b70c77 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.0";
-  sha256 = "05v4glwvidsd4gm2jcvmlcpfaxg2x0fb69w051rbwg9scanrm7bf";
+  version = "0.8.0.1";
+  sha256 = "1f4wsaiyq0zks71jgfx43774vxkf9l362a9kfd2jhsnxx7zkv5sq";
   buildDepends = [
     aeson binary deepseq filepath Glob hastache mtl mwcRandom parsec
     statistics time transformers vector vectorAlgorithms
-- 
GitLab


From 4541619bc86eef0ce7a8c9035f7ef5ac9410806f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:01 +0100
Subject: [PATCH 1920/3789] haskell-digestive-functors-heist: update to version
 0.8.5.0

---
 .../libraries/haskell/digestive-functors-heist/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
index 418923c453b..86a6a8560fb 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-heist";
-  version = "0.8.4.1";
-  sha256 = "03bbz5q3asn1iid13xjiv5hdpj5bgr0h9wwp29bnysiw4vrgjax0";
+  version = "0.8.5.0";
+  sha256 = "0pjjr3b1zm23wpqnmcbr8ly08bp63sz3c9vbxcani4mwgx05qp87";
   buildDepends = [
     blazeBuilder digestiveFunctors heist mtl text xmlhtml
   ];
-- 
GitLab


From 5f6e14dccbb2aca0318e8e83bcf906c8ef4d8efb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:02 +0100
Subject: [PATCH 1921/3789] haskell-esqueleto: update to version 1.3.5

---
 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 4d11aeaf700..fd314d12d51 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.4.6";
-  sha256 = "1mqjgc1glnfivrmw77mk6mqr02gp6l3jlvpz5ysiii42c1bp55n0";
+  version = "1.3.5";
+  sha256 = "0lz17fr4by31h1qdw0djbsb1zx9xgll5iphqq18gp587l799iy2p";
   buildDepends = [
     conduit monadLogger persistent resourcet tagged text transformers
     unorderedContainers
-- 
GitLab


From 7e664e6b5367f59d08a8b6b2948e39fbc474ea57 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:03 +0100
Subject: [PATCH 1922/3789] haskell-haskell-names: update to version 0.3.2.6

---
 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 db9e92fc8ce..0cc021460f2 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.2.5";
-  sha256 = "1jp3109b742gr6ii7syacl167i1i91xsyw0200ghaad3ymrqkcvq";
+  version = "0.3.2.6";
+  sha256 = "1326p95r28hzzwcqjvqwwjxx8hcq56gd978v7g45jhvr73kpnzz6";
   buildDepends = [
     aeson Cabal dataLens dataLensTemplate filepath haskellPackages
     haskellSrcExts hseCpp mtl tagged transformers traverseWithClass
-- 
GitLab


From 3965637782b2e6ebfc22cd575f2896eeaec2f8b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:05 +0100
Subject: [PATCH 1923/3789] haskell-hsimport: update to version 0.2.10

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

diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix
index eea778ec08a..c114e5aae0f 100644
--- a/pkgs/development/libraries/haskell/hsimport/default.nix
+++ b/pkgs/development/libraries/haskell/hsimport/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hsimport";
-  version = "0.2.9";
-  sha256 = "1xfz1as980jg3crlwlajaj8yfj4pl4phg9l6fjap037vr0107hav";
+  version = "0.2.10";
+  sha256 = "0xvsjgckh2jab9q7l8pvnnn5x977mb6hkhqb175m10brr13yzk4z";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From d8c30677050c1175228ce7c5b50556b911990a94 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:06 +0100
Subject: [PATCH 1924/3789] haskell-linear: update to version 1.8.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 5b8f42d5420..ea7c86e3c99 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.6";
-  sha256 = "1aka0da4mwv9cdj76armlava0d4c5f8s2pv10fk6b5glyb0c1a7x";
+  version = "1.8.1";
+  sha256 = "1hrvlavghwj8psi3qdmvnccrr2vk8rss8ggw87gn0jh771pv8zl2";
   buildDepends = [
     adjunctions binary distributive hashable lens reflection
     semigroupoids semigroups tagged transformers unorderedContainers
-- 
GitLab


From ef22bfd980df554e0062f3dbab1fb2d75709c822 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:07 +0100
Subject: [PATCH 1925/3789] haskell-math-functions: update to version 0.1.5.2

---
 .../libraries/haskell/math-functions/default.nix         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix
index 8180c8bce75..7faca58fd85 100644
--- a/pkgs/development/libraries/haskell/math-functions/default.nix
+++ b/pkgs/development/libraries/haskell/math-functions/default.nix
@@ -1,12 +1,13 @@
-{ cabal, erf, HUnit, ieee754, QuickCheck, testFramework
+{ cabal, deepseq, erf, HUnit, ieee754, QuickCheck, testFramework
 , testFrameworkHunit, testFrameworkQuickcheck2, vector
+, vectorThUnbox
 }:
 
 cabal.mkDerivation (self: {
   pname = "math-functions";
-  version = "0.1.4.0";
-  sha256 = "1cijm224gfvd7rvrrndcks8d7aj89c9qv0m4wx2qqngr7rk78kav";
-  buildDepends = [ erf vector ];
+  version = "0.1.5.2";
+  sha256 = "12cznf7gwia1ki7xhvlhk5p8d09zrdvfgn07pkp4sfrwsc4vijcy";
+  buildDepends = [ deepseq erf vector vectorThUnbox ];
   testDepends = [
     HUnit ieee754 QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2 vector
-- 
GitLab


From 7836dadf577dc53e4ecc3b30808a04228f46af45 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:08 +0100
Subject: [PATCH 1926/3789] haskell-mono-traversable: update to version 0.4.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 f6c261145c1..a88f6902d83 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.3.1";
-  sha256 = "0a0vy0hp34sw1q7153jd614mqydzg79pw645kfxlihs3j7ac2b3j";
+  version = "0.4.0";
+  sha256 = "0a59m46dr0am05v4b19j2saxlv0dp22kw47lck1m871y5x2gp936";
   buildDepends = [
     comonad hashable semigroupoids semigroups text transformers
     unorderedContainers vector vectorInstances
-- 
GitLab


From 7a0904c4896cc22db5f86c6dd97ad0747a006980 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:09 +0100
Subject: [PATCH 1927/3789] haskell-monoid-extras: update to version 0.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 73f720ba421..ffde409a9b1 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.2.4";
-  sha256 = "1qrgwnczznjp1visspqf3dk224nvqf5icv3646j96acl5srn84qc";
+  version = "0.3.3";
+  sha256 = "1a203fccwfmyqdv9mdzwd6gq5g9v3k9mial8n0hykdhmlny7dd56";
   buildDepends = [ groupoids groups semigroupoids semigroups ];
   jailbreak = true;
   meta = {
-- 
GitLab


From f5a99435986f36ad741afe11558da6410c9ae170 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:10 +0100
Subject: [PATCH 1928/3789] haskell-persistent-postgresql: update to version
 1.3.0.2

---
 .../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 acb7b3ce5b5..14b2e08ccac 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-postgresql";
-  version = "1.3.0.1";
-  sha256 = "00m78hdrnk367ymlgbi49p2zq2gkwskax1ng2h3ljskf3ic4jahf";
+  version = "1.3.0.2";
+  sha256 = "1d5g5zg3p0nhhkgnf9mr1wxmrpw5y1adv5lf21681an9frkisggy";
   buildDepends = [
     aeson blazeBuilder conduit monadControl persistent postgresqlLibpq
     postgresqlSimple text time transformers
-- 
GitLab


From 16214e2b31c9a44e80e099931c1675f0410fe762 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:12 +0100
Subject: [PATCH 1929/3789] haskell-pipes-binary: update to version 0.4.0.1

---
 pkgs/development/libraries/haskell/pipes-binary/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pipes-binary/default.nix b/pkgs/development/libraries/haskell/pipes-binary/default.nix
index 33f9482ca3f..e48ad2a96a4 100644
--- a/pkgs/development/libraries/haskell/pipes-binary/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-binary/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-binary";
-  version = "0.4.0";
-  sha256 = "021shl5czrr82b06awy7biy93qf6nh0wwiadhr7qsawzdnzqz2vc";
+  version = "0.4.0.1";
+  sha256 = "1vwsr446b3ysjm86bmpmq8pg2badx9xn0iyr17r4mby0bxvvld33";
   buildDepends = [
     binary pipes pipesBytestring pipesParse transformers
   ];
@@ -13,7 +13,6 @@ cabal.mkDerivation (self: {
     binary lensFamilyCore pipes pipesParse smallcheck tasty tastyHunit
     tastySmallcheck transformers
   ];
-  # Depends on an out-of-date version of smallcheck
   doCheck = false;
   meta = {
     homepage = "https://github.com/k0001/pipes-binary";
-- 
GitLab


From b421524646cc1038134ccdb13dbd255bbdbfe826 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:14 +0100
Subject: [PATCH 1930/3789] haskell-stripe: update to version 0.8.0

---
 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 1759143eb9b..304cc3df8f7 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.7.0";
-  sha256 = "02kyxipifdaf08bk85cbgksvm3jn7i648h9afb3jfxqam5j4a7a0";
+  version = "0.8.0";
+  sha256 = "0bz932v7kcz2xsnmpx34ifqnf6kbgy7a7qd0dqnjqypc8g6kfl37";
   buildDepends = [
     aeson httpConduit httpTypes mtl text time unorderedContainers
     utf8String
-- 
GitLab


From 003b4a099746077305e5281735b95a3781a84460 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:15 +0100
Subject: [PATCH 1931/3789] haskell-tasty-ant-xml: update to version 1.0.0.6

---
 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 c77ee5f3a3a..695d7edca62 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.5";
-  sha256 = "00nlp627r5rgahs8zqjxjm68ijf4yvxd18fq67z2fr68alg4rl4j";
+  version = "1.0.0.6";
+  sha256 = "06ll7mj60iiskla2x53yncs0931b7dw4l0shxkhz88558gjzy7cj";
   buildDepends = [
     genericDeriving mtl reducers stm tagged tasty transformers xml
   ];
-- 
GitLab


From 24c78d64c69b37be8418c2e4ab8410f0fbd5ddf7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:16 +0100
Subject: [PATCH 1932/3789] haskell-tasty-golden: update to version 2.2.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 0b13bb0dcff..f2fe7cfb0ad 100644
--- a/pkgs/development/libraries/haskell/tasty-golden/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-golden/default.nix
@@ -1,13 +1,13 @@
-{ cabal, filepath, mtl, optparseApplicative, tagged, tasty
+{ cabal, deepseq, filepath, mtl, optparseApplicative, tagged, tasty
 , temporary
 }:
 
 cabal.mkDerivation (self: {
   pname = "tasty-golden";
-  version = "2.2.0.2";
-  sha256 = "0wy29ybb31g34gjyx95an3azh111crvrrdhbbihjj064xvf6ddmy";
+  version = "2.2.1";
+  sha256 = "1q3x3vmck1yq7bf96f3ah5nadahfxjd4wr3dfh3ls549yz40x668";
   buildDepends = [
-    filepath mtl optparseApplicative tagged tasty temporary
+    deepseq filepath mtl optparseApplicative tagged tasty temporary
   ];
   meta = {
     homepage = "https://github.com/feuerbach/tasty-golden";
-- 
GitLab


From 7fe58926c3a8e665d53157293db4bdeaa42cc12c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:18 +0100
Subject: [PATCH 1933/3789] haskell-tasty-hunit: update to version 0.8.0.1

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

diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix
index dfcc5a4bdae..44efd608002 100644
--- a/pkgs/development/libraries/haskell/tasty-hunit/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-hunit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-hunit";
-  version = "0.4.1";
-  sha256 = "1ns4lbqjkgfgl00jg4sw2jz3r189z4k5fzwbii3g1bnskn28fapa";
+  version = "0.8.0.1";
+  sha256 = "0a84j8yjqp9x59dy5nbb50vnscb7iimgc60s8vz1p5721gqi62r5";
   buildDepends = [ HUnit mtl tasty ];
   meta = {
     description = "HUnit support for the Tasty test framework";
-- 
GitLab


From 6ec7fba26e5310955cf0bc11ab48419b9b2c5a6e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:19 +0100
Subject: [PATCH 1934/3789] haskell-tasty-quickcheck: update to version 0.8

---
 .../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 e18f3d7cd33..86ee3437cbb 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.3.1";
-  sha256 = "1rajvcq2a1yxdbb4kykvab1p9rnmsd2lgmlk61nd4fxvsvfj5gzn";
+  version = "0.8";
+  sha256 = "10d7chqrlp1fjphnkiykxd22g4mfp69kmihd705sxb0y0mrdfh8x";
   buildDepends = [ QuickCheck random tagged tasty ];
   meta = {
     description = "QuickCheck support for the Tasty test framework";
-- 
GitLab


From 872f5e56ea2edfc85be57f7101859de2523a798c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:20 +0100
Subject: [PATCH 1935/3789] haskell-tasty-rerun: update to version 1.1.1

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

diff --git a/pkgs/development/libraries/haskell/tasty-rerun/default.nix b/pkgs/development/libraries/haskell/tasty-rerun/default.nix
index 0b2623c5f67..b5f7351c594 100644
--- a/pkgs/development/libraries/haskell/tasty-rerun/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-rerun/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-rerun";
-  version = "1.1.0";
-  sha256 = "0nizjmz9z41r1vzxzld760x6ga4lqycwfazhddk570w3x2dzm6p2";
+  version = "1.1.1";
+  sha256 = "1xgjf47bvahankyic18l5fcda4dlfbd4j2lxqv3v5hhwk7zgvcp8";
   buildDepends = [
     mtl optparseApplicative reducers split stm tagged tasty
     transformers
-- 
GitLab


From 6448f24c9a8d94d5a98b35308b925c425cf35ae5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:21 +0100
Subject: [PATCH 1936/3789] haskell-tasty-smallcheck: update to version 0.8

---
 .../libraries/haskell/tasty-smallcheck/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix
index 36a9c4280af..40a30a6d24f 100644
--- a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-smallcheck";
-  version = "0.2";
-  sha256 = "1xw0l1bikwavyq7s8q71a92x87mg7z65mk32nn5qx0zxwqsfb5l4";
+  version = "0.8";
+  sha256 = "0c4ccmhql118j4dlvy5cmrnma454b0rdv1wq2ds6xhpdhx20h1br";
   buildDepends = [ async smallcheck tagged tasty ];
   meta = {
     homepage = "https://github.com/feuerbach/tasty";
-- 
GitLab


From 459b9bfd1202e037b69473492b3aa17371cadb3b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:22 +0100
Subject: [PATCH 1937/3789] haskell-tasty: update to version 0.8

---
 .../development/libraries/haskell/tasty/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix
index 2cf62b7cefd..6fcdf9a4cb3 100644
--- a/pkgs/development/libraries/haskell/tasty/default.nix
+++ b/pkgs/development/libraries/haskell/tasty/default.nix
@@ -1,16 +1,17 @@
-{ cabal, ansiTerminal, deepseq, either, mtl, optparseApplicative
-, regexTdfa, stm, tagged
+{ cabal, ansiTerminal, async, deepseq, mtl, optparseApplicative
+, regexTdfa, stm, tagged, unboundedDelays
 }:
 
 cabal.mkDerivation (self: {
   pname = "tasty";
-  version = "0.7";
-  sha256 = "0nwhbbm70v2drv6kzdz65wws7gn8ph6583xpb6dw8g4j9aa1shxd";
+  version = "0.8";
+  sha256 = "12r8ml45r1dq3vmjkibxkla5rmmyrm11js26kmkha110ji8hnflg";
   buildDepends = [
-    ansiTerminal deepseq either mtl optparseApplicative regexTdfa stm
-    tagged
+    ansiTerminal async deepseq mtl optparseApplicative regexTdfa stm
+    tagged unboundedDelays
   ];
   meta = {
+    homepage = "http://documentup.com/feuerbach/tasty";
     description = "Modern and extensible testing framework";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From 55cb854cad2e56e33fda81be2aa126a365bc34f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:23 +0100
Subject: [PATCH 1938/3789] haskell-text-format: update to version 0.3.1.1

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

diff --git a/pkgs/development/libraries/haskell/text-format/default.nix b/pkgs/development/libraries/haskell/text-format/default.nix
index b9507d7777a..b478fb7c515 100644
--- a/pkgs/development/libraries/haskell/text-format/default.nix
+++ b/pkgs/development/libraries/haskell/text-format/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "text-format";
-  version = "0.3.1.0";
-  sha256 = "13k5a1kfmapd4yckm2vcrwz4vrrf32c2dpisdw0hyvzvmdib3n60";
+  version = "0.3.1.1";
+  sha256 = "02zfgzfjvkaxbma1h2gr95h10c8q9gyaadag41q579j68iv15qbd";
   buildDepends = [ doubleConversion text time transformers ];
   meta = {
     homepage = "https://github.com/bos/text-format";
-- 
GitLab


From b47e3adbeb738398766d04e87acc36757c208789 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:25 +0100
Subject: [PATCH 1939/3789] haskell-trifecta: update to version 1.4.1

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

diff --git a/pkgs/development/libraries/haskell/trifecta/default.nix b/pkgs/development/libraries/haskell/trifecta/default.nix
index 84759406d00..d9a9a2a01c5 100644
--- a/pkgs/development/libraries/haskell/trifecta/default.nix
+++ b/pkgs/development/libraries/haskell/trifecta/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "trifecta";
-  version = "1.4";
-  sha256 = "1wz9rqd5nf1y4vpwn0vrbdlxdbrdp967p5ivpd0b2w5493m3mvax";
+  version = "1.4.1";
+  sha256 = "0w8x9n7n57y997iajm42z44nm846fj88shc04dffn1xif3jw5zfc";
   buildDepends = [
     ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup
     charset comonad deepseq fingertree hashable lens mtl parsers
-- 
GitLab


From 0f32474a731e6dcbb4895a71e5ee0b323ed6bb2c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:26 +0100
Subject: [PATCH 1940/3789] haskell-type-eq: update to version 0.4.2

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

diff --git a/pkgs/development/libraries/haskell/type-eq/default.nix b/pkgs/development/libraries/haskell/type-eq/default.nix
index ac97377c607..55bc6b03a95 100644
--- a/pkgs/development/libraries/haskell/type-eq/default.nix
+++ b/pkgs/development/libraries/haskell/type-eq/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "type-eq";
-  version = "0.4.1";
-  sha256 = "0l8nkrdn1hs8ddhh85qm176f9v42fdck9iscn4swd92vj7bfci7k";
+  version = "0.4.2";
+  sha256 = "0nyx3lqgrnlz0l3p615ln2dglqd39jwlk91ybz7blzhq1gpgayar";
   buildTools = [ cpphs ];
   meta = {
     homepage = "http://github.com/glaebhoerl/type-eq";
-- 
GitLab


From dd1cc881d51012bcb53b07ee2c05a8e24d725e6d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:27 +0100
Subject: [PATCH 1941/3789] haskell-xss-sanitize: update to version 0.3.5

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

diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
index fb0bd78917c..e92d761edcb 100644
--- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix
+++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xss-sanitize";
-  version = "0.3.4.2";
-  sha256 = "1sx44vkixxydv75cds5g9si7hzm2hdl395p3bdycq2zky0mnxwra";
+  version = "0.3.5";
+  sha256 = "13iggcivpvzlzlx0n1pb6lyw55lc7d7hzihf1llphq6lmdy6l49s";
   buildDepends = [
     attoparsec cssText network tagsoup text utf8String
   ];
-- 
GitLab


From 56e0e7492c8e40ffdf5c7a0785548cc6203db847 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:28 +0100
Subject: [PATCH 1942/3789] haskell-HaRe: update to version 0.7.1.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 33e5339a5f0..babfa131f10 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.1.2";
-  sha256 = "1bplcjh0rx6m8ja8vpb18cfky349gmi27rlpsg0pw5nr3l4gcwyl";
+  version = "0.7.1.3";
+  sha256 = "1x900mywsl5rmn4rv2ss1nnrb6y5zs422ivn0iqb4ijd8a2j4lq5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From f521a47663b1fad2acbf1da63508cb512ce123cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Mar 2014 23:13:29 +0100
Subject: [PATCH 1943/3789] haskell-cpphs: update to version 1.18.3

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

diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
index 2f86e8ad012..8d03d8ee4cb 100644
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -1,11 +1,12 @@
-{ cabal }:
+{ cabal, polyparse }:
 
 cabal.mkDerivation (self: {
   pname = "cpphs";
-  version = "1.18.2";
-  sha256 = "0b8hkb2sfacmpi3rwr62myn4kfpwbfdlv9k0vnhk3wvl1v4wf29l";
+  version = "1.18.3";
+  sha256 = "0m2083ynjfxad4ykvpm6c7q1clrm7nsvbwv10abhyzqkpazyzzxy";
   isLibrary = true;
   isExecutable = true;
+  buildDepends = [ polyparse ];
   meta = {
     homepage = "http://projects.haskell.org/cpphs/";
     description = "A liberalised re-implementation of cpp, the C pre-processor";
-- 
GitLab


From 0a2ff8d8b61021c1513c82016b8e6c37c5e31287 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Mar 2014 11:27:17 +0100
Subject: [PATCH 1944/3789] haskell-dependent-map: update to version 0.1.1.2

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

diff --git a/pkgs/development/libraries/haskell/dependent-map/default.nix b/pkgs/development/libraries/haskell/dependent-map/default.nix
index 32a10efc785..f8af7c8e42e 100644
--- a/pkgs/development/libraries/haskell/dependent-map/default.nix
+++ b/pkgs/development/libraries/haskell/dependent-map/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dependent-map";
-  version = "0.1.1.1";
-  sha256 = "1p5a5qahw7i6cvb0g0g1bv9gzy6jlxr5vb3hp8gahm210zw8g990";
+  version = "0.1.1.2";
+  sha256 = "1g8mq8189c6wr1rik70019gqrnk84c613x9cn5383p7hhfyc0rnn";
   buildDepends = [ dependentSum ];
   meta = {
     homepage = "https://github.com/mokus0/dependent-map";
-- 
GitLab


From 27e409e3fc9219e2338c253e947fe1a8424b0543 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Mar 2014 11:27:18 +0100
Subject: [PATCH 1945/3789] haskell-dependent-sum: update to version 0.2.0.2

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

diff --git a/pkgs/development/libraries/haskell/dependent-sum/default.nix b/pkgs/development/libraries/haskell/dependent-sum/default.nix
index 3d33956edcf..a92dd8064da 100644
--- a/pkgs/development/libraries/haskell/dependent-sum/default.nix
+++ b/pkgs/development/libraries/haskell/dependent-sum/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dependent-sum";
-  version = "0.2.0.1";
-  sha256 = "07zv8rj574vf7wl3pms4q8d9m7zsfppac5vla9d9b7q11s81lldf";
+  version = "0.2.0.2";
+  sha256 = "06amnc50j246f2za0ri49j6vyq6admx03w3xxjhhfnfx9lp6zmhm";
   meta = {
     homepage = "https://github.com/mokus0/dependent-sum";
     description = "Dependent sum type";
-- 
GitLab


From f3823dc8e35f606c1bf2b2a1137bad0c129fd5f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Mar 2014 11:27:19 +0100
Subject: [PATCH 1946/3789] haskell-gtk: update to version 0.12.5.6

---
 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 8198960854c..081573e7223 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.4";
-  sha256 = "0vs31lzrmd3546q8dqql8sf1vfagyr24p5i6ddi792vw14mj3why";
+  version = "0.12.5.6";
+  sha256 = "06i6y7psl8fd7cy7jn0aqp98k876spr5vjgjxs8730pw3x17z6ld";
   buildDepends = [ cairo glib mtl pango ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
-- 
GitLab


From d6f273a02c66479d1f953dab42276b72a9136216 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Mar 2014 11:27:20 +0100
Subject: [PATCH 1947/3789] haskell-haskell-names: update to version 0.3.2.7

---
 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 0cc021460f2..eba56e578f7 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.2.6";
-  sha256 = "1326p95r28hzzwcqjvqwwjxx8hcq56gd978v7g45jhvr73kpnzz6";
+  version = "0.3.2.7";
+  sha256 = "0ibc74xd480nnjhx274i184g2m24wx5ks602731fr490044cr4hl";
   buildDepends = [
     aeson Cabal dataLens dataLensTemplate filepath haskellPackages
     haskellSrcExts hseCpp mtl tagged transformers traverseWithClass
-- 
GitLab


From c9f64fb8ba42fa8dfa366d93df7eb4839989d69f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Mar 2014 12:47:18 +0100
Subject: [PATCH 1948/3789] lxc: update from 1.0.0 to 1.0.1

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

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index e6895bb517f..d59bb142f9f 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "lxc-1.0.0";
+  name = "lxc-1.0.1";
 
   src = fetchurl {
     url = "http://github.com/lxc/lxc/archive/${name}.tar.gz";
-    sha256 = "1dv78xd7mdb50x8dgjvnv2v6sdj2xv2vvar7y402ll2wh8ixmi91";
+    sha256 = "14fjzicv1s3niwag301i7m9vb9jlh3hnd9ks9jjkzp8xyxgb0rrv";
   };
 
   buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ];
-- 
GitLab


From 01e4edbabfc02d075f80d194d83d7dd1649431ab Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Mar 2014 16:30:05 +0400
Subject: [PATCH 1949/3789] Update vigra soure link to match both fresh and
 aged versions

---
 pkgs/development/libraries/vigra/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 5130abc9a96..97251e15c49 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -4,7 +4,10 @@ stdenv.mkDerivation rec {
   name = "vigra-1.9.0";
 
   src = fetchurl {
-    url = "${meta.homepage}/${name}-src.tar.gz";
+    urls = [
+      "${meta.homepage}/${name}-src.tar.gz"
+      "${meta.homepage}-old-versions/${name}-src.tar.gz"
+      ];
     sha256 = "00fg64da6dj9k42d90dz6y7x91xw1xqppcla14im74m4afswrgcg";
   };
 
@@ -17,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Novel computer vision C++ library with customizable algorithms and data structures";
-    homepage = http://hci.iwr.uni-heidelberg.de/vigra/;
+    homepage = http://hci.iwr.uni-heidelberg.de/vigra;
     license = "MIT";
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
-- 
GitLab


From bb37028fcc0bc8f207c169fea12d37b2eae3c1db Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Mar 2014 13:28:50 +0100
Subject: [PATCH 1950/3789] duplicity: add missing 'lockfile' build input

---
 pkgs/tools/backup/duplicity/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index ec4c00880d4..8a9db4e5701 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper }:
+{ stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper, lockfile }:
 
 let
   version = "0.6.23";
@@ -14,10 +14,10 @@ stdenv.mkDerivation {
   installPhase = ''
     python setup.py install --prefix=$out
     wrapProgram $out/bin/duplicity \
-      --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto})" \
+      --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \
       --prefix PATH : "${gnupg}/bin:${ncftp}/bin"
     wrapProgram $out/bin/rdiffdir \
-      --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto})" \
+      --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \
   '';
 
   buildInputs = [ python librsync makeWrapper ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9441da57ccd..58effac7336 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -848,7 +848,7 @@ let
   dtach = callPackage ../tools/misc/dtach { };
 
   duplicity = callPackage ../tools/backup/duplicity {
-    inherit (pythonPackages) boto;
+    inherit (pythonPackages) boto lockfile;
     gnupg = gnupg1;
   };
 
-- 
GitLab


From 3093656cfb3c033dee1ec0784c4459dc9bb928a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 8 Mar 2014 12:44:22 +0100
Subject: [PATCH 1951/3789] drumkv1: update from 0.3.6 to 0.4.0

---
 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 fc2453869e5..9a812fd261a 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.3.6";
+  version = "0.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "13prman3jlh3xz56675vnnnghnmmbxpq8gqdhv5llgd8ggzhmyjn";
+    sha256 = "0bhj4liv6c0rw0gsh1zygj4a9vmwl3jdz2j6zzdxbqdk21xq4zpz";
   };
 
   buildInputs = [ jackaudio libsndfile lv2 qt4 ];
-- 
GitLab


From c4651ec5df2ba8713fcbe2bc1364ded754faa032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 8 Mar 2014 12:46:28 +0100
Subject: [PATCH 1952/3789] samplv1: update from 0.3.6 to 0.4.0

---
 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 8c73928c79a..2748dfd5db4 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.3.6";
+  version = "0.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${name}.tar.gz";
-    sha256 = "1fgy9w3mp0p8i1v41a7gmpzzk268k7bp75d4sgzfprikjihc6ary";
+    sha256 = "04vldwpm4059czwd4i5yv07daqjnzs2zsrld779likans9ib3ri8";
   };
 
   buildInputs = [ jackaudio libsndfile lv2 qt4 ];
-- 
GitLab


From dc80186449660acf10a4bd7a1e3e2fe017139b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 8 Mar 2014 12:46:59 +0100
Subject: [PATCH 1953/3789] synthv1: update from 0.3.6 to 0.4.0

---
 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 c93c4c85225..229d4fdac14 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.3.6";
+  version = "0.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/synthv1/${name}.tar.gz";
-    sha256 = "1xj4dk1g546f9fv2c4i7g3f1axrxfrxzk9w1nidhj3686j79nyry";
+    sha256 = "0zyxja1s74fr95qbwsyykggs3af2ndm2hz1l0avb645xgm93vcfv";
   };
 
   buildInputs = [ qt4 jackaudio lv2 ];
-- 
GitLab


From 881bb235d9cbca120f061ee0d188a1f4fcd5a79f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 8 Mar 2014 08:00:56 -0600
Subject: [PATCH 1954/3789] nixos: tarsnap module documentation updates

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/backup/tarsnap.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 03fbd29a191..ac8f008069a 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -33,8 +33,9 @@ in
           service called <literal>tarsnap-backup</literal> which is
           periodically run by cron, or you may run it on-demand.
 
-          See <link xlink:href='http://www.tarsnap.com/gettingstarted.html'>Getting Started</link> 
-          Tarsnap page.
+          See the Tarsnap <link
+          xlink:href='http://www.tarsnap.com/gettingstarted.html'>Getting
+          Started</link> page.
         '';
       };
 
@@ -46,7 +47,7 @@ in
           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-20140301021501</literal>.
+          <literal>nixos-20140301011501</literal>.
         '';
       };
 
@@ -110,8 +111,8 @@ in
         default = "15 01 * * *";
         description = ''
           This option defines (in the format used by cron) when
-          tarsnap is run for backups.  The default is to update at
-          01:15 at night every day.
+          tarsnap is run for backups. The default is to backup the
+          specified paths at 01:15 at night every day.
         '';
       };
 
-- 
GitLab


From 429c536ddded5d9022df2c67ec803f244969d106 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 8 Mar 2014 09:00:57 -0600
Subject: [PATCH 1955/3789] fsharp: update to 3.0

Also, add myself to the maintainer list.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/fsharp/default.nix | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index bb9c6d75d44..a2f8f4e4ff4 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchurl, mono, unzip, pkgconfig
- } :
+{ stdenv, fetchgit, mono, pkgconfig, autoconf, automake, which }:
+
 stdenv.mkDerivation rec {
-  pname = "fsharp";
-  date = "2011-08-10";
-  name = "${pname}-${date}";
+  name = "fsharp-${version}";
+  version = "3.0";
 
-  src = fetchurl {
-    url = "http://download.mono-project.com/sources/fsharp/fsharp-cc126f2.zip";
-    sha256 = "03j2ypnfddl2zpvg8ivhafjy8dlz49b38rdy89l8c3irxdsb7k6i";
+  src = fetchgit {
+    url = "https://github.com/fsharp/fsharp";
+    rev = "refs/heads/fsharp_30";
+    sha256 = "59639c76ff401c9ddb1af7a2f5a53a5aef4ec0d62317aeb33429f3eb009f771f";
   };
 
-  buildInputs = [mono unzip pkgconfig];
-
-  sourceRoot = "fsharp";
+  buildInputs = [ mono pkgconfig autoconf automake which ];
+  configurePhase = "./autogen.sh --prefix $out";
 
   # To fix this error when running:
   # The file "/nix/store/path/whatever.exe" is an not a valid CIL image
@@ -20,9 +19,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A functional CLI language";
-    homepage = "http://tryfsharp.org/";
+    homepage = "http://fsharp.org/";
     license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
-- 
GitLab


From 531f7f56bc5a1c857790ee572fe672079080b22d Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 8 Mar 2014 17:51:45 +0200
Subject: [PATCH 1956/3789] wineUnstable: update from 1.7.12 to 1.7.14

---
 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 b6eb1038f93..bf55f93db5b 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.12";
+    version = "1.7.14";
     name = "wine-${version}";
 
     src = fetchurl {
       url = "mirror://sourceforge/wine/${name}.tar.bz2";
-      sha256 = "14mkh32lxjmbacz1f5pl5kr31n5dx0rfdqw5v88brhmsz1xzzk9d";
+      sha256 = "029y4vsjz2jxy31g5nylpl7wm5qhw37dsbx4f0za6swk51z97w9d";
     };
 
     gecko = fetchurl {
-- 
GitLab


From 568f9e953fdd58776bf368d62e51bfc2faea3424 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 8 Mar 2014 17:53:12 +0200
Subject: [PATCH 1957/3789] xterm: update from 301 to 303

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

diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index a13dd76fd03..ac2f6dd7756 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "xterm-301";
+  name = "xterm-303";
 
   src = fetchurl {
     url = "ftp://invisible-island.net/xterm/${name}.tgz";
-    sha256 = "040rarvv18zg0lk7qy0m3n7gv10mh40jic708wvng01z4rlbpfhz";
+    sha256 = "0n7hay16aam9kfn642ri0wj5yzilbjm3l8znxc2p5dx9pn3rkwla";
   };
 
   buildInputs =
-- 
GitLab


From bf900c25ec5cad34ccd6f02721e782b50ccbdca6 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 8 Mar 2014 17:53:52 +0200
Subject: [PATCH 1958/3789] youtubeDL: update from 2014.03.04.2 to 2014.03.07.1

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 8f27798d08a..5bf9e755ae9 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.03.04.2";
+  version = "2014.03.07.1";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1plqrjs7z4vbfa4h67zgd14j9ka9rnkzkqiwd948k9y3krxijg4p";
+    sha256 = "1yhjb5gk6l3y5p5fw246pww5yq661sr02zs17pqyxxbs2gx9kr4p";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From 6fa49c3945af69e9cff4207638efdbf4402774a9 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 8 Mar 2014 17:56:04 +0200
Subject: [PATCH 1959/3789] telepathy_glib: update from 0.22.0 to 0.22.1

---
 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 516ebc5f273..78d2d520050 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.0";
+  name = "telepathy-glib-0.22.1";
 
   src = fetchurl {
     url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
-    sha256 = "0mqrq2azw70rm50vy21acfnzn8mmh0w7dxh87mwr1lyk0jn1n232";
+    sha256 = "0vf2drh7g55nxyd0mxyn9sf99m981dagnvv9yc3q9f4k8x092a78";
   };
 
   configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings";
-- 
GitLab


From d9283c7663d83d35e502be94ba0c777fcdf7bb9b Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 8 Mar 2014 18:19:19 +0200
Subject: [PATCH 1960/3789] dosfstools: update from 3.0.24 to 3.0.26

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

diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index b9f10105918..6bd6bfe368c 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dosfstools-3.0.24";
+  name = "dosfstools-3.0.26";
 
   src = fetchurl {
     url = "http://daniel-baumann.ch/files/software/dosfstools/${name}.tar.xz";
-    sha256 = "1hblhb98wm9gm60y32psdqm5jprs4a6dqzrapzgb6bw7r3kvf88y";
+    sha256 = "0x9yi6s1419k678pr9h3a5bjccbrcxxpzmjwgl262ffrikz45126";
   };
 
   makeFlags = "PREFIX=$(out)";
-- 
GitLab


From 826335d2dc26f3ddeed8cac9d6a106eb98dc2d35 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 8 Mar 2014 18:21:06 +0200
Subject: [PATCH 1961/3789] collectd: update from 5.4.0 to 5.4.1

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

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 37283fc18a4..c76a1a13677 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "collectd-5.4.0";
+  name = "collectd-5.4.1";
   
   src = fetchurl {
     url = "http://collectd.org/files/${name}.tar.bz2";
-    sha256 = "0gljf5c60q6i0nrii6addxy1p76qqixww8zy17a7a1zil6a3i5wh";
+    sha256 = "1q365zx6d1wyhv7n97bagfxqnqbhj2j14zz552nhmjviy8lj2ibm";
   };
 
   NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel
-- 
GitLab


From 5a92a3a2962148588abd1215c09f6f9e635b514b Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 8 Mar 2014 18:22:28 +0200
Subject: [PATCH 1962/3789] cgit: update from 0.10 to 0.10.1

---
 .../version-management/git-and-tools/cgit/default.nix        | 5 +++--
 1 file changed, 3 insertions(+), 2 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 ce4d9f98596..8a1201815ae 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "cgit-0.10";
+  name = "cgit-0.10.1";
 
   src = fetchurl {
     url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
-    sha256 = "0ynywva0lrsasdm3nlk3dmd8k5bnrd9qlvmk4n42dfw9g1xj5i4h";
+    sha256 = "0bci1p9spf79wirc4lk36cndcx2b9wj0fq1l58rlp6r563is77l3";
   };
 
   # cgit is is tightly coupled with git and needs a git source tree to build.
@@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://git.zx2c4.com/cgit/about/;
+    repositories.git = git://git.zx2c4.com/cgit;
     description = "Web frontend for git repositories";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
-- 
GitLab


From 6f57402badd96e11822b161ba5584d6cd58e16c4 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 8 Mar 2014 18:25:27 +0200
Subject: [PATCH 1963/3789] chrony: update from 1.29 to 1.29.1

---
 pkgs/tools/networking/chrony/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index 41eb1a8f77a..ac7055e20f2 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux -> libcap != null;
 
 stdenv.mkDerivation rec {
-  name = "chrony-1.29";
+  name = "chrony-1.29.1";
   
   src = fetchurl {
     url = "http://download.tuxfamily.org/chrony/${name}.tar.gz";
-    sha256 = "16ykdb8pnqcr30pdsaa6rabvsin2n858fmkzd81anqq6p9rg11f6";
+    sha256 = "09xgcmh9yrprsazsrm3bm0xl3y75csi9lhh815yyrn68v2s9p335";
   };
   
   buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isLinux libcap;
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Sets your computer's clock from time servers on the Net";
-    homepage = "http://chrony.tuxfamily.org/";
+    homepage = http://chrony.tuxfamily.org/;
+    repository.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git;
     license = licenses.gpl2;
     platforms = platforms.unix;
 
-- 
GitLab


From bc1c6df9fe4a244613b45e9aea4228beb288c908 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 8 Mar 2014 18:30:44 +0200
Subject: [PATCH 1964/3789] ffmpeg_0_10: update from 0.10.10 to 0.10.11

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

diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix
index f51e3ccd3c0..f356bceaf40 100644
--- a/pkgs/development/libraries/ffmpeg/0.10.nix
+++ b/pkgs/development/libraries/ffmpeg/0.10.nix
@@ -21,11 +21,11 @@ assert vdpauSupport -> libvdpau != null;
 assert faacSupport -> faac != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-0.10.10";
+  name = "ffmpeg-0.10.11";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "14fbjhiwv5zg9yh0zk3k9h6id815xrikyz6l2cdl7z4vazbmhq4k";
+    sha256 = "1l1nyvsfafl9w0falv1hcm65r2rlxyb59har0rkrrpi56fj1ma4r";
   };
 
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
-- 
GitLab


From 0047f42663f5e55b77a604def3d83bad61ba28b1 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 8 Mar 2014 18:32:13 +0200
Subject: [PATCH 1965/3789] ffmpeg_1: update from 1.2.4 to 1.2.6

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

diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix
index 34d0a4e49fe..c43cd329956 100644
--- a/pkgs/development/libraries/ffmpeg/1.x.nix
+++ b/pkgs/development/libraries/ffmpeg/1.x.nix
@@ -31,11 +31,11 @@ assert playSupport -> SDL != null;
 assert freetypeSupport -> freetype != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-1.2.4";
+  name = "ffmpeg-1.2.6";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "1pqd544jmbggwisbkm0pj0l585b8a9x5n3jl9zbmqmw63g7ci5iv";
+    sha256 = "174rf3g2pqaxa8rzg03qmy4cn2gsy0p2mk26y9yk5ksq6kg59m19";
   };
 
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
-- 
GitLab


From d072cf56add7fe47f6844a915695f79b26a31f29 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Mar 2014 21:05:59 +0400
Subject: [PATCH 1966/3789] Update GlusterFS

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

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 9d4168b2d7d..2cb599f6a64 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information 
   rec {
     baseName="glusterfs";
-    version="3.4.1";
+    version="3.4.2";
     name="${baseName}-${version}";
-    hash="0fdp3bifd7n20xlmsmj374pbp11k7np71f7ibzycsvmqqviv9wdm";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.1/glusterfs-3.4.1.tar.gz";
-    sha256="0fdp3bifd7n20xlmsmj374pbp11k7np71f7ibzycsvmqqviv9wdm";
+    hash="1vzdihsy4da11jsa46n1n2xk6d40g7v0zrlqvs3pb9k07fql5kag";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.2/glusterfs-3.4.2.tar.gz";
+    sha256="1vzdihsy4da11jsa46n1n2xk6d40g7v0zrlqvs3pb9k07fql5kag";
   };
   buildInputs = [
     fuse bison flex openssl python ncurses readline
-- 
GitLab


From 8dc61a6519f3075818f6e3721a3d3e97280e48f1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Mar 2014 21:06:16 +0400
Subject: [PATCH 1967/3789] Update EKRHyper

---
 pkgs/applications/science/logic/ekrhyper/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/ekrhyper/default.nix b/pkgs/applications/science/logic/ekrhyper/default.nix
index 3a50d3e1ed0..e1eb9a2dcc3 100644
--- a/pkgs/applications/science/logic/ekrhyper/default.nix
+++ b/pkgs/applications/science/logic/ekrhyper/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="ekrhyper";
-    version="1_4_20112013";
+    version="1_4_21022014";
     name="${baseName}-${version}";
-    hash="08qrsahlgqq29zyrcc8435bymj3jvxaailbgjy47jzj1ki2i0vgm";
-    url="http://userpages.uni-koblenz.de/~bpelzer/ekrhyper/ekrh_1_4_20112013.tar.gz";
-    sha256="08qrsahlgqq29zyrcc8435bymj3jvxaailbgjy47jzj1ki2i0vgm";
+    hash="14xaaxyvfli1nd4vd9fp4j1s8k76z2bhazxzzc7br3q6hc6b8ivw";
+    url="http://userpages.uni-koblenz.de/~bpelzer/ekrhyper/ekrh_1_4_21022014.tar.gz";
+    sha256="14xaaxyvfli1nd4vd9fp4j1s8k76z2bhazxzzc7br3q6hc6b8ivw";
   };
   buildInputs = [
     ocaml perl
-- 
GitLab


From 8b83156598c6f519e2ce98148f89dabfc88f4ecc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Mar 2014 21:06:36 +0400
Subject: [PATCH 1968/3789] Update SBCL

---
 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 0c653064eac..36ea8981786 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.14";
+    version="1.1.16";
     name="${baseName}-${version}";
-    hash="0vqsq6q4xvz7vn1akvjwxp406mysak4h955pp8x32dfqc6ina7k7";
-    url="mirror://sourceforge/project/sbcl/sbcl/1.1.14/sbcl-1.1.14-source.tar.bz2";
-    sha256="0vqsq6q4xvz7vn1akvjwxp406mysak4h955pp8x32dfqc6ina7k7";
+    hash="04631klj02crs82b1i21rpddcgh9x6nnarj5avavy9c7zgvr8cnw";
+    url="mirror://sourceforge/project/sbcl/sbcl/1.1.16/sbcl-1.1.16-source.tar.bz2";
+    sha256="04631klj02crs82b1i21rpddcgh9x6nnarj5avavy9c7zgvr8cnw";
   };
   buildInputs = with a; [
     clisp makeWrapper
-- 
GitLab


From 3fa2c6ef5bd7ec5cff445d0d89b3af31f6e067f4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Mar 2014 21:06:56 +0400
Subject: [PATCH 1969/3789] Update 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 af985ac91fc..afab21bc4f0 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 = "0f1818l1vs5fbmrihzyv3qasddbqi3r01jik5crrxddwalsi2bd3";
+    sha256 = "18nd2zkgazphgkfdhf8ps7knda8vdnhrq9c02989279x2qxjsci9";
   };
   
   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.2";
+    version = "2.5.3.1";
     # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
     license = stdenv.lib.licenses.lgpl21Plus; 
     platforms = with stdenv.lib.platforms; unix;
-- 
GitLab


From dc4d698e223e9b9e110258ebd53242333dc39252 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Mar 2014 21:11:36 +0400
Subject: [PATCH 1970/3789] Update 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 356b004aa4e..953035342fd 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.1";
+    version="2.1.2";
     name="${baseName}-${version}";
-    hash="1b0qscmzdn80kxnn31v5q0rpafkwq1fr0766dzyh7dc2r6ws2nwr";
-    url="http://luarocks.org/releases/luarocks-2.1.1.tar.gz";
-    sha256="1b0qscmzdn80kxnn31v5q0rpafkwq1fr0766dzyh7dc2r6ws2nwr";
+    hash="1wwz71ymzjcyw8pz36yiw2x87c6v8nx5vdcd7zibm1n815v5qqk2";
+    url="http://luarocks.org/releases/luarocks-2.1.2.tar.gz";
+    sha256="1wwz71ymzjcyw8pz36yiw2x87c6v8nx5vdcd7zibm1n815v5qqk2";
   };
   buildInputs = [
     lua curl
-- 
GitLab


From 788b3f9ff9a6cd368ecc29157ce86fda6cd95faa Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Mar 2014 21:11:52 +0400
Subject: [PATCH 1971/3789] Update zpaq

---
 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 ccfea341771..c77517fa177 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="643";
+    version="649";
     name="${baseName}-${version}";
-    hash="1sgrhvvzrjb9gm9lffs1ai602v8p1mav0kc2sa7wlcx7kj1d3hxr";
-    url="http://mattmahoney.net/dc/zpaq643.zip";
-    sha256="1sgrhvvzrjb9gm9lffs1ai602v8p1mav0kc2sa7wlcx7kj1d3hxr";
+    hash="0rspkd8vdp06hyjlrhgqjrv37bwvnzvqw0smlcy5fjbny502s5nn";
+    url="http://mattmahoney.net/dc/zpaq649.zip";
+    sha256="0rspkd8vdp06hyjlrhgqjrv37bwvnzvqw0smlcy5fjbny502s5nn";
   };
   buildInputs = [
     unzip
-- 
GitLab


From 53f4bf3241729708b803611de1394421b4dbafb4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Mar 2014 21:12:12 +0400
Subject: [PATCH 1972/3789] Update BadVPN

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

diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix
index d2e53d677e2..fbea93d7edb 100644
--- a/pkgs/tools/networking/badvpn/default.nix
+++ b/pkgs/tools/networking/badvpn/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="badvpn";
-    version="1.999.128";
+    version="http://badvpn.googlecode.com/files/badvpn-openwrt.tar.bz2";
     name="${baseName}-${version}";
-    hash="1z4v1jydv8zkkszsq7scc17rw5dqz9zlpcc40ldxsw34arfqvcnn";
-    url="http://badvpn.googlecode.com/files/badvpn-1.999.128.tar.bz2";
-    sha256="1z4v1jydv8zkkszsq7scc17rw5dqz9zlpcc40ldxsw34arfqvcnn";
+    hash="1sr7i52msdjy8g7mrgwgqn3fqfvfjs48nz3waxf8r7wg1livvl2b";
+    url="http://badvpn.googlecode.com/files/badvpn-openwrt.tar.bz2";
+    sha256="1sr7i52msdjy8g7mrgwgqn3fqfvfjs48nz3waxf8r7wg1livvl2b";
   };
   buildInputs = [
     cmake openssl nss pkgconfig nspr
-- 
GitLab


From 4376d70c617f4aaae111f8b71b789fc11cae649f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Mar 2014 21:12:36 +0400
Subject: [PATCH 1973/3789] Update CL-Launch to 4.0.2.2

---
 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 3978d96400c..8aedd8a6159 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="3.22.1";
+    version="4.0.2.2";
     name="${baseName}-${version}";
-    hash="08lb8nm4dvkbgraqclw5xd7j6xskw9hgjpg9ql087gib5a90k09i";
-    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-3.22.1.tar.gz";
-    sha256="08lb8nm4dvkbgraqclw5xd7j6xskw9hgjpg9ql087gib5a90k09i";
+    hash="068bq66az3qhwgaxi9mx7f80396jilmd3zf4d3qamsyd81aq323c";
+    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.0.2.2.tar.gz.asc";
+    sha256="068bq66az3qhwgaxi9mx7f80396jilmd3zf4d3qamsyd81aq323c";
   };
   buildInputs = [
   ];
-- 
GitLab


From 9e801cc94a8b372698132e82575ef292a7d6543f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Mar 2014 21:12:46 +0400
Subject: [PATCH 1974/3789] Update XBoard

---
 pkgs/games/xboard/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix
index 45411263876..97414c07bda 100644
--- a/pkgs/games/xboard/default.nix
+++ b/pkgs/games/xboard/default.nix
@@ -5,11 +5,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="xboard";
-    version="4.7.2";
+    version="4.7.3";
     name="${baseName}-${version}";
-    hash="1vm95fjp3pkvvjvamfs7zqw4l4b4v7v52h2npvf9j5059fckcrwv";
-    url="http://ftp.gnu.org/gnu/xboard/xboard-4.7.2.tar.gz";
-    sha256="1vm95fjp3pkvvjvamfs7zqw4l4b4v7v52h2npvf9j5059fckcrwv";
+    hash="1amy9krr0qkvcc7gnp3i9x9ma91fc5cq8hy3gdc7rmfsaczv1l3z";
+    url="http://ftp.gnu.org/gnu/xboard/xboard-4.7.3.tar.gz";
+    sha256="1amy9krr0qkvcc7gnp3i9x9ma91fc5cq8hy3gdc7rmfsaczv1l3z";
   };
   buildInputs = [
     libX11 xproto libXt libXaw libSM libICE libXmu 
-- 
GitLab


From 8e1d765f615861632259095a75f81f52adfcd6f6 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 8 Mar 2014 19:33:41 +0100
Subject: [PATCH 1975/3789] nixos manual: make nixos options linkable

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

diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl
index 6d11ad7a6c4..9647aae0f2f 100644
--- a/nixos/doc/manual/options-to-docbook.xsl
+++ b/nixos/doc/manual/options-to-docbook.xsl
@@ -18,15 +18,14 @@
       <variablelist>
 
         <xsl:for-each select="attrs">
-
           <varlistentry>
-             <term>
-               <option>
+            <term xml:id="{generate-id(attr[@name = 'name']/string/@value)}" xlink:href="#{generate-id(attr[@name = 'name']/string/@value)}">
+              <option>
                  <xsl:for-each select="attr[@name = 'name']/string">
                    <xsl:value-of select="@value" />
                    <xsl:if test="position() != last()">.</xsl:if>
                  </xsl:for-each>
-               </option>
+              </option>
              </term>
 
              <listitem>
-- 
GitLab


From 73eead9f13157aa2c3b3b84457e7d982ba5220d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 8 Mar 2014 21:24:03 +0100
Subject: [PATCH 1976/3789] libreoffice: add deps needed now (libXdmcp,
 libpthreadstubs)

Configure phase passes now.
---
 pkgs/applications/office/libreoffice/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 58e657f8b2e..5918f0612ce 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -6,10 +6,10 @@
 
 { stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip
 , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
-, libxml2, db, sablotron, curl, libXaw, fontconfig, libsndfile, neon
+, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
-, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
-, libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler
+, icu, boost, jdk, ant, cups, xorg
+, openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
@@ -246,13 +246,14 @@ stdenv.mkDerivation rec {
     make slowcheck
   '';
 
-  buildInputs =
+  buildInputs = with xorg;
     [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
       CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig
       freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk
       hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
-      libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes
+      libXaw libXext libXi libXinerama libxml2 libxslt libXtst
+      libXdmcp libpthreadstubs mdds mesa mythes
       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
-- 
GitLab


From f0af1e7512cf40d02b6e6232950edab5784bfb48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 8 Mar 2014 00:42:42 +0100
Subject: [PATCH 1977/3789] rtl-sdr: new package

rtl-sdr turns your Realtek RTL2832 based DVB dongle into a SDR receiver.

http://sdr.osmocom.org/trac/wiki/rtl-sdr
---
 pkgs/applications/misc/rtl-sdr/default.nix | 30 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/misc/rtl-sdr/default.nix

diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix
new file mode 100644
index 00000000000..e6e76249388
--- /dev/null
+++ b/pkgs/applications/misc/rtl-sdr/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, cmake, pkgconfig, libusb1 }:
+
+stdenv.mkDerivation rec {
+  name = "rtl-sdr-${version}";
+  version = "0.5.3";
+
+  src = fetchgit {
+    url = "git://git.osmocom.org/rtl-sdr.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "00r5d08r12zzkd0xggd7l7p4r2278rzdhqdaihwjlajmr9qd3hs1";
+  };
+
+  buildInputs = [ cmake pkgconfig libusb1 ];
+
+  # Building with -DINSTALL_UDEV_RULES=ON tries to install udev rules to
+  # /etc/udev/rules.d/, and there is no option to install elsewhere. So install
+  # rules manually.
+  postInstall = ''
+    mkdir -p "$out/etc/udev/rules.d/"
+    cp ../rtl-sdr.rules "$out/etc/udev/rules.d/99-rtl-sdr.rules"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver";
+    homepage = http://sdr.osmocom.org/trac/wiki/rtl-sdr;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58effac7336..192666c5915 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8804,6 +8804,8 @@ let
     enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false);
   };
 
+  rtl-sdr = callPackage ../applications/misc/rtl-sdr { };
+
   rubyripper = callPackage ../applications/audio/rubyripper {};
 
   rxvt = callPackage ../applications/misc/rxvt { };
-- 
GitLab


From 12e00b5eebeb4996c447e1e41a9c18fd6636c960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 8 Mar 2014 09:30:36 +0100
Subject: [PATCH 1978/3789] openocd: install udev rules

So that they can easily be activated in NixOS:

  services.udev.packages = [ pkgs.openocd ];
---
 pkgs/development/tools/misc/openocd/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index c625f147400..36a57e8fe96 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libftdi libusb1 ];
 
+  postInstall = ''
+    mkdir -p "$out/etc/udev/rules.d"
+    ln -s "$out/share/openocd/contrib/openocd.udev" "$out/etc/udev/rules.d/99-openocd.rules"
+  '';
+
   meta = {
     homepage = http://openocd.sourceforge.net/;
     description = "OpenOCD, an on-chip debugger";
-- 
GitLab


From c33495b74961d82470f3d43cc7f109449f3d63f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 8 Mar 2014 09:53:11 +0100
Subject: [PATCH 1979/3789] saleae-logic: align attr name with pkg name
 (saleaeLogic -> saleae-logic)

---
 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 192666c5915..a5426321773 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3757,7 +3757,7 @@ let
 
   remake = callPackage ../development/tools/build-managers/remake { };
 
-  saleaeLogic = callPackage ../development/tools/misc/saleae-logic { };
+  saleae-logic = callPackage ../development/tools/misc/saleae-logic { };
 
   # couldn't find the source yet
   seleniumRCBin = callPackage ../development/tools/selenium/remote-control {
-- 
GitLab


From b9d7780ced1ea6a921d8d75316309b60a42796c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 8 Mar 2014 09:52:18 +0100
Subject: [PATCH 1980/3789] saleae-logic: install udev rules

So that they can easily be activated in NixOS:

  services.udev.packages = [ pkgs.saleae-logic ];
---
 pkgs/development/tools/misc/saleae-logic/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix
index 8fcf254e8ca..2fa7194cf07 100644
--- a/pkgs/development/tools/misc/saleae-logic/default.nix
+++ b/pkgs/development/tools/misc/saleae-logic/default.nix
@@ -3,6 +3,8 @@
 # Suggested udev rules to be able to access the Logic device without being root:
 #   SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="0925", ATTR{idProduct}=="3881", MODE="0666"
 #   SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="21a9", ATTR{idProduct}=="1001", MODE="0666"
+#
+# In NixOS, simply add this package to services.udev.packages.
 
 { stdenv, fetchurl, unzip, glib, libSM, libICE, gtk, libXext, libXft
 , fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor
@@ -79,6 +81,10 @@ stdenv.mkDerivation rec {
     # Copy the generated .desktop file
     mkdir -p "$out/share/applications"
     cp "$desktopItem"/share/applications/* "$out/share/applications/"
+
+    # Install provided udev rules
+    mkdir -p "$out/etc/udev/rules.d"
+    cp Drivers/99-SaleaeLogic.rules "$out/etc/udev/rules.d/"
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 24d9bc576aed512962429acd6b1da8064f398f05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 8 Mar 2014 18:13:29 +0100
Subject: [PATCH 1981/3789] gnuradio-osmosdr: new package

This is a Gnuradio block for OsmoSDR and rtl-sdr.

http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
---
 .../misc/gnuradio-osmosdr/default.nix         | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/misc/gnuradio-osmosdr/default.nix

diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
new file mode 100644
index 00000000000..2e9d74c2441
--- /dev/null
+++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd
+, makeWrapper
+, pythonSupport ? true, python, swig
+}:
+
+assert pythonSupport -> python != null && swig != null;
+
+stdenv.mkDerivation rec {
+  name = "gnuradio-osmosdr-${version}";
+  version = "0.1.0";
+
+  src = fetchgit {
+    url = "git://git.osmocom.org/gr-osmosdr";
+    rev = "refs/tags/v${version}";
+    sha256 = "112zfvnr6fjvhdc06ihi2sb0dp441qy7jq8rvr81nbyv3r8jspj4";
+  };
+
+  buildInputs = [
+    cmake pkgconfig boost gnuradio rtl-sdr uhd makeWrapper
+  ] ++ stdenv.lib.optionals pythonSupport [ python swig ];
+
+  postInstall = ''
+    for prog in "$out"/bin/*; do
+        wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out")
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Gnuradio block for OsmoSDR and rtl-sdr";
+    homepage = http://sdr.osmocom.org/trac/wiki/GrOsmoSDR;
+    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 a5426321773..2c2f545f76b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7930,6 +7930,8 @@ let
     fftw = fftwFloat;
   };
 
+  gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { };
+
   goldendict = callPackage ../applications/misc/goldendict { };
 
   google-musicmanager = callPackage ../applications/audio/google-musicmanager { };
-- 
GitLab


From 28e28acc36441c9966ddb4d794604ec26eaa92c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 8 Mar 2014 18:16:10 +0100
Subject: [PATCH 1982/3789] gqrx: new package

Gqrx is a software defined radio receiver powered by GNU Radio and the Qt
GUI toolkit. It can process I/Q data from many types of input devices,
including Funcube Dongle Pro/Pro+, rtl-sdr, HackRF, and Universal
Software Radio Peripheral (USRP) devices.

http://gqrx.dk/
---
 pkgs/applications/misc/gqrx/default.nix | 39 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/misc/gqrx/default.nix

diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
new file mode 100644
index 00000000000..a5208107750
--- /dev/null
+++ b/pkgs/applications/misc/gqrx/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, qt4, gnuradio, boost, gnuradio-osmosdr
+# drivers (optional):
+, rtl-sdr
+, pulseaudioSupport ? true, pulseaudio
+}:
+
+assert pulseaudioSupport -> pulseaudio != null;
+
+stdenv.mkDerivation rec {
+  name = "gqrx-${version}";
+  version = "2.2.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/gqrx/${version}/${name}-src.tar.gz";
+    sha256 = "15ncx2shh43skph7sj3jvmkls9cbbbysld49c8xd23fhdsxanj9x";
+  };
+
+  buildInputs = [
+    qt4 gnuradio boost gnuradio-osmosdr rtl-sdr
+  ] ++ stdenv.lib.optionals pulseaudioSupport [ pulseaudio ];
+
+  configurePhase = ''qmake PREFIX="$out"'';
+
+  meta = with stdenv.lib; {
+    description = "Software defined radio (SDR) receiver";
+    longDescription = ''
+      Gqrx is a software defined radio receiver powered by GNU Radio and the Qt
+      GUI toolkit. It can process I/Q data from many types of input devices,
+      including Funcube Dongle Pro/Pro+, rtl-sdr, HackRF, and Universal
+      Software Radio Peripheral (USRP) devices.
+    '';
+    homepage = http://gqrx.dk/;
+    # Some of the code comes from the Cutesdr project, with a BSD license, but
+    # it's currently unknown which version of the BSD license that is.
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;  # should work on Darwin / OS X too
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c2f545f76b..e5dc9e81251 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7938,6 +7938,8 @@ let
 
   gpicview = callPackage ../applications/graphics/gpicview { };
 
+  gqrx = callPackage ../applications/misc/gqrx { };
+
   grass = import ../applications/misc/grass {
     inherit (xlibs) libXmu libXext libXp libX11 libXt libSM libICE libXpm
       libXaw libXrender;
-- 
GitLab


From 6eb7a3078cc877d91fad01e1662e8a430eab68eb Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 8 Mar 2014 11:04:01 -0600
Subject: [PATCH 1983/3789] mono: add LLVM support (3.4svn build)

This adds LLVM support in Mono using their custom fork, based on LLVM
3.4svn upstream. Somehow, it's gone for a while without a patch to fix
the CMakeLists.txt in the fork...

The upstream commit is based on the mono3 branch.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../compilers/mono/build-fix-llvm.patch       | 12 ++++
 pkgs/development/compilers/mono/default.nix   | 18 ++++--
 pkgs/development/compilers/mono/llvm.nix      | 59 +++++++++++++++++++
 3 files changed, 84 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/compilers/mono/build-fix-llvm.patch
 create mode 100644 pkgs/development/compilers/mono/llvm.nix

diff --git a/pkgs/development/compilers/mono/build-fix-llvm.patch b/pkgs/development/compilers/mono/build-fix-llvm.patch
new file mode 100644
index 00000000000..526986ad12c
--- /dev/null
+++ b/pkgs/development/compilers/mono/build-fix-llvm.patch
@@ -0,0 +1,12 @@
+diff --git a/lib/CodeGen/AsmPrinter/CMakeLists.txt.old b/lib/CodeGen/AsmPrinter/CMakeLists.txt
+index be484a6..c92ff46 100644
+--- a/lib/CodeGen/AsmPrinter/CMakeLists.txt.old
++++ b/lib/CodeGen/AsmPrinter/CMakeLists.txt
+@@ -10,6 +10,7 @@ add_llvm_library(LLVMAsmPrinter
+   DwarfCompileUnit.cpp
+   DwarfDebug.cpp
+   DwarfException.cpp
++  DwarfMonoException.cpp
+   ErlangGCPrinter.cpp
+   OcamlGCPrinter.cpp
+   Win64Exception.cpp
diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index 1f4d8dcef6f..4ff2dacff18 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -1,5 +1,9 @@
-{stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11}:
+{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? true }:
 
+let
+  llvm     = callPackage ./llvm.nix { };
+  llvmOpts = stdenv.lib.optionalString withLLVM "--enable-llvm --enable-llvmloaded --with-llvm=${llvm}";
+in
 stdenv.mkDerivation rec {
   name = "mono-${version}";
   version = "3.2.8";
@@ -8,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0h0s42pmgrhwqaym0b1401h70dcpr179ngcsp7f8i4hl4snqrd7x";
   };
 
-  buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11];
+  buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib];
   propagatedBuildInputs = [glib];
 
   NIX_LDFLAGS = "-lgcc_s" ;
@@ -18,7 +22,7 @@ stdenv.mkDerivation rec {
 
   # In fact I think this line does not help at all to what I
   # wanted to achieve: have mono to find libgdiplus automatically
-  configureFlags = "--x-includes=${libX11}/include --x-libraries=${libX11}/lib --with-libgdiplus=${libgdiplus}/lib/libgdiplus.so";
+  configureFlags = "--x-includes=${libX11}/include --x-libraries=${libX11}/lib --with-libgdiplus=${libgdiplus}/lib/libgdiplus.so ${llvmOpts}";
 
   # Attempt to fix this error when running "mcs --version":
   # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
@@ -27,10 +31,14 @@ stdenv.mkDerivation rec {
   # Parallel building doesn't work, as shows http://hydra.nixos.org/build/2983601
   enableParallelBuilding = false;
 
-  preBuild = "
+  # Patch all the necessary scripts. Also, if we're using LLVM, we fix the default
+  # LLVM path to point into the Mono LLVM build, since it's private anyway.
+  preBuild = ''
     makeFlagsArray=(INSTALL=`type -tp install`)
     patchShebangs ./
-  ";
+  '' + stdenv.lib.optionalString withLLVM ''
+    substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")"
+  '';
 
   #Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps
   #Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive
diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix
new file mode 100644
index 00000000000..74f85b1519c
--- /dev/null
+++ b/pkgs/development/compilers/mono/llvm.nix
@@ -0,0 +1,59 @@
+{ stdenv
+, fetchurl
+, perl
+, groff
+, cmake
+, python
+, libffi
+, binutils
+, libxml2
+, valgrind
+, ncurses
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+  name    = "llvm-${version}";
+  version = "3.4svn-mono-f9b1a74368";
+  src = fetchurl {
+    # from the HEAD of the 'mono3' branch
+    url = "https://github.com/mono/llvm/archive/f9b1a74368ec299fc04c4cfef4b5aa0992b7b806.tar.gz";
+    name = "${name}.tar.gz";
+    sha256 = "1bbkx4p5zdnk3nbdd5jxvbwqx8cdq8z1n1nhf639i98mggs0zhdg";
+  };
+
+  patches = [ ./build-fix-llvm.patch ];
+  unpackPhase = ''
+    unpackFile ${src}
+    mv llvm-* llvm
+    sourceRoot=$PWD/llvm
+  '';
+
+  buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind;
+
+  propagatedBuildInputs = [ ncurses zlib ];
+
+  # hacky fix: created binaries need to be run before installation
+  preBuild = ''
+    mkdir -p $out/
+    ln -sv $PWD/lib $out
+  '';
+  postBuild = "rm -fR $out";
+
+  cmakeFlags = with stdenv; [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DLLVM_ENABLE_FFI=ON"
+    "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
+    "-DCMAKE_CXX_FLAGS=-std=c++11"
+  ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Collection of modular and reusable compiler and toolchain technologies - Mono build";
+    homepage    = http://llvm.org/;
+    license     = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
-- 
GitLab


From f277d6f4a060ea98d85ffa55d5dea28b01b887d5 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 8 Mar 2014 15:45:52 -0600
Subject: [PATCH 1984/3789] fsharp: specify exact mono path, install fsi/fsc
 binaries

fsc/fsi are just symlinks for backwards compatibility.

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

diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index a2f8f4e4ff4..37516fabaab 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
   buildInputs = [ mono pkgconfig autoconf automake which ];
   configurePhase = "./autogen.sh --prefix $out";
 
+  # Make sure the executables use the right mono binary,
+  # and set up some symlinks for backwards compatibility.
+  postInstall = ''
+    substituteInPlace $out/bin/fsharpc --replace " mono " " ${mono}/bin/mono "
+    substituteInPlace $out/bin/fsharpi --replace " mono " " ${mono}/bin/mono "
+    substituteInPlace $out/bin/fsharpiAnyCpu --replace " mono " " ${mono}/bin/mono "
+    ln -s $out/bin/fsharpc $out/bin/fsc
+    ln -s $out/bin/fsharpi $out/bin/fsi
+  '';
+
   # To fix this error when running:
   # The file "/nix/store/path/whatever.exe" is an not a valid CIL image
   dontStrip = true;
-- 
GitLab


From f0f212562082338f3b5d7658bad036e286bfd9ad Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 8 Mar 2014 19:47:23 +0100
Subject: [PATCH 1985/3789] pythonPackages: auto add unzip to buildInputs if
 pkg has zip suffix

---
 .../python-modules/generic/default.nix        |  8 ++-
 pkgs/top-level/python-packages.nix            | 54 ++++++-------------
 2 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 067a1cdf2e2..6debcd818e5 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -3,7 +3,7 @@
    (http://pypi.python.org/pypi/setuptools/), which represents a large
    number of Python packages nowadays.  */
 
-{ python, setuptools, wrapPython, lib, recursivePthLoader, distutils-cfg }:
+{ python, setuptools, unzip, wrapPython, lib, recursivePthLoader, distutils-cfg }:
 
 { name
 
@@ -46,7 +46,11 @@ python.stdenv.mkDerivation (attrs // {
 
   name = namePrefix + name;
 
-  buildInputs = [ python wrapPython setuptools (distutils-cfg.override { extraCfg = distutilsExtraCfg; }) ] ++ buildInputs ++ pythonPath;
+  buildInputs = [
+    python wrapPython setuptools
+    (distutils-cfg.override { extraCfg = distutilsExtraCfg; })
+  ] ++ buildInputs ++ pythonPath
+    ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name) unzip);
 
   propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ];
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c7123a98d4..d013b5a1544 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14,7 +14,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 } // rec {
 
   inherit python;
-  inherit (pkgs) fetchurl fetchsvn fetchgit stdenv;
+  inherit (pkgs) fetchurl fetchsvn fetchgit stdenv unzip;
 
   # helpers
 
@@ -256,7 +256,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
     buildInputs = [
       pkgs.which
-      pkgs.unzip
       pythonPackages.coverage
       pythonPackages.mock
       pythonPackages.tissue
@@ -376,7 +375,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       sha1 = "fa4aec08e59fa5964197f59ba42408d64031675b";
     };
 
-    buildInputs = [ pkgs.unzip pkgs.sqlite ];
+    buildInputs = [ pkgs.sqlite ];
 
     # python: double free or corruption (fasttop): 0x0000000002fd4660 ***
     doCheck = false;
@@ -426,8 +425,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       sha256 = "192174mys40m0bwk6l5jlfnzps0xi81sxm34cqms6dc3c454pbyx";
     };
 
-    buildInputs = [ pkgs.unzip ];
-
     # error: invalid command 'test'
     doCheck = false;
 
@@ -591,8 +588,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       sha256 = "1i1p3rkj4ad108f23xyib34r4rcy571gy65paml6fk77knh0k66p";
     };
 
-    buildInputs = [ pkgs.unzip ];
-
     # error: invalid command 'test'
     doCheck = false;
 
@@ -1284,7 +1279,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "9c0b8efe9d43b460f8cf049fa46ce14d";
     };
 
-    buildInputs = [ pkgs.unzip pytest ];
+    buildInputs = [ pytest ];
     propagatedBuildInputs = [ execnet ];
 
     meta = {
@@ -1311,7 +1306,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       sha256 = "139yfm9yz9k33kgqw4khsljs10rkhhxyywbq9i82bh2r31cil1pp";
     };
 
-    buildInputs = [ pkgs.unzip pythonPackages.mock ];
+    buildInputs = [ pythonPackages.mock ];
 
     # couple of failing tests
     doCheck = false;
@@ -1564,8 +1559,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "be885ccd9612966bb81839670d2da099";
     };
 
-    buildInputs = [ pkgs.unzip ];
-
     meta = {
       description = "rapid multi-Python deployment";
       license = stdenv.lib.licenses.gpl2;
@@ -1933,7 +1926,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "a6728117cad24749ddb39d2827cd9033";
     };
 
-    buildInputs = [ pkgs.unzip webtest ];
+    buildInputs = [ webtest ];
     propagatedBuildInputs = [ jinja2 pyramid ];
 
     meta = {
@@ -2068,7 +2061,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "36aa2c96dec4cfeea57f54da2b733eb9";
     };
 
-    buildInputs = [ pkgs.unzip zope_interface zope_location zope_schema ];
+    buildInputs = [ zope_interface zope_location zope_schema ];
 
     meta = {
       maintainers = [ stdenv.lib.maintainers.iElectric ];
@@ -3381,7 +3374,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
 
     buildInputs =
-      [ pkgs.unzip fs gdata python_keyczar mock pyasn1 pycrypto pytest ];
+      [ fs gdata python_keyczar mock pyasn1 pycrypto pytest ];
   };
 
   kitchen = buildPythonPackage (rec {
@@ -3875,8 +3868,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       export LC_ALL="en_US.UTF-8"
     '';
 
-    buildInputs = [ pkgs.unzip ];
-
     propagatedBuildInputs = [ argparse jinja2 six modules.readline ] ++
                             (optionals isPy26 [ importlib ordereddict ]);
 
@@ -4165,7 +4156,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       sha256 = "0lgrfgp3sq8xi8d9grrg0z8jsyk0wl8a3rxw31hb7vdncin5b7n5";
     };
 
-    buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ nose ];
 
     meta = {
@@ -4660,8 +4650,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       sha256 = "0kdc4rg47k1qkq22inghd50xlxjdkfcilym8mxff8wy4h091xykw";
     };
 
-    buildInputs = [ pkgs.unzip ];
-
     propagatedBuildInputs = [ pytz ];
 
     meta = {
@@ -4704,7 +4692,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "56b6614499aacb7d6b5983c4914daea7";
     };
 
-    buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib pkgs.libtiff pkgs.libwebp ];
+    buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp ];
 
     # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
     preConfigure = ''
@@ -5268,7 +5256,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       sha256 = "0ldkm8xws91j7zbvpqb413hvdz8r66bslr451q3qc0xi8cnmydfq";
     };
 
-    buildInputs = [ pkgs.unzip pkgs.libiodbc ];
+    buildInputs = [ pkgs.libiodbc ];
 
     meta = with stdenv.lib; {
       description = "Python ODBC module to connect to almost any database";
@@ -5606,7 +5594,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "c57cba33626ac4b1e3d1974923d59232";
     };
 
-    buildInputs = [ pkgs.unzip ];
     meta = {
       homepage    = "https://code.google.com/p/pysphere/";
       license     = "BSD";
@@ -5811,7 +5798,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       sha256 = "1r127fa354ppb667f4acxlzwxixap1jgzjrr790bw8mcpxv2hqaa";
     };
 
-    buildInputs = [ pkgs.unzip pkgs.pyrex ];
+    buildInputs = [ pkgs.pyrex ];
     propagatedBuildInputs = [ pkgs.libyaml ];
 
     meta = {
@@ -6044,7 +6031,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     # error: invalid command 'test'
     #doCheck = false;
 
-    buildInputs = [ unittest2 pkgs.unzip ];
+    buildInputs = [ unittest2 ];
     propagatedBuildInputs = [ robotframework lxml ];
 
     meta = with stdenv.lib; {
@@ -7457,7 +7444,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     # XXX: skipping two tests fails in python2.6
     doCheck = ! isPy26;
 
-    buildInputs = [ pkgs.unzip ] ++ optionals isPy26 [ pythonPackages.ordereddict unittest2 ];
+    buildInputs = optionals isPy26 [ pythonPackages.ordereddict unittest2 ];
 
     propagatedBuildInputs = [
       nose
@@ -7721,7 +7708,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "eff24d7918099a3e899ee63a9c31bee6";
     };
 
-    buildInputs = [ pkgs.unzip zope_interface ];
+    buildInputs = [ zope_interface ];
 
     meta = {
         maintainers = [ stdenv.lib.maintainers.goibhniu ];
@@ -7737,8 +7724,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "4ff0ddbf64c45bfcc3189e35f4214ded";
     };
 
-    buildInputs = [ pkgs.unzip ];
-
     propagatedBuildInputs = [ zope_interface ];
 
     meta = {
@@ -7813,8 +7798,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "c6ac80e6887de4108a383f349fbdf332";
     };
 
-    buildInputs = [ pkgs.unzip ];
-
     meta = {
         maintainers = [ stdenv.lib.maintainers.goibhniu ];
     };
@@ -8050,7 +8033,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "8b317b41244fc2e67f2f286890ba59a0";
     };
 
-    buildInputs = [ pkgs.unzip sqlalchemy zope_testing zope_interface setuptools ];
+    buildInputs = [ sqlalchemy zope_testing zope_interface setuptools ];
     propagatedBuildInputs = [ sqlalchemy transaction ];
 
     meta = {
@@ -8072,7 +8055,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "01c30c342c6a18002a762bd5d320a6e9";
     };
 
-    buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ];
 
     meta = {
@@ -8093,8 +8075,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "1d689abad000419891494b30dd7d8190";
     };
 
-    buildInputs = [ pkgs.unzip ];
-
     propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit;
 
     # a test is failing
@@ -8117,8 +8097,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       md5 = "eaad8fc7bbef126f9f8616b074ec00aa";
     };
 
-    buildInputs = [ pkgs.unzip ];
-
     propagatedBuildInputs = [ zope_location zope_security zope_publisher ];
 
     meta = {
@@ -8207,7 +8185,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       sha256 = "0ri6gj883k042xaxa2d5ymmhbw2bfcxdzhh4bz7700ibxwxxj62h";
     };
 
-    buildInputs = [ pkgs.unzip unittest2 nose mock ];
+    buildInputs = [ unittest2 nose mock ];
     propagatedBuildInputs = [ modules.curses libarchive ];
 
     # tests are still failing
@@ -8234,7 +8212,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       url = "http://pypi.python.org/packages/source/p/pyzmq/pyzmq-13.0.0.zip";
       md5 = "fa2199022e54a393052d380c6e1a0934";
     };
-    buildInputs = [ pkgs.unzip pkgs.zeromq3 ];
+    buildInputs = [ pkgs.zeromq3 ];
     propagatedBuildInputs = [  ];
     doCheck = false;
   };
-- 
GitLab


From 727634b0e4ef7d233e75eff9c2c223e3cb3165a4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 9 Mar 2014 03:06:32 +0400
Subject: [PATCH 1986/3789] BadVPN moved to GitHub

---
 pkgs/tools/networking/badvpn/default.nix      | 8 ++++----
 pkgs/tools/networking/badvpn/default.upstream | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix
index fbea93d7edb..64f669a480e 100644
--- a/pkgs/tools/networking/badvpn/default.nix
+++ b/pkgs/tools/networking/badvpn/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="badvpn";
-    version="http://badvpn.googlecode.com/files/badvpn-openwrt.tar.bz2";
+    version="1.999.129";
     name="${baseName}-${version}";
-    hash="1sr7i52msdjy8g7mrgwgqn3fqfvfjs48nz3waxf8r7wg1livvl2b";
-    url="http://badvpn.googlecode.com/files/badvpn-openwrt.tar.bz2";
-    sha256="1sr7i52msdjy8g7mrgwgqn3fqfvfjs48nz3waxf8r7wg1livvl2b";
+    hash="078gax6yifkf9y9g01wn1p0dypvgiwcsdmzp1bhwwfi0fbpnzzgl";
+    url="https://github.com/ambrop72/badvpn/archive/1.999.129.tar.gz";
+    sha256="078gax6yifkf9y9g01wn1p0dypvgiwcsdmzp1bhwwfi0fbpnzzgl";
   };
   buildInputs = [
     cmake openssl nss pkgconfig nspr
diff --git a/pkgs/tools/networking/badvpn/default.upstream b/pkgs/tools/networking/badvpn/default.upstream
index 1c746698fef..2a85ba7cb51 100644
--- a/pkgs/tools/networking/badvpn/default.upstream
+++ b/pkgs/tools/networking/badvpn/default.upstream
@@ -1,3 +1,3 @@
-url http://gc.codehum.com/p/badvpn/downloads/list
-version_link '[.]tar[.][a-z0-9]+$'
-process 'gc.codehum.com//' ''
+url https://github.com/ambrop72/badvpn/releases
+version_link '[0-9][.]tar[.][a-z0-9]+$'
+version '.*/([0-9.]+)[.]tar[.].*' '\1'
-- 
GitLab


From 6cfbc75bc1cea45a586a2316f860beb9d411f962 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 9 Mar 2014 12:47:33 +0400
Subject: [PATCH 1987/3789] Fix CL-Launch source link

---
 pkgs/development/tools/misc/cl-launch/default.nix      | 6 +++---
 pkgs/development/tools/misc/cl-launch/default.upstream | 2 +-
 2 files 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 8aedd8a6159..5d7da48cced 100644
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -5,9 +5,9 @@ let
     baseName="cl-launch";
     version="4.0.2.2";
     name="${baseName}-${version}";
-    hash="068bq66az3qhwgaxi9mx7f80396jilmd3zf4d3qamsyd81aq323c";
-    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.0.2.2.tar.gz.asc";
-    sha256="068bq66az3qhwgaxi9mx7f80396jilmd3zf4d3qamsyd81aq323c";
+    hash="1a7nwm1gkvpypfbhl29gj4gba50r5b069g3c87cfvrk2n4plm65b";
+    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.0.2.2.tar.gz";
+    sha256="1a7nwm1gkvpypfbhl29gj4gba50r5b069g3c87cfvrk2n4plm65b";
   };
   buildInputs = [
   ];
diff --git a/pkgs/development/tools/misc/cl-launch/default.upstream b/pkgs/development/tools/misc/cl-launch/default.upstream
index 1ff5daca02c..ff7ee9446d2 100644
--- a/pkgs/development/tools/misc/cl-launch/default.upstream
+++ b/pkgs/development/tools/misc/cl-launch/default.upstream
@@ -1,2 +1,2 @@
 url http://common-lisp.net/project/xcvb/cl-launch/
-version_link '.-[0-9].*[0-9][.]tar[.].*'
+version_link '.-[0-9].*[0-9][.]tar[.][a-z0-9]*$'
-- 
GitLab


From 8d18d58f913bb7664b4d7975b3ba371d3049bce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 9 Mar 2014 13:23:46 +0100
Subject: [PATCH 1988/3789] can-utils: new package

CAN userspace utilities and tools (for use with Linux SocketCAN).

There is no real "homepage" for this project (the only thing I could
find was the gitorious page) and they haven't produced any proper
releases (source archives and/or git tags), even though git history goes
back to 2006 and things seem stable.
---
 pkgs/os-specific/linux/can-utils/default.nix | 24 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/os-specific/linux/can-utils/default.nix

diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix
new file mode 100644
index 00000000000..6a3fbd33d68
--- /dev/null
+++ b/pkgs/os-specific/linux/can-utils/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "can-utils-${version}";
+  # There are no releases (source archives or git tags), so use the date of the
+  # latest commit in git master as version number.
+  version = "20140227";
+
+  src = fetchgit {
+    url = "https://git.gitorious.org/linux-can/can-utils.git";
+    rev = "67a2bdcd336e6becfa5784742e18c88dbeddc973";
+    sha256 = "0pnnjl141wf3kbf256m6qz9mxz0144z36qqb43skialzcnlhga38";
+  };
+
+  preConfigure = ''makeFlagsArray+=(PREFIX="$out")'';
+
+  meta = with stdenv.lib; {
+    description = "CAN userspace utilities and tools (for use with Linux SocketCAN)";
+    homepage = "https://gitorious.org/linux-can/can-utils";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 730429bd366..fc00e047da5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -661,6 +661,8 @@ let
 
   cabextract = callPackage ../tools/archivers/cabextract { };
 
+  can-utils = callPackage ../os-specific/linux/can-utils { };
+
   ccid = callPackage ../tools/security/ccid { };
 
   ccrypt = callPackage ../tools/security/ccrypt { };
-- 
GitLab


From 807fbbe8ba2d86b5f2c463c7615682fd165c65b3 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 9 Mar 2014 13:27:41 +0100
Subject: [PATCH 1989/3789] pythonPackages.sqlalchemy9: add

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c7123a98d4..eb5d27ee290 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6753,46 +6753,44 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   });
 
-
-  sqlalchemy = buildPythonPackage rec {
-    name = "sqlalchemy-${version}";
-    version = "0.7.10";
-
+  sqlalchemy = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec {
+    name = "SQLAlchemy-0.7.10";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz";
+      url = "http://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
       sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp";
     };
-
     patches = [
       # see https://groups.google.com/forum/#!searchin/sqlalchemy/module$20logging$20handlers/sqlalchemy/ukuGhmQ2p6g/2_dOpBEYdDYJ
       # waiting for 0.7.11 release
       ../development/python-modules/sqlalchemy-0.7.10-test-failures.patch
     ];
+  });
 
-    buildInputs = [ nose ];
-
-    propagatedBuildInputs = [ modules.sqlite3 ];
 
-    meta = {
-      homepage = http://www.sqlalchemy.org/;
-      description = "A Python SQL toolkit and Object Relational Mapper";
+  sqlalchemy8 = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec {
+    name = "SQLAlchemy-0.8.5";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
+      md5 = "ecf0738eaf1229bae27ad2be0f9978a8";
     };
-  };
-
-
-  sqlalchemy8 = buildPythonPackage rec {
-    name = "SQLAlchemy-${version}";
-    version = "0.8.2";
+  });
+   
+  sqlalchemy9 = buildPythonPackage rec {
+    name = "SQLAlchemy-0.9.3";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
-      md5 = "5a33fb43dea93468dbb2a6562ee80b54";
+      md5 = "a27989b9d4b3f14ea0b1600aa45559c4";
     };
 
     buildInputs = [ nose mock ];
 
     propagatedBuildInputs = [ modules.sqlite3 ];
 
+    checkPhase = ''
+      ${python.executable} sqla_nose.py 
+    '';
+
     meta = {
       homepage = http://www.sqlalchemy.org/;
       description = "A Python SQL toolkit and Object Relational Mapper";
-- 
GitLab


From bba7fb62e831ee1b225705b3d320f5819d6e8f81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 9 Mar 2014 16:54:11 +0100
Subject: [PATCH 1990/3789] oxygen_gtk: update from 1.4.3 to 1.4.4

---
 pkgs/misc/themes/gtk2/oxygen-gtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
index 9bee6c81a8a..88807ab6dea 100644
--- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
+++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
@@ -2,12 +2,12 @@
   cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.3";
+  version = "1.4.4";
   name = "oxygen-gtk2-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2";
-    sha256 = "1611zkblfy8ahadyz4a1hc0vjfwkh8mdbnwjqm02i30vnhv3iy1j";
+    sha256 = "1w3300v7kclpaccvd0wsajgay4mgg2fbbi1nd0zak0p5nn40sqf8";
   };
 
   buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf
-- 
GitLab


From 7e932ca4e293c1a4eb558427bf5a0c1c1c4b6817 Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Fri, 7 Mar 2014 20:09:59 +0100
Subject: [PATCH 1991/3789] searx: add module

---
 nixos/modules/misc/ids.nix                  |  2 +
 nixos/modules/module-list.nix               |  1 +
 nixos/modules/services/networking/searx.nix | 76 +++++++++++++++++++++
 3 files changed, 79 insertions(+)
 create mode 100644 nixos/modules/services/networking/searx.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index ae7a8234e07..e50819d6d00 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -115,6 +115,7 @@
       nix-ssh = 104;
       dictd = 105;
       couchdb = 106;
+      searx = 107;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -208,6 +209,7 @@
       keys = 96;
       dictd = 105;
       couchdb = 106;
+      searx = 107;
 
       # 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 94c1667d39d..3a5eee1e3c6 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -189,6 +189,7 @@
   ./services/networking/rdnssd.nix
   ./services/networking/rpcbind.nix
   ./services/networking/sabnzbd.nix
+  ./services/networking/searx.nix
   ./services/networking/supybot.nix
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
new file mode 100644
index 00000000000..e777239d478
--- /dev/null
+++ b/nixos/modules/services/networking/searx.nix
@@ -0,0 +1,76 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.searx;
+
+  configFile = cfg.configFile;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.searx = {
+
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the Searx server.
+        ";
+      };
+
+      configFile = mkOption {
+        default = "";
+        description = "
+          The path of the Searx server configuration file. If no file
+          is specified, a default file is used (default config file has
+          debug mode enabled).
+        ";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.searx.enable {
+
+    users.extraUsers.searx =
+      { uid = config.ids.uids.searx;
+        description = "Searx user";
+        createHome = true;
+        home = "/var/lib/searx";
+      };
+
+    users.extraGroups.searx =
+      { gid = config.ids.gids.searx;
+      };
+
+    systemd.services.searx =
+      {
+        description = "Searx server, the meta search engine.";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig.User = "searx";
+        script = ''
+            if [ -z "${configFile}" ]; then
+              exec ${pkgs.pythonPackages.searx}/bin/searx-run
+            else
+              SEARX_SETTINGS_PATH="${configFile}" exec ${pkgs.pythonPackages.searx}/bin/searx-run
+            fi
+        '';
+      };
+
+    environment.systemPackages = [ pkgs.pythonPackages.searx ];
+
+  };
+
+}
-- 
GitLab


From acd2064859d4135ee937376a03de574405abc2d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 9 Mar 2014 18:00:52 +0100
Subject: [PATCH 1992/3789] Add raul: A C++ utility library primarily aimed at
 audio/musical applications

---
 .../libraries/audio/raul/default.nix          | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/audio/raul/default.nix

diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix
new file mode 100644
index 00000000000..0ec37a15871
--- /dev/null
+++ b/pkgs/development/libraries/audio/raul/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, boost, gtk, pkgconfig, python }:
+
+stdenv.mkDerivation rec {
+  name = "raul-${version}";
+  version = "0.8.0";
+
+  src = fetchurl {
+    url = "http://download.drobilla.net/${name}.tar.bz2";
+    sha256 = "09ms40xc1x6qli6lxkwn5ibqh62nl9w7dq0b6jh1q2zvnrxwsd8b";
+  };
+
+  buildInputs = [ boost gtk pkgconfig python ];
+
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    description = "A C++ utility library primarily aimed at audio/musical applications";
+    homepage = http://drobilla.net/software/raul;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cd584e6f1f..31d02956a52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5521,6 +5521,8 @@ let
 
   rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {};
 
+  raul = callPackage ../development/libraries/audio/raul { };
+
   readline = readline6;
 
   readline4 = callPackage ../development/libraries/readline/readline4.nix { };
-- 
GitLab


From f6104c88828ff2aa714d8c36f2af1f15c34dafd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 9 Mar 2014 18:20:45 +0100
Subject: [PATCH 1993/3789] add ganv: An interactive Gtk canvas widget for
 graph-based interfaces

---
 pkgs/development/libraries/ganv/default.nix | 27 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/ganv/default.nix

diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix
new file mode 100644
index 00000000000..e2c5ce47612
--- /dev/null
+++ b/pkgs/development/libraries/ganv/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchsvn, graphviz, gtk, gtkmm, pkgconfig, python }:
+
+stdenv.mkDerivation rec {
+  name = "ganv-svn-${rev}";
+  rev = "5318";
+
+  src = fetchsvn {
+    url = "http://svn.drobilla.net/lad/trunk/ganv";
+    rev = rev;
+    sha256 = "0wi87ks2xjma979d9hy82wmlm06g4sr0pm3b1n3zv27y52wrf7fl";
+  };
+
+  buildInputs = [ graphviz gtk gtkmm pkgconfig python ];
+
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    description = "An interactive Gtk canvas widget for graph-based interfaces";
+    homepage = http://drobilla.net;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31d02956a52..b1ed7bb4df0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4161,6 +4161,8 @@ let
 
   gamin = callPackage ../development/libraries/gamin { };
 
+  ganv = callPackage ../development/libraries/ganv { };
+
   gav = callPackage ../games/gav { };
 
   gsb = callPackage ../games/gsb { };
-- 
GitLab


From f0b34fe8ff6abc8d2612e63122c40c5eb0e7d5f2 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 9 Mar 2014 18:57:17 +0100
Subject: [PATCH 1994/3789] searx: refactor a bit

---
 nixos/modules/services/networking/searx.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index e777239d478..30f21151a76 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -21,7 +21,7 @@ in
       enable = mkOption {
         default = false;
         description = "
-          Whether to enable the Searx server.
+          Whether to enable the Searx server. See https://github.com/asciimoo/searx
         ";
       };
 
@@ -59,15 +59,14 @@ in
         description = "Searx server, the meta search engine.";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        serviceConfig.User = "searx";
-        script = ''
-            if [ -z "${configFile}" ]; then
-              exec ${pkgs.pythonPackages.searx}/bin/searx-run
-            else
-              SEARX_SETTINGS_PATH="${configFile}" exec ${pkgs.pythonPackages.searx}/bin/searx-run
-            fi
-        '';
-      };
+        serviceConfig = {
+          User = "searx";
+          ExecStart = "${pkgs.pythonPackages.searx}/bin/searx-run";
+        };
+      } // (optionalAttrs (configFile != "") {
+        environment.SEARX_SETTINGS_PATH = configFile;
+      });
+        
 
     environment.systemPackages = [ pkgs.pythonPackages.searx ];
 
-- 
GitLab


From bb3a3a7c0db42a4cb162138767c1487f2e3ba0b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 9 Mar 2014 14:45:43 -0300
Subject: [PATCH 1995/3789] Added python2 support to libpeas

---
 pkgs/desktops/gnome-3/core/libpeas/default.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix
index eeec43a1b65..9cf8426104b 100644
--- a/pkgs/desktops/gnome-3/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix
@@ -1,10 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, intltool, gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, intltool
+, glib, gtk3, gobjectIntrospection, python, pygobject3
+}:
 
 stdenv.mkDerivation rec {
   name = "libpeas-${version}";
   version = "1.9.0";
 
-  buildInputs = with gnome3; [ intltool pkgconfig glib gobjectIntrospection gtk3 ];
+  buildInputs =  [
+   intltool pkgconfig
+   glib gtk3 gobjectIntrospection python pygobject3
+  ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/libpeas/1.9/${name}.tar.xz";
@@ -15,8 +20,10 @@ stdenv.mkDerivation rec {
     rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
+  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;
   };
-
 }
-- 
GitLab


From 542226ffe1364413471cf9e8b43562f635cd1b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 9 Mar 2014 14:51:40 -0300
Subject: [PATCH 1996/3789] Updated liferea version from 1.8.15 to 1.10.6

---
 .../newsreaders/liferea/default.nix           | 43 ++++++++++++++-----
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 093b801401d..f557af41db9 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -1,30 +1,51 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk2, gnome2 /*just GConf*/
-, libsoup, libunique, libxslt, webkit_gtk2, json_glib
-, libnotify /*optional*/ }:
+{ stdenv, fetchurl, pkgconfig, intltool, python, pygobject3
+, glib, gnome3, pango, libxml2, libxslt, sqlite, libsoup
+, webkitgtk, json_glib, gobjectIntrospection, gsettings_desktop_schemas
+, gst_all_1
+, libnotify
+, makeWrapper
+}:
 
-let version = "1.8.15";
+let pname = "liferea";
+    version = "1.10.6";
 in
 stdenv.mkDerivation rec {
-  name = "liferea-${version}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/liferea/Liferea%20Stable/${version}/${name}.tar.bz2";
-    sha256 = "12hhdl5biwcvr9ds7pdhhvlp4vggjix6xm4z5pnfaz53ai2dnc99";
+    url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "0vp19z4p3cn3zbg1zjpg2iyzwq893dx5c1kh6aac06s3rf1124gm";
   };
 
-  buildInputs = [
-    pkgconfig intltool gtk2 gnome2.GConf
-    libsoup libunique libxslt webkit_gtk2 json_glib
+  buildInputs = with gst_all_1; [
+    pkgconfig intltool python
+    glib gnome3.gtk pango libxml2 libxslt sqlite libsoup
+    webkitgtk json_glib gobjectIntrospection gsettings_desktop_schemas
+    gnome3.libpeas
+    gst-plugins-base gst-plugins-good gst-plugins-bad
+    gnome3.gnome_keyring
     libnotify
+    makeWrapper
   ];
 
   preFixup = ''
     rm $out/share/icons/hicolor/icon-theme.cache'';
 
+  postInstall  = ''
+    for f in "$out"/bin/*; do
+      wrapProgram "$f" \
+        --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
+        --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:${gnome3.gnome_icon_theme}/share:${gsettings_desktop_schemas}/share:${gnome3.gtk}/share:$out/share"
+    done
+  '';
+
   meta = {
     description = "A GTK-based news feed agregator";
     homepage = http://lzone.de/liferea/;
-    maintainers = [ stdenv.lib.maintainers.vcunat ];
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ vcunat romildo ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From 061b489f100b6fd3eb2cd50a11856880835b24a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 9 Mar 2014 20:16:47 +0100
Subject: [PATCH 1997/3789] raul: update to svn version, 0.8.5+ is required by
 ingen

---
 pkgs/development/libraries/audio/raul/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix
index 0ec37a15871..a40bb0bf263 100644
--- a/pkgs/development/libraries/audio/raul/default.nix
+++ b/pkgs/development/libraries/audio/raul/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, boost, gtk, pkgconfig, python }:
+{ stdenv, fetchsvn, boost, gtk, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
-  name = "raul-${version}";
-  version = "0.8.0";
+  name = "raul-svn-${rev}";
+  rev = "5205";
 
-  src = fetchurl {
-    url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "09ms40xc1x6qli6lxkwn5ibqh62nl9w7dq0b6jh1q2zvnrxwsd8b";
+  src = fetchsvn {
+    url = "http://svn.drobilla.net/lad/trunk/raul";
+    rev = rev;
+    sha256 = "1rkl7vxhwf6d0qfl2ymfd1qwmh9cl1xv6kkz893xg0blpvzcdmp3";
   };
 
   buildInputs = [ boost gtk pkgconfig python ];
-- 
GitLab


From d21323cbf89ef27ee52b85d5eaa3eacaaed2cc98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 9 Mar 2014 20:32:06 +0100
Subject: [PATCH 1998/3789] add ingen: A modular audio processing system using
 JACK and LV2 or LADSPA

---
 pkgs/applications/audio/ingen/default.nix | 33 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/audio/ingen/default.nix

diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
new file mode 100644
index 00000000000..73138cc269d
--- /dev/null
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jackaudio, lilv
+, lv2, pkgconfig, python, raul, serd, sord, sratom, suil
+}:
+
+stdenv.mkDerivation  rec {
+  name = "ingen-svn-${rev}";
+  rev = "5317";
+
+  src = fetchsvn {
+    url = "http://svn.drobilla.net/lad/trunk/ingen";
+    rev = rev;
+    sha256 = "0zm3wbv9qsingjyr95nwin3khmnf3wq3fz2xa6p420dpcy6qnl4x";
+  };
+
+  buildInputs = [
+    boost ganv glibmm gtk gtkmm jackaudio lilv lv2 pkgconfig python
+    raul serd sord sratom suil
+  ];
+
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    description = "A modular audio processing system using JACK and LV2 or LADSPA plugins";
+    homepage = http://drobilla.net/software/ingen;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1ed7bb4df0..c22f79f0227 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9444,6 +9444,8 @@ let
 
   icbm3d = callPackage ../games/icbm3d { };
 
+  ingen = callPackage ../applications/audio/ingen { };
+
   instead = callPackage ../games/instead {
     lua = lua5;
   };
-- 
GitLab


From 13278f2596c19748b4320fe6b7623fcbf7bbb287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 9 Mar 2014 20:33:35 +0100
Subject: [PATCH 1999/3789] ganv and raul: set linux as a platform

---
 pkgs/development/libraries/audio/raul/default.nix | 1 +
 pkgs/development/libraries/ganv/default.nix       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix
index a40bb0bf263..aad3656cde8 100644
--- a/pkgs/development/libraries/audio/raul/default.nix
+++ b/pkgs/development/libraries/audio/raul/default.nix
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
     homepage = http://drobilla.net/software/raul;
     license = licenses.gpl3;
     maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix
index e2c5ce47612..40e0388d749 100644
--- a/pkgs/development/libraries/ganv/default.nix
+++ b/pkgs/development/libraries/ganv/default.nix
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
     homepage = http://drobilla.net;
     license = licenses.gpl3;
     maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From f911d51243b35afad0d4ab0a7ee37296346869c1 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 9 Mar 2014 21:04:05 +0100
Subject: [PATCH 2000/3789] python 3.3.4 -> 3.3.5

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

diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index af37b4372b7..33b67a10f19 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -17,7 +17,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.3";
-  version = "${majorVersion}.4";
+  version = "${majorVersion}.5";
 
   buildInputs = filter (p: p != null) [
     zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
-    sha256 = "12ank7in8xyncim3yyn3mi84wkc4g9nx7yrci1406kn0j5ni5k66";
+    sha256 = "1rdncc7g8g6f3lfdg33rli1yffbiq8z283xy4f5ksl1l8i49psdb";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
-- 
GitLab


From 658d8593eabb7272521983ae842a95b8d6439935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 9 Mar 2014 22:12:17 +0100
Subject: [PATCH 2001/3789] add lvtk: A set C++ wrappers around the LV2 C API

---
 .../libraries/audio/lvtk/default.nix          | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/audio/lvtk/default.nix

diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix
new file mode 100644
index 00000000000..0abe3f0376b
--- /dev/null
+++ b/pkgs/development/libraries/audio/lvtk/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, boost, gtkmm, lv2, pkgconfig, python }:
+
+stdenv.mkDerivation rec {
+  name = "lvtk-${version}";
+  version = "1.1.1";
+
+  src = fetchurl {
+    url = "http://lvtoolkit.org/code/browse/lvtk/snapshot/${name}.tar.gz";
+    sha256 = "161l4n3a2kar2r5mn3zz6dbj1p2s6361ainrka3s74518z7yf42w";
+  };
+
+  buildInputs = [ boost gtkmm lv2 pkgconfig python ];
+
+  configurePhase = ''
+    python waf configure --prefix=$out --boost-includes=${boost}/include
+  '';
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    description = "A set C++ wrappers around the LV2 C API";
+    homepage = http://lvtoolkit.org;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc3d0ecb0e1..f15fea3fc46 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5574,6 +5574,8 @@ let
 
   lv2 = callPackage ../development/libraries/audio/lv2 { };
 
+  lvtk = callPackage ../development/libraries/audio/lvtk { };
+
   qrupdate = callPackage ../development/libraries/qrupdate { };
 
   redland = pkgs.librdf_redland;
-- 
GitLab


From 12b50bb9f65c01255c816c4fd8a8ddf935007532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 9 Mar 2014 22:13:51 +0100
Subject: [PATCH 2002/3789] add ams-lv2: An LV2 port of the internal modules
 found in Alsa Modular Synth

---
 pkgs/applications/audio/ams-lv2/default.nix | 27 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/audio/ams-lv2/default.nix

diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix
new file mode 100644
index 00000000000..dd23504d3fa
--- /dev/null
+++ b/pkgs/applications/audio/ams-lv2/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cairo, gtk, gtkmm, lv2, lvtk, pkgconfig, python }:
+
+stdenv.mkDerivation  rec {
+  name = "ams-lv2-${version}";
+  version = "1.0.2";
+
+  src = fetchurl {
+    url = "https://github.com/blablack/ams-lv2/archive/v${version}.tar.gz";
+    sha256 = "0fa1ghf6qahbhj9j1ciyw0hr6nngwksa37hbs651mlz0fn7lz4xm";
+  };
+
+  buildInputs = [ cairo gtk gtkmm lv2 lvtk pkgconfig python ];
+
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    description = "An LV2 port of the internal modules found in Alsa Modular Synth";
+    homepage = http://objectivewave.wordpress.com/ams-lv2;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f15fea3fc46..6239c654825 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7470,6 +7470,8 @@ let
 
   alchemy = callPackage ../applications/graphics/alchemy { };
 
+  ams-lv2 = callPackage ../applications/audio/ams-lv2 { };
+
   amsn = callPackage ../applications/networking/instant-messengers/amsn { };
 
   antiword = callPackage ../applications/office/antiword {};
-- 
GitLab


From d23ea79667f26f8b5297d23a5fc813cf69ad988e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 9 Mar 2014 22:29:42 +0100
Subject: [PATCH 2003/3789] gnuradio: also use PYTHONPATH from runtime
 environment

So that extra modules can be used without rebuilding (e.g. in
gnuradio-companion). PYTHONPATH from the environment is added *after*
the default deps.
---
 pkgs/applications/misc/gnuradio/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index 3fc3e1e8e5f..7e67682f17f 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
     for file in "$out"/bin/* "$out"/share/gnuradio/examples/*/*.py; do
         wrapProgram "$file" \
-            --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") \
+            --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \
             --set MATPLOTLIBRC "$out/share/gnuradio"
     done
   '';
-- 
GitLab


From 086afe9161b0763075f8f4e4793c5490648f0ec9 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 10 Mar 2014 08:58:55 +0100
Subject: [PATCH 2004/3789] pythonPackages.nose: remove also pyc file

---
 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 eb5d27ee290..450e2c01e44 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4147,7 +4147,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     checkPhase = if python.is_py3k or false then ''
       ${python}/bin/${python.executable} setup.py build_tests
     '' else "" + ''
-      rm functional_tests/test_multiprocessing/test_concurrent_shared.py # see https://github.com/nose-devs/nose/commit/226bc671c73643887b36b8467b34ad485c2df062
+      rm functional_tests/test_multiprocessing/test_concurrent_shared.py* # see https://github.com/nose-devs/nose/commit/226bc671c73643887b36b8467b34ad485c2df062
       ${python}/bin/${python.executable} selftest.py
     '';
 
-- 
GitLab


From b21d95e1f8d455c06ecc9bbf5d618a64f3e4935f Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 10 Mar 2014 10:57:51 +0100
Subject: [PATCH 2005/3789] nixos/graphite: Make pure, fix several bugs, add
 dataDir option

---
 .../modules/services/monitoring/graphite.nix  | 94 +++++++++++--------
 1 file changed, 57 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index be57b8c5c03..3e2e7e9df6e 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -4,17 +4,31 @@ with pkgs.lib;
 
 let
   cfg = config.services.graphite;
-  writeTextOrNull = f: t: if t == null then null else pkgs.writeText f t;
+  writeTextOrNull = f: t: if t == null then null else pkgs.writeTextDir f t;
+
+  dataDir = cfg.dataDir;
+
+  configDir = pkgs.buildEnv {
+    name = "graphite-config";
+    paths = lists.filter (el: el != null) [
+      (writeTextOrNull "carbon.conf" cfg.carbon.config)
+      (writeTextOrNull "storage-agregation.conf" cfg.carbon.storageAggregation)
+      (writeTextOrNull "storage-schemas.conf" cfg.carbon.storageSchemas)
+      (writeTextOrNull "blacklist.conf" cfg.carbon.blacklist)
+      (writeTextOrNull "whitelist.conf" cfg.carbon.whitelist)
+      (writeTextOrNull "rewrite-rules.conf" cfg.carbon.rewriteRules)
+      (writeTextOrNull "relay-rules.conf" cfg.carbon.relayRules)
+      (writeTextOrNull "aggregation-rules.conf" cfg.carbon.aggregationRules)
+    ];
+  };
 
-  dataDir = "/var/db/graphite";
   carbonOpts = name: with config.ids; ''
-    --nodaemon --syslog --prefix=${name} --pidfile /var/run/${name}.pid \
-    --uid ${toString uids.graphite} --gid ${toString uids.graphite} ${name}
+    --nodaemon --syslog --prefix=${name} --pidfile ${dataDir}/${name}.pid ${name}
   '';
   carbonEnv = {
     PYTHONPATH = "${pkgs.python27Packages.carbon}/lib/python2.7/site-packages";
     GRAPHITE_ROOT = dataDir;
-    GRAPHITE_CONF_DIR = "/etc/graphite/";
+    GRAPHITE_CONF_DIR = configDir;
     GRAPHITE_STORAGE_DIR = dataDir;
   };
 
@@ -23,6 +37,14 @@ in {
   ###### interface
 
   options.services.graphite = {
+    dataDir = mkOption {
+      type = types.path;
+      default = "/var/db/graphite";
+      description = ''
+        Data directory for graphite.
+      '';
+    };
+
     web = {
       enable = mkOption {
         description = "Whether to enable graphite web frontend";
@@ -38,8 +60,8 @@ in {
 
       port = mkOption {
         description = "Graphite web frontend port";
-        default = "8080";
-        type = types.str;
+        default = 8080;
+        type = types.int;
       };
     };
 
@@ -152,31 +174,17 @@ in {
   ###### implementation
 
   config = mkIf (cfg.carbon.enableAggregator || cfg.carbon.enableCache || cfg.carbon.enableRelay || cfg.web.enable) {
-    environment.etc = lists.filter (el: el.source != null) [
-      { source = writeTextOrNull "carbon.conf" cfg.carbon.config;
-        target = "graphite/carbon.conf"; }
-      { source = writeTextOrNull "storage-agregation.conf" cfg.carbon.storageAggregation;
-        target = "graphite/storage-agregation.conf"; }
-      { source = writeTextOrNull "storage-schemas.conf" cfg.carbon.storageSchemas;
-        target = "graphite/storage-schemas.conf"; }
-      { source = writeTextOrNull "blacklist.conf" cfg.carbon.blacklist;
-        target = "graphite/blacklist.conf"; }
-      { source = writeTextOrNull "whitelist.conf" cfg.carbon.whitelist;
-        target = "graphite/whitelist.conf"; }
-      { source = writeTextOrNull "rewrite-rules.conf" cfg.carbon.rewriteRules;
-        target = "graphite/rewrite-rules.conf"; }
-      { source = writeTextOrNull "relay-rules.conf" cfg.carbon.relayRules;
-        target = "graphite/relay-rules.conf"; }
-      { source = writeTextOrNull "aggregation-rules.conf" cfg.carbon.aggregationRules;
-        target = "graphite/aggregation-rules.conf"; }
-    ];
-
-    systemd.services.carbonCache = mkIf cfg.carbon.enableCache {
+    systemd.services.carbonCache = {
+      enable = cfg.carbon.enableCache;
       description = "Graphite Data Storage Backend";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
       environment = carbonEnv;
-      serviceConfig.ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-cache"}";
+      serviceConfig = {
+        ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-cache"}";
+        User = "graphite";
+        Group = "graphite";
+      };
       restartTriggers = [
         pkgs.pythonPackages.carbon
         cfg.carbon.config
@@ -185,33 +193,45 @@ in {
         cfg.carbon.rewriteRules
       ];
       preStart = ''
-        mkdir -p ${dataDir}/whisper
+        mkdir -m 0700 -p ${cfg.dataDir}/whisper
+        if [ "$(id -u)" = 0 ]; then chown -R graphite:graphite ${cfg.dataDir}; fi
       '';
     };
 
-    systemd.services.carbonAggregator = mkIf cfg.carbon.enableAggregator {
+    systemd.services.carbonAggregator = {
+      enable = cfg.carbon.enableAggregator;
       description = "Carbon Data Aggregator";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
       environment = carbonEnv;
-      serviceConfig.ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-aggregator"}";
+      serviceConfig = {
+        ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-aggregator"}";
+        User = "graphite";
+        Group = "graphite";
+      };
       restartTriggers = [
         pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.aggregationRules
       ];
     };
 
-    systemd.services.carbonRelay = mkIf cfg.carbon.enableRelay {
+    systemd.services.carbonRelay = {
+      enable = cfg.carbon.enableRelay;
       description = "Carbon Data Relay";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
       environment = carbonEnv;
-      serviceConfig.ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-relay"}";
+      serviceConfig = {
+        ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-relay"}";
+        User = "graphite";
+        Group = "graphite";
+      };
       restartTriggers = [
         pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.relayRules
       ];
     };
 
-    systemd.services.graphiteWeb = mkIf cfg.web.enable {
+    systemd.services.graphiteWeb = {
+      enable = cfg.web.enable;
       description = "Graphite Web Interface";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
@@ -224,14 +244,15 @@ in {
       serviceConfig = {
         ExecStart = ''
           ${pkgs.python27Packages.waitress}/bin/waitress-serve \
-          --host=${cfg.web.host} --port=${cfg.web.port} \
+          --host=${cfg.web.host} --port=${toString cfg.web.port} \
           --call django.core.handlers.wsgi:WSGIHandler'';
         User = "graphite";
         Group = "graphite";
       };
       preStart = ''
         if ! test -e ${dataDir}/db-created; then
-          mkdir -p ${dataDir}/{whisper/,log/webapp/}
+          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
@@ -259,7 +280,6 @@ in {
       uid = config.ids.uids.graphite;
       description = "Graphite daemon user";
       home = dataDir;
-      createHome = true;
     };
     users.extraGroups.graphite.gid = config.ids.gids.graphite;
   };
-- 
GitLab


From bd5c0c3bc7ad3d5d5ee978ac5647e2d2a9381365 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 10 Mar 2014 11:01:38 +0100
Subject: [PATCH 2006/3789] nixos/statsd: change default host and port on
 graphite host and port

---
 nixos/modules/services/monitoring/statsd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix
index 979debefdd9..54b7e79f82e 100644
--- a/nixos/modules/services/monitoring/statsd.nix
+++ b/nixos/modules/services/monitoring/statsd.nix
@@ -64,13 +64,13 @@ in
 
     graphiteHost = mkOption {
       description = "Hostname or IP of Graphite server";
-      default = "127.0.0.1";
+      default = config.services.graphite.web.host;
       type = types.str;
     };
 
     graphitePort = mkOption {
       description = "Port of Graphite server";
-      default = 2003;
+      default = config.services.graphite.web.port;
       type = types.uniq types.int;
     };
 
-- 
GitLab


From cf65a62af43d5614bc81aa9db888e27b29804850 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 10 Mar 2014 11:04:29 +0100
Subject: [PATCH 2007/3789] nixos/elasticsearch: Make port an integer, add
 dataDir option, make pure

---
 .../modules/services/search/elasticsearch.nix | 50 +++++++++++--------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index b3d934862ab..d647301889a 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -5,16 +5,22 @@ with pkgs.lib;
 let
   cfg = config.services.elasticsearch;
 
-  es_home = "/var/lib/elasticsearch";
-
-  configFile = pkgs.writeText "elasticsearch.yml" ''
+  esConfig = ''
     network.host: ${cfg.host}
-    network.port: ${cfg.port}
-    network.tcp.port: ${cfg.tcp_port}
+    network.port: ${toString cfg.port}
+    network.tcp.port: ${toString cfg.tcp_port}
     cluster.name: ${cfg.cluster_name}
     ${cfg.extraConf}
   '';
 
+  configDir = pkgs.buildEnv {
+    name = "elasticsearch-config";
+    paths = [
+      (pkgs.writeTextDir "elasticsearch.yml" esConfig)
+      (pkgs.writeTextDir "logging.yml" cfg.logging)
+    ];
+  };
+
 in {
 
   ###### interface
@@ -34,14 +40,14 @@ in {
 
     port = mkOption {
       description = "Elasticsearch port to listen for HTTP traffic";
-      default = "9200";
-      type = types.str;
+      default = 9200;
+      type = types.int;
     };
 
     tcp_port = mkOption {
       description = "Elasticsearch port for the node to node communication";
-      default = "9300";
-      type = types.str;
+      default = 9300;
+      type = types.int;
     };
 
     cluster_name = mkOption {
@@ -79,27 +85,32 @@ in {
       '';
       type = types.str;
     };
+
+    dataDir = mkOption {
+      type = types.path;
+      default = "/var/lib/elasticsearch";
+      description = ''
+        Data directory for elasticsearch.
+      '';
+    };
   };
 
   ###### implementation
 
   config = mkIf cfg.enable {
-    environment.etc = [
-      { source = configFile;
-        target = "elasticsearch/elasticsearch.yml"; }
-      { source = pkgs.writeText "logging.yml" cfg.logging;
-        target = "elasticsearch/logging.yml"; }
-    ];
-
     systemd.services.elasticsearch = {
       description = "Elasticsearch daemon";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
-      environment = { ES_HOME = es_home; };
+      environment = { ES_HOME = cfg.dataDir; };
       serviceConfig = {
-        ExecStart = "${pkgs.elasticsearch}/bin/elasticsearch -f -Des.path.conf=/etc/elasticsearch";
+        ExecStart = "${pkgs.elasticsearch}/bin/elasticsearch -f -Des.path.conf=${configDir}";
         User = "elasticsearch";
       };
+      preStart = ''
+        mkdir -m 0700 -p ${cfg.dataDir}
+        if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi
+      '';
     };
 
     environment.systemPackages = [ pkgs.elasticsearch ];
@@ -108,8 +119,7 @@ in {
       name = "elasticsearch";
       uid = config.ids.uids.elasticsearch;
       description = "Elasticsearch daemon user";
-      home = es_home;
-      createHome = true;
+      home = cfg.dataDir;
     };
   };
 }
-- 
GitLab


From 993ef8287eaf1fd74fb595446b07eacf455478a3 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 10 Mar 2014 11:06:48 +0100
Subject: [PATCH 2008/3789] nixos/couchdb: fix stopping of service, by making
 it non-forking, a few other improvments

Conflicts:
	nixos/modules/services/databases/couchdb.nix
---
 nixos/modules/services/databases/couchdb.nix | 33 ++++++--------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index 01631e9879a..b48d3a64767 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -1,9 +1,7 @@
 { config, pkgs, ... }:
-
-with pkgs.lib;
+  with pkgs.lib;
 
 let
-
   cfg = config.services.couchdb;
   configFile = pkgs.writeText "couchdb.ini"
     ''
@@ -19,10 +17,8 @@ let
       [log]
       file = ${cfg.logFile}
     '';
-  configExtraFile = pkgs.writeText "couchdb-extra.ini" cfg.extraConfig;
 
-in
-{
+in {
 
   ###### interface
 
@@ -64,14 +60,6 @@ in
         '';
       };
 
-      pidFile = mkOption {
-        type = types.path;
-        default = "/var/run/couchdb/couchdb.pid";
-        description = ''
-          pid file.
-        '';
-      };
-
       # couchdb options: http://docs.couchdb.org/en/latest/config/index.html
 
       databaseDir = mkOption {
@@ -153,26 +141,23 @@ in
 
       preStart =
         ''
-        mkdir -p `dirname ${cfg.pidFile}`;
         mkdir -p `dirname ${cfg.uriFile}`;
         mkdir -p `dirname ${cfg.logFile}`;
-        touch ${cfg.logFile};
         mkdir -p ${cfg.databaseDir};
         mkdir -p ${cfg.viewIndexDir};
-        chown ${cfg.user}:${cfg.group} `dirname ${cfg.pidFile}`
-        chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}`
-        chown ${cfg.user}:${cfg.group} ${cfg.logFile}
-        chown ${cfg.user}:${cfg.group} ${cfg.databaseDir}
-        chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir}
+
+        if [ "$(id -u)" = 0 ]; then
+          chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}`
+          chown ${cfg.user}:${cfg.group} ${cfg.databaseDir}
+          chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir}
+        fi
         '';
 
       serviceConfig = {
         PermissionsStartOnly = true;
         User = cfg.user;
         Group = cfg.group;
-        Type = "forking";
-        ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile}";
-        ExecStop = "${cfg.package}/bin/couchdb -d";
+        ExecStart = "${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig}";
       };
     };
 
-- 
GitLab


From 0558c8728892f69ab80bbfe5e23bd95f402a7725 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 10 Mar 2014 10:06:04 +0100
Subject: [PATCH 2009/3789] buildPythonPackage: add shell hook for instant
 development

---
 .../python-modules/generic/default.nix           | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 6debcd818e5..45c8653bc19 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -38,6 +38,12 @@
 
 , meta ? {}
 
+# Execute before shell hook
+, preShellHook ? ""
+
+# Execute after shell hook
+, postShellHook ? ""
+
 , ... } @ attrs:
 
 # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
@@ -150,6 +156,16 @@ python.stdenv.mkDerivation (attrs // {
       done
     '';
 
+  shellHook = attrs.shellHook or ''
+    mkdir -p /tmp/$name/lib/${python.libPrefix}/site-packages
+    ${preShellHook}
+    export PATH="/tmp/$name/bin:$PATH"
+    export PYTHONPATH="/tmp/$name/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
+    python setup.py develop --prefix /tmp/$name
+    ${postShellHook}
+    return
+  '';
+
   meta = with lib.maintainers; {
     # default to python's platforms
     platforms = python.meta.platforms;
-- 
GitLab


From a33891973ada0ff948a467a9982c01074948c680 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 10 Mar 2014 10:29:03 +0100
Subject: [PATCH 2010/3789] pythonPackages: syntax improvements

- import pkgs.lib by default, there's no reason why not
- Define `isPy*` helper functions for all python versions
- Define `pythonName` that returns unique python name based on `isPy*`
  helpers
- Fix `python2.7` version detection
- Fix pythonPackages importing(with) for `python2.7` only packages
---
 pkgs/top-level/all-packages.nix    |   6 --
 pkgs/top-level/python-packages.nix | 137 ++++++++++++++++-------------
 2 files changed, 77 insertions(+), 66 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5dc9e81251..4bdf2440576 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6075,7 +6075,6 @@ let
   # regardless.
   python26Packages = import ./python-packages.nix {
     inherit pkgs;
-    inherit (lib) lowPrio;
     python = python26;
   };
 
@@ -6083,31 +6082,26 @@ let
 
   python33Packages = recurseIntoAttrs (import ./python-packages.nix {
     inherit pkgs;
-    inherit (lib) lowPrio;
     python = python33;
   });
 
   python34Packages = import ./python-packages.nix {
     inherit pkgs;
-    inherit (lib) lowPrio;
     python = python34;
   };
 
   python32Packages = import ./python-packages.nix {
     inherit pkgs;
-    inherit (lib) lowPrio;
     python = python32;
   };
 
   python27Packages = recurseIntoAttrs (import ./python-packages.nix {
     inherit pkgs;
-    inherit (lib) lowPrio;
     python = python27;
   });
 
   pypyPackages = recurseIntoAttrs (import ./python-packages.nix {
     inherit pkgs;
-    inherit (lib) lowPrio;
     python = pypy;
   });
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d013b5a1544..b44e7272c58 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1,24 +1,38 @@
-{ pkgs, python, lowPrio }:
+{ pkgs, python }:
+  with pkgs.lib;
 
 let
-isPy26 = python.majorVersion == "2.6";
-isPy27 = python.majorVersion == "2.7";
-optional = pkgs.lib.optional;
-optionals = pkgs.lib.optionals;
-modules = python.modules or { readline = null; sqlite3 = null; curses = null; curses_panel = null; ssl = null; crypt = null; };
+  isPy26 = python.majorVersion == "2.6";
+  isPy27 = python.majorVersion == "2.7";
+  isPy33 = python.majorVersion == "3.3";
+  isPy34 = python.majorVersion == "3.4";
+  isPyPy = python.executable == "pypy";
+
+  # Unique python version identifier
+  pythonName =
+    if isPy26 then "python26" else
+    if isPy27 then "python27" else
+    if isPy33 then "python33" else
+    if isPy34 then "python34" else
+    if isPyPy then "pypy" else "";
+
+  modules = python.modules or { readline = null; sqlite3 = null; curses = null; curses_panel = null; ssl = null; crypt = null; };
 
 pythonPackages = modules // import ./python-packages-generated.nix {
   inherit pkgs python;
   inherit (pkgs) stdenv fetchurl;
   self = pythonPackages;
-} // rec {
+} //
 
-  inherit python;
+# Python packages for all python versions
+rec {
+
+  inherit python isPy26 isPy27 isPy33 isPy34 isPyPy pythonName;
   inherit (pkgs) fetchurl fetchsvn fetchgit stdenv unzip;
 
   # helpers
 
-  callPackage = pkgs.lib.callPackageWith (pkgs // pythonPackages);
+  callPackage = callPackageWith (pkgs // pythonPackages);
 
   # global distutils config used by buildPythonPackage
   distutils-cfg = callPackage ../development/python-modules/distutils-cfg { };
@@ -554,7 +568,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = http://beets.radbox.org;
       description = "Music tagger and library organizer";
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
       maintainers = [ stdenv.lib.maintainers.iElectric ];
     };
   };
@@ -575,7 +589,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = https://github.com/Sheeprider/BitBucket-api;
       description = "Python library to interact with BitBucket REST API";
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -767,7 +781,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
    meta = {
       homepage = "http://www.buildout.org";
       description = "A software build and configuration system";
-      license = pkgs.lib.licenses.zpt21;
+      license = licenses.zpt21;
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   };
@@ -782,7 +796,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
    meta = {
       homepage = "http://www.buildout.org";
       description = "A software build and configuration system";
-      license = pkgs.lib.licenses.zpt21;
+      license = licenses.zpt21;
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   };
@@ -803,7 +817,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
    meta = {
       homepage = "http://www.buildout.org";
       description = "A software build and configuration system";
-      license = pkgs.lib.licenses.zpt21;
+      license = licenses.zpt21;
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   };
@@ -981,7 +995,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "Simple, lightweight, and easily extensible STOMP message broker";
       homepage = http://code.google.com/p/coilmq/;
-      license = pkgs.lib.licenses.asl20;
+      license = licenses.asl20;
     };
   });
 
@@ -1023,7 +1037,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "Autogenerate Colander schemas based on SQLAlchemy models.";
       homepage = https://github.com/stefanofontanelli/ColanderAlchemy;
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -1042,7 +1056,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "Config file reading, writing and validation.";
       homepage = http://pypi.python.org/pypi/configobj;
-      license = pkgs.lib.licenses.bsd3;
+      license = licenses.bsd3;
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   });
@@ -1102,7 +1116,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "Code coverage measurement for python";
       homepage = http://nedbatchelder.com/code/coverage/;
-      license = pkgs.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -2738,7 +2752,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "code checking using pep8 and pyflakes.";
       homepage = http://pypi.python.org/pypi/flake8;
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   });
@@ -3216,7 +3230,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = http://code.google.com/p/httplib2;
       description = "A comprehensive HTTP client library";
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   };
@@ -3278,7 +3292,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "Google's IP address manipulation library";
       homepage = http://code.google.com/p/ipaddr-py/;
-      license = pkgs.lib.licenses.asl20;
+      license = licenses.asl20;
     };
   };
 
@@ -3312,7 +3326,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = "https://github.com/davidhalter/jedi";
       description = "An autocompletion tool for Python that can be used for text editors.";
-      license = pkgs.lib.licenses.lgpl3Plus;
+      license = licenses.lgpl3Plus;
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   });
@@ -3402,7 +3416,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = http://code.google.com/p/pylast/;
       description = "A python interface to last.fm (and compatibles)";
-      license = pkgs.lib.licenses.asl20;
+      license = licenses.asl20;
     };
   };
 
@@ -3687,7 +3701,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "McCabe checker, plugin for flake8";
       homepage = "https://github.com/flintwork/mccabe";
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   });
@@ -3790,7 +3804,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       version = "0.9";
       description = ''Man-in-the-middle proxy'';
       homepage = "http://mitmproxy.org/";
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -3892,7 +3906,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = http://bmc.github.com/munkres/;
       description = "Munkres algorithm for the Assignment Problem";
-      license = pkgs.lib.licenses.bsd3;
+      license = licenses.bsd3;
       maintainers = [ stdenv.lib.maintainers.iElectric ];
     };
   };
@@ -3909,7 +3923,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = http://alastair/python-musicbrainz-ngs;
       description = "Python bindings for musicbrainz NGS webservice";
-      license = pkgs.lib.licenses.bsd2;
+      license = licenses.bsd2;
       maintainers = [ stdenv.lib.maintainers.iElectric ];
     };
   };
@@ -4078,7 +4092,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       version = "0.9";
       description = ''Man-in-the-middle proxy'';
       homepage = "https://github.com/cortesi/netlib";
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -4223,7 +4237,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx";
     };
 
-    patches = pkgs.lib.singleton (fetchurl {
+    patches = singleton (fetchurl {
       name = "libnotify07.patch";
       url = "http://pkgs.fedoraproject.org/cgit/notify-python.git/plain/"
           + "libnotify07.patch?id2=289573d50ae4838a1658d573d2c9f4c75e86db0c";
@@ -4336,7 +4350,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = "https://github.com/simplegeo/python-oauth2";
       description = "library for OAuth version 1.0";
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
       maintainers = [ stdenv.lib.maintainers.garbas ];
       platforms = stdenv.lib.platforms.linux;
     };
@@ -4601,7 +4615,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = "http://pep8.readthedocs.org/";
       description = "Python style guide checker";
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   };
@@ -4751,7 +4765,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "A library to manipulate gettext files (po and mo files)";
       homepage = "http://bitbucket.org/izi/polib/";
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -4875,7 +4889,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "Allows to get the public suffix of a domain name";
       homepage = "http://pypi.python.org/pypi/publicsuffix/";
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -5128,7 +5142,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = "https://launchpad.net/pyflakes";
       description = "A simple program which checks Python source files for errors.";
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   };
@@ -5143,7 +5157,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
     patchPhase = let
       libs = [ pkgs.mesa pkgs.xlibs.libX11 pkgs.freetype pkgs.fontconfig ];
-      paths = pkgs.lib.concatStringsSep "," (map (l: "\"${l}/lib\"") libs);
+      paths = concatStringsSep "," (map (l: "\"${l}/lib\"") libs);
     in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py";
 
     doCheck = false;
@@ -5188,7 +5202,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = "https://launchpad.net/pygpgme";
       description = "A Python wrapper for the GPGME library.";
-      license = pkgs.lib.licenses.lgpl21;
+      license = licenses.lgpl21;
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   };
@@ -5213,7 +5227,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = https://github.com/seb-m/pyinotify/wiki;
       description = "Monitor filesystems events on Linux platforms with inotify";
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -5243,7 +5257,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = "http://fedoraproject.org/wiki/Pykickstart";
       description = "Read and write Fedora kickstart files";
-      license = pkgs.lib.licenses.gpl2Plus;
+      license = licenses.gpl2Plus;
     };
   };
 
@@ -5300,7 +5314,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       sed -i -e '
         s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path|
       ' tests/test__ped_ped.py
-    '' + pkgs.lib.optionalString stdenv.isi686 ''
+    '' + optionalString stdenv.isi686 ''
       # remove some integers in this test case which overflow on 32bit systems
       sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \
         tests/test__ped_ped.py
@@ -5825,7 +5839,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   reportlab =
-   let freetype = pkgs.lib.overrideDerivation pkgs.freetype (args: { configureFlags = "--enable-static --enable-shared"; });
+   let freetype = overrideDerivation pkgs.freetype (args: { configureFlags = "--enable-static --enable-shared"; });
    in buildPythonPackage rec {
     name = "reportlab-2.5";
 
@@ -6623,7 +6637,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "Joyent SmartDataCenter CloudAPI connector using http-signature authentication via Requests";
       homepage = https://github.com/atl/py-smartdc;
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -6811,7 +6825,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = https://github.com/crosspop/sqlalchemy-imageattach;
       description = "SQLAlchemy extension for attaching images to entity objects";
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -6857,7 +6871,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "A client for Etsy's node-js statsd server";
       homepage = https://github.com/WoLpH/python-statsd;
-      license = pkgs.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -6877,7 +6891,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "Lightweight and extensible STOMP messaging client";
       homepage = http://bitbucket.org/hozn/stompclient;
-      license = pkgs.lib.licenses.asl20;
+      license = licenses.asl20;
     };
   });
 
@@ -6896,7 +6910,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "A streaming protocol for test results";
       homepage = https://launchpad.net/subunit;
-      license = pkgs.lib.licenses.asl20;
+      license = licenses.asl20;
     };
   };
 
@@ -7014,7 +7028,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "A set of extensions to the Python standard library's unit testing framework";
       homepage = http://pypi.python.org/pypi/testtools;
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -7034,7 +7048,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges.";
       homepage = https://code.google.com/p/mimeparse/;
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -7054,7 +7068,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges.";
       homepage = https://code.google.com/p/mimeparse/;
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -7165,7 +7179,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = "https://github.com/alejandrogomez/turses";
       description = "A Twitter client for the console.";
-      license = pkgs.lib.licenses.gpl3;
+      license = licenses.gpl3;
       maintainers = [ stdenv.lib.maintainers.garbas ];
       platforms = stdenv.lib.platforms.linux;
     };
@@ -7182,7 +7196,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = "https://github.com/tweepy/tweepy";
       description = "Twitter library for python";
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
       maintainers = [ stdenv.lib.maintainers.garbas ];
       platforms = stdenv.lib.platforms.linux;
     };
@@ -7216,7 +7230,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
         and licensed under the MIT license.
       '';
 
-      license = pkgs.lib.licenses.mit;
+      license = licenses.mit;
 
       maintainers = [ ];
     };
@@ -7285,7 +7299,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       description = "A full-featured console (xterm et al.) user interface library";
       homepage = http://excess.org/urwid;
       repositories.git = git://github.com/wardi/urwid.git;
-      license = pkgs.lib.licenses.lgpl21;
+      license = licenses.lgpl21;
       maintainers = [ stdenv.lib.maintainers.garbas ];
     };
   });
@@ -7485,7 +7499,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
   wokkel = buildPythonPackage (rec {
     url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz";
-    name = pkgs.lib.nameFromURL url ".tar";
+    name = nameFromURL url ".tar";
     src = fetchurl {
       inherit url;
       sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml";
@@ -8395,7 +8409,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = http://pypi.python.org/pypi/Unidecode/;
       description = "ASCII transliterations of Unicode text";
-      license = pkgs.lib.licenses.gpl2;
+      license = licenses.gpl2;
       maintainers = [ stdenv.lib.maintainers.iElectric ];
     };
   };
@@ -8557,7 +8571,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = https://code.google.com/p/gdata-python-client/;
       description = "Python client library for Google data APIs";
-      license = pkgs.lib.licenses.asl20;
+      license = licenses.asl20;
     };
   };
 
@@ -8577,7 +8591,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = http://imapclient.freshfoo.com/;
       description = "Easy-to-use, Pythonic and complete IMAP client library";
-      license = pkgs.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -8594,7 +8608,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = http://pythonhosted.org/Logbook/;
       description = "A logging replacement for Python";
-      license = pkgs.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -8691,8 +8705,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
-# python2.7 specific eggs
-} // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") {
+# python2.7 specific packages
+} // optionalAttrs isPy27 (
+  with pythonPackages;
+
+{
 
   pypi2nix = pythonPackages.buildPythonPackage rec {
     rev = "04a68d8577acbceb88bdf51b1231a9dbdead7003";
@@ -8713,4 +8730,4 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
-}; in pythonPackages
+}); in pythonPackages
-- 
GitLab


From 2297f31339cc3698e490b4dbdc7e14205d1c2f30 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 13 Dec 2013 10:24:50 +0100
Subject: [PATCH 2011/3789] nixos/network-interfaces: do not try to enable or
 disable ipv6 in container

---
 nixos/modules/tasks/network-interfaces.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 9619f0f5ebe..bbfcb62c5d7 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -401,9 +401,11 @@ in
                 EOF
 
                 # Disable or enable IPv6.
-                if [ -e /proc/sys/net/ipv6/conf/all/disable_ipv6 ]; then
-                  echo ${if cfg.enableIPv6 then "0" else "1"} > /proc/sys/net/ipv6/conf/all/disable_ipv6
-                fi
+                ${optionalString (!config.boot.isContainer) ''
+                  if [ -e /proc/sys/net/ipv6/conf/all/disable_ipv6 ]; then
+                    echo ${if cfg.enableIPv6 then "0" else "1"} > /proc/sys/net/ipv6/conf/all/disable_ipv6
+                  fi
+                ''}
 
                 # Set the default gateway.
                 ${optionalString (cfg.defaultGateway != "") ''
-- 
GitLab


From 1fe2a68224d3a28e79cb007805882f0e15c83526 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Mar 2014 14:51:05 +0100
Subject: [PATCH 2012/3789] quodlibet: Fix evaluation

http://hydra.nixos.org/build/9400950
---
 pkgs/applications/audio/quodlibet/default.nix       | 6 ++++--
 pkgs/development/python-modules/generic/default.nix | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index de1aba2a7f6..ea8ae88f022 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage {
   # XXX, tests fail
   doCheck = false;
 
-  src = [
+  srcs = [
     (fetchurl {
       url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-${version}.tar.gz";
       sha256 = "0ilasi4b0ay8r6v6ba209wsm80fq2nmzigzc5kvphrk71jwypx6z";
@@ -27,7 +27,7 @@ buildPythonPackage {
       url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-plugins-${version}.tar.gz";
       sha256 = "1rv08rhdjad8sjhplqsspcf4vkazgkxyshsqmbfbrrk5kvv57ybc";
      })
-  ];       
+  ];
 
   preConfigure = ''
     # TODO: for now don't a apply gdist overrides, will be needed for shipping icons, gtk, etc
@@ -35,11 +35,13 @@ buildPythonPackage {
   '';
 
   sourceRoot = "quodlibet-${version}";
+
   postUnpack = ''
     # the patch searches for plugins in directory ../plugins
     # so link the appropriate directory there
     ln -sf quodlibet-plugins-${version} plugins
   '';
+
   patches = [ ./quodlibet-package-plugins.patch ];
 
   buildInputs = stdenv.lib.optionals withGstPlugins [
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 45c8653bc19..d0234c29ed9 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -56,7 +56,7 @@ python.stdenv.mkDerivation (attrs // {
     python wrapPython setuptools
     (distutils-cfg.override { extraCfg = distutilsExtraCfg; })
   ] ++ buildInputs ++ pythonPath
-    ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name) unzip);
+    ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip);
 
   propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ];
 
-- 
GitLab


From e167cf9f215ad94cdc9af73acfad251695c4fd7c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Mar 2014 15:01:56 +0100
Subject: [PATCH 2013/3789] Make appendToName do the right thing

I.e. append a suffix *before* the version, rather than after.  So we
get "sqlite-interactive-3.8.0.2" instead of
"sqlite-3.8.0.2-interactive".  The latter is broken since nix-env just
sees it the suffix as part of the version, so "nix-env -u" will
happily upgrade "sqlite-3.8.0.2-interactive" to "sqlite-3.9".
---
 lib/meta.nix                    |  9 ++++-----
 pkgs/top-level/all-packages.nix | 17 +++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/meta.nix b/lib/meta.nix
index 1af31473348..44e3cc011f1 100644
--- a/lib/meta.nix
+++ b/lib/meta.nix
@@ -31,11 +31,10 @@ rec {
   updateName = updater: drv: drv // {name = updater (drv.name);};
 
 
-  /* Append a suffix to the name of a package.  !!! the suffix should
-     really be appended *before* the version, at least most of the
-     time.
-  */
-  appendToName = suffix: updateName (name: "${name}-${suffix}");
+  /* Append a suffix to the name of a package (before the version
+     part). */
+  appendToName = suffix: updateName (name:
+    let x = builtins.parseDrvName name; in "${x.name}-${suffix}-${x.version}");
 
 
   /* Apply a function to each derivation and only to derivations in an attrset
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36fdd6e78bb..0b63322c9b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1004,7 +1004,8 @@ let
 
   g500-control = callPackage ../tools/misc/g500-control { };
 
-  gawk = lowPrio (callPackage ../tools/text/gawk { });
+  gawk = callPackage ../tools/text/gawk { };
+
   gawkInteractive = appendToName "interactive"
     (gawk.override { readlineSupport = true; });
 
@@ -1583,9 +1584,9 @@ let
       pam = if stdenv.isLinux then pam else null;
     };
 
-  openssh_hpn = lowPrio (pkgs.appendToName "hpn" (openssh.override { hpnSupport = true; }));
+  openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; });
 
-  openssh_with_kerberos = lowPrio (pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; }));
+  openssh_with_kerberos = pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; });
 
   opensp = callPackage ../tools/text/sgml/opensp { };
 
@@ -2802,12 +2803,12 @@ let
 
   jdkdistro = installjdk: pluginSupport:
     assert supportsJDK;
-    (if pluginSupport then appendToName "plugin" else x: x)
+    (if pluginSupport then appendToName "with-plugin" else x: x)
       (callPackage ../development/compilers/jdk/jdk6-linux.nix { });
 
   oraclejdk7distro = installjdk: pluginSupport:
     assert supportsJDK;
-    (if pluginSupport then appendToName "plugin" else x: x)
+    (if pluginSupport then appendToName "with-plugin" else x: x)
       (callPackage ../development/compilers/jdk/jdk7-linux.nix { inherit installjdk; });
 
   jikes = callPackage ../development/compilers/jikes { };
@@ -8447,7 +8448,7 @@ let
     guiSupport = false; # use mercurialFull to get hgk GUI
   };
 
-  mercurialFull = lowPrio (appendToName "full" (pkgs.mercurial.override { guiSupport = true; }));
+  mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
 
   merkaartor = callPackage ../applications/misc/merkaartor { };
 
@@ -8931,11 +8932,11 @@ let
     sasl = cyrus_sasl;
   };
 
-  subversionClient = lowPrio (appendToName "client" (subversion.override {
+  subversionClient = appendToName "client" (subversion.override {
     bdbSupport = false;
     perlBindings = true;
     pythonBindings = true;
-  }));
+  });
 
   surf = callPackage ../applications/misc/surf {
     libsoup = gnome.libsoup;
-- 
GitLab


From 203f4d6ec8e97ef26b366075bc80c4f23ef5d6e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Mar 2014 15:18:48 +0100
Subject: [PATCH 2014/3789] firefoxWrapper: Fix the name

---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 +++-
 pkgs/top-level/all-packages.nix                           | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 3a73afe48c5..6a00dfcd8c1 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -2,8 +2,10 @@
 , browserName, desktopName, nameSuffix, icon
 }:
 
+let p = builtins.parseDrvName browser.name; in
+
 stdenv.mkDerivation {
-  name = browser.name + "-with-plugins";
+  name = "${p.name}-with-plugins-${p.version}";
 
   desktopItem = makeDesktopItem {
     name = browserName;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b63322c9b2..0fc007d745c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7633,6 +7633,7 @@ let
   comical = callPackage ../applications/graphics/comical { };
 
   conkeror = callPackage ../applications/networking/browsers/conkeror { };
+
   conkerorWrapper = wrapFirefox {
     browser = conkeror;
     browserName = "conkeror";
@@ -7993,7 +7994,7 @@ let
     inherit (gnome) libIDL;
   };
 
-  firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; });
+  firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; };
 
   firefoxPkgs = callPackage ../applications/networking/browsers/firefox {
     inherit (gnome) libIDL;
-- 
GitLab


From 356cdcd48e85ee185c5e85a2c54dc0d357a47c6c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Mar 2014 15:26:06 +0100
Subject: [PATCH 2015/3789] Remove comment

---
 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 0fc007d745c..fd83ec6156c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10503,13 +10503,13 @@ let
   wineStable = callPackage_i686 ../misc/emulators/wine/stable.nix {
     bison = bison2;
   };
+
   wineUnstable = lowPrio (callPackage_i686 ../misc/emulators/wine/unstable.nix {
     bison = bison2;
   });
+
   wine = wineStable;
 
-  # winetricks is a shell script with no binary components. Safe to just use the current platforms
-  # build instead of the i686 specific build.
   winetricks = callPackage ../misc/emulators/wine/winetricks.nix {
     inherit (gnome2) zenity;
   };
-- 
GitLab


From 9b650b074b4f80794565150feb40a26d8b4620aa Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 8 Mar 2014 21:50:02 +0100
Subject: [PATCH 2016/3789] linux: Update to 3.13.6

---
 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 05a4f55d020..361106bf065 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.5";
+  version = "3.13.6";
   extraMeta.branch = "3.13";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "03yggix59k2i2lf0m3kkqslcvvfcg19xx96ywbrfkfbb7vplw67w";
+    sha256 = "10j1rc63y0rcrnc2rx8jyczqg42gcbijd83qqd795qrrp5wnf7qw";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From d999872b8d097af7639b609cec041a348a2364fd Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 8 Mar 2014 21:49:38 +0100
Subject: [PATCH 2017/3789] grsecurity: Update stable and test patches

stable: 3.0-3.2.55-201403022154 -> 3.0-3.2.55-201403072107
test:   3.0-3.13.5-201403031445 -> 3.0-3.13.6-201403072241
---
 pkgs/os-specific/linux/kernel/patches.nix | 14 +++++++-------
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index e63ff168a61..e0d880a626a 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -81,22 +81,22 @@ rec {
   grsecurity_3_0_3_2_55 =
     { name = "grsecurity-3.0-3.2.55";
       patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403022154.patch;
-        sha256 = "0pqp8mfj4zbgb94c7g6ykh0amlwlilxjiqsyc6smmwwbg6klgvkr";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403072107.patch;
+        sha256 = "128dbspwg8hvshz6rjykcl42kam5g0db50rbyaagskh9jm9a0zyz";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55
       features.apparmor = true;
     };
 
-  grsecurity_3_0_3_13_5 =
-    { name = "grsecurity-3.0-3.13.5";
+  grsecurity_3_0_3_13_6 =
+    { name = "grsecurity-3.0-3.13.6";
       patch = fetchurl {
-        url = http://grsecurity.net/test/grsecurity-3.0-3.13.5-201403031445.patch;
-        sha256 = "0b22jbm9swghhj7a9c07z5yprk88bgp0iv3c8xmfqqyy0yighq1l";
+        url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403072241.patch;
+        sha256 = "006w89pvb9jasb7413nnphz5mrdmq10mkpmjcglbhs5ps915jczy";
       };
       features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.5
+      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.6
       features.apparmor = true;
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd83ec6156c..701f2713883 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6740,7 +6740,7 @@ let
   })) (args: grsecurityOverrider args));
 
   linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_5 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_6 kernelPatches.grsec_path ];
     argsOverride = {
       modDirVersion = "${linux_3_13.modDirVersion}-grsec";
     };
-- 
GitLab


From 727c8981ad9ab17e258c27c6b33b311ed66a0476 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Mon, 10 Mar 2014 13:32:47 -0700
Subject: [PATCH 2018/3789] apt-offline: set platforms

---
 pkgs/tools/misc/apt-offline/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix
index 7c1c65af6c3..7c778fe38a1 100644
--- a/pkgs/tools/misc/apt-offline/default.nix
+++ b/pkgs/tools/misc/apt-offline/default.nix
@@ -23,5 +23,6 @@ buildPythonPackage rec {
     description = "offline APT package manager";
     license = licenses.gpl3;
     maintainers = [ maintainers.falsifian ];
+    platforms = platforms.all;
   };
 }
-- 
GitLab


From c6e4e366e573fe7196f788394b31bac2849992d2 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Mon, 10 Mar 2014 13:38:24 -0700
Subject: [PATCH 2019/3789] apt-offline: set platforms to linux

(Only tested on Linux; might work on other systems.)
---
 pkgs/tools/misc/apt-offline/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix
index 7c778fe38a1..219cb2139f5 100644
--- a/pkgs/tools/misc/apt-offline/default.nix
+++ b/pkgs/tools/misc/apt-offline/default.nix
@@ -23,6 +23,6 @@ buildPythonPackage rec {
     description = "offline APT package manager";
     license = licenses.gpl3;
     maintainers = [ maintainers.falsifian ];
-    platforms = platforms.all;
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From 0b66e7f5be618152c0f8e6b983288f04495b00ee Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 10 Mar 2014 23:35:09 +0100
Subject: [PATCH 2020/3789] pythonPackages.nose: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 927c1483c43..d889f85eccc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4138,12 +4138,12 @@ rec {
   });
 
   nose = buildPythonPackage rec {
-    version = "1.3.0";
+    version = "1.3.1";
     name = "nose-${version}";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz";
-      sha256 = "0q2j9zz39h3liwbp6lb94kl3sxb9z9rbwh5dzyccyxfy4lrwqqsf";
+      sha256 = "1fmn5b7v183ym793ghrbh76b27aww9qv0lhl7dz31f9xmf3kn9w5";
     };
 
     buildInputs = [ coverage ];
-- 
GitLab


From 05a2b88df70228fbedcfadc2467933e71f901376 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 29 Aug 2013 21:27:48 +0000
Subject: [PATCH 2021/3789] vimHugeX: also add wrapper for system-wide vimrc

---
 pkgs/applications/editors/vim/wrapper.nix |  6 ++++--
 pkgs/top-level/all-packages.nix           | 12 ++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vim/wrapper.nix b/pkgs/applications/editors/vim/wrapper.nix
index 709753ff8eb..72e86805053 100644
--- a/pkgs/applications/editors/vim/wrapper.nix
+++ b/pkgs/applications/editors/vim/wrapper.nix
@@ -2,10 +2,12 @@
 
 let
 
-  vimrcfile = writeText "vimrc" (if vimrc == null then "" else vimrc);
+  vimrcfile = writeText "vimrc" vimrc;
+
+  p = builtins.parseDrvName vim.name;
 
 in stdenv.mkDerivation rec {
-  name = "vimwrapper-${vim.version}";
+  name = "${p.name}-with-vimrc-${p.version}";
 
   buildInputs = [ makeWrapper vim vimrcfile ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 953dd6a96c8..2fff1d917a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9092,13 +9092,12 @@ let
       else stdenv;
   };
 
-  vimwrapper = callPackage ../applications/editors/vim/wrapper.nix {
-    inherit vim;
-    vimrc = config.vim.vimrc or null;
-  };
+  vimWrapper = wrapVim vim;
 
   vimHugeX = vim_configurable;
 
+  vimHugeXWrapper = wrapVim vimHugeX;
+
   vim_configurable = callPackage ../applications/editors/vim/configurable.nix {
     inherit (pkgs) fetchurl fetchhg stdenv ncurses pkgconfig gettext
       composableDerivation lib config glib gtk python perl tcl ruby;
@@ -9131,6 +9130,11 @@ let
     flags = [ "python" "X11" ]; # only flag "X11" by now
   });
 
+  wrapVim = vim: import ../applications/editors/vim/wrapper.nix {
+    inherit stdenv makeWrapper writeText vim;
+    vimrc = config.vim.vimrc or "";
+  };
+
   virtviewer = callPackage ../applications/virtualization/virt-viewer {};
   virtmanager = callPackage ../applications/virtualization/virt-manager {
     inherit (gnome) gnome_python;
-- 
GitLab


From 8d2603baf4fe4d9b26d3846e903aaabc10366c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 10 Mar 2014 22:46:26 -0300
Subject: [PATCH 2022/3789] gnome3.libgnome_keyring with gobject introspection

---
 .../gnome-3/core/libgnome-keyring/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
index a5d196ae1e3..ed37f013e16 100644
--- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
@@ -1,17 +1,26 @@
-{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool }:
+{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  name = "libgnome-keyring-3.6.0";
+  name = "libgnome-keyring-3.10.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgnome-keyring/3.6/${name}.tar.xz";
-    sha256 = "0c4qrjpmv1hqga3xv6wsq2z10x2n78qgw7q3k3s01y1pggxkgjkd";
+    url = "mirror://gnome/sources/libgnome-keyring/3.10/${name}.tar.xz";
+    sha256 = "0wip88r91kwx4zp6sc9b38mnlv11grgl4k2kzsd3a8x83c9g2b05";
   };
 
-  propagatedBuildInputs = [ glib dbus_libs libgcrypt ];
+  propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];
   nativeBuildInputs = [ pkgconfig intltool ];
 
   meta = {
+    description = "Framework for managing passwords and other secrets";
+    homepage = http://live.gnome.org/GnomeKeyring;
+    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.
+    '';
   };
 }
-- 
GitLab


From 691b499a66095dbdb397d987a5d8dceed14eff49 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 11 Mar 2014 03:04:12 +0100
Subject: [PATCH 2023/3789] pythonPackages.glances: 1.7.1 -> 1.7.4

---
 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 d889f85eccc..79d32e93d2b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3044,7 +3044,7 @@ rec {
 
     src = fetchurl {
       url = "https://github.com/nicolargo/glances/archive/v${meta.version}.tar.gz";
-      sha256 = "0g2yg9qf7qgjwv13x0rx51rzhn99pcmjpb3vk0g3gmmdsqyqi0d6";
+      sha256 = "19pin04whc1z4gmwv2rqa7mh08d6007r8dyrhihnxj0v35ghp5i0";
     };
 
     buildInputs = [ pkgs.hddtemp ];
@@ -3058,7 +3058,7 @@ rec {
     '';
 
     meta = {
-      version = "1.7.1";
+      version = "1.7.4";
       homepage = "http://nicolargo.github.io/glances/";
       description = "Cross-platform curses-based monitoring tool";
     };
-- 
GitLab


From 0704190b33658c5f3a7add96bc44a641b0b1085f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 10 Mar 2014 23:37:42 -0300
Subject: [PATCH 2024/3789] liferea: fixed some dependencies

---
 .../newsreaders/liferea/default.nix           | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index f557af41db9..13859eb24ad 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, python, pygobject3
 , glib, gnome3, pango, libxml2, libxslt, sqlite, libsoup
-, webkitgtk, json_glib, gobjectIntrospection, gsettings_desktop_schemas
-, gst_all_1
+, webkitgtk, json_glib, gobjectIntrospection, gst_all_1
 , libnotify
 , makeWrapper
 }:
@@ -20,10 +19,10 @@ stdenv.mkDerivation rec {
   buildInputs = with gst_all_1; [
     pkgconfig intltool python
     glib gnome3.gtk pango libxml2 libxslt sqlite libsoup
-    webkitgtk json_glib gobjectIntrospection gsettings_desktop_schemas
-    gnome3.libpeas
+    webkitgtk json_glib gobjectIntrospection gnome3.gsettings_desktop_schemas
+    gnome3.libpeas gnome3.dconf
     gst-plugins-base gst-plugins-good gst-plugins-bad
-    gnome3.gnome_keyring
+    gnome3.libgnome_keyring
     libnotify
     makeWrapper
   ];
@@ -35,9 +34,10 @@ stdenv.mkDerivation rec {
     for f in "$out"/bin/*; do
       wrapProgram "$f" \
         --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
+        --prefix LD_LIBRARY_PATH : "${gnome3.libgnome_keyring}/lib" \
         --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:${gnome3.gnome_icon_theme}/share:${gsettings_desktop_schemas}/share:${gnome3.gtk}/share:$out/share"
+        --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share"
     done
   '';
 
@@ -47,5 +47,12 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [ vcunat romildo ];
     platforms = stdenv.lib.platforms.linux;
+
+    longDescription = ''
+      Liferea (Linux Feed Reader) is an RSS/RDF feed reader.
+      It's intended to be a clone of the Windows-only FeedReader.
+      It can be used to maintain a list of subscribed feeds,
+      browse through their items, and show their contents.
+    '';
   };
 }
-- 
GitLab


From e5bd086b11e250f1549e87a9a210ece11984b228 Mon Sep 17 00:00:00 2001
From: Vladimir Still <vl.still@gmail.com>
Date: Tue, 11 Mar 2014 12:20:57 +0100
Subject: [PATCH 2025/3789] perlPackages: Add X11::Protocol.

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c463fb9f83b..d5cd011bbae 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9415,6 +9415,17 @@ let self = _self // overrides; _self = with self; {
     doCheck = false;
   };
 
+  X11Protocol = buildPerlPackage rec {
+    name = "X11-Protocol-0.56";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SM/SMCCAM/${name}.tar.gz";
+      sha256 = "1dq89bh6fqv7l5mbffqcismcljpq5f869bx7g8lg698zgindv5ny";
+    };
+    buildInputs = [pkgs.x11];
+    NIX_CFLAGS_LINK = "-lX11";
+    doCheck = false; # requires an X server
+  };
+
   X11GUITest = buildPerlPackage rec {
     name = "X11-GUITest-0.21";
     src = fetchurl {
-- 
GitLab


From 813533f49a7777812b8b5b157ac13172c27bb17b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 12:34:33 +0100
Subject: [PATCH 2026/3789] wpa_supplicant: cherry-pick future patch that
 disable strict SSL certificate checks

Close #1913.
---
 pkgs/os-specific/linux/wpa_supplicant/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index bd2caed265f..26e3e8cc2b2 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -38,7 +38,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  patches = [ ./libnl.patch ];
+  patches = [ ./libnl.patch
+    # remove this patch after wpa_supplicant 2.1
+    (fetchurl {
+      url ="http://projects.archlinux.org/svntogit/packages.git/plain/trunk/0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch?h=packages/wpa_supplicant";
+      sha256 = "0x1wl2nbl7v9kv80qvysfjhhg5a7lmgygv1y723flps6y8ngm19w";
+    })
+  ];
 
   postInstall = ''
     mkdir -p $out/share/man/man5 $out/share/man/man8
-- 
GitLab


From 24d0e07a47d27ba12a8f4273050ba4fd619b1b8f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 12:34:48 +0100
Subject: [PATCH 2027/3789] wpa_supplicant: cosmetic to un-break syntax
 highlighting

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

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 26e3e8cc2b2..5ee25ea976a 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -48,14 +48,14 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     mkdir -p $out/share/man/man5 $out/share/man/man8
-    cp -v doc/docbook/*.5 $out/share/man/man5/
-    cp -v doc/docbook/*.8 $out/share/man/man8/
+    cp -v "doc/docbook/"*.5 $out/share/man/man5/
+    cp -v "doc/docbook/"*.8 $out/share/man/man8/
     mkdir -p $out/etc/dbus-1/system.d $out/share/dbus-1/system-services $out/etc/systemd/system
-    cp -v dbus/*service $out/share/dbus-1/system-services
-    sed -e "s@/sbin/wpa_supplicant@$out&@" -i $out/share/dbus-1/system-services/*
+    cp -v "dbus/"*service $out/share/dbus-1/system-services
+    sed -e "s@/sbin/wpa_supplicant@$out&@" -i "$out/share/dbus-1/system-services/"*
     cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d
-    cp -v systemd/*.service $out/etc/systemd/system
-  ''; # */
+    cp -v "systemd/"*.service $out/etc/systemd/system
+  '';
 
   meta = {
     homepage = http://hostap.epitest.fi/wpa_supplicant/;
-- 
GitLab


From f7d5e83abbe95ed06aac58f4d1a2e971fae4d186 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sun, 9 Mar 2014 14:32:02 +0400
Subject: [PATCH 2028/3789] slim: remove duplicate code

---
 lib/maintainers.nix                                 |  1 +
 .../modules/services/x11/display-managers/slim.nix  |  4 +++-
 pkgs/applications/display-managers/slim/default.nix | 13 +------------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fa0d1d81e61..d056d4ca7e4 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -31,6 +31,7 @@
   ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
   iElectric = "Domen Kozar <domen@dev.si>";
   iyzsong = "Song Wenwu <iyzsong@gmail.com>";
+  JagaJaga = "Arseniy Seroka <ars.seroka@gmail.com>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index b4f42ec7649..29cdc4cdabc 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -85,7 +85,9 @@ in
       
       package = mkOption {
         type = types.package;
-        default = pkgs.slim;
+        default = pkgs.slim.override { 
+          theme = slimThemesDir; 
+          };
         description = ''
           Configure slim package.
         '';
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index caf8a7c4222..96c9e149c9f 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -2,18 +2,7 @@
 , fontconfig, freetype, pam, dbus_libs, makeWrapper, pkgs, theme ? null }:
 
 let 
-  slimThemesDir =
-      let
-        unpackedTheme = pkgs.stdenv.mkDerivation {
-          name = "slim-theme";
-          buildCommand = ''
-            ensureDir $out
-            cd $out
-            unpackFile ${theme}
-            ln -s * default
-          '';
-        };
-    in if theme == null then "$out/share/slim/themes" else unpackedTheme;
+  slimThemesDir = if theme == null then "$out/share/slim/themes" else theme;
 in
 
 stdenv.mkDerivation rec {
-- 
GitLab


From 423b2e2cd495678893128bece3f2949cf98bc510 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:48:51 +0100
Subject: [PATCH 2029/3789] haskell-xmobar: update to version 0.20

---
 pkgs/applications/misc/xmobar/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index 7eacaf15b62..49c1a403814 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -1,15 +1,16 @@
-{ cabal, alsaCore, alsaMixer, filepath, libXrandr, mtl, parsec
-, regexCompat, stm, time, utf8String, wirelesstools, X11, X11Xft
+{ cabal, alsaCore, alsaMixer, filepath, HTTP, libXrandr, mtl
+, parsec, regexCompat, stm, time, utf8String, wirelesstools, X11
+, X11Xft
 }:
 
 cabal.mkDerivation (self: {
   pname = "xmobar";
-  version = "0.19";
-  sha256 = "1lwbww9vpqscip16lqiax2qvfyksxms5xx4n0s61mzw7v61hyxq2";
+  version = "0.20";
+  sha256 = "06ra5nx53rlijkb3hhp5p5a0b3bx14921jgkkp1xqciscnspj2nv";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    alsaCore alsaMixer filepath mtl parsec regexCompat stm time
+    alsaCore alsaMixer filepath HTTP mtl parsec regexCompat stm time
     utf8String X11 X11Xft
   ];
   extraLibraries = [ libXrandr wirelesstools ];
-- 
GitLab


From 766f561509b9d2ee7b081eb2098bb75e8d81c0ed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:48:53 +0100
Subject: [PATCH 2030/3789] haskell-Boolean: update to version 0.2.1

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

diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix
index bc8e9dca159..bb226733f8a 100644
--- a/pkgs/development/libraries/haskell/Boolean/default.nix
+++ b/pkgs/development/libraries/haskell/Boolean/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Boolean";
-  version = "0.2";
-  sha256 = "1r8qvsfbfjfp453pdy9ci9w584ad9bm4xv0ynx4b1yny34ag3zr3";
+  version = "0.2.1";
+  sha256 = "0vi09icwc254mbx85lf1n81mx4hr2sdf61a4njaqa91cf046sjlr";
   meta = {
     description = "Generalized booleans and numbers";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From 28a0f7703eaf16cf381feaa078d31b9451579249 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:48:55 +0100
Subject: [PATCH 2031/3789] haskell-MissingH: update to version 1.2.1.0

---
 .../libraries/haskell/MissingH/default.nix           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix
index 59656d51978..303a4852649 100644
--- a/pkgs/development/libraries/haskell/MissingH/default.nix
+++ b/pkgs/development/libraries/haskell/MissingH/default.nix
@@ -1,17 +1,17 @@
-{ cabal, filepath, hslogger, HUnit, mtl, network, parsec
-, QuickCheck, random, regexCompat, testpack, time
+{ cabal, errorcallEqInstance, filepath, hslogger, HUnit, mtl
+, network, parsec, QuickCheck, random, regexCompat, testpack, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "MissingH";
-  version = "1.2.0.2";
-  sha256 = "1wrrfa8dy0h0c53f1zjzwdkj8wkwsbi6qhv35wwlaz39dk32c4nn";
+  version = "1.2.1.0";
+  sha256 = "08zpzfhl31w35x13vapimwd508j4nydi8v3vid668r4fkqnymbss";
   buildDepends = [
     filepath hslogger HUnit mtl network parsec random regexCompat time
   ];
   testDepends = [
-    filepath hslogger HUnit mtl network parsec QuickCheck random
-    regexCompat testpack time
+    errorcallEqInstance filepath hslogger HUnit mtl network parsec
+    QuickCheck random regexCompat testpack time
   ];
   doCheck = false;
   meta = {
-- 
GitLab


From dd0cd0a7654ccacf7773ccf29c60d2baf43bc9db Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:48:56 +0100
Subject: [PATCH 2032/3789] haskell-amqp: update to version 0.8.2

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

diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix
index 200a736f331..15079a5ba39 100644
--- a/pkgs/development/libraries/haskell/amqp/default.nix
+++ b/pkgs/development/libraries/haskell/amqp/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "amqp";
-  version = "0.8.1";
-  sha256 = "10infzs2siw9vv8jgsndv7c82bsh22cs2drrb73nxpwf73hy3rzm";
+  version = "0.8.2";
+  sha256 = "0hl9x6kbxdv32014k1w34d84wl4ivpiyg1ikpjr0nr9bsg3wr0gf";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From dcb054093f3435bd4cf8d760e0c302adfbb67a4a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:48:58 +0100
Subject: [PATCH 2033/3789] haskell-bytestring-lexing: update to version
 0.4.3.1

---
 .../libraries/haskell/bytestring-lexing/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
index 93c8b2aa229..8c4f2af654e 100644
--- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bytestring-lexing";
-  version = "0.4.3";
-  sha256 = "0dynfrf8ym01v2dl57422h8r75kdlqh2qzqi9yc0f1bmbfqxap6r";
+  version = "0.4.3.1";
+  sha256 = "1n0sk1xqwkj4whp0gav7hwr33xqmwl3ylqfnqix8wbwz6xpg9ygn";
   buildTools = [ alex ];
   meta = {
     homepage = "http://code.haskell.org/~wren/";
-- 
GitLab


From 30d0c87736308a182c9e38fd1da1723ec192b07d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:00 +0100
Subject: [PATCH 2034/3789] haskell-conduit-combinators: update to version
 0.2.0.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 8372d465f01..5d1fa791c69 100644
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.2.0.0";
-  sha256 = "0r5s1m31ncg1m9sm8n2212r9mm4hjrxc3a92divkhcxwijadzghc";
+  version = "0.2.0.1";
+  sha256 = "0hmy398kk37n5l4pacb2a0z9h9f1kl6vva9gsph1kiqnnz7sbr4r";
   buildDepends = [
     chunkedData conduit monoTraversable primitive systemFileio
     systemFilepath text transformers transformersBase vector
-- 
GitLab


From c7823d47f428529247b4cc5e28d05e8063f5a519 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:02 +0100
Subject: [PATCH 2035/3789] haskell-cryptohash-cryptoapi: update to version
 0.1.2

---
 .../libraries/haskell/cryptohash-cryptoapi/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix b/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix
index e21e026080b..7041bcc5285 100644
--- a/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptohash-cryptoapi";
-  version = "0.1.0";
-  sha256 = "06b62ddwx2mp71dzaj8h88vw2c6nv3rj8n6d3d9vmqa7cws3mjkx";
+  version = "0.1.2";
+  sha256 = "1i2qxyq5qk4jzgkl7kndy10sbmzmagamfnqvl300qm3msi9k0kfy";
   buildDepends = [ cereal cryptoApi cryptohash tagged ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-cryptohash-cryptoapi";
-- 
GitLab


From dfc8dc4bf454fa2937c84cb0ed6090d0661e4a6c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:03 +0100
Subject: [PATCH 2036/3789] haskell-diagrams-cairo: update to version 1.1

---
 pkgs/development/libraries/haskell/diagrams/cairo.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index 186f60aecf5..c38346d189b 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -1,14 +1,16 @@
 { cabal, cairo, colour, dataDefaultClass, diagramsCore, diagramsLib
-, filepath, hashable, lens, mtl, split, statestack, time
+, filepath, hashable, JuicyPixels, lens, mtl, optparseApplicative
+, split, statestack, time, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-cairo";
-  version = "1.0.1.2";
-  sha256 = "040x3zdrr70kg10isby6xp8mswvjd84xiz2rf7w1y66g9izdgfmc";
+  version = "1.1";
+  sha256 = "0x66qdwni3pwc2lrqy5jnyz7nqbfpr1086g1ndy6cxx8hp632zaf";
   buildDepends = [
     cairo colour dataDefaultClass diagramsCore diagramsLib filepath
-    hashable lens mtl split statestack time
+    hashable JuicyPixels lens mtl optparseApplicative split statestack
+    time vector
   ];
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
-- 
GitLab


From 3f14c07cff5c9d194a929f9fe3e6561e5dceb644 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:05 +0100
Subject: [PATCH 2037/3789] haskell-diagrams-contrib: update to version 1.1.1.1

---
 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 c0ce17d63db..34dcb3745e3 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.0.1";
-  sha256 = "1vgfk3drs61am5z0146pq17i00ygsi2pyz8qipf6c30c9wri9hjp";
+  version = "1.1.1.1";
+  sha256 = "1b91scy96zf2njikfyr2ir2ckiib4dlvjazrlbri6f5ds40gnhna";
   buildDepends = [
     arithmoi circlePacking colour dataDefault dataDefaultClass
     diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec
-- 
GitLab


From 026f0ffc77e81c5b89d721b6c6191316640e4280 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:07 +0100
Subject: [PATCH 2038/3789] haskell-diagrams-core: update to version 1.1

---
 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 c291ce9a48c..3a3f74d4c27 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.0.0.1";
-  sha256 = "19jri4np14lgf4pxyyczqjwh30cdmcpnb8alj60b0z5fca7042xm";
+  version = "1.1";
+  sha256 = "0prklz6s5zcainpkawibdg3bidmvsd2xsc1xxrmfp7lscmim736v";
   buildDepends = [
     dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace
     vectorSpacePoints
-- 
GitLab


From 07ca6915c1552445c98c93d791a11b39bd9541b2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:09 +0100
Subject: [PATCH 2039/3789] haskell-diagrams: update to version 1.1

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

diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
index 7a0cd53218d..cddc5dbadcf 100644
--- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix
+++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams";
-  version = "1.0.0.1";
-  sha256 = "0nlh4n5ykymjkyi9n0r5l1caq1f26mijw7smnj78mv3d40qcrnv1";
+  version = "1.1";
+  sha256 = "1fdacsa57w64hkcsrriwdgdxddd7gps97fyaz2rl8wfxcl96vclr";
   buildDepends = [
     diagramsContrib diagramsCore diagramsLib diagramsSvg
   ];
-- 
GitLab


From 8e5198c284f6d9b58f55be91e3955edbb4c311be Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:10 +0100
Subject: [PATCH 2040/3789] haskell-diagrams-lib: update to version 1.1.0.1

---
 pkgs/development/libraries/haskell/diagrams/lib.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index 6dbedd5ecda..32385655426 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -1,18 +1,17 @@
 { cabal, active, colour, dataDefaultClass, diagramsCore, filepath
 , fingertree, hashable, intervals, lens, MemoTrie, monoidExtras
-, NumInstances, optparseApplicative, safe, semigroups, tagged
-, vectorSpace, vectorSpacePoints
+, optparseApplicative, safe, semigroups, tagged, vectorSpace
+, vectorSpacePoints
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "1.0.1";
-  sha256 = "0cjhb6dm0n4a7s8z0lyihql7dz34pdbm3ahm2p0yya4xf9pf0fw4";
+  version = "1.1.0.1";
+  sha256 = "0zkxkncz8ayvahr57fgq44vgir3yghxs2y1rrp138951fcy2g3a7";
   buildDepends = [
     active colour dataDefaultClass diagramsCore filepath fingertree
-    hashable intervals lens MemoTrie monoidExtras NumInstances
-    optparseApplicative safe semigroups tagged vectorSpace
-    vectorSpacePoints
+    hashable intervals lens MemoTrie monoidExtras optparseApplicative
+    safe semigroups tagged vectorSpace vectorSpacePoints
   ];
   jailbreak = true;
   meta = {
-- 
GitLab


From 4f5a93fc99f67f220174c9979f81086b98f94110 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:12 +0100
Subject: [PATCH 2041/3789] haskell-diagrams-postscript: update to version
 1.0.2

---
 .../libraries/haskell/diagrams/postscript.nix       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix
index 2c827b5f3d1..a7f85f98b09 100644
--- a/pkgs/development/libraries/haskell/diagrams/postscript.nix
+++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix
@@ -1,14 +1,15 @@
-{ cabal, diagramsCore, diagramsLib, dlist, filepath, hashable, lens
-, monoidExtras, mtl, semigroups, split, vectorSpace
+{ cabal, dataDefaultClass, diagramsCore, diagramsLib, dlist
+, filepath, hashable, lens, monoidExtras, mtl, semigroups, split
+, vectorSpace
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-postscript";
-  version = "1.0.1.2";
-  sha256 = "0im1w70qi8qs2z8x41v7pwvk1alfaw1h8k0683njzd5sfz2m1gny";
+  version = "1.0.2";
+  sha256 = "14y8wivgxs3qvybzqk1bfqsrs5457qd5br7nk1924si5gpsgp1xx";
   buildDepends = [
-    diagramsCore diagramsLib dlist filepath hashable lens monoidExtras
-    mtl semigroups split vectorSpace
+    dataDefaultClass diagramsCore diagramsLib dlist filepath hashable
+    lens monoidExtras mtl semigroups split vectorSpace
   ];
   meta = {
     homepage = "http://projects.haskell.org/diagrams/";
-- 
GitLab


From 220150c6cf505aad58e64f26cb46d811bf7506d0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:14 +0100
Subject: [PATCH 2042/3789] haskell-diagrams-svg: update to version 1.0.2

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

diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index 926249b853a..cc5795c80a1 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-svg";
-  version = "1.0.1.3";
-  sha256 = "0brbvzwh7yi3400wrdpkmw6jfd2nhi238zddhid76lmx2q9zxvvx";
+  version = "1.0.2";
+  sha256 = "1pbkr5qg3cjk2c23aas5y9f0bk5nsding4r4c4fdkxj49ipi4ys1";
   buildDepends = [
     blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath
     hashable lens monoidExtras mtl split time vectorSpace
-- 
GitLab


From 617ae225637a986d1f427131c729a4447c358266 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:16 +0100
Subject: [PATCH 2043/3789] haskell-force-layout: update to version 0.3.0.2

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

diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
index 70488010072..b57abc40e20 100644
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ b/pkgs/development/libraries/haskell/force-layout/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "force-layout";
-  version = "0.3.0.1";
-  sha256 = "0x9nfmvml9hszbm2izr4rfl9xphiyv0lj0hlixjbpxvm5nqk2w95";
+  version = "0.3.0.2";
+  sha256 = "0zrvsrqwl0wjv38l6zl1pa09572njdbcfbvimhpp930629zk4yb7";
   buildDepends = [
     dataDefaultClass lens vectorSpace vectorSpacePoints
   ];
-- 
GitLab


From 558910cb26a29662a7529898d0755ed4cc7ca2f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:17 +0100
Subject: [PATCH 2044/3789] haskell-ghc-mtl: update to version 1.1.0.0

---
 pkgs/development/libraries/haskell/ghc-mtl/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
index ea2495f6586..1379d4a8ee8 100644
--- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
@@ -1,12 +1,12 @@
-{ cabal, MonadCatchIOMtl, mtl }:
+{ cabal, exceptions, extensibleExceptions, mtl }:
 
 cabal.mkDerivation (self: {
   pname = "ghc-mtl";
-  version = "1.0.1.2";
-  sha256 = "06m8ynqlbvvs37w211ikldwvlvg4ry27x9l7idnwa1m8w2jkbkva";
-  buildDepends = [ MonadCatchIOMtl mtl ];
+  version = "1.1.0.0";
+  sha256 = "1vmiy00fsdp1jzmpjrz8wzxbv3185h27aspw412pmcr4v1n29kxc";
+  buildDepends = [ exceptions extensibleExceptions mtl ];
   meta = {
-    homepage = "http://darcsden.com/jcpetruzza/ghc-mtl";
+    homepage = "http://hub.darcs.net/jcpetruzza/ghc-mtl";
     description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From 953776280c2389fda4393e48ea09fda5e2d6c350 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:19 +0100
Subject: [PATCH 2045/3789] haskell-happstack-server: update to version 7.3.4

---
 .../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 40da6037e7d..4b54a002ab0 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.3";
-  sha256 = "18z706n9idszmn5j2cm2aqhs8zavk2sas6fwwywh38j536qzz36l";
+  version = "7.3.4";
+  sha256 = "1k9614f0x5ravblb00xiy8z2nqi4k9jhp2vzm1vdpx9q8sg47h1p";
   buildDepends = [
     base64Bytestring blazeHtml extensibleExceptions filepath hslogger
     html monadControl mtl network parsec sendfile syb systemFilepath
-- 
GitLab


From d675c97e655487f8b37d5a41b882dc7a1990edd2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:21 +0100
Subject: [PATCH 2046/3789] haskell-haskell-names: update to version 0.3.2.8

---
 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 eba56e578f7..519b24668ae 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.2.7";
-  sha256 = "0ibc74xd480nnjhx274i184g2m24wx5ks602731fr490044cr4hl";
+  version = "0.3.2.8";
+  sha256 = "043anrsilhd6mgc7c5qb6b7rkdf60xfgzzjn38zk6v0f41lvff99";
   buildDepends = [
     aeson Cabal dataLens dataLensTemplate filepath haskellPackages
     haskellSrcExts hseCpp mtl tagged transformers traverseWithClass
-- 
GitLab


From 856ed85f3cc594b1b9d41efdd9ad083d1132af6f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:23 +0100
Subject: [PATCH 2047/3789] haskell-hint: update to version 0.4.0.0

---
 .../libraries/haskell/hint/default.nix          | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix
index 3512bce9611..5534c2fc9da 100644
--- a/pkgs/development/libraries/haskell/hint/default.nix
+++ b/pkgs/development/libraries/haskell/hint/default.nix
@@ -1,17 +1,20 @@
-{ cabal, extensibleExceptions, filepath, ghcMtl, ghcPaths
-, haskellSrc, MonadCatchIOMtl, mtl, random, utf8String
+{ cabal, exceptions, extensibleExceptions, filepath, ghcMtl
+, ghcPaths, HUnit, mtl, random, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "hint";
-  version = "0.3.3.7";
-  sha256 = "1aba9dfkxlpmvbvllw4qnlrd300vnr0ismkn3kva1pv1cay5pifk";
+  version = "0.4.0.0";
+  sha256 = "0xs56ws7vwdjgvg7d31iqa111342an6rxvwhh7c3h4z1bq5l1l61";
   buildDepends = [
-    extensibleExceptions filepath ghcMtl ghcPaths haskellSrc
-    MonadCatchIOMtl mtl random utf8String
+    exceptions extensibleExceptions filepath ghcMtl ghcPaths mtl random
+    utf8String
+  ];
+  testDepends = [
+    exceptions extensibleExceptions filepath HUnit mtl
   ];
   meta = {
-    homepage = "http://darcsden.com/jcpetruzza/hint";
+    homepage = "http://hub.darcs.net/jcpetruzza/hint";
     description = "Runtime Haskell interpreter (GHC API wrapper)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From e1c9e94a6b3f69db70319c0c95dfd154f0037fff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:24 +0100
Subject: [PATCH 2048/3789] haskell-http-conduit: update to version 2.0.0.8

---
 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 3f938332c02..398459f6076 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.0.0.7";
-  sha256 = "0rizmshpypllfbmipbrad7hkrs2asx0ijfhr53w3pj58w6h80m0i";
+  version = "2.0.0.8";
+  sha256 = "1yralv1nalvdpgamnbjl8xm4lrx22m3v6jancrzisq38a680q96b";
   buildDepends = [
     conduit httpClient httpClientConduit httpClientTls httpTypes
     liftedBase resourcet transformers
-- 
GitLab


From aa12a345021952396a1badde8565c4e77dc73809 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:26 +0100
Subject: [PATCH 2049/3789] haskell-lifted-base: update to version 0.2.2.1

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

diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
index 7462b362c98..9dd46754164 100644
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-base";
-  version = "0.2.2.0";
-  sha256 = "1m6mk24nxkp9a78nywdb844avbqwh931gv1bxsgcbhavavzs72jj";
+  version = "0.2.2.1";
+  sha256 = "13w1y67wng5rv90fsikkwpvx2ajmq5ybnxrx9b2x0y0zbcy7pzk8";
   buildDepends = [
     baseUnicodeSymbols monadControl transformersBase
   ];
-- 
GitLab


From 0612b4bb7602ff63725796e0a0567d5ae8d97e53 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:28 +0100
Subject: [PATCH 2050/3789] haskell-mono-traversable: update to version 0.4.0.1

---
 .../libraries/haskell/mono-traversable/default.nix        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix
index a88f6902d83..5119863500d 100644
--- a/pkgs/development/libraries/haskell/mono-traversable/default.nix
+++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix
@@ -1,15 +1,15 @@
 { cabal, comonad, foldl, hashable, hspec, QuickCheck, semigroupoids
 , semigroups, text, transformers, unorderedContainers, vector
-, vectorInstances
+, vectorAlgorithms, vectorInstances
 }:
 
 cabal.mkDerivation (self: {
   pname = "mono-traversable";
-  version = "0.4.0";
-  sha256 = "0a59m46dr0am05v4b19j2saxlv0dp22kw47lck1m871y5x2gp936";
+  version = "0.4.0.1";
+  sha256 = "049skbjwz49c9qz2nys2hn6pc4gqn1a91b5kl9z6hjs9fnaic6ng";
   buildDepends = [
     comonad hashable semigroupoids semigroups text transformers
-    unorderedContainers vector vectorInstances
+    unorderedContainers vector vectorAlgorithms vectorInstances
   ];
   testDepends = [
     foldl hspec QuickCheck semigroups text transformers
-- 
GitLab


From 585743a043d2b695c44e47811549902bfe316f39 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:30 +0100
Subject: [PATCH 2051/3789] haskell-monoid-extras: update to version 0.3.3.1

---
 .../libraries/haskell/monoid-extras/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix
index ffde409a9b1..17df8cbeecc 100644
--- a/pkgs/development/libraries/haskell/monoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix
@@ -1,10 +1,10 @@
-{ cabal, groupoids, groups, semigroupoids, semigroups }:
+{ cabal, groups, semigroupoids, semigroups }:
 
 cabal.mkDerivation (self: {
   pname = "monoid-extras";
-  version = "0.3.3";
-  sha256 = "1a203fccwfmyqdv9mdzwd6gq5g9v3k9mial8n0hykdhmlny7dd56";
-  buildDepends = [ groupoids groups semigroupoids semigroups ];
+  version = "0.3.3.1";
+  sha256 = "1176sazk10vapia1qvcm2rxckn2vxfav21277rsgf11hvn3lzznc";
+  buildDepends = [ groups semigroupoids semigroups ];
   jailbreak = true;
   meta = {
     description = "Various extra monoid-related definitions and utilities";
-- 
GitLab


From c843c7bb9b27deee340511894724513d694e9a6e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:31 +0100
Subject: [PATCH 2052/3789] haskell-network-conduit: update to version 1.0.3

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

diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index b859858b8be..63dbaec80fd 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit";
-  version = "1.0.2.2";
-  sha256 = "1l7r40raqbhfgwgp5knkqfg2b7pqm4h23c9slbx55r829if8c54h";
+  version = "1.0.3";
+  sha256 = "0l5r0iws4zbqvkb2nlzxq0zspaz9vhl2a5r43jrxh4cvqb6lbn3q";
   buildDepends = [
     conduit liftedBase monadControl network transformers
   ];
-- 
GitLab


From d80bad8c215f04c3def885f55a42619f68f0390e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:33 +0100
Subject: [PATCH 2053/3789] haskell-pipes-bytestring: update to version 2.0.1

---
 .../libraries/haskell/pipes-bytestring/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix
index 8847f5e93f0..2a2324027d4 100644
--- a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-bytestring";
-  version = "2.0.0";
-  sha256 = "17l74g7xfl1i32jj9qa9ivbb3ndi68hkc1b6jchwnn19rmg51j9i";
+  version = "2.0.1";
+  sha256 = "1vsfqqkr5danb0n30av4vk8d4by9f50y5l8ywm1xjrmwrx999gvf";
   buildDepends = [
     pipes pipesGroup pipesParse profunctors transformers
   ];
-- 
GitLab


From c43e1b9e91bbb89708169a1251e5a34fbec7c6a3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:35 +0100
Subject: [PATCH 2054/3789] haskell-scientific: update to version 0.2.0.2

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

diff --git a/pkgs/development/libraries/haskell/scientific/default.nix b/pkgs/development/libraries/haskell/scientific/default.nix
index aa57f9dc5df..523bfce62b5 100644
--- a/pkgs/development/libraries/haskell/scientific/default.nix
+++ b/pkgs/development/libraries/haskell/scientific/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "scientific";
-  version = "0.2.0.1";
-  sha256 = "0xwxds884pqywjbc4j6qkx27nbi64sihig8ps9v884sk08021wrp";
+  version = "0.2.0.2";
+  sha256 = "13rrdaf5mrhpckq9vvrm4pnj63vahg7f0g75hk11nk7k1644l4f0";
   buildDepends = [ deepseq hashable text ];
   testDepends = [ smallcheck tasty tastySmallcheck text ];
   jailbreak = true;
-- 
GitLab


From d944d6a7f13bfa6b5ee77851e823834c2c35cc09 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:38 +0100
Subject: [PATCH 2055/3789] haskell-stm-conduit: update to version 2.2.2

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

diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index b53b310dafe..412dfa1fcd2 100644
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stm-conduit";
-  version = "2.2.1.1";
-  sha256 = "0rqn6xhqhaqiy0n2g46z58zzccq1i749p97aihrvjpikrz5kypka";
+  version = "2.2.2";
+  sha256 = "0a6yi35iw0p18asr6l8370kndmvim097vklayads6gbk74gg67cy";
   buildDepends = [
     async cereal cerealConduit conduit liftedAsync liftedBase
     monadControl monadLoops resourcet stm stmChans transformers
-- 
GitLab


From aee9e450ed2543fdcf71e5c2fbcb72dfaff4bfbc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:40 +0100
Subject: [PATCH 2056/3789] haskell-vector-space-points: update to version 0.2

---
 .../libraries/haskell/vector-space-points/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix
index 2edb15beeda..ca9218bf42c 100644
--- a/pkgs/development/libraries/haskell/vector-space-points/default.nix
+++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix
@@ -1,10 +1,10 @@
-{ cabal, newtype, vectorSpace }:
+{ cabal, vectorSpace }:
 
 cabal.mkDerivation (self: {
   pname = "vector-space-points";
-  version = "0.1.3";
-  sha256 = "0bk2zrccf5bxh14dzhhv89mr755j801ziqyxgv69ksdyxh8hx2qg";
-  buildDepends = [ newtype vectorSpace ];
+  version = "0.2";
+  sha256 = "05wczgvcqwqhcr4v0md4x5vybq6ns8rk6459yqyrc96kaig0sf2i";
+  buildDepends = [ vectorSpace ];
   meta = {
     description = "A type for points, as distinct from vectors";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From 7f7b9b0fc5d2a622b05ec89e0578d52c80b742aa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:42 +0100
Subject: [PATCH 2057/3789] haskell-wai-app-static: update to version 2.0.0.3

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

diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 8f2c6ebb342..412fd3f16e6 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "2.0.0.2";
-  sha256 = "0d9afs50r08k9zgz7vvh7fvamcvhm8hf4qxca4w0xi7pcj1vql0r";
+  version = "2.0.0.3";
+  sha256 = "0anbmp6wjk1qba1skr08fkm5y9lm58kfghzcgzgx8hrid7w85fb7";
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal
     cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed filepath
-- 
GitLab


From 5e2c633a516de5f01ca80c348128c57ccf21a858 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:44 +0100
Subject: [PATCH 2058/3789] haskell-wai-extra: update to version 2.1.0

---
 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 f3d2dfbd0cd..50e4d983d75 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.0.3.3";
-  sha256 = "11ma8pazvysvpiy8y7xfh7kpmsfiw94bd6vyyi3ji8q71rzjlf62";
+  version = "2.1.0";
+  sha256 = "14aj1c6i58jyg79y516sa2l39y4i7az3l5lp6fkxkgqgzl5dxs6c";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase
-- 
GitLab


From 04db2592881e00c597c07713f0affeb527ac98c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:46 +0100
Subject: [PATCH 2059/3789] haskell-wai-handler-fastcgi: update to version
 2.0.0.1

---
 .../libraries/haskell/wai-handler-fastcgi/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix
index 6612003fa2e..9767f2d7750 100644
--- a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix
+++ b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-handler-fastcgi";
-  version = "2.0.0";
-  sha256 = "1pqiqx1wq2iv705f8bd4sxmjmmkkxiw4g6a9dpwnawwb5n0d88nl";
+  version = "2.0.0.1";
+  sha256 = "14jsibsqfj6z5yqgdrh43aiqps1yldxkgn6fkj4i80zxk099nbxp";
   buildDepends = [ wai waiExtra ];
   extraLibraries = [ fcgi ];
   meta = {
-- 
GitLab


From 8a8dbb1682ea964eafae1dd4c986bbf71bd4233e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:47 +0100
Subject: [PATCH 2060/3789] haskell-wai-handler-launch: update to version
 2.0.1.1

---
 .../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 3ba78e16251..f25206e69ac 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.0";
-  sha256 = "1z03c3hjkh4k6j5dsp4973f05rk2cgl7gazac4vdq4imwfzxj3lg";
+  version = "2.0.1.1";
+  sha256 = "10izbri1a8mjb2q4r1badw63qbp3vxnw5v2hzskq6911bckqkskc";
   buildDepends = [
     blazeBuilder blazeBuilderConduit conduit httpTypes transformers wai
     warp zlibConduit
-- 
GitLab


From 0c478ecb401ff42188b30c91280596f1008d6fc5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:49 +0100
Subject: [PATCH 2061/3789] haskell-wai-test: update to version 2.0.0.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 9cae0a85d6c..1d7b184d6df 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.0.1";
-  sha256 = "1lk7i9kiawsn56f8w2nidmas6g94yq7diaprvkd7c52hjki5mla7";
+  version = "2.0.0.2";
+  sha256 = "0085whb8jav2zasmgi8z62anm6i509lc2w0988vqlcrds7rrknc8";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie
     httpTypes HUnit network text transformers wai
-- 
GitLab


From 6455c132c3b341e515748ea92e2c857a67cac14f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:51 +0100
Subject: [PATCH 2062/3789] haskell-wai: update to version 2.1.0

---
 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 4273e408a7f..f17b999f149 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.0.0";
-  sha256 = "11s60v9pw8jl9w950z81gkxci7djrdibi8hxrw6j1v8az40qqiwk";
+  version = "2.1.0";
+  sha256 = "0n3dgm1pwv9baxrx0qh0iq1mh9i7ihhki3h4ks5k74d37w7bwcjy";
   buildDepends = [
     blazeBuilder conduit httpTypes network text transformers vault
   ];
-- 
GitLab


From def8957c304ad8ba6a08917bc97a583c18f5b3ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:53 +0100
Subject: [PATCH 2063/3789] haskell-warp-tls: update to version 2.0.3.1

---
 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 c93352cf65c..c21e3b0d432 100644
--- a/pkgs/development/libraries/haskell/warp-tls/default.nix
+++ b/pkgs/development/libraries/haskell/warp-tls/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp-tls";
-  version = "2.0.2";
-  sha256 = "02wj9hwxd0x49g7kl68h3r4b9hc29yqfjagyybnr42xzwl6bdpyg";
+  version = "2.0.3.1";
+  sha256 = "1cyf4syblisi5hana7h2g72yyrjln40v3b6jq2253nglqip79l5w";
   buildDepends = [
     conduit cprngAes dataDefaultClass network networkConduit tls
     transformers wai warp
-- 
GitLab


From 5acfd49d17343a59a9bc419607c3faa6b7910415 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:54 +0100
Subject: [PATCH 2064/3789] haskell-warp: update to version 2.1.0

---
 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 f5b0f683553..fee847795dc 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.0.3.3";
-  sha256 = "02wh8jf8pcjb03xxdim9q92vr4jk9jibqqzl8kvccqlqfi5giq0f";
+  version = "2.1.0";
+  sha256 = "19pwpcn0qp0c4gb2yp81i550zfxk67087yhhn2iqgnzzhljhk8yw";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpDate httpTypes liftedBase network networkConduit simpleSendfile
-- 
GitLab


From ccac7c5dca13a33322131c64fc734e9eb0ca2380 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:56 +0100
Subject: [PATCH 2065/3789] haskell-x509: update to version 1.4.11

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

diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix
index 24ebf746202..d8fd7030f14 100644
--- a/pkgs/development/libraries/haskell/x509/default.nix
+++ b/pkgs/development/libraries/haskell/x509/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "x509";
-  version = "1.4.10";
-  sha256 = "1xsq0g7f5ki6l9yx604j6bsl1k7s3p1xr6hh2086hsgl9fp1f9ap";
+  version = "1.4.11";
+  sha256 = "1ax56jps640cj1swy08y4k75vx908ckwkg2hi7y2s3bhnvpz49ga";
   buildDepends = [
     asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes
     filepath mtl pem time
-- 
GitLab


From b48704974a95ce6f647decdd1f6139fc958192fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:49:58 +0100
Subject: [PATCH 2066/3789] haskell-yesod-auth: update to version 1.2.7

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

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 3831cac76e4..6857b6f02d7 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.2.6";
-  sha256 = "1w7svh49zqdrw1qp8v7df6y6mvkf40cn27k5ckxjyfin00rz0x31";
+  version = "1.2.7";
+  sha256 = "0arszd7nk7rwm0xnjb2vqk2zf7lcwyw1ncxyxdmdxxvmh28lymwk";
   buildDepends = [
     aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
     fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network
-- 
GitLab


From e5cf206741239cb57c6e811ac378b0e55ddd7f00 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:50:00 +0100
Subject: [PATCH 2067/3789] haskell-yesod-bin: update to version 1.2.7

---
 .../libraries/haskell/yesod-bin/default.nix   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index 59eeac6e3cf..9a96d2e574c 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -1,26 +1,26 @@
 { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit
-, dataDefaultClass, fileEmbed, filepath, fsnotify, ghcPaths
-, httpConduit, httpReverseProxy, httpTypes, liftedBase, network
-, networkConduit, optparseApplicative, parsec, projectTemplate
-, resourcet, shakespeare, shakespeareCss, shakespeareJs
-, shakespeareText, split, systemFileio, systemFilepath, tar, text
-, time, transformers, unixCompat, unorderedContainers, wai, warp
-, yaml, zlib
+, dataDefaultClass, fileEmbed, filepath, filesystemConduit
+, fsnotify, ghcPaths, httpConduit, httpReverseProxy, httpTypes
+, liftedBase, network, networkConduit, optparseApplicative, parsec
+, projectTemplate, resourcet, shakespeare, shakespeareCss
+, shakespeareJs, shakespeareText, split, systemFileio
+, systemFilepath, tar, text, time, transformers, unixCompat
+, unorderedContainers, wai, warp, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.6.1";
-  sha256 = "0w3qar315w96139j16fq4py4qs83bhm6pab9pzjbx8h451sqjarh";
+  version = "1.2.7";
+  sha256 = "1xy62r61fhswainws8q39dqkr1wfp1cls6sj2xvagf1yw5pw06wv";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     attoparsec base64Bytestring blazeBuilder Cabal conduit
-    dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit
-    httpReverseProxy httpTypes liftedBase network networkConduit
-    optparseApplicative parsec projectTemplate resourcet shakespeare
-    shakespeareCss shakespeareJs shakespeareText split systemFileio
-    systemFilepath tar text time transformers unixCompat
+    dataDefaultClass fileEmbed filepath filesystemConduit fsnotify
+    ghcPaths httpConduit httpReverseProxy httpTypes liftedBase network
+    networkConduit optparseApplicative parsec projectTemplate resourcet
+    shakespeare shakespeareCss shakespeareJs shakespeareText split
+    systemFileio systemFilepath tar text time transformers unixCompat
     unorderedContainers wai warp yaml zlib
   ];
   meta = {
-- 
GitLab


From f1120ff4b54db0e4dffe8d3b6781828f11a6b565 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:50:01 +0100
Subject: [PATCH 2068/3789] haskell-yesod-core: update to version 1.2.7

---
 .../libraries/haskell/yesod-core/default.nix  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 5eaaa316ecf..bd1116267fa 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -1,17 +1,17 @@
-{ cabal, aeson, attoparsecConduit, blazeBuilder, blazeHtml
+{ cabal, aeson, async, attoparsecConduit, blazeBuilder, blazeHtml
 , blazeMarkup, caseInsensitive, cereal, clientsession, conduit
 , cookie, dataDefault, failure, fastLogger, hamlet, hspec
-, httpTypes, HUnit, liftedBase, monadControl, monadLogger, parsec
-, pathPieces, QuickCheck, random, resourcet, safe, shakespeare
-, shakespeareCss, shakespeareI18n, shakespeareJs, text, time
-, transformers, transformersBase, unixCompat, vector, wai, waiExtra
-, waiLogger, waiTest, warp, yesodRoutes
+, httpTypes, HUnit, liftedBase, monadControl, monadLogger, network
+, networkConduit, parsec, pathPieces, QuickCheck, random, resourcet
+, safe, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs
+, text, time, transformers, transformersBase, unixCompat, vector
+, wai, waiExtra, waiLogger, waiTest, warp, yesodRoutes
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.6.7";
-  sha256 = "09vxi7fkiakr58ifa6ribsqq1p6fmqclznj38vhl5rdfalm7yivg";
+  version = "1.2.7";
+  sha256 = "1gkpx0d7hyvn45254aj40iy4k0bf3kkrvmxnw3q1mvqc3k1kdxqn";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit cookie dataDefault
@@ -22,9 +22,9 @@ cabal.mkDerivation (self: {
     yesodRoutes
   ];
   testDepends = [
-    blazeBuilder conduit hamlet hspec httpTypes HUnit liftedBase
-    QuickCheck random resourcet shakespeareCss shakespeareJs text
-    transformers wai waiTest
+    async blazeBuilder conduit hamlet hspec httpTypes HUnit liftedBase
+    network networkConduit QuickCheck random resourcet shakespeareCss
+    shakespeareJs text transformers wai waiTest
   ];
   jailbreak = true;
   meta = {
-- 
GitLab


From 46145143fcbb3c829fbff972b39098001088388c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:50:03 +0100
Subject: [PATCH 2069/3789] haskell-yesod-form: update to version 1.3.6

---
 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 7a7d1f16e05..84534d845a3 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.5.2";
-  sha256 = "0ppzj04c5y02k2daw52g2pkzf85mhsg7n4hbkm05xk1crzbrbcxj";
+  version = "1.3.6";
+  sha256 = "1gynm078i9iak0iirdrnp7pmz9rx4gq96cb2q5n617hww9m5p0j2";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
     dataDefault emailValidate hamlet network persistent resourcet
-- 
GitLab


From 4139ea10be8482a6333303bc4a946dbb1552e6dc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:50:05 +0100
Subject: [PATCH 2070/3789] haskell-zip-archive: update to version 0.2.2

---
 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 2d18fcd1f83..d76de048bab 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.1";
-  sha256 = "1w58fg3kzbsgscadwx3k34xbq7d7hzghlv4mxyglaxn3qdcd6w8b";
+  version = "0.2.2";
+  sha256 = "10br64sn7wmssimxssqmjd43br8y63l5szn2wg30d957a9zgdk60";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ binary digest filepath mtl text time zlib ];
-- 
GitLab


From 2273294b5009dd074c5d81cfc3b9795e58b2b740 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:50:07 +0100
Subject: [PATCH 2071/3789] haskell-HaRe: update to version 0.7.1.4

---
 pkgs/development/tools/haskell/HaRe/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix
index babfa131f10..6c128c25073 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.1.3";
-  sha256 = "1x900mywsl5rmn4rv2ss1nnrb6y5zs422ivn0iqb4ijd8a2j4lq5";
+  version = "0.7.1.4";
+  sha256 = "000vdvm38a3d3jpjg3cgsfl11w8jzvl0haqz78fy3zblqlndxy1m";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -24,7 +24,7 @@ cabal.mkDerivation (self: {
   ];
   jailbreak = true;
   meta = {
-    homepage = "http://www.cs.kent.ac.uk/projects/refactor-fp";
+    homepage = "https://github.com/RefactoringTools/HaRe/wiki";
     description = "the Haskell Refactorer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From d765d5ddbb2f1a7c3aed5739d524c97137410662 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 11:50:09 +0100
Subject: [PATCH 2072/3789] haskell-keter: update to version 1.2.0

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

diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix
index 53e2c5a7419..b8cf2466b10 100644
--- a/pkgs/development/tools/haskell/keter/default.nix
+++ b/pkgs/development/tools/haskell/keter/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "keter";
-  version = "1.1.0.1";
-  sha256 = "04hvwfs1dskaxl1fw29lf52389hy1yr3hwd05bl294zgfh995i0s";
+  version = "1.2.0";
+  sha256 = "06iz01ci1mcxjqs7dknxgjlkl783sdf680b54schxxirg268cxh3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 66729b6dead2e66eb1161b1a376963986fd26e1c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 12:49:56 +0100
Subject: [PATCH 2073/3789] haskell-lens: remove obsolete version 3.10.2

---
 .../libraries/haskell/lens/3.10.2.nix         | 36 -------------------
 .../haskell/lens/{4.0.5.nix => default.nix}   |  0
 pkgs/top-level/haskell-packages.nix           | 32 +++++------------
 3 files changed, 8 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/lens/3.10.2.nix
 rename pkgs/development/libraries/haskell/lens/{4.0.5.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/lens/3.10.2.nix b/pkgs/development/libraries/haskell/lens/3.10.2.nix
deleted file mode 100644
index 819902d6139..00000000000
--- a/pkgs/development/libraries/haskell/lens/3.10.2.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ cabal, bifunctors, comonad, contravariant, deepseq, distributive
-, doctest, filepath, genericDeriving, hashable, HUnit
-, MonadCatchIOTransformers, mtl, nats, parallel, profunctors
-, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect
-, split, tagged, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, testFrameworkTh, text, transformers
-, transformersCompat, unorderedContainers, vector, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lens";
-  version = "3.10.2";
-  sha256 = "0hdj75sg8r1m2jdpfh81zdcwbhp6mb7xipp6q57pv6n90xc6dnxw";
-  buildDepends = [
-    bifunctors comonad contravariant distributive filepath
-    genericDeriving hashable MonadCatchIOTransformers mtl parallel
-    profunctors reflection semigroupoids semigroups split tagged text
-    transformers transformersCompat unorderedContainers vector void
-  ];
-  testDepends = [
-    deepseq doctest filepath genericDeriving HUnit mtl nats parallel
-    QuickCheck semigroups simpleReflect split testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
-    transformers unorderedContainers vector
-  ];
-  patchPhase = ''
-    sed -i lens.cabal -e 's|MonadCatchIO-transformers >=.*,|MonadCatchIO-transformers,|'
-  '';
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/ekmett/lens/";
-    description = "Lenses, Folds and Traversals";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/lens/4.0.5.nix b/pkgs/development/libraries/haskell/lens/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/lens/4.0.5.nix
rename to pkgs/development/libraries/haskell/lens/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bbf7658a842..47926cb3fca 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -941,24 +941,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   dice = callPackage ../development/libraries/haskell/dice {};
 
   diagrams = callPackage ../development/libraries/haskell/diagrams/diagrams.nix {};
-  diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix {
-    lens = self.lens_3_10_2;
-  };
-  diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {
-    lens = self.lens_3_10_2;
-  };
-  diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix {
-    lens = self.lens_3_10_2;
-  };
-  diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {
-    lens = self.lens_3_10_2;
-  };
-  diagramsPostscript = callPackage ../development/libraries/haskell/diagrams/postscript.nix {
-     lens = self.lens_3_10_2;
-  };
-  diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix {
-    lens = self.lens_3_10_2;
-  };
+  diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix {};
+  diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {};
+  diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix {};
+  diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {};
+  diagramsPostscript = callPackage ../development/libraries/haskell/diagrams/postscript.nix {};
+  diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix {};
 
   Diff = callPackage ../development/libraries/haskell/Diff {};
 
@@ -1125,9 +1113,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   foldl = callPackage ../development/libraries/haskell/foldl {};
 
-  forceLayout = callPackage ../development/libraries/haskell/force-layout {
-    lens = self.lens_3_10_2;
-  };
+  forceLayout = callPackage ../development/libraries/haskell/force-layout {};
 
   free = callPackage ../development/libraries/haskell/free {};
 
@@ -1584,9 +1570,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {};
 
-  lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {};
-  lens_4_0_5 = callPackage ../development/libraries/haskell/lens/4.0.5.nix {};
-  lens = self.lens_4_0_5;
+  lens = callPackage ../development/libraries/haskell/lens {};
 
   lensAeson = callPackage ../development/libraries/haskell/lens-aeson {};
 
-- 
GitLab


From 55f2f3b4659973281d71513b60ec319d9ed6ec1b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 13:26:05 +0100
Subject: [PATCH 2074/3789] haskell-alsa-mixer: update to version 0.2.0.1

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

diff --git a/pkgs/development/libraries/haskell/alsa-mixer/default.nix b/pkgs/development/libraries/haskell/alsa-mixer/default.nix
index 67ab0275e78..35cc7aa0c93 100644
--- a/pkgs/development/libraries/haskell/alsa-mixer/default.nix
+++ b/pkgs/development/libraries/haskell/alsa-mixer/default.nix
@@ -2,12 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "alsa-mixer";
-  version = "0.1.2";
-  sha256 = "081f3a62f83a269d72e0b0fac8bae8c81e9ec342d592fa25abe57f7206cf4414";
+  version = "0.2.0.1";
+  sha256 = "1306kw4w85d3pkdqjw8cwx77a2mbhw2hlmxcjczym1nsyp4rhyhr";
   buildDepends = [ alsaCore ];
   buildTools = [ c2hs ];
   extraLibraries = [ alsaLib ];
   meta = {
+    homepage = "https://github.com/ttuegel/alsa-mixer";
     description = "Bindings to the ALSA simple mixer API";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.stdenv.lib.platforms.linux;
-- 
GitLab


From 902d57fe40d4a69c6aad893475574405805a0e61 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 13:26:10 +0100
Subject: [PATCH 2075/3789] haskell-http-reverse-proxy: update to version 0.3.1

---
 .../haskell/http-reverse-proxy/default.nix     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index f78205c49a0..3605425436e 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -1,17 +1,17 @@
-{ cabal, basicPrelude, blazeBuilder, caseInsensitive, conduit
-, dataDefaultClass, hspec, httpClient, httpConduit, httpTypes
-, liftedBase, monadControl, network, networkConduit, resourcet
-, text, transformers, wai, waiLogger, warp, word8
+{ cabal, async, basicPrelude, blazeBuilder, caseInsensitive
+, conduit, dataDefaultClass, hspec, httpClient, httpConduit
+, httpTypes, liftedBase, monadControl, network, networkConduit
+, resourcet, text, transformers, wai, waiLogger, warp, word8
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.3.0.1";
-  sha256 = "01rbczzf300ivb08wncm19wq64m7n6r5xfbgh82phjxjmmx9h6wj";
+  version = "0.3.1";
+  sha256 = "1xayhjrs6nm7gm5xc6z6vhzi9iq5czdvpywamkncivjsxjlc50b8";
   buildDepends = [
-    basicPrelude blazeBuilder caseInsensitive conduit dataDefaultClass
-    httpClient httpTypes liftedBase monadControl network networkConduit
-    resourcet text wai waiLogger word8
+    async basicPrelude blazeBuilder caseInsensitive conduit
+    dataDefaultClass httpClient httpTypes liftedBase monadControl
+    network networkConduit resourcet text wai waiLogger word8
   ];
   testDepends = [
     blazeBuilder conduit hspec httpConduit httpTypes liftedBase network
-- 
GitLab


From d0734f8aaaee4b9fd866ef7b8a0b7fccef9dda38 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 13:26:49 +0100
Subject: [PATCH 2076/3789] haskell-vcswrapper: add version 0.0.3

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

diff --git a/pkgs/development/libraries/haskell/vcswrapper/default.nix b/pkgs/development/libraries/haskell/vcswrapper/default.nix
new file mode 100644
index 00000000000..33462522c29
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vcswrapper/default.nix
@@ -0,0 +1,16 @@
+{ cabal, filepath, hxt, MissingH, mtl, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "vcswrapper";
+  version = "0.0.3";
+  sha256 = "04gmiiv461qh8fypkkiynipn5jsjqvywkj17ldq5wag4qaspx97x";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ filepath hxt MissingH mtl parsec ];
+  meta = {
+    homepage = "https://github.com/forste/haskellVCSWrapper";
+    description = "Wrapper for source code management systems";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 47926cb3fca..ff3e856b2f9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2510,6 +2510,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   vcsRevision = callPackage ../development/libraries/haskell/vcs-revision {};
 
+  vcswrapper = callPackage ../development/libraries/haskell/vcswrapper {};
+
   Vec = callPackage ../development/libraries/haskell/Vec {};
 
   vect = callPackage ../development/libraries/haskell/vect {};
-- 
GitLab


From 1e662766fbdfb430185176e5f55839470f7d296f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 13:27:27 +0100
Subject: [PATCH 2077/3789] haskell-vcsgui: add version 0.0.2

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

diff --git a/pkgs/development/libraries/haskell/vcsgui/default.nix b/pkgs/development/libraries/haskell/vcsgui/default.nix
new file mode 100644
index 00000000000..b27f61323a2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vcsgui/default.nix
@@ -0,0 +1,16 @@
+{ cabal, filepath, gtk3, MissingH, mtl, vcswrapper }:
+
+cabal.mkDerivation (self: {
+  pname = "vcsgui";
+  version = "0.0.2";
+  sha256 = "0kj06l9s4l791ffwdnh7j0nvjvgili18g2jl2ik81n28bzfyq1dx";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ filepath gtk3 MissingH mtl vcswrapper ];
+  meta = {
+    homepage = "https://github.com/forste/haskellVCSGUI";
+    description = "GUI library for source code management systems";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ff3e856b2f9..7bf244a1af0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2508,6 +2508,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   vault = callPackage ../development/libraries/haskell/vault {};
 
+  vcsgui = callPackage ../development/libraries/haskell/vcsgui {};
+
   vcsRevision = callPackage ../development/libraries/haskell/vcs-revision {};
 
   vcswrapper = callPackage ../development/libraries/haskell/vcswrapper {};
-- 
GitLab


From b46aac7d7952606a34291742e44c727739f4734e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 13:27:43 +0100
Subject: [PATCH 2078/3789] haskell-vado: add version 0.0.1

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

diff --git a/pkgs/development/libraries/haskell/vado/default.nix b/pkgs/development/libraries/haskell/vado/default.nix
new file mode 100644
index 00000000000..45e9524657a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vado/default.nix
@@ -0,0 +1,17 @@
+{ cabal, attoparsec, filepath, QuickCheck, text }:
+
+cabal.mkDerivation (self: {
+  pname = "vado";
+  version = "0.0.1";
+  sha256 = "11b8glzzpzhm8cfw3vyvvvz3h0xid5r3prwhnvplajr7v3r562h2";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ attoparsec filepath text ];
+  testDepends = [ attoparsec filepath QuickCheck text ];
+  meta = {
+    homepage = "https://github.com/hamishmack/vado";
+    description = "Runs commands on remote machines using ssh";
+    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 7bf244a1af0..a5defd67716 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2506,6 +2506,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   vacuumCairo = callPackage ../development/libraries/haskell/vacuum-cairo {};
 
+  vado = callPackage ../development/libraries/haskell/vado {};
+
   vault = callPackage ../development/libraries/haskell/vault {};
 
   vcsgui = callPackage ../development/libraries/haskell/vcsgui {};
-- 
GitLab


From 27247b0325a79e6339988904e124bf0e819620eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 13:28:07 +0100
Subject: [PATCH 2079/3789] haskell-ghcjs-dom: add version 0.0.4

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

diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
new file mode 100644
index 00000000000..58ad2765f6b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
@@ -0,0 +1,13 @@
+{ cabal, glib, gtk3, mtl, transformers, webkitgtk3 }:
+
+cabal.mkDerivation (self: {
+  pname = "ghcjs-dom";
+  version = "0.0.4";
+  sha256 = "1a3dv2l3s3aifcpivmnv308k2a1kb7r4x0z9gi83wc4xr9a8f08w";
+  buildDepends = [ glib gtk3 mtl transformers webkitgtk3 ];
+  meta = {
+    description = "DOM library that supports both GHCJS and WebKitGTK";
+    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 a5defd67716..2b5584278b0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1141,6 +1141,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled
   };
 
+  ghcjsDom = callPackage ../development/libraries/haskell/ghcjs-codemirror {};
+
   ghcMod = callPackage ../development/libraries/haskell/ghc-mod {
     inherit (pkgs) emacs;
   };
-- 
GitLab


From d35e61913ba2846d12948729238acf088ccf4c31 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 13:28:18 +0100
Subject: [PATCH 2080/3789] haskell-ghcjs-codemirror: add version 0.0.0.1

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

diff --git a/pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix b/pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix
new file mode 100644
index 00000000000..3f15f394c2c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "ghcjs-codemirror";
+  version = "0.0.0.1";
+  sha256 = "04x5h0i4fgyc2c5ihrnk0w3l1f3avvcl115zlnich93nillgbnfw";
+  meta = {
+    homepage = "https://github.com/ghcjs/CodeMirror";
+    description = "Installs CodeMirror JavaScript files";
+    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 2b5584278b0..aa83e06d351 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1143,6 +1143,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   ghcjsDom = callPackage ../development/libraries/haskell/ghcjs-codemirror {};
 
+  ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {};
+
   ghcMod = callPackage ../development/libraries/haskell/ghc-mod {
     inherit (pkgs) emacs;
   };
-- 
GitLab


From 36ee5c61c3626874540f431aae42c5078dc9e118 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Mar 2014 17:00:17 +0100
Subject: [PATCH 2081/3789] Rename git -> git-minimal, git-full -> git

Since most people probably want the full Git.
---
 .../version-management/git-and-tools/default.nix  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index ee1de54a4fb..96e4631889c 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -4,10 +4,8 @@
 args: with args; with pkgs;
 let
   inherit (pkgs) stdenv fetchgit fetchurl subversion;
-in
-rec {
 
-  git = lib.makeOverridable (import ./git) {
+  gitBase = lib.makeOverridable (import ./git) {
     inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
       asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl
       tk makeWrapper subversionClient gzip;
@@ -24,6 +22,9 @@ rec {
     ];
   };
 
+in
+rec {
+
   # support for bugzilla
   gitBz = import ./git-bz {
     inherit fetchgit stdenv makeWrapper python asciidoc xmlto # docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
@@ -31,17 +32,19 @@ rec {
     inherit (pythonPackages) pysqlite;
   };
 
+  git = appendToName "minimal" gitBase;
+
   # Git with SVN support, but without GUI.
-  gitSVN = lowPrio (appendToName "with-svn" (git.override {
+  gitSVN = lowPrio (appendToName "with-svn" (gitBase.override {
     svnSupport = true;
   }));
 
   # The full-featured Git.
-  gitFull = appendToName "full" (git.override {
+  gitFull = gitBase.override {
     svnSupport = true;
     guiSupport = true;
     sendEmailSupport = !stdenv.isDarwin;
-  });
+  };
 
   gitAnnex = pkgs.haskellPackages.gitAnnex;
 
-- 
GitLab


From 4c226fb88a52aa0bc0f83d1e42d65ad0ad23ea26 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Mar 2014 16:13:14 +0100
Subject: [PATCH 2082/3789] haskell-hledger-web: jailbreak to fix build with
 recent versions of yesod

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

diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index 0875c09db86..eee84c338e6 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -20,6 +20,7 @@ cabal.mkDerivation (self: {
     yesodCore yesodStatic
   ];
   testDepends = [ hspec yesod yesodTest ];
+  jailbreak = true;
   doCheck = false;
   meta = {
     homepage = "http://hledger.org";
-- 
GitLab


From 635599c61155f181066cb26c02d98f5b6ed1db0c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 11 Mar 2014 05:47:59 -0500
Subject: [PATCH 2083/3789] st: Add builtInput for pkgconfig

During the build process st fails to find pkg-config. This does not throw a fatal error but it should be included during build time.
---
 pkgs/applications/misc/st/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index 41575ce35a6..fda89f1cd3d 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, libX11, ncurses, libXext, libXft, fontconfig
+{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft, fontconfig
 , conf? null}:
 
 with stdenv.lib;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
   preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
   
-  buildInputs = [ libX11 ncurses libXext libXft fontconfig ];
+  buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ];
 
   NIX_LDFLAGS = "-lfontconfig";
 
-- 
GitLab


From 28437226ae04092531ea75dea01b708944dfbbeb Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 11 Mar 2014 18:27:09 +0100
Subject: [PATCH 2084/3789] libvirt: Update from 1.2.0 to 1.2.2

---
 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 c34934400d0..1f7e41fe4be 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -4,14 +4,14 @@
 , dnsmasq
 }:
 
-let version = "1.2.0"; in
+let version = "1.2.2"; in
 
 stdenv.mkDerivation {
   name = "libvirt-${version}";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
-    sha256 = "1p9dn96j8qqp20lr0kvc7zyjjcpgsa9k41slyk2jmnv1g2p7ird8";
+    sha256 = "1hxvgh2fp2fk3wva7fnbz2pk6g5217wrmf9xwikiphn50zipg0x4";
   };
 
   buildInputs =
-- 
GitLab


From 927971d8e31f5ddf5a694722c2e4978299e53db2 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Tue, 11 Mar 2014 18:21:34 +0100
Subject: [PATCH 2085/3789] kdevelop: Update to 4.6.

---
 pkgs/applications/editors/kdevelop/default.nix | 18 +++++-------------
 .../libraries/kdevplatform/default.nix         | 10 +++++-----
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix
index 14f9c1eb0d4..b815b052347 100644
--- a/pkgs/applications/editors/kdevelop/default.nix
+++ b/pkgs/applications/editors/kdevelop/default.nix
@@ -1,28 +1,20 @@
 { stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info,
-  kdebase_workspace, gettext, perl, okteta }:
+  kdebase_workspace, gettext, perl, okteta, qjson }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "4.3.1";
+  version = "4.6.0";
   pname = "kdevelop";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "0015hv39rqhyq1w6jw65lx7ls4l5pc3a2asvd5zsd65831vrfxxs";
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "1ee9e7b8c46f575dd29d920cfd6284130f2e738a2e1f52dfd97b075fab2e4c73";
   };
 
-  buildInputs = [ kdevplatform kdebase_workspace okteta ];
+  buildInputs = [ kdevplatform kdebase_workspace okteta qjson ];
 
   nativeBuildInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
 
-  patches =
-    [ ( fetchurl {
-        url = https://git.reviewboard.kde.org/r/105211/diff/raw/;
-        name = "okteta-0.9.patch"; # fixes build with KDE-4.9.x
-        sha256 = "1mvqhw7jr1vi66l3jgam3slyfafcvwy4g3iapfi69dpfnzhmcxl0";
-      } )
-    ];
-
   NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix
index 2ff2fac296d..6f874450fc5 100644
--- a/pkgs/development/libraries/kdevplatform/default.nix
+++ b/pkgs/development/libraries/kdevplatform/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, perl, phonon,
-  gettext, pkgconfig, apr, aprutil, boost, qjson }:
+  gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }:
 
 stdenv.mkDerivation rec {
-  name = "kdevplatform-1.3.1";
+  name = "kdevplatform-1.6.0";
 
   src = fetchurl {
-    url = "mirror://kde/stable/kdevelop/4.3.1/src/${name}.tar.bz2";
-    sha256 = "1fiqwabw5ilhw1jwvvr743dym12y3kxrs3zlqahz57yncdsglcl6";
+    url = "mirror://kde/stable/kdevelop/4.6.0/src/${name}.tar.xz";
+    sha256 = "cdf7c88ca8860258f46e41d2107c826a307212fd041345bee54fbd70c9794f80";
   };
 
   propagatedBuildInputs = [ kdelibs qt4 phonon ];
-  buildInputs = [ apr aprutil subversion boost qjson ];
+  buildInputs = [ apr aprutil subversion boost qjson grantlee ];
 
   nativeBuildInputs = [ cmake automoc4 gettext pkgconfig ];
 
-- 
GitLab


From b2b4e46198dc1ef3aa267296707befc9e3ccd651 Mon Sep 17 00:00:00 2001
From: Andres Loeh <mail@andres-loeh.de>
Date: Thu, 6 Mar 2014 11:40:51 +0100
Subject: [PATCH 2086/3789] Add GHC-7.8.1-rc2.

---
 pkgs/development/compilers/ghc/7.8.1.nix | 45 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  1 +
 pkgs/top-level/haskell-defaults.nix      | 15 ++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 pkgs/development/compilers/ghc/7.8.1.nix

diff --git a/pkgs/development/compilers/ghc/7.8.1.nix b/pkgs/development/compilers/ghc/7.8.1.nix
new file mode 100644
index 00000000000..c9ca6fd8719
--- /dev/null
+++ b/pkgs/development/compilers/ghc/7.8.1.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
+
+stdenv.mkDerivation rec {
+  version = "7.8.0.20140228";
+  name = "ghc-${version}";
+
+  src = fetchurl {
+    url = "http://www.haskell.org/ghc/dist/7.8.1-rc2/${name}-src.tar.bz2";
+    sha256 = "09xlgz1xg0182wjy62h3j0xvnhllhjlyvj30vc3him98parnr76w";
+  };
+
+  buildInputs = [ ghc perl gmp ncurses ];
+
+  enableParallelBuilding = true;
+
+  buildMK = ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+    DYNAMIC_BY_DEFAULT = NO
+  '';
+
+  preConfigure = ''
+    echo "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
+  '';
+
+  configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc";
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags = [ "-S" "--keep-file-symbols" ];
+
+  meta = {
+    homepage = "http://haskell.org/ghc";
+    description = "The Glasgow Haskell Compiler";
+    maintainers = [
+      stdenv.lib.maintainers.marcweber
+      stdenv.lib.maintainers.andres
+      stdenv.lib.maintainers.simons
+    ];
+    inherit (ghc.meta) license platforms;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 953dd6a96c8..43cf09faa8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2729,6 +2729,7 @@ let
   haskellPackages_ghc763_profiling    = recurseIntoAttrs (haskell.packages_ghc763.profiling);
   haskellPackages_ghc763              = recurseIntoAttrs (haskell.packages_ghc763.highPrio);
   # Reasonably current HEAD snapshot.
+  haskellPackages_ghc781 = haskell.packages_ghc781;
   haskellPackages_ghcHEAD = haskell.packages_ghcHEAD;
 
   haxe = callPackage ../development/compilers/haxe { };
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 0856bf50378..fe11a329ecd 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -23,6 +23,15 @@
       cabalInstall = self.cabalInstall_1_18_0_3.override { Cabal = null; };
     };
 
+  ghc781Prefs =
+    self : self.haskellPlatformArgs_future self // {
+      haskellPlatform = null;
+      extensibleExceptions = self.extensibleExceptions_0_1_1_4;
+      cabalInstall_1_18_0_2 = self.cabalInstall_1_18_0_2.override { Cabal = null; };
+      cabalInstall = self.cabalInstall_1_18_0_2.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;
@@ -395,6 +404,12 @@
                prefFun = ghc763Prefs;
              };
 
+  packages_ghc781 =
+    packages { ghcPath = ../development/compilers/ghc/7.8.1.nix;
+               ghcBinary = ghc742Binary;
+               prefFun = ghc781Prefs;
+             };
+
   # Reasonably current HEAD snapshot. Should *always* be lowPrio.
   packages_ghcHEAD =
     packages { ghcPath = ../development/compilers/ghc/head.nix;
-- 
GitLab


From cf931434de20249632354dde6ea5c33465c1ac0b Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Wed, 12 Mar 2014 00:20:27 +0400
Subject: [PATCH 2087/3789] hoauth2 and bytestring-show add pkgs

---
 .../haskell/bytestring-show/default.nix       | 14 ++++++++++++++
 .../libraries/haskell/hoauth2/default.nix     | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/bytestring-show/default.nix
 create mode 100644 pkgs/development/libraries/haskell/hoauth2/default.nix

diff --git a/pkgs/development/libraries/haskell/bytestring-show/default.nix b/pkgs/development/libraries/haskell/bytestring-show/default.nix
new file mode 100644
index 00000000000..b71b2a3ad83
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bytestring-show/default.nix
@@ -0,0 +1,14 @@
+{ cabal, binary }:
+
+cabal.mkDerivation (self: {
+  pname = "bytestring-show";
+  version = "0.3.5.5";
+  sha256 = "0vd8f3jrzi2s119rcn20k6srk6l7ypiars1mxw1n1jrjx8ill2y4";
+  buildDepends = [ binary ];
+  meta = {
+    homepage = "http://code.haskell.org/~dolio/";
+    description = "Efficient conversion of values into readable byte strings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hoauth2/default.nix b/pkgs/development/libraries/haskell/hoauth2/default.nix
new file mode 100644
index 00000000000..77e84842723
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hoauth2/default.nix
@@ -0,0 +1,19 @@
+{ cabal, aeson, bytestringShow, conduit, httpConduit, httpTypes
+, monadControl, mtl, random, resourcet, text, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hoauth2";
+  version = "0.3.6.1";
+  sha256 = "0nfh77fxyl8vbdnrrp28hsl1zhxhmg8mjn0gfvc2i3w5rd6j0lda";
+  buildDepends = [
+    aeson bytestringShow conduit httpConduit httpTypes monadControl mtl
+    random resourcet text transformers
+  ];
+  meta = {
+    homepage = "https://github.com/freizl/hoauth2";
+    description = "hoauth2";
+    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 bbf7658a842..1cac51fe612 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -699,6 +699,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   bytestringMmap = callPackage ../development/libraries/haskell/bytestring-mmap {};
 
+  bytestringShow = callPackage ../development/libraries/haskell/bytestring-show {};
+
   bytestringTrie = callPackage ../development/libraries/haskell/bytestring-trie {};
 
   bytestringProgress = callPackage ../development/libraries/haskell/bytestring-progress {};
@@ -1391,6 +1393,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hoauth = callPackage ../development/libraries/haskell/hoauth {};
 
+  hoauth2 = callPackage ../development/libraries/haskell/hoauth2 {};
+
   hoodle = callPackage ../applications/graphics/hoodle {};
 
   hoodleBuilder = callPackage ../development/libraries/haskell/hoodle-builder {};
-- 
GitLab


From 4a0d46438458c36c61651bdf31f178ea21236b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 11 Mar 2014 21:55:52 +0100
Subject: [PATCH 2088/3789] glib_networking: big update, cleanup, meta added

---
 .../libraries/glib-networking/default.nix     | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 53d447cf5ca..618b37bae4c 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -1,21 +1,33 @@
-{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls, libproxy
-, gsettings_desktop_schemas, libgcrypt, libtasn1 }:
+{ stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy
+, gsettings_desktop_schemas }:
 
-stdenv.mkDerivation {
-  name = "glib-networking-2.30.2";
+let
+  ver_maj = "2.38";
+  ver_min = "2";
+in
+stdenv.mkDerivation rec {
+  name = "glib-networking-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = mirror://gnome/sources/glib-networking/2.30/glib-networking-2.30.2.tar.xz;
-    sha256 = "1g2ran0rn37009fs3xl38m95i5w8sdf9ax0ady4jbjir15844xcz";
+    url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz";
+    sha256 = "1iwzjkx6q9gqr7fipc98zi2bi0gccrwq1v7skff1cdijkn8zxqp8";
   };
 
   configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
-  
+
   preBuild = ''
     sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
   '';
 
   nativeBuildInputs = [ pkgconfig intltool ];
-  propagatedBuildInputs =
-    [ glib libtool gnutls libproxy libgcrypt libtasn1 gsettings_desktop_schemas ];
+  propagatedBuildInputs = [ glib gnutls libproxy gsettings_desktop_schemas ];
+
+  doCheck = false; # tests need to access the certificates (among other things)
+
+  meta = with stdenv.lib; {
+    description = "Network-related giomodules for glib";
+    license = licenses.lgpl2Plus;
+    platforms = platforms.unix;
+  };
 }
+
-- 
GitLab


From 4c9bac5004382b83eaeb58879036a2b2927d80a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 11 Mar 2014 22:01:12 +0100
Subject: [PATCH 2089/3789] liferea: fix https URIs by adding glib_networking

---
 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 13859eb24ad..caf7da3cf3c 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, python, pygobject3
-, glib, gnome3, pango, libxml2, libxslt, sqlite, libsoup
+, glib, gnome3, pango, libxml2, libxslt, sqlite, libsoup, glib_networking
 , webkitgtk, json_glib, gobjectIntrospection, gst_all_1
 , libnotify
 , makeWrapper
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
         --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
         --prefix LD_LIBRARY_PATH : "${gnome3.libgnome_keyring}/lib" \
         --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-        --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \
+        --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking}/lib/gio/modules" \
         --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share"
     done
   '';
-- 
GitLab


From ef825eaca72a66c8e1f7be562938fbaefc8de874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 12 Mar 2014 07:10:38 +0100
Subject: [PATCH 2090/3789] libproxy: attempt to fix build on Darwin

It seems it won't compile with too old compilers.
---
 pkgs/top-level/all-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 953dd6a96c8..dca72290a11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5008,7 +5008,11 @@ let
 
   libpaper = callPackage ../development/libraries/libpaper { };
 
-  libproxy = callPackage ../development/libraries/libproxy { };
+  libproxy = callPackage ../development/libraries/libproxy {
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gcc
+      else stdenv;
+  };
 
   libpseudo = callPackage ../development/libraries/libpseudo { };
 
-- 
GitLab


From 773d886f5187be2129ea733ef359bd1da707b8a6 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 12 Mar 2014 08:27:05 +0100
Subject: [PATCH 2091/3789] libvirt: Clean up nix file, update meta

---
 .../development/libraries/libvirt/default.nix | 68 +++++++++++--------
 1 file changed, 39 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 1f7e41fe4be..d883f1da9ca 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -6,45 +6,55 @@
 
 let version = "1.2.2"; in
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "libvirt-${version}";
 
   src = fetchurl {
-    url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
+    url = "http://libvirt.org/sources/${name}.tar.gz";
     sha256 = "1hxvgh2fp2fk3wva7fnbz2pk6g5217wrmf9xwikiphn50zipg0x4";
   };
 
-  buildInputs =
-    [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2
-      utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper
-      libcap_ng
-    ];
-
-  preConfigure =
-    ''
-      PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:${dnsmasq}/bin:$PATH
-      patchShebangs . # fixes /usr/bin/python references
-    '';
-
-  configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-init-script=redhat --without-macvtap";
-
-  installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc";
-
-  postInstall =
-    ''
-      substituteInPlace $out/libexec/libvirt-guests.sh \
-        --replace "$out/bin" "${gettext}/bin"
-      wrapProgram $out/sbin/libvirtd \
-        --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin
-    '';
+  buildInputs = [
+    pkgconfig libxml2 gnutls devicemapper perl python readline lvm2
+    utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper
+    libcap_ng
+  ];
+
+  preConfigure = ''
+    PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:${dnsmasq}/bin:$PATH
+    patchShebangs . # fixes /usr/bin/python references
+  '';
+
+  configureFlags = [
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+    "--with-init-script=redhat"
+    "--without-macvtap"
+  ];
+
+  installFlags = [
+    "localstatedir=$(TMPDIR)/var"
+    "sysconfdir=$(out)/etc"
+  ];
+
+  postInstall = ''
+    substituteInPlace $out/libexec/libvirt-guests.sh \
+      --replace "$out/bin" "${gettext}/bin"
+    wrapProgram $out/sbin/libvirtd \
+      --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin
+  '';
 
   enableParallelBuilding = true;
+
   NIX_CFLAGS_COMPILE = "-fno-stack-protector";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libvirt.org/;
-    description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes)";
-    license = "LGPLv2+";
-    platforms = stdenv.lib.platforms.linux;
+    description = ''
+      A toolkit to interact with the virtualization capabilities of recent
+      versions of Linux (and other OSes)
+    '';
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From a2353866a82c4233bb79beda2019eda5e2fad03d Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Wed, 12 Mar 2014 03:32:56 -0400
Subject: [PATCH 2092/3789] UID/GID fix for kippo

---
 nixos/modules/misc/ids.nix                  | 2 ++
 nixos/modules/services/networking/kippo.nix | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index e50819d6d00..ad344dfbc11 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -116,6 +116,7 @@
       dictd = 105;
       couchdb = 106;
       searx = 107;
+      kippo = 108;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -210,6 +211,7 @@
       dictd = 105;
       couchdb = 106;
       searx = 107;
+      kippo = 108;
 
       # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix
index 76dd66013ba..164c38940f7 100644
--- a/nixos/modules/services/networking/kippo.nix
+++ b/nixos/modules/services/networking/kippo.nix
@@ -76,8 +76,9 @@ rec {
     users.extraUsers = singleton {
       name = "kippo";
       description = "kippo web server privilege separation user";
+      uid = 108; # why does config.ids.uids.kippo give an error?
     };
-    users.extraGroups = singleton { name = "kippo"; };
+    users.extraGroups = singleton { name = "kippo";gid=108; };
 
     systemd.services.kippo = with pkgs; {
       description = "Kippo Web Server";
-- 
GitLab


From a3bf4df6e439932b46569b130424e548fbf20cf1 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 12 Mar 2014 08:33:43 +0100
Subject: [PATCH 2093/3789] libvirt-python: Update from 1.2.0 to 1.2.2

---
 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 79d32e93d2b..fae34f3747a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8612,11 +8612,11 @@ rec {
 
   libvirt = pkgs.stdenv.mkDerivation rec {
     name = "libvirt-python-${version}";
-    version = "1.2.0";
+    version = "1.2.2";
 
     src = fetchurl {
       url = "http://libvirt.org/sources/python/${name}.tar.gz";
-      sha256 = "0azml1yv9iqnpj4sdg1wwsa70q7kb06lv85p63qwyd8vrd0y7rrg";
+      sha256 = "0fccpyppz79kbbnzwdgsiza3cxq7jlnnp1dqi33gc4305dk9vmwl";
     };
 
     buildInputs = [ python pkgs.pkgconfig pkgs.libvirt lxml ];
@@ -8628,7 +8628,7 @@ rec {
     meta = {
       homepage = http://www.libvirt.org/;
       description = "libvirt Python bindings";
-      license = "LGPLv2";
+      license = pkgs.lib.license.lgpl2;
     };
   };
 
-- 
GitLab


From 28069d6aadf081520399d624d350ee1c22a132b2 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Wed, 12 Mar 2014 09:20:49 +0100
Subject: [PATCH 2094/3789] move windowManager.xbmc to desktopManager.xbmc

---
 nixos/modules/rename.nix                      |  1 +
 .../services/x11/desktop-managers/default.nix |  2 +-
 .../services/x11/desktop-managers/xbmc.nix    | 31 +++++++++++++++++++
 .../services/x11/window-managers/default.nix  |  1 -
 .../services/x11/window-managers/xbmc.nix     | 31 -------------------
 5 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 nixos/modules/services/x11/desktop-managers/xbmc.nix
 delete mode 100644 nixos/modules/services/x11/window-managers/xbmc.nix

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index a26f930eda1..72093aab5cd 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" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "xbmc" ]
 
 # KDE
 ++ deprecated [ "kde" "extraPackages" ] [ "environment" "kdePackages" ]
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index dde5b333f32..753babf6a22 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -17,7 +17,7 @@ in
   # Note: the order in which desktop manager modules are imported here
   # determines the default: later modules (if enabled) are preferred.
   # E.g., if KDE is enabled, it supersedes xterm.
-  imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ./gnome3.nix ];
+  imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ./gnome3.nix ./xbmc.nix ];
 
   options = {
 
diff --git a/nixos/modules/services/x11/desktop-managers/xbmc.nix b/nixos/modules/services/x11/desktop-managers/xbmc.nix
new file mode 100644
index 00000000000..51278c5fadb
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/xbmc.nix
@@ -0,0 +1,31 @@
+{ pkgs, config, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.xserver.desktopManager.xbmc;
+in
+
+{
+  options = {
+    services.xserver.desktopManager.xbmc = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the xbmc multimedia center.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.desktopManager.session = [{
+      name = "xbmc";
+      start = ''
+        ${pkgs.xbmc}/bin/xbmc --lircdev /var/run/lirc/lircd --standalone &
+        waitPID=$!
+      '';
+    }];
+    
+    environment.systemPackages = [ pkgs.xbmc ];
+  };
+}
\ No newline at end of file
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index 4d52e398b47..1c10333462c 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -16,7 +16,6 @@ in
       ./wmii.nix
       ./xmonad.nix
       ./i3.nix
-      ./xbmc.nix
       ./herbstluftwm.nix
     ];
 
diff --git a/nixos/modules/services/x11/window-managers/xbmc.nix b/nixos/modules/services/x11/window-managers/xbmc.nix
deleted file mode 100644
index 46494202b40..00000000000
--- a/nixos/modules/services/x11/window-managers/xbmc.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{pkgs, config, ...}:
-
-let
-  inherit (pkgs.lib) mkOption mkIf;
-  cfg = config.services.xserver.windowManager.xbmc;
-in
-
-{
-  options = {
-    services.xserver.windowManager.xbmc = {
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable the xbmc multimedia center.";
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    services.xserver.windowManager = {
-      session = [{
-        name = "xbmc";
-        start = "
-          ${pkgs.xbmc}/bin/xbmc --lircdev /var/run/lirc/lircd --standalone &
-          waitPID=$!
-        ";
-      }];
-    };
-    environment.systemPackages = [ pkgs.xbmc ];
-  };
-}
-- 
GitLab


From 562a8ca4a287fb88476496d663864f0746f34d2f Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 11 Mar 2014 23:46:57 +0100
Subject: [PATCH 2095/3789] Add phpfpm NixOS service module

---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/web-servers/phpfpm.nix | 77 +++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 nixos/modules/services/web-servers/phpfpm.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3a5eee1e3c6..d67d7d040dc 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -228,6 +228,7 @@
   ./services/web-servers/lighttpd/cgit.nix
   ./services/web-servers/lighttpd/gitweb.nix
   ./services/web-servers/nginx/default.nix
+  ./services/web-servers/phpfpm.nix
   ./services/web-servers/tomcat.nix
   ./services/web-servers/varnish/default.nix
   ./services/web-servers/zope2.nix
diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix
new file mode 100644
index 00000000000..9be8390fb6a
--- /dev/null
+++ b/nixos/modules/services/web-servers/phpfpm.nix
@@ -0,0 +1,77 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.phpfpm;
+
+  stateDir = "/run/phpfpm";
+
+  pidFile = "${stateDir}/phpfpm.pid";
+
+  cfgFile = pkgs.writeText "phpfpm.conf" ''
+    [global]
+    pid = ${pidFile}
+    error_log = syslog
+    daemonize = yes
+    ${cfg.extraConfig}
+
+    ${concatStringsSep "\n" (mapAttrsToList (n: v: "[${n}]\n${v}") cfg.poolConfigs)}
+  '';
+
+in {
+
+  options = {
+    services.phpfpm = {
+      extraConfig = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          Extra configuration that should be put in the global section of
+          the PHP FPM configuration file. Do not specify the options
+          <literal>pid</literal>, <literal>error_log</literal> or
+          <literal>daemonize</literal> here, since they are generated by
+          NixOS.
+        '';
+      };
+
+      poolConfigs = mkOption {
+        type = types.attrsOf types.str;
+        default = {};
+        example = {
+          mypool = ''
+            listen = /run/phpfpm/mypool
+            user = nobody
+            pm = dynamic
+            pm.max_children = 75
+            pm.start_servers = 10
+            pm.min_spare_servers = 5
+            pm.max_spare_servers = 20
+            pm.max_requests = 500
+          '';
+        };
+        description = ''
+          A mapping between PHP FPM pool names and their configurations.
+          See the documentation on <literal>php-fpm.conf</literal> for
+          details on configuration directives. If no pools are defined,
+          the phpfpm service is disabled.
+        '';
+      };
+    };
+  };
+
+  config = mkIf (cfg.poolConfigs != {}) {
+
+    systemd.services.phpfpm = {
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        mkdir -p "${stateDir}"
+      '';
+      serviceConfig = {
+        ExecStart = "${pkgs.php54}/sbin/php-fpm -y ${cfgFile}";
+        PIDFile = pidFile;
+      };
+    };
+
+  };
+}
-- 
GitLab


From 4e2357313811f486a5c61aafeab5718e3c04f24b Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 12 Mar 2014 11:45:31 +0100
Subject: [PATCH 2096/3789] phpfpm module: Make extraConfig and poolConfigs
 mergeable by switching option type to types.lines

---
 nixos/modules/services/web-servers/phpfpm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix
index 9be8390fb6a..76ec4124462 100644
--- a/nixos/modules/services/web-servers/phpfpm.nix
+++ b/nixos/modules/services/web-servers/phpfpm.nix
@@ -24,7 +24,7 @@ in {
   options = {
     services.phpfpm = {
       extraConfig = mkOption {
-        type = types.str;
+        type = types.lines;
         default = "";
         description = ''
           Extra configuration that should be put in the global section of
@@ -36,7 +36,7 @@ in {
       };
 
       poolConfigs = mkOption {
-        type = types.attrsOf types.str;
+        type = types.attrsOf types.lines;
         default = {};
         example = {
           mypool = ''
-- 
GitLab


From 37e74d8cc048b960e22c194e318ee141a4192a41 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, 12 Mar 2014 18:54:50 +0800
Subject: [PATCH 2097/3789] noweb: some fixes

install libs to $out/lib/noweb
don't sed on binaries, eg markup
---
 .../tools/literate-programming/noweb/default.nix            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix
index c173010928d..291bc29e1b7 100644
--- a/pkgs/development/tools/literate-programming/noweb/default.nix
+++ b/pkgs/development/tools/literate-programming/noweb/default.nix
@@ -9,13 +9,15 @@ stdenv.mkDerivation {
     sha256 = "10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9";
   };
   preBuild = ''
+    ensureDir $out/lib/noweb
     cd src
-    makeFlags="BIN=$out/bin LIB=$out/lib MAN=$out/share/man TEXINPUTS=$out/share/texmf/tex/latex"
+    makeFlags="BIN=$out/bin LIB=$out/lib/noweb MAN=$out/share/man TEXINPUTS=$out/share/texmf/tex/latex"
   '';
   preInstall=''mkdir -p $out/share/texmf/tex/latex'';
   postInstall= ''
     substituteInPlace $out/bin/cpif --replace "PATH=/bin:/usr/bin" ""
-    for f in $out/bin/{noweb,nountangle,noroots,noroff,noindex} $out/lib/*; do
+    for f in $out/bin/{noweb,nountangle,noroots,noroff,noindex} \
+             $out/lib/noweb/{toroff,btdefn,totex,pipedoc,noidx,unmarkup,toascii,tohtml,emptydefn}; do
       substituteInPlace $f --replace "nawk" "${gawk}/bin/awk"
     done
   '';
-- 
GitLab


From 2cb2be81619971c3ac9a9c5b2c76a5d15a54f60c Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 12 Mar 2014 12:04:38 +0100
Subject: [PATCH 2098/3789] titaniumsdk: Bump version to 3.2.2

---
 pkgs/development/mobile/titaniumenv/default.nix    |  2 +-
 .../mobile/titaniumenv/examples/default.nix        |  2 +-
 .../mobile/titaniumenv/titaniumsdk-3.2.nix         | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index 6c80cdae3e2..18b76bc3bbd 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -29,7 +29,7 @@ rec {
   
   titaniumsdk = let
     titaniumSdkFile = if tiVersion == "3.1.4.GA" then ./titaniumsdk-3.1.nix
-      else if tiVersion == "3.2.1.GA" then ./titaniumsdk-3.2.nix
+      else if tiVersion == "3.2.2.GA" then ./titaniumsdk-3.2.nix
       else throw "Titanium version not supported: "+tiVersion;
     in
     import titaniumSdkFile {
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index c9f32f8bb6b..b81fcd41bcb 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -1,7 +1,7 @@
 { nixpkgs ? <nixpkgs>
 , systems ? [ "x86_64-linux" "x86_64-darwin" ]
 , xcodeVersion ? "5.0"
-, tiVersion ? "3.2.1.GA"
+, tiVersion ? "3.2.2.GA"
 , rename ? false
 , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? ""
 }:
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
index 96428f4a99b..1f0d53e99fe 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
 
 stdenv.mkDerivation {
-  name = "mobilesdk-3.2.1.v20140206170116";
+  name = "mobilesdk-3.2.2.v20140305122111";
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
-    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_2_X/mobilesdk-3.2.1.v20140206170116-linux.zip;
-    sha1 = "89955d31d48875aca64dd0131baac5ed82abcfc9";
+    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_2_X/mobilesdk-3.2.2.v20140305122111-linux.zip;
+    sha1 = "12dc1bfe8dd73db0650a235492f5f50c7b816d69";
   }
   else if stdenv.system == "x86_64-darwin" then fetchurl {
-    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_2_X/mobilesdk-3.2.1.v20140206170116-osx.zip;
-    sha1 = "06d9338c619b787be83baf3c0d93748b0e430182";
+    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_2_X/mobilesdk-3.2.2.v20140305122111-osx.zip;
+    sha1 = "9875b59faf0ab92e8996b58476466405ed60f6e2";
   }
   else throw "Platform: ${stdenv.system} not supported!";
   
@@ -28,8 +28,8 @@ stdenv.mkDerivation {
    
     # Rename ugly version number
     cd mobilesdk/*
-    mv 3.2.1.v20140206170116 3.2.1.GA
-    cd 3.2.1.GA
+    mv 3.2.2.v20140305122111 3.2.2.GA
+    cd 3.2.2.GA
     
     # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
     # Yes, I know it's nasty :-)
-- 
GitLab


From 3339f1e1f4ee09da7ab4e51728da33ed73346bdb 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:14:00 +0100
Subject: [PATCH 2099/3789] thrift: add meta.platforms, small cleanup

I set platforms to 'linux' because that's the only thing I have tested.
---
 pkgs/development/libraries/thrift/default.nix | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix
index 2b555db3282..0153cfa62ac 100644
--- a/pkgs/development/libraries/thrift/default.nix
+++ b/pkgs/development/libraries/thrift/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchgit, boost, zlib, libevent, openssl, python, automake, autoconf,
-libtool, pkgconfig, bison, flex }:
+{ stdenv, fetchgit, boost, zlib, libevent, openssl, python, automake, autoconf
+, libtool, pkgconfig, bison, flex
+}:
 
 stdenv.mkDerivation {
   name = "thrift-0.9.1";
@@ -13,14 +14,19 @@ stdenv.mkDerivation {
   };
 
   enableParallelBuilding = true;
-  buildInputs = [ boost zlib libevent openssl python automake autoconf libtool
-      pkgconfig bison flex ];
+
+  buildInputs = [
+    boost zlib libevent openssl python automake autoconf libtool pkgconfig
+    bison flex
+  ];
 
   preConfigure = "sh bootstrap.sh; export PY_PREFIX=$out";
 
-  meta = {
-    homepage = http://thrift.apache.org/;
-    license = "ASL2.0";
+  meta = with stdenv.lib; {
     description = "Library for scalable cross-language services";
+    homepage = http://thrift.apache.org/;
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
   };
 }
-- 
GitLab


From 844d246d2dd0b148d5a6c6fc8cb6a0b77b190a62 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 2100/3789] Unbreak channel (fix license attribute in
 python-packages.nix)

---
 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;
     };
   };
 
-- 
GitLab


From 4640a6b9db6dbe934df65fc204ad9e18cda403d9 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 11 Mar 2014 19:41:50 +0100
Subject: [PATCH 2101/3789] flashplayer: Update from 11.2.202.341 ->
 11.2.202.346

---
 .../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 8317f94e079..5bf0d0785a3 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.341";
+  version = "11.2.202.346";
 
   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 = "0d1ic70awdig0v699svmq8mmnil8xmmwsap30sgi0r94saxmq49j";
+        sha256 = "19jgiw5f0ksxqgi6jkla4qq7gx9gnn9jmpjgqanb7mhl5fdl0v55";
       }
     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 = "0bfz1id4035jnkwy4xm0dj8l9lygrrzqdbf8dgc9pcy8c63d1hac";
+        sha256 = "01f4zady0r0n5rfqq2285svc13wiypmfrm8fnirmr5lpwl5d89ra";
       }
     else throw "Flash Player is not supported on this platform";
 
-- 
GitLab


From 635cb24bb1c009d86a0a4d86263d2266a0f3a6e0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 10 Mar 2014 11:03:55 -0500
Subject: [PATCH 2102/3789] notbit: Add Package

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

diff --git a/pkgs/applications/networking/notbit/default.nix b/pkgs/applications/networking/notbit/default.nix
new file mode 100644
index 00000000000..db900f9ff25
--- /dev/null
+++ b/pkgs/applications/networking/notbit/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit, autoconf, automake, pkgconfig, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "notbit-0.2-28-g06f9160";
+
+  src = fetchgit {
+    url = "git://git.busydoingnothing.co.uk/notbit";
+    rev = "06f916081836de12f8e57a9f50c95d4d1b51627f";
+    sha256 = "d5c38eea1d9ca213bfbea5c88350478a5088b5532e939de9680d72e60aa65288";
+  };
+
+  buildInputs = [ autoconf automake pkgconfig openssl ];
+
+  preConfigure = "autoreconf -vfi";
+
+  meta = with stdenv.lib; { 
+    homepage = http://busydoingnothing.co.uk/notbit/;
+    description = "A minimal bitmessage client";
+    license = licenses.mit;
+
+    # This is planned to change when the project officially supports other platforms
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 953dd6a96c8..f024cf44249 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1521,6 +1521,8 @@ let
     inherit (pythonPackages) pysqlite;
   };
 
+  notbit = callPackage ../applications/networking/notbit { };
+
   nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {};
 
   ntfs3g = callPackage ../tools/filesystems/ntfs-3g { };
-- 
GitLab


From 03c6c1608bfd2488ab82346c8f656fe1b9abdf93 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Wed, 12 Mar 2014 17:48:04 +0100
Subject: [PATCH 2103/3789] add pythonPackages.dropbox

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f408b317091..5feec7c6255 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1504,6 +1504,49 @@ rec {
       platforms = stdenv.lib.platforms.all;
     };
   };
+  
+  urllib3 = buildPythonPackage rec {
+    name = "urllib3-1.8";
+
+    src = fetchurl {
+      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
+    '';
+
+    buildInputs = [ coverage tornado mock nose ];
+
+    meta = with stdenv.lib; {
+      description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs";
+      homepage = https://www.dropbox.com/developers/core/docs;
+      license = licenses.mit;
+    };
+  };
+
+  
+  dropbox = buildPythonPackage rec {
+    name = "dropbox-2.0.0";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/d/dropbox/${name}.zip";
+      sha256 = "1bi2z1lql6ryylfflmizhqn98ab55777vn7n5krhqz40pdcjilkx";
+    };
+
+    propagatedBuildInputs = [ urllib3 mock setuptools ];
+
+    meta = with stdenv.lib; {
+      description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs";
+      homepage = https://www.dropbox.com/developers/core/docs;
+      license = licenses.mit;
+    };
+  };
 
 
   evdev = buildPythonPackage rec {
-- 
GitLab


From b805528552ab1fd734b7c0ec997001de1ca370a6 Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Wed, 12 Mar 2014 17:48:32 +0100
Subject: [PATCH 2104/3789] silver-searcher: avoid -lgcc_s on darwin

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

diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index e8a1ee96505..d5d022c8063 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "b6993e077f650eb0976cbc924640665fa9b2499a899ecba5a6cad5cf9addfdff";
   };
 
-  NIX_LDFLAGS = "-lgcc_s";
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
   buildInputs = [ autoreconfHook pkgconfig pcre zlib lzma ];
 
-- 
GitLab


From 3358906395d2692dcda515418d6300ebed29a690 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Mar 2014 17:53:41 +0100
Subject: [PATCH 2105/3789] apcupsd: Description -> description

---
 nixos/modules/services/monitoring/apcupsd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix
index 58ec8a49694..38fd53653d6 100644
--- a/nixos/modules/services/monitoring/apcupsd.nix
+++ b/nixos/modules/services/monitoring/apcupsd.nix
@@ -168,11 +168,11 @@ in
     # shuts off power.) Copied from here:
     # http://forums.opensuse.org/english/get-technical-help-here/applications/479499-apcupsd-systemd-killpower-issues.html
     systemd.services.apcupsd-killpower = {
+      description = "APC UPS Kill Power";
       after = [ "shutdown.target" ]; # append umount.target?
       before = [ "final.target" ];
       wantedBy = [ "shutdown.target" ];
       unitConfig = {
-        Description = "APC UPS Kill Power";
         ConditionPathExists = "/run/apcupsd/powerfail";
         DefaultDependencies = "no";
       };
-- 
GitLab


From 691c0cd72e96cc6c75b46112c287b07bd571df26 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Mar 2014 18:20:57 +0100
Subject: [PATCH 2106/3789] systemd: Allow customisation of upstream units

You can now say:

  systemd.services.foo.baseUnit = "${pkgs.foo}/.../foo.service";

This will cause NixOS' generated foo.service file to include
foo.service from the foo package.  You can then apply local
customization in the usual way:

  systemd.services.foo.serviceConfig.MemoryLimit = "512M";

Note however that overriding options in the original unit may not
work.  For instance, you cannot override ExecStart.

It's also possible to customize instances of template units:

  systemd.services."getty@tty4" =
    { baseUnit = "/etc/systemd/system/getty@.service";
      serviceConfig.MemoryLimit = "512M";
    };

This replaces the unit options linkTarget (which didn't allow
customisation) and extraConfig (which did allow customisation, but in
a non-standard way).
---
 .../system/boot/systemd-unit-options.nix      |  6 ++
 nixos/modules/system/boot/systemd.nix         | 61 +++++--------------
 2 files changed, 22 insertions(+), 45 deletions(-)

diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index c0518599f17..4163696c53d 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -41,6 +41,12 @@ 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 2d1bb5ae980..7bff08d50d9 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -12,18 +12,12 @@ let
 
   makeUnit = name: unit:
     pkgs.runCommand "unit" { preferLocalBuild = true; inherit (unit) text; }
-      ((if !unit.enable then  ''
+      (if !unit.enable then  ''
         mkdir -p $out
         ln -s /dev/null $out/${name}
-      '' else if unit.linkTarget != null then ''
-        mkdir -p $out
-        ln -s ${unit.linkTarget} $out/${name}
-      '' else if unit.text != null then ''
+      '' else ''
         mkdir -p $out
         echo -n "$text" > $out/${name}
-      '' else "") + optionalString (unit.extraConfig != {}) ''
-        mkdir -p $out/${name}.d
-        ${concatStringsSep "\n" (mapAttrsToList (n: v: "echo -n \"${v}\" > $out/${name}.d/${n}") unit.extraConfig)}
       '');
 
   upstreamUnits =
@@ -158,7 +152,7 @@ let
           BindsTo = concatStringsSep " " config.bindsTo;
           PartOf = concatStringsSep " " config.partOf;
           Conflicts = concatStringsSep " " config.conflicts;
-          "X-Restart-Triggers" = toString config.restartTriggers;
+          X-Restart-Triggers = toString config.restartTriggers;
         } // optionalAttrs (config.description != "") {
           Description = config.description;
         };
@@ -244,6 +238,14 @@ let
         (if isList value then value else [value]))
         as));
 
+  commonUnitText = def:
+    optionalString (def.baseUnit != null) ''
+      .include ${def.baseUnit}
+    '' + ''
+      [Unit]
+      ${attrsToSection def.unitConfig}
+    '';
+
   targetToUnit = name: def:
     { inherit (def) wantedBy requiredBy enable;
       text =
@@ -255,11 +257,8 @@ let
 
   serviceToUnit = name: def:
     { inherit (def) wantedBy requiredBy enable;
-      text =
+      text = commonUnitText def +
         ''
-          [Unit]
-          ${attrsToSection def.unitConfig}
-
           [Service]
           ${let env = cfg.globalEnvironment // def.environment;
             in concatMapStrings (n: "Environment=\"${n}=${getAttr n env}\"\n") (attrNames env)}
@@ -271,11 +270,8 @@ let
 
   socketToUnit = name: def:
     { inherit (def) wantedBy requiredBy enable;
-      text =
+      text = commonUnitText def +
         ''
-          [Unit]
-          ${attrsToSection def.unitConfig}
-
           [Socket]
           ${attrsToSection def.socketConfig}
           ${concatStringsSep "\n" (map (s: "ListenStream=${s}") def.listenStreams)}
@@ -284,11 +280,8 @@ let
 
   timerToUnit = name: def:
     { inherit (def) wantedBy requiredBy enable;
-      text =
+      text = commonUnitText def +
         ''
-          [Unit]
-          ${attrsToSection def.unitConfig}
-
           [Timer]
           ${attrsToSection def.timerConfig}
         '';
@@ -296,11 +289,8 @@ let
 
   mountToUnit = name: def:
     { inherit (def) wantedBy requiredBy enable;
-      text =
+      text = commonUnitText def +
         ''
-          [Unit]
-          ${attrsToSection def.unitConfig}
-
           [Mount]
           ${attrsToSection def.mountConfig}
         '';
@@ -308,11 +298,8 @@ let
 
   automountToUnit = name: def:
     { inherit (def) wantedBy requiredBy enable;
-      text =
+      text = commonUnitText def +
         ''
-          [Unit]
-          ${attrsToSection def.unitConfig}
-
           [Automount]
           ${attrsToSection def.automountConfig}
         '';
@@ -423,22 +410,6 @@ in
               internal = true;
               description = "The generated unit.";
             };
-            linkTarget = mkOption {
-              default = null;
-              description = "The file to symlink this target to.";
-              type = types.nullOr types.path;
-            };
-            extraConfig = mkOption {
-              default = {};
-              example = { "foo@1.conf" = "X-RestartIfChanged=false"; };
-              type = types.attrsOf types.lines;
-              description = ''
-                Extra files to be appended to the configuration for the unit.
-                This can be used to override configuration for a unit provided
-                by systemd or another package, or to override only a single instance
-                of a template unit.
-              '';
-            };
           };
           config = {
             unit = makeUnit name config;
-- 
GitLab


From d4122456016accdc2137c383bf7b40e6c016dd19 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Mar 2014 18:29:06 +0100
Subject: [PATCH 2107/3789] getty@ and autovt@: Use the upstream units

---
 nixos/modules/services/ttys/agetty.nix | 95 ++++++--------------------
 nixos/modules/services/ttys/kmscon.nix |  2 +-
 2 files changed, 20 insertions(+), 77 deletions(-)

diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index 211008fa7e4..ca4fbeb0add 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -48,82 +48,25 @@ with pkgs.lib;
 
   config = {
 
-    # FIXME: these are mostly copy/pasted from the systemd sources,
-    # which some small modifications, which is annoying.
-
-    # Generate a separate job for each tty.
-    systemd.units."getty@.service".text =
-      ''
-        [Unit]
-        Description=Getty on %I
-        Documentation=man:agetty(8)
-        After=systemd-user-sessions.service plymouth-quit-wait.service
-
-        # If additional gettys are spawned during boot then we should make
-        # sure that this is synchronized before getty.target, even though
-        # getty.target didn't actually pull it in.
-        Before=getty.target
-        IgnoreOnIsolate=yes
-
-        ConditionPathExists=/dev/tty0
-
-        [Service]
-        Environment=TERM=linux
-        Environment=LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
-        ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login %I 38400
-        Type=idle
-        Restart=always
-        RestartSec=0
-        UtmpIdentifier=%I
-        TTYPath=/dev/%I
-        TTYReset=yes
-        TTYVHangup=yes
-        TTYVTDisallocate=yes # set to no to prevent clearing the screen
-        KillMode=process
-        IgnoreSIGPIPE=no
-
-        # Some login implementations ignore SIGTERM, so we send SIGHUP
-        # instead, to ensure that login terminates cleanly.
-        KillSignal=SIGHUP
-
-        X-RestartIfChanged=false
-      '';
-    
-    systemd.units."serial-getty@.service".text = let
-        speeds = with pkgs.lib; concatStringsSep "," (map toString config.services.mingetty.serialSpeed);
-      in ''
-        [Unit]
-        Description=Serial Getty on %I
-        Documentation=man:agetty(8) man:systemd-getty-generator(8)
-        BindsTo=dev-%i.device
-        After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
-
-        # If additional gettys are spawned during boot then we should make
-        # sure that this is synchronized before getty.target, even though
-        # getty.target didn't actually pull it in.
-        Before=getty.target
-        IgnoreOnIsolate=yes
-
-        [Service]
-        Environment=TERM=linux
-        Environment=LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
-        ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login %I ${speeds}
-        Type=idle
-        Restart=always
-        RestartSec=0
-        UtmpIdentifier=%I
-        TTYPath=/dev/%I
-        TTYReset=yes
-        TTYVHangup=yes
-        KillMode=process
-        IgnoreSIGPIPE=no
-
-        # Some login implementations ignore SIGTERM, so we send SIGHUP
-        # instead, to ensure that login terminates cleanly.
-        KillSignal=SIGHUP
-        
-        X-RestartIfChanged=false
-      '';
+    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";
+        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
+          '';
+        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}";
+        restartIfChanged = false;
+      };
 
     environment.etc = singleton
       { # Friendly greeting on the virtual consoles.
diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index eb68a3d95d8..1857c69b76b 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixos/modules/services/ttys/kmscon.nix
@@ -62,7 +62,7 @@ in {
       X-RestartIfChanged=false
     '';
 
-    systemd.units."autovt@.service".linkTarget = "${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service";
+    systemd.units."autovt@.service".baseUnit = "${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service";
 
     systemd.services."systemd-vconsole-setup".restartIfChanged = false;
 
-- 
GitLab


From 207c881df9a8786323516908ca21885aa7f6138a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Mar 2014 18:35:50 +0100
Subject: [PATCH 2108/3789] Don't include superfluous lines in generated units

---
 .../system/boot/systemd-unit-options.nix      |  1 +
 nixos/modules/system/boot/systemd.nix         | 26 ++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 4163696c53d..113990814ef 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -141,6 +141,7 @@ in rec {
 
     restartTriggers = mkOption {
       default = [];
+      type = types.listOf types.unspecified;
       description = ''
         An arbitrary list of items such as derivations.  If any item
         in the list changes between reconfigurations, the service will
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 7bff08d50d9..e9d25479378 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -145,15 +145,23 @@ let
   unitConfig = { name, config, ... }: {
     config = {
       unitConfig =
-        { Requires = concatStringsSep " " config.requires;
-          Wants = concatStringsSep " " config.wants;
-          After = concatStringsSep " " config.after;
-          Before = concatStringsSep " " config.before;
-          BindsTo = concatStringsSep " " config.bindsTo;
-          PartOf = concatStringsSep " " config.partOf;
-          Conflicts = concatStringsSep " " config.conflicts;
-          X-Restart-Triggers = toString config.restartTriggers;
-        } // optionalAttrs (config.description != "") {
+        optionalAttrs (config.requires != [])
+          { Requires = toString config.requires; }
+        // optionalAttrs (config.wants != [])
+          { Wants = toString config.wants; }
+        // optionalAttrs (config.after != [])
+          { After = toString config.after; }
+        // optionalAttrs (config.before != [])
+          { Before = toString config.before; }
+        // optionalAttrs (config.bindsTo != [])
+          { BindsTo = toString config.bindsTo; }
+        // optionalAttrs (config.partOf != [])
+          { PartOf = toString config.partOf; }
+        // optionalAttrs (config.conflicts != [])
+          { Conflicts = toString config.conflicts; }
+        // optionalAttrs (config.restartTriggers != [])
+          { X-Restart-Triggers = toString config.restartTriggers; }
+        // optionalAttrs (config.description != "") {
           Description = config.description;
         };
     };
-- 
GitLab


From f198c4060806706203420c6951b136a42a44d750 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Mar 2014 18:40:28 +0100
Subject: [PATCH 2109/3789] Don't depend on the text of disabled units

This prevents pulling in unnecessary dependencies.
---
 nixos/modules/system/boot/systemd.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index e9d25479378..3b4e06e3ad6 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -11,14 +11,18 @@ let
   systemd = cfg.package;
 
   makeUnit = name: unit:
-    pkgs.runCommand "unit" { preferLocalBuild = true; inherit (unit) text; }
-      (if !unit.enable then  ''
-        mkdir -p $out
-        ln -s /dev/null $out/${name}
-      '' else ''
-        mkdir -p $out
-        echo -n "$text" > $out/${name}
-      '');
+    if unit.enable then
+      pkgs.runCommand "unit" { preferLocalBuild = true; inherit (unit) text; }
+        ''
+          mkdir -p $out
+          echo -n "$text" > $out/${name}
+        ''
+    else
+      pkgs.runCommand "unit" { preferLocalBuild = true; }
+        ''
+          mkdir -p $out
+          ln -s /dev/null $out/${name}
+        '';
 
   upstreamUnits =
     [ # Targets.
-- 
GitLab


From 09c14cd8aa7df29d5c752f650710b0928fce0317 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Mar 2014 18:51:44 +0100
Subject: [PATCH 2110/3789] switch-to-configuration: Don't try to start masked
 units

---
 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 cb5b49692fe..e0649448c83 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -128,7 +128,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
     $baseName =~ s/\.[a-z]*$//;
 
     if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) {
-        if (! -e $newUnitFile) {
+        if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") {
             push @unitsToStop, $unit;
         }
 
-- 
GitLab


From b13a5d4ccae1b38a1ba1c1a846d7528ba1227ec2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Mar 2014 21:00:59 +0100
Subject: [PATCH 2111/3789] Fix kmscon evaluation

---
 nixos/modules/services/ttys/kmscon.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index 1857c69b76b..4bbc4259327 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixos/modules/services/ttys/kmscon.nix
@@ -44,6 +44,7 @@ in {
       After=systemd-user-sessions.service
       After=plymouth-quit-wait.service
       After=systemd-logind.service
+      After=systemd-vconsole-setup.service
       Requires=systemd-logind.service
       Before=getty.target
       Conflicts=getty@%i.service
@@ -62,11 +63,9 @@ in {
       X-RestartIfChanged=false
     '';
 
-    systemd.units."autovt@.service".baseUnit = "${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service";
+    systemd.services."autovt@".baseUnit = "${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service";
 
-    systemd.services."systemd-vconsole-setup".restartIfChanged = false;
-
-    systemd.units."kmsconvt@tty1.service".extraConfig.wait-for-vconsole-setup = "After=systemd-vconsole-setup.service";
+    systemd.services.systemd-vconsole-setup.restartIfChanged = false;
 
     services.kmscon.extraConfig = mkIf cfg.hwRender ''
       drm
-- 
GitLab


From 059e8e179bb03e7a315ddd6400c59d36163eaca7 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Wed, 12 Mar 2014 21:20:01 +0100
Subject: [PATCH 2112/3789] set all licenses to be attributes (and wait for Nix
 1.7)

---
 lib/licenses.nix                              | 38 +++++++++++++------
 .../desktops/gnome-3/core/empathy/default.nix |  2 +-
 .../gnome-3/core/libgnome-keyring/default.nix |  2 +-
 .../gnome-3/core/yelp-xsl/default.nix         |  2 +-
 .../development/libraries/pangomm/default.nix |  2 +-
 pkgs/development/tools/misc/lttv/default.nix  |  2 +-
 pkgs/os-specific/darwin/otool/default.nix     |  2 +-
 .../linux/lttng-modules/default.nix           |  4 +-
 pkgs/tools/networking/haproxy/default.nix     |  4 +-
 .../networking/p2p/tahoe-lafs/default.nix     |  2 +-
 10 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index cda43583279..d82402cd3af 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -25,12 +25,14 @@
   amd = {
     shortName = "amd";
     fullName = "AMD License Agreement";
-    url = "http://developer.amd.com/amd-license-agreement/";
-  };
+    url = http://developer.amd.com/amd-license-agreement/;
+  };#
 
-  # Apple Public Source License 2.0;
-  # http://opensource.org/licenses/APSL-2.0
-  apsl20 = "APSL 2.0";
+  apsl20 = {
+    shortName = "APSL 2.0";
+    fullName = "Apple Public Source License 2.0";
+    url = http://opensource.org/licenses/APSL-2.0;
+  };
 
   asl20 = {
     shortName = "ASL2.0";
@@ -80,7 +82,11 @@
     url = http://www.eclipse.org/legal/epl-v10.html;
   };
 
-  gpl2 = "GPLv2";
+  gpl2 = {
+    shortName = "GPLv2";
+    fullName = "GNU General Public License version 2";
+    url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html;
+  };
 
   gpl2Oss = {
     shortName = "GPLv2+OSS";
@@ -88,9 +94,11 @@
     url = http://www.mysql.com/about/legal/licensing/foss-exception;
   };
 
-  # GNU General Public License version 2 or later;
-  # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-  gpl2Plus = "GPLv2+";
+  gpl2Plus = {
+    shortName = "GPLv2+";
+    fullName = "GNU General Public License version 2 or later";
+    url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html;
+  };
 
   gpl3 = {
     shortName = "GPLv3";
@@ -134,7 +142,11 @@
     url = https://fedoraproject.org/wiki/Licensing/libtiff;
   };
 
-  lgpl2 = "LGPLv2";
+  lgpl2 = {
+    shortName = "LGPLv2";
+    fullName = "GNU Library General Public License version 2";
+    url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html;
+  };
 
   lgpl2Plus = {
     shortName = "LGPLv2+";
@@ -142,7 +154,11 @@
     url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html;
   };
 
-  lgpl21 = "LGPLv2.1";
+  lgpl21 = {
+    shortName = "LGPLv2.1";
+    fullName = "GNU Lesser General Public License version 2.1";
+    url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html;
+  };
 
   lgpl21Plus = {
     shortName = "LGPLv2.1+";
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 1e0c94d0c7f..1f7a027fd3e 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     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 ];
-    license = [ licenses.gpl2 licenses.lgpl2 ];
+    # TODO: license = [ licenses.gpl2 licenses.lgpl2 ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
index ed37f013e16..28c7b80c0d4 100644
--- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Framework for managing passwords and other secrets";
     homepage = http://live.gnome.org/GnomeKeyring;
-    license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
+    # TODO license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
     inherit (glib.meta) platforms maintainers;
 
     longDescription = ''
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index 708a8ff32d6..c5060bdba75 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     homepage = https://wiki.gnome.org/Apps/Yelp;
     description = "Yelp's universal stylesheets for Mallard and DocBook";
     maintainers = with maintainers; [ lethalman ];
-    license = [licenses.gpl2 licenses.lgpl2];
+    # TODO license = [licenses.gpl2 licenses.lgpl2];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix
index f71c52e670b..ab598f47a52 100644
--- a/pkgs/development/libraries/pangomm/default.nix
+++ b/pkgs/development/libraries/pangomm/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "C++ interface to the Pango text rendering library";
     homepage    = http://www.pango.org/;
-    license     = with licenses; [ lgpl2 lgpl21 ];
+    # TODO license     = with licenses; [ lgpl2 lgpl21 ];
     maintainers = with maintainers; [ lovek323 raskin ];
     platforms   = platforms.unix;
 
diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix
index 5cf8b664941..0096cbdbabf 100644
--- a/pkgs/development/tools/misc/lttv/default.nix
+++ b/pkgs/development/tools/misc/lttv/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     homepage = http://lttng.org/;
     # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1.
     # The rest of the LTTV package is distributed under the GNU GPL v2.
-    license = with licenses; [ gpl2 lgpl21 ];
+    # TODO license = with licenses; [ gpl2 lgpl21 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
   };
diff --git a/pkgs/os-specific/darwin/otool/default.nix b/pkgs/os-specific/darwin/otool/default.nix
index 671e51542d0..e0793664a9c 100644
--- a/pkgs/os-specific/darwin/otool/default.nix
+++ b/pkgs/os-specific/darwin/otool/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Object file displaying tool";
     homepage    = https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/otool.1.html;
-    license     = with licenses; [ apsl20 gpl2Plus ];
+    # TODO license     = with licenses; [ apsl20 gpl2Plus ];
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.darwin;
 
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index b9cc34345df..1673472036f 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Linux kernel modules for LTTng tracing";
     homepage = http://lttng.org/;
-    # TODO: Add "mit" to the license list once the license attr set vs string
-    # decision has been made. (Having "mit" there breaks hydra evaluation.)
-    license = with licenses; [ lgpl21 gpl2 ];
+    # TODO license = with licenses; [ lgpl21 gpl2 mit ];
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
   };
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index e4a32e14260..42760da5d4a 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -29,9 +29,9 @@ stdenv.mkDerivation rec {
     homepage = http://haproxy.1wt.eu;
     maintainers = [ stdenv.lib.maintainers.garbas ];
     platforms = stdenv.lib.platforms.linux;
-    license = [
+    /* TODO license = [
        stdenv.lib.licenses.gpl2
        stdenv.lib.licenses.lgpl21
-    ];
+    ];*/
   };
 }
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index 8796dbd076e..76a4a0eae62 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -67,7 +67,7 @@ buildPythonPackage {
 
     homepage = http://allmydata.org/;
 
-    license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ];
+    # TODO license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ];
 
     maintainers = [ lib.maintainers.simons  ];
     platforms = lib.platforms.gnu;  # arbitrary choice
-- 
GitLab


From 37ad2a7d28a027b09dce71e0a4094ce889623632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 12 Mar 2014 22:49:20 +0100
Subject: [PATCH 2113/3789] lighttpd: bump 1.4.34 -> 1.4.35 (security fixes)

From http://www.lighttpd.net/:

  Important changes
  -----------------
  This release contains a lot of bug fixes, many detected by scan.coverity.com
  (and more to come). The main reason for the release is a fix for an SQL
  injection (and path traversal) bug triggered by specially crafted (and
  invalid) Host: headers.

  Security fixes
  --------------
  http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2014_01.txt (no CVE yet)

NOTE: We (nixpkgs) currently don't build the mod_mysql_vhost module mentioned
above.
---
 pkgs/servers/http/lighttpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 4a50acd3379..ce055c0c528 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -5,11 +5,11 @@
 assert enableMagnet -> lua5 != null;
 
 stdenv.mkDerivation rec {
-  name = "lighttpd-1.4.34";
+  name = "lighttpd-1.4.35";
 
   src = fetchurl {
     url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
-    sha256 = "1dzgz3gkfyn97s4dm896yjanlhqzzsz38dhjdgla06xgynca1hdl";
+    sha256 = "18rh7xyx69xbwl20znnjma1dq5fay0ygjjvpn3gaa7dxrir9nghi";
   };
 
   buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]
-- 
GitLab


From f191aa32badca584c6f70b93414d498d8b16bdc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 12 Mar 2014 23:02:30 +0100
Subject: [PATCH 2114/3789] lighttpd: add enableMysql option, to build
 'mod_mysql_vhost'

Now we have options to build all available modules/plugins.
---
 pkgs/servers/http/lighttpd/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index ce055c0c528..899914b6446 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -1,8 +1,10 @@
 { stdenv, fetchurl, pkgconfig, pcre, libxml2, zlib, attr, bzip2, which, file
 , openssl, enableMagnet ? false, lua5 ? null
+, enableMysql ? false, mysql ? null
 }:
 
 assert enableMagnet -> lua5 != null;
+assert enableMysql -> mysql != null;
 
 stdenv.mkDerivation rec {
   name = "lighttpd-1.4.35";
@@ -13,10 +15,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]
-             ++ stdenv.lib.optional enableMagnet lua5;
+             ++ stdenv.lib.optional enableMagnet lua5
+             ++ stdenv.lib.optional enableMysql mysql;
 
   configureFlags = [ "--with-openssl" ]
-                ++ stdenv.lib.optional enableMagnet "--with-lua";
+                ++ stdenv.lib.optional enableMagnet "--with-lua"
+                ++ stdenv.lib.optional enableMysql "--with-mysql";
 
   preConfigure = ''
     sed -i "s:/usr/bin/file:${file}/bin/file:g" configure
-- 
GitLab


From ec3dbdf93dfd639aab058b07e33dc62172893b95 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 12 Mar 2014 22:03:02 +0100
Subject: [PATCH 2115/3789] New package: winstone 0.9.10, a Java Servlet
 container

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

diff --git a/pkgs/servers/http/winstone/default.nix b/pkgs/servers/http/winstone/default.nix
new file mode 100644
index 00000000000..8991a220a76
--- /dev/null
+++ b/pkgs/servers/http/winstone/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "winstone-${version}";
+  version = "0.9.10";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/winstone/${name}.jar";
+    sha256 = "17xvq3yk95335c6ag1bmbmxlvh7gqq35ifi64r2l6rnvrf6pqyan";
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/lib
+    cp $src $out/lib/winstone.jar
+  '';
+
+  meta = {
+    homepage = "http://winstone.sourceforge.net/";
+    description = "A simple Java Servlet container.";
+    license = stdenv.lib.licenses.cddl;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.rickynils ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2eb971b8a8..3daae75dbaa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6470,6 +6470,8 @@ let
 
   vsftpd = callPackage ../servers/ftp/vsftpd { };
 
+  winstone = callPackage ../servers/http/winstone { };
+
   xinetd = callPackage ../servers/xinetd { };
 
   xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
-- 
GitLab


From f24940330b21bc42dc3cd1379632782feb358f11 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 12 Mar 2014 22:06:28 +0100
Subject: [PATCH 2116/3789] New NixOS module: services.winstone, for running
 instances of the Winstone Java Servlet container

---
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/web-servers/winstone.nix | 120 ++++++++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100644 nixos/modules/services/web-servers/winstone.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index d67d7d040dc..0a3654b3824 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -231,6 +231,7 @@
   ./services/web-servers/phpfpm.nix
   ./services/web-servers/tomcat.nix
   ./services/web-servers/varnish/default.nix
+  ./services/web-servers/winstone.nix
   ./services/web-servers/zope2.nix
   ./services/x11/desktop-managers/default.nix
   ./services/x11/display-managers/auto.nix
diff --git a/nixos/modules/services/web-servers/winstone.nix b/nixos/modules/services/web-servers/winstone.nix
new file mode 100644
index 00000000000..8904745ed17
--- /dev/null
+++ b/nixos/modules/services/web-servers/winstone.nix
@@ -0,0 +1,120 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.winstone;
+
+  winstoneOpts = { name, ... }: {
+    options = {
+      name = mkOption {
+        default = name;
+        internal = true;
+      };
+
+      warFile = mkOption {
+        type = types.str;
+        description = ''
+          The WAR file that Winstone should serve.
+        '';
+      };
+
+      javaPackage = mkOption {
+        type = types.package;
+        default = pkgs.openjre;
+        description = ''
+          Which Java derivation to use for running Winstone.
+        '';
+      };
+
+      user = mkOption {
+        type = types.str;
+        description = ''
+          The user that should run this Winstone process and
+          own the working directory.
+        '';
+      };
+
+      group = mkOption {
+        type = types.str;
+        description = ''
+          The group that will own the working directory.
+        '';
+      };
+
+      workDir = mkOption {
+        type = types.str;
+        description = ''
+          The working directory for this Winstone instance. Will
+          contain extracted webapps etc. The directory will be
+          created if it doesn't exist.
+        '';
+      };
+
+      extraJavaOptions = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Extra command line options given to the java process running
+          Winstone.
+        '';
+      };
+
+      extraOptions = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Extra command line options given to the Winstone process.
+        '';
+      };
+    };
+
+    config = {
+      workDir = mkDefault "/run/winstone/${name}";
+    };
+  };
+
+  mkService = cfg: let
+    opts = concatStringsSep " " (cfg.extraOptions ++ [
+      "--warfile ${cfg.warFile}"
+    ]);
+
+    javaOpts = concatStringsSep " " (cfg.extraJavaOptions ++ [
+      "-Djava.io.tmpdir=${cfg.workDir}"
+      "-jar ${pkgs.winstone}/lib/winstone.jar"
+    ]);
+  in {
+    wantedBy = [ "multi-user.target" ];
+    description = "winstone service for ${cfg.name}";
+    preStart = ''
+      mkdir -p "${cfg.workDir}"
+      chown ${cfg.user}:${cfg.group} "${cfg.workDir}"
+    '';
+    serviceConfig = {
+      ExecStart = "${cfg.javaPackage}/bin/java ${javaOpts} ${opts}";
+      User = cfg.user;
+      PermissionsStartOnly = true;
+    };
+  };
+
+in {
+
+  options = {
+    services.winstone = mkOption {
+      default = {};
+      type = types.attrsOf types.optionSet;
+      options = [ winstoneOpts ];
+      description = ''
+        Defines independent Winstone services, each serving one WAR-file.
+      '';
+    };
+  };
+
+  config = mkIf (cfg != {}) {
+
+    systemd.services = mapAttrs' (n: c: nameValuePair "winstone-${n}" (mkService c)) cfg;
+
+  };
+
+}
-- 
GitLab


From 040df9c41a7e1c2a6f9a07a5853f218318a35b67 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 12 Mar 2014 23:07:38 +0100
Subject: [PATCH 2117/3789] New package: solr 4.7.0, a Java search platform

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

diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix
new file mode 100644
index 00000000000..443e7af71ad
--- /dev/null
+++ b/pkgs/servers/search/solr/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "solr-${version}";
+  version = "4.7.0";
+
+  src = fetchurl {
+    url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz";
+    sha256 = "0qm3pnhpfqjxdl0xiwffrcchp79q3ja5w5d278bkkxglc2y1y4xc";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/lib
+    cp dist/${name}.war $out/lib/solr.war
+    cp -r example/lib/ext $out/lib/ext
+  '';
+
+  meta = {
+    homepage = "https://lucene.apache.org/solr/";
+    description = ''
+      Open source enterprise search platform from the Apache Lucene project
+    '';
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.rickynils ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3daae75dbaa..3c5752e18a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1906,6 +1906,8 @@ let
     inherit (pkgsi686Linux.xlibs) libX11;
   };
 
+  solr = callPackage ../servers/search/solr { };
+
   sparsehash = callPackage ../development/libraries/sparsehash { };
 
   stardict = callPackage ../applications/misc/stardict/stardict.nix {
-- 
GitLab


From 91e6d7411ef011a1a8ce2f1b00679afac5878120 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 12 Mar 2014 23:28:38 +0100
Subject: [PATCH 2118/3789] winstone NixOS module: Make it possible to set
 systemd service name

---
 nixos/modules/services/web-servers/winstone.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/winstone.nix b/nixos/modules/services/web-servers/winstone.nix
index 8904745ed17..33c7e730118 100644
--- a/nixos/modules/services/web-servers/winstone.nix
+++ b/nixos/modules/services/web-servers/winstone.nix
@@ -13,6 +13,14 @@ let
         internal = true;
       };
 
+      serviceName = mkOption {
+        type = types.str;
+        description = ''
+          The name of the systemd service. By default, it is
+          derived from the winstone instance name.
+        '';
+      };
+
       warFile = mkOption {
         type = types.str;
         description = ''
@@ -72,6 +80,7 @@ let
 
     config = {
       workDir = mkDefault "/run/winstone/${name}";
+      serviceName = mkDefault "winstone-${name}";
     };
   };
 
@@ -113,7 +122,7 @@ in {
 
   config = mkIf (cfg != {}) {
 
-    systemd.services = mapAttrs' (n: c: nameValuePair "winstone-${n}" (mkService c)) cfg;
+    systemd.services = mapAttrs' (n: c: nameValuePair c.serviceName (mkService c)) cfg;
 
   };
 
-- 
GitLab


From 576eaa16b8bca178050e87df15da0e1de2acc475 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Wed, 12 Mar 2014 23:48:35 +0100
Subject: [PATCH 2119/3789] pythonPackages.gevent-socketio: add

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5feec7c6255..2ec6d251cf4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3025,7 +3025,32 @@ rec {
       maintainers = [ maintainers.bjornfor ];
     };
   };
+  
+  
+  gevent-socketio = buildPythonPackage rec {
+    name = "gevent-socketio-0.3.6";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/g/gevent-socketio/${name}.tar.gz";
+      sha256 = "1zra86hg2l1jcpl9nsnqagy3nl3akws8bvrbpgdxk15x7ywllfak";
+    };
+
+    buildInputs = [ versiontools gevent-websocket mock pytest ];
+    propagatedBuildInputs = [ gevent ];
+
+  };
+  
+  gevent-websocket = buildPythonPackage rec {
+    name = "gevent-websocket-0.9.3";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/g/gevent-websocket/${name}.tar.gz";
+      sha256 = "07rqwfpbv13mk6gg8mf0bmvcf6siyffjpgai1xd8ky7r801j4xb4";
+    };
 
+    propagatedBuildInputs = [ gevent ];
+
+  };
 
   genzshcomp = buildPythonPackage {
     name = "genzshcomp-0.5.1";
@@ -8472,6 +8497,16 @@ rec {
       maintainers = [ stdenv.lib.maintainers.rickynils ];
     };
   };
+  
+  versiontools = buildPythonPackage rec {
+    name = "versiontools-1.9.1";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/v/versiontools/${name}.tar.gz";
+      sha256 = "1xhl6kl7f4srgnw6zw4lr8j2z5vmrbaa83nzn2c9r2m1hwl36sd9";
+    };
+
+  };
 
   graphite_web = buildPythonPackage rec {
     name = "graphite-web-${version}";
-- 
GitLab


From e1984f029da99ac19434aabf98afcecb4f883bf9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Mar 2014 00:18:17 +0100
Subject: [PATCH 2120/3789] autovt@.service really has to be a symlink

---
 nixos/modules/services/ttys/kmscon.nix | 6 +++++-
 nixos/modules/system/boot/systemd.nix  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index 4bbc4259327..70555e5d882 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixos/modules/services/ttys/kmscon.nix
@@ -63,7 +63,11 @@ in {
       X-RestartIfChanged=false
     '';
 
-    systemd.services."autovt@".baseUnit = "${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service";
+    systemd.units."autovt@.service".unit = pkgs.runCommand "unit" { }
+        ''
+          mkdir -p $out
+          ln -s ${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service $out/autovt@.service
+        '';
 
     systemd.services.systemd-vconsole-setup.restartIfChanged = false;
 
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 3b4e06e3ad6..3f92489b866 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -424,7 +424,7 @@ in
             };
           };
           config = {
-            unit = makeUnit name config;
+            unit = mkDefault (makeUnit name config);
           };
         };
     };
-- 
GitLab


From 3ed3c60d0fba2f55c65afe91597dc9fdf07e1121 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 13 Mar 2014 00:32:34 +0100
Subject: [PATCH 2121/3789] New NixOS module: services.solr, for running a solr
 server

---
 nixos/modules/module-list.nix          |   1 +
 nixos/modules/services/search/solr.nix | 114 +++++++++++++++++++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 nixos/modules/services/search/solr.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0a3654b3824..8a7d32adf34 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -206,6 +206,7 @@
   ./services/scheduling/cron.nix
   ./services/scheduling/fcron.nix
   ./services/search/elasticsearch.nix
+  ./services/search/solr.nix
   ./services/security/clamav.nix
   ./services/security/haveged.nix
   ./services/security/fprot.nix
diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix
new file mode 100644
index 00000000000..eab18c4229b
--- /dev/null
+++ b/nixos/modules/services/search/solr.nix
@@ -0,0 +1,114 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.solr;
+
+in {
+
+  options = {
+    services.solr = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enables the solr service.
+        '';
+      };
+
+      javaPackage = mkOption {
+        type = types.package;
+        default = pkgs.openjre;
+        description = ''
+          Which Java derivation to use for running solr.
+        '';
+      };
+
+      solrPackage = mkOption {
+        type = types.package;
+        default = pkgs.solr;
+        description = ''
+          Which solr derivation to use for running solr.
+        '';
+      };
+
+      log4jConfiguration = mkOption {
+        type = types.lines;
+        default = ''
+          log4j.rootLogger=INFO, stdout
+          log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+          log4j.appender.stdout.Target=System.out
+          log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+          log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+        '';
+        description = ''
+          Contents of the <literal>log4j.properties</literal> used. By default,
+          everything is logged to stdout (picked up by systemd) with level INFO.
+        '';
+      };
+
+      user = mkOption {
+        type = types.str;
+        description = ''
+          The user that should run the solr process and.
+          the working directories.
+        '';
+      };
+
+      group = mkOption {
+        type = types.str;
+        description = ''
+          The group that will own the working directory.
+        '';
+      };
+
+      solrHome = mkOption {
+        type = types.str;
+        description = ''
+          The solr home directory. It is your own responsibility to
+          make sure this directory contains a working solr configuration,
+          and is writeable by the the user running the solr service.
+          Failing to do so, the solr will not start properly.
+        '';
+      };
+
+      extraJavaOptions = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Extra command line options given to the java process running
+          solr.
+        '';
+      };
+
+      extraWinstoneOptions = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Extra command line options given to the Winstone, which is
+          the servlet container hosting solr.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    services.winstone.solr = {
+      serviceName = "solr";
+      inherit (cfg) user group javaPackage;
+      warFile = "${cfg.solrPackage}/lib/solr.war";
+      extraOptions = [
+        "--commonLibFolder=${cfg.solrPackage}/lib/ext"
+      ] ++ cfg.extraWinstoneOptions;
+      extraJavaOptions = [
+        "-Dsolr.solr.home=${cfg.solrHome}"
+        "-Dlog4j.configuration=file://${pkgs.writeText "log4j.properties" cfg.log4jConfiguration}"
+      ] ++ cfg.extraJavaOptions;
+    };
+
+  };
+
+}
-- 
GitLab


From 59a060523e820fa420a94a022755c37ca8b54192 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 12 Mar 2014 20:03:14 -0400
Subject: [PATCH 2122/3789] Don't override the baseUnit's PATH by default

---
 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 3f92489b866..7305fb17261 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -173,7 +173,7 @@ let
 
   serviceConfig = { name, config, ... }: {
     config = mkMerge
-      [ { # Default path for systemd services.  Should be quite minimal.
+      [ (mkIf (config.baseUnit == null) { # Default path for systemd services.  Should be quite minimal.
           path =
             [ pkgs.coreutils
               pkgs.findutils
@@ -182,7 +182,7 @@ let
               systemd
             ];
           environment.PATH = config.path;
-        }
+        })
         (mkIf (config.preStart != "")
           { serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" ''
               #! ${pkgs.stdenv.shell} -e
-- 
GitLab


From fcfbe753e7ebfbc1667661fbb60894af820ca5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Thu, 13 Mar 2014 01:14:05 +0100
Subject: [PATCH 2123/3789] Add synfig: A 2D animation program

---
 .../graphics/synfigstudio/default.nix         | 56 +++++++++++++++++++
 .../synfigstudio/synfig-cstring.patch         | 12 ++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 70 insertions(+)
 create mode 100644 pkgs/applications/graphics/synfigstudio/default.nix
 create mode 100644 pkgs/applications/graphics/synfigstudio/synfig-cstring.patch

diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
new file mode 100644
index 00000000000..034a147b787
--- /dev/null
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, boost, cairo, gettext, glibmm, gtk, gtkmm
+, libsigcxx, libtool, libxmlxx, pango, pkgconfig, imagemagick
+, intltool
+}:
+
+let
+  version = "0.64.1";
+
+  ETL = stdenv.mkDerivation rec {
+    name = "ETL-0.04.17";
+
+    src = fetchurl {
+       url = "mirror://sourceforge/synfig/${name}.tar.gz";
+       sha256 = "13kpiswgcpsif9fwcplqr0405aqavqn390cjnivkn3pxv0d2q8iy";
+    };
+  };
+
+  synfig = stdenv.mkDerivation rec {
+    name = "synfig-${version}";
+
+    src = fetchurl {
+       url = "mirror://sourceforge/synfig/synfig-${version}.tar.gz";
+       sha256 = "1b4ksxnqbaq4rxlvasmrvk7z4jvjbsg4ns3cns2qcnz64dyvbgda";
+    };
+
+    patches = [ ./synfig-cstring.patch ];
+
+    buildInputs = [
+      ETL boost cairo gettext glibmm libsigcxx libtool libxmlxx pango
+      pkgconfig
+    ];
+
+    configureFlags = [ "--with-boost-libdir=${boost}/lib" ];
+  };
+in
+stdenv.mkDerivation rec {
+  name = "synfigstudio-${version}";
+
+  src = fetchurl {
+       url = "mirror://sourceforge/synfig/${name}.tar.gz";
+       sha256 = "0nl6vpsn5dcjd5qhbrmd0j4mr3wddvymkg9414m77cdpz4l8b9v2";
+    };
+
+  buildInputs = [
+    ETL boost cairo gettext glibmm gtk gtkmm imagemagick intltool
+    intltool libsigcxx libtool libxmlxx pkgconfig synfig
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A 2D animation program";
+    homepage = http://www.synfig.org;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/graphics/synfigstudio/synfig-cstring.patch b/pkgs/applications/graphics/synfigstudio/synfig-cstring.patch
new file mode 100644
index 00000000000..51eb7704216
--- /dev/null
+++ b/pkgs/applications/graphics/synfigstudio/synfig-cstring.patch
@@ -0,0 +1,12 @@
+http://www.synfig.org/issues/thebuggenie/synfig/issues/438
+--- a/src/modules/mod_png/trgt_png.cpp
++++ b/src/modules/mod_png/trgt_png.cpp
+@@ -39,6 +39,7 @@
+ #include <algorithm>
+ #include <functional>
+ #include <ETL/misc>
++#include <cstring>
+ 
+ #endif
+ 
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c5752e18a0..4603179fafc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8614,6 +8614,8 @@ let
     rake         = rake_10_1_0;
   };
 
+  synfigstudio = callPackage ../applications/graphics/synfigstudio { };
+
   msmtp = callPackage ../applications/networking/msmtp { };
 
   imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix {
-- 
GitLab


From d83e7fbb8dfefc3091c6455d3f07bcf717dae29a Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 12 Mar 2014 14:51:45 +0100
Subject: [PATCH 2124/3789] chromium: Update all channels

stable: 33.0.1750.146 -> 33.0.1750.149
beta:   34.0.1847.14  -> 34.0.1847.45
dev:    35.0.1862.2   -> 35.0.1883.0
---
 .../networking/browsers/chromium/sources.nix   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index 63b4c9033a3..a3645b2ac69 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "35.0.1862.2";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-35.0.1862.2.tar.xz";
-    sha256 = "19426x4x3bnx21qjhqc4sk27k7dnhm1pw84079h6gk0hyjzcwn0f";
+    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.14";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.14.tar.xz";
-    sha256 = "038bz2d40rgjppkalal9ycjhfvkhph926k35v8pc3618z2fy10cn";
+    version = "34.0.1847.45";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.45.tar.xz";
+    sha256 = "0ypz6cclddiasmy8z5p97ndpl9xb7p5ncn9dxm6zkffxyagnx531";
   };
   stable = {
-    version = "33.0.1750.146";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.146.tar.xz";
-    sha256 = "0x2a5kyaj38661c5s33pywhrwkm8kj2fbr1z940c5al6y2hfgc6m";
+    version = "33.0.1750.149";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.149.tar.xz";
+    sha256 = "111hml6kjfzps9addvhcjygjb2k65spknx2zc6pnz4ygshynspqn";
   };
 }
-- 
GitLab


From 86b8cf954a4a58abefd3ba3ccb5b3e3c9e45cb4d Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 13 Mar 2014 02:28:26 +0100
Subject: [PATCH 2125/3789] grsecurity: Update stable and test patches

stable: 3.0-3.2.55-201403072107 -> 3.0-3.2.55-201403122114
test:   3.0-3.13.6-201403072241 -> 3.0-3.13.6-201403122116
---
 pkgs/os-specific/linux/kernel/patches.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index e0d880a626a..fdaf19154d3 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -81,8 +81,8 @@ rec {
   grsecurity_3_0_3_2_55 =
     { name = "grsecurity-3.0-3.2.55";
       patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403072107.patch;
-        sha256 = "128dbspwg8hvshz6rjykcl42kam5g0db50rbyaagskh9jm9a0zyz";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403122114.patch;
+        sha256 = "0jfi8dp7zrbq9ai12h0fxmj0r73wf5vp3y43n506y8ha7cyrrk5y";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55
@@ -92,8 +92,8 @@ rec {
   grsecurity_3_0_3_13_6 =
     { name = "grsecurity-3.0-3.13.6";
       patch = fetchurl {
-        url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403072241.patch;
-        sha256 = "006w89pvb9jasb7413nnphz5mrdmq10mkpmjcglbhs5ps915jczy";
+        url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403122116.patch;
+        sha256 = "0nsr6dxa7w9dl4bjmx7wh3vng9llbfjcxh3yr61434bzabymj9nm";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.6
-- 
GitLab


From 1b2902f8ebe4b4f79c377a80f64231cdcc83ed42 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Mar 2014 08:53:09 +0200
Subject: [PATCH 2126/3789] manpages: update from 3.61 to 3.62

---
 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 e997dd487c5..b43cc8a7995 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.61";
+  name = "man-pages-3.62";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "1qh1rwh0klk9s1wja6rzr5gdyvijh88i0fwqap83grbgqs661c61";
+    sha256 = "1pxnbznrzckzdnlfbdsg9hjd2g93q6b433l4gp095kdxxjqm1mgk";
   };
 
   preBuild =
-- 
GitLab


From 7c38f9afe1bcb524f29c07321a11d45bd1bf2aae Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Mar 2014 08:54:58 +0200
Subject: [PATCH 2127/3789] youtubeDL: update from 2014.03.07.1 to 2014.03.12,
 add myself as a maintainer

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 5bf9e755ae9..3edce28151e 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.03.07.1";
+  version = "2014.03.12";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1yhjb5gk6l3y5p5fw246pww5yq661sr02zs17pqyxxbs2gx9kr4p";
+    sha256 = "1fap7mx2bmfr1jv7v5n2khl72mbasnzlasqd8gi654cl9xp12p5x";
   };
 
   buildInputs = [ python ];
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     description = "Command-line tool to download videos from YouTube.com and other sites";
 
     platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons ];
+    maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons phreedom ];
   };
 }
-- 
GitLab


From 0ffbfd38bfe820579ac4c8ed37676813179e2608 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Mar 2014 08:59:25 +0200
Subject: [PATCH 2128/3789] udisks2: update from 2.1.1 to 2.1.3, potentially
 fixes CVE-2014-0004

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

diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 537b17550da..90272d8f095 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "udisks-2.1.1";
+  name = "udisks-2.1.3";
 
   src = fetchurl {
     url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2";
-    sha256 = "1yw6h3l13y796adwgj6m4j3hijv58lgpf98mq24nn9da73zhjfq1";
+    sha256 = "0bb3403pa23j317b7z9ikdigr6ll5cl93l4hiy4afjgfa7b2zjaw";
   };
 
   patches = [ ./force-path.patch ];
-- 
GitLab


From e585d65b499359cae348d106c89c56407bb7fba4 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Mar 2014 09:09:19 +0200
Subject: [PATCH 2129/3789] socat: update from 1.7.2.3 to 1.7.2.4

---
 pkgs/tools/networking/socat/2.x.nix     | 1 +
 pkgs/tools/networking/socat/default.nix | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix
index 885f2d005d8..74b9b1bdf6a 100644
--- a/pkgs/tools/networking/socat/2.x.nix
+++ b/pkgs/tools/networking/socat/2.x.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A utility for bidirectional data transfer between two independent data channels";
     homepage = http://www.dest-unreach.org/socat/;
+    repositories.git = git://repo.or.cz/socat.git;
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl2;
     maintainers = stdenv.lib.maintainers.eelco;
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix
index 8e2f9449090..7da82796b1c 100644
--- a/pkgs/tools/networking/socat/default.nix
+++ b/pkgs/tools/networking/socat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "socat-1.7.2.3";
+  name = "socat-1.7.2.4";
 
   src = fetchurl {
     url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
-    sha256 = "1l5ajqwfpxy35mvqlihzncmfngn61k7in51wkvd8q4vvmxaar605";
+    sha256 = "028yjka2zr6j1i8pmfmvzqki8ajczdl1hnry1x31xbbg3j83jxsb";
   };
 
   buildInputs = [ openssl ];
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A utility for bidirectional data transfer between two independent data channels";
     homepage = http://www.dest-unreach.org/socat/;
+    repositories.git = git://repo.or.cz/socat.git;
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl2;
     maintainers = stdenv.lib.maintainers.eelco;
-- 
GitLab


From 3ac4078d9e5eac74b46b39f31de1b2ee5dc30b87 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 13 Mar 2014 09:14:05 +0200
Subject: [PATCH 2130/3789] telepathy_farstream: update from 0.6.0 to 0.6.1

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

diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix
index e41bd9fdb02..a5185689ee0 100644
--- a/pkgs/development/libraries/telepathy/farstream/default.nix
+++ b/pkgs/development/libraries/telepathy/farstream/default.nix
@@ -2,12 +2,12 @@
 , pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-0.6.0";
+  name = "${pname}-0.6.1";
   pname = "telepathy-farstream";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
-    sha256 = "04v414jij2ba71krk7vh4avsz07sfp5w38dmvjwig5isdygy0905";
+    sha256 = "0ia8nldxxan1cvplr62aicjhfcrm27s3qyk0x46c8q0fmqvnzlm3";
   };
 
   buildInputs = [ gst_plugins_base gst_python pygobject ];
-- 
GitLab


From f7cdd1611baa60f498840d615287a3fc18ebecd8 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 12 Mar 2014 21:52:43 +0100
Subject: [PATCH 2131/3789] pythonPackages: distutils-cfg, allow to override
 config

---
 pkgs/development/python-modules/distutils-cfg/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/distutils-cfg/default.nix b/pkgs/development/python-modules/distutils-cfg/default.nix
index 190c663b471..204f4de5456 100644
--- a/pkgs/development/python-modules/distutils-cfg/default.nix
+++ b/pkgs/development/python-modules/distutils-cfg/default.nix
@@ -1,10 +1,11 @@
 # global distutils configuration, see http://docs.python.org/2/install/index.html#distutils-configuration-files
 
-{ stdenv, python, writeText, extraCfg ? "" }:
+{ stdenv, python, writeText, extraCfg ? "", overrideCfg ? "" }:
 
 
 let
-  distutilsCfg = writeText "distutils.cfg" ''
+  distutilsCfg = writeText "distutils.cfg" (
+  if overrideCfg != "" then overrideCfg else ''
     [easy_install]
 
     # don't allow network connections during build to ensure purity
@@ -14,7 +15,7 @@ let
     zip_ok = 0
 
     ${extraCfg}
-  '';
+  '');
 in stdenv.mkDerivation {
   name = "${python.libPrefix}-distutils.cfg";
 
-- 
GitLab


From c81c344d6713b8dea29c8647da71ce02d541aaf9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 13 Mar 2014 06:43:54 -0400
Subject: [PATCH 2132/3789] wai-middleware-static: Jailbreak for the latest wai

---
 .../libraries/haskell/wai-middleware-static/default.nix          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
index 859c75c39c3..31ec8c410a9 100644
--- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
@@ -11,4 +11,5 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
+  jailbreak = true;
 })
-- 
GitLab


From 07cc34bc122bcf4267edc825dbe43563306df360 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Mar 2014 11:27:02 +0100
Subject: [PATCH 2133/3789] haskell-hsini: update to version 0.3.1

---
 pkgs/development/libraries/haskell/hsini/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hsini/default.nix b/pkgs/development/libraries/haskell/hsini/default.nix
index 45e03ad7144..73368a1dd6c 100644
--- a/pkgs/development/libraries/haskell/hsini/default.nix
+++ b/pkgs/development/libraries/haskell/hsini/default.nix
@@ -4,14 +4,13 @@
 
 cabal.mkDerivation (self: {
   pname = "hsini";
-  version = "0.2";
-  sha256 = "0d9dhzaw2v9r0hb4lywzw4f0inijbcw5brc5dh45zfkalmn3aqam";
+  version = "0.3.1";
+  sha256 = "06cys4i1nsic13dkp5jgammm3qykzizlnp6wdka2vl699rvnzaaf";
   buildDepends = [ mtl parsec ];
   testDepends = [
     HUnit mtl parsec QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2 testFrameworkTh
   ];
-  doCheck = false;
   meta = {
     description = "Package for user configuration files (INI)";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From 080408ea8a2dca6cc3c5ea6927f9211a4369ee33 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Mar 2014 11:27:04 +0100
Subject: [PATCH 2134/3789] haskell-network-conduit: update to version 1.0.4

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

diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index 63dbaec80fd..c2f00b68f8f 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit";
-  version = "1.0.3";
-  sha256 = "0l5r0iws4zbqvkb2nlzxq0zspaz9vhl2a5r43jrxh4cvqb6lbn3q";
+  version = "1.0.4";
+  sha256 = "1a7p3gs0rczx0rhz27410rr6fzy3l0nsj6kk5wi0nqvqfyh7jb9c";
   buildDepends = [
     conduit liftedBase monadControl network transformers
   ];
-- 
GitLab


From 6a552211791df2492ac3dae17581409e17cacc13 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Mar 2014 11:27:05 +0100
Subject: [PATCH 2135/3789] haskell-persistent-postgresql: update to version
 1.3.0.3

---
 .../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 14b2e08ccac..e529747e7a7 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-postgresql";
-  version = "1.3.0.2";
-  sha256 = "1d5g5zg3p0nhhkgnf9mr1wxmrpw5y1adv5lf21681an9frkisggy";
+  version = "1.3.0.3";
+  sha256 = "00frqpv7wbksbjl714nhrian45p61kggxhpin9hawbwn2siwsg2m";
   buildDepends = [
     aeson blazeBuilder conduit monadControl persistent postgresqlLibpq
     postgresqlSimple text time transformers
-- 
GitLab


From 79cf91b1e5b7d2cdc491137bce9a10f34cc5301f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Mar 2014 11:27:07 +0100
Subject: [PATCH 2136/3789] haskell-persistent-sqlite: update to version
 1.3.0.3

---
 .../libraries/haskell/persistent-sqlite/default.nix         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
index 742f4d3b516..009aa3b6299 100644
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
@@ -4,8 +4,10 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-sqlite";
-  version = "1.3.0.2";
-  sha256 = "0mxnmbqsj67mfsp7d09wbziwfwcfdqr0rln0qcyi3wjwgybjmkzk";
+  version = "1.3.0.3";
+  sha256 = "0b7dp2hiza02rnnph44rd2vls06jipmixi32icbijmcqk83hfglq";
+  isLibrary = true;
+  isExecutable = true;
   buildDepends = [
     aeson conduit monadControl monadLogger persistent text transformers
   ];
-- 
GitLab


From b0776598341476abeb485ee4199899a967f8b070 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Mar 2014 11:27:09 +0100
Subject: [PATCH 2137/3789] haskell-persistent-template: update to version
 1.3.1.2

---
 .../libraries/haskell/persistent-template/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 9dc3ea188bb..1340ceaaf95 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "1.3.1.1";
-  sha256 = "13rbsxfrync5vmg5f1h5z5lc2b1vvh7nzbap4s5g5df3nvzfmmqx";
+  version = "1.3.1.2";
+  sha256 = "1gdwwx55ihnqxgyw0wsx0pr4dcs2hdbp5xbnx6l1j03rn5x1sglq";
   buildDepends = [
     aeson monadControl monadLogger persistent text transformers
     unorderedContainers
-- 
GitLab


From 2180e76c471531514bef26b83dd6df787cf8eeff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Mar 2014 11:27:11 +0100
Subject: [PATCH 2138/3789] haskell-persistent: update to version 1.3.0.3

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

diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index c9375dc06b4..1a61e5f76a0 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "1.3.0.2";
-  sha256 = "16bq0l6nqjpzlbzm47ip2m8b5yhwhf28fpv3hxy7qsnzmy7siv6y";
+  version = "1.3.0.3";
+  sha256 = "0p9h43wvm1l9va6s6p71y6r5ifgvbqz8ypc86pmzbphq6712jnsl";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
     liftedBase monadControl monadLogger pathPieces poolConduit
-- 
GitLab


From b38f435e0e282cdb793c0ec1af8a907941bf047f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Mar 2014 11:27:13 +0100
Subject: [PATCH 2139/3789] haskell-pool-conduit: update to version 0.1.2.1

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

diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix
index 77faceeea92..e97fbb983a7 100644
--- a/pkgs/development/libraries/haskell/pool-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pool-conduit";
-  version = "0.1.2";
-  sha256 = "10lvq18pk9d4la5irr1qv1c9y4qbwlglmzgs7bz1d0g5232w3rv8";
+  version = "0.1.2.1";
+  sha256 = "1mcx66xv1irxd66cfv23h4n7fplg5a0hyldlgk8km0k395mjw8k8";
   buildDepends = [
     monadControl resourcePool resourcet transformers
   ];
-- 
GitLab


From 1e99af6888cfa6ff6783e17608523ff4cba9227c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Mar 2014 11:27:14 +0100
Subject: [PATCH 2140/3789] haskell-shelly: update to version 1.5.0.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 720bbea8933..3ebc62932cf 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.4.4.2";
-  sha256 = "01h08bw7j7f5vi3bffd4ipvj5nmab8j5rqgxav688n2jm2342jzk";
+  version = "1.5.0.1";
+  sha256 = "19mfxdwnzv01bxd0l5q2z4mbdp7r8p6z2bm083vjlxx7cc35wv7a";
   buildDepends = [
     async mtl systemFileio systemFilepath text time unixCompat
   ];
-- 
GitLab


From 2d4b15028bae35f6fd9d8282970ace559bc16db7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Mar 2014 11:27:16 +0100
Subject: [PATCH 2141/3789] haskell-sqlite-simple: update to version 0.4.5.2

---
 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 cc6204735d2..d6d8d43bf24 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.1";
-  sha256 = "0mmj6vk3yjvrbsggc5pyba5iprzvfhlsq1jfradpazgfc998j0ry";
+  version = "0.4.5.2";
+  sha256 = "04080ak589n0abisb6bzsmycrh3l8sh0ipcl1gcsvvfd4x83c9yi";
   buildDepends = [
     attoparsec blazeBuilder blazeTextual directSqlite text time
     transformers
-- 
GitLab


From 5acd15da48402982d2f9b8830356e4a3db4e5f80 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Mar 2014 11:27:18 +0100
Subject: [PATCH 2142/3789] haskell-tasty-rerun: update to version 1.1.2

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

diff --git a/pkgs/development/libraries/haskell/tasty-rerun/default.nix b/pkgs/development/libraries/haskell/tasty-rerun/default.nix
index b5f7351c594..65d0c73473a 100644
--- a/pkgs/development/libraries/haskell/tasty-rerun/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-rerun/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-rerun";
-  version = "1.1.1";
-  sha256 = "1xgjf47bvahankyic18l5fcda4dlfbd4j2lxqv3v5hhwk7zgvcp8";
+  version = "1.1.2";
+  sha256 = "0vgx6l9yd21aiwivd6zp67rgjly1j2wwqdmx99p17prr430rm4id";
   buildDepends = [
     mtl optparseApplicative reducers split stm tagged tasty
     transformers
-- 
GitLab


From 2fb6b4b547ff68af07879a6f85b0ec10f9ab7359 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Mar 2014 11:27:20 +0100
Subject: [PATCH 2143/3789] haskell-warp: update to version 2.1.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 fee847795dc..7ebc7af3627 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.1.0";
-  sha256 = "19pwpcn0qp0c4gb2yp81i550zfxk67087yhhn2iqgnzzhljhk8yw";
+  version = "2.1.1";
+  sha256 = "1nldm0pq1q5m91mhss4h23dxdqwqmvfdmcpq5grc1rqjb88mgm25";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpDate httpTypes liftedBase network networkConduit simpleSendfile
-- 
GitLab


From 7f42327a648377dce86c83da5a99a49026f46a45 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Mar 2014 11:27:22 +0100
Subject: [PATCH 2144/3789] haskell-yesod-bin: update to version 1.2.7.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 9a96d2e574c..50071e8cffe 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.7";
-  sha256 = "1xy62r61fhswainws8q39dqkr1wfp1cls6sj2xvagf1yw5pw06wv";
+  version = "1.2.7.1";
+  sha256 = "1lbnn7lzgpw0xsbnlax41q5hqb1bv9irmncgjvv18y8mpf5zcncs";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 89ac0bdaf22db120e12c312e1e7f7e22c388868b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Mar 2014 11:27:23 +0100
Subject: [PATCH 2145/3789] haskell-yesod-form: update to version 1.3.7

---
 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 84534d845a3..a42e0a50bc4 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.6";
-  sha256 = "1gynm078i9iak0iirdrnp7pmz9rx4gq96cb2q5n617hww9m5p0j2";
+  version = "1.3.7";
+  sha256 = "01fv3c5db702nm9dk5ynvn5mf9vc4a1rkjn31zlw260jlgqy4vsn";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
     dataDefault emailValidate hamlet network persistent resourcet
-- 
GitLab


From 6754d7518805eafe8a3d5d86cd725762760b0e63 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Mar 2014 16:54:07 +0100
Subject: [PATCH 2146/3789] haskell-defaults.nix: update reference to
 cabal-install 1.18.0.2

---
 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 fe11a329ecd..2d4bdea6006 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -27,8 +27,8 @@
     self : self.haskellPlatformArgs_future self // {
       haskellPlatform = null;
       extensibleExceptions = self.extensibleExceptions_0_1_1_4;
-      cabalInstall_1_18_0_2 = self.cabalInstall_1_18_0_2.override { Cabal = null; };
-      cabalInstall = self.cabalInstall_1_18_0_2.override { Cabal = null; };
+      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;
     };
 
-- 
GitLab


From 18a4fa7594eed4bef81b44a33159a389e7349c84 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Mar 2014 10:50:34 +0100
Subject: [PATCH 2147/3789] haskell-adjunctions: update to version 4.0.2

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

diff --git a/pkgs/development/libraries/haskell/adjunctions/default.nix b/pkgs/development/libraries/haskell/adjunctions/default.nix
index bdfec2f01d4..69c7751270c 100644
--- a/pkgs/development/libraries/haskell/adjunctions/default.nix
+++ b/pkgs/development/libraries/haskell/adjunctions/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "adjunctions";
-  version = "4.0.1";
-  sha256 = "0z13rmh9yp8jg2jzj3bmysqc4h2nblshx125h2sx51wllnvxzh5l";
+  version = "4.0.2";
+  sha256 = "0c9168jmnfpzv3025n05b80b9p7jzkdzs0hzymjmh1qvz3iximq5";
   buildDepends = [
     comonad contravariant distributive free mtl semigroupoids
     semigroups tagged transformers void
-- 
GitLab


From fe7f0a1198a8c1b6481faa26358f824fcc07678a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Mar 2014 10:50:36 +0100
Subject: [PATCH 2148/3789] haskell-bson: update to version 0.2.4

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

diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix
index 1fa5f3fb79f..da4629e93fb 100644
--- a/pkgs/development/libraries/haskell/bson/default.nix
+++ b/pkgs/development/libraries/haskell/bson/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bson";
-  version = "0.2.3";
-  sha256 = "0p8c4cq8ldspwj4pmg0l8pg8bkwsk9xan07md32ikm4bfqsnv2rb";
+  version = "0.2.4";
+  sha256 = "1fr0xx9q2l3cb72j5lgrwdlr2gba7idh2v80s8d6dr69dhwaccd9";
   buildDepends = [
     binary cryptohash dataBinaryIeee754 mtl network text time
   ];
-- 
GitLab


From 8a9a4e3f14f9c32626feab939ead362326e81cca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Mar 2014 10:50:40 +0100
Subject: [PATCH 2149/3789] haskell-linear: update to version 1.9.0.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 ea7c86e3c99..b57879085bf 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.8.1";
-  sha256 = "1hrvlavghwj8psi3qdmvnccrr2vk8rss8ggw87gn0jh771pv8zl2";
+  version = "1.9.0.1";
+  sha256 = "1ibdv1915rqz6dp8qg1nipnwwk345n4c5n51i8nn1h7p7jp53hhs";
   buildDepends = [
     adjunctions binary distributive hashable lens reflection
     semigroupoids semigroups tagged transformers unorderedContainers
-- 
GitLab


From d1a77ca66c90251bc59d0ad2ff9cc9c29baf0c1d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Mar 2014 10:50:41 +0100
Subject: [PATCH 2150/3789] haskell-smtp-mail: update to version 0.1.4.5

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

diff --git a/pkgs/development/libraries/haskell/smtp-mail/default.nix b/pkgs/development/libraries/haskell/smtp-mail/default.nix
index 814a89f70c2..80f18da4c56 100644
--- a/pkgs/development/libraries/haskell/smtp-mail/default.nix
+++ b/pkgs/development/libraries/haskell/smtp-mail/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "smtp-mail";
-  version = "0.1.4.4";
-  sha256 = "055b736sr9w4dxf1p5xjfsisqxk49kz4d3hyqwgdvi8zzvi31vp6";
+  version = "0.1.4.5";
+  sha256 = "010fbrcbypajwd9fjjc35br9p5axl1pqd0n1v51585ncrlv2icyw";
   buildDepends = [
     base16Bytestring base64Bytestring cryptohash filepath mimeMail
     network text
-- 
GitLab


From 7bb1de4a2f66579590675e77cd200c3246aa98fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Mar 2014 10:50:43 +0100
Subject: [PATCH 2151/3789] haskell-thyme: update to version 0.3.1.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 6f1a6b41bba..08563c6f2c5 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.1.0";
-  sha256 = "0dhnsqn6miiqnbpqln2vmkq7cbm8bz5jz1dwc1bif6dwl16fvhm6";
+  version = "0.3.1.1";
+  sha256 = "00c15zy7190mghpvrpwl0hp8w1mp386vvff8w2zdpgl792cvdby8";
   buildDepends = [
     aeson attoparsec deepseq lens QuickCheck random text time
     transformers vector vectorSpace
-- 
GitLab


From 02583ff4f36b43f97a2416cf37d147b681cec692 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 13 Mar 2014 08:38:23 -0400
Subject: [PATCH 2152/3789] memcached: Bump

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

diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index ef77c3191ca..b45bef0cce8 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, cyrus_sasl, libevent}:
 
-stdenv.mkDerivation {
-  name = "memcached-1.4.15";
+stdenv.mkDerivation rec {
+  name = "memcached-1.4.17";
 
   src = fetchurl {
-    url = http://memcached.googlecode.com/files/memcached-1.4.15.tar.gz;
-    sha256 = "1d7205cp49s379fdy2qz1gz2a5v4nnv18swzmvbascbmgamj35qn";
+    url = "http://memcached.org/files/${name}.tar.gz";
+    sha1 = "2b4fc706d39579cf355e3358cfd27b44d40bd79c";
   };
 
   buildInputs = [cyrus_sasl libevent];
-- 
GitLab


From eed8f2d91ea4cbd35b4872bf8a7b3246dd4fa14c Mon Sep 17 00:00:00 2001
From: Jacob Hinkle <jacob.hinkle@gmail.com>
Date: Thu, 13 Mar 2014 10:49:45 -0600
Subject: [PATCH 2153/3789] Added Haskell package pbkdf

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

diff --git a/pkgs/development/libraries/haskell/pbkdf/default.nix b/pkgs/development/libraries/haskell/pbkdf/default.nix
new file mode 100644
index 00000000000..29ccc2b63da
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pbkdf/default.nix
@@ -0,0 +1,15 @@
+{ cabal, binary, byteable, bytedump, cryptohash, utf8String }:
+
+cabal.mkDerivation (self: {
+  pname = "pbkdf";
+  version = "1.1.1.1";
+  sha256 = "1nbn8kan43i00g23g8aljxjpaxm9q1qhzxxdgks0mc4mr1f7bifx";
+  buildDepends = [ binary byteable bytedump cryptohash utf8String ];
+  testDepends = [ binary byteable bytedump cryptohash utf8String ];
+  meta = {
+    homepage = "https://github.com/cdornan/pbkdf";
+    description = "Haskell implementation of the PBKDF functions from RFC-2898";
+    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 cc0bab08414..1aeed399c82 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1895,6 +1895,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   pathtype = callPackage ../development/libraries/haskell/pathtype {};
 
+  pbkdf = callPackage ../development/libraries/haskell/pbkdf {};
+
   pcap = callPackage ../development/libraries/haskell/pcap {};
 
   pcapEnumerator = callPackage ../development/libraries/haskell/pcap-enumerator {};
-- 
GitLab


From 0f72effdd96e46401b5c3c3a6839f9c880822585 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 13 Mar 2014 15:05:15 -0400
Subject: [PATCH 2154/3789] The derivation primop doesn't play well with null
 outputs attribute

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

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index ae226f0908b..dd199814760 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -38,7 +38,7 @@ in {
 
 let
   inherit (stdenv.lib)
-    hasAttr getAttr optional optionalString maintainers platforms;
+    hasAttr getAttr optional optionalString optionalAttrs maintainers platforms;
 
   installkernel = writeTextFile { name = "installkernel"; executable=true; text = ''
     #!${stdenv.shell} -e
@@ -73,9 +73,7 @@ let
 
       installsFirmware = (config.isEnabled "FW_LOADER") &&
         (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL"));
-    in {
-      outputs = if isModular then [ "out" "dev" ] else null;
-
+    in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // {
       passthru = {
         inherit version modDirVersion config kernelPatches;
       };
-- 
GitLab


From 9b79d5b298ead3bfdc14e32b179aec1b08434c10 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Mon, 10 Feb 2014 12:07:12 -0800
Subject: [PATCH 2155/3789] Add jenkins continuous integration server and user.

By default the jenkins server is executed under the user "jenkins". Which can be configured using
users.jenkins.* options. If a different user is requested by changing services.jenkins.user then
none of the users.jenkins options apply.

This patch does not include jenkins slave configuration. Some config options will probably change
when this is implemented.

Aspects like the user and environment are typically identical between slave and master. The service
configs are different. The design is for users.jenkins to cover the shared aspects while
services.jenkins and services.jenkins-slave cover the master and slave specific aspects,
respectively.

Another option would be to place everything under services.jenkins and have a config that selects
master vs slave.
---
 nixos/modules/misc/ids.nix                    |  2 +
 nixos/modules/module-list.nix                 |  2 +
 .../jenkins/default.nix                       | 97 +++++++++++++++++++
 .../continuous-integration/jenkins/user.nix   | 61 ++++++++++++
 nixos/tests/default.nix                       |  1 +
 nixos/tests/jenkins.nix                       | 14 +++
 .../jenkins/default.nix                       | 18 ++++
 pkgs/top-level/all-packages.nix               |  2 +
 8 files changed, 197 insertions(+)
 create mode 100644 nixos/modules/services/continuous-integration/jenkins/default.nix
 create mode 100644 nixos/modules/services/continuous-integration/jenkins/user.nix
 create mode 100644 nixos/tests/jenkins.nix
 create mode 100644 pkgs/development/tools/continuous-integration/jenkins/default.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index ad344dfbc11..6b41c7c7c0e 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -117,6 +117,7 @@
       couchdb = 106;
       searx = 107;
       kippo = 108;
+      jenkins = 109;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -212,6 +213,7 @@
       couchdb = 106;
       searx = 107;
       kippo = 108;
+      jenkins = 109;
 
       # 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 8a7d32adf34..f3d6bdb297d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -81,6 +81,8 @@
   ./services/backup/rsnapshot.nix
   ./services/backup/sitecopy-backup.nix
   ./services/backup/tarsnap.nix
+  ./services/continuous-integration/jenkins/default.nix
+  ./services/continuous-integration/jenkins/user.nix
   ./services/databases/4store-endpoint.nix
   ./services/databases/4store.nix
   ./services/databases/couchdb.nix
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
new file mode 100644
index 00000000000..330dbab14e7
--- /dev/null
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -0,0 +1,97 @@
+{ config, pkgs, ... }:
+with pkgs.lib;
+let
+  cfg = config.services.jenkins;
+  userCfg = config.users.jenkins;
+in {
+  options = {
+    services.jenkins = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable the jenkins continuous integration server.
+        '';
+      };
+
+      user = mkOption {
+        default = "jenkins";
+        type = with types; string;
+        description = ''
+          User the jenkins server should execute under. Defaults to the "jenkins" user.
+        '';
+      };
+
+      home = mkOption {
+        default = userCfg.home;
+        type = with types; string;
+        description = ''
+          The path to use as JENKINS_HOME. Defaults to the home of the "jenkins" user.
+        '';
+      };
+
+      port = mkOption {
+        default = 8080;
+        type = types.uniq types.int;
+        description = ''
+          Specifies port number on which the jenkins HTTP interface listens. The default is 8080
+        '';
+      };
+
+      packages = mkOption {
+        default = [ pkgs.stdenv pkgs.git pkgs.jdk pkgs.openssh pkgs.nix ];
+        type = types.listOf types.package;
+        description = ''
+          Packages to add to PATH for the jenkins process.
+        '';
+      };
+
+      environment = mkOption {
+        default = { NIX_REMOTE = "daemon"; };
+        type = with types; attrsOf string;
+        description = ''
+          Additional environment variables to be passed to the jenkins process.
+          The environment will always include JENKINS_HOME.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.jenkins.enable = true;
+
+    systemd.services.jenkins = {
+      description = "jenkins continuous integration server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      environment = {
+        JENKINS_HOME = cfg.home;
+      } // cfg.environment;
+
+      path = cfg.packages;
+
+      script = ''
+        ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins} --httpPort=${toString cfg.port}
+      '';
+
+      postStart = ''
+        until ${pkgs.curl}/bin/curl -L localhost:${toString cfg.port} ; do
+          sleep 10
+        done
+        while true ; do
+          index=`${pkgs.curl}/bin/curl -L localhost:${toString cfg.port}`
+          if [[ !("$index" =~ 'Please wait while Jenkins is restarting' ||
+                  "$index" =~ 'Please wait while Jenkins is getting ready to work') ]]; then
+            exit 0
+          fi
+          sleep 30
+        done
+      '';
+
+      serviceConfig = {
+        User = cfg.user;
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/continuous-integration/jenkins/user.nix b/nixos/modules/services/continuous-integration/jenkins/user.nix
new file mode 100644
index 00000000000..cb4d9a60a4a
--- /dev/null
+++ b/nixos/modules/services/continuous-integration/jenkins/user.nix
@@ -0,0 +1,61 @@
+{ config, pkgs, ... }:
+with pkgs.lib;
+let
+  cfg = config.users.jenkins;
+in {
+  options = {
+    users.jenkins = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable the jenkins user. By default enabling a jenkins service enables the
+          jenkins user. The "user" config property of the service can be used to select a different
+          user.
+        '';
+      };
+
+      extraGroups = mkOption {
+        default = [];
+        type = with types; listOf string;
+        description = ''
+          Extra groups of the "jenkins" user.
+        '';
+      };
+
+      group = mkOption {
+        default = "jenkins";
+        description = ''
+          Default group of "jenkins" user.
+        '';
+      };
+
+      home = mkOption {
+        default = "/var/lib/jenkins";
+        type = types.string;
+        description = ''
+          Home of the "jenkins" user and JENKINS_HOME.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.extraGroups = optional (cfg.group == "jenkins") {
+      name = "jenkins";
+      gid = config.ids.gids.jenkins;
+    };
+
+    users.extraUsers = {
+      jenkins = {
+        description = "jenkins user";
+        createHome = true;
+        home = cfg.home;
+        group = cfg.group;
+        extraGroups = cfg.extraGroups;
+        useDefaultShell = true;
+        uid = config.ids.uids.jenkins;
+      };
+    };
+  };
+}
diff --git a/nixos/tests/default.nix b/nixos/tests/default.nix
index b37a0d5fa0c..5b68862a2cd 100644
--- a/nixos/tests/default.nix
+++ b/nixos/tests/default.nix
@@ -14,6 +14,7 @@ with import ../lib/testing.nix { inherit system minimal; };
   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 {});
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
new file mode 100644
index 00000000000..b05a9d3eaf9
--- /dev/null
+++ b/nixos/tests/jenkins.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+{
+  nodes = {
+    master = { pkgs, config, ... }: {
+        services.jenkins.enable = true;
+      };
+  };
+
+  testScript = ''
+    startAll;
+
+    $master->waitForUnit("jenkins");
+  '';
+}
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
new file mode 100644
index 00000000000..565693ddd79
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "jenkins";
+  version = "1.550";
+
+  src = fetchurl {
+    url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
+    sha256 = "1ziimbfs9kylga0xmxlfsfcc7qsirs5bnx00pa99m2l5sz2ki793";
+  };
+  meta = {
+    description = "An extendable open source continuous integration server.";
+    homepage = http://jenkins-ci.org;
+    maintainers = [ stdenv.lib.maintainers.coconnor ];
+  };
+
+  buildCommand = "ln -s $src $out";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4603179fafc..4bb7acfba1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3686,6 +3686,8 @@ let
 
   jikespg = callPackage ../development/tools/parsing/jikespg { };
 
+  jenkins = callPackage ../development/tools/continuous-integration/jenkins { };
+
   lcov = callPackage ../development/tools/analysis/lcov { };
 
   leiningen = callPackage ../development/tools/build-managers/leiningen { };
-- 
GitLab


From 292ece425e430a297eec2c3044f43e264f3b8dd3 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Tue, 25 Feb 2014 15:44:07 -0800
Subject: [PATCH 2156/3789] match systemd style and silent curl progress bar
 during startup check

---
 .../services/continuous-integration/jenkins/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 330dbab14e7..6e3f6abbb87 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -61,7 +61,7 @@ in {
     users.jenkins.enable = true;
 
     systemd.services.jenkins = {
-      description = "jenkins continuous integration server";
+      description = "Jenkins Continuous Integration Server";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
@@ -76,11 +76,11 @@ in {
       '';
 
       postStart = ''
-        until ${pkgs.curl}/bin/curl -L localhost:${toString cfg.port} ; do
+        until ${pkgs.curl}/bin/curl -s -L localhost:${toString cfg.port} ; do
           sleep 10
         done
         while true ; do
-          index=`${pkgs.curl}/bin/curl -L localhost:${toString cfg.port}`
+          index=`${pkgs.curl}/bin/curl -s -L localhost:${toString cfg.port}`
           if [[ !("$index" =~ 'Please wait while Jenkins is restarting' ||
                   "$index" =~ 'Please wait while Jenkins is getting ready to work') ]]; then
             exit 0
-- 
GitLab


From 4b6e67f6c43c49dd2cb950c152d22cf59b5364a6 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Thu, 27 Feb 2014 10:29:59 -0800
Subject: [PATCH 2157/3789] add platform and license to package metadata.

---
 .../tools/continuous-integration/jenkins/default.nix            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 565693ddd79..5194684261c 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An extendable open source continuous integration server.";
     homepage = http://jenkins-ci.org;
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.coconnor ];
   };
 
-- 
GitLab


From 40de28afca0faa6673948bf99f444faad1d1a2d4 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Thu, 6 Mar 2014 10:06:53 -0800
Subject: [PATCH 2158/3789] remove users.jenkins config start on slave config.
 Uses standard NixOS user config merging. Work in progress: The slave config
 does not actually start the slave agent. This just configures a jenkins user
 if required. Bare minimum to enable a nice jenkins SSH slave.

---
 nixos/modules/module-list.nix                 |  2 +-
 .../jenkins/default.nix                       | 31 +++++++--
 .../continuous-integration/jenkins/slave.nix  | 67 +++++++++++++++++++
 .../continuous-integration/jenkins/user.nix   | 61 -----------------
 nixos/tests/jenkins.nix                       | 21 ++++++
 5 files changed, 115 insertions(+), 67 deletions(-)
 create mode 100644 nixos/modules/services/continuous-integration/jenkins/slave.nix
 delete mode 100644 nixos/modules/services/continuous-integration/jenkins/user.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f3d6bdb297d..b419942057a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -82,7 +82,7 @@
   ./services/backup/sitecopy-backup.nix
   ./services/backup/tarsnap.nix
   ./services/continuous-integration/jenkins/default.nix
-  ./services/continuous-integration/jenkins/user.nix
+  ./services/continuous-integration/jenkins/slave.nix
   ./services/databases/4store-endpoint.nix
   ./services/databases/4store.nix
   ./services/databases/couchdb.nix
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 6e3f6abbb87..c3dc59a9fbd 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -2,7 +2,6 @@
 with pkgs.lib;
 let
   cfg = config.services.jenkins;
-  userCfg = config.users.jenkins;
 in {
   options = {
     services.jenkins = {
@@ -18,15 +17,24 @@ in {
         default = "jenkins";
         type = with types; string;
         description = ''
-          User the jenkins server should execute under. Defaults to the "jenkins" user.
+          User the jenkins server should execute under.
+        '';
+      };
+
+      group = mkOption {
+        default = "jenkins";
+        type = with types; string;
+        description = ''
+          User the jenkins server should execute under.
         '';
       };
 
       home = mkOption {
-        default = userCfg.home;
+        default = "/var/lib/jenkins";
         type = with types; string;
         description = ''
-          The path to use as JENKINS_HOME. Defaults to the home of the "jenkins" user.
+          The path to use as JENKINS_HOME. If the default user "jenkins" is configured then
+          this is the home of the "jenkins" user.
         '';
       };
 
@@ -58,7 +66,20 @@ in {
   };
 
   config = mkIf cfg.enable {
-    users.jenkins.enable = true;
+    users.extraGroups = optional (cfg.group == "jenkins") {
+      name = "jenkins";
+      gid = config.ids.gids.jenkins;
+    };
+
+    users.extraUsers = optional (cfg.user == "jenkins") {
+      name = "jenkins";
+      description = "jenkins user";
+      createHome = true;
+      home = cfg.home;
+      group = cfg.group;
+      useDefaultShell = true;
+      uid = config.ids.uids.jenkins;
+    };
 
     systemd.services.jenkins = {
       description = "Jenkins Continuous Integration Server";
diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix
new file mode 100644
index 00000000000..1d31ab830f6
--- /dev/null
+++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix
@@ -0,0 +1,67 @@
+{ config, pkgs, ... }:
+with pkgs.lib;
+let
+  cfg = config.services.jenkinsSlave;
+  masterCfg = config.services.jenkins;
+in {
+  options = {
+    services.jenkinsSlave = {
+      # todo:
+      # * assure the profile of the jenkins user has a JRE and any specified packages. This would
+      # enable ssh slaves.
+      # * Optionally configure the node as a jenkins ad-hoc slave. This would imply configuration
+      # properties for the master node.
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If true the system will be configured to work as a jenkins slave.
+          If the system is also configured to work as a jenkins master then this has no effect.
+          In progress: Currently only assures the jenkins user is configured.
+        '';
+      };
+
+      user = mkOption {
+        default = "jenkins";
+        type = with types; string;
+        description = ''
+          User the jenkins slave agent should execute under.
+        '';
+      };
+
+      group = mkOption {
+        default = "jenkins";
+        type = with types; string;
+        description = ''
+          User the jenkins slave agent should execute under.
+        '';
+      };
+
+      home = mkOption {
+        default = "/var/lib/jenkins";
+        type = with types; string;
+        description = ''
+          The path to use as JENKINS_HOME. If the default user "jenkins" is configured then
+          this is the home of the "jenkins" user.
+        '';
+      };
+    };
+  };
+
+  config = mkIf (cfg.enable && !masterCfg.enable) {
+    users.extraGroups = optional (cfg.group == "jenkins") {
+      name = "jenkins";
+      gid = config.ids.gids.jenkins;
+    };
+
+    users.extraUsers = optional (cfg.user == "jenkins") {
+      name = "jenkins";
+      description = "jenkins user";
+      createHome = true;
+      home = cfg.home;
+      group = cfg.group;
+      useDefaultShell = true;
+      uid = config.ids.uids.jenkins;
+    };
+  };
+}
diff --git a/nixos/modules/services/continuous-integration/jenkins/user.nix b/nixos/modules/services/continuous-integration/jenkins/user.nix
deleted file mode 100644
index cb4d9a60a4a..00000000000
--- a/nixos/modules/services/continuous-integration/jenkins/user.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ config, pkgs, ... }:
-with pkgs.lib;
-let
-  cfg = config.users.jenkins;
-in {
-  options = {
-    users.jenkins = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable the jenkins user. By default enabling a jenkins service enables the
-          jenkins user. The "user" config property of the service can be used to select a different
-          user.
-        '';
-      };
-
-      extraGroups = mkOption {
-        default = [];
-        type = with types; listOf string;
-        description = ''
-          Extra groups of the "jenkins" user.
-        '';
-      };
-
-      group = mkOption {
-        default = "jenkins";
-        description = ''
-          Default group of "jenkins" user.
-        '';
-      };
-
-      home = mkOption {
-        default = "/var/lib/jenkins";
-        type = types.string;
-        description = ''
-          Home of the "jenkins" user and JENKINS_HOME.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    users.extraGroups = optional (cfg.group == "jenkins") {
-      name = "jenkins";
-      gid = config.ids.gids.jenkins;
-    };
-
-    users.extraUsers = {
-      jenkins = {
-        description = "jenkins user";
-        createHome = true;
-        home = cfg.home;
-        group = cfg.group;
-        extraGroups = cfg.extraGroups;
-        useDefaultShell = true;
-        uid = config.ids.uids.jenkins;
-      };
-    };
-  };
-}
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index b05a9d3eaf9..e6524ec5653 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -1,8 +1,22 @@
+# verifies:
+#   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, ... }:
 {
   nodes = {
     master = { pkgs, config, ... }: {
         services.jenkins.enable = true;
+
+        # should have no effect
+        services.jenkinsSlave.enable = true;
+
+        users.extraUsers.jenkins.extraGroups = [ "users" ];
+      };
+    slave = { pkgs, config, ... }: {
+        services.jenkinsSlave.enable = true;
+
+        users.extraUsers.jenkins.extraGroups = [ "users" ];
       };
   };
 
@@ -10,5 +24,12 @@
     startAll;
 
     $master->waitForUnit("jenkins");
+    print $master->execute("sudo -u jenkins groups");
+    $master->mustSucceed("sudo -u jenkins groups | grep jenkins | grep users");
+
+    print $slave->execute("sudo -u jenkins groups");
+    $slave->mustSucceed("sudo -u jenkins groups | grep jenkins | grep users");
+
+    $slave->mustFail("systemctl status jenkins.service");
   '';
 }
-- 
GitLab


From 344f2e6518ebcc1d07cff19df49ed2f960680087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Mar 2014 21:15:35 +0100
Subject: [PATCH 2159/3789] udisks1: bump to fix CVE-2014-0004

Also systemd unit is now installed.
Thanks to nixpkgs monitor again, as for all my CVE commits.
---
 pkgs/os-specific/linux/udisks/1-default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix
index b53af52755f..19cfec9f065 100644
--- a/pkgs/os-specific/linux/udisks/1-default.nix
+++ b/pkgs/os-specific/linux/udisks/1-default.nix
@@ -3,11 +3,11 @@
 , libxslt, docbook_xsl, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "udisks-1.0.4";
+  name = "udisks-1.0.5";
 
   src = fetchurl {
     url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5";
+    sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j";
   };
 
   patches = [ ./purity.patch ./no-pci-db.patch ];
@@ -28,7 +28,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  configureFlags = "--localstatedir=/var --enable-lvm2";
+  configureFlags = [
+    "--localstatedir=/var"
+    "--enable-lvm2"
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+  ];
 
   meta = {
     homepage = http://www.freedesktop.org/wiki/Software/udisks;
-- 
GitLab


From 766f053cc390114a7d09ec5c87eb253686773773 Mon Sep 17 00:00:00 2001
From: Jacob Hinkle <jacob.hinkle@gmail.com>
Date: Thu, 13 Mar 2014 14:23:34 -0600
Subject: [PATCH 2160/3789] Added Haskell AES package

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

diff --git a/pkgs/development/libraries/haskell/aes/default.nix b/pkgs/development/libraries/haskell/aes/default.nix
new file mode 100644
index 00000000000..6b239bd4e77
--- /dev/null
+++ b/pkgs/development/libraries/haskell/aes/default.nix
@@ -0,0 +1,13 @@
+{ cabal, cereal, monadsTf, random, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "AES";
+  version = "0.2.8";
+  sha256 = "1yf0mhmj294gf1b1m11gixa1xxlbvv0yl60b59fnv5lf0s170jn3";
+  buildDepends = [ cereal monadsTf random transformers ];
+  meta = {
+    description = "Fast AES encryption/decryption for bytestrings";
+    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 1aeed399c82..672b8ffe594 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -526,6 +526,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   adjunctions = callPackage ../development/libraries/haskell/adjunctions {};
 
+  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;
   };
-- 
GitLab


From d6349df0dd5d6ff26cb882ea7b2451fdb832ae6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Mar 2014 21:44:51 +0100
Subject: [PATCH 2161/3789] put systemd unit dirs on the right place

Also see #1936.
---
 pkgs/applications/misc/nut/default.nix            | 2 +-
 pkgs/development/libraries/dbus/default.nix       | 2 +-
 pkgs/os-specific/linux/udisks/2-default.nix       | 2 +-
 pkgs/tools/misc/colord/default.nix                | 6 +++++-
 pkgs/tools/misc/system-config-printer/default.nix | 2 +-
 pkgs/tools/security/pcsclite/default.nix          | 7 ++-----
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix
index 92cd0de8b31..3e972f672cc 100644
--- a/pkgs/applications/misc/nut/default.nix
+++ b/pkgs/applications/misc/nut/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       "--without-powerman" # Until we have it ...
       "--without-cgi"
       "--without-hal"
-      "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
+      "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
       "--with-udev-dir=$(out)/etc/udev"
     ];
 
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 2101f99bbb9..11ad2014663 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -56,7 +56,7 @@ let
       "--localstatedir=/var"
       "--sysconfdir=/etc"
       "--with-session-socket-dir=/tmp"
-      "--with-systemdsystemunitdir=$(out)/lib/systemd"
+      "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     ];
 
     enableParallelBuilding = true;
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 90272d8f095..6c9b743fe17 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--localstatedir=/var"
-    "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     "--with-udevdir=$(out)/lib/udev"
   ];
 
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 525c3ba9f2c..a744adbe05c 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -12,7 +12,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  configureFlags = "--with-udevrulesdir=$out/lib/udev/rules.d --with-systemdsystemunitdir=$out/lib/udev/rules.d --disable-bash-completion";
+  configureFlags = [
+    "--with-udevrulesdir=$out/lib/udev/rules.d"
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+    "--disable-bash-completion"
+  ];
 
   buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
                   bashCompletion ];
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index b0da497c322..51cb1d22a49 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   configureFlags =
     [ "--with-udev-rules"
-      "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
+      "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     ];
 
   postInstall =
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 18fa1045153..3cf8c8157db 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -12,13 +12,10 @@ stdenv.mkDerivation rec {
   # The OS should care on preparing the drivers into this location
   configureFlags = [
     "--enable-usbdropdir=/var/lib/pcsc/drivers"
-    "--with-systemdsystemunitdir=$out/lib/systemd/system" # probably
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+    "--enable-confdir=$(out)/etc"
   ];
 
-  preConfigure = ''
-    configureFlags="$configureFlags --enable-confdir=$out/etc"
-  '';
-
   buildInputs = [ udev dbus_libs perl ];
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From f5464c298232c179508ee77ff35a187393c71264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Mar 2014 22:00:41 +0100
Subject: [PATCH 2162/3789] libpng: update 1.6.9 -> .10 to fix CVE-2014-0333

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

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index c1655bf7f2b..52aaeaf93a4 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,11 +3,11 @@
 assert zlib != null;
 
 let
-  version = "1.6.9";
-  sha256 = "0ji7488fp08b3xa6605zzghzpxawkhhg6jbqzrdw2y38zrvadqzx";
+  version = "1.6.10";
+  sha256 = "0mjsfxc18478y1jxrs3snmx7mvckmghvki9gfhmhl49n1vyz00s0";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
-    sha256 = "0l61y6b03avyxrx8c72x8m73j3b8mj0wx80wdl6w82wgnr2fw4x1";
+    sha256 = "0512q27c26ajzqm2qzmmc7q1frj7cjylls2hxy3y3wg2r6ryizw8";
   };
   whenPatched = stdenv.lib.optionalString apngSupport;
 
-- 
GitLab


From 8fb68289c6facefb84e25cf8cfc4f338a30a9224 Mon Sep 17 00:00:00 2001
From: Ben Doyle <benjamin.peter.doyle@gmail.com>
Date: Thu, 13 Mar 2014 13:15:28 -0400
Subject: [PATCH 2163/3789] newsbeuter: Update from 2.7 to 2.8

---
 .../networking/feedreaders/newsbeuter/default.nix     | 11 ++++++-----
 pkgs/top-level/all-packages.nix                       |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
index 029a6f8e633..e5f18f72ced 100644
--- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json_c, ncurses
+{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses
 , gettext, libiconvOrEmpty, makeWrapper, perl }:
 
 stdenv.mkDerivation rec {
-  name = "newsbeuter-2.7";
+  name = "newsbeuter-2.8";
 
   src = fetchurl {
     url = "http://www.newsbeuter.org/downloads/${name}.tar.gz";
-    sha256 = "0flhzzlbdirjmrq738gmcxqqnifg3kb7plcwqcxshpizmjkhswp6";
+    sha256 = "013qi8yghpms2qq1b3xbrlmfgpj0ybgk0qhj245ni4kpxila0wn8";
+
   };
 
   buildInputs
     # use gettext instead of libintlOrEmpty so we have access to the msgfmt
     # command
-    = [ pkgconfig sqlite curl libxml2 stfl json_c ncurses gettext perl ]
+    = [ pkgconfig sqlite curl libxml2 stfl json-c-0-11 ncurses gettext perl ]
       ++ libiconvOrEmpty
       ++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
 
   preBuild = ''
-    sed -i -e 104,108d config.sh
+    sed -i -e 110,114d config.sh
     sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl
     export LDFLAGS=-lncursesw
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4603179fafc..5740ab4b334 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10512,7 +10512,7 @@ let
     desktopName = "Vimb";
   };
 
-  VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
+  # VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
 
   # Wine cannot be built in 64-bit; use a 32-bit build instead.
   wineStable = callPackage_i686 ../misc/emulators/wine/stable.nix {
-- 
GitLab


From 3cbd1cd7957b0c0c0e98197cc053d59a4a2ea409 Mon Sep 17 00:00:00 2001
From: Ben Doyle <benjamin.peter.doyle@gmail.com>
Date: Thu, 13 Mar 2014 16:48:34 -0400
Subject: [PATCH 2164/3789] newsbeuter: bump development version to latest
 master

---
 .../applications/networking/feedreaders/newsbeuter/dev.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix
index 17e97d92b89..4390360ff9e 100644
--- a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix
+++ b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix
@@ -2,11 +2,12 @@
 , gettext, libiconvOrEmpty, makeWrapper, perl }:
 
 stdenv.mkDerivation rec {
-  name = "newsbeuter-dev-20131118";
+  name = "newsbeuter-dev-20140309";
 
   src = fetchgit {
     url = "https://github.com/akrennmair/newsbeuter.git";
-    rev = "18b73f7d44a99a698d4878fe7d226f55842132c2";
+    rev = "1427bdb0705806368db39576a9b803df82fa0415";
+    sha256 = "b29a304a46bf56b439d0d35ea586f7fd0fbf1a5565dca95de76e774885d8b64b";
   };
 
   buildInputs
@@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
       ++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
 
   preBuild = ''
-    sed -i -e 104,108d config.sh
+    sed -i -e 110,114d config.sh
     sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl
     export LDFLAGS=-lncursesw
   '';
-- 
GitLab


From 9ae063df13b37d22ff477ef6b5bda3a0326efb35 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 13 Mar 2014 22:11:33 +0100
Subject: [PATCH 2165/3789] Update logcheck from 1.3.15 to 1.3.16

---
 pkgs/tools/system/logcheck/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix
index 7d15ade348c..208ff837b34 100644
--- a/pkgs/tools/system/logcheck/default.nix
+++ b/pkgs/tools/system/logcheck/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   _name   = "logcheck";
-  version = "1.3.15";
+  version = "1.3.16";
   name    = "${_name}-${version}";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/l/${_name}/${_name}_${version}.tar.gz";
-    sha256 = "1rdrs12hkm5i5yyz89a6cwhf4fzjkbcd4q4zy6sk148aji9lg6xj";
+    url = "mirror://debian/pool/main/l/${_name}/${_name}_${version}.tar.xz";
+    sha256 = "1rmq4s2fj86226ncw2kdjvjbi29375gd7vdq62fsbjxm4m6nzsiy";
   };
 
   preConfigure = ''
-- 
GitLab


From ef32fbe6a438c0c1cb97086b909bb0cc8a4ff96f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Mar 2014 22:32:17 +0100
Subject: [PATCH 2166/3789] libpng12, libpng15: minor updates of legacy
 versions

---
 pkgs/development/libraries/libpng/12.nix | 4 ++--
 pkgs/development/libraries/libpng/15.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index 031e2aa1a91..094483da660 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -3,11 +3,11 @@
 assert zlib != null;
 
 stdenv.mkDerivation rec {
-  name = "libpng-1.2.50";
+  name = "libpng-1.2.51";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "1rz8v3cvy1zzpagxn91lj8swb9vf75rz3yyi18v7zb4jihgzh927";
+    sha256 = "0jkdlmnvn72jwm94dp98pznm9fy7alvcr2zpfh2dgbr2n09vimy7";
   };
 
   propagatedBuildInputs = [ zlib ];
diff --git a/pkgs/development/libraries/libpng/15.nix b/pkgs/development/libraries/libpng/15.nix
index 8f62ef1e8dc..15351798633 100644
--- a/pkgs/development/libraries/libpng/15.nix
+++ b/pkgs/development/libraries/libpng/15.nix
@@ -3,11 +3,11 @@
 assert zlib != null;
 
 stdenv.mkDerivation rec {
-  name = "libpng-1.5.15";
+  name = "libpng-1.5.18";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "1iaplghmv5qhd4dgwfymhp42sh27vz6s2107jk698xm57z2v9hwm";
+    sha256 = "119m71p60iq3yn2n8ckl4j4cxvbpddj6sgdpa6g05jzyg7vw54y0";
   };
 
   propagatedBuildInputs = [ zlib ];
-- 
GitLab


From dc3f762019a038ae00b783bc9095a0486d7d1f31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Mar 2014 22:54:58 +0100
Subject: [PATCH 2167/3789] goffice: minor update, dep cleanup

Also enable parallel building.
---
 pkgs/desktops/gnome-3/misc/goffice/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/goffice/default.nix b/pkgs/desktops/gnome-3/misc/goffice/default.nix
index 51d259314a7..0390fc13368 100644
--- a/pkgs/desktops/gnome-3/misc/goffice/default.nix
+++ b/pkgs/desktops/gnome-3/misc/goffice/default.nix
@@ -1,19 +1,23 @@
-{ fetchurl, stdenv, pkgconfig, intltool, bzip2, glib, gdk_pixbuf, gtk3
-, libgsf, libxml2, cairo, pango, librsvg, libspectre }:
+{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3
+, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
 
 stdenv.mkDerivation rec {
-  name = "goffice-0.10.9";
+  name = "goffice-0.10.12";
 
   src = fetchurl {
     url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
-    sha256 = "0xc82hymhkdglnksd3r7405p39d5ym826rwaa7dfkps5crjwq8cg";
+    sha256 = "0vh0sdig5n8sxzh4xx82lm8y8d0jcdhc2ipb1kq02qs142zs74ff";
   };
 
+  nativeBuildInputs = [ pkgconfig intltool ];
+
   propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection?
-    pkgconfig intltool bzip2 glib gdk_pixbuf gtk3
-    libgsf libxml2 cairo pango librsvg libspectre
+    glib gtk3 libxml2 cairo pango libgsf
   ];
 
+  buildInputs = [ libxslt librsvg ];
+
+  enableParallelBuilding = true;
   doCheck = true;
 
   meta = {
-- 
GitLab


From db9599c4a05ec4e959d69c861d4ba50b0c491ac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Mar 2014 22:55:52 +0100
Subject: [PATCH 2168/3789] gnumeric: minor update 1.12.9 -> .12

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

diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index 0108f934693..0ae27e322b7 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnumeric-1.12.9";
+  name = "gnumeric-1.12.12";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
-    sha256 = "1rv2ifw6rp0iza4fkf3bffvdkyi77dwvzdnvcbpqcyn2kxfsvlsc";
+    sha256 = "096i9x6b4i6x24vc4lsxx8fg2n2pjs2jb6x3bkg3ppa2c60w1jq0";
   };
 
   preConfigure = ''sed -i 's/\(SUBDIRS.*\) doc/\1/' Makefile.in''; # fails when installing docs
-- 
GitLab


From 147e6ed4c96d290cd01944d3293712410709ea09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 13 Mar 2014 23:39:07 +0100
Subject: [PATCH 2169/3789] pcsclite: update download url

The current one doesn't work.
---
 pkgs/tools/security/pcsclite/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 3cf8c8157db..d069c183842 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "pcsclite-${version}";
 
   src = fetchurl {
-    url = "http://ftp.de.debian.org/debian/pool/main/p/pcsc-lite/pcsc-lite_${version}.orig.tar.bz2";
+    url = "https://alioth.debian.org/frs/download.php/file/3963/pcsc-lite-${version}.tar.bz2";
     sha256 = "04i63zi9ayg38z3cahp6gf3rgx23w17bmcpdccm2hvaj63blnz30";
   };
 
-- 
GitLab


From aa428305381740f1c8f95cb8fb1ec02d1dcb50b5 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, 14 Mar 2014 12:30:10 +0800
Subject: [PATCH 2170/3789] add ekho 5.8.2, a Chinese TTS software

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

diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix
new file mode 100644
index 00000000000..dd9b830be84
--- /dev/null
+++ b/pkgs/applications/audio/ekho/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, pkgconfig
+, libsndfile, pulseaudio
+}:
+
+let
+  version = "5.8.2";
+in stdenv.mkDerivation rec {
+  name = "ekho-${version}";
+
+  meta = with stdenv.lib; {
+    description = "Chinese text-to-speech software";
+    homepage    = "http://www.eguidedog.net/ekho.php";
+    longDescription = ''
+      Ekho (余音) is a free, open source and multilingual text-to-speech (TTS)
+      software. It supports Cantonese (Chinese dialect spoken in Hong Kong and
+      part of Guangdong province), Mandarin (standard Chinese), Zhaoan Hakka
+      (a dialect in Taiwan), Tibetan, Ngangien (an ancient Chinese before
+      Yuan Dynasty) and Korean (in trial).
+    '';
+    license        = licenses.gpl2Plus;
+    platforms      = platforms.linux;
+    hydraPlatforms = [];
+    maintainers    = with maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${name}.tar.xz";
+    sha256 = "0ym6lpcpsvwvsiwlzkl1509a2hljwcw7synngrmqjq1n49ww00nj";
+  };
+
+  preConfigure = with stdenv.lib; ''
+    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${optionalString stdenv.is64bit "-D_x86_64"}"
+    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DEKHO_DATA_PATH=\"$out/share/ekho-data\""
+  '';
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ libsndfile pulseaudio ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4603179fafc..39c8a911364 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7729,6 +7729,8 @@ let
 
   ed = callPackage ../applications/editors/ed { };
 
+  ekho = callPackage ../applications/audio/ekho { };
+
   elinks = callPackage ../applications/networking/browsers/elinks { };
 
   elvis = callPackage ../applications/editors/elvis { };
-- 
GitLab


From 191bd1c26a3e88938dd34e34c5b0c764adf45f0a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 14 Mar 2014 10:34:21 +0100
Subject: [PATCH 2171/3789] dovecot22: Update from 2.2.6 to 2.2.12

---
 .../mail/dovecot/2.2.x-module_dir.patch       | 69 ++++++++++---------
 pkgs/servers/mail/dovecot/2.2.x.nix           |  4 +-
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
index cce63fe250c..3ba11d41b1b 100644
--- a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
+++ b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
@@ -1,6 +1,6 @@
-diff -ur dovecot-2.2.2-orig/src/auth/main.c dovecot-2.2.2/src/auth/main.c
---- dovecot-2.2.2-orig/src/auth/main.c	2013-03-13 15:26:46.000000000 +0100
-+++ dovecot-2.2.2/src/auth/main.c	2013-05-20 20:23:58.126024535 +0200
+diff -ur dovecot-2.2.12-orig/src/auth/main.c dovecot-2.2.12/src/auth/main.c
+--- dovecot-2.2.12-orig/src/auth/main.c	2014-02-11 23:23:37.000000000 +0100
++++ dovecot-2.2.12/src/auth/main.c	2014-03-14 09:28:17.642334838 +0100
 @@ -193,7 +193,7 @@
  	mod_set.debug = global_auth_settings->debug;
  	mod_set.filter_callback = auth_module_filter;
@@ -19,10 +19,10 @@ diff -ur dovecot-2.2.2-orig/src/auth/main.c dovecot-2.2.2/src/auth/main.c
  					  &mod_set);
  	module_dir_init(modules);
  }
-diff -ur dovecot-2.2.2-orig/src/config/all-settings.c dovecot-2.2.2/src/config/all-settings.c
---- dovecot-2.2.2-orig/src/config/all-settings.c	2013-05-15 12:20:55.000000000 +0200
-+++ dovecot-2.2.2/src/config/all-settings.c	2013-05-21 00:31:46.624073562 +0200
-@@ -766,7 +766,7 @@
+diff -ur dovecot-2.2.12-orig/src/config/all-settings.c dovecot-2.2.12/src/config/all-settings.c
+--- dovecot-2.2.12-orig/src/config/all-settings.c	2014-02-11 23:31:37.000000000 +0100
++++ dovecot-2.2.12/src/config/all-settings.c	2014-03-14 09:32:08.907608311 +0100
+@@ -773,7 +773,7 @@
  	.last_valid_gid = 0,
  
  	.mail_plugins = "",
@@ -31,18 +31,19 @@ diff -ur dovecot-2.2.2-orig/src/config/all-settings.c dovecot-2.2.2/src/config/a
  
  	.mail_log_prefix = "%s(%u): ",
  
-@@ -3274,7 +3274,7 @@
+@@ -3304,7 +3304,7 @@
  	.base_dir = PKG_RUNDIR,
  	.libexec_dir = PKG_LIBEXECDIR,
  	.mail_plugins = "",
 -	.mail_plugin_dir = MODULEDIR,
 +	.mail_plugin_dir = "/var/lib/dovecot/modules",
+ 	.auth_socket_path = "auth-userdb",
  	.doveadm_socket_path = "doveadm-server",
  	.doveadm_worker_count = 0,
- 	.doveadm_port = 0,
-diff -ur dovecot-2.2.2-orig/src/config/config-parser.c dovecot-2.2.2/src/config/config-parser.c
---- dovecot-2.2.2-orig/src/config/config-parser.c	2013-02-04 22:05:42.000000000 +0100
-+++ dovecot-2.2.2/src/config/config-parser.c	2013-05-20 20:23:58.106024534 +0200
+Only in dovecot-2.2.12/src/config: all-settings.c.orig
+diff -ur dovecot-2.2.12-orig/src/config/config-parser.c dovecot-2.2.12/src/config/config-parser.c
+--- dovecot-2.2.12-orig/src/config/config-parser.c	2014-02-11 23:23:37.000000000 +0100
++++ dovecot-2.2.12/src/config/config-parser.c	2014-03-14 09:28:17.645334840 +0100
 @@ -990,7 +990,7 @@
  
  	memset(&mod_set, 0, sizeof(mod_set));
@@ -52,9 +53,9 @@ diff -ur dovecot-2.2.2-orig/src/config/config-parser.c dovecot-2.2.2/src/config/
  	module_dir_init(modules);
  
  	i_array_init(&new_roots, 64);
-diff -ur dovecot-2.2.2-orig/src/dict/main.c dovecot-2.2.2/src/dict/main.c
---- dovecot-2.2.2-orig/src/dict/main.c	2013-02-04 22:05:42.000000000 +0100
-+++ dovecot-2.2.2/src/dict/main.c	2013-05-20 20:23:58.101024534 +0200
+diff -ur dovecot-2.2.12-orig/src/dict/main.c dovecot-2.2.12/src/dict/main.c
+--- dovecot-2.2.12-orig/src/dict/main.c	2014-02-11 23:23:37.000000000 +0100
++++ dovecot-2.2.12/src/dict/main.c	2014-03-14 09:28:17.645334840 +0100
 @@ -61,7 +61,7 @@
  	mod_set.abi_version = DOVECOT_ABI_VERSION;
  	mod_set.require_init_funcs = TRUE;
@@ -64,22 +65,23 @@ diff -ur dovecot-2.2.2-orig/src/dict/main.c dovecot-2.2.2/src/dict/main.c
  	module_dir_init(modules);
  
  	/* Register only after loading modules. They may contain SQL drivers,
-diff -ur dovecot-2.2.2-orig/src/doveadm/doveadm-settings.c dovecot-2.2.2/src/doveadm/doveadm-settings.c
---- dovecot-2.2.2-orig/src/doveadm/doveadm-settings.c	2013-04-07 19:13:06.000000000 +0200
-+++ dovecot-2.2.2/src/doveadm/doveadm-settings.c	2013-05-20 20:23:58.399024539 +0200
-@@ -76,7 +76,7 @@
+diff -ur dovecot-2.2.12-orig/src/doveadm/doveadm-settings.c dovecot-2.2.12/src/doveadm/doveadm-settings.c
+--- dovecot-2.2.12-orig/src/doveadm/doveadm-settings.c	2014-02-11 23:23:37.000000000 +0100
++++ dovecot-2.2.12/src/doveadm/doveadm-settings.c	2014-03-14 09:32:56.540087069 +0100
+@@ -77,7 +77,7 @@
  	.base_dir = PKG_RUNDIR,
  	.libexec_dir = PKG_LIBEXECDIR,
  	.mail_plugins = "",
 -	.mail_plugin_dir = MODULEDIR,
 +	.mail_plugin_dir = "/var/lib/dovecot/modules",
+ 	.auth_socket_path = "auth-userdb",
  	.doveadm_socket_path = "doveadm-server",
  	.doveadm_worker_count = 0,
- 	.doveadm_port = 0,
-diff -ur dovecot-2.2.2-orig/src/lib-fs/fs-api.c dovecot-2.2.2/src/lib-fs/fs-api.c
---- dovecot-2.2.2-orig/src/lib-fs/fs-api.c	2013-04-18 16:07:26.000000000 +0200
-+++ dovecot-2.2.2/src/lib-fs/fs-api.c	2013-05-20 20:23:58.099024534 +0200
-@@ -82,7 +82,7 @@
+Only in dovecot-2.2.12/src/doveadm: doveadm-settings.c.orig
+diff -ur dovecot-2.2.12-orig/src/lib-fs/fs-api.c dovecot-2.2.12/src/lib-fs/fs-api.c
+--- dovecot-2.2.12-orig/src/lib-fs/fs-api.c	2014-02-11 23:23:37.000000000 +0100
++++ dovecot-2.2.12/src/lib-fs/fs-api.c	2014-03-14 09:28:17.646334843 +0100
+@@ -89,7 +89,7 @@
  	mod_set.abi_version = DOVECOT_ABI_VERSION;
  	mod_set.ignore_missing = TRUE;
  
@@ -88,10 +90,11 @@ diff -ur dovecot-2.2.2-orig/src/lib-fs/fs-api.c dovecot-2.2.2/src/lib-fs/fs-api.
  					     module_name, &mod_set);
  	module_dir_init(fs_modules);
  
-diff -ur dovecot-2.2.2-orig/src/lib-ssl-iostream/iostream-ssl.c dovecot-2.2.2/src/lib-ssl-iostream/iostream-ssl.c
---- dovecot-2.2.2-orig/src/lib-ssl-iostream/iostream-ssl.c	2013-04-09 22:45:19.000000000 +0200
-+++ dovecot-2.2.2/src/lib-ssl-iostream/iostream-ssl.c	2013-05-20 20:23:58.089024534 +0200
-@@ -28,7 +28,7 @@
+Only in dovecot-2.2.12/src/lib-fs: fs-api.c.orig
+diff -ur dovecot-2.2.12-orig/src/lib-ssl-iostream/iostream-ssl.c dovecot-2.2.12/src/lib-ssl-iostream/iostream-ssl.c
+--- dovecot-2.2.12-orig/src/lib-ssl-iostream/iostream-ssl.c	2014-02-11 23:23:37.000000000 +0100
++++ dovecot-2.2.12/src/lib-ssl-iostream/iostream-ssl.c	2014-03-14 09:28:17.646334843 +0100
+@@ -30,7 +30,7 @@
  	memset(&mod_set, 0, sizeof(mod_set));
  	mod_set.abi_version = DOVECOT_ABI_VERSION;
  	mod_set.setting_name = "<built-in lib-ssl-iostream lookup>";
@@ -100,10 +103,11 @@ diff -ur dovecot-2.2.2-orig/src/lib-ssl-iostream/iostream-ssl.c dovecot-2.2.2/sr
  
  	ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs");
  	if (ssl_vfuncs == NULL) {
-diff -ur dovecot-2.2.2-orig/src/lib-storage/mail-storage-settings.c dovecot-2.2.2/src/lib-storage/mail-storage-settings.c
---- dovecot-2.2.2-orig/src/lib-storage/mail-storage-settings.c	2013-05-15 12:20:00.000000000 +0200
-+++ dovecot-2.2.2/src/lib-storage/mail-storage-settings.c	2013-05-20 20:23:57.858024531 +0200
-@@ -260,7 +260,7 @@
+Only in dovecot-2.2.12/src/lib-ssl-iostream: iostream-ssl.c.orig
+diff -ur dovecot-2.2.12-orig/src/lib-storage/mail-storage-settings.c dovecot-2.2.12/src/lib-storage/mail-storage-settings.c
+--- dovecot-2.2.12-orig/src/lib-storage/mail-storage-settings.c	2014-02-11 23:23:37.000000000 +0100
++++ dovecot-2.2.12/src/lib-storage/mail-storage-settings.c	2014-03-14 09:28:17.646334843 +0100
+@@ -262,7 +262,7 @@
  	.last_valid_gid = 0,
  
  	.mail_plugins = "",
@@ -112,3 +116,4 @@ diff -ur dovecot-2.2.2-orig/src/lib-storage/mail-storage-settings.c dovecot-2.2.
  
  	.mail_log_prefix = "%s(%u): ",
  
+Only in dovecot-2.2.12/src/lib-storage: mail-storage-settings.c.orig
diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix
index 06635e33954..2b1aca3e926 100644
--- a/pkgs/servers/mail/dovecot/2.2.x.nix
+++ b/pkgs/servers/mail/dovecot/2.2.x.nix
@@ -2,13 +2,13 @@
 , inotifyTools }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.2.6";
+  name = "dovecot-2.2.12";
 
   buildInputs = [perl systemd openssl pam bzip2 zlib openldap inotifyTools];
 
   src = fetchurl {
     url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
-    sha256 = "1rfnsg0a57cv02pl68h3jhbd5v3071a75bvf9gs95fd41g72n9v2";
+    sha256 = "0mlcwgrxfwy1fqfk3wwbh1h9f0jddg4rnj612ckj1zv5asp1rppk";
   };
 
   preConfigure = ''
-- 
GitLab


From 6a09ce8c01f5c84aa6cf2c7e4a6492ca166699e5 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 14 Mar 2014 10:35:36 +0100
Subject: [PATCH 2172/3789] check: update from 0.9.11 to 0.9.12

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

diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix
index a424041dbc2..a0e1bcfa612 100644
--- a/pkgs/development/libraries/check/default.nix
+++ b/pkgs/development/libraries/check/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv }:
 
-let version = "0.9.11"; in
+let version = "0.9.12"; in
 stdenv.mkDerivation {
   name = "check-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz";
-    sha256 = "0dk9jx9hjjwsgly0iwvr5hhw870zlx21gwar7zxlzfq0zdzqqkpa";
+    sha256 = "18qybf3s25s1gydp2lwbc4icnmdc6f9sj21fllcwm81kw5apxm67";
   };
 
   # Test can randomly fail: http://hydra.nixos.org/build/7243912
-- 
GitLab


From 74488f2aded2501a8d8294510806f6399a822645 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 14 Mar 2014 10:35:36 +0100
Subject: [PATCH 2173/3789] clisp_2_44_1: update from 2.44.1 to 2.49

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

diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix
index 521933b0ed1..7b811732a62 100644
--- a/pkgs/development/interpreters/clisp/2.44.1.nix
+++ b/pkgs/development/interpreters/clisp/2.44.1.nix
@@ -3,12 +3,12 @@
 , libffi, libffcall, coreutils }:
         
 stdenv.mkDerivation rec {
-  v = "2.44.1";
+  v = "2.49";
   name = "clisp-${v}";
   
   src = fetchurl {
     url = "mirror://gnu/clisp/release/${v}/${name}.tar.gz";
-    sha256 = "0rkp6j6rih4s5d9acifh7pi4b9xfgcspif512l269dqy9qgyy4j1";
+    sha256 = "0rp82nqp5362isl9i34rwgg04cidz7izljd9d85pqcw1qr964bxx";
   };
 
   buildInputs =
-- 
GitLab


From b86692e00d6112d50fe05745094d843f58778b4b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 14 Mar 2014 10:35:36 +0100
Subject: [PATCH 2174/3789] mpg123: update from 1.18.1 to 1.19.0

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

diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 8d4b8d4d778..3edb7ae6793 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, alsaLib }:
 
 stdenv.mkDerivation {
-  name = "mpg123-1.18.1";
+  name = "mpg123-1.19.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/mpg123/mpg123-1.18.1.tar.bz2;
-    sha256 = "0bb5hv0qw3ln09xisi7d19gb4p2y69sx3905rdc293q3gr7khvdw";
+    url = mirror://sourceforge/mpg123/mpg123-1.19.0.tar.bz2;
+    sha256 = "06xhd68mj9yp0r6l771aq0d7xgnl402a3wm2mvhxmd3w3ph29446";
   };
 
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
-- 
GitLab


From ceb1f815b4895ac7db29e2735c0f179aca063291 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 14 Mar 2014 10:35:37 +0100
Subject: [PATCH 2175/3789] SDL2: update from 2.0.1 to 2.0.2

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

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index c3b33dfaf62..6964d8ac804 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -22,11 +22,11 @@ let
       '';
 in
 stdenv.mkDerivation rec {
-  name = "SDL2-2.0.1";
+  name = "SDL2-2.0.2";
 
   src = fetchurl {
     url = "http://www.libsdl.org/release/${name}.tar.gz";
-    sha256 = "1w1jcz7hilk4fl8wlhiwvd1licg8lwy0brqz05562xv7l81fkrqa";
+    sha256 = "0l78h3wlirnxxrdw3kkm9amhgjn6xrs9l5j871r552wabbw5f0ar";
   };
 
   # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
-- 
GitLab


From 6a2aede374558f1c690845e29f955f401c7bb7bc Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 14 Mar 2014 10:35:37 +0100
Subject: [PATCH 2176/3789] SDL_ttf: update from 2.0.9 to 2.0.11

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

diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix
index 591a4bfbd6d..696b6bd0ac8 100644
--- a/pkgs/development/libraries/SDL_ttf/default.nix
+++ b/pkgs/development/libraries/SDL_ttf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL, freetype }:
 
 stdenv.mkDerivation {
-  name = "SDL_ttf-2.0.9";
+  name = "SDL_ttf-2.0.11";
 
   src = fetchurl {
-    url = http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.9.tar.gz;
-    sha256 = "0ls6anmlmwrmy21p3y9nfyl6fkwz4jpgh74kw7xd0hwbg5v8h95l";
+    url = http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz;
+    sha256 = "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j";
   };
 
   buildInputs = [SDL freetype];
-- 
GitLab


From 69fff447aa2eaad81ad9765452ff238e478a70b6 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 14 Mar 2014 10:35:37 +0100
Subject: [PATCH 2177/3789] alsaUtils: update from 1.0.27 to 1.0.27.2

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

diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index 484ecd06bb0..e675072975d 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}:
 
 stdenv.mkDerivation rec {
-  name = "alsa-utils-1.0.27";
+  name = "alsa-utils-1.0.27.2";
 
   src = fetchurl {
     # url = "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2";
     url = "http://alsa.cybermirror.org/utils/${name}.tar.bz2";
-    sha256 = "1vssljbdzf0psqhhd7w9m9mzb0sl2kgx9fagkja25sqw6ivwsxkg";
+    sha256 = "1sjjngnq50jv5ilwsb4zys6smifni3bd6fn28gbnhfrg14wsrgq2";
   };
 
   buildInputs = [ alsaLib ncurses libsamplerate ];
-- 
GitLab


From d23e7fdfc3e3ca6db57641592598ca3b7f569bb0 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Fri, 14 Mar 2014 11:52:06 +0100
Subject: [PATCH 2178/3789] OpenAFS client update

---
 pkgs/servers/openafs-client/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
index ba0b80fc61e..47c8c12edef 100644
--- a/pkgs/servers/openafs-client/default.nix
+++ b/pkgs/servers/openafs-client/default.nix
@@ -4,11 +4,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation {
-  name = "openafs-1.6.1-${kernel.version}";
+  name = "openafs-1.6.6-${kernel.version}";
 
   src = fetchurl {
-    url = http://www.openafs.org/dl/openafs/1.6.1/openafs-1.6.1-src.tar.bz2;
-    sha256 = "1c7mid0dwl2x0sikr70bi5cs881y6pa4dfwkdmr3jscvx3wgfpnh";
+    url = http://www.openafs.org/dl/openafs/1.6.6/openafs-1.6.6-src.tar.bz2;
+    sha256 = "0xfa64hvz0avp89zgz8ksmp24s6ns0z3103m4mspshhhdlikypk3";
   };
 
   buildInputs = [ autoconf automake flex yacc ncurses perl which ];
@@ -41,6 +41,5 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.ipl10;
     platforms = stdenv.lib.platforms.linux;
     maintainers = stdenv.lib.maintainers.z77z;
-    broken = true;
   };
 }
-- 
GitLab


From c0c835dccee7d05df14d424eb7a4fbb9bd3684da Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 14 Mar 2014 12:09:05 +0000
Subject: [PATCH 2179/3789] keybinder: add gtk3 support

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

diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix
index 20e2cd2218f..96a3c9a3a8d 100644
--- a/pkgs/development/libraries/keybinder/default.nix
+++ b/pkgs/development/libraries/keybinder/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome_common
-, gtk_doc, gtk2, python, pygtk, pygobject, lua
+{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3, pygobject3, pygtk
+, gtk_doc, gtk2, python, pygtk3, pygobject, lua, libX11, libXext, libXrender, gobjectIntrospection
 }:
 
 stdenv.mkDerivation rec {
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    autoconf automake libtool pkgconfig gnome_common gtk_doc gtk2
-    python pygtk pygobject lua
+    autoconf automake libtool pkgconfig gnome3.gnome_common gtk_doc gnome3.gtk3
+    python pygobject3 pygtk lua libX11 libXext libXrender gobjectIntrospection gtk2
   ];
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4bb7acfba1f..71b50043f11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4596,7 +4596,6 @@ let
   judy = callPackage ../development/libraries/judy { };
 
   keybinder = callPackage ../development/libraries/keybinder {
-    inherit (gnome2) gnome_common;
     automake = automake111x;
     lua = lua5_1;
   };
-- 
GitLab


From 5a807eaedbb1806b6da460a9a0469f7d76432f26 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Mar 2014 13:24:04 +0100
Subject: [PATCH 2180/3789] flashplayer: Add license field

---
 .../browsers/mozilla-plugins/flashplayer-11/default.nix          | 1 +
 1 file changed, 1 insertion(+)

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 5bf0d0785a3..25eab66293d 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -88,5 +88,6 @@ stdenv.mkDerivation {
   meta = {
     description = "Adobe Flash Player browser plugin";
     homepage = http://www.adobe.com/products/flashplayer/;
+    license = "unfree";
   };
 }
-- 
GitLab


From a48658c3c645e8229202bff1e0dc715907b3318b Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 14 Mar 2014 13:28:41 +0100
Subject: [PATCH 2181/3789] keybinder: remove redundant arg

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

diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix
index 96a3c9a3a8d..0cc875e2656 100644
--- a/pkgs/development/libraries/keybinder/default.nix
+++ b/pkgs/development/libraries/keybinder/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3, pygobject3, pygtk
-, gtk_doc, gtk2, python, pygtk3, pygobject, lua, libX11, libXext, libXrender, gobjectIntrospection
+, gtk_doc, gtk2, python, pygobject, lua, libX11, libXext, libXrender, gobjectIntrospection
 }:
 
 stdenv.mkDerivation rec {
-- 
GitLab


From 2156be8449f118f19d73bd859131b8e90d291ac4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Mar 2014 13:32:01 +0100
Subject: [PATCH 2182/3789] Don't enable Flash by default in the Firefox
 wrapper

---
 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 71b50043f11..987d94029d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9225,7 +9225,7 @@ let
     , icon ? "${browser}/lib/${browser.name}/icons/mozicon128.png" }:
     let
       cfg = stdenv.lib.attrByPath [ browserName ] {} config;
-      enableAdobeFlash = cfg.enableAdobeFlash or true;
+      enableAdobeFlash = cfg.enableAdobeFlash or false;
       enableGnash = cfg.enableGnash or false;
     in
     import ../applications/networking/browsers/firefox/wrapper.nix {
-- 
GitLab


From 3f6603a80e9f626f638fe446d95cd873e763f5d8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 14 Mar 2014 09:08:04 -0400
Subject: [PATCH 2183/3789] Fix alsa-utils

---
 pkgs/os-specific/linux/alsa-utils/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index e675072975d..6167696f336 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -16,12 +16,6 @@ stdenv.mkDerivation rec {
 
   installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy";
 
-  preConfigure =
-    ''
-      # Ensure that ‘90-alsa-restore.rules.in’ gets rebuilt.
-      rm alsactl/90-alsa-restore.rules
-    '';
-
   meta = {
     homepage = http://www.alsa-project.org/;
     description = "ALSA, the Advanced Linux Sound Architecture utils";
-- 
GitLab


From 2be35c3e99855b695a7599811dec24cc0fcdf282 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Fri, 14 Mar 2014 14:39:21 +0100
Subject: [PATCH 2184/3789] OpenAFS client fixes

Make it stoppable.  Add support for crypt and dynroot-sparse.
---
 .../openafs-client/default.nix                | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix
index 4a888b64bd3..b34ebc3663e 100644
--- a/nixos/modules/services/network-filesystems/openafs-client/default.nix
+++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix
@@ -46,6 +46,16 @@ in
         description = "Cache directory.";
       };
 
+      crypt = mkOption {
+        default = false;
+        description = "Whether to enable (weak) protocol encryption.";
+      };
+
+      sparse = mkOption {
+        default = false;
+        description = "Minimal cell list in /afs.";
+      };
+
     };
   };
 
@@ -70,18 +80,23 @@ in
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
-	preStart = ''
-	  mkdir -m 0755 /afs || true
-	  mkdir -m 0755 -p ${cfg.cacheDirectory} || true
+        preStart = ''
+          mkdir -p -m 0755 /afs
+          mkdir -m 0700 -p ${cfg.cacheDirectory}
           ${pkgs.module_init_tools}/sbin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true
-          ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} -dynroot -fakestat
-	'';
-
-	postStop = ''
-	  umount /afs
+          ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} -fakestat -afsdb
+          ${openafsPkgs}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"}
+        '';
+
+        # Doing this in preStop, because after these commands AFS is basically
+        # stopped, so systemd has nothing to do, just noticing it.  If done in
+        # postStop, then we get a hang + kernel oops, because AFS can't be
+        # stopped simply by sending signals to processes.
+        preStop = ''
+          ${pkgs.utillinux}/bin/umount /afs
           ${openafsPkgs}/sbin/afsd -shutdown
-	  rmmod libafs
-	'';
+          ${pkgs.module_init_tools}/sbin/rmmod libafs
+        '';
 
       };
 
-- 
GitLab


From 50d144278d6cde36592a1bd30569a52d520ad8b0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 14 Mar 2014 11:56:54 -0400
Subject: [PATCH 2185/3789] mysql module: Specify --basedir

Needed for mariadb and safe for mysql
---
 nixos/modules/services/databases/mysql.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 62fbc2a1415..7e42438fe6d 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -15,7 +15,7 @@ let
   pidFile = "${cfg.pidDir}/mysqld.pid";
 
   mysqldOptions =
-    "--user=${cfg.user} --datadir=${cfg.dataDir} " +
+    "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${mysql} " +
     "--pid-file=${pidFile}";
 
   myCnf = pkgs.writeText "my.cnf"
-- 
GitLab


From a0d574f19b2ea3fecb539842ea9d64aca861f085 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 14 Mar 2014 14:55:30 -0400
Subject: [PATCH 2186/3789] firewall: Allow setting rate limits for pings

---
 nixos/modules/services/networking/firewall.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index babde3e942b..07e05fa6d05 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -171,6 +171,17 @@ in
         '';
     };
 
+    networking.firewall.pingLimit = mkOption {
+      default = null;
+      type = types.nullOr (types.separatedString " ");
+      description =
+        ''
+          If pings are allowed, this allows setting rate limits
+          on them. If non-null, this option should be in the form
+          of flags like "-limit 1/minute -limit-burst 5"
+        '';
+    };
+
     networking.firewall.checkReversePath = mkOption {
       default = kernelHasRPFilter;
       type = types.bool;
@@ -375,7 +386,9 @@ in
 
             # Optionally respond to ICMPv4 pings.
             ${optionalString cfg.allowPing ''
-              iptables -A nixos-fw -p icmp --icmp-type echo-request -j nixos-fw-accept
+              iptables -A nixos-fw -p icmp --icmp-type echo-request ${optionalString (cfg.pingLimit != null)
+                "-m limit ${cfg.pingLimit} "
+              }-j nixos-fw-accept
             ''}
 
             # Accept all ICMPv6 messages except redirects and node
-- 
GitLab


From 17b473449b48620ae9a31519f2fe5ad8a31320af Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 14 Mar 2014 21:18:16 +0100
Subject: [PATCH 2187/3789] Add myself as maintainer of pkgs I wish to keep
 up-to-date

---
 pkgs/applications/networking/browsers/chromium/default.nix      | 2 +-
 pkgs/applications/networking/browsers/firefox/default.nix       | 2 +-
 .../browsers/mozilla-plugins/flashplayer-11/default.nix         | 1 +
 pkgs/applications/networking/p2p/transmission/default.nix       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index eba32738e0b..baf67371769 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -275,7 +275,7 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "An open source web browser from Google";
     homepage = http://www.chromium.org/;
-    maintainers = with maintainers; [ goibhniu chaoflow aszlig ];
+    maintainers = with maintainers; [ goibhniu chaoflow aszlig wizeman ];
     license = licenses.bsd3;
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index db89903c3ad..b45fb4bbae7 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -195,7 +195,7 @@ rec {
     meta = {
       description = "Mozilla Firefox - the browser, reloaded";
       homepage = http://www.mozilla.com/en-US/firefox/;
-      maintainers = [ stdenv.lib.maintainers.eelco ];
+      maintainers = with stdenv.lib.maintainers; [ eelco wizeman ];
     };
 
     passthru = {
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 25eab66293d..a33c879ad92 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -88,6 +88,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Adobe Flash Player browser plugin";
     homepage = http://www.adobe.com/products/flashplayer/;
+    maintainer = with stdenv.lib.maintainers; [ wizeman ];
     license = "unfree";
   };
 }
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index cb439ddb462..958e19a0986 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.transmissionbt.com/;
     license = licenses.gpl2; # parts are under MIT
-    maintainers = with maintainers; [ astsmtl vcunat ];
+    maintainers = with maintainers; [ astsmtl vcunat wizeman ];
     platforms = platforms.linux;
   };
 }
-- 
GitLab


From 562f937d2123d98d200e8b62bc0c41a5c69843c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 14 Mar 2014 22:17:27 +0100
Subject: [PATCH 2188/3789] openscad: bump 2013.06 -> 2014.03

openscad now depends on glib, and it needs pkgconfig to find glib.
---
 pkgs/applications/graphics/openscad/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index a1238fe3dcd..d831df5d7b6 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -1,17 +1,19 @@
 { stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
-, mpfr, gmp
+, mpfr, gmp, glib, pkgconfig
 }:
 
 stdenv.mkDerivation rec {
-  version = "2013.06";
+  version = "2014.03";
   name = "openscad-${version}";
 
   src = fetchurl {
-    url = "https://openscad.googlecode.com/files/${name}.src.tar.gz";
-    sha256 = "01r013l8zyfkgmqn05axh3rlfsjwd6j403w5ffl7nby4i2spiw1f";
+    url = "http://files.openscad.org/${name}.src.tar.gz";
+    sha256 = "1hv1lmq1ayhlvrz5sqipg650xryq25a9k22ysdw0dsrwg9ixqpw6";
   };
 
-  buildInputs = [ qt4 bison flex eigen boost mesa glew opencsg cgal gmp mpfr ];
+  buildInputs = [
+    qt4 bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib pkgconfig
+  ];
 
   configurePhase = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) "
-- 
GitLab


From f5edf3244f0eb88165d18982a8d11266d65839c2 Mon Sep 17 00:00:00 2001
From: Jacob Hinkle <jacob.hinkle@gmail.com>
Date: Fri, 14 Mar 2014 16:28:49 -0600
Subject: [PATCH 2189/3789] Added sharedLibs option to ITK

---
 pkgs/development/libraries/itk/default.nix | 10 +++++++---
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix
index bfe10490fc7..478cc4a3864 100644
--- a/pkgs/development/libraries/itk/default.nix
+++ b/pkgs/development/libraries/itk/default.nix
@@ -1,14 +1,18 @@
-{stdenv, fetchurl, cmake, libX11, libuuid, xz}:
+{stdenv, fetchurl, cmake, libX11, libuuid, xz, sharedLibs ? false}:
 
 stdenv.mkDerivation rec {
-  name = "itk-4.0.0";
+  name = "itk${stdenv.lib.optionalString sharedLibs ''-shared''}-4.0.0";
 
   src = fetchurl {
     url = mirror://sourceforge/itk/InsightToolkit-4.0.0.tar.xz;
     sha256 = "05z49sw612cbyiaghcsda0xylrkf06jh81ql79si5632w1hpgbd9";
   };
 
-  cmakeFlags = [ "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" ];
+  cmakeFlags = [ "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" ]
+    ++ stdenv.lib.optional sharedLibs [
+  "-DBUILD_SHARED_LIBS=ON"
+  "-DCMAKE_CXX_FLAGS=-fPIC"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 987d94029d0..1b81f9c1381 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4567,6 +4567,8 @@ let
 
   itk = callPackage ../development/libraries/itk { };
 
+  itkShared = itk.override { sharedLibs = true; };
+
   jamp = builderDefsPackage ../games/jamp {
     inherit mesa SDL SDL_image SDL_mixer;
   };
-- 
GitLab


From 65bb4ce47be6308b8a1074d80ecde4ec44121503 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 14 Mar 2014 23:43:41 +0100
Subject: [PATCH 2190/3789] haskell-wai-websockets: add version 2.1.0

---
 .../haskell/wai-websockets/default.nix        | 22 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/wai-websockets/default.nix

diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix
new file mode 100644
index 00000000000..4b4038fd411
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wai-websockets/default.nix
@@ -0,0 +1,22 @@
+{ cabal, blazeBuilder, caseInsensitive, conduit, fileEmbed
+, httpTypes, ioStreams, network, text, transformers, wai
+, waiAppStatic, warp, websockets
+}:
+
+cabal.mkDerivation (self: {
+  pname = "wai-websockets";
+  version = "2.1.0";
+  sha256 = "094imqhkn4ghifgp2qhs4hnby3zzdd84fhmyvvy7igcpz1rmll7a";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    blazeBuilder caseInsensitive conduit fileEmbed httpTypes ioStreams
+    network text transformers wai waiAppStatic warp websockets
+  ];
+  meta = {
+    homepage = "http://github.com/yesodweb/wai";
+    description = "Provide a bridge betweeen WAI and the websockets package";
+    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 672b8ffe594..99754abbaa2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2570,6 +2570,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   waiTest = callPackage ../development/libraries/haskell/wai-test {};
 
+  waiWebsockets = callPackage ../development/libraries/haskell/wai-websockets {};
+
   warp = callPackage ../development/libraries/haskell/warp {};
 
   warpTls = callPackage ../development/libraries/haskell/warp-tls {};
-- 
GitLab


From fa9335e441ad47a8bc5348d8574e3d38f0ec8e21 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 14 Mar 2014 23:45:21 +0100
Subject: [PATCH 2191/3789] haskell-leveldb-haskell: add version 0.3.0

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

diff --git a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix
new file mode 100644
index 00000000000..becd68ba915
--- /dev/null
+++ b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix
@@ -0,0 +1,21 @@
+{ cabal, async, dataDefault, filepath, leveldb, resourcet
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "leveldb-haskell";
+  version = "0.3.0";
+  sha256 = "0hdxn6v7fzc0wlpkymlci60m2584h6fn78bxdnv2q18ra03r3ygs";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    async dataDefault filepath resourcet transformers
+  ];
+  extraLibraries = [ leveldb ];
+  meta = {
+    homepage = "http://github.com/kim/leveldb-haskell";
+    description = "Haskell bindings to LevelDB";
+    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 99754abbaa2..5df1eb4c074 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1590,6 +1590,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   lenses = callPackage ../development/libraries/haskell/lenses {};
 
+  leveldbHaskell = callPackage ../development/libraries/haskell/leveldb-haskell {};
+
   libffi = callPackage ../development/libraries/haskell/libffi {
     libffi = pkgs.libffi;
   };
-- 
GitLab


From eeecf8f6ca17ad3903bed62f02375fa978d94d95 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 14 Mar 2014 23:45:47 +0100
Subject: [PATCH 2192/3789] haskell-snowball: add version 1.0.0.1

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

diff --git a/pkgs/development/libraries/haskell/snowball/default.nix b/pkgs/development/libraries/haskell/snowball/default.nix
new file mode 100644
index 00000000000..2f44e5c606a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/snowball/default.nix
@@ -0,0 +1,21 @@
+{ cabal, HUnit, QuickCheck, quickcheckInstances, testFrameworkHunit
+, testFrameworkQuickcheck2, testFrameworkTh, text, textIcu
+}:
+
+cabal.mkDerivation (self: {
+  pname = "snowball";
+  version = "1.0.0.1";
+  doCheck = false;
+  sha256 = "0fvxzm14ffjqq6n51bi5cmq5yrlggpkbb9rbbw522l6cjgv0apbx";
+  buildDepends = [ text textIcu ];
+  testDepends = [
+    HUnit QuickCheck quickcheckInstances testFrameworkHunit
+    testFrameworkQuickcheck2 testFrameworkTh text
+  ];
+  meta = {
+    homepage = "http://hub.darcs.net/dag/snowball";
+    description = "Bindings to the Snowball 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 672b8ffe594..ec8522a2653 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2193,6 +2193,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   snapServer = callPackage ../development/libraries/haskell/snap/server.nix {};
 
+  snowball = callPackage ../development/libraries/haskell/snowball {};
+
   socks = callPackage ../development/libraries/haskell/socks {};
 
   sparse = callPackage ../development/libraries/haskell/sparse {};
-- 
GitLab


From b89bfdf2c24790483689ce435b11f1da21b9baba Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 14 Mar 2014 23:46:13 +0100
Subject: [PATCH 2193/3789] haskell-scrypt: add version 0.5.0

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

diff --git a/pkgs/development/libraries/haskell/scrypt/default.nix b/pkgs/development/libraries/haskell/scrypt/default.nix
new file mode 100644
index 00000000000..6caf51edc1e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/scrypt/default.nix
@@ -0,0 +1,20 @@
+{ cabal, base64Bytestring, entropy, HUnit, QuickCheck
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "scrypt";
+  version = "0.5.0";
+  sha256 = "1cnrjdq1ncv224dlk236a7w29na8r019d2acrsxlsaiy74iadh1y";
+  buildDepends = [ base64Bytestring entropy ];
+  testDepends = [
+    HUnit QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "http://github.com/informatikr/scrypt";
+    description = "Stronger password hashing via sequential memory-hard functions";
+    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 672b8ffe594..34277b14513 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2149,6 +2149,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   scottyHastache = callPackage ../development/libraries/haskell/scotty-hastache {};
 
+  scrypt = callPackage ../development/libraries/haskell/scrypt {};
+
   securemem = callPackage ../development/libraries/haskell/securemem {};
 
   sendfile = callPackage ../development/libraries/haskell/sendfile {};
-- 
GitLab


From 0f7efa31d57dc3f29e798a9e84669de7540fea81 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Sat, 15 Mar 2014 01:14:43 +0100
Subject: [PATCH 2194/3789] Update pyserial to 2.7.

---
 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 79d32e93d2b..e211e62bafd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5584,11 +5584,11 @@ rec {
 
 
   pyserial = buildPythonPackage rec {
-    name = "pyserial-2.6";
+    name = "pyserial-2.7";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyserial/${name}.tar.gz";
-      md5 = "cde799970b7c1ce1f7d6e9ceebe64c98";
+      sha256 = "3542ec0838793e61d6224e27ff05e8ce4ba5a5c5cc4ec5c6a3e8d49247985477";
     };
 
     doCheck = false;
-- 
GitLab


From d1e88c462587647675089a8b9270b2861833006c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 14 Mar 2014 20:18:17 -0400
Subject: [PATCH 2195/3789] Unconditionally compile itk with shared libs

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

diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix
index 478cc4a3864..29e15e08f69 100644
--- a/pkgs/development/libraries/itk/default.nix
+++ b/pkgs/development/libraries/itk/default.nix
@@ -1,17 +1,18 @@
-{stdenv, fetchurl, cmake, libX11, libuuid, xz, sharedLibs ? false}:
+{stdenv, fetchurl, cmake, libX11, libuuid, xz}:
 
 stdenv.mkDerivation rec {
-  name = "itk${stdenv.lib.optionalString sharedLibs ''-shared''}-4.0.0";
+  name = "itk-4.0.0";
 
   src = fetchurl {
     url = mirror://sourceforge/itk/InsightToolkit-4.0.0.tar.xz;
     sha256 = "05z49sw612cbyiaghcsda0xylrkf06jh81ql79si5632w1hpgbd9";
   };
 
-  cmakeFlags = [ "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" ]
-    ++ stdenv.lib.optional sharedLibs [
-  "-DBUILD_SHARED_LIBS=ON"
-  "-DCMAKE_CXX_FLAGS=-fPIC"
+  cmakeFlags = [
+    "-DBUILD_TESTING=OFF"
+    "-DBUILD_EXAMPLES=OFF"
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DCMAKE_CXX_FLAGS=-fPIC"
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4035f128fb..9aaa55496e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4569,8 +4569,6 @@ let
 
   itk = callPackage ../development/libraries/itk { };
 
-  itkShared = itk.override { sharedLibs = true; };
-
   jamp = builderDefsPackage ../games/jamp {
     inherit mesa SDL SDL_image SDL_mixer;
   };
-- 
GitLab


From bb188bbba72184a0a88294f85b237d8a6deb0f08 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 22 Jan 2014 01:11:51 +0100
Subject: [PATCH 2196/3789] nixos: Add ZFS auto-snapshotting module

---
 nixos/modules/tasks/filesystems/zfs.nix | 221 +++++++++++++++++++-----
 1 file changed, 174 insertions(+), 47 deletions(-)

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 853cd833fd0..32e3da6a273 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -11,18 +11,30 @@ with pkgs.lib;
 let
 
   cfgSpl = config.boot.spl;
+  cfgSnapshots = config.services.zfs.autoSnapshot;
+
   inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems;
   inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems;
+
+  enableAutoSnapshots = cfgSnapshots.enable;
+  enableZfs = inInitrd || inSystem || enableAutoSnapshots;
+
   kernel = config.boot.kernelPackages;
 
+  autosnapPkg = pkgs.zfstools.override {
+    zfs = config.boot.kernelPackages.zfs;
+  };
+
+  zfsAutoSnap = "${autosnapPkg}/bin/zfs-auto-snapshot";
+
 in
 
 {
 
   ###### interface
-  
-  options = { 
-    boot.spl.hostid = mkOption { 
+
+  options = {
+    boot.spl.hostid = mkOption {
       default = "";
       example = "0xdeadbeef";
       description = ''
@@ -34,62 +46,177 @@ in
         manually import pools.
       '';
     };
-  };
 
-  ###### implementation
+    services.zfs.autoSnapshot = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enable the (OpenSolaris-compatible) ZFS auto-snapshotting service.
+          Note that you must set the <literal>com.sun:auto-snapshot</literal>
+          property to <literal>true</literal> on all datasets which you wish
+          to auto-snapshot.
 
-  config = mkIf ( inInitrd || inSystem ) {
+          You can override a child dataset to use, or not use auto-snapshotting
+          by setting its flag with the given interval:
+          <literal>zfs set com.sun:auto-snapshot:weekly=false DATASET</literal>
+        '';
+      };
 
-    boot = { 
-      kernelModules = [ "spl" "zfs" ] ;
-      extraModulePackages = [ kernel.zfs kernel.spl ];
-      extraModprobeConfig = mkIf (cfgSpl.hostid != "") ''
-        options spl spl_hostid=${cfgSpl.hostid}
-      '';
-    };
+      frequent = mkOption {
+        default = 4;
+        type = types.int;
+        description = ''
+          Number of frequent (15-minute) auto-snapshots that you wish to keep.
+        '';
+      };
+
+      hourly = mkOption {
+        default = 24;
+        type = types.int;
+        description = ''
+          Number of hourly auto-snapshots that you wish to keep.
+        '';
+      };
+
+      daily = mkOption {
+        default = 7;
+        type = types.int;
+        description = ''
+          Number of daily auto-snapshots that you wish to keep.
+        '';
+      };
 
-    boot.initrd = mkIf inInitrd { 
-      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 -pdv ${pkgs.zlib}/lib/lib*.so* $out/lib
+      weekly = mkOption {
+        default = 4;
+        type = types.int;
+        description = ''
+          Number of weekly auto-snapshots that you wish to keep.
         '';
-      postDeviceCommands =
-        ''
-          zpool import -f -a
+      };
+
+      monthly = mkOption {
+        default = 12;
+        type = types.int;
+        description = ''
+          Number of monthly auto-snapshots that you wish to keep.
         '';
+      };
     };
+  };
 
-    systemd.services."zpool-import" = {
-      description = "Import zpools";
-      after = [ "systemd-udev-settle.service" ];
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
+  ###### implementation
+
+  config = mkMerge [
+    (mkIf enableZfs {
+      boot = {
+        kernelModules = [ "spl" "zfs" ] ;
+        extraModulePackages = [ kernel.zfs kernel.spl ];
+        extraModprobeConfig = mkIf (cfgSpl.hostid != "") ''
+          options spl spl_hostid=${cfgSpl.hostid}
+        '';
+      };
+
+      boot.initrd = mkIf inInitrd {
+        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 -pdv ${pkgs.zlib}/lib/lib*.so* $out/lib
+          '';
+        postDeviceCommands =
+          ''
+            zpool import -f -a
+          '';
+      };
+
+      systemd.services."zpool-import" = {
+        description = "Import zpools";
+        after = [ "systemd-udev-settle.service" ];
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+          ExecStart = "${kernel.zfs}/sbin/zpool import -f -a";
+        };
         restartIfChanged = false;
-        ExecStart = "${kernel.zfs}/sbin/zpool import -f -a";
       };
-    };
 
-    systemd.services."zfs-mount" = {
-      description = "Mount ZFS Volumes";
-      after = [ "zpool-import.service" ];
-      wantedBy = [ "local-fs.target" ];
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
+      systemd.services."zfs-mount" = {
+        description = "Mount ZFS Volumes";
+        after = [ "zpool-import.service" ];
+        wantedBy = [ "local-fs.target" ];
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+          ExecStart = "${kernel.zfs}/sbin/zfs mount -a";
+          ExecStop = "${kernel.zfs}/sbin/zfs umount -a";
+        };
         restartIfChanged = false;
-        ExecStart = "${kernel.zfs}/sbin/zfs mount -a";
-        ExecStop = "${kernel.zfs}/sbin/zfs umount -a";
       };
-    };
 
-    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 = [ 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.
+    })
+
+    (mkIf enableAutoSnapshots {
+      systemd.services."zfs-snapshot-frequent" = {
+        description = "ZFS auto-snapshotting every 15 mins";
+        after = [ "zpool-import.service" ];
+        serviceConfig = {
+          Type = "oneshot";
+          ExecStart = "${zfsAutoSnap} frequent ${toString cfgSnapshots.frequent}";
+        };
+        restartIfChanged = false;
+        startAt = "*:15,30,45";
+      };
+
+      systemd.services."zfs-snapshot-hourly" = {
+        description = "ZFS auto-snapshotting every hour";
+        after = [ "zpool-import.service" ];
+        serviceConfig = {
+          Type = "oneshot";
+          ExecStart = "${zfsAutoSnap} hourly ${toString cfgSnapshots.hourly}";
+        };
+        restartIfChanged = false;
+        startAt = "hourly";
+      };
+
+      systemd.services."zfs-snapshot-daily" = {
+        description = "ZFS auto-snapshotting every day";
+        after = [ "zpool-import.service" ];
+        serviceConfig = {
+          Type = "oneshot";
+          ExecStart = "${zfsAutoSnap} daily ${toString cfgSnapshots.daily}";
+        };
+        restartIfChanged = false;
+        startAt = "daily";
+      };
+
+      systemd.services."zfs-snapshot-weekly" = {
+        description = "ZFS auto-snapshotting every week";
+        after = [ "zpool-import.service" ];
+        serviceConfig = {
+          Type = "oneshot";
+          ExecStart = "${zfsAutoSnap} weekly ${toString cfgSnapshots.weekly}";
+        };
+        restartIfChanged = false;
+        startAt = "weekly";
+      };
+
+      systemd.services."zfs-snapshot-monthly" = {
+        description = "ZFS auto-snapshotting every month";
+        after = [ "zpool-import.service" ];
+        serviceConfig = {
+          Type = "oneshot";
+          ExecStart = "${zfsAutoSnap} monthly ${toString cfgSnapshots.monthly}";
+        };
+        restartIfChanged = false;
+        startAt = "monthly";
+      };
+    })
+  ];
 }
-- 
GitLab


From 3c97fdc7a8d7d91c8b35c45fe33169e69d918231 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 15 Mar 2014 01:59:23 +0100
Subject: [PATCH 2197/3789] spl, zfs: Add myself as a maintainer

---
 pkgs/os-specific/linux/spl/default.nix | 2 +-
 pkgs/os-specific/linux/zfs/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 56c41798780..1d70a76a001 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation {
     homepage = http://zfsonlinux.org/;
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+    maintainers = with stdenv.lib.maintainers; [ jcumming wizeman ];
   };
 }
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index ef313e6ca1e..f8f3c9ed316 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -45,6 +45,6 @@ stdenv.mkDerivation {
     homepage = http://zfsonlinux.org/;
     license = stdenv.lib.licenses.cddl;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+    maintainers = with stdenv.lib.maintainers; [ jcumming wizeman ];
   };
 }
-- 
GitLab


From ceec0140208eba7e42bf8f96644cd7dac5325fbb Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 15 Mar 2014 04:11:43 +0100
Subject: [PATCH 2198/3789] grsecurity: Update stable and test patches

stable: 3.0-3.2.55-201403122114 -> 3.0-3.2.55-201403142107
test:   3.0-3.13.6-201403122116 -> 3.0-3.13.6-201403142112
---
 pkgs/os-specific/linux/kernel/patches.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index fdaf19154d3..22f9ee9d876 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -81,8 +81,8 @@ rec {
   grsecurity_3_0_3_2_55 =
     { name = "grsecurity-3.0-3.2.55";
       patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403122114.patch;
-        sha256 = "0jfi8dp7zrbq9ai12h0fxmj0r73wf5vp3y43n506y8ha7cyrrk5y";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403142107.patch;
+        sha256 = "0v858lizqbvp0czpx5vg0h1sd5mb5kik1qhv4hh7y01cx6dywam2";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55
@@ -92,8 +92,8 @@ rec {
   grsecurity_3_0_3_13_6 =
     { name = "grsecurity-3.0-3.13.6";
       patch = fetchurl {
-        url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403122116.patch;
-        sha256 = "0nsr6dxa7w9dl4bjmx7wh3vng9llbfjcxh3yr61434bzabymj9nm";
+        url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403142112.patch;
+        sha256 = "12wdibf7xfqjwr1cnar3nskgrlm04w68impaq4a3xg1blb9nxxhr";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.6
-- 
GitLab


From 9d42f2e5fce35db6bb10d2dc0002e5575a989c26 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 14 Mar 2014 23:43:51 -0500
Subject: [PATCH 2199/3789] ccid: Update from 1.4.14 -> 1.4.15

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

diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index 4be2393eed5..fdcd15a4b82 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
 stdenv.mkDerivation rec {
-  version = "1.4.14";
+  version = "1.4.15";
   name = "ccid-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/c/ccid/ccid_${version}.orig.tar.bz2";
-    sha256 = "0inibkhzk4ghg85jkysscjrzshmxfdzz6b54dqj182l0isn082y5";
+    sha256 = "02lrdmqlw2ilbmgcpi2h7w741p025c10frxdn5w3wnzi8qi1hdjl";
   };
 
   patchPhase = ''
-- 
GitLab


From 9ce62a1ae6bdf235ee02184e989bb95e9092f0f6 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, 15 Mar 2014 13:13:25 +0800
Subject: [PATCH 2200/3789] add vmpk 0.5.1, a virtual midi piano keyboard

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

diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix
new file mode 100644
index 00000000000..7fffa77b5a3
--- /dev/null
+++ b/pkgs/applications/audio/vmpk/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, cmake, pkgconfig
+, qt4, jackaudio
+}:
+
+let
+  version = "0.5.1";
+in stdenv.mkDerivation rec {
+  name = "vmpk-${version}";
+
+  meta = with stdenv.lib; {
+    description = "Virtual MIDI Piano Keyboard";
+    homepage    = "http://vmpk.sourceforge.net/";
+    license     = licenses.gpl3Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    url = "mirror://sourceforge/vmpk/${version}/${name}.tar.bz2";
+    sha256 = "11fqnxgs9hr9255d93n7lazxzjwn8jpmn23nywdksh0pb1ffvfrc";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ qt4 jackaudio ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 987d94029d0..5309851a39d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9163,6 +9163,8 @@ let
 
   vlc = callPackage ../applications/video/vlc { };
 
+  vmpk = callPackage ../applications/audio/vmpk { };
+
   vnstat = callPackage ../applications/networking/vnstat { };
 
   vorbisTools = callPackage ../applications/audio/vorbis-tools { };
-- 
GitLab


From 4d03052c9c177359a4299ea727fd2e3e05627919 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Mar 2014 15:30:26 +0100
Subject: [PATCH 2201/3789] ghc: update HEAD snapshot to 7.9.20140313

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

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index f4f8be27367..7f5ec0985b9 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.7.20131202";
+  version = "7.9.20140313";
   name = "ghc-${version}";
 
   src = fetchurl {
     url = "http://cryp.to/${name}.tar.xz";
-    sha256 = "1gnp5c3x7dbaz7s2yvkw2fmvqh5by2gpp0zlcyj8p2gv13gxi2cb";
+    sha256 = "03i9ajgzlp2y0qq7qnmyji6vdcgx2xnsyrc2zbqbziinf86igwhi";
   };
 
   buildInputs = [ ghc perl gmp ncurses happy alex ];
-- 
GitLab


From 9dd6e2adef4df8c58f6286334b76de434a760cad Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Mon, 30 Dec 2013 17:53:29 -0500
Subject: [PATCH 2202/3789] happstack-fastcgi: add version 0.1.5

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

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-fastcgi.nix b/pkgs/development/libraries/haskell/happstack/happstack-fastcgi.nix
new file mode 100644
index 00000000000..858512e9add
--- /dev/null
+++ b/pkgs/development/libraries/haskell/happstack/happstack-fastcgi.nix
@@ -0,0 +1,14 @@
+{ cabal, cgi, fastcgi, happstackServer, mtl, utf8String }:
+
+cabal.mkDerivation (self: {
+  pname = "happstack-fastcgi";
+  version = "0.1.5";
+  sha256 = "0rvb041nx2f8azvfy1yysisjqrmsfbxnccn992v5q7zhlglcvj8h";
+  buildDepends = [ cgi fastcgi happstackServer mtl utf8String ];
+  meta = {
+    description = "Happstack extension for use with FastCGI";
+    license = self.stdenv.lib.licenses.bsd3;
+    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 2cd100e5fe1..2db77d90911 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1260,6 +1260,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   happstackLite = callPackage ../development/libraries/haskell/happstack/happstack-lite.nix {};
 
+  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;
-- 
GitLab


From 728f3872a3e0d6d5ea96be499429f98333a446c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:15:41 +0100
Subject: [PATCH 2203/3789] haskell-wai-middleware-static: re-generate with
 cabal2nix

---
 .../libraries/haskell/wai-middleware-static/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
index 31ec8c410a9..e496d5266db 100644
--- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
@@ -5,11 +5,11 @@ cabal.mkDerivation (self: {
   version = "0.4.0.2";
   sha256 = "0nw54h8baphjdwsd118g9j5w4g2mnb2hrny0n4ih4jlqlcqam3lf";
   buildDepends = [ filepath httpTypes mtl text wai ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/scotty-web/scotty";
     description = "WAI middleware that intercepts requests to static files";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-  jailbreak = true;
 })
-- 
GitLab


From 189fe46ab181be33ffe8b39bace0f8255b8218e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:15:52 +0100
Subject: [PATCH 2204/3789] haskell-snowball: re-generate with cabal2nix

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

diff --git a/pkgs/development/libraries/haskell/snowball/default.nix b/pkgs/development/libraries/haskell/snowball/default.nix
index 2f44e5c606a..36a4231109d 100644
--- a/pkgs/development/libraries/haskell/snowball/default.nix
+++ b/pkgs/development/libraries/haskell/snowball/default.nix
@@ -5,13 +5,13 @@
 cabal.mkDerivation (self: {
   pname = "snowball";
   version = "1.0.0.1";
-  doCheck = false;
   sha256 = "0fvxzm14ffjqq6n51bi5cmq5yrlggpkbb9rbbw522l6cjgv0apbx";
   buildDepends = [ text textIcu ];
   testDepends = [
     HUnit QuickCheck quickcheckInstances testFrameworkHunit
     testFrameworkQuickcheck2 testFrameworkTh text
   ];
+  doCheck = false;
   meta = {
     homepage = "http://hub.darcs.net/dag/snowball";
     description = "Bindings to the Snowball library";
-- 
GitLab


From a42e1d54948b796458b094e79b5acb3dfee50ed7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 13 Mar 2014 03:45:57 -0500
Subject: [PATCH 2205/3789] notbit: Add systemd service for a system daemon

---
 nixos/modules/misc/ids.nix                   |  2 +
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/networking/notbit.nix | 93 ++++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 nixos/modules/services/networking/notbit.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index b27739c99ce..970b9caa2f9 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -119,6 +119,7 @@
       kippo = 108;
       jenkins = 109;
       systemd-journal-gateway = 110;
+      notbit = 111;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -216,6 +217,7 @@
       kippo = 108;
       jenkins = 109;
       systemd-journal-gateway = 110;
+      notbit = 111;
 
       # 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 b419942057a..326ce8e15b1 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -179,6 +179,7 @@
   ./services/networking/minidlna.nix
   ./services/networking/nat.nix
   ./services/networking/networkmanager.nix
+  ./services/networking/notbit.nix
   ./services/networking/ntopng.nix
   ./services/networking/ntpd.nix
   ./services/networking/oidentd.nix
diff --git a/nixos/modules/services/networking/notbit.nix b/nixos/modules/services/networking/notbit.nix
new file mode 100644
index 00000000000..83dafd08379
--- /dev/null
+++ b/nixos/modules/services/networking/notbit.nix
@@ -0,0 +1,93 @@
+{ config, pkgs, ... }:
+
+let
+  cfg = config.services.notbit;
+  varDir = "/var/lib/notbit";
+  
+  sendmail = pkgs.stdenv.mkDerivation {
+    name = "notbit-wrapper";
+    buildInputs = [ pkgs.makeWrapper ];
+    propagatedBuildInputs = [ pkgs.notbit ];
+    buildCommand = ''
+      mkdir -p $out/bin
+      makeWrapper ${pkgs.notbit}/bin/notbit-sendmail $out/bin/notbit-system-sendmail \
+        --set XDG_RUNTIME_DIR ${varDir}
+    '';
+  };
+in
+
+with pkgs.lib;
+{
+
+  ### configuration
+
+  options = {
+
+    services.notbit = {
+
+      enable = mkOption {
+        type = types.uniq types.bool;
+        default = false;
+        description = ''
+          Enables the notbit daemon and provides a sendmail binary named `notbit-system-sendmail` for sending mail over the system instance of notbit. Users must be in the notbit group in order to send mail over the system notbit instance. Currently mail recipt is not supported.
+        '';
+      };
+
+      port = mkOption {
+        type = types.uniq types.int;
+        default = 8443;
+        description = "The port which the daemon listens for other bitmessage clients";
+      };
+
+      nice = mkOption {
+        type = types.uniq types.int;
+        default = 10;
+        description = "Set the nice level for the notbit daemon";
+      };
+
+    };
+
+  };
+
+  ### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.notbit sendmail ];
+
+    systemd.services.notbit = {
+      description = "Notbit daemon";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.notbit ];
+      environment = { XDG_RUNTIME_DIR = varDir; };
+
+      postStart = ''
+        [ ! -f "${varDir}/addr" ] && notbit-keygen > ${varDir}/addr
+        chmod 0640 ${varDir}/{addr,notbit/notbit-ipc.lock}
+        chmod 0750 ${varDir}/notbit/{,notbit-ipc}
+      '';
+
+      serviceConfig = {
+        Type = "forking";
+        ExecStart = "${pkgs.notbit}/bin/notbit -d -p ${toString cfg.port}";
+        User = "notbit";
+        Group = "notbit";
+        UMask = "0077";
+        WorkingDirectory = varDir;
+        Nice = cfg.nice;
+      };
+    };
+
+    users.extraUsers.notbit = {
+      group = "notbit";
+      description = "Notbit daemon user";
+      home = varDir;
+      createHome = true;
+      uid = config.ids.uids.notbit;
+    };
+
+    users.extraGroups.notbit.gid = config.ids.gids.notbit;
+  };
+
+}
-- 
GitLab


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 2206/3789] 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 { };
-- 
GitLab


From ec0116f99d47f3ae08b843b6a48eb2973c4b0ca1 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 11:47:31 +0100
Subject: [PATCH 2207/3789] xfce4-power-manager: put patch into nixpkgs

It's generated by cgit, which adds cgit version to the end,
and I see no way to avoid that silly behavior.
---
 .../core/xfce4-power-manager-brightness.patch | 307 ++++++++++++++++++
 .../xfce/core/xfce4-power-manager.nix         |   7 +-
 2 files changed, 308 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch

diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch b/pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch
new file mode 100644
index 00000000000..6b6f14fdae7
--- /dev/null
+++ b/pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch
@@ -0,0 +1,307 @@
+From 05d12e12596512f7a31d3cdb4845a69dc2d4c611 Mon Sep 17 00:00:00 2001
+From: Martin Matuska <martin@matuska.org>
+Date: Tue, 23 Jul 2013 11:27:41 +0200
+Subject: Change brightness level from glong to gint32
+
+The "Backlight" RandR property is a 32-bit integer. This means that the int32 (gint32) type should be used to represent brightness levels. The attached patch does nothing else than changing the brightness level representation from glong to gint32. This fixes the screen auto-dimming issue and brightness panel plugin issue.
+
+diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c
+index aa1ef33..f1524cb 100644
+--- a/common/xfpm-brightness.c
++++ b/common/xfpm-brightness.c
+@@ -92,11 +92,11 @@ out:
+ }
+ 
+ static gboolean
+-xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, long *current)
++xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, gint32 *current)
+ {
+     unsigned long nitems;
+     unsigned long bytes_after;
+-    long *prop;
++    gint32 *prop;
+     Atom actual_type;
+     int actual_format;
+     gboolean ret = FALSE;
+@@ -124,7 +124,7 @@ xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, l
+ }
+ 
+ static gboolean
+-xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, long level)
++xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, gint32 level)
+ {
+     gboolean ret = TRUE;
+ 
+@@ -137,7 +137,7 @@ xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, l
+     
+     if ( gdk_error_trap_pop () ) 
+     {
+-	    g_warning ("failed to XRRChangeOutputProperty for brightness %li", level);
++	    g_warning ("failed to XRRChangeOutputProperty for brightness %d", level);
+ 	    ret = FALSE;
+     }
+     
+@@ -225,11 +225,11 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness)
+ }
+ 
+ static gboolean
+-xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
++xfpm_brightness_xrand_up (XfpmBrightness *brightness, gint32 *new_level)
+ {
+-    long hw_level;
++    gint32 hw_level;
+     gboolean ret = FALSE;
+-    long set_level;
++    gint32 set_level;
+     
+     ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level);
+     
+@@ -250,14 +250,14 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
+     
+     if ( !ret )
+     {
+-	g_warning ("xfpm_brightness_xrand_up failed for %li", set_level);
++	g_warning ("xfpm_brightness_xrand_up failed for %d", set_level);
+ 	return FALSE;
+     }
+ 	
+     /* Nothing changed in the hardware*/
+     if ( *new_level == hw_level )
+     {
+-	g_warning ("xfpm_brightness_xrand_up did not change the hw level to %li", set_level);
++	g_warning ("xfpm_brightness_xrand_up did not change the hw level to %d", set_level);
+ 	return FALSE;
+     }
+     
+@@ -265,11 +265,11 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
+ }
+ 
+ static gboolean
+-xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
++xfpm_brightness_xrand_down (XfpmBrightness *brightness, gint32 *new_level)
+ {
+-    long hw_level;
++    gint32 hw_level;
+     gboolean ret;
+-    long set_level;
++    gint32 set_level;
+     
+     ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level);
+     
+@@ -290,14 +290,14 @@ xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
+     
+     if ( !ret )
+     {
+-	g_warning ("xfpm_brightness_xrand_down failed for %li", set_level);
++	g_warning ("xfpm_brightness_xrand_down failed for %d", set_level);
+ 	return FALSE;
+     }
+     
+     /* Nothing changed in the hardware*/
+     if ( *new_level == hw_level )
+     {
+-	g_warning ("xfpm_brightness_xrand_down did not change the hw level to %li", set_level);
++	g_warning ("xfpm_brightness_xrand_down did not change the hw level to %d", set_level);
+ 	return FALSE;
+     }
+     
+@@ -361,7 +361,7 @@ xfpm_brightness_setup_helper (XfpmBrightness *brightness)
+ }
+ 
+ static gboolean
+-xfpm_brightness_helper_get_level (XfpmBrightness *brg, glong *level)
++xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level)
+ {
+     int ret;
+ 
+@@ -406,11 +406,11 @@ out:
+ }
+ 
+ static gboolean
+-xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
++xfpm_brightness_helper_up (XfpmBrightness *brightness, gint32 *new_level)
+ {
+-    glong hw_level;
++    gint32 hw_level;
+     gboolean ret = FALSE;
+-    gint set_level;
++    gint32 set_level;
+     
+     ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
+     
+@@ -446,11 +446,11 @@ xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
+ }
+ 
+ static gboolean
+-xfpm_brightness_helper_down (XfpmBrightness *brightness, glong *new_level)
++xfpm_brightness_helper_down (XfpmBrightness *brightness, gint32 *new_level)
+ {
+-    glong hw_level;
++    gint32 hw_level;
+     gboolean ret;
+-    gint set_level;
++    gint32 set_level;
+     
+     ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
+     
+@@ -572,7 +572,7 @@ xfpm_brightness_setup (XfpmBrightness *brightness)
+     return FALSE;
+ }
+ 
+-gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
++gboolean xfpm_brightness_up (XfpmBrightness *brightness, gint32 *new_level)
+ {
+     gboolean ret = FALSE;
+     
+@@ -589,7 +589,7 @@ gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
+     return ret;
+ }
+ 
+-gboolean xfpm_brightness_down (XfpmBrightness *brightness, glong *new_level)
++gboolean xfpm_brightness_down (XfpmBrightness *brightness, gint32 *new_level)
+ {
+     gboolean ret = FALSE;
+     
+@@ -618,7 +618,7 @@ gint xfpm_brightness_get_max_level (XfpmBrightness *brightness)
+     return brightness->priv->max_level;
+ }
+ 
+-gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, glong *level)
++gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, gint32 *level)
+ {
+     gboolean ret = FALSE;
+     
+@@ -632,7 +632,7 @@ gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, glong *level)
+     return ret;
+ }
+ 
+-gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, glong level)
++gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, gint32 level)
+ {
+     gboolean ret = FALSE;
+     
+diff --git a/common/xfpm-brightness.h b/common/xfpm-brightness.h
+index 0c4e3ed..26b3dbe 100644
+--- a/common/xfpm-brightness.h
++++ b/common/xfpm-brightness.h
+@@ -51,20 +51,20 @@ XfpmBrightness       	       *xfpm_brightness_new             (void);
+ gboolean			xfpm_brightness_setup 		(XfpmBrightness *brightness);
+ 
+ gboolean			xfpm_brightness_up		(XfpmBrightness *brightness,
+-								 glong *new_level);
++								 gint32 *new_level);
+ 
+ gboolean			xfpm_brightness_down		(XfpmBrightness *brightness,
+-								 glong *new_level);
++								 gint32 *new_level);
+ 
+ gboolean			xfpm_brightness_has_hw 		(XfpmBrightness *brightness);
+ 
+ gint 				xfpm_brightness_get_max_level   (XfpmBrightness *brightness);
+ 
+ gboolean			xfpm_brightness_get_level	(XfpmBrightness *brightness,
+-								 glong *level);
++								 gint32 *level);
+ 
+ gboolean			xfpm_brightness_set_level	(XfpmBrightness *brightness,
+-								 glong level);
++								 gint32 level);
+ 
+ gboolean			xfpm_brightness_dim_down	(XfpmBrightness *brightness);
+ 
+diff --git a/panel-plugins/brightness/brightness-button.c b/panel-plugins/brightness/brightness-button.c
+index 6e60c29..bd466c9 100644
+--- a/panel-plugins/brightness/brightness-button.c
++++ b/panel-plugins/brightness/brightness-button.c
+@@ -186,7 +186,7 @@ static gboolean
+ brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 ev_time)
+ {
+     gint x, y;
+-    glong current_level = 0;
++    gint32 current_level = 0;
+     GdkDisplay *display;
+     GdkScreen *screen;
+     BrightnessButton *button;
+@@ -342,7 +342,7 @@ plus_clicked (GtkWidget *widget, BrightnessButton *button)
+ static void
+ range_value_changed (GtkWidget *widget, BrightnessButton *button)
+ {
+-    glong range_level, hw_level;
++    gint32 range_level, hw_level;
+     
+     range_level = (gint) gtk_range_get_value (GTK_RANGE (button->priv->range));
+     
+@@ -428,8 +428,8 @@ brightness_button_create_popup (BrightnessButton *button)
+ static void
+ brightness_button_up (BrightnessButton *button)
+ {
+-    glong level;
+-    glong max_level;
++    gint32 level;
++    gint32 max_level;
+     
+     xfpm_brightness_get_level (button->priv->brightness, &level);
+     max_level = xfpm_brightness_get_max_level (button->priv->brightness);
+@@ -443,7 +443,7 @@ brightness_button_up (BrightnessButton *button)
+ static void
+ brightness_button_down (BrightnessButton *button)
+ {
+-    glong level;
++    gint32 level;
+     xfpm_brightness_get_level (button->priv->brightness, &level);
+     
+     if ( level != 0 )
+diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
+index baeeb43..45c990f 100644
+--- a/src/xfpm-backlight.c
++++ b/src/xfpm-backlight.c
+@@ -63,8 +63,8 @@ struct XfpmBacklightPrivate
+     gboolean	    has_hw;
+     gboolean	    on_battery;
+     
+-    glong            last_level;
+-    glong 	    max_level;
++    gint32          last_level;
++    gint32 	    max_level;
+     
+     gboolean        dimmed;
+     gboolean	    block;
+@@ -79,7 +79,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
+     
+     if (xfpm_power_get_mode (backlight->priv->power) == XFPM_POWER_MODE_NORMAL )
+     {
+-	glong dim_level;
++	gint32 dim_level;
+ 	
+ 	g_object_get (G_OBJECT (backlight->priv->conf),
+ 		      backlight->priv->on_battery ? BRIGHTNESS_LEVEL_ON_BATTERY : BRIGHTNESS_LEVEL_ON_AC, &dim_level,
+@@ -101,7 +101,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
+ 	 **/
+ 	if (backlight->priv->last_level > dim_level)
+ 	{
+-	    XFPM_DEBUG ("Current brightness level before dimming : %li, new %li", backlight->priv->last_level, dim_level);
++	    XFPM_DEBUG ("Current brightness level before dimming : %d, new %d", backlight->priv->last_level, dim_level);
+ 	    backlight->priv->dimmed = xfpm_brightness_set_level (backlight->priv->brightness, dim_level);
+ 	}
+     }
+@@ -182,7 +182,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
+     {
+ 	if ( !backlight->priv->block)
+ 	{
+-	    XFPM_DEBUG ("Alarm reset, setting level to %li", backlight->priv->last_level);
++	    XFPM_DEBUG ("Alarm reset, setting level to %d", backlight->priv->last_level);
+ 	    xfpm_brightness_set_level (backlight->priv->brightness, backlight->priv->last_level);
+ 	}
+ 	backlight->priv->dimmed = FALSE;
+@@ -192,7 +192,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
+ static void
+ xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmBacklight *backlight)
+ {
+-    glong level;
++    gint32 level;
+     gboolean ret = TRUE;
+     
+     gboolean enable_brightness, show_popup;
+-- 
+cgit v0.10.1
+
diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
index 91ec6b40e23..7740af438d9 100644
--- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix
+++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
@@ -11,11 +11,6 @@ stdenv.mkDerivation rec {
     sha256 = "1sc4f4wci5yl3l9lk7vcsbwj6hdjshbxw9qm43s64jr882jriyyp";
   };
 
-  brightness_patch = fetchurl {
-    url = "http://git.xfce.org/xfce/xfce4-power-manager/patch/?id=05d12e12596512f7a31d3cdb4845a69dc2d4c611";
-    sha256 = "1y8520s0s4d7x1abdwsm5qig4vgm3np7hhagfbdwd5ymiz5nn9mw";
-  };
-
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   buildInputs =
@@ -24,7 +19,7 @@ stdenv.mkDerivation rec {
     ];
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
-  patches = [ brightness_patch ];
+  patches = ./xfce4-power-manager-brightness.patch;
 
   meta = {
     homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager;
-- 
GitLab


From 89f0c9a8b6cae04321daa177ef97b8c21d05b065 Mon Sep 17 00:00:00 2001
From: Matthew Sackman <matthew@rabbitmq.com>
Date: Sat, 15 Mar 2014 10:57:27 +0000
Subject: [PATCH 2208/3789] Update serfdom to 0.5.0.

---
 pkgs/servers/serfdom/default.nix | 111 +++++++++++++++++++------------
 1 file changed, 68 insertions(+), 43 deletions(-)

diff --git a/pkgs/servers/serfdom/default.nix b/pkgs/servers/serfdom/default.nix
index 13c878888e2..274fc89f94d 100644
--- a/pkgs/servers/serfdom/default.nix
+++ b/pkgs/servers/serfdom/default.nix
@@ -1,80 +1,105 @@
-{ stdenv, fetchurl, fetchgit, go, lib }:
+{ stdenv, fetchurl, fetchgit, fetchhg, go, lib }:
 
 let
   goDeps = [
     {
-      dir    = "github.com/hashicorp";
-      name   = "serf";
-      rev    = "21113c8207d8e02b7ff738c9be80fcaabf67251d";
-      sha256 = "10lmgb0caffp0x02nriahyfq9p6qkhr8carfq38m8cjxqxs2v0nk";
+      dir     = "github.com/hashicorp";
+      name    = "serf";
+      rev     = "c5b41a9d1d261135117a8d501d3293efade3cc74";
+      sha256  = "a314d3c13fb370842a8f7c6650abfa907b51172a09c64f9184a240fab05b43df";
+      fetcher = git;
     }
     {
-      dir    = "github.com/armon";
-      name   = "go-metrics";
-      rev    = "8ceaed1d0bc3a25db6e65e79ee4f895013313c17";
-      sha256 = "1yzajmx26br4812m9gz4v7qj6fcmhg4a9jz9l3i20hh2x06srmpg";
+      dir     = "github.com/armon";
+      name    = "go-metrics";
+      rev     = "e12c3591b520e819e8234bd585d592774f2b2ad5";
+      sha256  = "79476efefb68876fcad7e71e76d95f4a7eece2cfcdc5a9c10f998af3178230ba";
+      fetcher = git;
     }
     {
-      dir    = "github.com/hashicorp";
-      name   = "logutils";
-      rev    = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8";
-      sha256 = "184lnn7x1v3xvj6zz1rg9s0252wkkd59kij2iyrrm7y80bym2jys";
+      dir     = "github.com/hashicorp";
+      name    = "logutils";
+      rev     = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8";
+      sha256  = "184lnn7x1v3xvj6zz1rg9s0252wkkd59kij2iyrrm7y80bym2jys";
+      fetcher = git;
     }
     {
-      dir    = "github.com/hashicorp";
-      name   = "memberlist";
-      rev    = "825ad4aca57c7323e8dadde149bfdec9d9621ffe";
-      sha256 = "0mm0hm2kncafq5ml58ki7ilh3b47ni0w19n50ilahhhm4lsfry7z";
+      dir     = "github.com/hashicorp";
+      name    = "memberlist";
+      rev     = "d5be01d1f4d75b086eba4ae808f2767c08cbbf73";
+      sha256  = "4ab2b610d439e96c169d9caf9ac0e009d71d3ef9a2fd2c812870b71eb6b27dfc";
+      fetcher = git;
     }
     {
-      dir    = "github.com/ugorji";
-      name   = "go";
-      rev    = "cdeae7b76625959e4164eab9eb303087a794f2cc";
-      sha256 = "0pcjlbhp6vxnksy12rav6c8bvi2v010407l5hibxqdvnampvhlkb";
+      dir     = "github.com/ugorji";
+      name    = "go";
+      rev     = "71c2886f5a673a35f909803f38ece5810165097b";
+      sha256  = "128853bcc5f114c300772cbce316b55e84206fa56705c5b9cc94c1693b11ee94";
+      fetcher = git;
     }
     {
-      dir    = "github.com/mitchellh";
-      name   = "cli";
-      rev    = "69f0b65ce53b27f729b1b807b88dc88007f41dd3";
-      sha256 = "0hnnqd8vg5ca2hglkrj141ba2akdh7crl2lsrgz8d6ipw6asszx3";
+      dir     = "github.com/mitchellh";
+      name    = "cli";
+      rev     = "69f0b65ce53b27f729b1b807b88dc88007f41dd3";
+      sha256  = "0hnnqd8vg5ca2hglkrj141ba2akdh7crl2lsrgz8d6ipw6asszx3";
+      fetcher = git;
     }
     {
-      dir    = "github.com/armon";
-      name   = "mdns";
-      rev    = "17be83de467449f38a8395c30534a9cf0c03e5ea";
-      sha256 = "1fhb6vldclgdx9aqqh1gl87cl5sw3nbq9b7mibkljhbk3cdajyxn";
+      dir     = "github.com/armon";
+      name    = "mdns";
+      rev     = "8be7e3ac4e941555169a99d01abcabd3c982d87a";
+      sha256  = "87cd3a0ada3b094ee8fc4c4742158e0d051cde893da1ea320158a47d6254f69d";
+      fetcher = git;
     }
     {
-      dir    = "github.com/miekg";
-      name   = "dns";
-      rev    = "5eec7f362c392f0a7eaadea69b13667d665feb82";
-      sha256 = "0irlzhd78qmn3lyfbkxmwajv0mm6jp6x0cg7hb9hyj6d01ynlv09";
+      dir     = "github.com/miekg";
+      name    = "dns";
+      rev     = "7ebb4c59b39d5984952a355086606dd91f6cfe86";
+      sha256  = "8418ad2d27e607cef1dc0003471416294443e467f2de9df135e3a2ab411e2512";
+      fetcher = git;
     }
     {
-      dir    = "github.com/mitchellh";
-      name   = "mapstructure";
-      rev    = "57bb2fa7a7e00b26c80e4c4b0d4f15a210d94039";
-      sha256 = "13lvd5vw8y6h5zl3samkrb7237kk778cky7k7ys1cm46mfd957zy";
+      dir     = "github.com/mitchellh";
+      name    = "mapstructure";
+      rev     = "57bb2fa7a7e00b26c80e4c4b0d4f15a210d94039";
+      sha256  = "13lvd5vw8y6h5zl3samkrb7237kk778cky7k7ys1cm46mfd957zy";
+      fetcher = git;
+    }
+    {
+      dir     = "github.com/ryanuber";
+      name    = "columnize";
+      rev     = "d066e113d6e13232f45bda646a915dffeee7f1a4";
+      sha256  = "2aaec396a223fc4b45117a595e74c0a874bd5cd9604c742b8c4747436b4721e9";
+      fetcher = git;
+    }
+    {
+      dir     = "code.google.com/p";
+      name    = "go.net";
+      rev     = "89dbba2db2d4";
+      sha256  = "0168inai10nkdrz4g0rjlj8b5v34mv135v8bhyvh501vnqql50jn";
+      fetcher = hg;
     }
   ];
+  git = desc: fetchgit { url = "https://${desc.dir}/${desc.name}";
+                         inherit (desc) rev sha256; };
+  hg = desc: fetchhg { url = "https://${desc.dir}/${desc.name}";
+                       tag = desc.rev;
+                       inherit (desc) sha256; };
   createGoPathCmds =
     lib.concatStrings
       (map (desc:
-            let
-              fetched = fetchgit { url = "https://${desc.dir}/${desc.name}";
-                                   inherit (desc) rev sha256; };
-            in ''
+            let fetched = desc.fetcher desc; in ''
               mkdir -p $GOPATH/src/${desc.dir}
               ln -s ${fetched} $GOPATH/src/${desc.dir}/${desc.name}
             '') goDeps);
 in
   stdenv.mkDerivation rec {
-    version = "0.4.1";
+    version = "0.5.0";
     name = "serfdom-${version}";
 
     src = fetchurl {
       url = "https://github.com/hashicorp/serf/archive/v${version}.tar.gz";
-      sha256 = "0f4fxhw2r31ks9rs9h3wx9lsymnp8szk0gzggvibwhl2bm6kn6d8";
+      sha256 = "1p2cpkdx0gck1ypxc98im7gsv3275avpkizhsif3nxvl1xd8g1qp";
     };
 
     buildInputs = [ go ];
-- 
GitLab


From 49768ca8ffbdb9796763e4cbc85291cf0270a1c8 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Sat, 15 Mar 2014 12:17:00 +0100
Subject: [PATCH 2209/3789] power-management: Don't enable acpid. Running acpid
 along with systemd will cause double handling of acpi events.

---
 nixos/modules/config/power-management.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix
index 7299136235e..c80b1ec3ddc 100644
--- a/nixos/modules/config/power-management.nix
+++ b/nixos/modules/config/power-management.nix
@@ -65,9 +65,6 @@ in
 
   config = mkIf cfg.enable {
 
-    # Enable the ACPI daemon.  Not sure whether this is essential.
-    services.acpid.enable = true;
-
     boot.kernelModules =
       [ "acpi_cpufreq" "powernow-k8" "cpufreq_performance" "cpufreq_powersave" "cpufreq_ondemand"
         "cpufreq_conservative"
-- 
GitLab


From a330e244ad60e50def988115643b7e42bf46cf58 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 15 Mar 2014 08:15:22 -0400
Subject: [PATCH 2210/3789] Revert "Merge branch 'nix-run' of
 git://github.com/rickynils/nixpkgs"

nix-run's functionality is subsumed by nix-shell -p.

This reverts commit 3cc2b243c7f2d906ce77968e75fd84a3f65a09e0, reversing
changes made to 4d5d6aed29a0ee10a471fd870fa2fdb61408e4eb.
---
 pkgs/build-support/my-env-run/default.nix |  6 --
 pkgs/misc/nix-run/default.nix             | 72 -----------------------
 pkgs/top-level/all-packages.nix           |  6 --
 3 files changed, 84 deletions(-)
 delete mode 100644 pkgs/build-support/my-env-run/default.nix
 delete mode 100644 pkgs/misc/nix-run/default.nix

diff --git a/pkgs/build-support/my-env-run/default.nix b/pkgs/build-support/my-env-run/default.nix
deleted file mode 100644
index 0fedd0b8c6d..00000000000
--- a/pkgs/build-support/my-env-run/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ writeScript, bash, myEnvFun }: args:
-
-let env = myEnvFun args; in writeScript "envrun-${args.name}" ''
-  #!${bash}/bin/bash
-  ${env}/bin/load-env-${args.name}
-''
diff --git a/pkgs/misc/nix-run/default.nix b/pkgs/misc/nix-run/default.nix
deleted file mode 100644
index ef83ec2a1f3..00000000000
--- a/pkgs/misc/nix-run/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ stdenv, bash, writeScript }:
-
-let
-
-  nix-run = writeScript "nix-run" ''
-    #!${bash}/bin/bash
-
-    # Runs nix-build and executes the result
-    # All arguments before "--" are given to nix-build,
-    # and all arguments after "--" are given to the
-    # executed command. stdin is redirected to the executed
-    # command.
-
-    out=$(mktemp)
-    rm "$out"
-
-    # parse args into args1 and args2, separated by --
-    # args1 goes to nix-build, args2 goes to the built command
-    args1=("$@")
-    args2=()
-    for i in "''${!args1[@]}"; do
-      if [ "''${args1[$i]}" == "--" ]; then
-        args2=("''${args1[@]:$((i+1))}")
-        args1=("''${args1[@]:0:$((i))}")
-        break
-      fi
-    done
-
-    if nix-build -o "$out" "''${args1[@]}" >/dev/null; then
-      target=$(readlink -m "$out")
-      unlink "$out"
-      if test -f "$target" && test -x "$target"; then
-        exec "$target" "''${args2[@]}" <&0
-      else
-        echo "nix-run: No executable target produced by nix-build"
-        exit 1
-      fi
-    else
-      echo "nix-run: nix-build failed"
-      exit 1
-    fi
-  '';
-
-in stdenv.mkDerivation {
-  name = "nix-run";
-  phases = [ "installPhase" ];
-  installPhase = ''
-    mkdir -p $out/bin
-    ln -s ${nix-run} $out/bin/nix-run
-  '';
-  meta = {
-    description = ''
-      Wrapper around nix-build that automatically executes the binary
-      produced by the provided Nix expression.
-    '';
-    longDescription = ''
-      nix-run invokes nix-build with any options given to it. It then
-      expects one executable file to be produced by nix-build. If this
-      is the case, that file is executed with any options that is given
-      to nix-run after a <literal>--</literal> option separator. If no
-      executable file is produced by nix-build, nix-run will exit with
-      an error. An example invocation of nix-run is <literal>nix-run -A
-      myattr mynix.nix -- -o opt</literal>. nix-run will then build the
-      attribute <literal>myattr</literal> from the Nix expression given
-      in the file <literal>mynix.nix</literal>. If a single executable
-      file is produced, that file is executed with the option
-      <literal>-o opt</literal>.
-    '';
-    maintainers = [ stdenv.lib.maintainers.rickynils ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9aaa55496e2..ab536d80ce2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10554,12 +10554,6 @@ let
     inherit (stdenv) mkDerivation;
   };
 
-  myEnvRun = import ../build-support/my-env-run {
-    inherit writeScript bash myEnvFun;
-  };
-
-  nix-run = callPackage ../misc/nix-run { };
-
   # patoline requires a rather large ocaml compilation environment.
   # this is why it is build as an environment and not just a normal package.
   # remark : the emacs mode is also installed, but you have to adjust your load-path.
-- 
GitLab


From 6246fad9c707faff6d059337e1cb8bc0deb150ee 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 15:07:45 +0100
Subject: [PATCH 2211/3789] liferea: fix crash when opening file dialogs

The same schema issue as always in gtk3 dialogs.
---
 pkgs/applications/networking/newsreaders/liferea/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index caf7da3cf3c..527c860c098 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
         --prefix LD_LIBRARY_PATH : "${gnome3.libgnome_keyring}/lib" \
         --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
         --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking}/lib/gio/modules" \
-        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share"
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:${gnome3.gtk}/share:$out/share"
     done
   '';
 
-- 
GitLab


From 2985f31b1c0a8c915fabe6a45d0005835ad92a02 Mon Sep 17 00:00:00 2001
From: Anders Claesson <akc@akc.is>
Date: Sat, 15 Mar 2014 16:05:02 +0000
Subject: [PATCH 2212/3789] Add haskell library terminal-size.

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

diff --git a/pkgs/development/libraries/haskell/terminal-size/default.nix b/pkgs/development/libraries/haskell/terminal-size/default.nix
new file mode 100644
index 00000000000..d33bc7d4317
--- /dev/null
+++ b/pkgs/development/libraries/haskell/terminal-size/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "terminal-size";
+  version = "0.2.1.0";
+  sha256 = "0d41af1is3vdb1kgd8dk82fags86bgs67vkbzpdhjdwa3aimsxgn";
+  meta = {
+    description = "Get terminal window height and width";
+    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 2db77d90911..d23471ffdd4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2377,6 +2377,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   terminalProgressBar = callPackage ../development/libraries/haskell/terminal-progress-bar {};
 
+  terminalSize = callPackage ../development/libraries/haskell/terminal-size {};
+
   terminfo_0_3_2_6 = callPackage ../development/libraries/haskell/terminfo/0.3.2.6.nix { inherit (pkgs) ncurses; };
   terminfo_0_4_0_0 = callPackage ../development/libraries/haskell/terminfo/0.4.0.0.nix { inherit (pkgs) ncurses; };
   terminfo = self.terminfo_0_4_0_0;
-- 
GitLab


From 28e5f72f05d0ee931bccb87de63184e47cb3173b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 14 Mar 2014 23:01:32 +0100
Subject: [PATCH 2213/3789] nixos/gpsd-service: change from deprecated 'jobs'
 type to 'systemd'

This has the nice side-effect of making gpsd actually run!

Old behaviour (debugLevel=2):

  systemd[1]: gpsd.service holdoff time over, scheduling restart.
  systemd[1]: Stopping GPSD daemon...
  systemd[1]: Starting GPSD daemon...
  systemd[1]: gpsd.service start request repeated too quickly, refusing to start.
  systemd[1]: Failed to start GPSD daemon.
  systemd[1]: Unit gpsd.service entered failed state.

New behaviour (debugLevel=2):

  gpsd[945]: gpsd: launching (Version 2.95)
  systemd[1]: Started GPSD daemon.
  gpsd[945]: gpsd: listening on port 2947
  gpsd[945]: gpsd: running with effective group ID 27
  gpsd[945]: gpsd: running with effective user ID 23
  gpsd[945]: gpsd: stashing device /dev/ttyUSB0 at slot 0
---
 nixos/modules/services/misc/gpsd.nix | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix
index bc1d1f4575a..a92e06f0902 100644
--- a/nixos/modules/services/misc/gpsd.nix
+++ b/nixos/modules/services/misc/gpsd.nix
@@ -85,19 +85,20 @@ in
         inherit gid;
       };
 
-    jobs.gpsd =
-      { description = "GPSD daemon";
-
-        startOn = "ip-up";
-
-        exec =
-          ''
-            ${pkgs.gpsd}/sbin/gpsd -D "${toString cfg.debugLevel}"  \
-              -S "${toString cfg.port}"                             \
-              ${if cfg.readonly then "-b" else ""}                  \
-              "${cfg.device}"
-          '';
+    systemd.services.gpsd = {
+      description = "GPSD daemon";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      serviceConfig = {
+        Type = "forking";
+        ExecStart = ''
+          ${pkgs.gpsd}/sbin/gpsd -D "${toString cfg.debugLevel}"  \
+            -S "${toString cfg.port}"                             \
+            ${if cfg.readonly then "-b" else ""}                  \
+            "${cfg.device}"
+        '';
       };
+    };
 
   };
 
-- 
GitLab


From f7006116b383fa865c8a24af874f3b4b7997dcbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 15 Mar 2014 09:52:00 +0100
Subject: [PATCH 2214/3789] nixos/gpsd-service: add type declarations to
 options

---
 nixos/modules/services/misc/gpsd.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix
index a92e06f0902..99b733d399e 100644
--- a/nixos/modules/services/misc/gpsd.nix
+++ b/nixos/modules/services/misc/gpsd.nix
@@ -19,6 +19,7 @@ in
     services.gpsd = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to enable `gpsd', a GPS service daemon.
@@ -26,6 +27,7 @@ in
       };
 
       device = mkOption {
+        type = types.str;
         default = "/dev/ttyUSB0";
         description = ''
           A device may be a local serial device for GPS input, or a URL of the form:
@@ -35,6 +37,7 @@ in
       };
 
       readonly = mkOption {
+        type = types.bool;
         default = true;
         description = ''
           Whether to enable the broken-device-safety, otherwise
@@ -51,6 +54,7 @@ in
       };
 
       port = mkOption {
+        type = types.uniq types.int;
         default = 2947;
         description = ''
           The port where to listen for TCP connections.
@@ -58,6 +62,7 @@ in
       };
 
       debugLevel = mkOption {
+        type = types.uniq types.int;
         default = 0;
         description = ''
           The debugging level.
-- 
GitLab


From c54b9b7b6024eaf29a2e022990fbcfae45336572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 24 Nov 2013 00:02:03 +0100
Subject: [PATCH 2215/3789] gpsd: update 2.95 -> 3.10

Build system is changed, gpsd uses scons now.

The expressions needs some more work, TODO comments added. (xgps didn't
work before this change either.)

I added an option for the gpsd group, which is set to upstream default:
"dialout". Note that our default gpsd user is "gpsd", while upstream
uses "nobody" by default.
---
 ...Y_PATH-to-allow-running-scons-check-.patch | 25 +++++++++
 ...OG_FILES-to-be-able-to-validate-the-.patch | 28 ++++++++++
 pkgs/servers/gpsd/default.nix                 | 55 +++++++++++++++----
 3 files changed, 97 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/servers/gpsd/0001-Import-LD_LIBRARY_PATH-to-allow-running-scons-check-.patch
 create mode 100644 pkgs/servers/gpsd/0002-Import-XML_CATALOG_FILES-to-be-able-to-validate-the-.patch

diff --git a/pkgs/servers/gpsd/0001-Import-LD_LIBRARY_PATH-to-allow-running-scons-check-.patch b/pkgs/servers/gpsd/0001-Import-LD_LIBRARY_PATH-to-allow-running-scons-check-.patch
new file mode 100644
index 00000000000..3a38340f43a
--- /dev/null
+++ b/pkgs/servers/gpsd/0001-Import-LD_LIBRARY_PATH-to-allow-running-scons-check-.patch
@@ -0,0 +1,25 @@
+From d7e56abcae8bcb85dc935e94418a2f0e9956941b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
+Date: Mon, 17 Feb 2014 20:52:50 +0000
+Subject: [PATCH 1/2] Import LD_LIBRARY_PATH to allow running 'scons check'
+ without 'chrpath'
+
+---
+ SConstruct | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/SConstruct b/SConstruct
+index 14e2f59..86b94bc 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -215,6 +215,7 @@ import_env = (
+     'PKG_CONFIG_LIBDIR',      # Pass more environment variables to pkg-config (required for crossbuilds)
+     'STAGING_DIR',     # Required by the OpenWRT and CeroWrt builds.
+     'STAGING_PREFIX',  # Required by the OpenWRT and CeroWrt builds.
++    'LD_LIBRARY_PATH', # Allows running 'scons check' without 'chrpath'
+     )
+ envs = {}
+ for var in import_env:
+-- 
+1.9.0
+
diff --git a/pkgs/servers/gpsd/0002-Import-XML_CATALOG_FILES-to-be-able-to-validate-the-.patch b/pkgs/servers/gpsd/0002-Import-XML_CATALOG_FILES-to-be-able-to-validate-the-.patch
new file mode 100644
index 00000000000..f12d7a52ba0
--- /dev/null
+++ b/pkgs/servers/gpsd/0002-Import-XML_CATALOG_FILES-to-be-able-to-validate-the-.patch
@@ -0,0 +1,28 @@
+From aed93b6ada5b9b76b85d11d9bad732ca005295af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
+Date: Sat, 15 Mar 2014 15:08:01 +0100
+Subject: [PATCH 2/2] Import XML_CATALOG_FILES to be able to validate the
+ manual
+
+In nixos/nixpkgs, 'xmlto' depends on $XML_CATALOG_FILES to be able to
+validate XML documents. Because without it, it'll try to go online to
+download DTD's and builders don't have network access...
+---
+ SConstruct | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/SConstruct b/SConstruct
+index 86b94bc..a0b3d25 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -216,6 +216,7 @@ import_env = (
+     'STAGING_DIR',     # Required by the OpenWRT and CeroWrt builds.
+     'STAGING_PREFIX',  # Required by the OpenWRT and CeroWrt builds.
+     'LD_LIBRARY_PATH', # Allows running 'scons check' without 'chrpath'
++    'XML_CATALOG_FILES', # Enables validating the manual with 'xmlto' using nix build system
+     )
+ envs = {}
+ for var in import_env:
+-- 
+1.9.0
+
diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix
index 25051167ca5..ae0656cb644 100644
--- a/pkgs/servers/gpsd/default.nix
+++ b/pkgs/servers/gpsd/default.nix
@@ -1,28 +1,61 @@
-{ fetchurl, stdenv, pythonPackages, pkgconfig, dbus, dbus_glib
+{ fetchurl, stdenv, scons, pythonFull, pkgconfig, dbus, dbus_glib
 , ncurses, libX11, libXt, libXpm, libXaw, libXext, makeWrapper
 , libusb1, docbook_xml_dtd_412, docbook_xsl, bc
-, libxslt, xmlto, gpsdUser ? "gpsd" }:
+, libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout"
+}:
+
+# TODO: the 'xgps' program doesn't work: "ImportError: No module named gobject"
+# TODO: put the X11 deps behind a guiSupport parameter for headless support
 
 stdenv.mkDerivation rec {
-  name = "gpsd-2.95";
+  name = "gpsd-3.10";
 
   src = fetchurl {
-    url = "http://download.berlios.de/gpsd/${name}.tar.gz";
-    sha256 = "1bjhyjg561kwp6zc2wg58njdvpnsj5yaa2slz8g3ga1176jl68w3";
+    url = "http://download-mirror.savannah.gnu.org/releases/gpsd/${name}.tar.gz";
+    sha256 = "0823hl5zgwnbgm0fq3i4z34lv76cpj0k6m0zjiygiyrxrz0w4vvh";
   };
 
-  nativeBuildInputs = [ makeWrapper pkgconfig docbook_xml_dtd_412 docbook_xsl
-    xmlto bc pythonPackages.wrapPython ];
+  nativeBuildInputs = [
+    scons makeWrapper pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc
+    pythonFull
+  ];
 
-  pythonPath = [ pythonPackages.curses ];
+  buildInputs = [
+    pythonFull dbus dbus_glib ncurses libX11 libXt libXpm libXaw libXext
+    libxslt libusb1
+  ];
 
-  buildInputs = [ pythonPackages.python dbus dbus_glib ncurses libX11 libXt
-    libXpm libXaw libXext libxslt libusb1 ];
+  patches = [
+    ./0001-Import-LD_LIBRARY_PATH-to-allow-running-scons-check-.patch
+    ./0002-Import-XML_CATALOG_FILES-to-be-able-to-validate-the-.patch
+  ];
 
-  configureFlags = "--enable-static --enable-dbus --enable-gpsd-user=${gpsdUser}";
+  # - leapfetch=no disables going online at build time to fetch leap-seconds
+  #   info. See <gpsd-src>/build.txt for more info.
+  # - chrpath=no stops the build from using 'chrpath' (which we don't have).
+  #   'chrpath' is used to be able to run the tests from the source tree, but
+  #   we use $LD_LIBRARY_PATH instead.
+  buildPhase = ''
+    mkdir -p "$out"
+    sed -e "s|python_lib_dir = .*|python_lib_dir = \"$out/lib/${pythonFull.python.libPrefix}/site-packages\"|" -i SConstruct
+    scons prefix="$out" leapfetch=no gpsd_user=${gpsdUser} gpsd_group=${gpsdGroup} \
+        systemd=yes udevdir="$out/lib/udev" chrpath=no
+  '';
 
   doCheck = true;
 
+  checkPhase = ''
+    export LD_LIBRARY_PATH="$PWD"
+    scons check
+  '';
+
+  # TODO: the udev rules file and the hotplug script need fixes to work on NixOS
+  installPhase = ''
+    scons install
+    mkdir -p "$out/lib/udev/rules.d"
+    scons udev-install
+  '';
+
   postInstall = "wrapPythonPrograms";
 
   meta = {
-- 
GitLab


From 395618890b403eed43118b80abd20e2aa924c5a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 15 Mar 2014 15:22:32 +0100
Subject: [PATCH 2216/3789] gpsd: update meta attributes

* Don't repeat package name in description
* longDescription re-copied from homepage (gpsd now supports AIS...)
* The homepage has moved
* Add platforms and maintainers
---
 pkgs/servers/gpsd/default.nix | 39 +++++++++++++++++------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix
index ae0656cb644..a89f10ad836 100644
--- a/pkgs/servers/gpsd/default.nix
+++ b/pkgs/servers/gpsd/default.nix
@@ -58,30 +58,29 @@ stdenv.mkDerivation rec {
 
   postInstall = "wrapPythonPrograms";
 
-  meta = {
-    description = "`gpsd', a GPS service daemon";
-
+  meta = with stdenv.lib; {
+    description = "GPS service daemon";
     longDescription = ''
-      gpsd is a service daemon that monitors one or more GPSes
-      attached to a host computer through serial or USB ports, making
-      all data on the location/course/velocity of the sensors
-      available to be queried on TCP port 2947 of the host computer.
-      With gpsd, multiple GPS client applications (such as
-      navigational and wardriving software) can share access to GPSes
-      without contention or loss of data.  Also, gpsd responds to
-      queries with a format that is substantially easier to parse than
-      the NMEA 0183 emitted by most GPSes.  The gpsd distribution
-      includes a linkable C service library, a C++ wrapper class, and
-      a Python module that developers of gpsd-aware applications can
-      use to encapsulate all communication with gpsd.
+      gpsd is a service daemon that monitors one or more GPSes or AIS
+      receivers attached to a host computer through serial or USB ports,
+      making all data on the location/course/velocity of the sensors
+      available to be queried on TCP port 2947 of the host computer. With
+      gpsd, multiple location-aware client applications (such as navigational
+      and wardriving software) can share access to receivers without
+      contention or loss of data. Also, gpsd responds to queries with a
+      format that is substantially easier to parse than the NMEA 0183 emitted
+      by most GPSes. The gpsd distribution includes a linkable C service
+      library, a C++ wrapper class, and a Python module that developers of
+      gpsd-aware applications can use to encapsulate all communication with
+      gpsd. Third-party client bindings for Java and Perl also exist.
 
       Besides gpsd itself, the project provides auxiliary tools for
-      diagnostic monitoring and profiling of GPSes and feeding
-      GPS-aware applications GPS logs for diagnostic purposes.
+      diagnostic monitoring and profiling of receivers and feeding
+      location-aware applications GPS/AIS logs for diagnostic purposes.
     '';
-
-    homepage = http://gpsd.berlios.de/;
-
+    homepage = http://catb.org/gpsd/;
     license = "BSD-style";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
   };
 }
-- 
GitLab


From e76c059b2370294a369bb5c9297668c3f37c3f5c Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 15 Mar 2014 17:31:39 +0100
Subject: [PATCH 2217/3789] grsecurity: Fix grsec-path.patch to apply with
 newest patches

---
 pkgs/os-specific/linux/kernel/grsec-path.patch | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/grsec-path.patch b/pkgs/os-specific/linux/kernel/grsec-path.patch
index be242779548..6f59cf8d80b 100644
--- a/pkgs/os-specific/linux/kernel/grsec-path.patch
+++ b/pkgs/os-specific/linux/kernel/grsec-path.patch
@@ -1,15 +1,17 @@
 diff --git a/kernel/kmod.c b/kernel/kmod.c
-index 3227c2c..f32c944 100644
+index 67f7981..03f127d 100644
 --- a/kernel/kmod.c
 +++ b/kernel/kmod.c
-@@ -246,8 +246,8 @@ static int ____call_usermodehelper(void *data)
+@@ -246,9 +246,9 @@ static int ____call_usermodehelper(void *data)
  	   out the path to be used prior to this point and are now operating
  	   on that copy
  	*/
 -	if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
--	     strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7)) || strstr(sub_info->path, "..")) {
+-	     strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
+-	     strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
 +	if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/nix/store/", 11) &&
-+	     strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) || strstr(sub_info->path, "..")) {
++	     strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) ||
++	     strstr(sub_info->path, "..")) {
  		printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
  		retval = -EPERM;
  		goto fail;
-- 
GitLab


From 732760bb5054971af2bb249af181997da6152e0e Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Sat, 15 Mar 2014 20:22:03 +0100
Subject: [PATCH 2218/3789] Update KTorrent to 4.3.1.

---
 pkgs/applications/networking/p2p/ktorrent/default.nix | 4 ++--
 pkgs/development/libraries/libktorrent/default.nix    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix
index b408f20b711..c7840f2024f 100644
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@@ -5,11 +5,11 @@ stdenv.mkDerivation rec {
   name = pname + "-" + version;
 
   pname = "ktorrent";
-  version = "4.2.1";
+  version = "4.3.1";
 
   src = fetchurl {
     url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2";
-    sha256 = "1b6w7i1vvq8mlw9yrlxvb51hvaj6rpl8lv9b9zagyl3wcanz73zd";
+    sha256 = "66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1";
   };
 
   patches = [ ./find-workspace.diff ];
diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix
index a452cb7609e..3d7c21fde16 100644
--- a/pkgs/development/libraries/libktorrent/default.nix
+++ b/pkgs/development/libraries/libktorrent/default.nix
@@ -2,8 +2,8 @@
 , phonon, libgcrypt }:
 
 let
-  mp_ = "2.1";
-  version = "1.${mp_}-2";
+  mp_ = "3.1";
+  version = "1.${mp_}";
   version4 = "4.${mp_}";
 in
 stdenv.mkDerivation rec {
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
   pname = "libktorrent";
 
   src = fetchurl {
-    url = "http://ktorrent.org/downloads/${version4}/${name}.tar.bz2";
-    sha256 = "1b4ibkba27ivvjsh5s93xwlcgzvvwsgl6mcd8g96d1al05n2ccw9";
+    url = "http://ktorrent.pwsp.net//downloads/${version4}/${name}.tar.bz2";
+    sha256 = "2fe11ccb4bf2028c3da11e52cde890f1b3a90560e548eac89a4f8e1558b09725";
   };
 
   nativeBuildInputs = [ cmake automoc4 gettext ];
-- 
GitLab


From 44b6766f5dbfb7fe3187f5bd1550f2f61e726e6c Mon Sep 17 00:00:00 2001
From: Ellis Whitehead <ellis@ellisw.net>
Date: Sat, 15 Mar 2014 20:21:30 +0100
Subject: [PATCH 2219/3789] Create package for 'fasd'

---
 pkgs/tools/misc/fasd/default.nix | 37 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  4 ++++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/misc/fasd/default.nix

diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix
new file mode 100644
index 00000000000..77d1d58c30c
--- /dev/null
+++ b/pkgs/tools/misc/fasd/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchgit, pandoc, ... } :
+
+let
+  rev = "287af2b80e0829b08dc6329b4fe8d8e5594d64b0";
+in
+stdenv.mkDerivation {
+
+  name = "fasd-1.0.1";
+
+  src = fetchgit {
+    url = "https://github.com/clvv/fasd.git";
+    inherit rev;
+    sha256 = "0kv9iyfdf916x0gab9fzs4vmsnkaqmb6kh4xna485nqij89xzkgs";
+  };
+
+  installPhase = ''
+    PREFIX=$out make install
+  '';
+
+  meta = {
+    homepage = "https://github.com/clvv/fasd";
+    description = "quick command-line access to files and directories for POSIX shells";
+    license = "free";
+
+    longDescription = ''
+      Fasd is a command-line productivity booster.
+      Fasd offers quick access to files and directories for POSIX shells. It is
+      inspired by tools like autojump, z and v. Fasd keeps track of files and
+      directories you have accessed, so that you can quickly reference them in the
+      command line.
+    '';
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}
+
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fc4e432073..a797207b8af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -586,6 +586,10 @@ let
 
   enca = callPackage ../tools/text/enca { };
 
+  fasd = callPackage ../tools/misc/fasd {
+    inherit (haskellPackages) pandoc;
+  };
+
   fop = callPackage ../tools/typesetting/fop { };
 
   mcrl = callPackage ../tools/misc/mcrl { };
-- 
GitLab


From 24f4957d50584aa6683451c7cbbb63a42846d5dc Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Sat, 15 Mar 2014 21:31:58 +0100
Subject: [PATCH 2220/3789] KTorrent: Fix URLs.

---
 pkgs/applications/networking/p2p/ktorrent/default.nix | 2 +-
 pkgs/development/libraries/libktorrent/default.nix    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix
index c7840f2024f..e53fda08911 100644
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "KDE integrated BtTorrent client";
-    homepage = http://ktorrent.org;
+    homepage = http://ktorrent.pwsp.net;
     maintainers = with stdenv.lib.maintainers; [ sander urkud ];
     inherit (libktorrent.meta) platforms;
   };
diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix
index 3d7c21fde16..db07775d45e 100644
--- a/pkgs/development/libraries/libktorrent/default.nix
+++ b/pkgs/development/libraries/libktorrent/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   pname = "libktorrent";
 
   src = fetchurl {
-    url = "http://ktorrent.pwsp.net//downloads/${version4}/${name}.tar.bz2";
+    url = "${meta.homepage}/downloads/${version4}/${name}.tar.bz2";
     sha256 = "2fe11ccb4bf2028c3da11e52cde890f1b3a90560e548eac89a4f8e1558b09725";
   };
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A BiTtorrent library used by KTorrent";
-    homepage = http://ktorrent.org;
+    homepage = http://ktorrent.pwsp.net;
     inherit (kdelibs.meta) platforms;
   };
 }
-- 
GitLab


From 2ce7902059467db3b415309bb8e877bb762b7942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 15 Mar 2014 23:59:44 +0100
Subject: [PATCH 2221/3789] gpsd: fix build in chroot

Fixes this when building with nix.useChroot = true in configuration.nix:

  sh: ./test_maidenhead.py: /usr/bin/env: bad interpreter: No such file or directory
  scons: *** [maidenhead-locator-regress] Error 126
  scons: building terminated because of errors.
---
 pkgs/servers/gpsd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix
index a89f10ad836..a52ca2b6871 100644
--- a/pkgs/servers/gpsd/default.nix
+++ b/pkgs/servers/gpsd/default.nix
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
   #   'chrpath' is used to be able to run the tests from the source tree, but
   #   we use $LD_LIBRARY_PATH instead.
   buildPhase = ''
+    patchShebangs .
     mkdir -p "$out"
     sed -e "s|python_lib_dir = .*|python_lib_dir = \"$out/lib/${pythonFull.python.libPrefix}/site-packages\"|" -i SConstruct
     scons prefix="$out" leapfetch=no gpsd_user=${gpsdUser} gpsd_group=${gpsdGroup} \
-- 
GitLab


From 1661501465f0a2d01697b11b53ebf0e5c85daf0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 16 Mar 2014 11:32:56 +0100
Subject: [PATCH 2222/3789] ardour: make ardour3 the default and remove ardour
 2, it doesn't build

---
 pkgs/applications/audio/ardour/ardour3.nix | 62 -----------------
 pkgs/applications/audio/ardour/default.nix | 81 ++++++++++++----------
 pkgs/top-level/all-packages.nix            |  6 +-
 3 files changed, 48 insertions(+), 101 deletions(-)
 delete mode 100644 pkgs/applications/audio/ardour/ardour3.nix

diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix
deleted file mode 100644
index 4315a5a7547..00000000000
--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw
-, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio
-, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
-, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
-, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
-, perl, pkgconfig, python, serd, sord, sratom, suil }:
-
-let
-  tag = "3.5.357";
-in
-
-stdenv.mkDerivation rec {
-  name = "ardour-${tag}";
-
-  src = fetchgit {
-    url = git://git.ardour.org/ardour/ardour.git;
-    rev = "refs/tags/${tag}";
-    sha256 = "1e026fb9a6ad4179d52c4b578cc3861bdfd3629b9e7b7a7341d431c7d3692c42";
-  };
-
-  buildInputs = 
-    [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
-      glibmm gtk gtkmm jackaudio libgnomecanvas libgnomecanvasmm liblo
-      libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
-      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
-      makeWrapper pango perl pkgconfig python serd sord sratom suil
-    ];
-
-  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
-    # Note the different version number
-    sed -i '33i rev = \"3.5-357-gce4d125\"' 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
-  '';
-
-  configurePhase = "python waf configure --optimize --prefix=$out";
-
-  buildPhase = "python waf";
-
-  # For the custom ardour clearlooks gtk-engine to work, it must be
-  # moved to a directory called "engines" and added to GTK_PATH
-  installPhase = ''
-    python waf install
-    mkdir -pv $out/gtk2/engines
-    cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/
-    wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Multi-track hard disk recording software";
-    longDescription = ''
-      Also read "The importance of Paying Something" on their homepage, please!
-    '';
-    homepage = http://ardour.org/;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 08cecfea064..4315a5a7547 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -1,51 +1,62 @@
-{ stdenv, fetchurl, scons, boost, pkgconfig, fftw, librdf_raptor2
-, librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2
-, lilv, lv2, serd, sord, sratom, suil # these are probably optional
-, libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango
-, gtk, glibmm, gtkmm, libgnomecanvas, libgnomecanvasmm, liblo, aubio
-, fftwSinglePrec, libmad, automake, autoconf, libtool, liblrdf, curl }:
+{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw
+, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio
+, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
+, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
+, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
+, perl, pkgconfig, python, serd, sord, sratom, suil }:
+
+let
+  tag = "3.5.357";
+in
 
 stdenv.mkDerivation rec {
-  name = "ardour-${version}";
-  version = "2.8.16";
+  name = "ardour-${tag}";
 
-  src = fetchurl {
-    url = "mirror://gentoo/distfiles/${name}.tar.bz2";
-    sha256 = "0h2y0x4yznalllja53anjil2gmgcb26f39zshc4gl1d1kc8k5vip";
+  src = fetchgit {
+    url = git://git.ardour.org/ardour/ardour.git;
+    rev = "refs/tags/${tag}";
+    sha256 = "1e026fb9a6ad4179d52c4b578cc3861bdfd3629b9e7b7a7341d431c7d3692c42";
   };
 
-  postPatch = ''
-    #sed -e "s#/usr/bin/which#type -P#" -i libs/glibmm2/autogen.sh
-    echo '#include "ardour/svn_revision.h"' > libs/ardour/svn_revision.cc
-    echo -e 'namespace ARDOUR {\n extern const char* svn_revision = "2.8.12";\n }\n' >> libs/ardour/svn_revision.cc
-  '';
+  buildInputs = 
+    [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
+      glibmm gtk gtkmm jackaudio libgnomecanvas libgnomecanvasmm liblo
+      libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
+      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
+      makeWrapper pango perl pkgconfig python serd sord sratom suil
+    ];
 
-  buildInputs = [
-    scons boost pkgconfig fftw librdf_raptor2 librdf_rasqal jackaudio
-    flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx
-    #lilv lv2 serd sord sratom suil
-    libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas libgnomecanvasmm liblrdf
-    liblo aubio fftwSinglePrec libmad autoconf automake libtool curl
-  ];
-
-  buildPhase = ''
-    mkdir -p $out
-    export CXX=g++
-    scons PREFIX=$out SYSLIBS=1 install
+  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
+    # Note the different version number
+    sed -i '33i rev = \"3.5-357-gce4d125\"' 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
   '';
 
-  installPhase = ":";
+  configurePhase = "python waf configure --optimize --prefix=$out";
+
+  buildPhase = "python waf";
+
+  # For the custom ardour clearlooks gtk-engine to work, it must be
+  # moved to a directory called "engines" and added to GTK_PATH
+  installPhase = ''
+    python waf install
+    mkdir -pv $out/gtk2/engines
+    cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/
+    wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Multi-track hard disk recording software";
     longDescription = ''
-      Broken: use ardour3-svn instead
       Also read "The importance of Paying Something" on their homepage, please!
     '';
     homepage = http://ardour.org/;
-    branch  = "2";
-    license = "GPLv2";
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    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 22dee1d2a20..ba6cb440c74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7501,11 +7501,9 @@ let
 
   antiword = callPackage ../applications/office/antiword {};
 
-  ardour = callPackage ../applications/audio/ardour {
-    inherit (gnome) libgnomecanvas libgnomecanvasmm;
-  };
+  ardour = ardour3;
 
-  ardour3 =  lowPrio (callPackage ../applications/audio/ardour/ardour3.nix {
+  ardour3 =  lowPrio (callPackage ../applications/audio/ardour {
     inherit (gnome) libgnomecanvas libgnomecanvasmm;
   });
 
-- 
GitLab


From 37c42c16a478384c059130fd3d70ee0ee6fe2c7f Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 16 Mar 2014 11:49:07 +0100
Subject: [PATCH 2223/3789] networkmanagerapplet: fix crash while connecting to
 protected wifis

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

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 4d2dff22d11..6db55ada192 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     ln -s ${networkmanager_openconnect}/libexec/* $out/libexec/
     wrapProgram "$out/bin/nm-applet" \
       --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
-      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \
+      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:${gnome3.gtk}/share:$out/share" \
       --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
       --prefix PATH ":" "${gnome3.gconf}/bin"
   '';
-- 
GitLab


From b57ee8c33104523cd64426dd77770f0adc9731b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 16 Mar 2014 12:08:26 +0100
Subject: [PATCH 2224/3789] nixpkgs-lint: add the platforms meta attr for most
 of my packages

---
 pkgs/applications/audio/a2jmidid/default.nix             | 2 +-
 pkgs/applications/audio/gigedit/default.nix              | 1 +
 pkgs/applications/audio/jalv/default.nix                 | 1 +
 pkgs/applications/audio/lash/default.nix                 | 2 +-
 pkgs/applications/audio/mid2key/default.nix              | 1 +
 pkgs/applications/audio/qsampler/default.nix             | 1 +
 pkgs/development/libraries/audio/lilv/default.nix        | 2 +-
 pkgs/development/libraries/audio/lv2/default.nix         | 2 +-
 pkgs/development/libraries/audio/sratom/default.nix      | 2 +-
 pkgs/development/libraries/audio/suil/default.nix        | 2 +-
 pkgs/development/libraries/libconfig/default.nix         | 1 +
 pkgs/development/libraries/libgig/default.nix            | 1 +
 pkgs/development/libraries/liblscp/default.nix           | 1 +
 pkgs/development/libraries/serd/default.nix              | 2 +-
 pkgs/development/libraries/sord/default.nix              | 2 +-
 pkgs/development/tools/selenium/chromedriver/default.nix | 1 +
 pkgs/misc/themes/gtk2/oxygen-gtk/default.nix             | 1 +
 pkgs/os-specific/linux/ffado/default.nix                 | 1 +
 pkgs/os-specific/linux/plymouth/default.nix              | 1 +
 pkgs/tools/text/podiff/default.nix                       | 1 +
 pkgs/tools/text/uni2ascii/default.nix                    | 1 +
 21 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index 9dbdada07d4..c5e35d8867c 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system";
     license = licenses.gpl2;
     maintainers = [ maintainers.goibhniu ];
-
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix
index be6970f01e1..269b48aebb8 100644
--- a/pkgs/applications/audio/gigedit/default.nix
+++ b/pkgs/applications/audio/gigedit/default.nix
@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
     description = "Gigasampler file access library";
     license = licenses.gpl2;
     maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix
index 6b15052769b..2baf69cef4f 100644
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation  rec {
     homepage = http://drobilla.net/software/jalv;
     license = licenses.isc;
     maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix
index 72087c76b05..ad52e7b2d85 100644
--- a/pkgs/applications/audio/lash/default.nix
+++ b/pkgs/applications/audio/lash/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation  rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "LASH Audio Session Handler";
+    description = "A Linux Audio Session Handler";
     longDescription = ''
       Session management system for GNU/Linux audio applications.
     '';
diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix
index 1e163391a39..26ea2c7b0b2 100644
--- a/pkgs/applications/audio/mid2key/default.nix
+++ b/pkgs/applications/audio/mid2key/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     description = "A simple tool which maps midi notes to simulated keystrokes";
     license = licenses.gpl3;
     maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix
index 7cfe73c9c75..b851517b872 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/applications/audio/qsampler/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     description = "graphical frontend to LinuxSampler";
     license = licenses.gpl2;
     maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index 9150df8da7d..d1510e34238 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "A C library to make the use of LV2 plugins";
     license = licenses.mit;
     maintainers = [ maintainers.goibhniu ];
-
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
index f5d48df03f8..25d19d089a5 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/pkgs/development/libraries/audio/lv2/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "A plugin standard for audio systems";
     license = licenses.mit;
     maintainers = [ maintainers.goibhniu ];
-
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix
index 5c78296af97..ac0b9d233fa 100644
--- a/pkgs/development/libraries/audio/sratom/default.nix
+++ b/pkgs/development/libraries/audio/sratom/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "A library for serialising LV2 atoms to/from RDF";
     license = licenses.mit;
     maintainers = [ maintainers.goibhniu ];
-
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index 8af725b6b80..87e03472659 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "A lightweight C library for loading and wrapping LV2 plugin UIs";
     license = licenses.mit;
     maintainers = [ maintainers.goibhniu ];
-
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix
index 70a882ff15c..d6c238ff179 100644
--- a/pkgs/development/libraries/libconfig/default.nix
+++ b/pkgs/development/libraries/libconfig/default.nix
@@ -14,5 +14,6 @@ stdenv.mkDerivation rec {
     description = "a simple library for processing structured configuration files";
     license = licenses.lgpl3;
     maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix
index 6129ef42f3d..8975c4fa074 100644
--- a/pkgs/development/libraries/libgig/default.nix
+++ b/pkgs/development/libraries/libgig/default.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
     description = "Gigasampler file access library";
     license = licenses.gpl2;
     maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix
index 33731e5d755..a1cbf9250c4 100644
--- a/pkgs/development/libraries/liblscp/default.nix
+++ b/pkgs/development/libraries/liblscp/default.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
     description = "LinuxSampler Control Protocol (LSCP) wrapper library";
     license = licenses.gpl2;
     maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix
index 63733a35b20..2fd5c9ad493 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/pkgs/development/libraries/serd/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples";
     license = licenses.mit;
     maintainers = [ maintainers.goibhniu ];
-
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index 0f2326420cb..8f122cb699a 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "A lightweight C library for storing RDF data in memory";
     license = licenses.mit;
     maintainers = [ maintainers.goibhniu ];
-
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index bbe21378248..90f7647aa05 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
     description = "A WebDriver server for running Selenium tests on Chrome";
     license = licenses.bsd3;
     maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
index 88807ab6dea..1bd4d5f35b4 100644
--- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
+++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
     homepage = https://projects.kde.org/projects/playground/artwork/oxygen-gtk;
     license = licenses.lgpl2;
     maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 834f98960df..e024a608a0b 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
     description = "FireWire audio drivers";
     license = licenses.gpl3;
     maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix
index bf3da195467..4c51c4fea6c 100644
--- a/pkgs/os-specific/linux/plymouth/default.nix
+++ b/pkgs/os-specific/linux/plymouth/default.nix
@@ -52,5 +52,6 @@ stdenv.mkDerivation rec {
     description = "A graphical boot animation";
     license = licenses.gpl2;
     maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix
index fc9e3785cf3..ccfeabaa73b 100644
--- a/pkgs/tools/text/podiff/default.nix
+++ b/pkgs/tools/text/podiff/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     homepage = http://puszcza.gnu.org.ua/software/podiff;
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix
index 0f54644eba5..c81e02b4399 100644
--- a/pkgs/tools/text/uni2ascii/default.nix
+++ b/pkgs/tools/text/uni2ascii/default.nix
@@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
     similar ASCII characters, e.g. by stripping diacritics.
     '';
     maintainers = [ "cillian.deroiste@gmail.com" ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From 26d5d506c968e4a06c5b37bdd154aa8525f2d77e Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 14 Mar 2014 23:39:56 +0100
Subject: [PATCH 2225/3789] conky: add config options

---
 pkgs/os-specific/linux/conky/default.nix   | 62 +++++++++++++++++++---
 pkgs/os-specific/linux/conky/stdbool.patch | 12 -----
 pkgs/top-level/all-packages.nix            | 11 +++-
 3 files changed, 64 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/conky/stdbool.patch

diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 086b792b4cd..3e95daba29e 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -1,5 +1,33 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl
-, ncurses }:
+{ stdenv, fetchurl, pkgconfig
+
+# dependencies
+, glib, ncurses
+
+# optional features without extra dependencies
+, mpdSupport   ? true
+
+# optional features with extra dependencies
+, x11Support   ? false, x11           ? null
+, xdamage      ? false, libXdamage    ? null
+, wireless     ? false, wirelesstools ? null
+, luaSupport   ? false, lua5          ? null
+
+, rss          ? false
+, weatherMetar ? false
+, weatherXoap  ? false
+, curl ? null, libxml2 ? null
+}:
+
+assert luaSupport -> lua5          != null;
+assert wireless   -> wirelesstools != null;
+assert x11Support -> x11           != null;
+assert xdamage    -> x11Support && libXdamage != null;
+
+assert rss          -> curl != null && libxml2 != null;
+assert weatherMetar -> curl != null;
+assert weatherXoap  -> curl != null && libxml2 != null;
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "conky-1.9.0";
@@ -9,17 +37,35 @@ stdenv.mkDerivation rec {
     sha256 = "0vxvjmi3cdvnp994sv5zcdyncfn0mlxa71p2wm9zpyrmy58bbwds";
   };
 
-  patches = [ ./stdbool.patch ];
+  buildInputs = [ pkgconfig glib ncurses ]
+    ++ optional  luaSupport   lua5
+    ++ optional  wireless     wirelesstools
+    ++ optional  x11Support   x11
+    ++ optional  xdamage      libXdamage
+
+    ++ optionals rss          [ curl libxml2 ]
+    ++ optional  weatherMetar curl
+    ++ optionals weatherXoap  [ curl libxml2 ]
+    ;
 
-  buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ncurses ];
   configureFlags =
-    (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" ])
-    ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss"
-                                   "weather-metar" "weather-xoap" ]);
+    let flag = state: flags: if state then map (x: "--enable-${x}")  flags
+                                      else map (x: "--disable-${x}") flags;
+     in flag mpdSupport   [ "mpd" ]
+
+     ++ flag luaSupport   [ "lua" ]
+     ++ flag wireless     [ "wlan" ]
+     ++ flag x11Support   [ "x11" "xft" "argb" "double-buffer" "own-window" ] # conky won't compile without --enable-own-window
+     ++ flag xdamage      [ "xdamage" ]
+
+     ++ flag rss          [ "rss" ]
+     ++ flag weatherMetar [ "weather-metar" ]
+     ++ flag weatherXoap  [ "weather-xoap" ]
+     ;
 
   meta = {
     homepage = http://conky.sourceforge.net/;
-    description = "Conky is an advanced, highly configurable system monitor complied without X based on torsmo";
+    description = "Conky is an advanced, highly configurable system monitor based on torsmo";
     maintainers = [ stdenv.lib.maintainers.guibert ];
     license = stdenv.lib.licenses.gpl3Plus;
   };
diff --git a/pkgs/os-specific/linux/conky/stdbool.patch b/pkgs/os-specific/linux/conky/stdbool.patch
deleted file mode 100644
index 3f0b714a1f0..00000000000
--- a/pkgs/os-specific/linux/conky/stdbool.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/conky.c b/src/conky.c
-index 5848b61..69a3d45 100644
---- a/src/conky.c
-+++ b/src/conky.c
-@@ -34,6 +34,7 @@
- #include "common.h"
- #include "timed_thread.h"
- #include <stdarg.h>
-+#include <stdbool.h>
- #include <math.h>
- #include <time.h>
- #include <locale.h>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba6cb440c74..7e6c88a526a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6583,7 +6583,16 @@ let
 
   cifs_utils = callPackage ../os-specific/linux/cifs-utils { };
 
-  conky = callPackage ../os-specific/linux/conky { };
+  conky = callPackage ../os-specific/linux/conky {
+    mpdSupport   = config.conky.mpdSupport   or true;
+    x11Support   = config.conky.x11Support   or false;
+    xdamage      = config.conky.xdamage      or false;
+    wireless     = config.conky.wireless     or false;
+    luaSupport   = config.conky.luaSupport   or false;
+    rss          = config.conky.rss          or false;
+    weatherMetar = config.conky.weatherMetar or false;
+    weatherXoap  = config.conky.weatherXoap  or false;
+  };
 
   cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
 
-- 
GitLab


From 29d46452dd772c449adbd951e8099320705241fd Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 18 Feb 2014 03:38:35 -0600
Subject: [PATCH 2226/3789] nixos: add Duo Security module

This module adds the security.duosec attributes, which you can use to
enable simple two-factor authentication for NixOS logins.

The module currently provides PAM and SSH support, although the PAM unix
system configuration isn't automatically dealt with (although the
configuration is automatically built).

Enabling it is as easy as saying:

  security.duosec.ssh.enable = true;
  security.duosec.ikey       = "XXXXXXXX...";
  security.duosec.skey       = "XXXXXXXX...";
  security.duosec.host       = "api-XXXXXXX.duosecurity.com";
  security.duosec.group      = "duosec";

which will enforce two-factor authentication for SSH logins for users in
the 'duosec' group.

This requires uid/gid support in the environment.etc module.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/module-list.nix     |   1 +
 nixos/modules/security/duosec.nix | 198 ++++++++++++++++++++++++++++++
 2 files changed, 199 insertions(+)
 create mode 100644 nixos/modules/security/duosec.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 391cc2503bd..21db81c1497 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -61,6 +61,7 @@
   ./security/apparmor.nix
   ./security/apparmor-suid.nix
   ./security/ca.nix
+  ./security/duosec.nix
   ./security/pam.nix
   ./security/pam_usb.nix
   ./security/polkit.nix
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
new file mode 100644
index 00000000000..989bd13d101
--- /dev/null
+++ b/nixos/modules/security/duosec.nix
@@ -0,0 +1,198 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.security.duosec;
+
+  boolToStr = b: if b then "yes" else "no";
+
+  configFile = ''
+    [duo]
+    ikey=${cfg.ikey}
+    skey=${cfg.skey}
+    host=${cfg.host}
+    ${optionalString (cfg.group != "") ("group="+cfg.group)}
+    failmode=${cfg.failmode}
+    pushinfo=${boolToStr cfg.pushinfo}
+    autopush=${boolToStr cfg.autopush}
+    motd=${boolToStr cfg.motd}
+    prompts=${toString cfg.prompts}
+    accept_env_factor=${boolToStr cfg.acceptEnvFactor}
+    fallback_local_ip=${boolToStr cfg.fallbackLocalIP}
+  '';
+
+  loginCfgFile = optional cfg.ssh.enable
+    { source = pkgs.writeText "login_duo.conf" configFile;
+      mode   = "0600";
+      uid    = config.ids.uids.sshd;
+      target = "duo/login_duo.conf";
+    };
+
+  pamCfgFile = optional cfg.pam.enable
+    { source = pkgs.writeText "pam_duo.conf" configFile;
+      mode   = "0600";
+      uid    = config.ids.uids.sshd;
+      target = "duo/pam_duo.conf";
+    };
+in
+{
+  options = {
+    security.duosec = {
+      ssh.enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "If enabled, protect SSH logins with Duo Security.";
+      };
+
+      pam.enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "If enabled, protect logins with Duo Security using PAM support.";
+      };
+
+      ikey = mkOption {
+        type = types.str;
+        description = "Integration key.";
+      };
+
+      skey = mkOption {
+        type = types.str;
+        description = "Secret key.";
+      };
+
+      host = mkOption {
+        type = types.str;
+        description = "Duo API hostname.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "";
+        description = "Use Duo authentication for users only in this group.";
+      };
+
+      failmode = mkOption {
+        type = types.str;
+        default = "safe";
+        description = ''
+          On service or configuration errors that prevent Duo
+          authentication, fail "safe" (allow access) or "secure" (deny
+          access). The default is "safe".
+        '';
+      };
+
+      pushinfo = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Include information such as the command to be executed in
+          the Duo Push message.
+        '';
+      };
+
+      autopush = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If <literal>true</literal>, Duo Unix will automatically send
+          a push login request to the user’s phone, falling back on a
+          phone call if push is unavailable. If
+          <literal>false</literal>, the user will be prompted to
+          choose an authentication method. When configured with
+          <literal>autopush = yes</literal>, we recommend setting
+          <literal>prompts = 1</literal>.
+        '';
+      };
+
+      motd = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Print the contents of <literal>/etc/motd</literal> to screen
+          after a succesful login.
+        '';
+      };
+
+      prompts = mkOption {
+        type = types.int;
+        default = 3;
+        description = ''
+          If a user fails to authenticate with a second factor, Duo
+          Unix will prompt the user to authenticate again. This option
+          sets the maximum number of prompts that Duo Unix will
+          display before denying access. Must be 1, 2, or 3. Default
+          is 3.
+
+          For example, when <literal>prompts = 1</literal>, the user
+          will have to successfully authenticate on the first prompt,
+          whereas if <literal>prompts = 2</literal>, if the user
+          enters incorrect information at the initial prompt, he/she
+          will be prompted to authenticate again.
+
+          When configured with <literal>autopush = true</literal>, we
+          recommend setting <literal>prompts = 1</literal>.
+        '';
+      };
+
+      acceptEnvFactor = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Look for factor selection or passcode in the
+          <literal>$DUO_PASSCODE</literal> environment variable before
+          prompting the user for input.
+
+          When $DUO_PASSCODE is non-empty, it will override
+          autopush. The SSH client will need SendEnv DUO_PASSCODE in
+          its configuration, and the SSH server will similarily need
+          AcceptEnv DUO_PASSCODE.
+        '';
+      };
+
+      fallbackLocalIP = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Duo Unix reports the IP address of the authorizing user, for
+          the purposes of authorization and whitelisting. If Duo Unix
+          cannot detect the IP address of the client, setting
+          <literal>fallbackLocalIP = yes</literal> will cause Duo Unix
+          to send the IP address of the server it is running on.
+
+          If you are using IP whitelisting, enabling this option could
+          cause unauthorized logins if the local IP is listed in the
+          whitelist.
+        '';
+      };
+    };
+  };
+
+  config = mkIf (cfg.ssh.enable || cfg.pam.enable) {
+    assertions =
+      [ { assertion = cfg.failmode == "safe" || cfg.failmode == "secure";
+          message   = "Invalid value for failmode (must be safe or secure).";
+        }
+        { assertion = cfg.prompts == 1 || cfg.prompts == 2 || cfg.prompts == 3;
+          message   = "Invalid value for prompts (must be 1, 2, or 3).";
+        }
+        { assertion = !cfg.pam.enable;
+          message   = "PAM support is currently not implemented.";
+        }
+      ];
+
+     environment.systemPackages = [ pkgs.duo-unix ];
+     security.setuidPrograms    = [ "login_duo" ];
+     environment.etc = loginCfgFile ++ pamCfgFile;
+
+     /* If PAM *and* SSH are enabled, then don't do anything special.
+     If PAM isn't used, set the default SSH-only options. */
+     services.openssh.extraConfig = mkIf (cfg.ssh.enable || cfg.pam.enable) (
+     if cfg.pam.enable then "UseDNS no" else ''
+       # Duo Security configuration
+       ForceCommand ${config.security.wrapperDir}/login_duo
+       PermitTunnel no
+       AllowTcpForwarding no
+     '');
+  };
+}
-- 
GitLab


From 47b35d5e801f365f0d1dc72509f3c3a1f7301f26 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 27 Feb 2014 01:05:20 -0600
Subject: [PATCH 2227/3789] criu: version 1.2

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/criu/default.nix | 37 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/os-specific/linux/criu/default.nix

diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
new file mode 100644
index 00000000000..30056d8b8e6
--- /dev/null
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, protobuf, protobufc, asciidoc, xmlto, utillinux }:
+
+stdenv.mkDerivation rec {
+  name    = "criu-${version}";
+  version = "1.2";
+
+  src = fetchurl {
+    url    = "http://download.openvz.org/criu/${name}.tar.bz2";
+    sha256 = "04xlnqvgbjd5wfmi97m5rr76a3agkz8g96hdyzhc6x8gd52bbg9y";
+  };
+
+  enableParallelBuilding = true;
+  buildInputs = [ protobuf protobufc asciidoc xmlto ];
+
+  patchPhase = ''
+    chmod +w ./scripts/gen-offsets.sh
+    substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump
+  '';
+
+  buildPhase = ''
+    make config PREFIX=$out
+    make PREFIX=$out
+  '';
+
+  installPhase = ''
+    mkdir -p $out/etc/logrotate.d
+    make install PREFIX=$out LIBDIR=$out/lib
+  '';
+
+  meta = {
+    description = "userspace checkpoint/restore for Linux";
+    homepage    = "http://criu.org";
+    license     = stdenv.lib.licenses.gpl2;
+    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 44a23e828df..d17bd16b540 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6521,6 +6521,8 @@ let
 
   cryopid = callPackage ../os-specific/linux/cryopid { };
 
+  criu = callPackage ../os-specific/linux/criu { };
+
   cryptsetup = callPackage ../os-specific/linux/cryptsetup { };
 
   cramfsswap = callPackage ../os-specific/linux/cramfsswap { };
-- 
GitLab


From a16e1e21336feff9ceda23b38a19f37f682b97a1 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 15 Mar 2014 17:37:15 +0100
Subject: [PATCH 2228/3789] chromium: Update stable and beta channels

stable: 33.0.1750.149 -> 33.0.1750.152
beta:   34.0.1847.45  -> 34.0.1847.60
---
 .../networking/browsers/chromium/sources.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index a3645b2ac69..782356640c8 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -6,13 +6,13 @@
     sha256 = "0qbv6prxl18y5824pfd13ng9798g561gzb6nypwp502hqr45jvb6";
   };
   beta = {
-    version = "34.0.1847.45";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.45.tar.xz";
-    sha256 = "0ypz6cclddiasmy8z5p97ndpl9xb7p5ncn9dxm6zkffxyagnx531";
+    version = "34.0.1847.60";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.60.tar.xz";
+    sha256 = "1na5d6z4a0wkabn7cj62vyiv3mmvcb6qdvrkyy6fj79h7gk2hb7k";
   };
   stable = {
-    version = "33.0.1750.149";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.149.tar.xz";
-    sha256 = "111hml6kjfzps9addvhcjygjb2k65spknx2zc6pnz4ygshynspqn";
+    version = "33.0.1750.152";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.152.tar.xz";
+    sha256 = "0byc23vwn9alsva0jqvwvgnbx2bm7x48m3jln02y4fpf1f265m4z";
   };
 }
-- 
GitLab


From af163435040945b0f37ad58cd64dc2dd35b0b61b Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Sun, 16 Mar 2014 16:01:06 +0100
Subject: [PATCH 2229/3789] deluge: add curses module for deluge-console

---
 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 254dcb7c988..17880714115 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2395,7 +2395,7 @@ rec {
     };
 
     propagatedBuildInputs = with pkgs; [
-      pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl
+      pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl modules.curses
     ];
 
     postInstall = ''
-- 
GitLab


From d4da7e5e4f3190a50db9105260158470a474ffff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Mar 2014 23:28:18 +0100
Subject: [PATCH 2230/3789] man-pages-posix: update 2003a -> 2013-a

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

diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/pkgs/data/documentation/man-pages-posix/default.nix
index 8c126db0792..78b3aa1c8b3 100644
--- a/pkgs/data/documentation/man-pages-posix/default.nix
+++ b/pkgs/data/documentation/man-pages-posix/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "man-pages-posix-2003a";
+  name = "man-pages-posix-2013-a";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/docs/man-pages/man-pages-posix/man-pages-posix-2003-a.tar.bz2";
-    sha256 = "1sj97lbj27w935f9ia91ih1mwlz4j3qcr3d3nkvcxm6cpfvv2mg3";
+    url = "mirror://kernel/linux/docs/man-pages/man-pages-posix/${name}.tar.xz";
+    sha256 = "0258j05zdrxpgdj8nndbyi7bvrs8fxdksb0xbfrylzgzfmf3lqqr";
   };
 
   preBuild =
-- 
GitLab


From 8de867c95869626d1615154877798ed622521842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 14 Mar 2014 09:20:42 +0100
Subject: [PATCH 2231/3789] qt_gstreamer: update from 0.10.2 to 0.10.3

---
 .../libraries/gstreamer/legacy/qt-gstreamer/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
index c3510a69a12..c0cab607062 100644
--- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
@@ -2,12 +2,12 @@
 , automoc4, flex, bison, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-0.10.2";
+  name = "${pname}-0.10.3";
   pname = "qt-gstreamer";
 
   src = fetchurl {
     url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2";
-    sha256 = "1laryg5vgc3prdi7dmpfwa71nsrc3ngv27sgax44c4qfrgpsgwbf";
+    sha256 = "1pqg9sxzk8sdrf7pazb5v21hasqai9i4l203gbdqz29w2ll1ybsl";
   };
 
   buildInputs = [ gstreamer gst_plugins_base glib qt4 ];
-- 
GitLab


From 76822ea4d5982e4d247f1c90f00577c5b47854f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 14 Mar 2014 09:50:18 +0100
Subject: [PATCH 2232/3789] libav: minor updates of both branches

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

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index c99059bf034..04d51edf531 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -26,8 +26,8 @@ with { inherit (stdenv.lib) optional optionals; };
 
 let
   result = {
-    libav_9   = libavFun  "9.11"  "1ad7vyxp0w8dw6ngc16fz0ngsjlgk6h8bpphghqia5sqkbl10ca3";
-    libav_0_8 = libavFun "0.8.10" "0sxmj4qsd3ljygvdjz7ly46nf7sqmaqka4hx65b1jdji12al1djc";
+    libav_9   = libavFun  "9.12"  "1wm0nf12c1p138y54jh71mvbpikrpk43zc9m2qhpjm9pgnagizk0";
+    libav_0_8 = libavFun "0.8.11" "0nhm0mzz2aj78sgmw9xf20a1mlgig78cv1nyhx4zrq7nvgqf8d2r";
   };
 
   libavFun = version : sha256 : stdenv.mkDerivation rec {
-- 
GitLab


From ab05fa29ebcaa4870d366640cbb6fa8bf254450b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 14 Mar 2014 09:52:05 +0100
Subject: [PATCH 2233/3789] xfce.gigolo: minor update 0.4.1 -> .2

It no longer uses Waf.
---
 pkgs/desktops/xfce/applications/gigolo.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/gigolo.nix b/pkgs/desktops/xfce/applications/gigolo.nix
index b54ea8cc623..9badeb5370e 100644
--- a/pkgs/desktops/xfce/applications/gigolo.nix
+++ b/pkgs/desktops/xfce/applications/gigolo.nix
@@ -3,20 +3,16 @@
 stdenv.mkDerivation rec {
   p_name  = "gigolo";
   ver_maj = "0.4";
-  ver_min = "1";
+  ver_min = "2";
 
   src = fetchurl {
     url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2";
+    sha256 = "0r4ij0mlnp0bqq44pyrdcpz18r1zwsksw6w5yc0jzgg7wj7wfgsm";
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   buildInputs = [ python gettext intltool gtk pkgconfig gvfs];
 
-  preConfigure = ''
-    sed -i "waf" -e "1 s^.*/env[ ]*python^#!${python}/bin/python^";
-  '';
-
   meta = {
     homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
     description = "A frontend to easily manage connections to remote filesystems";
-- 
GitLab


From 607678341db87cfc41a799fa64e422448b2e159b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 14 Mar 2014 09:55:46 +0100
Subject: [PATCH 2234/3789] xfce.tumbler: minor update 0.1.29 -> .30

---
 pkgs/desktops/xfce/core/tumbler.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix
index 06902792624..8988d072e2c 100644
--- a/pkgs/desktops/xfce/core/tumbler.nix
+++ b/pkgs/desktops/xfce/core/tumbler.nix
@@ -4,11 +4,11 @@ libgsf, poppler, bzip2 }:
 stdenv.mkDerivation rec {
   p_name  = "tumbler";
   ver_maj = "0.1";
-  ver_min = "29";
+  ver_min = "30";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "14zw69x5979d19brjbyq81wvbikb13vgv901gxnbw8lyc3pc9fn3";
+    sha256 = "013kacqyy1vya7kp6jgc1almp3cbbvq96a3r7f5myiihr1whvhp7";
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-- 
GitLab


From 3caa572a8e02951fd7ec43f1013cb251a8c48419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 14 Mar 2014 09:58:33 +0100
Subject: [PATCH 2235/3789] xfce4-task-manager: minor update 1.0.0 -> .1

---
 pkgs/desktops/xfce/applications/xfce4-taskmanager.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
index baef6872848..df743e4cc9c 100644
--- a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   p_name  = "xfce4-taskmanager";
   ver_maj = "1.0";
-  ver_min = "0";
+  ver_min = "1";
 
   src = fetchurl {
     url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0";
+    sha256 = "11pfiglfg3mzsmpiwva6l7dj44zsv76vyf0282pghwcrvnb2gapm";
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-- 
GitLab


From 93633039223eee9ae337226be1912232ffc4dcf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Mar 2014 23:15:01 +0100
Subject: [PATCH 2236/3789] pfstools: update from 1.8.3 to 1.8.5

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

diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix
index 9b0a83725ea..fbd1778faef 100644
--- a/pkgs/tools/graphics/pfstools/default.nix
+++ b/pkgs/tools/graphics/pfstools/default.nix
@@ -2,11 +2,11 @@
 freeglut, bzip2, libX11, libpng, expat, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "pfstools-1.8.3";
+  name = "pfstools-1.8.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/pfstools/${name}.tar.gz";
-    sha256 = "1j3pzwpxvsx9220176bfjallc73jyda61xqkvnmlxqfd3n7ycgx1";
+    sha256 = "01kk2r8afrb3vrhm8abfjdhhan97lzpapc4n8w1mpdp3kv9miy9c";
   };
 
   configureFlags = "--with-moc=${qt4}/bin/moc";
-- 
GitLab


From ca09a878d0dd85f1d2124c29833f8f9a1f217a65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Mar 2014 23:52:59 +0100
Subject: [PATCH 2237/3789] procps-ng: make it the default procps (name and
 attr)

---
 pkgs/os-specific/linux/procps-ng/default.nix | 2 +-
 pkgs/top-level/all-packages.nix              | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 0b3389f903a..cd8a8eaec13 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation {
-  name = "procps-ng-3.3.9";
+  name = "procps-3.3.9";
 
   src = fetchurl {
     url = mirror://sourceforge/procps-ng/procps-ng-3.3.9.tar.xz;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba6cb440c74..d2ceacfa7fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7090,9 +7090,11 @@ let
 
   prayer = callPackage ../servers/prayer { };
 
-  procps = callPackage ../os-specific/linux/procps { };
+  procps = procps-ng;
 
-  "procps-ng" = callPackage ../os-specific/linux/procps-ng { };
+  procps-old = lowPrio (callPackage ../os-specific/linux/procps { });
+
+  procps-ng = callPackage ../os-specific/linux/procps-ng { };
 
   qemu_kvm = lowPrio (qemu.override { x86Only = true; });
 
-- 
GitLab


From 4c04474c27a0a5f45ce1564b04cc063e307a66ea Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 16 Mar 2014 16:53:08 -0500
Subject: [PATCH 2238/3789] nmap: add myself to maintainers, add
 homepage/description

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/nmap/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 1b2e940540d..a6452cdb89b 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -4,7 +4,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nmap-6.40";
+  name = "nmap-${version}";
+  version = "6.40";
 
   src = fetchurl {
     url = "http://nmap.org/dist/${name}.tar.bz2";
@@ -21,8 +22,11 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ libpcap libX11 gtk pkgconfig openssl python pygtk makeWrapper pysqlite ];
 
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = maintainers.mornfall;
+  meta = {
+    description = "A free and open source utility for network discovery and security auditing.";
+    homepage    = "http://www.nmap.org";
+    license     = stdenv.lib.licenses.gpl2;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ mornfall thoughtpolice ];
   };
 }
-- 
GitLab


From 11874b9e3b2ca12881f308c05527e8cf794d9aff Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 16 Mar 2014 23:31:00 +0100
Subject: [PATCH 2239/3789] add Planetary Annihilation: next-generation RTS
 that takes the genre to a planetary scale

---
 pkgs/games/planetaryannihilation/default.nix | 54 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 56 insertions(+)
 create mode 100755 pkgs/games/planetaryannihilation/default.nix

diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix
new file mode 100755
index 00000000000..009d07d4456
--- /dev/null
+++ b/pkgs/games/planetaryannihilation/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, config, fetchurl, patchelf, makeWrapper, xlibs, gtk, glib, udev, alsaLib, atk
+, nspr, fontconfig, cairo, pango, nss, freetype, gnome3, gdk_pixbuf, curl, systemd, xorg }:
+
+# TODO: use dynamic attributes once Nix 1.7 is out
+assert ((config.planetary_annihilation or null).url or null) != null;
+assert ((config.planetary_annihilation or null).sha256 or null) != null;
+
+/* to setup:
+ $ cat ~/.nixpkgs/config.nix
+ {
+  planetary_annihilation = {
+    url = "file:///home/user/PA_Linux_62857.tar.bz2";
+    sha256 = "0imi3k5144dsn3ka9khx3dj76klkw46ga7m6rddqjk4yslwabh3k";
+  };
+}
+*/
+
+stdenv.mkDerivation {
+  name = "planetary-annihalation";
+
+  src = fetchurl {
+    inherit (config.planetary_annihilation) url sha256;
+  };
+
+  buildInputs = [ patchelf makeWrapper ];
+ 
+  installPhase = ''
+    mkdir -p $out/{bin,lib}
+
+    cp -R * $out/
+    mv $out/*.so $out/lib
+    rm $out/libstdc++.so.6
+    ln -s $out/PA $out/bin/PA
+
+    ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
+
+    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" "$out/PA"
+    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.gcc.gcc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host.bin" 
+
+    wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.gcc.gcc}/lib64:${stdenv.glibc}/lib64"
+
+    for f in $out/lib/*; do
+      patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.gcc.gcc}/lib64:${stdenv.glibc}/lib64" $f
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.uberent.com/pa/;
+    description = "next-generation RTS that takes the genre to a planetary scale";
+    license = "unfree";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.iElectric ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03b7dba8b4a..c9644afbbbc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6090,6 +6090,8 @@ let
   ack = perlPackages.ack;
 
   perlcritic = perlPackages.PerlCritic;
+  
+  planetary_annihilation = callPackage ../games/planetaryannihilation { };
 
 
   ### DEVELOPMENT / PYTHON MODULES
-- 
GitLab


From 779a95998246f260dde468c65203c32dbf6d00f2 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 15 Mar 2014 07:01:54 +0100
Subject: [PATCH 2240/3789] add haskell-lzma-enumerator

---
 .../haskell/lzma-enumerator/default.nix       | 22 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/lzma-enumerator/default.nix

diff --git a/pkgs/development/libraries/haskell/lzma-enumerator/default.nix b/pkgs/development/libraries/haskell/lzma-enumerator/default.nix
new file mode 100644
index 00000000000..f931262a91e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lzma-enumerator/default.nix
@@ -0,0 +1,22 @@
+{ cabal, bindingsDSL, enumerator, HUnit, lzma, mtl, QuickCheck
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "lzma-enumerator";
+  version = "0.1.3";
+  sha256 = "0pzz8bf6310p23pmsa013i8vib0xsfvlkj7zp0w9xs2xsi4j7jk1";
+  buildDepends = [ bindingsDSL enumerator mtl ];
+  testDepends = [
+    enumerator HUnit QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  extraLibraries = [ lzma ];
+  jailbreak = true;
+  meta = {
+    homepage = "http://github.com/alphaHeavy/lzma-enumerator";
+    description = "Enumerator interface for lzma/xz compression";
+    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 d23471ffdd4..c325aead1d3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1646,6 +1646,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   lushtags = callPackage ../development/libraries/haskell/lushtags {};
 
+  lzmaEnumerator = callPackage ../development/libraries/haskell/lzma-enumerator {};
+
   maccatcher = callPackage ../development/libraries/haskell/maccatcher {};
 
   markdownUnlit = callPackage ../development/libraries/haskell/markdown-unlit {};
-- 
GitLab


From ea1cd70128a0ca02881a345a3b2b891b0b7a0c7c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Mar 2014 17:54:40 +0100
Subject: [PATCH 2241/3789] geoip: Convert to mkDerivation

Also, drop unused zlib dependency and add some meta attributes.
---
 pkgs/development/libraries/geoip/default.nix  | 29 ++++++++-----------
 .../libraries/geoip/src-for-default.nix       |  8 -----
 .../libraries/geoip/src-info-for-default.nix  |  6 ----
 pkgs/top-level/all-packages.nix               |  4 +--
 4 files changed, 13 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/development/libraries/geoip/src-for-default.nix
 delete mode 100644 pkgs/development/libraries/geoip/src-info-for-default.nix

diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix
index 94c0505bc6f..1abcb7c6943 100644
--- a/pkgs/development/libraries/geoip/default.nix
+++ b/pkgs/development/libraries/geoip/default.nix
@@ -1,24 +1,19 @@
-a :
-let
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    zlib
-  ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
+{ stdenv, fetchurl }:
 
-  inherit (s) name;
-  inherit buildInputs;
-  configureFlags = [];
+let version = "1.6.0"; in
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
+stdenv.mkDerivation {
+  name = "geoip-${version}";
+
+  src = fetchurl {
+    url = "http://geolite.maxmind.com/download/geoip/api/c/GeoIP-${version}.tar.gz";
+    sha256 = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7";
+  };
 
   meta = {
     description = "Geolocation API";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    license = stdenv.lib.licenses.lgpl21;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/geoip/src-for-default.nix b/pkgs/development/libraries/geoip/src-for-default.nix
deleted file mode 100644
index 1fc4b9b8755..00000000000
--- a/pkgs/development/libraries/geoip/src-for-default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-rec {
-  advertisedUrl="http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.4.6.tar.gz";
-  version = "1.4.6";
-  url="http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.6.0.tar.gz";
-  hash = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7";
-  name = "geoip-1.6.0";
-  
-}
diff --git a/pkgs/development/libraries/geoip/src-info-for-default.nix b/pkgs/development/libraries/geoip/src-info-for-default.nix
deleted file mode 100644
index 99c79227c63..00000000000
--- a/pkgs/development/libraries/geoip/src-info-for-default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  downloadPage = "http://geolite.maxmind.com/download/geoip/api/c/";
-  sourceRegexp = "GeoIP-[0-9.]+[.]tar[.]gz";
-  choiceCommand = "tail -1";
-  baseName = "geoip";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9644afbbbc..619ea319dc4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4235,9 +4235,7 @@ let
 
   geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
 
-  geoip = builderDefsPackage ../development/libraries/geoip {
-    inherit zlib;
-  };
+  geoip = callPackage ../development/libraries/geoip { };
 
   geoipjava = callPackage ../development/libraries/java/geoipjava { };
 
-- 
GitLab


From c0f3f6e3965ef9a5dfc2eb0a38344a370f050bd2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Mar 2014 11:25:48 +0100
Subject: [PATCH 2242/3789] linux: Update to 3.4.83

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index a7bfee210ad..294f616242d 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.81";
+  version = "3.4.83";
   extraMeta.branch = "3.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "17m8b9wcsz8ryakhk8v85iknylkjlbsx69wkj1rbvqi2f1sjihx5";
+    sha256 = "1jammd31cgzymaqd2qwrm1shx5xwpaxmpnv658fix275fn35a8gb";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 14af15dbff21ad91e7633d91f2c7ba1bc5badd77 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Mar 2014 11:33:36 +0100
Subject: [PATCH 2243/3789] Explicitly require Nix 1.6

People using Nix < 1.6 previously got an unhelpful "infinite
recursion" error.
---
 default.nix                     | 8 +++++++-
 pkgs/stdenv/generic/default.nix | 6 ------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/default.nix b/default.nix
index 9d5764a6307..c1b9bfd39f9 100644
--- a/default.nix
+++ b/default.nix
@@ -1 +1,7 @@
-import ./pkgs/top-level/all-packages.nix
+if ! builtins ? nixVersion || builtins.compareVersions "1.6" builtins.nixVersion == 1 then
+
+  abort "This version of Nixpkgs requires Nix >= 1.6, please upgrade!"
+
+else
+
+  import ./pkgs/top-level/all-packages.nix
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 6e74af5fce5..f1cf34b160c 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -12,12 +12,6 @@ let lib = import ../../../lib; in lib.makeOverridable (
 , extraBuildInputs ? []
 }:
 
-if ! builtins ? langVersion then
-
-  abort "This version of Nixpkgs requires Nix >= 1.2, please upgrade!"
-
-else
-
 let
 
   allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1";
-- 
GitLab


From edf1c8ce0f76c98fdae069155c28f9dce2e518d1 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Mon, 17 Mar 2014 15:27:08 +0400
Subject: [PATCH 2244/3789] dsp: add haskell pkg

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

diff --git a/pkgs/development/libraries/haskell/dsp/default.nix b/pkgs/development/libraries/haskell/dsp/default.nix
new file mode 100644
index 00000000000..c1315a23817
--- /dev/null
+++ b/pkgs/development/libraries/haskell/dsp/default.nix
@@ -0,0 +1,14 @@
+{ cabal, random }:
+
+cabal.mkDerivation (self: {
+  pname = "dsp";
+  version = "0.2.2";
+  sha256 = "0vb71z8iky3xl40b9d79z7krq960ykcgn3y8lks3wzgiabbh2d89";
+  buildDepends = [ random ];
+  meta = {
+    homepage = "http://www.haskell.org/haskellwiki/DSP";
+    description = "Haskell Digital Signal Processing";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c325aead1d3..2df904b0b0b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1000,6 +1000,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   DSH = callPackage ../development/libraries/haskell/DSH {};
 
+  dsp = callPackage ../development/libraries/haskell/dsp {};
+
   dstring = callPackage ../development/libraries/haskell/dstring {};
 
   dualTree = callPackage ../development/libraries/haskell/dual-tree {};
-- 
GitLab


From 1b6c01721d3853860903a605575b8eddd56c2db1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Mar 2014 12:45:57 +0100
Subject: [PATCH 2245/3789] Revert "nixos-manual: show manual on tty8 by
 default"

This reverts commit b792394119b8ffc4a2fd34a67048fe205a08dcd7.
Starting the manual on tty8 was intended as a convenience during
installation, not as a general purpose thing.  In fact, given that w3m
runs as root, this is highly insecure!
---
 nixos/modules/services/misc/nixos-manual.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 9a5b170d5e6..1a8b85db329 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -63,7 +63,7 @@ in
 
     services.nixosManual.showManual = mkOption {
       type = types.bool;
-      default = true;
+      default = false;
       description = ''
         Whether to show the NixOS manual on one of the virtual
         consoles.
-- 
GitLab


From 0d506aa712cf088343dff5863e9e58eb1228c3b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Mar 2014 14:04:39 +0100
Subject: [PATCH 2246/3789] Provide a simple way to log into containers

On the host, you can run

  $ socat unix:<path-to-container>/var/lib/login.socket -,echo=0,raw

to get a login prompt.  So this allows logging in even if the
container has no SSH access enabled.

You can also do

  $ socat unix:<path-to-container>/var/lib/root-shell.socket -

to get a plain root shell.  (This socket is only accessible by root,
obviously.)  This makes it easy to execute commands in the container,
e.g.

  $ echo reboot | socat unix:<path-to-container>/var/lib/root-shell.socket -
---
 .../virtualisation/container-login.nix        | 56 +++++++++++++++++++
 nixos/modules/virtualisation/containers.nix   |  1 +
 2 files changed, 57 insertions(+)
 create mode 100644 nixos/modules/virtualisation/container-login.nix

diff --git a/nixos/modules/virtualisation/container-login.nix b/nixos/modules/virtualisation/container-login.nix
new file mode 100644
index 00000000000..56e772fb797
--- /dev/null
+++ b/nixos/modules/virtualisation/container-login.nix
@@ -0,0 +1,56 @@
+{ config, pkgs, ... }:
+
+{
+
+  config = {
+
+    # 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 = "0600"; # only root can connect, obviously
+            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
+          };
+      };
+
+    # Provide a non-interactive login root shell on
+    # /var/lib/root-shell.socket.  On the host, you can connect to it
+    # by running ‘socat unix:<path-to-container>/var/lib/root-shell.socket -’.
+    systemd.sockets.root-shell =
+      { description = "Root Shell Socket";
+        wantedBy = [ "sockets.target" ];
+        socketConfig =
+          { ListenStream = "/var/lib/root-shell.socket";
+            SocketMode = "0666";
+            Accept = true;
+          };
+      };
+
+    systemd.services."root-shell@" =
+      { description = "Root Shell %i";
+        serviceConfig =
+          { Type = "simple";
+            StandardInput = "socket";
+            ExecStart = "${pkgs.bash}/bin/bash --login";
+            TimeoutStopSec = 1; # FIXME
+          };
+      };
+
+  };
+
+}
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index d87284de4fc..f1fcc18f1f9 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -57,6 +57,7 @@ with pkgs.lib;
                       { boot.isContainer = true;
                         security.initialRootPassword = mkDefault "!";
                         networking.hostName = mkDefault name;
+                        imports = [ ./container-login.nix ];
                       };
                     in [ extraConfig config.config ];
                   prefix = [ "systemd" "containers" name ];
-- 
GitLab


From f13bd41384afadcd94e316759583359de37d15bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Mar 2014 14:10:25 +0100
Subject: [PATCH 2247/3789] switch-to-configuration: Restart sockets.target

---
 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 e0649448c83..3f78ec0d48e 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -321,7 +321,7 @@ if (scalar @restart > 0) {
 # that are symlinks to other units.  We shouldn't start both at the
 # same time because we'll get a "Failed to add path to set" error from
 # systemd.
-my @start = unique("default.target", "timers.target", split('\n', read_file($startListFile, err_mode => 'quiet') // ""));
+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";
 system("@systemd@/bin/systemctl", "start", "--", @start) == 0 or $res = 4;
 unlink($startListFile);
-- 
GitLab


From f9e2af1e8b62809e9af9acc92826c29f63db8043 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Mar 2014 14:16:10 +0100
Subject: [PATCH 2248/3789] switch-to-configuration: Don't require /etc/NIXOS

Check /etc/os-release if /etc/NIXOS doesn't exist.
---
 nixos/modules/system/activation/switch-to-configuration.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 3f78ec0d48e..67b2280af3b 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -26,7 +26,10 @@ EOF
     exit 1;
 }
 
-die "This is not a NixOS installation (/etc/NIXOS is missing)!\n" unless -f "/etc/NIXOS";
+# This is a NixOS installation if it has /etc/NIXOS or a proper
+# /etc/os-release.
+die "This is not a NixOS installation!\n" unless
+    -f "/etc/NIXOS" || (read_file("/etc/os-release", err_mode => 'quiet') // "") =~ /ID=nixos/s;
 
 openlog("nixos", "", LOG_USER);
 
-- 
GitLab


From e67f3a38cfc21cd65ae6c4cc8b5fdfad54be12ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Mon, 17 Mar 2014 21:31:45 +0800
Subject: [PATCH 2249/3789] gst-plugins-bad: add description and set license
 correctly

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

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index a9137ad46a7..7647c0f64db 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -9,11 +9,18 @@
 stdenv.mkDerivation rec {
   name = "gst-plugins-bad-1.2.3";
 
-  meta = {
-    homepage = "http://gstreamer.freedesktop.org";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  meta = with stdenv.lib; {
+    description = "Gstreamer Bad Plugins";
+    homepage    = "http://gstreamer.freedesktop.org";
+    longDescription = ''
+      a set of plug-ins that aren't up to par compared to the
+      rest.  They might be close to being good quality, but they're missing
+      something - be it a good code review, some documentation, a set of tests,
+      a real live maintainer, or some actual wide use.
+    '';
+    license     = licenses.lgpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
   };
 
   src = fetchurl {
-- 
GitLab


From b45a29403850e056379ce2a1f09af3884d9a3797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Mon, 17 Mar 2014 21:43:10 +0800
Subject: [PATCH 2250/3789] gst-plugins-good: add description and set license
 correctly

---
 .../libraries/gstreamer/good/default.nix         | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 71151c4e559..090c84600ab 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -9,11 +9,17 @@
 stdenv.mkDerivation rec {
   name = "gst-plugins-good-1.2.3";
 
-  meta = {
-    homepage = "http://gstreamer.freedesktop.org";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  meta = with stdenv.lib; {
+    description = "Gstreamer Good Plugins";
+    homepage    = "http://gstreamer.freedesktop.org";
+    longDescription = ''
+      a set of plug-ins that we consider to have good quality code,
+      correct functionality, our preferred license (LGPL for the plug-in
+      code, LGPL or LGPL-compatible for the supporting library).
+    '';
+    license     = licenses.lgpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
   };
 
   src = fetchurl {
-- 
GitLab


From 1b3899b040403df8f333bff20b85c2b366c18c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Mon, 17 Mar 2014 21:47:58 +0800
Subject: [PATCH 2251/3789] gst-plugins-ugly: add description

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

diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 50005004135..4f16fa4259c 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -7,11 +7,18 @@
 stdenv.mkDerivation rec {
   name = "gst-plugins-ugly-1.2.3";
 
-  meta = {
-    homepage = "http://gstreamer.freedesktop.org";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  meta = with stdenv.lib; {
+    description = "Gstreamer Ugly Plugins";
+    homepage    = "http://gstreamer.freedesktop.org";
+    longDescription = ''
+      a set of plug-ins that have good quality and correct functionality,
+      but distributing them might pose problems.  The license on either
+      the plug-ins or the supporting libraries might not be how we'd
+      like. The code might be widely known to present patent problems.
+    '';
+    license     = licenses.lgpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
   };
 
   src = fetchurl {
-- 
GitLab


From 28b7d67d08a7a76c7508d4b6a8f791c2eba4a1b9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Mar 2014 15:01:10 +0100
Subject: [PATCH 2252/3789] httpd: Don't require keys.target

This has the unintended side-effect of restarting httpd every time we
run switch-to-configuration, even if httpd hasn't changed (because
we're doing a "stop keys.target" now).  So use a "Wants" dependency
instead.
---
 nixos/modules/services/web-servers/apache-httpd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index a22ef10312d..949dce96824 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -621,7 +621,7 @@ in
       { description = "Apache HTTPD";
 
         wantedBy = [ "multi-user.target" ];
-        requires = [ "keys.target" ];
+        wants = [ "keys.target" ];
         after = [ "network.target" "fs.target" "postgresql.service" "keys.target" ];
 
         path =
-- 
GitLab


From 7d3eb6307b43e8505483d919fc9d9e8db0d87289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Mon, 17 Mar 2014 22:02:48 +0800
Subject: [PATCH 2253/3789] add gnonlin 1.2.0

---
 .../libraries/gstreamer/default.nix           |  2 ++
 .../libraries/gstreamer/gnonlin/default.nix   | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/gstreamer/gnonlin/default.nix

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index b68de91c240..2cb1df00da6 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -14,4 +14,6 @@ rec {
   gst-libav = callPackage ./libav { inherit gst-plugins-base; };
 
   gst-python = callPackage ./python { inherit gst-plugins-base gstreamer; };
+
+  gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; };
 }
diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
new file mode 100644
index 00000000000..c45c1469cb3
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig
+, gst-plugins-base
+}:
+
+stdenv.mkDerivation rec {
+  name = "gnonlin-1.2.0";
+
+  meta = with stdenv.lib; {
+    description = "Gstreamer Non-Linear Multimedia Editing Plugins";
+    homepage    = "http://gstreamer.freedesktop.org";
+    longDescription = ''
+      Gnonlin is a library built on top of GStreamer which provides 
+      support for writing non-linear audio and video editing
+      applications. It introduces the concept of a timeline.
+    '';
+    license     = licenses.lgpl2Plus; 
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/gnonlin/${name}.tar.xz";
+    sha256 = "15hyb0kg8sm92kj37cir4l3sa21b8zy4la1ccfhb358b4mf24vl7";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  propagatedBuildInputs = [ gst-plugins-base ];
+}
-- 
GitLab


From 511b86d22dbf3d4a52ac9d6437f0ee0375468f01 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Mar 2014 15:02:53 +0100
Subject: [PATCH 2254/3789] Add an option to reload rather than restart changed
 units

---
 .../system/activation/switch-to-configuration.pl      |  5 ++++-
 nixos/modules/system/boot/systemd-unit-options.nix    | 11 +++++++++++
 nixos/modules/system/boot/systemd.nix                 |  6 +++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 67b2280af3b..fd2b5b7950d 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -176,7 +176,10 @@ while (my ($unit, $state) = each %{$activePrev}) {
                 # FIXME: do something?
             } else {
                 my $unitInfo = parseUnit($newUnitFile);
-                if (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes")) {
+                if (boolIsTrue($unitInfo->{'X-ReloadIfChanged'} // "no")) {
+                    write_file($reloadListFile, { append => 1 }, "$unit\n");
+                }
+                elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes")) {
                     push @unitsToSkip, $unit;
                 } else {
                     # If this unit is socket-activated, then stop the
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 113990814ef..784025f6bab 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -243,6 +243,17 @@ in rec {
       '';
     };
 
+    reloadIfChanged = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether the service should be reloaded during a NixOS
+        configuration switch if its definition has changed.  If
+        enabled, the value of <option>restartIfChanged</option> is
+        ignored.
+      '';
+    };
+
     stopIfChanged = mkOption {
       type = types.bool;
       default = true;
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 49502b3e685..b31c631a0a7 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -279,7 +279,11 @@ let
           [Service]
           ${let env = cfg.globalEnvironment // def.environment;
             in concatMapStrings (n: "Environment=\"${n}=${getAttr n env}\"\n") (attrNames env)}
-          ${optionalString (!def.restartIfChanged) "X-RestartIfChanged=false"}
+          ${if def.reloadIfChanged then ''
+            X-ReloadIfChanged=true
+          '' else if !def.restartIfChanged then ''
+            X-RestartIfChanged=false
+          '' else ""}
           ${optionalString (!def.stopIfChanged) "X-StopIfChanged=false"}
           ${attrsToSection def.serviceConfig}
         '';
-- 
GitLab


From ef8e0266a2583eb45444b1faa0512f99d18fca6c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Mar 2014 15:03:29 +0100
Subject: [PATCH 2255/3789] Don't reboot a container when its configuration
 changes

Instead, just run "switch-to-configuration" inside the container.
---
 nixos/modules/virtualisation/containers.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index f1fcc18f1f9..034ebe84b42 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -132,6 +132,14 @@ with pkgs.lib;
               done
             fi
           '';
+
+        reloadIfChanged = true;
+
+        serviceConfig.ExecReload =
+          "${pkgs.bash}/bin/bash -c '"
+          + "echo ${container.path}/bin/switch-to-configuration test "
+          + "| ${pkgs.socat}/bin/socat unix:${container.root}/var/lib/root-shell.socket -'";
+
       }) config.systemd.containers;
 
   };
-- 
GitLab


From c3ffcb1cfe36f11105f7c025b716814920cf3392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Mon, 17 Mar 2014 22:06:32 +0800
Subject: [PATCH 2256/3789] add gst-editing-services 1.2.0

---
 .../libraries/gstreamer/default.nix           |  2 ++
 .../libraries/gstreamer/ges/default.nix       | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/gstreamer/ges/default.nix

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 2cb1df00da6..4796ce078df 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -16,4 +16,6 @@ rec {
   gst-python = callPackage ./python { inherit gst-plugins-base gstreamer; };
 
   gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; };
+
+  gst-editing-services = callPackage ./ges { inherit gnonlin; };
 }
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
new file mode 100644
index 00000000000..94d3688eb1c
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, python
+, gnonlin, libxml2
+}:
+
+stdenv.mkDerivation rec {
+  name = "gstreamer-editing-services-1.2.0";
+
+  meta = with stdenv.lib; {
+    description = "Library for creation of audio/video non-linear editors";
+    homepage    = "http://gstreamer.freedesktop.org";
+    license     = licenses.lgpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
+    sha256 = "1n7nw8rqvwna9af55lggah44gdvfgld1igvgaya8glc37wpq89b0";
+  };
+
+  nativeBuildInputs = [ pkgconfig python ];
+
+  propagatedBuildInputs = [ gnonlin libxml2 ];
+}
-- 
GitLab


From d847b5851fc1b16bee43529b0dd05a9a5028b263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Mon, 17 Mar 2014 22:09:51 +0800
Subject: [PATCH 2257/3789] gst-python: update to 1.2.0

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

diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
index eaf284e950d..843822b0748 100644
--- a/pkgs/development/libraries/gstreamer/python/default.nix
+++ b/pkgs/development/libraries/gstreamer/python/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-python-1.1.90";
+  name = "gst-python-1.2.0";
 
   src = fetchurl {
     urls = [
       "${meta.homepage}/src/gst-python/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "1vsykx2l5360y19c0rxspa9nf1ilml2c1ybsv8cw8p696scryb2l";
+    sha256 = "09c6yls8ipbmwimdjr7xi3hvf2xa1xn1pv07855r7wfyzas1xbl1";
   };
 
   buildInputs =
-- 
GitLab


From ac215779dd1fdfe58d75bcc22cb6a5b0a58744a4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Mar 2014 15:23:20 +0100
Subject: [PATCH 2258/3789] Give containers a writable
 /nix/var/nix/{profiles,gcroots}

These are stored on the host in
/nix/var/nix/{profiles,gcroots}/per-container/<container-name> to
ensure that container profiles/roots are not garbage-collected.
---
 nixos/modules/virtualisation/containers.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 034ebe84b42..6a4833e1e21 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -110,10 +110,19 @@ with pkgs.lib;
             if ! [ -e ${container.root}/etc/os-release ]; then
               touch ${container.root}/etc/os-release
             fi
+
+            mkdir -p -m 0755 \
+              /nix/var/nix/profiles/per-container/${name} \
+              /nix/var/nix/gcroots/per-container/${name}
           '';
 
         serviceConfig.ExecStart =
-          "${config.systemd.package}/bin/systemd-nspawn -M ${name} -D ${container.root} --bind-ro=/nix ${container.path}/init";
+          "${config.systemd.package}/bin/systemd-nspawn"
+          + " -M ${name} -D ${container.root}"
+          + " --bind-ro=/nix/store --bind-ro=/nix/var/nix/db --bind-ro=/nix/var/nix/daemon-socket"
+          + " --bind=/nix/var/nix/profiles/per-container/${name}:/nix/var/nix/profiles"
+          + " --bind=/nix/var/nix/gcroots/per-container/${name}:/nix/var/nix/gcroots"
+          + " ${container.path}/init";
 
         preStop =
           ''
-- 
GitLab


From 062363c001f1b0d33f7e4abd798db4b7ddfa967f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 17 Mar 2014 16:20:55 +0100
Subject: [PATCH 2259/3789] thrift: make it useable with the python wrapper

The python wrapper discards derivations that lack the 'pythonPath'
attribute, so provide a (dummy) pythonPath attribute to make this work:

  pythonFull.override { extraLibs = [ thrift ]; }
---
 pkgs/development/libraries/thrift/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix
index 0153cfa62ac..e1129d25ef4 100644
--- a/pkgs/development/libraries/thrift/default.nix
+++ b/pkgs/development/libraries/thrift/default.nix
@@ -15,6 +15,10 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  # Workaround to make the python wrapper not drop this package:
+  # pythonFull.override { extraLibs = [ thrift ]; }
+  pythonPath = [];
+
   buildInputs = [
     boost zlib libevent openssl python automake autoconf libtool pkgconfig
     bison flex
-- 
GitLab


From 24e9c676d285c0aa6b522df445630ef51c96a927 Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Mon, 17 Mar 2014 15:19:24 +0100
Subject: [PATCH 2260/3789] python: update 3.4.0 to stable release

---
 pkgs/development/interpreters/python/3.4/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix
index 8d7da9d91e6..3725586f3f4 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";
-  fullVersion = "${version}rc2";
+  fullVersion = "${version}";
 
   buildInputs = filter (p: p != null) [
     zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
-    sha256 = "0v37mlkwzbc8m54h3nb04x6xm2yx5fmd7flq2shn37ixf9d0ih6z";
+    sha256 = "1gjcn5c3zqg161vwzh43ciha15w0plf5v7cyfm372pnllb08cdpi";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 619ea319dc4..f7db8633ee9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6115,10 +6115,10 @@ let
     python = python33;
   });
 
-  python34Packages = import ./python-packages.nix {
+  python34Packages = recurseIntoAttrs (import ./python-packages.nix {
     inherit pkgs;
     python = python34;
-  };
+  });
 
   python32Packages = import ./python-packages.nix {
     inherit pkgs;
-- 
GitLab


From 4a112f46b1d6edb9dafa5b4ed85fc70958201f89 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 12 Mar 2014 12:25:14 -0500
Subject: [PATCH 2261/3789] sup: Push sup to the latest git commit

ncursesw was also pushed forward from 1.3.1.2 -> 1.4.6 as the packaging
was changed for the latest version of sup
---
 .../networking/mailreaders/sup/default.nix            |  6 +++---
 .../libraries/ruby_ncursesw_sup/default.nix           | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
index a8fb387e729..70aeb000981 100644
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/pkgs/applications/networking/mailreaders/sup/default.nix
@@ -3,7 +3,7 @@
 , gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which }:
 
 stdenv.mkDerivation rec {
-  version = "20131130";
+  version = "20140312";
   name    = "sup-${version}";
   
   meta = {
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = git://github.com/sup-heliotrope/sup.git;
-    rev = "a5a1e39034204ac4b05c9171a71164712690b010";
-    sha256 = "0w2w7dcif1ri1qq81csz7gj45rqd9z7hjd6x29awibybyyqyvj5s";
+    rev = "0cad7b308237c07b8a46149908b2ad4806ac3d1d";
+    sha256 = "83534b6ad9fb6aa883d630c927e3a71bd09a646e3254b4eb0cc7a09f69a525bc";
   };
 
   buildInputs =
diff --git a/pkgs/development/libraries/ruby_ncursesw_sup/default.nix b/pkgs/development/libraries/ruby_ncursesw_sup/default.nix
index 67041ad0607..8d55bafeb20 100644
--- a/pkgs/development/libraries/ruby_ncursesw_sup/default.nix
+++ b/pkgs/development/libraries/ruby_ncursesw_sup/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, ncurses, ruby, rubygems }:
 
 stdenv.mkDerivation rec {
-  name = ''ncursesw-sup-afd962b9c06108ff0643e98593c5605314d76917'';
+  name = "ncursesw-sup-${version}";
+  version = "1.4.6";
 
   src = fetchurl {
-    url = "https://github.com/sup-heliotrope/ncursesw-ruby/archive/afd962b9c06108ff0643e98593c5605314d76917.tar.gz";
-    sha256 = "13i286p4bm8zqg9xh96a1dg7wkywj9m6975gbh3w43d3rmfc1h6a";
+    url = "https://github.com/sup-heliotrope/ncursesw-ruby/archive/v${version}.tar.gz";
+    sha256 = "1fzmj5kqh2aql7r7jys8cyf7mb78kz71yc4a6gh74h9s8pybyhh7";
   };
 
   meta = {
@@ -32,12 +33,12 @@ stdenv.mkDerivation rec {
     # For some reason, the installation phase doesn't work with the default
     # make install command run by gem (we'll fix it and do it ourselves later)
     gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
-        --bindir "$out/bin" --no-rdoc --no-ri ncursesw-sup-1.3.1.2.gem || true
+        --bindir "$out/bin" --no-rdoc --no-ri ncursesw-${version}.gem || true
 
     # Needed for ruby to recognise the gem
     cp ncursesw.gemspec "$out/${ruby.gemPath}/specifications"
 
-    cd "$out/${ruby.gemPath}/gems/ncursesw-sup-1.3.1.2"
+    cd "$out/${ruby.gemPath}/gems/ncursesw-${version}"
     mkdir src
     mv lib src
     sed -i "s/srcdir = ./srcdir = src/" Makefile
-- 
GitLab


From d03aa6a13f4b8f296f811f1dcc59e5dada1a849e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:24:55 +0100
Subject: [PATCH 2262/3789] haskell-chell: add version 0.3.3

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

diff --git a/pkgs/development/libraries/haskell/chell/default.nix b/pkgs/development/libraries/haskell/chell/default.nix
new file mode 100644
index 00000000000..c69994e6868
--- /dev/null
+++ b/pkgs/development/libraries/haskell/chell/default.nix
@@ -0,0 +1,18 @@
+{ cabal, ansiTerminal, options, patience, random, text
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "chell";
+  version = "0.3.3";
+  sha256 = "1k5vxipf47753d41dgr1gr4zy7y72gz2x8lcn0fgfmxi2v810nsm";
+  buildDepends = [
+    ansiTerminal options patience random text transformers
+  ];
+  meta = {
+    homepage = "https://john-millikin.com/software/chell/";
+    description = "A simple and intuitive library for automated testing";
+    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 2df904b0b0b..44c66d5bac1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -758,6 +758,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   checkers = callPackage ../development/libraries/haskell/checkers {};
 
+  chell = callPackage ../development/libraries/haskell/chell {};
+
   chunkedData = callPackage ../development/libraries/haskell/chunked-data {};
 
   citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {};
-- 
GitLab


From f5e1190036d6f252c74c1bf2576f1cbf4ba633db Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:25:15 +0100
Subject: [PATCH 2263/3789] haskell-chell-quickcheck: add version 0.2.2

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

diff --git a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix
new file mode 100644
index 00000000000..835747ee881
--- /dev/null
+++ b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix
@@ -0,0 +1,14 @@
+{ cabal, chell, QuickCheck, random }:
+
+cabal.mkDerivation (self: {
+  pname = "chell-quickcheck";
+  version = "0.2.2";
+  sha256 = "05qshv9vcl05khxsxyks2z7dqd8dqafjsg3awkkdhviviv5p2fp8";
+  buildDepends = [ chell QuickCheck random ];
+  meta = {
+    homepage = "https://john-millikin.com/software/chell/";
+    description = "QuickCheck support for the Chell testing 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 44c66d5bac1..fd97ec8da6b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -760,6 +760,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   chell = callPackage ../development/libraries/haskell/chell {};
 
+  chellQuickcheck = callPackage ../development/libraries/haskell/chell-quickcheck {};
+
   chunkedData = callPackage ../development/libraries/haskell/chunked-data {};
 
   citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {};
-- 
GitLab


From 84872fe15de4e4f3ca8ecbc668a012ae11443eff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:25:26 +0100
Subject: [PATCH 2264/3789] haskell-options: add version 1.0

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

diff --git a/pkgs/development/libraries/haskell/options/default.nix b/pkgs/development/libraries/haskell/options/default.nix
new file mode 100644
index 00000000000..b1698ac5b35
--- /dev/null
+++ b/pkgs/development/libraries/haskell/options/default.nix
@@ -0,0 +1,15 @@
+{ cabal, chell, chellQuickcheck, monadsTf, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "options";
+  version = "1.0";
+  sha256 = "0d40d6k1c8v2b0bgchgl54sk9wx28kysp8bjws8bwjcmmd57775f";
+  buildDepends = [ monadsTf transformers ];
+  testDepends = [ chell chellQuickcheck monadsTf transformers ];
+  meta = {
+    homepage = "https://john-millikin.com/software/haskell-options/";
+    description = "A powerful and easy-to-use command-line option parser";
+    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 fd97ec8da6b..247d8649ed6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1863,6 +1863,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   operational = callPackage ../development/libraries/haskell/operational {};
 
+  options = callPackage ../development/libraries/haskell/options {};
+
   optparseApplicative = callPackage ../development/libraries/haskell/optparse-applicative {};
 
   pathPieces = callPackage ../development/libraries/haskell/path-pieces {};
-- 
GitLab


From bfa2466d71a0a851136cc56f5a2dbab9cd1508f0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:25:58 +0100
Subject: [PATCH 2265/3789] haskell-xmobar: update to version 0.20.1

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

diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index 49c1a403814..a7aeed339e2 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xmobar";
-  version = "0.20";
-  sha256 = "06ra5nx53rlijkb3hhp5p5a0b3bx14921jgkkp1xqciscnspj2nv";
+  version = "0.20.1";
+  sha256 = "16jfgn6ciqxrwj6qjhbcpms7mzlbxfaxyxfxp64xvnw626xlpjvk";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From a7e71295fcccdcbdf68458cf49aa3a9ba322c412 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:25:59 +0100
Subject: [PATCH 2266/3789] haskell-HDBC: update to version 2.4.0.0

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

diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix
index a8275c31b85..08134abf843 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HDBC";
-  version = "2.3.1.2";
-  sha256 = "1rjamh8xscb9jhxgxcrs2qnvs2ipv9dqgnn0bpv5vwclmzmn5j87";
+  version = "2.4.0.0";
+  sha256 = "1zwkrr0pbgxi2y75n2sjr3xs8xa3pxbmnqg3phqkjqcz3j4gcq6y";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ convertible mtl text time utf8String ];
-- 
GitLab


From 34fad84658f38f8377f7beeeb4c61432724840a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:00 +0100
Subject: [PATCH 2267/3789] haskell-alsa-pcm: update to version 0.6.0.1

---
 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 39123a176dc..c4f39cdd7ee 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";
-  sha256 = "10cmlf1s9y65cs81wn7xwgcd4218n3h3p34avibv3fa7n3q9b4x1";
+  version = "0.6.0.1";
+  sha256 = "0gnq4p172sqmlks6aykzr5l2qx2shrs2fypcvs4g56c9zpk3c3ax";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 64fb48f9e2f828e0c7032f6dd760cb16e3cc00ff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:02 +0100
Subject: [PATCH 2268/3789] haskell-cipher-aes: update to version 0.2.7

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

diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix
index d68d2389e0e..52ec2fab711 100644
--- a/pkgs/development/libraries/haskell/cipher-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-aes";
-  version = "0.2.6";
-  sha256 = "0ys5a1w5pwwr74k9wzcsh1flb2jdcvnp1zz7sjs14jpxclpd8x3i";
+  version = "0.2.7";
+  sha256 = "1a5viy2frkdqhzzlipd2ik89a04gv95v4b98lgpsas2958r9c9yp";
   buildDepends = [ byteable cryptoCipherTypes securemem ];
   testDepends = [
     byteable cryptoCipherTests cryptoCipherTypes QuickCheck
-- 
GitLab


From 02dfc27b581b912b579d46fbd010e27dd9b7236f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:03 +0100
Subject: [PATCH 2269/3789] haskell-constraints: update to version 0.3.5

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

diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix
index 1e0dc901aaf..333d8e6601d 100644
--- a/pkgs/development/libraries/haskell/constraints/default.nix
+++ b/pkgs/development/libraries/haskell/constraints/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "constraints";
-  version = "0.3.4.2";
-  sha256 = "14bfar4d44yl9zxgqxj4p67ag2ndprm602l4pinfjk0ywbh63fwq";
+  version = "0.3.5";
+  sha256 = "01xrk0xqkfwzzr5jwkadkyjgrdcpslwiqfqdb7mci688xp2isi3i";
   buildDepends = [ newtype ];
   meta = {
     homepage = "http://github.com/ekmett/constraints/";
-- 
GitLab


From 4d53562910a362a335c8bc63795022d894b571ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:04 +0100
Subject: [PATCH 2270/3789] haskell-convertible: update to version 1.1.0.0

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

diff --git a/pkgs/development/libraries/haskell/convertible/default.nix b/pkgs/development/libraries/haskell/convertible/default.nix
index 8a79e50527d..78be057c201 100644
--- a/pkgs/development/libraries/haskell/convertible/default.nix
+++ b/pkgs/development/libraries/haskell/convertible/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "convertible";
-  version = "1.0.11.1";
-  sha256 = "1r50a2rpfsx0s7dv8ww5xck33b1mhy73gfilffrbqd4hxjgnxlj6";
+  version = "1.1.0.0";
+  sha256 = "0pc3z4jfjna1rz5wlfimw9fyhpasmdnwvava883s401760y99i0k";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl text time ];
-- 
GitLab


From 8818350aba9f1c506a06ab6e092d59bd675adda3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:05 +0100
Subject: [PATCH 2271/3789] haskell-data-accessor-template: update to version
 0.2.1.11

---
 .../haskell/data-accessor/data-accessor-template.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
index 41bd2347012..89658ead4d5 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-accessor-template";
-  version = "0.2.1.10";
-  sha256 = "11a4c0g74ppl7nls0dhx6xs47dfcq1wp7bd8qgdba6hhn645afzy";
+  version = "0.2.1.11";
+  sha256 = "1n2slv287zp6pabqb7xbfi296dbikw5a4ivqmnas0c4nxikqkayx";
   buildDepends = [ dataAccessor utilityHt ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Record_access";
-- 
GitLab


From 703fae7101a015d39f7185912d6f2f1d4d152ff5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:06 +0100
Subject: [PATCH 2272/3789] haskell-data-accessor: update to version 0.2.2.5

---
 .../libraries/haskell/data-accessor/data-accessor.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
index 7c1de10b20b..8fdde66f5fd 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-accessor";
-  version = "0.2.2.3";
-  sha256 = "1fa1rbbs3m05y61w42vj4vqlcpqmz60v8mv3r0h6lx669k6ka5gj";
+  version = "0.2.2.5";
+  sha256 = "0z63fv41cnpk3h404gprk2f5jl7rrpyv97xmsgac9zgdm5zkkhm6";
   buildDepends = [ transformers ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Record_access";
-- 
GitLab


From 0a326a51a68c3906feb1da2fbdeb7d57c5b88c39 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:08 +0100
Subject: [PATCH 2273/3789] haskell-dbus: update to version 0.10.7

---
 pkgs/development/libraries/haskell/dbus/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix
index 304b9e84942..874b945513a 100644
--- a/pkgs/development/libraries/haskell/dbus/default.nix
+++ b/pkgs/development/libraries/haskell/dbus/default.nix
@@ -1,15 +1,20 @@
-{ cabal, cereal, libxmlSax, network, parsec, random, text
-, transformers, vector, xmlTypes
+{ cabal, cereal, chell, chellQuickcheck, filepath, libxmlSax
+, network, parsec, QuickCheck, random, text, transformers, vector
+, xmlTypes
 }:
 
 cabal.mkDerivation (self: {
   pname = "dbus";
-  version = "0.10.6";
-  sha256 = "0jbysa7czhp7yl3fb6sxiqppg8yb3cdk4v8hcs4y8yzwjj0lm7mf";
+  version = "0.10.7";
+  sha256 = "0xszynw6p07r7z9nlq8alx5lxfjm57gljya835ccj63hqhkr5yxh";
   buildDepends = [
     cereal libxmlSax network parsec random text transformers vector
     xmlTypes
   ];
+  testDepends = [
+    cereal chell chellQuickcheck filepath libxmlSax network parsec
+    QuickCheck random text transformers vector xmlTypes
+  ];
   jailbreak = true;
   meta = {
     homepage = "https://john-millikin.com/software/haskell-dbus/";
-- 
GitLab


From b34768db9b873ec92db7119215e75636be7fbc4b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:09 +0100
Subject: [PATCH 2274/3789] haskell-doctest: update to version 0.9.10.2

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

diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix
index 843fd6239dc..8ed11decf05 100644
--- a/pkgs/development/libraries/haskell/doctest/default.nix
+++ b/pkgs/development/libraries/haskell/doctest/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "doctest";
-  version = "0.9.10.1";
-  sha256 = "1kl6bihhyj08ifij7ddpy6067s1lv2lnnp4an9wany3fzwlifbyi";
+  version = "0.9.10.2";
+  sha256 = "1vrhfbw59vfypylkr2ica2wx1vm62r40s4165syy76r8cyy0i554";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ deepseq filepath ghcPaths syb transformers ];
-- 
GitLab


From ac5fdeb00fde8d459d5d98d7a47996643c6bb6b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:10 +0100
Subject: [PATCH 2275/3789] haskell-fay-base: update to version 0.19.1

---
 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 53f6fdce41c..6e9ed486884 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";
-  sha256 = "03jf1ig3s2dcdd26j3d3iwm9hbiq5f5q5hyg22jdvl7lmvigw36j";
+  version = "0.19.1";
+  sha256 = "1b4v8l3adhcpply9yqk1pc1cgsvqlamvk60rvcb89kw5clrbvr4r";
   buildDepends = [ fay ];
   meta = {
     homepage = "https://github.com/faylang/fay-base";
-- 
GitLab


From 00b17087f76dd54548ac25acc19f1a4af3d0a83f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:11 +0100
Subject: [PATCH 2276/3789] haskell-fay: update to version 0.19.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 fdce9907056..d945298d228 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.0.2";
-  sha256 = "025yhl32xr5fcsxval5rcj8jrgd6qnjq9bqbhbsr5ni8dz3ks5r3";
+  version = "0.19.1";
+  sha256 = "05h4jmwy1wzgps1an1df5b4gic91xlm884mv6nqnazvpbnn23d5b";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 34b4e5c97add141e36507fd338d95fd10071c263 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:12 +0100
Subject: [PATCH 2277/3789] haskell-ghc-mod: update to version 3.1.7

---
 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 02c459c8e5c..260fff8ae82 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 = "3.1.6";
-  sha256 = "1z8fzh08f38cxplf14sflpgrazlwzz6q73lvxm37xyp7gww2prhi";
+  version = "3.1.7";
+  sha256 = "1mv6m1fcqkm4i27jw1aniwfq2dhpn4m7kicyq4l70zmkfr7y7c5s";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 7e83f3b703f2684c51d2b5670004331933a92828 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:14 +0100
Subject: [PATCH 2278/3789] haskell-gnuplot: update to version 0.5.2.1

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

diff --git a/pkgs/development/libraries/haskell/gnuplot/default.nix b/pkgs/development/libraries/haskell/gnuplot/default.nix
index 8390ef2520a..14655677c6f 100644
--- a/pkgs/development/libraries/haskell/gnuplot/default.nix
+++ b/pkgs/development/libraries/haskell/gnuplot/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gnuplot";
-  version = "0.5.2";
-  sha256 = "11gma33bikx97jra04vgnhikylw9wm1l37hdrsknl7mgk2qbrs74";
+  version = "0.5.2.1";
+  sha256 = "1bzj7z803mxyxfv2123swvdv78gh5dbrf8ldc6iziry3fz5q8nb1";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From b976817bd7eb9149aa0aa2077ffd8624884b4724 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:15 +0100
Subject: [PATCH 2279/3789] haskell-lens: update to version 4.0.7

---
 .../libraries/haskell/lens/default.nix        | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 7c347f69ce4..57f84955be3 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -1,23 +1,22 @@
-{ cabal, aeson, bifunctors, comonad, constraints, contravariant
-, deepseq, distributive, doctest, exceptions, filepath
-, genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel
-, primitive, profunctors, QuickCheck, reflection, scientific
-, semigroupoids, semigroups, simpleReflect, split, tagged
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, testFrameworkTh, text, transformers, transformersCompat
-, unorderedContainers, utf8String, vector, void, zlib
+{ cabal, aeson, bifunctors, comonad, contravariant, deepseq
+, distributive, doctest, exceptions, filepath, genericDeriving
+, hashable, hlint, HUnit, mtl, nats, parallel, primitive
+, profunctors, QuickCheck, reflection, scientific, semigroupoids
+, semigroups, simpleReflect, split, tagged, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh
+, text, transformers, transformersCompat, unorderedContainers
+, utf8String, vector, void, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "4.0.5";
-  sha256 = "1kjmi76zpkhkwn514inhpfhfh3pg5na1f2zw1faqnk3bylpp9h6g";
+  version = "4.0.7";
+  sha256 = "0n4xw182yamgaplyshbhyjw9i7n6rvaszr4011mdbd6yvprl5v29";
   buildDepends = [
-    aeson bifunctors comonad constraints contravariant distributive
-    exceptions filepath hashable mtl parallel primitive profunctors
-    reflection scientific semigroupoids semigroups split tagged text
-    transformers transformersCompat unorderedContainers utf8String
-    vector void zlib
+    aeson bifunctors comonad contravariant distributive exceptions
+    filepath hashable mtl parallel primitive profunctors reflection
+    scientific semigroupoids semigroups split tagged text transformers
+    transformersCompat unorderedContainers utf8String vector void zlib
   ];
   testDepends = [
     deepseq doctest filepath genericDeriving hlint HUnit mtl nats
-- 
GitLab


From e63062ed9ddd81117faecf1c8b46dbb94dcc9444 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:16 +0100
Subject: [PATCH 2280/3789] haskell-linear: update to version 1.9.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 b57879085bf..f0dac623a98 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.9.0.1";
-  sha256 = "1ibdv1915rqz6dp8qg1nipnwwk345n4c5n51i8nn1h7p7jp53hhs";
+  version = "1.9.1";
+  sha256 = "17jvqy2nbcra36fzkwbjkfwg6mjw804zd1i50mhbqwg9j7z4s5sb";
   buildDepends = [
     adjunctions binary distributive hashable lens reflection
     semigroupoids semigroups tagged transformers unorderedContainers
-- 
GitLab


From e31bd9e6ee8b7a7ea65a9892b9fe96aeac3050b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:17 +0100
Subject: [PATCH 2281/3789] haskell-ltk: update to version 0.13.1.0

---
 pkgs/development/libraries/haskell/ltk/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ltk/default.nix b/pkgs/development/libraries/haskell/ltk/default.nix
index 7960395eb09..df1e4be218f 100644
--- a/pkgs/development/libraries/haskell/ltk/default.nix
+++ b/pkgs/development/libraries/haskell/ltk/default.nix
@@ -1,10 +1,12 @@
-{ cabal, Cabal, filepath, glib, gtk, mtl, parsec, transformers }:
+{ cabal, Cabal, filepath, glib, gtk3, mtl, parsec, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "ltk";
-  version = "0.12.1.0";
-  sha256 = "12x6nba5bll8fgzpxii1cf87j27jk4mn5gf1bx4ahd9v30h1a0h6";
-  buildDepends = [ Cabal filepath glib gtk mtl parsec transformers ];
+  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";
-- 
GitLab


From dbd61dbdaecde0e3aa2e313b3ea124ab1914aa36 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:18 +0100
Subject: [PATCH 2282/3789] haskell-midi: update to version 0.2.1.1

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

diff --git a/pkgs/development/libraries/haskell/midi/default.nix b/pkgs/development/libraries/haskell/midi/default.nix
index e50843c6ff2..9467b567f82 100644
--- a/pkgs/development/libraries/haskell/midi/default.nix
+++ b/pkgs/development/libraries/haskell/midi/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "midi";
-  version = "0.2.1";
-  sha256 = "0i767y0835979s9i3wm8qwzh2awhhmfvhc5zvq2lkn8xlsp3wa6y";
+  version = "0.2.1.1";
+  sha256 = "11h4kr9a1jia1ghcyzgavcznw4771l00z736iibjpagw0b8fpip5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 165ada34b9e6912d915d9af602a270b8c5d857e5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:20 +0100
Subject: [PATCH 2283/3789] haskell-numeric-prelude: update to version 0.4.1

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

diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
index 9fb5d334a4d..4fac81b01f9 100644
--- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "numeric-prelude";
-  version = "0.4.0.3";
-  sha256 = "0lgjnkvbz14cqsm5fjafl8g5mkclcdvpwa3kpz9radmg2x09rsnl";
+  version = "0.4.1";
+  sha256 = "1y1dg4bk811xmz3p23g8kjl6vxns3gs8qj671971c06nccfl1h5r";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From b9a837c26c201734fd1b0405016d65dbfa28cb3c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:21 +0100
Subject: [PATCH 2284/3789] haskell-sample-frame: update to version 0.0.3

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

diff --git a/pkgs/development/libraries/haskell/sample-frame/default.nix b/pkgs/development/libraries/haskell/sample-frame/default.nix
index f8acbf1fda8..8e9478ed5e2 100644
--- a/pkgs/development/libraries/haskell/sample-frame/default.nix
+++ b/pkgs/development/libraries/haskell/sample-frame/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "sample-frame";
-  version = "0.0.2";
-  sha256 = "1k1fyslgw5vvn9a38mhp7c9j1xxf75ys010rcn2vr3pm6aj868sx";
+  version = "0.0.3";
+  sha256 = "0ivj0bcnqqc805np62bdpvh8v4ykmw86ph5rp7k54bbv9wd31bsv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ QuickCheck storableRecord ];
-- 
GitLab


From 10fde8fe5c72b0ad593cef01d36c4d96f7cd6dd4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:22 +0100
Subject: [PATCH 2285/3789] haskell-snap-core: update to version 0.9.6.1

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

diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
index 7bc8d6e4b57..351e8d94323 100644
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ b/pkgs/development/libraries/haskell/snap/core.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-core";
-  version = "0.9.6.0";
-  sha256 = "0v5bp8dw867gq92p3qw3h2yv6bhr2b7gy72rs26m9crk2dsfx9pa";
+  version = "0.9.6.1";
+  sha256 = "1wfjkbck2dc4a1nxz62yprf68g66m9vhvxihn9c5xypxjpgj2r9k";
   buildDepends = [
     attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
     bytestringMmap caseInsensitive deepseq enumerator filepath hashable
-- 
GitLab


From d56ff5cf6051ae0591642b98bd3b1ee6e0892313 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:23 +0100
Subject: [PATCH 2286/3789] haskell-tagged: update to version 0.7.1

---
 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 ee808800c55..d62033e8d16 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";
-  sha256 = "1g78hl6sib1mhg016gy3fqw78x72jsgqizsgim8a1pysjzq0y6zm";
+  version = "0.7.1";
+  sha256 = "036k5k44971fq6zdxc36kkic9ma93mcas7zk48i32s60iznnfc6v";
   meta = {
     homepage = "http://github.com/ekmett/tagged";
     description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
-- 
GitLab


From 7548ed77fb06d44c65e42bcd04d14064486bc24f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:24 +0100
Subject: [PATCH 2287/3789] haskell-tasty: update to version 0.8.0.2

---
 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 6fcdf9a4cb3..706053a3e03 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";
-  sha256 = "12r8ml45r1dq3vmjkibxkla5rmmyrm11js26kmkha110ji8hnflg";
+  version = "0.8.0.2";
+  sha256 = "0xn0qc1d7bq8s7988x58snq5ipvmi7g87rg89r1l21yxl6a85zw5";
   buildDepends = [
     ansiTerminal async deepseq mtl optparseApplicative regexTdfa stm
     tagged unboundedDelays
-- 
GitLab


From 8dfc2e1e4fcca8eefc6cb453c829dedca0b6db26 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:26 +0100
Subject: [PATCH 2288/3789] haskell-th-desugar: update to version 1.3.0

---
 pkgs/development/libraries/haskell/th-desugar/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/th-desugar/default.nix b/pkgs/development/libraries/haskell/th-desugar/default.nix
index f3aa1628aae..42ff1d78198 100644
--- a/pkgs/development/libraries/haskell/th-desugar/default.nix
+++ b/pkgs/development/libraries/haskell/th-desugar/default.nix
@@ -1,10 +1,11 @@
-{ cabal, mtl, syb }:
+{ cabal, hspec, HUnit, mtl, syb }:
 
 cabal.mkDerivation (self: {
   pname = "th-desugar";
-  version = "1.2.1";
-  sha256 = "12a8m1vzfbn728psaiqxwngmksrbybci3g7a47z04rjbsjf3cy4v";
+  version = "1.3.0";
+  sha256 = "1wfypk1hcxr2918qp63df5xlx00rqwnaa59mivnlqs558g4kjx6j";
   buildDepends = [ mtl syb ];
+  testDepends = [ hspec HUnit mtl syb ];
   meta = {
     homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar";
     description = "Functions to desugar Template Haskell";
-- 
GitLab


From 745a35c130abbde42850831d12d03343d4b0eff6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:26:27 +0100
Subject: [PATCH 2289/3789] haskell-hlint: update to version 1.8.59

---
 pkgs/development/tools/haskell/hlint/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index 860148cf244..72ba1ba6b87 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -1,15 +1,16 @@
-{ cabal, cpphs, filepath, haskellSrcExts, hscolour, transformers
-, uniplate
+{ cabal, cmdargs, cpphs, filepath, haskellSrcExts, hscolour
+, transformers, uniplate
 }:
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.8.57";
-  sha256 = "062fpyjd3mha9faxdpg763sigafl4mvl8qqw3z31zkafz361qzm4";
+  version = "1.8.59";
+  sha256 = "14yn63zbbqwvxlis0kwga4mrz6qjr8kq1cq7f0rcilgqgh1dkwh8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    cpphs filepath haskellSrcExts hscolour transformers uniplate
+    cmdargs cpphs filepath haskellSrcExts hscolour transformers
+    uniplate
   ];
   jailbreak = true;
   meta = {
-- 
GitLab


From d17eb6576d1b265011b8b753bbce4baf6c5ce34d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:43:38 +0100
Subject: [PATCH 2290/3789] haskell-haskell-names: update to version 0.3.3

---
 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 519b24668ae..74cfc453099 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.2.8";
-  sha256 = "043anrsilhd6mgc7c5qb6b7rkdf60xfgzzjn38zk6v0f41lvff99";
+  version = "0.3.3";
+  sha256 = "1f40dyrdb9c5iysmclql75l86zg3iisnyyiq5fkgixdafzsq31ir";
   buildDepends = [
     aeson Cabal dataLens dataLensTemplate filepath haskellPackages
     haskellSrcExts hseCpp mtl tagged transformers traverseWithClass
-- 
GitLab


From dd701b4c51dd1e9b32d7cf0e01059c83bfa7a91c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Mar 2014 09:47:28 +0100
Subject: [PATCH 2291/3789] haskell-options: we cannot easily run the test
 suite because it requires 'chell', which requires 'options'

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

diff --git a/pkgs/development/libraries/haskell/options/default.nix b/pkgs/development/libraries/haskell/options/default.nix
index b1698ac5b35..3772a142a58 100644
--- a/pkgs/development/libraries/haskell/options/default.nix
+++ b/pkgs/development/libraries/haskell/options/default.nix
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0d40d6k1c8v2b0bgchgl54sk9wx28kysp8bjws8bwjcmmd57775f";
   buildDepends = [ monadsTf transformers ];
   testDepends = [ chell chellQuickcheck monadsTf transformers ];
+  doCheck = false;
   meta = {
     homepage = "https://john-millikin.com/software/haskell-options/";
     description = "A powerful and easy-to-use command-line option parser";
-- 
GitLab


From f202729d53ccf38e7e04114b7c602d2f0e42444c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Mar 2014 14:12:29 +0100
Subject: [PATCH 2292/3789] haskell-dbus: disable test suite

The tests need access to the Internet to succeed.
---
 pkgs/development/libraries/haskell/dbus/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix
index 874b945513a..7f0285dfc7a 100644
--- a/pkgs/development/libraries/haskell/dbus/default.nix
+++ b/pkgs/development/libraries/haskell/dbus/default.nix
@@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
     QuickCheck random text transformers vector xmlTypes
   ];
   jailbreak = true;
+  doCheck = false;
   meta = {
     homepage = "https://john-millikin.com/software/haskell-dbus/";
     description = "A client library for the D-Bus IPC system";
-- 
GitLab


From e5cc6d3552654097bccf9e26dba4ee2be13dc8ce Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Mon, 17 Mar 2014 19:27:06 +0100
Subject: [PATCH 2293/3789] Enable acpid if nvidia driver is being used. The
 NVidia driver wants to connect to acpid to receive ACPI events.

---
 nixos/modules/services/x11/xserver.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 2677f758456..206cf128a9b 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -24,6 +24,11 @@ let
 
   driverNames = config.hardware.opengl.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);
@@ -428,6 +433,8 @@ in
       ++ optional (elem "virtualbox" driverNames) xorg.xrefresh
       ++ optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
 
+    services.acpid.enable = mkIf needsAcpid true;
+
     environment.pathsToLink =
       [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
 
@@ -436,7 +443,8 @@ in
     systemd.services."display-manager" =
       { description = "X11 Server";
 
-        after = [ "systemd-udev-settle.service" "local-fs.target" ];
+        after = [ "systemd-udev-settle.service" "local-fs.target" ]
+                ++ optional needsAcpid "acpid.service";
 
         restartIfChanged = false;
 
-- 
GitLab


From da4fca4ce411fdce79fee63558c61dfd8666598a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 17 Mar 2014 22:53:08 +0100
Subject: [PATCH 2294/3789] ffmpeg (0.10): minor update

(cherry picked from commit 9951478c40330b7cf7918ce93c7d242d99ffcd05)

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

diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix
index f356bceaf40..99c823e7b29 100644
--- a/pkgs/development/libraries/ffmpeg/0.10.nix
+++ b/pkgs/development/libraries/ffmpeg/0.10.nix
@@ -21,11 +21,11 @@ assert vdpauSupport -> libvdpau != null;
 assert faacSupport -> faac != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-0.10.11";
+  name = "ffmpeg-0.10.12";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "1l1nyvsfafl9w0falv1hcm65r2rlxyb59har0rkrrpi56fj1ma4r";
+    sha256 = "00nvm3iysn8zincpvv1abqrxqj1ky0322dh2j9csjw983358538i";
   };
 
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
-- 
GitLab


From 4e6eae45ee8c2357acf3dc7e3caba9d86c2edeac Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 17 Mar 2014 22:04:51 -0400
Subject: [PATCH 2295/3789] test-driver: Set the date to the current time on
 boot

Should allow merging #1816
---
 nixos/lib/test-driver/test-driver.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl
index 31f3281cefe..84c8d6e4703 100644
--- a/nixos/lib/test-driver/test-driver.pl
+++ b/nixos/lib/test-driver/test-driver.pl
@@ -52,6 +52,7 @@ sub createMachine {
     my ($args) = @_;
     my $vm = Machine->new({%{$args}, log => $log, redirectSerial => ($ENV{USE_SERIAL} // "0") ne "1"});
     $vms{$vm->name} = $vm;
+    $vm->execute("date -s @" . time);
     return $vm;
 }
 
-- 
GitLab


From a1a167bc8bfd40616d6ad465b5c44337c7fee657 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 17 Mar 2014 23:31:56 -0400
Subject: [PATCH 2296/3789] nginx module: Enable modularly specifying servers

---
 nixos/modules/services/web-servers/nginx/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 1a39fe43bbe..62153613355 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -9,6 +9,11 @@ let
     user ${cfg.user} ${cfg.group};
     daemon off;
     ${cfg.config}
+    ${optionalString (cfg.httpConfig != "") ''
+    http {
+      ${cfg.httpConfig}
+    }
+    ''}
     ${cfg.appendConfig}
   '';
 in
@@ -51,6 +56,12 @@ in
         '';
       };
 
+      httpConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Configuration lines to be appended inside of the http {} block.";
+      };
+
       stateDir = mkOption {
         default = "/var/spool/nginx";
         description = "
-- 
GitLab


From cca592b45518bd09b54010183f32b32f604ce5ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 18 Mar 2014 10:05:48 +0100
Subject: [PATCH 2297/3789] liferea: minor update

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

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 527c860c098..c0892740dbd 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.6";
+    version = "1.10.7";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "0vp19z4p3cn3zbg1zjpg2iyzwq893dx5c1kh6aac06s3rf1124gm";
+    url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
+    sha256 = "17kvg44brdz99firr5h5qx8icvadlr7p1cz3xr3437sf5rhj25wh";
   };
 
   buildInputs = with gst_all_1; [
-- 
GitLab


From 895bcdd1cb9f98ba032c78d996f3ebc89fd60bc2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Mar 2014 10:49:25 +0100
Subject: [PATCH 2298/3789] Add support for running a container with a private
 network interface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For example, the following sets up a container named ‘foo’.  The
container will have a single network interface eth0, with IP address
10.231.136.2.  The host will have an interface c-foo with IP address
10.231.136.1.

  systemd.containers.foo =
    { privateNetwork = true;
      hostAddress = "10.231.136.1";
      localAddress = "10.231.136.2";
      config =
        { services.openssh.enable = true; };
    };

With ‘privateNetwork = true’, the container has the CAP_NET_ADMIN
capability, allowing it to do arbitrary network configuration, such as
setting up firewall rules.  This is secure because it cannot touch the
interfaces of the host.

The helper program ‘run-in-netns’ is needed at the moment because ‘ip
netns exec’ doesn't quite do the right thing (it remounts /sys without
bind-mounting the original /sys/fs/cgroups).
---
 nixos/modules/services/networking/dhcpcd.nix |   5 +-
 nixos/modules/virtualisation/containers.nix  | 113 +++++++++++++++++--
 nixos/modules/virtualisation/run-in-netns.c  |  50 ++++++++
 3 files changed, 155 insertions(+), 13 deletions(-)
 create mode 100644 nixos/modules/virtualisation/run-in-netns.c

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index d4ec96a18f6..38a21a723d9 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -34,8 +34,9 @@ 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).
-      denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet*
+      # (Xen) and virbr* and vnet* (libvirt) and c-* and ctmp-* (NixOS
+      # containers).
+      denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet* c-* ctmp-*
 
       ${config.networking.dhcpcd.extraConfig}
     '';
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 6a4833e1e21..49046975d83 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -2,6 +2,20 @@
 
 with pkgs.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";
+  };
+
+in
+
 {
   options = {
 
@@ -45,6 +59,39 @@ with pkgs.lib;
               '';
             };
 
+            privateNetwork = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                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>
+                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.
+              '';
+            };
+
+            hostAddress = mkOption {
+              type = types.nullOr types.string;
+              default = null;
+              example = "10.231.136.1";
+              description = ''
+                The IPv4 address assigned to the host interface.
+              '';
+            };
+
+            localAddress = mkOption {
+              type = types.nullOr types.string;
+              default = null;
+              example = "10.231.136.2";
+              description = ''
+                The IPv4 address assigned to <literal>eth0</literal>
+                in the container.
+              '';
+            };
+
           };
 
           config = mkMerge
@@ -97,32 +144,70 @@ with pkgs.lib;
 
   config = {
 
-    systemd.services = mapAttrs' (name: container: nameValuePair "container-${name}"
-      { description = "Container '${name}'";
+    systemd.services = mapAttrs' (name: cfg:
+      let
+        # FIXME: interface names have a maximum length.
+        ifaceHost = "c-${name}";
+        ifaceCont = "ctmp-${name}";
+        ns = "net-${name}";
+      in
+      nameValuePair "container-${name}" {
+        description = "Container '${name}'";
 
         wantedBy = [ "multi-user.target" ];
 
-        unitConfig.RequiresMountsFor = [ container.root ];
+        unitConfig.RequiresMountsFor = [ cfg.root ];
+
+        path = [ pkgs.iproute ];
 
         preStart =
           ''
-            mkdir -p -m 0755 ${container.root}/etc
-            if ! [ -e ${container.root}/etc/os-release ]; then
-              touch ${container.root}/etc/os-release
+            mkdir -p -m 0755 ${cfg.root}/etc
+            if ! [ -e ${cfg.root}/etc/os-release ]; then
+              touch ${cfg.root}/etc/os-release
             fi
 
             mkdir -p -m 0755 \
               /nix/var/nix/profiles/per-container/${name} \
               /nix/var/nix/gcroots/per-container/${name}
+          ''
+
+          + optionalString cfg.privateNetwork ''
+            # Cleanup from last time.
+            ip netns del ${ns} 2> /dev/null || true
+            ip link del ${ifaceHost} 2> /dev/null || true
+            ip link del ${ifaceCont} 2> /dev/null || true
+
+            # Create a pair of virtual ethernet devices.  On the host,
+            # we get ‘c-<container-name’, and on the guest, we get
+            # ‘eth0’.
+            set -x
+            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
+            ${optionalString (cfg.hostAddress != null) ''
+              ip addr add ${cfg.hostAddress} dev ${ifaceHost}
+              ip netns exec ${ns} ip route add ${cfg.hostAddress} dev eth0
+              ip netns exec ${ns} ip route add default via ${cfg.hostAddress}
+            ''}
+            ${optionalString (cfg.localAddress != null) ''
+              ip netns exec ${ns} ip addr add ${cfg.localAddress} dev eth0
+              ip route add ${cfg.localAddress} dev ${ifaceHost}
+            ''}
           '';
 
         serviceConfig.ExecStart =
-          "${config.systemd.package}/bin/systemd-nspawn"
-          + " -M ${name} -D ${container.root}"
+          (optionalString cfg.privateNetwork "${runInNetns}/bin/run-in-netns ${ns} ")
+          + "${config.systemd.package}/bin/systemd-nspawn"
+          + (optionalString cfg.privateNetwork " --capability=CAP_NET_ADMIN")
+          + " -M ${name} -D ${cfg.root}"
           + " --bind-ro=/nix/store --bind-ro=/nix/var/nix/db --bind-ro=/nix/var/nix/daemon-socket"
           + " --bind=/nix/var/nix/profiles/per-container/${name}:/nix/var/nix/profiles"
           + " --bind=/nix/var/nix/gcroots/per-container/${name}:/nix/var/nix/gcroots"
-          + " ${container.path}/init";
+          + " ${cfg.path}/init";
 
         preStop =
           ''
@@ -146,10 +231,16 @@ with pkgs.lib;
 
         serviceConfig.ExecReload =
           "${pkgs.bash}/bin/bash -c '"
-          + "echo ${container.path}/bin/switch-to-configuration test "
-          + "| ${pkgs.socat}/bin/socat unix:${container.root}/var/lib/root-shell.socket -'";
+          + "echo ${cfg.path}/bin/switch-to-configuration test "
+          + "| ${pkgs.socat}/bin/socat unix:${cfg.root}/var/lib/root-shell.socket -'";
 
       }) config.systemd.containers;
 
+    # Generate /etc/hosts entries for the containers.
+    networking.extraHosts = concatStrings (mapAttrsToList (name: cfg: optionalString (cfg.localAddress != null)
+      ''
+        ${cfg.localAddress} ${name}.containers
+      '') config.systemd.containers);
+
   };
 }
diff --git a/nixos/modules/virtualisation/run-in-netns.c b/nixos/modules/virtualisation/run-in-netns.c
new file mode 100644
index 00000000000..d375bddf2e6
--- /dev/null
+++ b/nixos/modules/virtualisation/run-in-netns.c
@@ -0,0 +1,50 @@
+#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;
+}
-- 
GitLab


From 7b82d1ee27a60157418e241152ef1aa3f909ad7b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Mar 2014 11:04:54 +0100
Subject: [PATCH 2299/3789] Ensure that the container root can always be
 accessed via /var/lib/containers

---
 nixos/modules/virtualisation/containers.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 49046975d83..ff17fcc1221 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -172,6 +172,10 @@ in
               /nix/var/nix/gcroots/per-container/${name}
           ''
 
+          + optionalString (cfg.root != "/var/lib/containers/${name}") ''
+            ln -sfn "${cfg.root}" "/var/lib/containers/${name}"
+          ''
+
           + optionalString cfg.privateNetwork ''
             # Cleanup from last time.
             ip netns del ${ns} 2> /dev/null || true
-- 
GitLab


From cf0f710b13c268529c065de1b484019ce9847875 Mon Sep 17 00:00:00 2001
From: Tom Hinton <tom.hinton@cse.org.uk>
Date: Tue, 18 Mar 2014 10:14:52 +0000
Subject: [PATCH 2300/3789] Update isync version to 1.1.0 (doesn't need
 recursive listing patch any more)

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

diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix
index 86986ed9b95..ed01ccacd79 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/pkgs/tools/networking/isync/default.nix
@@ -1,14 +1,13 @@
 { fetchurl, stdenv, openssl, pkgconfig, db }:
 
 stdenv.mkDerivation rec {
-  name = "isync-1.0.6";
+  name = "isync-1.1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/isync/${name}.tar.gz";
-    sha256 = "0bv3hw6mc9xi55q6lpyz1w3dyrk6rlxa8ny2x1b44mrnbrx7chz5";
+    sha256 = "51f5618c239013fb770f98ae269f24ee417214efaaf7e22821b4a27cf9a9213c";
   };
 
-  patches = [ ./isync-recursice-imap.patch ]; # usefull patch to enable subfolders listing
   buildInputs = [ openssl pkgconfig db ];
 
   meta = {
-- 
GitLab


From 7b9485145df02c509fb9eaa6976b722f459f5795 Mon Sep 17 00:00:00 2001
From: Tom Hinton <tom.hinton@cse.org.uk>
Date: Tue, 18 Mar 2014 10:15:59 +0000
Subject: [PATCH 2301/3789] Add missing sha256sum to autorandr derivation

---
 pkgs/tools/misc/autorandr/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index 2c7505260a6..960d85ab6be 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -16,6 +16,7 @@ in
     src = fetchgit {
       inherit rev;
       url = "https://github.com/wertarbyte/autorandr.git";
+      sha256 = "1x8agg6mf5jr0imw7dznr8kxyw970bf252bda9q7b0z4yksya2zd"; 
     };
 
     patchPhase = ''
-- 
GitLab


From 11c4c4ae54bbef647358d2b6d6c3ddf0457f81f7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Mar 2014 11:36:03 +0100
Subject: [PATCH 2302/3789] =?UTF-8?q?Add=20command=20=E2=80=98nixos-contai?=
 =?UTF-8?q?ner-shell=E2=80=99=20for=20logging=20into=20a=20container?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nixos/modules/virtualisation/containers.nix | 54 +++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index ff17fcc1221..28ee78e3fcc 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -14,6 +14,58 @@ let
     installPhase = "true";
   };
 
+  nixos-container-shell = pkgs.writeScriptBin "nixos-container-shell"
+    ''
+      #! ${pkgs.bash}/bin/sh -e
+
+      usage() {
+        echo "Usage: $0 <container-name>" >&2
+        echo "       $0 (-r|--root-shell) <container-name>" >&2
+      }
+
+      args="`getopt --options 'r' -l help -- "$@"`"
+      eval "set -- $args"
+      rootShell=
+      while [ $# -gt 0 ]; do
+        case "$1" in
+          (--help) usage; exit 0;;
+          (-r|--root-shell) rootShell=1;;
+          (--) shift; break;;
+          (*) break;;
+        esac
+        shift
+      done
+
+      container="$1"
+      if [ -z "$container" ]; then
+        usage
+        exit 1
+      fi
+      shift
+
+      root="/var/lib/containers/$container"
+      if ! [ -d "$root" ]; then
+        echo "$0: container ‘$container’ does not exist" >&2
+        exit 1
+      fi
+
+      if [ -n "$rootShell" ]; then
+        socket="$root/var/lib/root-shell.socket"
+      else
+        socket="$root/var/lib/login.socket"
+      fi
+      if ! [ -S "$socket" ]; then
+        echo "$0: socket ‘$socket’ does not exist" >&2
+        exit 1
+      fi
+
+      if [ -n "$rootShell" ]; then
+        exec ${pkgs.socat}/bin/socat "unix:$socket" -
+      else
+        exec ${pkgs.socat}/bin/socat "unix:$socket" -,echo=0,raw
+      fi
+    '';
+
 in
 
 {
@@ -246,5 +298,7 @@ in
         ${cfg.localAddress} ${name}.containers
       '') config.systemd.containers);
 
+    environment.systemPackages = optional (config.systemd.containers != {}) nixos-container-shell;
+
   };
 }
-- 
GitLab


From 5b10ea1f99edf1855d0735330634a463771a5ee2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Mar 2014 11:39:51 +0100
Subject: [PATCH 2303/3789] Don't run dhcpcd in containers

---
 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 28ee78e3fcc..b8388e7f206 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -156,6 +156,7 @@ in
                       { boot.isContainer = true;
                         security.initialRootPassword = mkDefault "!";
                         networking.hostName = mkDefault name;
+                        networking.useDHCP = false;
                         imports = [ ./container-login.nix ];
                       };
                     in [ extraConfig config.config ];
-- 
GitLab


From 01fc3e5153e0dd3dea3318f52bd52bdc0a1e11d0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Mar 2014 14:05:51 +0100
Subject: [PATCH 2304/3789] Revert "test-driver: Set the date to the current
 time on boot"

This reverts commit 4e6eae45ee8c2357acf3dc7e3caba9d86c2edeac. It
breaks running the test driver interactively (in that it causes all
VMs to be started immediately, which is not always what you wnat).
---
 nixos/lib/test-driver/test-driver.pl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl
index 84c8d6e4703..31f3281cefe 100644
--- a/nixos/lib/test-driver/test-driver.pl
+++ b/nixos/lib/test-driver/test-driver.pl
@@ -52,7 +52,6 @@ sub createMachine {
     my ($args) = @_;
     my $vm = Machine->new({%{$args}, log => $log, redirectSerial => ($ENV{USE_SERIAL} // "0") ne "1"});
     $vms{$vm->name} = $vm;
-    $vm->execute("date -s @" . time);
     return $vm;
 }
 
-- 
GitLab


From de57c0eb661fa670912f13f367c5d6f891129322 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Mar 2014 14:10:31 +0100
Subject: [PATCH 2305/3789] Shut up Perl warning

---
 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 8bef3d67b8d..99810f87750 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -497,7 +497,7 @@ sub waitForX {
         retry sub {
             my ($status, $out) = $self->execute("journalctl -bu systemd-logind | grep Linked");
             return 0 if $status != 0;
-            my ($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1");
+            ($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1");
             return 1 if $status == 0;
         }
     });
-- 
GitLab


From b6d3526c53c0ad2ff5f80bde6815a74119617dec Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 20 Feb 2014 14:02:55 -0600
Subject: [PATCH 2306/3789] qemu: Update 1.5.2 -> 1.7.0

---
 .../applications/virtualization/qemu/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index dcf5b4e5009..7f3bf8fafc8 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman
-, attr, libcap, vde2, alsaLib, texinfo, libuuid
+, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison
 , makeWrapper
 , sdlSupport ? true, SDL
 , vncSupport ? true, libjpeg, libpng
@@ -7,19 +7,19 @@
 , x86Only ? false
 }:
 
-let n = "qemu-1.5.2"; in
+let n = "qemu-1.7.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 = "0l52jwlxmwp9g3jpq0g7ix9dq4qgh46nd2h58lh47f0a35yi8qgn";
+    sha256 = "050kq9mz8c2jcshm7nn7dldypsk8jr590ybnlw2wc51dbyl37wri";
   };
 
   buildInputs =
     [ python zlib pkgconfig glib ncurses perl pixman attr libcap
-      vde2 alsaLib texinfo libuuid makeWrapper
+      vde2 alsaLib texinfo libuuid flex bison makeWrapper
     ]
     ++ stdenv.lib.optionals sdlSupport [ SDL ]
     ++ stdenv.lib.optionals vncSupport [ libjpeg libpng ]
@@ -43,11 +43,11 @@ stdenv.mkDerivation rec {
       fi
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.qemu.org/;
     description = "A generic and open source machine emulator and virtualizer";
-    license = "GPLv2+";
-    maintainers = with stdenv.lib.maintainers; [ viric shlevy eelco ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ viric shlevy eelco ];
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From f73ff0529ef079cb9b53b25201766d670287b28f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Mar 2014 15:02:09 +0100
Subject: [PATCH 2307/3789] runInLinuxVM: Set the clock properly

---
 pkgs/build-support/vm/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 3dcb8aa1705..274cd05024b 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -2,7 +2,7 @@
 , kernel ? pkgs.linux_3_10
 , img ? "bzImage"
 , rootModules ?
-    [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" ]
+    [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" "rtc_cmos" ]
 }:
 
 with pkgs;
@@ -57,6 +57,7 @@ rec {
       mknod ${dev}/random  c 1 8
       mknod ${dev}/urandom c 1 9
       mknod ${dev}/tty     c 5 0
+      mknod ${dev}/rtc     c 254 0
       . /sys/class/block/${hd}/uevent
       mknod ${dev}/${hd} b $MAJOR $MINOR
     '';
@@ -159,6 +160,10 @@ rec {
     #! ${bash}/bin/sh
     source /tmp/xchg/saved-env
 
+    # Set the system time from the hardware clock.  Works around an
+    # apparent KVM > 1.5.2 bug.
+    ${pkgs.utillinux}/sbin/hwclock -s
+
     export NIX_STORE=/nix/store
     export NIX_BUILD_TOP=/tmp
     export TMPDIR=/tmp
-- 
GitLab


From ac3de98f079e5b48c85f5b4b85b6bb447ebe3567 Mon Sep 17 00:00:00 2001
From: Anders Claesson <akc@akc.is>
Date: Sat, 15 Mar 2014 22:12:38 +0000
Subject: [PATCH 2308/3789] Add sloane -- a command line interface to OEIS.

---
 lib/maintainers.nix                           |  1 +
 .../science/math/sloane/default.nix           | 21 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/science/math/sloane/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8d6c613fd0f..c2dd5dd266a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -5,6 +5,7 @@
      alphabetically sorted.  */
 
   aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
+  akc = "Anders Claesson <akc@akc.is>";
   algorith = "Dries Van Daele <dries_van_daele@telenet.be>";
   all = "Nix Committers <nix-commits@lists.science.uu.nl>";
   amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
diff --git a/pkgs/applications/science/math/sloane/default.nix b/pkgs/applications/science/math/sloane/default.nix
new file mode 100644
index 00000000000..1e318bd8a79
--- /dev/null
+++ b/pkgs/applications/science/math/sloane/default.nix
@@ -0,0 +1,21 @@
+{ cabal, ansiTerminal, cmdargs, HTTP, terminalSize, url }:
+
+cabal.mkDerivation (self: {
+  pname = "sloane";
+  version = "1.6";
+  sha256 = "0my3j53bda3s8zxnm6is1align4k082wwsfg2y1i75js5z9kwmzy";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ ansiTerminal cmdargs HTTP terminalSize url ];
+  postInstall = ''
+    mkdir -p $out/share/man/man1
+    cp sloane.1 $out/share/man/man1/
+  '';
+  meta = {
+    homepage = "http://github.com/akc/sloane";
+    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 ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d23471ffdd4..2e7765c0b7b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2842,6 +2842,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   nc-indicators = callPackage ../applications/misc/nc-indicators {};
 
+  sloane = callPackage ../applications/science/math/sloane {};
+
   taffybar = callPackage ../applications/misc/taffybar {};
 
   yi = callPackage ../applications/editors/yi/yi.nix {};
-- 
GitLab


From cc69228119c4c2da1ed4260eab9add54841dcbeb Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 18 Mar 2014 15:50:24 +0000
Subject: [PATCH 2309/3789] grsecurity: Update stable and test patches

stable: 3.0-3.2.55-201403142107 -> 3.0-3.2.55-201403172027
test:   3.0-3.13.6-201403142112 -> 3.0-3.13.6-201403172032
---
 pkgs/os-specific/linux/kernel/patches.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 22f9ee9d876..2d1fb6e2818 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -81,8 +81,8 @@ rec {
   grsecurity_3_0_3_2_55 =
     { name = "grsecurity-3.0-3.2.55";
       patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403142107.patch;
-        sha256 = "0v858lizqbvp0czpx5vg0h1sd5mb5kik1qhv4hh7y01cx6dywam2";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403172027.patch;
+        sha256 = "1ik8xa9xgy9ghlb66rz04rdj64c8914vpv847zld7zhhih90lfm8";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55
@@ -92,8 +92,8 @@ rec {
   grsecurity_3_0_3_13_6 =
     { name = "grsecurity-3.0-3.13.6";
       patch = fetchurl {
-        url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403142112.patch;
-        sha256 = "12wdibf7xfqjwr1cnar3nskgrlm04w68impaq4a3xg1blb9nxxhr";
+        url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403172032.patch;
+        sha256 = "18gr6r11gv015y6nb2zvv3z8kb4zv9gadhlcdii6il0c2y4bsrsb";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.6
-- 
GitLab


From 26a868139ec2e582a8dd678676eed4d665b584f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Mar 2014 17:30:57 +0100
Subject: [PATCH 2310/3789] kdf: Disable parallel building

http://hydra.nixos.org/build/9595928
---
 pkgs/desktops/kde-4.10/kdeutils/kdf.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/kde-4.10/kdeutils/kdf.nix b/pkgs/desktops/kde-4.10/kdeutils/kdf.nix
index 3f9da58d0a6..4b02c12d88a 100644
--- a/pkgs/desktops/kde-4.10/kdeutils/kdf.nix
+++ b/pkgs/desktops/kde-4.10/kdeutils/kdf.nix
@@ -3,6 +3,8 @@
 kde {
   buildInputs = [ kdelibs ];
 
+  enableParallelBuilding = false;
+
   meta = {
     description = "KDE free disk space utility";
   };
-- 
GitLab


From 7ee31c7f94d121f5e57779c0c1478aee30d80cb1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Mar 2014 18:04:38 +0100
Subject: [PATCH 2311/3789] Fix permissions

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

diff --git a/nixos/modules/virtualisation/container-login.nix b/nixos/modules/virtualisation/container-login.nix
index 56e772fb797..09eaf90ae65 100644
--- a/nixos/modules/virtualisation/container-login.nix
+++ b/nixos/modules/virtualisation/container-login.nix
@@ -12,7 +12,7 @@
         wantedBy = [ "sockets.target" ];
         socketConfig =
           { ListenStream = "/var/lib/login.socket";
-            SocketMode = "0600"; # only root can connect, obviously
+            SocketMode = "0666";
             Accept = true;
           };
       };
@@ -36,7 +36,7 @@
         wantedBy = [ "sockets.target" ];
         socketConfig =
           { ListenStream = "/var/lib/root-shell.socket";
-            SocketMode = "0666";
+            SocketMode = "0600"; # only root can connect, obviously
             Accept = true;
           };
       };
-- 
GitLab


From 902b0599679bee358d5eb1afd6fc5603cbddddc6 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 14 Jul 2013 15:14:37 +0200
Subject: [PATCH 2312/3789] Add shotwell 1.15.1

---
 .../graphics/shotwell/default.nix             | 56 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  3 +-
 pkgs/desktops/gnome-3/misc/gexiv2/default.nix | 25 +++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/graphics/shotwell/default.nix
 create mode 100644 pkgs/desktops/gnome-3/misc/gexiv2/default.nix

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
new file mode 100644
index 00000000000..fdf50cceafe
--- /dev/null
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -0,0 +1,56 @@
+{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkit
+, pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils
+, lcms2, gdk_pixbuf, librsvg, makeWrapper }:
+
+# for dependencies see http://www.yorba.org/projects/shotwell/install/
+
+let
+  rest = stdenv.mkDerivation rec {
+    name = "rest-0.7.12";
+
+    src = fetchurl {
+      url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz";
+      sha256 = "0fmg7fq5fx0jg3ryk71kwdkspsvj42acxy9imk7vznkqj29a9zqn";
+    };
+    
+    configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
+    
+    buildInputs = [ pkgconfig glib libsoup ];
+  };
+in stdenv.mkDerivation rec {
+  version = "0.15.1";
+  name = "shotwell-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/shotwell/0.15/${name}.tar.xz";
+    sha256 = "12qbqba226q9wb0m31xx8w0m968sr1n18qa4mbz75wblhwws0j7b";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
+  
+  configureFlags = [ "--disable-gsettings-convert-install" ];
+  
+  preConfigure = ''
+    patchShebangs .
+  '';
+  
+  postInstall = ''
+    wrapProgram "$out/bin/shotwell" \
+     --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+     --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share"
+  '';
+
+
+  buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkit pkgconfig
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2
+                  libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
+                  makeWrapper ];
+
+  meta = with stdenv.lib; {
+    description = "Popular photo organizer for the GNOME desktop";
+    homepage = http://www.yorba.org/projects/shotwell/;
+    license = licenses.lgpl;
+    maintainers = with maintainers; [iElectric];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 15544eff922..61dfe2b1795 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -128,5 +128,6 @@ rec {
   gitg = callPackage ./misc/gitg { };
 
   libgit2-glib = callPackage ./misc/libgit2-glib { };
-
+  
+  gexiv2 = callPackage ./misc/gexiv2 { };
 }
diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
new file mode 100644
index 00000000000..86942c13f34
--- /dev/null
+++ b/pkgs/desktops/gnome-3/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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7db8633ee9..359e0305679 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1878,6 +1878,8 @@ let
   sg3_utils = callPackage ../tools/system/sg3_utils { };
 
   sharutils = callPackage ../tools/archivers/sharutils { };
+  
+  shotwell = callPackage ../applications/graphics/shotwell { };
 
   shebangfix = callPackage ../tools/misc/shebangfix { };
 
-- 
GitLab


From d4b1250b6c12d8e55ffcc959db26ac7a4209a5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 18 Mar 2014 18:21:03 +0100
Subject: [PATCH 2313/3789] remove prefix for kazam

---
 pkgs/applications/video/kazam/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix
index ed93f81b662..17bf282a459 100644
--- a/pkgs/applications/video/kazam/default.nix
+++ b/pkgs/applications/video/kazam/default.nix
@@ -5,6 +5,7 @@
 python3Packages.buildPythonPackage rec {
   name = "kazam-${version}";
   version = "1.4.3";
+  namePrefix = "";
 
   src = fetchurl {
     url = "https://launchpad.net/kazam/stable/${version}/+download/kazam-${version}.tar.gz";
-- 
GitLab


From ab7a8abd58af2a3be49f34de827ca340b7a87ccb Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 18 Mar 2014 18:43:00 +0100
Subject: [PATCH 2314/3789] python-hetzner: Update to new version 0.7.0.

This introduces the following changes:

 - hetznerctl: Fix UnicodeEncodeError in server product name.
 - Support rebooting of vServers.
 - Server now has a new attribute is_vserver.
 - Add a README.md with examples.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 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 17880714115..ab605199e7f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3212,12 +3212,12 @@ rec {
 
   hetzner = buildPythonPackage rec {
     name = "hetzner-${version}";
-    version = "0.6.0";
+    version = "0.7.0";
 
     src = fetchurl {
       url = "https://github.com/RedMoonStudios/hetzner/archive/"
           + "v${version}.tar.gz";
-      sha256 = "1cgi77f453ahw3ad6hvqwbyp6fwnh90rlzfgl9cp79wg58wyar4w";
+      sha256 = "1ldbhwy6yk18frv6n9znvdsrqfnpch4mfvc70jrpq3f9fw236src";
     };
 
     # not there yet, but coming soon.
-- 
GitLab


From 08095f97ce88962c365781ffa1692aadc03a8de8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Mar 2014 15:13:11 +0100
Subject: [PATCH 2315/3789] Typo

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

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index b749172a3ff..9b3cfc9e7a5 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -131,9 +131,8 @@ if ! mountpoint -q /run; then
     mount -t tmpfs -o "mode=0755,size=@runSize@" none /run
 fi
 
-# Create a ramfs on /run/keys to hold secrets that shouldn't
-# be written to disk (generally used for nixops, harmless
-# elsehwere)
+# Create a ramfs on /run/keys to hold secrets that shouldn't be
+# written to disk (generally used for NixOps, harmless elsewhere).
 if ! mountpoint -q /run/keys; then
     rm -rf /run/keys
     mkdir -m 0750 /run/keys
-- 
GitLab


From 7d8fea797a4a844c6715a4f8a0a70f86df96bf5a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Mar 2014 23:14:34 +0100
Subject: [PATCH 2316/3789] Run hwclock --hctosys to initialize the system time

---
 nixos/modules/system/boot/kernel.nix      | 3 +++
 nixos/modules/system/boot/stage-2-init.sh | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 327f3b7e112..4cfd8a0b618 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -203,6 +203,9 @@ in
 
         # To wait for SCSI devices to appear.
         "scsi_wait_scan"
+
+        # Needed by the stage 2 init script.
+        "rtc_cmos"
       ];
 
     boot.initrd.kernelModules =
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 9b3cfc9e7a5..4a86daf1fe8 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -161,6 +161,12 @@ echo "running activation script..."
 $systemConfig/activate
 
 
+# Restore the system time from the hardware clock.  We do this after
+# running the activation script to be sure that /etc/localtime points
+# at the current time zone.
+hwclock --hctosys
+
+
 # Record the boot configuration.
 ln -sfn "$systemConfig" /run/booted-system
 
-- 
GitLab


From 043bf5a94115b605745de93ec316566f852cb6b3 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 19 Mar 2014 08:38:31 +0100
Subject: [PATCH 2317/3789] mysql service: Shutdown with normal systemd SIGTERM
 instead of mysqladmin

According to the MySQL manual, this is a perfectly legal way of
shutting down the server. The shutdown logs also looks fine:

systemd[1]: Stopping MySQL Server...
mysqld[5114]: 140319  8:36:12 [Note] /nix/store/sc26mz82k97mbpx3d1abzn3rrbd155ws-mariadb-10.0.8/bin/mysqld: Normal shutdown
mysqld[5114]: 140319  8:36:12 [Note] Event Scheduler: Purging the queue. 0 events
mysqld[5114]: 140319  8:36:12 [Note] InnoDB: FTS optimize thread exiting.
mysqld[5114]: 140319  8:36:12 [Note] InnoDB: Starting shutdown...
mysqld[5114]: 140319  8:36:14 [Note] InnoDB: Shutdown completed; log sequence number 1619078
mysqld[5114]: 140319  8:36:14 [Note] /nix/store/sc26mz82k97mbpx3d1abzn3rrbd155ws-mariadb-10.0.8/bin/mysqld: Shutdown complete
systemd[1]: Stopped MySQL Server.
---
 nixos/modules/services/databases/mysql.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 7e42438fe6d..44fb0062f92 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -250,9 +250,6 @@ in
               rm /tmp/mysql_init
             fi
           ''; # */
-
-        serviceConfig.ExecStop =
-          "${mysql}/bin/mysqladmin ${optionalString (cfg.rootPassword != null) "--user=root --password=\"$(cat ${cfg.rootPassword})\""} shutdown";
       };
 
   };
-- 
GitLab


From 94a690a41ad833db38f6ef0c9cf76120e40f6e00 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Wed, 19 Mar 2014 08:46:17 +0100
Subject: [PATCH 2318/3789] Fix compilation of ocaml-facile with OCaml 4.xx

---
 pkgs/development/libraries/facile/default.nix      |  8 +++++---
 pkgs/development/libraries/facile/ocaml_4.xx.patch | 12 ++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/facile/ocaml_4.xx.patch

diff --git a/pkgs/development/libraries/facile/default.nix b/pkgs/development/libraries/facile/default.nix
index edbe99cd8b0..5e3776afbc0 100644
--- a/pkgs/development/libraries/facile/default.nix
+++ b/pkgs/development/libraries/facile/default.nix
@@ -9,9 +9,11 @@ stdenv.mkDerivation rec {
   };
   
   dontAddPrefix = 1;
-        
-  patchPhase = "sed -e 's@mkdir@mkdir -p@' -i Makefile";
-  
+
+  patches = [ ./ocaml_4.xx.patch ];
+
+  postPatch = "sed -e 's@mkdir@mkdir -p@' -i Makefile";
+
   postConfigure = "make -C src .depend";
   
   makeFlags = "FACILEDIR=\${out}/lib/ocaml/facile";
diff --git a/pkgs/development/libraries/facile/ocaml_4.xx.patch b/pkgs/development/libraries/facile/ocaml_4.xx.patch
new file mode 100644
index 00000000000..429405fabda
--- /dev/null
+++ b/pkgs/development/libraries/facile/ocaml_4.xx.patch
@@ -0,0 +1,12 @@
+diff -rupN facile-1.1/src/fcl_data.ml facile-1.1-patched//src/fcl_data.ml
+--- facile-1.1/src/fcl_data.ml	2004-09-08 11:51:02.000000000 +0200
++++ facile-1.1-patched//src/fcl_data.ml	2012-12-16 13:49:36.286722670 +0100
+@@ -16,7 +16,7 @@ end
+ 
+ module Hashtbl = struct
+   type ('a, 'b) t = ('a, 'b) Hashtbl.t
+-  let create = Hashtbl.create
++  let create x = Hashtbl.create x
+   let get h = h
+ 
+   let add h k d =
-- 
GitLab


From 77181be713658f7065058aa1231e32e045cf856a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 19 Mar 2014 05:18:24 -0400
Subject: [PATCH 2319/3789] Set /run/keys ownership based on numerical ids

See comments on 4ab5646417e3cc606281f71027c12ddced8b65b4
---
 nixos/modules/system/boot/stage-2-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 4a86daf1fe8..ee042992b17 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -136,7 +136,7 @@ fi
 if ! mountpoint -q /run/keys; then
     rm -rf /run/keys
     mkdir -m 0750 /run/keys
-    chown root:keys /run/keys
+    chown 0:96 /run/keys
     mount -t ramfs none /run/keys
 fi
 
-- 
GitLab


From 2a50098657c60e422bf0477be2b4f7a6f676f3db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 19 Mar 2014 12:23:02 +0100
Subject: [PATCH 2320/3789] easy-rsa: don't include directory when wrapping

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

diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix
index 99cfb92a18b..bb59bb5b165 100644
--- a/pkgs/tools/networking/easyrsa/default.nix
+++ b/pkgs/tools/networking/easyrsa/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   # Make sane defaults and patch default config vars
   postInstall = ''
-    for prog in $(find "$out/share/easy-rsa" -executable); do
+    for prog in $(find "$out/share/easy-rsa" -executable -type f); do
       makeWrapper "$prog" "$out/bin/$(basename $prog)" \
         --set EASY_RSA "$out/share/easy-rsa" \
         --set OPENSSL "${openssl}/bin/openssl" \
-- 
GitLab


From 5bb0803254cca864710f723f806f01c767107dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 19 Mar 2014 21:10:15 +0100
Subject: [PATCH 2321/3789] fix evaluation (shotwell license)

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

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index fdf50cceafe..2cb86a3f1e6 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -49,8 +49,8 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Popular photo organizer for the GNOME desktop";
     homepage = http://www.yorba.org/projects/shotwell/;
-    license = licenses.lgpl;
+    license = licenses.lgpl21Plus;
     maintainers = with maintainers; [iElectric];
     platforms = platforms.linux;
   };
-}
\ No newline at end of file
+}
-- 
GitLab


From 8a8ae81e40fb18a4c0c7411da9d9062fea13f793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 19 Mar 2014 21:56:48 +0100
Subject: [PATCH 2322/3789] acpid: update from 2.0.21 to 2.0.22

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

diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix
index a0ae59a5a5b..c9d45835cfd 100644
--- a/pkgs/os-specific/linux/acpid/default.nix
+++ b/pkgs/os-specific/linux/acpid/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "acpid-2.0.21";
+  name = "acpid-2.0.22";
 
   src = fetchurl {
     url = "mirror://sourceforge/acpid2/${name}.tar.xz";
-    sha256 = "0vv3zz8p3wxhlp35aqgqvzn6lda595wzn7php3k47jwci1cpxrn4";
+    sha256 = "0cdbcy5xjdcyp2x6hzgpv6a9vg9bbxmypmfvv1qzgj43897la49x";
   };
 
   preBuild = ''
-- 
GitLab


From 47c7e29ffaf3e155760c84cad0d86b3270f11c1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Mar 2014 10:16:11 -0300
Subject: [PATCH 2323/3789] make environment.variables.GIO_EXTRA_MODULES a list

Close #1929.
---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 +-
 nixos/modules/services/x11/desktop-managers/xfce.nix   | 2 +-
 2 files 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 456975015a2..85be61bfc1e 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -43,7 +43,7 @@ in {
         '';
       };
 
-    environment.variables.GIO_EXTRA_MODULES = "${gnome3.dconf}/lib/gio/modules";
+    environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules" ];
     environment.systemPackages =
       [ gnome3.evince
         gnome3.eog
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 3c67571ffd5..9ce7744b065 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -81,7 +81,7 @@ in
     environment.pathsToLink =
       [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ];
 
-    environment.variables.GIO_EXTRA_MODULES = "${pkgs.xfce.gvfs}/lib/gio/modules";
+    environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ];
 
     # Enable helpful DBus services.
     services.udisks2.enable = true;
-- 
GitLab


From 608f436da3c6d526af8fce92bc6898e99beb319e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 19 Mar 2014 21:03:19 -0400
Subject: [PATCH 2324/3789] Add ngircd IRC server

---
 pkgs/servers/irc/ngircd/default.nix | 29 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/servers/irc/ngircd/default.nix

diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix
new file mode 100644
index 00000000000..738881e2aaf
--- /dev/null
+++ b/pkgs/servers/irc/ngircd/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, zlib, openssl, pam, libiconvOrNull }:
+
+stdenv.mkDerivation rec {
+  name = "ngircd-21";
+
+  src = fetchurl {
+    url = "http://ngircd.barton.de/pub/ngircd/${name}.tar.xz";
+    sha256 = "19llx54zy6hc8k7kcs1f234qc20mqpnlnb30c663c42jxq5x6xii";
+  };
+
+  configureFlags = [
+    "--with-syslog"
+    "--with-zlib"
+    "--with-pam"
+    "--with-openssl"
+    "--enable-ipv6"
+    "--with-iconv"
+  ];
+
+  buildInputs = [ zlib pam openssl libiconvOrNull ];
+
+  meta = {
+    description = "Next Generation IRC Daemon";
+    homepage    = http://ngircd.barton.de;
+    license     = stdenv.lib.licenses.gpl2;
+    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 fb93570e784..020d4e1e915 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6335,6 +6335,8 @@ let
 
   nginx = callPackage ../servers/http/nginx { };
 
+  ngircd = callPackage ../servers/irc/ngircd { };
+
   opensmtpd = callPackage ../servers/mail/opensmtpd { };
 
   petidomo = callPackage ../servers/mail/petidomo { };
-- 
GitLab


From 78e6d0143dd672d8d1645c648da058461572e3e1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 19 Mar 2014 22:04:35 -0400
Subject: [PATCH 2325/3789] Add ngircd module

---
 nixos/modules/misc/ids.nix                   |  1 +
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/networking/ngircd.nix | 58 ++++++++++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 nixos/modules/services/networking/ngircd.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 970b9caa2f9..07ec5c8c2c4 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -120,6 +120,7 @@
       jenkins = 109;
       systemd-journal-gateway = 110;
       notbit = 111;
+      ngircd = 112;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1c2fca1f88b..706f3da60b3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -180,6 +180,7 @@
   ./services/networking/minidlna.nix
   ./services/networking/nat.nix
   ./services/networking/networkmanager.nix
+  ./services/networking/ngircd.nix
   ./services/networking/notbit.nix
   ./services/networking/ntopng.nix
   ./services/networking/ntpd.nix
diff --git a/nixos/modules/services/networking/ngircd.nix b/nixos/modules/services/networking/ngircd.nix
new file mode 100644
index 00000000000..49e5f355980
--- /dev/null
+++ b/nixos/modules/services/networking/ngircd.nix
@@ -0,0 +1,58 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.ngircd;
+
+  configFile = pkgs.stdenv.mkDerivation {
+    name = "ngircd.conf";
+
+    text = cfg.config;
+
+    preferLocalBuild = true;
+
+    buildCommand = ''
+      echo -n "$text" > $out
+      ${cfg.package}/sbin/ngircd --config $out --configtest
+    '';
+  };
+in {
+  options = {
+    services.ngircd = {
+      enable = mkEnableOption "the ngircd IRC server";
+
+      config = mkOption {
+        description = "The ngircd configuration (see ngircd.conf(5)).";
+
+        type = types.lines;
+      };
+
+      package = mkOption {
+        description = "The ngircd package.";
+
+        type = types.package;
+
+        default = pkgs.ngircd;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    #!!! TODO: Use ExecReload (see https://github.com/NixOS/nixpkgs/issues/1988)
+    systemd.services.ngircd = {
+      description = "The ngircd IRC server";
+
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig.ExecStart = "${cfg.package}/sbin/ngircd --config ${configFile} --nodaemon";
+
+      serviceConfig.User = "ngircd";
+    };
+
+    users.extraUsers.ngircd = {
+      uid = config.ids.uids.ngircd;
+      description = "ngircd user.";
+    };
+  };
+}
-- 
GitLab


From dbaa07b8ef6cae1b726bc3bdbb9cfaca5116a2c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 20 Mar 2014 10:46:15 +0100
Subject: [PATCH 2326/3789] Updating GNU readline to 6.3.

I remove all 6.2 patches manually, but I keep the logic to add later patches.
---
 .../libraries/readline/readline-6.2-patches.nix          | 9 ---------
 .../libraries/readline/readline-6.3-patches.nix          | 4 ++++
 pkgs/development/libraries/readline/readline6.nix        | 8 ++++----
 3 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 pkgs/development/libraries/readline/readline-6.2-patches.nix
 create mode 100644 pkgs/development/libraries/readline/readline-6.3-patches.nix

diff --git a/pkgs/development/libraries/readline/readline-6.2-patches.nix b/pkgs/development/libraries/readline/readline-6.2-patches.nix
deleted file mode 100644
index 9fdcb3743b7..00000000000
--- a/pkgs/development/libraries/readline/readline-6.2-patches.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-# Automatically generated by `update-patch-set.sh'; do not edit.
-
-patch: [
-(patch "001" "1qxl74f4n0hv4a807byrgbk4ixd8m50apj3922q2ss9pfi0nra1q")
-(patch "002" "1m670g2xzib6r81315q9r24nh9brmxkpq07acch1fwxmih94jqqy")
-(patch "003" "0x13c9wir4r44v2vdg96y0ahn8kl3wcmb5y0xn15yvid6pzk28fb")
-(patch "004" "0xjlkxfssfsd6jwbqhfjs4hybcps0b9zgz8v86vbhnzag4j39g89")
-(patch "005" "1x61bjl3wgs1gwla9b3y1hh12m1j5qlbis22258mljjl9mg900pg")
-]
diff --git a/pkgs/development/libraries/readline/readline-6.3-patches.nix b/pkgs/development/libraries/readline/readline-6.3-patches.nix
new file mode 100644
index 00000000000..b8019fb3350
--- /dev/null
+++ b/pkgs/development/libraries/readline/readline-6.3-patches.nix
@@ -0,0 +1,4 @@
+# Automatically generated by `update-patch-set.sh'; do not edit.
+
+patch: [
+]
diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix
index 0826e6c5f7c..463d6fba4b2 100644
--- a/pkgs/development/libraries/readline/readline6.nix
+++ b/pkgs/development/libraries/readline/readline6.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, ncurses }:
 
 stdenv.mkDerivation (rec {
-  name = "readline-6.2";
+  name = "readline-6.3";
 
   src = fetchurl {
     url = "mirror://gnu/readline/${name}.tar.gz";
-    sha256 = "10ckm2bd2rkxhvdmj7nmbsylmihw0abwcsnxf8y27305183rd9kr";
+    sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn";
   };
 
   propagatedBuildInputs = [ncurses];
@@ -17,11 +17,11 @@ stdenv.mkDerivation (rec {
     (let
        patch = nr: sha256:
          fetchurl {
-           url = "mirror://gnu/readline/${name}-patches/readline62-${nr}";
+           url = "mirror://gnu/readline/${name}-patches/readline63-${nr}";
            inherit sha256;
          };
      in
-       import ./readline-6.2-patches.nix patch);
+       import ./readline-6.3-patches.nix patch);
 
   meta = {
     description = "GNU Readline, a library for interactive line editing";
-- 
GitLab


From d4bf329dde908cb64b8840e12ba5418599b6c933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 20 Mar 2014 10:47:00 +0100
Subject: [PATCH 2327/3789] Updating gdb to 7.7.

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

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 0d3eb5c824f..b3facd1203b 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -8,7 +8,7 @@
 
 let
 
-  basename = "gdb-7.6.2";
+  basename = "gdb-7.7";
 
   # Whether (cross-)building for GNU/Hurd.  This is an approximation since
   # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}.tar.bz2";
-    sha256 = "1s6hjqmq7xz10hqx45dgrpfh5mla578shn3zxgnrsv66w4n0wsig";
+    sha256 = "08vcb97j1b7vxwq6088wb6s3g3bm8iwikd922y0xsgbbxv3d2104";
   };
 
   # I think python is not a native input, but I leave it
-- 
GitLab


From ae3a1519e4dd94155b80660a899c63f310b5996e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 20 Mar 2014 11:09:39 +0100
Subject: [PATCH 2328/3789] gdb: adding a patch to handle well the edit cmd +
 SIGWINCH.

It's reported to upstream since two years ago, through
their patches mailing list.
---
 pkgs/development/tools/misc/gdb/default.nix   |  2 ++
 .../tools/misc/gdb/edit-signals.patch         | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/tools/misc/gdb/edit-signals.patch

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index b3facd1203b..b3a86a03d97 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
     sha256 = "08vcb97j1b7vxwq6088wb6s3g3bm8iwikd922y0xsgbbxv3d2104";
   };
 
+  patches = [ ./edit-signals.patch ];
+
   # I think python is not a native input, but I leave it
   # here while I will not need it cross building
   nativeBuildInputs = [ texinfo python ]
diff --git a/pkgs/development/tools/misc/gdb/edit-signals.patch b/pkgs/development/tools/misc/gdb/edit-signals.patch
new file mode 100644
index 00000000000..e9da8035ef5
--- /dev/null
+++ b/pkgs/development/tools/misc/gdb/edit-signals.patch
@@ -0,0 +1,25 @@
+Patch adapted from
+https://www.sourceware.org/ml/gdb-patches/2012-08/msg00439.html
+
+Without it, spawning a terminal 'vim' from gdb 'edit' cmd, makes
+all gdb grazy.
+
+diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
+index 7ea0fec..be5455c 100644
+--- a/gdb/tui/tui-win.c
++++ b/gdb/tui/tui-win.c
+@@ -831,11 +831,12 @@ void
+ tui_initialize_win (void)
+ {
+ #ifdef SIGWINCH
+-#ifdef HAVE_SIGACTION
++#if defined (HAVE_SIGACTION) && defined (SA_RESTART)
+   struct sigaction old_winch;
+ 
+-  memset (&old_winch, 0, sizeof (old_winch));
++  sigemptyset (&old_winch.sa_mask);
+   old_winch.sa_handler = &tui_sigwinch_handler;
++  old_winch.sa_flags = SA_RESTART;
+   sigaction (SIGWINCH, &old_winch, NULL);
+ #else
+   signal (SIGWINCH, &tui_sigwinch_handler);
-- 
GitLab


From 31fb83444f998145670beb917143109a58959ee5 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 20 Mar 2014 12:22:38 +0100
Subject: [PATCH 2329/3789] python-suds: Add new package

---
 pkgs/top-level/python-packages-generated.nix | 22 ++++++++++++++++++++
 pkgs/top-level/python-packages.json          |  3 +++
 2 files changed, 25 insertions(+)

diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
index 29a9bc91a1e..193928513cb 100644
--- a/pkgs/top-level/python-packages-generated.nix
+++ b/pkgs/top-level/python-packages-generated.nix
@@ -5370,5 +5370,27 @@ in
     };
   };
 
+
+  "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 b5b7afab85b..b8ddcee3a47 100644
--- a/pkgs/top-level/python-packages.json
+++ b/pkgs/top-level/python-packages.json
@@ -137,5 +137,8 @@
   },
   { "name": "xlrd",
     "doCheck": false
+  },
+  { "name": "suds",
+    "doCheck": false
   }
 ]
-- 
GitLab


From 76f7ea6e396c6e9584a6a911ded4807183d68d7a Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 20 Mar 2014 13:29:06 +0200
Subject: [PATCH 2330/3789] add repositories.git to several packages

---
 pkgs/applications/networking/irc/konversation/default.nix | 1 +
 pkgs/tools/security/tor/default.nix                       | 6 ++----
 pkgs/tools/security/vidalia/default.nix                   | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index d3009115b17..7554ad7d1a8 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Integrated IRC client for KDE";
+    repositories.git = git://anongit.kde.org/konversation;
     license = "GPL";
     inherit (kdelibs.meta) maintainers platforms;
   };
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index e8c27c5f2b1..dd4d797825f 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.torproject.org/;
+    repositories.git = https://git.torproject.org/git/tor;
     description = "Tor, an anonymous network router to improve privacy on the Internet";
 
     longDescription=''
@@ -30,10 +31,7 @@ stdenv.mkDerivation rec {
 
     license="mBSD";
 
-    maintainers =
-      [ # Russell O’Connor <roconnor@theorem.ca> ?
-        stdenv.lib.maintainers.ludo
-      ];
+    maintainers = with stdenv.lib.maintainers; [ phreedom ludo ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix
index 6ce09499780..f221a1b89e6 100644
--- a/pkgs/tools/security/vidalia/default.nix
+++ b/pkgs/tools/security/vidalia/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://www.torproject.org/projects/vidalia.html.en;
+    repositories.git = git://git.torproject.org/vidalia;
     description = "a cross-platform graphical controller for the Tor software, built using the Qt framework";
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.phreedom ];
-- 
GitLab


From 06097489a6a6f1310300350b0260730fbeae332a Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 20 Mar 2014 13:29:52 +0200
Subject: [PATCH 2331/3789] youtubeDL: update from 2014.03.12 to 2014.03.18.1

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 3edce28151e..986e0f449d2 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.03.12";
+  version = "2014.03.18.1";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1fap7mx2bmfr1jv7v5n2khl72mbasnzlasqd8gi654cl9xp12p5x";
+    sha256 = "0yyyvwa5av4ay8kxxlsav49mp2dcxflz6w0as0nklyg6k5zb5pn1";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From d9f9bb1ab25eaf32a9d840755ffce3e97f14d996 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Mar 2014 12:37:25 +0100
Subject: [PATCH 2332/3789] openssh: Update to 6.6p1

CVE-2014-2532

Note that this CVE only affects people who use AcceptEnv with
wildcards.
---
 pkgs/tools/networking/openssh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 0b68ec83b52..b0d1dba891b 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -18,11 +18,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "openssh-6.5p1";
+  name = "openssh-6.6p1";
 
   src = fetchurl {
     url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "09wh7mi65aahyxd2xvq1makckhd5laid8c0pb8njaidrbpamw6d1";
+    sha256 = "1fq3w86q05y5nn6z878wm312k0svaprw8k007188fd259dkg1ha8";
   };
 
   prePatch = stdenv.lib.optionalString hpnSupport
-- 
GitLab


From b9163ab3328b9b7104a0b4870970eee022fecb37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 20 Mar 2014 12:53:20 +0100
Subject: [PATCH 2333/3789] Revert "Updating GNU readline to 6.3."

This reverts commit dbaa07b8ef6cae1b726bc3bdbb9cfaca5116a2c3.

vcunat reported on IRC that the update breaks python and parted at least.
http://hydra.nixos.org/build/9661091/nixlog/1/tail-reload
---
 .../libraries/readline/readline-6.2-patches.nix          | 9 +++++++++
 .../libraries/readline/readline-6.3-patches.nix          | 4 ----
 pkgs/development/libraries/readline/readline6.nix        | 8 ++++----
 3 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/libraries/readline/readline-6.2-patches.nix
 delete mode 100644 pkgs/development/libraries/readline/readline-6.3-patches.nix

diff --git a/pkgs/development/libraries/readline/readline-6.2-patches.nix b/pkgs/development/libraries/readline/readline-6.2-patches.nix
new file mode 100644
index 00000000000..9fdcb3743b7
--- /dev/null
+++ b/pkgs/development/libraries/readline/readline-6.2-patches.nix
@@ -0,0 +1,9 @@
+# Automatically generated by `update-patch-set.sh'; do not edit.
+
+patch: [
+(patch "001" "1qxl74f4n0hv4a807byrgbk4ixd8m50apj3922q2ss9pfi0nra1q")
+(patch "002" "1m670g2xzib6r81315q9r24nh9brmxkpq07acch1fwxmih94jqqy")
+(patch "003" "0x13c9wir4r44v2vdg96y0ahn8kl3wcmb5y0xn15yvid6pzk28fb")
+(patch "004" "0xjlkxfssfsd6jwbqhfjs4hybcps0b9zgz8v86vbhnzag4j39g89")
+(patch "005" "1x61bjl3wgs1gwla9b3y1hh12m1j5qlbis22258mljjl9mg900pg")
+]
diff --git a/pkgs/development/libraries/readline/readline-6.3-patches.nix b/pkgs/development/libraries/readline/readline-6.3-patches.nix
deleted file mode 100644
index b8019fb3350..00000000000
--- a/pkgs/development/libraries/readline/readline-6.3-patches.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-# Automatically generated by `update-patch-set.sh'; do not edit.
-
-patch: [
-]
diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix
index 463d6fba4b2..0826e6c5f7c 100644
--- a/pkgs/development/libraries/readline/readline6.nix
+++ b/pkgs/development/libraries/readline/readline6.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, ncurses }:
 
 stdenv.mkDerivation (rec {
-  name = "readline-6.3";
+  name = "readline-6.2";
 
   src = fetchurl {
     url = "mirror://gnu/readline/${name}.tar.gz";
-    sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn";
+    sha256 = "10ckm2bd2rkxhvdmj7nmbsylmihw0abwcsnxf8y27305183rd9kr";
   };
 
   propagatedBuildInputs = [ncurses];
@@ -17,11 +17,11 @@ stdenv.mkDerivation (rec {
     (let
        patch = nr: sha256:
          fetchurl {
-           url = "mirror://gnu/readline/${name}-patches/readline63-${nr}";
+           url = "mirror://gnu/readline/${name}-patches/readline62-${nr}";
            inherit sha256;
          };
      in
-       import ./readline-6.3-patches.nix patch);
+       import ./readline-6.2-patches.nix patch);
 
   meta = {
     description = "GNU Readline, a library for interactive line editing";
-- 
GitLab


From a4c412947779d915039efc3db09bf4dfe64b4ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 20 Mar 2014 13:00:46 +0100
Subject: [PATCH 2334/3789] Adding GNU readline 6.3 apart

I set bashInteractive to use it, as it has many relevant fixes.
---
 .../libraries/readline/readline6.3.nix        | 49 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +-
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/readline/readline6.3.nix

diff --git a/pkgs/development/libraries/readline/readline6.3.nix b/pkgs/development/libraries/readline/readline6.3.nix
new file mode 100644
index 00000000000..2f99b9d7218
--- /dev/null
+++ b/pkgs/development/libraries/readline/readline6.3.nix
@@ -0,0 +1,49 @@
+{ fetchurl, stdenv, ncurses }:
+
+stdenv.mkDerivation (rec {
+  name = "readline-6.3";
+
+  src = fetchurl {
+    url = "mirror://gnu/readline/${name}.tar.gz";
+    sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn";
+  };
+
+  propagatedBuildInputs = [ncurses];
+
+  patchFlags = "-p0";
+
+  patches =
+    [ ./link-against-ncurses.patch ];
+
+  meta = {
+    description = "GNU Readline, a library for interactive line editing";
+
+    longDescription = ''
+      The GNU Readline library provides a set of functions for use by
+      applications that allow users to edit command lines as they are
+      typed in.  Both Emacs and vi editing modes are available.  The
+      Readline library includes additional functions to maintain a
+      list of previously-entered command lines, to recall and perhaps
+      reedit those lines, and perform csh-like history expansion on
+      previous commands.
+
+      The history facilites are also placed into a separate library,
+      the History library, as part of the build process.  The History
+      library may be used without Readline in applications which
+      desire its capabilities.
+    '';
+
+    homepage = http://savannah.gnu.org/projects/readline/;
+
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}
+
+//
+
+# Don't run the native `strip' when cross-compiling.
+(if (stdenv ? cross)
+ then { dontStrip = true; }
+ else { }))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 020d4e1e915..392ad1b290b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2323,6 +2323,7 @@ let
 
   bashInteractive = appendToName "interactive" (callPackage ../shells/bash {
     interactive = true;
+    readline = readline63; # Includes many vi mode fixes
   });
 
   bashCompletion = callPackage ../shells/bash-completion { };
@@ -5574,7 +5575,7 @@ let
 
   raul = callPackage ../development/libraries/audio/raul { };
 
-  readline = readline6;
+  readline = readline6; # 6.2 works, 6.3 breaks python, parted
 
   readline4 = callPackage ../development/libraries/readline/readline4.nix { };
 
@@ -5589,6 +5590,8 @@ let
       else stdenv;
   };
 
+  readline63 = callPackage ../development/libraries/readline/readline6.3.nix { };
+
   librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
 
   librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { };
-- 
GitLab


From 42b070527ce2f35c146116ebaaf109e9b63abea2 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Thu, 20 Mar 2014 14:50:54 +0100
Subject: [PATCH 2335/3789] Update ocamlnet to version 3.7.3

Also remove dependency to lablgkt which is not used and prevent
building on darwin.
---
 pkgs/development/ocaml-modules/ocamlnet/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index c1960d4706e..f1bf39a283d 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -1,20 +1,20 @@
-{stdenv, fetchurl, ncurses, ocaml, findlib, ocaml_pcre, camlzip, openssl, ocaml_ssl, lablgtk, cryptokit }:
+{stdenv, fetchurl, ncurses, ocaml, findlib, ocaml_pcre, camlzip, openssl, ocaml_ssl, cryptokit }:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
 in
 
 stdenv.mkDerivation {
-  name = "ocamlnet-3.6.3";
+  name = "ocamlnet-3.7.3";
 
   src = fetchurl {
-    url = http://download.camlcity.org/download/ocamlnet-3.6.3.tar.gz;
-    sha256 = "c62fe0a4db6c63c04e24c8d76bcb504054f0b59a7a41c1abcbb8dd504afc9f29";
+    url = http://download.camlcity.org/download/ocamlnet-3.7.3.tar.gz;
+    sha256 = "0s24icyrxkqqai91rgxpf52s1fx70j7p12c8vq9vcmvdhll6kp2d";
   };
 
-  buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl lablgtk cryptokit];
+  buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl cryptokit];
 
-  propagatedbuildInputs = [ncurses ocaml_pcre camlzip openssl ocaml_ssl lablgtk cryptokit];
+  propagatedbuildInputs = [ncurses ocaml_pcre camlzip openssl ocaml_ssl cryptokit];
 
   patches = [ ./configure.patch ];
 
-- 
GitLab


From 1bb8d12d2f0d04725a3518518edfa15ef416da28 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Thu, 20 Mar 2014 14:36:34 +0000
Subject: [PATCH 2336/3789] haskellPackages.dbmigrations: Jailbreak now HDBC
 has been updated

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

diff --git a/pkgs/development/libraries/haskell/dbmigrations/default.nix b/pkgs/development/libraries/haskell/dbmigrations/default.nix
index 10b3737d88a..78c5d82f0fd 100644
--- a/pkgs/development/libraries/haskell/dbmigrations/default.nix
+++ b/pkgs/development/libraries/haskell/dbmigrations/default.nix
@@ -18,4 +18,5 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
+  jailbreak = true;
 })
-- 
GitLab


From 4e385c272c3b438e998fbfc8f3bb8486d1bfc773 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Thu, 20 Mar 2014 15:44:25 +0100
Subject: [PATCH 2337/3789] git: Update to 1.9.1

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

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index c14eb36acf9..9be32b9accd 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.0";
+  version = "1.9.1";
 
   svn = subversionClient.override { perlBindings = true; };
 
@@ -20,8 +20,8 @@ stdenv.mkDerivation {
   name = "git-${version}";
 
   src = fetchurl {
-    url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "10lq71vrg1zbqm923wb0p36ily6y5x057f2bryk4wqkdqgyrfc6y";
+    url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
+    sha256 = "0yx7qf9hqgfvrliqvk775pw3zh982nx5r16iw7n997q4ik7gnqpr";
   };
 
   patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
-- 
GitLab


From 29dae7ef337ba26ab408614557d021bd44deb8b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 20 Mar 2014 16:11:43 +0100
Subject: [PATCH 2338/3789] Trying to fix GNU readline 6.3 build on Darwin

I copied the stdenv override used for readline 6.2.

Peter Simons notified me of the failure:
http://hydra.nixos.org/build/9672338
---
 pkgs/top-level/all-packages.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 392ad1b290b..da5ff3e095f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5590,7 +5590,14 @@ let
       else stdenv;
   };
 
-  readline63 = callPackage ../development/libraries/readline/readline6.3.nix { };
+  readline63 = callPackage ../development/libraries/readline/readline6.3.nix {
+    stdenv =
+      # On Darwin, Readline uses `-arch_only', which is specific to
+      # Apple-GCC.  So give it what it expects.
+      if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
 
   librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
 
-- 
GitLab


From bb09cfc2fc17dc2c90c089c50ee413883cce21a8 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Thu, 20 Mar 2014 15:14:05 +0000
Subject: [PATCH 2339/3789] haskellPackages.timezoneOlson: Update to 0.1.4

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

diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix
index 4cce59f6165..6a0e81383f7 100644
--- a/pkgs/development/libraries/haskell/timezone-olson/default.nix
+++ b/pkgs/development/libraries/haskell/timezone-olson/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "timezone-olson";
-  version = "0.1.3";
-  sha256 = "02x3wq03h2zjhxrcv6vnq9hrzggdvpnj7zj8rcrq4scf67q6h8gc";
+  version = "0.1.4";
+  sha256 = "1l5j6gqi9vlx7sifn7vv3by4z9ha3h6klfds4ywqv3dv0gh5725k";
   buildDepends = [ binary extensibleExceptions time timezoneSeries ];
   meta = {
     homepage = "http://projects.haskell.org/time-ng/";
-- 
GitLab


From 042f85cdd0586da8b7649f48389e6ac607c8b416 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 18:07:15 +0100
Subject: [PATCH 2340/3789] nbd: update to version 3.8

---
 pkgs/tools/networking/nbd/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index 54f6689582d..b2943eb2ace 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,14 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
-let
-  name = "nbd-3.7";
-in
-stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "nbd-3.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.xz";
-    sha256 = "1k4bvg5rg4q6b58y4kd9qwj07sznsfbknlpc6y1bk6c48rgr3d0b";
+    sha256 = "1qnkzrnc9m4n814ciqh95q9j8l7d6yd7sn36q8yn0dmi1rvj78j8";
   };
 
   buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders;
-- 
GitLab


From 6e415d2b58f9821d79c75fce29796da06c723c46 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 21 Feb 2014 13:05:12 -0600
Subject: [PATCH 2341/3789] nixos: add BitTorrent Sync service module

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

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 07ec5c8c2c4..fc05584e256 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -121,6 +121,7 @@
       systemd-journal-gateway = 110;
       notbit = 111;
       ngircd = 112;
+      btsync = 113;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 706f3da60b3..e59b0ff5ac2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -155,6 +155,7 @@
   ./services/networking/avahi-daemon.nix
   ./services/networking/bind.nix
   ./services/networking/bitlbee.nix
+  ./services/networking/btsync.nix
   ./services/networking/connman.nix
   ./services/networking/cntlm.nix
   ./services/networking/chrony.nix
diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix
new file mode 100644
index 00000000000..e7fb471ccf4
--- /dev/null
+++ b/nixos/modules/services/networking/btsync.nix
@@ -0,0 +1,280 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.btsync;
+  listenAddr = cfg.httpListenAddr + ":" + (toString cfg.httpListenPort);
+
+  boolStr = x: if x then "true" else "false";
+  optionalEmptyStr = b: v: optionalString (b != "") v;
+
+  webUIConfig = optionalString cfg.enableWebUI
+    ''
+      "webui":
+      {
+        ${optionalEmptyStr cfg.httpLogin "\"login\":    \"${cfg.httpLogin}\","}
+        ${optionalEmptyStr cfg.httpPass  "\"password\": \"${cfg.httpPass}\","}
+        ${optionalEmptyStr cfg.apiKey    "\"api_key\":  \"${cfg.apiKey}\","}
+        "listen": "${listenAddr}"
+      }
+    '';
+
+  knownHosts = e:
+    optionalString (e ? "knownHosts")
+      (concatStringsSep "," (map (v: "\"${v}\"") e."knownHosts"));
+
+  sharedFoldersRecord = with pkgs.lib;
+    concatStringsSep "," (map (entry:
+      let helper = attr: v:
+        if (entry ? attr) then boolStr entry.attr else boolStr v;
+      in
+      ''
+        {
+          "secret": "${entry.secret}",
+          "dir":    "${entry.directory}",
+
+          "use_relay_server": ${helper "useRelayServer" true},
+          "use_tracker":      ${helper "useTracker"     true},
+          "use_dht":          ${helper "useDHT"        false},
+
+          "search_lan":       ${helper "searchLAN"      true},
+          "use_sync_trash":   ${helper "useSyncTrash"   true},
+
+          "known_hosts": [${knownHosts entry}]
+        }
+      '') cfg.sharedFolders);
+
+  sharedFoldersConfig = optionalString (cfg.sharedFolders != [])
+    ''
+      "shared_folders":
+        [
+        ${sharedFoldersRecord}
+        ]
+    '';
+
+  configFile = pkgs.writeText "btsync.config"
+    ''
+      {
+        "device_name":     "${cfg.deviceName}",
+        "storage_path":    "/var/lib/btsync",
+        "listening_port":  ${toString cfg.listeningPort},
+        "use_gui":         false,
+
+        "check_for_updates": ${boolStr cfg.checkForUpdates},
+        "use_upnp":          ${boolStr cfg.useUpnp},
+        "download_limit":    ${toString cfg.downloadLimit},
+        "upload_limit":      ${toString cfg.uploadLimit},
+        "lan_encrypt_data":  ${boolStr cfg.encryptLAN},
+
+        ${webUIConfig}
+        ${sharedFoldersConfig}
+      }
+    '';
+in
+{
+  options = {
+    services.btsync = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If enabled, start the Bittorrent Sync daemon. Once enabled,
+          you can interact with the service through the Web UI, or
+          configure it in your NixOS configuration. Enabling the
+          <literal>btsync</literal> service also installs a
+          multi-instance systemd unit which can be used to start
+          user-specific copies of the daemon. Once installed, you can
+          use <literal>systemctl start btsync@user</literal> to start
+          the daemon only for user <literal>user</literal>, using the
+          configuration file located at
+          <literal>$HOME/.config/btsync.conf</literal>
+        '';
+      };
+
+      deviceName = mkOption {
+        type = types.str;
+        example = "Voltron";
+        description = ''
+          Name of the Bittorrent Sync device.
+        '';
+      };
+
+      listeningPort = mkOption {
+        type = types.int;
+        default = 0;
+        example = 44444;
+        description = ''
+          Listening port. Defaults to 0 which randomizes the port.
+        '';
+      };
+
+      checkForUpdates = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Determines whether to check for updates and alert the user
+          about them in the UI.
+        '';
+      };
+
+      useUpnp = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Use Universal Plug-n-Play (UPnP)
+        '';
+      };
+
+      downloadLimit = mkOption {
+        type = types.int;
+        default = 0;
+        example = 1024;
+        description = ''
+          Download speed limit. 0 is unlimited (default).
+        '';
+      };
+
+      uploadLimit = mkOption {
+        type = types.int;
+        default = 0;
+        example = 1024;
+        description = ''
+          Upload speed limit. 0 is unlimited (default).
+        '';
+      };
+
+      httpListenAddr = mkOption {
+        type = types.str;
+        default = "0.0.0.0";
+        example = "1.2.3.4";
+        description = ''
+          HTTP address to bind to.
+        '';
+      };
+
+      httpListenPort = mkOption {
+        type = types.int;
+        default = 9000;
+        description = ''
+          HTTP port to bind on.
+        '';
+      };
+
+      httpLogin = mkOption {
+        type = types.str;
+        example = "allyourbase";
+        description = ''
+          HTTP web login username.
+        '';
+      };
+
+      httpPass = mkOption {
+        type = types.str;
+        example = "arebelongtous";
+        description = ''
+          HTTP web login password.
+        '';
+      };
+
+      encryptLAN = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Encrypt LAN data.";
+      };
+
+      enableWebUI = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable Web UI for administration. Bound to the specified
+          <literal>httpListenAddress</literal> and
+          <literal>httpListenPort</literal>.
+          '';
+      };
+
+      apiKey = mkOption {
+        type = types.str;
+        default = "";
+        description = "API key, which enables the developer API.";
+      };
+
+      sharedFolders = mkOption {
+        default = [];
+        example =
+          [ { secret         = "AHMYFPCQAHBM7LQPFXQ7WV6Y42IGUXJ5Y";
+              directory      = "/home/user/sync_test";
+              useRelayServer = true;
+              useTracker     = true;
+              useDHT         = false;
+              searchLAN      = true;
+              useSyncTrash   = true;
+              knownHosts     =
+                [ "192.168.1.2:4444"
+                  "192.168.1.3:4444"
+                ];
+            }
+          ];
+        description = ''
+          Shared folder list. If enabled, web UI must be
+          disabled. Secrets can be generated using <literal>btsync
+          --generate-secret</literal>. Note that this secret will be
+          put inside the Nix store, so it is realistically not very
+          secret.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions =
+      [ { assertion = cfg.deviceName != "";
+          message   = "Device name cannot be empty.";
+        }
+        { assertion = cfg.enableWebUI -> cfg.sharedFolders == [];
+          message   = "If using shared folders, the web UI cannot be enabled.";
+        }
+        { 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 = {
+      description     = "Bittorrent Sync Service user";
+      home            = "/var/lib/btsync";
+      createHome      = true;
+      uid             = config.ids.uids.btsync;
+    };
+
+    systemd.services.btsync = with pkgs; {
+      description = "Bittorrent Sync Service";
+      wantedBy    = [ "multi-user.target" ];
+      after       = [ "network.target" ];
+      serviceConfig = {
+        Restart   = "on-abort";
+        User      = "btsync";
+        ExecStart =
+          "${bittorrentSync}/bin/btsync --nodaemon --config ${configFile}";
+      };
+    };
+
+    systemd.services."btsync@" = with pkgs; {
+      description = "Bittorrent Sync Service for %i";
+      after       = [ "network.target" ];
+      serviceConfig = {
+        Restart   = "on-abort";
+        User      = "%i";
+        ExecStart =
+          "${bittorrentSync}/bin/btsync --nodaemon --config %h/.config/btsync.conf";
+      };
+    };
+
+    environment.systemPackages = [ pkgs.bittorrentSync ];
+  };
+}
-- 
GitLab


From 0c3bb487c3d64fe445865dbcad2fced0d8dd8c09 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 20 Mar 2014 13:18:51 -0500
Subject: [PATCH 2342/3789] ssdeep: version 2.10

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/ssdeep/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/security/ssdeep/default.nix

diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix
new file mode 100644
index 00000000000..66fdedc4906
--- /dev/null
+++ b/pkgs/tools/security/ssdeep/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name    = "ssdeep-${version}";
+  version = "2.10";
+
+  src = fetchurl {
+    url    = "mirror://sourceforge/ssdeep/${name}.tar.gz";
+    sha256 = "1p7dgchq8hgadnxz5qh95ay17k5j74l4qyd15wspc54lb603p2av";
+  };
+
+  postFixup = ''
+    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/ssdeep):$out/lib" $out/bin/ssdeep
+  '';
+
+  meta = {
+    description = "A program for calculating fuzzy hashes";
+    homepage    = "http://www.ssdeep.sf.net";
+    license     = stdenv.lib.licenses.gpl2;
+    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 da5ff3e095f..36ab6ac3abd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1953,6 +1953,8 @@ let
 
   super = callPackage ../tools/security/super { };
 
+  ssdeep = callPackage ../tools/security/ssdeep { };
+
   ssmtp = callPackage ../tools/networking/ssmtp {
     tlsSupport = true;
   };
-- 
GitLab


From d5799cd64fc593f4fba84902b9f49a03c4b54bad Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 20 Mar 2014 13:38:02 -0500
Subject: [PATCH 2343/3789] scrypt: adopt package

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/scrypt/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix
index ca2c9f43dfc..fe2a19491d9 100644
--- a/pkgs/tools/security/scrypt/default.nix
+++ b/pkgs/tools/security/scrypt/default.nix
@@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The scrypt encryption utility";
-    homepage = https://www.tarsnap.com/scrypt.html;
-    license = "BSD";
-    platforms = stdenv.lib.platforms.all;
+    homepage    = https://www.tarsnap.com/scrypt.html;
+    license     = stdenv.lib.licenses.bsd2;
+    platforms   = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }
-- 
GitLab


From 7dcf9f6907f1031ca84d2b772248121207a06727 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 20 Mar 2014 13:41:05 -0500
Subject: [PATCH 2344/3789] criu: only supported on 64-bit

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/criu/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index 30056d8b8e6..4c58fe5a46f 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, protobuf, protobufc, asciidoc, xmlto, utillinux }:
 
+assert stdenv.system == "x86_64-linux";
 stdenv.mkDerivation rec {
   name    = "criu-${version}";
   version = "1.2";
@@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
     description = "userspace checkpoint/restore for Linux";
     homepage    = "http://criu.org";
     license     = stdenv.lib.licenses.gpl2;
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = [ "x86_64-linux" ];
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }
-- 
GitLab


From 76c9e89984e60bccde645c059df6916fd789945d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 20 Mar 2014 13:54:46 -0500
Subject: [PATCH 2345/3789] duo-unix: correctly set openssl directory

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/duo-unix/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix
index a7cd61d7f67..2070150a32e 100644
--- a/pkgs/tools/security/duo-unix/default.nix
+++ b/pkgs/tools/security/duo-unix/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
     [ "--with-pam=$(out)/lib/security"
       "--prefix=$(out)"
       "--sysconfdir=$(out)/etc/duo"
+      "--with-openssl=${openssl}"
     ];
 
   meta = {
-- 
GitLab


From 9bcc48a4b22f20933d045c2ae31ad43460b76762 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 20 Mar 2014 14:01:57 -0500
Subject: [PATCH 2346/3789] criu: attempt to fix doc building on Hydra

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/criu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index 4c58fe5a46f..349d690e4d1 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/etc/logrotate.d
-    make install PREFIX=$out LIBDIR=$out/lib
+    make install PREFIX=$out LIBDIR=$out/lib ASCIIDOC=${asciidoc}/bin/asciidoc XMLTO=${xmlto}/bin/xmlto
   '';
 
   meta = {
-- 
GitLab


From 529fdedf05b0a4b6d063f412ba1a4ca4d6a48275 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 20 Mar 2014 14:05:38 -0500
Subject: [PATCH 2347/3789] duo_unix: disable lib64 directories

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/duo-unix/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix
index 2070150a32e..078e7cc06e0 100644
--- a/pkgs/tools/security/duo-unix/default.nix
+++ b/pkgs/tools/security/duo-unix/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
       "--prefix=$(out)"
       "--sysconfdir=$(out)/etc/duo"
       "--with-openssl=${openssl}"
+      "--enable-lib64=no"
     ];
 
   meta = {
-- 
GitLab


From 44e604a421bc0839e9c3d4e8bc273ef03c1ab0f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 21 Mar 2014 07:02:56 +0100
Subject: [PATCH 2348/3789] gnutls: minor update to fix API+ABI breakage

http://article.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/7343
http://osdir.com/ml/gnutls-devel-gnu/2014-03/msg00007.html

Guile tests work fine again, but I guess we still don't need
guile bindings by default.
---
 pkgs/development/libraries/gnutls/3.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix
index fff05ed8727..45d0270de5a 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";
+  name = "gnutls-3.2.12.1";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz";
-    sha256 = "1zwk9qkxn3190nssyamd7jsb3ag6mnnln3jwbgmjs1w306dzwafi";
+    sha256 = "1787n4iard3ad0p44xbl4aj3r3f5ir3sz0b2s27qpaaia2w4774g";
   };
 
   patches =
-- 
GitLab


From 20696f162077ff6bc3b93786da82e4d66d0644e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 21 Mar 2014 07:23:43 +0100
Subject: [PATCH 2349/3789] libchop: builds with gnutls32 now

---
 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 d4d937f050d..88d1a054f69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4702,9 +4702,7 @@ let
 
   libchamplain_0_6 = callPackage ../development/libraries/libchamplain/0.6.nix {};
 
-  libchop = callPackage ../development/libraries/libchop {
-    gnutls = gnutls31;
-  };
+  libchop = callPackage ../development/libraries/libchop { };
 
   libcm = callPackage ../development/libraries/libcm { };
 
-- 
GitLab


From 2646eac8b25404f162c34c79d366da8ce080504f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 7 Mar 2014 22:45:15 -0600
Subject: [PATCH 2350/3789] z3: version 4.3.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../applications/science/logic/z3/default.nix | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/applications/science/logic/z3/default.nix

diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
new file mode 100644
index 00000000000..eeef03eb161
--- /dev/null
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, python, unzip, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "z3-${version}";
+  version = "4.3.1";
+  src = fetchurl {
+    url    = "http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx\?ProjectName\=z3\&changeSetId\=89c1785b73225a1b363c0e485f854613121b70a7";
+    name   = "${name}.zip";
+    sha256 = "3b94465c52ec174350d8707dd6a1fb0cef42f0fa23f148cc1808c14f3c2c7f76";
+  };
+
+  buildInputs = [ python unzip autoreconfHook ];
+  enableParallelBuilding = true;
+
+  # The zip file doesn't unpack a directory, just the code itself.
+  unpackPhase = "mkdir ${name} && cd ${name} && unzip $src";
+  postConfigure = ''
+    python scripts/mk_make.py
+    cd build
+  '';
+
+  # z3's install phase is stupid because it tries to calculate the
+  # python package store location itself, meaning it'll attempt to
+  # write files into the nix store, and fail.
+  soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so";
+  installPhase = ''
+    mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include
+    cp ../src/api/z3.h        $out/include
+    cp ../src/api/z3_api.h    $out/include
+    cp ../src/api/z3_v1.h     $out/include
+    cp ../src/api/z3_macros.h $out/include
+    cp ../src/api/c++/z3++.h  $out/include
+    cp z3                     $out/bin
+    cp libz3${soext}          $out/lib
+    cp libz3${soext}          $out/lib/${python.libPrefix}/site-packages
+    cp z3*.pyc                $out/lib/${python.libPrefix}/site-packages
+  '';
+
+  meta = {
+    description = "Z3 is a high-performance theorem prover and SMT solver";
+    homepage    = "http://z3.codeplex.com";
+    license     = stdenv.lib.licenses.unfreeRedistributable;
+    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 9441da57ccd..bf7c3ed55ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10068,6 +10068,7 @@ let
 
   tptp = callPackage ../applications/science/logic/tptp {};
 
+  z3 = callPackage ../applications/science/logic/z3 {};
 
   ### SCIENCE / ELECTRONICS
 
-- 
GitLab


From e4961c63f7153f9e9661a61fd0e2228424d6d362 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 21 Mar 2014 04:36:15 -0400
Subject: [PATCH 2351/3789] Remove sec_perm patch that was needed by AUFS

Now the kernel is unpatched by default on non-MIPS!
---
 pkgs/os-specific/linux/kernel/patches.nix     |  6 -----
 .../linux/kernel/sec_perm-2.6.24.patch        | 16 -----------
 pkgs/top-level/all-packages.nix               | 27 ++++---------------
 3 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/sec_perm-2.6.24.patch

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 2d1fb6e2818..d7c9e126598 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -44,12 +44,6 @@ rec {
     features.apparmor = true;
   };
 
-  sec_perm_2_6_24 =
-    { name = "sec_perm-2.6.24";
-      patch = ./sec_perm-2.6.24.patch;
-      features.secPermPatch = true;
-    };
-
   no_xsave =
     { name = "no-xsave";
       patch = ./no-xsave.patch;
diff --git a/pkgs/os-specific/linux/kernel/sec_perm-2.6.24.patch b/pkgs/os-specific/linux/kernel/sec_perm-2.6.24.patch
deleted file mode 100644
index de9b29949c3..00000000000
--- a/pkgs/os-specific/linux/kernel/sec_perm-2.6.24.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: linux-2.6.24-rc3/security/security.c
-===================================================================
-RCS file: /ext1/sysadm/transparent/repository/linux-2.6.24-rc3/security/security.c,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -p -r1.1 -r1.2
---- linux-2.6.24-rc3/security/security.c	21 Nov 2007 13:03:11 -0000	1.1
-+++ linux-2.6.24-rc3/security/security.c	21 Nov 2007 13:07:55 -0000	1.2
-@@ -409,6 +409,7 @@ int security_inode_permission(struct ino
- 		return 0;
- 	return security_ops->inode_permission(inode, mask, nd);
- }
-+EXPORT_SYMBOL(security_inode_permission);
- 
- int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
- {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88d1a054f69..f0ba9b3c29e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6767,9 +6767,6 @@ let
 
   linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
     inherit fetchurl stdenv perl buildLinux;
-    kernelPatches =
-      [ kernelPatches.sec_perm_2_6_24
-      ];
   };
 
   grsecurityOverrider = args: {
@@ -6817,9 +6814,7 @@ let
 
   linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
     inherit fetchurl stdenv perl buildLinux;
-    kernelPatches =
-      [ kernelPatches.sec_perm_2_6_24
-      ] ++ lib.optionals ((platform.kernelArch or null) == "mips")
+    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
         kernelPatches.mips_fpu_sigill
       ];
@@ -6839,10 +6834,7 @@ let
 
   linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) {
     inherit fetchurl stdenv perl buildLinux;
-    kernelPatches =
-      [
-        kernelPatches.sec_perm_2_6_24
-      ] ++ lib.optionals ((platform.kernelArch or null) == "mips")
+    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
         kernelPatches.mips_fpu_sigill
         kernelPatches.mips_ext3_n32
@@ -6860,10 +6852,7 @@ let
 
   linux_3_11 = makeOverridable (import ../os-specific/linux/kernel/linux-3.11.nix) {
     inherit fetchurl stdenv perl buildLinux;
-    kernelPatches =
-      [
-        kernelPatches.sec_perm_2_6_24
-      ] ++ lib.optionals ((platform.kernelArch or null) == "mips")
+    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
         kernelPatches.mips_fpu_sigill
         kernelPatches.mips_ext3_n32
@@ -6872,10 +6861,7 @@ let
 
   linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) {
     inherit fetchurl stdenv perl buildLinux;
-    kernelPatches =
-      [
-        kernelPatches.sec_perm_2_6_24
-      ] ++ lib.optionals ((platform.kernelArch or null) == "mips")
+    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
         kernelPatches.mips_fpu_sigill
         kernelPatches.mips_ext3_n32
@@ -6884,10 +6870,7 @@ let
 
   linux_3_13 = makeOverridable (import ../os-specific/linux/kernel/linux-3.13.nix) {
     inherit fetchurl stdenv perl buildLinux;
-    kernelPatches =
-      [
-        kernelPatches.sec_perm_2_6_24
-      ] ++ lib.optionals ((platform.kernelArch or null) == "mips")
+    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
         kernelPatches.mips_fpu_sigill
         kernelPatches.mips_ext3_n32
-- 
GitLab


From 4f50a0917eda773cf088acc1b7e2cc4c4bdb0a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 19 Mar 2014 23:11:11 +0100
Subject: [PATCH 2352/3789] xorg: add xf86-video-modesetting

---
 pkgs/servers/x11/xorg/default.nix       | 10 ++++++++++
 pkgs/servers/x11/xorg/tarballs-7.7.list |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index beca7414c36..6990da2352e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1569,6 +1569,16 @@ let
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
+  xf86videomodesetting = (stdenv.mkDerivation ((if overrides ? xf86videomodesetting then overrides.xf86videomodesetting else x: x) {
+    name = "xf86-video-modesetting-0.8.1";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/driver/xf86-video-modesetting-0.8.1.tar.bz2;
+      sha256 = "1jhjhgji6169sj7489qahcnmi8cf7y22wvj8qsmrg537rgbxia1v";
+    };
+    buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ];
+  })) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;};
+
   xf86videoneomagic = (stdenv.mkDerivation ((if overrides ? xf86videoneomagic then overrides.xf86videoneomagic else x: x) {
     name = "xf86-video-neomagic-1.2.8";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 24279ac70f9..eccc931f42f 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -136,6 +136,7 @@ mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2
+mirror://xorg/individual/driver/xf86-video-modesetting-0.8.1.tar.bz2
 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2
-- 
GitLab


From 2560f2e78b3fe32c03813ed56d666459c90f06cb Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 21 Mar 2014 04:08:59 -0500
Subject: [PATCH 2353/3789] fsharp: 3.0 -> 3.1, and attempt to fix build

Hopefully this fix will appease hydra - the distributed autogen.sh
script is annoying.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/fsharp/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index 37516fabaab..8cc283bc3f1 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -2,16 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "fsharp-${version}";
-  version = "3.0";
+  version = "3.1";
 
   src = fetchgit {
     url = "https://github.com/fsharp/fsharp";
-    rev = "refs/heads/fsharp_30";
-    sha256 = "59639c76ff401c9ddb1af7a2f5a53a5aef4ec0d62317aeb33429f3eb009f771f";
+    rev = "refs/heads/fsharp_31";
+    sha256 = "0d41ae31c57ec9ac8a4ea149b615ae085f3774b8877d8e53ddbf68856c32eda0";
   };
 
   buildInputs = [ mono pkgconfig autoconf automake which ];
-  configurePhase = "./autogen.sh --prefix $out";
+  configurePhase = ''
+    substituteInPlace ./autogen.sh "/usr/bin/env sh" "/bin/sh"
+    ./autogen.sh --prefix $out
+  '';
 
   # Make sure the executables use the right mono binary,
   # and set up some symlinks for backwards compatibility.
-- 
GitLab


From 9ace84df758b0cd639d2f33d849c9c32be6ac406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Mar 2014 23:12:30 +0100
Subject: [PATCH 2354/3789] libxklavier: update 5.0 -> 5.3 (after a long time)

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

diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
index ac5c6146cba..cb3c3b23e7f 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -1,12 +1,15 @@
 { stdenv, fetchurl, pkgconfig, libX11, libXi, xkeyboard_config, libxml2
 , libICE, glib, libxkbfile, isocodes }:
 
+let
+  version = "5.3";
+in
 stdenv.mkDerivation rec {
-  name = "libxklavier-5.0";
+  name = "libxklavier-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gswitchit/${name}.tar.bz2";
-    sha256 = "1c2dxinjfpq1lzxi0z46r0j80crbmwb0lkvnh6987cjjlwblpnfz";
+    url = "mirror://gnome/sources/libxklavier/${version}/${name}.tar.xz";
+    sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b";
   };
 
   # TODO: enable xmodmap support, needs xmodmap DB
-- 
GitLab


From 23682d02d0031a9636f320d16659712d2ad8121b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 14 Mar 2014 12:31:09 +0100
Subject: [PATCH 2355/3789] xorg: update, regenerate (new: glamor-egl)

Updates caught by nixpkgs monitor.
---
 pkgs/servers/x11/xorg/default.nix       | 330 ++++++++++++------------
 pkgs/servers/x11/xorg/old.list          |  10 +-
 pkgs/servers/x11/xorg/tarballs-7.7.list |  83 +++---
 3 files changed, 217 insertions(+), 206 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 6990da2352e..27791429418 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -20,11 +20,11 @@ let
   })) // {inherit ;};
 
   bdftopcf = (stdenv.mkDerivation ((if overrides ? bdftopcf then overrides.bdftopcf else x: x) {
-    name = "bdftopcf-1.0.3";
+    name = "bdftopcf-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/bdftopcf-1.0.3.tar.bz2;
-      sha256 = "02hx981f7jfwylxj21s91yvv4h597nqqzz3vd6ar81zyn84b944w";
+      url = mirror://xorg/individual/app/bdftopcf-1.0.4.tar.bz2;
+      sha256 = "1617zmgnx50n7vxlqyj84fl7vnk813jjqmi6jpigyz1xp9br1xga";
     };
     buildInputs = [pkgconfig libXfont ];
   })) // {inherit libXfont ;};
@@ -489,32 +489,42 @@ let
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
 
+  glamoregl = (stdenv.mkDerivation ((if overrides ? glamoregl then overrides.glamoregl else x: x) {
+    name = "glamor-egl-0.6.0";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2;
+      sha256 = "1jg5clihklb9drh1jd7nhhdsszla6nv7xmbvm8yvakh5wrb1nlv6";
+    };
+    buildInputs = [pkgconfig dri2proto xorgserver ];
+  })) // {inherit dri2proto xorgserver ;};
+
   glproto = (stdenv.mkDerivation ((if overrides ? glproto then overrides.glproto else x: x) {
-    name = "glproto-1.4.16";
+    name = "glproto-1.4.17";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/glproto-1.4.16.tar.bz2;
-      sha256 = "13arnb4bz5pn89bxbh3shr8gihkhyznpjnq3zzr05msygwx6dpal";
+      url = mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2;
+      sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
 
   iceauth = (stdenv.mkDerivation ((if overrides ? iceauth then overrides.iceauth else x: x) {
-    name = "iceauth-1.0.5";
+    name = "iceauth-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/iceauth-1.0.5.tar.bz2;
-      sha256 = "1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl";
+      url = mirror://xorg/individual/app/iceauth-1.0.6.tar.bz2;
+      sha256 = "1x72y99dxf2fxnlyf0yrf9yzd8xzimxshy6l8mprwhrv6lvhi6dx";
     };
     buildInputs = [pkgconfig libICE xproto ];
   })) // {inherit libICE xproto ;};
 
   imake = (stdenv.mkDerivation ((if overrides ? imake then overrides.imake else x: x) {
-    name = "imake-1.0.5";
+    name = "imake-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/imake-1.0.5.tar.bz2;
-      sha256 = "1h8ww97aymm10l9qn21n1b9x5ypjrqr10qpf48jjcbc9fg77gklr";
+      url = mirror://xorg/individual/util/imake-1.0.6.tar.bz2;
+      sha256 = "1786k6jsazpr37v2b6qlsznjjp5lgyb869hx5m4ahax7n3yq72gs";
     };
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
@@ -570,11 +580,11 @@ let
   })) // {inherit xproto xtrans ;};
 
   libSM = (stdenv.mkDerivation ((if overrides ? libSM then overrides.libSM else x: x) {
-    name = "libSM-1.2.1";
+    name = "libSM-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libSM-1.2.1.tar.bz2;
-      sha256 = "07bzi6xwlhq36f60qfspjbz0qjj7zcgayi1vp4ihgx34kib1vhck";
+      url = mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2;
+      sha256 = "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b";
     };
     buildInputs = [pkgconfig libICE libuuid xproto xtrans ];
   })) // {inherit libICE libuuid xproto xtrans ;};
@@ -590,11 +600,11 @@ let
   })) // {inherit windowswmproto libX11 libXext xextproto ;};
 
   libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) {
-    name = "libX11-1.6.1";
+    name = "libX11-1.6.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libX11-1.6.1.tar.bz2;
-      sha256 = "14hqf180dxax3xf65bq95psd4bx8az1q1l6lxsjzbd2qdg0lz98h";
+      url = mirror://xorg/individual/lib/libX11-1.6.2.tar.bz2;
+      sha256 = "05mx0s0vqzds3qjc1gmjr2s6x2ll37z4lfhgm7p2w7936zl2g81a";
     };
     buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
   })) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
@@ -610,31 +620,31 @@ let
   })) // {inherit scrnsaverproto libX11 libXext xextproto ;};
 
   libXau = (stdenv.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) {
-    name = "libXau-1.0.7";
+    name = "libXau-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libXau-1.0.7.tar.bz2;
-      sha256 = "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi";
+      url = mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2;
+      sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x";
     };
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
 
   libXaw = (stdenv.mkDerivation ((if overrides ? libXaw then overrides.libXaw else x: x) {
-    name = "libXaw-1.0.11";
+    name = "libXaw-1.0.12";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2;
-      sha256 = "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47";
+      url = mirror://xorg/individual/lib/libXaw-1.0.12.tar.bz2;
+      sha256 = "1xnv7jy86j9vhmw74frkzcraynqbw1p1s79jasargsgwfi433z4n";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ];
   })) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
 
   libXcomposite = (stdenv.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) {
-    name = "libXcomposite-0.4.3";
+    name = "libXcomposite-0.4.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2;
-      sha256 = "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j";
+      url = mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2;
+      sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd";
     };
     buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ];
   })) // {inherit compositeproto libX11 libXfixes xproto ;};
@@ -650,11 +660,11 @@ let
   })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
 
   libXdamage = (stdenv.mkDerivation ((if overrides ? libXdamage then overrides.libXdamage else x: x) {
-    name = "libXdamage-1.1.3";
+    name = "libXdamage-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2;
-      sha256 = "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw";
+      url = mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2;
+      sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw";
     };
     buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ];
   })) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
@@ -730,11 +740,11 @@ let
   })) // {inherit libX11 libXext xextproto xineramaproto ;};
 
   libXmu = (stdenv.mkDerivation ((if overrides ? libXmu then overrides.libXmu else x: x) {
-    name = "libXmu-1.1.1";
+    name = "libXmu-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libXmu-1.1.1.tar.bz2;
-      sha256 = "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h";
+      url = mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2;
+      sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
   })) // {inherit libX11 libXext xextproto xproto libXt ;};
@@ -750,21 +760,21 @@ let
   })) // {inherit printproto libX11 libXau libXext xextproto ;};
 
   libXpm = (stdenv.mkDerivation ((if overrides ? libXpm then overrides.libXpm else x: x) {
-    name = "libXpm-3.5.10";
+    name = "libXpm-3.5.11";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libXpm-3.5.10.tar.bz2;
-      sha256 = "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6";
+      url = mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2;
+      sha256 = "07041q4k8m4nirzl7lrqn8by2zylx0xvh6n0za301qqs3njszgf5";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
   })) // {inherit libX11 libXext xextproto xproto libXt ;};
 
   libXrandr = (stdenv.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) {
-    name = "libXrandr-1.4.1";
+    name = "libXrandr-1.4.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXrandr-1.4.1.tar.bz2;
-      sha256 = "01dr1wvyxq2y4yq4hilgglkjlvn551dmnl4l65nfm8nh1x4s056r";
+      url = mirror://xorg/individual/lib/libXrandr-1.4.2.tar.bz2;
+      sha256 = "1b95p3l84ppv6j7dbbmg0zrz6k8xdwvnag1l6ajm3gk9qwdb79ya";
     };
     buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ];
   })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
@@ -810,11 +820,11 @@ let
   })) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;};
 
   libXv = (stdenv.mkDerivation ((if overrides ? libXv then overrides.libXv else x: x) {
-    name = "libXv-1.0.8";
+    name = "libXv-1.0.10";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXv-1.0.8.tar.bz2;
-      sha256 = "1mvkmypf9rsr3lr161hf9sjadlirb116jfp5lk70j29r8x9yn02g";
+      url = mirror://xorg/individual/lib/libXv-1.0.10.tar.bz2;
+      sha256 = "09a5j6bisysiipd0nw6s352565bp0n6gbyhv5hp63s3cd3w95zjm";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ];
   })) // {inherit videoproto libX11 libXext xextproto xproto ;};
@@ -870,11 +880,11 @@ let
   })) // {inherit dmxproto libX11 libXext xextproto ;};
 
   libfontenc = (stdenv.mkDerivation ((if overrides ? libfontenc then overrides.libfontenc else x: x) {
-    name = "libfontenc-1.1.1";
+    name = "libfontenc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2;
-      sha256 = "0zq1483xy31sssq0h3xxf8y1v4q14cp8rv164ayn7fsn30pq2wny";
+      url = mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2;
+      sha256 = "0qign0ivqk166l9yfd51gw9lbhgs718bcrmvc40yicjr6gnyz959";
     };
     buildInputs = [pkgconfig xproto zlib ];
   })) // {inherit xproto zlib ;};
@@ -950,11 +960,11 @@ let
   })) // {inherit libfontenc ;};
 
   makedepend = (stdenv.mkDerivation ((if overrides ? makedepend then overrides.makedepend else x: x) {
-    name = "makedepend-1.0.4";
+    name = "makedepend-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/makedepend-1.0.4.tar.bz2;
-      sha256 = "1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb";
+      url = mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2;
+      sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p";
     };
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
@@ -970,11 +980,11 @@ let
   })) // {inherit ;};
 
   mkfontscale = (stdenv.mkDerivation ((if overrides ? mkfontscale then overrides.mkfontscale else x: x) {
-    name = "mkfontscale-1.1.0";
+    name = "mkfontscale-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/mkfontscale-1.1.0.tar.bz2;
-      sha256 = "1539h3ws66vcql6sf2831bcs0r4d9b05lcgpswkw33lvcxighmff";
+      url = mirror://xorg/individual/app/mkfontscale-1.1.1.tar.bz2;
+      sha256 = "0cdpn1ii2iw1vg2ga4w62acrh78gzgf0vza4g8wx5kkp4jcifh14";
     };
     buildInputs = [pkgconfig libfontenc freetype xproto zlib ];
   })) // {inherit libfontenc freetype xproto zlib ;};
@@ -1050,11 +1060,11 @@ let
   })) // {inherit ;};
 
   sessreg = (stdenv.mkDerivation ((if overrides ? sessreg then overrides.sessreg else x: x) {
-    name = "sessreg-1.0.7";
+    name = "sessreg-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/sessreg-1.0.7.tar.bz2;
-      sha256 = "0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47";
+      url = mirror://xorg/individual/app/sessreg-1.0.8.tar.bz2;
+      sha256 = "1hy4wvgawajf4qw2k51fkcjzxw0drx60ydzpmqhj7k1g4z3cqahf";
     };
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
@@ -1080,31 +1090,31 @@ let
   })) // {inherit libICE libSM libXmu libXt ;};
 
   twm = (stdenv.mkDerivation ((if overrides ? twm then overrides.twm else x: x) {
-    name = "twm-1.0.7";
+    name = "twm-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/twm-1.0.7.tar.bz2;
-      sha256 = "0i6dbf5vafi5hm4bcmnj6r412cncjlv9hkkbr6bzlh15qvg56p8g";
+      url = mirror://xorg/individual/app/twm-1.0.8.tar.bz2;
+      sha256 = "0i1ff8h2gh1ab311da5dlhl0nrma0qbrk403ymzi4cnnacikaq3n";
     };
     buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ];
   })) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
 
   utilmacros = (stdenv.mkDerivation ((if overrides ? utilmacros then overrides.utilmacros else x: x) {
-    name = "util-macros-1.17";
+    name = "util-macros-1.18.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/util-macros-1.17.tar.bz2;
-      sha256 = "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx";
+      url = mirror://xorg/individual/util/util-macros-1.18.0.tar.bz2;
+      sha256 = "0nwlg1d4r23byncb3kar1a0mhjn52fc1m0ygl9p5gw2jm0rd3qz5";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
 
   videoproto = (stdenv.mkDerivation ((if overrides ? videoproto then overrides.videoproto else x: x) {
-    name = "videoproto-2.3.1";
+    name = "videoproto-2.3.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/videoproto-2.3.1.tar.bz2;
-      sha256 = "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry";
+      url = mirror://xorg/individual/proto/videoproto-2.3.2.tar.bz2;
+      sha256 = "1dnlkd9nb0m135lgd6hd61vc29sdyarsyya8aqpx7z10p261dbld";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -1130,21 +1140,21 @@ let
   })) // {inherit libX11 libXext libXft libXmu libXrender ;};
 
   xauth = (stdenv.mkDerivation ((if overrides ? xauth then overrides.xauth else x: x) {
-    name = "xauth-1.0.7";
+    name = "xauth-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xauth-1.0.7.tar.bz2;
-      sha256 = "1382wdfiakgckbw1xxavzh1nm34q21b1zzy96qp7ws66xc48rxw4";
+      url = mirror://xorg/individual/app/xauth-1.0.8.tar.bz2;
+      sha256 = "1xylgy7qrf8w76gg1sa6x8ckv14q1nv0h554ndgrss8clpknlsd8";
     };
-    buildInputs = [pkgconfig libX11 libXau libXext libXmu ];
-  })) // {inherit libX11 libXau libXext libXmu ;};
+    buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ];
+  })) // {inherit libX11 libXau libXext libXmu xproto ;};
 
   xbacklight = (stdenv.mkDerivation ((if overrides ? xbacklight then overrides.xbacklight else x: x) {
-    name = "xbacklight-1.2.0";
+    name = "xbacklight-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xbacklight-1.2.0.tar.bz2;
-      sha256 = "199n9qszjiz82nbjz6ychh0xl15igm535mv0830wk4m59w9xclji";
+      url = mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2;
+      sha256 = "0arnd1j8vzhzmw72mqhjjcb2qwcbs9qphsy3ps593ajyld8wzxhp";
     };
     buildInputs = [pkgconfig libxcb xcbutil ];
   })) // {inherit libxcb xcbutil ;};
@@ -1220,14 +1230,14 @@ let
   })) // {inherit gperf m4 libxcb xproto ;};
 
   xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) {
-    name = "xclock-1.0.6";
+    name = "xclock-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xclock-1.0.6.tar.bz2;
-      sha256 = "1l1zxr69p0734fnx9rdqw79ahr273hr050sm8xdc0n51n1bnzfr1";
+      url = mirror://xorg/individual/app/xclock-1.0.7.tar.bz2;
+      sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3";
     };
-    buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu libXrender libXt ];
-  })) // {inherit libX11 libXaw libXft libxkbfile libXmu libXrender libXt ;};
+    buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ];
+  })) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;};
 
   xcmiscproto = (stdenv.mkDerivation ((if overrides ? xcmiscproto then overrides.xcmiscproto else x: x) {
     name = "xcmiscproto-1.2.2";
@@ -1260,11 +1270,11 @@ let
   })) // {inherit libpng libX11 libXcursor ;};
 
   xcursorthemes = (stdenv.mkDerivation ((if overrides ? xcursorthemes then overrides.xcursorthemes else x: x) {
-    name = "xcursor-themes-1.0.3";
+    name = "xcursor-themes-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xcursor-themes-1.0.3.tar.bz2;
-      sha256 = "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr";
+      url = mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2;
+      sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3";
     };
     buildInputs = [pkgconfig libXcursor ];
   })) // {inherit libXcursor ;};
@@ -1280,14 +1290,14 @@ let
   })) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
 
   xdpyinfo = (stdenv.mkDerivation ((if overrides ? xdpyinfo then overrides.xdpyinfo else x: x) {
-    name = "xdpyinfo-1.3.0";
+    name = "xdpyinfo-1.3.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xdpyinfo-1.3.0.tar.bz2;
-      sha256 = "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3";
+      url = mirror://xorg/individual/app/xdpyinfo-1.3.1.tar.bz2;
+      sha256 = "154b29zlrq33lmni883jgwyrb2kx7z8h52jx1s3ys5x5d582iydf";
     };
-    buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
-  })) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
+    buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
+  })) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
 
   xdriinfo = (stdenv.mkDerivation ((if overrides ? xdriinfo then overrides.xdriinfo else x: x) {
     name = "xdriinfo-1.0.4";
@@ -1300,11 +1310,11 @@ let
   })) // {inherit glproto libX11 ;};
 
   xev = (stdenv.mkDerivation ((if overrides ? xev then overrides.xev else x: x) {
-    name = "xev-1.2.0";
+    name = "xev-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xev-1.2.0.tar.bz2;
-      sha256 = "13xk5z7vy87rnn4574z0jfzymdivyc7pl4axim81sx0pmdysg1ip";
+      url = mirror://xorg/individual/app/xev-1.2.1.tar.bz2;
+      sha256 = "0hv296mysglcgkx6lj1wxc23kshb2kix1a8yqppxj5vz16mpzw8i";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr ];
   })) // {inherit libX11 xproto libXrandr ;};
@@ -1400,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.3";
+    name = "xf86-input-synaptics-1.7.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.3.tar.bz2;
-      sha256 = "1m9j5shypv3dmxxfxjcmj01glay4gqqlchxqav89a4cn8ch9falb";
+      url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.4.tar.bz2;
+      sha256 = "1xssjj0qxarzsc4m69ay5ydkwgq27qajzih2c7sjk7nkgggx58jn";
     };
     buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
   })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
@@ -1460,14 +1470,14 @@ let
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) {
-    name = "xf86-video-ati-7.2.0";
+    name = "xf86-video-ati-7.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-ati-7.2.0.tar.bz2;
-      sha256 = "1i5fknbbhynl5hv2dzznzcf0yadpm28jzvx7xl38vlfpr3ymw3zk";
+      url = mirror://xorg/individual/driver/xf86-video-ati-7.3.0.tar.bz2;
+      sha256 = "1zj6401km2zgc32vhw7jfkaklsllsm9xpbs79zh9da8r94n0fz0h";
     };
-    buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+  })) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videocirrus = (stdenv.mkDerivation ((if overrides ? xf86videocirrus then overrides.xf86videocirrus else x: x) {
     name = "xf86-video-cirrus-1.5.2";
@@ -1546,8 +1556,8 @@ let
       url = mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2;
       sha256 = "1z6ncmpszmwqi9xr590c4kp4gjjf7mndcr56r35x2bx7h87i8nkx";
     };
-    buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ];
-  })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;};
+    buildInputs = [pkgconfig dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ];
+  })) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;};
 
   xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) {
     name = "xf86-video-mach64-6.9.4";
@@ -1800,14 +1810,14 @@ let
   })) // {inherit libX11 libXxf86vm ;};
 
   xhost = (stdenv.mkDerivation ((if overrides ? xhost then overrides.xhost else x: x) {
-    name = "xhost-1.0.5";
+    name = "xhost-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xhost-1.0.5.tar.bz2;
-      sha256 = "0l483y6wfrjh37j16b41kpi2nc7ss5rvndafpbaylrs87ygx2w18";
+      url = mirror://xorg/individual/app/xhost-1.0.6.tar.bz2;
+      sha256 = "1hlxm0is9nks1cx033s1733kkib9ivx2bxa3pb9yayqavwibkxd6";
     };
-    buildInputs = [pkgconfig libX11 libXau libXmu ];
-  })) // {inherit libX11 libXau libXmu ;};
+    buildInputs = [pkgconfig libX11 libXau libXmu xproto ];
+  })) // {inherit libX11 libXau libXmu xproto ;};
 
   xineramaproto = (stdenv.mkDerivation ((if overrides ? xineramaproto then overrides.xineramaproto else x: x) {
     name = "xineramaproto-1.2.1";
@@ -1820,21 +1830,21 @@ let
   })) // {inherit ;};
 
   xinit = (stdenv.mkDerivation ((if overrides ? xinit then overrides.xinit else x: x) {
-    name = "xinit-1.3.2";
+    name = "xinit-1.3.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xinit-1.3.2.tar.bz2;
-      sha256 = "0d821rlqwyn2js7bkzicyp894n9gqv1hahxs285pas1zm3d7z1m1";
+      url = mirror://xorg/individual/app/xinit-1.3.3.tar.bz2;
+      sha256 = "1bq0mqy7y305g2rds1g5443f3d2kgxzafqhmiyabbmg3ws6qgckl";
     };
-    buildInputs = [pkgconfig libX11 ];
-  })) // {inherit libX11 ;};
+    buildInputs = [pkgconfig libX11 xproto ];
+  })) // {inherit libX11 xproto ;};
 
   xinput = (stdenv.mkDerivation ((if overrides ? xinput then overrides.xinput else x: x) {
-    name = "xinput-1.6.0";
+    name = "xinput-1.6.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2;
-      sha256 = "0zl4cdgnzh9shz20yn7hz889v4nkbyqwx0nb7dh6arn7abchgc2a";
+      url = mirror://xorg/individual/app/xinput-1.6.1.tar.bz2;
+      sha256 = "07w7zlpdhpwzzshg8q0y152cy3wl2fj7x1897glnp2la487jsqxp";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext libXi libXinerama libXrandr ];
   })) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;};
@@ -1860,11 +1870,11 @@ let
   })) // {inherit libX11 libxkbfile ;};
 
   xkbutils = (stdenv.mkDerivation ((if overrides ? xkbutils then overrides.xkbutils else x: x) {
-    name = "xkbutils-1.0.3";
+    name = "xkbutils-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2;
-      sha256 = "1ga913pw6chssf2016kjyjl6ar2lj83pa497w97ak2kq603sy2g4";
+      url = mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2;
+      sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj";
     };
     buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ];
   })) // {inherit inputproto libX11 libXaw xproto libXt ;};
@@ -1880,14 +1890,14 @@ let
   })) // {inherit libX11 xproto ;};
 
   xkill = (stdenv.mkDerivation ((if overrides ? xkill then overrides.xkill else x: x) {
-    name = "xkill-1.0.3";
+    name = "xkill-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2;
-      sha256 = "1ac110qbb9a4x1dim3vaghvdk3jc708i2p3f4rmag33458khg0xx";
+      url = mirror://xorg/individual/app/xkill-1.0.4.tar.bz2;
+      sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8";
     };
-    buildInputs = [pkgconfig libX11 libXmu ];
-  })) // {inherit libX11 libXmu ;};
+    buildInputs = [pkgconfig libX11 libXmu xproto ];
+  })) // {inherit libX11 libXmu xproto ;};
 
   xlsatoms = (stdenv.mkDerivation ((if overrides ? xlsatoms then overrides.xlsatoms else x: x) {
     name = "xlsatoms-1.1.1";
@@ -1900,11 +1910,11 @@ let
   })) // {inherit libxcb ;};
 
   xlsclients = (stdenv.mkDerivation ((if overrides ? xlsclients then overrides.xlsclients else x: x) {
-    name = "xlsclients-1.1.2";
+    name = "xlsclients-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2;
-      sha256 = "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w";
+      url = mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2;
+      sha256 = "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx";
     };
     buildInputs = [pkgconfig libxcb ];
   })) // {inherit libxcb ;};
@@ -1920,21 +1930,21 @@ let
   })) // {inherit libXaw libXt ;};
 
   xmodmap = (stdenv.mkDerivation ((if overrides ? xmodmap then overrides.xmodmap else x: x) {
-    name = "xmodmap-1.0.7";
+    name = "xmodmap-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2;
-      sha256 = "1dg47lay4vhrl9mfq3cfc6741a0m2n8wd4ljagd21ix3qklys8pg";
+      url = mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2;
+      sha256 = "1hwzm54m4ng09ls9i4bq0x84zbyhamgzasgrvhxxp8jqk34f7qpg";
     };
     buildInputs = [pkgconfig libX11 xproto ];
   })) // {inherit libX11 xproto ;};
 
   xorgcffiles = (stdenv.mkDerivation ((if overrides ? xorgcffiles then overrides.xorgcffiles else x: x) {
-    name = "xorg-cf-files-1.0.4";
+    name = "xorg-cf-files-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/xorg-cf-files-1.0.4.tar.bz2;
-      sha256 = "0s86h66b3w4623m88fg2csp41cnr08qc8i3gkj85k3wpwj1wxs9n";
+      url = mirror://xorg/individual/util/xorg-cf-files-1.0.5.tar.bz2;
+      sha256 = "1m3ypq0xcy46ghxc0svl1rbhpy3zvgmy0aa2mn7w7v7d8d8bh8zd";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -1980,61 +1990,61 @@ let
   })) // {inherit libX11 libXmu xproto ;};
 
   xprop = (stdenv.mkDerivation ((if overrides ? xprop then overrides.xprop else x: x) {
-    name = "xprop-1.2.1";
+    name = "xprop-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2;
-      sha256 = "18zi2any13zlb7f34fzyw6lkiwkd6k2scp3b800a1f4rj0c7m407";
+      url = mirror://xorg/individual/app/xprop-1.2.2.tar.bz2;
+      sha256 = "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv";
     };
     buildInputs = [pkgconfig libX11 xproto ];
   })) // {inherit libX11 xproto ;};
 
   xproto = (stdenv.mkDerivation ((if overrides ? xproto then overrides.xproto else x: x) {
-    name = "xproto-7.0.23";
+    name = "xproto-7.0.25";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xproto-7.0.23.tar.bz2;
-      sha256 = "17lkmi12f89qvg4jj5spqzwzc24fmsqq68dv6kpy7r7b944lmq5d";
+      url = mirror://xorg/individual/proto/xproto-7.0.25.tar.bz2;
+      sha256 = "1zh977hrfxxdyhlxr9qjfa2xl8qrb4v43a2b708kdz2gvj2p894j";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
 
   xrandr = (stdenv.mkDerivation ((if overrides ? xrandr then overrides.xrandr else x: x) {
-    name = "xrandr-1.3.5";
+    name = "xrandr-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xrandr-1.3.5.tar.bz2;
-      sha256 = "03lq1c1q4w5cf2ijs4b34v008lshibha9zv5lw08xpyhk9xgyn8h";
+      url = mirror://xorg/individual/app/xrandr-1.4.1.tar.bz2;
+      sha256 = "0l0y4ifaqg90ibci276jvyawpj7ynzd8czsqxy5pfljnjymm9db7";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ];
   })) // {inherit libX11 xproto libXrandr libXrender ;};
 
   xrdb = (stdenv.mkDerivation ((if overrides ? xrdb then overrides.xrdb else x: x) {
-    name = "xrdb-1.0.9";
+    name = "xrdb-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xrdb-1.0.9.tar.bz2;
-      sha256 = "1dza5a34nj68fzhlgwf18i5bk0n24ig28yihwpjy7vwn57hh2934";
+      url = mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2;
+      sha256 = "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk";
     };
-    buildInputs = [pkgconfig libX11 libXmu ];
-  })) // {inherit libX11 libXmu ;};
+    buildInputs = [pkgconfig libX11 libXmu xproto ];
+  })) // {inherit libX11 libXmu xproto ;};
 
   xrefresh = (stdenv.mkDerivation ((if overrides ? xrefresh then overrides.xrefresh else x: x) {
-    name = "xrefresh-1.0.4";
+    name = "xrefresh-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xrefresh-1.0.4.tar.bz2;
-      sha256 = "0ywxzwa4kmnnmf8idr8ssgcil9xvbhnk155zpsh2i8ay93mh5586";
+      url = mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2;
+      sha256 = "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj";
     };
-    buildInputs = [pkgconfig libX11 ];
-  })) // {inherit libX11 ;};
+    buildInputs = [pkgconfig libX11 xproto ];
+  })) // {inherit libX11 xproto ;};
 
   xset = (stdenv.mkDerivation ((if overrides ? xset then overrides.xset else x: x) {
-    name = "xset-1.2.2";
+    name = "xset-1.2.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xset-1.2.2.tar.bz2;
-      sha256 = "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1";
+      url = mirror://xorg/individual/app/xset-1.2.3.tar.bz2;
+      sha256 = "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu xproto libXxf86misc ];
   })) // {inherit libX11 libXext libXmu xproto libXxf86misc ;};
@@ -2060,31 +2070,31 @@ let
   })) // {inherit ;};
 
   xvinfo = (stdenv.mkDerivation ((if overrides ? xvinfo then overrides.xvinfo else x: x) {
-    name = "xvinfo-1.1.1";
+    name = "xvinfo-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xvinfo-1.1.1.tar.bz2;
-      sha256 = "119rd93d7661ll1rfcdssn78l0b97326smziyr2f5wdwj2hlmiv0";
+      url = mirror://xorg/individual/app/xvinfo-1.1.2.tar.bz2;
+      sha256 = "1qsh7fszi727l3vwlaf9pb7bpikdv15smrx5qhlgg3kqzl7xklzf";
     };
-    buildInputs = [pkgconfig libX11 libXv ];
-  })) // {inherit libX11 libXv ;};
+    buildInputs = [pkgconfig libX11 xproto libXv ];
+  })) // {inherit libX11 xproto libXv ;};
 
   xwd = (stdenv.mkDerivation ((if overrides ? xwd then overrides.xwd else x: x) {
-    name = "xwd-1.0.5";
+    name = "xwd-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xwd-1.0.5.tar.bz2;
-      sha256 = "0fkg6msy2zg7rda2rpxb7j6vmrdmqmk72xsxnyhz97196ykjnx82";
+      url = mirror://xorg/individual/app/xwd-1.0.6.tar.bz2;
+      sha256 = "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv";
     };
     buildInputs = [pkgconfig libX11 xproto ];
   })) // {inherit libX11 xproto ;};
 
   xwininfo = (stdenv.mkDerivation ((if overrides ? xwininfo then overrides.xwininfo else x: x) {
-    name = "xwininfo-1.1.2";
+    name = "xwininfo-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xwininfo-1.1.2.tar.bz2;
-      sha256 = "0fmcr5yl03xw7m8p9h1rk67rrj7gp5x16a547xhmg8idw2f6r9lg";
+      url = mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2;
+      sha256 = "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1";
     };
     buildInputs = [pkgconfig libX11 libxcb xproto ];
   })) // {inherit libX11 libxcb xproto ;};
diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list
index 68c88594932..7019273dd11 100644
--- a/pkgs/servers/x11/xorg/old.list
+++ b/pkgs/servers/x11/xorg/old.list
@@ -1,15 +1,15 @@
-mirror://xorg/individual/app/twm-1.0.7.tar.bz2
-mirror://xorg/individual/app/xclock-1.0.6.tar.bz2
+mirror://xorg/individual/app/twm-1.0.8.tar.bz2
+mirror://xorg/individual/app/xclock-1.0.7.tar.bz2
 mirror://xorg/individual/app/xdm-1.1.11.tar.bz2
 mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2
 mirror://xorg/individual/app/xfs-1.1.3.tar.bz2
-mirror://xorg/individual/app/xinit-1.3.2.tar.bz2
+mirror://xorg/individual/app/xinit-1.3.3.tar.bz2
 mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2
 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.5.tar.bz2
+mirror://xorg/individual/util/imake-1.0.6.tar.bz2
 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
-mirror://xorg/individual/util/xorg-cf-files-1.0.4.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 eccc931f42f..84ab8196122 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -1,5 +1,5 @@
 mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2
-mirror://xorg/X11R7.7/src/everything/bdftopcf-1.0.3.tar.bz2
+mirror://xorg/individual/app/bdftopcf-1.0.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2
@@ -46,25 +46,25 @@ 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
 mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2
-mirror://xorg/individual/proto/glproto-1.4.16.tar.bz2
-mirror://xorg/X11R7.7/src/everything/iceauth-1.0.5.tar.bz2
+mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2
+mirror://xorg/individual/app/iceauth-1.0.6.tar.bz2
 mirror://xorg/individual/proto/inputproto-2.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2
 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2
 mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2
+mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2
 mirror://xorg/individual/lib/libFS-1.0.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2
 mirror://xorg/individual/lib/libpciaccess-0.13.2.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libSM-1.2.1.tar.bz2
+mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.6.1.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libXau-1.0.7.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2
+mirror://xorg/individual/lib/libX11-1.6.2.tar.bz2
+mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2
+mirror://xorg/individual/lib/libXaw-1.0.12.tar.bz2
+mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2
 mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2
+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
@@ -73,44 +73,44 @@ 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
 mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libXmu-1.1.1.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libXpm-3.5.10.tar.bz2
-mirror://xorg/individual/lib/libXrandr-1.4.1.tar.bz2
+mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2
+mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2
+mirror://xorg/individual/lib/libXrandr-1.4.2.tar.bz2
 mirror://xorg/individual/lib/libXrender-0.9.8.tar.bz2
 mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2
 mirror://xorg/individual/lib/libXt-1.1.4.tar.bz2
 mirror://xorg/individual/lib/libXtst-1.2.2.tar.bz2
-mirror://xorg/individual/lib/libXv-1.0.8.tar.bz2
+mirror://xorg/individual/lib/libXv-1.0.10.tar.bz2
 mirror://xorg/individual/lib/libXvMC-1.0.8.tar.bz2
 mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2
 mirror://xorg/individual/lib/libXxf86vm-1.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2
-mirror://xorg/X11R7.7/src/everything/makedepend-1.0.4.tar.bz2
+mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2
-mirror://xorg/X11R7.7/src/everything/mkfontscale-1.1.0.tar.bz2
+mirror://xorg/individual/app/mkfontscale-1.1.1.tar.bz2
 mirror://xorg/individual/proto/randrproto-1.4.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2
-mirror://xorg/X11R7.7/src/everything/sessreg-1.0.7.tar.bz2
+mirror://xorg/individual/app/sessreg-1.0.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/setxkbmap-1.3.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/smproxy-1.0.5.tar.bz2
-mirror://xorg/X11R7.7/src/everything/util-macros-1.17.tar.bz2
-mirror://xorg/X11R7.7/src/everything/videoproto-2.3.1.tar.bz2
+mirror://xorg/individual/util/util-macros-1.18.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/X11R7.7/src/everything/xauth-1.0.7.tar.bz2
-mirror://xorg/individual/app/xbacklight-1.2.0.tar.bz2
+mirror://xorg/individual/app/xauth-1.0.8.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
 mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xcursor-themes-1.0.3.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xdpyinfo-1.3.0.tar.bz2
+mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2
+mirror://xorg/individual/app/xdpyinfo-1.3.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xev-1.2.0.tar.bz2
+mirror://xorg/individual/app/xev-1.2.1.tar.bz2
 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
@@ -119,12 +119,13 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.8.2.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.3.tar.bz2
+mirror://xorg/individual/driver/xf86-input-synaptics-1.7.4.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
 mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ati-7.2.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ati-7.3.0.tar.bz2
+mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.10.tar.bz2
 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2
@@ -157,30 +158,30 @@ mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xgamma-1.0.5.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xhost-1.0.5.tar.bz2
+mirror://xorg/individual/app/xhost-1.0.6.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2
+mirror://xorg/individual/app/xinput-1.6.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2
+mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2
 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2
+mirror://xorg/individual/app/xkill-1.0.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.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/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/X11R7.7/src/everything/xprop-1.2.1.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xproto-7.0.23.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xrandr-1.3.5.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xrdb-1.0.9.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xrefresh-1.0.4.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xset-1.2.2.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/app/xrandr-1.4.1.tar.bz2
+mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2
+mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2
+mirror://xorg/individual/app/xset-1.2.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2
 mirror://xorg/individual/lib/xtrans-1.3.3.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xvinfo-1.1.1.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xwd-1.0.5.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xwininfo-1.1.2.tar.bz2
+mirror://xorg/individual/app/xvinfo-1.1.2.tar.bz2
+mirror://xorg/individual/app/xwd-1.0.6.tar.bz2
+mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2
-- 
GitLab


From eac9324034f2e86962cb8832d0944863b148b805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 14 Mar 2014 12:32:38 +0100
Subject: [PATCH 2356/3789] xorg: fixup after the update

All that built before update builds now again (and glamor-egl is new).
---
 pkgs/servers/x11/xorg/overrides.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8b2617f0621..ead54a58a6b 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -37,6 +37,10 @@ in
       '';
   };
 
+  glamoregl = attrs: attrs // {
+    installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d";
+  };
+
   imake = attrs: attrs // {
     inherit (xorg) xorgcffiles;
     x11BuildHook = ./imake.sh;
@@ -158,7 +162,7 @@ in
 
   xf86inputsynaptics = attrs: attrs // {
     buildInputs = attrs.buildInputs ++ [args.mtdev];
-    installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/include/xorg";
+    installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d";
   };
 
   xf86inputvmmouse = attrs: attrs // {
@@ -169,6 +173,10 @@ in
     ];
   };
 
+  xf86videoati = attrs: attrs // {
+    NIX_CFLAGS_COMPILE = "-I${xorg.glamoregl}/include/xorg";
+  };
+
   xf86videonv = attrs: attrs // {
     patches = [( args.fetchurl {
       url = http://cgit.freedesktop.org/xorg/driver/xf86-video-nv/patch/?id=fc78fe98222b0204b8a2872a529763d6fe5048da;
@@ -209,13 +217,6 @@ in
     '';
   };
 
-  xmodmap = attrs: attrs // {
-    patches = [(args.fetchurl {
-      url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-apps/xmodmap/files/xmodmap-1.0.7-_GNU_SOURCE.patch;
-      sha256 = "0q3zhy0wy1kkbpagzav8869fais4lw5q5vybgjj7wkmak06c5648";
-      name = "new-gcc.patch";
-    })];
-  };
   xorgserver = with xorg; attrs: attrs // {
     configureFlags = [
       "--enable-xcsecurity" # enable SECURITY extension
@@ -277,6 +278,6 @@ in
   };
 
   xwd = attrs: attrs // {
-    buildInputs = attrs.buildInputs ++ [xorg.libXt];
+    buildInputs = with xorg; attrs.buildInputs ++ [libXt libxkbfile];
   };
 }
-- 
GitLab


From a245aeaef1a311c3a1b84d2259a55ee0b19b1480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 16 Mar 2014 18:46:20 +0100
Subject: [PATCH 2357/3789] nixos ati: support glamor, disabled by default

This is from @ambrop72 #1969.
---
 nixos/modules/services/x11/xserver.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 2677f758456..f422bc0cd2a 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -20,6 +20,7 @@ let
     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 ]; };
   };
 
   driverNames = config.hardware.opengl.videoDrivers;
@@ -372,6 +373,14 @@ in
         '';
       };
 
+      useGlamor = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to use the Glamor module for 2D acceleration,
+          if possible.
+        '';
+      };
     };
 
   };
@@ -523,6 +532,13 @@ in
           '')}
         EndSection
 
+        ${if cfg.useGlamor then ''
+          Section "Module"
+            Load "dri2"
+            Load "glamoregl"
+          EndSection
+        '' else ""}
+
         # For each supported driver, add a "Device" and "Screen"
         # section.
         ${flip concatMapStrings drivers (driver: ''
@@ -530,6 +546,7 @@ in
           Section "Device"
             Identifier "Device-${driver.name}[0]"
             Driver "${driver.driverName}"
+            ${if cfg.useGlamor then ''Option "AccelMethod" "glamor"'' else ""}
             ${cfg.deviceSection}
             ${xrandrDeviceSection}
           EndSection
-- 
GitLab


From ad8adf12a40ababfce6a0aba38be3dfd1b60a152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 17 Mar 2014 22:04:03 +0100
Subject: [PATCH 2358/3789] mesa: major update to 10.0.4, seems to work finally

---
 pkgs/development/libraries/mesa/default.nix   |  16 +-
 .../libraries/mesa/dricore-gallium.patch      | 216 ------------------
 pkgs/development/libraries/mesa/rtti.patch    |  72 ++++++
 .../libraries/mesa/static-gallium.patch       |   9 +-
 .../libraries/mesa/werror-wundef.patch        |  12 -
 pkgs/top-level/all-packages.nix               |   2 +-
 6 files changed, 83 insertions(+), 244 deletions(-)
 delete mode 100644 pkgs/development/libraries/mesa/dricore-gallium.patch
 create mode 100644 pkgs/development/libraries/mesa/rtti.patch
 delete mode 100644 pkgs/development/libraries/mesa/werror-wundef.patch

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 68333892fd4..1018a0e31f3 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,8 +23,8 @@ else
 */
 
 let
-  version = "9.2.5";
-  # this is the default search path for DRI drivers (note: X server no longer introduces an overriding env var)
+  version = "10.0.4";
+  # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
 with { inherit (stdenv.lib) optional optionals optionalString; };
@@ -34,21 +34,23 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "1w3bxclgwl2hwyxk3za7dbdakb8jsya7afck35cz0v8pxppvjsml";
+    sha256 = "0h2sq8h0l7415vsqfkb7mn1rxm62m2anpi9swlca69fbpr9bavpz";
   };
 
   prePatch = "patchShebangs .";
 
   patches = [
     ./static-gallium.patch
-    ./dricore-gallium.patch
-    ./werror-wundef.patch
+   # TODO: revive ./dricore-gallium.patch when it gets ported (from Ubuntu),
+   #  as it saved ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog
   ];
 
   # Change the search path for EGL drivers from $drivers/* to driverLink
   postPatch = ''
     sed '/D_EGL_DRIVER_SEARCH_DIR=/s,EGL_DRIVER_INSTALL_DIR,${driverLink}/lib/egl,' \
       -i src/egl/main/Makefile.am
+  '' + /* work around RTTI LLVM problems */ ''
+    patch -R -p1 < ${./rtti.patch}
   '';
 
   outputs = ["out" "drivers" "osmesa"];
@@ -70,7 +72,7 @@ stdenv.mkDerivation {
 
     "--with-dri-drivers=i965,r200,radeon"
     "--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,radeonsi"
-    "--with-egl-platforms=x11,wayland,drm" "--enable-gbm" "--enable-shared-glapi"
+    "--with-egl-platforms=x11,wayland,drm" "--enable-gbm"
   ]
     ++ optional enableTextureFloats "--enable-texture-float"
     ++ optionals enableExtraFeatures [
@@ -94,7 +96,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
   #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672,
-    # also, 10.* links bad due to some RTTI problem
+    #tests for 10.* fail to link due to some RTTI problem
 
   # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM;
   #   also move libOSMesa to $osmesa, as it's relatively big
diff --git a/pkgs/development/libraries/mesa/dricore-gallium.patch b/pkgs/development/libraries/mesa/dricore-gallium.patch
deleted file mode 100644
index 9a8b6768277..00000000000
--- a/pkgs/development/libraries/mesa/dricore-gallium.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-commit 5208f187c7dade2c33385a56c1a5f1c3cedc8377 (HEAD, nix-patches)
-Author: Vladimír Čunát <vcunat@gmail.com>
-Date:   Mon May 13 11:34:59 2013 +0200
-
-    118-dricore-gallium.patch
-
-diff --git a/configure.ac b/configure.ac
-index be89843..08f6761 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -928,6 +928,8 @@ AC_SUBST([GLESv2_LIB_DEPS])
- AC_SUBST([GLESv2_PC_LIB_PRIV])
- 
- DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la"
-+MESAGALLIUM_LIBS="${DRI_LIB_DEPS}"
-+AC_SUBST([MESAGALLIUM_LIBS], ${MESAGALLIUM_LIBS})
- 
- AC_SUBST([HAVE_XF86VIDMODE])
- 
-diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
-index 3cdec83..53ff69b 100644
---- a/src/gallium/auxiliary/Makefile.am
-+++ b/src/gallium/auxiliary/Makefile.am
-@@ -34,14 +34,14 @@ if LLVM_NEEDS_FNORTTI
- 
- AM_CXXFLAGS += -fno-rtti
- 
--libgallium_la_LIBADD = $(LLVM_LIBS)
--
- endif
- 
- libgallium_la_SOURCES += \
- 	$(GALLIVM_SOURCES) \
- 	$(GALLIVM_CPP_SOURCES)
- 
-+libgallium_la_LIBADD = ../../mesa/libdricore/libmesagallium.la $(LLVM_LIBS) $(GALLIUM_DRI_LIB_DEPS)
-+
- endif
- 
- indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py
-diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am
-index f4f9030..e9b9462 100644
---- a/src/gallium/targets/dri-i915/Makefile.am
-+++ b/src/gallium/targets/dri-i915/Makefile.am
-@@ -49,7 +49,7 @@ i915_dri_la_SOURCES = \
- i915_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
- 
- i915_dri_la_LIBADD = \
--	$(top_builddir)/src/mesa/libmesagallium.la \
-+	@MESAGALLIUM_LIBS@ \
- 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
- 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
- 	$(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
-diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am
-index 69ccf32..fef4c63 100644
---- a/src/gallium/targets/dri-nouveau/Makefile.am
-+++ b/src/gallium/targets/dri-nouveau/Makefile.am
-@@ -48,7 +48,7 @@ nouveau_dri_la_SOURCES = \
- nouveau_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
- 
- nouveau_dri_la_LIBADD = \
--	$(top_builddir)/src/mesa/libmesagallium.la \
-+	@MESAGALLIUM_LIBS@ \
- 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
- 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
- 	$(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
-diff --git a/src/gallium/targets/dri-r300/Makefile.am b/src/gallium/targets/dri-r300/Makefile.am
-index 8c0215d..6beb536 100644
---- a/src/gallium/targets/dri-r300/Makefile.am
-+++ b/src/gallium/targets/dri-r300/Makefile.am
-@@ -49,7 +49,7 @@ r300_dri_la_SOURCES = \
- r300_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
- 
- r300_dri_la_LIBADD = \
--	$(top_builddir)/src/mesa/libmesagallium.la \
-+	@MESAGALLIUM_LIBS@ \
- 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
- 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
- 	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
-diff --git a/src/gallium/targets/dri-r600/Makefile.am b/src/gallium/targets/dri-r600/Makefile.am
-index 2b3524b..d40fb89 100644
---- a/src/gallium/targets/dri-r600/Makefile.am
-+++ b/src/gallium/targets/dri-r600/Makefile.am
-@@ -48,7 +48,7 @@ r600_dri_la_SOURCES = \
- r600_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
- 
- r600_dri_la_LIBADD = \
--	$(top_builddir)/src/mesa/libmesagallium.la \
-+	@MESAGALLIUM_LIBS@ \
- 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
- 	$(top_builddir)/src/gallium/drivers/r600/libr600.la \
- 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
-diff --git a/src/gallium/targets/dri-radeonsi/Makefile.am b/src/gallium/targets/dri-radeonsi/Makefile.am
-index f7d87a6..87ab2aa 100644
---- a/src/gallium/targets/dri-radeonsi/Makefile.am
-+++ b/src/gallium/targets/dri-radeonsi/Makefile.am
-@@ -49,7 +49,7 @@ radeonsi_dri_la_SOURCES = \
- radeonsi_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
- 
- radeonsi_dri_la_LIBADD = \
--	$(top_builddir)/src/mesa/libmesagallium.la \
-+	@MESAGALLIUM_LIBS@ \
- 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
- 	$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
- 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
-diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am
-index 1104379..72d2401 100644
---- a/src/gallium/targets/dri-swrast/Makefile.am
-+++ b/src/gallium/targets/dri-swrast/Makefile.am
-@@ -49,7 +49,7 @@ swrast_dri_la_SOURCES = \
- swrast_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
- 
- swrast_dri_la_LIBADD = \
--	$(top_builddir)/src/mesa/libmesagallium.la \
-+	@MESAGALLIUM_LIBS@ \
- 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
- 	$(top_builddir)/src/gallium/state_trackers/dri/sw/libdrisw.la \
- 	$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
-diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am
-index ca7df65..4384976 100644
---- a/src/gallium/targets/dri-vmwgfx/Makefile.am
-+++ b/src/gallium/targets/dri-vmwgfx/Makefile.am
-@@ -48,7 +48,7 @@ vmwgfx_dri_la_SOURCES = \
- vmwgfx_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
- 
- vmwgfx_dri_la_LIBADD = \
--	$(top_builddir)/src/mesa/libmesagallium.la \
-+	@MESAGALLIUM_LIBS@ \
- 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
- 	$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
- 	$(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
-diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
-index 5c40ae8..6922ab2 100644
---- a/src/gallium/targets/egl-static/Makefile.am
-+++ b/src/gallium/targets/egl-static/Makefile.am
-@@ -104,7 +104,7 @@ AM_CPPFLAGS += \
- 	$(API_DEFINES)
- 
- egl_gallium_la_LIBADD += \
--	$(top_builddir)/src/mesa/libmesagallium.la
-+	@MESAGALLIUM_LIBS@
- # make st/mesa built-in when there is a single glapi provider
- if HAVE_SHARED_GLAPI
- egl_gallium_la_LIBADD += \
-diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
-index 41483dd..0045a673 100644
---- a/src/mesa/Makefile.am
-+++ b/src/mesa/Makefile.am
-@@ -75,9 +75,6 @@ noinst_LTLIBRARIES += libmesa.la
- else
- check_LTLIBRARIES = libmesa.la
- endif
--if HAVE_GALLIUM
--noinst_LTLIBRARIES += libmesagallium.la
--endif
- 
- SRCDIR = $(top_srcdir)/src/mesa/
- BUILDDIR = $(top_builddir)/src/mesa/
-@@ -119,15 +116,6 @@ libmesa_la_LIBADD = \
-         $()
- libmesa_la_LDFLAGS =
- 
--libmesagallium_la_SOURCES = \
--	$(MESA_GALLIUM_FILES) \
--        $(MESA_ASM_FILES_FOR_ARCH)
--
--libmesagallium_la_LIBADD = \
--        $(top_builddir)/src/glsl/libglsl.la \
--        $(top_builddir)/src/mesa/program/libprogram.la \
--        $()
--
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = gl.pc
- 
-diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
-index 753548e..8761418 100644
---- a/src/mesa/libdricore/Makefile.am
-+++ b/src/mesa/libdricore/Makefile.am
-@@ -42,6 +42,7 @@ libdricore@VERSION@_la_SOURCES = \
- libdricore@VERSION@_la_LDFLAGS = -version-number 1:0
- libdricore@VERSION@_la_LIBADD = \
-         ../program/libdricore_program.la \
-+        $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-         $()
- 
- if HAVE_X86_ASM
-@@ -65,8 +66,10 @@ AM_CPPFLAGS += \
-         -I$(top_srcdir)/src/mesa/sparc
- endif
- 
-+lib_LTLIBRARIES =
-+
- if HAVE_DRI
--lib_LTLIBRARIES = libdricore@VERSION@.la
-+lib_LTLIBRARIES += libdricore@VERSION@.la
- 
- # Provide compatibility with scripts for the old Mesa build system for
- # a while by putting a link to the driver into /lib of the build tree.
-@@ -76,6 +79,17 @@ all-local: libdricore@VERSION@.la
- 	ln -sf libdricore@VERSION@.so.1 $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so
- endif
- 
-+libmesagallium_la_SOURCES = \
-+	$(STATETRACKER_FILES)
-+libmesagallium_la_CFLAGS = @LLVM_CFLAGS@
-+libmesagallium_la_CXXFLAGS = @LLVM_CXXFLAGS@
-+libmesagallium_la_LIBADD = libdricore@VERSION@.la $(LLVM_LIBS)
-+
-+if HAVE_GALLIUM
-+noinst_LTLIBRARIES = libmesagallium.la
-+endif
-+
-+
- CLEANFILES = \
- 	$(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so.1 \
- 	$(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so
diff --git a/pkgs/development/libraries/mesa/rtti.patch b/pkgs/development/libraries/mesa/rtti.patch
new file mode 100644
index 00000000000..6b123139013
--- /dev/null
+++ b/pkgs/development/libraries/mesa/rtti.patch
@@ -0,0 +1,72 @@
+http://lists.freedesktop.org/archives/mesa-dev/2013-October/046311.html
+
+* As discussed on the mailing list,
+  forced no-rtti breaks C++ public
+  API's such as the Haiku C++ libGL.so
+* -fno-rtti *can* be still set however
+  instead of blindly forcing -fno-rtti,
+  we can rely on the llvm-config
+  --cppflags output.
+  If the system llvm is built without
+  rtti (default), the no-rtti flag will be
+  present in llvm-config --cppflags
+  (which we pick up on)
+  If llvm is built with rtti
+  (REQUIRES_RTTI=1), then -fno-rtti is
+  removed from llvm-config --cppflags.
+* We could selectively add / remove rtti
+  from various components, however mixing
+  rtti and non-rtti code is tricky and
+  could introduce bugs.
+* This needs impact tested.
+---
+ configure.ac                      | 1 -
+ scons/llvm.py                     | 3 ---
+ src/gallium/auxiliary/Makefile.am | 6 ------
+ 3 files changed, 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0d082d2..3335575 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1943,7 +1943,6 @@ AM_CONDITIONAL(HAVE_LOADER_GALLIUM, test x$enable_gallium_loader = xyes)
+ AM_CONDITIONAL(HAVE_DRM_LOADER_GALLIUM, test x$enable_gallium_drm_loader = xyes)
+ AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes)
+ AM_CONDITIONAL(HAVE_MESA_LLVM, test x$MESA_LLVM = x1)
+-AM_CONDITIONAL(LLVM_NEEDS_FNORTTI, test $LLVM_VERSION_INT -ge 302)
+ 
+ AC_SUBST([ELF_LIB])
+ 
+diff --git a/scons/llvm.py b/scons/llvm.py
+index 7cd609c..c1c3736 100644
+--- a/scons/llvm.py
++++ b/scons/llvm.py
+@@ -195,9 +195,6 @@ def generate(env):
+             if llvm_version >= distutils.version.LooseVersion('3.1'):
+                 components.append('mcjit')
+ 
+-            if llvm_version >= distutils.version.LooseVersion('3.2'):
+-                env.Append(CXXFLAGS = ('-fno-rtti',))
+-
+             env.ParseConfig('llvm-config --libs ' + ' '.join(components))
+             env.ParseConfig('llvm-config --ldflags')
+         except OSError:
+diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
+index 670e124..2d2d8d4 100644
+--- a/src/gallium/auxiliary/Makefile.am
++++ b/src/gallium/auxiliary/Makefile.am
+@@ -25,12 +25,6 @@ AM_CXXFLAGS += \
+ 	$(GALLIUM_CFLAGS) \
+ 	$(LLVM_CXXFLAGS)
+ 
+-if LLVM_NEEDS_FNORTTI
+-
+-AM_CXXFLAGS += -fno-rtti
+-
+-endif
+-
+ libgallium_la_SOURCES += \
+ 	$(GALLIVM_SOURCES) \
+ 	$(GALLIVM_CPP_SOURCES)
+-- 
+1.8.4
diff --git a/pkgs/development/libraries/mesa/static-gallium.patch b/pkgs/development/libraries/mesa/static-gallium.patch
index 755682d9f1e..bb3f60eaf88 100644
--- a/pkgs/development/libraries/mesa/static-gallium.patch
+++ b/pkgs/development/libraries/mesa/static-gallium.patch
@@ -1,11 +1,4 @@
-commit 2c910b6f186616cac8134e2a2cbe239c8351ed99
-Author: Vladimír Čunát <vcunat@gmail.com>
-Date:   Mon May 13 11:34:34 2013 +0200
-
-    117-static-gallium.patch
-    
-    Conflicts (moving of VISIBILITY_ confused the merge):
-    	src/gallium/auxiliary/Makefile.am
+117-static-gallium.patch from Ubuntu Trusty
 
 diff --git a/configure.ac b/configure.ac
 index b9fcb0b..be89843 100644
diff --git a/pkgs/development/libraries/mesa/werror-wundef.patch b/pkgs/development/libraries/mesa/werror-wundef.patch
deleted file mode 100644
index 4663f68bd7d..00000000000
--- a/pkgs/development/libraries/mesa/werror-wundef.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN Mesa-9.2.0-orig/include/GL/gl.h Mesa-9.2.0/include/GL/gl.h
---- Mesa-9.2.0-orig/include/GL/gl.h	2013-08-14 03:34:42.000000000 +0200
-+++ Mesa-9.2.0/include/GL/gl.h	2013-09-24 19:34:58.319140812 +0200
-@@ -2088,7 +2088,7 @@ typedef void (APIENTRYP PFNGLMULTITEXCOO
- 
- 
- 
--#if GL_ARB_shader_objects
-+#if defined(GL_ARB_shaders_objects) && GL_ARB_shader_objects
- 
- #ifndef GL_MESA_shader_debug
- #define GL_MESA_shader_debug 1
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0ba9b3c29e..10faa642844 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5252,7 +5252,7 @@ let
 
   mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
 
-  mesa_original = callPackage ../development/libraries/mesa { llvm = llvm_33; };
+  mesa_original = callPackage ../development/libraries/mesa { };
   mesa_noglu = if stdenv.isDarwin
     then darwinX11AndOpenGL // { driverLink = mesa_noglu; }
     else mesa_original;
-- 
GitLab


From aa48fc9b284fa1a2e042eccef862c6aafe30a293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 18 Mar 2014 09:56:24 +0100
Subject: [PATCH 2359/3789] gtk2: bugfix update 2.24.22 -> .23

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

diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index fdc2c675847..92c6debaa66 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
-  name = "gtk+-2.24.22";
+  name = "gtk+-2.24.23";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz";
-    sha256 = "0zxf810znlk80j230rbr0xscx3gm71jmf2bdiamg76rqzglvc55i";
+    sha256 = "0z2ic7fma1lmmv4ncgki3vadqp7d0qkj2d235impsplvgvi0d950";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 968c0e5dbd280c1111856710e126a009ce3335a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 19 Mar 2014 20:55:31 +0100
Subject: [PATCH 2360/3789] harfbuzz: minor update 0.9.26 -> .27

---
 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 227ac58bda5..f564c4bf1bd 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.26";
+  name = "harfbuzz-0.9.27";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "0mz220qv3xn3lk1v94q1wgykayxnas94n8ks1liwkdazs71pvvax";
+    sha256 = "1ns7njbm45fjbc9p7gcpjc606ax120ab0i9cbx6v3mcq3kllln08";
   };
 
   configureFlags = [
-- 
GitLab


From 150102ce30e6c58f66bc0bd555e4e4bbdfd27d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 19 Mar 2014 21:45:13 +0100
Subject: [PATCH 2361/3789] xorg.libFS: maintenance update 1.0.5 -> .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 27791429418..2a04ab54b32 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -560,11 +560,11 @@ let
   })) // {inherit applewmproto libX11 libXext xextproto ;};
 
   libFS = (stdenv.mkDerivation ((if overrides ? libFS then overrides.libFS else x: x) {
-    name = "libFS-1.0.5";
+    name = "libFS-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libFS-1.0.5.tar.bz2;
-      sha256 = "01v1z6hy702pcxz89kqb84w9gjjrvnjqsxc2zzvswlw0vl2k1sr2";
+      url = mirror://xorg/individual/lib/libFS-1.0.6.tar.bz2;
+      sha256 = "1mxfsvj9m3pn8cdkcn4kg190zp665mf4pv0083g6xykvsgxzq1wh";
     };
     buildInputs = [pkgconfig fontsproto xproto xtrans ];
   })) // {inherit fontsproto xproto xtrans ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 84ab8196122..4d035bdf775 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -54,7 +54,7 @@ mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2
 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2
 mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2
 mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2
-mirror://xorg/individual/lib/libFS-1.0.5.tar.bz2
+mirror://xorg/individual/lib/libFS-1.0.6.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2
 mirror://xorg/individual/lib/libpciaccess-0.13.2.tar.bz2
 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2
-- 
GitLab


From 65155c20d585eb1d3b2084cac23303d9ad61b0b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 19 Mar 2014 22:02:18 +0100
Subject: [PATCH 2362/3789] automake: update from 1.12.4 to 1.12.6

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

diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix
index 8bee4790bcb..269d423f2fa 100644
--- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
 
 stdenv.mkDerivation rec {
-  name = "automake-1.12.4";
+  name = "automake-1.12.6";
 
   # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is
   # available upstream; see
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/automake/${name}.tar.xz";
-    sha256 = "0wppdm0wfizs6nmiwlkigcmh2pn33dywdkl7b407j3pvwn622vsi";
+    sha256 = "1ynvca8z4aqcwr94rf7j1bfiid2w9w250y9qhnyj9vmi8lhsnd7q";
   };
 
   buildInputs = [perl autoconf makeWrapper];
-- 
GitLab


From 23464b3241454ad9d29e20fc078a54fcf59dc5ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 21 Mar 2014 11:59:57 +0100
Subject: [PATCH 2363/3789] Making more programs use readline63.

Specially those I use.
---
 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 f0ba9b3c29e..984188e2371 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3237,6 +3237,7 @@ let
     suitesparse = null;
     openjdk = null;
     gnuplot = null;
+    readline = readline63;
   };
   octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
     fltk = fltk13;
@@ -3857,6 +3858,7 @@ let
 
   gdb = callPackage ../development/tools/misc/gdb {
     hurd = gnu.hurdCross;
+    readline = readline63;
     inherit (gnu) mig;
   };
 
-- 
GitLab


From 6a60fc3bddf43fb33d50462e511cfdbc0c57f000 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 21 Mar 2014 12:02:35 +0100
Subject: [PATCH 2364/3789] solr module: Activate JSP support in Winstone

Required by older versions of solr. The JSP support
in Winstone seems spotty, but at one point we'll switch
over to Jetty instead.
---
 nixos/modules/services/search/solr.nix | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix
index eab18c4229b..a79b1194c80 100644
--- a/nixos/modules/services/search/solr.nix
+++ b/nixos/modules/services/search/solr.nix
@@ -6,6 +6,26 @@ let
 
   cfg = config.services.solr;
 
+  # Assemble all jars needed for solr
+  solrJars = pkgs.stdenv.mkDerivation {
+    name = "solr-jars";
+
+    src = pkgs.fetchurl {
+      url = http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/bin/apache-tomcat-5.5.36.tar.gz;
+      sha256 = "01mzvh53wrs1p2ym765jwd00gl6kn8f9k3nhdrnhdqr8dhimfb2p";
+    };
+
+    buildPhases = [ "unpackPhase" "installPhase" ];
+
+    installPhase = ''
+      mkdir -p $out/lib
+      cp common/lib/*.jar $out/lib/
+      ln -s ${pkgs.ant}/lib/ant/lib/ant.jar $out/lib/
+      ln -s ${cfg.solrPackage}/lib/ext/* $out/lib/
+      ln -s ${pkgs.openjdk}/lib/openjdk/lib/tools.jar $out/lib/
+    '';
+  };
+
 in {
 
   options = {
@@ -101,7 +121,8 @@ in {
       inherit (cfg) user group javaPackage;
       warFile = "${cfg.solrPackage}/lib/solr.war";
       extraOptions = [
-        "--commonLibFolder=${cfg.solrPackage}/lib/ext"
+        "--commonLibFolder=${solrJars}/lib"
+        "--useJasper"
       ] ++ cfg.extraWinstoneOptions;
       extraJavaOptions = [
         "-Dsolr.solr.home=${cfg.solrHome}"
-- 
GitLab


From 0ea398ecbe5f7ce815d1ede45fd9b0b9ac3d55b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 21 Mar 2014 12:26:13 +0100
Subject: [PATCH 2365/3789] telnet: fix broken download

---
 pkgs/tools/networking/telnet/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix
index c0dbf710ffb..9827b62c6c4 100644
--- a/pkgs/tools/networking/telnet/default.nix
+++ b/pkgs/tools/networking/telnet/default.nix
@@ -4,7 +4,8 @@ stdenv.mkDerivation {
   name = "telnet-1.2";
 
   src = fetchurl {
-    url = ftp://ftp.suse.com/pub/people/kukuk/ipv6/telnet-bsd-1.2.tar.bz2;
+    #url = ftp://ftp.suse.com/pub/people/kukuk/ipv6/telnet-bsd-1.2.tar.bz2; # broken
+    url = mirror://gentoo/distfiles/telnet-bsd-1.2.tar.bz2;
     sha256 = "0cs7ks22dhcn5qfjv2vl6ikhw93x68gg33zdn5f5cxgg81kx5afn";
   };
 
-- 
GitLab


From f2026c16fd24d95eec8379e4d607d4de411daf21 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 21 Mar 2014 13:11:38 +0100
Subject: [PATCH 2366/3789] elasticsearch: update from 1.0.0 to 1.0.1,
 potentially fixes CVE-2013-5307, CVE-2013-6804

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

diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix
index 165a01517b4..c6939ce5f7a 100644
--- a/pkgs/servers/search/elasticsearch/default.nix
+++ b/pkgs/servers/search/elasticsearch/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, makeWrapper, jre, utillinux }:
 stdenv.mkDerivation rec {
-  name = "elasticsearch-1.0.0";
+  name = "elasticsearch-1.0.1";
 
   src = fetchurl {
     url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz";
-    sha256 = "06ym7hl47339a5dav2hawnxv820y0lbvh9xxd0lfp1f815vbql01";
+    sha256 = "0nwv7llw7gk94alfcpxxy0lybhnw7fggv30v7ylsxn20id9g7kba";
   };
 
   patches = [ ./es-home.patch ];
-- 
GitLab


From 94990a593590970de22bbe4dddc3f53133b0b110 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 21 Mar 2014 13:12:52 +0100
Subject: [PATCH 2367/3789] tomcat6: update from 6.0.37 to 6.0.39, potentially
 fixes CVE-2013-4286, CVE-2013-4322, CVE-2013-4590, CVE-2014-0033

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

diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix
index d8304ba4dbe..ee0049ce08f 100644
--- a/pkgs/servers/http/tomcat/6.0.nix
+++ b/pkgs/servers/http/tomcat/6.0.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "6.0.37"; in
+let version = "6.0.39"; in
 
 stdenv.mkDerivation rec {
   name = "apache-tomcat-${version}";
 
   src = fetchurl {
     url = "mirror://apache/tomcat/tomcat-6/v${version}/bin/${name}.tar.gz";
-    sha256 = "000v63amhbyp8nkw3a4pff1vm4nxri5n9j7rknhnqaxzab3sp49y";
+    sha256 = "19qix6affhc252n03smjf482drg3nxd27shni1gvhphgj3zfmgfy";
   };
 
   installPhase =
-- 
GitLab


From 5f27ed59f092a48d637a597285c2da9a72d00d30 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 21 Mar 2014 13:13:11 +0100
Subject: [PATCH 2368/3789] rabbitmq_server: update from 3.2.1 to 3.2.4,
 potentially fixes CVE-2012-3582, CVE-2013-4674

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

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 4bb05a23faf..45a6c2189db 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "rabbitmq-server-${version}";
 
-  version = "3.2.1";
+  version = "3.2.4";
 
   src = fetchurl {
     url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz";
-    sha256 = "0j9yx64sdgkv0h20zjs65aa2ag6wwv50i6hd3x69m0cc6shzcc0f";
+    sha256 = "17rvqhzcb7rscp228vmgixk0rsqi42m820jzxj9g5wid6qmzjc59";
   };
 
   buildInputs =
-- 
GitLab


From 8edc5f9999026fe206b34815004488f9b6eb75e0 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Fri, 21 Mar 2014 13:26:03 +0100
Subject: [PATCH 2369/3789] weechat: Backport fix for freeze with gnutls 3.2.

Fixes /exit when using gnutls 3.2. This is a temporary solution as 3.1
isn't building right now. The next release of weechat will include this
fix.
---
 .../networking/irc/weechat/default.nix           |  7 +++++++
 .../networking/irc/weechat/fix-gnutls-32.diff    | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix                  |  5 +----
 3 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 89b437acc90..b47018e0d97 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -17,6 +17,13 @@ stdenv.mkDerivation rec {
       cacert cmake
     ];
 
+  # This patch is based on
+  # weechat/c324610226cef15ecfb1235113c8243b068084c8. It fixes
+  # freeze/crash on /exit when using nixpkgs' gnutls 3.2. The next
+  # weechat release (0.4.4) will include this, so it's safe to remove
+  # then.
+  patches = [ ./fix-gnutls-32.diff ];
+
   postInstall = ''
        wrapProgram "$out/bin/weechat" \
          --prefix PYTHONPATH : "$PYTHONPATH" \
diff --git a/pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff b/pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff
new file mode 100644
index 00000000000..56e357c8f7d
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff
@@ -0,0 +1,16 @@
+diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
+index 325c611..a8927bc 100644
+--- a/src/gui/curses/CMakeLists.txt
++++ b/src/gui/curses/CMakeLists.txt
+@@ -53,9 +53,7 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+   ENDIF(HAVE_BACKTRACE)
+ ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+ 
+-IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+-  LIST(APPEND EXTRA_LIBS "pthread")
+-ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
++LIST(APPEND EXTRA_LIBS "pthread")
+ 
+ IF(ICONV_LIBRARY)
+   LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 984188e2371..968ef26d29e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9215,10 +9215,7 @@ let
     graphicsSupport = false;
   };
 
-  weechat = callPackage ../applications/networking/irc/weechat {
-    # weechat doesn't exit with gnutls32. Use 3.1 for now.
-    gnutls = gnutls31;
-  };
+  weechat = callPackage ../applications/networking/irc/weechat { };
 
   weston = callPackage ../applications/window-managers/weston { };
 
-- 
GitLab


From f3f6f04c7d64030fdaaf97cdd381c23b3faeae0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 21 Mar 2014 13:46:31 +0100
Subject: [PATCH 2370/3789] fix eval after e4961c6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 968ef26d29e..fb5dd9b490e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6769,6 +6769,7 @@ let
 
   linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
     inherit fetchurl stdenv perl buildLinux;
+    kernelPatches = [];
   };
 
   grsecurityOverrider = args: {
-- 
GitLab


From af6c571a7e6784526bd97587bf900d2546acf6e9 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 21 Mar 2014 14:55:42 +0100
Subject: [PATCH 2371/3789] Increase size of GCE image. Use disk.raw as name
 inside tar.gz, as this is compulsory.

---
 .../modules/virtualisation/google-compute-image.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 634932ff007..1439c26b071 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -1,7 +1,9 @@
 { config, pkgs, ... }:
 
 with pkgs.lib;
-
+let
+  diskSize = "200G";
+in
 {
   imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ];
 
@@ -12,7 +14,7 @@ with pkgs.lib;
             ''
               mkdir $out
               diskImage=$out/$diskImageBase
-              truncate $diskImage --size 10G
+              truncate $diskImage --size ${diskSize}
               mv closure xchg/
             '';
 
@@ -20,8 +22,9 @@ with pkgs.lib;
             ''
               PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin
               pushd $out
-              tar -Szcf $diskImageBase.tar.gz $diskImageBase
-              rm $out/$diskImageBase
+              mv $diskImageBase disk.raw
+              tar -Szcf $diskImageBase.tar.gz disk.raw
+              rm $out/disk.raw
               popd
             '';
           diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
@@ -32,7 +35,7 @@ with pkgs.lib;
         ''
           # Create partition table
           ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
-          ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 10G
+          ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize}
           ${pkgs.parted}/sbin/parted /dev/vda print
           . /sys/class/block/vda1/uevent
           mknod /dev/vda1 b $MAJOR $MINOR
-- 
GitLab


From 5115636037f182b5d9cb5a2d668ee675838e91dd Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 21 Mar 2014 16:02:03 +0200
Subject: [PATCH 2372/3789] bluez5: update from 5.12 to 5.16

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

diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index 4938f7f4470..ffa91e951a8 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -5,11 +5,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "bluez-5.12";
+  name = "bluez-5.16";
    
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
-    sha256 = "0zk183gjsxissq9gma962cyvyqxydai8n6jgslxx0mpk2m7mgvvm";
+    sha256 = "0qxivd64az3qziw82axj2ksilllxq4fnb6fdrnlxr6d74550kmf8";
   };
 
   pythonPath = with pythonPackages;
@@ -71,6 +71,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.bluez.org/;
+    repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git;
     description = "Bluetooth support for Linux";
     platforms = platforms.linux;
   };
-- 
GitLab


From 020d3b299c7fe8694409b92b9d29e96abf7aad10 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 21 Mar 2014 15:17:49 +0100
Subject: [PATCH 2373/3789] Make the GCE image use 100G as disk size (maximum).

---
 nixos/modules/virtualisation/google-compute-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 1439c26b071..5fca115b819 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -2,7 +2,7 @@
 
 with pkgs.lib;
 let
-  diskSize = "200G";
+  diskSize = "100G";
 in
 {
   imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ];
-- 
GitLab


From 00cfc70b107a70f11370a2bd3f05bdeb5545172b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 21 Mar 2014 15:38:18 +0100
Subject: [PATCH 2374/3789] linux: update to 3.12.14 and 3.10.33

---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.12.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 748611ab1b5..4c6e01271fb 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.31";
+  version = "3.10.33";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1nz8203avjjin3sivx6h6ddsramk37vp02g9lw2ix3hxji0lsz1m";
+    sha256 = "0pdrzhdylan87nrhpz9dxx3da0008hkch4k1cjw46gg2jmxcryhh";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index d276de69446..e2ec7295a5f 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.13";
+  version = "3.12.14";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "08r4k64v0nkr0dnmir3n3x7f4i83akl3ahx9cl7rbj29zc4ninmd";
+    sha256 = "1fv5mr8y5kn7077brajgv6l4shs8044i6pkh6phv7ms5ywacbllx";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 9db587bf7dff8190afd004dcc597a06a34e52c39 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 21 Mar 2014 05:23:54 +0100
Subject: [PATCH 2375/3789] grsecurity: Update stable and test patches

stable: 3.0-3.2.55-201403172027 -> 3.0-3.2.55-201403202347
test:   3.0-3.13.6-201403172032 -> 3.0-3.13.6-201403202349
---
 pkgs/os-specific/linux/kernel/patches.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index d7c9e126598..a41290168fe 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -75,8 +75,8 @@ rec {
   grsecurity_3_0_3_2_55 =
     { name = "grsecurity-3.0-3.2.55";
       patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403172027.patch;
-        sha256 = "1ik8xa9xgy9ghlb66rz04rdj64c8914vpv847zld7zhhih90lfm8";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403202347.patch;
+        sha256 = "19fwbpnfgq7iylrd0akazmh349xvxc9saxcsiqzhficfrsc4fyd3";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55
@@ -86,8 +86,8 @@ rec {
   grsecurity_3_0_3_13_6 =
     { name = "grsecurity-3.0-3.13.6";
       patch = fetchurl {
-        url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403172032.patch;
-        sha256 = "18gr6r11gv015y6nb2zvv3z8kb4zv9gadhlcdii6il0c2y4bsrsb";
+        url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403202349.patch;
+        sha256 = "0a1alz46k1g9nryx7qb040v5zf09ax7shj5wb0xj58gfpm67g86p";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.6
-- 
GitLab


From f63d2dba0ab6b095d37b2ffa397b229fa09b9286 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 21 Mar 2014 15:42:58 +0100
Subject: [PATCH 2376/3789] pax-utils: Update from 0.7 -> 0.8.1

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

diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index 8d58873d5c1..83f0dc1e82d 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pax-utils-${version}";
-  version = "0.7";
+  version = "0.8.1";
 
   src = fetchurl {
     url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz";
-    sha256 = "111vmwn0ikrmy3s0w3rzpbzwrphawljrmcjya0isg5yam7lwxi0s";
+    sha256 = "1fgm70s52x48dxjihs0rcwmpfsi2dxbjzcilxy9fzg0i39dz4kw4";
   };
 
   makeFlags = [
-- 
GitLab


From d33544129f513a6beaa979ec11a2ce27d31baea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 19 Mar 2014 16:40:07 +0100
Subject: [PATCH 2377/3789] easyrsa: symlink correct openssl config

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

diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix
index bb59bb5b165..e49c32aac70 100644
--- a/pkgs/tools/networking/easyrsa/default.nix
+++ b/pkgs/tools/networking/easyrsa/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
 
   # Make sane defaults and patch default config vars
   postInstall = ''
+    cp $out/share/easy-rsa/openssl-1.0.0.cnf $out/share/easy-rsa/openssl.cnf
     for prog in $(find "$out/share/easy-rsa" -executable -type f); do
       makeWrapper "$prog" "$out/bin/$(basename $prog)" \
         --set EASY_RSA "$out/share/easy-rsa" \
-- 
GitLab


From 917498001fb49c82c3bf0dfd533a40f3b4dbc6d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 21 Mar 2014 18:01:18 +0100
Subject: [PATCH 2378/3789] almir: correctly set PYTHONPATH

---
 nixos/modules/services/backup/almir.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/backup/almir.nix b/nixos/modules/services/backup/almir.nix
index d5bc932c6b9..8fdcdd6c7be 100644
--- a/nixos/modules/services/backup/almir.nix
+++ b/nixos/modules/services/backup/almir.nix
@@ -154,7 +154,8 @@ in {
       description = "Almir web app";
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.pythonPackages.almir ];
-      serviceConfig.ExecStart = "${pkgs.pythonPackages.almir}/bin/pserve ${productionini}";
+      environment.PYTHONPATH = "${pkgs.pythonPackages.almir}/lib/${pkgs.pythonPackages.python.libPrefix}/site-packages";
+      serviceConfig.ExecStart = "${pkgs.pythonPackages.pyramid}/bin/pserve ${productionini}";
     };
 
     environment.systemPackages = [ pkgs.pythonPackages.almir ];
-- 
GitLab


From d7bd83d0ae2ba1fccca8029593db3c06d882a3d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 21 Mar 2014 18:02:06 +0100
Subject: [PATCH 2379/3789] shotwell: 0.15.1 -> 0.18

---
 pkgs/applications/graphics/shotwell/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 2cb86a3f1e6..2a3ed77609f 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkit
 , pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils
-, lcms2, gdk_pixbuf, librsvg, makeWrapper }:
+, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils }:
 
 # for dependencies see http://www.yorba.org/projects/shotwell/install/
 
@@ -18,12 +18,12 @@ let
     buildInputs = [ pkgconfig glib libsoup ];
   };
 in stdenv.mkDerivation rec {
-  version = "0.15.1";
+  version = "0.18.0";
   name = "shotwell-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/shotwell/0.15/${name}.tar.xz";
-    sha256 = "12qbqba226q9wb0m31xx8w0m968sr1n18qa4mbz75wblhwws0j7b";
+    url = "mirror://gnome/sources/shotwell/0.18/${name}.tar.xz";
+    sha256 = "0cq0zs13f3f4xyz46yvj4qfpm5nh4ypds7r53pkqm4a3n8ybf5v7";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
@@ -37,14 +37,14 @@ in stdenv.mkDerivation rec {
   postInstall = ''
     wrapProgram "$out/bin/shotwell" \
      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-     --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share"
+     --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gsettings_desktop_schemas}/share:${gtk3}/share:$out/share"
   '';
 
 
   buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkit pkgconfig
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2
                   libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
-                  makeWrapper ];
+                  makeWrapper gnome_doc_utils ];
 
   meta = with stdenv.lib; {
     description = "Popular photo organizer for the GNOME desktop";
-- 
GitLab


From 584d6969439432fb8ff802ee81dc9b2e4a9e8e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 21 Mar 2014 18:08:07 +0100
Subject: [PATCH 2380/3789] ike: also specify lib64 libs

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

diff --git a/pkgs/applications/ike/default.nix b/pkgs/applications/ike/default.nix
index 7bba42152e8..d595cb60da8 100644
--- a/pkgs/applications/ike/default.nix
+++ b/pkgs/applications/ike/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     make install
     for file in "$out"/bin/* "$out"/sbin/*; do
-        wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.gcc}/lib:${libedit}/lib:${qt4}/lib"
+        wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.gcc}/lib:${stdenv.glibc}/lib::${gcc.gcc}/lib64:${stdenv.glibc}/lib64:${libedit}/lib:${qt4}/lib"
     done
   '';
 
-- 
GitLab


From 774d179790d5e062bfa2e6322d6d6d751ceed2b7 Mon Sep 17 00:00:00 2001
From: Jacob Hinkle <jacob.hinkle@gmail.com>
Date: Fri, 21 Mar 2014 12:07:56 -0600
Subject: [PATCH 2381/3789] Started default.nix for slrn. Not finding slang

---
 .../networking/newsreaders/slrn/default.nix   | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/networking/newsreaders/slrn/default.nix

diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix
new file mode 100644
index 00000000000..3a4a7d65c84
--- /dev/null
+++ b/pkgs/applications/networking/newsreaders/slrn/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgs
+, slang
+}:
+
+let version = "1.0.1"; in
+
+stdenv.mkDerivation {
+  name = "slrn-${version}";
+
+  src = fetchurl {
+    url = "http://www.jedsoft.org/slrn/download/slrn-1.0.1.tar.gz";
+    sha256 = "1rmaprfwvshzkv0c5vi43839cz3laqjpl306b9z0ghwyjdha1d06";
+  };
+
+  nativeBuildInputs = [ slang ];
+
+  meta = {
+    description = "The slrn (S-Lang read news) newsreader";
+    homepage = http://slrn.sourceforge.net/index.html;
+    license = pkgs.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb5dd9b490e..10df9bbd986 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8905,6 +8905,8 @@ let
 
   skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { };
 
+  slrn = callPackage ../applications/networking/newsreaders/slrn { };
+
   ssvnc = callPackage ../applications/networking/remote/ssvnc { };
 
   st = callPackage ../applications/misc/st {
-- 
GitLab


From 715b90f784ca6e753bd78116dffddaf7a5a6b326 Mon Sep 17 00:00:00 2001
From: Jacob Hinkle <jacob.hinkle@gmail.com>
Date: Fri, 21 Mar 2014 14:32:21 -0600
Subject: [PATCH 2382/3789] Update default.nix to use ncurses and patch
 hardcoded paths

---
 .../networking/newsreaders/slrn/default.nix       | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix
index 3a4a7d65c84..e079e9d9a9f 100644
--- a/pkgs/applications/networking/newsreaders/slrn/default.nix
+++ b/pkgs/applications/networking/newsreaders/slrn/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgs
-, slang
+{ stdenv, fetchurl, pkgs,
+slang, ncurses
 }:
 
 let version = "1.0.1"; in
@@ -12,7 +12,16 @@ stdenv.mkDerivation {
     sha256 = "1rmaprfwvshzkv0c5vi43839cz3laqjpl306b9z0ghwyjdha1d06";
   };
 
-  nativeBuildInputs = [ slang ];
+  preConfigure = ''
+    sed -i -e "s|-ltermcap|-lncurses|" configure
+    sed -i autoconf/Makefile.in src/Makefile.in \
+      -e "s|/bin/cp|cp|"  \
+      -e "s|/bin/rm|rm|"
+  '';
+
+  configureFlags = "--with-slang=${slang}";
+
+  buildInputs = [ slang ncurses ];
 
   meta = {
     description = "The slrn (S-Lang read news) newsreader";
-- 
GitLab


From 5f5a2d38b3924e053bcfb9396ea286e42127e69b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 21 Mar 2014 16:32:21 -0500
Subject: [PATCH 2383/3789] pcsclite: Update from 1.8.10 -> 1.8.11

---
 pkgs/tools/security/pcsclite/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index d069c183842..a386d05707c 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl }:
 
 stdenv.mkDerivation rec {
-  version = "1.8.10";
+  version = "1.8.11";
   name = "pcsclite-${version}";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/file/3963/pcsc-lite-${version}.tar.bz2";
-    sha256 = "04i63zi9ayg38z3cahp6gf3rgx23w17bmcpdccm2hvaj63blnz30";
+    url = "https://alioth.debian.org/frs/download.php/file/3991/pcsc-lite-${version}.tar.bz2";
+    sha256 = "945041c94c53959ae5a767616a4ec5099fe67f549bfd344e8bd0cfe7a3c71ac6";
   };
 
   # The OS should care on preparing the drivers into this location
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Middleware to access a smart card using SCard API (PC/SC)";
     homepage = http://pcsclite.alioth.debian.org/;
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [viric];
+    platforms = with platforms; linux;
   };
 }
-- 
GitLab


From a7077973a50908f46f796fc85c390d5306e67dd8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 21 Mar 2014 16:36:49 -0500
Subject: [PATCH 2384/3789] ccid: Update from 1.4.14 -> 1.4.15

---
 pkgs/tools/security/ccid/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index 4be2393eed5..7d218f49623 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
 stdenv.mkDerivation rec {
-  version = "1.4.14";
+  version = "1.4.15";
   name = "ccid-${version}";
 
   src = fetchurl {
-    url = "http://ftp.de.debian.org/debian/pool/main/c/ccid/ccid_${version}.orig.tar.bz2";
-    sha256 = "0inibkhzk4ghg85jkysscjrzshmxfdzz6b54dqj182l0isn082y5";
+    url = "https://alioth.debian.org/frs/download.php/file/3989/${name}.tar.bz2";
+    sha256 = "5436182246f15b3e78b1ad6707022b02dc400e3f50c4cb5e5d340a4e716d990a";
   };
 
   patchPhase = ''
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pcsclite pkgconfig libusb1 ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "ccid drivers for pcsclite";
     homepage = http://pcsclite.alioth.debian.org/;
-    license = "GPLv2+";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [viric];
+    platforms = with platforms; linux;
   };
 }
-- 
GitLab


From 155dc472d8e260f5c1ddb3b1c9d05cc036efedfd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 21 Mar 2014 17:52:24 -0500
Subject: [PATCH 2385/3789] pcscd: Convert to systemd + Fix config file

---
 nixos/modules/services/hardware/pcscd.nix | 31 ++++++++++++-----------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix
index 9f389efc06d..6d429c94b28 100644
--- a/nixos/modules/services/hardware/pcscd.nix
+++ b/nixos/modules/services/hardware/pcscd.nix
@@ -1,5 +1,9 @@
 { config, pkgs, ... }:
 
+let
+  cfgFile = pkgs.writeText "reader.conf" "";
+in
+
 with pkgs.lib;
 
 {
@@ -24,22 +28,19 @@ with pkgs.lib;
 
   config = mkIf config.services.pcscd.enable {
 
-    jobs.pcscd =
-      { description = "PCSC-Lite daemon";
-
-        startOn = "started udev";
-
-        daemonType = "fork";
-
-        # Add to the drivers directory the only drivers we have by now: ccid
-        preStart = ''
-            mkdir -p /var/lib/pcsc
-            rm -Rf /var/lib/pcsc/drivers
-            ln -s ${pkgs.ccid}/pcsc/drivers /var/lib/pcsc/
-        '';
-
-        exec = "${pkgs.pcsclite}/sbin/pcscd";
+    systemd.services.pcscd = {
+      description = "PCSC-Lite daemon";
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+          mkdir -p /var/lib/pcsc
+          rm -Rf /var/lib/pcsc/drivers
+          ln -s ${pkgs.ccid}/pcsc/drivers /var/lib/pcsc/
+      '';
+      serviceConfig = {
+        Type = "forking";
+        ExecStart = "${pkgs.pcsclite}/sbin/pcscd -c ${cfgFile}";
       };
+    };
 
   };
 
-- 
GitLab


From f7498e5a7ee46e8f8d17450397ef2dd129e2c9a5 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 22 Mar 2014 01:12:48 -0300
Subject: [PATCH 2386/3789] Adding info about maintainer (myself -
 AndersonTorres) and modifying the meta.license field for some packages I have
 made.

---
 lib/maintainers.nix                                   | 1 +
 pkgs/applications/video/aegisub/default.nix           | 7 ++++++-
 pkgs/applications/video/mpv/default.nix               | 3 ++-
 pkgs/applications/virtualization/8086tiny/default.nix | 3 ++-
 pkgs/applications/virtualization/bochs/default.nix    | 3 ++-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8d6c613fd0f..07414a9ad3a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -9,6 +9,7 @@
   all = "Nix Committers <nix-commits@lists.science.uu.nl>";
   amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
   amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>";
+  AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>";
   andres = "Andres Loeh <ksnixos@andres-loeh.de>";
   antono = "Antono Vasiljev <self@antono.info>";
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index cbbb23b04a0..fa17fb5ffd2 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -53,7 +53,12 @@ stdenv.mkDerivation rec {
       built-in real-time video preview.
     '';
     homepage = http://www.aegisub.org/;
-    license = "BSD"; # The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd softwares
+    license = stdenv.lib.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 = [ maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
+
   };
 }
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index a20dc0cf590..2ffefa35898 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -118,7 +118,8 @@ stdenv.mkDerivation rec {
     mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both.
     '';
     homepage = "http://mpv.io";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix
index 0b4ff90e409..ca93a1bfd7c 100644
--- a/pkgs/applications/virtualization/8086tiny/default.nix
+++ b/pkgs/applications/virtualization/8086tiny/default.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
     8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :)
     '';
     homepage = http://www.megalith.co.uk/8086tiny/index.html;
-    license = "MIT";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index 6b8cf5dc035..7b49bb8220d 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -56,7 +56,8 @@ stdenv.mkDerivation rec {
     Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, written in C++, that runs on most popular platforms. It includes emulation of the Intel x86 CPU, common I/O devices, and a custom BIOS.
     '';
     homepage = http://bochs.sourceforge.net/;
-    license = "LGPL";
+    license = stdenv.lib.licenses.lgpl2Plus;
+    maintainers = [ maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From 357f61b3fade629fa264f93126df2777005d43a3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:42:52 +0100
Subject: [PATCH 2387/3789] haskell-HaRe: update to version 0.7.1.5

---
 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 6c128c25073..a5d6794f318 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.1.4";
-  sha256 = "000vdvm38a3d3jpjg3cgsfl11w8jzvl0haqz78fy3zblqlndxy1m";
+  version = "0.7.1.5";
+  sha256 = "1xfgvqhnlpmfljad790sdjyqlq684751i7bdfw1wvbzmw7gdyafc";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From b722d4f3ffcb73f3c9fe647175d763b26e303bdf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:44:24 +0100
Subject: [PATCH 2388/3789] haskell-testing-feat: add version 0.4.0.1

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

diff --git a/pkgs/development/libraries/haskell/testing-feat/default.nix b/pkgs/development/libraries/haskell/testing-feat/default.nix
new file mode 100644
index 00000000000..5e6a8177d1a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/testing-feat/default.nix
@@ -0,0 +1,13 @@
+{ cabal, mtl, QuickCheck, tagshare }:
+
+cabal.mkDerivation (self: {
+  pname = "testing-feat";
+  version = "0.4.0.1";
+  sha256 = "1fqp5k8kwnn7qqggyy5scsxmkvd1pibc5sfs7v1myrp0azkc25cp";
+  buildDepends = [ mtl QuickCheck tagshare ];
+  meta = {
+    description = "Functional Enumeration of Algebraic 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 247d8649ed6..d3094af7687 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2407,6 +2407,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   testFrameworkThPrime = callPackage ../development/libraries/haskell/test-framework-th-prime {};
 
+  testingFeat = callPackage ../development/libraries/haskell/testing-feat {};
+
   texmath = callPackage ../development/libraries/haskell/texmath {};
 
   text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {};
-- 
GitLab


From ac40eeb9b341d74f0818c73d6a77e4b240eea9f5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:44:32 +0100
Subject: [PATCH 2389/3789] haskell-tagshare: add version 0.0

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

diff --git a/pkgs/development/libraries/haskell/tagshare/default.nix b/pkgs/development/libraries/haskell/tagshare/default.nix
new file mode 100644
index 00000000000..be56d518121
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tagshare/default.nix
@@ -0,0 +1,13 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "tagshare";
+  version = "0.0";
+  sha256 = "1q3chp1rmwmxa8rxv7548wsvbqbng6grrnv1587p08385sp4ncfj";
+  buildDepends = [ mtl ];
+  meta = {
+    description = "TagShare - explicit sharing with tags";
+    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 d3094af7687..88fe001a0cf 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2357,6 +2357,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   tagged = callPackage ../development/libraries/haskell/tagged {};
 
+  tagshare = callPackage ../development/libraries/haskell/tagshare {};
+
   tagsoup = callPackage ../development/libraries/haskell/tagsoup {};
 
   tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {};
-- 
GitLab


From a18d18a4246524924f4b25b74648bbf13427b4c3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:44:41 +0100
Subject: [PATCH 2390/3789] haskell-cryptohash-conduit: add version 0.1.0

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

diff --git a/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix b/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix
new file mode 100644
index 00000000000..501edf03ae0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix
@@ -0,0 +1,14 @@
+{ cabal, conduit, cryptohash, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "cryptohash-conduit";
+  version = "0.1.0";
+  sha256 = "08x45dy5crxc63gd4psryrzprz7lc5hbzjl23q56c3iqbvrx2r7w";
+  buildDepends = [ conduit cryptohash transformers ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-cryptohash-conduit";
+    description = "cryptohash 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 88fe001a0cf..4fdc5058f5f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -860,6 +860,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   cryptohash = callPackage ../development/libraries/haskell/cryptohash {};
 
+  cryptohashConduit = callPackage ../development/libraries/haskell/cryptohash-conduit {};
+
   cryptohashCryptoapi = callPackage ../development/libraries/haskell/cryptohash-cryptoapi {};
 
   cryptoNumbers = callPackage ../development/libraries/haskell/crypto-numbers {};
-- 
GitLab


From a88067e6da4059b5532537dd4732ab3b81326727 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:44:50 +0100
Subject: [PATCH 2391/3789] haskell-dlist-instances: add version 0.1

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

diff --git a/pkgs/development/libraries/haskell/dlist-instances/default.nix b/pkgs/development/libraries/haskell/dlist-instances/default.nix
new file mode 100644
index 00000000000..d168c4b3583
--- /dev/null
+++ b/pkgs/development/libraries/haskell/dlist-instances/default.nix
@@ -0,0 +1,14 @@
+{ cabal, dlist, semigroups }:
+
+cabal.mkDerivation (self: {
+  pname = "dlist-instances";
+  version = "0.1";
+  sha256 = "0r1j7djywqd7c224wc9ixkplj3m2mbf9k3ra7n92ja2kfpksm615";
+  buildDepends = [ dlist semigroups ];
+  meta = {
+    homepage = "https://github.com/gregwebs/dlist-instances";
+    description = "Difference lists instances";
+    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 4fdc5058f5f..15ba3d01161 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -990,6 +990,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   dlist = callPackage ../development/libraries/haskell/dlist {};
 
+  dlistInstances = callPackage ../development/libraries/haskell/dlist-instances {};
+
   dns = callPackage ../development/libraries/haskell/dns {};
 
   doctest = callPackage ../development/libraries/haskell/doctest {};
-- 
GitLab


From f4f93bf701e4e01fe64ad02634d5cb9b5808eeb6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:44:56 +0100
Subject: [PATCH 2392/3789] haskell-Glob: update to version 0.7.4

---
 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 80c0eaa44ab..d6f07e9168d 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.3";
-  sha256 = "0yl0wxbd03dv0hfr2aqwm9f3xnhjkdicymqv3nmhjjslqq3a59zd";
+  version = "0.7.4";
+  sha256 = "00f6xznqh27vbr8rggsrdphqsq1cvv931pa06b1grs7w01dcmw8s";
   buildDepends = [ dlist filepath transformers ];
   meta = {
     homepage = "http://iki.fi/matti.niemenmaa/glob/";
-- 
GitLab


From a802d4ef14bc59c4fa78e30827f615fde6330706 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:44:58 +0100
Subject: [PATCH 2393/3789] haskell-HaXml: update to version 1.24.1

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

diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix
index b490cf75d96..996437cbeac 100644
--- a/pkgs/development/libraries/haskell/HaXml/default.nix
+++ b/pkgs/development/libraries/haskell/HaXml/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HaXml";
-  version = "1.24";
-  sha256 = "18kvavqa84k2121ppxngn39fjz4w63chngb3255w1fhdz13v3ydn";
+  version = "1.24.1";
+  sha256 = "1pvqgczksxasayvdb6d4g7ya7g7w1v9hsa35kaxm9bcic9y8q9az";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath polyparse random ];
-- 
GitLab


From a9738e5cd1ca34e3e13b88073189c49ab0d48f4b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:00 +0100
Subject: [PATCH 2394/3789] haskell-arithmoi: update to version 0.4.0.4

---
 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 181937fdd80..082745fadf0 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.3";
-  sha256 = "0idn312xzly636h13zmm7cw7ki64bpnniqc97nshqzgp8if5ycrc";
+  version = "0.4.0.4";
+  sha256 = "1v8qn0gjvlds6ljm9sfzzi5w3gsf7x63z0r7hcs1rvn0n3acwz6y";
   buildDepends = [ mtl random ];
   meta = {
     homepage = "https://bitbucket.org/dafis/arithmoi";
-- 
GitLab


From 053391eba5e42ba34680df9e7a0fefdfdcf0d0a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:01 +0100
Subject: [PATCH 2395/3789] haskell-conduit-combinators: update to version
 0.2.1

---
 .../haskell/conduit-combinators/default.nix     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
index 5d1fa791c69..0c9ccbd8f35 100644
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -1,19 +1,20 @@
 { cabal, basicPrelude, chunkedData, conduit, hspec, monoTraversable
-, primitive, silently, systemFileio, systemFilepath, text
-, transformers, transformersBase, vector
+, mwcRandom, primitive, silently, systemFileio, systemFilepath
+, text, transformers, transformersBase, vector, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.2.0.1";
-  sha256 = "0hmy398kk37n5l4pacb2a0z9h9f1kl6vva9gsph1kiqnnz7sbr4r";
+  version = "0.2.1";
+  sha256 = "0v3b9wiziyynk00fk07nwrk3c032wyr0adrwlkjl89ma1ix220sv";
   buildDepends = [
-    chunkedData conduit monoTraversable primitive systemFileio
-    systemFilepath text transformers transformersBase vector
+    chunkedData conduit monoTraversable mwcRandom primitive
+    systemFileio systemFilepath text transformers transformersBase
+    vector void
   ];
   testDepends = [
-    basicPrelude chunkedData hspec monoTraversable silently text
-    transformers vector
+    basicPrelude chunkedData hspec monoTraversable mwcRandom silently
+    text transformers vector
   ];
   meta = {
     homepage = "https://github.com/fpco/conduit-combinators";
-- 
GitLab


From c9de5a7000c9a5941ad3f70a301738458a6ef1bc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:03 +0100
Subject: [PATCH 2396/3789] haskell-css-text: update to version 0.1.2.1

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

diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix
index 2cb78af7ba9..9ab9b9f5d2d 100644
--- a/pkgs/development/libraries/haskell/css-text/default.nix
+++ b/pkgs/development/libraries/haskell/css-text/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "css-text";
-  version = "0.1.2.0.1";
-  sha256 = "0j8d9kfs9j01gqlapaahyziphkx0f55g9bbz2wwix1si7954xxhp";
+  version = "0.1.2.1";
+  sha256 = "1xi1n2f0g8y43p95lynhcg50wxbq7hqfzbfzm7fy8mn7gvd920nw";
   buildDepends = [ attoparsec text ];
   testDepends = [ attoparsec hspec QuickCheck text ];
   meta = {
-- 
GitLab


From 833f782e7ff5fbb001fbec999e55b47ffb6a0fb4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:05 +0100
Subject: [PATCH 2397/3789] haskell-diagrams-cairo: update to version 1.1.0.1

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

diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index c38346d189b..421859dbdaa 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-cairo";
-  version = "1.1";
-  sha256 = "0x66qdwni3pwc2lrqy5jnyz7nqbfpr1086g1ndy6cxx8hp632zaf";
+  version = "1.1.0.1";
+  sha256 = "04s3z3j3xqx4q4chdysip2ngjbw4k7gd12s5zlbvx88d3jg0bcrs";
   buildDepends = [
     cairo colour dataDefaultClass diagramsCore diagramsLib filepath
     hashable JuicyPixels lens mtl optparseApplicative split statestack
-- 
GitLab


From e658482fcc2bbf70867f4f49604d795ab94c4588 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:07 +0100
Subject: [PATCH 2398/3789] haskell-diagrams-lib: update to version 1.1.0.2

---
 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 32385655426..d8180bfbda4 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.1";
-  sha256 = "0zkxkncz8ayvahr57fgq44vgir3yghxs2y1rrp138951fcy2g3a7";
+  version = "1.1.0.2";
+  sha256 = "1kfzf9cjb74vpfdjargjy8hg0rdhvry96f9ysmya3j7ws8lqrwdh";
   buildDepends = [
     active colour dataDefaultClass diagramsCore filepath fingertree
     hashable intervals lens MemoTrie monoidExtras optparseApplicative
-- 
GitLab


From b4fa83f5fbe819d5d6b0c2058dcb73be64a88377 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:09 +0100
Subject: [PATCH 2399/3789] haskell-diagrams-postscript: update to version
 1.0.2.1

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

diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix
index a7f85f98b09..ebd7294de3d 100644
--- a/pkgs/development/libraries/haskell/diagrams/postscript.nix
+++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-postscript";
-  version = "1.0.2";
-  sha256 = "14y8wivgxs3qvybzqk1bfqsrs5457qd5br7nk1924si5gpsgp1xx";
+  version = "1.0.2.1";
+  sha256 = "0c3svrkv2wyls1mb75gzv9nfjy0vgfw4bshd6q6z036jn75q9y0r";
   buildDepends = [
     dataDefaultClass diagramsCore diagramsLib dlist filepath hashable
     lens monoidExtras mtl semigroups split vectorSpace
-- 
GitLab


From 99537a00cc87e97a7c6fdbed8acdae9477615083 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:11 +0100
Subject: [PATCH 2400/3789] haskell-dlist: update to version 0.7

---
 pkgs/development/libraries/haskell/dlist/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix
index 547ea9f8a47..f87e7e2d758 100644
--- a/pkgs/development/libraries/haskell/dlist/default.nix
+++ b/pkgs/development/libraries/haskell/dlist/default.nix
@@ -1,9 +1,10 @@
-{ cabal, Cabal, QuickCheck }:
+{ cabal, Cabal, deepseq, QuickCheck }:
 
 cabal.mkDerivation (self: {
   pname = "dlist";
-  version = "0.6.0.1";
-  sha256 = "08q8dsczh59a0ii3nqk6yqz70msd0pndjjcg9dzq8iyknbbqbi45";
+  version = "0.7";
+  sha256 = "1abbym3afm77xkgcrv3d9nl4wn69m7m3gxahdcvkg1ir1sm2pkyi";
+  buildDepends = [ deepseq ];
   testDepends = [ Cabal QuickCheck ];
   meta = {
     homepage = "https://github.com/spl/dlist";
-- 
GitLab


From 79d51a59c14ec90d41dbe96c0b3f109bcc223525 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:12 +0100
Subject: [PATCH 2401/3789] haskell-dsp: update to version 0.2.3

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

diff --git a/pkgs/development/libraries/haskell/dsp/default.nix b/pkgs/development/libraries/haskell/dsp/default.nix
index c1315a23817..c16a6888b6b 100644
--- a/pkgs/development/libraries/haskell/dsp/default.nix
+++ b/pkgs/development/libraries/haskell/dsp/default.nix
@@ -2,8 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "dsp";
-  version = "0.2.2";
-  sha256 = "0vb71z8iky3xl40b9d79z7krq960ykcgn3y8lks3wzgiabbh2d89";
+  version = "0.2.3";
+  sha256 = "1h7y3b2gwbkq97lv6f9a4zssyqs422g5zj2bi9mq1a5fzy5i4v4v";
+  isLibrary = true;
+  isExecutable = true;
   buildDepends = [ random ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/DSP";
-- 
GitLab


From 30117ea592f92ffe2e63abdd86416c03fc6cdaf6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:14 +0100
Subject: [PATCH 2402/3789] haskell-fay: update to version 0.19.1.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 d945298d228..ec5f0a48b87 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.1";
-  sha256 = "05h4jmwy1wzgps1an1df5b4gic91xlm884mv6nqnazvpbnn23d5b";
+  version = "0.19.1.1";
+  sha256 = "1jjv7l4x1bxr4whhcn4vh4b3ac4wfnb6l322jmdj60nh9sj8dzpf";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 3d1e229413cc1796cb862e7e52f3170ec5c3bfe1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:16 +0100
Subject: [PATCH 2403/3789] haskell-gnuplot: update to version 0.5.2.2

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

diff --git a/pkgs/development/libraries/haskell/gnuplot/default.nix b/pkgs/development/libraries/haskell/gnuplot/default.nix
index 14655677c6f..f835410dbbd 100644
--- a/pkgs/development/libraries/haskell/gnuplot/default.nix
+++ b/pkgs/development/libraries/haskell/gnuplot/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gnuplot";
-  version = "0.5.2.1";
-  sha256 = "1bzj7z803mxyxfv2123swvdv78gh5dbrf8ldc6iziry3fz5q8nb1";
+  version = "0.5.2.2";
+  sha256 = "0l5hi346bhs9w11i3z6yy4mcr3k50xcp3j31g6wza9grxlfqc5av";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From a1e3866a165108ad08de4b5046c733aa4aa2c9bf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:18 +0100
Subject: [PATCH 2404/3789] haskell-heist: update to version 0.13.1

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

diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix
index 718f2088ff2..77ebf3fd9af 100644
--- a/pkgs/development/libraries/haskell/heist/default.nix
+++ b/pkgs/development/libraries/haskell/heist/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "heist";
-  version = "0.13.0.6";
-  sha256 = "1h34bmcb9bqkagcx3iqnp4l8z8qhngf00mki4hpk905znja6hib9";
+  version = "0.13.1";
+  sha256 = "0v9c5hhybn617nmjswqkjrf7bjb5073achfi05ivw1gblbvsj0ir";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
     filepath hashable MonadCatchIOTransformers mtl random text time
-- 
GitLab


From 891a497aa1cd917c70bb57ea8eff256c8c62c6c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:20 +0100
Subject: [PATCH 2405/3789] haskell-http-reverse-proxy: update to version
 0.3.1.1

---
 .../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 3605425436e..1e1b0117a2f 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.3.1";
-  sha256 = "1xayhjrs6nm7gm5xc6z6vhzi9iq5czdvpywamkncivjsxjlc50b8";
+  version = "0.3.1.1";
+  sha256 = "02aksdkwhdxzc4kk7j3npbiqpm9px3yva0375mk1b1f2g552g5jj";
   buildDepends = [
     async basicPrelude blazeBuilder caseInsensitive conduit
     dataDefaultClass httpClient httpTypes liftedBase monadControl
-- 
GitLab


From 17b59a84c35063cc9aac3ad56521509c57d5c1b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:22 +0100
Subject: [PATCH 2406/3789] haskell-language-ecmascript: update to version 0.16

---
 .../libraries/haskell/language-ecmascript/default.nix    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-ecmascript/default.nix b/pkgs/development/libraries/haskell/language-ecmascript/default.nix
index 77165ef104d..79404ffbcf0 100644
--- a/pkgs/development/libraries/haskell/language-ecmascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-ecmascript/default.nix
@@ -1,14 +1,15 @@
 { cabal, dataDefaultClass, Diff, filepath, HUnit, mtl, parsec
 , QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, uniplate, wlPprint
+, testFrameworkQuickcheck2, testingFeat, uniplate, wlPprint
 }:
 
 cabal.mkDerivation (self: {
   pname = "language-ecmascript";
-  version = "0.15.4";
-  sha256 = "1drivy75lvrwjx7irdbnnqp7y6mbzbm2pbxy7zzc1nfln6g3k9x7";
+  version = "0.16";
+  sha256 = "1gz0089llxfmq9v2j5hp85h7w2vw50sgbl6dcd7i0s8m5zd3dmqg";
   buildDepends = [
-    dataDefaultClass Diff mtl parsec QuickCheck uniplate wlPprint
+    dataDefaultClass Diff mtl parsec QuickCheck testingFeat uniplate
+    wlPprint
   ];
   testDepends = [
     dataDefaultClass Diff filepath HUnit mtl parsec QuickCheck
-- 
GitLab


From c358085c417cc069e63866fd896d0703a770239f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:23 +0100
Subject: [PATCH 2407/3789] haskell-mono-traversable: update to version 0.4.0.3

---
 .../haskell/mono-traversable/default.nix          | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix
index 5119863500d..a1de3e9ad16 100644
--- a/pkgs/development/libraries/haskell/mono-traversable/default.nix
+++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix
@@ -1,15 +1,16 @@
-{ cabal, comonad, foldl, hashable, hspec, QuickCheck, semigroupoids
-, semigroups, text, transformers, unorderedContainers, vector
-, vectorAlgorithms, vectorInstances
+{ cabal, comonad, dlist, dlistInstances, foldl, hashable, hspec
+, QuickCheck, semigroupoids, semigroups, text, transformers
+, unorderedContainers, vector, vectorAlgorithms, vectorInstances
 }:
 
 cabal.mkDerivation (self: {
   pname = "mono-traversable";
-  version = "0.4.0.1";
-  sha256 = "049skbjwz49c9qz2nys2hn6pc4gqn1a91b5kl9z6hjs9fnaic6ng";
+  version = "0.4.0.3";
+  sha256 = "04g2ihk4n71zrz09si2k8j46y53i5vllps9xizgs0bmikmrgh29f";
   buildDepends = [
-    comonad hashable semigroupoids semigroups text transformers
-    unorderedContainers vector vectorAlgorithms vectorInstances
+    comonad dlist dlistInstances hashable semigroupoids semigroups text
+    transformers unorderedContainers vector vectorAlgorithms
+    vectorInstances
   ];
   testDepends = [
     foldl hspec QuickCheck semigroups text transformers
-- 
GitLab


From 912492268030120986f4d9a2f0d3264d6efdc1f0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:29 +0100
Subject: [PATCH 2408/3789] haskell-pipes-attoparsec: update to version 0.5.0

---
 .../libraries/haskell/pipes-attoparsec/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
index 7204286671e..d886d17478b 100644
--- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-attoparsec";
-  version = "0.4.0.1";
-  sha256 = "0f536x0l135b5pd14l6lri7kinwh2m4p7qw054lacw362y7004zf";
+  version = "0.5.0";
+  sha256 = "1xpqna850lxawx0m84lzaxwrwfw4vccr7jjf199ir7bmwwhqlr5h";
   buildDepends = [ attoparsec pipes pipesParse text transformers ];
   testDepends = [
     attoparsec HUnit mmorph pipes pipesParse tasty tastyHunit text
-- 
GitLab


From a727d1480be80f01cd6ef0734359f69b9c74940d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:31 +0100
Subject: [PATCH 2409/3789] haskell-recaptcha: update to version 0.1.0.1

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

diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix
index 37fb26208f4..0d7b9d709c6 100644
--- a/pkgs/development/libraries/haskell/recaptcha/default.nix
+++ b/pkgs/development/libraries/haskell/recaptcha/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "recaptcha";
-  version = "0.1";
-  sha256 = "de00e6e3aadd99a1cd036ce4b413ebe02d59c1b9cfd3032f122735cca1f25144";
+  version = "0.1.0.1";
+  sha256 = "0mk2vdvm5jz8jh8xc4alsly8c9msfis0drbgg89rck1y387z2njz";
   buildDepends = [ HTTP network xhtml ];
   meta = {
     homepage = "http://github.com/jgm/recaptcha/tree/master";
-- 
GitLab


From 0ed61e69f1ee036ecc3e84a71667c168159d9f93 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:33 +0100
Subject: [PATCH 2410/3789] haskell-resourcet: update to version 0.4.10.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 913e77483e4..cb554314752 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 = "0.4.10";
-  sha256 = "0mgwcgacf4ilyh54s862p8jqv1f42dkp287sdkpswyai1pxlvipz";
+  version = "0.4.10.1";
+  sha256 = "05skxqxhbmsyjn72w1c9n924d865wxadfsxlavk0nmbd7ygmnazb";
   buildDepends = [
     liftedBase mmorph monadControl mtl transformers transformersBase
   ];
-- 
GitLab


From 68cd345c344947f588b928dc6232ecd10f771f64 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:34 +0100
Subject: [PATCH 2411/3789] haskell-scotty: update to version 0.7.0

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

diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
index e51c2a7a64c..69a3aae5696 100644
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "scotty";
-  version = "0.6.2";
-  sha256 = "0szki6wcmhj20kxhmgidgf930xwhiq03qrk8m0x8aklcjzkhvy69";
+  version = "0.7.0";
+  sha256 = "0j08zjm8ndkpq5mrmh6rj6zc733irf7kyikw8nww754r40y6kps2";
   buildDepends = [
     aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes
     mtl regexCompat text transformers wai waiExtra warp
-- 
GitLab


From 6b5721c2b6fbe51d68b7a3f573306137fd759822 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:36 +0100
Subject: [PATCH 2412/3789] haskell-wai-app-static: update to version 2.0.0.4

---
 .../haskell/wai-app-static/default.nix        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 412fd3f16e6..009ae99daa8 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -1,19 +1,19 @@
 { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup
-, cereal, cryptoApi, cryptoConduit, cryptohashCryptoapi, fileEmbed
-, filepath, hspec, httpDate, httpTypes, mimeTypes, network
-, systemFileio, systemFilepath, text, time, transformers
-, unixCompat, unorderedContainers, wai, waiTest, zlib
+, byteable, cryptohash, cryptohashConduit, fileEmbed, filepath
+, hspec, httpDate, httpTypes, mimeTypes, network, systemFileio
+, systemFilepath, text, time, transformers, unixCompat
+, unorderedContainers, wai, waiTest, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "2.0.0.3";
-  sha256 = "0anbmp6wjk1qba1skr08fkm5y9lm58kfghzcgzgx8hrid7w85fb7";
+  version = "2.0.0.4";
+  sha256 = "1dk1s2q8w2rvknknw54ja2jhm1nayp8zpyis1zhgnl4yjgwr5kld";
   buildDepends = [
-    base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal
-    cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed filepath
-    httpDate httpTypes mimeTypes systemFileio systemFilepath text time
-    transformers unixCompat unorderedContainers wai zlib
+    base64Bytestring blazeBuilder blazeHtml blazeMarkup byteable
+    cryptohash cryptohashConduit fileEmbed filepath httpDate httpTypes
+    mimeTypes systemFileio systemFilepath text time transformers
+    unixCompat unorderedContainers wai zlib
   ];
   testDepends = [
     hspec httpDate httpTypes mimeTypes network text time transformers
-- 
GitLab


From f3568bf38d326d6cd5c0e26e1a7e49cc95d06c77 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:38 +0100
Subject: [PATCH 2413/3789] haskell-wai-extra: update to version 2.1.0.1

---
 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 50e4d983d75..73f3ed78e97 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.0";
-  sha256 = "14aj1c6i58jyg79y516sa2l39y4i7az3l5lp6fkxkgqgzl5dxs6c";
+  version = "2.1.0.1";
+  sha256 = "1vdizcxpq6brbzv790978nz05cwzxxhna1alk8phrc4igab04y1j";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase
-- 
GitLab


From b3ad12f4ff5c780cb7cb8a93f065b16e697443fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:40 +0100
Subject: [PATCH 2414/3789] haskell-warp: update to version 2.1.1.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 7ebc7af3627..dd03b1463c6 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.1.1";
-  sha256 = "1nldm0pq1q5m91mhss4h23dxdqwqmvfdmcpq5grc1rqjb88mgm25";
+  version = "2.1.1.2";
+  sha256 = "1kiwarlfw8m04fapnihbr2n6diysi1snwvpvdya5hz555c5flda9";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpDate httpTypes liftedBase network networkConduit simpleSendfile
-- 
GitLab


From a226e09297b71507ba224f1617041fc232dfd6bb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:42 +0100
Subject: [PATCH 2415/3789] haskell-yesod-bin: update to version 1.2.7.2

---
 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 50071e8cffe..611b140619e 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.7.1";
-  sha256 = "1lbnn7lzgpw0xsbnlax41q5hqb1bv9irmncgjvv18y8mpf5zcncs";
+  version = "1.2.7.2";
+  sha256 = "13mn0b144a4cfwlpq25r72a4ffngjgfdzk8rd5yk37mcsqn7yagy";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From dac3a2292766ff18ee391c901fcf32c76cd70b01 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:44 +0100
Subject: [PATCH 2416/3789] haskell-yesod-core: update to version 1.2.8

---
 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 bd1116267fa..acd4fc97ba8 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.7";
-  sha256 = "1gkpx0d7hyvn45254aj40iy4k0bf3kkrvmxnw3q1mvqc3k1kdxqn";
+  version = "1.2.8";
+  sha256 = "1zxi5dg3ym6byaif7z6jy8cri4mc8yxf12f42dsal0ls1nmqlk6s";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit cookie dataDefault
-- 
GitLab


From 8cb764ea6a353643505e323dc85de5fbb5269889 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:45 +0100
Subject: [PATCH 2417/3789] haskell-yesod-form: update to version 1.3.8

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

diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index a42e0a50bc4..2f58cbb6408 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -1,15 +1,15 @@
 { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
-, cryptoApi, dataDefault, emailValidate, hamlet, hspec, network
+, byteable, dataDefault, emailValidate, hamlet, hspec, network
 , persistent, resourcet, shakespeareCss, shakespeareJs, text, time
 , transformers, wai, xssSanitize, yesodCore, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.7";
-  sha256 = "01fv3c5db702nm9dk5ynvn5mf9vc4a1rkjn31zlw260jlgqy4vsn";
+  version = "1.3.8";
+  sha256 = "0cdpdgclhasdmynp9fhf9yhl33nwh71bmg344x51xkp5347w614b";
   buildDepends = [
-    aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
+    aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable
     dataDefault emailValidate hamlet network persistent resourcet
     shakespeareCss shakespeareJs text time transformers wai xssSanitize
     yesodCore yesodPersistent
-- 
GitLab


From cb52531d53b69c66cd31df4c12042eec9050c116 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:45:47 +0100
Subject: [PATCH 2418/3789] haskell-yesod-static: update to version 1.2.2.2

---
 .../libraries/haskell/yesod-static/default.nix       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index 757367b7393..7059e178bb6 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -1,5 +1,5 @@
-{ cabal, base64Bytestring, cereal, conduit, cryptoConduit
-, cryptohashCryptoapi, dataDefault, fileEmbed, filepath, hjsmin
+{ cabal, base64Bytestring, byteable, conduit, cryptohash
+, cryptohashConduit, dataDefault, fileEmbed, filepath, hjsmin
 , hspec, httpTypes, HUnit, mimeTypes, processConduit, resourcet
 , shakespeareCss, systemFileio, systemFilepath, text, transformers
 , unixCompat, unorderedContainers, wai, waiAppStatic, waiTest
@@ -8,17 +8,17 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "1.2.2.1";
-  sha256 = "1dsr3gv6hf42islw2018y4yajvkd9j627fkdlz45309cyjns55jg";
+  version = "1.2.2.2";
+  sha256 = "156qqd2v3z7wv75jsfscs9cvbg1cl1riqcrhycrqcmapjprr2r12";
   buildDepends = [
-    base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi
+    base64Bytestring byteable conduit cryptohash cryptohashConduit
     dataDefault fileEmbed filepath hjsmin httpTypes mimeTypes
     processConduit resourcet shakespeareCss systemFileio systemFilepath
     text transformers unixCompat unorderedContainers wai waiAppStatic
     yesodCore
   ];
   testDepends = [
-    base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi
+    base64Bytestring byteable conduit cryptohash cryptohashConduit
     dataDefault fileEmbed filepath hjsmin hspec httpTypes HUnit
     mimeTypes processConduit resourcet shakespeareCss systemFileio
     systemFilepath text transformers unixCompat unorderedContainers wai
-- 
GitLab


From 1b6b1b8f87fe91e403963d3d1ad8dee41886cd7f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:47:09 +0100
Subject: [PATCH 2419/3789] haskell-llvm-general-pure: update to version
 3.4.2.1

---
 .../haskell/llvm-general-pure/{3.4.1.0.nix => 3.4.2.1.nix}    | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/llvm-general-pure/{3.4.1.0.nix => 3.4.2.1.nix} (86%)

diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.1.nix
similarity index 86%
rename from pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix
rename to pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.1.nix
index 200d8d00b44..460de2de5d4 100644
--- a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix
+++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.1.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "llvm-general-pure";
-  version = "3.4.1.0";
-  sha256 = "0cjzqw9k6x8akbgx4rdigvhjhfv9zlq40p789invdc514qmxhr6q";
+  version = "3.4.2.1";
+  sha256 = "0wdx8zk1r7s3chryvwpm8hc73xvhklbmxd998zpvimv4ywil2f67";
   buildDepends = [ mtl parsec setenv transformers ];
   testDepends = [
     HUnit mtl QuickCheck testFramework testFrameworkHunit
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 15ba3d01161..0226294ced1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1641,8 +1641,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   llvmGeneral = self.llvmGeneral_3_4_1_0;
 
   llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix { };
-  llvmGeneralPure_3_4_1_0 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.1.0.nix {};
-  llvmGeneralPure = self.llvmGeneralPure_3_4_1_0;
+  llvmGeneralPure_3_4_2_1 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.2.1.nix {};
+  llvmGeneralPure = self.llvmGeneralPure_3_4_2_1;
 
   lrucache = callPackage ../development/libraries/haskell/lrucache {};
 
-- 
GitLab


From 763bdd7ed51a0609b6fdf98f47f598a9b5a762c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 11:47:30 +0100
Subject: [PATCH 2420/3789] haskell-llvm-general: update to version 3.4.2.1

---
 .../haskell/llvm-general/{3.4.1.0.nix => 3.4.2.1.nix}         | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/llvm-general/{3.4.1.0.nix => 3.4.2.1.nix} (88%)

diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix b/pkgs/development/libraries/haskell/llvm-general/3.4.2.1.nix
similarity index 88%
rename from pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix
rename to pkgs/development/libraries/haskell/llvm-general/3.4.2.1.nix
index b86a65618cd..a219f227575 100644
--- a/pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix
+++ b/pkgs/development/libraries/haskell/llvm-general/3.4.2.1.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "llvm-general";
-  version = "3.4.1.0";
-  sha256 = "0vh0bqkkahafhiv1sqvrncxswvz4rvb2zfwf33936fnnh5vn8vyp";
+  version = "3.4.2.1";
+  sha256 = "0967pijv6x5l80igdcp1nza6ix32i8s8z3hzmp6qa9nx25sqviw1";
   buildDepends = [
     llvmGeneralPure mtl parsec setenv transformers utf8String
   ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0226294ced1..f5cae5fe298 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1635,10 +1635,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     llvmConfig = pkgs.llvm_33;
     llvmGeneralPure = self.llvmGeneralPure_3_3_8_2;
   };
-  llvmGeneral_3_4_1_0 = callPackage ../development/libraries/haskell/llvm-general/3.4.1.0.nix {
+  llvmGeneral_3_4_2_1 = callPackage ../development/libraries/haskell/llvm-general/3.4.2.1.nix {
     llvmConfig = pkgs.llvm;
   };
-  llvmGeneral = self.llvmGeneral_3_4_1_0;
+  llvmGeneral = self.llvmGeneral_3_4_2_1;
 
   llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix { };
   llvmGeneralPure_3_4_2_1 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.2.1.nix {};
-- 
GitLab


From 9f5bc8901988282ff0d29297c2045ad7a9bfa199 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 16:51:53 +0100
Subject: [PATCH 2421/3789] haskell-diagrams: update to version 1.1.0.1

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

diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
index cddc5dbadcf..6159270379e 100644
--- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix
+++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams";
-  version = "1.1";
-  sha256 = "1fdacsa57w64hkcsrriwdgdxddd7gps97fyaz2rl8wfxcl96vclr";
+  version = "1.1.0.1";
+  sha256 = "0cxmrikcxgnrki9z8i33z7fbjpkx0vw849zj1cbq1zh8ry8xhhvg";
   buildDepends = [
     diagramsContrib diagramsCore diagramsLib diagramsSvg
   ];
-- 
GitLab


From 0d62f71006c25bb1ee35ad924215ec9f29765d38 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 16:51:55 +0100
Subject: [PATCH 2422/3789] haskell-snap: update to version 0.13.2.3

---
 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 3a656d65b33..e12138d08be 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.2";
-  sha256 = "097bv45646g5qanc5ik0lpfm8g7zd1f5ymlxkilgcnvc72wiwkjm";
+  version = "0.13.2.3";
+  sha256 = "14v48b47d4yhm05c1x66lil8h9vvjjwab6vgawlfpxsz2yn3sfaa";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From a65a5058981c64e46844c0adc4124fea5b901490 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Mar 2014 16:54:36 +0100
Subject: [PATCH 2423/3789] haskell-optparse-applicative: update to version
 0.8.0.1

---
 .../haskell/optparse-applicative/default.nix         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
index 6f7ef601d61..da681b324a7 100644
--- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix
+++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
@@ -1,14 +1,16 @@
-{ cabal, HUnit, testFramework, testFrameworkHunit
+{ cabal, ansiWlPprint, HUnit, QuickCheck, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2
 , testFrameworkThPrime, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "optparse-applicative";
-  version = "0.7.0.2";
-  sha256 = "1pq620236x8fch9nkq4g4vganbzksnwj8z1bb80c2mwvf6sbg5ci";
-  buildDepends = [ transformers ];
+  version = "0.8.0.1";
+  sha256 = "19k7jw9hrns5i8dr67jxadaqnj0cmn991hl00fwymg4awv34p1w3";
+  buildDepends = [ ansiWlPprint transformers ];
   testDepends = [
-    HUnit testFramework testFrameworkHunit testFrameworkThPrime
+    HUnit QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 testFrameworkThPrime
   ];
   jailbreak = true;
   meta = {
-- 
GitLab


From 12c201bc6ad5ff927e9b1c383324ac2656caa47c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:22:14 +0100
Subject: [PATCH 2424/3789] haskell-hjsmin: jailbreak to fix build with recent
 versions of optparse-applicative

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

diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix
index b060d3c6efe..eeed299af74 100644
--- a/pkgs/development/libraries/haskell/hjsmin/default.nix
+++ b/pkgs/development/libraries/haskell/hjsmin/default.nix
@@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
     blazeBuilder Cabal HUnit languageJavascript QuickCheck
     testFramework testFrameworkHunit text
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/alanz/hjsmin";
     description = "Haskell implementation of a javascript minifier";
-- 
GitLab


From 9b135f83727ea0f19d56d042d7c27d5d6622d16c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:31:54 +0100
Subject: [PATCH 2425/3789] haskell-tf-random: add version 0.4

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

diff --git a/pkgs/development/libraries/haskell/tf-random/default.nix b/pkgs/development/libraries/haskell/tf-random/default.nix
new file mode 100644
index 00000000000..3ff0b2d9b84
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tf-random/default.nix
@@ -0,0 +1,13 @@
+{ cabal, primitive, random, time }:
+
+cabal.mkDerivation (self: {
+  pname = "tf-random";
+  version = "0.4";
+  sha256 = "0yi7699zswpsn9a39ccqkyd0117sppjnqggclnhs1wm7ql1glc27";
+  buildDepends = [ primitive random time ];
+  meta = {
+    description = "High-quality splittable pseudorandom number generator";
+    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 f5cae5fe298..fc59708a3a7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2433,6 +2433,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   textStreamDecode = callPackage ../development/libraries/haskell/text-stream-decode {};
 
+  tfRandom = callPackage ../development/libraries/haskell/tf-random {};
+
   thespian = callPackage ../development/libraries/haskell/thespian {};
 
   thDesugar = callPackage ../development/libraries/haskell/th-desugar {};
-- 
GitLab


From 34ed797ecf212ce8ccded33e076c7af6f86708fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:32:08 +0100
Subject: [PATCH 2426/3789] haskell-QuickCheck: add version 2.7

---
 .../libraries/haskell/QuickCheck/2.7.nix         | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.7.nix

diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.nix
new file mode 100644
index 00000000000..4c3847a65f9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.nix
@@ -0,0 +1,16 @@
+{ cabal, random, testFramework, tfRandom }:
+
+cabal.mkDerivation (self: {
+  pname = "QuickCheck";
+  version = "2.7";
+  sha256 = "0l7qijcwbf81wdizsv7qzmm73dsjbldm2sx305cqs6bmnynbl508";
+  buildDepends = [ random tfRandom ];
+  testDepends = [ testFramework ];
+  meta = {
+    homepage = "http://code.haskell.org/QuickCheck";
+    description = "Automatic testing of Haskell programs";
+    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 fc59708a3a7..da5c9daddf0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2048,6 +2048,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {};
   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 = callPackage ../development/libraries/haskell/QuickCheck/2.7.nix {};
   QuickCheck1 = self.QuickCheck_1_2_0_1;
   QuickCheck2 = self.QuickCheck_2_6;
   QuickCheck  = self.QuickCheck2;
-- 
GitLab


From 5fd7fac97163c023cb848cca6ffa8b5c9350a567 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:38:26 +0100
Subject: [PATCH 2427/3789] haskell-conduit: update to version 1.0.16

---
 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 c5fe6d9d379..a65fb81633f 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.15.1";
-  sha256 = "0pbrsa00x8qr856532iinw9lyliwh7gwzyd1pshdmj3gkbqpf2bv";
+  version = "1.0.16";
+  sha256 = "12baxqgbs5wd6w024yrbv47lp320lgacrsb527r7xvbgffji3lbq";
   buildDepends = [
     liftedBase mmorph monadControl mtl resourcet text textStreamDecode
     transformers transformersBase void
-- 
GitLab


From d5aa5b0e8bfd5fb31bbb5951cf7c6bf53d3573ac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:38:28 +0100
Subject: [PATCH 2428/3789] haskell-diagrams-cairo: update to version 1.1.0.2

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

diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index 421859dbdaa..bd09b67196b 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-cairo";
-  version = "1.1.0.1";
-  sha256 = "04s3z3j3xqx4q4chdysip2ngjbw4k7gd12s5zlbvx88d3jg0bcrs";
+  version = "1.1.0.2";
+  sha256 = "0y36cx89rlbmj470a6g11wlzkwzznjkjmkcpm7dzbxvfxw4pp70z";
   buildDepends = [
     cairo colour dataDefaultClass diagramsCore diagramsLib filepath
     hashable JuicyPixels lens mtl optparseApplicative split statestack
-- 
GitLab


From 24683a43535e4af5110448f5436352840875a8f0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:38:30 +0100
Subject: [PATCH 2429/3789] haskell-diagrams-contrib: update to version 1.1.1.2

---
 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 34dcb3745e3..f2a654302b6 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.1";
-  sha256 = "1b91scy96zf2njikfyr2ir2ckiib4dlvjazrlbri6f5ds40gnhna";
+  version = "1.1.1.2";
+  sha256 = "09dfnvriih4lkici34bj9nvww245hzl95crldblwyjwi2c8qcy69";
   buildDepends = [
     arithmoi circlePacking colour dataDefault dataDefaultClass
     diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec
-- 
GitLab


From de50656b244bad7790e7baf9373f4b72c664d2d9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:38:31 +0100
Subject: [PATCH 2430/3789] haskell-diagrams-core: update to version 1.1.0.1

---
 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 3a3f74d4c27..3529faaf6af 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";
-  sha256 = "0prklz6s5zcainpkawibdg3bidmvsd2xsc1xxrmfp7lscmim736v";
+  version = "1.1.0.1";
+  sha256 = "1jr827cd3qa631glwc9h247w0wnrx84gj2iwxj18b4y78d0ajz69";
   buildDepends = [
     dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace
     vectorSpacePoints
-- 
GitLab


From 844e01577d6d686cde2a05d849e409d125e556fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:38:33 +0100
Subject: [PATCH 2431/3789] haskell-diagrams-lib: update to version 1.1.0.3

---
 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 d8180bfbda4..c8c8bf5434d 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.2";
-  sha256 = "1kfzf9cjb74vpfdjargjy8hg0rdhvry96f9ysmya3j7ws8lqrwdh";
+  version = "1.1.0.3";
+  sha256 = "1g4kcmpqsnb25yqvd6yv026znp7s5jhnqg1nvfxcaq0zz84w9ckh";
   buildDepends = [
     active colour dataDefaultClass diagramsCore filepath fingertree
     hashable intervals lens MemoTrie monoidExtras optparseApplicative
-- 
GitLab


From 1df4fcb8047c2fdf5c3d0e29573b4c2bbbbc74e3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:38:35 +0100
Subject: [PATCH 2432/3789] haskell-diagrams-postscript: update to version
 1.0.2.2

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

diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix
index ebd7294de3d..9716177ede5 100644
--- a/pkgs/development/libraries/haskell/diagrams/postscript.nix
+++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-postscript";
-  version = "1.0.2.1";
-  sha256 = "0c3svrkv2wyls1mb75gzv9nfjy0vgfw4bshd6q6z036jn75q9y0r";
+  version = "1.0.2.2";
+  sha256 = "00xzzx6dvraa8gbk3agqvrmxjnpvq4hik7kahidw4k37hxyyvwm3";
   buildDepends = [
     dataDefaultClass diagramsCore diagramsLib dlist filepath hashable
     lens monoidExtras mtl semigroups split vectorSpace
-- 
GitLab


From 911373dbdbc8702431f428e01bb0cd8d79bbf383 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:38:37 +0100
Subject: [PATCH 2433/3789] haskell-diagrams-svg: update to version 1.0.2.1

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

diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index cc5795c80a1..663a6287c62 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-svg";
-  version = "1.0.2";
-  sha256 = "1pbkr5qg3cjk2c23aas5y9f0bk5nsding4r4c4fdkxj49ipi4ys1";
+  version = "1.0.2.1";
+  sha256 = "1qm4vk67knl4bpp84kwm95blshf7slarpl620m8irslsq3yag507";
   buildDepends = [
     blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath
     hashable lens monoidExtras mtl split time vectorSpace
-- 
GitLab


From 96d7bc61adbf4708951e93af7fef6750272e1513 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:38:39 +0100
Subject: [PATCH 2434/3789] haskell-exceptions: update to version 0.3.3.1

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

diff --git a/pkgs/development/libraries/haskell/exceptions/default.nix b/pkgs/development/libraries/haskell/exceptions/default.nix
index 0665694212b..a206b7c186e 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.3.3";
-  sha256 = "1gng8zvsljm6xrb5gy501f1dl47z171wkic8bsivhn4rgp9lby9l";
+  version = "0.3.3.1";
+  sha256 = "091frx3hmx7lq10z7f8q98pz0sa1lj23i7z4z98gh1980r525fah";
   buildDepends = [ mtl transformers ];
   testDepends = [
     mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers
@@ -13,7 +13,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://github.com/ekmett/exceptions/";
     description = "Extensible optionally-pure exceptions";
-    license = "unknown";
+    license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
-- 
GitLab


From 0135fe7b1a885dd7ab676c1a80d3e88e39c6ac3f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:38:40 +0100
Subject: [PATCH 2435/3789] haskell-force-layout: update to version 0.3.0.3

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

diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
index b57abc40e20..a336c2a7e2b 100644
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ b/pkgs/development/libraries/haskell/force-layout/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "force-layout";
-  version = "0.3.0.2";
-  sha256 = "0zrvsrqwl0wjv38l6zl1pa09572njdbcfbvimhpp930629zk4yb7";
+  version = "0.3.0.3";
+  sha256 = "0xix9syfiya5wx0iwzs7sp3ksqyp15vjlpir71x8md8v0hkrnh5a";
   buildDepends = [
     dataDefaultClass lens vectorSpace vectorSpacePoints
   ];
-- 
GitLab


From 08fed7fab54328402112b78ecd70e513becf7360 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:38:42 +0100
Subject: [PATCH 2436/3789] haskell-ghcjs-dom: update to version 0.0.6

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

diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
index 58ad2765f6b..d42c4c84bf1 100644
--- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
+++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
@@ -1,10 +1,10 @@
-{ cabal, glib, gtk3, mtl, transformers, webkitgtk3 }:
+{ cabal, ghcjsBase, mtl }:
 
 cabal.mkDerivation (self: {
   pname = "ghcjs-dom";
-  version = "0.0.4";
-  sha256 = "1a3dv2l3s3aifcpivmnv308k2a1kb7r4x0z9gi83wc4xr9a8f08w";
-  buildDepends = [ glib gtk3 mtl transformers webkitgtk3 ];
+  version = "0.0.6";
+  sha256 = "0c27mf5cjvw5q4lwbmi245q4y09b61y5s6hxsfzgdn4lhfbvdma6";
+  buildDepends = [ ghcjsBase mtl ];
   meta = {
     description = "DOM library that supports both GHCJS and WebKitGTK";
     license = self.stdenv.lib.licenses.mit;
-- 
GitLab


From 85505d75a0b9e1ea530ce451c2d6d83bfdfa0403 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:38:44 +0100
Subject: [PATCH 2437/3789] haskell-http-client: update to version 0.2.2.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 ff21e12bb43..87a48bbdd39 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.2.2.2";
-  sha256 = "1pn38vqbb8ff3gmwkzb8a2fika2rdymnlglpi3q7yn0jsvxl5xli";
+  version = "0.2.2.3";
+  sha256 = "0li4mfw5lm0y0m3l3r7cbmhbch7ap9n2067jqw1l0qjm8s74nqkh";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie
     dataDefaultClass deepseq failure httpTypes network publicsuffixlist
-- 
GitLab


From 19ac8eb7a0fdb954c6d061dcbbbe95fbdeaa0c2a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:38:46 +0100
Subject: [PATCH 2438/3789] haskell-lens: update to version 4.1

---
 .../libraries/haskell/lens/default.nix        | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 57f84955be3..427cf681d2e 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -1,22 +1,23 @@
 { cabal, aeson, bifunctors, comonad, contravariant, deepseq
-, distributive, doctest, exceptions, filepath, genericDeriving
-, hashable, hlint, HUnit, mtl, nats, parallel, primitive
-, profunctors, QuickCheck, reflection, scientific, semigroupoids
-, semigroups, simpleReflect, split, tagged, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh
-, text, transformers, transformersCompat, unorderedContainers
-, utf8String, vector, void, zlib
+, distributive, doctest, exceptions, filepath, free
+, genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel
+, primitive, profunctors, QuickCheck, reflection, scientific
+, semigroupoids, semigroups, simpleReflect, split, tagged
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+, testFrameworkTh, text, transformers, transformersCompat
+, unorderedContainers, utf8String, vector, void, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "4.0.7";
-  sha256 = "0n4xw182yamgaplyshbhyjw9i7n6rvaszr4011mdbd6yvprl5v29";
+  version = "4.1";
+  sha256 = "0fsl2cydmkj2k49z3cgv6hfgrlkmx7zsy0ikp4k5jn2kp3hs77dw";
   buildDepends = [
     aeson bifunctors comonad contravariant distributive exceptions
-    filepath hashable mtl parallel primitive profunctors reflection
-    scientific semigroupoids semigroups split tagged text transformers
-    transformersCompat unorderedContainers utf8String vector void zlib
+    filepath free hashable mtl parallel primitive profunctors
+    reflection scientific semigroupoids semigroups split tagged text
+    transformers transformersCompat unorderedContainers utf8String
+    vector void zlib
   ];
   testDepends = [
     deepseq doctest filepath genericDeriving hlint HUnit mtl nats
-- 
GitLab


From afb614ad316bedb70cc79bb2ee5a748f0d0a4d99 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:38:49 +0100
Subject: [PATCH 2439/3789] haskell-scotty: update to version 0.7.1

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

diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
index 69a3aae5696..278a26d1536 100644
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "scotty";
-  version = "0.7.0";
-  sha256 = "0j08zjm8ndkpq5mrmh6rj6zc733irf7kyikw8nww754r40y6kps2";
+  version = "0.7.1";
+  sha256 = "07aj74jq0hh86ik4x5p5q65b47q44rrnd6mkp039wj9l6dmyrv3c";
   buildDepends = [
     aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes
     mtl regexCompat text transformers wai waiExtra warp
-- 
GitLab


From c2cd1abedb4780001612029d5fbdca4485bfe563 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:38:53 +0100
Subject: [PATCH 2440/3789] haskell-wai-middleware-static: update to version
 0.4.0.3

---
 .../libraries/haskell/wai-middleware-static/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
index e496d5266db..005305d7709 100644
--- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-middleware-static";
-  version = "0.4.0.2";
-  sha256 = "0nw54h8baphjdwsd118g9j5w4g2mnb2hrny0n4ih4jlqlcqam3lf";
+  version = "0.4.0.3";
+  sha256 = "0nvzdj04g10bcay6x4y5l7gxx38gs3ns0izair8n1j1awrp8px07";
   buildDepends = [ filepath httpTypes mtl text wai ];
   jailbreak = true;
   meta = {
-- 
GitLab


From e738b7ae83fc194250d72103baf1fbe64ddfa654 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:38:55 +0100
Subject: [PATCH 2441/3789] haskell-warp: update to version 2.1.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 dd03b1463c6..d08f8d6e545 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.1.1.2";
-  sha256 = "1kiwarlfw8m04fapnihbr2n6diysi1snwvpvdya5hz555c5flda9";
+  version = "2.1.2";
+  sha256 = "15630g8qzshn2620qsdki1nwr4bkapqz0k2bls0yxyblvw0fn9cf";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpDate httpTypes liftedBase network networkConduit simpleSendfile
-- 
GitLab


From a5e408dbf841976e2408ba90187b9f532d96923b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:38:56 +0100
Subject: [PATCH 2442/3789] haskell-HaRe: update to version 0.7.1.6

---
 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 a5d6794f318..883be6a8d41 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.1.5";
-  sha256 = "1xfgvqhnlpmfljad790sdjyqlq684751i7bdfw1wvbzmw7gdyafc";
+  version = "0.7.1.6";
+  sha256 = "1nj70f7ki6wxvjm5ra83xr2yymfsakb5kg2q1dl54hvxsd0wqcw7";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 56259ddd897ee8a12ca9f34e50a200b35dbcde38 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:40:27 +0100
Subject: [PATCH 2443/3789] haskell-llvm-general-pure: update to version
 3.4.2.2

---
 .../haskell/llvm-general-pure/{3.4.2.1.nix => 3.4.2.2.nix}    | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/llvm-general-pure/{3.4.2.1.nix => 3.4.2.2.nix} (86%)

diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.1.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix
similarity index 86%
rename from pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.1.nix
rename to pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix
index 460de2de5d4..bfa0ed43d0e 100644
--- a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.1.nix
+++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "llvm-general-pure";
-  version = "3.4.2.1";
-  sha256 = "0wdx8zk1r7s3chryvwpm8hc73xvhklbmxd998zpvimv4ywil2f67";
+  version = "3.4.2.2";
+  sha256 = "0grbw0lamp0w4jzxg97jccl3jqdgqfgldpb4llvhr1l70591b0s8";
   buildDepends = [ mtl parsec setenv transformers ];
   testDepends = [
     HUnit mtl QuickCheck testFramework testFrameworkHunit
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index da5c9daddf0..a6dc0087f01 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1641,8 +1641,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   llvmGeneral = self.llvmGeneral_3_4_2_1;
 
   llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix { };
-  llvmGeneralPure_3_4_2_1 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.2.1.nix {};
-  llvmGeneralPure = self.llvmGeneralPure_3_4_2_1;
+  llvmGeneralPure_3_4_2_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.2.2.nix {};
+  llvmGeneralPure = self.llvmGeneralPure_3_4_2_2;
 
   lrucache = callPackage ../development/libraries/haskell/lrucache {};
 
-- 
GitLab


From 19c328d28f7d3eb2648f0ede7a97b4062ce04ad1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 09:40:38 +0100
Subject: [PATCH 2444/3789] haskell-llvm-general: update to version 3.4.2.2

---
 .../haskell/llvm-general/{3.4.2.1.nix => 3.4.2.2.nix}         | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/llvm-general/{3.4.2.1.nix => 3.4.2.2.nix} (88%)

diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.2.1.nix b/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix
similarity index 88%
rename from pkgs/development/libraries/haskell/llvm-general/3.4.2.1.nix
rename to pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix
index a219f227575..43a346ebf19 100644
--- a/pkgs/development/libraries/haskell/llvm-general/3.4.2.1.nix
+++ b/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "llvm-general";
-  version = "3.4.2.1";
-  sha256 = "0967pijv6x5l80igdcp1nza6ix32i8s8z3hzmp6qa9nx25sqviw1";
+  version = "3.4.2.2";
+  sha256 = "1dqdvv8pslblavyi14xy0bgrr1ca8d1jqp60x16zgbzkk3f2jx6a";
   buildDepends = [
     llvmGeneralPure mtl parsec setenv transformers utf8String
   ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a6dc0087f01..9d0cbf4c07b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1635,10 +1635,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     llvmConfig = pkgs.llvm_33;
     llvmGeneralPure = self.llvmGeneralPure_3_3_8_2;
   };
-  llvmGeneral_3_4_2_1 = callPackage ../development/libraries/haskell/llvm-general/3.4.2.1.nix {
+  llvmGeneral_3_4_2_2 = callPackage ../development/libraries/haskell/llvm-general/3.4.2.2.nix {
     llvmConfig = pkgs.llvm;
   };
-  llvmGeneral = self.llvmGeneral_3_4_2_1;
+  llvmGeneral = self.llvmGeneral_3_4_2_2;
 
   llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix { };
   llvmGeneralPure_3_4_2_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.2.2.nix {};
-- 
GitLab


From 3aa6b99d8389c8981e2133540696626c256a0bf1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 13:18:11 +0100
Subject: [PATCH 2445/3789] haskell-snap: jailbreak some more to support lens
 4.1 or later

---
 pkgs/development/libraries/haskell/snap/snap.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index e12138d08be..a0c4e4db5a1 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -20,6 +20,9 @@ cabal.mkDerivation (self: {
     unorderedContainers vector vectorAlgorithms xmlhtml
   ];
   jailbreak = true;
+  patchPhase = ''
+    sed -i -r -e 's|lens +>= 3.7.6.*&& < 4.1|lens >= 3.7.6|' snap.cabal
+  '';
   meta = {
     homepage = "http://snapframework.com/";
     description = "Top-level package for the Snap Web Framework";
-- 
GitLab


From cd5fd2f6c806eb69a66c877b45c4f4aebca622cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 20:55:00 +0100
Subject: [PATCH 2446/3789] haskell-classy-prelude: update to version 0.8.1

---
 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 abc0841c58e..51da644cec9 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.8.0.1";
-  sha256 = "0mj6zz53w6irs16w1pk65imhvnhp1rq3vq8s1n1xkf9gr13v3y9r";
+  version = "0.8.1";
+  sha256 = "04rgsw656vjzaibargw5ibzagy74mlsd25wpw6hn1phz8qkgls4l";
   buildDepends = [
     basicPrelude chunkedData enclosedExceptions hashable liftedBase
     monoTraversable semigroups systemFilepath text time transformers
-- 
GitLab


From 4fed76e19af8aaa88e29c33f529d49b532bf320a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 20:55:01 +0100
Subject: [PATCH 2447/3789] haskell-conduit-combinators: update to version
 0.2.2

---
 .../libraries/haskell/conduit-combinators/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
index 0c9ccbd8f35..a2ac0dd9549 100644
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -1,16 +1,16 @@
 { cabal, basicPrelude, chunkedData, conduit, hspec, monoTraversable
 , mwcRandom, primitive, silently, systemFileio, systemFilepath
-, text, transformers, transformersBase, vector, void
+, text, transformers, transformersBase, unixCompat, vector, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.2.1";
-  sha256 = "0v3b9wiziyynk00fk07nwrk3c032wyr0adrwlkjl89ma1ix220sv";
+  version = "0.2.2";
+  sha256 = "0b196srw2vbs46zz2m3mb1cbw7pza8q429r5b280bw6vby9h6jbr";
   buildDepends = [
     chunkedData conduit monoTraversable mwcRandom primitive
     systemFileio systemFilepath text transformers transformersBase
-    vector void
+    unixCompat vector void
   ];
   testDepends = [
     basicPrelude chunkedData hspec monoTraversable mwcRandom silently
-- 
GitLab


From e964dbf4d409691a32c99cdc991780503704b237 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 20:55:03 +0100
Subject: [PATCH 2448/3789] haskell-dbmigrations: update to version 0.7

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

diff --git a/pkgs/development/libraries/haskell/dbmigrations/default.nix b/pkgs/development/libraries/haskell/dbmigrations/default.nix
index 78c5d82f0fd..008cb04f2fa 100644
--- a/pkgs/development/libraries/haskell/dbmigrations/default.nix
+++ b/pkgs/development/libraries/haskell/dbmigrations/default.nix
@@ -12,11 +12,11 @@ cabal.mkDerivation (self: {
     configurator fgl filepath HDBC HDBCPostgresql HDBCSqlite3 HUnit mtl
     random text time yamlLight
   ];
+  jailbreak = true;
   meta = {
     description = "An implementation of relational database \"migrations\"";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
-  jailbreak = true;
 })
-- 
GitLab


From 1386b4cee1794642b66de57126727a5539ed4c59 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 20:55:04 +0100
Subject: [PATCH 2449/3789] haskell-derive: update to version 2.5.14

---
 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 0873e65d9da..42ca82f4ac1 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.13";
-  sha256 = "0lmwj66s4krh29qqmkyc3cn3j4b4mhyqvlngvmy1xaigmgib5aci";
+  version = "2.5.14";
+  sha256 = "1fihcd8l4z8d6rad8h39pg5gdb75h895c2xld9574fwp3bm0zl0c";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 161d5a20773c14c07da11994294fa7c7ce24e8a2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 20:55:05 +0100
Subject: [PATCH 2450/3789] haskell-filesystem-conduit: update to version
 1.0.0.2

---
 .../libraries/haskell/filesystem-conduit/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
index f1a0554e380..3d7a1300b58 100644
--- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "filesystem-conduit";
-  version = "1.0.0.1";
-  sha256 = "04l8i97mr0jzkc7vc77j885n45qd2qyn5kmzxyckp3za96sjsqqw";
+  version = "1.0.0.2";
+  sha256 = "05dsl3bgyjciq6sgmba0hki7imilrjq3ddp9ip5gxl9884j1f4a1";
   buildDepends = [
     conduit systemFileio systemFilepath text transformers
   ];
@@ -14,7 +14,7 @@ cabal.mkDerivation (self: {
   ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
-    description = "Use system-filepath data types with conduits";
+    description = "Use system-filepath data types with conduits. (deprecated)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 94a591deedc0de733a832df3d2e0c6d9e62c37fe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 20:55:06 +0100
Subject: [PATCH 2451/3789] haskell-html-conduit: update to version 1.1.0.2

---
 .../libraries/haskell/html-conduit/default.nix      | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix
index 3f7b2ad507a..bff7c352175 100644
--- a/pkgs/development/libraries/haskell/html-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/html-conduit/default.nix
@@ -1,15 +1,14 @@
-{ cabal, conduit, filesystemConduit, hspec, HUnit, resourcet
-, systemFilepath, tagstreamConduit, text, transformers, xmlConduit
-, xmlTypes
+{ cabal, conduit, hspec, HUnit, resourcet, systemFilepath
+, tagstreamConduit, text, transformers, xmlConduit, xmlTypes
 }:
 
 cabal.mkDerivation (self: {
   pname = "html-conduit";
-  version = "1.1.0.1";
-  sha256 = "0v3zlassakc34i7kzajx63s1rxn516xv7lrib0a4kn4cdlqn7kxs";
+  version = "1.1.0.2";
+  sha256 = "12a5hb9sf4sd11sjhwwp84k8whkxs7hqfyni2hi247fii2ldkfax";
   buildDepends = [
-    conduit filesystemConduit resourcet systemFilepath tagstreamConduit
-    text transformers xmlConduit xmlTypes
+    conduit resourcet systemFilepath tagstreamConduit text transformers
+    xmlConduit xmlTypes
   ];
   testDepends = [ hspec HUnit xmlConduit ];
   meta = {
-- 
GitLab


From fd8e133b42fecf5bad434014034efe0c2ac49497 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 20:55:08 +0100
Subject: [PATCH 2452/3789] haskell-list-tries: update to version 0.5.2

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

diff --git a/pkgs/development/libraries/haskell/list-tries/default.nix b/pkgs/development/libraries/haskell/list-tries/default.nix
index 4eb91c67a47..a7d2a963e0d 100644
--- a/pkgs/development/libraries/haskell/list-tries/default.nix
+++ b/pkgs/development/libraries/haskell/list-tries/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "list-tries";
-  version = "0.5.1";
-  sha256 = "15lbq41rikj5vm9gfgjxz98pamnib4dcs48fr2vm9r3s3fikd2kz";
+  version = "0.5.2";
+  sha256 = "0lfl35i1k3nnv8q6bhwq4sr197fylin2hmxa4b96kfcc22xfzwy6";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ binary dlist ];
-- 
GitLab


From bd9e4c352a00e3845d8c182a69f9a3719c63f754 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 20:55:09 +0100
Subject: [PATCH 2453/3789] haskell-snap: update to version 0.13.2.4

---
 pkgs/development/libraries/haskell/snap/snap.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index a0c4e4db5a1..3d361a69b87 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.3";
-  sha256 = "14v48b47d4yhm05c1x66lil8h9vvjjwab6vgawlfpxsz2yn3sfaa";
+  version = "0.13.2.4";
+  sha256 = "1806nd6gzih66c9gg2iz3dxr4qcd4jkgamz8pv9x3zkk7n5jqga0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -20,9 +20,6 @@ cabal.mkDerivation (self: {
     unorderedContainers vector vectorAlgorithms xmlhtml
   ];
   jailbreak = true;
-  patchPhase = ''
-    sed -i -r -e 's|lens +>= 3.7.6.*&& < 4.1|lens >= 3.7.6|' snap.cabal
-  '';
   meta = {
     homepage = "http://snapframework.com/";
     description = "Top-level package for the Snap Web Framework";
-- 
GitLab


From 048824a55bc498dde844ee6a75a47d1e35f31f29 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 20:55:10 +0100
Subject: [PATCH 2454/3789] haskell-tasty-quickcheck: update to version 0.8.0.3

---
 .../libraries/haskell/tasty-quickcheck/default.nix        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix
index 86ee3437cbb..ee848359509 100644
--- a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix
@@ -1,10 +1,10 @@
-{ cabal, QuickCheck, random, tagged, tasty }:
+{ cabal, QuickCheck, tagged, tasty }:
 
 cabal.mkDerivation (self: {
   pname = "tasty-quickcheck";
-  version = "0.8";
-  sha256 = "10d7chqrlp1fjphnkiykxd22g4mfp69kmihd705sxb0y0mrdfh8x";
-  buildDepends = [ QuickCheck random tagged tasty ];
+  version = "0.8.0.3";
+  sha256 = "0dng415dsdg86rliwmz5hpn2111cn0x494c0vmdmzv5qgvx5naf6";
+  buildDepends = [ QuickCheck tagged tasty ];
   meta = {
     description = "QuickCheck support for the Tasty test framework";
     license = self.stdenv.lib.licenses.mit;
-- 
GitLab


From 0da6b352fe10cefb4adf666760099804ca86e54b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 20:55:11 +0100
Subject: [PATCH 2455/3789] haskell-unix-process-conduit: update to version
 0.2.2.3

---
 .../libraries/haskell/unix-process-conduit/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
index a52f9fe04fb..73343bf307b 100644
--- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-process-conduit";
-  version = "0.2.2.2";
-  sha256 = "0an4lwwkzr902r0rxa35i9kdm5cpgdfmg5m06zsxzbck3mry7871";
+  version = "0.2.2.3";
+  sha256 = "0ldgjwdvshggygxn9fpnxvb01dba0q0bn9f7iiw5xgqhli46nvcy";
   buildDepends = [ conduit filepath stm time transformers ];
   testDepends = [ conduit hspec transformers ];
   meta = {
     homepage = "https://github.com/snoyberg/conduit";
-    description = "Run processes on Unix systems, with a conduit interface";
+    description = "Run processes on Unix systems, with a conduit interface (deprecated)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 4a6d30c2e7e572da14acf5cdd9d23494126a41b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 20:55:12 +0100
Subject: [PATCH 2456/3789] haskell-wai-test: update to version 2.0.1

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

diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix
index 1d7b184d6df..5e3a666726a 100644
--- a/pkgs/development/libraries/haskell/wai-test/default.nix
+++ b/pkgs/development/libraries/haskell/wai-test/default.nix
@@ -1,15 +1,15 @@
 { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
-, conduit, cookie, hspec, httpTypes, HUnit, network, text
+, conduit, cookie, deepseq, hspec, httpTypes, network, text
 , transformers, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-test";
-  version = "2.0.0.2";
-  sha256 = "0085whb8jav2zasmgi8z62anm6i509lc2w0988vqlcrds7rrknc8";
+  version = "2.0.1";
+  sha256 = "0c803l3cz5bjf60l97sy1isxhnmbpzr5x39yhnck28r0vykycnrj";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie
-    httpTypes HUnit network text transformers wai
+    deepseq httpTypes network text transformers wai
   ];
   testDepends = [ hspec wai ];
   meta = {
-- 
GitLab


From d063b8f6ceb40adbdeac83fd3f59a795f6919317 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 20:55:14 +0100
Subject: [PATCH 2457/3789] haskell-yaml: update to version 0.8.8

---
 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 35106292f85..e9a9c075c32 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.7.2";
-  sha256 = "00dmmws0gmp9fb2ha6z055ix7jlsiry24bwhkl226b680gi9a84d";
+  version = "0.8.8";
+  sha256 = "0fv56x40ici6hx2dfy85fg7zy213mn82h84czhj4xbvjszg8wycw";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From cf29fe8205884784b029505b4b17453cae1dcd08 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 20:55:15 +0100
Subject: [PATCH 2458/3789] haskell-yesod-bin: update to version 1.2.7.3

---
 .../libraries/haskell/yesod-bin/default.nix   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index 611b140619e..e939b1e4ee7 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -1,26 +1,26 @@
 { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit
-, dataDefaultClass, fileEmbed, filepath, filesystemConduit
-, fsnotify, ghcPaths, httpConduit, httpReverseProxy, httpTypes
-, liftedBase, network, networkConduit, optparseApplicative, parsec
-, projectTemplate, resourcet, shakespeare, shakespeareCss
-, shakespeareJs, shakespeareText, split, systemFileio
-, systemFilepath, tar, text, time, transformers, unixCompat
-, unorderedContainers, wai, warp, yaml, zlib
+, dataDefaultClass, fileEmbed, filepath, fsnotify, ghcPaths
+, httpConduit, httpReverseProxy, httpTypes, liftedBase, network
+, networkConduit, optparseApplicative, parsec, projectTemplate
+, resourcet, shakespeare, shakespeareCss, shakespeareJs
+, shakespeareText, split, systemFileio, systemFilepath, tar, text
+, time, transformers, unixCompat, unorderedContainers, wai, warp
+, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.7.2";
-  sha256 = "13mn0b144a4cfwlpq25r72a4ffngjgfdzk8rd5yk37mcsqn7yagy";
+  version = "1.2.7.3";
+  sha256 = "05kbfnkigk4p1vjw0h1pkp7jfczjq99vgrsaz45faajadnhffnpz";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     attoparsec base64Bytestring blazeBuilder Cabal conduit
-    dataDefaultClass fileEmbed filepath filesystemConduit fsnotify
-    ghcPaths httpConduit httpReverseProxy httpTypes liftedBase network
-    networkConduit optparseApplicative parsec projectTemplate resourcet
-    shakespeare shakespeareCss shakespeareJs shakespeareText split
-    systemFileio systemFilepath tar text time transformers unixCompat
+    dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit
+    httpReverseProxy httpTypes liftedBase network networkConduit
+    optparseApplicative parsec projectTemplate resourcet shakespeare
+    shakespeareCss shakespeareJs shakespeareText split systemFileio
+    systemFilepath tar text time transformers unixCompat
     unorderedContainers wai warp yaml zlib
   ];
   meta = {
-- 
GitLab


From 7176a84eb0aafa1cd8e6c60df6d93e3f7d334fb6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 20:55:16 +0100
Subject: [PATCH 2459/3789] haskell-yesod-core: update to version 1.2.9

---
 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 acd4fc97ba8..2c3d378257f 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.8";
-  sha256 = "1zxi5dg3ym6byaif7z6jy8cri4mc8yxf12f42dsal0ls1nmqlk6s";
+  version = "1.2.9";
+  sha256 = "0qd9x2pca2nx7yqz9whlvb0rjgf1zf9vw19j6z0p149yddgrrcyq";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit cookie dataDefault
-- 
GitLab


From a1615dedf6b5d49bd032a98d2cae272d9c9f2275 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 20:55:17 +0100
Subject: [PATCH 2460/3789] haskell-yesod-test: update to version 1.2.1.1

---
 .../libraries/haskell/yesod-test/default.nix        | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix
index c4ad5b29acd..38a319a8745 100644
--- a/pkgs/development/libraries/haskell/yesod-test/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-test/default.nix
@@ -1,19 +1,18 @@
 { cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
 , caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit
-, monadControl, network, persistent, poolConduit, text, time
-, transformers, wai, waiTest, xmlConduit, xmlTypes, yesodCore
-, yesodForm
+, monadControl, network, persistent, text, time, transformers, wai
+, waiTest, xmlConduit, xmlTypes, yesodCore, yesodForm
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-test";
-  version = "1.2.1";
-  sha256 = "1f92q9wjj6npxfsjibw0qlg6pai721mwkjcadh121bwgrancflyr";
+  version = "1.2.1.1";
+  sha256 = "0rbavw67cfqyav6xakacag0sd0gixbz3sls06px6q6pnpzk9q9d4";
   buildDepends = [
     attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
     cookie hspec htmlConduit httpTypes HUnit monadControl network
-    persistent poolConduit text time transformers wai waiTest
-    xmlConduit xmlTypes yesodCore
+    persistent text time transformers wai waiTest xmlConduit xmlTypes
+    yesodCore
   ];
   testDepends = [
     hspec htmlConduit HUnit text xmlConduit yesodCore yesodForm
-- 
GitLab


From d225486c0b889311adda13be133f1245b4dc5d0d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 22:25:32 +0100
Subject: [PATCH 2461/3789] haskell-tasty-quickcheck: require QuickCheck 2.7 or
 later

---
 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 9d0cbf4c07b..b8521e3a7fa 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2378,7 +2378,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {};
 
-  tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {};
+  tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {
+    QuickCheck = self.Quickcheck2;
+  };
 
   tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {};
 
-- 
GitLab


From 6eae14cc26a2b2836133a5e70c89de9b950b6d9d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 22:26:13 +0100
Subject: [PATCH 2462/3789] haskell-hspec-meta: update to version 1.9.0

---
 .../development/libraries/haskell/hspec-meta/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index 1b9cbd08978..28edba11cac 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -1,16 +1,17 @@
 { cabal, ansiTerminal, deepseq, filepath, hspecExpectations, HUnit
-, QuickCheck, quickcheckIo, random, setenv, time, transformers
+, QuickCheck, quickcheckIo, random, setenv, tfRandom, time
+, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.8.3";
-  sha256 = "12d254snnv8i1qqybsp6yzbqdxjf1wx8d29ja3lazb3kx12qwawd";
+  version = "1.9.0";
+  sha256 = "1jvx748aay8ln23p382y03gk6hc19f3z62za4326i0d3cyapfqdv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck
-    quickcheckIo random setenv time transformers
+    quickcheckIo random setenv tfRandom time transformers
   ];
   doCheck = false;
   meta = {
-- 
GitLab


From 500ea1c6f3b11114f121bff2b6b241597a3b6702 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Mar 2014 22:26:14 +0100
Subject: [PATCH 2463/3789] haskell-hspec: update to version 1.9.0

---
 pkgs/development/libraries/haskell/hspec/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 984a046f501..0c41ab471f8 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -1,22 +1,22 @@
 { cabal, ansiTerminal, deepseq, doctest, filepath, ghcPaths
 , hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo
-, random, setenv, silently, time, transformers
+, random, setenv, silently, tfRandom, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.8.3";
-  sha256 = "0k5l8r54nc0q5x3czdfxkwa606qnli3a6qm2xd3r5yl5bnz6hzh8";
+  version = "1.9.0";
+  sha256 = "01nwxx63l9cl1smld7pwm59k6shs865iiy1jqwi97lkhzhy9cvhl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck
-    quickcheckIo random setenv time transformers
+    quickcheckIo random setenv tfRandom time transformers
   ];
   testDepends = [
     ansiTerminal deepseq doctest filepath ghcPaths hspecExpectations
-    hspecMeta HUnit QuickCheck quickcheckIo random setenv silently time
-    transformers
+    hspecMeta HUnit QuickCheck quickcheckIo random setenv silently
+    tfRandom time transformers
   ];
   doCheck = false;
   meta = {
-- 
GitLab


From 638d238d95538c6aed5603e97a5538b89c01d42b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 10:46:09 +0100
Subject: [PATCH 2464/3789] haskell-tasty-quickcheck: require QuickCheck 2.7 or
 later some more

---
 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 b8521e3a7fa..1efbe70594c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2379,7 +2379,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {};
 
   tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {
-    QuickCheck = self.Quickcheck2;
+    QuickCheck = self.QuickCheck_2_7;
   };
 
   tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {};
-- 
GitLab


From f62b4c6251c8b00df75f2ccccd96b9ec82ddd983 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 11:10:44 +0100
Subject: [PATCH 2465/3789] haskell-hspec: require QuickCheck 2.7 or later

---
 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 1efbe70594c..05ec0c816a1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1451,7 +1451,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {};
 
-  hspec = callPackage ../development/libraries/haskell/hspec {};
+  hspec = callPackage ../development/libraries/haskell/hspec {
+    QuickCheck = self.QuickCheck_2_7;
+    quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7; };
+  };
 
   hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {};
 
-- 
GitLab


From 9f5063a7a48b2ab0ea77b3da947039a12a1fb7e3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:41:47 +0100
Subject: [PATCH 2466/3789] haskell-hspec-meta: require QuickCheck 2.7 or later

---
 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 05ec0c816a1..592f33bec0c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1460,7 +1460,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {};
 
-  hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {};
+  hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {
+    QuickCheck = self.QuickCheck_2_7;
+    quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7; };
+  };
 
   hstatsd = callPackage ../development/libraries/haskell/hstatsd {};
 
-- 
GitLab


From fa62ab13deb5a7ee27ff5873b9f8675d2692ca69 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:45:49 +0100
Subject: [PATCH 2467/3789] haskell-git-annex: update to version 5.20140320

---
 .../git-and-tools/git-annex/default.nix       | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 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 49129e6b8ce..d64230aa50d 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
@@ -1,4 +1,4 @@
-{ cabal, aeson, async, blazeBuilder, bloomfilter, bup
+{ cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable
 , caseInsensitive, clientsession, cryptoApi, cryptohash, curl
 , dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance
 , extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet
@@ -7,31 +7,31 @@
 , MonadCatchIOTransformers, monadControl, mtl, network
 , networkConduit, networkInfo, networkMulticast
 , networkProtocolXmpp, openssh, optparseApplicative, perl
-, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, SHA, stm
-, tasty, tastyHunit, tastyQuickcheck, tastyRerun, text, time
-, transformers, unixCompat, utf8String, uuid, wai, waiLogger, warp
-, warpTls, which, xmlTypes, yesod, yesodCore, yesodDefault
+, 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
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140306";
-  sha256 = "1kjgqrz0wnccylrbdiwj1yndg7v2k09f5h2vkk06bnx02xmwvjl9";
+  version = "5.20140320";
+  sha256 = "0jhg5nbvdsiaprpj4h57fpfskhx0nqva4yx6krfd90i9gwgkm8l5";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    aeson async blazeBuilder bloomfilter caseInsensitive clientsession
-    cryptoApi cryptohash dataDefault dataenc DAV dbus dlist dns
-    editDistance extensibleExceptions feed filepath gnutls hamlet
-    hinotify hS3 hslogger HTTP httpClient httpConduit httpTypes IfElse
-    json liftedBase MissingH MonadCatchIOTransformers monadControl mtl
-    network networkConduit networkInfo networkMulticast
-    networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa
-    SafeSemaphore SHA stm tasty tastyHunit tastyQuickcheck tastyRerun
-    text time transformers unixCompat utf8String uuid wai waiLogger
-    warp warpTls xmlTypes yesod yesodCore yesodDefault yesodForm
-    yesodStatic
+    aeson async blazeBuilder bloomfilter byteable caseInsensitive
+    clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus
+    dlist dns editDistance extensibleExceptions feed filepath gnutls
+    hamlet hinotify hS3 hslogger HTTP httpClient httpConduit 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
   ];
   buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
   configureFlags = "-fS3
-- 
GitLab


From 2ca5022f6208ea01a2d74399e8eb29933198023d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:46:53 +0100
Subject: [PATCH 2468/3789] haskell-base64-conduit: update to version 1.0.0.1

---
 .../libraries/haskell/base64-conduit/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/base64-conduit/default.nix b/pkgs/development/libraries/haskell/base64-conduit/default.nix
index 3a2d044de64..0fa5a02d5a5 100644
--- a/pkgs/development/libraries/haskell/base64-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/base64-conduit/default.nix
@@ -3,15 +3,15 @@
 
 cabal.mkDerivation (self: {
   pname = "base64-conduit";
-  version = "1.0.0";
-  sha256 = "10wjgdixk5da48jpm2i91vy3ckdqpbpgba6hzn7ak6d3qac22m9q";
+  version = "1.0.0.1";
+  sha256 = "07zhvn3fy60q04a5g5mzhkl17rap9jlh00vb4f6565bjha2k16g9";
   buildDepends = [ base64Bytestring conduit ];
   testDepends = [
     base64Bytestring conduit hspec QuickCheck transformers
   ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
-    description = "Base64-encode and decode streams of bytes";
+    description = "Base64-encode and decode streams of bytes. (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 0ecfcfc073594dcf6b3f33e2fd0b110232029cbb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:46:58 +0100
Subject: [PATCH 2469/3789] haskell-chunked-data: update to version 0.1.0.1

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

diff --git a/pkgs/development/libraries/haskell/chunked-data/default.nix b/pkgs/development/libraries/haskell/chunked-data/default.nix
index 95b52d50b4d..2705aee7aab 100644
--- a/pkgs/development/libraries/haskell/chunked-data/default.nix
+++ b/pkgs/development/libraries/haskell/chunked-data/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "chunked-data";
-  version = "0.1.0.0";
-  sha256 = "1wdgvhf170rv557dwsiqy6nhys965xhs6w24ays273fv8hn3yk9l";
+  version = "0.1.0.1";
+  sha256 = "0kdq79mxi9nhy3dqw283f5ffx4rxwfrdq9cfw46ql5wmqrg2qw7r";
   buildDepends = [
     blazeBuilder monoTraversable semigroups systemFilepath text
     transformers vector
-- 
GitLab


From 60358214278fd647c9e1fe2fb4692e963794e0de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:46:59 +0100
Subject: [PATCH 2470/3789] haskell-classy-prelude: update to version 0.8.1.1

---
 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 51da644cec9..99fa5a138b8 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.8.1";
-  sha256 = "04rgsw656vjzaibargw5ibzagy74mlsd25wpw6hn1phz8qkgls4l";
+  version = "0.8.1.1";
+  sha256 = "14iq0zdmw4f2i3c282hs89c4a763wcm7vn5n0f6kcvcpjgjyahgi";
   buildDepends = [
     basicPrelude chunkedData enclosedExceptions hashable liftedBase
     monoTraversable semigroups systemFilepath text time transformers
-- 
GitLab


From 3ec9395ff287ae92daf32080c883f1acc42b4bcb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:47:01 +0100
Subject: [PATCH 2471/3789] haskell-conduit-combinators: update to version
 0.2.3

---
 .../haskell/conduit-combinators/default.nix   | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
index a2ac0dd9549..4799a0f63f5 100644
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -1,20 +1,21 @@
-{ cabal, basicPrelude, chunkedData, conduit, hspec, monoTraversable
-, mwcRandom, primitive, silently, systemFileio, systemFilepath
-, text, transformers, transformersBase, unixCompat, vector, void
+{ cabal, base16Bytestring, base64Bytestring, basicPrelude
+, chunkedData, conduit, hspec, monoTraversable, mwcRandom
+, primitive, silently, systemFileio, systemFilepath, text
+, transformers, transformersBase, unixCompat, vector, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.2.2";
-  sha256 = "0b196srw2vbs46zz2m3mb1cbw7pza8q429r5b280bw6vby9h6jbr";
+  version = "0.2.3";
+  sha256 = "05sb1v6rciaj7cj6lxv6pf9ai0k3q6cvvflcb4a7q6ql9xr3j7pr";
   buildDepends = [
-    chunkedData conduit monoTraversable mwcRandom primitive
-    systemFileio systemFilepath text transformers transformersBase
-    unixCompat vector void
+    base16Bytestring base64Bytestring chunkedData conduit
+    monoTraversable mwcRandom primitive systemFileio systemFilepath
+    text transformers transformersBase unixCompat vector void
   ];
   testDepends = [
-    basicPrelude chunkedData hspec monoTraversable mwcRandom silently
-    text transformers vector
+    base16Bytestring base64Bytestring basicPrelude chunkedData hspec
+    monoTraversable mwcRandom silently text transformers vector
   ];
   meta = {
     homepage = "https://github.com/fpco/conduit-combinators";
-- 
GitLab


From 1fb0dfdb5210b934e3799d8884383dda473ee85c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:47:02 +0100
Subject: [PATCH 2472/3789] haskell-conduit: update to version 1.0.17

---
 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 a65fb81633f..da3853748e0 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.16";
-  sha256 = "12baxqgbs5wd6w024yrbv47lp320lgacrsb527r7xvbgffji3lbq";
+  version = "1.0.17";
+  sha256 = "0skshic2glx0sfy75skj8b4iip62zha51pgnnx5hsswhx8j2whcw";
   buildDepends = [
     liftedBase mmorph monadControl mtl resourcet text textStreamDecode
     transformers transformersBase void
-- 
GitLab


From 5270fd003b995d837cdd50013c94679a66362f69 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:47:03 +0100
Subject: [PATCH 2473/3789] haskell-errors: update to version 1.4.6

---
 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 5e55f3a6d59..7207bfbb185 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.5";
-  sha256 = "16m4psk1150319bd2hrswpp2h90l1hhh7w13arfhy4ylh8vscm4q";
+  version = "1.4.6";
+  sha256 = "1h8va76rhvs76ljdccxbmb659qk1slzkal118m85bw6lpy5wv6fi";
   buildDepends = [ either safe transformers ];
   jailbreak = true;
   meta = {
-- 
GitLab


From 6337e79a7c618c0b4a25c5ae05bc97eaa4cfabef Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:47:04 +0100
Subject: [PATCH 2474/3789] haskell-foldl: update to version 1.0.3

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

diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix
index 3b1c61574f0..926c2a812a0 100644
--- a/pkgs/development/libraries/haskell/foldl/default.nix
+++ b/pkgs/development/libraries/haskell/foldl/default.nix
@@ -1,10 +1,10 @@
-{ cabal, primitive, text, vector }:
+{ cabal, primitive, text, transformers, vector }:
 
 cabal.mkDerivation (self: {
   pname = "foldl";
-  version = "1.0.2";
-  sha256 = "11cqmw102m2bskaknl8qr7hwyn94hfv2ind5fgvjw4hwgllr8v84";
-  buildDepends = [ primitive text vector ];
+  version = "1.0.3";
+  sha256 = "0jl50bh7k8wp0nz0s0sb2zwh92yrgsm2l6szib41g7zq34mwamn9";
+  buildDepends = [ primitive text transformers vector ];
   meta = {
     description = "Composable, streaming, and efficient left folds";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From fefc4a93b7147e370012cec0c7ea7fd616625634 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:47:05 +0100
Subject: [PATCH 2475/3789] haskell-hjsmin: update to version 0.1.4.6

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

diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix
index eeed299af74..563372fa451 100644
--- a/pkgs/development/libraries/haskell/hjsmin/default.nix
+++ b/pkgs/development/libraries/haskell/hjsmin/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hjsmin";
-  version = "0.1.4.5";
-  sha256 = "0lzqs20kyngbjc7wqq347b1caj0hbf29dvdpxghfpjbrgyvyqh74";
+  version = "0.1.4.6";
+  sha256 = "0z0wzgwm66ckq9h756s7srfyiv2jia9779yi86cn1zgzr8dwspvr";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 61f395a760fb1373e8195667764f689053b1056e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:47:09 +0100
Subject: [PATCH 2476/3789] haskell-wai-app-static: update to version 2.0.0.5

---
 .../haskell/wai-app-static/default.nix        | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 009ae99daa8..fec4d410c22 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -1,19 +1,22 @@
 { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup
-, byteable, cryptohash, cryptohashConduit, fileEmbed, filepath
-, hspec, httpDate, httpTypes, mimeTypes, network, systemFileio
-, systemFilepath, text, time, transformers, unixCompat
-, unorderedContainers, wai, waiTest, zlib
+, byteable, cmdargs, cryptohash, cryptohashConduit, fileEmbed
+, filepath, hspec, httpDate, httpTypes, mimeTypes, network
+, systemFileio, systemFilepath, text, time, transformers
+, unixCompat, unorderedContainers, wai, waiExtra, waiTest, warp
+, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "2.0.0.4";
-  sha256 = "1dk1s2q8w2rvknknw54ja2jhm1nayp8zpyis1zhgnl4yjgwr5kld";
+  version = "2.0.0.5";
+  sha256 = "0f18wwk0xrzbn9d6krjdcm71cyxl1pzzi5xqwzzc9xnq595m75wa";
+  isLibrary = true;
+  isExecutable = true;
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml blazeMarkup byteable
-    cryptohash cryptohashConduit fileEmbed filepath httpDate httpTypes
-    mimeTypes systemFileio systemFilepath text time transformers
-    unixCompat unorderedContainers wai zlib
+    cmdargs cryptohash cryptohashConduit fileEmbed filepath httpDate
+    httpTypes mimeTypes systemFileio systemFilepath text time
+    transformers unixCompat unorderedContainers wai waiExtra warp zlib
   ];
   testDepends = [
     hspec httpDate httpTypes mimeTypes network text time transformers
-- 
GitLab


From fd1283ed1d1b61629e4d3231ff062ddf6b440be0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:47:11 +0100
Subject: [PATCH 2477/3789] haskell-wai-extra: update to version 2.1.1

---
 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 73f3ed78e97..df13922601c 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.0.1";
-  sha256 = "1vdizcxpq6brbzv790978nz05cwzxxhna1alk8phrc4igab04y1j";
+  version = "2.1.1";
+  sha256 = "1bsc9sjmp9hspdif4f81iqjkcaflv6b7rd42g62qj790a4b70igf";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase
-- 
GitLab


From 065584ffdb249fe686d5784764213453ab26d17e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:47:12 +0100
Subject: [PATCH 2478/3789] haskell-yesod-persistent: update to version 1.2.2.2

---
 .../libraries/haskell/yesod-persistent/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
index 42b55bcee6a..a96db23f952 100644
--- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
@@ -1,15 +1,15 @@
-{ cabal, blazeBuilder, conduit, hspec, liftedBase, persistent
-, persistentSqlite, persistentTemplate, poolConduit, resourcet
-, text, transformers, waiTest, yesodCore
+{ cabal, blazeBuilder, conduit, hspec, persistent, persistentSqlite
+, persistentTemplate, resourcePool, resourcet, text, transformers
+, waiTest, yesodCore
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-persistent";
-  version = "1.2.2.1";
-  sha256 = "0vihd94yh4xipvz193p2fd1sqlbwdj0619l21gpdy307sng50kjn";
+  version = "1.2.2.2";
+  sha256 = "112wr85k8a7ah1m5s8b9h1dm3hbglckdhngp12d67rccrr4mmgjq";
   buildDepends = [
-    blazeBuilder conduit liftedBase persistent persistentTemplate
-    poolConduit resourcet transformers yesodCore
+    blazeBuilder conduit persistent persistentTemplate resourcePool
+    resourcet transformers yesodCore
   ];
   testDepends = [
     blazeBuilder conduit hspec persistent persistentSqlite text waiTest
-- 
GitLab


From 441dca211e4158c5136f3669e567b4361d516df6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:47:20 +0100
Subject: [PATCH 2479/3789] haskell-yi-contrib: update to version 0.7.2

---
 pkgs/applications/editors/yi/yi-contrib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/yi/yi-contrib.nix b/pkgs/applications/editors/yi/yi-contrib.nix
index 0ed6e877862..6dd75301187 100644
--- a/pkgs/applications/editors/yi/yi-contrib.nix
+++ b/pkgs/applications/editors/yi/yi-contrib.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yi-contrib";
-  version = "0.7.1";
-  sha256 = "0915ikck01kc5npbvywd9r7azylqrhfymzc72rf4iaghz4w939li";
+  version = "0.7.2";
+  sha256 = "074cq1y0pp66r2fqqszd8w2pws8jbfwq9g39w3rsgjnw83058fr8";
   buildDepends = [ dataAccessor filepath mtl split yi ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/Yi";
-- 
GitLab


From cc8c69890bb3eda24ab80a0901897aafaa4a78b4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:47:21 +0100
Subject: [PATCH 2480/3789] haskell-yi: update to version 0.7.2

---
 pkgs/applications/editors/yi/yi.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix
index b504af14904..b358f5488dc 100644
--- a/pkgs/applications/editors/yi/yi.nix
+++ b/pkgs/applications/editors/yi/yi.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yi";
-  version = "0.7.1";
-  sha256 = "111xg7qpjhsqf6pfr136wh8km3lrgpzghd9h5rlypafr61w59vly";
+  version = "0.7.2";
+  sha256 = "0g0hvr4zqcrmdl6mbdmrfxd5m51fhkhslvl9piwq83g2wirxqbvm";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 170a359904015655b6e4cf380dcc7f38cad72f7a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:47:22 +0100
Subject: [PATCH 2481/3789] haskell-persistent: update to version 1.3.0.4

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

diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 1a61e5f76a0..a3faace8d49 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -1,17 +1,17 @@
 { cabal, aeson, attoparsec, base64Bytestring, blazeHtml
 , blazeMarkup, conduit, hspec, liftedBase, monadControl
-, monadLogger, pathPieces, poolConduit, resourcet, scientific
+, monadLogger, pathPieces, resourcePool, resourcet, scientific
 , silently, sqlite, text, time, transformers, transformersBase
 , unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "1.3.0.3";
-  sha256 = "0p9h43wvm1l9va6s6p71y6r5ifgvbqz8ypc86pmzbphq6712jnsl";
+  version = "1.3.0.4";
+  sha256 = "09p7nf6dnjz83qp7invkmzcr55zglm0y54p8pb1y6acjpnw3glkl";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
-    liftedBase monadControl monadLogger pathPieces poolConduit
+    liftedBase monadControl monadLogger pathPieces resourcePool
     resourcet scientific silently text time transformers
     transformersBase unorderedContainers vector
   ];
-- 
GitLab


From 2d4e2dcca44a64a605187408f6658e1b2ad06586 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:47:23 +0100
Subject: [PATCH 2482/3789] haskell-shake: update to version 0.11.4

---
 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 f7505c62fc1..3e769f5e601 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.3";
-  sha256 = "0j4b9fd60kvkayf5zgr8d8w0i4k8ly2v0vnfg80k0lkwpka7nwzl";
+  version = "0.11.4";
+  sha256 = "0gkj7zdy500zf58yscr5fq1ghj0kb3hywcv97r1xmi6ydccgf4ni";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From b1ad3e9dee40a2c91d70728d67d11372fc927e84 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 18:47:24 +0100
Subject: [PATCH 2483/3789] haskell-singletons: update to version 0.10.0

---
 .../libraries/haskell/singletons/default.nix          | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/singletons/default.nix b/pkgs/development/libraries/haskell/singletons/default.nix
index 48f12cd8825..e233dc60cc0 100644
--- a/pkgs/development/libraries/haskell/singletons/default.nix
+++ b/pkgs/development/libraries/haskell/singletons/default.nix
@@ -1,10 +1,13 @@
-{ cabal, mtl, syb, thDesugar }:
+{ cabal, Cabal, constraints, filepath, mtl, tasty, tastyGolden
+, thDesugar
+}:
 
 cabal.mkDerivation (self: {
   pname = "singletons";
-  version = "0.9.3";
-  sha256 = "0m90k3ygm04c0gjfiaw5rmajyn2yz0ldcqm2xmm39d10270skpb4";
-  buildDepends = [ mtl syb thDesugar ];
+  version = "0.10.0";
+  sha256 = "14vnkw9ihrs3xg3lhb3wkyfz59lsaz4c3iqh3hqy7x9gmifgggwr";
+  buildDepends = [ mtl thDesugar ];
+  testDepends = [ Cabal constraints filepath tasty tastyGolden ];
   noHaddock = true;
   meta = {
     homepage = "http://www.cis.upenn.edu/~eir/packages/singletons";
-- 
GitLab


From 9443e618ffc05ac67b436d8fe71fa82dad951aa5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Mar 2014 22:59:31 +0100
Subject: [PATCH 2484/3789] haskell-conduit: disable test suite to work around
 https://github.com/snoyberg/conduit/issues/142

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

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index da3853748e0..b2a3ec9804b 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
   testDepends = [
     hspec mtl QuickCheck resourcet text transformers void
   ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Streaming data processing library";
-- 
GitLab


From bf653a2a0579a4b46b27ff4341eb80ed226b1d27 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 08:53:58 +0100
Subject: [PATCH 2485/3789] git-annex: Crypto build input (propagated by hS3)
 needs to be compiled with QuickCheck 2.7

---
 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 592f33bec0c..5e26f04d460 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2906,7 +2906,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   };
   cabalInstall = self.cabalInstall_1_18_0_3;
 
-  gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {};
+  gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {
+    hS3 = self.hS3.override { Crypto = self.Crypto.override { QuickCheck = self.QuickCheck_2_7; }; };
+  };
 
   githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {};
 
-- 
GitLab


From ceb7673bf04ba4123e2b10a6fae09411052a0bbb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 10:01:42 +0100
Subject: [PATCH 2486/3789] Fix broken references to 'maintainers' attribute
 set.

---
 pkgs/applications/video/aegisub/default.nix      | 16 ++++++++--------
 pkgs/applications/video/mpv/default.nix          |  6 +++---
 .../virtualization/8086tiny/default.nix          | 10 +++++-----
 .../virtualization/bochs/default.nix             | 16 ++++++++--------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index fa17fb5ffd2..9bbc7c9e739 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -5,7 +5,7 @@
 , libass, fftw, ffms
 , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies
 , spellChecking ? true, hunspell ? null
-, automationSupport ? true, lua ? null 
+, automationSupport ? true, lua ? null
 , openalSupport ? false, openal ? null
 , alsaSupport ? true, alsaLib ? null
 , pulseaudioSupport ? true, pulseaudio ? null
@@ -39,11 +39,11 @@ stdenv.mkDerivation rec {
   ;
 
   NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm";
-  
-  preConfigure = "cd aegisub"; 
-  
+
+  preConfigure = "cd aegisub";
+
   postInstall = "ln -s $out/bin/aegisub-3.0 $out/bin/aegisub";
-  
+
   meta = {
     description = "An advanced subtitle editor";
     longDescription = ''
@@ -53,11 +53,11 @@ stdenv.mkDerivation rec {
       built-in real-time video preview.
     '';
     homepage = http://www.aegisub.org/;
-    license = stdenv.lib.licenses.bsd3; 
-              # The Aegisub sources are itself BSD/ISC, 
+    license = stdenv.lib.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 = [ maintainers.AndersonTorres ];
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
 
   };
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 2ffefa35898..f059472aa9b 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -46,7 +46,7 @@ assert cacaSupport -> libcaca != null;
 # 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
 
-let 
+let
   waf = fetchurl {
     url = https://waf.googlecode.com/files/waf-1.7.13;
     sha256 = "03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873";
@@ -109,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 = {
@@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://mpv.io";
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ maintainers.AndersonTorres ];
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix
index ca93a1bfd7c..1ad9203b94c 100644
--- a/pkgs/applications/virtualization/8086tiny/default.nix
+++ b/pkgs/applications/virtualization/8086tiny/default.nix
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
   version = "1.20";
 
   src = fetchurl {
-    url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_120.tar.bz2"; 
+    url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_120.tar.bz2";
     sha256 = "0yapnr8wvlx7h1q1w98yfy2vsbf0rlp4wd99r3xb0b7l70b36mpw";
   };
-  
+
   buildInputs = with stdenv.lib;
-  optionals localBios [ nasm ] 
+  optionals localBios [ nasm ]
   ++  optionals sdlSupport [ SDL ];
 
   builder = ./builder.sh;
@@ -27,12 +27,12 @@ stdenv.mkDerivation rec {
     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 based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :)
     '';
     homepage = http://www.megalith.co.uk/8086tiny/index.html;
     license = stdenv.lib.licenses.mit;
-    maintainers = [ maintainers.AndersonTorres ];
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index 7b49bb8220d..75afcb41f80 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz";
     sha256 = "042blm1xb9ig4fh2bv8nrrfpgkcxy4hq8yrkx7mrdpm5g4mvfwyr";
   };
-  
+
   buildInputs = with stdenv.lib;
   [ libX11 mesa ]
   ++ optionals sdlSupport [ SDL ]
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   ++ optionals curlSupport [ curl ];
 
   configureFlags = ''
-    --with-x11 
+    --with-x11
     --with-term=${if termSupport then "yes" else "no"}
     --with-sdl=${if sdlSupport then "yes" else "no"}
     --with-svga=no
@@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
     --enable-plugins=no
     --enable-disasm
     --enable-debugger
-    --enable-ne2000 
-    --enable-e1000 
-    --enable-sb16 
-    --enable-voodoo 
-    --enable-usb 
+    --enable-ne2000
+    --enable-e1000
+    --enable-sb16
+    --enable-voodoo
+    --enable-usb
     --enable-pnic
 '';
 
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://bochs.sourceforge.net/;
     license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = [ maintainers.AndersonTorres ];
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From 451bc020e1b7027ba65399f560e26e72ade73647 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 22 Mar 2014 06:20:36 -0400
Subject: [PATCH 2487/3789] Add libsystemd-journal haskell package

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

diff --git a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix
new file mode 100644
index 00000000000..b30b0714d1f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix
@@ -0,0 +1,21 @@
+{ cabal, hashable, hsyslog, pipes, pipesSafe, systemd-journal, text
+, transformers, uniplate, unixBytestring, unorderedContainers, uuid
+, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "libsystemd-journal";
+  version = "1.1.0";
+  sha256 = "0zdql5y40d0d044mwbsr3xxmfzgnnp02a36wbbslxmrm5c3w1qi2";
+  buildDepends = [
+    hashable hsyslog pipes pipesSafe text transformers uniplate
+    unixBytestring unorderedContainers uuid vector
+  ];
+  extraLibraries = [ systemd-journal ];
+  meta = {
+    homepage = "http://github.com/ocharles/libsystemd-journal";
+    description = "Haskell bindings to libsystemd-journal";
+    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 5e26f04d460..9bd485417db 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1620,6 +1620,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   liblastfm = callPackage ../development/libraries/haskell/liblastfm {};
 
+  libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal {
+    systemd-journal = pkgs.systemd;
+  };
+
   libxmlSax = callPackage ../development/libraries/haskell/libxml-sax {};
 
   liftedAsync = callPackage ../development/libraries/haskell/lifted-async {};
-- 
GitLab


From 3f2b74bf088cedc20d54314b32c6a0699adb0c40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 13 Mar 2014 16:24:15 +0100
Subject: [PATCH 2488/3789] new expression: gvolicon

---
 lib/maintainers.nix                   |  1 +
 pkgs/tools/audio/gvolicon/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/audio/gvolicon/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e92177ded4b..8acfdcf809d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -14,6 +14,7 @@
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
   aszlig = "aszlig <aszlig@redmoonstudios.org>";
   bbenoist = "Baptist BENOIST <return_0@live.com>";
+  bennofs = "Benno Fünfstück <benno.fuenfstueck@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/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix
new file mode 100644
index 00000000000..311e420c6a3
--- /dev/null
+++ b/pkgs/tools/audio/gvolicon/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, hicolor_icon_theme, gdk_pixbuf, librsvg }:
+
+stdenv.mkDerivation {
+  name = "gvolicon";
+  src = fetchgit {
+    url = "https://github.com/Unia/gvolicon";
+    rev = "26343415de836e0b05aa0b480c0c69cc2ed9e419";
+    sha256 = "68858840a45b5f74803e85116c6219f805d6d944c00354662889549910856cdd";
+  };
+
+  buildInputs = [ pkgconfig makeWrapper alsaLib gnome3.gtk ];
+  propagatedBuildInputs = [ gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic hicolor_icon_theme gdk_pixbuf librsvg ];
+  installPhase = ''
+    make install PREFIX=$out
+    wrapProgram "$out/bin/gvolicon" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/gvolicon:$XDG_ICON_DIRS"
+    '';
+
+  meta = {
+    description = "A simple and lightweight volume icon that sits in your system tray.";
+    homepage = "https://github.com/Unia/gvolicon";
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainer = stdenv.lib.maintainers.bennofs;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4603179fafc..6a9159a6dfb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1144,6 +1144,8 @@ let
     inherit openssl gmp nettools iproute;
   };
 
+  gvolicon = callPackage ../tools/audio/gvolicon {};
+
   gzip = callPackage ../tools/compression/gzip { };
 
   gzrt = callPackage ../tools/compression/gzrt { };
-- 
GitLab


From 9111ce6be281a72751d18e1d664b52f12cef19c4 Mon Sep 17 00:00:00 2001
From: Arvin Moezzi <moezzia@gmail.com>
Date: Sat, 22 Mar 2014 13:34:28 +0100
Subject: [PATCH 2489/3789] pcsclite: $out was misspelled

$(out) was evaluated to an empty string and hence pcscd didn't startup:

  configfile.l:234:tok_error() tok_error: invalid value line ...
---
 pkgs/tools/security/pcsclite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index d069c183842..7f13ffc8db5 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   # The OS should care on preparing the drivers into this location
   configureFlags = [
     "--enable-usbdropdir=/var/lib/pcsc/drivers"
-    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-    "--enable-confdir=$(out)/etc"
+    "--with-systemdsystemunitdir=$out/etc/systemd/system"
+    "--enable-confdir=$out/etc"
   ];
 
   buildInputs = [ udev dbus_libs perl ];
-- 
GitLab


From 941682efba9524e4d9ef5e111f5b708a5beb68eb Mon Sep 17 00:00:00 2001
From: Jacob Hinkle <jacob.hinkle@gmail.com>
Date: Sat, 22 Mar 2014 06:58:31 -0600
Subject: [PATCH 2490/3789] Remove pkgs from slrn. Use stdenv.lib instead

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

diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix
index e079e9d9a9f..c933460af43 100644
--- a/pkgs/applications/networking/newsreaders/slrn/default.nix
+++ b/pkgs/applications/networking/newsreaders/slrn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgs,
+{ stdenv, fetchurl,
 slang, ncurses
 }:
 
@@ -26,6 +26,6 @@ stdenv.mkDerivation {
   meta = {
     description = "The slrn (S-Lang read news) newsreader";
     homepage = http://slrn.sourceforge.net/index.html;
-    license = pkgs.lib.licenses.gpl2;
+    license = stdenv.lib.licenses.gpl2;
   };
 }
-- 
GitLab


From 13928c9892c2266f9f94e9f270cd87aa29101726 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, 22 Mar 2014 20:55:58 +0800
Subject: [PATCH 2491/3789] clutter-gtk: enable gobject introspection

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

diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 040123d4276..3614d149489 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, clutter, gtk3 }:
+{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }:
 
 stdenv.mkDerivation rec {
   name = "clutter-gtk-1.4.4";
@@ -9,9 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ clutter gtk3 ];
-  nativeBuildInputs = [ pkgconfig ];
-
-  configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
 
   postBuild = "rm -rf $out/share/gtk-doc";
 
-- 
GitLab


From 6f689beeeb32b03d19ff07954bf482c6ee6dc782 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, 22 Mar 2014 20:56:29 +0800
Subject: [PATCH 2492/3789] gst-editing-services: enable gobject introspection

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

diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 94d3688eb1c..90233abe31c 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, python
+{ stdenv, fetchurl, pkgconfig, python, gobjectIntrospection
 , gnonlin, libxml2
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "1n7nw8rqvwna9af55lggah44gdvfgld1igvgaya8glc37wpq89b0";
   };
 
-  nativeBuildInputs = [ pkgconfig python ];
+  nativeBuildInputs = [ pkgconfig python gobjectIntrospection ];
 
   propagatedBuildInputs = [ gnonlin libxml2 ];
 }
-- 
GitLab


From 36af50f69a1f42d643c3acd8362b3c58db696a95 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, 22 Mar 2014 22:19:44 +0800
Subject: [PATCH 2493/3789] gst-python: make it works

---
 .../libraries/gstreamer/python/default.nix    |  2 ++
 .../different-path-with-pygobject.patch       | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch

diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
index 843822b0748..9a526de05b1 100644
--- a/pkgs/development/libraries/gstreamer/python/default.nix
+++ b/pkgs/development/libraries/gstreamer/python/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "09c6yls8ipbmwimdjr7xi3hvf2xa1xn1pv07855r7wfyzas1xbl1";
   };
 
+  patches = [ ./different-path-with-pygobject.patch ];
+
   buildInputs =
     [ pkgconfig gst-plugins-base pygtk pygobject3 ]
     ;
diff --git a/pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch b/pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch
new file mode 100644
index 00000000000..7326b3630f7
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch
@@ -0,0 +1,20 @@
+diff -Nru gst-python-1.2.0-orig/gi/overrides/Makefile.in gst-python-1.2.0/gi/overrides/Makefile.in
+--- gst-python-1.2.0-orig/gi/overrides/Makefile.in	2014-03-22 21:47:56.235364405 +0800
++++ gst-python-1.2.0/gi/overrides/Makefile.in	2014-03-22 21:48:28.737958066 +0800
+@@ -356,7 +356,7 @@
+ 
+ # We install everything in the gi/overrides folder
+ pygioverridesdir = $(PYGI_OVERRIDES_DIR)
+-pygioverrides_PYTHON = Gst.py GstPbutils.py
++pygioverrides_PYTHON = Gst.py GstPbutils.py __init__.py
+ pygioverridesexecdir = $(PYGI_OVERRIDES_DIR)
+ EXTRA_DIST = Gst.py
+ INCLUDES = $(PYTHON_INCLUDES)
+diff -Nru gst-python-1.2.0-orig/gi/overrides/__init__.py gst-python-1.2.0/gi/overrides/__init__.py
+--- gst-python-1.2.0-orig/gi/overrides/__init__.py	1970-01-01 08:00:00.000000000 +0800
++++ gst-python-1.2.0/gi/overrides/__init__.py	2014-03-22 21:48:15.442124287 +0800
+@@ -0,0 +1,4 @@
++from pkgutil import extend_path
++
++__path__ = extend_path(__path__, __name__)
++print(__path__, __name__)
-- 
GitLab


From 6a981b514198d9b615be065e7b7fa4a2adbeb890 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, 22 Mar 2014 22:33:35 +0800
Subject: [PATCH 2494/3789] add pitivi 0.93

---
 pkgs/applications/video/pitivi/default.nix | 52 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  5 +++
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/applications/video/pitivi/default.nix

diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
new file mode 100644
index 00000000000..d6a0c0e5212
--- /dev/null
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper
+, pythonPackages, gst, clutter-gst, clutter-gtk
+, gobjectIntrospection, clutter, gtk3, librsvg
+}:
+
+let
+  version = "0.93";
+in stdenv.mkDerivation rec {
+  name = "pitivi-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/pitivi/${version}/${name}.tar.xz";
+    sha256 = "0z89dwrd7akhkap270i372yszqib8yqcymv78lhdmn3a8bsa7jhp";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Non-Linear video editor utilizing the power of GStreamer";
+    homepage    = "http://pitivi.org/";
+    longDescription = ''
+      Pitivi is a video editor built upon the GStreamer Editing Services.
+      It aims to be an intuitive and flexible application
+      that can appeal to newbies and professionals alike.
+    '';
+    license     = licenses.lgpl21Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool itstool makeWrapper ];
+
+  buildInputs = [
+    gobjectIntrospection clutter-gst clutter-gtk librsvg
+  ] ++ (with gst; [
+    gst-python gst-editing-services
+    gst-plugins-base gst-plugins-good
+    gst-plugins-bad gst-plugins-ugly gst-libav
+  ]) ++ (with pythonPackages; [
+    python pygobject3 pyxdg numpy pycairo sqlite3
+  ]);
+
+  postInstall = with stdenv.lib; with gst; let
+    libraryPath = makeLibraryPath [
+      gstreamer gst-editing-services
+      clutter-gst clutter-gtk clutter gtk3
+    ];
+  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"
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10df9bbd986..dad2bf5056a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1630,6 +1630,11 @@ let
 
   parted = callPackage ../tools/misc/parted { hurd = null; };
 
+  pitivi = callPackage ../applications/video/pitivi {
+    gst = gst_all_1;
+    clutter-gtk = clutter_gtk;
+  };
+
   hurdPartedCross =
     if crossSystem != null && crossSystem.config == "i586-pc-gnu"
     then (makeOverridable
-- 
GitLab


From 3cb4ddb3d5d8b1d0e2fc96e986cd6afc30d83ec8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 10:30:13 +0100
Subject: [PATCH 2495/3789] haskell-QuickCheck: update to version 2.7.1

---
 .../haskell/QuickCheck/{2.7.nix => 2.7.1.nix}      |  4 ++--
 pkgs/top-level/haskell-packages.nix                | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename pkgs/development/libraries/haskell/QuickCheck/{2.7.nix => 2.7.1.nix} (84%)

diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/QuickCheck/2.7.nix
rename to pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix
index 4c3847a65f9..6d449871e01 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.7.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "QuickCheck";
-  version = "2.7";
-  sha256 = "0l7qijcwbf81wdizsv7qzmm73dsjbldm2sx305cqs6bmnynbl508";
+  version = "2.7.1";
+  sha256 = "1hk19q7lfvja7g626hbbq0xs30zsgjpqfalgmdr24fy8sgdchm21";
   buildDepends = [ random tfRandom ];
   testDepends = [ testFramework ];
   meta = {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9bd485417db..cf846778087 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1452,8 +1452,8 @@ 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;
-    quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7; };
+    QuickCheck = self.QuickCheck_2_7_1;
+    quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_1; };
   };
 
   hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {};
@@ -1461,8 +1461,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {};
 
   hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {
-    QuickCheck = self.QuickCheck_2_7;
-    quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7; };
+    QuickCheck = self.QuickCheck_2_7_1;
+    quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_1; };
   };
 
   hstatsd = callPackage ../development/libraries/haskell/hstatsd {};
@@ -2058,7 +2058,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {};
   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 = callPackage ../development/libraries/haskell/QuickCheck/2.7.nix {};
+  QuickCheck_2_7_1 = callPackage ../development/libraries/haskell/QuickCheck/2.7.1.nix {};
   QuickCheck1 = self.QuickCheck_1_2_0_1;
   QuickCheck2 = self.QuickCheck_2_6;
   QuickCheck  = self.QuickCheck2;
@@ -2389,7 +2389,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {};
 
   tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {
-    QuickCheck = self.QuickCheck_2_7;
+    QuickCheck = self.QuickCheck_2_7_1;
   };
 
   tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {};
@@ -2911,7 +2911,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cabalInstall = self.cabalInstall_1_18_0_3;
 
   gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {
-    hS3 = self.hS3.override { Crypto = self.Crypto.override { QuickCheck = self.QuickCheck_2_7; }; };
+    hS3 = self.hS3.override { Crypto = self.Crypto.override { QuickCheck = self.QuickCheck_2_7_1; }; };
   };
 
   githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {};
-- 
GitLab


From 70f6b1e50608964194849b8600355ec6af307d0f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 10:30:40 +0100
Subject: [PATCH 2496/3789] haskell-QuickCheck: jailbreak to that the test
 suite for 2.7.1 accepts its own library

---
 pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix
index 6d449871e01..85829093c34 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix
@@ -6,6 +6,9 @@ cabal.mkDerivation (self: {
   sha256 = "1hk19q7lfvja7g626hbbq0xs30zsgjpqfalgmdr24fy8sgdchm21";
   buildDepends = [ random tfRandom ];
   testDepends = [ testFramework ];
+  patchPhase = ''
+    sed -i -e 's|QuickCheck == .*,|QuickCheck,|' QuickCheck.cabal
+  '';
   meta = {
     homepage = "http://code.haskell.org/QuickCheck";
     description = "Automatic testing of Haskell programs";
-- 
GitLab


From 65e3713630e322644a5a3c8f26cbe5577a505206 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 10:32:03 +0100
Subject: [PATCH 2497/3789] haskell-tls: update to version 1.2.3

---
 .../haskell/tls/{1.2.2.nix => 1.2.3.nix}          | 15 ++++++++-------
 pkgs/top-level/haskell-packages.nix               |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)
 rename pkgs/development/libraries/haskell/tls/{1.2.2.nix => 1.2.3.nix} (63%)

diff --git a/pkgs/development/libraries/haskell/tls/1.2.2.nix b/pkgs/development/libraries/haskell/tls/1.2.3.nix
similarity index 63%
rename from pkgs/development/libraries/haskell/tls/1.2.2.nix
rename to pkgs/development/libraries/haskell/tls/1.2.3.nix
index 638299d4a42..5906413796d 100644
--- a/pkgs/development/libraries/haskell/tls/1.2.2.nix
+++ b/pkgs/development/libraries/haskell/tls/1.2.3.nix
@@ -1,5 +1,5 @@
-{ cabal, asn1Encoding, asn1Types, cereal, cipherAes, cipherRc4
-, cprngAes, cryptohash, cryptoNumbers, cryptoPubkey
+{ cabal, asn1Encoding, asn1Types, byteable, cereal, cipherAes
+, cipherRc4, cprngAes, cryptohash, cryptoNumbers, cryptoPubkey
 , cryptoPubkeyTypes, cryptoRandom, dataDefaultClass, mtl, network
 , QuickCheck, testFramework, testFrameworkQuickcheck2, time, x509
 , x509Store, x509Validation
@@ -7,12 +7,13 @@
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "1.2.2";
-  sha256 = "156l859mfpdax5rg1frwa5ms5bzggaja0mi795hh8i5c3ah7hfcp";
+  version = "1.2.3";
+  sha256 = "0vv81z5m223b90zzfp5dk376fh8yngyd8h9anrxjrqb4f3bycaxg";
   buildDepends = [
-    asn1Encoding asn1Types cereal cipherAes cipherRc4 cryptohash
-    cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom
-    dataDefaultClass mtl network x509 x509Store x509Validation
+    asn1Encoding asn1Types byteable cereal cipherAes cipherRc4
+    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 cf846778087..16405f53da6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2479,8 +2479,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   timeCompat = callPackage ../development/libraries/haskell/time-compat {};
 
   tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {};
-  tls_1_2_2 = callPackage ../development/libraries/haskell/tls/1.2.2.nix {};
-  tls = self.tls_1_2_2;
+  tls_1_2_3 = callPackage ../development/libraries/haskell/tls/1.2.3.nix {};
+  tls = self.tls_1_2_3;
 
   tlsExtra = callPackage ../development/libraries/haskell/tls-extra {
     tls = self.tls_1_1_5;
-- 
GitLab


From c30f45dbdc6c7f99dbc3421f84bd9630c8ee2390 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 10:32:26 +0100
Subject: [PATCH 2498/3789] haskell-filepath: update to version 1.3.0.2

---
 pkgs/development/libraries/haskell/filepath/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/default.nix
index 0cd65bb1905..7a2b9e75e7f 100644
--- a/pkgs/development/libraries/haskell/filepath/default.nix
+++ b/pkgs/development/libraries/haskell/filepath/default.nix
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, QuickCheck, random }:
 
 cabal.mkDerivation (self: {
   pname = "filepath";
-  version = "1.3.0.1";
-  sha256 = "1ny8dz8rv883vg6hkzg3zank771cr2z9sfhii7aw4rfb71k29g5p";
+  version = "1.3.0.2";
+  sha256 = "0wvvz6cs5fh4f04a87b9s7xrnzypmnzzkn149p6xk8xi7gcvcpy2";
+  testDepends = [ QuickCheck random ];
   meta = {
     homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/";
     description = "Library for manipulating FilePaths in a cross platform way";
-- 
GitLab


From e2193175cdc1c2731ec5d4e858a6d2ef55f651a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 10:32:27 +0100
Subject: [PATCH 2499/3789] haskell-vty: update to version 4.7.5

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

diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix
index 3bcadc78a97..8a8ed40adb4 100644
--- a/pkgs/development/libraries/haskell/vty/default.nix
+++ b/pkgs/development/libraries/haskell/vty/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vty";
-  version = "4.7.3";
-  sha256 = "0x059mzw6v2xf92fdhy0ilyqbics2as6dqrdr6njpp0m6qykkybb";
+  version = "4.7.5";
+  sha256 = "0ahd5qjszfw1xbl5jxhzfw31mny8hp8clw9qciv15xn442prvvpr";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 9fdacd0d6dff2bd93db0273e9afcf1c36e7b1414 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 10:34:52 +0100
Subject: [PATCH 2500/3789] haskell-wx: update to version 0.90.1.0

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

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
index dc030f68059..a0f77536519 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wx";
-  version = "0.90.0.1";
-  sha256 = "116vlpssjcyzil99xmz3azc2vl97iban3gdpxd593q5gi24l838m";
+  version = "0.90.1.0";
+  sha256 = "1669mrd73c3v7c4yc0zgyqsnfgzb7561v1wd168y06d0db1nlkn9";
   buildDepends = [ stm wxcore ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
-- 
GitLab


From 9761a0c49ad2bec22976b6087b877012310d1f28 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 10:34:53 +0100
Subject: [PATCH 2501/3789] haskell-wxc: update to version 0.90.1.0

---
 pkgs/development/libraries/haskell/wxHaskell/wxc.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
index d95b07121af..2435edb31b1 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
@@ -2,14 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "wxc";
-  version = "0.90.0.4";
-  sha256 = "1bh20i1rb8ng0ni1v98nm8qv5wni19dvxwf5i3ijxhrxqdq4i7p6";
+  version = "0.90.1.0";
+  sha256 = "1j318pxn6wqjwhz5rinb8az1bkhasgm9rhb3l36dlbzwcc4p0a2a";
   buildDepends = [ wxdirect ];
   extraLibraries = [ libX11 mesa wxGTK ];
-  postInstall = ''
-    cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so
-  '';
-  patches = [ ./fix-bogus-pointer-assignment.patch ];
   noHaddock = true;
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
-- 
GitLab


From 33a55a58c14c5628d734925f78ff47e8b1281bbf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 10:34:54 +0100
Subject: [PATCH 2502/3789] haskell-wxcore: update to version 0.90.1.0

---
 pkgs/development/libraries/haskell/wxHaskell/wxcore.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
index 5dde5e8fc3f..37d8c24a21c 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
@@ -4,13 +4,10 @@
 
 cabal.mkDerivation (self: {
   pname = "wxcore";
-  version = "0.90.0.3";
-  sha256 = "0d79hr6cz9zj3w57h6630nfnsmfq1w73gz04jjmlhwh8ih557imw";
+  version = "0.90.1.0";
+  sha256 = "0pyh5xc8f3rlyn66dawlijwym8nwac12qwh96hfkna0pbqg0995c";
   buildDepends = [ filepath parsec stm time wxc wxdirect ];
   extraLibraries = [ libX11 mesa wxGTK ];
-  patchPhase = ''
-    sed -i -e 's|containers >=.*|containers|' wxcore.cabal
-  '';
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "wxHaskell core";
-- 
GitLab


From 02e8e7021bfb38eba60fabbed08195b0f0f79fc2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 10:34:55 +0100
Subject: [PATCH 2503/3789] haskell-wxdirect: update to version 0.90.1.0

---
 .../libraries/haskell/wxHaskell/wxdirect.nix          | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
index 08512c20625..3b67ec103df 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
@@ -1,15 +1,12 @@
-{ cabal, parsec, strict, time }:
+{ cabal, filepath, parsec, strict, time }:
 
 cabal.mkDerivation (self: {
   pname = "wxdirect";
-  version = "0.90.0.1";
-  sha256 = "04jslgxw601g6wh8f2wrdnipzh6x0487kfxb89fkgfgjhxrkfyr3";
+  version = "0.90.1.0";
+  sha256 = "06r8z4css7md35rcbi805407dcabcrb1knif9f7445aphwzgadr0";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ parsec strict time ];
-  patchPhase = ''
-    sed -i -e 's|containers >=.*|containers|' wxdirect.cabal
-  '';
+  buildDepends = [ filepath parsec strict time ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "helper tool for building wxHaskell";
-- 
GitLab


From fffe521344de1718d419a4c047fd5b10fc4e984a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 10:35:23 +0100
Subject: [PATCH 2504/3789] haskell-wxHaskell: drop obsolete patch

---
 .../wxHaskell/fix-bogus-pointer-assignment.patch    | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch

diff --git a/pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch b/pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch
deleted file mode 100644
index 38551d24d43..00000000000
--- a/pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ubr wxc-0.90.0.4-orig/src/cpp/eljpen.cpp wxc-0.90.0.4/src/cpp/eljpen.cpp
---- wxc-0.90.0.4-orig/src/cpp/eljpen.cpp	2012-07-03 12:12:17.000000000 +0200
-+++ wxc-0.90.0.4/src/cpp/eljpen.cpp	2013-01-07 12:09:50.296417007 +0100
-@@ -156,7 +156,7 @@
- EWXWEXPORT(void,wxPen_GetStipple)(void* self,wxBitmap* _ref)
- {
- #if defined(__WXGTK__)
--    *_ref = NULL;
-+    _ref = NULL;
- #else
-     *_ref = *(((wxPen*)self)->GetStipple());
- #endif
-Only in wxc-0.90.0.4/src/cpp: eljpen.cpp.orig
-- 
GitLab


From ec8e5b99fc24ad78e7b55f2570a0cb15875b0360 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 10:44:19 +0100
Subject: [PATCH 2505/3789] ghc-7.4.2: fix build on recent versions of Darwin

---
 pkgs/development/compilers/ghc/7.4.2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix
index d1acb3d09b9..497a59e17fa 100644
--- a/pkgs/development/compilers/ghc/7.4.2.nix
+++ b/pkgs/development/compilers/ghc/7.4.2.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
   '';
 
-- 
GitLab


From e54ae8cce1dc6e75b506da50e9219e033794d618 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 10:44:27 +0100
Subject: [PATCH 2506/3789] ghc-7.8.1: fix build on recent versions of Darwin

---
 pkgs/development/compilers/ghc/7.8.1.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ghc/7.8.1.nix b/pkgs/development/compilers/ghc/7.8.1.nix
index c9ca6fd8719..f58ca9cc1fc 100644
--- a/pkgs/development/compilers/ghc/7.8.1.nix
+++ b/pkgs/development/compilers/ghc/7.8.1.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
   '';
 
-- 
GitLab


From 5c3be05e90dcf70720c8d922149de5dd87d5ef50 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 10:44:35 +0100
Subject: [PATCH 2507/3789] ghc-HEAD: fix build on recent versions of Darwin

---
 pkgs/development/compilers/ghc/head.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 7f5ec0985b9..cc220eb7b1c 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
   '';
 
-- 
GitLab


From 1bc1ddcda0d7dec6d9fea739651903fecc705d71 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 12:28:31 +0100
Subject: [PATCH 2508/3789] haskell-unix-time: fix test suite in shared library
 build

https://github.com/kazu-yamamoto/unix-time/issues/20
---
 pkgs/development/libraries/haskell/unix-time/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix
index 0ca4ea5f5c2..e329c1ef406 100644
--- a/pkgs/development/libraries/haskell/unix-time/default.nix
+++ b/pkgs/development/libraries/haskell/unix-time/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.2.2";
   sha256 = "0xnl12mscc5nwjl9s2lx4xr8q8agzcpxh3bmxxidfjrg19drfwrm";
   testDepends = [ doctest hspec QuickCheck time ];
+  configureFlags = self.stdenv.lib.optionalString self.enableSharedLibraries "--ghc-option=-fPIC";
   meta = {
     description = "Unix time parser/formatter and utilities";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From 9a107da470b4f8cc671dd69602363e074bfde377 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Mar 2014 13:05:35 +0100
Subject: [PATCH 2509/3789] wxHaskell: touch files after extracting the tarball
 to fix broken timestamps

---
 pkgs/development/libraries/haskell/wxHaskell/wx.nix       | 1 +
 pkgs/development/libraries/haskell/wxHaskell/wxc.nix      | 1 +
 pkgs/development/libraries/haskell/wxHaskell/wxcore.nix   | 1 +
 pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix | 1 +
 4 files changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
index a0f77536519..90bfdc5ca0a 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.90.1.0";
   sha256 = "1669mrd73c3v7c4yc0zgyqsnfgzb7561v1wd168y06d0db1nlkn9";
   buildDepends = [ stm wxcore ];
+  preConfigure = "find . -type f -exec touch {} +";
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "wxHaskell";
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
index 2435edb31b1..7a9f05c6b62 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   buildDepends = [ wxdirect ];
   extraLibraries = [ libX11 mesa wxGTK ];
   noHaddock = true;
+  preConfigure = "find . -type f -exec touch {} +";
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "wxHaskell C++ wrapper";
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
index 37d8c24a21c..3ee5d9e2cdb 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
   sha256 = "0pyh5xc8f3rlyn66dawlijwym8nwac12qwh96hfkna0pbqg0995c";
   buildDepends = [ filepath parsec stm time wxc wxdirect ];
   extraLibraries = [ libX11 mesa wxGTK ];
+  preConfigure = "find . -type f -exec touch {} +";
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "wxHaskell core";
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
index 3b67ec103df..0f379401b35 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 ];
+  preConfigure = "find . -type f -exec touch {} +";
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "helper tool for building wxHaskell";
-- 
GitLab


From e48ae6a0794c5fbcfb5cdfcac31a1c23ee4548d7 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 22 Mar 2014 14:30:45 -0300
Subject: [PATCH 2510/3789] A minor fix to maintainers field for some packages
 (aegisub,mpv,8086tiny and bochs)

---
 pkgs/applications/video/aegisub/default.nix           | 2 +-
 pkgs/applications/video/mpv/default.nix               | 2 +-
 pkgs/applications/virtualization/8086tiny/default.nix | 4 +++-
 pkgs/applications/virtualization/bochs/default.nix    | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index fa17fb5ffd2..af3f6f79942 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
               # The Aegisub sources are itself BSD/ISC, 
               # but they are linked against GPL'd softwares
               # - so the resulting program will be GPL
-    maintainers = [ maintainers.AndersonTorres ];
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
 
   };
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 2ffefa35898..693f367a169 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://mpv.io";
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ maintainers.AndersonTorres ];
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix
index ca93a1bfd7c..1802ed74db9 100644
--- a/pkgs/applications/virtualization/8086tiny/default.nix
+++ b/pkgs/applications/virtualization/8086tiny/default.nix
@@ -32,7 +32,9 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.megalith.co.uk/8086tiny/index.html;
     license = stdenv.lib.licenses.mit;
-    maintainers = [ maintainers.AndersonTorres ];
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
+
+# TODO: add support for a locally made BIOS
\ No newline at end of file
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index 7b49bb8220d..eaa7a4ad054 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://bochs.sourceforge.net/;
     license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = [ maintainers.AndersonTorres ];
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From bc025bf63265530e40591eeeb05e5ecae1a2a4b2 Mon Sep 17 00:00:00 2001
From: Ben Doyle <benjamin.peter.doyle@gmail.com>
Date: Sat, 22 Mar 2014 17:54:39 -0400
Subject: [PATCH 2511/3789] Fix mistaken change to top level packages

---
 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 5740ab4b334..4603179fafc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10512,7 +10512,7 @@ let
     desktopName = "Vimb";
   };
 
-  # VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
+  VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
 
   # Wine cannot be built in 64-bit; use a 32-bit build instead.
   wineStable = callPackage_i686 ../misc/emulators/wine/stable.nix {
-- 
GitLab


From ed7f95be88a507ab646a21081a6b7c8d5032a0a8 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sat, 22 Mar 2014 21:21:24 -0400
Subject: [PATCH 2512/3789] ncdc: initial expression

http://dev.yorhel.nl/ncdc
---
 .../networking/p2p/ncdc/default.nix           | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/networking/p2p/ncdc/default.nix

diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix
new file mode 100644
index 00000000000..a06185ed2ae
--- /dev/null
+++ b/pkgs/applications/networking/p2p/ncdc/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }:
+
+stdenv.mkDerivation rec {
+  name = "ncdc-${version}";
+  version = "1.19";
+
+  src = fetchurl {
+    url = "http://dev.yorhel.nl/download/ncdc-1.19.tar.gz";
+    sha256 = "1wgvqwfxq9kc729h2r528n55821w87sfbm4h21mr6pvkpfw30hf2";
+  };
+
+  buildInputs = [ ncurses zlib bzip2 sqlite pkgconfig glib gnutls ];
+
+  meta = {
+    description = "modern and lightweight direct connect client with a friendly ncurses interface";
+    homepage = http://dev.yorhel.nl/ncdc;
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10df9bbd986..9f80fea68aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8676,6 +8676,8 @@ let
 
   ncdu = callPackage ../tools/misc/ncdu { };
 
+  ncdc = callPackage ../applications/networking/p2p/ncdc { };
+
   nedit = callPackage ../applications/editors/nedit {
     motif = lesstif;
   };
-- 
GitLab


From d30644136001176b2f6ee94bb8ec947b02841461 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sat, 22 Mar 2014 21:47:37 -0400
Subject: [PATCH 2513/3789] f2fs-tools: initial expression

---
 pkgs/tools/filesystems/f2fs-tools/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/filesystems/f2fs-tools/default.nix

diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix
new file mode 100644
index 00000000000..72f417ff10b
--- /dev/null
+++ b/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, libuuid }:
+
+stdenv.mkDerivation rec {
+  name = "f2fs-tools-${version}";
+  version = "1.3.0";
+
+  src = fetchgit {
+    url = git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;
+    rev = "refs/tags/v${version}";
+    sha256 = "1r97k91qaf42jz623jqy0wm97yjq1ym034q4fdhfirq27s46sn6i";
+  };
+
+  buildInputs = [ autoconf automake libtool pkgconfig libuuid ];
+
+  preConfigure = ''
+    sed -i '/AC_SUBST/d' configure.ac
+    autoreconf --install
+  '';
+
+  meta = {
+    homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/";
+    description = "Userland tools for the f2fs filesystem";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10df9bbd986..031f334c7dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -920,6 +920,8 @@ let
 
   expect = callPackage ../tools/misc/expect { };
 
+  f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { };
+
   fabric = pythonPackages.fabric;
 
   fail2ban = callPackage ../tools/security/fail2ban { };
-- 
GitLab


From e7172cad9aec8cec889eee3a0c21476b7b88c521 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 22 Mar 2014 22:40:14 -0400
Subject: [PATCH 2514/3789] haskell-postgresql-simple: bump

---
 .../libraries/haskell/postgresql-simple/default.nix  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index d1be8d1d896..56c4a5965e1 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -1,15 +1,15 @@
 { cabal, aeson, attoparsec, base16Bytestring, blazeBuilder
-, blazeTextual, cryptohash, HUnit, postgresqlLibpq, text, time
-, transformers, uuid, vector
+, blazeTextual, cryptohash, hashable, HUnit, postgresqlLibpq
+, scientific, text, time, transformers, uuid, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "postgresql-simple";
-  version = "0.4.0.2";
-  sha256 = "0gx9jmmzv6aaa6z88i3j51f5hp153dbwzw3x7jx329c5pjp536g9";
+  version = "0.4.2.0";
+  sha256 = "0g31a7s2h9d6f3igvrddbr357sk4vabvg88mmvb194pps66y8zzn";
   buildDepends = [
-    aeson attoparsec blazeBuilder blazeTextual postgresqlLibpq text
-    time transformers uuid vector
+    aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq
+    scientific text time transformers uuid vector
   ];
   testDepends = [
     aeson base16Bytestring cryptohash HUnit text time vector
-- 
GitLab


From ae8a8b5deb305e2e8884d9f34a91a7ab28b62b1b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 22 Mar 2014 22:40:35 -0400
Subject: [PATCH 2515/3789] Add buildLocalCabal helper function

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 16405f53da6..5b39974c315 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2893,6 +2893,25 @@ 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
+    cabalExpr = pkgs.stdenv.mkDerivation {
+      name = "${name}.nix";
+
+      LANG = "en_US.UTF-8";
+
+      LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
+
+      buildCommand = ''
+      ${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/pname = \([^\n]*\)/pname = \1\n  inherit src;/'  > $out
+      '';
+    };
+  in callPackage cabalExpr { inherit src; };
+
   cabalDev = callPackage ../development/tools/haskell/cabal-dev {};
 
   cabal2Ghci = callPackage ../development/tools/haskell/cabal2ghci {};
-- 
GitLab


From 7c2d00aefdf48415aecfecc1962097b7ba28d743 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 23 Mar 2014 10:03:28 +0000
Subject: [PATCH 2516/3789] build-support: Add writeTextDir

This `writeTextFile` based helper function is especially usefull for writing a
bunch of configuration files to root of the output folder
---
 pkgs/build-support/trivial-builders.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 5ae2e7b4fc9..c08a6c3a265 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -33,6 +33,7 @@ rec {
     
   # Shorthands for `writeTextFile'.
   writeText = name: text: writeTextFile {inherit name text;};
+  writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";};
   writeScript = name: text: writeTextFile {inherit name text; executable = true;};
   writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";};
 
-- 
GitLab


From a7070743a30d608f93be859ffc87de6354ba97b5 Mon Sep 17 00:00:00 2001
From: Alexei Robyn <shados@shados.net>
Date: Sun, 23 Mar 2014 20:49:09 +1100
Subject: [PATCH 2517/3789] Openbox: Added wrapping for XDG_DATA_DIRS

Fixes issue with Openbox failing to start due to not finding its default
theme
---
 pkgs/applications/window-managers/openbox/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix
index 487a8a5b387..56a5f0e3e2c 100644
--- a/pkgs/applications/window-managers/openbox/default.nix
+++ b/pkgs/applications/window-managers/openbox/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig
 , libxml2, libXinerama, libXcursor, libXau, libXrandr
-, imlib2, pango, libstartup_notification }:
+, imlib2, pango, libstartup_notification, makeWrapper}:
 
 stdenv.mkDerivation rec {
   name = "openbox-3.5.2";
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
     pkgconfig libxml2
     libXinerama libXcursor libXau libXrandr
     imlib2 pango libstartup_notification
+    makeWrapper
   ];
 
   src = fetchurl {
@@ -16,6 +17,14 @@ stdenv.mkDerivation rec {
     sha256 = "0cxgb334zj6aszwiki9g10i56sm18i7w1kw52vdnwgzq27pv93qj";
   };
 
+  # Openbox needs XDG_DATA_DIRS set or it can't find its default theme
+  postInstall = ''
+    wrapProgram "$out/bin/openbox" --prefix XDG_DATA_DIRS : "$out/share"
+    wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share"
+    wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share"
+    wrapProgram "$out/bin/openbox-kde-session" --prefix XDG_DATA_DIRS : "$out/share"
+    '';
+
   meta = {
     description = "X window manager for non-desktop embedded systems";
     homepage = http://openbox.org/;
-- 
GitLab


From 02b85f51913be7d95dba25b90eace31b862edcae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 23 Mar 2014 12:25:20 +0100
Subject: [PATCH 2518/3789] libjpeg(_turbo): minor update 1.3.0 -> .1

The security patch got incorporated into the release.
---
 .../libraries/libjpeg-turbo/default.nix       |  6 +--
 ...g-turbo-1.3.0-CVE-2013-6629-and-6630.patch | 40 -------------------
 2 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/development/libraries/libjpeg-turbo/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch

diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index 8976e743192..bf27e074dd5 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -1,15 +1,13 @@
 { stdenv, fetchurl, nasm }:
 
 stdenv.mkDerivation rec {
-  name = "libjpeg-turbo-1.3.0";
+  name = "libjpeg-turbo-1.3.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
-    sha256 = "0d0jwdmj3h89bxdxlwrys2mw18mqcj4rzgb5l2ndpah8zj600mr6";
+    sha256 = "1fbgcvlnn3d5gvf0v9jnlcabpv2z3nwxclzyabahxi6x2xs90cn1";
   };
 
-  patches = [ ./libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch ];
-
   buildInputs = [ nasm ];
 
   doCheck = true;
diff --git a/pkgs/development/libraries/libjpeg-turbo/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch b/pkgs/development/libraries/libjpeg-turbo/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch
deleted file mode 100644
index 8c0f9c75054..00000000000
--- a/pkgs/development/libraries/libjpeg-turbo/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Thanks to the sources below; this patch discovered via Gentoo.
-
-http://bugzilla.redhat.com/show_bug.cgi?id=1031734
-http://bugzilla.redhat.com/show_bug.cgi?id=1031749
-http://sourceforge.net/p/libjpeg-turbo/code/1090/
-
---- libjpeg-turbo-1.3.0/jdmarker.c
-+++ libjpeg-turbo-1.3.0/jdmarker.c
-@@ -304,7 +304,7 @@
- /* Process a SOS marker */
- {
-   INT32 length;
--  int i, ci, n, c, cc;
-+  int i, ci, n, c, cc, pi;
-   jpeg_component_info * compptr;
-   INPUT_VARS(cinfo);
- 
-@@ -348,6 +348,13 @@
-     
-     TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,
- 	     compptr->dc_tbl_no, compptr->ac_tbl_no);
-+
-+    /* This CSi (cc) should differ from the previous CSi */
-+    for (pi = 0; pi < i; pi++) {
-+      if (cinfo->cur_comp_info[pi] == compptr) {
-+        ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
-+      }
-+    }
-   }
- 
-   /* Collect the additional scan parameters Ss, Se, Ah/Al. */
-@@ -465,6 +472,8 @@
-     for (i = 0; i < count; i++)
-       INPUT_BYTE(cinfo, huffval[i], return FALSE);
- 
-+    MEMZERO(&huffval[count], (256 - count) * SIZEOF(UINT8));
-+
-     length -= count;
- 
-     if (index & 0x10) {		/* AC table definition */
-- 
GitLab


From e91daf327d5b8dec070601cd22aebb5083dfe9e7 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sun, 23 Mar 2014 11:22:57 -0400
Subject: [PATCH 2519/3789] electrum: initial expression

Electrum is a Bitcoin thin-wallet.
https://electrum.org
---
 pkgs/applications/misc/electrum/default.nix   | 32 +++++++++++++++++++
 .../python-modules/ecdsa/default.nix          | 18 +++++++++++
 .../python-modules/slowaes/default.nix        | 16 ++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++++
 4 files changed, 72 insertions(+)
 create mode 100644 pkgs/applications/misc/electrum/default.nix
 create mode 100644 pkgs/development/python-modules/ecdsa/default.nix
 create mode 100644 pkgs/development/python-modules/slowaes/default.nix

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
new file mode 100644
index 00000000000..c35a2c7ff82
--- /dev/null
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pythonPackages, slowaes, ecdsa, pyqt4 }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "electrum-${version}";
+  version = "1.9.8";
+
+  src = fetchurl {
+    url = "https://download.electrum.org/Electrum-${version}.tar.gz";
+    sha256 = "8fc144a32013e4a747fea27fff981762a6b9e14cde9ffb405c4c721975d846ff";
+  };
+
+  buildInputs = [ slowaes ecdsa ];
+
+  propagatedBuildInputs = [ 
+    slowaes
+    ecdsa
+    pyqt4
+  ];
+
+  postPatch = ''
+    mkdir -p $out/share
+    sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py
+  '';
+
+  meta = {
+    description = "Bitcoin thin-wallet";
+    long-description = "Electrum is an easy to use Bitcoin client. It protects you from losing coins in a backup mistake or computer failure, because your wallet can be recovered from a secret phrase that you can write on paper or learn by heart. There is no waiting time when you start the client, because it does not download the Bitcoin blockchain.";
+    homepage = "https://electrum.org";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ "emery@vfemail.net" ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix
new file mode 100644
index 00000000000..f668f3c6ac3
--- /dev/null
+++ b/pkgs/development/python-modules/ecdsa/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, buildPythonPackage, openssl }:
+
+buildPythonPackage rec {
+  name = "ecdsa-0.11";
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/e/ecdsa/${name}.tar.gz";
+    sha256 = "134mbq5xsvx54k9xm7zrizvh9imxmcz1w9mhyfr99p4i7wcnqfwf";
+  };
+
+  buildInputs = [ openssl ];
+
+  meta = {
+    homepage = "http://github.com/warner/python-ecdsa";
+    description = "pure-python ECDSA signature/verification";
+    license = stdenv.lib.licenses.mit;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/slowaes/default.nix b/pkgs/development/python-modules/slowaes/default.nix
new file mode 100644
index 00000000000..ef793d7e120
--- /dev/null
+++ b/pkgs/development/python-modules/slowaes/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "slowaes-0.1a1";
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/s/slowaes/${name}.tar.gz";
+    sha256 = "83658ae54cc116b96f7fdb12fdd0efac3a4e8c7c7064e3fac3f4a881aa54bf09";
+  };
+
+  meta = {
+    homepage = "http://code.google.com/p/slowaes/";
+    description = "AES implemented in pure python";
+    license = stdenv.lib.licenses.apache;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24f1543fc83..95109679e8b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6157,6 +6157,8 @@ let
 
   bsddb3 = callPackage ../development/python-modules/bsddb3 { };
 
+  ecdsa = callPackage ../development/python-modules/ecdsa { };
+
   numeric = callPackage ../development/python-modules/numeric { };
 
   pil = pythonPackages.pil;
@@ -6215,6 +6217,8 @@ let
 
   setuptools = pythonPackages.setuptools;
 
+  slowaes = callPackage ../development/python-modules/slowaes { };
+
   wxPython = pythonPackages.wxPython;
   wxPython28 = pythonPackages.wxPython28;
 
@@ -7765,6 +7769,8 @@ let
 
   ekho = callPackage ../applications/audio/ekho { };
 
+  electrum = callPackage ../applications/misc/electrum { };
+
   elinks = callPackage ../applications/networking/browsers/elinks { };
 
   elvis = callPackage ../applications/editors/elvis { };
-- 
GitLab


From 0c79b762718ff6e4e810e0b27eded5104d871e03 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sun, 23 Mar 2014 13:17:34 -0300
Subject: [PATCH 2520/3789] Aspell dictionaries update: Portuguese (pt_PT) and
 Brazilian (pt_BR)

---
 .../libraries/aspell/dictionaries.nix           | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index 6500e602e85..79a75708c16 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -140,12 +140,21 @@ in {
     };
   };
 
-  pt = buildDict {
-    shortName = "pt-0.50-1";
+  pt_BR = buildDict {
+    shortName = "pt_BR-20090702";
+    fullName = "Brazilian Portuguese";
+    src = fetchurl {
+      url = mirror://gnu/aspell/dict/pt_BR/aspell6-pt_BR-20090702-0.tar.bz2;
+      sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p";
+    };
+  };
+
+  pt_PT = buildDict {
+    shortName = "pt_PT-20070510";
     fullName = "Portuguese";
     src = fetchurl {
-      url = mirror://gnu/aspell/dict/pt/aspell-pt-0.50-1.tar.bz2;
-      sha256 = "07xzlnxxzadqsapng29p2gdwj0bijv10wpjnqlwzmkxnx6fxzkcy";
+      url = mirror://gnu/aspell/dict/pt_PT/aspell6-pt_PT-20070510-0.tar.bz2;
+      sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq";
     };
   };
 
-- 
GitLab


From 6c9ecc1573113b12140bbebd3f3a85503548955f Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Sun, 23 Mar 2014 17:27:55 +0100
Subject: [PATCH 2521/3789] mplayer: add option config.mplayer.vdpauSupport

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24f1543fc83..c1cff95649a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8585,6 +8585,7 @@ let
 
   mplayer = callPackage ../applications/video/mplayer {
     pulseSupport = config.pulseaudio or false;
+    vdpauSupport = config.mplayer.vdpauSupport or false;
   };
 
   mplayer2 = callPackage ../applications/video/mplayer2 { };
-- 
GitLab


From 6f44ffc61c1274f79fa30f2a20b87cc932c8b6c9 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 23 Mar 2014 18:03:31 +0100
Subject: [PATCH 2522/3789] transmission-remote-gtk: fix missing schema for
 gtk3 FileChooser

---
 .../networking/p2p/transmission-remote-gtk/default.nix   | 9 +++++++--
 1 file changed, 7 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 3c1cfe51836..5403f6e3156 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, json_glib, curl }:
+{ stdenv, makeWrapper, fetchurl, pkgconfig, intltool, gtk3, json_glib, curl }:
 
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "1jbh2pm4i740cmzqd2r7zxnqqipvv2v2ndmnmk53nqrxcbgc4nlz";
   };
 
-  buildInputs = [ pkgconfig intltool gtk3 json_glib curl ];
+  buildInputs = [ makeWrapper pkgconfig intltool gtk3 json_glib curl ];
+
+  postInstall = ''
+    wrapProgram "$out/bin/transmission-remote-gtk" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share"
+  '';
 
   meta = {
    description = "GTK remote control for the Transmission BitTorrent client";
-- 
GitLab


From 13bc37ed3e730ed2e98d60694ccdfc15cbc57447 Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Sun, 23 Mar 2014 17:24:12 +0100
Subject: [PATCH 2523/3789] vlc: ncurses support (close #2012)

---
 pkgs/applications/video/vlc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 3df447fad62..de2615d8334 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
     [ "--enable-alsa"
       "--with-kde-solid=$out/share/apps/solid/actions"
       "--enable-dc1394"
+      "--enable-ncurses"
     ];
 
   preConfigure = ''sed -e "s@/bin/echo@echo@g" -i configure'';
-- 
GitLab


From 97f1a251ed5f5446c227d0ece8c0410222ab87ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 23 Mar 2014 20:32:47 +0100
Subject: [PATCH 2524/3789] mesa: add symlinks from $out/lib/*.so to
 $drivers/lib

This is mainly in order for libGL to be present in /run/opengl-drivers{,-32}.
Now even with mesa drivers pkgs will use your current nixos libGL
instead of the one it was built against.

Thanks to @iElectric for suggesting this change.
---
 pkgs/development/libraries/mesa/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 1018a0e31f3..e5cd54c572f 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -152,6 +152,11 @@ 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
 
-- 
GitLab


From c173ddb70e24348af4297ca240285ddcf3b92ea9 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sun, 23 Mar 2014 15:48:33 +0100
Subject: [PATCH 2525/3789] python-3.3: Add support for lzma

---
 pkgs/development/interpreters/python/3.3/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index 33b67a10f19..d744fa9672f 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -3,6 +3,7 @@
 , db
 , gdbm
 , libX11, xproto
+, lzma
 , ncurses
 , openssl
 , readline
@@ -20,7 +21,7 @@ let
   version = "${majorVersion}.5";
 
   buildInputs = filter (p: p != null) [
-    zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
+    zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
   ];
 in
 stdenv.mkDerivation {
-- 
GitLab


From 842ae7674b660b52f69963d957c4cf2904a749fd Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sun, 23 Mar 2014 21:19:56 +0100
Subject: [PATCH 2526/3789] python-3.4: Add support for lzma

---
 pkgs/development/interpreters/python/3.4/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix
index 3725586f3f4..0b877446324 100644
--- a/pkgs/development/interpreters/python/3.4/default.nix
+++ b/pkgs/development/interpreters/python/3.4/default.nix
@@ -3,6 +3,7 @@
 , db
 , gdbm
 , libX11, xproto
+, lzma
 , ncurses
 , openssl
 , readline
@@ -21,7 +22,7 @@ let
   fullVersion = "${version}";
 
   buildInputs = filter (p: p != null) [
-    zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
+    zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
   ];
 in
 stdenv.mkDerivation {
-- 
GitLab


From 11492176d598b1d6ab0166cadbe96c7534497e39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 23 Mar 2014 21:28:14 +0100
Subject: [PATCH 2527/3789] xorg: add "intel-testing" video driver, currently
 2.99.911

---
 nixos/modules/services/x11/xserver.nix             |  1 +
 pkgs/servers/x11/xorg/xf86-video-intel-testing.nix | 14 ++++++++++++++
 pkgs/top-level/all-packages.nix                    |  2 ++
 3 files changed, 17 insertions(+)
 create mode 100644 pkgs/servers/x11/xorg/xf86-video-intel-testing.nix

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index f422bc0cd2a..25ba3606adc 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -21,6 +21,7 @@ let
     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 = config.hardware.opengl.videoDrivers;
diff --git a/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix b/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix
new file mode 100644
index 00000000000..5877643fb1b
--- /dev/null
+++ b/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix
@@ -0,0 +1,14 @@
+{ stdenv, fetchurl, pkgconfig, libdrm, udev, xorg }:
+
+with xorg;
+
+(stdenv.mkDerivation ({
+  name = "xf86-video-intel-2.99.911";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = mirror://xorg/individual/driver/xf86-video-intel-2.99.911.tar.bz2;
+    sha256 = "1mkhfa10304xvs763dz1kj93zkmdidlfxhsy5j8ljkfc3d4nhyjf";
+  };
+  buildInputs = [pkgconfig dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ];
+})) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ;}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c345848b2a0..4d9b83379a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6515,6 +6515,8 @@ let
       dbus libuuid openssl gperf m4
       autoconf automake libtool xmlto asciidoc udev flex bison python mtdev pixman;
     mesa = mesa_noglu;
+  } // {
+    xf86videointel-testing = callPackage ../servers/x11/xorg/xf86-video-intel-testing.nix { };
   });
 
   xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { };
-- 
GitLab


From 11e8c4ae8cab3794cc9dc463b75844c1278f6367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 23 Mar 2014 22:26:08 +0100
Subject: [PATCH 2528/3789] superTuxKart: fix build with newer mesa

The idea is taken from Arch.
---
 pkgs/games/super-tux-kart/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index 46f22d332cc..cd2698665f6 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     echo Building internal Irrlicht
     cd lib/irrlicht/source/Irrlicht/
+    cp "${mesa}"/include/GL/{gl,glx,wgl}ext.h .
     NDEBUG=1 make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
     cd -
   '';
-- 
GitLab


From 4c5d093ae07324b9daea7a9fb9fbf0b3c77a936a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 23 Mar 2014 22:30:48 +0100
Subject: [PATCH 2529/3789] esniper: add patch to fix unrecognized e-bay log-in
 page

---
 pkgs/applications/networking/esniper/default.nix    |  3 ++-
 .../networking/esniper/fix-ebay-login.patch         | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/esniper/fix-ebay-login.patch

diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index 50a2764d375..ee263245218 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation {
   buildInputs = [ openssl curl ];
 
   # Add support for CURL_CA_BUNDLE variable.
-  patches = [ ./find-ca-bundle.patch ];
+  # Fix <http://sourceforge.net/p/esniper/bugs/648/>.
+  patches = [ ./find-ca-bundle.patch ./fix-ebay-login.patch ];
 
   postInstall = ''
     sed <"frontends/snipe" >"$out/bin/snipe" \
diff --git a/pkgs/applications/networking/esniper/fix-ebay-login.patch b/pkgs/applications/networking/esniper/fix-ebay-login.patch
new file mode 100644
index 00000000000..07d0a577a08
--- /dev/null
+++ b/pkgs/applications/networking/esniper/fix-ebay-login.patch
@@ -0,0 +1,13 @@
+--- esniper-orig/auction.c	2014-03-23 22:28:46.684289574 +0100
++++ esniper/auction.c	2014-03-23 22:24:00.540568653 +0100
+@@ -424,7 +424,9 @@
+ 		if ((pp->srcId && !strcmp(pp->srcId, "SignInAlertSupressor"))||
+ 		    (pp->pageName &&
+ 			(!strncasecmp(pp->pageName, "MyeBay", 6) ||
+-			 !strncasecmp(pp->pageName, "My eBay", 7))
++                        !strncasecmp(pp->pageName, "My eBay", 7) ||
++                        !strncasecmp(pp->pageName, "Watch list", 10) ||
++                        !strncasecmp(pp->pageName, "User Agreement", 10))
+ 		    ))
+ 			loginTime = time(NULL);
+ 		else if (pp->pageName &&
-- 
GitLab


From a18eb2daa0134ea0edd38a94ee61c9c21796c226 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 24 Mar 2014 00:16:42 -0400
Subject: [PATCH 2530/3789] Fix tarball

---
 pkgs/development/python-modules/slowaes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/slowaes/default.nix b/pkgs/development/python-modules/slowaes/default.nix
index ef793d7e120..e45ffdfb2e1 100644
--- a/pkgs/development/python-modules/slowaes/default.nix
+++ b/pkgs/development/python-modules/slowaes/default.nix
@@ -11,6 +11,6 @@ buildPythonPackage rec {
   meta = {
     homepage = "http://code.google.com/p/slowaes/";
     description = "AES implemented in pure python";
-    license = stdenv.lib.licenses.apache;
+    license = stdenv.lib.licenses.asl20;
   };
-}
\ No newline at end of file
+}
-- 
GitLab


From b5c39bfada812a7a50457e376f8c71605c4114c7 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 24 Mar 2014 00:07:55 -0500
Subject: [PATCH 2531/3789] ssdeep: remove Darwin from Hydra platforms for now

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/ssdeep/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix
index 66fdedc4906..c59e50f4ae4 100644
--- a/pkgs/tools/security/ssdeep/default.nix
+++ b/pkgs/tools/security/ssdeep/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "A program for calculating fuzzy hashes";
     homepage    = "http://www.ssdeep.sf.net";
     license     = stdenv.lib.licenses.gpl2;
-    platforms   = stdenv.lib.platforms.unix;
+    platforms   = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }
-- 
GitLab


From 149dcb211349f3f77b58cf5839a30be035f87483 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 22 Mar 2014 11:28:06 +0100
Subject: [PATCH 2532/3789] conkeror: upgrade to more recent snapshot

needed for scripting Downloads.jsm with Gecko >= 26
---
 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 fc84f7fcecc..79402c31f8b 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-20131116-1";
+  name = "conkeror-1.0pre-20140212";
 
   src = fetchgit {
     url = git://repo.or.cz/conkeror.git;
-    rev = "refs/tags/debian-1.0--pre+git131116-1";
-    sha256 = "6fe0f30487c5bb8f2183dc7c2e15cf29df7cc8b1950b5fc15c26510c74a1f7d3";
+    rev = "07064d76d10e0978c6de535e21f4597d44560fbd";
+    sha256 = "b03a7debee8583ff7a3f2d95474f60e956f0e24dbd1a8fd22412de1d6627f322";
   };
 
   buildInputs = [ unzip makeWrapper ];
-- 
GitLab


From d8d8606da456c7ebe40039bbebc12320eb86301b Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 22 Mar 2014 23:37:05 +0100
Subject: [PATCH 2533/3789] unison: upgrade to 2.40.102

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

diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index 35dd2d2a7d0..744c8c01efa 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation (rec {
 
-  name = "unison-2.40.63";
+  name = "unison-2.40.102";
   src = fetchurl {
-    url = "http://www.seas.upenn.edu/~bcpierce/unison/download/releases/${name}/${name}.tar.gz";
-    sha256 = "17fd2bg5jxwbib87j6j2bjpwdm66whqm1fq46v70hfby79j00vkf";
+    url = "http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/${name}.tar.gz";
+    sha256 = "0m78q5vnsric1virvkmxxx32ipaq0cnj0kbirdbg36395gq94jix";
   };
 
   buildInputs = [ ocaml makeWrapper ncurses ];
-- 
GitLab


From 231f6c546048b9604a3bc321c4b43476c6e9740c Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 23 Mar 2014 14:39:32 +0100
Subject: [PATCH 2534/3789] psmisc: the tarball got updated upstream

looking at our git history, I think it is very peculiar that we
managed to have this version (22.21) 2 months before release :)

So I think we were using some beta/rc that accidentally got called
22.21
---
 pkgs/os-specific/linux/psmisc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix
index 0e423f85d66..1215c5261f4 100644
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/pkgs/os-specific/linux/psmisc/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/psmisc/${name}.tar.gz";
-    sha256 = "1p13s2323mi2868y4fzy3q2kkmv4fn1ggabqnjf202x4030vjj1q";
+    sha256 = "0nhlm1vrrwn4a845p6y4nnnb4liq70n74zbdd5dq844jc6nkqclp";
   };
 
   buildInputs = [ncurses];
-- 
GitLab


From 64e7ee41425e93bf70338a2e7281f400c25eaf7d Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 23 Mar 2014 14:47:09 +0100
Subject: [PATCH 2535/3789] libarchive: patch checksum failure

Probably github changed some headers in their patch output.
I verified other sources for CVE2013-0211 and the patch seems the
same.
---
 pkgs/development/libraries/libarchive/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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


From fa5a583098f493fb6503967dc384cb7c5e82ee86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 24 Mar 2014 10:09:40 +0100
Subject: [PATCH 2536/3789] Bringing back the xkeyboard-config eo patch

---
 pkgs/servers/x11/xorg/overrides.nix           |  4 +-
 .../x11/xorg/xkeyboard-config-eo.patch        | 71 +++++++++++++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/x11/xorg/xkeyboard-config-eo.patch

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8b2617f0621..d95ef24e998 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -197,10 +197,12 @@ in
   };
 
   xkeyboardconfig = attrs: attrs // {
-    #TODO: resurrect patches for US_intl and Esperanto?
 
     buildInputs = attrs.buildInputs ++ [args.intltool];
 
+    #TODO: resurrect patches for US_intl?
+    patches = [ ./xkeyboard-config-eo.patch ];
+
     # 1: compatibility for X11/xkb location
     # 2: I think pkgconfig/ is supposed to be in /lib/
     postInstall = ''
diff --git a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch
new file mode 100644
index 00000000000..f288a5c0f6d
--- /dev/null
+++ b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch
@@ -0,0 +1,71 @@
+diff --git a/rules/base.xml.in b/rules/base.xml.in
+index ec321f8..e9c3546 100644
+--- a/rules/base.xml.in
++++ b/rules/base.xml.in
+@@ -1786,6 +1786,13 @@
+     </layout>
+     <layout>
+       <configItem>
++        <name>eo</name>
++        <_shortDescription>Esp</_shortDescription>
++        <_description>Esperanto</_description>
++      </configItem>
++    </layout>
++    <layout>
++      <configItem>
+         <name>ir</name>
+         <_shortDescription>Irn</_shortDescription>
+         <_description>Iran</_description>
+diff --git a/symbols/Makefile.am b/symbols/Makefile.am
+index 97c816d..d7e3a4e 100644
+--- a/symbols/Makefile.am
++++ b/symbols/Makefile.am
+@@ -10,7 +10,7 @@ bt by braille \
+ ca cd \
+ ch cn cz \
+ de dk \
+-ee es et epo \
++ee eo es et epo \
+ fi fo fr \
+ gb ge gh gn \
+ gr hr hu \
+diff --git a/symbols/Makefile.in b/symbols/Makefile.in
+index b5be077..5cddcc7 100644
+--- a/symbols/Makefile.in
++++ b/symbols/Makefile.in
+@@ -222,7 +222,7 @@ bt by braille \
+ ca cd \
+ ch cn cz \
+ de dk \
+-ee es et epo \
++ee eo es et epo \
+ fi fo fr \
+ gb ge gh gn \
+ gr hr hu \
+diff --git a/symbols/eo b/symbols/eo
+new file mode 100644
+index 0000000..d6358c9
+--- /dev/null
++++ b/symbols/eo
+@@ -0,0 +1,21 @@
++// $XFree86$
++
++partial alphanumeric_keys
++xkb_symbols "basic" {
++
++     // Describes the differences between a very simple en_US
++     // keyboard and a simple Esperanto keyboard
++     // Press AltGr or Windows Menu key together with C, H, J, S, U
++     // to get accented letters.
++     // 2001 by Radovan Garabik <garabik@melkor.dnp.fmph.uniba.sk>
++
++    key.type = "FOUR_LEVEL";
++
++    key <AD02>  { [w,W, ubreve,Ubreve ] };
++    key <AD07>  { [u,U, ubreve, Ubreve ] };
++    key <AC02>  { [s,S, scircumflex,    Scircumflex ] };
++    key <AC05>  { [g,G, gcircumflex,Gcircumflex ] };
++    key <AC06>  { [h,H, hcircumflex,Hcircumflex ] };
++    key <AC07>  { [j,J, jcircumflex,Jcircumflex ] };
++    key <AB03>  { [c,C, ccircumflex,Ccircumflex ] };
++};
-- 
GitLab


From 2ace7edb81509189a15a0b8e8d0ee1886be9e725 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Mar 2014 18:18:35 +0100
Subject: [PATCH 2537/3789] Rename systemd.containers -> containers

That NixOS containers use systemd-nspawn is just an implementation
detail (which we could change in the future).
---
 nixos/modules/virtualisation/containers.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index b8388e7f206..cdd9e729dc1 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -80,7 +80,7 @@ in
       '';
     };
 
-    systemd.containers = mkOption {
+    containers = mkOption {
       type = types.attrsOf (types.submodule (
         { config, options, name, ... }:
         {
@@ -160,7 +160,7 @@ in
                         imports = [ ./container-login.nix ];
                       };
                     in [ extraConfig config.config ];
-                  prefix = [ "systemd" "containers" name ];
+                  prefix = [ "containers" name ];
                 }).config.system.build.toplevel;
               })
             ];
@@ -291,15 +291,15 @@ in
           + "echo ${cfg.path}/bin/switch-to-configuration test "
           + "| ${pkgs.socat}/bin/socat unix:${cfg.root}/var/lib/root-shell.socket -'";
 
-      }) config.systemd.containers;
+      }) config.containers;
 
     # Generate /etc/hosts entries for the containers.
     networking.extraHosts = concatStrings (mapAttrsToList (name: cfg: optionalString (cfg.localAddress != null)
       ''
         ${cfg.localAddress} ${name}.containers
-      '') config.systemd.containers);
+      '') config.containers);
 
-    environment.systemPackages = optional (config.systemd.containers != {}) nixos-container-shell;
+    environment.systemPackages = optional (config.containers != {}) nixos-container-shell;
 
   };
 }
-- 
GitLab


From 0cca0f477f168cee994b2c90d20b713f2bb67d85 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Mar 2014 10:15:57 +0100
Subject: [PATCH 2538/3789] nixos-container-shell -> nixos-container { login |
 root-shell }

---
 nixos/modules/virtualisation/containers.nix   | 60 +++----------------
 .../modules/virtualisation/nixos-container.sh | 54 +++++++++++++++++
 2 files changed, 62 insertions(+), 52 deletions(-)
 create mode 100644 nixos/modules/virtualisation/nixos-container.sh

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index cdd9e729dc1..e718398815d 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -14,57 +14,13 @@ let
     installPhase = "true";
   };
 
-  nixos-container-shell = pkgs.writeScriptBin "nixos-container-shell"
-    ''
-      #! ${pkgs.bash}/bin/sh -e
-
-      usage() {
-        echo "Usage: $0 <container-name>" >&2
-        echo "       $0 (-r|--root-shell) <container-name>" >&2
-      }
-
-      args="`getopt --options 'r' -l help -- "$@"`"
-      eval "set -- $args"
-      rootShell=
-      while [ $# -gt 0 ]; do
-        case "$1" in
-          (--help) usage; exit 0;;
-          (-r|--root-shell) rootShell=1;;
-          (--) shift; break;;
-          (*) break;;
-        esac
-        shift
-      done
-
-      container="$1"
-      if [ -z "$container" ]; then
-        usage
-        exit 1
-      fi
-      shift
-
-      root="/var/lib/containers/$container"
-      if ! [ -d "$root" ]; then
-        echo "$0: container ‘$container’ does not exist" >&2
-        exit 1
-      fi
-
-      if [ -n "$rootShell" ]; then
-        socket="$root/var/lib/root-shell.socket"
-      else
-        socket="$root/var/lib/login.socket"
-      fi
-      if ! [ -S "$socket" ]; then
-        echo "$0: socket ‘$socket’ does not exist" >&2
-        exit 1
-      fi
-
-      if [ -n "$rootShell" ]; then
-        exec ${pkgs.socat}/bin/socat "unix:$socket" -
-      else
-        exec ${pkgs.socat}/bin/socat "unix:$socket" -,echo=0,raw
-      fi
-    '';
+  nixos-container = pkgs.substituteAll {
+    name = "nixos-container";
+    dir = "bin";
+    isExecutable = true;
+    src = ./nixos-container.sh;
+    inherit (pkgs) bash socat;
+  };
 
 in
 
@@ -299,7 +255,7 @@ in
         ${cfg.localAddress} ${name}.containers
       '') config.containers);
 
-    environment.systemPackages = optional (config.containers != {}) nixos-container-shell;
+    environment.systemPackages = optional (config.containers != {}) nixos-container;
 
   };
 }
diff --git a/nixos/modules/virtualisation/nixos-container.sh b/nixos/modules/virtualisation/nixos-container.sh
new file mode 100644
index 00000000000..f4e34588d6e
--- /dev/null
+++ b/nixos/modules/virtualisation/nixos-container.sh
@@ -0,0 +1,54 @@
+#! @bash@/bin/sh -e
+
+usage() {
+    echo "Usage: $0 login <container-name>" >&2
+    echo "       $0 root-shell <container-name>" >&2
+}
+
+args="`getopt --options '' -l help -- "$@"`"
+eval "set -- $args"
+while [ $# -gt 0 ]; do
+    case "$1" in
+        (--help) usage; exit 0;;
+        (--) shift; break;;
+        (*) break;;
+    esac
+    shift
+done
+
+action="$1"
+if [ -z "$action" ]; then usage; exit 1; fi
+shift
+
+getContainerRoot() {
+    root="/var/lib/containers/$container"
+    if ! [ -d "$root" ]; then
+        echo "$0: container ‘$container’ does not exist" >&2
+        exit 1
+    fi
+}
+
+if [ $action = login ]; then
+
+    container="$1"
+    if [ -z "$container" ]; then usage; exit 1; fi
+    shift
+
+    getContainerRoot
+
+    exec @socat@/bin/socat "unix:$root/var/lib/login.socket" -,echo=0,raw
+
+elif [ $action = root-shell ]; then
+
+    container="$1"
+    if [ -z "$container" ]; then usage; exit 1; fi
+    shift
+
+    getContainerRoot
+
+    exec @socat@/bin/socat "unix:$root/var/lib/root-shell.socket" -
+
+else
+    echo "$0: unknown action ‘$action’" >&2
+    exit 1
+fi
-- 
GitLab


From ba88db3cd332e439dd2090b64abb7b9942b5fc94 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Mar 2014 19:55:05 +0100
Subject: [PATCH 2539/3789] Add support for imperative container management
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The command nixos-container can now create containers.  For instance,
the following creates and starts a container named ‘database’:

  $ nixos-container create database

The configuration of the container is stored in
/var/lib/containers/<name>/etc/nixos/configuration.nix.  After editing
the configuration, you can make the changes take effect by doing

  $ nixos-container update database

The container can also be destroyed:

  $ nixos-container destroy database

Containers are now executed using a template unit,
‘container@.service’, so the unit in this example would be
‘container@database.service’.
---
 nixos/modules/virtualisation/containers.nix   | 166 ++++++++++--------
 .../modules/virtualisation/nixos-container.sh | 106 +++++++++--
 2 files changed, 185 insertions(+), 87 deletions(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index e718398815d..573a3d1c584 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -42,13 +42,6 @@ in
         {
           options = {
 
-            root = mkOption {
-              type = types.path;
-              description = ''
-                The root directory of the container.
-              '';
-            };
-
             config = mkOption {
               description = ''
                 A specification of the desired configuration of this
@@ -103,9 +96,7 @@ in
           };
 
           config = mkMerge
-            [ { root = mkDefault "/var/lib/containers/${name}";
-              }
-              (mkIf options.config.isDefined {
+            [ (mkIf options.config.isDefined {
                 path = (import ../../lib/eval-config.nix {
                   modules =
                     let extraConfig =
@@ -126,12 +117,10 @@ in
       example = literalExample
         ''
           { webserver =
-              { root = "/containers/webserver";
-                path = "/nix/var/nix/profiles/webserver";
+              { path = "/nix/var/nix/profiles/webserver";
               };
             database =
-              { root = "/containers/database";
-                config =
+              { config =
                   { config, pkgs, ... }:
                   { services.postgresql.enable = true;
                     services.postgresql.package = pkgs.postgresql92;
@@ -153,78 +142,76 @@ in
 
   config = {
 
-    systemd.services = mapAttrs' (name: cfg:
-      let
-        # FIXME: interface names have a maximum length.
-        ifaceHost = "c-${name}";
-        ifaceCont = "ctmp-${name}";
-        ns = "net-${name}";
-      in
-      nameValuePair "container-${name}" {
-        description = "Container '${name}'";
-
-        wantedBy = [ "multi-user.target" ];
+    systemd.services."container@" =
+      { description = "Container '%I'";
 
-        unitConfig.RequiresMountsFor = [ cfg.root ];
+        unitConfig.RequiresMountsFor = [ "/var/lib/containers/%I" ];
 
         path = [ pkgs.iproute ];
 
-        preStart =
+        environment.INSTANCE = "%I";
+
+        script =
           ''
-            mkdir -p -m 0755 ${cfg.root}/etc
-            if ! [ -e ${cfg.root}/etc/os-release ]; then
-              touch ${cfg.root}/etc/os-release
+            root="/var/lib/containers/$INSTANCE"
+            mkdir -p -m 0755 "$root/etc"
+            if ! [ -e "$root/etc/os-release" ]; then
+              touch "$root/etc/os-release"
             fi
 
             mkdir -p -m 0755 \
-              /nix/var/nix/profiles/per-container/${name} \
-              /nix/var/nix/gcroots/per-container/${name}
-          ''
+              "/nix/var/nix/profiles/per-container/$INSTANCE" \
+              "/nix/var/nix/gcroots/per-container/$INSTANCE"
 
-          + optionalString (cfg.root != "/var/lib/containers/${name}") ''
-            ln -sfn "${cfg.root}" "/var/lib/containers/${name}"
-          ''
+            SYSTEM_PATH=/nix/var/nix/profiles/system
+            if [ -f "/etc/containers/$INSTANCE.conf" ]; then
+              . "/etc/containers/$INSTANCE.conf"
+            fi
 
-          + optionalString cfg.privateNetwork ''
             # Cleanup from last time.
-            ip netns del ${ns} 2> /dev/null || true
-            ip link del ${ifaceHost} 2> /dev/null || true
-            ip link del ${ifaceCont} 2> /dev/null || true
-
-            # Create a pair of virtual ethernet devices.  On the host,
-            # we get ‘c-<container-name’, and on the guest, we get
-            # ‘eth0’.
-            set -x
-            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
-            ${optionalString (cfg.hostAddress != null) ''
-              ip addr add ${cfg.hostAddress} dev ${ifaceHost}
-              ip netns exec ${ns} ip route add ${cfg.hostAddress} dev eth0
-              ip netns exec ${ns} ip route add default via ${cfg.hostAddress}
-            ''}
-            ${optionalString (cfg.localAddress != null) ''
-              ip netns exec ${ns} ip addr add ${cfg.localAddress} dev eth0
-              ip route add ${cfg.localAddress} dev ${ifaceHost}
-            ''}
-          '';
+            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"
+            fi
 
-        serviceConfig.ExecStart =
-          (optionalString cfg.privateNetwork "${runInNetns}/bin/run-in-netns ${ns} ")
-          + "${config.systemd.package}/bin/systemd-nspawn"
-          + (optionalString cfg.privateNetwork " --capability=CAP_NET_ADMIN")
-          + " -M ${name} -D ${cfg.root}"
-          + " --bind-ro=/nix/store --bind-ro=/nix/var/nix/db --bind-ro=/nix/var/nix/daemon-socket"
-          + " --bind=/nix/var/nix/profiles/per-container/${name}:/nix/var/nix/profiles"
-          + " --bind=/nix/var/nix/gcroots/per-container/${name}:/nix/var/nix/gcroots"
-          + " ${cfg.path}/init";
+            exec $runInNetNs ${config.systemd.package}/bin/systemd-nspawn \
+              -M "$INSTANCE" -D "/var/lib/containers/$INSTANCE" $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"
+          '';
 
         preStop =
           ''
-            pid="$(cat /sys/fs/cgroup/systemd/machine/${name}.nspawn/system/tasks 2> /dev/null)"
+            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.
@@ -240,13 +227,38 @@ in
             fi
           '';
 
-        reloadIfChanged = true;
+        restartIfChanged = false;
+        #reloadIfChanged = true; # FIXME
 
-        serviceConfig.ExecReload =
-          "${pkgs.bash}/bin/bash -c '"
-          + "echo ${cfg.path}/bin/switch-to-configuration test "
-          + "| ${pkgs.socat}/bin/socat unix:${cfg.root}/var/lib/root-shell.socket -'";
+        serviceConfig.ExecReload = pkgs.writeScript "reload-container"
+          ''
+            #! ${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:/var/lib/containers/$INSTANCE/var/lib/root-shell.socket -
+          '';
+      };
 
+    # Generate a configuration file in /etc/containers for each
+    # container so that container@.target can get the container
+    # configuration.
+    environment.etc = mapAttrs' (name: cfg: nameValuePair "containers/${name}.conf"
+      { text =
+          ''
+            SYSTEM_PATH=${cfg.path}
+            ${optionalString cfg.privateNetwork ''
+              PRIVATE_NETWORK=1
+              ${optionalString (cfg.hostAddress != null) ''
+                HOST_ADDRESS=${cfg.hostAddress}
+              ''}
+              ${optionalString (cfg.localAddress != null) ''
+                LOCAL_ADDRESS=${cfg.localAddress}
+              ''}
+            ''}
+          '';
       }) config.containers;
 
     # Generate /etc/hosts entries for the containers.
@@ -257,5 +269,7 @@ in
 
     environment.systemPackages = optional (config.containers != {}) nixos-container;
 
+    system.build.foo = nixos-container;
+
   };
 }
diff --git a/nixos/modules/virtualisation/nixos-container.sh b/nixos/modules/virtualisation/nixos-container.sh
index f4e34588d6e..c72b6fb9281 100644
--- a/nixos/modules/virtualisation/nixos-container.sh
+++ b/nixos/modules/virtualisation/nixos-container.sh
@@ -1,15 +1,21 @@
 #! @bash@/bin/sh -e
 
 usage() {
-    echo "Usage: $0 login <container-name>" >&2
+    echo "Usage: $0 create <container-name> [--config <filename>]" >&2
+    echo "       $0 update <container-name>" >&2
+    echo "       $0 destroy <container-name>" >&2
+    echo "       $0 login <container-name>" >&2
     echo "       $0 root-shell <container-name>" >&2
+    echo "       $0 set-root-password <container-name> <password>" >&2
 }
 
-args="`getopt --options '' -l help -- "$@"`"
+args="`getopt --options '' -l help -l config: -- "$@"`"
 eval "set -- $args"
+extraConfigFile=
 while [ $# -gt 0 ]; do
     case "$1" in
         (--help) usage; exit 0;;
+        (--config) shift; extraConfigFile=$1;;
         (--) shift; break;;
         (*) break;;
     esac
@@ -28,26 +34,104 @@ getContainerRoot() {
     fi
 }
 
-if [ $action = login ]; then
+container="$1"
+if [ -z "$container" ]; then usage; exit 1; fi
+shift
 
-    container="$1"
-    if [ -z "$container" ]; then usage; exit 1; fi
-    shift
+if [ $action = create ]; then
+
+    confFile="/etc/containers/$container.conf"
+    root="/var/lib/containers/$container"
+
+    if [ -e "$confFile" -o -e "$root/nix" ]; then
+        echo "$0: container ‘$container’ already exists" >&2
+        exit 1
+    fi
+
+    profileDir="/nix/var/nix/profiles/per-container/$container"
+    mkdir -m 0755 -p "$root/etc/nixos" "$profileDir"
+
+    config="
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{ boot.isContainer = true;
+  security.initialRootPassword = mkDefault \"!\";
+  networking.hostName = mkDefault \"$container\";
+  networking.useDHCP = false;
+  imports = [ <nixpkgs/nixos/modules/virtualisation/container-login.nix> $extraConfigFile ];
+}"
+    configFile="$root/etc/nixos/configuration.nix"
+    echo "$config" > "$configFile"
+
+    nix-env -p "$profileDir/system" -I "nixos-config=$configFile" -f '<nixpkgs/nixos>' --set -A system
+
+    # Allocate a new /8 network in the 10.233.* range.
+    network="$(sed -e 's/.*_ADDRESS=10\.233\.\(.*\)\..*/\1/; t; d' /etc/containers/*.conf | sort -n | tail -n1)"
+    if [ -z "$network" ]; then network=0; else : $((network++)); fi
+
+    hostAddress="10.233.$network.1"
+    localAddress="10.233.$network.2"
+    echo "host IP is $hostAddress, container IP is $localAddress" >&2
+
+    cat > "$confFile" <<EOF
+PRIVATE_NETWORK=1
+HOST_ADDRESS=$hostAddress
+LOCAL_ADDRESS=$localAddress
+EOF
+
+    echo "starting container@$container.service..." >&2
+    systemctl start "container@$container.service"
+
+elif [ $action = update ]; then
 
     getContainerRoot
 
-    exec @socat@/bin/socat "unix:$root/var/lib/login.socket" -,echo=0,raw
+    configFile="$root/etc/nixos/configuration.nix"
+    profileDir="/nix/var/nix/profiles/per-container/$container"
 
-elif [ $action = root-shell ]; then
+    nix-env -p "$profileDir/system" -I "nixos-config=$configFile" -f '<nixpkgs/nixos>' --set -A system
 
-    container="$1"
-    if [ -z "$container" ]; then usage; exit 1; fi
-    shift
+    echo "reloading container@$container.service..." >&2
+    systemctl reload "container@$container.service"
+
+elif [ $action = destroy ]; then
 
     getContainerRoot
 
+    confFile="/etc/containers/$container.conf"
+    if [ ! -w "$confFile" ]; then
+        echo "$0: cannot destroy declarative container (remove it from your configuration.nix instead)"
+        exit 1
+    fi
+
+    if systemctl show "container@$container.service" | grep -q ActiveState=active; then
+        echo "stopping container@$container.service..." >&2
+        systemctl stop "container@$container.service"
+    fi
+
+    rm -f "$confFile"
+
+elif [ $action = login ]; then
+
+    getContainerRoot
+    exec @socat@/bin/socat "unix:$root/var/lib/login.socket" -,echo=0,raw
+
+elif [ $action = root-shell ]; then
+
+    getContainerRoot
     exec @socat@/bin/socat "unix:$root/var/lib/root-shell.socket" -
 
+elif [ $action = set-root-password ]; then
+
+    password="$1"
+    if [ -z "$password" ]; then usage; exit 1; fi
+
+    # FIXME: not very secure.
+    getContainerRoot
+    (echo "passwd"; echo "$password"; echo "$password") | @socat@/bin/socat "unix:$root/var/lib/root-shell.socket" -
+
 else
     echo "$0: unknown action ‘$action’" >&2
     exit 1
-- 
GitLab


From 29c469b88db31d56acf02478fffea14f15372b1f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Mar 2014 15:09:38 +0100
Subject: [PATCH 2540/3789] Allow dashes in container names

---
 nixos/modules/virtualisation/containers.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 573a3d1c584..7e45d9f8b22 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -143,13 +143,13 @@ in
   config = {
 
     systemd.services."container@" =
-      { description = "Container '%I'";
+      { description = "Container '%i'";
 
-        unitConfig.RequiresMountsFor = [ "/var/lib/containers/%I" ];
+        unitConfig.RequiresMountsFor = [ "/var/lib/containers/%i" ];
 
         path = [ pkgs.iproute ];
 
-        environment.INSTANCE = "%I";
+        environment.INSTANCE = "%i";
 
         script =
           ''
-- 
GitLab


From 6010b0e8868b5a8058302a7b7839cddb21272043 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Mar 2014 15:09:53 +0100
Subject: [PATCH 2541/3789] nixos-container: NixOps helper functions

---
 .../modules/virtualisation/nixos-container.sh | 46 +++++++++++++++++--
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/nixos-container.sh b/nixos/modules/virtualisation/nixos-container.sh
index c72b6fb9281..a3fd9db56d8 100644
--- a/nixos/modules/virtualisation/nixos-container.sh
+++ b/nixos/modules/virtualisation/nixos-container.sh
@@ -1,21 +1,25 @@
 #! @bash@/bin/sh -e
 
 usage() {
-    echo "Usage: $0 create <container-name> [--config <filename>]" >&2
+    echo "Usage: $0 list" >&2
+    echo "       $0 create <container-name> [--config <filename>] [--ensure-unique-name]" >&2
     echo "       $0 update <container-name>" >&2
     echo "       $0 destroy <container-name>" >&2
     echo "       $0 login <container-name>" >&2
     echo "       $0 root-shell <container-name>" >&2
     echo "       $0 set-root-password <container-name> <password>" >&2
+    echo "       $0 show-ip <container-name>" >&2
 }
 
-args="`getopt --options '' -l help -l config: -- "$@"`"
+args="`getopt --options '' -l help -l config: -l ensure-unique-name -- "$@"`"
 eval "set -- $args"
 extraConfigFile=
+ensureUniqueName=
 while [ $# -gt 0 ]; do
     case "$1" in
         (--help) usage; exit 0;;
         (--config) shift; extraConfigFile=$1;;
+        (--ensure-unique-name) ensureUniqueName=1;;
         (--) shift; break;;
         (*) break;;
     esac
@@ -34,12 +38,28 @@ getContainerRoot() {
     fi
 }
 
+if [ $action = list ]; then
+    for i in $(cd /etc/containers && echo *.conf); do
+        echo "$(basename "$i" .conf)"
+    done
+    exit 0
+fi
+
 container="$1"
 if [ -z "$container" ]; then usage; exit 1; fi
 shift
 
 if [ $action = create ]; then
 
+    if [ -n "$ensureUniqueName" ]; then
+        # FIXME: race
+        nr=0
+        while [ -e "/etc/containers/$container-$nr.conf" -o -e "/var/lib/containers/$container-$nr" ]; do
+            : $((nr++))
+        done
+        container="$container-$nr"
+    fi
+
     confFile="/etc/containers/$container.conf"
     root="/var/lib/containers/$container"
 
@@ -61,13 +81,19 @@ with pkgs.lib;
   networking.hostName = mkDefault \"$container\";
   networking.useDHCP = false;
   imports = [ <nixpkgs/nixos/modules/virtualisation/container-login.nix> $extraConfigFile ];
+  services.openssh.enable = true;
+  services.openssh.extraConfig =
+    ''
+      UseDNS no
+    '';
+  users.extraUsers.root.openssh.authorizedKeys.keys = [ \"ssh-dss AAAAB3NzaC1kc3MAAACBAOo3foMFsYvc+LEVVTAeXpaxdOFG6O2NE9coxZYN6UtwE477GwkvZ4uKymAekq3TB8I6dDg4QFfE27fIip/rQHJ/Rus+KsxwnTbwPzE0WcZVpkKQsepsoqLkfwMpiPfn5/oxcnJsimwRY/E95aJmmOHdGaYWrc0t4ARa+6teUgdFAAAAFQCSQq2Wil0/X4hDypGGUKlKvYyaWQAAAIAy/0fSDnz1tZOQBGq7q78y406HfWghErrVlrW9g+foJQG5pgXXcdJs9JCIrlaKivUKITDsYnQaCjrZaK8eHnc4ksbkSLfDOxFnR5814ulCftrgEDOv9K1UU3pYketjFMvQCA2U48lR6jG/99CPNXPH55QEFs8H97cIsdLQw9wM4gAAAIEAmzWZlXLzIf3eiHQggXqvw3+C19QvxQITcYHYVTx/XYqZi1VZ/fkY8bNmdcJsWFyOHgEhpEca+xM/SNvH/14rXDmt0wtclLEx/4GVLi59hQCnnKqv7HzJg8RF4v6XTiROBAEEdb4TaFuFn+JCvqPzilTzXTexvZKJECOvfYcY+10= eelco.dolstra@logicblox.com\" ];
 }"
     configFile="$root/etc/nixos/configuration.nix"
     echo "$config" > "$configFile"
 
     nix-env -p "$profileDir/system" -I "nixos-config=$configFile" -f '<nixpkgs/nixos>' --set -A system
 
-    # Allocate a new /8 network in the 10.233.* range.
+    # Allocate a new /8 network in the 10.233.* range.  FIXME: race
     network="$(sed -e 's/.*_ADDRESS=10\.233\.\(.*\)\..*/\1/; t; d' /etc/containers/*.conf | sort -n | tail -n1)"
     if [ -z "$network" ]; then network=0; else : $((network++)); fi
 
@@ -84,6 +110,11 @@ EOF
     echo "starting container@$container.service..." >&2
     systemctl start "container@$container.service"
 
+    # Print generated container name on stdout.
+    if [ -n "$ensureUniqueName" ]; then
+        echo "$container"
+    fi
+
 elif [ $action = update ]; then
 
     getContainerRoot
@@ -101,7 +132,7 @@ elif [ $action = destroy ]; then
     getContainerRoot
 
     confFile="/etc/containers/$container.conf"
-    if [ ! -w "$confFile" ]; then
+    if [ -e "$confFile" -a ! -w "$confFile" ]; then
         echo "$0: cannot destroy declarative container (remove it from your configuration.nix instead)"
         exit 1
     fi
@@ -112,6 +143,7 @@ elif [ $action = destroy ]; then
     fi
 
     rm -f "$confFile"
+    rm -rf "$root"
 
 elif [ $action = login ]; then
 
@@ -132,6 +164,12 @@ elif [ $action = set-root-password ]; then
     getContainerRoot
     (echo "passwd"; echo "$password"; echo "$password") | @socat@/bin/socat "unix:$root/var/lib/root-shell.socket" -
 
+elif [ $action = show-ip ]; then
+
+    getContainerRoot
+    . "/etc/containers/$container.conf"
+    echo "$LOCAL_ADDRESS"
+
 else
     echo "$0: unknown action ‘$action’" >&2
     exit 1
-- 
GitLab


From 07adfae5519ae12ce1a06d2b57f027c97288d0fb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 24 Mar 2014 09:26:42 +0100
Subject: [PATCH 2542/3789] Remove hard-coded SSH key

---
 nixos/modules/virtualisation/nixos-container.sh | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/virtualisation/nixos-container.sh b/nixos/modules/virtualisation/nixos-container.sh
index a3fd9db56d8..47abf96072f 100644
--- a/nixos/modules/virtualisation/nixos-container.sh
+++ b/nixos/modules/virtualisation/nixos-container.sh
@@ -2,7 +2,7 @@
 
 usage() {
     echo "Usage: $0 list" >&2
-    echo "       $0 create <container-name> [--config <filename>] [--ensure-unique-name]" >&2
+    echo "       $0 create <container-name> [--config <string>] [--ensure-unique-name]" >&2
     echo "       $0 update <container-name>" >&2
     echo "       $0 destroy <container-name>" >&2
     echo "       $0 login <container-name>" >&2
@@ -13,12 +13,12 @@ usage() {
 
 args="`getopt --options '' -l help -l config: -l ensure-unique-name -- "$@"`"
 eval "set -- $args"
-extraConfigFile=
+extraConfig=
 ensureUniqueName=
 while [ $# -gt 0 ]; do
     case "$1" in
         (--help) usage; exit 0;;
-        (--config) shift; extraConfigFile=$1;;
+        (--config) shift; extraConfig=$1;;
         (--ensure-unique-name) ensureUniqueName=1;;
         (--) shift; break;;
         (*) break;;
@@ -80,13 +80,8 @@ with pkgs.lib;
   security.initialRootPassword = mkDefault \"!\";
   networking.hostName = mkDefault \"$container\";
   networking.useDHCP = false;
-  imports = [ <nixpkgs/nixos/modules/virtualisation/container-login.nix> $extraConfigFile ];
-  services.openssh.enable = true;
-  services.openssh.extraConfig =
-    ''
-      UseDNS no
-    '';
-  users.extraUsers.root.openssh.authorizedKeys.keys = [ \"ssh-dss AAAAB3NzaC1kc3MAAACBAOo3foMFsYvc+LEVVTAeXpaxdOFG6O2NE9coxZYN6UtwE477GwkvZ4uKymAekq3TB8I6dDg4QFfE27fIip/rQHJ/Rus+KsxwnTbwPzE0WcZVpkKQsepsoqLkfwMpiPfn5/oxcnJsimwRY/E95aJmmOHdGaYWrc0t4ARa+6teUgdFAAAAFQCSQq2Wil0/X4hDypGGUKlKvYyaWQAAAIAy/0fSDnz1tZOQBGq7q78y406HfWghErrVlrW9g+foJQG5pgXXcdJs9JCIrlaKivUKITDsYnQaCjrZaK8eHnc4ksbkSLfDOxFnR5814ulCftrgEDOv9K1UU3pYketjFMvQCA2U48lR6jG/99CPNXPH55QEFs8H97cIsdLQw9wM4gAAAIEAmzWZlXLzIf3eiHQggXqvw3+C19QvxQITcYHYVTx/XYqZi1VZ/fkY8bNmdcJsWFyOHgEhpEca+xM/SNvH/14rXDmt0wtclLEx/4GVLi59hQCnnKqv7HzJg8RF4v6XTiROBAEEdb4TaFuFn+JCvqPzilTzXTexvZKJECOvfYcY+10= eelco.dolstra@logicblox.com\" ];
+  imports = [ <nixpkgs/nixos/modules/virtualisation/container-login.nix> ];
+  $extraConfig
 }"
     configFile="$root/etc/nixos/configuration.nix"
     echo "$config" > "$configFile"
-- 
GitLab


From d4c711ee1d1080179958fb2cb9553d73acf4b2af Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 24 Mar 2014 08:37:36 -0400
Subject: [PATCH 2543/3789] Add memcache php module

---
 pkgs/build-support/build-pecl.nix |  9 +++++++++
 pkgs/top-level/all-packages.nix   |  4 ++++
 pkgs/top-level/php-packages.nix   | 19 +++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 pkgs/build-support/build-pecl.nix
 create mode 100644 pkgs/top-level/php-packages.nix

diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix
new file mode 100644
index 00000000000..d84497e8019
--- /dev/null
+++ b/pkgs/build-support/build-pecl.nix
@@ -0,0 +1,9 @@
+{ stdenv, php, autoreconfHook }:
+
+args: stdenv.mkDerivation (args // {
+  buildInputs = [ php autoreconfHook ] ++ args.buildInputs or [];
+
+  makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ args.makeFlags or [];
+
+  autoreconfPhase = "phpize";
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0360a87ac5..7e81a39ec08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3267,6 +3267,10 @@ let
 
   php = php54;
 
+  phpPackages = import ./php-packages.nix {
+    inherit php pkgs;
+  };
+
   php53 = callPackage ../development/interpreters/php/5.3.nix { };
 
   php54 = callPackage ../development/interpreters/php/5.4.nix { };
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
new file mode 100644
index 00000000000..e26ec8c9eb8
--- /dev/null
+++ b/pkgs/top-level/php-packages.nix
@@ -0,0 +1,19 @@
+{ pkgs, php }:
+
+let self = with self; {
+  buildPecl = import ../build-support/build-pecl.nix {
+    inherit php;
+    inherit (pkgs) stdenv autoreconfHook;
+  };
+
+  memcache = buildPecl {
+    name = "memcache-3.0.8";
+
+    src = pkgs.fetchurl {
+      url = http://pecl.php.net/get/memcache-3.0.8.tgz;
+      sha256 = "04c35rj0cvq5ygn2jgmyvqcb0k8d03v4k642b6i37zgv7x15pbic";
+    };
+
+    configureFlags = "--with-zlib-dir=${pkgs.zlib}";
+  };
+}; in self
-- 
GitLab


From 5221cfdda95d7072b475161a2de82732f2f68ea6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 24 Mar 2014 09:23:10 -0400
Subject: [PATCH 2544/3789] Add memcached php module.

Yes, it's different from memcache. Yes, we need both
---
 pkgs/top-level/php-packages.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index e26ec8c9eb8..654a071a182 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -16,4 +16,20 @@ let self = with self; {
 
     configureFlags = "--with-zlib-dir=${pkgs.zlib}";
   };
+
+  memcached = buildPecl {
+    name = "memcached-2.1.0";
+
+    src = pkgs.fetchurl {
+      url = http://pecl.php.net/get/memcached-2.1.0.tgz;
+      sha256 = "1by4zhkq4mbk9ja6s0vlavv5ng8aw5apn3a1in84fkz7bc0l0jdw";
+    };
+
+    configureFlags = [
+      "--with-zlib-dir=${pkgs.zlib}"
+      "--with-libmemcached-dir=${pkgs.libmemcached}"
+    ];
+
+    buildInputs = [ pkgs.cyrus_sasl ];
+  };
 }; in self
-- 
GitLab


From 84fba566f148543f06255e447225fae554b6a2c2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 24 Mar 2014 09:48:23 -0400
Subject: [PATCH 2545/3789] quickcheck-instances: jailbreak to work with newer
 QuickCheck

---
 .../libraries/haskell/quickcheck-instances/default.nix        | 1 +
 pkgs/top-level/haskell-packages.nix                           | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
index 3260fd17e9e..d532a83015c 100644
--- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
+++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
@@ -14,4 +14,5 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
+  jailbreak = true;
 })
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5b39974c315..4888d51b3b7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2065,7 +2065,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {};
 
-  quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances {};
+  quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances {
+    QuickCheck = self.QuickCheck_2_7_1;
+  };
 
   quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {};
 
-- 
GitLab


From ff6febb75da2d0a5d822b517c8f3e82d1ef75d92 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 24 Mar 2014 12:01:20 -0400
Subject: [PATCH 2546/3789] sox: Update, get rid of composableDerivation

---
 pkgs/applications/misc/audio/sox/default.nix | 57 +++++++-------------
 1 file changed, 20 insertions(+), 37 deletions(-)

diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix
index 50aa92f8d29..570699fb619 100644
--- a/pkgs/applications/misc/audio/sox/default.nix
+++ b/pkgs/applications/misc/audio/sox/default.nix
@@ -1,48 +1,31 @@
-{ composableDerivation, lib, fetchurl, alsaLib, libao, lame, libmad }:
-
-let inherit (composableDerivation) edf; in
-
-composableDerivation.composableDerivation {} {
-  name = "sox-14.3.0";
+{ stdenv, fetchurl
+, enableAlsa ? true, alsaLib ? null
+, enableLibao ? true, libao ? null
+, enableLame ? false, lame ? null
+, enableLibmad ? true, libmad ? null
+, enableLibogg ? true, libogg ? null, libvorbis ? null
+}:
+let
+  inherit (stdenv.lib) optional optionals;
+in stdenv.mkDerivation rec {
+  name = "sox-14.4.1";
 
   src = fetchurl {
-    url = mirror://sourceforge/sox/sox-14.3.0.tar.gz;
-    sha256 = "15r39dq9nlwrypm0vpxmbxyqqv0bd6284djbi1fdfrlkjhf43gws";
+    url = "mirror://sourceforge/sox/${name}.tar.gz";
+    sha256 = "16x8gykfjdhxg0kdxwzcwgwpm5caa08y2mx18siqsq0ywmpjr34s";
   };
 
-  flags =
-    # are these options of interest? We'll see
-    #--disable-fftw          disable usage of FFTW
-    #--enable-debug          enable debugging
-    #--disable-cpu-clip      disable tricky cpu specific clipper
-    edf { name = "alsa"; enable = { buildInputs = [alsaLib]; }; }
-    // edf { name = "libao"; enable = { buildInputs = [libao]; }; }
-    // edf { name = "oss"; }
-    // edf { name = "sun_audio"; }
-    // edf { name = "dl-lame"; enable.buildInputs = [ lame ]; } # use shared library
-    // edf { name = "lame";    enable.buildInputs = [ lame ]; }
-    // edf { name = "dl-mad"; enable.buildInputs = [ libmad ]; } # use shared library
-    // edf { name = "mad";    enable.buildInputs =[ libmad ]; }
-    ;
-
-  cfg = {
-    ossSupport = false;
-    sun_audioSupport = false;
-  } // lib.listToAttrs
-    [ { name = "dl-lameSupport"; value = true; }
-      { name = "dl-madSupport"; value = true; }
-    ];
-
-  configureFlags = ["-enable-dl-lame"];
-
-  optionals = [ "libsndfile" "libogg" "flac" "ffmpeg" "libmad" "lame"
-                 /* "amr-wb" "amr-nb" */
-                "libsamplerate" /* "ladspa" */ ];
+  buildInputs =
+    (optional enableAlsa alsaLib) ++
+    (optional enableLibao libao) ++
+    (optional enableLame lame) ++
+    (optional enableLibmad libmad) ++
+    (optionals enableLibogg [ libogg libvorbis ]);
 
   meta = {
     description = "Sample Rate Converter for audio";
     homepage = http://www.mega-nerd.com/SRC/index.html;
-    maintainers = [lib.maintainers.marcweber];
+    maintainers = [stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.shlevy];
     # you can choose one of the following licenses:
     license = [
       "GPL"
-- 
GitLab


From 344279495a87cea13e92688ca27925d2d845899b Mon Sep 17 00:00:00 2001
From: vi <noreply@example.org>
Date: Tue, 25 Mar 2014 02:55:25 +0800
Subject: [PATCH 2547/3789] Add Mnemosyne 2.2.1.

The Mnemosyne Project has two aspects:

  * It's a free flash-card tool which optimizes your learning process.
  * It's a research project into the nature of long-term memory.

We strive to provide a clear, uncluttered piece of software, easy to use
and to understand for newbies, but still infinitely customisable through
plugins and scripts for power users.

Mnemosyne uses a sophisticated algorithm to schedule the best time for
a card to come up for review. Difficult cards that you tend to forget
quickly will be scheduled more often, while Mnemosyne won't waste your
time on things you remember well.

If you want, anonymous statistics on your learning process can be
uploaded to a central server for analysis. This data will be valuable to
study the behaviour of our memory over a very long time period. The
results will be used to improve the scheduling algorithms behind the
software even further.
---
 pkgs/games/mnemosyne/default.nix | 51 ++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/games/mnemosyne/default.nix

diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix
new file mode 100644
index 00000000000..3598cca0461
--- /dev/null
+++ b/pkgs/games/mnemosyne/default.nix
@@ -0,0 +1,51 @@
+{stdenv, fetchurl, pythonPackages}:
+let 
+  version = "2.2.1";
+  inherit (pythonPackages) pyqt4 matplotlib cherrypy sqlite3;
+in pythonPackages.buildPythonPackage rec {
+  name = "mnemosyne-${version}";
+  src = fetchurl {
+    url    = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz";
+    sha256 = "7f5dd06a879b9ab059592355412182ee286e78e124aa25d588cacf9e4ab7c423";
+  };
+  pythonPath = [
+    pyqt4
+    matplotlib
+    cherrypy
+    sqlite3
+  ];
+  preConfigure = ''
+    substituteInPlace setup.py --replace /usr $out
+    substituteInPlace setup.py --replace sys.exec_prefix \"$out\"
+  '';
+  installCommand = "python setup.py install --prefix=$out";
+  meta = {
+    homepage = "http://mnemosyne-proj.org/";
+    description = "Spaced-repetition software.";
+    longDescription = ''
+      The Mnemosyne Project has two aspects:
+
+        * It's a free flash-card tool which optimizes your learning process.
+        * It's a research project into the nature of long-term memory.
+
+      We strive to provide a clear, uncluttered piece of software, easy to use
+      and to understand for newbies, but still infinitely customisable through
+      plugins and scripts for power users.
+
+      ## Efficient learning
+
+      Mnemosyne uses a sophisticated algorithm to schedule the best time for
+      a card to come up for review. Difficult cards that you tend to forget
+      quickly will be scheduled more often, while Mnemosyne won't waste your
+      time on things you remember well.
+
+      ## Memory research
+
+      If you want, anonymous statistics on your learning process can be
+      uploaded to a central server for analysis. This data will be valuable to
+      study the behaviour of our memory over a very long time period. The
+      results will be used to improve the scheduling algorithms behind the
+      software even further.  
+    '';
+  };
+}
-- 
GitLab


From ed7c31187645cf4ac6cb0673fd43a8f0d4798791 Mon Sep 17 00:00:00 2001
From: vi <noreply@example.org>
Date: Tue, 25 Mar 2014 02:58:21 +0800
Subject: [PATCH 2548/3789] Include Mnemosyne in nix packages collection.

---
 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 7e81a39ec08..7578553f68b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9576,6 +9576,8 @@ let
   mars = callPackage ../games/mars { };
 
   micropolis = callPackage ../games/micropolis { };
+  
+  mnemosyne = callPackage ../games/mnemosyne { };
 
   naev = callPackage ../games/naev { };
 
-- 
GitLab


From 5149f278aa61cb52fa65d39cc383c1c7d8e4360d Mon Sep 17 00:00:00 2001
From: vi <noreply@example.org>
Date: Tue, 25 Mar 2014 03:28:19 +0800
Subject: [PATCH 2549/3789] Patch *all* references to `sys.exec_prefix`.

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

diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix
index 3598cca0461..f55a7efe964 100644
--- a/pkgs/games/mnemosyne/default.nix
+++ b/pkgs/games/mnemosyne/default.nix
@@ -16,7 +16,7 @@ in pythonPackages.buildPythonPackage rec {
   ];
   preConfigure = ''
     substituteInPlace setup.py --replace /usr $out
-    substituteInPlace setup.py --replace sys.exec_prefix \"$out\"
+    find . -type f -exec grep -H sys.exec_prefix {} ';' | cut -d: -f1 | xargs sed -i s,sys.exec_prefix,\"$out\",
   '';
   installCommand = "python setup.py install --prefix=$out";
   meta = {
-- 
GitLab


From c814dab2eeb97c15f4a309e69435988fc3e65c6a 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 2550/3789] 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.
---
 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 e6b01f695dc..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 = "1y649pvilwx4jpjhyq5pfs2jb0ay01ylrn1y8098v785z0j82wml";
+    url = "https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4.diff";
+    sha256 = "1466ddrkdh2r8idmj3v7fk2gwnhc1kdxvyczdpnqms0qlmas6fj5";
     name = "CVE-2013-0211.patch";
   })];
 
-- 
GitLab


From 1dc040a8ad7e99f2bfbe180412d15d140d6bea58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 24 Mar 2014 22:39:42 +0100
Subject: [PATCH 2551/3789] gdk_pixbuf: minor update

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

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index cd3e7631618..39be4720eb1 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -3,14 +3,14 @@
 
 let
   ver_maj = "2.30";
-  ver_min = "4";
+  ver_min = "6";
 in
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "0ldhpdalbyi6q5k1dz498i9hqcsd51yxq0f91ck9p0h4v38blfx1";
+    sha256 = "0nkz19xlh60bf9bqylh98n8rynpjyx1nzp1gcr6zljgvmnj4yfa3";
   };
 
   setupHook = ./setup-hook.sh;
-- 
GitLab


From 70a4c7b1dfdb238d3729c3f71127538943a43afd Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 20 Mar 2014 08:51:08 +0100
Subject: [PATCH 2552/3789] nixos: fix linux containers (systemd-nspawn, lxc,
 lxc-libvirt)

- Make dhcp work, use dhcpcd without udev in container
- Make login shell work, patch getty to not wait for /dev/tty0
- Make ssh work, sshd/pam do not start session
---
 nixos/modules/services/networking/dhcpcd.nix       |  2 +-
 nixos/modules/services/networking/ssh/sshd.nix     |  2 +-
 pkgs/os-specific/linux/systemd/default.nix         |  1 +
 .../linux/systemd/fix_console_in_containers.patch  | 14 ++++++++++++++
 pkgs/tools/networking/dhcpcd/default.nix           |  2 +-
 pkgs/top-level/all-packages.nix                    |  2 ++
 6 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/os-specific/linux/systemd/fix_console_in_containers.patch

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index d4ec96a18f6..37f607b0815 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -4,7 +4,7 @@ with pkgs.lib;
 
 let
 
-  inherit (pkgs) dhcpcd;
+  dhcpcd =  if !config.boot.isContainer then pkgs.dhcpcd else pkgs.dhcpcd_without_udev;
 
   # Don't start dhcpcd on explicitly configured interfaces or on
   # interfaces that are part of a bridge.
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 85b6ab1efec..537fe0848ea 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -285,7 +285,7 @@ in
     networking.firewall.allowedTCPPorts = cfg.ports;
 
     security.pam.services.sshd =
-      { startSession = true;
+      { startSession = !config.boot.isContainer;
         showMotd = true;
         unixAuth = cfg.passwordAuthentication;
       };
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index caa69a9e3a8..0afaf7b0370 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
     [ # These are all changes between upstream and
       # https://github.com/edolstra/systemd/tree/nixos-v203.
       ./fixes.patch
+      ./fix_console_in_containers.patch
     ]
     ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch;
 
diff --git a/pkgs/os-specific/linux/systemd/fix_console_in_containers.patch b/pkgs/os-specific/linux/systemd/fix_console_in_containers.patch
new file mode 100644
index 00000000000..005c0028202
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/fix_console_in_containers.patch
@@ -0,0 +1,14 @@
+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/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index fe683c38285..758e3fd7980 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc";
 
   # Check that the udev plugin got built.
-  postInstall = "[ -e $out/lib/dhcpcd/dev/udev.so ]";
+  postInstall = stdenv.lib.optional (udev != null) "[ -e $out/lib/dhcpcd/dev/udev.so ]";
 
   meta = {
     description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 619ea319dc4..f21f26aaa3e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -823,6 +823,8 @@ 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 { };
-- 
GitLab


From 023464f13fdab2cfe51ac8acdad116c670ba7151 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 24 Mar 2014 19:58:11 -0500
Subject: [PATCH 2553/3789] licenses: add Sleepycat Public License

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 lib/licenses.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index d82402cd3af..603fddcb857 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -248,4 +248,10 @@
     fullName = "Zope Public License 2.1";
     url = "http://old.zope.org/Resources/License/ZPL-2.1";
   };
+
+  sleepycat = {
+    shortName = "Sleepycat";
+    fullName  = "Sleepycat Public License";
+    url       = "https://en.wikipedia.org/wiki/Sleepycat_License";
+  };
 }
-- 
GitLab


From 289a1c5f061afc26b569ef97b9a33aceccf16784 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 24 Mar 2014 19:58:36 -0500
Subject: [PATCH 2554/3789] ike: use stdenv.lib.licenses.sleepycat

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/ike/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/ike/default.nix b/pkgs/applications/ike/default.nix
index d595cb60da8..1414310ebf3 100644
--- a/pkgs/applications/ike/default.nix
+++ b/pkgs/applications/ike/default.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems";
     platforms = platforms.unix;
     maintainers = [ maintainers.iElectric ];
-    license = "sleepycat";
+    license = licenses.sleepycat;
   };
 }
-- 
GitLab


From c7fd20ca5b853973dd4a9ea3fc85e52f5485da75 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 24 Mar 2014 20:01:24 -0500
Subject: [PATCH 2555/3789] db: Berkely DB (was) licensed under Sleepycat by
 default

6.0 and newer are still under AGPLv3 however.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/db/generic.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index de9fb27b4ec..6217bc46124 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -5,7 +5,7 @@
 # Options from inherited versions
 , version, sha256
 , extraPatches ? [ ]
-, license ? "Berkeley Database License"
+, license ? stdenv.lib.licenses.sleepycat
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     url = "http://download.oracle.com/berkeley-db/${name}.tar.gz";
     sha256 = sha256;
   };
-  
+
   patches = extraPatches;
 
   configureFlags = [
-- 
GitLab


From 33e4adc32576517781c8ea9851d36988ce46546d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 24 Mar 2014 20:32:39 -0500
Subject: [PATCH 2556/3789] mps: version 1.113.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/mps/default.nix | 24 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/mps/default.nix

diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix
new file mode 100644
index 00000000000..d01f5f84fec
--- /dev/null
+++ b/pkgs/development/libraries/mps/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, autoreconfHook, sqlite }:
+
+stdenv.mkDerivation rec {
+  name = "mps-${version}";
+  version = "1.113.0";
+
+  src = fetchurl {
+    url    = "http://www.ravenbrook.com/project/mps/release/${version}/mps-kit-${version}.tar.gz";
+    sha256 = "0v4difh3yl2mvpvnwlavhaags945l1452g07fllhdbpzgbjay79i";
+  };
+
+  buildInputs = [ autoreconfHook sqlite ];
+
+  # Fix a slightly annoying build failure in 'make install'
+  patchPhase = "substituteInPlace ./Makefile.in --replace /hot/Release /hot";
+
+  meta = {
+    description = "A flexible memory management and garbage collection library";
+    homepage    = "http://www.ravenbrook.com/project/mps";
+    license     = stdenv.lib.licenses.sleepycat;
+    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 7e81a39ec08..9fdde18bee1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5304,6 +5304,8 @@ let
 
   mlt = callPackage ../development/libraries/mlt { };
 
+  mps = callPackage ../development/libraries/mps { };
+
   libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
 
   mpeg2dec = libmpeg2;
-- 
GitLab


From 0242b3c6ac186aea0ae7bf2c7f876133325d7119 Mon Sep 17 00:00:00 2001
From: Artyom Shalkhakov <artyom.shalkhakov@gmail.com>
Date: Tue, 25 Mar 2014 04:51:35 +0100
Subject: [PATCH 2557/3789] Adding ATS1, updating ATS2 package.

---
 pkgs/development/compilers/ats/default.nix    | 41 +++++++++++++++++++
 .../ats/install-atsdoc-hats-files.patch       | 38 +++++++++++++++++
 pkgs/development/compilers/ats2/default.nix   |  6 ++-
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/compilers/ats/default.nix
 create mode 100644 pkgs/development/compilers/ats/install-atsdoc-hats-files.patch

diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/development/compilers/ats/default.nix
new file mode 100644
index 00000000000..a5ed478a879
--- /dev/null
+++ b/pkgs/development/compilers/ats/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, gmp }:
+
+let version = "0.2.11"; in stdenv.mkDerivation {
+  name = "ats-anairiats-${version}";
+
+  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.
+      '';
+  };
+
+  platforms = stdenv.lib.platforms.all;
+}
diff --git a/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch b/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch
new file mode 100644
index 00000000000..93c6fa07d8a
--- /dev/null
+++ b/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch
@@ -0,0 +1,38 @@
+--- ats-lang-anairiats-0.2.11/Makefile	2013-12-10 00:43:52.000000000 +0100
++++ ats-lang-anairiats-0.2.11/Makefile	2014-03-02 07:49:06.985837425 +0100
+@@ -97,7 +97,7 @@
+ 	cd $(abs_top_srcdir)
+ 	[ -d $(bindir2) ] || $(MKDIR_P) $(bindir2)
+ 	$(MKDIR_P) $(ATSLIBHOME2)/bin
+-	find ccomp contrib doc libats libc prelude -type d \
++	find ccomp contrib doc libats libatsdoc libc prelude -type d \
+ 	  -exec $(MKDIR_P) $(ATSLIBHOME2)/\{} \; \
+ 	  -print
+ 
+@@ -105,7 +105,7 @@
+ #
+ # recursively install all files in the list except .svn control files.
+ #
+-	for d in ccomp/runtime contrib doc libats libc prelude; do \
++	for d in ccomp/runtime contrib doc libats libatsdoc libc prelude; do \
+ 	  cd $(abs_top_srcdir) && \
+ 	  $(INSTALL) -d $(ATSLIBHOME2)/"$$d" && \
+ 	  find "$$d" -name .svn -prune -o -type f \
+@@ -143,6 +143,17 @@
+ 	  $(INSTALL) -m 755 ats_env.sh $(bindir2)/"$$b" && \
+ 	  echo [ats_env.sh] is installed into $(bindir2)/"$$b"; \
+ 	done
++#
++# install atsdoc headers
++#
++	for f in \
++	    utils/atsdoc/SATS/*.sats utils/atsdoc/DATS/*.dats utils/atsdoc/HATS/*.hats; \
++	do \
++	  [ -f "$$f" ] || continue; \
++	  cd $(abs_top_srcdir) && \
++	  $(INSTALL) -m 644 -D "$$f" $(ATSLIBHOME2)/"$$f" && \
++	  echo "$$f"; \
++	done
+ 
+ install:: install_files
+ 
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index ae9a202a529..c1c71b0dfe2 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gmp }:
 
-let version = "0.0.5"; in stdenv.mkDerivation {
+let version = "0.0.6"; in stdenv.mkDerivation {
   name = "ats2-postiats-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "1rzcqc7fwqf0y4cc14lr282r25s66jygf6cxrnf5l8p5p550l0dl";
+    sha256 = "110a4drzf656j9s5yfvxj1cwgh5g9ysnh40cv8y9qfjjkki8vd5b";
   };
 
   buildInputs = [ gmp ];
@@ -15,4 +15,6 @@ let version = "0.0.5"; in stdenv.mkDerivation {
     homepage = http://www.ats-lang.org/;
     license = stdenv.lib.licenses.gpl3Plus;
   };
+
+  platforms = stdenv.lib.platforms.all;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e81a39ec08..8e2a54b17cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2360,6 +2360,7 @@ let
 
   aspectj = callPackage ../development/compilers/aspectj { };
 
+  ats = callPackage ../development/compilers/ats { };
   ats2 = callPackage ../development/compilers/ats2 { };
 
   avra = callPackage ../development/compilers/avra { };
-- 
GitLab


From 45c6aabf69d549839aef400018b69c1e9a7fd570 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Tue, 25 Mar 2014 14:23:59 +0000
Subject: [PATCH 2558/3789] haskellPackages.jsonAssertions: Update to 1.0.2

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

diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix
index 8797ca90029..027cf20064e 100644
--- a/pkgs/development/libraries/haskell/json-assertions/default.nix
+++ b/pkgs/development/libraries/haskell/json-assertions/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "json-assertions";
-  version = "1.0.1";
-  sha256 = "0rpj300knyk602wqkqipmy54xv3pn20cd06sa8irkf2wz0xribzm";
+  version = "1.0.2";
+  sha256 = "0ppj1xxbi0yrmv6vkmwkz91vvwzjd0ixj60432liwmd6h13apky0";
   buildDepends = [ aeson indexed indexedFree lens text ];
   meta = {
     homepage = "http://github.com/ocharles/json-assertions.git";
-- 
GitLab


From af89e63bf73f43b094958c2b744ada1731d37f8a Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Tue, 25 Mar 2014 14:29:41 +0000
Subject: [PATCH 2559/3789] haskellPackages.digestiveFunctorsAeson: Update to
 1.1.6

---
 .../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 dd098cbe183..64137054a70 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.5";
-  sha256 = "1mxi8zbv3hxy2crj6h6p1a885k8rd0fqhmwq7l7w7d7d73h8bmm3";
+  version = "1.1.6";
+  sha256 = "1zhw0zksl48q9y699phadf6ixsyll52clr3yyhqghki6l820xwci";
   buildDepends = [ aeson digestiveFunctors lens safe text vector ];
   testDepends = [
     aeson digestiveFunctors HUnit mtl tasty tastyHunit text
-- 
GitLab


From 02a30bea44edf1116dcab16c5e64501312b2927b Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 25 Mar 2014 16:48:19 +0100
Subject: [PATCH 2560/3789] Fix services.udisks.enable.

Latest update to udisks in 344f2e65 broke it for me. Fix it by doing the
following:

- Add udisks.service to /etc/systemd/system (via systemd.packages)
- Fix path to udisks-daemon in udisks.service (libexec/ instead of lib/)
---
 nixos/modules/services/hardware/udisks.nix  | 2 ++
 pkgs/os-specific/linux/udisks/1-default.nix | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/nixos/modules/services/hardware/udisks.nix b/nixos/modules/services/hardware/udisks.nix
index 531ee192573..a3527468cce 100644
--- a/nixos/modules/services/hardware/udisks.nix
+++ b/nixos/modules/services/hardware/udisks.nix
@@ -40,6 +40,8 @@ with pkgs.lib;
       '';
 
     services.udev.packages = [ pkgs.udisks ];
+
+    systemd.packages = [ pkgs.udisks ];
   };
 
 }
diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix
index 19cfec9f065..485880f0cbb 100644
--- a/pkgs/os-specific/linux/udisks/1-default.nix
+++ b/pkgs/os-specific/linux/udisks/1-default.nix
@@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
       substituteInPlace src/main.c --replace \
         "/sbin:/bin:/usr/sbin:/usr/bin" \
         "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin"
+
+      # For some reason @libexec@ is set to 'lib/' when building.
+      # Passing --libexecdir in configureFlags didn't help.
+      substituteInPlace data/systemd/udisks.service.in \
+        --replace "@libexecdir@" "$out/libexec"
     '';
 
   buildInputs =
-- 
GitLab


From ed63dcb7c7f84d6bd67d980c0d731782bead7ee7 Mon Sep 17 00:00:00 2001
From: vi <noreply@example.org>
Date: Wed, 26 Mar 2014 00:05:34 +0800
Subject: [PATCH 2561/3789] Have Mnemosyne take pkgs, rather than
 pythonPackages as argument.

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

diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix
index f55a7efe964..44f2d229fbe 100644
--- a/pkgs/games/mnemosyne/default.nix
+++ b/pkgs/games/mnemosyne/default.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl, pythonPackages}:
+{stdenv, fetchurl, pkgs}:
 let 
   version = "2.2.1";
-  inherit (pythonPackages) pyqt4 matplotlib cherrypy sqlite3;
-in pythonPackages.buildPythonPackage rec {
+  inherit (pkgs.pythonPackages) buildPythonPackage pyqt4 matplotlib cherrypy sqlite3;
+in buildPythonPackage rec {
   name = "mnemosyne-${version}";
   src = fetchurl {
     url    = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz";
-- 
GitLab


From b5acc84ff3c74909d3b2a28becbb70a37102ceae Mon Sep 17 00:00:00 2001
From: vi <noreply@example.org>
Date: Wed, 26 Mar 2014 00:37:05 +0800
Subject: [PATCH 2562/3789] Mnemosyne: provide capacity to override
 dependencies at the fidelity of a Python package.

---
 pkgs/games/mnemosyne/default.nix | 10 ++++++++--
 pkgs/top-level/all-packages.nix  |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix
index 44f2d229fbe..1d23640ce8b 100644
--- a/pkgs/games/mnemosyne/default.nix
+++ b/pkgs/games/mnemosyne/default.nix
@@ -1,7 +1,13 @@
-{stdenv, fetchurl, pkgs}:
+{ stdenv
+, fetchurl
+, buildPythonPackage
+, pyqt4
+, matplotlib
+, cherrypy
+, sqlite3
+}:
 let 
   version = "2.2.1";
-  inherit (pkgs.pythonPackages) buildPythonPackage pyqt4 matplotlib cherrypy sqlite3;
 in buildPythonPackage rec {
   name = "mnemosyne-${version}";
   src = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7578553f68b..a35721097bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9577,7 +9577,9 @@ let
 
   micropolis = callPackage ../games/micropolis { };
   
-  mnemosyne = callPackage ../games/mnemosyne { };
+  mnemosyne = callPackage ../games/mnemosyne { 
+    inherit (pythonPackages) matplotlib cherrypy sqlite3;
+  };
 
   naev = callPackage ../games/naev { };
 
-- 
GitLab


From 3a765a7309504957961363960eb03b3e4fb9d680 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Sun, 23 Mar 2014 17:19:39 +0100
Subject: [PATCH 2563/3789] fetchgit: Implement option to not check out
 submodules.

---
 pkgs/build-support/fetchgit/builder.sh       | 4 +++-
 pkgs/build-support/fetchgit/default.nix      | 4 ++--
 pkgs/build-support/fetchgit/nix-prefetch-git | 7 ++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh
index 5c7d92698cc..9050cce6ee8 100644
--- a/pkgs/build-support/fetchgit/builder.sh
+++ b/pkgs/build-support/fetchgit/builder.sh
@@ -6,6 +6,8 @@ source $stdenv/setup
 
 header "exporting $url (rev $rev) into $out"
 
-$fetcher --builder --url "$url" --out "$out" --rev "$rev" ${leaveDotGit:+--leave-dotGit}
+$fetcher --builder --url "$url" --out "$out" --rev "$rev" \
+  ${leaveDotGit:+--leave-dotGit} \
+  ${fetchSubmodules:+--fetch-submodules}
 
 stopNest
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index b22bdc88f83..a17daf9a2c5 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -1,5 +1,5 @@
 {stdenv, git, cacert}:
-{url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false }:
+{url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false, fetchSubmodules ? true}:
 
 /* NOTE:
    fetchgit has one problem: git fetch only works for refs.
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
   outputHashMode = "recursive";
   outputHash = if sha256 == "" then md5 else sha256;
 
-  inherit url rev leaveDotGit;
+  inherit url rev leaveDotGit fetchSubmodules;
 
   GIT_SSL_CAINFO = "${cacert}/etc/ca-bundle.crt";
 
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 8d0de055c75..6e79f82eae8 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -6,6 +6,7 @@ expHash=
 hashType=$NIX_HASH_ALGO
 deepClone=$NIX_PREFETCH_GIT_DEEP_CLONE
 leaveDotGit=$NIX_PREFETCH_GIT_LEAVE_DOT_GIT
+fetchSubmodules=
 builder=
 
 if test -n "$deepClone"; then
@@ -33,6 +34,7 @@ for arg; do
       --deepClone) deepClone=true;;
       --no-deepClone) deepClone=false;;
       --leave-dotGit) leaveDotGit=true;;
+      --fetch-submodules) fetchSubmodules=true;;
       --builder) builder=true;;
       *)
           argi=$(($argi + 1))
@@ -66,6 +68,7 @@ Options:
       --deepClone     Clone submodules recursively.
       --no-deepClone  Do not clone submodules.
       --leave-dotGit  Keep the .git directories.
+      --fetch-submodules Fetch submodules.
       --builder       Clone as fetchgit does, but url, rev, and out option are mandatory.
 "
     exit 1
@@ -178,7 +181,9 @@ clone(){
     )
 
     # Checkout linked sources.
-    init_submodules;
+    if test -n "$fetchSubmodules"; then
+        init_submodules;
+    fi
 
     if [ -z "$builder" -a -f .topdeps ]; then
 	if tg help 2>&1 > /dev/null
-- 
GitLab


From be46ca48822fb1dd8b912ca52ca692b2fb9a39b2 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Tue, 25 Mar 2014 22:18:02 +0100
Subject: [PATCH 2564/3789] pyopengl: Bump to 3.0.2 and hack the library
 loading to make it work.

---
 pkgs/top-level/python-packages.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ab605199e7f..10be397835e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5591,18 +5591,25 @@ rec {
 
 
   pyopengl =
-    let version = "3.0.0b5";
+    let version = "3.0.2";
     in
       buildPythonPackage {
         name = "pyopengl-${version}";
 
         src = fetchurl {
-          url = "mirror://sourceforge/pyopengl/PyOpenGL-${version}.tar.gz";
-          sha256 = "1rjpl2qdcqn4wamkik840mywdycd39q8dn3wqfaiv35jdsbifxx3";
+          url = "http://pypi.python.org/packages/source/P/PyOpenGL/PyOpenGL-${version}.tar.gz";
+          sha256 = "9ef93bbea2c193898341f574e281c3ca0dfe87c53aa25fbec4b03581f6d1ba03";
         };
 
         propagatedBuildInputs = with pkgs; [ mesa freeglut pil ];
 
+        patchPhase = ''
+          sed -i "s|util.find_library( name )|name|" OpenGL/platform/ctypesloader.py
+          sed -i "s|'GL',|'libGL.so',|" OpenGL/platform/glx.py
+          sed -i "s|'GLU',|'${pkgs.mesa}/lib/libGLU.so',|" OpenGL/platform/glx.py
+          sed -i "s|'glut',|'${pkgs.freeglut}/lib/libglut.so',|" OpenGL/platform/glx.py
+        '';
+
         meta = {
           homepage = http://pyopengl.sourceforge.net/;
           description = "PyOpenGL, the Python OpenGL bindings";
-- 
GitLab


From 93d313c0ed34df4d4f8969d95c0cf721bb69f10c Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Tue, 25 Mar 2014 22:32:39 +0100
Subject: [PATCH 2565/3789] Add wxPython-3.0 with OpenGL support.

---
 .../python-modules/wxPython/3.0.nix           | 25 +++++++++++++++++++
 .../python-modules/wxPython/builder3.0.sh     | 22 ++++++++++++++++
 pkgs/top-level/python-packages.nix            |  6 +++++
 3 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/wxPython/3.0.nix
 create mode 100644 pkgs/development/python-modules/wxPython/builder3.0.sh

diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix
new file mode 100644
index 00000000000..9aa6148643b
--- /dev/null
+++ b/pkgs/development/python-modules/wxPython/3.0.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages, openglSupport ? true }:
+
+assert wxGTK.unicode;
+
+with stdenv.lib;
+
+let version = "3.0.0.0"; in
+
+stdenv.mkDerivation {
+  name = "wxPython-${version}";
+  
+  builder = ./builder3.0.sh;
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2";
+    sha256 = "af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11";
+  };
+  
+  buildInputs = [ pkgconfig wxGTK (wxGTK.gtk) pythonPackages.python pythonPackages.wrapPython ]
+                ++ optional openglSupport pythonPackages.pyopengl;
+
+  inherit openglSupport;
+
+  passthru = { inherit wxGTK openglSupport; };
+}
diff --git a/pkgs/development/python-modules/wxPython/builder3.0.sh b/pkgs/development/python-modules/wxPython/builder3.0.sh
new file mode 100644
index 00000000000..7403c67d091
--- /dev/null
+++ b/pkgs/development/python-modules/wxPython/builder3.0.sh
@@ -0,0 +1,22 @@
+source $stdenv/setup
+
+flags="WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${openglSupport?1:0} UNICODE=1"
+
+configurePhase() {
+    cd wxPython
+}
+
+buildPhase() {
+    python setup.py $flags build
+}
+
+installPhase() {
+    python setup.py $flags install --prefix=$out
+
+    # Ugly workaround for Nixpkgs/111.
+    ln -s $out/lib/python*/site-packages/wx-*-gtk2-unicode/* $out/lib/python*/site-packages
+    
+    wrapPythonPrograms    
+}
+
+genericBuild
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ab605199e7f..e5a72517d97 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7610,6 +7610,12 @@ rec {
     wxGTK = pkgs.wxGTK28;
   };
 
+  wxPython30 = import ../development/python-modules/wxPython/3.0.nix {
+    inherit (pkgs) stdenv fetchurl pkgconfig;
+    inherit pythonPackages;
+    wxGTK = pkgs.wxGTK30;
+  };
+
   xe = buildPythonPackage rec {
     url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz";
     name = stdenv.lib.nameFromURL url ".tar";
-- 
GitLab


From 58857096fb679848730892d3f939be471e185cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 25 Mar 2014 23:00:26 +0100
Subject: [PATCH 2566/3789] file: update to fix CVE-2014-2270, CVE-2013-7345

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

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index cbcbbb2bb4a..8d6cbc1359b 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "file-5.14";
+  name = "file-5.17";
 
   buildInputs = [ zlib ];
 
   src = fetchurl {
     url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz";
-    sha256 = "1r3zqxr7al5yy2595hd9hxwc14iij021p46d5my3n2lhs0fs06s6";
+    sha256 = "1jl31jli87s5xnjq14r1fh72qc95562qbr5f63d68yrq3ca9gsrz";
   };
 
   meta = {
-- 
GitLab


From 5f2167627eb7ee0d43bdd5898cbf8dee05665fd4 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Tue, 25 Mar 2014 23:17:17 +0100
Subject: [PATCH 2567/3789] Add Cura.

---
 pkgs/applications/misc/cura/default.nix       | 71 +++++++++++++++++++
 pkgs/applications/misc/curaengine/default.nix | 22 ++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 97 insertions(+)
 create mode 100644 pkgs/applications/misc/cura/default.nix
 create mode 100644 pkgs/applications/misc/curaengine/default.nix

diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
new file mode 100644
index 00000000000..937025c0840
--- /dev/null
+++ b/pkgs/applications/misc/cura/default.nix
@@ -0,0 +1,71 @@
+{ stdenv, python27Packages, curaengine, makeDesktopItem, fetchgit }:
+let
+    py = python27Packages;
+in
+stdenv.mkDerivation rec {
+  name = "cura";
+
+  src = fetchgit {
+    url = "https://github.com/daid/Cura";
+    rev = "58414695269d60ca9b165e8cbc3424933ed79403";
+    sha256 = "1nxrrz8sjjx9i9cyvz15vay6yarnywp3vlk7qzr65sw88lzxgq23";
+    fetchSubmodules = false;
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "Cura";
+    exec = "cura";
+    icon = "cura";
+    comment = "Cura";
+    desktopName = "Cura";
+    genericName = "3D printing host software";
+    categories = "GNOME;GTK;Utility;";
+  };
+
+  python_deps = [ py.pyopengl py.pyserial py.numpy py.wxPython30 py.power py.setuptools ];
+
+  pythonPath = python_deps;
+
+  propagatedBuildInputs = python_deps;
+
+  buildInputs = [ curaengine py.wrapPython ];
+
+  configurePhase = "";
+  buildPhase = "";
+
+  installPhase = ''
+    # Install Python code.
+    site_packages=$out/lib/python2.7/site-packages
+    mkdir -p $site_packages
+    cp -r Cura $site_packages/
+
+    # Install resources.
+    resources=$out/share/cura
+    mkdir -p $resources
+    cp -r resources/* $resources/
+    sed -i 's|os.path.join(os.path.dirname(__file__), "../../resources")|"'$resources'"|g' $site_packages/Cura/util/resources.py
+
+    # Install executable.
+    mkdir -p $out/bin
+    cp Cura/cura.py $out/bin/cura
+    chmod +x $out/bin/cura
+    sed -i 's|#!/usr/bin/python|#!/usr/bin/env python|' $out/bin/cura
+    wrapPythonPrograms
+
+    # Make it find CuraEngine.
+    echo "def getEngineFilename(): return '${curaengine}/bin/CuraEngine'" >> $site_packages/Cura/util/sliceEngine.py
+
+    # Install desktop item.
+    mkdir -p "$out"/share/applications
+    cp "$desktopItem"/share/applications/* "$out"/share/applications/
+    mkdir -p "$out"/share/icons
+    ln -s "$resources/images/c.png" "$out"/share/icons/cura.png
+  '';
+
+  meta = with stdenv.lib; {
+    description = "3D printing host software";
+    homepage = https://github.com/daid/Cura;
+    license = licenses.agpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
new file mode 100644
index 00000000000..256d337f679
--- /dev/null
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchgit }:
+stdenv.mkDerivation {
+    name = "curaengine";
+
+    src = fetchgit {
+        url = "https://github.com/Ultimaker/CuraEngine";
+        rev = "62667ff2e7479b55d75e3d1dc9136242adf4a6a0";
+        sha256 = "0c68xmnq4c49vzg2cyqb375kc72rcnghj21wp3919w8sfwil00vr";
+    };
+
+    installPhase = ''
+        mkdir -p $out/bin
+        cp CuraEngine $out/bin/
+    '';
+
+    meta = with stdenv.lib; {
+        description = "Engine for processing 3D models into 3D printing instructions";
+        homepage = https://github.com/Ultimaker/CuraEngine;
+        license = licenses.agpl3;
+        platforms = platforms.linux;
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24f1543fc83..29251a513dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8939,6 +8939,10 @@ let
     perl = perl514;
   };
 
+  curaengine = callPackage ../applications/misc/curaengine { };
+
+  cura = callPackage ../applications/misc/cura { };
+
   slim = callPackage ../applications/display-managers/slim {
     libpng = libpng12;
   };
-- 
GitLab


From 3d08732d128c8106a0ee66d042617353820b2c2d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 25 Mar 2014 17:25:37 -0500
Subject: [PATCH 2568/3789] Wrap k3b with PATH to required tools

---
 pkgs/applications/misc/k3b/default.nix | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix
index 06565065ce5..9f9e29f537e 100644
--- a/pkgs/applications/misc/k3b/default.nix
+++ b/pkgs/applications/misc/k3b/default.nix
@@ -1,8 +1,12 @@
 { stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
 , flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
 , kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null
+, makeWrapper, cdrkit, cdrdao, dvdplusrwtools
 }:
 
+let
+  runtimeDeps = [ cdrkit cdrdao dvdplusrwtools ];
+in
 stdenv.mkDerivation rec {
   name = "k3b-2.0.2";
   
@@ -16,10 +20,22 @@ stdenv.mkDerivation rec {
       flac libsamplerate libdvdread lame libsndfile
       libmad gettext stdenv.gcc.libc
       kdelibs kdemultimedia automoc4 phonon
-      libkcddb
-    ];
+      libkcddb makeWrapper
+    ]
+    # Runtime dependencies are *not* propagated so they are easy to override.
+    ++ runtimeDeps;
 
   enableParallelBuilding = true;
+
+  postInstall =
+    # Wrap k3b with PATH to required tools, so they can be found without being
+    # installed in a profile. The PATH is suffixed so that profile-installed
+    # tools take preference.
+    let extraPath = stdenv.lib.makeSearchPath "bin" runtimeDeps;
+    in ''
+      wrapProgram "$out/bin/k3b" --suffix PATH : ${extraPath}
+      wrapProgram "$out/bin/k3bsetup" --suffix PATH : ${extraPath}
+    '';
                   
   meta = with stdenv.lib; {
     description = "CD/DVD Burning Application for KDE";
-- 
GitLab


From 4121f9d745cdf0db7e2876b8b4e9beada46b5ae1 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <ambrop7@gmail.com>
Date: Tue, 25 Mar 2014 22:27:05 +0100
Subject: [PATCH 2569/3789] python-packages: Add power-1.2.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ab605199e7f..dd7d187693c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8781,6 +8781,21 @@ rec {
     };
   };
 
+  power = buildPythonPackage rec {
+    name = "power-1.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/power/${name}.tar.gz";
+      sha256 = "09a00af8357f63dbb1a1eb13b82e39ccc0a14d6d2e44e5b235afe60ce8ee8195";
+    };
+
+    meta = {
+      description = "Cross-platform system power status information";
+      homepage = https://github.com/Kentzo/Power;
+      license = "mit";
+    };
+  };
+
 # python2.7 specific packages
 } // optionalAttrs isPy27 (
   with pythonPackages;
-- 
GitLab


From 72d8c4225b3a3195f8e549a96edcdac21b1f8d95 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 24 Mar 2014 21:05:28 +0100
Subject: [PATCH 2570/3789] Add seyren, an alerting dashboard for Graphite

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

diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix
new file mode 100644
index 00000000000..541c377c404
--- /dev/null
+++ b/pkgs/servers/monitoring/seyren/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, makeWrapper, jre }:
+
+stdenv.mkDerivation rec {
+  name = "seyren-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/scobal/seyren/releases/download/${version}/seyren-${version}.jar";
+    sha256 = "14p97yzfyacvavfms8qs3q5515vpfkjlfvislbwrf7qa89xzz8x0";
+  };
+
+  phases = ["installPhase"];
+
+  buildInputs = [ makeWrapper jre src ];
+
+  installPhase = ''
+    ensureDir "$out"/bin
+    makeWrapper "${jre}/bin/java" "$out"/bin/seyren --add-flags "-jar $src"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An alerting dashboard for Graphite";
+    homepage = https://github.com/scobal/seyren;
+    license = licenses.asl20;
+    maintainers = [ maintainers.offline ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e81a39ec08..46ddcd9c4dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6486,6 +6486,8 @@ let
 
   serfdom = callPackage ../servers/serfdom { };
 
+  seyren = callPackage ../servers/monitoring/seyren { };
+
   shishi = callPackage ../servers/shishi { };
 
   sipwitch = callPackage ../servers/sip/sipwitch { };
-- 
GitLab


From a5a5abd2feea900aead301c7f559a0bc1e2c6456 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 26 Mar 2014 01:33:07 +0100
Subject: [PATCH 2571/3789] chromium: Fix startup of beta and dev channels.

Since version 34, ICU data files are now created separately and thus
need to be installed as well.

Closes #2016

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit f117341ff2de4b95d223b41b36942e2f60ada2a3)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index baf67371769..df5c2bff0d3 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -246,6 +246,9 @@ in stdenv.mkDerivation rec {
   installPhase = ''
     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}/"
 
-- 
GitLab


From 70a51b75e1aaadcf8ea21fe77c3f3b97f3b3673e Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 22 Mar 2014 12:49:20 +0200
Subject: [PATCH 2572/3789] springLobby: update from 0.180 to 0.182, get rid of
 patch, improve meta

---
 pkgs/games/spring/springlobby.nix          | 11 +++++------
 pkgs/games/spring/unitsync_path_find.patch | 10 ----------
 2 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/games/spring/unitsync_path_find.patch

diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 34760db7c68..9d7b281935b 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "springlobby-${version}";
-  version = "0.180";
+  version = "0.182";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "0v2pwrwiwiggyl95rcyfj3pdlwsss5vcmnyzd40r9swb9gyi55na";
+    sha256 = "121kvbbrcnp2yqzbnz3wai2m6mn7nrgqvb1d4ly0k98p3ar20m4v";
   };
 
   buildInputs = [
@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
     libnotify gtk doxygen makeWrapper
   ];
 
-  patches = [ ./unitsync_path_find.patch ];
-
   prePatch = ''
     substituteInPlace tools/regen_config_header.sh --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace tools/test-susynclib.awk --replace "#!/usr/bin/awk" "#!${gawk}/bin/awk"
@@ -31,14 +29,15 @@ stdenv.mkDerivation rec {
   postInstall = ''
     wrapProgram $out/bin/springlobby \
       --prefix PATH : "${spring}/bin" \
-      --set SPRING_LIB_DIRS "${spring}/lib"
+      --set SPRING_BUNDLE_DIR "${spring}/lib"
   '';
 
   meta = with stdenv.lib; {
     homepage = http://springlobby.info/;
+    repositories.git = git://github.com/springlobby/springlobby.git;
     description = "Cross-platform lobby client for the Spring RTS project";
     license = licenses.gpl2;
-    maintainers = [ maintainers.phreedom maintainers.qknight maintainers.iElectric ];
+    maintainers = with maintainers; [ phreedom qknight iElectric ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/games/spring/unitsync_path_find.patch b/pkgs/games/spring/unitsync_path_find.patch
deleted file mode 100644
index 66257a5f52f..00000000000
--- a/pkgs/games/spring/unitsync_path_find.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/settings.cpp	2013-12-02 10:09:19.000000000 +0000
-+++ b/src/settings.cpp-new	2014-02-10 11:39:48.265628767 +0000
-@@ -498,6 +498,7 @@
- 
- wxString Settings::AutoFindUnitSync(wxPathList pl) const
- {
-+	pl.AddEnvList( _T( "SPRING_LIB_DIRS" ) );
- 	wxString retpath = pl.FindValidPath( _T( "unitsync" ) + GetLibExtension() );
- 	if ( retpath.IsEmpty() )
- 		retpath = pl.FindValidPath( _T( "libunitsync" ) + GetLibExtension() );
-- 
GitLab


From aaa5685b1492b2df7225e8933518fe13c1c8ca82 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 26 Mar 2014 12:15:12 +0200
Subject: [PATCH 2573/3789] libtorrentRasterbar: update from 0.16.15 to 0.16.16

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

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 9c4d3bfd2dd..0745313b41e 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libtorrent-rasterbar-${version}";
-  version = "0.16.15";
+  version = "0.16.16";
   
   src = fetchurl {
-    url = mirror://sourceforge/libtorrent/libtorrent-rasterbar-0.16.15.tar.gz;
-    sha256 = "0xcz4hphgkcdxcbmgzk27mxn7478hy417pn55zn5hnpllgndy3w2";
+    url = mirror://sourceforge/libtorrent/libtorrent-rasterbar-0.16.16.tar.gz;
+    sha256 = "1a3yxwjs4qb0rwx6cfpvar0a8jmavb6ik580b27md08jhvq80if7";
   };
 
   buildInputs = [ boost pkgconfig openssl zlib python libiconvOrNull geoip ];
-- 
GitLab


From cca30b37f8962079794740eab0c5e60d1cf0786a Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 26 Mar 2014 12:16:29 +0200
Subject: [PATCH 2574/3789] youtubeDL: update from 2014.03.18.1 to 2014.03.25.1

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 986e0f449d2..a70678c5034 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.03.18.1";
+  version = "2014.03.25.1";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0yyyvwa5av4ay8kxxlsav49mp2dcxflz6w0as0nklyg6k5zb5pn1";
+    sha256 = "09jayir0n10pgp6h3swzlx4d2x82by6f3dgbvnlvby73h5lpf668";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From 34301c89e1566c7c3584eda63e12bc918095b302 Mon Sep 17 00:00:00 2001
From: _1126 <mail@elfsechsundzwanzig.de>
Date: Tue, 25 Mar 2014 15:45:24 +0100
Subject: [PATCH 2575/3789] ncmcp: New expression

---
 lib/maintainers.nix                       |  1 +
 pkgs/applications/audio/ncmpc/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 3 files changed, 25 insertions(+)
 create mode 100755 pkgs/applications/audio/ncmpc/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index aa0dabc19da..bcce04e4eba 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -4,6 +4,7 @@
   /* Add your name and email address here.  Keep the list
      alphabetically sorted.  */
 
+  _1126 = "Christian Lask <mail@elfsechsundzwanzig.de>";
   aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
   akc = "Anders Claesson <akc@akc.is>";
   algorith = "Dries Van Daele <dries_van_daele@telenet.be>";
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
new file mode 100755
index 00000000000..05972bb2881
--- /dev/null
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib }:
+
+stdenv.mkDerivation rec {
+  version = "0.21";
+  name = "ncmpc-${version}";
+
+  src = fetchurl {
+    url = "http://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.bz2";
+    sha256 = "648e846e305c867cb937dcb467393c2f5a30bf460bdf77b63de7af69fba1fd07";
+  };
+
+  buildInputs = [ pkgconfig glib ncurses mpd_clientlib ];
+
+  meta = with stdenv.lib; {
+    description = "Curses-based interface for MPD (music player daemon)";
+    homepage    = http://www.musicpd.org/clients/ncmpc/;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ 1126 ];
+    platforms   = platforms.all;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index abd6b7cd621..4e912d63daf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8592,6 +8592,8 @@ let
 
   mpc_cli = callPackage ../applications/audio/mpc { };
 
+  ncmpc = callPackage ../applications/audio/ncmpc { };
+
   ncmpcpp = callPackage ../applications/audio/ncmpcpp { };
 
   normalize = callPackage ../applications/audio/normalize { };
-- 
GitLab


From d2571617c0c42ffa50ac62ef3024b66e4ada7486 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 26 Mar 2014 13:03:31 +0200
Subject: [PATCH 2576/3789] stunnel: update from 4.56 to 5.00, potentially
 fixes CVE-2014-0016

---
 pkgs/tools/networking/stunnel/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index cb93e8a504b..672f05577dd 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation {
-  name = "stunnel-4.56";
+  name = "stunnel-5.00";
   
   src = fetchurl {
-    url = http://www.stunnel.org/downloads/stunnel-4.56.tar.gz;
-    sha256 = "14qjhwfa0y17ipnd5mc970vfmralvgaxfl6fk0rl91vdwbxjrblw";
+    url = http://www.stunnel.org/downloads/stunnel-5.00.tar.gz;
+    sha256 = "04xwfppvmj0wrzar3rbypax93jb10f1skh3gq86gy6pglx96v648";
   };
 
   buildInputs = [openssl];
-- 
GitLab


From fa49cba2373ee360e8b7cde24dc04dd000c19af4 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 26 Mar 2014 13:04:35 +0200
Subject: [PATCH 2577/3789] net_snmp: update from 5.7.2 to 5.7.2.1, potentially
 fixes CVE-2014-2284, change source to .zip because tar.gz is broken

---
 pkgs/servers/monitoring/net-snmp/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix
index ad44860e7bd..30317d25cff 100644
--- a/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/pkgs/servers/monitoring/net-snmp/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, autoreconfHook, file, openssl, perl }:
+{ stdenv, fetchurl, autoreconfHook, file, openssl, perl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "net-snmp-5.7.2";
+  name = "net-snmp-5.7.2.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/net-snmp/${name}.tar.gz";
-    sha256 = "05mqrv22c65405d6v91cqf4hvczkkvvyy5lsxw8h8g0zrjs33v89";
+    url = "mirror://sourceforge/net-snmp/${name}.zip";
+    sha256 = "1nj3b2x4fhsh82nra99128vqp2lfw5wx91ka8nqwzxvik59hb4dc";
   };
 
   preConfigure =
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       "--with-persistent-directory=/var/lib/net-snmp"
     ];
 
-  buildInputs = [ autoreconfHook file openssl perl ];
+  buildInputs = [ autoreconfHook file openssl perl unzip ];
 
   enableParallelBuilding = true;
 
-- 
GitLab


From 2780cf2838a84d551914c81f14471b04d3c1708f Mon Sep 17 00:00:00 2001
From: Maxim Ivanov <ivanov.maxim@gmail.com>
Date: Wed, 26 Mar 2014 13:06:22 +0000
Subject: [PATCH 2578/3789] Fix -fsanitize=... options for clang

When using -fsanitize=... options clang implicitly
links binary to static libraries which are part of
llvm, but expects them to be found under clang prefix
---
 pkgs/development/compilers/llvm/3.4/clang.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index 6bb5622d0cf..7032056f7e4 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -28,7 +28,11 @@ stdenv.mkDerivation {
   (stdenv.lib.optional (stdenv.gcc.gcc != null) "-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}");
 
   # Clang expects to find LLVMgold in its own prefix
-  postInstall = "ln -sv ${llvm}/lib/LLVMgold.so $out/lib";
+  # 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/
+  '';
 
   passthru.gcc = stdenv.gcc.gcc;
 
-- 
GitLab


From 431ff0f769d97ea27061e330bf877d7a06f732e4 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 26 Mar 2014 17:56:55 +0200
Subject: [PATCH 2579/3789] nginx: update from 1.4.6 to 1.4.7

---
 pkgs/servers/http/nginx/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index f2bc0765636..757d4cb9566 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -5,10 +5,10 @@
 , moreheaders ? false}:
 
 let
-  version = "1.4.6";
+  version = "1.4.7";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "1ihjb3dqw4icc5pvgaqbp740cyr4m8zxjfvj3v3bkd88swamp2vs";
+    sha256 = "09mnw4f1yk64f21xq4k65x4r76pmrszyzc4iixkr0w41fr5gzf13";
   };
 
   rtmp-ext = fetchgit {
@@ -71,7 +71,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A reverse proxy and lightweight webserver";
-    maintainers = [ stdenv.lib.maintainers.raskin];
+    homepage = http://nginx.org;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
     platforms = stdenv.lib.platforms.all;
     inherit version;
   };
-- 
GitLab


From 37f8bcc028c3b5b50e52866455f1e6fd6e8aa3df Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 26 Mar 2014 19:18:15 +0200
Subject: [PATCH 2580/3789] kde4_prev.quasselDaemon: update from 0.9.2 to
 0.10.0

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

diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 9066bfb6c4c..57cfc928afb 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -12,12 +12,12 @@ let
 
 in with stdenv; mkDerivation rec {
 
-  version = "0.9.2";
+  version = "0.10.0";
   name = "quassel${tag}-${version}";
 
   src = fetchurl {
     url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2";
-    sha256 = "1h2kzi4pgfv3qmvhxix9fffdjixs3bsya0i5c18dkh894mh02kgh";
+    sha256 = "08vwxkwnzlgnxn0wi6ga9fk8qgc6nklb236hsfnr5ad37bi8q8k8";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 8cd858b100a1a24c7e17a66138482aa98e6826c6 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 26 Mar 2014 19:20:11 +0200
Subject: [PATCH 2581/3789] ocamlPackages.mldonkey: update from 3.1.3 to 3.1.5

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

diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix
index 2f739b056d4..57ea6248531 100644
--- a/pkgs/applications/networking/p2p/mldonkey/default.nix
+++ b/pkgs/applications/networking/p2p/mldonkey/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }:
 
 stdenv.mkDerivation (rec {
-  name = "mldonkey-3.1.3";
+  name = "mldonkey-3.1.5";
   
   src = fetchurl {
     url = "mirror://sourceforge/mldonkey/${name}.tar.bz2";
-    sha256 = "1qnr0qzliw4aynf2zhmm5hmrc9bd5vhdq3bi8n88j4nc86gry9bw";
+    sha256 = "1jqik6b09p27ckssppfiqpph7alxbgpnf9w1s0lalmi3qyyd9ybl";
   };
   
   meta = {
-- 
GitLab


From 72d457de2f9018492104a0cb6fca5fc9e9e95d8f Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sun, 16 Mar 2014 03:37:53 +0100
Subject: [PATCH 2582/3789] icedtea7: New package

Free Java environment based on OpenJDK 7.0 and the IcedTea project.
---
 .../icedtea/cppflags-include-fix.patch        |  16 +
 .../development/compilers/icedtea/default.nix | 175 +++++++++
 .../compilers/icedtea/fix-java-home.patch     |  17 +
 .../compilers/icedtea/generate-cacerts.pl     | 366 ++++++++++++++++++
 .../development/compilers/icedtea/sources.nix |  56 +++
 pkgs/top-level/all-packages.nix               |   9 +
 6 files changed, 639 insertions(+)
 create mode 100644 pkgs/development/compilers/icedtea/cppflags-include-fix.patch
 create mode 100644 pkgs/development/compilers/icedtea/default.nix
 create mode 100644 pkgs/development/compilers/icedtea/fix-java-home.patch
 create mode 100644 pkgs/development/compilers/icedtea/generate-cacerts.pl
 create mode 100644 pkgs/development/compilers/icedtea/sources.nix

diff --git a/pkgs/development/compilers/icedtea/cppflags-include-fix.patch b/pkgs/development/compilers/icedtea/cppflags-include-fix.patch
new file mode 100644
index 00000000000..8931c122538
--- /dev/null
+++ b/pkgs/development/compilers/icedtea/cppflags-include-fix.patch
@@ -0,0 +1,16 @@
+diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
+--- openjdk-orig/jdk/make/sun/awt/mawt.gmk	2012-08-28 19:13:16.000000000 -0400
++++ openjdk/jdk/make/sun/awt/mawt.gmk	2013-01-22 11:56:22.315418708 -0500
+@@ -234,12 +234,6 @@
+ endif # !HEADLESS
+ endif # PLATFORM
+ 
+-ifeq ($(PLATFORM), linux)
+-  # Checking for the X11/extensions headers at the additional location
+-  CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
+-                        $(wildcard /usr/include/X11/extensions))
+-endif
+-
+ ifeq ($(PLATFORM), macosx))
+   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
+               -I$(OPENWIN_HOME)/include 
diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix
new file mode 100644
index 00000000000..42a719d64d3
--- /dev/null
+++ b/pkgs/development/compilers/icedtea/default.nix
@@ -0,0 +1,175 @@
+{ stdenv, fetchurl, jdk, jdkPath, ant, wget, zip, unzip, cpio, file, libxslt
+, xorg, zlib, pkgconfig, libjpeg, libpng, giflib, lcms2, gtk2, krb5, attr
+, alsaLib, procps, automake, autoconf, cups, which, perl, coreutils, binutils
+, cacert, setJavaClassPath
+}:
+
+let
+
+  /**
+   * The JRE libraries are in directories that depend on the CPU.
+   */
+  architecture =
+    if stdenv.system == "i686-linux" then
+      "i386"
+    else if stdenv.system == "x86_64-linux" then
+      "amd64"
+    else
+      throw "icedtea requires i686-linux or x86_64 linux";
+
+  srcInfo = (import ./sources.nix).icedtea7;
+
+  pkgName = "icedtea7-${srcInfo.version}";
+
+  defSrc = name:
+    with (builtins.getAttr name srcInfo.bundles); fetchurl {
+      inherit url sha256;
+      name = "${pkgName}-${name}-${baseNameOf url}";
+    };
+
+  bundleNames = builtins.attrNames srcInfo.bundles;
+
+  sources = stdenv.lib.genAttrs bundleNames (name: defSrc name);
+
+  bundleFun = name: "--with-${name}-src-zip=" + builtins.getAttr name sources;
+  bundleFlags = map bundleFun bundleNames;
+
+in
+
+with srcInfo; stdenv.mkDerivation {
+  name = pkgName;
+
+  src = fetchurl {
+    inherit url sha256;
+  };
+
+  outputs = [ "out" "jre" ];
+
+  # TODO: Probably some more dependencies should be on this list but are being
+  # propagated instead
+  buildInputs = [
+    jdk ant wget zip unzip cpio file libxslt pkgconfig procps automake
+    autoconf which perl coreutils xorg.lndir
+    zlib libjpeg libpng giflib lcms2 krb5 attr alsaLib cups
+    xorg.libX11 xorg.libXtst gtk2
+  ];
+
+  configureFlags = bundleFlags ++ [
+    "--disable-bootstrap"
+    "--disable-downloading"
+
+    "--without-rhino"
+    # Uncomment this when paxctl lands in stdenv: "--with-pax=paxctl"
+    "--with-jdk-home=${jdkPath}"
+  ];
+
+  preConfigure = ''
+    unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+    substituteInPlace javac.in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
+    substituteInPlace javah.in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
+
+    ./autogen.sh
+  '';
+
+  preBuild = ''
+    make stamps/extract.stamp
+
+    substituteInPlace openjdk/jdk/make/common/shared/Defs-utils.gmk --replace '/bin/echo' '${coreutils}/bin/echo'
+    substituteInPlace openjdk/corba/make/common/shared/Defs-utils.gmk --replace '/bin/echo' '${coreutils}/bin/echo'
+
+    patch -p0 < ${./cppflags-include-fix.patch}
+    patch -p0 < ${./fix-java-home.patch}
+  '';
+
+  NIX_NO_SELF_RPATH = true;
+
+  makeFlags = [
+    "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h"
+    "ALT_UNIXCOMMAND_PATH="
+    "ALT_USRBIN_PATH="
+    "ALT_DEVTOOLS_PATH="
+    "ALT_COMPILER_PATH="
+    "ALT_CUPS_HEADERS_PATH=${cups}/include"
+    "ALT_OBJCOPY=${binutils}/bin/objcopy"
+    "SORT=${coreutils}/bin/sort"
+    "UNLIMITED_CRYPTO=1"
+  ];
+
+  installPhase = ''
+    mkdir -p $out/lib/icedtea $out/share $jre/lib/icedtea
+
+    cp -av openjdk.build/j2sdk-image/* $out/lib/icedtea
+
+    # Move some stuff to top-level.
+    mv $out/lib/icedtea/include $out/include
+    mv $out/lib/icedtea/man $out/share/man
+
+    # jni.h expects jni_md.h to be in the header search path.
+    ln -s $out/include/linux/*_md.h $out/include/
+
+    # Remove some broken manpages.
+    rm -rf $out/share/man/ja*
+
+    # Remove crap from the installation.
+    rm -rf $out/lib/icedtea/demo $out/lib/icedtea/sample
+
+    # Move the JRE to a separate output.
+    mv $out/lib/icedtea/jre $jre/lib/icedtea/
+    mkdir $out/lib/icedtea/jre
+    lndir $jre/lib/icedtea/jre $out/lib/icedtea/jre
+
+    rm -rf $out/lib/icedtea/jre/bin
+    ln -s $out/lib/icedtea/bin $out/lib/icedtea/jre/bin
+
+    # Remove duplicate binaries.
+    for i in $(cd $out/lib/icedtea/bin && echo *); do
+      if [ "$i" = java ]; then continue; fi
+      if cmp -s $out/lib/icedtea/bin/$i $jre/lib/icedtea/jre/bin/$i; then
+        ln -sfn $jre/lib/icedtea/jre/bin/$i $out/lib/icedtea/bin/$i
+      fi
+    done
+
+    # Generate certificates.
+    pushd $jre/lib/icedtea/jre/lib/security
+    rm cacerts
+    perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/etc/ca-bundle.crt
+    popd
+
+    ln -s $out/lib/icedtea/bin $out/bin
+    ln -s $jre/lib/icedtea/jre/bin $jre/bin
+  '';
+
+  # FIXME: this is unnecessary once the multiple-outputs branch is merged.
+  preFixup = ''
+    prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}"
+    patchELF $jre
+    propagatedNativeBuildInputs+=" $jre"
+
+    # Propagate the setJavaClassPath setup hook from the JRE so that
+    # any package that depends on the JRE has $CLASSPATH set up
+    # properly.
+    mkdir -p $jre/nix-support
+    echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs
+
+    # Set JAVA_HOME automatically.
+    mkdir -p $out/nix-support
+    cat <<EOF > $out/nix-support/setup-hook
+    if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/icedtea; fi
+    EOF
+  '';
+
+  meta = {
+    description = "Free Java development kit based on OpenJDK 7.0 and the IcedTea project";
+    longDescription = ''
+      Free Java environment based on OpenJDK 7.0 and the IcedTea project.
+      - Full Java runtime environment
+      - Needed for executing Java Webstart programs and the free Java web browser plugin.
+    '';
+    homepage = http://icedtea.classpath.org;
+    maintainers = with stdenv.lib.maintainers; [ wizeman ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+  passthru = { inherit architecture; };
+}
diff --git a/pkgs/development/compilers/icedtea/fix-java-home.patch b/pkgs/development/compilers/icedtea/fix-java-home.patch
new file mode 100644
index 00000000000..5def344f171
--- /dev/null
+++ b/pkgs/development/compilers/icedtea/fix-java-home.patch
@@ -0,0 +1,17 @@
+diff -ru -x '*~' openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp	2013-09-06 20:22:03.000000000 +0200
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2014-01-24 22:44:08.223857012 +0100
+@@ -2358,12 +2358,10 @@
+                 CAST_FROM_FN_PTR(address, os::jvm_path),
+                 dli_fname, sizeof(dli_fname), NULL);
+   assert(ret, "cannot locate libjvm");
+   char *rp = NULL;
+   if (ret && dli_fname[0] != '\0') {
+-    rp = realpath(dli_fname, buf);
++    snprintf(buf, buflen, "%s", dli_fname);
+   }
+-  if (rp == NULL)
+-    return;
+ 
+   if (Arguments::created_by_gamma_launcher()) {
+     // Support for the gamma launcher.  Typical value for buf is
diff --git a/pkgs/development/compilers/icedtea/generate-cacerts.pl b/pkgs/development/compilers/icedtea/generate-cacerts.pl
new file mode 100644
index 00000000000..3bdd42f7274
--- /dev/null
+++ b/pkgs/development/compilers/icedtea/generate-cacerts.pl
@@ -0,0 +1,366 @@
+#!/usr/bin/perl
+
+# Copyright (C) 2007, 2008 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.
+
+# generate-cacerts.pl generates a JKS keystore named 'cacerts' from
+# OpenSSL's certificate bundle using OpenJDK's keytool.
+
+# First extract each of OpenSSL's bundled certificates into its own
+# aliased filename.
+
+# Downloaded from http://cvs.fedoraproject.org/viewvc/rpms/ca-certificates/F-12/generate-cacerts.pl?revision=1.2
+# Check and prevention of duplicate aliases added by Vlastimil Babka <caster@gentoo.org>
+
+$file = $ARGV[1];
+open(CERTS, $file);
+@certs = <CERTS>;
+close(CERTS);
+
+$pem_file_count = 0;
+$in_cert_block = 0;
+$write_current_cert = 1;
+foreach $cert (@certs)
+{
+    if ($cert =~ /Issuer: /)
+    {
+        $_ = $cert;
+        if ($cert =~ /personal-freemail/)
+        {
+            $cert_alias = "thawtepersonalfreemailca";
+        }
+        elsif ($cert =~ /personal-basic/)
+        {
+            $cert_alias = "thawtepersonalbasicca";
+        }
+        elsif ($cert =~ /personal-premium/)
+        {
+            $cert_alias = "thawtepersonalpremiumca";
+        }
+        elsif ($cert =~ /server-certs/)
+        {
+            $cert_alias = "thawteserverca";
+        }
+        elsif ($cert =~ /premium-server/)
+        {
+            $cert_alias = "thawtepremiumserverca";
+        }
+        elsif ($cert =~ /Class 1 Public Primary Certification Authority$/)
+        {
+            $cert_alias = "verisignclass1ca";
+        }
+        elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/)
+        {
+            $cert_alias = "verisignclass1g2ca";
+        }
+        elsif ($cert =~
+               /VeriSign Class 1 Public Primary Certification Authority - G3/)
+        {
+            $cert_alias = "verisignclass1g3ca";
+        }
+        elsif ($cert =~ /Class 2 Public Primary Certification Authority$/)
+        {
+            $cert_alias = "verisignclass2ca";
+        }
+        elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/)
+        {
+            $cert_alias = "verisignclass2g2ca";
+        }
+        elsif ($cert =~
+               /VeriSign Class 2 Public Primary Certification Authority - G3/)
+        {
+            $cert_alias = "verisignclass2g3ca";
+        }
+        elsif ($cert =~ /Class 3 Public Primary Certification Authority$/)
+        {
+            $cert_alias = "verisignclass3ca";
+        }
+        # Version 1 of Class 3 Public Primary Certification Authority
+        # - G2 is added.  Version 3 is excluded.  See below.
+        elsif ($cert =~
+               /VeriSign Class 3 Public Primary Certification Authority - G3/)
+        {
+            $cert_alias = "verisignclass3g3ca";
+        }
+        elsif ($cert =~
+               /RSA Data Security.*Secure Server Certification Authority/)
+        {
+            $cert_alias = "verisignserverca";
+        }
+        elsif ($cert =~ /GTE CyberTrust Global Root/)
+        {
+            $cert_alias = "gtecybertrustglobalca";
+        }
+        elsif ($cert =~ /Baltimore CyberTrust Root/)
+        {
+            $cert_alias = "baltimorecybertrustca";
+        }
+        elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/)
+        {
+            $cert_alias = "entrustclientca";
+        }
+        elsif ($cert =~ /www.entrust.net\/GCCA_CPS/)
+        {
+            $cert_alias = "entrustglobalclientca";
+        }
+        elsif ($cert =~ /www.entrust.net\/CPS_2048/)
+        {
+            $cert_alias = "entrust2048ca";
+        }
+        elsif ($cert =~ /www.entrust.net\/CPS /)
+        {
+            $cert_alias = "entrustsslca";
+        }
+        elsif ($cert =~ /www.entrust.net\/SSL_CPS/)
+        {
+            $cert_alias = "entrustgsslca";
+        }
+        elsif ($cert =~ /The Go Daddy Group/)
+        {
+            $cert_alias = "godaddyclass2ca";
+        }
+        elsif ($cert =~ /Starfield Class 2 Certification Authority/)
+        {
+            $cert_alias = "starfieldclass2ca";
+        }
+        elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/)
+        {
+            $cert_alias = "valicertclass2ca";
+        }
+        elsif ($cert =~ /GeoTrust Global CA$/)
+        {
+            $cert_alias = "geotrustglobalca";
+        }
+        elsif ($cert =~ /Equifax Secure Certificate Authority/)
+        {
+            $cert_alias = "equifaxsecureca";
+        }
+        elsif ($cert =~ /Equifax Secure eBusiness CA-1/)
+        {
+            $cert_alias = "equifaxsecureebusinessca1";
+        }
+        elsif ($cert =~ /Equifax Secure eBusiness CA-2/)
+        {
+            $cert_alias = "equifaxsecureebusinessca2";
+        }
+        elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/)
+        {
+            $cert_alias = "equifaxsecureglobalebusinessca1";
+        }
+        elsif ($cert =~ /Sonera Class1 CA/)
+        {
+            $cert_alias = "soneraclass1ca";
+        }
+        elsif ($cert =~ /Sonera Class2 CA/)
+        {
+            $cert_alias = "soneraclass2ca";
+        }
+        elsif ($cert =~ /AAA Certificate Services/)
+        {
+            $cert_alias = "comodoaaaca";
+        }
+        elsif ($cert =~ /AddTrust Class 1 CA Root/)
+        {
+            $cert_alias = "addtrustclass1ca";
+        }
+        elsif ($cert =~ /AddTrust External CA Root/)
+        {
+            $cert_alias = "addtrustexternalca";
+        }
+        elsif ($cert =~ /AddTrust Qualified CA Root/)
+        {
+            $cert_alias = "addtrustqualifiedca";
+        }
+        elsif ($cert =~ /UTN-USERFirst-Hardware/)
+        {
+            $cert_alias = "utnuserfirsthardwareca";
+        }
+        elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/)
+        {
+            $cert_alias = "utnuserfirstclientauthemailca";
+        }
+        elsif ($cert =~ /UTN - DATACorp SGC/)
+        {
+            $cert_alias = "utndatacorpsgcca";
+        }
+        elsif ($cert =~ /UTN-USERFirst-Object/)
+        {
+            $cert_alias = "utnuserfirstobjectca";
+        }
+        elsif ($cert =~ /America Online Root Certification Authority 1/)
+        {
+            $cert_alias = "aolrootca1";
+        }
+        elsif ($cert =~ /DigiCert Assured ID Root CA/)
+        {
+            $cert_alias = "digicertassuredidrootca";
+        }
+        elsif ($cert =~ /DigiCert Global Root CA/)
+        {
+            $cert_alias = "digicertglobalrootca";
+        }
+        elsif ($cert =~ /DigiCert High Assurance EV Root CA/)
+        {
+            $cert_alias = "digicerthighassuranceevrootca";
+        }
+        elsif ($cert =~ /GlobalSign Root CA$/)
+        {
+            $cert_alias = "globalsignca";
+        }
+        elsif ($cert =~ /GlobalSign Root CA - R2/)
+        {
+            $cert_alias = "globalsignr2ca";
+        }
+        elsif ($cert =~ /Elektronik.*Kas.*2005/)
+        {
+            $cert_alias = "extra-elektronikkas2005";
+        }
+        elsif ($cert =~ /Elektronik/)
+        {
+            $cert_alias = "extra-elektronik2005";
+        }
+        # Mozilla does not provide these certificates:
+        #   baltimorecodesigningca
+        #   gtecybertrust5ca
+        #   trustcenterclass2caii
+        #   trustcenterclass4caii
+        #   trustcenteruniversalcai
+        else
+        {
+            # Generate an alias using the OU and CN attributes of the
+            # Issuer field if both are present, otherwise use only the
+            # CN attribute.  The Issuer field must have either the OU
+            # or the CN attribute.
+            $_ = $cert;
+            if ($cert =~ /OU=/)
+            {
+                s/Issuer:.*?OU=//;
+                # Remove other occurrences of OU=.
+                s/OU=.*CN=//;
+                # Remove CN= if there were not other occurrences of OU=.
+                s/CN=//;
+                s/\/emailAddress.*//;
+                s/Certificate Authority/ca/g;
+                s/Certification Authority/ca/g;
+            }
+            elsif ($cert =~ /CN=/)
+            {
+                s/Issuer:.*CN=//;
+                s/\/emailAddress.*//;
+                s/Certificate Authority/ca/g;
+                s/Certification Authority/ca/g;
+            }
+            s/\W//g;
+            tr/A-Z/a-z/;
+            $cert_alias = "extra-$_";
+
+        }
+        while (-e "$cert_alias.pem")
+        {
+            $cert_alias = "$cert_alias" . "_";
+        }
+    }
+    # When it attempts to parse:
+    #
+    # Class 3 Public Primary Certification Authority - G2, Version 3
+    #
+    # keytool says:
+    #
+    # #2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false
+    # Unparseable AuthorityInfoAccess extension due to
+    # java.io.IOException: Invalid encoding of URI
+    #
+    # If we do not exclude this file
+    # openjdk/jdk/test/lib/security/cacerts/VerifyCACerts.java fails
+    # on this cert, printing:
+    #
+    # Couldn't verify: java.security.SignatureException: Signature
+    # does not match.
+    #
+    elsif ($cert =~
+           /A6:0F:34:C8:62:6C:81:F6:8B:F7:7D:A9:F6:67:58:8A:90:3F:7D:36/)
+    {
+        $write_current_cert = 0;
+        $pem_file_count--;
+    }
+    elsif ($cert eq "-----BEGIN CERTIFICATE-----\n")
+    {
+        $_ = $cert;
+        s/\W//g;
+        tr/A-Z/a-z/;
+        $cert_alias = "extra-$_";
+        while (-e "$cert_alias.pem")
+        {
+            $cert_alias = "$cert_alias" . "_";
+        }
+        if ($in_cert_block != 0)
+        {
+            die "$file is malformed.";
+        }
+        $in_cert_block = 1;
+        if ($write_current_cert == 1)
+        {
+            $pem_file_count++;
+            if (-e "$cert_alias.pem")
+            {
+                print "$cert_alias";
+                die "already exists"
+            }
+            open(PEM, ">$cert_alias.pem");
+            print PEM $cert;
+        }
+    }
+    elsif ($cert eq "-----END CERTIFICATE-----\n")
+    {
+        $in_cert_block = 0;
+        if ($write_current_cert == 1)
+        {
+            print PEM $cert;
+            close(PEM);
+        }
+        $write_current_cert = 1
+    }
+    else
+    {
+        if ($in_cert_block == 1 && $write_current_cert == 1)
+        {
+            print PEM $cert;
+        }
+    }
+}
+
+# Check that the correct number of .pem files were produced.
+@pem_files = <*.pem>;
+if (@pem_files != $pem_file_count)
+{
+    print "$pem_file_count";
+    die "Number of .pem files produced does not match".
+        " number of certs read from $file.";
+}
+
+# Now store each cert in the 'cacerts' file using keytool.
+$certs_written_count = 0;
+foreach $pem_file (@pem_files)
+{
+    system "$ARGV[0] -noprompt -import".
+        " -alias `basename $pem_file .pem`".
+        " -keystore cacerts -storepass 'changeit' -file $pem_file";
+    unlink($pem_file);
+    $certs_written_count++;
+}
+
+# Check that the correct number of certs were added to the keystore.
+if ($certs_written_count != $pem_file_count)
+{
+    die "Number of certs added to keystore does not match".
+        " number of certs read from $file.";
+}
diff --git a/pkgs/development/compilers/icedtea/sources.nix b/pkgs/development/compilers/icedtea/sources.nix
new file mode 100644
index 00000000000..95d6928b3ab
--- /dev/null
+++ b/pkgs/development/compilers/icedtea/sources.nix
@@ -0,0 +1,56 @@
+# This file is autogenerated from update.py in the same directory.
+{
+  icedtea7 = rec {
+    branch = "2.4";
+    version = "${branch}.5";
+
+    url = "http://icedtea.wildebeest.org/download/source/icedtea-${version}.tar.xz";
+    sha256 = "0nrhbn2q7cm21hpq1f5ds0v0rnsznmdyiifi8w4l1ykyqw9n9yfk";
+
+    hg_url = "http://icedtea.classpath.org/hg/release/icedtea7-forest-${branch}";
+
+    bundles = {
+      openjdk = rec {
+        changeset = "410eb7fef869";
+        url = "${hg_url}/archive/${changeset}.tar.gz";
+        sha256 = "2de151c7275d91ef082e63fcc0957c5f9290404ec6e20ecfa1e752e16bfab707";
+      };
+
+      corba = rec {
+        changeset = "3594dbde270d";
+        url = "${hg_url}/corba/archive/${changeset}.tar.gz";
+        sha256 = "d1f97e143fe94ae3a56b45bb5a90f8ab10ec2be4ff770a788f0a1ac677e27a7d";
+      };
+
+      jaxp = rec {
+        changeset = "8fe156ad49e2";
+        url = "${hg_url}/jaxp/archive/${changeset}.tar.gz";
+        sha256 = "0a2a40186cedfbeb8f87b0bc86bea2830943943081d4289fc74f7a783b2e1af3";
+      };
+
+      jaxws = rec {
+        changeset = "32ea8b1ed91a";
+        url = "${hg_url}/jaxws/archive/${changeset}.tar.gz";
+        sha256 = "08a169b6b02883759ec7a412aa91aa3e37480761cb50b95d092dbcdb2fc9a3d0";
+      };
+
+      jdk = rec {
+        changeset = "9db88c18e114";
+        url = "${hg_url}/jdk/archive/${changeset}.tar.gz";
+        sha256 = "285e5b8ccbb29f3f9f9ea9ea7856d1ed97465c57d091fbcd9b2e55a1ffbb543e";
+      };
+
+      langtools = rec {
+        changeset = "dabd37b7e295";
+        url = "${hg_url}/langtools/archive/${changeset}.tar.gz";
+        sha256 = "86cb370ce2084c4b699d8c002ebe6c026e86206ffa82a2f3d7906aadb94ed79f";
+      };
+
+      hotspot = rec {
+        changeset = "2cb58882dac3";
+        url = "${hg_url}/hotspot/archive/${changeset}.tar.gz";
+        sha256 = "d8c1681ae76e660c1888065933cedbbc1309869c7a2fb98f07c424716d5ebaf9";
+      };
+    };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e912d63daf..4e0b9b2218a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2784,6 +2784,15 @@ let
 
   gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };
 
+  icedtea7_jdk = callPackage ../development/compilers/icedtea rec {
+    jdk = openjdk;
+    jdkPath = "${openjdk}/lib/openjdk";
+  } // { outputs = [ "out" ]; };
+
+  icedtea7_jre = (lib.setName "icedtea7-${lib.getVersion pkgs.icedtea7_jdk.jre}" (lib.addMetaAttrs
+    { description = "Free Java runtime environment based on OpenJDK 7.0 and the IcedTea project"; }
+    pkgs.icedtea7_jdk.jre)) // { outputs = [ "jre" ]; };
+
   ikarus = callPackage ../development/compilers/ikarus { };
 
   hugs = callPackage ../development/compilers/hugs { };
-- 
GitLab


From 6ec21a5dd10dfe7a57ad0779effe6a6ed100de1d Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sun, 23 Mar 2014 17:50:25 +0100
Subject: [PATCH 2583/3789] icedtea: Add update script

---
 pkgs/development/compilers/icedtea/update.py | 275 +++++++++++++++++++
 1 file changed, 275 insertions(+)
 create mode 100755 pkgs/development/compilers/icedtea/update.py

diff --git a/pkgs/development/compilers/icedtea/update.py b/pkgs/development/compilers/icedtea/update.py
new file mode 100755
index 00000000000..ba3c5fc51ad
--- /dev/null
+++ b/pkgs/development/compilers/icedtea/update.py
@@ -0,0 +1,275 @@
+#!/usr/bin/env python3
+
+import subprocess, urllib.request, re, os, tarfile
+from html.parser import HTMLParser
+
+HG_URL = 'http://icedtea.classpath.org/hg/release/icedtea{}-forest-{}'
+DOWNLOAD_URL = 'http://icedtea.wildebeest.org/download/source/'
+DOWNLOAD_HTML = DOWNLOAD_URL + '?C=M;O=D'
+
+ICEDTEA_JDKS = [7]
+
+BUNDLES = ['openjdk', 'corba', 'jaxp', 'jaxws', 'jdk', 'langtools', 'hotspot']
+
+SRC_PATH = './sources.nix'
+
+def get_output(cmd, env = None):
+	try:
+		proc = subprocess.Popen(cmd, env = env, stdout = subprocess.PIPE)
+		out = proc.communicate()[0]
+	except subprocess.CalledProcessError as e:
+		return None
+
+	return out.decode('utf-8').strip()
+
+def nix_prefetch_url(url):
+	env = os.environ.copy()
+	env['PRINT_PATH'] = '1'
+	out = get_output(['nix-prefetch-url', url], env = env)
+
+	return out.split('\n')
+
+def get_nix_attr(path, attr):
+	out = get_output(['nix-instantiate', '--eval-only', '-A', attr, path])
+
+	if len(out) < 2 or out[0] != '"' or out[-1] != '"':
+		raise Exception('Cannot find Nix attribute "{}" (parsing failure?)'.format(attr))
+
+	# Strip quotes
+	return out[1:-1]
+
+def get_jdk_attr(jdk, attr):
+	return get_nix_attr(SRC_PATH, 'icedtea{}.{}'.format(jdk, attr))
+
+class Parser(HTMLParser):
+	def __init__(self, link_regex):
+		HTMLParser.__init__(self)
+
+		self.regex = link_regex
+		self.href = None
+		self.version = None
+
+	def handle_starttag(self, tag, attrs):
+		if self.href != None or tag != 'a':
+			return
+
+		href = None
+		for attr in attrs:
+			if attr[0] == 'href':
+				href = attr[1]
+		if href == None:
+			return
+
+		m = re.match(self.regex, href)
+		if m != None:
+			self.href = href
+			self.version = m.group(1)
+
+def get_latest_version_url(major):
+	f = urllib.request.urlopen(DOWNLOAD_HTML)
+	html = f.read().decode('utf-8')
+	f.close()
+
+	parser = Parser(r'^icedtea\d?-({}\.\d[\d.]*)\.tar\.xz$'.format(major))
+	parser.feed(html)
+	parser.close()
+
+	if parser.href == None:
+		raise Exception('Error: could not find download url for major version "{}"'.format(major))
+
+	return parser.version, DOWNLOAD_URL + parser.href
+
+def get_old_bundle_attrs(jdk, bundle):
+	attrs = {}
+	for attr in ('changeset', 'url', 'sha256'):
+		attrs[attr] = get_jdk_attr(jdk, 'bundles.{}.{}'.format(bundle, attr))
+
+	return attrs
+
+def get_old_attrs(jdk):
+	attrs = {}
+
+	for attr in ('branch', 'version', 'url', 'sha256'):
+		attrs[attr] = get_jdk_attr(jdk, attr)
+
+	attrs['bundles'] = {}
+
+	for bundle in BUNDLES:
+		attrs['bundles'][bundle] = get_old_bundle_attrs(jdk, bundle)
+
+	return attrs
+
+def get_member_filename(tarball, name):
+	for fname in tarball.getnames():
+		m = re.match(r'^icedtea\d?-\d[\d.]*/{}$'.format(name), fname)
+		if m != None:
+			return m.group(0)
+
+	return None
+
+def get_member_file(tarball, name):
+	path = get_member_filename(tarball, name)
+	if path == None:
+		raise Exception('Could not find "{}" inside tarball'.format(name))
+
+	f = tarball.extractfile(path)
+	data = f.read().decode('utf-8')
+	f.close()
+
+	return data
+
+def get_new_bundle_attr(makefile, bundle, attr):
+	var = '{}_{}'.format(bundle.upper(), attr.upper())
+	regex = r'^{} = (.*?)$'.format(var)
+
+	m = re.search(regex, makefile, re.MULTILINE)
+	if m == None:
+		raise Exception('Could not find variable "{}" in Makefile.am'.format(var))
+
+	return m.group(1)
+
+def get_new_bundle_attrs(jdk, branch, path):
+	hg_url = HG_URL.format(jdk, branch)
+
+	attrs = {}
+
+	print('Opening file: "{}"'.format(path))
+	tar = tarfile.open(name = path, mode = 'r:xz')
+
+	makefile = get_member_file(tar, 'Makefile.am')
+	hotspot_map = get_member_file(tar, 'hotspot.map')
+
+	for bundle in BUNDLES:
+		battrs = {}
+
+		if bundle == 'hotspot':
+			m = re.search(r'^default (.*?) (.*?) (.*?)$', hotspot_map, re.MULTILINE)
+			if m == None:
+				raise Exception('Could not find info for hotspot bundle in hotspot.map')
+
+			battrs['url'] = '{}/archive/{}.tar.gz'.format(m.group(1), m.group(2))
+			battrs['changeset'] = m.group(2)
+			battrs['sha256'] = m.group(3)
+
+			attrs[bundle] = battrs
+			continue
+
+		changeset = get_new_bundle_attr(makefile, bundle, 'changeset')
+		battrs['changeset'] = changeset
+		battrs['sha256'] = get_new_bundle_attr(makefile, bundle, 'sha256sum')
+
+		if bundle == 'openjdk':
+			battrs['url'] = '{}/archive/{}.tar.gz'.format(hg_url, changeset)
+		else:
+			battrs['url'] = '{}/{}/archive/{}.tar.gz'.format(hg_url, bundle, changeset)
+
+		attrs[bundle] = battrs
+
+	tar.close()
+
+	return attrs
+
+def get_new_attrs(jdk):
+	print('Getting old attributes for JDK {}...'.format(jdk))
+	old_attrs = get_old_attrs(jdk)
+	attrs = {}
+
+	# The major version corresponds to a specific JDK (1 = OpenJDK6, 2 = OpenJDK7, 3 = OpenJDK8)
+	major = jdk - 5
+
+	print('Getting latest version for JDK {}...'.format(jdk))
+	version, url = get_latest_version_url(major)
+
+	print()
+	print('Old version: {}'.format(old_attrs['version']))
+	print('New version: {}'.format(version))
+	print()
+
+	if version == old_attrs['version']:
+		print('No update available, skipping...')
+		print()
+		return old_attrs
+
+	print('Update available, generating new attributes for JDK {}...'.format(jdk))
+
+	attrs['version'] = version
+	attrs['branch'] = '.'.join(version.split('.')[:2])
+	attrs['url'] = url
+
+	print('Downloading tarball from url "{}"...'.format(url))
+	print()
+	attrs['sha256'], path = nix_prefetch_url(url)
+	print()
+
+	print('Inspecting tarball for bundle information...')
+
+	attrs['bundles'] = get_new_bundle_attrs(jdk, attrs['branch'], path)
+
+	print('Done!')
+
+	return attrs
+
+def generate_jdk(jdk):
+	attrs = get_new_attrs(jdk)
+
+	branch = attrs['branch']
+	src_version = attrs['version'].replace(branch, '${branch}')
+	src_url = attrs['url'].replace(attrs['version'], '${version}')
+
+	hg_url = HG_URL.format(jdk, branch)
+	src_hg_url = HG_URL.format(jdk, '${branch}')
+
+	src =  '  icedtea{} = rec {{\n'.format(jdk)
+	src += '    branch = "{}";\n'.format(branch)
+	src += '    version = "{}";\n'.format(src_version)
+	src += '\n'
+	src += '    url = "{}";\n'.format(src_url)
+	src += '    sha256 = "{}";\n'.format(attrs['sha256'])
+	src += '\n'
+	src += '    hg_url = "{}";\n'.format(src_hg_url)
+	src += '\n'
+	src += '    bundles = {\n'
+
+	for bundle in BUNDLES:
+		battrs = attrs['bundles'][bundle]
+
+		b_url = battrs['url']
+		b_url = b_url.replace(hg_url, '${hg_url}')
+		b_url = b_url.replace(battrs['changeset'], '${changeset}')
+
+		src += '      {} = rec {{\n'.format(bundle)
+		src += '        changeset = "{}";\n'.format(battrs['changeset'])
+		src += '        url = "{}";\n'.format(b_url)
+		src += '        sha256 = "{}";\n'.format(battrs['sha256'])
+		src += '      };\n'
+
+		if bundle != BUNDLES[-1]:
+			src += '\n'
+
+	src += '    };\n'
+	src += '  };\n'
+
+	return src
+
+def generate_sources(jdks):
+	src = '# This file is autogenerated from update.py in the same directory.\n'
+	src += '{\n'
+
+	for jdk in jdks:
+		print()
+		print('Generating sources for JDK {}...'.format(jdk))
+		src += generate_jdk(jdk)
+
+	src += '}\n'
+	return src
+
+if __name__ == '__main__':
+	print('Generating {}...'.format(SRC_PATH))
+	src = generate_sources(ICEDTEA_JDKS)
+
+	f = open(SRC_PATH, 'w', encoding = 'utf-8')
+	f.write(src)
+	f.close()
+
+	print()
+	print('Update complete!')
-- 
GitLab


From be8667627a060f9e4ee76751f9a703bcde2b3ebe Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 25 Mar 2014 20:29:42 +0100
Subject: [PATCH 2584/3789] icedtea: Workaround javaws/web plugin start-up
 error

This is a workaround to avoid the error: "java.io.IOException: RSA premaster
secret error".

In Java Web Start and the Java web plugin, there seems to be a Java policy
that prevents untrusted code from being loaded, and (probably for security
reasons) it doesn't like the files in the JDK's lib/icedtea/jre/lib/ext
directory to be symlinks.

Worked around it by copying those files instead of symlinking them.
---
 pkgs/development/compilers/icedtea/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix
index 42a719d64d3..a8f9617a634 100644
--- a/pkgs/development/compilers/icedtea/default.nix
+++ b/pkgs/development/compilers/icedtea/default.nix
@@ -119,6 +119,10 @@ with srcInfo; stdenv.mkDerivation {
     mkdir $out/lib/icedtea/jre
     lndir $jre/lib/icedtea/jre $out/lib/icedtea/jre
 
+    # The following files cannot be symlinked, as it seems to violate Java security policies
+    rm $out/lib/icedtea/jre/lib/ext/*
+    cp $jre/lib/icedtea/jre/lib/ext/* $out/lib/icedtea/jre/lib/ext/
+
     rm -rf $out/lib/icedtea/jre/bin
     ln -s $out/lib/icedtea/bin $out/lib/icedtea/jre/bin
 
-- 
GitLab


From 2d821edb92f5e8c48a4ee631d13697e16a4254bc Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 25 Mar 2014 17:29:03 +0100
Subject: [PATCH 2585/3789] npapi-sdk: New package

NPAPI-SDK is a bundle of NPAPI headers by Mozilla.
---
 .../libraries/npapi-sdk/default.nix           | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/npapi-sdk/default.nix

diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix
new file mode 100644
index 00000000000..255468e7810
--- /dev/null
+++ b/pkgs/development/libraries/npapi-sdk/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "npapi-sdk-${version}";
+
+  version = "0.27.2";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/mgorny/npapi-sdk/downloads/${name}.tar.bz2";
+
+    sha256 = "0xxfcsjmmgbbyl9zwpzdshbx27grj5fnzjfmldmm9apws2yk9gq1";
+  };
+
+  meta = with stdenv.lib; {
+    description = "NPAPI-SDK is a bundle of NPAPI headers by Mozilla";
+
+    homepage = https://code.google.com/p/npapi-sdk/;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ wizeman ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e0b9b2218a..89a94c59213 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1525,6 +1525,8 @@ let
 
   nlopt = callPackage ../development/libraries/nlopt {};
 
+  npapi_sdk = callPackage ../development/libraries/npapi-sdk {};
+
   npth = callPackage ../development/libraries/npth {};
 
   nmap = callPackage ../tools/security/nmap {
-- 
GitLab


From 5fbc63be35029d1a6586e700dbca4d3c39fbf003 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 24 Mar 2014 20:52:18 +0100
Subject: [PATCH 2586/3789] icedtea7_web: New package

Java web browser plugin and an implementation of Java Web Start.
---
 .../compilers/icedtea-web/default.nix         | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/compilers/icedtea-web/default.nix

diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix
new file mode 100644
index 00000000000..9123aaa988c
--- /dev/null
+++ b/pkgs/development/compilers/icedtea-web/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, jdk, gtk2, xulrunner, zip, pkgconfig, perl, npapi_sdk }:
+
+stdenv.mkDerivation rec {
+  name = "icedtea-web-${version}";
+
+  version = "1.4.2";
+
+  src = fetchurl {
+    url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz";
+
+    sha256 = "0bfw4icxjfkdxqmiqgp9lfs1ca9rydl57g3yhlxrif0fpzyyb3fl";
+  };
+
+  buildInputs = [ gtk2 xulrunner zip pkgconfig npapi_sdk ];
+
+  preConfigure = ''
+    substituteInPlace javac.in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
+  '';
+
+  configureFlags = [
+    "--with-jdk-home=${jdk}"
+  ];
+
+  mozillaPlugin = "/lib";
+
+  meta = {
+    description = "Java web browser plugin and an implementation of Java Web Start";
+    longDescription = ''
+      A Free Software web browser plugin running applets written in the Java
+      programming language and an implementation of Java Web Start, originally
+      based on the NetX project.
+    '';
+    homepage = http://icedtea.classpath.org/wiki/IcedTea-Web;
+    maintainers = with stdenv.lib.maintainers; [ wizeman ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89a94c59213..81d975f8b24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2795,6 +2795,10 @@ let
     { description = "Free Java runtime environment based on OpenJDK 7.0 and the IcedTea project"; }
     pkgs.icedtea7_jdk.jre)) // { outputs = [ "jre" ]; };
 
+  icedtea7_web = callPackage ../development/compilers/icedtea-web {
+    jdk = "${icedtea7_jdk}/lib/icedtea";
+  };
+
   ikarus = callPackage ../development/compilers/ikarus { };
 
   hugs = callPackage ../development/compilers/hugs { };
-- 
GitLab


From 8af6b20856fe6523463b54154b072c4f4347df07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sat, 22 Feb 2014 23:42:11 +0100
Subject: [PATCH 2587/3789] idea: update 13.0.2 -> 13.1.1

And use buildnumbers only in the buildscript and use more familiar
version numbers in the package name.

[bjorn.forsman@gmail.com: modify commit message]
---
 pkgs/applications/editors/idea/default.nix | 38 ++++++++++++----------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 31812bcb989..c6301bd8a30 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -5,10 +5,10 @@
 let
 
   buildIdea =
-  { name, src, description, license }:
+  { name, version, build, src, description, license }:
 
   stdenv.mkDerivation rec {
-    inherit name src license;
+    inherit name build src license;
     ideaItem = makeDesktopItem {
       name = "IDEA";
       exec = "idea";
@@ -23,26 +23,26 @@ let
     buildCommand = ''
       tar xvzf $src
       mkdir -p $out
-      cp -a $name $out
+      cp -a idea-$build $out
 
       interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
 
-      7z x $out/$name/lib/snappy-java-1.0.5.jar
-      rm $out/$name/lib/snappy-java-1.0.5.jar
+      7z x $out/idea-$build/lib/snappy-java-1.0.5.jar
+      rm $out/idea-$build/lib/snappy-java-1.0.5.jar
       if [ "${stdenv.system}" == "x86_64-linux" ];then
-        patchelf --set-interpreter $interpreter $out/$name/bin/fsnotifier64
+        patchelf --set-interpreter $interpreter $out/idea-$build/bin/fsnotifier64
         patchelf --set-rpath ${stdenv.gcc.gcc}/lib64/ org/xerial/snappy/native/Linux/amd64/libsnappyjava.so
       else
-        patchelf --set-interpreter $interpreter $out/$name/bin/fsnotifier
+        patchelf --set-interpreter $interpreter $out/idea-$build/bin/fsnotifier
         patchelf --set-rpath ${stdenv.gcc.gcc}/lib/ org/xerial/snappy/native/Linux/i386/libsnappyjava.so
       fi
-      7z a -tzip $out/$name/lib/snappy-java-1.0.5.jar .
+      7z a -tzip $out/idea-$build/lib/snappy-java-1.0.5.jar .
 
       mkdir -p $out/bin
 
       jdk=${jdk}/lib/openjdk
 
-      makeWrapper $out/$name/bin/idea.sh $out/bin/idea \
+      makeWrapper $out/idea-$build/bin/idea.sh $out/bin/idea \
         --prefix PATH : ${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin \
         --prefix LD_RUN_PATH : ${stdenv.gcc.gcc}/lib/ \
         --prefix JDK_HOME : $jdk \
@@ -64,23 +64,27 @@ let
 
 in {
 
-  idea_community_1302 = buildIdea {
-    name = "idea-IC-133.696";
+  idea_community_1311 = buildIdea rec {
+    name = "idea-community-${version}";
+    version = "13.1.1";
+    build = "IC-135.480";
     description = "IntelliJ IDEA 13 Community Edition";
     license = stdenv.lib.licenses.asl20.shortName;
     src = fetchurl {
-      url = http://download-ln.jetbrains.com/idea/ideaIC-13.0.2.tar.gz;
-      sha256 = "a776878c2dba877761b74d2886d006f64eec3c9694dbd1578380287a9c8cbd53";
+      url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz";
+      sha256 = "9e28d3e5682b037c9d6190622ab2a47112fa792539083cc7a4cb24f3f7bf7d22";
     };
   };
 
-  idea_ultimate_1302 = buildIdea {
-    name = "idea-IU-133.696";
+  idea_ultimate_1311 = buildIdea rec {
+    name = "idea-ultimate-${version}";
+    version = "13.1.1";
+    build = "IU-135.480";
     description = "IntelliJ IDEA 13 Ultimate Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
-      url = http://download-ln.jetbrains.com/idea/ideaIU-13.0.2.tar.gz;
-      sha256 = "7ba9499ecc82029470712d6ead520db1e2cf520e4f86d382cbdea1d0052712d0";
+      url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz";
+      sha256 = "d699abcdcace387105a465049e015c1367dedf42f7a5f5a1f7b3d840e98b2658";
     };
   };
 
-- 
GitLab


From 7381035bc2489be3152868efbb53271c68834bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 26 Mar 2014 22:25:40 +0100
Subject: [PATCH 2588/3789] blender: update from 2.69 to 2.70

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

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 683c4242a9c..2e9cf46bf86 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.69";
+  name = "blender-2.70";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "02ffakkbax1kl4ycakxq20yp9hmw1qj1qndjjqxnhhhdxifpyjn9";
+    sha256 = "0j73yfpavcrzg5v54kcha7sig6179g5ykrlhih8d288pnb5c7596";
   };
 
   buildInputs = [
-- 
GitLab


From fc4542c99de712e882ef85e9e9d46a0b853d182b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 26 Mar 2014 22:26:43 +0100
Subject: [PATCH 2589/3789] qtractor: update from 0.5.12 to 0.6.0

---
 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 e04ad9ddd14..c70842c399a 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.5.12";
+  version = "0.6.0";
   name = "qtractor-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qtractor/${name}.tar.gz";
-    sha256 = "0yf2p9l3hj8pd550v3rbbjqkvxnvn8p6nsnm4aj2v5q4mgg2c8cc";
+    sha256 = "0aw6g0biqzysnsk5vd6wx3q1khyav6krhjz7bzk0v7d2160bn40r";
   };
 
   buildInputs =
-- 
GitLab


From b60f8810b214d2b2b5a8257c446ce89419f964f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 26 Mar 2014 22:27:02 +0100
Subject: [PATCH 2590/3789] yoshimi: update from 1.1.0 to 1.2.0

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

diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 698c8dc0dda..df0b98cdd9e 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
   name = "yoshimi-${version}";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "0rb0q0bqsaaj3imdjgfaigj1kbjqkx1gm91nh2mdgy9i09rygsbv";
+    sha256 = "0p4v39kxxzzfvaazzxarx54i164ghpfxq0ljkavlgr8fnix5v3mx";
   };
 
   buildInputs = [
-- 
GitLab


From 62793a007db2911cadebfc738d5415d7cc2cacbf Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 23 Mar 2014 23:32:00 -0500
Subject: [PATCH 2591/3789] fmod: adopt, and upgrade 4.22.04 -> 4.44.32
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This installs the headers in a fashion which matches Gentoo, and it also
changes the version numbering scheme as well to match, so hopefully
Nixpkgs Monitor can provide security tracking updates or anything
(although technically Gentoo is outdated!)

[Bjørn: add github pull-request cover letter to commit message; it
contains useful info.]

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/fmod/default.nix | 44 +++++++++++----------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/fmod/default.nix b/pkgs/development/libraries/fmod/default.nix
index d85a24fa63a..ba9bb286cdf 100644
--- a/pkgs/development/libraries/fmod/default.nix
+++ b/pkgs/development/libraries/fmod/default.nix
@@ -1,28 +1,32 @@
-{stdenv, fetchurl }:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "fmod-42204";
-  src = if stdenv.system == "i686-linux" then
-    fetchurl {
-      url = http://www.fmod.org/index.php/release/version/fmodapi42204linux.tar.gz;
-      sha256 = "64eedc5b37c597eb925de446106d75cab0b5a79697d5ec048d34702812c08563";
-    } else if stdenv.system == "x86_64-linux" then
-    fetchurl {
-      url = http://www.fmod.org/index.php/release/version/fmodapi42204linux64.tar.gz;
-      sha256 = "3f2eec8265838a1005febe07c4971660e85010e4622911890642dc438746edf3";
-    } else throw "unsupported platform ${stdenv.system} (only i686-linux and x86_64 linux supported yet)";
+assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux");
+let
+  bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";
+in
+stdenv.mkDerivation rec {
+  name    = "fmod-${version}";
+  version = "4.44.32";
 
-  preInstall = ''
-    sed -e /ldconfig/d -i Makefile
-    sed -e s@/usr/local@$out@ -i Makefile
-    sed -e s@/include/fmodex@/include@ -i Makefile
-    mkdir -p $out/lib
-    mkdir -p $out/include
+  src = fetchurl {
+    url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi44432linux.tar.gz";
+    sha256 = "071m2snzz5vc5ca7dvsf6w31nrgk5k9xb6mp7yzqdj4bkjad2hyd";
+  };
+
+  buildPhase = "true";
+  installPhase = ''
+    mkdir -p $out/lib $out/include/fmodex
+
+    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
   '';
 
   meta = {
-    homepage = http://www.fmod.org/;
     description = "Programming library and toolkit for the creation and playback of interactive audio";
-    license = "unfree";
+    homepage    = "http://www.fmod.org/";
+    license     = stdenv.lib.licenses.unfreeRedistributable;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }
-- 
GitLab


From de3b5b450076b3f881359646a32268baaa14ce5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 26 Mar 2014 23:02:15 +0100
Subject: [PATCH 2592/3789] Add simplescreenrecorder: an excellent screen
 recorder for linux

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

diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
new file mode 100644
index 00000000000..3251127c7a1
--- /dev/null
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, alsaLib, ffmpeg, jackaudio, libX11, libXext
+, libXfixes, mesa, pkgconfig, pulseaudio, qt4
+}:
+
+stdenv.mkDerivation rec {
+  name = "simplescreenrecorder-${version}";
+  version = "0.2.2";
+
+  src = fetchurl {
+    url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz";
+    sha256 = "0k1r1ilpk05qmwpnld95zxxk57qvyaq2r9f4i3la7y0xh9bz1gls";
+  };
+
+  buildInputs = [
+    alsaLib ffmpeg jackaudio libX11 libXext libXfixes mesa pkgconfig
+    pulseaudio qt4
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A screen recorder for Linux";
+    homepage = http://www.maartenbaert.be/simplescreenrecorder;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e912d63daf..47515b4b575 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1897,6 +1897,8 @@ let
 
   silver-searcher = callPackage ../tools/text/silver-searcher { };
 
+  simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { };
+
   sleuthkit = callPackage ../tools/system/sleuthkit {};
 
   slimrat = callPackage ../tools/networking/slimrat {
-- 
GitLab


From 1c73e6f9d8edd3d975db096d6ba1d203d56d10db Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 26 Mar 2014 21:20:48 +0100
Subject: [PATCH 2593/3789] linux: Update to 3.13.7

---
 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 361106bf065..c7658cc232e 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.6";
+  version = "3.13.7";
   extraMeta.branch = "3.13";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "10j1rc63y0rcrnc2rx8jyczqg42gcbijd83qqd795qrrp5wnf7qw";
+    sha256 = "0llyc343hzk8a2vhv63xja269jfqaavz613x98y71qfi05ald524";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 911f33227940aa7a5d446827af52c4887b7834fd Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 26 Mar 2014 21:21:05 +0100
Subject: [PATCH 2594/3789] grsecurity: Update stable and test patches

stable: 3.0-3.2.55-201403202347 -> 3.0-3.2.55-201403252026
test:   3.0-3.13.6-201403202349 -> 3.0-3.13.7-201403252047
---
 pkgs/os-specific/linux/kernel/patches.nix | 14 +++++++-------
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index a41290168fe..492fe647a88 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -75,22 +75,22 @@ rec {
   grsecurity_3_0_3_2_55 =
     { name = "grsecurity-3.0-3.2.55";
       patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403202347.patch;
-        sha256 = "19fwbpnfgq7iylrd0akazmh349xvxc9saxcsiqzhficfrsc4fyd3";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403252026.patch;
+        sha256 = "1jfy4cfzgfixyyq5436fzwhg9ch31ynq6d5sxzajqkvmprq5kbhn";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55
       features.apparmor = true;
     };
 
-  grsecurity_3_0_3_13_6 =
-    { name = "grsecurity-3.0-3.13.6";
+  grsecurity_3_0_3_13_7 =
+    { name = "grsecurity-3.0-3.13.7";
       patch = fetchurl {
-        url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403202349.patch;
-        sha256 = "0a1alz46k1g9nryx7qb040v5zf09ax7shj5wb0xj58gfpm67g86p";
+        url = http://grsecurity.net/test/grsecurity-3.0-3.13.7-201403252047.patch;
+        sha256 = "0f3mhkf15fpgy28rkfkd0wnccvz2n7s21gppnksl5w9dlw8m7mib";
       };
       features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.6
+      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.7
       features.apparmor = true;
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47515b4b575..41646b7a25c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6812,7 +6812,7 @@ let
   })) (args: grsecurityOverrider args));
 
   linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_6 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_7 kernelPatches.grsec_path ];
     argsOverride = {
       modDirVersion = "${linux_3_13.modDirVersion}-grsec";
     };
-- 
GitLab


From 897bbc3702b8c5451f49f7614f3e3e86542b897b Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sun, 16 Mar 2014 20:38:40 +0100
Subject: [PATCH 2595/3789] grsecurity: Add myself as a maintainer

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41646b7a25c..8817060b850 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6804,19 +6804,23 @@ let
   # Note: grsec is not enabled automatically, you need to specify which kernel
   # config options you need (e.g. by overriding extraConfig). See list of options here:
   # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
-  linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
+  linux_3_2_grsecurity = lowPrio (lib.addMetaAttrs {
+    maintainers = with lib.maintainers; [ wizeman ];
+  } (lib.overrideDerivation (linux_3_2.override (args: {
     kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_55 kernelPatches.grsec_path ];
     argsOverride = {
       modDirVersion = "${linux_3_2.modDirVersion}-grsec";
     };
-  })) (args: grsecurityOverrider args));
+  })) (args: grsecurityOverrider args)));
 
-  linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: {
+  linux_3_13_grsecurity = lowPrio (lib.addMetaAttrs {
+    maintainers = with lib.maintainers; [ wizeman ];
+  } (lib.overrideDerivation (linux_3_13.override (args: {
     kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_7 kernelPatches.grsec_path ];
     argsOverride = {
       modDirVersion = "${linux_3_13.modDirVersion}-grsec";
     };
-  })) (args: grsecurityOverrider args));
+  })) (args: grsecurityOverrider args)));
 
   linux_3_2_apparmor = lowPrio (linux_3_2.override {
     kernelPatches = [ kernelPatches.apparmor_3_2 ];
-- 
GitLab


From fd827e643754af4469932ae33a601c0416c475d9 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 27 Mar 2014 03:01:45 +0200
Subject: [PATCH 2596/3789] springLobby: update from 0.182 to 0.186

---
 pkgs/games/spring/springlobby.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 9d7b281935b..b5c8ef0154c 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "springlobby-${version}";
-  version = "0.182";
+  version = "0.186";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "121kvbbrcnp2yqzbnz3wai2m6mn7nrgqvb1d4ly0k98p3ar20m4v";
+    sha256 = "0pj7v85gl76hxvfhcypxsayk8lnnhgjn2irawgx49p80wsivl64k";
   };
 
   buildInputs = [
-- 
GitLab


From e16595f14963d61dc4876da45d18d79b319247b0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 26 Mar 2014 22:46:05 -0400
Subject: [PATCH 2597/3789] Build all ghcs on hydra

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8817060b850..c2cf120490b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2724,7 +2724,13 @@ let
   # NOTE (recurseIntoAttrs): After discussion, we originally decided to
   # enable it for all GHC versions. However, this is getting too much,
   # particularly in connection with Hydra builds for all these packages.
-  # So we enable it for selected versions only.
+  # So we enable it for selected versions only. We build all ghcs, though
+
+  ghc = recurseIntoAttrs (lib.mapAttrs' (name: value:
+    lib.nameValuePair (builtins.substring (builtins.stringLength "packages_") (builtins.stringLength name) name) value.ghc
+  ) (lib.filterAttrs (name: value:
+    builtins.substring 0 (builtins.stringLength "packages_") name == "packages_"
+  ) haskell));
 
   # Current default version: 7.6.3.
   haskellPackages = haskellPackages_ghc763;
-- 
GitLab


From 96d78a2804ada185f6bb4dc2b51f15853598e251 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, 22 Mar 2014 23:57:24 +0800
Subject: [PATCH 2598/3789] pitivi: fix icons

---
 pkgs/applications/video/pitivi/default.nix | 8 +++++++-
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index d6a0c0e5212..947d2517808 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -1,6 +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
 }:
 
 let
@@ -43,10 +44,15 @@ in stdenv.mkDerivation rec {
       gstreamer gst-editing-services
       clutter-gst clutter-gtk clutter gtk3
     ];
+
+    xdgDataDirs = makeSearchPath "share" [
+      gtk3 gnome_icon_theme gnome_icon_theme_symbolic
+    ];
   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 GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
+      --prefix XDG_DATA_DIRS : "\$XDG_ICON_DIRS:${xdgDataDirs}:$out/share"
   '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dad2bf5056a..c7ba7f800a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1633,6 +1633,7 @@ let
   pitivi = callPackage ../applications/video/pitivi {
     gst = gst_all_1;
     clutter-gtk = clutter_gtk;
+    inherit (gnome3) gnome_icon_theme gnome_icon_theme_symbolic;
   };
 
   hurdPartedCross =
-- 
GitLab


From 699b18e95a1b3eac4756533a4786daf10d38f426 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, 27 Mar 2014 11:33:34 +0800
Subject: [PATCH 2599/3789] webkitgtk: update to 2.4.0

---
 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 8f8551ac9b6..cad5185b0d7 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "webkitgtk-2.2.4";
+  name = "webkitgtk-2.4.0";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0x2d9hds5yazwdakkhrh3dk5qxscb169imi056q2qq53zhdyw6jy";
+    sha256 = "1fyz6ysw7npy5wa7m1zg05zrj0gi0wdlpjbqix03iq4ym36pflnw";
   };
 
   patches = [ ./webcore-svg-libxml-cflags.patch ];
-- 
GitLab


From 2cf7678fc0ef50afc2abf2657f29ef21bfb4f6a1 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, 27 Mar 2014 16:11:56 +0800
Subject: [PATCH 2600/3789] webkitgtk: add gtk2 version

---
 pkgs/development/libraries/webkitgtk/default.nix | 14 +++++++++++---
 pkgs/top-level/all-packages.nix                  |  5 +++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index cad5185b0d7..b742be27f74 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -3,6 +3,8 @@
 , gtk2, gtk3, wayland, libwebp, enchant
 , libxml2, libsoup, libsecret, libxslt, harfbuzz
 , gst-plugins-base
+, withGtk2 ? false
+, enableIntrospection ? true
 }:
 
 stdenv.mkDerivation rec {
@@ -31,9 +33,12 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  configureFlags = [
+  configureFlags = with stdenv.lib; [
     "--disable-geolocation"
-    "--enable-introspection"
+    (optionalString enableIntrospection "--enable-introspection")
+  ] ++ stdenv.lib.optional withGtk2 [
+    "--with-gtk=2.0"
+    "--disable-webkit2"
   ];
 
   dontAddDisableDepTrack = true;
@@ -49,7 +54,10 @@ stdenv.mkDerivation rec {
     gst-plugins-base
   ];
 
-  propagatedBuildInputs = [ gtk3 libsoup ];
+  propagatedBuildInputs = [
+    libsoup
+    (if withGtk2 then gtk2 else gtk3)
+  ];
 
   #enableParallelBuilding = true; # build problems on Hydra
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2cf120490b..66f5acc51b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5909,6 +5909,11 @@ let
     gst-plugins-base = gst_all_1.gst-plugins-base;
   };
 
+  webkitgtk2 = webkitgtk.override {
+    withGtk2 = true;
+    enableIntrospection = false;
+  };
+
   wildmidi = callPackage ../development/libraries/wildmidi { };
 
   wvstreams = callPackage ../development/libraries/wvstreams { };
-- 
GitLab


From 558eac386985356e4a613a4e91f242656c6e7889 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 12:45:58 +0100
Subject: [PATCH 2601/3789] haskell-dataenc: jailbreak to fix build with GHC
 7.8.1

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

diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix
index 9c4de4a1b84..6eda9ca3c43 100644
--- a/pkgs/development/libraries/haskell/dataenc/default.nix
+++ b/pkgs/development/libraries/haskell/dataenc/default.nix
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "13gajqbayar7x8sq3rw93i277gqd0bx1i34spshlj4b41fraxc8w";
   isLibrary = true;
   isExecutable = true;
+  jailbreak = true;
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding";
     description = "Data encoding library";
-- 
GitLab


From 284ea5859b13e40a319785f4dc616a6f1517e691 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 12:49:46 +0100
Subject: [PATCH 2602/3789] BNFC: fix build with GHC 7.8.1

---
 pkgs/development/tools/haskell/BNFC/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix
index 3cb85b86acb..ebe8d2c3e24 100644
--- a/pkgs/development/tools/haskell/BNFC/default.nix
+++ b/pkgs/development/tools/haskell/BNFC/default.nix
@@ -1,4 +1,4 @@
-{ cabal, mtl, fetchurl }:
+{ cabal, mtl, fetchurl, alex, happy }:
 
 cabal.mkDerivation (self: {
   pname = "BNFC";
@@ -7,8 +7,10 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl ];
+  buildTools = [ alex happy ];
   patches = [ (fetchurl { url = "https://github.com/BNFC/bnfc/pull/3.patch"; sha256 = "103l04ylzswgxrmpv5zy6dd0jyr96z21mdkpgk1z4prvn8wjl624"; }) ];
   patchFlags = "-p2";
+  preConfigure = "runhaskell Setup.lhs clean";
   meta = {
     homepage = "http://bnfc.digitalgrammars.com/";
     description = "A compiler front-end generator";
-- 
GitLab


From 5943227a263172388b95164f7329c58b505c6ae9 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 25 Mar 2014 16:00:06 +0100
Subject: [PATCH 2603/3789] neoload: fix for the new jdk/jre location

---
 pkgs/development/tools/neoload/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix
index 384e724dfad..8b00d17ac7d 100644
--- a/pkgs/development/tools/neoload/default.nix
+++ b/pkgs/development/tools/neoload/default.nix
@@ -13,9 +13,9 @@ if !licenseAccepted then throw ''
 else assert licenseAccepted;
 
 # the installer is very picky and demands 1.7.0.07
-let dotInstall4j = writeTextFile { name = "dot-install4j"; text = ''
-      JRE_VERSION	${jre}	1	7	0	7
-      JRE_INFO	${jre}	94
+let dotInstall4j = path: writeTextFile { name = "dot-install4j"; text = ''
+      JRE_VERSION	${jre}${path}	1	7	0	7
+      JRE_INFO	${jre}${path}	94
     ''; };
 
     responseVarfile = writeTextFile { name = "response.varfile"; text = ''
@@ -48,7 +48,6 @@ in stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/lib/neoload
-    ln -s ${jre} $out/lib/neoload/jre
 
     # the installer wants to use its internal JRE
     # disable this. The extra spaces are needed because the installer carries
@@ -56,7 +55,7 @@ in stdenv.mkDerivation rec {
     sed -e 's/^if \[ -f jre.tar.gz/if false          /' $src > installer
     chmod a+x installer
 
-    cp ${dotInstall4j} .install4j
+    cp ${dotInstall4j ""} .install4j
     chmod u+w .install4j
 
     sed -e "s|INSTALLDIR|$out|" ${responseVarfile} > response.varfile
@@ -66,7 +65,7 @@ in stdenv.mkDerivation rec {
     bash -ic './installer -q -varfile response.varfile'
 
     for i in $out/bin/*; do
-      wrapProgram $i --run 'cp ${dotInstall4j} ~/.install4j' \
+      wrapProgram $i --run 'cp ${dotInstall4j "/lib/openjdk/jre"} ~/.install4j' \
                      --run 'chmod u+w ~/.install4j'
     done
 
@@ -75,7 +74,7 @@ in stdenv.mkDerivation rec {
       name=$(basename "$i")
       sed -e 's|/lib/neoload/bin|/bin|' "$i" > "$out/share/applications/$name"
     done
-    rm $out/lib/neoload/*.desktop $out/lib/neoload/uninstall
+    rm -r $out/lib/neoload/*.desktop $out/lib/neoload/uninstall
 
   '';
 
-- 
GitLab


From e39b70dd79d3dc8caf8e32a1eaa3400b7184cd40 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 27 Mar 2014 12:13:26 +0100
Subject: [PATCH 2604/3789] go: Update to 1.2.1

---
 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 2abdc51e4c6..4219e0d8873 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";
+  name = "go-1.2.1";
 
   src = fetchurl {
-    url = http://go.googlecode.com/files/go1.2.src.tar.gz;
-    sha1 = "7dd2408d40471aeb30a9e0b502c6717b5bf383a5";
+    url = http://go.googlecode.com/files/go1.2.1.src.tar.gz;
+    sha1 = "6a4b9991eddd8039438438d6aa25126ab7e07f2f";
   };
 
   buildInputs = [ bison glibc bash makeWrapper ];
-- 
GitLab


From 342fc9c20769bbaa3a44c4941456ff47bc718225 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 27 Mar 2014 12:15:54 +0100
Subject: [PATCH 2605/3789] go: Add myself as maintainer to receive Hydra
 notifications

---
 pkgs/development/compilers/go/1.2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
index 4219e0d8873..82b0c400fa6 100644
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation {
     homepage = http://golang.org/;
     description = "The Go Programming language";
     license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [ pierron viric ];
+    maintainers = with stdenv.lib.maintainers; [ pierron viric wizeman ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From 3551e2ee06664d8eeff748b12da0867222e8da2f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:46:23 +0100
Subject: [PATCH 2606/3789] haskell-quickcheck-instances: re-generate with
 cabal2nix

---
 .../libraries/haskell/quickcheck-instances/default.nix          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
index d532a83015c..00ea65388fd 100644
--- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
+++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     hashable QuickCheck text time unorderedContainers
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/aslatter/qc-instances";
     description = "Common quickcheck instances";
@@ -14,5 +15,4 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
-  jailbreak = true;
 })
-- 
GitLab


From da7fe3fe8a1a50b7c2df16b16d327c6287db189c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:49:11 +0100
Subject: [PATCH 2607/3789] haskell-QuickCheck: update to version 2.7.3

---
 .../haskell/QuickCheck/{2.7.1.nix => 2.7.3.nix}  |  7 ++-----
 pkgs/top-level/haskell-packages.nix              | 16 ++++++++--------
 2 files changed, 10 insertions(+), 13 deletions(-)
 rename pkgs/development/libraries/haskell/QuickCheck/{2.7.1.nix => 2.7.3.nix} (71%)

diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix
similarity index 71%
rename from pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix
rename to pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix
index 85829093c34..b3acd535d8f 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix
@@ -2,13 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "QuickCheck";
-  version = "2.7.1";
-  sha256 = "1hk19q7lfvja7g626hbbq0xs30zsgjpqfalgmdr24fy8sgdchm21";
+  version = "2.7.3";
+  sha256 = "196pz0b32m84ydwm4wk7m8512bmsxw7nsqpxbyfxsyi3ykq220yh";
   buildDepends = [ random tfRandom ];
   testDepends = [ testFramework ];
-  patchPhase = ''
-    sed -i -e 's|QuickCheck == .*,|QuickCheck,|' QuickCheck.cabal
-  '';
   meta = {
     homepage = "http://code.haskell.org/QuickCheck";
     description = "Automatic testing of Haskell programs";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0c176c8700f..a94bf643d93 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1452,8 +1452,8 @@ 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_1;
-    quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_1; };
+    QuickCheck = self.QuickCheck_2_7_3;
+    quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_3; };
   };
 
   hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {};
@@ -1461,8 +1461,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {};
 
   hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {
-    QuickCheck = self.QuickCheck_2_7_1;
-    quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_1; };
+    QuickCheck = self.QuickCheck_2_7_3;
+    quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_3; };
   };
 
   hstatsd = callPackage ../development/libraries/haskell/hstatsd {};
@@ -2058,7 +2058,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {};
   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_1 = callPackage ../development/libraries/haskell/QuickCheck/2.7.1.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;
@@ -2066,7 +2066,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {};
 
   quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances {
-    QuickCheck = self.QuickCheck_2_7_1;
+    QuickCheck = self.QuickCheck_2_7_3;
   };
 
   quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {};
@@ -2391,7 +2391,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {};
 
   tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {
-    QuickCheck = self.QuickCheck_2_7_1;
+    QuickCheck = self.QuickCheck_2_7_3;
   };
 
   tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {};
@@ -2934,7 +2934,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cabalInstall = self.cabalInstall_1_18_0_3;
 
   gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {
-    hS3 = self.hS3.override { Crypto = self.Crypto.override { QuickCheck = self.QuickCheck_2_7_1; }; };
+    hS3 = self.hS3.override { Crypto = self.Crypto.override { QuickCheck = self.QuickCheck_2_7_3; }; };
   };
 
   githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {};
-- 
GitLab


From 7f9558896fcb23c56213b6daa7978d35bf41e0b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:10 +0100
Subject: [PATCH 2608/3789] haskell-tls: update to version 1.2.6

---
 .../libraries/haskell/tls/{1.2.3.nix => 1.2.6.nix}            | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/tls/{1.2.3.nix => 1.2.6.nix} (92%)

diff --git a/pkgs/development/libraries/haskell/tls/1.2.3.nix b/pkgs/development/libraries/haskell/tls/1.2.6.nix
similarity index 92%
rename from pkgs/development/libraries/haskell/tls/1.2.3.nix
rename to pkgs/development/libraries/haskell/tls/1.2.6.nix
index 5906413796d..15019265f91 100644
--- a/pkgs/development/libraries/haskell/tls/1.2.3.nix
+++ b/pkgs/development/libraries/haskell/tls/1.2.6.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "1.2.3";
-  sha256 = "0vv81z5m223b90zzfp5dk376fh8yngyd8h9anrxjrqb4f3bycaxg";
+  version = "1.2.6";
+  sha256 = "16r60acz9q84dv91jms9qaqvc53r98761ap9ijj3pifizzxcyswi";
   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 a94bf643d93..533b12b3d98 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2481,8 +2481,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   timeCompat = callPackage ../development/libraries/haskell/time-compat {};
 
   tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {};
-  tls_1_2_3 = callPackage ../development/libraries/haskell/tls/1.2.3.nix {};
-  tls = self.tls_1_2_3;
+  tls_1_2_6 = callPackage ../development/libraries/haskell/tls/1.2.6.nix {};
+  tls = self.tls_1_2_6;
 
   tlsExtra = callPackage ../development/libraries/haskell/tls-extra {
     tls = self.tls_1_1_5;
-- 
GitLab


From 27ebc33d6560b9fc2954abf62371468560552471 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:33 +0100
Subject: [PATCH 2609/3789] haskell-elm-server: update to version 0.11

---
 pkgs/development/compilers/elm/elm-server.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix
index 760a6f072de..fce6f4a2699 100644
--- a/pkgs/development/compilers/elm/elm-server.nix
+++ b/pkgs/development/compilers/elm/elm-server.nix
@@ -1,21 +1,20 @@
-{ cabal, blazeHtml, deepseq, Elm, filepath, happstackServer, HTTP
-, mtl, parsec, transformers
+{ cabal, cmdargs, Elm, filepath, mtl, snapCore, snapServer
+, unorderedContainers
 }:
 
 cabal.mkDerivation (self: {
   pname = "elm-server";
-  version = "0.10.1";
-  sha256 = "0rh01jm9h9zbslnzy6xg7bin76gdmypannh3ly40azplw9xmf2dn";
+  version = "0.11";
+  sha256 = "1977fa03n2m2apxhbzpcn6b5y5gf7ksnpigibi8djlpp76rliaz2";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    blazeHtml deepseq Elm filepath happstackServer HTTP mtl parsec
-    transformers
+    cmdargs Elm filepath mtl snapCore snapServer unorderedContainers
   ];
   jailbreak = true;
   meta = {
     homepage = "http://elm-lang.org";
-    description = "The Elm language server";
+    description = "Server for developing Elm projects";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 0f86e37b6cba1143862601e8650d817102fdb419 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:34 +0100
Subject: [PATCH 2610/3789] haskell-Elm: update to version 0.12

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

diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix
index 00c5e2907c6..5a9ba8f6379 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.11";
-  sha256 = "1rg1dbd2ag63in6069p6v88h1yx0snap2gdhz81lk9l66qns3f4s";
+  version = "0.12";
+  sha256 = "1gmhnpcfv49bdifvz70fif71947q482pd1dbs5c84m8sn7c5n3ss";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 55697418082463b48c7d045db9ce796486066dbd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:36 +0100
Subject: [PATCH 2611/3789] haskell-JuicyPixels: update to version 3.1.5

---
 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 5e12adc39a8..95831927a30 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.4.1";
-  sha256 = "12yq6wv0hs8kdckw1wgfssvnl8nvfanic8ciz8r2cjcwnlidh324";
+  version = "3.1.5";
+  sha256 = "1dcqqmj7skx17mwaf0sayqdknnz9w6q2y8z3c8ixmbjyg4jh6a66";
   buildDepends = [
     binary deepseq mtl primitive transformers vector zlib
   ];
-- 
GitLab


From c72248808c152a894b9e1f99975aeede64d64515 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:37 +0100
Subject: [PATCH 2612/3789] haskell-adjunctions: update to version 4.0.3

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

diff --git a/pkgs/development/libraries/haskell/adjunctions/default.nix b/pkgs/development/libraries/haskell/adjunctions/default.nix
index 69c7751270c..d0804959ccb 100644
--- a/pkgs/development/libraries/haskell/adjunctions/default.nix
+++ b/pkgs/development/libraries/haskell/adjunctions/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "adjunctions";
-  version = "4.0.2";
-  sha256 = "0c9168jmnfpzv3025n05b80b9p7jzkdzs0hzymjmh1qvz3iximq5";
+  version = "4.0.3";
+  sha256 = "0rh3vffbq407k9g95dingw6zqq3fk87pknyrqj1mrbmgrnllr8k0";
   buildDepends = [
     comonad contravariant distributive free mtl semigroupoids
     semigroups tagged transformers void
-- 
GitLab


From dcc028ba74cc984bbbef2c3187f7d5bf81262b36 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:38 +0100
Subject: [PATCH 2613/3789] haskell-c2hs: update to version 0.16.6

---
 pkgs/development/libraries/haskell/c2hs/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix
index 90fb53051e2..f63d9f1771b 100644
--- a/pkgs/development/libraries/haskell/c2hs/default.nix
+++ b/pkgs/development/libraries/haskell/c2hs/default.nix
@@ -1,12 +1,17 @@
-{ cabal, filepath, languageC }:
+{ cabal, filepath, HUnit, languageC, shelly, testFramework
+, testFrameworkHunit, text
+}:
 
 cabal.mkDerivation (self: {
   pname = "c2hs";
-  version = "0.16.5";
-  sha256 = "19h4zppn7ry7p3f7qw1kgsrf6h2bjnknycfrj3ibxys82qpv8m8y";
+  version = "0.16.6";
+  sha256 = "1yf7mcslkf6m1nizifqva8j5sxnw87bg60dw8mfgpmqvrzpbxizm";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ filepath languageC ];
+  testDepends = [
+    filepath HUnit shelly testFramework testFrameworkHunit text
+  ];
   meta = {
     homepage = "https://github.com/haskell/c2hs";
     description = "C->Haskell FFI tool that gives some cross-language type safety";
-- 
GitLab


From 5b726ef6ba15d2c2797c178653db380db3910764 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:39 +0100
Subject: [PATCH 2614/3789] haskell-comonad: update to version 4.0.1

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

diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix
index 9457a2ad44d..92c70b55156 100644
--- a/pkgs/development/libraries/haskell/comonad/default.nix
+++ b/pkgs/development/libraries/haskell/comonad/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "comonad";
-  version = "4.0";
-  sha256 = "1f57wqxy1la59kippbj924prnj53a5hwc2ppg48n9xx2wfr63iha";
+  version = "4.0.1";
+  sha256 = "1ib3spgyjbdsnpbz4alaqb1m13v48l5dpv7s68c0mi2nyjkli7lx";
   buildDepends = [
     contravariant distributive mtl semigroups tagged transformers
   ];
-- 
GitLab


From 426f03d9656b1f324e4445ddee8facd19d17e5e6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:40 +0100
Subject: [PATCH 2615/3789] haskell-conduit: update to version 1.0.17.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 b2a3ec9804b..8a73ef04d1d 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.17";
-  sha256 = "0skshic2glx0sfy75skj8b4iip62zha51pgnnx5hsswhx8j2whcw";
+  version = "1.0.17.1";
+  sha256 = "0s2cszwfmz7j249bdydh0d97r5br1p6nizw7ycbkxlmpcrmdvifk";
   buildDepends = [
     liftedBase mmorph monadControl mtl resourcet text textStreamDecode
     transformers transformersBase void
-- 
GitLab


From e3309447a989c0435f1edf5a9dd5582fbc05ef42 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:42 +0100
Subject: [PATCH 2616/3789] haskell-data-lens-template: update to version 2.1.8

---
 .../libraries/haskell/data-lens-template/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix
index 7ba9e3f9da7..67bd753b302 100644
--- a/pkgs/development/libraries/haskell/data-lens-template/default.nix
+++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-lens-template";
-  version = "2.1.7";
-  sha256 = "108xvk5glsw016vdvjb1p3a9zh7rgbkjv5xashs1hj25f8k4cw49";
+  version = "2.1.8";
+  sha256 = "0w8x5zn3d98z0q74bqfgkb9s0ca9hd1xc53gjl759s77wm4iwa0q";
   buildDepends = [ dataLens ];
   meta = {
     homepage = "http://github.com/roconnor/data-lens-template/";
-- 
GitLab


From 81f596a32bf16789fc12d5da8cb5e067950d5ed0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:43 +0100
Subject: [PATCH 2617/3789] haskell-distributive: update to version 0.4.1

---
 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 72510e26d36..4a0167eb030 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";
-  sha256 = "11zln3h7pflv1f6jfma5b505p4wnr9xrs711mhh3a8xi20n4r318";
+  version = "0.4.1";
+  sha256 = "0izsgasml3didklkk6z274fzfd1c6qnn0wlzprcz0bnd07zkh814";
   buildDepends = [ tagged transformers transformersCompat ];
   testDepends = [ doctest filepath ];
   meta = {
-- 
GitLab


From 0a6e61033a832fa23fcaa8298fd8d748c082baa3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:44 +0100
Subject: [PATCH 2618/3789] haskell-dlist: update to version 0.7.0.1

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

diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix
index f87e7e2d758..bf63239dd81 100644
--- a/pkgs/development/libraries/haskell/dlist/default.nix
+++ b/pkgs/development/libraries/haskell/dlist/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dlist";
-  version = "0.7";
-  sha256 = "1abbym3afm77xkgcrv3d9nl4wn69m7m3gxahdcvkg1ir1sm2pkyi";
+  version = "0.7.0.1";
+  sha256 = "197k608ja69xc531r7h3gmy1mf6dsk27b3mkpgp4zdw46z6lcb5l";
   buildDepends = [ deepseq ];
   testDepends = [ Cabal QuickCheck ];
   meta = {
-- 
GitLab


From 76cf6b026a89aa48cc63c2d3b8cbfffe7d8b126c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:45 +0100
Subject: [PATCH 2619/3789] haskell-doctest: update to version 0.9.11

---
 .../libraries/haskell/doctest/default.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix
index 8ed11decf05..ad7bcfe6240 100644
--- a/pkgs/development/libraries/haskell/doctest/default.nix
+++ b/pkgs/development/libraries/haskell/doctest/default.nix
@@ -1,17 +1,17 @@
-{ cabal, deepseq, filepath, ghcPaths, hspec, HUnit, QuickCheck
-, setenv, silently, stringbuilder, syb, transformers
+{ cabal, baseCompat, deepseq, filepath, ghcPaths, hspec, HUnit
+, QuickCheck, setenv, silently, stringbuilder, syb, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "doctest";
-  version = "0.9.10.2";
-  sha256 = "1vrhfbw59vfypylkr2ica2wx1vm62r40s4165syy76r8cyy0i554";
+  version = "0.9.11";
+  sha256 = "04y6y5hixqh8awl37wrss20c2drvx070w7wd6icfx7r0jqds97jr";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ deepseq filepath ghcPaths syb transformers ];
   testDepends = [
-    deepseq filepath ghcPaths hspec HUnit QuickCheck setenv silently
-    stringbuilder syb transformers
+    baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv
+    silently stringbuilder syb transformers
   ];
   doCheck = false;
   noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4";
-- 
GitLab


From 11dc7a8e2cdfda24ad2ffdf2ebcff27fa8f66e15 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:48 +0100
Subject: [PATCH 2620/3789] haskell-free: update to version 4.6.1

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

diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix
index 7d8376da28e..1c7c236ba64 100644
--- a/pkgs/development/libraries/haskell/free/default.nix
+++ b/pkgs/development/libraries/haskell/free/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "free";
-  version = "4.5";
-  sha256 = "0hcdl02whmnyxd3mbfrncd978778irm5sx5f4z54zsigwlk822vx";
+  version = "4.6.1";
+  sha256 = "0xmnxp6x7b6pp2ap7jrjhz00cm30v334i9dcxc14d3r070h7l73w";
   buildDepends = [
     bifunctors comonad distributive mtl profunctors semigroupoids
     semigroups transformers
-- 
GitLab


From 45625d48a15acdd805aefc164c0fbb673b2a85ba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:49 +0100
Subject: [PATCH 2621/3789] haskell-generic-deriving: update to version 1.6.3

---
 .../libraries/haskell/generic-deriving/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix
index 5081d09939b..9b1d911638f 100644
--- a/pkgs/development/libraries/haskell/generic-deriving/default.nix
+++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "generic-deriving";
-  version = "1.6.2";
-  sha256 = "1ryzg7zgnlhx6mbmpsh4fgqf2d758c94qz2zpg3jxns30hd4sfy6";
+  version = "1.6.3";
+  sha256 = "04cjyl5aphf36qbbn75midrqj151fc77z2znpal8dk52gaab2f67";
   meta = {
     description = "Generic programming library for generalised deriving";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From a1060da3944cd25fe26e518b623fae6620b4cd71 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:50 +0100
Subject: [PATCH 2622/3789] haskell-ghcjs-dom: update to version 0.0.7

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

diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
index d42c4c84bf1..20fc85b95f1 100644
--- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
+++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghcjs-dom";
-  version = "0.0.6";
-  sha256 = "0c27mf5cjvw5q4lwbmi245q4y09b61y5s6hxsfzgdn4lhfbvdma6";
+  version = "0.0.7";
+  sha256 = "1yg2c0slndg3y9bk95xkbgl8zp4lmcgw9wk3jkk1sdizn3y3yggq";
   buildDepends = [ ghcjsBase mtl ];
   meta = {
     description = "DOM library that supports both GHCJS and WebKitGTK";
-- 
GitLab


From e61c57686bd0bf5676c16897d35407cf61b49599 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:51 +0100
Subject: [PATCH 2623/3789] haskell-hoogle: update to version 4.2.30

---
 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 9f8c10f86fb..53b037ec301 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.29";
-  sha256 = "0w4fgf0qvd5zsa7dk99vcbr2pnyyg1hl3k0zwvp5v26v1lfijzil";
+  version = "4.2.30";
+  sha256 = "0vw0chqsq8wmi1mpdxj1c9g4ah7lqxm8rwh85j2vyp56vfscw9q1";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From b1cbcea6d2fdcba5f0973265f64f4b95ad43e9d1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:52 +0100
Subject: [PATCH 2624/3789] haskell-hsimport: update to version 0.3

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

diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix
index c114e5aae0f..ca2808e5aba 100644
--- a/pkgs/development/libraries/haskell/hsimport/default.nix
+++ b/pkgs/development/libraries/haskell/hsimport/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hsimport";
-  version = "0.2.10";
-  sha256 = "0xvsjgckh2jab9q7l8pvnnn5x977mb6hkhqb175m10brr13yzk4z";
+  version = "0.3";
+  sha256 = "124dimaa8v4x6vlh51v2r7569d8122l42q19bpzgqih33vw2djcs";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 8282fb8327b9cd8cdce6b21c520d6b0328e0d51d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:54 +0100
Subject: [PATCH 2625/3789] haskell-hybrid-vectors: update to version 0.1.2

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

diff --git a/pkgs/development/libraries/haskell/hybrid-vectors/default.nix b/pkgs/development/libraries/haskell/hybrid-vectors/default.nix
index 56fd36fbe87..0ad23b69437 100644
--- a/pkgs/development/libraries/haskell/hybrid-vectors/default.nix
+++ b/pkgs/development/libraries/haskell/hybrid-vectors/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hybrid-vectors";
-  version = "0.1";
-  sha256 = "0a5ry6xmkr0zjz0kp7qbm7kdz5yr9842gy116902djppmdn5dq05";
+  version = "0.1.2";
+  sha256 = "1scx1xr9rqdpxc1kj5zgf8w1ld1mj68hxr3nl1p352wspvpgd3qf";
   buildDepends = [ deepseq primitive vector ];
   meta = {
     homepage = "http://github.com/ekmett/hybrid-vectors";
-- 
GitLab


From db09633e7b0541d595c8103aeda1b64c3e0590a9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:55 +0100
Subject: [PATCH 2626/3789] haskell-intervals: update to version 0.4.2

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

diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix
index b48aa8884ad..88a001afadd 100644
--- a/pkgs/development/libraries/haskell/intervals/default.nix
+++ b/pkgs/development/libraries/haskell/intervals/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "intervals";
-  version = "0.4.1";
-  sha256 = "09pgy400r47lsa9w5g5dxydshw7lv9i4yv65ld1arssx3n59wyvl";
+  version = "0.4.2";
+  sha256 = "08l7q22rlhyigls1qksf7lnb7g1yrkmdh9clq68xxaf6wzm26aaz";
   buildDepends = [ distributive ];
   testDepends = [ doctest filepath ];
   meta = {
-- 
GitLab


From 1aa1cee4f4ea8f22ac0d7335cb5130065f0c560e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:56 +0100
Subject: [PATCH 2627/3789] haskell-lens: update to version 4.1.2

---
 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 427cf681d2e..1c1fe9b7cd3 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";
-  sha256 = "0fsl2cydmkj2k49z3cgv6hfgrlkmx7zsy0ikp4k5jn2kp3hs77dw";
+  version = "4.1.2";
+  sha256 = "0jpr78bn7bh5v11vw21hjwzmwpzl1zgyq9l3yk3k711vz6689dg2";
   buildDepends = [
     aeson bifunctors comonad contravariant distributive exceptions
     filepath free hashable mtl parallel primitive profunctors
-- 
GitLab


From 0f0755da8cf36e846760942a30989b0867e4ba1a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:57 +0100
Subject: [PATCH 2628/3789] haskell-semigroupoids: update to version 4.0.1

---
 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 e0dbf456804..c46bfa910b0 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";
-  sha256 = "12h2b9pisy21xca3x9ilj0aix9clni0za35d2dmv55gb8y8df54l";
+  version = "4.0.1";
+  sha256 = "0w4r4nmyq94aq9xlyvrankipfwdmlcz2ghqicn9drqfjirhi8lrl";
   buildDepends = [
     comonad contravariant distributive semigroups transformers
   ];
-- 
GitLab


From 94f0403692033753a92f214f8c81f3d1871b3c98 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:50:58 +0100
Subject: [PATCH 2629/3789] haskell-shakespeare-css: update to version 1.0.7.3

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

diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 4a2305cce2a..ae966a4501e 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.7.1";
-  sha256 = "1qw8hlldzdijp0vgikrbj83q4wmx6i1vswn4314dwjxcihljl8ls";
+  version = "1.0.7.3";
+  sha256 = "0f2l1i4h3h5xps74nx3gy1mbi96m12rzgidlh4ilxz6p7dx9wnbq";
   buildDepends = [ parsec shakespeare text transformers ];
   testDepends = [ hspec HUnit shakespeare text ];
   meta = {
-- 
GitLab


From a566d81b4153f29f5f53f7868c68e0a393035e00 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:51:00 +0100
Subject: [PATCH 2630/3789] haskell-shelly: update to version 1.5.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 3ebc62932cf..5a7171c4619 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.5.0.1";
-  sha256 = "19mfxdwnzv01bxd0l5q2z4mbdp7r8p6z2bm083vjlxx7cc35wv7a";
+  version = "1.5.2";
+  sha256 = "1iyn3xxmqbrx6xfay364m2qgflscmz9crr051jpzg0b629b8wssa";
   buildDepends = [
     async mtl systemFileio systemFilepath text time unixCompat
   ];
-- 
GitLab


From c8b03742d5b169cba1c0c95ff8ab0f7d3db486dd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:51:01 +0100
Subject: [PATCH 2631/3789] haskell-stm-conduit: update to version 2.3.0

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

diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index 412dfa1fcd2..07d1fc03bf0 100644
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stm-conduit";
-  version = "2.2.2";
-  sha256 = "0a6yi35iw0p18asr6l8370kndmvim097vklayads6gbk74gg67cy";
+  version = "2.3.0";
+  sha256 = "1qvzqzk822sc0sjblgqb5y73mggsvh70zpzz908isfiqcwp7llc4";
   buildDepends = [
     async cereal cerealConduit conduit liftedAsync liftedBase
     monadControl monadLoops resourcet stm stmChans transformers
-- 
GitLab


From 4246511556b50101a483489db7c60bba8b495c2c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:51:02 +0100
Subject: [PATCH 2632/3789] haskell-wai-middleware-static: update to version
 0.5.0.0

---
 .../libraries/haskell/wai-middleware-static/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
index 005305d7709..8c0540ee101 100644
--- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-middleware-static";
-  version = "0.4.0.3";
-  sha256 = "0nvzdj04g10bcay6x4y5l7gxx38gs3ns0izair8n1j1awrp8px07";
+  version = "0.5.0.0";
+  sha256 = "0mvsm1ff7i2v09gchkc60r8klin1lb0w690m2kwhf9q6y7fxphdf";
   buildDepends = [ filepath httpTypes mtl text wai ];
   jailbreak = true;
   meta = {
     homepage = "https://github.com/scotty-web/scotty";
-    description = "WAI middleware that intercepts requests to static files";
+    description = "WAI middleware that serves requests to static files";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From d1fc054b02ad4d496804cf437abc28cb9f017ad3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:51:03 +0100
Subject: [PATCH 2633/3789] haskell-warp: update to version 2.1.3

---
 pkgs/development/libraries/haskell/warp/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index d08f8d6e545..abd301dcc78 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -1,22 +1,22 @@
 { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
 , conduit, doctest, hashable, hspec, HTTP, httpDate, httpTypes
 , HUnit, liftedBase, network, networkConduit, QuickCheck
-, simpleSendfile, time, transformers, unixCompat, void, wai
+, simpleSendfile, text, time, transformers, unixCompat, void, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.1.2";
-  sha256 = "15630g8qzshn2620qsdki1nwr4bkapqz0k2bls0yxyblvw0fn9cf";
+  version = "2.1.3";
+  sha256 = "00861dimzvbbqx3pbpihfml8k2fkvsw8kda7mkkix59xqsjwc1nz";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpDate httpTypes liftedBase network networkConduit simpleSendfile
-    transformers unixCompat void wai
+    text transformers unixCompat void wai
   ];
   testDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit doctest
     hashable hspec HTTP httpDate httpTypes HUnit liftedBase network
-    networkConduit QuickCheck simpleSendfile time transformers
+    networkConduit QuickCheck simpleSendfile text time transformers
     unixCompat void wai
   ];
   doCheck = false;
-- 
GitLab


From bbcf7320154ba92dd03f589c0a4e144ebac0d7a9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:51:04 +0100
Subject: [PATCH 2634/3789] haskell-wxc: update to version 0.90.1.1

---
 pkgs/development/libraries/haskell/wxHaskell/wxc.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
index 7a9f05c6b62..b816c3007f9 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
@@ -2,12 +2,14 @@
 
 cabal.mkDerivation (self: {
   pname = "wxc";
-  version = "0.90.1.0";
-  sha256 = "1j318pxn6wqjwhz5rinb8az1bkhasgm9rhb3l36dlbzwcc4p0a2a";
+  version = "0.90.1.1";
+  sha256 = "0cvfphskvsq3lsl24h6jh8r6yw5jg8qa9wdc883yasfvmzmxwwgc";
   buildDepends = [ wxdirect ];
   extraLibraries = [ libX11 mesa wxGTK ];
   noHaddock = true;
-  preConfigure = "find . -type f -exec touch {} +";
+  postInstall = ''
+    cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so
+  '';
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "wxHaskell C++ wrapper";
-- 
GitLab


From c53463dcee0c452730458efa87f00220cd76af1f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:51:06 +0100
Subject: [PATCH 2635/3789] haskell-wxcore: update to version 0.90.1.1

---
 pkgs/development/libraries/haskell/wxHaskell/wxcore.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
index 3ee5d9e2cdb..ae01992db97 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
@@ -4,11 +4,10 @@
 
 cabal.mkDerivation (self: {
   pname = "wxcore";
-  version = "0.90.1.0";
-  sha256 = "0pyh5xc8f3rlyn66dawlijwym8nwac12qwh96hfkna0pbqg0995c";
+  version = "0.90.1.1";
+  sha256 = "1ma6vjf87b493vz3sj6hxzifqixk62n6b5gvixpfzfig1lysddgp";
   buildDepends = [ filepath parsec stm time wxc wxdirect ];
   extraLibraries = [ libX11 mesa wxGTK ];
-  preConfigure = "find . -type f -exec touch {} +";
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "wxHaskell core";
-- 
GitLab


From 29187bc16a8c0ed91e5fb92bbca9f9b3f9705483 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:51:07 +0100
Subject: [PATCH 2636/3789] haskell-wxdirect: update to version 0.90.1.1

---
 pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
index 0f379401b35..63bc82d6f67 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
@@ -2,12 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "wxdirect";
-  version = "0.90.1.0";
-  sha256 = "06r8z4css7md35rcbi805407dcabcrb1knif9f7445aphwzgadr0";
+  version = "0.90.1.1";
+  sha256 = "0ibhxl4n66w094jhca01z2vmibgz0nn7qddgxzqngvajzjvnha98";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath parsec strict time ];
-  preConfigure = "find . -type f -exec touch {} +";
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "helper tool for building wxHaskell";
-- 
GitLab


From 0312c15071c33b25b99dd678ef6868ad87012979 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:51:08 +0100
Subject: [PATCH 2637/3789] haskell-zlib-bindings: update to version 0.1.1.4

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

diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
index f69be8ae99e..231e3ac40f0 100644
--- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zlib-bindings";
-  version = "0.1.1.3";
-  sha256 = "18jhav7chbapakm9mwn7bn9lgvip7qaz61dw5gwv2nyalvm96qfr";
+  version = "0.1.1.4";
+  sha256 = "02ln0gv9kkq68s3n195q2mpqimxb6k4wqs731b1gg8wrbbkaxb6w";
   buildDepends = [ zlib ];
   testDepends = [ hspec QuickCheck zlib ];
   meta = {
-- 
GitLab


From b27ddc3d05a43b48546ba4a833aad4c7045e74f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:51:09 +0100
Subject: [PATCH 2638/3789] haskell-HaRe: update to version 0.7.2.0

---
 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 883be6a8d41..11c36f320f2 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.1.6";
-  sha256 = "1nj70f7ki6wxvjm5ra83xr2yymfsakb5kg2q1dl54hvxsd0wqcw7";
+  version = "0.7.2.0";
+  sha256 = "0i769mryjr3v9vh4zkdycpha8skq9xcdln3plrxx55bf42c4aqi9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From b692096f9dbcbe4ff8a09d229c14bfa77a3cb098 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:51:10 +0100
Subject: [PATCH 2639/3789] haskell-timeplot: update to version 1.0.24

---
 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 fc8c0e3f052..84444522d19 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.23";
-  sha256 = "0z87yzqv1bjclvyslzpclhrbfm4vcyz0q32jr4kbnfwjk3s8zyi2";
+  version = "1.0.24";
+  sha256 = "1k6xinnnc0723mbf0yvqn6qipjr3hcvy2qjv38sy7f5h0gp8lfhc";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From ae2cb475c99ed9fe4e6f8cb3d50c494a4876d613 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 09:51:12 +0100
Subject: [PATCH 2640/3789] haskell-cpphs: update to version 1.18.4

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

diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
index 8d03d8ee4cb..72a6571f3cc 100644
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cpphs";
-  version = "1.18.3";
-  sha256 = "0m2083ynjfxad4ykvpm6c7q1clrm7nsvbwv10abhyzqkpazyzzxy";
+  version = "1.18.4";
+  sha256 = "0rmcq66wn7lsc5g1wk6bbsr7jiw8h6bz5cbvdywnv7vmwsx8gh51";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ polyparse ];
-- 
GitLab


From a46352aad1731bdcfacb750e5b9c492b7fbd601c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 11:01:53 +0100
Subject: [PATCH 2641/3789] haskell-bmp: use version 1.2.5.2 on all platforms

---
 .../development/libraries/haskell/bmp/1.2.2.1.nix | 15 ---------------
 .../haskell/bmp/{1.2.5.2.nix => default.nix}      |  0
 pkgs/top-level/haskell-packages.nix               |  4 +---
 3 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/bmp/1.2.2.1.nix
 rename pkgs/development/libraries/haskell/bmp/{1.2.5.2.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix b/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix
deleted file mode 100644
index e018ac7a8d2..00000000000
--- a/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, binary }:
-
-cabal.mkDerivation (self: {
-  pname = "bmp";
-  version = "1.2.2.1";
-  sha256 = "0yxkkvpgavk9im9i9f6zpzc1n5nj2g4qsk4ck51aqz2fv6z1rhiy";
-  buildDepends = [ binary ];
-  meta = {
-    homepage = "http://code.ouroborus.net/bmp";
-    description = "Read and write uncompressed BMP image files";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bmp/1.2.5.2.nix b/pkgs/development/libraries/haskell/bmp/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/bmp/1.2.5.2.nix
rename to pkgs/development/libraries/haskell/bmp/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 533b12b3d98..54cc982c072 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -674,9 +674,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {};
 
-  bmp_1_2_2_1 = callPackage ../development/libraries/haskell/bmp/1.2.2.1.nix {};
-  bmp_1_2_5_2 = callPackage ../development/libraries/haskell/bmp/1.2.5.2.nix {};
-  bmp = self.bmp_1_2_2_1;       # the latest version needs a very recent 'binary' library
+  bmp = callPackage ../development/libraries/haskell/bmp {};
 
   Boolean = callPackage ../development/libraries/haskell/Boolean {};
 
-- 
GitLab


From 4a4439fd140bd2607a629a536acbd29ed2881a53 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 11:27:16 +0100
Subject: [PATCH 2642/3789] haskell-filestore: jailbreak to fix build with GHC
 7.8.1

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

diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
index 04321d34ffa..d0056dd9c35 100644
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ b/pkgs/development/libraries/haskell/filestore/default.nix
@@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
   sha256 = "1la30bimcjngcv5dyx1a9x8lr8c4zs0dp4kzh8y5mjf8snky1avf";
   buildDepends = [ Diff filepath parsec split time utf8String xml ];
   testDepends = [ Diff filepath HUnit mtl time ];
-  doCheck = false;
+  jailbreak = true;
   meta = {
     description = "Interface for versioning file stores";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From 088a652eb447be664adcc2d23e925b0e2d6163ec Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Mar 2014 11:31:31 +0100
Subject: [PATCH 2643/3789] haskell-ghc-events: jailbreak to fix build with GHC
 7.8.1

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

diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix
index 5b7decf9416..a13f56e4b53 100644
--- a/pkgs/development/libraries/haskell/ghc-events/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-events/default.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [ binary mtl ];
   testDepends = [ binary mtl ];
+  jailbreak = true;
   doCheck = false;
   meta = {
     description = "Library and tool for parsing .eventlog files from GHC";
-- 
GitLab


From e5725d35c11eb06b1de5d35e8f3532f68d0c0376 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 10:53:36 +0100
Subject: [PATCH 2644/3789] haskell-bmp: require a recent version of 'binary'

---
 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 54cc982c072..b8f4076c89a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -674,7 +674,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {};
 
-  bmp = callPackage ../development/libraries/haskell/bmp {};
+  bmp = callPackage ../development/libraries/haskell/bmp {
+    binary = self.binary_0_7_1_0;
+  };
 
   Boolean = callPackage ../development/libraries/haskell/Boolean {};
 
-- 
GitLab


From 93c973f45f3a7b1236d35b38d11744058fa29204 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 10:58:06 +0100
Subject: [PATCH 2645/3789] haskell-temporary: jailbreak to fix build with
 recent versions of 'exceptions'

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

diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix
index 5bb668e86a8..cf5d76f8cd6 100644
--- a/pkgs/development/libraries/haskell/temporary/default.nix
+++ b/pkgs/development/libraries/haskell/temporary/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.2.0.1";
   sha256 = "12z8qnqn1fg9ymaav5ds7gk067lmj0bv1lhhxcnvmvjcpk1l5b54";
   buildDepends = [ exceptions filepath transformers ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.github.com/batterseapower/temporary";
     description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
-- 
GitLab


From 61efc76a635867d95099e4e1abf1f47e9e9001c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 11:54:36 +0100
Subject: [PATCH 2646/3789] haskell-c2hs: jailbreak to fix build with recent
 versions of 'shelly'

Also, disable the test suite because of <https://github.com/haskell/c2hs/issues/67>.
---
 pkgs/development/libraries/haskell/c2hs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix
index f63d9f1771b..9313deaf840 100644
--- a/pkgs/development/libraries/haskell/c2hs/default.nix
+++ b/pkgs/development/libraries/haskell/c2hs/default.nix
@@ -12,6 +12,8 @@ cabal.mkDerivation (self: {
   testDepends = [
     filepath HUnit shelly testFramework testFrameworkHunit text
   ];
+  jailbreak = true;
+  doCheck = false;
   meta = {
     homepage = "https://github.com/haskell/c2hs";
     description = "C->Haskell FFI tool that gives some cross-language type safety";
-- 
GitLab


From 56adfd34fcf88cc0a903921dd983c453719c8084 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 27 Mar 2014 14:08:36 +0100
Subject: [PATCH 2647/3789] libvirt: Add support for macvtap and VEPA

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index d883f1da9ca..a8b20078cfe 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python
 , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng
-, dnsmasq
+, dnsmasq, libnl
 }:
 
 let version = "1.2.2"; in
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     pkgconfig libxml2 gnutls devicemapper perl python readline lvm2
     utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper
-    libcap_ng
+    libcap_ng libnl
   ];
 
   preConfigure = ''
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var"
     "--sysconfdir=/etc"
     "--with-init-script=redhat"
-    "--without-macvtap"
+    "--with-macvtap"
+    "--with-virtualport"
   ];
 
   installFlags = [
-- 
GitLab


From 3078cf3e75428984b3cf08a1a4db505d073e8d31 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 27 Mar 2014 14:27:12 +0100
Subject: [PATCH 2648/3789] libvirt: Add git repository to meta attributes

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index a8b20078cfe..972d287e10a 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://libvirt.org/;
+    repositories.git = git://libvirt.org/libvirt.git;
     description = ''
       A toolkit to interact with the virtualization capabilities of recent
       versions of Linux (and other OSes)
-- 
GitLab


From a541350cb3c3bafb583b7f8ec018617da03623d4 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 27 Mar 2014 14:27:50 +0100
Subject: [PATCH 2649/3789] libvirt: Assume maintainership

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 972d287e10a..587fbfe48d3 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -57,6 +57,7 @@ stdenv.mkDerivation rec {
       versions of Linux (and other OSes)
     '';
     license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ wizeman ];
     platforms = platforms.linux;
   };
 }
-- 
GitLab


From b13a33550a344ec4a35e0494781d3b48156cc88c Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Thu, 27 Mar 2014 17:47:18 +0100
Subject: [PATCH 2650/3789] silver-searcher: update to 0.21.0

---
 pkgs/tools/text/silver-searcher/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index d5d022c8063..fa780b11f68 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchgit, autoreconfHook, pkgconfig, pcre, zlib, lzma}:
 
-let release = "0.19.2"; in
+let release = "0.21.0"; in
 stdenv.mkDerivation {
   name = "silver-searcher-${release}";
 
   src = fetchgit {
     url = "https://github.com/ggreer/the_silver_searcher.git";
     rev = "refs/tags/${release}";
-    sha256 = "b6993e077f650eb0976cbc924640665fa9b2499a899ecba5a6cad5cf9addfdff";
+    sha256 = "bd49c6cadabeaf7bde130e5d2d0083367ae2d19cfedb40e45f5bb1ff9f4a3e51";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
-- 
GitLab


From 151ac5ab9e4fd445b23fcfb6be7681129d544f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 27 Mar 2014 20:53:50 +0100
Subject: [PATCH 2651/3789] gtk+3 core stack: update to 3.12

---
 pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix  |  6 +++---
 pkgs/desktops/gnome-3/core/at-spi2-core/default.nix |  6 +++---
 pkgs/development/libraries/atk/default.nix          |  4 ++--
 pkgs/development/libraries/glib/default.nix         |  6 +++---
 .../libraries/gobject-introspection/default.nix     |  4 ++--
 pkgs/development/libraries/gtk+/3.x.nix             | 13 ++++++++-----
 6 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix
index 742036f16b3..fc0c4f2a6bc 100644
--- a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix
+++ b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix
@@ -2,14 +2,14 @@
 , intltool, dbus_glib, at_spi2_core, libSM }:
 
 stdenv.mkDerivation rec {
-  versionMajor = "2.10";
-  versionMinor = "2";
+  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 = "1xfh89lydl8d18dhnzwvzcsyyybr5q3ik001qgq520l3qh8shj73";
+    sha256 = "0crn3k6qvn6fjvgm68dj5ska1ppfgmdkaia2db1jp0b9y74nfm1v";
   };
 
   buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi
diff --git a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix
index ab30c81efc2..d60a0ff7480 100644
--- a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix
+++ b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix
@@ -2,14 +2,14 @@
 , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
 
 stdenv.mkDerivation (rec {
-  versionMajor = "2.10";
-  versionMinor = "2";
+  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 = "1qfxlbmbaihgmqgkxnywnji9wkbvn8pvbv20x5glv3jc9zw5innk";
+    sha256 = "12gvsgdaxnxskndlhlmdkc50cfqgmzfc4n8la9944fz5k3fhwmfv";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index a93aaa5a43f..2dca2a8e1ec 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }:
 
 let
-  ver_maj = "2.10";
+  ver_maj = "2.12";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz";
-    sha256 = "1c2hbg66wfvibsz2ia0ri48yr62751fn950i97c53j3b0fjifsb3";
+    sha256 = "13zijfcmx7sda83qkryzsmr9hw0r3b73xkagq9cmm733fhcl7a28";
   };
 
   buildInputs = libintlOrEmpty;
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 6fa77b233c6..af4b152dcce 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -35,8 +35,8 @@ let
     ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true
   '';
 
-  ver_maj = "2.38";
-  ver_min = "2";
+  ver_maj = "2.40";
+  ver_min = "0";
 in
 with { inherit (stdenv.lib) optional optionals optionalString; };
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
-    sha256 = "0d2px8m77603s5pm3md4bcm5d0ksbcsb6ik1w52hjslnq1a9hsh5";
+    sha256 = "1d98mbqjmc34s8095lkw1j1bwvnnkw9581yfvjaikjvfjsaz29qd";
   };
 
   buildInputs = [ libelf ]
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index da746969ed7..7686fb30838 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -5,7 +5,7 @@
 # In that case its about 6MB which could be separated
 
 let
-  ver_maj = "1.38";
+  ver_maj = "1.40";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
-    sha256 = "0wvxyvgajmms2bb6k3pf1rdpnd79xdxamykzvxzmcyn1ag9yax9m";
+    sha256 = "162flbzwzz0b8axab2gimc4dglpaw88fh1d177zfg0whczlpbsln";
   };
 
   buildInputs = [ flex bison glib pkgconfig python ]
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 9f89fc074f1..c8e4299e1a7 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -9,8 +9,8 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 let
-  ver_maj = "3.10";
-  ver_min = "7";
+  ver_maj = "3.12";
+  ver_min = "0";
   version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
@@ -18,11 +18,9 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "09wlsim4immrws0fyvpk03sspsljcsgybrwp73scycah70axxsdp";
+    sha256 = "0jvf9dawq82x1xsr2f56fw3y7yfwapgdj16gr4d5m6q2shf78sgb";
   };
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
 
   buildInputs = [ libxkbcommon ];
@@ -33,6 +31,11 @@ stdenv.mkDerivation rec {
     ++ optional xineramaSupport libXinerama
     ++ optional cupsSupport cups;
 
+  # demos fail to install, no idea where's the problem
+  preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in";
+
+  enableParallelBuilding = true;
+
   postInstall = "rm -rf $out/share/gtk-doc";
 
   meta = {
-- 
GitLab


From abda7ec36f53f529975df63a9c53b5b4f9994a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 26 Mar 2014 21:26:04 +0100
Subject: [PATCH 2652/3789] liferea: maintenance update

---
 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 c0892740dbd..83eeb18d126 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.7";
+    version = "1.10.8";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "17kvg44brdz99firr5h5qx8icvadlr7p1cz3xr3437sf5rhj25wh";
+    sha256 = "1d3icma90mj0nai20pfhxp4k4l33iwkkkcddb9vg5hi4yq4wpmwx";
   };
 
   buildInputs = with gst_all_1; [
-- 
GitLab


From 9bde84a75d1ca5d60b1c21abab405206e0e5742c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 27 Mar 2014 21:32:54 +0100
Subject: [PATCH 2653/3789] fix evaluation since 34301c8

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

diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index 05972bb2881..6db80f39e2c 100755
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     description = "Curses-based interface for MPD (music player daemon)";
     homepage    = http://www.musicpd.org/clients/ncmpc/;
     license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ 1126 ];
+    maintainers = with maintainers; [ _1126 ];
     platforms   = platforms.all;
   };
 }
-- 
GitLab


From 9ddc57cbea569f75e81ef41d6ce3c86128a81bc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 27 Mar 2014 22:14:51 +0100
Subject: [PATCH 2654/3789] xorg.xf86-video-vmware: minor update

Patch no longer needed to build.
---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/overrides.nix     | 4 ----
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 2a04ab54b32..5ce58e67c40 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1750,11 +1750,11 @@ let
   })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
 
   xf86videovmware = (stdenv.mkDerivation ((if overrides ? xf86videovmware then overrides.xf86videovmware else x: x) {
-    name = "xf86-video-vmware-13.0.1";
+    name = "xf86-video-vmware-13.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-vmware-13.0.1.tar.bz2;
-      sha256 = "0ggyz3yl1ly0p9c9lva5z3892vm033z49py3svd2wh92bi0xlbc0";
+      url = mirror://xorg/individual/driver/xf86-video-vmware-13.0.2.tar.bz2;
+      sha256 = "0m1wfsv34s4pyr5ry87yyjb2p6vmy6vyypdz5jx0sqnkx8n3vfn8";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 043bdc99cb7..3f591cb7c0e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -186,10 +186,6 @@ in
 
   xf86videovmware = attrs: attrs // {
     buildInputs =  attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker
-    patches = [( args.fetchurl {
-      url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xatracker-v2-fixes.patch?h=packages/xf86-video-vmware;
-      sha256 = "1k5a3zf2bzmw84di31b8zfy51n2mqrr01xjfy5nw7395qv5r5cvs";
-    })];
   };
 
   xdriinfo = attrs: attrs // {
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 4d035bdf775..89ea4b95630 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -153,7 +153,7 @@ mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-trident-1.3.6.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-vesa-2.3.3.tar.bz2
-mirror://xorg/individual/driver/xf86-video-vmware-13.0.1.tar.bz2
+mirror://xorg/individual/driver/xf86-video-vmware-13.0.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2
-- 
GitLab


From 5554d9c688c888162a10cb25f9daf8a767a06200 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 26 Mar 2014 18:24:20 -0500
Subject: [PATCH 2655/3789] Add zotero 4.0.19 (close #2043)

@vcunat simplied the expression a little.
---
 pkgs/applications/office/zotero/default.nix | 41 +++++++++++++++++++++
 pkgs/applications/office/zotero/zotero.sh   |  3 ++
 pkgs/top-level/all-packages.nix             |  2 +
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/applications/office/zotero/default.nix
 create mode 100644 pkgs/applications/office/zotero/zotero.sh

diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
new file mode 100644
index 00000000000..4afd250a549
--- /dev/null
+++ b/pkgs/applications/office/zotero/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, bash, xulrunner }:
+
+assert (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux");
+
+let
+  version = "4.0.19";
+  arch = if stdenv.system == "x86_64-linux"
+           then "linux-x86_64"
+           else "linux-i686";
+in
+stdenv.mkDerivation {
+  name = "zotero-${version}";
+
+  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";
+  };
+
+  # Strip the bundled xulrunner
+  prePatch = ''rm -fr run-zotero.sh zotero xulrunner/'';
+
+  inherit bash xulrunner;
+  installPhase = ''
+    ensureDir "$out/libexec/zotero"
+    cp -vR * "$out/libexec/zotero/"
+
+    ensureDir "$out/bin"
+    substituteAll "${./zotero.sh}" "$out/bin/zotero"
+    chmod +x "$out/bin/zotero"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.zotero.org";
+    description = "Collect, organize, cite, and share your research sources";
+    license = licenses.agpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ttuegel ];
+  };
+}
diff --git a/pkgs/applications/office/zotero/zotero.sh b/pkgs/applications/office/zotero/zotero.sh
new file mode 100644
index 00000000000..c80d5e8189e
--- /dev/null
+++ b/pkgs/applications/office/zotero/zotero.sh
@@ -0,0 +1,3 @@
+#!@bash@/bin/bash
+
+exec "@xulrunner@/bin/xulrunner" "@out@/libexec/zotero/application.ini" "${@}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2cf120490b..12af77d2899 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9453,6 +9453,8 @@ let
 
   zgrviewer = callPackage ../applications/graphics/zgrviewer {};
 
+  zotero = callPackage ../applications/office/zotero { };
+
   zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { };
 
 
-- 
GitLab


From 835f9e5f19c93606778822e731cf9064018ea9b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 27 Mar 2014 22:47:29 +0100
Subject: [PATCH 2656/3789] libgsf: maintenance update to fix build with new
 glib

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

diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 0c79b20b564..dbcdabc8951 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -4,11 +4,11 @@
 with { inherit (stdenv.lib) optionals; };
 
 stdenv.mkDerivation rec {
-  name = "libgsf-1.14.28";
+  name = "libgsf-1.14.30";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
-    sha256 = "1r6bkwramb6qglmgbjmqvr5sahbfmql057ql97mx99fs3x7r357a";
+    sha256 = "0w2v1a9sxsymd1mcy4mwsz4r6za9iwq69rj86nb939p41d4c6j6b";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
-- 
GitLab


From aaebdb7b1e5d66ca6632e85c41827d33f749ca9d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:16 +0100
Subject: [PATCH 2657/3789] haskell-keter: update to version 1.2.1

---
 pkgs/development/tools/haskell/keter/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix
index b8cf2466b10..a56e64953c0 100644
--- a/pkgs/development/tools/haskell/keter/default.nix
+++ b/pkgs/development/tools/haskell/keter/default.nix
@@ -1,17 +1,16 @@
 { cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive
-, conduit, dataDefault, filepath, fsnotify, httpClient
+, conduit, dataDefault, filepath, fsnotify, hspec, httpClient
 , httpClientConduit, httpConduit, httpReverseProxy, httpTypes
 , liftedBase, mtl, network, networkConduit, networkConduitTls
 , random, regexTdfa, stm, systemFileio, systemFilepath, tar, text
-, time, transformers, unixCompat, unixProcessConduit
-, unorderedContainers, vector, wai, waiAppStatic, waiExtra, warp
-, warpTls, yaml, zlib
+, time, transformers, unixCompat, unorderedContainers, vector, wai
+, waiAppStatic, waiExtra, warp, warpTls, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "keter";
-  version = "1.2.0";
-  sha256 = "06iz01ci1mcxjqs7dknxgjlkl783sdf680b54schxxirg268cxh3";
+  version = "1.2.1";
+  sha256 = "160kw3c2h9i1rwhicm860ahanx9p9qskrnfxsa68484j0cmw1ga9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -20,9 +19,10 @@ cabal.mkDerivation (self: {
     httpConduit httpReverseProxy httpTypes liftedBase mtl network
     networkConduit networkConduitTls random regexTdfa stm systemFileio
     systemFilepath tar text time transformers unixCompat
-    unixProcessConduit unorderedContainers vector wai waiAppStatic
-    waiExtra warp warpTls yaml zlib
+    unorderedContainers vector wai waiAppStatic waiExtra warp warpTls
+    yaml zlib
   ];
+  testDepends = [ conduit hspec transformers ];
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Web application deployment manager, focusing on Haskell web frameworks";
-- 
GitLab


From d5a5c32775d70aebaa3b127ade4d1286ed4bbb7f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:20 +0100
Subject: [PATCH 2658/3789] haskell-attempt: update to version 0.4.0.1

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

diff --git a/pkgs/development/libraries/haskell/attempt/default.nix b/pkgs/development/libraries/haskell/attempt/default.nix
index c000002d499..2546748ee1e 100644
--- a/pkgs/development/libraries/haskell/attempt/default.nix
+++ b/pkgs/development/libraries/haskell/attempt/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "attempt";
-  version = "0.4.0";
-  sha256 = "0n7srd1gy1fa0q1qzizvdgmrc078jyx47115aw85vvl74vh9qyjy";
+  version = "0.4.0.1";
+  sha256 = "1gvq04ds62kk88r2210mxd1fggp6vf5p8j5hci9vqkkss1hy9rxh";
   buildDepends = [ failure ];
   meta = {
     homepage = "http://github.com/snoyberg/attempt/tree/master";
-    description = "Concrete data type for handling extensible exceptions as failures";
+    description = "Concrete data type for handling extensible exceptions as failures. (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
-- 
GitLab


From 135c27d70a3b5e7c955efc80f06a1d36c3d3d120 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:22 +0100
Subject: [PATCH 2659/3789] haskell-authenticate: update to version 1.3.2.7

---
 .../libraries/haskell/authenticate/default.nix       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix
index f0a1969ffba..a0cbd89f4d8 100644
--- a/pkgs/development/libraries/haskell/authenticate/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate/default.nix
@@ -1,16 +1,16 @@
 { cabal, aeson, attoparsec, blazeBuilder, caseInsensitive, conduit
-, httpConduit, httpTypes, network, tagsoup, text, transformers
-, unorderedContainers, xmlConduit
+, httpConduit, httpTypes, network, tagstreamConduit, text
+, transformers, unorderedContainers, xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "authenticate";
-  version = "1.3.2.6";
-  sha256 = "12sgi6q6kajjhh8mns9nklxj0kwn32xs5kzi7wmw50shx0smnjrz";
+  version = "1.3.2.7";
+  sha256 = "1b7bshbjg2141bywjiw69x1x6k30hx9gcqzjaqy7r1jfhnwcjz43";
   buildDepends = [
     aeson attoparsec blazeBuilder caseInsensitive conduit httpConduit
-    httpTypes network tagsoup text transformers unorderedContainers
-    xmlConduit
+    httpTypes network tagstreamConduit text transformers
+    unorderedContainers xmlConduit
   ];
   meta = {
     homepage = "http://github.com/yesodweb/authenticate";
-- 
GitLab


From 43de5f42c7ca5d4e34f2da73ccba53430ffc36d1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:24 +0100
Subject: [PATCH 2660/3789] haskell-conduit-combinators: update to version
 0.2.3.1

---
 .../haskell/conduit-combinators/default.nix      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
index 4799a0f63f5..5431f3dbe3a 100644
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -1,21 +1,21 @@
-{ cabal, base16Bytestring, base64Bytestring, basicPrelude
-, chunkedData, conduit, hspec, monoTraversable, mwcRandom
-, primitive, silently, systemFileio, systemFilepath, text
-, transformers, transformersBase, unixCompat, vector, void
+{ cabal, base16Bytestring, base64Bytestring, chunkedData, conduit
+, hspec, monoTraversable, mwcRandom, primitive, silently
+, systemFileio, systemFilepath, text, transformers
+, transformersBase, unixCompat, vector, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.2.3";
-  sha256 = "05sb1v6rciaj7cj6lxv6pf9ai0k3q6cvvflcb4a7q6ql9xr3j7pr";
+  version = "0.2.3.1";
+  sha256 = "078i0727nhy75y6bxav6sxr1gz9cq04nvskdnzwabljppd34dqg4";
   buildDepends = [
     base16Bytestring base64Bytestring chunkedData conduit
     monoTraversable mwcRandom primitive systemFileio systemFilepath
     text transformers transformersBase unixCompat vector void
   ];
   testDepends = [
-    base16Bytestring base64Bytestring basicPrelude chunkedData hspec
-    monoTraversable mwcRandom silently text transformers vector
+    base16Bytestring base64Bytestring chunkedData hspec monoTraversable
+    mwcRandom silently systemFilepath text transformers vector
   ];
   meta = {
     homepage = "https://github.com/fpco/conduit-combinators";
-- 
GitLab


From a330950b0091c0c68e96f71ad913260fb9d26120 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:26 +0100
Subject: [PATCH 2661/3789] haskell-cryptohash: update to version 0.11.4

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

diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index b888ce6153a..cefa8fbbdf8 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.11.2";
-  sha256 = "0az2p7lql1lchl85ca26b5sbvhqsv47daavyfqy84qmr3w3wyr28";
+  version = "0.11.4";
+  sha256 = "1laakkc1xzp2bmai0sfi86784wharqbyanlp1d1f1q6nj318by3y";
   buildDepends = [ byteable ];
   testDepends = [
     byteable HUnit QuickCheck testFramework testFrameworkHunit
-- 
GitLab


From 9541f82ccce713d848ed2570a7662778201dc95c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:27 +0100
Subject: [PATCH 2662/3789] haskell-failure: update to version 0.2.0.2

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

diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix
index bc2821e3e8c..9c0edece302 100644
--- a/pkgs/development/libraries/haskell/failure/default.nix
+++ b/pkgs/development/libraries/haskell/failure/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "failure";
-  version = "0.2.0.1";
-  sha256 = "05k62sb2xj4ddjwsbfldxkap7v5kmv04qzic4sszx5i3ykbf20fd";
+  version = "0.2.0.2";
+  sha256 = "0hvcsn7qx00613f23vvb3vjpjlcy0nfavsai9f6s3yvmyssk5kfv";
   buildDepends = [ transformers ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Failure";
-    description = "A simple type class for success/failure computations";
+    description = "A simple type class for success/failure computations. (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
-- 
GitLab


From b4742af957343baeb37aa59560ea85d4523b2461 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:29 +0100
Subject: [PATCH 2663/3789] haskell-hakyll: update to version 4.5.0.0

---
 pkgs/development/libraries/haskell/hakyll/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index e027111c6b6..cd051bd938c 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.4.3.2";
-  sha256 = "1n597q4pbdka7g06524j0zvjcjpv7fgf6mga1a0kfr012sf9cqz9";
+  version = "4.5.0.0";
+  sha256 = "19rmib508zcaada7xj0p84dbkjwzfiaxaszpmc763wlpx15azw8z";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -26,12 +26,6 @@ cabal.mkDerivation (self: {
     testFrameworkHunit testFrameworkQuickcheck2 text time
   ];
   doCheck = false;
-  patchPhase = ''
-    sed -i -e 's|blaze-markup.*,|blaze-markup,|' \
-      -e 's|blaze-html.*,|blaze-html,|' \
-      -e 's|pandoc-citeproc.*,|pandoc-citeproc,|' \
-      -e 's|regex-tdfa.*,|regex-tdfa,|' hakyll.cabal
-  '';
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";
-- 
GitLab


From 29bb48bc28f44e7b241bb08cb65b8bbd4e067436 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:31 +0100
Subject: [PATCH 2664/3789] haskell-html-conduit: update to version 1.1.0.3

---
 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 bff7c352175..4f02c8a6fa2 100644
--- a/pkgs/development/libraries/haskell/html-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/html-conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "html-conduit";
-  version = "1.1.0.2";
-  sha256 = "12a5hb9sf4sd11sjhwwp84k8whkxs7hqfyni2hi247fii2ldkfax";
+  version = "1.1.0.3";
+  sha256 = "08f8dqndd2smjf5zycpsjsl50z9rqgi4ynlks4paw1xqlin0n1cl";
   buildDepends = [
     conduit resourcet systemFilepath tagstreamConduit text transformers
     xmlConduit xmlTypes
-- 
GitLab


From ef9d804a320bd039b1abccf3b45e030435995371 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:33 +0100
Subject: [PATCH 2665/3789] haskell-http-client: update to version 0.2.2.4

---
 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 87a48bbdd39..7ebdd3cee6a 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.2.2.3";
-  sha256 = "0li4mfw5lm0y0m3l3r7cbmhbch7ap9n2067jqw1l0qjm8s74nqkh";
+  version = "0.2.2.4";
+  sha256 = "19dymsi39m2m7i99xsmcl9gigqm6jhynnv0w8w230mq8vraq1mcw";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie
     dataDefaultClass deepseq failure httpTypes network publicsuffixlist
-- 
GitLab


From bc1bfe32e35dab8fa0c365e6f43e9c8c823e33f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:35 +0100
Subject: [PATCH 2666/3789] haskell-http-reverse-proxy: update to version
 0.3.1.2

---
 .../haskell/http-reverse-proxy/default.nix     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index 1e1b0117a2f..25608789d74 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -1,17 +1,17 @@
-{ cabal, async, basicPrelude, blazeBuilder, caseInsensitive
-, conduit, dataDefaultClass, hspec, httpClient, httpConduit
-, httpTypes, liftedBase, monadControl, network, networkConduit
-, resourcet, text, transformers, wai, waiLogger, warp, word8
+{ cabal, async, blazeBuilder, caseInsensitive, conduit
+, dataDefaultClass, hspec, httpClient, httpConduit, httpTypes
+, liftedBase, monadControl, network, networkConduit, resourcet
+, text, transformers, wai, waiLogger, warp, word8
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.3.1.1";
-  sha256 = "02aksdkwhdxzc4kk7j3npbiqpm9px3yva0375mk1b1f2g552g5jj";
+  version = "0.3.1.2";
+  sha256 = "0c7xg5l5di87dwn0pq5ymh1bj5zzj7hmj6cvwp3b1q6cb3fcwfnp";
   buildDepends = [
-    async basicPrelude blazeBuilder caseInsensitive conduit
-    dataDefaultClass httpClient httpTypes liftedBase monadControl
-    network networkConduit resourcet text wai waiLogger word8
+    async blazeBuilder caseInsensitive conduit dataDefaultClass
+    httpClient httpTypes liftedBase monadControl network networkConduit
+    resourcet text transformers wai waiLogger word8
   ];
   testDepends = [
     blazeBuilder conduit hspec httpConduit httpTypes liftedBase network
-- 
GitLab


From f0e51dd0d6809a527e5e690c1444dde05619d83b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:36 +0100
Subject: [PATCH 2667/3789] haskell-language-c-quote: update to version 0.7.7

---
 .../libraries/haskell/language-c-quote/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix
index 94eb72633de..3f4ec1e54d8 100644
--- a/pkgs/development/libraries/haskell/language-c-quote/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-c-quote";
-  version = "0.7.6";
-  sha256 = "15sfasbrr9wzqkwv9xg9nvb3gnn4drkll3b3cappiyzkmawp2hkr";
+  version = "0.7.7";
+  sha256 = "0rj508hfv9xf30rfjhalz3yfb15vp4r4acdj8aahwfnbls2qb37v";
   buildDepends = [
     exceptionMtl exceptionTransformers filepath haskellSrcMeta
     mainlandPretty mtl srcloc syb symbol
-- 
GitLab


From 3d00b619ca1cb179159e7eef577f42df77818031 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:38 +0100
Subject: [PATCH 2668/3789] haskell-linear: update to version 1.10

---
 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 f0dac623a98..1abc63c8c4b 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.9.1";
-  sha256 = "17jvqy2nbcra36fzkwbjkfwg6mjw804zd1i50mhbqwg9j7z4s5sb";
+  version = "1.10";
+  sha256 = "1wl0hb58znc3n5f5jv0wm6g21p080zldlq954n0lm8sjwmv39cdx";
   buildDepends = [
     adjunctions binary distributive hashable lens reflection
     semigroupoids semigroups tagged transformers unorderedContainers
-- 
GitLab


From 14bb8fae6dba6409ffcc2b31fffc20db2e03e73c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:40 +0100
Subject: [PATCH 2669/3789] haskell-profunctors: update to version 4.0.3

---
 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 41e4fc6eeb0..300d2e66f89 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.2";
-  sha256 = "1p98pczrxvhk1imwics25b5ac59qzixblns83a1k9zszvz42kmix";
+  version = "4.0.3";
+  sha256 = "0rdr75nqzxaly47vnpbmska608k457dgpzi5wfcqhmw996kh5inh";
   buildDepends = [ comonad semigroupoids tagged transformers ];
   meta = {
     homepage = "http://github.com/ekmett/profunctors/";
-- 
GitLab


From 8470a695eda8b506e71ad494117b1b6270708d82 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:42 +0100
Subject: [PATCH 2670/3789] haskell-project-template: update to version 0.1.4

---
 .../haskell/project-template/default.nix        | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix
index f4c9214b0b6..d5cd0da22a3 100644
--- a/pkgs/development/libraries/haskell/project-template/default.nix
+++ b/pkgs/development/libraries/haskell/project-template/default.nix
@@ -1,19 +1,18 @@
-{ cabal, base64Bytestring, base64Conduit, basicPrelude, conduit
-, hspec, mtl, QuickCheck, resourcet, systemFileio, systemFilepath
-, text, transformers
+{ cabal, base64Bytestring, conduit, hspec, mtl, QuickCheck
+, resourcet, systemFileio, systemFilepath, text, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "project-template";
-  version = "0.1.3.2";
-  sha256 = "076xq5hwi7bfn3cmx8zd19vnj6lj2p7qm2waam94qqw2m466xq50";
+  version = "0.1.4";
+  sha256 = "1fmpb7jrn7mry8wq5jyxhkwyr61fknhi7p8mmqs7xn8lxwbj5904";
   buildDepends = [
-    base64Bytestring base64Conduit basicPrelude conduit mtl resourcet
-    systemFileio systemFilepath text transformers
+    base64Bytestring conduit mtl resourcet systemFileio systemFilepath
+    text transformers
   ];
   testDepends = [
-    base64Bytestring basicPrelude conduit hspec QuickCheck
-    systemFilepath text transformers
+    base64Bytestring conduit hspec QuickCheck systemFilepath text
+    transformers
   ];
   meta = {
     homepage = "https://github.com/fpco/haskell-ide";
-- 
GitLab


From 94fe963dd329698c84c18ec2f2f1ff73937e296a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:44 +0100
Subject: [PATCH 2671/3789] haskell-recaptcha: update to version 0.1.0.2

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

diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix
index 0d7b9d709c6..2d3fb430fe2 100644
--- a/pkgs/development/libraries/haskell/recaptcha/default.nix
+++ b/pkgs/development/libraries/haskell/recaptcha/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "recaptcha";
-  version = "0.1.0.1";
-  sha256 = "0mk2vdvm5jz8jh8xc4alsly8c9msfis0drbgg89rck1y387z2njz";
+  version = "0.1.0.2";
+  sha256 = "04sdfp6bmcd3qkz1iqxijfiqa4qf78m5d16r9gjv90ckqf68kbih";
   buildDepends = [ HTTP network xhtml ];
   meta = {
     homepage = "http://github.com/jgm/recaptcha/tree/master";
-- 
GitLab


From a7c80c11e5cfee6fc847fa7b228e11b4a0188060 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:45 +0100
Subject: [PATCH 2672/3789] haskell-smtps-gmail: update to version 1.1.0

---
 .../libraries/haskell/smtps-gmail/default.nix  | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/haskell/smtps-gmail/default.nix b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
index d41a37d1e5b..0dfb2ab5665 100644
--- a/pkgs/development/libraries/haskell/smtps-gmail/default.nix
+++ b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
@@ -1,23 +1,19 @@
-{ cabal, base64String, cprngAes, network, tlsExtra, utf8String
+{ cabal, base64Bytestring, cprngAes, dataDefault, filepath
+, mimeMail, network, stringsearch, text, tls
 }:
 
 cabal.mkDerivation (self: {
   pname = "smtps-gmail";
-  version = "1.0.0";
-  sha256 = "0kv5m8rg5z1iic10av3bscdygnph1iab4b22sq3hmx6a93abqkc2";
-  isLibrary = true;
-  isExecutable = true;
+  version = "1.1.0";
+  sha256 = "0zr2ndpwfnb9pkv69vx94p0vpghl0khd0wbmccjpk6hlrp6fsj66";
   buildDepends = [
-    base64String cprngAes network tlsExtra utf8String
+    base64Bytestring cprngAes dataDefault filepath mimeMail network
+    stringsearch text tls
   ];
   meta = {
     homepage = "https://github.com/enzoh/smtps-gmail";
-    description = "Gmail API";
+    description = "Gmail SMTP Client";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-  # adding a Setup script as it's needed by nix
-  preConfigure = ''
-    printf "import Distribution.Simple\nmain = defaultMain\n" > Setup.hs
-  '';
 })
-- 
GitLab


From c5d967f781ff6a260b281bfa00ea235eceae3e93 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:47 +0100
Subject: [PATCH 2673/3789] haskell-text-stream-decode: update to version
 0.1.0.5

---
 .../libraries/haskell/text-stream-decode/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/text-stream-decode/default.nix b/pkgs/development/libraries/haskell/text-stream-decode/default.nix
index eb55d68666c..0530804d84b 100644
--- a/pkgs/development/libraries/haskell/text-stream-decode/default.nix
+++ b/pkgs/development/libraries/haskell/text-stream-decode/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "text-stream-decode";
-  version = "0.1.0.4";
-  sha256 = "041winxbqkz1y6vx6sgbhl925n5qxii2q7ijcwa85sj4dkrqpafr";
+  version = "0.1.0.5";
+  sha256 = "1s2lncs5k8rswg1bpf4vz5p1maj46bsgf7ar4lzcla9bf3f4bppy";
   buildDepends = [ text ];
   testDepends = [ deepseq hspec text ];
   meta = {
     homepage = "http://github.com/fpco/text-stream-decode";
-    description = "Streaming decoding functions for UTF encodings";
+    description = "Streaming decoding functions for UTF encodings. (deprecated)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 0af0e1f5d68c036fddde681b79bbacf21262d170 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:49 +0100
Subject: [PATCH 2674/3789] haskell-unbounded-delays: update to version 0.1.0.7

---
 .../libraries/haskell/unbounded-delays/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/unbounded-delays/default.nix b/pkgs/development/libraries/haskell/unbounded-delays/default.nix
index 69f6ac60ac3..78484a2a75a 100644
--- a/pkgs/development/libraries/haskell/unbounded-delays/default.nix
+++ b/pkgs/development/libraries/haskell/unbounded-delays/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unbounded-delays";
-  version = "0.1.0.6";
-  sha256 = "0yykb9jqxhvbngvp2gbzb0ch2cmzdxx8km62dclyvr3xbv6hk1h7";
+  version = "0.1.0.7";
+  sha256 = "1nv50i90hgvcl51w7s8x1c1ylpzyrbvs2mz5zfn68lr1ix2lk879";
   meta = {
     homepage = "https://github.com/basvandijk/unbounded-delays";
     description = "Unbounded thread delays and timeouts";
-- 
GitLab


From 487a6f0971b5e6a4bf04eca253b2e853fe973fa0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:51 +0100
Subject: [PATCH 2675/3789] haskell-wai-app-static: update to version 2.0.1

---
 .../haskell/wai-app-static/default.nix         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index fec4d410c22..45dd5562a28 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -1,21 +1,21 @@
 { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup
-, byteable, cmdargs, cryptohash, cryptohashConduit, fileEmbed
-, filepath, hspec, httpDate, httpTypes, mimeTypes, network
-, systemFileio, systemFilepath, text, time, transformers
-, unixCompat, unorderedContainers, wai, waiExtra, waiTest, warp
-, zlib
+, byteable, cryptohash, cryptohashConduit, fileEmbed, filepath
+, hspec, httpDate, httpTypes, mimeTypes, network
+, optparseApplicative, systemFileio, systemFilepath, text, time
+, transformers, unixCompat, unorderedContainers, wai, waiExtra
+, waiTest, warp, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "2.0.0.5";
-  sha256 = "0f18wwk0xrzbn9d6krjdcm71cyxl1pzzi5xqwzzc9xnq595m75wa";
+  version = "2.0.1";
+  sha256 = "1mygyp70rmhnkc0s8626cxrkvcbil92v4gnx70iz26gfb5q9lc7d";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml blazeMarkup byteable
-    cmdargs cryptohash cryptohashConduit fileEmbed filepath httpDate
-    httpTypes mimeTypes systemFileio systemFilepath text time
+    cryptohash cryptohashConduit fileEmbed filepath httpDate httpTypes
+    mimeTypes optparseApplicative systemFileio systemFilepath text time
     transformers unixCompat unorderedContainers wai waiExtra warp zlib
   ];
   testDepends = [
-- 
GitLab


From cb55852ff216ef499dbbd2fb2eb299581a2d2c33 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:53 +0100
Subject: [PATCH 2676/3789] haskell-xml-conduit: update to version 1.2.0

---
 .../libraries/haskell/xml-conduit/default.nix        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 28a5beb966f..60bc750823b 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -1,17 +1,17 @@
 { cabal, attoparsec, attoparsecConduit, blazeBuilder
 , blazeBuilderConduit, blazeHtml, blazeMarkup, conduit, dataDefault
-, deepseq, failure, hspec, HUnit, monadControl, resourcet
-, systemFilepath, text, transformers, xmlTypes
+, deepseq, hspec, HUnit, monadControl, resourcet, systemFilepath
+, text, transformers, xmlTypes
 }:
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "1.1.0.9";
-  sha256 = "01sx8yblknv0dyi7z6k6icfvwjvl4dyhrka1d6y1793xcp1mkxs6";
+  version = "1.2.0";
+  sha256 = "0sh4f645ysj2dzd58a1b1y2pqqcg6khav27lgy2j3fqgm6mryxhj";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
-    blazeHtml blazeMarkup conduit dataDefault deepseq failure
-    monadControl resourcet systemFilepath text transformers xmlTypes
+    blazeHtml blazeMarkup conduit dataDefault deepseq monadControl
+    resourcet systemFilepath text transformers xmlTypes
   ];
   testDepends = [
     blazeMarkup conduit hspec HUnit text transformers xmlTypes
-- 
GitLab


From 3de19454812fe024733ad90d338280b6d61cafd1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:55 +0100
Subject: [PATCH 2677/3789] haskell-xml-hamlet: update to version 0.4.0.7

---
 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 885620f0648..346891cc68d 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.6";
-  sha256 = "05izdqpxw0gq2wgs4ckr55xvzfk5ay7xpbcvihj66myiah5azqwy";
+  version = "0.4.0.7";
+  sha256 = "05rygs3ja3zc87az151mkbm4llrnshzrqf1mfpbwx4ysfgjkvq7b";
   buildDepends = [ parsec shakespeare text xmlConduit ];
   testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ];
   meta = {
-- 
GitLab


From a69ae620dc89b70e949a83043538bb5114a8a8f6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:56 +0100
Subject: [PATCH 2678/3789] haskell-yesod-auth: update to version 1.3.0.1

---
 .../libraries/haskell/yesod-auth/default.nix  | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 6857b6f02d7..71c5dff4dad 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -1,21 +1,22 @@
-{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, dataDefault
-, emailValidate, fileEmbed, hamlet, httpConduit, httpTypes
-, liftedBase, mimeMail, network, persistent, persistentTemplate
-, pureMD5, pwstoreFast, random, resourcet, safe, SHA
-, shakespeareCss, shakespeareJs, text, time, transformers
+{ cabal, aeson, authenticate, base16Bytestring, blazeHtml
+, blazeMarkup, cryptohash, dataDefault, emailValidate, fileEmbed
+, hamlet, httpConduit, httpTypes, liftedBase, mimeMail, network
+, persistent, persistentTemplate, pwstoreFast, random, resourcet
+, safe, shakespeareCss, shakespeareJs, text, time, transformers
 , unorderedContainers, wai, yesodCore, yesodForm, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.2.7";
-  sha256 = "0arszd7nk7rwm0xnjb2vqk2zf7lcwyw1ncxyxdmdxxvmh28lymwk";
+  version = "1.3.0.1";
+  sha256 = "0c9vrjn7ypwqidyz65icr0i8xb956gaga8jbqrwvc9x624brxhxy";
   buildDepends = [
-    aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
-    fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network
-    persistent persistentTemplate pureMD5 pwstoreFast random resourcet
-    safe SHA shakespeareCss shakespeareJs text time transformers
-    unorderedContainers wai yesodCore yesodForm yesodPersistent
+    aeson authenticate base16Bytestring blazeHtml blazeMarkup
+    cryptohash dataDefault emailValidate fileEmbed hamlet httpConduit
+    httpTypes liftedBase mimeMail network persistent persistentTemplate
+    pwstoreFast random resourcet safe shakespeareCss shakespeareJs text
+    time transformers unorderedContainers wai yesodCore yesodForm
+    yesodPersistent
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
-- 
GitLab


From cbca108acd2e35c65a9b93b33006b5cd44de9ce3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:17:58 +0100
Subject: [PATCH 2679/3789] haskell-yesod-core: update to version 1.2.9.1

---
 .../libraries/haskell/yesod-core/default.nix  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 2c3d378257f..55cd76784a0 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -1,23 +1,23 @@
 { cabal, aeson, async, attoparsecConduit, blazeBuilder, blazeHtml
 , blazeMarkup, caseInsensitive, cereal, clientsession, conduit
-, cookie, dataDefault, failure, fastLogger, hamlet, hspec
-, httpTypes, HUnit, liftedBase, monadControl, monadLogger, network
-, networkConduit, parsec, pathPieces, QuickCheck, random, resourcet
-, safe, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs
-, text, time, transformers, transformersBase, unixCompat, vector
-, wai, waiExtra, waiLogger, waiTest, warp, yesodRoutes
+, cookie, dataDefault, fastLogger, hamlet, hspec, httpTypes, HUnit
+, liftedBase, monadControl, monadLogger, network, networkConduit
+, parsec, pathPieces, QuickCheck, random, resourcet, safe
+, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs, text
+, time, transformers, transformersBase, unixCompat, vector, wai
+, waiExtra, waiLogger, waiTest, warp, yesodRoutes
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.9";
-  sha256 = "0qd9x2pca2nx7yqz9whlvb0rjgf1zf9vw19j6z0p149yddgrrcyq";
+  version = "1.2.9.1";
+  sha256 = "1j37jf82csdvjgb36034c0pqrmzd5r131hfqh43jp4m1wqsrib5k";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit cookie dataDefault
-    failure fastLogger hamlet httpTypes liftedBase monadControl
-    monadLogger parsec pathPieces random resourcet safe shakespeare
-    shakespeareCss shakespeareI18n shakespeareJs text time transformers
+    fastLogger hamlet httpTypes liftedBase monadControl monadLogger
+    parsec pathPieces random resourcet safe shakespeare shakespeareCss
+    shakespeareI18n shakespeareJs text time transformers
     transformersBase unixCompat vector wai waiExtra waiLogger warp
     yesodRoutes
   ];
-- 
GitLab


From 17d4b3da50a6b524aa5bd930180fb640301bc0e8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:18:00 +0100
Subject: [PATCH 2680/3789] haskell-yesod-static: update to version 1.2.2.3

---
 .../haskell/yesod-static/default.nix          | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index 7059e178bb6..a009cd60378 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -1,4 +1,4 @@
-{ cabal, base64Bytestring, byteable, conduit, cryptohash
+{ cabal, async, base64Bytestring, byteable, conduit, cryptohash
 , cryptohashConduit, dataDefault, fileEmbed, filepath, hjsmin
 , hspec, httpTypes, HUnit, mimeTypes, processConduit, resourcet
 , shakespeareCss, systemFileio, systemFilepath, text, transformers
@@ -8,21 +8,21 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "1.2.2.2";
-  sha256 = "156qqd2v3z7wv75jsfscs9cvbg1cl1riqcrhycrqcmapjprr2r12";
+  version = "1.2.2.3";
+  sha256 = "1lxnrd2972yj3a56kz9giz15h2g9qh12pgylpsxhpvscf3xajwml";
   buildDepends = [
-    base64Bytestring byteable conduit cryptohash cryptohashConduit
-    dataDefault fileEmbed filepath hjsmin httpTypes mimeTypes
-    processConduit resourcet shakespeareCss systemFileio systemFilepath
-    text transformers unixCompat unorderedContainers wai waiAppStatic
+    async base64Bytestring byteable conduit cryptohash
+    cryptohashConduit dataDefault fileEmbed filepath hjsmin httpTypes
+    mimeTypes resourcet shakespeareCss systemFileio systemFilepath text
+    transformers unixCompat unorderedContainers wai waiAppStatic
     yesodCore
   ];
   testDepends = [
-    base64Bytestring byteable conduit cryptohash cryptohashConduit
-    dataDefault fileEmbed filepath hjsmin hspec httpTypes HUnit
-    mimeTypes processConduit resourcet shakespeareCss systemFileio
-    systemFilepath text transformers unixCompat unorderedContainers wai
-    waiAppStatic waiTest yesodCore yesodTest
+    async base64Bytestring byteable conduit cryptohash
+    cryptohashConduit dataDefault fileEmbed filepath hjsmin hspec
+    httpTypes HUnit mimeTypes processConduit resourcet shakespeareCss
+    systemFileio systemFilepath text transformers unixCompat
+    unorderedContainers wai waiAppStatic waiTest yesodCore yesodTest
   ];
   doCheck = false;
   meta = {
-- 
GitLab


From 3c7eb54a80aa75e2a0e9fe201015a2be3a38ba40 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:18:02 +0100
Subject: [PATCH 2681/3789] haskell-yesod: update to version 1.2.5.1

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

diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 130e6eb9c33..21efff9f0e0 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.2.5";
-  sha256 = "0vcszhd8vasfpm754bz1vyarhlkffj3kbrfcq9q5gqmm389jfpk2";
+  version = "1.2.5.1";
+  sha256 = "1q4fnhvc5kl17z5hkbwa35rqp68nflmayszxj1v65gvplagv5cxn";
   buildDepends = [
     aeson blazeHtml blazeMarkup dataDefault fastLogger hamlet
     monadControl monadLogger networkConduit safe shakespeareCss
-- 
GitLab


From 4c8ea71d64d78cd93b8880c75da7b951688f8195 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 13:18:04 +0100
Subject: [PATCH 2682/3789] haskell-zlib-bindings: update to version 0.1.1.5

---
 .../development/libraries/haskell/zlib-bindings/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
index 231e3ac40f0..ba4751af2fe 100644
--- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "zlib-bindings";
-  version = "0.1.1.4";
-  sha256 = "02ln0gv9kkq68s3n195q2mpqimxb6k4wqs731b1gg8wrbbkaxb6w";
+  version = "0.1.1.5";
+  sha256 = "02ciywlz4wdlymgc3jsnicz9kzvymjw1www2163gxidnz4wb8fy8";
   buildDepends = [ zlib ];
   testDepends = [ hspec QuickCheck zlib ];
   meta = {
     homepage = "http://github.com/snoyberg/zlib-bindings";
-    description = "Low-level bindings to the zlib package";
+    description = "Low-level bindings to the zlib package. (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
-- 
GitLab


From feed777cf2a9aa3aadaf03b715b2c16aab88cd32 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 22:18:12 +0100
Subject: [PATCH 2683/3789] haskell-language-javascript: remove pre-generated
 lexer and parsers to fix the build with GHC 7.8.1

https://github.com/alanz/language-javascript/issues/26
---
 .../libraries/haskell/language-javascript/default.nix        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix
index d2cc342c477..94d693aa7c8 100644
--- a/pkgs/development/libraries/haskell/language-javascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-javascript/default.nix
@@ -1,5 +1,5 @@
 { cabal, blazeBuilder, Cabal, happy, HUnit, mtl, QuickCheck
-, testFramework, testFrameworkHunit, utf8Light, utf8String
+, testFramework, testFrameworkHunit, utf8Light, utf8String, alex
 }:
 
 cabal.mkDerivation (self: {
@@ -11,7 +11,8 @@ cabal.mkDerivation (self: {
     blazeBuilder Cabal HUnit mtl QuickCheck testFramework
     testFrameworkHunit utf8Light utf8String
   ];
-  buildTools = [ happy ];
+  buildTools = [ happy alex ];
+  preConfigure = "rm -rv dist; $SHELL runalex.sh";
   meta = {
     homepage = "http://github.com/alanz/language-javascript";
     description = "Parser for JavaScript";
-- 
GitLab


From 812ece044ad6fb7603115f2093a825056f6160b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Mar 2014 23:22:27 +0100
Subject: [PATCH 2684/3789] haskell-DAV: jailbreak to fix build with recent
 versions of xml-conduit

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

diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix
index 84ef157613e..1fc28b4e50b 100644
--- a/pkgs/development/libraries/haskell/DAV/default.nix
+++ b/pkgs/development/libraries/haskell/DAV/default.nix
@@ -15,6 +15,7 @@ cabal.mkDerivation (self: {
     lens liftedBase monadControl mtl network optparseApplicative
     transformers transformersBase xmlConduit xmlHamlet
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://floss.scru.org/hDAV";
     description = "RFC 4918 WebDAV support";
-- 
GitLab


From 1aabffdea22838f26a2a8fb72766ae99ffd7c31a Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Fri, 28 Mar 2014 11:12:20 +0800
Subject: [PATCH 2685/3789] mysql upgrade to 5.5.37

---
 pkgs/servers/sql/mysql/5.5.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index e8da8a48d65..782019f8ee0 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.5.34";
+  version = "5.5.37";
 
   src = fetchurl {
     url = "http://cdn.mysql.com/Downloads/MySQL-5.5/${name}.tar.gz";
-    md5 = "930970a42d51e48599deb7fe01778a4a";
+    md5 = "bf1d80c66d4822ec6036300399a33c03";
   };
 
   buildInputs = [ cmake bison ncurses openssl readline zlib ]
-- 
GitLab


From df2e5fc47a6c282a2347baedf4cceca71b7579af Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 28 Mar 2014 10:30:36 +0100
Subject: [PATCH 2686/3789] Updated dwb to latest revision

---
 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 c638e2b1adb..e14996d35f4 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-03-01";
+  name = "dwb-2014-03-27";
 
   src = fetchgit {
     url = "https://bitbucket.org/portix/dwb.git";
-    rev = "e8d4b8d7937b70279d006da4938dfe52fb85f9e8";
-    sha256 = "0m4730zqmnvb9k6xyydi221sh0wbanzbhg07xvwil3kn1d29340w";
+    rev = "4566d58575fbf687ebe9e3414996c45697b62787";
+    sha256 = "145sq2wv0s0n32cwpwgy59ff6ppcv80ialak7nnj1rpqicfqb72h";
   };
 
   buildInputs = [ pkgconfig makeWrapper libsoup webkit gtk3 gnutls json_c m4  ];
-- 
GitLab


From 10511b47125aafc37cf0e5310894cb702fabf089 Mon Sep 17 00:00:00 2001
From: Zhang Yichao <echaozh@gmail.com>
Date: Fri, 28 Mar 2014 18:39:26 +0800
Subject: [PATCH 2687/3789] add julia 0.2.1 release

---
 pkgs/development/compilers/julia/0.2.1.nix    | 140 ++++++++++++++++++
 .../julia/{default.nix => git-20131013.nix}   |   0
 pkgs/top-level/all-packages.nix               |   7 +-
 3 files changed, 146 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/julia/0.2.1.nix
 rename pkgs/development/compilers/julia/{default.nix => git-20131013.nix} (100%)

diff --git a/pkgs/development/compilers/julia/0.2.1.nix b/pkgs/development/compilers/julia/0.2.1.nix
new file mode 100644
index 00000000000..f7d20a1e01f
--- /dev/null
+++ b/pkgs/development/compilers/julia/0.2.1.nix
@@ -0,0 +1,140 @@
+{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
+ , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
+ , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack
+ , tcl, tk, xproto, libX11, git, mpfr
+ } :
+let
+  realGcc = stdenv.gcc.gcc;
+in
+stdenv.mkDerivation rec {
+  pname = "julia";
+  version = "0.2.1";
+  name = "${pname}-${version}";
+
+  grisu_ver = "1.1.1";
+  dsfmt_ver = "2.2";
+  openblas_ver = "v0.2.2";
+  lapack_ver = "3.4.1";
+  arpack_ver = "3.1.3";
+  clp_ver = "1.14.5";
+  lighttpd_ver = "1.4.29";
+  patchelf_ver = "0.6";
+  pcre_ver = "8.31";
+
+  grisu_src = fetchurl {
+    url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
+    sha256 = "e1cabb73fd69e74f145aea91100cde483aef8b79dc730fcda0a34466730d4d1d";
+  };
+  dsfmt_src = fetchurl {
+    url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
+    name = "dsfmt-${dsfmt_ver}.tar.gz";
+    sha256 = "bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899";
+  };
+  openblas_src = fetchurl {
+    url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}";
+    name = "openblas-${openblas_ver}.tar.gz";
+    sha256 = "19ffec70f9678f5c159feadc036ca47720681b782910fbaa95aa3867e7e86d8e";
+  };
+  arpack_src = fetchurl {
+    url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/607/get/";
+    name = "arpack-ng-${arpack_ver}.tar.gz";
+    sha256 = "039w7j3dr1xy35a3hp92zg2g92gmjq6xsv0g4awlb4cffy09nr2d";
+  };
+  lapack_src = fetchurl {
+    url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz";
+    name = "lapack-${lapack_ver}.tgz";
+    sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f";
+  };
+  clp_src = fetchurl {
+    url = "http://www.coin-or.org/download/source/Clp/Clp-${clp_ver}.tgz";
+    name = "clp-${clp_ver}.tar.gz";
+    sha256 = "e6cabe8b4319c17a9bbe6fe172194ab6cd1fe6e376f5e9969d3040636ea3a817";
+  };
+  lighttpd_src = fetchurl {
+    url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${lighttpd_ver}.tar.gz";
+    sha256 = "ff9f4de3901d03bb285634c5b149191223d17f1c269a16c863bac44238119c85";
+  };
+  patchelf_src = fetchurl {
+    url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2";
+    sha256 = "00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw";
+  };
+  pcre_src = fetchurl {
+    url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_ver}.tar.bz2";
+    sha256 = "0g4c0z4h30v8g8qg02zcbv7n67j5kz0ri9cfhgkpwg276ljs0y2p";
+  };
+
+  src = fetchgit {
+    url = "git://github.com/JuliaLang/julia.git";
+    rev = "e44b5939057d87c1e854077108a1a6d66203f4fa";
+    sha256 = "7ee0f267bc1ae286764ced3c0c695c335a6f8d67bd7b3ca7e4de259333c9426a";
+  };
+
+  buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
+    fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
+    openblas liblapack tcl tk xproto libX11 git mpfr
+    ];
+
+  configurePhase = ''
+    for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB MPFR;
+    do
+      makeFlags="$makeFlags USE_SYSTEM_$i=1 "
+    done
+
+    copy_kill_hash(){
+      cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
+    }
+
+    for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${patchelf_src}" "${pcre_src}" ; do
+      copy_kill_hash "$i" deps
+    done
+    copy_kill_hash "${dsfmt_src}" deps/random
+
+    ${if realGcc ==null then "" else 
+    ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''}
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC "
+
+    export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia"
+
+    export GLPK_PREFIX="${glpk}/include"
+
+    mkdir -p "$out/lib"
+    sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
+    sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile
+
+    export makeFlags="$makeFlags PREFIX=$out SHELL=${stdenv.shell}"
+
+    export dontPatchELF=1
+
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia"
+  '';
+
+  preBuild = ''
+    mkdir -p usr/lib
+    
+    echo "$out"
+    mkdir -p "$out/lib"
+    (
+    cd "$(mktemp -d)"
+    for i in "${suitesparse}"/lib/lib*.a; do
+      ar -x $i
+    done
+    gcc *.o --shared -o "$out/lib/libsuitesparse.so"
+    )
+    cp "$out/lib/libsuitesparse.so" usr/lib
+    for i in umfpack cholmod amd camd colamd spqr; do
+      ln -s libsuitesparse.so "$out"/lib/lib$i.so;
+      ln -s libsuitesparse.so "usr"/lib/lib$i.so;
+    done
+  '';
+
+  preInstall = ''
+  '';
+
+  meta = {
+    description = "High-level performance-oriented dynamical language for technical computing";
+    homepage = "http://julialang.org/";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/git-20131013.nix
similarity index 100%
rename from pkgs/development/compilers/julia/default.nix
rename to pkgs/development/compilers/julia/git-20131013.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12af77d2899..ab03b3d0973 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2846,10 +2846,15 @@ let
 
   jikes = callPackage ../development/compilers/jikes { };
 
-  julia = callPackage ../development/compilers/julia {
+  juliaGit = callPackage ../development/compilers/julia/git-20131013.nix {
     liblapack = liblapack.override {shared = true;};
     llvm = llvm_33;
   };
+  julia021 = callPackage ../development/compilers/julia/0.2.1.nix {
+    liblapack = liblapack.override {shared = true;};
+    llvm = llvm_33;
+  };
+  julia = julia021;
 
   lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) {
     inherit makeWrapper gtk glib pango atk gdk_pixbuf;
-- 
GitLab


From 0f2d7fa6f67399aa381cd65ac6dbb55f3c69e287 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Fri, 28 Mar 2014 14:51:41 +0400
Subject: [PATCH 2688/3789] shellinabox: unhardcode /bin/login, apply vt100 '-'
 fixup

---
 pkgs/servers/shellinabox/default.nix          |  7 ++++-
 .../shellinabox/shellinabox-minus.patch       | 28 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/shellinabox/shellinabox-minus.patch

diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix
index 49d7810a3c2..acff3a84a31 100644
--- a/pkgs/servers/shellinabox/default.nix
+++ b/pkgs/servers/shellinabox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pam, openssl, openssh }:
+{ stdenv, fetchurl, pam, openssl, openssh, shadow }:
 
 stdenv.mkDerivation {
   name = "shellinabox-2.14";
@@ -7,12 +7,17 @@ stdenv.mkDerivation {
     url = "https://shellinabox.googlecode.com/files/shellinabox-2.14.tar.gz";
     sha1 = "9e01f58c68cb53211b83d0f02e676e0d50deb781";
   };
+
   buildInputs = [pam openssl openssh];
 
+  patches = [ ./shellinabox-minus.patch ];
+
   # Disable GSSAPIAuthentication errors as well as correct hardcoded path. Take /usr/games's place. 
   preConfigure = ''
     substituteInPlace ./shellinabox/service.c --replace "-oGSSAPIAuthentication=no" ""
     substituteInPlace ./shellinabox/launcher.c --replace "/usr/games" "${openssh}/bin"
+    substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login"
+    substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login"
     '';
   meta = {
     homepage = https://code.google.com/p/shellinabox;
diff --git a/pkgs/servers/shellinabox/shellinabox-minus.patch b/pkgs/servers/shellinabox/shellinabox-minus.patch
new file mode 100644
index 00000000000..2e30bd9c8aa
--- /dev/null
+++ b/pkgs/servers/shellinabox/shellinabox-minus.patch
@@ -0,0 +1,28 @@
+diff -ru shellinabox-2.14/shellinabox/vt100.js shellinabox-2.14.new/shellinabox/vt100.js
+--- shellinabox-2.14/shellinabox/vt100.js	2012-04-21 21:30:44.000000000 +0400
++++ shellinabox-2.14.new/shellinabox/vt100.js	2014-03-27 16:33:31.012344164 +0400
+@@ -2676,6 +2676,7 @@
+       switch (key) {
+       case  33: /* Page Up      */ this.scrollBack();                   return;
+       case  34: /* Page Down    */ this.scrollFore();                   return;
++      case 173: /* _            */ ch = this.applyModifiers(95, event); break;
+       default:                                                          break;
+       }
+     }
+@@ -2738,6 +2739,7 @@
+       case 123: /* F12          */ ch = '\u001B[24~';                   break;
+       case 144: /* Num Lock     */                                      return;
+       case 145: /* Scroll Lock  */                                      return;
++      case 173: /* -            */ ch = this.applyModifiers(45, event); break;
+       case 186: /* ;            */ ch = this.applyModifiers(59, event); break;
+       case 187: /* =            */ ch = this.applyModifiers(61, event); break;
+       case 188: /* ,            */ ch = this.applyModifiers(44, event); break;
+@@ -2882,6 +2884,7 @@
+     case 109: /* - -> _ */ u = 45; s =  95; break;
+     case 111: /* / -> ? */ u = 47; s =  63; break;
+ 
++    case 173: /* - -> _ */ u = 45; s =  95; break;
+     case 186: /* ; -> : */ u = 59; s =  58; break;
+     case 187: /* = -> + */ u = 61; s =  43; break;
+     case 188: /* , -> < */ u = 44; s =  60; break;
+
-- 
GitLab


From 7c2d4be437c1d3d6d00a0c7a2281a8990fe32d0e Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 28 Mar 2014 15:17:17 +0100
Subject: [PATCH 2689/3789] deepmerge: Add nodejs package

---
 pkgs/top-level/node-packages-generated.nix | 3031 +++++++++++++-------
 pkgs/top-level/node-packages.json          |    1 +
 2 files changed, 1927 insertions(+), 1105 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 93e965235fc..12314c0ee16 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -21,21 +21,21 @@
     passthru.names = [ "Base64" ];
   };
   by-spec."CSSselect"."0.x" =
-    self.by-version."CSSselect"."0.5.0";
-  by-version."CSSselect"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-CSSselect-0.5.0";
+    self.by-version."CSSselect"."0.7.0";
+  by-version."CSSselect"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-CSSselect-0.7.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.5.0.tgz";
-        name = "CSSselect-0.5.0.tgz";
-        sha1 = "cd12727a4e3a85d1e862611b349c9e3c6b7e0452";
+        url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.7.0.tgz";
+        name = "CSSselect-0.7.0.tgz";
+        sha1 = "e4054c67b467465f3c9500c0da0aa7878c4babd2";
       })
     ];
     buildInputs =
       (self.nativeDeps."CSSselect" or []);
     deps = [
       self.by-version."CSSwhat"."0.4.5"
-      self.by-version."domutils"."1.4.0"
+      self.by-version."domutils"."1.4.1"
       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.0"
+      self.by-version."domutils"."1.4.1"
     ];
     peerDependencies = [
     ];
@@ -548,6 +548,82 @@
   };
   by-spec."argparse"."~ 0.1.11" =
     self.by-version."argparse"."0.1.15";
+  by-spec."array-filter"."~0.0.0" =
+    self.by-version."array-filter"."0.0.1";
+  by-version."array-filter"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-array-filter-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz";
+        name = "array-filter-0.0.1.tgz";
+        sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."array-filter" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "array-filter" ];
+  };
+  by-spec."array-map"."~0.0.0" =
+    self.by-version."array-map"."0.0.0";
+  by-version."array-map"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-array-map-0.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz";
+        name = "array-map-0.0.0.tgz";
+        sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."array-map" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "array-map" ];
+  };
+  by-spec."array-reduce"."~0.0.0" =
+    self.by-version."array-reduce"."0.0.0";
+  by-version."array-reduce"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-array-reduce-0.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz";
+        name = "array-reduce-0.0.0.tgz";
+        sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."array-reduce" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "array-reduce" ];
+  };
+  by-spec."asap"."^1.0.0" =
+    self.by-version."asap"."1.0.0";
+  by-version."asap"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-asap-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/asap/-/asap-1.0.0.tgz";
+        name = "asap-1.0.0.tgz";
+        sha1 = "b2a45da5fdfa20b0496fc3768cc27c12fa916a7d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."asap" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "asap" ];
+  };
   by-spec."ascii-json"."~0.2" =
     self.by-version."ascii-json"."0.2.0";
   by-version."ascii-json"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -769,6 +845,8 @@
   };
   by-spec."async"."0.2.x" =
     self.by-version."async"."0.2.10";
+  by-spec."async"."^0.2.10" =
+    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" =
@@ -959,6 +1037,25 @@
     ];
     passthru.names = [ "base64id" ];
   };
+  by-spec."basic-auth-connect"."1.0.0" =
+    self.by-version."basic-auth-connect"."1.0.0";
+  by-version."basic-auth-connect"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-basic-auth-connect-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz";
+        name = "basic-auth-connect-1.0.0.tgz";
+        sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."basic-auth-connect" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "basic-auth-connect" ];
+  };
   by-spec."batch"."0.5.0" =
     self.by-version."batch"."0.5.0";
   by-version."batch"."0.5.0" = lib.makeOverridable self.buildNodePackage {
@@ -1159,6 +1256,70 @@
     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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bower/-/bower-1.3.1.tgz";
+        name = "bower-1.3.1.tgz";
+        sha1 = "60d564e774be4e60631a159566830fce260e469a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bower" or []);
+    deps = [
+      self.by-version."abbrev"."1.0.4"
+      self.by-version."archy"."0.0.2"
+      self.by-version."bower-config"."0.5.0"
+      self.by-version."bower-endpoint-parser"."0.2.1"
+      self.by-version."bower-json"."0.4.0"
+      self.by-version."bower-logger"."0.2.2"
+      self.by-version."bower-registry-client"."0.1.6"
+      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."fstream"."0.1.25"
+      self.by-version."fstream-ignore"."0.0.7"
+      self.by-version."glob"."3.2.9"
+      self.by-version."graceful-fs"."2.0.3"
+      self.by-version."handlebars"."1.3.0"
+      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."nopt"."2.1.2"
+      self.by-version."lru-cache"."2.5.0"
+      self.by-version."open"."0.0.4"
+      self.by-version."osenv"."0.0.3"
+      self.by-version."promptly"."0.2.0"
+      self.by-version."q"."1.0.1"
+      self.by-version."request"."2.33.0"
+      self.by-version."request-progress"."0.3.1"
+      self.by-version."retry"."0.6.0"
+      self.by-version."rimraf"."2.2.6"
+      self.by-version."semver"."2.2.1"
+      self.by-version."stringify-object"."0.2.0"
+      self.by-version."tar"."0.1.19"
+      self.by-version."tmp"."0.0.23"
+      self.by-version."update-notifier"."0.1.8"
+      self.by-version."which"."1.0.5"
+      self.by-version."p-throttler"."0.0.1"
+      self.by-version."insight"."0.3.1"
+      self.by-version."is-root"."0.1.0"
+      self.by-version."shell-quote"."1.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bower" ];
+  };
+  "bower" = self.by-version."bower"."1.3.1";
+  by-spec."bower".">=0.9.0" =
+    self.by-version."bower"."1.3.1";
+  by-spec."bower".">=1.2.8 <2" =
+    self.by-version."bower"."1.3.1";
+  by-spec."bower"."~1.2.0" =
     self.by-version."bower"."1.2.8";
   by-version."bower"."1.2.8" = lib.makeOverridable self.buildNodePackage {
     name = "bower-1.2.8";
@@ -1182,11 +1343,11 @@
       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.4"
+      self.by-version."decompress-zip"."0.0.5"
       self.by-version."fstream"."0.1.25"
       self.by-version."fstream-ignore"."0.0.7"
       self.by-version."glob"."3.2.9"
-      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."handlebars"."1.0.12"
       self.by-version."inquirer"."0.3.5"
       self.by-version."junk"."0.2.2"
@@ -1207,7 +1368,7 @@
       self.by-version."sudo-block"."0.2.1"
       self.by-version."tar"."0.1.19"
       self.by-version."tmp"."0.0.23"
-      self.by-version."update-notifier"."0.1.7"
+      self.by-version."update-notifier"."0.1.8"
       self.by-version."which"."1.0.5"
       self.by-version."p-throttler"."0.0.1"
     ];
@@ -1215,13 +1376,6 @@
     ];
     passthru.names = [ "bower" ];
   };
-  "bower" = self.by-version."bower"."1.2.8";
-  by-spec."bower".">=0.9.0" =
-    self.by-version."bower"."1.2.8";
-  by-spec."bower".">=1.2.8 <2" =
-    self.by-version."bower"."1.2.8";
-  by-spec."bower"."~1.2.0" =
-    self.by-version."bower"."1.2.8";
   by-spec."bower-config"."~0.4.3" =
     self.by-version."bower-config"."0.4.5";
   by-version."bower-config"."0.4.5" = lib.makeOverridable self.buildNodePackage {
@@ -1236,7 +1390,7 @@
     buildInputs =
       (self.nativeDeps."bower-config" or []);
     deps = [
-      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."mout"."0.6.0"
       self.by-version."optimist"."0.6.1"
       self.by-version."osenv"."0.0.3"
@@ -1259,7 +1413,7 @@
     buildInputs =
       (self.nativeDeps."bower-config" or []);
     deps = [
-      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."mout"."0.6.0"
       self.by-version."optimist"."0.6.1"
       self.by-version."osenv"."0.0.3"
@@ -1304,7 +1458,7 @@
       (self.nativeDeps."bower-json" or []);
     deps = [
       self.by-version."deep-extend"."0.2.8"
-      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."intersect"."0.0.3"
     ];
     peerDependencies = [
@@ -1351,6 +1505,8 @@
     ];
     passthru.names = [ "bower-logger" ];
   };
+  by-spec."bower-logger"."~0.2.2" =
+    self.by-version."bower-logger"."0.2.2";
   by-spec."bower-registry-client"."~0.1.4" =
     self.by-version."bower-registry-client"."0.1.6";
   by-version."bower-registry-client"."0.1.6" = lib.makeOverridable self.buildNodePackage {
@@ -1367,7 +1523,7 @@
     deps = [
       self.by-version."async"."0.2.10"
       self.by-version."bower-config"."0.4.5"
-      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."lru-cache"."2.3.1"
       self.by-version."request"."2.27.0"
       self.by-version."request-replay"."0.2.0"
@@ -1397,7 +1553,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.2.8"
+      self.by-version."bower"."1.3.1"
       self.by-version."argparse"."0.1.15"
       self.by-version."clone"."0.1.11"
       self.by-version."semver"."2.2.1"
@@ -1479,21 +1635,21 @@
   by-spec."browser-resolve"."~1.2.2" =
     self.by-version."browser-resolve"."1.2.2";
   by-spec."browserchannel"."*" =
-    self.by-version."browserchannel"."1.1.1";
-  by-version."browserchannel"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-browserchannel-1.1.1";
+    self.by-version."browserchannel"."1.2.0";
+  by-version."browserchannel"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-browserchannel-1.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.1.1.tgz";
-        name = "browserchannel-1.1.1.tgz";
-        sha1 = "223aeddf06892314e11f15fd2d4e2ade64a1bba5";
+        url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.2.0.tgz";
+        name = "browserchannel-1.2.0.tgz";
+        sha1 = "207ce6eb844e00febfdf32084f10d4757cbcf97c";
       })
     ];
     buildInputs =
       (self.nativeDeps."browserchannel" or []);
     deps = [
       self.by-version."hat"."0.0.3"
-      self.by-version."connect"."2.13.0"
+      self.by-version."connect"."2.14.3"
       self.by-version."request"."2.34.0"
       self.by-version."ascii-json"."0.2.0"
     ];
@@ -1501,16 +1657,16 @@
     ];
     passthru.names = [ "browserchannel" ];
   };
-  "browserchannel" = self.by-version."browserchannel"."1.1.1";
-  by-spec."browserify"."~3.31.2" =
-    self.by-version."browserify"."3.31.2";
-  by-version."browserify"."3.31.2" = lib.makeOverridable self.buildNodePackage {
-    name = "browserify-3.31.2";
+  "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";
     src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/browserify/-/browserify-3.31.2.tgz";
-        name = "browserify-3.31.2.tgz";
-        sha1 = "ec5bbd7fff284645db59280c340d972868e0ab1b";
+      (fetchurl {
+        url = "http://registry.npmjs.org/browserify/-/browserify-3.32.1.tgz";
+        name = "browserify-3.32.1.tgz";
+        sha1 = "5d4ad85d5cafee3fc1062e76e56143d0c298bfcb";
       })
     ];
     buildInputs =
@@ -1523,7 +1679,7 @@
       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.1"
+      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"
@@ -1533,7 +1689,7 @@
       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.1"
+      self.by-version."os-browserify"."0.1.2"
       self.by-version."console-browserify"."1.0.3"
       self.by-version."vm-browserify"."0.0.4"
       self.by-version."zlib-browserify"."0.0.3"
@@ -1542,11 +1698,11 @@
       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.4"
+      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"."0.2.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"
@@ -1558,7 +1714,7 @@
       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.1"
+      self.by-version."resolve"."0.6.2"
       self.by-version."glob"."3.2.9"
       self.by-version."builtins"."0.0.2"
     ];
@@ -1644,14 +1800,14 @@
     passthru.names = [ "bson" ];
   };
   by-spec."buffer"."~2.1.4" =
-    self.by-version."buffer"."2.1.4";
-  by-version."buffer"."2.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/buffer/-/buffer-2.1.4.tgz";
-        name = "buffer-2.1.4.tgz";
-        sha1 = "0283e62870b4f450b636e00eb9fd527cd9ae1341";
+        url = "http://registry.npmjs.org/buffer/-/buffer-2.1.5.tgz";
+        name = "buffer-2.1.5.tgz";
+        sha1 = "15373190bc584061de5cbc155db82a0dc1a462de";
       })
     ];
     buildInputs =
@@ -1724,14 +1880,14 @@
     passthru.names = [ "buffers" ];
   };
   by-spec."buffertools"."*" =
-    self.by-version."buffertools"."2.0.1";
-  by-version."buffertools"."2.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-buffertools-2.0.1";
+    self.by-version."buffertools"."2.1.1";
+  by-version."buffertools"."2.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-buffertools-2.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/buffertools/-/buffertools-2.0.1.tgz";
-        name = "buffertools-2.0.1.tgz";
-        sha1 = "4611e6430687e7876330285dd1ae7e7e47b47288";
+        url = "http://registry.npmjs.org/buffertools/-/buffertools-2.1.1.tgz";
+        name = "buffertools-2.1.1.tgz";
+        sha1 = "10d54433f27ef419e845338a3c6bc6dd2c1f311c";
       })
     ];
     buildInputs =
@@ -1742,7 +1898,7 @@
     ];
     passthru.names = [ "buffertools" ];
   };
-  "buffertools" = self.by-version."buffertools"."2.0.1";
+  "buffertools" = self.by-version."buffertools"."2.1.1";
   by-spec."buffertools".">=1.1.1 <2.0.0" =
     self.by-version."buffertools"."1.1.1";
   by-version."buffertools"."1.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -1879,6 +2035,8 @@
     ];
     passthru.names = [ "bytes" ];
   };
+  by-spec."bytes"."~0.2.0" =
+    self.by-version."bytes"."0.2.1";
   by-spec."bytes"."~0.2.1" =
     self.by-version."bytes"."0.2.1";
   by-spec."callsite"."~1.0.0" =
@@ -1922,14 +2080,14 @@
     passthru.names = [ "cardinal" ];
   };
   by-spec."chai"."*" =
-    self.by-version."chai"."1.9.0";
-  by-version."chai"."1.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-chai-1.9.0";
+    self.by-version."chai"."1.9.1";
+  by-version."chai"."1.9.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-chai-1.9.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/chai/-/chai-1.9.0.tgz";
-        name = "chai-1.9.0.tgz";
-        sha1 = "3ebe99f3bab9241ed3fcd576f8fe96cad9ed7413";
+        url = "http://registry.npmjs.org/chai/-/chai-1.9.1.tgz";
+        name = "chai-1.9.1.tgz";
+        sha1 = "3711bb6706e1568f34c0b36098bf8f19455c81ae";
       })
     ];
     buildInputs =
@@ -1942,7 +2100,7 @@
     ];
     passthru.names = [ "chai" ];
   };
-  "chai" = self.by-version."chai"."1.9.0";
+  "chai" = self.by-version."chai"."1.9.1";
   by-spec."chainsaw"."~0.1.0" =
     self.by-version."chainsaw"."0.1.0";
   by-version."chainsaw"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -2027,8 +2185,6 @@
     ];
     passthru.names = [ "chalk" ];
   };
-  by-spec."chalk"."~0.2.1" =
-    self.by-version."chalk"."0.2.1";
   by-spec."chalk"."~0.3.0" =
     self.by-version."chalk"."0.3.0";
   by-version."chalk"."0.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -2131,7 +2287,7 @@
     buildInputs =
       (self.nativeDeps."cheerio-select" or []);
     deps = [
-      self.by-version."CSSselect"."0.5.0"
+      self.by-version."CSSselect"."0.7.0"
     ];
     peerDependencies = [
     ];
@@ -2176,19 +2332,21 @@
     passthru.names = [ "chmodr" ];
   };
   by-spec."chokidar"."~0.8.0" =
-    self.by-version."chokidar"."0.8.1";
-  by-version."chokidar"."0.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-chokidar-0.8.1";
+    self.by-version."chokidar"."0.8.2";
+  by-version."chokidar"."0.8.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-chokidar-0.8.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/chokidar/-/chokidar-0.8.1.tgz";
-        name = "chokidar-0.8.1.tgz";
-        sha1 = "8ee0c99ef48420902fded73b862eac2dd75da4a6";
+        url = "http://registry.npmjs.org/chokidar/-/chokidar-0.8.2.tgz";
+        name = "chokidar-0.8.2.tgz";
+        sha1 = "767e2509aaa040fd8a23cc46225a783dc1bfc899";
       })
     ];
     buildInputs =
       (self.nativeDeps."chokidar" or []);
     deps = [
+      self.by-version."fsevents"."0.2.0"
+      self.by-version."recursive-readdir"."0.0.2"
     ];
     peerDependencies = [
     ];
@@ -2234,14 +2392,14 @@
     passthru.names = [ "class-extend" ];
   };
   by-spec."clean-css"."2.1.x" =
-    self.by-version."clean-css"."2.1.4";
-  by-version."clean-css"."2.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "clean-css-2.1.4";
+    self.by-version."clean-css"."2.1.7";
+  by-version."clean-css"."2.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "clean-css-2.1.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.4.tgz";
-        name = "clean-css-2.1.4.tgz";
-        sha1 = "82b59182c8aa02d7050329b0b977f7651bf9875e";
+        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.7.tgz";
+        name = "clean-css-2.1.7.tgz";
+        sha1 = "beef4e12945c2f8c1ec6101cf0275a38fdf43c65";
       })
     ];
     buildInputs =
@@ -2254,7 +2412,7 @@
     passthru.names = [ "clean-css" ];
   };
   by-spec."clean-css"."~2.1.0" =
-    self.by-version."clean-css"."2.1.4";
+    self.by-version."clean-css"."2.1.7";
   by-spec."cli"."0.4.x" =
     self.by-version."cli"."0.4.5";
   by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage {
@@ -2414,7 +2572,7 @@
       (self.nativeDeps."cmd-shim" or []);
     deps = [
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."graceful-fs"."2.0.3"
     ];
     peerDependencies = [
     ];
@@ -2483,29 +2641,51 @@
     ];
     passthru.names = [ "coffee-script" ];
   };
-  by-spec."coffee-script"."~1.6" =
-    self.by-version."coffee-script"."1.6.3";
-  by-spec."coffee-script-redux"."git+https://github.com/michaelficarra/CoffeeScriptRedux.git#9895cd1641fdf3a2424e662ab7583726bb0e35b3" =
-    self.by-version."coffee-script-redux"."2.0.0-beta4";
-  by-version."coffee-script-redux"."2.0.0-beta4" = lib.makeOverridable self.buildNodePackage {
-    name = "coffee-script-redux-2.0.0-beta4";
+  by-spec."coffee-script-redux"."=2.0.0-beta8" =
+    self.by-version."coffee-script-redux"."2.0.0-beta8";
+  by-version."coffee-script-redux"."2.0.0-beta8" = lib.makeOverridable self.buildNodePackage {
+    name = "coffee-script-redux-2.0.0-beta8";
     src = [
-      (fetchgit {
-        url = "https://github.com/michaelficarra/CoffeeScriptRedux.git";
-        rev = "9895cd1641fdf3a2424e662ab7583726bb0e35b3";
-        sha256 = "d70e659aa7cdb50a98959dec0e2a8c916200e31cb770f04faa2ae92a55d1e66d";
+      (self.patchSource fetchurl {
+        url = "http://registry.npmjs.org/coffee-script-redux/-/coffee-script-redux-2.0.0-beta8.tgz";
+        name = "coffee-script-redux-2.0.0-beta8.tgz";
+        sha1 = "0fd7b8417340dd0d339e8f6fd8b4b8716956e8d5";
       })
     ];
     buildInputs =
       (self.nativeDeps."coffee-script-redux" or []);
     deps = [
       self.by-version."StringScanner"."0.0.3"
-      self.by-version."jedediah"."0.1.1"
+      self.by-version."nopt"."2.1.2"
+      self.by-version."esmangle"."0.0.17"
+      self.by-version."source-map"."0.1.11"
+      self.by-version."escodegen"."0.0.28"
+      self.by-version."cscodegen"."0.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "coffee-script-redux" ];
   };
+  by-spec."collections"."^2.0.0" =
+    self.by-version."collections"."2.0.1";
+  by-version."collections"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-collections-2.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/collections/-/collections-2.0.1.tgz";
+        name = "collections-2.0.1.tgz";
+        sha1 = "ee201b142bd1ee5b37a95d62fe13062d87d83db0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."collections" or []);
+    deps = [
+      self.by-version."weak-map"."1.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "collections" ];
+  };
   by-spec."color"."~0.5.0" =
     self.by-version."color"."0.5.0";
   by-version."color"."0.5.0" = lib.makeOverridable self.buildNodePackage {
@@ -2521,7 +2701,7 @@
       (self.nativeDeps."color" or []);
     deps = [
       self.by-version."color-convert"."0.2.1"
-      self.by-version."color-string"."0.1.2"
+      self.by-version."color-string"."0.1.3"
     ];
     peerDependencies = [
     ];
@@ -2547,14 +2727,14 @@
     passthru.names = [ "color-convert" ];
   };
   by-spec."color-string"."0.1.x" =
-    self.by-version."color-string"."0.1.2";
-  by-version."color-string"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-color-string-0.1.2";
+    self.by-version."color-string"."0.1.3";
+  by-version."color-string"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-color-string-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/color-string/-/color-string-0.1.2.tgz";
-        name = "color-string-0.1.2.tgz";
-        sha1 = "a413fb7dd137162d5d4ea784cbeb36d931ad9b4a";
+        url = "http://registry.npmjs.org/color-string/-/color-string-0.1.3.tgz";
+        name = "color-string-0.1.3.tgz";
+        sha1 = "e865d2e3e59f665c3af0de14383f6bf0705685f3";
       })
     ];
     buildInputs =
@@ -2791,6 +2971,8 @@
     self.by-version."commander"."2.1.0";
   by-spec."commander"."~0.6.1" =
     self.by-version."commander"."0.6.1";
+  by-spec."commander"."~2.1.0" =
+    self.by-version."commander"."2.1.0";
   by-spec."commondir"."0.0.1" =
     self.by-version."commondir"."0.0.1";
   by-version."commondir"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -2829,15 +3011,37 @@
     ];
     passthru.names = [ "compressible" ];
   };
+  by-spec."compression"."1.0.0" =
+    self.by-version."compression"."1.0.0";
+  by-version."compression"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-compression-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/compression/-/compression-1.0.0.tgz";
+        name = "compression-1.0.0.tgz";
+        sha1 = "8aeb85d48db5145d38bc8b181b6352d8eab26020";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."compression" or []);
+    deps = [
+      self.by-version."bytes"."0.2.1"
+      self.by-version."negotiator"."0.3.0"
+      self.by-version."compressible"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "compression" ];
+  };
   by-spec."concat-stream"."^1.4.1" =
-    self.by-version."concat-stream"."1.4.1";
-  by-version."concat-stream"."1.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.1.tgz";
-        name = "concat-stream-1.4.1.tgz";
-        sha1 = "20358b86fe36e5ac3de29cec76f4d04ad8ff1423";
+        url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.4.tgz";
+        name = "concat-stream-1.4.4.tgz";
+        sha1 = "88cf474555dfbbdbeb34453e7f1e417dae97ce21";
       })
     ];
     buildInputs =
@@ -2852,7 +3056,7 @@
     passthru.names = [ "concat-stream" ];
   };
   by-spec."concat-stream"."~1.4.1" =
-    self.by-version."concat-stream"."1.4.1";
+    self.by-version."concat-stream"."1.4.4";
   by-spec."config"."0.4.15" =
     self.by-version."config"."0.4.15";
   by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage {
@@ -2898,39 +3102,15 @@
   };
   by-spec."config-chain"."~1.1.8" =
     self.by-version."config-chain"."1.1.8";
-  by-spec."configstore"."~0.1.0" =
-    self.by-version."configstore"."0.1.7";
-  by-version."configstore"."0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-configstore-0.1.7";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/configstore/-/configstore-0.1.7.tgz";
-        name = "configstore-0.1.7.tgz";
-        sha1 = "57dc701bc2a51eb804d6e1733c8abb9d82a5cede";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."configstore" or []);
-    deps = [
-      self.by-version."lodash"."2.4.1"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."js-yaml"."2.1.3"
-      self.by-version."osenv"."0.0.3"
-      self.by-version."graceful-fs"."2.0.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "configstore" ];
-  };
   by-spec."configstore"."~0.2.1" =
-    self.by-version."configstore"."0.2.2";
-  by-version."configstore"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-configstore-0.2.2";
+    self.by-version."configstore"."0.2.3";
+  by-version."configstore"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-configstore-0.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/configstore/-/configstore-0.2.2.tgz";
-        name = "configstore-0.2.2.tgz";
-        sha1 = "ae0eb4f75833a4436f33456a4d2db11d69cc61ed";
+        url = "http://registry.npmjs.org/configstore/-/configstore-0.2.3.tgz";
+        name = "configstore-0.2.3.tgz";
+        sha1 = "b1bdc4ad823a25423dc15d220fcc1ae1d7efab02";
       })
     ];
     buildInputs =
@@ -2939,7 +3119,7 @@
       self.by-version."mkdirp"."0.3.5"
       self.by-version."js-yaml"."3.0.2"
       self.by-version."osenv"."0.0.3"
-      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."uuid"."1.4.1"
       self.by-version."object-assign"."0.1.2"
     ];
@@ -2947,6 +3127,8 @@
     ];
     passthru.names = [ "configstore" ];
   };
+  by-spec."configstore"."~0.2.2" =
+    self.by-version."configstore"."0.2.3";
   by-spec."connect"."1.x" =
     self.by-version."connect"."1.9.2";
   by-version."connect"."1.9.2" = lib.makeOverridable self.buildNodePackage {
@@ -3036,6 +3218,47 @@
     ];
     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 {
+    name = "node-connect-2.14.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect/-/connect-2.14.1.tgz";
+        name = "connect-2.14.1.tgz";
+        sha1 = "e6fd676a5735ca703a89eb970f3d283fadecc2c7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect" or []);
+    deps = [
+      self.by-version."basic-auth-connect"."1.0.0"
+      self.by-version."cookie-parser"."1.0.1"
+      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."errorhandler"."1.0.0"
+      self.by-version."express-session"."1.0.2"
+      self.by-version."fresh"."0.2.2"
+      self.by-version."method-override"."1.0.0"
+      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."serve-index"."1.0.1"
+      self.by-version."serve-static"."1.0.2"
+      self.by-version."static-favicon"."1.0.0"
+      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.7.4"
+      self.by-version."raw-body"."1.1.3"
+      self.by-version."multiparty"."2.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect" ];
+  };
   by-spec."connect"."2.3.x" =
     self.by-version."connect"."2.3.9";
   by-version."connect"."2.3.9" = lib.makeOverridable self.buildNodePackage {
@@ -3122,34 +3345,40 @@
     passthru.names = [ "connect" ];
   };
   by-spec."connect"."~2" =
-    self.by-version."connect"."2.13.0";
-  by-version."connect"."2.13.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-connect-2.13.0";
+    self.by-version."connect"."2.14.3";
+  by-version."connect"."2.14.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-connect-2.14.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.13.0.tgz";
-        name = "connect-2.13.0.tgz";
-        sha1 = "a1974986381b4ea52ded726c2b4598e88ed527d3";
+        url = "http://registry.npmjs.org/connect/-/connect-2.14.3.tgz";
+        name = "connect-2.14.3.tgz";
+        sha1 = "be8267f116cc905b53b29e0e7c9ea278d71d597b";
       })
     ];
     buildInputs =
       (self.nativeDeps."connect" or []);
     deps = [
-      self.by-version."compressible"."1.0.0"
-      self.by-version."batch"."0.5.0"
+      self.by-version."basic-auth-connect"."1.0.0"
+      self.by-version."cookie-parser"."1.0.1"
+      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."errorhandler"."1.0.0"
+      self.by-version."express-session"."1.0.2"
+      self.by-version."fresh"."0.2.2"
+      self.by-version."method-override"."1.0.0"
+      self.by-version."morgan"."1.0.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."response-time"."1.0.0"
+      self.by-version."serve-index"."1.0.1"
+      self.by-version."serve-static"."1.0.2"
+      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."fresh"."0.2.0"
       self.by-version."pause"."0.0.1"
-      self.by-version."uid2"."0.0.3"
       self.by-version."debug"."0.7.4"
-      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."raw-body"."1.1.3"
       self.by-version."multiparty"."2.2.0"
     ];
     peerDependencies = [
@@ -3239,6 +3468,26 @@
     passthru.names = [ "connect-mongo" ];
   };
   "connect-mongo" = self.by-version."connect-mongo"."0.4.0";
+  by-spec."connect-timeout"."1.0.0" =
+    self.by-version."connect-timeout"."1.0.0";
+  by-version."connect-timeout"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-connect-timeout-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz";
+        name = "connect-timeout-1.0.0.tgz";
+        sha1 = "12054799f90bb9566f8b274efe7842d6465d10bb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect-timeout" or []);
+    deps = [
+      self.by-version."debug"."0.7.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect-timeout" ];
+  };
   by-spec."connection-parse"."0.0.x" =
     self.by-version."connection-parse"."0.0.7";
   by-version."connection-parse"."0.0.7" = lib.makeOverridable self.buildNodePackage {
@@ -3310,7 +3559,7 @@
     buildInputs =
       (self.nativeDeps."constantinople" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.12"
+      self.by-version."uglify-js"."2.4.13"
     ];
     peerDependencies = [
     ];
@@ -3332,7 +3581,7 @@
     buildInputs =
       (self.nativeDeps."constantinople" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.12"
+      self.by-version."uglify-js"."2.4.13"
     ];
     peerDependencies = [
     ];
@@ -3433,6 +3682,25 @@
     ];
     passthru.names = [ "cookie" ];
   };
+  by-spec."cookie"."0.1.1" =
+    self.by-version."cookie"."0.1.1";
+  by-version."cookie"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cookie-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookie/-/cookie-0.1.1.tgz";
+        name = "cookie-0.1.1.tgz";
+        sha1 = "cbd4b537aa65f800b6c66ead2520ba8d6afbdf54";
+      })
+    ];
+    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 {
@@ -3471,6 +3739,27 @@
     ];
     passthru.names = [ "cookie-jar" ];
   };
+  by-spec."cookie-parser"."1.0.1" =
+    self.by-version."cookie-parser"."1.0.1";
+  by-version."cookie-parser"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cookie-parser-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz";
+        name = "cookie-parser-1.0.1.tgz";
+        sha1 = "17bd622c9717cd0858a912a9fef4c0362360a7b0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookie-parser" or []);
+    deps = [
+      self.by-version."cookie"."0.1.0"
+      self.by-version."cookie-signature"."1.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cookie-parser" ];
+  };
   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 {
@@ -3627,14 +3916,14 @@
     passthru.names = [ "couch-login" ];
   };
   by-spec."coveralls"."*" =
-    self.by-version."coveralls"."2.8.0";
-  by-version."coveralls"."2.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "coveralls-2.8.0";
+    self.by-version."coveralls"."2.10.0";
+  by-version."coveralls"."2.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "coveralls-2.10.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.8.0.tgz";
-        name = "coveralls-2.8.0.tgz";
-        sha1 = "959b1b3cb9b5ce2ca502b025fd69eb1700756e63";
+        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.10.0.tgz";
+        name = "coveralls-2.10.0.tgz";
+        sha1 = "03f0c54070f30e0d336c79ef2b16a5c53728a7e5";
       })
     ];
     buildInputs =
@@ -3649,7 +3938,7 @@
     ];
     passthru.names = [ "coveralls" ];
   };
-  "coveralls" = self.by-version."coveralls"."2.8.0";
+  "coveralls" = self.by-version."coveralls"."2.10.0";
   by-spec."crc"."0.2.0" =
     self.by-version."crc"."0.2.0";
   by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -3767,6 +4056,25 @@
     ];
     passthru.names = [ "crypto-browserify" ];
   };
+  by-spec."cscodegen"."git://github.com/michaelficarra/cscodegen.git#73fd7202ac086c26f18c9d56f025b18b3c6f5383" =
+    self.by-version."cscodegen"."0.1.0";
+  by-version."cscodegen"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "cscodegen-0.1.0";
+    src = [
+      (fetchgit {
+        url = "git://github.com/michaelficarra/cscodegen.git";
+        rev = "73fd7202ac086c26f18c9d56f025b18b3c6f5383";
+        sha256 = "cb527b00ac305ebc6ab3f59ff4e99def7646b417fdd9e35f0186c8ee41cd0829";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cscodegen" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cscodegen" ];
+  };
   by-spec."css"."~1.0.8" =
     self.by-version."css"."1.0.8";
   by-version."css"."1.0.8" = lib.makeOverridable self.buildNodePackage {
@@ -3845,6 +4153,26 @@
     ];
     passthru.names = [ "css-stringify" ];
   };
+  by-spec."csurf"."1.0.0" =
+    self.by-version."csurf"."1.0.0";
+  by-version."csurf"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-csurf-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/csurf/-/csurf-1.0.0.tgz";
+        name = "csurf-1.0.0.tgz";
+        sha1 = "a68d5718b988032e270abf1f4b34f272753d745b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."csurf" or []);
+    deps = [
+      self.by-version."uid2"."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 {
@@ -4027,14 +4355,14 @@
     passthru.names = [ "debuglog" ];
   };
   by-spec."decompress"."~0.1.5" =
-    self.by-version."decompress"."0.1.6";
-  by-version."decompress"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-decompress-0.1.6";
+    self.by-version."decompress"."0.1.8";
+  by-version."decompress"."0.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-decompress-0.1.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/decompress/-/decompress-0.1.6.tgz";
-        name = "decompress-0.1.6.tgz";
-        sha1 = "4db64844d80b615b888ca129d12f8accd1e27286";
+        url = "http://registry.npmjs.org/decompress/-/decompress-0.1.8.tgz";
+        name = "decompress-0.1.8.tgz";
+        sha1 = "5a8b5caa9ca5dd50112320383f8f047d5823d6e9";
       })
     ];
     buildInputs =
@@ -4042,36 +4370,36 @@
     deps = [
       self.by-version."adm-zip"."0.4.4"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."mout"."0.6.0"
+      self.by-version."mout"."0.9.0"
       self.by-version."rimraf"."2.2.6"
       self.by-version."stream-combiner"."0.0.4"
       self.by-version."tar"."0.1.19"
-      self.by-version."tempfile"."0.1.2"
+      self.by-version."tempfile"."0.1.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "decompress" ];
   };
   by-spec."decompress-zip"."~0.0.3" =
-    self.by-version."decompress-zip"."0.0.4";
-  by-version."decompress-zip"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "decompress-zip-0.0.4";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.4.tgz";
-        name = "decompress-zip-0.0.4.tgz";
-        sha1 = "c562431f76af8970afaf50226e42e1c47a57b086";
+        url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.5.tgz";
+        name = "decompress-zip-0.0.5.tgz";
+        sha1 = "ab145d0dfe4f1c4249af7efcdff1df669eca0c8c";
       })
     ];
     buildInputs =
       (self.nativeDeps."decompress-zip" or []);
     deps = [
-      self.by-version."q"."0.9.7"
+      self.by-version."q"."1.0.1"
       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.11"
-      self.by-version."nopt"."2.1.2"
+      self.by-version."nopt"."2.2.0"
     ];
     peerDependencies = [
     ];
@@ -4177,6 +4505,26 @@
   };
   by-spec."deep-extend"."~0.2.8" =
     self.by-version."deep-extend"."0.2.8";
+  by-spec."deepmerge"."*" =
+    self.by-version."deepmerge"."0.2.7";
+  by-version."deepmerge"."0.2.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-deepmerge-0.2.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deepmerge/-/deepmerge-0.2.7.tgz";
+        name = "deepmerge-0.2.7.tgz";
+        sha1 = "3a5ab8d37311c4d1aefb22209693afe0a91a0563";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."deepmerge" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "deepmerge" ];
+  };
+  "deepmerge" = self.by-version."deepmerge"."0.2.7";
   by-spec."defined"."~0.0.0" =
     self.by-version."defined"."0.0.0";
   by-version."defined"."0.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -4520,14 +4868,14 @@
     passthru.names = [ "domutils" ];
   };
   by-spec."domutils"."1.4" =
-    self.by-version."domutils"."1.4.0";
-  by-version."domutils"."1.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-domutils-1.4.0";
+    self.by-version."domutils"."1.4.1";
+  by-version."domutils"."1.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-domutils-1.4.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/domutils/-/domutils-1.4.0.tgz";
-        name = "domutils-1.4.0.tgz";
-        sha1 = "330b95212944e340c6e0227e9ec3d35242d4dd05";
+        url = "http://registry.npmjs.org/domutils/-/domutils-1.4.1.tgz";
+        name = "domutils-1.4.1.tgz";
+        sha1 = "e716621c245561dd03c1ecd5667f70e8ddeb2f59";
       })
     ];
     buildInputs =
@@ -4553,7 +4901,7 @@
     buildInputs =
       (self.nativeDeps."download" or []);
     deps = [
-      self.by-version."decompress"."0.1.6"
+      self.by-version."decompress"."0.1.8"
       self.by-version."each-async"."0.1.2"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."request"."2.31.0"
@@ -4756,6 +5104,25 @@
     ];
     passthru.names = [ "entities" ];
   };
+  by-spec."errorhandler"."1.0.0" =
+    self.by-version."errorhandler"."1.0.0";
+  by-version."errorhandler"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-errorhandler-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz";
+        name = "errorhandler-1.0.0.tgz";
+        sha1 = "d74b37e8dc38c99afb3f5a79edcebaea022d042a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."errorhandler" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "errorhandler" ];
+  };
   by-spec."es5-ext"."~0.9.2" =
     self.by-version."es5-ext"."0.9.2";
   by-version."es5-ext"."0.9.2" = lib.makeOverridable self.buildNodePackage {
@@ -4797,7 +5164,7 @@
   "escape-html" = self.by-version."escape-html"."1.0.1";
   by-spec."escape-html"."1.0.1" =
     self.by-version."escape-html"."1.0.1";
-  by-spec."escodegen"."*" =
+  by-spec."escodegen"."1.2.x" =
     self.by-version."escodegen"."1.2.0";
   by-version."escodegen"."1.2.0" = lib.makeOverridable self.buildNodePackage {
     name = "escodegen-1.2.0";
@@ -4820,37 +5187,39 @@
     ];
     passthru.names = [ "escodegen" ];
   };
-  by-spec."escodegen"."0.0.23" =
-    self.by-version."escodegen"."0.0.23";
-  by-version."escodegen"."0.0.23" = lib.makeOverridable self.buildNodePackage {
-    name = "escodegen-0.0.23";
+  by-spec."escodegen"."~ 0.0.28" =
+    self.by-version."escodegen"."0.0.28";
+  by-version."escodegen"."0.0.28" = lib.makeOverridable self.buildNodePackage {
+    name = "escodegen-0.0.28";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.23.tgz";
-        name = "escodegen-0.0.23.tgz";
-        sha1 = "9acf978164368e42276571f18839c823b3a844df";
+        url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.28.tgz";
+        name = "escodegen-0.0.28.tgz";
+        sha1 = "0e4ff1715f328775d6cab51ac44a406cd7abffd3";
       })
     ];
     buildInputs =
       (self.nativeDeps."escodegen" or []);
     deps = [
       self.by-version."esprima"."1.0.4"
-      self.by-version."estraverse"."0.0.4"
+      self.by-version."estraverse"."1.3.2"
       self.by-version."source-map"."0.1.33"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "escodegen" ];
   };
-  by-spec."escodegen"."1.0.x" =
-    self.by-version."escodegen"."1.0.1";
-  by-version."escodegen"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "escodegen-1.0.1";
+  by-spec."escodegen"."~0.0.24" =
+    self.by-version."escodegen"."0.0.28";
+  by-spec."escodegen"."~1.1.0" =
+    self.by-version."escodegen"."1.1.0";
+  by-version."escodegen"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "escodegen-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.0.1.tgz";
-        name = "escodegen-1.0.1.tgz";
-        sha1 = "84c92c4a07440271b90e6b78e620973bf721226e";
+        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz";
+        name = "escodegen-1.1.0.tgz";
+        sha1 = "c663923f6e20aad48d0c0fa49f31c6d4f49360cf";
       })
     ];
     buildInputs =
@@ -4865,28 +5234,25 @@
     ];
     passthru.names = [ "escodegen" ];
   };
-  by-spec."escodegen"."~1.1.0" =
-    self.by-version."escodegen"."1.1.0";
-  by-version."escodegen"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "escodegen-1.1.0";
+  by-spec."escope"."~ 1.0.0" =
+    self.by-version."escope"."1.0.1";
+  by-version."escope"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-escope-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz";
-        name = "escodegen-1.1.0.tgz";
-        sha1 = "c663923f6e20aad48d0c0fa49f31c6d4f49360cf";
+        url = "http://registry.npmjs.org/escope/-/escope-1.0.1.tgz";
+        name = "escope-1.0.1.tgz";
+        sha1 = "59b04cdccb76555608499ed13502b9028fe73dd8";
       })
     ];
     buildInputs =
-      (self.nativeDeps."escodegen" or []);
+      (self.nativeDeps."escope" 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."source-map"."0.1.33"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "escodegen" ];
+    passthru.names = [ "escope" ];
   };
   by-spec."escope"."~0.0.13" =
     self.by-version."escope"."0.0.16";
@@ -4908,6 +5274,32 @@
     ];
     passthru.names = [ "escope" ];
   };
+  by-spec."esmangle"."~0.0.8" =
+    self.by-version."esmangle"."0.0.17";
+  by-version."esmangle"."0.0.17" = lib.makeOverridable self.buildNodePackage {
+    name = "esmangle-0.0.17";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/esmangle/-/esmangle-0.0.17.tgz";
+        name = "esmangle-0.0.17.tgz";
+        sha1 = "4c5c93607cde5d1276bad396e836229dba68d90c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."esmangle" or []);
+    deps = [
+      self.by-version."esprima"."1.0.4"
+      self.by-version."escope"."1.0.1"
+      self.by-version."escodegen"."0.0.28"
+      self.by-version."estraverse"."1.3.2"
+      self.by-version."source-map"."0.1.33"
+      self.by-version."esshorten"."0.0.2"
+      self.by-version."optimist"."0.6.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "esmangle" ];
+  };
   by-spec."esprima"."1.0.x" =
     self.by-version."esprima"."1.0.4";
   by-version."esprima"."1.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -4976,7 +5368,28 @@
     ];
     passthru.names = [ "esrefactor" ];
   };
-  by-spec."estraverse"."*" =
+  by-spec."esshorten"."~ 0.0.2" =
+    self.by-version."esshorten"."0.0.2";
+  by-version."esshorten"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-esshorten-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/esshorten/-/esshorten-0.0.2.tgz";
+        name = "esshorten-0.0.2.tgz";
+        sha1 = "28a652f1efd40c8e227f8c6de7dbe6b560ee8129";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."esshorten" or []);
+    deps = [
+      self.by-version."escope"."1.0.1"
+      self.by-version."estraverse"."1.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "esshorten" ];
+  };
+  by-spec."estraverse".">= 0.0.2" =
     self.by-version."estraverse"."1.5.0";
   by-version."estraverse"."1.5.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-estraverse-1.5.0";
@@ -4995,8 +5408,44 @@
     ];
     passthru.names = [ "estraverse" ];
   };
-  by-spec."estraverse".">= 0.0.2" =
-    self.by-version."estraverse"."1.5.0";
+  by-spec."estraverse"."~ 1.2.0" =
+    self.by-version."estraverse"."1.2.0";
+  by-version."estraverse"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-estraverse-1.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/estraverse/-/estraverse-1.2.0.tgz";
+        name = "estraverse-1.2.0.tgz";
+        sha1 = "6a3dc8a46a5d6766e5668639fc782976ce5660fd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."estraverse" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "estraverse" ];
+  };
+  by-spec."estraverse"."~ 1.3.2" =
+    self.by-version."estraverse"."1.3.2";
+  by-version."estraverse"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-estraverse-1.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/estraverse/-/estraverse-1.3.2.tgz";
+        name = "estraverse-1.3.2.tgz";
+        sha1 = "37c2b893ef13d723f276d878d60d8535152a6c42";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."estraverse" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "estraverse" ];
+  };
   by-spec."estraverse"."~0.0.4" =
     self.by-version."estraverse"."0.0.4";
   by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -5016,6 +5465,8 @@
     ];
     passthru.names = [ "estraverse" ];
   };
+  by-spec."estraverse"."~1.3.0" =
+    self.by-version."estraverse"."1.3.2";
   by-spec."estraverse"."~1.5.0" =
     self.by-version."estraverse"."1.5.0";
   by-spec."esutils"."~1.0.0" =
@@ -5177,7 +5628,7 @@
       self.by-version."node-swt"."0.1.1"
       self.by-version."node-wsfederation"."0.1.1"
       self.by-version."debug"."0.5.0"
-      self.by-version."express"."3.4.8"
+      self.by-version."express"."3.5.1"
     ];
     peerDependencies = [
     ];
@@ -5225,19 +5676,20 @@
   by-spec."exit"."~0.1.1" =
     self.by-version."exit"."0.1.2";
   by-spec."express"."*" =
-    self.by-version."express"."4.0.0-rc2";
-  by-version."express"."4.0.0-rc2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-express-4.0.0-rc2";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-4.0.0-rc2.tgz";
-        name = "express-4.0.0-rc2.tgz";
-        sha1 = "0b3fc3b853b393cdb5042dc9960498015ed06b96";
+        url = "http://registry.npmjs.org/express/-/express-4.0.0-rc4.tgz";
+        name = "express-4.0.0-rc4.tgz";
+        sha1 = "1cedc8790f47b776b9d100f5388e5fb652ea4388";
       })
     ];
     buildInputs =
       (self.nativeDeps."express" or []);
     deps = [
+      self.by-version."parseurl"."1.0.1"
       self.by-version."accepts"."1.0.0"
       self.by-version."type-is"."1.0.0"
       self.by-version."range-parser"."1.0.0"
@@ -5251,13 +5703,15 @@
       self.by-version."utils-merge"."1.0.0"
       self.by-version."escape-html"."1.0.1"
       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.7.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "express" ];
   };
-  "express" = self.by-version."express"."4.0.0-rc2";
+  "express" = self.by-version."express"."4.0.0-rc4";
   by-spec."express"."2.5.11" =
     self.by-version."express"."2.5.11";
   by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage {
@@ -5342,30 +5796,30 @@
     passthru.names = [ "express" ];
   };
   by-spec."express"."3.x" =
-    self.by-version."express"."3.4.8";
-  by-version."express"."3.4.8" = lib.makeOverridable self.buildNodePackage {
-    name = "express-3.4.8";
+    self.by-version."express"."3.5.1";
+  by-version."express"."3.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "express-3.5.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-3.4.8.tgz";
-        name = "express-3.4.8.tgz";
-        sha1 = "aa7a8986de07053337f4bc5ed9a6453d9cc8e2e1";
+        url = "http://registry.npmjs.org/express/-/express-3.5.1.tgz";
+        name = "express-3.5.1.tgz";
+        sha1 = "4b333e1117faca336a538f4c724140b9ce1a87e7";
       })
     ];
     buildInputs =
       (self.nativeDeps."express" or []);
     deps = [
-      self.by-version."connect"."2.12.0"
+      self.by-version."connect"."2.14.1"
       self.by-version."commander"."1.3.2"
-      self.by-version."range-parser"."0.0.4"
+      self.by-version."range-parser"."1.0.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."cookie"."0.1.0"
+      self.by-version."cookie"."0.1.1"
       self.by-version."buffer-crc32"."0.2.1"
-      self.by-version."fresh"."0.2.0"
+      self.by-version."fresh"."0.2.2"
       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."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.7.4"
     ];
     peerDependencies = [
@@ -5404,6 +5858,35 @@
   };
   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.7.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "express" ];
+  };
   by-spec."express"."~3.4.8" =
     self.by-version."express"."3.4.8";
   by-spec."express-form"."*" =
@@ -5425,7 +5908,7 @@
       self.by-version."async"."0.2.10"
     ];
     peerDependencies = [
-      self.by-version."express"."3.4.8"
+      self.by-version."express"."3.5.1"
     ];
     passthru.names = [ "express-form" ];
   };
@@ -5449,6 +5932,31 @@
     ];
     passthru.names = [ "express-partials" ];
   };
+  by-spec."express-session"."1.0.2" =
+    self.by-version."express-session"."1.0.2";
+  by-version."express-session"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-session-1.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz";
+        name = "express-session-1.0.2.tgz";
+        sha1 = "004478c742561774411ceb79733155a56b6d49eb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."express-session" or []);
+    deps = [
+      self.by-version."utils-merge"."1.0.0"
+      self.by-version."cookie"."0.1.0"
+      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."extend"."*" =
     self.by-version."extend"."1.2.1";
   by-version."extend"."1.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -5469,6 +5977,8 @@
     passthru.names = [ "extend" ];
   };
   "extend" = self.by-version."extend"."1.2.1";
+  by-spec."extend"."~1.2.1" =
+    self.by-version."extend"."1.2.1";
   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 {
@@ -5605,7 +6115,7 @@
     deps = [
       self.by-version."bower-endpoint-parser"."0.2.1"
       self.by-version."bower-logger"."0.2.1"
-      self.by-version."bower"."1.2.8"
+      self.by-version."bower"."1.3.1"
       self.by-version."glob"."3.2.9"
     ];
     peerDependencies = [
@@ -5656,7 +6166,7 @@
       self.by-version."rimraf"."2.2.6"
       self.by-version."glob"."3.2.9"
       self.by-version."minimatch"."0.2.14"
-      self.by-version."findup-sync"."0.1.2"
+      self.by-version."findup-sync"."0.1.3"
       self.by-version."isbinaryfile"."0.1.9"
     ];
     peerDependencies = [
@@ -5706,49 +6216,49 @@
     passthru.names = [ "findit" ];
   };
   by-spec."findup"."~0.1.3" =
-    self.by-version."findup"."0.1.3";
-  by-version."findup"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "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";
     src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/findup/-/findup-0.1.3.tgz";
-        name = "findup-0.1.3.tgz";
-        sha1 = "df2b8ecf06fdaa9cc13dc4ba58bf950e3a176941";
+      (fetchurl {
+        url = "http://registry.npmjs.org/findup/-/findup-0.1.4.tgz";
+        name = "findup-0.1.4.tgz";
+        sha1 = "28cd82e13eb629b40688f08f613f5cae5a29a0f5";
       })
     ];
     buildInputs =
       (self.nativeDeps."findup" or []);
     deps = [
-      self.by-version."nopt"."1.0.10"
       self.by-version."colors"."0.6.2"
+      self.by-version."commander"."2.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "findup" ];
   };
   by-spec."findup-sync"."~0.1.0" =
-    self.by-version."findup-sync"."0.1.2";
-  by-version."findup-sync"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-findup-sync-0.1.2";
+    self.by-version."findup-sync"."0.1.3";
+  by-version."findup-sync"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-findup-sync-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.2.tgz";
-        name = "findup-sync-0.1.2.tgz";
-        sha1 = "da2b96ca9f800e5a13d0a11110f490b65f62e96d";
+        url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz";
+        name = "findup-sync-0.1.3.tgz";
+        sha1 = "7f3e7a97b82392c653bf06589bd85190e93c3683";
       })
     ];
     buildInputs =
       (self.nativeDeps."findup-sync" or []);
     deps = [
-      self.by-version."glob"."3.1.21"
-      self.by-version."lodash"."1.0.1"
+      self.by-version."glob"."3.2.9"
+      self.by-version."lodash"."2.4.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "findup-sync" ];
   };
   by-spec."findup-sync"."~0.1.2" =
-    self.by-version."findup-sync"."0.1.2";
+    self.by-version."findup-sync"."0.1.3";
   by-spec."flatiron"."*" =
     self.by-version."flatiron"."0.3.11";
   by-version."flatiron"."0.3.11" = lib.makeOverridable self.buildNodePackage {
@@ -5840,7 +6350,7 @@
       self.by-version."timespan"."2.3.0"
       self.by-version."watch"."0.8.0"
       self.by-version."utile"."0.2.1"
-      self.by-version."winston"."0.7.2"
+      self.by-version."winston"."0.7.3"
     ];
     peerDependencies = [
     ];
@@ -6187,6 +6697,26 @@
   };
   by-spec."fs.extra".">=1.2.1 <2" =
     self.by-version."fs.extra"."1.2.1";
+  by-spec."fsevents"."0.2.0" =
+    self.by-version."fsevents"."0.2.0";
+  by-version."fsevents"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-fsevents-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fsevents/-/fsevents-0.2.0.tgz";
+        name = "fsevents-0.2.0.tgz";
+        sha1 = "1de161da042818f45bfbe11a853da8e5c6ca5d83";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fsevents" or []);
+    deps = [
+      self.by-version."nan"."0.8.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fsevents" ];
+  };
   by-spec."fstream"."0" =
     self.by-version."fstream"."0.1.25";
   by-version."fstream"."0.1.25" = lib.makeOverridable self.buildNodePackage {
@@ -6203,7 +6733,7 @@
     deps = [
       self.by-version."rimraf"."2.2.6"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."inherits"."2.0.1"
     ];
     peerDependencies = [
@@ -6264,45 +6794,45 @@
     passthru.names = [ "fstream-npm" ];
   };
   by-spec."generator-angular"."*" =
-    self.by-version."generator-angular"."0.7.1";
-  by-version."generator-angular"."0.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-generator-angular-0.7.1";
+    self.by-version."generator-angular"."0.8.0";
+  by-version."generator-angular"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-generator-angular-0.8.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.7.1.tgz";
-        name = "generator-angular-0.7.1.tgz";
-        sha1 = "51f9faed8d7c0e9d972004101cc1c16ecd1ebf65";
+        url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.8.0.tgz";
+        name = "generator-angular-0.8.0.tgz";
+        sha1 = "c2115b1a7a304b884b7f8857cade77dc36b63d13";
       })
     ];
     buildInputs =
       (self.nativeDeps."generator-angular" or []);
     deps = [
-      self.by-version."yeoman-generator"."0.13.4"
-      self.by-version."chalk"."0.3.0"
-      self.by-version."wiredep"."0.4.2"
+      self.by-version."chalk"."0.4.0"
+      self.by-version."wiredep"."1.0.0"
+      self.by-version."yeoman-generator"."0.16.0"
     ];
     peerDependencies = [
-      self.by-version."generator-karma"."0.6.0"
+      self.by-version."generator-karma"."0.7.0"
       self.by-version."yo"."1.1.2"
     ];
     passthru.names = [ "generator-angular" ];
   };
-  "generator-angular" = self.by-version."generator-angular"."0.7.1";
-  by-spec."generator-karma"."~0.6.0" =
-    self.by-version."generator-karma"."0.6.0";
-  by-version."generator-karma"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-generator-karma-0.6.0";
+  "generator-angular" = self.by-version."generator-angular"."0.8.0";
+  by-spec."generator-karma".">=0.6.0" =
+    self.by-version."generator-karma"."0.7.0";
+  by-version."generator-karma"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-generator-karma-0.7.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.6.0.tgz";
-        name = "generator-karma-0.6.0.tgz";
-        sha1 = "e89b6195c186771e8bdddde37441abb6ce07e1a0";
+        url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.7.0.tgz";
+        name = "generator-karma-0.7.0.tgz";
+        sha1 = "aaa2b6d8905b687343fe6a10b15279afd984048d";
       })
     ];
     buildInputs =
       (self.nativeDeps."generator-karma" or []);
     deps = [
-      self.by-version."yeoman-generator"."0.13.4"
+      self.by-version."yeoman-generator"."0.16.0"
     ];
     peerDependencies = [
       self.by-version."yo"."1.1.2"
@@ -6331,14 +6861,14 @@
     passthru.names = [ "generator-mocha" ];
   };
   by-spec."generator-webapp"."*" =
-    self.by-version."generator-webapp"."0.4.7";
-  by-version."generator-webapp"."0.4.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-generator-webapp-0.4.7";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.7.tgz";
-        name = "generator-webapp-0.4.7.tgz";
-        sha1 = "a42b663cbe289358046038229603e8557b6881e5";
+        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.8.tgz";
+        name = "generator-webapp-0.4.8.tgz";
+        sha1 = "d0dc7e8040ec41fe6cf42ec43291157a3bd515be";
       })
     ];
     buildInputs =
@@ -6354,7 +6884,7 @@
     ];
     passthru.names = [ "generator-webapp" ];
   };
-  "generator-webapp" = self.by-version."generator-webapp"."0.4.7";
+  "generator-webapp" = self.by-version."generator-webapp"."0.4.8";
   by-spec."getmac"."~1.0.6" =
     self.by-version."getmac"."1.0.6";
   by-version."getmac"."1.0.6" = lib.makeOverridable self.buildNodePackage {
@@ -6395,14 +6925,14 @@
     passthru.names = [ "getobject" ];
   };
   by-spec."gh"."*" =
-    self.by-version."gh"."1.8.2";
-  by-version."gh"."1.8.2" = lib.makeOverridable self.buildNodePackage {
-    name = "gh-1.8.2";
+    self.by-version."gh"."1.9.0";
+  by-version."gh"."1.9.0" = lib.makeOverridable self.buildNodePackage {
+    name = "gh-1.9.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/gh/-/gh-1.8.2.tgz";
-        name = "gh-1.8.2.tgz";
-        sha1 = "01ae9e23a617a9c08e8196078dd7b5a8b79b0156";
+        url = "http://registry.npmjs.org/gh/-/gh-1.9.0.tgz";
+        name = "gh-1.9.0.tgz";
+        sha1 = "a681f25314d2e69e4f2471fc4bf4378e9b0d8f3e";
       })
     ];
     buildInputs =
@@ -6412,32 +6942,32 @@
       self.by-version."cli-color"."0.2.3"
       self.by-version."cli-log"."0.0.8"
       self.by-version."copy-paste"."0.1.0"
-      self.by-version."moment"."2.4.0"
+      self.by-version."github"."0.1.15"
       self.by-version."handlebars"."1.0.11"
-      self.by-version."github"."0.1.14"
       self.by-version."inquirer"."0.3.5"
-      self.by-version."wordwrap"."0.0.2"
+      self.by-version."moment"."2.4.0"
       self.by-version."nopt"."2.1.2"
       self.by-version."open"."0.0.4"
       self.by-version."truncate"."1.0.2"
-      self.by-version."update-notifier"."0.1.7"
+      self.by-version."update-notifier"."0.1.8"
       self.by-version."userhome"."0.1.0"
       self.by-version."which"."1.0.5"
+      self.by-version."wordwrap"."0.0.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "gh" ];
   };
-  "gh" = self.by-version."gh"."1.8.2";
-  by-spec."github"."~0.1.12" =
-    self.by-version."github"."0.1.14";
-  by-version."github"."0.1.14" = lib.makeOverridable self.buildNodePackage {
-    name = "node-github-0.1.14";
+  "gh" = self.by-version."gh"."1.9.0";
+  by-spec."github"."~0.1.14" =
+    self.by-version."github"."0.1.15";
+  by-version."github"."0.1.15" = lib.makeOverridable self.buildNodePackage {
+    name = "node-github-0.1.15";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/github/-/github-0.1.14.tgz";
-        name = "github-0.1.14.tgz";
-        sha1 = "2a4fc150c9aee8c7a7702fa1e620d29599246322";
+        url = "http://registry.npmjs.org/github/-/github-0.1.15.tgz";
+        name = "github-0.1.15.tgz";
+        sha1 = "3df037442518fe800c75b1a243a13154d334069c";
       })
     ];
     buildInputs =
@@ -6543,28 +7073,7 @@
       (self.nativeDeps."glob" or []);
     deps = [
       self.by-version."minimatch"."0.2.14"
-      self.by-version."graceful-fs"."2.0.2"
-      self.by-version."inherits"."2.0.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "glob" ];
-  };
-  by-spec."glob"."3.2.7" =
-    self.by-version."glob"."3.2.7";
-  by-version."glob"."3.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-glob-3.2.7";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/glob/-/glob-3.2.7.tgz";
-        name = "glob-3.2.7.tgz";
-        sha1 = "275f39a0eee805694790924f36eac38e1db6d802";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."glob" or []);
-    deps = [
-      self.by-version."minimatch"."0.2.14"
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."inherits"."2.0.1"
     ];
     peerDependencies = [
@@ -6611,15 +7120,17 @@
     self.by-version."glob"."3.2.9";
   by-spec."glob"."~3.2.8" =
     self.by-version."glob"."3.2.9";
+  by-spec."glob"."~3.2.9" =
+    self.by-version."glob"."3.2.9";
   by-spec."graceful-fs"."2" =
-    self.by-version."graceful-fs"."2.0.2";
-  by-version."graceful-fs"."2.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-graceful-fs-2.0.2";
+    self.by-version."graceful-fs"."2.0.3";
+  by-version."graceful-fs"."2.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-graceful-fs-2.0.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.2.tgz";
-        name = "graceful-fs-2.0.2.tgz";
-        sha1 = "26806eaca4bff8fc5dbc935e696135792175c46f";
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz";
+        name = "graceful-fs-2.0.3.tgz";
+        sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0";
       })
     ];
     buildInputs =
@@ -6630,8 +7141,6 @@
     ];
     passthru.names = [ "graceful-fs" ];
   };
-  by-spec."graceful-fs"."^2.0.2" =
-    self.by-version."graceful-fs"."2.0.2";
   by-spec."graceful-fs"."~1" =
     self.by-version."graceful-fs"."1.2.3";
   by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -6673,11 +7182,13 @@
   by-spec."graceful-fs"."~1.2.0" =
     self.by-version."graceful-fs"."1.2.3";
   by-spec."graceful-fs"."~2" =
-    self.by-version."graceful-fs"."2.0.2";
+    self.by-version."graceful-fs"."2.0.3";
   by-spec."graceful-fs"."~2.0.0" =
-    self.by-version."graceful-fs"."2.0.2";
+    self.by-version."graceful-fs"."2.0.3";
   by-spec."graceful-fs"."~2.0.1" =
-    self.by-version."graceful-fs"."2.0.2";
+    self.by-version."graceful-fs"."2.0.3";
+  by-spec."graceful-fs"."~2.0.2" =
+    self.by-version."graceful-fs"."2.0.3";
   by-spec."gridfs-stream"."*" =
     self.by-version."gridfs-stream"."0.4.1";
   by-version."gridfs-stream"."0.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -6718,14 +7229,14 @@
     passthru.names = [ "growl" ];
   };
   by-spec."grunt"."0.4.x" =
-    self.by-version."grunt"."0.4.2";
-  by-version."grunt"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-0.4.2";
+    self.by-version."grunt"."0.4.4";
+  by-version."grunt"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-0.4.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt/-/grunt-0.4.2.tgz";
-        name = "grunt-0.4.2.tgz";
-        sha1 = "895b4f28a6102bffd41d365a65e8be2d6a293d93";
+        url = "http://registry.npmjs.org/grunt/-/grunt-0.4.4.tgz";
+        name = "grunt-0.4.4.tgz";
+        sha1 = "f37fa46e2e52e37f9a0370542a74281c09c73f53";
       })
     ];
     buildInputs =
@@ -6736,32 +7247,33 @@
       self.by-version."colors"."0.6.2"
       self.by-version."dateformat"."1.0.2-1.2.3"
       self.by-version."eventemitter2"."0.4.13"
-      self.by-version."findup-sync"."0.1.2"
+      self.by-version."findup-sync"."0.1.3"
       self.by-version."glob"."3.1.21"
       self.by-version."hooker"."0.2.3"
       self.by-version."iconv-lite"."0.2.11"
       self.by-version."minimatch"."0.2.14"
       self.by-version."nopt"."1.0.10"
-      self.by-version."rimraf"."2.0.3"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."lodash"."0.9.2"
       self.by-version."underscore.string"."2.2.1"
       self.by-version."which"."1.0.5"
       self.by-version."js-yaml"."2.0.5"
       self.by-version."exit"."0.1.2"
       self.by-version."getobject"."0.1.0"
+      self.by-version."grunt-legacy-util"."0.1.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "grunt" ];
   };
   by-spec."grunt"."^0.4.0" =
-    self.by-version."grunt"."0.4.2";
+    self.by-version."grunt"."0.4.4";
   by-spec."grunt"."~0.4" =
-    self.by-version."grunt"."0.4.2";
+    self.by-version."grunt"."0.4.4";
   by-spec."grunt"."~0.4.0" =
-    self.by-version."grunt"."0.4.2";
+    self.by-version."grunt"."0.4.4";
   by-spec."grunt"."~0.4.1" =
-    self.by-version."grunt"."0.4.2";
+    self.by-version."grunt"."0.4.4";
   by-spec."grunt-bower-task"."*" =
     self.by-version."grunt-bower-task"."0.3.4";
   by-version."grunt-bower-task"."0.3.4" = lib.makeOverridable self.buildNodePackage {
@@ -6803,7 +7315,7 @@
       (self.nativeDeps."grunt-cli" or []);
     deps = [
       self.by-version."nopt"."1.0.10"
-      self.by-version."findup-sync"."0.1.2"
+      self.by-version."findup-sync"."0.1.3"
       self.by-version."resolve"."0.3.1"
     ];
     peerDependencies = [
@@ -6828,61 +7340,64 @@
       (self.nativeDeps."grunt-contrib-cssmin" or []);
     deps = [
       self.by-version."chalk"."0.4.0"
-      self.by-version."clean-css"."2.1.4"
+      self.by-version."clean-css"."2.1.7"
       self.by-version."maxmin"."0.1.0"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.2"
+      self.by-version."grunt"."0.4.4"
     ];
     passthru.names = [ "grunt-contrib-cssmin" ];
   };
   "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.9.0";
   by-spec."grunt-contrib-jshint"."*" =
-    self.by-version."grunt-contrib-jshint"."0.8.0";
-  by-version."grunt-contrib-jshint"."0.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-jshint-0.8.0";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.8.0.tgz";
-        name = "grunt-contrib-jshint-0.8.0.tgz";
-        sha1 = "6bd52325dcce1d995dbbf648030c59e1a606acda";
+        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";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-jshint" or []);
     deps = [
       self.by-version."jshint"."2.4.4"
+      self.by-version."hooker"."0.2.3"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.2"
+      self.by-version."grunt"."0.4.4"
     ];
     passthru.names = [ "grunt-contrib-jshint" ];
   };
-  "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.8.0";
+  "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.9.2";
   by-spec."grunt-contrib-less"."*" =
-    self.by-version."grunt-contrib-less"."0.10.0";
-  by-version."grunt-contrib-less"."0.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-less-0.10.0";
+    self.by-version."grunt-contrib-less"."0.11.0";
+  by-version."grunt-contrib-less"."0.11.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-less-0.11.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.10.0.tgz";
-        name = "grunt-contrib-less-0.10.0.tgz";
-        sha1 = "542bf636ffb35f6e14c2e931855c1151b4a291b3";
+        url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.11.0.tgz";
+        name = "grunt-contrib-less-0.11.0.tgz";
+        sha1 = "601cbdda0591f7fde7fe50278cd904fedede90ed";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-less" or []);
     deps = [
       self.by-version."less"."1.7.0"
-      self.by-version."grunt-lib-contrib"."0.6.1"
       self.by-version."chalk"."0.4.0"
+      self.by-version."maxmin"."0.1.0"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."async"."0.2.10"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.2"
+      self.by-version."grunt"."0.4.4"
     ];
     passthru.names = [ "grunt-contrib-less" ];
   };
-  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.10.0";
+  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.11.0";
   by-spec."grunt-contrib-requirejs"."*" =
     self.by-version."grunt-contrib-requirejs"."0.4.3";
   by-version."grunt-contrib-requirejs"."0.4.3" = lib.makeOverridable self.buildNodePackage {
@@ -6900,7 +7415,7 @@
       self.by-version."requirejs"."2.1.11"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.2"
+      self.by-version."grunt"."0.4.4"
     ];
     passthru.names = [ "grunt-contrib-requirejs" ];
   };
@@ -6919,58 +7434,64 @@
     buildInputs =
       (self.nativeDeps."grunt-contrib-uglify" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.12"
+      self.by-version."uglify-js"."2.4.13"
       self.by-version."chalk"."0.4.0"
       self.by-version."maxmin"."0.1.0"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.2"
+      self.by-version."grunt"."0.4.4"
     ];
     passthru.names = [ "grunt-contrib-uglify" ];
   };
   "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.4.0";
   by-spec."grunt-karma"."*" =
-    self.by-version."grunt-karma"."0.7.2";
-  by-version."grunt-karma"."0.7.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-karma-0.7.2";
+    self.by-version."grunt-karma"."0.8.2";
+  by-version."grunt-karma"."0.8.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-karma-0.8.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.7.2.tgz";
-        name = "grunt-karma-0.7.2.tgz";
-        sha1 = "1d041d9833671c2bca671cd66bd874c96b2a631e";
+        url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.8.2.tgz";
+        name = "grunt-karma-0.8.2.tgz";
+        sha1 = "0f422d357e4556fb96ab68c6d9a2be46908f1c84";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-karma" or []);
     deps = [
-      self.by-version."optimist"."0.6.1"
+      self.by-version."lodash"."2.4.1"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.2"
-      self.by-version."karma"."0.11.14"
+      self.by-version."grunt"."0.4.4"
+      self.by-version."karma"."0.12.1"
     ];
     passthru.names = [ "grunt-karma" ];
   };
-  "grunt-karma" = self.by-version."grunt-karma"."0.7.2";
-  by-spec."grunt-lib-contrib"."~0.6.1" =
-    self.by-version."grunt-lib-contrib"."0.6.1";
-  by-version."grunt-lib-contrib"."0.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-lib-contrib-0.6.1";
+  "grunt-karma" = self.by-version."grunt-karma"."0.8.2";
+  by-spec."grunt-legacy-util"."~0.1.2" =
+    self.by-version."grunt-legacy-util"."0.1.2";
+  by-version."grunt-legacy-util"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-legacy-util-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-lib-contrib/-/grunt-lib-contrib-0.6.1.tgz";
-        name = "grunt-lib-contrib-0.6.1.tgz";
-        sha1 = "3f56adb7da06e814795ee2415b0ebe5fb8903ebb";
+        url = "http://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.1.2.tgz";
+        name = "grunt-legacy-util-0.1.2.tgz";
+        sha1 = "be84d337ef4a0137dc8566092a46528fd8957ebd";
       })
     ];
     buildInputs =
-      (self.nativeDeps."grunt-lib-contrib" or []);
+      (self.nativeDeps."grunt-legacy-util" or []);
     deps = [
-      self.by-version."zlib-browserify"."0.0.1"
+      self.by-version."hooker"."0.2.3"
+      self.by-version."async"."0.1.22"
+      self.by-version."lodash"."0.9.2"
+      self.by-version."exit"."0.1.2"
+      self.by-version."underscore.string"."2.2.1"
+      self.by-version."getobject"."0.1.0"
+      self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "grunt-lib-contrib" ];
+    passthru.names = [ "grunt-legacy-util" ];
   };
   by-spec."grunt-sed"."*" =
     self.by-version."grunt-sed"."0.1.1";
@@ -6989,7 +7510,7 @@
       self.by-version."replace"."0.2.9"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.2"
+      self.by-version."grunt"."0.4.4"
     ];
     passthru.names = [ "grunt-sed" ];
   };
@@ -7010,7 +7531,7 @@
     deps = [
       self.by-version."coffee-script"."1.7.1"
       self.by-version."jade"."1.3.0"
-      self.by-version."q"."1.0.0"
+      self.by-version."q"."2.0.1"
       self.by-version."xml2js"."0.4.1"
       self.by-version."msgpack"."0.2.2"
     ];
@@ -7033,7 +7554,7 @@
     buildInputs =
       (self.nativeDeps."gzip-size" or []);
     deps = [
-      self.by-version."concat-stream"."1.4.1"
+      self.by-version."concat-stream"."1.4.4"
       self.by-version."zlib-browserify"."0.0.3"
     ];
     peerDependencies = [
@@ -7082,15 +7603,15 @@
     ];
     passthru.names = [ "handlebars" ];
   };
-  by-spec."handlebars"."1.0.x" =
-    self.by-version."handlebars"."1.0.12";
-  by-version."handlebars"."1.0.12" = lib.makeOverridable self.buildNodePackage {
-    name = "handlebars-1.0.12";
+  by-spec."handlebars"."1.3.x" =
+    self.by-version."handlebars"."1.3.0";
+  by-version."handlebars"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "handlebars-1.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/handlebars/-/handlebars-1.0.12.tgz";
-        name = "handlebars-1.0.12.tgz";
-        sha1 = "18c6d3440c35e91b19b3ff582b9151ab4985d4fc";
+        url = "http://registry.npmjs.org/handlebars/-/handlebars-1.3.0.tgz";
+        name = "handlebars-1.3.0.tgz";
+        sha1 = "9e9b130a93e389491322d975cf3ec1818c37ce34";
       })
     ];
     buildInputs =
@@ -7103,15 +7624,15 @@
     ];
     passthru.names = [ "handlebars" ];
   };
-  by-spec."handlebars"."1.3.x" =
-    self.by-version."handlebars"."1.3.0";
-  by-version."handlebars"."1.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "handlebars-1.3.0";
+  by-spec."handlebars"."~1.0.11" =
+    self.by-version."handlebars"."1.0.12";
+  by-version."handlebars"."1.0.12" = lib.makeOverridable self.buildNodePackage {
+    name = "handlebars-1.0.12";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/handlebars/-/handlebars-1.3.0.tgz";
-        name = "handlebars-1.3.0.tgz";
-        sha1 = "9e9b130a93e389491322d975cf3ec1818c37ce34";
+        url = "http://registry.npmjs.org/handlebars/-/handlebars-1.0.12.tgz";
+        name = "handlebars-1.0.12.tgz";
+        sha1 = "18c6d3440c35e91b19b3ff582b9151ab4985d4fc";
       })
     ];
     buildInputs =
@@ -7124,8 +7645,8 @@
     ];
     passthru.names = [ "handlebars" ];
   };
-  by-spec."handlebars"."~1.0.11" =
-    self.by-version."handlebars"."1.0.12";
+  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 {
@@ -7672,27 +8193,28 @@
     passthru.names = [ "i18next" ];
   };
   "i18next" = self.by-version."i18next"."1.7.1";
-  by-spec."ibrik"."~1.0.1" =
-    self.by-version."ibrik"."1.0.1";
-  by-version."ibrik"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "ibrik-1.0.1";
+  by-spec."ibrik"."~1.1.1" =
+    self.by-version."ibrik"."1.1.1";
+  by-version."ibrik"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "ibrik-1.1.1";
     src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/ibrik/-/ibrik-1.0.1.tgz";
-        name = "ibrik-1.0.1.tgz";
-        sha1 = "ba9c0cf9302c51a812dc4a92038b3de579c0aefb";
+      (fetchurl {
+        url = "http://registry.npmjs.org/ibrik/-/ibrik-1.1.1.tgz";
+        name = "ibrik-1.1.1.tgz";
+        sha1 = "c9bd04c5137e967a2f0dbc9e4eb31dbfa04801b5";
       })
     ];
     buildInputs =
       (self.nativeDeps."ibrik" or []);
     deps = [
-      self.by-version."coffee-script-redux"."2.0.0-beta4"
-      self.by-version."istanbul"."0.2.4"
-      self.by-version."optimist"."0.6.1"
-      self.by-version."escodegen"."1.2.0"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."which"."1.0.5"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."coffee-script-redux"."2.0.0-beta8"
+      self.by-version."istanbul"."0.2.6"
       self.by-version."estraverse"."1.5.0"
+      self.by-version."escodegen"."1.1.0"
+      self.by-version."which"."1.0.5"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."optimist"."0.6.1"
     ];
     peerDependencies = [
     ];
@@ -7828,15 +8350,15 @@
     self.by-version."ini"."1.1.0";
   by-spec."ini"."~1.1.0" =
     self.by-version."ini"."1.1.0";
-  by-spec."init-package-json"."0.0.14" =
-    self.by-version."init-package-json"."0.0.14";
-  by-version."init-package-json"."0.0.14" = lib.makeOverridable self.buildNodePackage {
-    name = "node-init-package-json-0.0.14";
+  by-spec."init-package-json"."0.0.15" =
+    self.by-version."init-package-json"."0.0.15";
+  by-version."init-package-json"."0.0.15" = lib.makeOverridable self.buildNodePackage {
+    name = "node-init-package-json-0.0.15";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.14.tgz";
-        name = "init-package-json-0.0.14.tgz";
-        sha1 = "bd5f7b2d73b54957388cca3ce61190340c8a05b7";
+        url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.15.tgz";
+        name = "init-package-json-0.0.15.tgz";
+        sha1 = "d40f0201e4de6aa2b3fdc4208ae162766703ebed";
       })
     ];
     buildInputs =
@@ -7844,7 +8366,7 @@
     deps = [
       self.by-version."promzard"."0.2.1"
       self.by-version."read"."1.0.5"
-      self.by-version."read-package-json"."1.1.7"
+      self.by-version."read-package-json"."1.1.8"
       self.by-version."semver"."2.2.1"
       self.by-version."glob"."3.2.9"
     ];
@@ -7942,7 +8464,7 @@
       self.by-version."process"."0.5.2"
       self.by-version."through"."2.3.4"
       self.by-version."JSONStream"."0.7.1"
-      self.by-version."concat-stream"."1.4.1"
+      self.by-version."concat-stream"."1.4.4"
     ];
     peerDependencies = [
     ];
@@ -7964,7 +8486,7 @@
     deps = [
       self.by-version."chalk"."0.4.0"
       self.by-version."request"."2.27.0"
-      self.by-version."configstore"."0.2.2"
+      self.by-version."configstore"."0.2.3"
       self.by-version."async"."0.2.10"
       self.by-version."inquirer"."0.4.1"
       self.by-version."object-assign"."0.1.2"
@@ -8008,11 +8530,11 @@
       (self.nativeDeps."ironhorse" or []);
     deps = [
       self.by-version."underscore"."1.5.2"
-      self.by-version."winston"."0.7.2"
+      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.2.10"
-      self.by-version."express"."4.0.0-rc2"
+      self.by-version."express"."4.0.0-rc4"
       self.by-version."jade"."1.3.0"
       self.by-version."passport"."0.2.0"
       self.by-version."passport-http"."0.2.2"
@@ -8048,19 +8570,38 @@
     ];
     passthru.names = [ "is-promise" ];
   };
-  by-spec."isbinaryfile"."~0.1.8" =
-    self.by-version."isbinaryfile"."0.1.9";
-  by-version."isbinaryfile"."0.1.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-isbinaryfile-0.1.9";
+  by-spec."is-root"."~0.1.0" =
+    self.by-version."is-root"."0.1.0";
+  by-version."is-root"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-is-root-0.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz";
-        name = "isbinaryfile-0.1.9.tgz";
-        sha1 = "15eece35c4ab708d8924da99fb874f2b5cc0b6c4";
+        url = "http://registry.npmjs.org/is-root/-/is-root-0.1.0.tgz";
+        name = "is-root-0.1.0.tgz";
+        sha1 = "825e394ab593df2d73c5d0092fce507270b53dcb";
       })
     ];
     buildInputs =
-      (self.nativeDeps."isbinaryfile" or []);
+      (self.nativeDeps."is-root" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "is-root" ];
+  };
+  by-spec."isbinaryfile"."~0.1.8" =
+    self.by-version."isbinaryfile"."0.1.9";
+  by-version."isbinaryfile"."0.1.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-isbinaryfile-0.1.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz";
+        name = "isbinaryfile-0.1.9.tgz";
+        sha1 = "15eece35c4ab708d8924da99fb874f2b5cc0b6c4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."isbinaryfile" or []);
     deps = [
     ];
     peerDependencies = [
@@ -8089,67 +8630,41 @@
     passthru.names = [ "isbinaryfile" ];
   };
   by-spec."istanbul"."*" =
-    self.by-version."istanbul"."0.2.4";
-  by-version."istanbul"."0.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "istanbul-0.2.4";
+    self.by-version."istanbul"."0.2.6";
+  by-version."istanbul"."0.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "istanbul-0.2.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.4.tgz";
-        name = "istanbul-0.2.4.tgz";
-        sha1 = "faaaa400f2cf652c3dc8b3d9484b44a5528e3a04";
+        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.6.tgz";
+        name = "istanbul-0.2.6.tgz";
+        sha1 = "2c56f1c715aa47fc67eed291123adef8bc45e6a1";
       })
     ];
     buildInputs =
       (self.nativeDeps."istanbul" or []);
     deps = [
       self.by-version."esprima"."1.0.4"
-      self.by-version."escodegen"."1.0.1"
+      self.by-version."escodegen"."1.2.0"
       self.by-version."handlebars"."1.3.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."nopt"."2.1.2"
+      self.by-version."nopt"."2.2.0"
       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."wordwrap"."0.0.2"
-      self.by-version."resolve"."0.6.1"
+      self.by-version."resolve"."0.6.2"
       self.by-version."js-yaml"."3.0.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "istanbul" ];
   };
-  "istanbul" = self.by-version."istanbul"."0.2.4";
-  by-spec."istanbul"."~0.1.45" =
-    self.by-version."istanbul"."0.1.46";
-  by-version."istanbul"."0.1.46" = lib.makeOverridable self.buildNodePackage {
-    name = "istanbul-0.1.46";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.1.46.tgz";
-        name = "istanbul-0.1.46.tgz";
-        sha1 = "cefeb1c787d125a6db23bd0f63b0eb9390b0b40d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."istanbul" or []);
-    deps = [
-      self.by-version."esprima"."1.0.4"
-      self.by-version."escodegen"."0.0.23"
-      self.by-version."handlebars"."1.0.12"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."nopt"."2.1.2"
-      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."wordwrap"."0.0.2"
-      self.by-version."resolve"."0.5.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "istanbul" ];
-  };
+  "istanbul" = self.by-version."istanbul"."0.2.6";
+  by-spec."istanbul"."~0.2.3" =
+    self.by-version."istanbul"."0.2.6";
+  by-spec."istanbul"."~0.2.4" =
+    self.by-version."istanbul"."0.2.6";
   by-spec."jade"."*" =
     self.by-version."jade"."1.3.0";
   by-version."jade"."1.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -8274,14 +8789,14 @@
     passthru.names = [ "jade" ];
   };
   by-spec."jayschema"."*" =
-    self.by-version."jayschema"."0.2.5";
-  by-version."jayschema"."0.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "jayschema-0.2.5";
+    self.by-version."jayschema"."0.2.6";
+  by-version."jayschema"."0.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "jayschema-0.2.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.5.tgz";
-        name = "jayschema-0.2.5.tgz";
-        sha1 = "314e87687eac703a0a2557d77dbb3f175a0e7ada";
+        url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.6.tgz";
+        name = "jayschema-0.2.6.tgz";
+        sha1 = "c160e767cef66babda76b0fc34a06d4adc44965d";
       })
     ];
     buildInputs =
@@ -8293,26 +8808,7 @@
     ];
     passthru.names = [ "jayschema" ];
   };
-  "jayschema" = self.by-version."jayschema"."0.2.5";
-  by-spec."jedediah"."~0.1.0" =
-    self.by-version."jedediah"."0.1.1";
-  by-version."jedediah"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-jedediah-0.1.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jedediah/-/jedediah-0.1.1.tgz";
-        name = "jedediah-0.1.1.tgz";
-        sha1 = "51f33021ebec6847d844cb53bbc086ee38877f84";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jedediah" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "jedediah" ];
-  };
+  "jayschema" = self.by-version."jayschema"."0.2.6";
   by-spec."js-yaml"."*" =
     self.by-version."js-yaml"."3.0.2";
   by-version."js-yaml"."3.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -8419,27 +8915,6 @@
     ];
     passthru.names = [ "js-yaml" ];
   };
-  by-spec."js-yaml"."~2.1.0" =
-    self.by-version."js-yaml"."2.1.3";
-  by-version."js-yaml"."2.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "js-yaml-2.1.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.3.tgz";
-        name = "js-yaml-2.1.3.tgz";
-        sha1 = "0ffb5617be55525878063d7a16aee7fdd282e84c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."js-yaml" or []);
-    deps = [
-      self.by-version."argparse"."0.1.15"
-      self.by-version."esprima"."1.0.4"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "js-yaml" ];
-  };
   by-spec."js-yaml"."~3.0.1" =
     self.by-version."js-yaml"."3.0.2";
   by-spec."jsesc"."0.4.3" =
@@ -8668,14 +9143,14 @@
     passthru.names = [ "junk" ];
   };
   by-spec."karma"."*" =
-    self.by-version."karma"."0.11.14";
-  by-version."karma"."0.11.14" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-0.11.14";
+    self.by-version."karma"."0.12.1";
+  by-version."karma"."0.12.1" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-0.12.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.11.14.tgz";
-        name = "karma-0.11.14.tgz";
-        sha1 = "2f6f81611bfe62e588d4e1d63c14f3928971a77c";
+        url = "http://registry.npmjs.org/karma/-/karma-0.12.1.tgz";
+        name = "karma-0.12.1.tgz";
+        sha1 = "7e785eea935174c8d53d9841f82380079d8c077b";
       })
     ];
     buildInputs =
@@ -8683,20 +9158,19 @@
     deps = [
       self.by-version."di"."0.0.1"
       self.by-version."socket.io"."0.9.16"
-      self.by-version."chokidar"."0.8.1"
+      self.by-version."chokidar"."0.8.2"
       self.by-version."glob"."3.2.9"
       self.by-version."minimatch"."0.2.14"
       self.by-version."http-proxy"."0.10.4"
       self.by-version."optimist"."0.6.1"
-      self.by-version."coffee-script"."1.6.3"
       self.by-version."rimraf"."2.2.6"
       self.by-version."q"."0.9.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."useragent"."2.0.7"
-      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."useragent"."2.0.8"
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."connect"."2.12.0"
       self.by-version."source-map"."0.1.33"
     ];
@@ -8704,15 +9178,15 @@
     ];
     passthru.names = [ "karma" ];
   };
-  "karma" = self.by-version."karma"."0.11.14";
+  "karma" = self.by-version."karma"."0.12.1";
   by-spec."karma".">=0.11.11" =
-    self.by-version."karma"."0.11.14";
+    self.by-version."karma"."0.12.1";
   by-spec."karma".">=0.9" =
-    self.by-version."karma"."0.11.14";
+    self.by-version."karma"."0.12.1";
   by-spec."karma".">=0.9.3" =
-    self.by-version."karma"."0.11.14";
-  by-spec."karma"."~0.11.0" =
-    self.by-version."karma"."0.11.14";
+    self.by-version."karma"."0.12.1";
+  by-spec."karma"."~0.12.0" =
+    self.by-version."karma"."0.12.1";
   by-spec."karma-chrome-launcher"."*" =
     self.by-version."karma-chrome-launcher"."0.1.2";
   by-version."karma-chrome-launcher"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -8729,35 +9203,35 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.14"
+      self.by-version."karma"."0.12.1"
     ];
     passthru.names = [ "karma-chrome-launcher" ];
   };
   "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.2";
   by-spec."karma-coverage"."*" =
-    self.by-version."karma-coverage"."0.2.0";
-  by-version."karma-coverage"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-coverage-0.2.0";
+    self.by-version."karma-coverage"."0.2.1";
+  by-version."karma-coverage"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-coverage-0.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.0.tgz";
-        name = "karma-coverage-0.2.0.tgz";
-        sha1 = "d8edc429c35ab7c68fa90a5cd2f2ecb3aa31fde8";
+        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.1.tgz";
+        name = "karma-coverage-0.2.1.tgz";
+        sha1 = "3b1bce268711a631e008e108930906eceae0a623";
       })
     ];
     buildInputs =
       (self.nativeDeps."karma-coverage" or []);
     deps = [
-      self.by-version."istanbul"."0.1.46"
-      self.by-version."ibrik"."1.0.1"
+      self.by-version."istanbul"."0.2.6"
+      self.by-version."ibrik"."1.1.1"
       self.by-version."dateformat"."1.0.7-1.2.3"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.14"
+      self.by-version."karma"."0.12.1"
     ];
     passthru.names = [ "karma-coverage" ];
   };
-  "karma-coverage" = self.by-version."karma-coverage"."0.2.0";
+  "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 {
@@ -8775,20 +9249,20 @@
       self.by-version."xmlbuilder"."0.4.2"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.14"
+      self.by-version."karma"."0.12.1"
     ];
     passthru.names = [ "karma-junit-reporter" ];
   };
   "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.1";
   by-spec."karma-mocha"."*" =
-    self.by-version."karma-mocha"."0.1.1";
-  by-version."karma-mocha"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-mocha-0.1.1";
+    self.by-version."karma-mocha"."0.1.3";
+  by-version."karma-mocha"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-mocha-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.1.tgz";
-        name = "karma-mocha-0.1.1.tgz";
-        sha1 = "5edddb3e2d2c6fd47e9ad26f0af1595fe852c756";
+        url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.3.tgz";
+        name = "karma-mocha-0.1.3.tgz";
+        sha1 = "396e44be8ddb4abf28bfca0387924c3aeddbce1a";
       })
     ];
     buildInputs =
@@ -8796,12 +9270,12 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.14"
-      self.by-version."mocha"."1.17.1"
+      self.by-version."karma"."0.12.1"
+      self.by-version."mocha"."1.18.2"
     ];
     passthru.names = [ "karma-mocha" ];
   };
-  "karma-mocha" = self.by-version."karma-mocha"."0.1.1";
+  "karma-mocha" = self.by-version."karma-mocha"."0.1.3";
   by-spec."karma-requirejs"."*" =
     self.by-version."karma-requirejs"."0.2.1";
   by-version."karma-requirejs"."0.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -8818,37 +9292,37 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.14"
+      self.by-version."karma"."0.12.1"
       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.0";
-  by-version."karma-sauce-launcher"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-sauce-launcher-0.2.0";
+    self.by-version."karma-sauce-launcher"."0.2.4";
+  by-version."karma-sauce-launcher"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-sauce-launcher-0.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.0.tgz";
-        name = "karma-sauce-launcher-0.2.0.tgz";
-        sha1 = "0994da49a1774be876ff1b107fd47e8768e3ead0";
+        url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.4.tgz";
+        name = "karma-sauce-launcher-0.2.4.tgz";
+        sha1 = "9d33b23d44c7580ea0d9d1651fd56d96276d8cd7";
       })
     ];
     buildInputs =
       (self.nativeDeps."karma-sauce-launcher" or []);
     deps = [
-      self.by-version."wd"."0.2.11"
-      self.by-version."sauce-connect-launcher"."0.2.2"
+      self.by-version."wd"."0.2.13"
+      self.by-version."sauce-connect-launcher"."0.3.2"
       self.by-version."q"."0.9.7"
       self.by-version."saucelabs"."0.1.1"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.14"
+      self.by-version."karma"."0.12.1"
     ];
     passthru.names = [ "karma-sauce-launcher" ];
   };
-  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.0";
+  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.4";
   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 {
@@ -9115,7 +9589,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"."^1.7.0" =
     self.by-version."less"."1.7.0";
   by-version."less"."1.7.0" = lib.makeOverridable self.buildNodePackage {
     name = "less-1.7.0";
@@ -9132,13 +9606,15 @@
       self.by-version."mime"."1.2.11"
       self.by-version."request"."2.34.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."clean-css"."2.1.4"
+      self.by-version."clean-css"."2.1.7"
       self.by-version."source-map"."0.1.33"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "less" ];
   };
+  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 {
@@ -9218,6 +9694,25 @@
     ];
     passthru.names = [ "lockfile" ];
   };
+  by-spec."lodash"."^2.4.1" =
+    self.by-version."lodash"."2.4.1";
+  by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz";
+        name = "lodash-2.4.1.tgz";
+        sha1 = "5b7723034dda4d262e5a46fb2c58d7cc22f71420";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash" ];
+  };
   by-spec."lodash"."~0.10.0" =
     self.by-version."lodash"."0.10.0";
   by-version."lodash"."0.10.0" = lib.makeOverridable self.buildNodePackage {
@@ -9256,25 +9751,6 @@
     ];
     passthru.names = [ "lodash" ];
   };
-  by-spec."lodash"."~1.0.1" =
-    self.by-version."lodash"."1.0.1";
-  by-version."lodash"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash-1.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz";
-        name = "lodash-1.0.1.tgz";
-        sha1 = "57945732498d92310e5bd4b1ff4f273a79e6c9fc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash" ];
-  };
   by-spec."lodash"."~1.2.1" =
     self.by-version."lodash"."1.2.1";
   by-version."lodash"."1.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -9355,23 +9831,6 @@
   };
   by-spec."lodash"."~2.4.1" =
     self.by-version."lodash"."2.4.1";
-  by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz";
-        name = "lodash-2.4.1.tgz";
-        sha1 = "5b7723034dda4d262e5a46fb2c58d7cc22f71420";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash" ];
-  };
   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 {
@@ -9615,14 +10074,14 @@
     passthru.names = [ "long" ];
   };
   by-spec."longjohn"."~0.2.2" =
-    self.by-version."longjohn"."0.2.2";
-  by-version."longjohn"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-longjohn-0.2.2";
+    self.by-version."longjohn"."0.2.4";
+  by-version."longjohn"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-longjohn-0.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/longjohn/-/longjohn-0.2.2.tgz";
-        name = "longjohn-0.2.2.tgz";
-        sha1 = "f1110be9407b2dfc13713cb5b57cb69ef843c4d9";
+        url = "http://registry.npmjs.org/longjohn/-/longjohn-0.2.4.tgz";
+        name = "longjohn-0.2.4.tgz";
+        sha1 = "48436a1f359e7666f678e2170ee1f43bba8f8b4c";
       })
     ];
     buildInputs =
@@ -9903,26 +10362,27 @@
     ];
     passthru.names = [ "merge-descriptors" ];
   };
-  by-spec."methods"."0.0.1" =
-    self.by-version."methods"."0.0.1";
-  by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-methods-0.0.1";
+  by-spec."method-override"."1.0.0" =
+    self.by-version."method-override"."1.0.0";
+  by-version."method-override"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-method-override-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
-        name = "methods-0.0.1.tgz";
-        sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c";
+        url = "http://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz";
+        name = "method-override-1.0.0.tgz";
+        sha1 = "9e5bfbd80f3b9e043801dd3fe60bbab0f15b5f61";
       })
     ];
     buildInputs =
-      (self.nativeDeps."methods" or []);
+      (self.nativeDeps."method-override" or []);
     deps = [
+      self.by-version."methods"."0.1.0"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "methods" ];
+    passthru.names = [ "method-override" ];
   };
-  by-spec."methods"."0.1.0" =
+  by-spec."methods"."*" =
     self.by-version."methods"."0.1.0";
   by-version."methods"."0.1.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-methods-0.1.0";
@@ -9941,6 +10401,27 @@
     ];
     passthru.names = [ "methods" ];
   };
+  by-spec."methods"."0.0.1" =
+    self.by-version."methods"."0.0.1";
+  by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-methods-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
+        name = "methods-0.0.1.tgz";
+        sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."methods" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "methods" ];
+  };
+  by-spec."methods"."0.1.0" =
+    self.by-version."methods"."0.1.0";
   by-spec."mime"."*" =
     self.by-version."mime"."1.2.11";
   by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage {
@@ -10267,14 +10748,14 @@
     passthru.names = [ "mkpath" ];
   };
   by-spec."mocha"."*" =
-    self.by-version."mocha"."1.17.1";
-  by-version."mocha"."1.17.1" = lib.makeOverridable self.buildNodePackage {
-    name = "mocha-1.17.1";
+    self.by-version."mocha"."1.18.2";
+  by-version."mocha"."1.18.2" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-1.18.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mocha/-/mocha-1.17.1.tgz";
-        name = "mocha-1.17.1.tgz";
-        sha1 = "7f7671d68526d074b7bae660c9099f87e0ea1ccb";
+        url = "http://registry.npmjs.org/mocha/-/mocha-1.18.2.tgz";
+        name = "mocha-1.18.2.tgz";
+        sha1 = "800848f8f7884c61eefcfa2a27304ba9e5446d0b";
       })
     ];
     buildInputs =
@@ -10292,7 +10773,7 @@
     ];
     passthru.names = [ "mocha" ];
   };
-  "mocha" = self.by-version."mocha"."1.17.1";
+  "mocha" = self.by-version."mocha"."1.18.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 {
@@ -10334,8 +10815,8 @@
       self.by-version."through"."2.3.4"
       self.by-version."JSONStream"."0.7.1"
       self.by-version."browser-resolve"."1.2.2"
-      self.by-version."resolve"."0.6.1"
-      self.by-version."concat-stream"."1.4.1"
+      self.by-version."resolve"."0.6.2"
+      self.by-version."concat-stream"."1.4.4"
       self.by-version."minimist"."0.0.8"
       self.by-version."parents"."0.0.2"
       self.by-version."detective"."2.4.1"
@@ -10402,14 +10883,14 @@
     passthru.names = [ "moment" ];
   };
   by-spec."mongodb"."*" =
-    self.by-version."mongodb"."1.4.0-rc8";
-  by-version."mongodb"."1.4.0-rc8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mongodb-1.4.0-rc8";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc8.tgz";
-        name = "mongodb-1.4.0-rc8.tgz";
-        sha1 = "3c6048070935d2b1c7e997dd77be70119e33cced";
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc9.tgz";
+        name = "mongodb-1.4.0-rc9.tgz";
+        sha1 = "1b3887e9b2846de7557a009e1702f7dbc70d4c12";
       })
     ];
     buildInputs =
@@ -10422,7 +10903,7 @@
     ];
     passthru.names = [ "mongodb" ];
   };
-  "mongodb" = self.by-version."mongodb"."1.4.0-rc8";
+  "mongodb" = self.by-version."mongodb"."1.4.0-rc9";
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
   by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
@@ -10649,6 +11130,26 @@
     ];
     passthru.names = [ "monocle" ];
   };
+  by-spec."morgan"."1.0.0" =
+    self.by-version."morgan"."1.0.0";
+  by-version."morgan"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-morgan-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz";
+        name = "morgan-1.0.0.tgz";
+        sha1 = "83cf74b9f2d841901f1a9a6b8fa7a468d2e47a8d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."morgan" or []);
+    deps = [
+      self.by-version."bytes"."0.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "morgan" ];
+  };
   by-spec."mout"."~0.6.0" =
     self.by-version."mout"."0.6.0";
   by-version."mout"."0.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -10687,6 +11188,25 @@
     ];
     passthru.names = [ "mout" ];
   };
+  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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mout/-/mout-0.9.0.tgz";
+        name = "mout-0.9.0.tgz";
+        sha1 = "4b6ef8cae5099151d9a7ddb6ebb9a56f9de6aaeb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mout" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mout" ];
+  };
   by-spec."mpath"."0.1.1" =
     self.by-version."mpath"."0.1.1";
   by-version."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -11090,6 +11610,25 @@
     ];
     passthru.names = [ "negotiator" ];
   };
+  by-spec."negotiator"."0.4.2" =
+    self.by-version."negotiator"."0.4.2";
+  by-version."negotiator"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-negotiator-0.4.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz";
+        name = "negotiator-0.4.2.tgz";
+        sha1 = "8c43ea7e4c40ddfe40c3c0234c4ef77500b8fd37";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."negotiator" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "negotiator" ];
+  };
   by-spec."negotiator"."~0.3.0" =
     self.by-version."negotiator"."0.3.0";
   by-spec."net-ping"."1.1.7" =
@@ -11241,7 +11780,7 @@
       (self.nativeDeps."node-gyp" or []);
     deps = [
       self.by-version."glob"."3.2.9"
-      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."fstream"."0.1.25"
       self.by-version."minimatch"."0.2.14"
       self.by-version."mkdirp"."0.3.5"
@@ -11259,47 +11798,17 @@
     passthru.names = [ "node-gyp" ];
   };
   "node-gyp" = self.by-version."node-gyp"."0.13.0";
-  by-spec."node-gyp"."~0.12.2" =
-    self.by-version."node-gyp"."0.12.2";
-  by-version."node-gyp"."0.12.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-gyp-0.12.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.12.2.tgz";
-        name = "node-gyp-0.12.2.tgz";
-        sha1 = "bdca7e7025feb308ddd7fd3434300e47703ec57a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-gyp" or []);
-    deps = [
-      self.by-version."glob"."3.2.9"
-      self.by-version."graceful-fs"."2.0.2"
-      self.by-version."fstream"."0.1.25"
-      self.by-version."minimatch"."0.2.14"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."nopt"."2.2.0"
-      self.by-version."npmlog"."0.0.6"
-      self.by-version."osenv"."0.0.3"
-      self.by-version."request"."2.34.0"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."semver"."2.2.1"
-      self.by-version."tar"."0.1.19"
-      self.by-version."which"."1.0.5"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-gyp" ];
-  };
+  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.0";
-  by-version."node-inspector"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-inspector-0.7.0";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.0.tgz";
-        name = "node-inspector-0.7.0.tgz";
-        sha1 = "b035e94e4bca3279ebabbb4df871ad8931919d9c";
+        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.2.tgz";
+        name = "node-inspector-0.7.2.tgz";
+        sha1 = "b9f1a1bbec7960d504edbfbc4bf191841794aab8";
       })
     ];
     buildInputs =
@@ -11320,7 +11829,7 @@
     ];
     passthru.names = [ "node-inspector" ];
   };
-  "node-inspector" = self.by-version."node-inspector"."0.7.0";
+  "node-inspector" = self.by-version."node-inspector"."0.7.2";
   by-spec."node-protobuf"."*" =
     self.by-version."node-protobuf"."1.0.10";
   by-version."node-protobuf"."1.0.10" = lib.makeOverridable self.buildNodePackage {
@@ -11531,7 +12040,7 @@
       (self.nativeDeps."nodemailer" or []);
     deps = [
       self.by-version."mailcomposer"."0.2.8"
-      self.by-version."simplesmtp"."0.3.22"
+      self.by-version."simplesmtp"."0.3.23"
       self.by-version."optimist"."0.6.1"
     ];
     peerDependencies = [
@@ -11539,27 +12048,27 @@
     passthru.names = [ "nodemailer" ];
   };
   by-spec."nodemon"."*" =
-    self.by-version."nodemon"."1.0.15";
-  by-version."nodemon"."1.0.15" = lib.makeOverridable self.buildNodePackage {
-    name = "nodemon-1.0.15";
+    self.by-version."nodemon"."1.0.17";
+  by-version."nodemon"."1.0.17" = lib.makeOverridable self.buildNodePackage {
+    name = "nodemon-1.0.17";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.15.tgz";
-        name = "nodemon-1.0.15.tgz";
-        sha1 = "32efa6b8134d579dca8894cd9e8a27d381387f11";
+        url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.17.tgz";
+        name = "nodemon-1.0.17.tgz";
+        sha1 = "910a3f3cb66c06a3499498455cf4e0119f75799c";
       })
     ];
     buildInputs =
       (self.nativeDeps."nodemon" or []);
     deps = [
-      self.by-version."update-notifier"."0.1.7"
+      self.by-version."update-notifier"."0.1.8"
       self.by-version."minimatch"."0.2.14"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "nodemon" ];
   };
-  "nodemon" = self.by-version."nodemon"."1.0.15";
+  "nodemon" = self.by-version."nodemon"."1.0.17";
   by-spec."nomnom"."1.6.x" =
     self.by-version."nomnom"."1.6.2";
   by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage {
@@ -11621,15 +12130,17 @@
     ];
     passthru.names = [ "nopt" ];
   };
-  by-spec."nopt"."2.1.x" =
-    self.by-version."nopt"."2.1.2";
-  by-version."nopt"."2.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "nopt-2.1.2";
+  by-spec."nopt"."2.2.x" =
+    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 {
+    name = "nopt-1.0.10";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
-        name = "nopt-2.1.2.tgz";
-        sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
+        url = "http://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
+        name = "nopt-1.0.10.tgz";
+        sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       })
     ];
     buildInputs =
@@ -11641,17 +12152,15 @@
     ];
     passthru.names = [ "nopt" ];
   };
-  by-spec."nopt"."^2.2.0" =
-    self.by-version."nopt"."2.2.0";
-  by-spec."nopt"."https://github.com/Filirom1/nopt/tarball/master#pull-request-in-progress" =
-    self.by-version."nopt"."1.0.10";
-  by-version."nopt"."1.0.10" = lib.makeOverridable self.buildNodePackage {
-    name = "nopt-1.0.10";
+  by-spec."nopt"."~2.1.1" =
+    self.by-version."nopt"."2.1.2";
+  by-version."nopt"."2.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-2.1.2";
     src = [
       (fetchurl {
-        url = "https://github.com/Filirom1/nopt/tarball/master#pull-request-in-progress";
-        name = "nopt-1.0.10.tgz";
-        sha256 = "94daa53a0ab7668be12931b7b551c924c913d1efef7f2a05e60704c9b90a7bad";
+        url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
+        name = "nopt-2.1.2.tgz";
+        sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
       })
     ];
     buildInputs =
@@ -11663,12 +12172,10 @@
     ];
     passthru.names = [ "nopt" ];
   };
-  by-spec."nopt"."~1.0.10" =
-    self.by-version."nopt"."1.0.10";
-  by-spec."nopt"."~2.1.1" =
-    self.by-version."nopt"."2.1.2";
   by-spec."nopt"."~2.1.2" =
     self.by-version."nopt"."2.1.2";
+  by-spec."nopt"."~2.2.0" =
+    self.by-version."nopt"."2.2.0";
   by-spec."normalize-package-data"."~0.2.9" =
     self.by-version."normalize-package-data"."0.2.12";
   by-version."normalize-package-data"."0.2.12" = lib.makeOverridable self.buildNodePackage {
@@ -11692,73 +12199,74 @@
     passthru.names = [ "normalize-package-data" ];
   };
   by-spec."npm"."*" =
-    self.by-version."npm"."1.4.4";
-  by-version."npm"."1.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "npm-1.4.4";
+    self.by-version."npm"."1.4.6";
+  by-version."npm"."1.4.6" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-1.4.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm/-/npm-1.4.4.tgz";
-        name = "npm-1.4.4.tgz";
-        sha1 = "076616f7af95bcd08a4c5ad5cce18c5f370e0935";
+        url = "http://registry.npmjs.org/npm/-/npm-1.4.6.tgz";
+        name = "npm-1.4.6.tgz";
+        sha1 = "0e151bce38e72cf2206a6299fa5164123f04256e";
       })
     ];
     buildInputs =
       (self.nativeDeps."npm" or []);
     deps = [
-      self.by-version."semver"."2.2.1"
-      self.by-version."ini"."1.1.0"
-      self.by-version."slide"."1.1.5"
       self.by-version."abbrev"."1.0.4"
-      self.by-version."graceful-fs"."2.0.2"
-      self.by-version."minimatch"."0.2.14"
-      self.by-version."nopt"."2.2.0"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."request"."2.30.0"
-      self.by-version."which"."1.0.5"
-      self.by-version."tar"."0.1.19"
-      self.by-version."fstream"."0.1.25"
-      self.by-version."block-stream"."0.0.7"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."read"."1.0.5"
-      self.by-version."lru-cache"."2.5.0"
-      self.by-version."node-gyp"."0.12.2"
-      self.by-version."fstream-npm"."0.1.6"
-      self.by-version."uid-number"."0.0.5"
-      self.by-version."archy"."0.0.2"
-      self.by-version."chownr"."0.0.1"
-      self.by-version."npmlog"."0.0.6"
       self.by-version."ansi"."0.2.1"
-      self.by-version."npm-registry-client"."0.4.4"
-      self.by-version."read-package-json"."1.1.7"
-      self.by-version."read-installed"."1.0.0"
-      self.by-version."glob"."3.2.7"
-      self.by-version."init-package-json"."0.0.14"
-      self.by-version."osenv"."0.0.3"
-      self.by-version."lockfile"."0.4.2"
-      self.by-version."retry"."0.6.0"
-      self.by-version."once"."1.3.0"
-      self.by-version."npmconf"."0.1.13"
-      self.by-version."opener"."1.3.0"
+      self.by-version."ansicolors"."0.3.2"
+      self.by-version."ansistyles"."0.1.3"
+      self.by-version."archy"."0.0.2"
+      self.by-version."block-stream"."0.0.7"
+      self.by-version."child-process-close"."0.1.1"
       self.by-version."chmodr"."0.1.0"
+      self.by-version."chownr"."0.0.1"
       self.by-version."cmd-shim"."1.1.1"
-      self.by-version."sha"."1.2.3"
+      self.by-version."columnify"."0.1.2"
       self.by-version."editor"."0.0.5"
-      self.by-version."child-process-close"."0.1.1"
-      self.by-version."npm-user-validate"."0.0.3"
+      self.by-version."fstream"."0.1.25"
+      self.by-version."fstream-npm"."0.1.6"
       self.by-version."github-url-from-git"."1.1.1"
       self.by-version."github-url-from-username-repo"."0.0.2"
-      self.by-version."text-table"."0.2.0"
-      self.by-version."ansicolors"."0.3.2"
-      self.by-version."ansistyles"."0.1.3"
-      self.by-version."path-is-inside"."1.0.1"
-      self.by-version."columnify"."0.1.2"
+      self.by-version."glob"."3.2.9"
+      self.by-version."graceful-fs"."2.0.3"
+      self.by-version."ini"."1.1.0"
+      self.by-version."init-package-json"."0.0.15"
+      self.by-version."lockfile"."0.4.2"
+      self.by-version."lru-cache"."2.5.0"
+      self.by-version."minimatch"."0.2.14"
+      self.by-version."mkdirp"."0.3.5"
+      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.5"
+      self.by-version."npm-user-validate"."0.0.3"
+      self.by-version."npmconf"."0.1.13"
+      self.by-version."npmlog"."0.0.6"
+      self.by-version."once"."1.3.0"
+      self.by-version."opener"."1.3.0"
+      self.by-version."osenv"."0.0.3"
+      self.by-version."path-is-inside"."1.0.1"
+      self.by-version."read"."1.0.5"
+      self.by-version."read-installed"."2.0.2"
+      self.by-version."read-package-json"."1.1.8"
+      self.by-version."request"."2.30.0"
+      self.by-version."retry"."0.6.0"
+      self.by-version."rimraf"."2.2.6"
+      self.by-version."semver"."2.2.1"
+      self.by-version."sha"."1.2.3"
+      self.by-version."slide"."1.1.5"
+      self.by-version."sorted-object"."1.0.0"
+      self.by-version."tar"."0.1.19"
+      self.by-version."text-table"."0.2.0"
+      self.by-version."uid-number"."0.0.5"
+      self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm" ];
   };
-  "npm" = self.by-version."npm"."1.4.4";
+  "npm" = self.by-version."npm"."1.4.6";
   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 {
@@ -11795,7 +12303,7 @@
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
       self.by-version."request"."2.34.0"
-      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."semver"."2.0.11"
       self.by-version."slide"."1.1.5"
       self.by-version."chownr"."0.0.1"
@@ -11809,22 +12317,22 @@
     ];
     passthru.names = [ "npm-registry-client" ];
   };
-  by-spec."npm-registry-client"."^0.4.4" =
-    self.by-version."npm-registry-client"."0.4.4";
-  by-version."npm-registry-client"."0.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npm-registry-client-0.4.4";
+  by-spec."npm-registry-client"."~0.4.4" =
+    self.by-version."npm-registry-client"."0.4.5";
+  by-version."npm-registry-client"."0.4.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-registry-client-0.4.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.4.4.tgz";
-        name = "npm-registry-client-0.4.4.tgz";
-        sha1 = "f9dbc383a49069d8c7f67755a3ff6e424aff584f";
+        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.4.5.tgz";
+        name = "npm-registry-client-0.4.5.tgz";
+        sha1 = "7d6fdca46139470715f9477ddb5ad3e770d4de7b";
       })
     ];
     buildInputs =
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
       self.by-version."request"."2.34.0"
-      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."semver"."2.2.1"
       self.by-version."slide"."1.1.5"
       self.by-version."chownr"."0.0.1"
@@ -11837,8 +12345,8 @@
     ];
     passthru.names = [ "npm-registry-client" ];
   };
-  by-spec."npm-registry-client"."~0.4.4" =
-    self.by-version."npm-registry-client"."0.4.4";
+  by-spec."npm-registry-client"."~0.4.5" =
+    self.by-version."npm-registry-client"."0.4.5";
   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 {
@@ -11940,7 +12448,7 @@
     ];
     passthru.names = [ "npmconf" ];
   };
-  by-spec."npmconf"."~0.1.12" =
+  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";
@@ -11967,8 +12475,6 @@
     ];
     passthru.names = [ "npmconf" ];
   };
-  by-spec."npmconf"."~0.1.13" =
-    self.by-version."npmconf"."0.1.13";
   by-spec."npmconf"."~0.1.2" =
     self.by-version."npmconf"."0.1.13";
   by-spec."npmlog"."*" =
@@ -12044,7 +12550,7 @@
       (fetchurl {
         url = "https://github.com/ciaranj/node-oauth/tarball/master";
         name = "oauth-0.9.11.tgz";
-        sha256 = "ea86c233c1a77e52a97107b40978a909a99dd59c4751e7f4d342274c1d6a55a4";
+        sha256 = "8716e78676584860379f3ccc0f510beea508152d1728f3f17e8e760e12b0ef8f";
       })
     ];
     buildInputs =
@@ -12426,14 +12932,14 @@
   by-spec."optparse".">= 1.0.3" =
     self.by-version."optparse"."1.0.5";
   by-spec."os-browserify"."~0.1.1" =
-    self.by-version."os-browserify"."0.1.1";
-  by-version."os-browserify"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-os-browserify-0.1.1";
+    self.by-version."os-browserify"."0.1.2";
+  by-version."os-browserify"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-os-browserify-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/os-browserify/-/os-browserify-0.1.1.tgz";
-        name = "os-browserify-0.1.1.tgz";
-        sha1 = "c1c6b8b27be18cb09da7fa87476e0bcf3b465cbe";
+        url = "http://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz";
+        name = "os-browserify-0.1.2.tgz";
+        sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54";
       })
     ];
     buildInputs =
@@ -12465,6 +12971,8 @@
   };
   by-spec."osenv"."0.0.3" =
     self.by-version."osenv"."0.0.3";
+  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 {
@@ -12528,6 +13036,25 @@
   };
   by-spec."parents"."~0.0.1" =
     self.by-version."parents"."0.0.2";
+  by-spec."parseurl"."1.0.1" =
+    self.by-version."parseurl"."1.0.1";
+  by-version."parseurl"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-parseurl-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/parseurl/-/parseurl-1.0.1.tgz";
+        name = "parseurl-1.0.1.tgz";
+        sha1 = "2e57dce6efdd37c3518701030944c22bf388b7b4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."parseurl" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "parseurl" ];
+  };
   by-spec."passport"."*" =
     self.by-version."passport"."0.2.0";
   by-version."passport"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -12598,6 +13125,27 @@
   };
   "passport-http" = self.by-version."passport-http"."0.2.2";
   by-spec."passport-local"."*" =
+    self.by-version."passport-local"."1.0.0";
+  by-version."passport-local"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-passport-local-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz";
+        name = "passport-local-1.0.0.tgz";
+        sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."passport-local" or []);
+    deps = [
+      self.by-version."passport-strategy"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    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";
@@ -12618,9 +13166,6 @@
     ];
     passthru.names = [ "passport-local" ];
   };
-  "passport-local" = self.by-version."passport-local"."0.1.6";
-  by-spec."passport-local"."0.1.6" =
-    self.by-version."passport-local"."0.1.6";
   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 {
@@ -12678,6 +13223,25 @@
     ];
     passthru.names = [ "path-is-inside" ];
   };
+  by-spec."path-to-regexp"."0.1.2" =
+    self.by-version."path-to-regexp"."0.1.2";
+  by-version."path-to-regexp"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-path-to-regexp-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.2.tgz";
+        name = "path-to-regexp-0.1.2.tgz";
+        sha1 = "9b2b151f9cc3018c9eea50ca95729e05781712b4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."path-to-regexp" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "path-to-regexp" ];
+  };
   by-spec."pause"."0.0.1" =
     self.by-version."pause"."0.0.1";
   by-version."pause"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -13067,19 +13631,21 @@
   by-spec."punycode"."~1.2.3" =
     self.by-version."punycode"."1.2.4";
   by-spec."q".">= 0.0.1" =
-    self.by-version."q"."1.0.0";
-  by-version."q"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-q-1.0.0";
+    self.by-version."q"."2.0.1";
+  by-version."q"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-q-2.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/q/-/q-1.0.0.tgz";
-        name = "q-1.0.0.tgz";
-        sha1 = "dc1f92c4587be54f7853b29dc28e6d243a88498d";
+        url = "http://registry.npmjs.org/q/-/q-2.0.1.tgz";
+        name = "q-2.0.1.tgz";
+        sha1 = "ae9dc1edd970e72820a1ca716ecc1b0fc96c1c5a";
       })
     ];
     buildInputs =
       (self.nativeDeps."q" or []);
     deps = [
+      self.by-version."asap"."1.0.0"
+      self.by-version."collections"."2.0.1"
     ];
     peerDependencies = [
     ];
@@ -13109,7 +13675,24 @@
   by-spec."q"."~0.9.7" =
     self.by-version."q"."0.9.7";
   by-spec."q"."~1.0.0" =
-    self.by-version."q"."1.0.0";
+    self.by-version."q"."1.0.1";
+  by-version."q"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-q-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/q/-/q-1.0.1.tgz";
+        name = "q-1.0.1.tgz";
+        sha1 = "11872aeedee89268110b10a718448ffb10112a14";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."q" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "q" ];
+  };
   by-spec."qs"."0.4.2" =
     self.by-version."qs"."0.4.2";
   by-version."qs"."0.4.2" = lib.makeOverridable self.buildNodePackage {
@@ -13270,24 +13853,24 @@
     ];
     passthru.names = [ "querystring" ];
   };
-  by-spec."querystring"."https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz" =
-    self.by-version."querystring"."0.2.0";
-  by-version."querystring"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-querystring-0.2.0";
+  by-spec."querystring-es3"."0.2.0" =
+    self.by-version."querystring-es3"."0.2.0";
+  by-version."querystring-es3"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-querystring-es3-0.2.0";
     src = [
       (fetchurl {
-        url = "https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz";
-        name = "querystring-0.2.0.tgz";
-        sha256 = "9476079402605957bae231ea3ec5ae83b454b2de68ddaa3450096821996be8f5";
+        url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.0.tgz";
+        name = "querystring-es3-0.2.0.tgz";
+        sha1 = "c365a08a69c443accfeb3a9deab35e3f0abaa476";
       })
     ];
     buildInputs =
-      (self.nativeDeps."querystring" or []);
+      (self.nativeDeps."querystring-es3" or []);
     deps = [
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "querystring" ];
+    passthru.names = [ "querystring-es3" ];
   };
   by-spec."rai"."~0.1" =
     self.by-version."rai"."0.1.9";
@@ -13410,6 +13993,26 @@
     ];
     passthru.names = [ "raw-body" ];
   };
+  by-spec."raw-body"."1.1.3" =
+    self.by-version."raw-body"."1.1.3";
+  by-version."raw-body"."1.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-raw-body-1.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.3.tgz";
+        name = "raw-body-1.1.3.tgz";
+        sha1 = "3d2f91e2449259cc67b8c3ce9f061db5b987935b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."raw-body" or []);
+    deps = [
+      self.by-version."bytes"."0.2.1"
+    ];
+    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 {
@@ -13515,45 +14118,46 @@
     deps = [
       self.by-version."semver"."2.2.1"
       self.by-version."slide"."1.1.5"
-      self.by-version."read-package-json"."1.1.7"
+      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"."~1.0.0" =
-    self.by-version."read-installed"."1.0.0";
-  by-version."read-installed"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-read-installed-1.0.0";
+  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 {
+    name = "node-read-installed-2.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/read-installed/-/read-installed-1.0.0.tgz";
-        name = "read-installed-1.0.0.tgz";
-        sha1 = "4db88d5a363f9c68eaa07e1626974bc2e0a1b3a5";
+        url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.2.tgz";
+        name = "read-installed-2.0.2.tgz";
+        sha1 = "e69e7e1946af932b2fa454465639ebea4d63773c";
       })
     ];
     buildInputs =
       (self.nativeDeps."read-installed" or []);
     deps = [
+      self.by-version."read-package-json"."1.1.8"
       self.by-version."semver"."2.2.1"
       self.by-version."slide"."1.1.5"
-      self.by-version."read-package-json"."1.1.7"
-      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."util-extend"."1.0.1"
+      self.by-version."graceful-fs"."2.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "read-installed" ];
   };
   by-spec."read-package-json"."1" =
-    self.by-version."read-package-json"."1.1.7";
-  by-version."read-package-json"."1.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-read-package-json-1.1.7";
+    self.by-version."read-package-json"."1.1.8";
+  by-version."read-package-json"."1.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-read-package-json-1.1.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.7.tgz";
-        name = "read-package-json-1.1.7.tgz";
-        sha1 = "a28da23cb4330106a0d45e86065e0fc3b79d263e";
+        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.8.tgz";
+        name = "read-package-json-1.1.8.tgz";
+        sha1 = "234928819444283fd63f9d93ce03ba00668e94f9";
       })
     ];
     buildInputs =
@@ -13562,14 +14166,14 @@
       self.by-version."glob"."3.2.9"
       self.by-version."lru-cache"."2.5.0"
       self.by-version."normalize-package-data"."0.2.12"
-      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."graceful-fs"."2.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "read-package-json" ];
   };
-  by-spec."read-package-json"."~1.1.7" =
-    self.by-version."read-package-json"."1.1.7";
+  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 {
@@ -13664,6 +14268,25 @@
     ];
     passthru.names = [ "readline2" ];
   };
+  by-spec."recursive-readdir"."0.0.2" =
+    self.by-version."recursive-readdir"."0.0.2";
+  by-version."recursive-readdir"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-recursive-readdir-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/recursive-readdir/-/recursive-readdir-0.0.2.tgz";
+        name = "recursive-readdir-0.0.2.tgz";
+        sha1 = "0bc47dc4838e646dccfba0507b5e57ffbff35f7c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."recursive-readdir" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "recursive-readdir" ];
+  };
   by-spec."redeyed"."~0.4.0" =
     self.by-version."redeyed"."0.4.4";
   by-version."redeyed"."0.4.4" = lib.makeOverridable self.buildNodePackage {
@@ -13963,37 +14586,6 @@
     self.by-version."request"."2.34.0";
   by-spec."request"."~2" =
     self.by-version."request"."2.34.0";
-  by-spec."request"."~2.25.0" =
-    self.by-version."request"."2.25.0";
-  by-version."request"."2.25.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-request-2.25.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
-        name = "request-2.25.0.tgz";
-        sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request" or []);
-    deps = [
-      self.by-version."qs"."0.6.6"
-      self.by-version."json-stringify-safe"."5.0.0"
-      self.by-version."forever-agent"."0.5.2"
-      self.by-version."tunnel-agent"."0.3.0"
-      self.by-version."http-signature"."0.10.0"
-      self.by-version."hawk"."1.0.0"
-      self.by-version."aws-sign"."0.3.0"
-      self.by-version."oauth-sign"."0.3.0"
-      self.by-version."cookie-jar"."0.3.0"
-      self.by-version."node-uuid"."1.4.1"
-      self.by-version."mime"."1.2.11"
-      self.by-version."form-data"."0.1.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "request" ];
-  };
   by-spec."request"."~2.27.0" =
     self.by-version."request"."2.27.0";
   by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage {
@@ -14179,15 +14771,15 @@
   };
   by-spec."requirejs"."~2.1.0" =
     self.by-version."requirejs"."2.1.11";
-  by-spec."resolve"."0.5.x" =
-    self.by-version."resolve"."0.5.1";
-  by-version."resolve"."0.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-resolve-0.5.1";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/resolve/-/resolve-0.5.1.tgz";
-        name = "resolve-0.5.1.tgz";
-        sha1 = "15e4a222c4236bcd4cf85454412c2d0fb6524576";
+        url = "http://registry.npmjs.org/resolve/-/resolve-0.6.1.tgz";
+        name = "resolve-0.6.1.tgz";
+        sha1 = "b7fc874a8fe240b44de2c92b7f885a2e8598b652";
       })
     ];
     buildInputs =
@@ -14198,15 +14790,15 @@
     ];
     passthru.names = [ "resolve" ];
   };
-  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.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.1.tgz";
-        name = "resolve-0.6.1.tgz";
-        sha1 = "b7fc874a8fe240b44de2c92b7f885a2e8598b652";
+        url = "http://registry.npmjs.org/resolve/-/resolve-0.6.2.tgz";
+        name = "resolve-0.6.2.tgz";
+        sha1 = "7404e59e3c02980aa172272186521db3cf0a15f5";
       })
     ];
     buildInputs =
@@ -14217,8 +14809,6 @@
     ];
     passthru.names = [ "resolve" ];
   };
-  by-spec."resolve"."0.6.x" =
-    self.by-version."resolve"."0.6.1";
   by-spec."resolve"."~0.3.0" =
     self.by-version."resolve"."0.3.1";
   by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -14241,9 +14831,28 @@
   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.1";
+    self.by-version."resolve"."0.6.2";
   by-spec."resolve"."~0.6.1" =
-    self.by-version."resolve"."0.6.1";
+    self.by-version."resolve"."0.6.2";
+  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 {
+    name = "node-response-time-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz";
+        name = "response-time-1.0.0.tgz";
+        sha1 = "c2bc8d08f3c359f97eae1d6da86eead175fabdc9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."response-time" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "response-time" ];
+  };
   by-spec."restify"."2.4.1" =
     self.by-version."restify"."2.4.1";
   by-version."restify"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -14281,14 +14890,14 @@
     passthru.names = [ "restify" ];
   };
   by-spec."rethinkdb"."*" =
-    self.by-version."rethinkdb"."1.11.0-4";
-  by-version."rethinkdb"."1.11.0-4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-rethinkdb-1.11.0-4";
+    self.by-version."rethinkdb"."1.12.0-0";
+  by-version."rethinkdb"."1.12.0-0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-rethinkdb-1.12.0-0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.11.0-4.tgz";
-        name = "rethinkdb-1.11.0-4.tgz";
-        sha1 = "11a4f32cf7cd98d895016448641b9af6a1b575e9";
+        url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.12.0-0.tgz";
+        name = "rethinkdb-1.12.0-0.tgz";
+        sha1 = "cad01e869bd12dcd09f235c5ec8f5ccf26cc6f81";
       })
     ];
     buildInputs =
@@ -14300,7 +14909,7 @@
     ];
     passthru.names = [ "rethinkdb" ];
   };
-  "rethinkdb" = self.by-version."rethinkdb"."1.11.0-4";
+  "rethinkdb" = self.by-version."rethinkdb"."1.12.0-0";
   by-spec."retry"."0.6.0" =
     self.by-version."retry"."0.6.0";
   by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -14426,8 +15035,6 @@
     ];
     passthru.names = [ "rimraf" ];
   };
-  by-spec."rimraf"."~2.0.3" =
-    self.by-version."rimraf"."2.0.3";
   by-spec."rimraf"."~2.1.4" =
     self.by-version."rimraf"."2.1.4";
   by-version."rimraf"."2.1.4" = lib.makeOverridable self.buildNodePackage {
@@ -14505,15 +15112,15 @@
     passthru.names = [ "s3http" ];
   };
   "s3http" = self.by-version."s3http"."0.0.5";
-  by-spec."sauce-connect-launcher"."~0.2.2" =
-    self.by-version."sauce-connect-launcher"."0.2.2";
-  by-version."sauce-connect-launcher"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sauce-connect-launcher-0.2.2";
+  by-spec."sauce-connect-launcher"."~0.3.0" =
+    self.by-version."sauce-connect-launcher"."0.3.2";
+  by-version."sauce-connect-launcher"."0.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sauce-connect-launcher-0.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.2.2.tgz";
-        name = "sauce-connect-launcher-0.2.2.tgz";
-        sha1 = "cfd951c8b488af38d384aef14920261482e2e05a";
+        url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.3.2.tgz";
+        name = "sauce-connect-launcher-0.3.2.tgz";
+        sha1 = "bcae99571cf78d2e7b2d863eee28fa72f9c90846";
       })
     ];
     buildInputs =
@@ -14522,6 +15129,7 @@
       self.by-version."lodash"."1.3.1"
       self.by-version."async"."0.2.10"
       self.by-version."adm-zip"."0.4.4"
+      self.by-version."rimraf"."2.2.6"
     ];
     peerDependencies = [
     ];
@@ -14783,54 +15391,115 @@
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "send" ];
+    passthru.names = [ "send" ];
+  };
+  by-spec."send"."0.1.4" =
+    self.by-version."send"."0.1.4";
+  by-version."send"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-send-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz";
+        name = "send-0.1.4.tgz";
+        sha1 = "be70d8d1be01de61821af13780b50345a4f71abd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."send" or []);
+    deps = [
+      self.by-version."debug"."0.7.4"
+      self.by-version."mime"."1.2.11"
+      self.by-version."fresh"."0.2.0"
+      self.by-version."range-parser"."0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "send" ];
+  };
+  by-spec."send"."0.2.0" =
+    self.by-version."send"."0.2.0";
+  by-spec."sequence"."2.2.1" =
+    self.by-version."sequence"."2.2.1";
+  by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sequence-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
+        name = "sequence-2.2.1.tgz";
+        sha1 = "7f5617895d44351c0a047e764467690490a16b03";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sequence" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sequence" ];
+  };
+  by-spec."sequence"."2.x" =
+    self.by-version."sequence"."2.2.1";
+  by-spec."serve-index"."1.0.1" =
+    self.by-version."serve-index"."1.0.1";
+  by-version."serve-index"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-serve-index-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz";
+        name = "serve-index-1.0.1.tgz";
+        sha1 = "2782ee8ede6cccaae54957962c4715e8ce1921a6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."serve-index" or []);
+    deps = [
+      self.by-version."batch"."0.5.0"
+      self.by-version."negotiator"."0.4.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "serve-index" ];
   };
-  by-spec."send"."0.1.4" =
-    self.by-version."send"."0.1.4";
-  by-version."send"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-send-0.1.4";
+  by-spec."serve-static"."1.0.1" =
+    self.by-version."serve-static"."1.0.1";
+  by-version."serve-static"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-serve-static-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz";
-        name = "send-0.1.4.tgz";
-        sha1 = "be70d8d1be01de61821af13780b50345a4f71abd";
+        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.1.tgz";
+        name = "serve-static-1.0.1.tgz";
+        sha1 = "10dcbfd44b3e0291a131fc9ab4ab25a9f5a78a42";
       })
     ];
     buildInputs =
-      (self.nativeDeps."send" or []);
+      (self.nativeDeps."serve-static" or []);
     deps = [
-      self.by-version."debug"."0.7.4"
-      self.by-version."mime"."1.2.11"
-      self.by-version."fresh"."0.2.0"
-      self.by-version."range-parser"."0.0.4"
+      self.by-version."send"."0.1.4"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "send" ];
+    passthru.names = [ "serve-static" ];
   };
-  by-spec."send"."0.2.0" =
-    self.by-version."send"."0.2.0";
-  by-spec."sequence"."2.2.1" =
-    self.by-version."sequence"."2.2.1";
-  by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sequence-2.2.1";
+  by-spec."serve-static"."1.0.2" =
+    self.by-version."serve-static"."1.0.2";
+  by-version."serve-static"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-serve-static-1.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
-        name = "sequence-2.2.1.tgz";
-        sha1 = "7f5617895d44351c0a047e764467690490a16b03";
+        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.2.tgz";
+        name = "serve-static-1.0.2.tgz";
+        sha1 = "4129f6727b09fb031134fa6d185683e30bfbef54";
       })
     ];
     buildInputs =
-      (self.nativeDeps."sequence" or []);
+      (self.nativeDeps."serve-static" or []);
     deps = [
+      self.by-version."send"."0.2.0"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "sequence" ];
+    passthru.names = [ "serve-static" ];
   };
-  by-spec."sequence"."2.x" =
-    self.by-version."sequence"."2.2.1";
   by-spec."sha"."~1.2.1" =
     self.by-version."sha"."1.2.3";
   by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -14845,7 +15514,7 @@
     buildInputs =
       (self.nativeDeps."sha" or []);
     deps = [
-      self.by-version."graceful-fs"."2.0.2"
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."readable-stream"."1.0.26"
     ];
     peerDependencies = [
@@ -14890,6 +15559,29 @@
     ];
     passthru.names = [ "shell-quote" ];
   };
+  by-spec."shell-quote"."~1.4.1" =
+    self.by-version."shell-quote"."1.4.1";
+  by-version."shell-quote"."1.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-shell-quote-1.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/shell-quote/-/shell-quote-1.4.1.tgz";
+        name = "shell-quote-1.4.1.tgz";
+        sha1 = "ae18442b536a08c720239b079d2f228acbedee40";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."shell-quote" or []);
+    deps = [
+      self.by-version."jsonify"."0.0.0"
+      self.by-version."array-filter"."0.0.1"
+      self.by-version."array-reduce"."0.0.0"
+      self.by-version."array-map"."0.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "shell-quote" ];
+  };
   by-spec."shelljs"."0.1.x" =
     self.by-version."shelljs"."0.1.4";
   by-version."shelljs"."0.1.4" = lib.makeOverridable self.buildNodePackage {
@@ -14909,8 +15601,6 @@
     ];
     passthru.names = [ "shelljs" ];
   };
-  by-spec."shelljs"."~0.1.4" =
-    self.by-version."shelljs"."0.1.4";
   by-spec."shelljs"."~0.2.6" =
     self.by-version."shelljs"."0.2.6";
   by-version."shelljs"."0.2.6" = lib.makeOverridable self.buildNodePackage {
@@ -14931,14 +15621,14 @@
     passthru.names = [ "shelljs" ];
   };
   by-spec."should"."*" =
-    self.by-version."should"."3.1.3";
-  by-version."should"."3.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-should-3.1.3";
+    self.by-version."should"."3.2.0-beta1";
+  by-version."should"."3.2.0-beta1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-should-3.2.0-beta1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/should/-/should-3.1.3.tgz";
-        name = "should-3.1.3.tgz";
-        sha1 = "900ff485c1497f873de0aa3bfcf9d8b913fdda24";
+        url = "http://registry.npmjs.org/should/-/should-3.2.0-beta1.tgz";
+        name = "should-3.2.0-beta1.tgz";
+        sha1 = "91481d7eb1a8c1329616a8544ccec05c6a47354c";
       })
     ];
     buildInputs =
@@ -14949,7 +15639,7 @@
     ];
     passthru.names = [ "should" ];
   };
-  "should" = self.by-version."should"."3.1.3";
+  "should" = self.by-version."should"."3.2.0-beta1";
   by-spec."sigmund"."~1.0.0" =
     self.by-version."sigmund"."1.0.0";
   by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -15012,14 +15702,14 @@
     passthru.names = [ "simple-lru-cache" ];
   };
   by-spec."simplesmtp".">= 0.1.22" =
-    self.by-version."simplesmtp"."0.3.22";
-  by-version."simplesmtp"."0.3.22" = lib.makeOverridable self.buildNodePackage {
-    name = "node-simplesmtp-0.3.22";
+    self.by-version."simplesmtp"."0.3.23";
+  by-version."simplesmtp"."0.3.23" = lib.makeOverridable self.buildNodePackage {
+    name = "node-simplesmtp-0.3.23";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.22.tgz";
-        name = "simplesmtp-0.3.22.tgz";
-        sha1 = "5bef8fef60e7e3c4ff57117e3502190447de11e5";
+        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.23.tgz";
+        name = "simplesmtp-0.3.23.tgz";
+        sha1 = "f452cb8f6dfa6cdd5bbdded5d6dc010493ff0c27";
       })
     ];
     buildInputs =
@@ -15317,6 +16007,25 @@
     passthru.names = [ "sockjs" ];
   };
   "sockjs" = self.by-version."sockjs"."0.3.8";
+  by-spec."sorted-object"."~1.0.0" =
+    self.by-version."sorted-object"."1.0.0";
+  by-version."sorted-object"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sorted-object-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz";
+        name = "sorted-object-1.0.0.tgz";
+        sha1 = "5d1f4f9c1fb2cd48965967304e212eb44cfb6d05";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sorted-object" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sorted-object" ];
+  };
   by-spec."source-map"."*" =
     self.by-version."source-map"."0.1.33";
   by-version."source-map"."0.1.33" = lib.makeOverridable self.buildNodePackage {
@@ -15338,14 +16047,38 @@
     passthru.names = [ "source-map" ];
   };
   "source-map" = self.by-version."source-map"."0.1.33";
+  by-spec."source-map"."0.1.11" =
+    self.by-version."source-map"."0.1.11";
+  by-version."source-map"."0.1.11" = lib.makeOverridable self.buildNodePackage {
+    name = "node-source-map-0.1.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.11.tgz";
+        name = "source-map-0.1.11.tgz";
+        sha1 = "2eef2fd65a74c179880ae5ee6975d99ce21eb7b4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."source-map" or []);
+    deps = [
+      self.by-version."amdefine"."0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "source-map" ];
+  };
   by-spec."source-map"."0.1.x" =
     self.by-version."source-map"."0.1.33";
   by-spec."source-map".">= 0.1.2" =
     self.by-version."source-map"."0.1.33";
+  by-spec."source-map"."~ 0.1.8" =
+    self.by-version."source-map"."0.1.33";
   by-spec."source-map"."~0.1.30" =
     self.by-version."source-map"."0.1.33";
   by-spec."source-map"."~0.1.31" =
     self.by-version."source-map"."0.1.33";
+  by-spec."source-map"."~0.1.33" =
+    self.by-version."source-map"."0.1.33";
   by-spec."source-map"."~0.1.7" =
     self.by-version."source-map"."0.1.33";
   by-spec."spdy"."1.7.1" =
@@ -15467,6 +16200,44 @@
     passthru.names = [ "stackdriver-statsd-backend" ];
   };
   "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.1.5";
+  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 {
+    name = "node-static-favicon-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/static-favicon/-/static-favicon-1.0.0.tgz";
+        name = "static-favicon-1.0.0.tgz";
+        sha1 = "2e58dcfe58957a2d53337ef7a38cf9ad6c13c0d0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."static-favicon" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "static-favicon" ];
+  };
+  by-spec."static-favicon"."1.0.2" =
+    self.by-version."static-favicon"."1.0.2";
+  by-version."static-favicon"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-static-favicon-1.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/static-favicon/-/static-favicon-1.0.2.tgz";
+        name = "static-favicon-1.0.2.tgz";
+        sha1 = "7c15920dda2bf33f414b0e60aebbd65cdd2a1d2f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."static-favicon" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "static-favicon" ];
+  };
   by-spec."statsd"."*" =
     self.by-version."statsd"."0.7.1";
   by-version."statsd"."0.7.1" = lib.makeOverridable self.buildNodePackage {
@@ -15688,6 +16459,25 @@
     ];
     passthru.names = [ "stringify-object" ];
   };
+  by-spec."stringify-object"."~0.2.0" =
+    self.by-version."stringify-object"."0.2.0";
+  by-version."stringify-object"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-stringify-object-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.2.0.tgz";
+        name = "stringify-object-0.2.0.tgz";
+        sha1 = "832996ea55ab2aaa7570cc9bc0d5774adfc2c585";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."stringify-object" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "stringify-object" ];
+  };
   by-spec."strip-ansi"."~0.1.0" =
     self.by-version."strip-ansi"."0.1.1";
   by-version."strip-ansi"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -15836,15 +16626,15 @@
     ];
     passthru.names = [ "sudo-block" ];
   };
-  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";
+  by-spec."superagent"."0.17.0" =
+    self.by-version."superagent"."0.17.0";
+  by-version."superagent"."0.17.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-superagent-0.17.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/superagent/-/superagent-0.16.0.tgz";
-        name = "superagent-0.16.0.tgz";
-        sha1 = "f38df4a476565dffdbaa07764b81a19f0ab38a4e";
+        url = "http://registry.npmjs.org/superagent/-/superagent-0.17.0.tgz";
+        name = "superagent-0.17.0.tgz";
+        sha1 = "aadcd50fbe5a93e71991118d79bf0714d625bba8";
       })
     ];
     buildInputs =
@@ -15858,6 +16648,7 @@
       self.by-version."cookiejar"."1.3.0"
       self.by-version."debug"."0.7.4"
       self.by-version."reduce-component"."1.0.1"
+      self.by-version."extend"."1.2.1"
     ];
     peerDependencies = [
     ];
@@ -15890,28 +16681,53 @@
   };
   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."supertest"."*" =
-    self.by-version."supertest"."0.9.0";
-  by-version."supertest"."0.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-supertest-0.9.0";
+    self.by-version."supertest"."0.10.0";
+  by-version."supertest"."0.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-supertest-0.10.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/supertest/-/supertest-0.9.0.tgz";
-        name = "supertest-0.9.0.tgz";
-        sha1 = "955efa32ad01fb9eecfc6f7c3122699a5843bba4";
+        url = "http://registry.npmjs.org/supertest/-/supertest-0.10.0.tgz";
+        name = "supertest-0.10.0.tgz";
+        sha1 = "5ba821b5f4e9e643292fcf87268dfd2688bdbb58";
       })
     ];
     buildInputs =
       (self.nativeDeps."supertest" or []);
     deps = [
-      self.by-version."superagent"."0.16.0"
+      self.by-version."superagent"."0.17.0"
       self.by-version."methods"."0.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "supertest" ];
   };
-  "supertest" = self.by-version."supertest"."0.9.0";
+  "supertest" = self.by-version."supertest"."0.10.0";
   by-spec."swig"."0.14.x" =
     self.by-version."swig"."0.14.0";
   by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage {
@@ -16116,14 +16932,14 @@
   by-spec."temp"."~0.7.0" =
     self.by-version."temp"."0.7.0";
   by-spec."tempfile"."~0.1.2" =
-    self.by-version."tempfile"."0.1.2";
-  by-version."tempfile"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-tempfile-0.1.2";
+    self.by-version."tempfile"."0.1.3";
+  by-version."tempfile"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-tempfile-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/tempfile/-/tempfile-0.1.2.tgz";
-        name = "tempfile-0.1.2.tgz";
-        sha1 = "81d4e51f35856592f3b51d568135791af3b038e0";
+        url = "http://registry.npmjs.org/tempfile/-/tempfile-0.1.3.tgz";
+        name = "tempfile-0.1.3.tgz";
+        sha1 = "7d6b710047339d39f847327a056dadf183103010";
       })
     ];
     buildInputs =
@@ -16135,25 +16951,6 @@
     ];
     passthru.names = [ "tempfile" ];
   };
-  by-spec."text-table"."~0.1.1" =
-    self.by-version."text-table"."0.1.1";
-  by-version."text-table"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-text-table-0.1.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/text-table/-/text-table-0.1.1.tgz";
-        name = "text-table-0.1.1.tgz";
-        sha1 = "9aa4347a39b6950cd24190264576f62db6e52d93";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."text-table" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "text-table" ];
-  };
   by-spec."text-table"."~0.2.0" =
     self.by-version."text-table"."0.2.0";
   by-version."text-table"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -16291,14 +17088,14 @@
     passthru.names = [ "timespan" ];
   };
   by-spec."timezone"."*" =
-    self.by-version."timezone"."0.0.28";
-  by-version."timezone"."0.0.28" = lib.makeOverridable self.buildNodePackage {
-    name = "node-timezone-0.0.28";
+    self.by-version."timezone"."0.0.30";
+  by-version."timezone"."0.0.30" = lib.makeOverridable self.buildNodePackage {
+    name = "node-timezone-0.0.30";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/timezone/-/timezone-0.0.28.tgz";
-        name = "timezone-0.0.28.tgz";
-        sha1 = "a3fb234b48093c8edd36de5662e92ece6477a88c";
+        url = "http://registry.npmjs.org/timezone/-/timezone-0.0.30.tgz";
+        name = "timezone-0.0.30.tgz";
+        sha1 = "f83e46d35c017a33a684a4d8bb8fac3debed49bf";
       })
     ];
     buildInputs =
@@ -16309,7 +17106,7 @@
     ];
     passthru.names = [ "timezone" ];
   };
-  "timezone" = self.by-version."timezone"."0.0.28";
+  "timezone" = self.by-version."timezone"."0.0.30";
   by-spec."tinycolor"."0.x" =
     self.by-version."tinycolor"."0.0.1";
   by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -16348,7 +17145,7 @@
       self.by-version."fields"."0.1.12"
       self.by-version."humanize"."0.0.9"
       self.by-version."jade"."0.35.0"
-      self.by-version."longjohn"."0.2.2"
+      self.by-version."longjohn"."0.2.4"
       self.by-version."moment"."2.4.0"
       self.by-version."node-appc"."0.2.0"
       self.by-version."optimist"."0.6.1"
@@ -16680,14 +17477,14 @@
     passthru.names = [ "uglify-js" ];
   };
   by-spec."uglify-js"."^2.4.0" =
-    self.by-version."uglify-js"."2.4.12";
-  by-version."uglify-js"."2.4.12" = lib.makeOverridable self.buildNodePackage {
-    name = "uglify-js-2.4.12";
+    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.12.tgz";
-        name = "uglify-js-2.4.12.tgz";
-        sha1 = "2354d9659f85330c1e3e2910f8acd77fe14bb4a8";
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.13.tgz";
+        name = "uglify-js-2.4.13.tgz";
+        sha1 = "18debc9e6ecfc20db1a5ea035f839d436a605aba";
       })
     ];
     buildInputs =
@@ -16769,9 +17566,9 @@
   by-spec."uglify-js"."~2.3.6" =
     self.by-version."uglify-js"."2.3.6";
   by-spec."uglify-js"."~2.4.0" =
-    self.by-version."uglify-js"."2.4.12";
+    self.by-version."uglify-js"."2.4.13";
   by-spec."uglify-js"."~2.4.12" =
-    self.by-version."uglify-js"."2.4.12";
+    self.by-version."uglify-js"."2.4.13";
   by-spec."uglify-to-browserify"."~1.0.0" =
     self.by-version."uglify-to-browserify"."1.0.2";
   by-version."uglify-to-browserify"."1.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -16829,6 +17626,8 @@
     ];
     passthru.names = [ "uid2" ];
   };
+  by-spec."uid2"."~0.0.2" =
+    self.by-version."uid2"."0.0.3";
   by-spec."umd"."~2.0.0" =
     self.by-version."umd"."2.0.0";
   by-version."umd"."2.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -16846,7 +17645,7 @@
       self.by-version."rfile"."1.0.0"
       self.by-version."ruglify"."1.0.0"
       self.by-version."through"."2.3.4"
-      self.by-version."uglify-js"."2.4.12"
+      self.by-version."uglify-js"."2.4.13"
     ];
     peerDependencies = [
     ];
@@ -16989,14 +17788,14 @@
     passthru.names = [ "unfunk-diff" ];
   };
   by-spec."ungit"."*" =
-    self.by-version."ungit"."0.7.1";
-  by-version."ungit"."0.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "ungit-0.7.1";
+    self.by-version."ungit"."0.7.2";
+  by-version."ungit"."0.7.2" = lib.makeOverridable self.buildNodePackage {
+    name = "ungit-0.7.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ungit/-/ungit-0.7.1.tgz";
-        name = "ungit-0.7.1.tgz";
-        sha1 = "9b1b768ecd97a66f7b97b5d7a1b36f29682e2bf7";
+        url = "http://registry.npmjs.org/ungit/-/ungit-0.7.2.tgz";
+        name = "ungit-0.7.2.tgz";
+        sha1 = "fc4d6943c407ca4ed08b7c48841419050e3ce52a";
       })
     ];
     buildInputs =
@@ -17011,7 +17810,7 @@
       self.by-version."async"."0.2.10"
       self.by-version."rc"."0.3.4"
       self.by-version."uuid"."1.4.1"
-      self.by-version."winston"."0.7.2"
+      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."semver"."2.2.1"
@@ -17028,42 +17827,42 @@
       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.4"
+      self.by-version."npm-registry-client"."0.4.5"
       self.by-version."npmconf"."0.1.13"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."less"."1.7.0"
-      self.by-version."browserify"."3.31.2"
+      self.by-version."browserify"."3.32.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "ungit" ];
   };
-  "ungit" = self.by-version."ungit"."0.7.1";
+  "ungit" = self.by-version."ungit"."0.7.2";
   by-spec."update-notifier"."~0.1.3" =
-    self.by-version."update-notifier"."0.1.7";
-  by-version."update-notifier"."0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-update-notifier-0.1.7";
+    self.by-version."update-notifier"."0.1.8";
+  by-version."update-notifier"."0.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-update-notifier-0.1.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.7.tgz";
-        name = "update-notifier-0.1.7.tgz";
-        sha1 = "b37fb55004835240fd2e7e360c52ccffde5219c9";
+        url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.8.tgz";
+        name = "update-notifier-0.1.8.tgz";
+        sha1 = "ebf5c698375f5c232031a419634fab66cc0322a6";
       })
     ];
     buildInputs =
       (self.nativeDeps."update-notifier" or []);
     deps = [
       self.by-version."request"."2.27.0"
-      self.by-version."configstore"."0.1.7"
+      self.by-version."configstore"."0.2.3"
       self.by-version."semver"."2.1.0"
-      self.by-version."chalk"."0.2.1"
+      self.by-version."chalk"."0.4.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "update-notifier" ];
   };
   by-spec."update-notifier"."~0.1.7" =
-    self.by-version."update-notifier"."0.1.7";
+    self.by-version."update-notifier"."0.1.8";
   by-spec."url"."~0.7.9" =
     self.by-version."url"."0.7.9";
   by-version."url"."0.7.9" = lib.makeOverridable self.buildNodePackage {
@@ -17086,14 +17885,14 @@
     passthru.names = [ "url" ];
   };
   by-spec."useragent"."~2.0.4" =
-    self.by-version."useragent"."2.0.7";
-  by-version."useragent"."2.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-useragent-2.0.7";
+    self.by-version."useragent"."2.0.8";
+  by-version."useragent"."2.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-useragent-2.0.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/useragent/-/useragent-2.0.7.tgz";
-        name = "useragent-2.0.7.tgz";
-        sha1 = "a44c07d157a15e13d73d4af4ece6aab70f298224";
+        url = "http://registry.npmjs.org/useragent/-/useragent-2.0.8.tgz";
+        name = "useragent-2.0.8.tgz";
+        sha1 = "32caa86d3f404e92d7d4183831dd103ebc1a3125";
       })
     ];
     buildInputs =
@@ -17184,6 +17983,25 @@
     ];
     passthru.names = [ "util" ];
   };
+  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 {
+    name = "node-util-extend-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz";
+        name = "util-extend-1.0.1.tgz";
+        sha1 = "bb703b79480293ddcdcfb3c6a9fea20f483415bc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."util-extend" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "util-extend" ];
+  };
   by-spec."utile"."0.1.x" =
     self.by-version."utile"."0.1.7";
   by-version."utile"."0.1.7" = lib.makeOverridable self.buildNodePackage {
@@ -17401,6 +18219,25 @@
     ];
     passthru.names = [ "verror" ];
   };
+  by-spec."vhost"."1.0.0" =
+    self.by-version."vhost"."1.0.0";
+  by-version."vhost"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-vhost-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz";
+        name = "vhost-1.0.0.tgz";
+        sha1 = "654513f289a4f898aab745bbd633e40180c9c4c0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."vhost" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "vhost" ];
+  };
   by-spec."view-helpers"."*" =
     self.by-version."view-helpers"."0.1.4";
   by-version."view-helpers"."0.1.4" = lib.makeOverridable self.buildNodePackage {
@@ -17541,15 +18378,15 @@
     ];
     passthru.names = [ "watch" ];
   };
-  by-spec."wd"."~0.2.8" =
-    self.by-version."wd"."0.2.11";
-  by-version."wd"."0.2.11" = lib.makeOverridable self.buildNodePackage {
-    name = "wd-0.2.11";
+  by-spec."wd"."~0.2.12" =
+    self.by-version."wd"."0.2.13";
+  by-version."wd"."0.2.13" = lib.makeOverridable self.buildNodePackage {
+    name = "wd-0.2.13";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wd/-/wd-0.2.11.tgz";
-        name = "wd-0.2.11.tgz";
-        sha1 = "27889d290facf3d19e050b3c789f2e852ca03f10";
+        url = "http://registry.npmjs.org/wd/-/wd-0.2.13.tgz";
+        name = "wd-0.2.13.tgz";
+        sha1 = "12dd4a479d9c676a17a290b63da2acf41182e44f";
       })
     ];
     buildInputs =
@@ -17557,7 +18394,7 @@
     deps = [
       self.by-version."async"."0.2.10"
       self.by-version."vargs"."0.1.0"
-      self.by-version."q"."1.0.0"
+      self.by-version."q"."1.0.1"
       self.by-version."request"."2.33.0"
       self.by-version."archiver"."0.5.2"
       self.by-version."lodash"."2.4.1"
@@ -17567,6 +18404,25 @@
     ];
     passthru.names = [ "wd" ];
   };
+  by-spec."weak-map"."^1.0.4" =
+    self.by-version."weak-map"."1.0.4";
+  by-version."weak-map"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-weak-map-1.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.4.tgz";
+        name = "weak-map-1.0.4.tgz";
+        sha1 = "1acddee2cc90eb30950860b7415c79cefc5f07c9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."weak-map" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "weak-map" ];
+  };
   by-spec."webdrvr"."*" =
     self.by-version."webdrvr"."2.40.0";
   by-version."webdrvr"."2.40.0" = lib.makeOverridable self.buildNodePackage {
@@ -17634,7 +18490,7 @@
     ];
     passthru.names = [ "when" ];
   };
-  by-spec."which"."*" =
+  by-spec."which"."1" =
     self.by-version."which"."1.0.5";
   by-version."which"."1.0.5" = lib.makeOverridable self.buildNodePackage {
     name = "which-1.0.5";
@@ -17653,8 +18509,6 @@
     ];
     passthru.names = [ "which" ];
   };
-  by-spec."which"."1" =
-    self.by-version."which"."1.0.5";
   by-spec."which"."1.0.x" =
     self.by-version."which"."1.0.5";
   by-spec."which"."~1.0.5" =
@@ -17681,14 +18535,14 @@
     passthru.names = [ "winser" ];
   };
   by-spec."winston"."*" =
-    self.by-version."winston"."0.7.2";
-  by-version."winston"."0.7.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-winston-0.7.2";
+    self.by-version."winston"."0.7.3";
+  by-version."winston"."0.7.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-winston-0.7.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz";
-        name = "winston-0.7.2.tgz";
-        sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb";
+        url = "http://registry.npmjs.org/winston/-/winston-0.7.3.tgz";
+        name = "winston-0.7.3.tgz";
+        sha1 = "7ae313ba73fcdc2ecb4aa2f9cd446e8298677266";
       })
     ];
     buildInputs =
@@ -17706,7 +18560,7 @@
     ];
     passthru.names = [ "winston" ];
   };
-  "winston" = self.by-version."winston"."0.7.2";
+  "winston" = self.by-version."winston"."0.7.3";
   by-spec."winston"."0.6.2" =
     self.by-version."winston"."0.6.2";
   by-version."winston"."0.6.2" = lib.makeOverridable self.buildNodePackage {
@@ -17737,17 +18591,41 @@
     self.by-version."winston"."0.6.2";
   by-spec."winston"."0.7.2" =
     self.by-version."winston"."0.7.2";
+  by-version."winston"."0.7.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-winston-0.7.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz";
+        name = "winston-0.7.2.tgz";
+        sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."winston" or []);
+    deps = [
+      self.by-version."async"."0.2.10"
+      self.by-version."colors"."0.6.2"
+      self.by-version."cycle"."1.0.3"
+      self.by-version."eyes"."0.1.8"
+      self.by-version."pkginfo"."0.3.0"
+      self.by-version."request"."2.16.6"
+      self.by-version."stack-trace"."0.0.9"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "winston" ];
+  };
   by-spec."winston"."~0.7.2" =
-    self.by-version."winston"."0.7.2";
-  by-spec."wiredep"."~0.4.2" =
-    self.by-version."wiredep"."0.4.2";
-  by-version."wiredep"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-wiredep-0.4.2";
+    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 {
+    name = "node-wiredep-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wiredep/-/wiredep-0.4.2.tgz";
-        name = "wiredep-0.4.2.tgz";
-        sha1 = "42d4cf07422576f26e3a04045edc163da101a66f";
+        url = "http://registry.npmjs.org/wiredep/-/wiredep-1.0.0.tgz";
+        name = "wiredep-1.0.0.tgz";
+        sha1 = "2e570465657b97e7494abf62978a3e52fc37ac52";
       })
     ];
     buildInputs =
@@ -17755,6 +18633,7 @@
     deps = [
       self.by-version."lodash"."1.3.1"
       self.by-version."chalk"."0.1.1"
+      self.by-version."glob"."3.2.9"
     ];
     peerDependencies = [
     ];
@@ -17814,7 +18693,7 @@
     buildInputs =
       (self.nativeDeps."with" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.12"
+      self.by-version."uglify-js"."2.4.13"
     ];
     peerDependencies = [
     ];
@@ -18147,45 +19026,6 @@
     ];
     passthru.names = [ "yargs" ];
   };
-  by-spec."yeoman-generator"."~0.13.0" =
-    self.by-version."yeoman-generator"."0.13.4";
-  by-version."yeoman-generator"."0.13.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-yeoman-generator-0.13.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.4.tgz";
-        name = "yeoman-generator-0.13.4.tgz";
-        sha1 = "066798dd978026d37be6657b2672a17bc4f4ce34";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."yeoman-generator" or []);
-    deps = [
-      self.by-version."cheerio"."0.12.4"
-      self.by-version."request"."2.25.0"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."tar"."0.1.19"
-      self.by-version."diff"."1.0.8"
-      self.by-version."mime"."1.2.11"
-      self.by-version."underscore.string"."2.3.3"
-      self.by-version."lodash"."1.3.1"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."glob"."3.2.9"
-      self.by-version."debug"."0.7.4"
-      self.by-version."isbinaryfile"."0.1.9"
-      self.by-version."dargs"."0.1.0"
-      self.by-version."async"."0.2.10"
-      self.by-version."inquirer"."0.3.5"
-      self.by-version."iconv-lite"."0.2.11"
-      self.by-version."shelljs"."0.1.4"
-      self.by-version."findup-sync"."0.1.2"
-      self.by-version."chalk"."0.2.1"
-      self.by-version."text-table"."0.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "yeoman-generator" ];
-  };
   by-spec."yeoman-generator"."~0.14.0" =
     self.by-version."yeoman-generator"."0.14.2";
   by-version."yeoman-generator"."0.14.2" = lib.makeOverridable self.buildNodePackage {
@@ -18215,7 +19055,7 @@
       self.by-version."inquirer"."0.3.5"
       self.by-version."iconv-lite"."0.2.11"
       self.by-version."shelljs"."0.2.6"
-      self.by-version."findup-sync"."0.1.2"
+      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.10"
@@ -18255,7 +19095,7 @@
       self.by-version."inquirer"."0.4.1"
       self.by-version."iconv-lite"."0.2.11"
       self.by-version."shelljs"."0.2.6"
-      self.by-version."findup-sync"."0.1.2"
+      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.10"
@@ -18284,18 +19124,18 @@
       self.by-version."yeoman-generator"."0.16.0"
       self.by-version."nopt"."2.1.2"
       self.by-version."lodash"."2.4.1"
-      self.by-version."update-notifier"."0.1.7"
+      self.by-version."update-notifier"."0.1.8"
       self.by-version."insight"."0.3.1"
       self.by-version."sudo-block"."0.3.0"
       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.3"
+      self.by-version."findup"."0.1.4"
       self.by-version."shelljs"."0.2.6"
     ];
     peerDependencies = [
       self.by-version."grunt-cli"."0.1.13"
-      self.by-version."bower"."1.2.8"
+      self.by-version."bower"."1.3.1"
     ];
     passthru.names = [ "yo" ];
   };
@@ -18344,25 +19184,6 @@
     ];
     passthru.names = [ "zip-stream" ];
   };
-  by-spec."zlib-browserify"."0.0.1" =
-    self.by-version."zlib-browserify"."0.0.1";
-  by-version."zlib-browserify"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-zlib-browserify-0.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.1.tgz";
-        name = "zlib-browserify-0.0.1.tgz";
-        sha1 = "4fa6a45d00dbc15f318a4afa1d9afc0258e176cc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."zlib-browserify" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "zlib-browserify" ];
-  };
   by-spec."zlib-browserify"."^0.0.3" =
     self.by-version."zlib-browserify"."0.0.3";
   by-version."zlib-browserify"."0.0.3" = lib.makeOverridable self.buildNodePackage {
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 6539fc3e6dd..25ce3121227 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -118,4 +118,5 @@
 , "fetch-bower"
 , { "titanium": "3.2.1" }
 , "gh"
+, "deepmerge"
 ]
-- 
GitLab


From 98c3caed931c5942bf17b5fea863f37d1711c1e1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Mar 2014 17:56:32 +0100
Subject: [PATCH 2690/3789] nvidia-x11: Update to 331.49

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 1632f4f4ecb..d46692e6cdc 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.38";
+  versionNumber = "331.49";
 
 in
 
@@ -21,18 +21,18 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
 
-  patches = optional (kernel ? version && versionAtLeast kernel.version "3.13") ./kernel-3.13.patch ;
+  patches = optional (kernel ? version && versionAtLeast kernel.version "3.13") ./kernel-3.13.patch;
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "1x1b70lnw2ipwlyff7czxqrgz8yyq87djzgmgs9p3lmczy7lsvir";
+        sha256 = "00d7bq8cfxk52qd4y226fz8m9m3mjq45fbgr3q7k08jyy9qmswmn";
       }
     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 = "1ljafiqnyhj355mjp3r8wmb806xm6mbrn0x1dfgqh5pv9imhszhp";
+        sha256 = "0q3lvl1lypi33i847nqz4k3161ackh2n9kgyjn6v2c480f405hfk";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
-- 
GitLab


From c704f6bb4e884c5c5670f08dd3f5daedd18d5772 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Mar 2014 16:52:08 +0100
Subject: [PATCH 2691/3789] VM tests: Run hwclock in the initrd

Needed for the installer tests, since otherwise mounting a filesystem
may fail as it has a last-mounted date in the future.

http://hydra.nixos.org/build/9846712
---
 nixos/modules/virtualisation/qemu-vm.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index a866b513f0f..80bc71bbb8c 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -291,6 +291,11 @@ in
         if test -z "$FSTYPE"; then
             mke2fs -t ext4 /dev/vda
         fi
+
+        # Set the system time from the hardware clock to work around a
+        # bug in qemu-kvm > 1.5.2 (where the VM clock is initialised
+        # to the *boot time* of the host).
+        hwclock -s
       '';
 
     boot.initrd.postMountCommands =
-- 
GitLab


From 65727f92e4bc3ebfdac6b3096587011e6d00c8ce Mon Sep 17 00:00:00 2001
From: Jacob Hinkle <jacob.hinkle@gmail.com>
Date: Fri, 28 Mar 2014 15:47:57 -0600
Subject: [PATCH 2692/3789] Bump texlive download versions *0215->*0314

---
 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 98a8a0fd810..85de3dc08cf 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.20140215";
+  texmfVersion = "2013.20140314";
   texmfSrc = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz";
-    sha256 = "0f1xqa1a1yklsiqz12rgihdc6viw8ghdbx2s2pw2k3h0dfsd6ss3";
+    sha256 = "0f2dxm0ac4j04w1rgjpdranpprjghw8slvijknykpvph1jn0lmzm";
   };
 
-  langTexmfVersion = "2013.20140215";
+  langTexmfVersion = "2013.20140314";
   langTexmfSrc = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz";
-    sha256 = "0igz9kpd1rfbq7smb1wyd75cz396rinbh25rk19lxqh25dix0xzj";
+    sha256 = "154g300nbg4fhxprvi9fwr7wmpws4cg89m9nwsfpyf0m2k8n9ibx";
   };
 
   passthru = { inherit texmfSrc langTexmfSrc; };
diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix
index 056c7e0bf4e..10b9962936d 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.20140215";
+  version = "2013.20140314";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz";
-    sha256 = "04a67pns6q8kw1nl2v6x5p443kvhk8fr26qkcj7z098n68fpwls8";
+    sha256 = "6b4216fe87c354a0c3c8ec456272cc096a7ec112a68031797ae23f18e1e5b74c";
   };
 
   buildInputs = [texLive xz];
-- 
GitLab


From 960690e9316488579cdda9b0419c9462d25dc47f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 24 Mar 2014 00:02:00 -0500
Subject: [PATCH 2693/3789] bsdiff: adopt and clean up

Bonus: simpler build, and should fix the build of bsdiff for Darwin
(patch taken from homebrew).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/compression/bsdiff/builder.sh      |  8 ----
 pkgs/tools/compression/bsdiff/default.nix     | 37 +++++++++++++++----
 .../compression/bsdiff/include-systypes.patch | 12 ++++++
 3 files changed, 42 insertions(+), 15 deletions(-)
 delete mode 100644 pkgs/tools/compression/bsdiff/builder.sh
 create mode 100644 pkgs/tools/compression/bsdiff/include-systypes.patch

diff --git a/pkgs/tools/compression/bsdiff/builder.sh b/pkgs/tools/compression/bsdiff/builder.sh
deleted file mode 100644
index f2792a40a60..00000000000
--- a/pkgs/tools/compression/bsdiff/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-source $stdenv/setup
-
-installFlags="PREFIX=$out INSTALL=install"
-
-mkdir -p "$out/bin"
-mkdir -p "$out/man/man1"
-
-genericBuild
diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix
index 81210490883..1d693f781e6 100644
--- a/pkgs/tools/compression/bsdiff/default.nix
+++ b/pkgs/tools/compression/bsdiff/default.nix
@@ -1,14 +1,37 @@
-{stdenv, fetchurl, bzip2}:
+{ stdenv, fetchurl, bzip2 }:
+
+stdenv.mkDerivation rec {
+  name    = "bsdiff-${version}";
+  version = "4.3";
 
-stdenv.mkDerivation {
-  name = "bsdiff-4.3";
-  builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.daemonology.net/bsdiff/bsdiff-4.3.tar.gz;
+    url    = "http://www.daemonology.net/bsdiff/${name}.tar.gz";
     sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq";
   };
+
   buildInputs = [ bzip2 ];
-  patchPhase = ''
-    sed 's/^\.//g' -i Makefile
+  patches = [ ./include-systypes.patch ];
+
+  buildPhase = ''
+    cc -O3 -lbz2 bspatch.c -o bspatch
+    cc -O3 -lbz2 bsdiff.c  -o bsdiff
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man1
+
+    cp bsdiff    $out/bin
+    cp bspatch   $out/bin
+    cp bsdiff.1  $out/share/man/man1
+    cp bspatch.1 $out/share/man/man1
   '';
+
+  meta = {
+    description = "An efficient binary diff/patch tool";
+    homepage    = "http://www.daemonology.net/bsdiff";
+    license     = stdenv.lib.licenses.bsd2;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
 }
diff --git a/pkgs/tools/compression/bsdiff/include-systypes.patch b/pkgs/tools/compression/bsdiff/include-systypes.patch
new file mode 100644
index 00000000000..d070a8bb0f8
--- /dev/null
+++ b/pkgs/tools/compression/bsdiff/include-systypes.patch
@@ -0,0 +1,12 @@
+diff --git a/bspatch.c b/bspatch.c
+index 643c60b..543379c 100644
+--- a/bspatch.c
++++ b/bspatch.c
+@@ -28,6 +28,7 @@
+ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.1 2005/08/06 01:59:06 cperciva Exp $");
+ #endif
+ 
++#include <sys/types.h>
+ #include <bzlib.h>
+ #include <stdlib.h>
+ #include <stdio.h>
-- 
GitLab


From fff798b018d0d0087aaaef35e102fc15cd7788b5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 28 Mar 2014 23:43:37 -0400
Subject: [PATCH 2694/3789] Revert "ccid: Update from 1.4.14 -> 1.4.15"

ccid was already updated in master

This reverts commit a7077973a50908f46f796fc85c390d5306e67dd8.
---
 pkgs/tools/security/ccid/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index 7d218f49623..4be2393eed5 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
 stdenv.mkDerivation rec {
-  version = "1.4.15";
+  version = "1.4.14";
   name = "ccid-${version}";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/file/3989/${name}.tar.bz2";
-    sha256 = "5436182246f15b3e78b1ad6707022b02dc400e3f50c4cb5e5d340a4e716d990a";
+    url = "http://ftp.de.debian.org/debian/pool/main/c/ccid/ccid_${version}.orig.tar.bz2";
+    sha256 = "0inibkhzk4ghg85jkysscjrzshmxfdzz6b54dqj182l0isn082y5";
   };
 
   patchPhase = ''
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pcsclite pkgconfig libusb1 ];
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "ccid drivers for pcsclite";
     homepage = http://pcsclite.alioth.debian.org/;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [viric];
-    platforms = with platforms; linux;
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }
-- 
GitLab


From 1eddec9f9b11668c928dffbf917dd433817fffa4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 29 Mar 2014 05:00:12 -0400
Subject: [PATCH 2695/3789] webkitgtk: Fix build with chroot

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

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index b742be27f74..8497ea9ae94 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -25,12 +25,10 @@ stdenv.mkDerivation rec {
 
   patches = [ ./webcore-svg-libxml-cflags.patch ];
 
+  CC = "cc";
+
   prePatch = ''
     patchShebangs Tools/gtk
-
-    for i in $(find . -name '*.p[l|m]'); do
-      sed -e 's@/usr/bin/gcc@gcc@' -i $i
-    done
   '';
 
   configureFlags = with stdenv.lib; [
-- 
GitLab


From f6ca125548a8401962e13a858b2ee85c90343d66 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 29 Mar 2014 05:01:50 -0400
Subject: [PATCH 2696/3789] buildLocalCabal: Jailbreak by default.

buildLocalCabal is for local convenience anyway
---
 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 b8f4076c89a..f0b940d02a0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2911,7 +2911,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
           | grep -v FILTERME | sed \
             -e 's/licenses.proprietary/licenses.unfree/' \
             -e 's/{ cabal/{ cabal, src/' \
-            -e 's/pname = \([^\n]*\)/pname = \1\n  inherit src;/'  > $out
+            -e 's/pname = \([^\n]*\)/pname = \1\n  inherit src;\n  jailbreak = true;/'  > $out
       '';
     };
   in callPackage cabalExpr { inherit src; };
-- 
GitLab


From 38cc80f4d87fd534d1aaa86ef3a247b5bda8499a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 29 Mar 2014 05:25:16 -0400
Subject: [PATCH 2697/3789] D'oh

---
 nixos/modules/virtualisation/virtualbox-guest.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
index 3d43ec0ff4c..84c86539b33 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";
       };
 
-    services.mesa.videoDrivers = mkOverride 50 [ "virtualbox" ];
+    hardware.mesa.videoDrivers = mkOverride 50 [ "virtualbox" ];
 
     services.xserver.config =
       ''
-- 
GitLab


From c23464672ec9be77b03abb8a4dec72324dcfee22 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 29 Mar 2014 05:28:37 -0400
Subject: [PATCH 2698/3789] sloppy sloppy Shea

---
 nixos/modules/virtualisation/virtualbox-guest.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
index 84c86539b33..b06ae94438e 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.mesa.videoDrivers = mkOverride 50 [ "virtualbox" ];
+    hardware.opengl.videoDrivers = mkOverride 50 [ "virtualbox" ];
 
     services.xserver.config =
       ''
-- 
GitLab


From 227997d8cab68c3305da72cd48e425da36233936 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 10 Mar 2014 11:10:32 +0100
Subject: [PATCH 2699/3789] nixos/rabbitmq: rewrite

- rewrite from old jobs options to new services
- add simple test
- add dataDir option
---
 nixos/modules/services/amqp/rabbitmq.nix | 69 +++++++++++-------------
 nixos/tests/default.nix                  |  1 +
 nixos/tests/rabbitmq.nix                 | 18 +++++++
 3 files changed, 51 insertions(+), 37 deletions(-)
 create mode 100644 nixos/tests/rabbitmq.nix

diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
index 696b5ad4379..dc1a68aefbb 100644
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
@@ -3,20 +3,11 @@
 with pkgs.lib;
 
 let
-
   cfg = config.services.rabbitmq;
 
-  run = cmd: "${pkgs.sudo}/bin/sudo -E -u rabbitmq ${cmd}";
-
-in
-
-{
-
-
+in {
   ###### interface
-
   options = {
-
     services.rabbitmq = {
 
       enable = mkOption {
@@ -40,55 +31,59 @@ in
         '';
       };
 
-    };
 
+      dataDir = mkOption {
+        type = types.path;
+        default = "/var/lib/rabbitmq";
+        description = ''
+          Data directory for rabbitmq.
+        '';
+      };
+
+    };
   };
 
 
   ###### implementation
-
   config = mkIf cfg.enable {
 
     environment.systemPackages = [ pkgs.rabbitmq_server ];
 
     users.extraUsers.rabbitmq = {
       description = "RabbitMQ server user";
-      home = "/var/empty";
+      home = "${cfg.dataDir}";
       group = "rabbitmq";
       uid = config.ids.uids.rabbitmq;
     };
 
     users.extraGroups.rabbitmq.gid = config.ids.gids.rabbitmq;
 
-    jobs.rabbitmq = {
-        description = "RabbitMQ server";
-
-        startOn = "started network-interfaces";
+    systemd.services.rabbitmq = {
+      description = "RabbitMQ Server";
 
-        preStart =
-          ''
-            mkdir -m 0700 -p /var/lib/rabbitmq
-            chown rabbitmq /var/lib/rabbitmq
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
 
-            mkdir -m 0700 -p /var/log/rabbitmq
-            chown rabbitmq /var/log/rabbitmq
-          '';
-
-        environment.HOME = "/var/lib/rabbitmq";
-        environment.RABBITMQ_NODE_IP_ADDRESS = cfg.listenAddress;
-        environment.SYS_PREFIX = "";
-
-        exec =
-          ''
-            ${run "${pkgs.rabbitmq_server}/sbin/rabbitmq-server"}
-          '';
+      environment = {
+        RABBITMQ_MNESIA_BASE = "${cfg.dataDir}/mnesia";
+        RABBITMQ_NODE_IP_ADDRESS = cfg.listenAddress;
+        RABBITMQ_SERVER_START_ARGS = "-rabbit error_logger tty -rabbit sasl_error_logger false";
+        SYS_PREFIX = "";
+      };
 
-        preStop =
-          ''
-            ${run "${pkgs.rabbitmq_server}/sbin/rabbitmqctl stop"}
-          '';
+      serviceConfig = {
+        ExecStart = "${pkgs.rabbitmq_server}/sbin/rabbitmq-server";
+        User = "rabbitmq";
+        Group = "rabbitmq";
+        PermissionsStartOnly = true;
       };
 
+      preStart = ''
+        mkdir -p ${cfg.dataDir} && chmod 0700 ${cfg.dataDir}
+        if [ "$(id -u)" = 0 ]; then chown rabbitmq:rabbitmq ${cfg.dataDir}; fi
+      '';
+    };
+
   };
 
 }
diff --git a/nixos/tests/default.nix b/nixos/tests/default.nix
index 5b68862a2cd..4aeb7f55ac3 100644
--- a/nixos/tests/default.nix
+++ b/nixos/tests/default.nix
@@ -33,6 +33,7 @@ with import ../lib/testing.nix { inherit system minimal; };
   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);
diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix
new file mode 100644
index 00000000000..271661f0682
--- /dev/null
+++ b/nixos/tests/rabbitmq.nix
@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+
+# This test runs rabbitmq and checks if rabbitmq is up and running
+
+{
+  nodes = {
+    one = { config, pkgs, ... }: {
+      services.rabbitmq.enable = true;
+    };
+  };
+
+  testScript = ''
+    startAll;
+  
+    $one->waitForUnit("rabbitmq.service");
+    $one->waitUntilSucceeds("su -s ${pkgs.stdenv.shell} rabbitmq -c \"rabbitmqctl status\"");
+  '';
+}
-- 
GitLab


From d60af7f34dfa9caae8139179e3acc5fbe68c9549 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 29 Mar 2014 04:48:08 -0500
Subject: [PATCH 2700/3789] minecraft-server: version 1.7.5

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/games/minecraft-server/default.nix | 35 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/games/minecraft-server/default.nix

diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
new file mode 100644
index 00000000000..bfa5a69dfc3
--- /dev/null
+++ b/pkgs/games/minecraft-server/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, jre }:
+
+with import <nixpkgs> {};
+
+stdenv.mkDerivation rec {
+  name    = "minecraft-server-${version}";
+  version = "1.7.5";
+
+  src  = fetchurl {
+    url    = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar";
+    sha256 = "0f3sh3fws02yl4xqa8qrvn0cchfp0hymqrf30c5syzzcz9w4l8pq";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin $out/lib/minecraft
+    cp -v $src $out/lib/minecraft/server.jar
+
+    cat > $out/bin/minecraft-server << EOF
+    #!/bin/sh
+    exec ${jre}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui
+    EOF
+
+    chmod +x $out/bin/minecraft-server
+  '';
+
+  phases = "installPhase";
+
+  meta = {
+    description = "Minecraft Server";
+    homepage    = "https://minecraft.net";
+    license     = stdenv.lib.licenses.unfreeRedistributable;
+    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 e3b34243d4d..84e31d82bf8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1394,6 +1394,8 @@ let
 
   minecraft = callPackage ../games/minecraft { };
 
+  minecraft-server = callPackage ../games/minecraft-server { };
+
   minetest = callPackage ../games/minetest {
     libpng = libpng12;
   };
-- 
GitLab


From 1acca1c396ca97b9ef706a66e5170341c9ec33d5 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 29 Mar 2014 04:48:33 -0500
Subject: [PATCH 2701/3789] nixos: add minecraft-server service

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/misc/ids.nix                    |  1 +
 nixos/modules/module-list.nix                 |  1 +
 .../services/games/minecraft-server.nix       | 51 +++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 nixos/modules/services/games/minecraft-server.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index fc05584e256..9c413e36d56 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -122,6 +122,7 @@
       notbit = 111;
       ngircd = 112;
       btsync = 113;
+      minecraft = 114;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e59b0ff5ac2..652a99e7c5a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -96,6 +96,7 @@
   ./services/databases/postgresql.nix
   ./services/databases/virtuoso.nix
   ./services/games/ghost-one.nix
+  ./services/games/minecraft-server.nix
   ./services/hardware/acpid.nix
   ./services/hardware/amd-hybrid-graphics.nix
   ./services/hardware/bluetooth.nix
diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix
new file mode 100644
index 00000000000..ac70bc53473
--- /dev/null
+++ b/nixos/modules/services/games/minecraft-server.nix
@@ -0,0 +1,51 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.minecraft-server;
+in
+{
+  options = {
+    services.minecraft-server = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If enabled, start a Minecraft Server. The listening port for
+          the server is always <literal>25565</literal>. The server
+          data will be loaded from and saved to
+          <literal>/var/lib/minecraft</literal>.
+        '';
+      };
+
+      jvmOpts = mkOption {
+        type = types.str;
+        default = "-Xmx2048M -Xms2048M";
+        description = "JVM options for the Minecraft Service.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.extraUsers.minecraft = {
+      description     = "Minecraft Server Service user";
+      home            = "/var/lib/minecraft";
+      createHome      = true;
+      uid             = config.ids.uids.minecraft;
+    };
+
+    systemd.services.minecraft-server = {
+      description   = "Minecraft Server Service";
+      wantedBy      = [ "multi-user.target" ];
+      after         = [ "network.target" ];
+
+      serviceConfig.Restart = "always";
+      serviceConfig.User    = "minecraft";
+      script = ''
+        cd /var/lib/minecraft
+        exec ${pkgs.minecraft-server}/bin/minecraft-server ${cfg.jvmOpts}
+      '';
+    };
+  };
+}
-- 
GitLab


From 99d639d750e30182bdc8a188798a8b847a6702d0 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Sat, 29 Mar 2014 13:44:50 +0100
Subject: [PATCH 2702/3789] Update Virtualbox and Guest Additions to 4.3.10,
 Oracle Extensions to 93012

---
 .../applications/virtualization/virtualbox/default.nix | 10 +++++-----
 .../virtualbox/guest-additions/default.nix             |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 819b06be012..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.8"; # 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 = "92456";
+  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.8/SHA256SUMS
-    sha256 = "eb364239fc399416af6c985b3082bfbdd206d42a60e7af98ffba13d60912b864";
+    # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS
+    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 = "ffabd8735bdc80753cec29d01b499769f41e083f37a3f58b3055f19d3b1b9641";
+    sha256 = "739835aee3274a663b23eeb748bd0430e8a5d8ba2f4d0eae5dc47ff2c485e23b";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index f9b8fd457a8..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 = "a1e58f3a15cab81b82424c6382a490bb02377d78d537a57538692fa83ce448c7";
+    sha256 = "247e15e9a205dcd4761f6cb547ceca2a61e8d6905c1930870939fd323f4cd1ae";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";
-- 
GitLab


From f949a71aac67ee24289550b5f7c693a23bf3d6e3 Mon Sep 17 00:00:00 2001
From: Maxim Ivanov <ivanov.maxim@gmail.com>
Date: Sat, 29 Mar 2014 12:28:25 +0000
Subject: [PATCH 2703/3789] add libmsgpack C/C++ library (close #2059)

---
 lib/maintainers.nix                           |  1 +
 .../libraries/libmsgpack/default.nix          | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/libmsgpack/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 29dd06c69b9..938e1ed5455 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -62,6 +62,7 @@
   pSub = "Pascal Wittmann <mail@pascal-wittmann.de>";
   qknight = "Joachim Schiele <js@lastlog.de>";
   raskin = "Michael Raskin <7c6f434c@mail.ru>";
+  redbaron = "Maxim Ivanov <ivanov.maxim@gmail.com>";
   rickynils = "Rickard Nilsson <rickynils@gmail.com>";
   rob = "Rob Vermaas <rob.vermaas@gmail.com>";
   roconnor = "Russell O'Connor <roconnor@theorem.ca>";
diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix
new file mode 100644
index 00000000000..26dc6be8382
--- /dev/null
+++ b/pkgs/development/libraries/libmsgpack/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, autoconf, automake, libtool, ruby }:
+
+stdenv.mkDerivation rec {
+  version = "0.5.8";
+  name = "libmsgpack-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/msgpack/msgpack-c/archive/cpp-${version}.tar.gz";
+    sha256 = "1h6k9kdbfavmw3by5kk3raszwa64hn9k8yw9rdhvl5m8g2lks89k";
+  };
+
+  buildInputs = [ autoconf automake libtool ruby ];
+
+  outputs = [ "out" "lib" ];
+
+  preConfigure = "./bootstrap";
+
+  postInstall = ''
+    mkdir -p $lib/lib
+    mv $out/lib/*.so.* $lib/lib/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "MessagePack implementation for C and C++";
+    homepage = http://msgpack.org;
+    maintainers = [ maintainers.redbaron ];
+    license = licenses.asl20;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3b34243d4d..86b07854c02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4913,6 +4913,8 @@ let
 
   libmtp = callPackage ../development/libraries/libmtp { };
 
+  libmsgpack = callPackage ../development/libraries/libmsgpack { };
+
   libnatspec = callPackage ../development/libraries/libnatspec { };
 
   libnfsidmap = callPackage ../development/libraries/libnfsidmap { };
-- 
GitLab


From bd1abb36dd2a357cc9e12102e42fbedc071ba503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Mar 2014 16:15:13 +0100
Subject: [PATCH 2704/3789] xorg: minor updates of xrandr and util-macros

---
 pkgs/servers/x11/xorg/default.nix       | 12 ++++++------
 pkgs/servers/x11/xorg/extra.list        |  1 -
 pkgs/servers/x11/xorg/tarballs-7.7.list |  4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 5ce58e67c40..c1e274081ea 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1100,11 +1100,11 @@ let
   })) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
 
   utilmacros = (stdenv.mkDerivation ((if overrides ? utilmacros then overrides.utilmacros else x: x) {
-    name = "util-macros-1.18.0";
+    name = "util-macros-1.19.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/util-macros-1.18.0.tar.bz2;
-      sha256 = "0nwlg1d4r23byncb3kar1a0mhjn52fc1m0ygl9p5gw2jm0rd3qz5";
+      url = mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2;
+      sha256 = "1fnhpryf55l0yqajxn0cxan3kvsjzi67nlanz8clwqzf54cb2d98";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -2010,11 +2010,11 @@ let
   })) // {inherit ;};
 
   xrandr = (stdenv.mkDerivation ((if overrides ? xrandr then overrides.xrandr else x: x) {
-    name = "xrandr-1.4.1";
+    name = "xrandr-1.4.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xrandr-1.4.1.tar.bz2;
-      sha256 = "0l0y4ifaqg90ibci276jvyawpj7ynzd8czsqxy5pfljnjymm9db7";
+      url = mirror://xorg/individual/app/xrandr-1.4.2.tar.bz2;
+      sha256 = "1g4hnj53wknsjwiqivyy3jl4qw7jwrpncz7d5p2z29zq5zlnxrxj";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ];
   })) // {inherit libX11 xproto libXrandr libXrender ;};
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 867e050bce0..3abfed675f8 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -6,4 +6,3 @@ http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2
-http://xorg.freedesktop.org/releases/individual/util/util-macros-1.17.tar.bz2
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 89ea4b95630..9de73701e82 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -97,7 +97,7 @@ mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2
 mirror://xorg/individual/app/sessreg-1.0.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/setxkbmap-1.3.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/smproxy-1.0.5.tar.bz2
-mirror://xorg/individual/util/util-macros-1.18.0.tar.bz2
+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
@@ -175,7 +175,7 @@ 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/app/xrandr-1.4.1.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
 mirror://xorg/individual/app/xset-1.2.3.tar.bz2
-- 
GitLab


From 71982ab7083dfd39a344adbb83eedb4d12acbad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Mar 2014 16:45:37 +0100
Subject: [PATCH 2705/3789] gtkmm3: update to fix build with gtk-3.12

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

diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix
index 8649abec637..600ea1a0278 100644
--- a/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/pkgs/development/libraries/gtkmm/3.x.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }:
 
 let
-  ver_maj = "3.10";
-  ver_min = "1";
+  ver_maj = "3.11"; # unstable version, but ATM no stable builds with gtk-3.12 and this is the version used in GNOME-3.12 "stable"
+  ver_min = "9";
 in
 stdenv.mkDerivation rec {
   name = "gtkmm-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz";
-    sha256 = "0f1587pc6x8hn268vqj5zr4dvyisj5zd9zpsfxyfm1pkbjmcv9bg";
+    sha256 = "04yji82prijlwpd3blx0am1ikjy7y7ih7jd628dywdjbbfq42920";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From be6a16ccbc57de85fad6e8f9be8b80020793817b Mon Sep 17 00:00:00 2001
From: Matthew Sackman <matthew@rabbitmq.com>
Date: Sat, 29 Mar 2014 16:47:23 +0000
Subject: [PATCH 2706/3789] Add New-DJBDNS

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

diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix
new file mode 100644
index 00000000000..e2dc1fd1eaf
--- /dev/null
+++ b/pkgs/tools/networking/ndjbdns/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, systemd, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "1.05.9";
+  name = "ndjbdns-${version}";
+  src = fetchurl {
+    url = "http://pjp.dgplug.org/ndjbdns/${name}.tar.gz";
+    sha256 = "0gf3hlmr6grcn6dzflf83lqqfp6hk3ldhbc7z0a1rrh059m93ap5";
+  };
+
+  buildInputs = [ pkgconfig systemd ];
+
+  meta = with stdenv.lib; {
+    description = "N-DJBDNS is a brand new release of the Djbdns. Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein.";
+    homepage = http://pjp.dgplug.org/ndjbdns/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.msackman ];
+    platforms = platforms.linux;
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4ad8db5c0f..b340825ccab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1457,6 +1457,8 @@ let
 
   nbd = callPackage ../tools/networking/nbd { };
 
+  ndjbdns = callPackage ../tools/networking/ndjbdns { };
+
   netatalk = callPackage ../tools/filesystems/netatalk { };
 
   netcdf = callPackage ../development/libraries/netcdf { };
-- 
GitLab


From 8b94e22f33b10a9aed8df676b1833dd39c30cc1d Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Sat, 29 Mar 2014 11:00:26 +0100
Subject: [PATCH 2707/3789] Add gcc-arm-embedded.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These are packages for precompiled ARM microcontroller compilers from
https://launchpad.net/gcc-arm-embedded.

[Bjørn: modify commit message (add paragraph).]
---
 .../compilers/gcc-arm-embedded/default.nix    | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 12 ++++++
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/compilers/gcc-arm-embedded/default.nix

diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix
new file mode 100644
index 00000000000..2a71405e2b9
--- /dev/null
+++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, bzip2, patchelf, glibc, gcc, fetchurl, version, releaseType, sha256 }:
+with stdenv.lib;
+let
+  versionParts = splitString "-" version; # 4.7 2013q3 20130916
+  majorVersion = elemAt versionParts 0; # 4.7
+  yearQuarter = elemAt versionParts 1; # 2013q3
+  underscoreVersion = replaceChars ["."] ["_"] version; # 4_7-2013q3-20130916
+  yearQuarterParts = splitString "q" yearQuarter; # 2013 3
+  year = elemAt yearQuarterParts 0; # 2013
+  quarter = elemAt yearQuarterParts 1; # 3
+  subdirName = "${majorVersion}-${year}-q${quarter}-${releaseType}"; # 4.7-2013-q3-update
+in
+stdenv.mkDerivation {
+  name = "gcc-arm-embedded-${version}";
+
+  src = fetchurl {
+    url = "https://launchpad.net/gcc-arm-embedded/${majorVersion}/${subdirName}/+download/gcc-arm-none-eabi-${underscoreVersion}-linux.tar.bz2";
+    sha256 = sha256;
+  };
+
+  buildInputs = [ bzip2 patchelf ];
+ 
+  dontPatchELF = true;
+  
+  phases = "unpackPhase patchPhase installPhase";
+  
+  installPhase = ''
+    mkdir -pv $out
+    cp -r ./* $out
+
+    for f in $(find $out); do
+      if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then
+        patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \
+                 --set-rpath $out/lib:${gcc}/lib \
+                 "$f" || true
+      fi
+    done
+  '';
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d1d908e935..f927145c4d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2722,6 +2722,18 @@ let
       regexCompat HsSyck random;
   };
 
+  gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
+    version = "4.7-2013q3-20130916";
+    releaseType = "update";
+    sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d";
+  };
+  gcc-arm-embedded-4_8 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
+    version = "4.8-2014q1-20140314";
+    releaseType = "update";
+    sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577";
+  };
+  gcc-arm-embedded = gcc-arm-embedded-4_8;
+
   # Haskell and GHC
 
   # Import Haskell infrastructure.
-- 
GitLab


From b5bd583bb8451f79bb358e393895ad85d0c31ae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 29 Mar 2014 18:27:35 +0100
Subject: [PATCH 2708/3789] gcc-arm-embedded: add meta attributes

---
 pkgs/development/compilers/gcc-arm-embedded/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix
index 2a71405e2b9..62e08d1fa7c 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix
@@ -36,5 +36,11 @@ stdenv.mkDerivation {
       fi
     done
   '';
-}
 
+  meta = with stdenv.lib; {
+    description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4, Cortex-R4/R5/R7)";
+    homepage = "https://launchpad.net/gcc-arm-embedded";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
-- 
GitLab


From 5668a70a49a76e72d19534cbdcea3bf0172b5bca 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, 29 Mar 2014 23:10:03 +0800
Subject: [PATCH 2709/3789] widelands: update to build-18 (close #2062)

@vcunat enabled parallelBuilding.
---
 .../boost_and_cmake_die_die_die.patch         |  11 --
 pkgs/games/widelands/default.nix              | 103 ++++++------------
 pkgs/top-level/all-packages.nix               |   2 +-
 3 files changed, 37 insertions(+), 79 deletions(-)
 delete mode 100644 pkgs/games/widelands/boost_and_cmake_die_die_die.patch

diff --git a/pkgs/games/widelands/boost_and_cmake_die_die_die.patch b/pkgs/games/widelands/boost_and_cmake_die_die_die.patch
deleted file mode 100644
index f008be35e37..00000000000
--- a/pkgs/games/widelands/boost_and_cmake_die_die_die.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- widelands-build17-src.old/CMakeLists.txt	2012-04-23 02:46:49.000000000 -0700
-+++ widelands-build17-src/CMakeLists.txt	2012-07-14 19:49:14.000000000 -0700
-@@ -140,8 +140,6 @@
- else (WL_UNIT_TESTS)
-   message(STATUS "Disabled Unit Tests")
-   set (Boost_FIND_COMPONENTS signals)
--  set (Boost_USE_STATIC_LIBS   ON)
--  set (Boost_USE_MULTITHREADED ON)
-   set (Boost_DETAILED_FAILURE_MSG ON)
-   find_package(Boost 1.35.0 COMPONENTS signals REQUIRED)
- endif (WL_UNIT_TESTS)
diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix
index 65c99134072..b6008bd7e76 100644
--- a/pkgs/games/widelands/default.nix
+++ b/pkgs/games/widelands/default.nix
@@ -1,77 +1,46 @@
-x@{builderDefsPackage
-  , libjpeg, boost, SDL, SDL_gfx, SDL_image, SDL_net, SDL_ttf, SDL_sound
-  , gettext, zlib, libiconv, libpng, python, expat, lua5, glew, doxygen
-  , cmake, ggz_base_libs, mesa, SDL_mixer
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, cmake, python, gettext
+, boost, libpng, zlib, glew, lua
+, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, SDL_gfx
+}:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="widelands";
-    version="build17";
-    name="${baseName}-${version}";
-    project="${baseName}";
-    url="https://launchpadlibrarian.net/102893896/widelands-build17-src.tar.bz2";
-    hash="be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["killBuildDir" "doPatch"  "doCmake" "doMakeInstall" "createScript"];
-
-  patches = [ ./boost_and_cmake_die_die_die.patch ]; 
-      
-  killBuildDir = a.fullDepEntry ''
-    rm -r build
-  '' ["minInit" "doUnpack"];
-
-  cmakeFlags = [
-    "-DLUA_LIBRARIES=-llua"
-    "-DWL_PORTABLE=true"
-  ];
-
-  createScript = a.fullDepEntry ''
-    mkdir -p "$out/bin"
-    echo '#! ${a.stdenv.shell}' >> "$out/bin/widelands"
-    echo "cd \"$out/share/games/widelands\"" >> "$out/bin/widelands"
-    echo "\"$out/games/widelands\" \"\$@\"" >> "$out/bin/widelands"
-    chmod a+x "$out/bin/widelands"
-  '' ["minInit"];
+stdenv.mkDerivation {
+  name = "widelands-18";
 
-  meta = {
-    description = "Widelands RTS with multiple-goods economy";
+  meta = with stdenv.lib; {
+    description = "RTS with multiple-goods economy";
+    homepage    = "http://widelands.org/";
     longDescription = ''
       Widelands is a real time strategy game based on "The Settlers" and "The
       Settlers II". It has a single player campaign mode, as well as a networked
-      multiplayer mode. 
+      multiplayer mode.
     '';
-
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-      jcumming
-    ];
-    platforms = a.lib.platforms.linux;
+    license        = licenses.gpl2Plus;
+    platforms      = platforms.linux;
+    maintainers    = with maintainers; [ raskin jcumming ];
     hydraPlatforms = [];
-    license = a.lib.licenses.gpl2Plus;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "https://launchpad.net/widelands/+download";
-    };
+
+
+  src = fetchurl {
+    url = "https://launchpad.net/widelands/build18/build-18/+download/"
+        + "widelands-build18-src.tar.bz2";
+    sha256 = "1qvx1cwkf61iwq0qkngvg460dsxqsfvk36qc7jf7mzwkiwbxkzvd";
   };
-}) x
 
+  preConfigure = ''
+    cmakeFlags="
+      -DWL_INSTALL_PREFIX=$out
+      -DWL_INSTALL_BINDIR=bin
+      -DWL_INSTALL_DATADIR=share/widelands
+    "
+  '';
+
+  nativeBuildInputs = [ cmake python gettext ];
+
+  buildInputs = [
+    boost libpng zlib glew lua
+    SDL SDL_image SDL_mixer SDL_net SDL_ttf SDL_gfx
+  ];
+
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 482c0086242..da2edad1e60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9811,7 +9811,7 @@ let
   warzone2100 = callPackage ../games/warzone2100 { };
 
   widelands = callPackage ../games/widelands {
-    libpng = libpng12;
+    lua = lua5_1;
   };
 
   worldofgoo_demo = callPackage ../games/worldofgoo {
-- 
GitLab


From 5d26659bb93a21430a6a8af26ce069f6cdddb190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Mar 2014 18:35:11 +0100
Subject: [PATCH 2710/3789] nixUnstable: update to avoid the funny --c||es bug
 :-)

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 7f52950aa36..28497647f86 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.7pre3522_f7e077a";
+  name = "nix-1.7pre3538_4900957";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/9342392/download/4/${name}.tar.xz";
-    sha256 = "f1fce2cc7bde1a7bd5d8d491153ed805542970768211ebb7b121d9630033afc2";
+    url = "http://hydra.nixos.org/build/9862372/download/5/${name}.tar.xz";
+    sha256 = "05l9j892cscf0ig6s0kxkfigzqwrsza4g38a40s87yvd2cr14pxq";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];
-- 
GitLab


From a7980953d218a31566ebd5e9fe83545c9689d639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Mar 2014 18:36:38 +0100
Subject: [PATCH 2711/3789] libtasn1: major update 2.14 -> 3.4

---
 pkgs/development/libraries/libtasn1/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 42fa2578062..d90e1c22564 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, perl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "libtasn1-2.14";
+  name = "libtasn1-3.4";
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "0m1x2p04xpacl18dzv1hmsm2fk97gi167ra5h4kmjy16436kcadw";
+    sha256 = "1j5cwsjk9wai700ljsr5qyzywijrr5ba05hhg4mkgqlg8mx50lzk";
   };
 
+  buildInputs = [ perl texinfo ];
+
   doCheck = true;
 
   meta = {
-- 
GitLab


From 22c04a2fe121edfdc7950fea293c0ed2eea769e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Mar 2014 19:44:30 +0100
Subject: [PATCH 2712/3789] shishi: minor update to fix build with new libtasn1

---
 pkgs/servers/shishi/default.nix   |  6 ++----
 pkgs/servers/shishi/no-gets.patch | 20 --------------------
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/servers/shishi/no-gets.patch

diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index a5d31ca354d..2e0a4e84f6c 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -1,15 +1,13 @@
 { fetchurl, stdenv, libtasn1, libgcrypt, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "shishi-1.0.1";
+  name = "shishi-1.0.2";
 
   src = fetchurl {
     url = "mirror://gnu/shishi/${name}.tar.gz";
-    sha256 = "13c6w9rpaqb3am65nrn86byvmll5r78pld2vb0i68491vww4fzlx";
+    sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d";
   };
 
-  patches = [ ./no-gets.patch ];
-
   buildInputs = [ libtasn1 libgcrypt gnutls ] ;
 
   NIX_CFLAGS_COMPILE
diff --git a/pkgs/servers/shishi/no-gets.patch b/pkgs/servers/shishi/no-gets.patch
deleted file mode 100644
index 12137204f45..00000000000
--- a/pkgs/servers/shishi/no-gets.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/gl/stdio.in.h b/gl/stdio.in.h
-index 06d9780..fa04a10 100644
---- a/gl/stdio.in.h
-+++ b/gl/stdio.in.h
-@@ -713,10 +713,13 @@ _GL_CXXALIAS_SYS (gets, char *, (char *s));
- # endif
- _GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
-+   so any use of gets warrants an unconditional warning; besides C11
-+   removed it.  */
-+#ifdef gets
-+#undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-+#endif
- 
- 
- #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
-- 
GitLab


From e50a76a4693a9f64c028e47c336b68cf36a50e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Mar 2014 20:24:13 +0100
Subject: [PATCH 2713/3789] openssh: fix CVE-2014-2653 by a Debian patch

---
 pkgs/tools/networking/openssh/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index b0d1dba891b..6926b9aa82a 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -31,7 +31,17 @@ stdenv.mkDerivation rec {
       export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
     '';
 
-  patches = [ ./locale_archive.patch ];
+  patches = [
+    ./locale_archive.patch
+    (fetchurl {
+      name = "CVE-2014-2653.patch";
+      url = "http://anonscm.debian.org/gitweb/?p=pkg-ssh/openssh.git;a=blobdiff_plain;"
+        + "f=sshconnect.c;h=324f5e0a396a4da9885d121bbbef87f6ccf2b149;"
+        + "hp=87c3770c0fd5c7ff41227c45b4528985eaea54a6;hb=63d5fa28e16d96db6bac2dbe3fcecb65328f8966;"
+        + "hpb=9cbb60f5e4932634db04c330c88abc49cc5567bd";
+      sha256 = "160c434igl2r8q4cavhdlwvnbqizx444sjrhg98f997pyhz524h9";
+    })
+  ];
 
   buildInputs = [ zlib openssl libedit pkgconfig pam ]
     ++ stdenv.lib.optional withKerberos [ kerberos ];
-- 
GitLab


From 6c77690b2898aa8a12184ca8f3c113a11c957e50 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Wed, 26 Mar 2014 18:12:00 -0400
Subject: [PATCH 2714/3789] rippled: initial pkg and module expressions

rippled is the Ripple P2P payment network reference server
https://ripple.com
---
 lib/maintainers.nix                     |   1 +
 nixos/modules/misc/ids.nix              |   1 +
 nixos/modules/module-list.nix           |   1 +
 nixos/modules/services/misc/rippled.nix | 326 ++++++++++++++++++++++++
 pkgs/servers/rippled/default.nix        |  32 +++
 pkgs/servers/rippled/scons-env.patch    |  46 ++++
 pkgs/top-level/all-packages.nix         |   2 +
 7 files changed, 409 insertions(+)
 create mode 100644 nixos/modules/services/misc/rippled.nix
 create mode 100644 pkgs/servers/rippled/default.nix
 create mode 100644 pkgs/servers/rippled/scons-env.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 938e1ed5455..1e3b9a32a52 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -28,6 +28,7 @@
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
+  emery = "Emery Hemingawy <emery@vfemail.net>";
   ertes = "Ertugrul Söylemez <es@ertes.de>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
   garbas = "Rok Garbas <rok@garbas.si>";
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 9c413e36d56..f03aeed7f65 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -123,6 +123,7 @@
       ngircd = 112;
       btsync = 113;
       minecraft = 114;
+      rippled = 115;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 652a99e7c5a..79c071087e4 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -132,6 +132,7 @@
   ./services/misc/nix-gc.nix
   ./services/misc/nix-ssh-serve.nix
   ./services/misc/nixos-manual.nix
+  ./services/misc/rippled.nix
   ./services/misc/rogue.nix
   ./services/misc/svnserve.nix
   ./services/misc/synergy.nix
diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix
new file mode 100644
index 00000000000..7d339a48b97
--- /dev/null
+++ b/nixos/modules/services/misc/rippled.nix
@@ -0,0 +1,326 @@
+# configuration building is commented out until better tested.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.rippled;
+
+  rippledStateCfgFile = "/var/lib/rippled/rippled.cfg";
+
+  rippledCfg = ''
+    [node_db]
+    type=HyperLevelDB
+    path=/var/lib/rippled/db/hyperldb
+
+    [debug_logfile]
+    /var/log/rippled/debug.log
+
+  ''
+  /*
+  + optionalString (cfg.ips != null) ''
+    [ips]
+    ${concatStringsSep "\n" cfg.ips}
+
+  ''
+  + optionalString (cfg.ipsFixed != null) ''
+    [ips_fixed]
+    ${concatStringsSep "\n" cfg.ipsFixed}
+
+  ''
+  */
+  + optionalString (cfg.peerIp != null) ''
+    [peer_ip]
+    ${cfg.peerIp}
+
+    [peer_port]
+    ${toString cfg.peerPort}
+
+  ''
+  + cfg.extraConfig;
+
+  rippledCfgFile = pkgs.writeText "rippled.cfg" rippledCfg;
+    
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.rippled = {
+
+      enable = mkOption {
+        default = false;
+	description = "Whether to enable rippled";
+      };
+
+      /*
+      ips = mkOption {
+        default = [ "r.ripple.com 51235" ];
+	example = [ "192.168.0.1" "192.168.0.1 3939" "r.ripple.com 51235" ];
+	description = ''
+	  List of hostnames or ips where the Ripple protocol is served.
+	  For a starter list, you can either copy entries from: 
+	  https://ripple.com/ripple.txt or if you prefer you can let it
+	   default to r.ripple.com 51235
+
+	  A port may optionally be specified after adding a space to the 
+	  address. By convention, if known, IPs are listed in from most 
+	  to least trusted.
+	'';
+      };
+
+      ipsFixed = mkOption {
+        default = null;
+	example = [ "192.168.0.1" "192.168.0.1 3939" "r.ripple.com 51235" ];
+	description = ''
+	  List of IP addresses or hostnames to which rippled should always 
+	  attempt to maintain peer connections with. This is useful for 
+	  manually forming private networks, for example to configure a 
+	  validation server that connects to the Ripple network through a 
+	  public-facing server, or for building a set of cluster peers.
+
+	  A port may optionally be specified after adding a space to the address
+	'';
+      };
+      */
+
+      peerIp = mkOption {
+        default = null;
+	example = "0.0.0.0";
+	description = ''
+	  IP address or domain to bind to allow external connections from peers.
+	  Defaults to not binding, which disallows external connections from peers.
+        '';
+      };
+
+      peerPort = mkOption {
+	default = 51235;
+	description = ''
+	  If peerIp is supplied, corresponding port to bind to for peer connections.
+	'';
+      };
+
+      /*
+      peerPortProxy = mkOption {
+        type = types.int;
+	example = 51236;
+	description = ''
+	  An optional, additional listening port number for peers. Incoming
+	  connections on this port will be required to provide a PROXY Protocol
+	  handshake, described in this document (external link):
+
+	    http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt
+
+	  The PROXY Protocol is a popular method used by elastic load balancing
+	  service providers such as Amazon, to identify the true IP address and
+	  port number of external incoming connections.
+
+	  In addition to enabling this setting, it will also be required to
+	  use your provider-specific control panel or administrative web page
+	  to configure your server instance to receive PROXY Protocol handshakes,
+	  and also to restrict access to your instance to the Elastic Load Balancer.
+	'';
+      };
+
+      peerPrivate = mkOption {
+        default = null;
+	example = 0;
+	description = ''
+	 0: Request peers to broadcast your address. Normal outbound peer connections [default]
+	 1: Request peers not broadcast your address. Only connect to configured peers.
+       '';
+     };
+
+     peerSslCipherList = mkOption {
+       default = null;
+       example = "ALL:!LOW:!EXP:!MD5:@STRENGTH";
+       description = ''
+         A colon delimited string with the allowed SSL cipher modes for peer. The
+	 choices for for ciphers are defined by the OpenSSL API function
+	 SSL_CTX_set_cipher_list, documented here (external link):
+
+	  http://pic.dhe.ibm.com/infocenter/tpfhelp/current/index.jsp?topic=%2Fcom.ibm.ztpf-ztpfdf.doc_put.cur%2Fgtpc2%2Fcpp_ssl_ctx_set_cipher_list.html
+
+	The default setting of "ALL:!LOW:!EXP:!MD5:@STRENGTH", which allows
+	non-authenticated peer connections (they are, however, secure).
+      '';
+    };
+
+    nodeSeed = mkOption {
+      default = null;
+      example = "RASH BUSH MILK LOOK BAD BRIM AVID GAFF BAIT ROT POD LOVE";
+      description = ''
+        This is used for clustering. To force a particular node seed or key, the
+	key can be set here.  The format is the same as the validation_seed field.
+	To obtain a validation seed, use the rippled validation_create command.
+      '';
+    };
+
+    clusterNodes = mkOption {
+      default = null;
+      example = [ "n9KorY8QtTdRx7TVDpwnG9NvyxsDwHUKUEeDLY3AkiGncVaSXZi5" ];
+      description = ''
+        To extend full trust to other nodes, place their node public keys here.
+	Generally, you should only do this for nodes under common administration.
+	Node public keys start with an 'n'. To give a node a name for identification
+	place a space after the public key and then the name.
+      '';
+    };
+
+    sntpServers = mkOption {
+      default = null;
+      example = [ "time.nist.gov" "pool.ntp.org" ];
+      description = ''
+        IP address or domain of NTP servers to use for time synchronization.
+      '';
+    };
+
+    # TODO: websocket options
+
+    rpcAllowRemote = mkOption {
+      default = false;
+      description = ''
+        false: Allow RPC connections only from 127.0.0.1. [default]
+	true:  Allow RPC connections from any IP.
+      '';
+    };
+
+    rpcAdminAllow = mkOption {
+      example = [ "10.0.0.4" ];
+      description = ''
+        List of IP addresses allowed to have admin access.
+      '';
+    };
+
+    rpcAdminUser = mkOption {
+      type = types.str;
+      description = ''
+        As a server, require this as the admin user to be specified.  Also, require
+	rpc_admin_user and rpc_admin_password to be checked for RPC admin functions.
+	The request must specify these as the admin_user and admin_password in the
+	request object.
+      '';
+    };
+
+    rpcAdminPassword = mkOption {
+      type = types.str;
+      description = ''
+        As a server, require this as the admin pasword to be specified.  Also,
+	require rpc_admin_user and rpc_admin_password to be checked for RPC admin
+	functions.  The request must specify these as the admin_user and
+	admin_password in the request object.
+      '';
+    };
+
+      rpcIp = mkOption {
+        type = types.str;
+	description = ''
+	  IP address or domain to bind to allow insecure RPC connections.
+	  Defaults to not binding, which disallows RPC connections.
+	'';
+      };
+
+      rpcPort = mkOption {
+        type = types.int;
+        description = ''
+          If rpcIp is supplied, corresponding port to bind to for peer connections.
+        '';
+      };
+
+      rpcUser = mkOption {
+        type = types.str;
+	description = ''
+	  Require a this user to specified and require rpcPassword to
+	  be checked for RPC access via the rpcIp and rpcPort. The user and password
+	  must be specified via HTTP's basic authentication method.
+	  As a client, supply this to the server via HTTP's basic authentication
+	  method.
+	'';
+      };
+
+      rpcPassword = mkOption {
+        type = types.str;
+	description = ''
+	  Require a this password to specified and require rpc_user to
+	  be checked for RPC access via the rpcIp and rpcPort. The user and password
+	  must be specified via HTTP's basic authentication method.
+	  As a client, supply this to the server via HTTP's basic authentication
+	  method.
+	'';
+      };
+
+      rpcStartup = mkOption {
+        example = [ ''"command" : "log_level"'' ''"partition" : "ripplecalc"'' ''"severity" : "trace"'' ];
+	description = "List of RPC commands to run at startup.";
+      };
+
+      rpcSecure = mkOption {
+        default = false;
+	description = ''
+	  false: Server certificates are not provided for RPC clients using SSL [default]
+	  true:  Client RPC connections wil be provided with SSL certificates.
+
+	  Note that if rpc_secure is enabled, it will also be necessasry to configure the
+	  certificate file settings located in rpcSslCert, rpcSslChain, and rpcSslKey
+	'';
+      };
+      */
+
+      extraConfig = mkOption {
+        default = "";
+	description = ''
+	  Extra lines to be added verbatim to the rippled.cfg configuration file.
+	'';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment = {
+      etc = singleton
+        { source = rippledStateCfgFile;
+	  target = "rippled";
+	};
+	
+	# users can attempt to send RPC commands to the server.
+	systemPackages = [ pkgs.rippled ];
+    };
+
+    users.extraUsers = singleton
+      { name = "rippled";
+        description = "Ripple server user";
+        uid = config.ids.uids.rippled;
+	home = "/var/lib/rippled";
+      };
+
+    systemd.services.rippled = {
+      path = [ pkgs.rippled ];
+
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        ExecStart = "${pkgs.rippled}/bin/rippled --fg -q --conf ${rippledStateCfgFile}";
+	WorkingDirectory = "/var/lib/rippled";
+      };
+    };
+
+    networking.firewall.allowedTCPPorts = mkIf (cfg.peerIp != null) [ cfg.peerPort ];
+
+    system.activationScripts.rippled = ''
+      mkdir -p /var/{lib,log}/rippled
+      chown -R rippled /var/{lib,log}/rippled
+      ln -sf ${rippledCfgFile} ${rippledStateCfgFile}
+    '';
+  };
+}
diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix
new file mode 100644
index 00000000000..66a0743b367
--- /dev/null
+++ b/pkgs/servers/rippled/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, scons, pkgconfig, openssl, protobuf, boost155, zlib}:
+
+stdenv.mkDerivation rec {
+  name = "rippled-${version}";
+  version = "0.23.0";
+
+  src = fetchurl {
+    url = "https://github.com/ripple/rippled/archive/${version}.tar.gz";
+    sha256 = "0js734sk11jn19fyp403mk6p62azlc6s9kyhr5jfg466fiak537p";
+  };
+
+  patches = [ ./scons-env.patch ];
+
+  buildInputs = [ scons pkgconfig openssl protobuf boost155 zlib ];
+
+  RIPPLED_BOOST_HOME = boost155.out;
+  RIPPLED_ZLIB_HOME = zlib.out;
+  buildPhase = "scons build/rippled";
+
+  installPhase = ''
+    mkdir -p $out/bin    
+    cp build/rippled $out/bin/
+  '';
+
+  meta = {
+    description = "Ripple P2P payment network reference server";
+    homepage = "https://ripple.com";
+    maintainers = stdenv.lib.maintainers.emery;
+    license = stdenv.lib.licenses.isc;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/servers/rippled/scons-env.patch b/pkgs/servers/rippled/scons-env.patch
new file mode 100644
index 00000000000..5b80e77bb2e
--- /dev/null
+++ b/pkgs/servers/rippled/scons-env.patch
@@ -0,0 +1,46 @@
+diff --git a/SConstruct b/SConstruct
+index 8ba8bbd..95eab3b 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -24,6 +24,8 @@ USING_CLANG = OSX or os.environ.get('CC', None) == 'clang'
+ #
+ BOOST_HOME = os.environ.get("RIPPLED_BOOST_HOME", None)
+ 
++ZLIB_HOME = os.environ.get("RIPPLED_ZLIB_HOME", None)
++
+ 
+ if OSX or Ubuntu or Debian or Archlinux:
+     CTAGS = 'ctags'
+@@ -36,7 +38,7 @@ else:
+ # scons tools
+ #
+ 
+-HONOR_ENVS = ['CC', 'CXX', 'PATH']
++HONOR_ENVS = ['CC', 'CXX', 'PATH', 'PKG_CONFIG_PATH']
+ 
+ env = Environment(
+     tools = ['default', 'protoc'],
+@@ -156,8 +158,8 @@ INCLUDE_PATHS = [
+     'build/proto'
+     ]
+ 
+-# if BOOST_HOME:
+-#     INCLUDE_PATHS.append(BOOST_HOME)
++if BOOST_HOME:
++    INCLUDE_PATHS.append("%s/include" % BOOST_HOME)
+ 
+ #-------------------------------------------------------------------------------
+ #
+@@ -261,7 +263,11 @@ env.Append(
+ # such, as installed into `/usr/lib/`
+ if BOOST_HOME is not None:
+     env.Prepend(
+-        LIBPATH = ["%s/stage/lib" % BOOST_HOME])
++        LIBPATH = ["%s/lib" % BOOST_HOME])
++
++if ZLIB_HOME is not None:
++    env.Prepend(
++        LIBPATH = ["%s/lib" % ZLIB_HOME])
+ 
+ if not OSX:
+     env.Append(LINKFLAGS = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da2edad1e60..8a9228d15a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6528,6 +6528,8 @@ let
 
   rethinkdb = callPackage ../servers/nosql/rethinkdb { };
 
+  rippled = callPackage ../servers/rippled { };
+
   spamassassin = callPackage ../servers/mail/spamassassin {
     inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile
       HTTPDate MailDKIM LWP IOSocketSSL;
-- 
GitLab


From 090ee41e6bc1a0fae5c0e85ed213e9ae97211cc3 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Sat, 29 Mar 2014 20:54:17 +0100
Subject: [PATCH 2715/3789] gvfs: Fix build with lightWeight=false (close
 #2068)

Needed for SMB backend.
---
 pkgs/development/libraries/gvfs/default.nix | 2 +-
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 083d0a10cdf..73b74a12c66 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -2,7 +2,7 @@
 , glib, dbus, udev, udisks2, libgcrypt
 , libgphoto2, avahi, libarchive, fuse, libcdio
 , libxml2, libxslt, docbook_xsl
-, lightWeight ? true, gnome, samba, makeWrapper }:
+, lightWeight ? true, gnome, samba, libgnome_keyring, gconf, makeWrapper }:
 
 let
   ver_maj = "1.18";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da2edad1e60..fbc96e29d82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4584,7 +4584,7 @@ let
 
   gts = callPackage ../development/libraries/gts { };
 
-  gvfs = callPackage ../development/libraries/gvfs { };
+  gvfs = callPackage ../development/libraries/gvfs { gconf = gnome.GConf; };
 
   gwenhywfar = callPackage ../development/libraries/gwenhywfar { };
 
-- 
GitLab


From 9a2758f98d0e832a1fe9a3f62b057c5dd97049ad Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Sat, 29 Mar 2014 23:03:35 +0100
Subject: [PATCH 2716/3789] Add Printrun.

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

diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix
new file mode 100644
index 00000000000..dc258d65328
--- /dev/null
+++ b/pkgs/applications/misc/printrun/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, python27Packages, fetchgit }:
+let
+  py = python27Packages;
+in
+py.buildPythonPackage rec {
+  name = "printrun";
+
+  src = fetchgit {
+    url = "https://github.com/kliment/Printrun";
+    rev = "0a7f2335d0c02c3cc283200867b41f8b337b1387";
+    sha256 = "1zvh5ih89isv51sraljm29z9k00srrdnklwkyp27ymxzlbcwq6gv";
+  };
+
+  propagatedBuildInputs = [ py.wxPython py.pyserial py.dbus py.psutil ];
+
+  doCheck = false;
+
+  postPatch = ''
+    sed -i -r "s|/usr(/local)?/share/|$out/share/|g" printrun/utils.py
+    sed -i "s|distutils.core|setuptools|" setup.py
+    sed -i "s|distutils.command.install |setuptools.command.install |" setup.py
+  '';
+
+  postInstall = ''
+    for f in $out/share/applications/*.desktop; do
+      sed -i -e "s|/usr/|$out/|g" "$f"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Pronterface, Pronsole, and Printcore - Pure Python 3d printing host software";
+    homepage = https://github.com/kliment/Printrun;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da2edad1e60..4e3cb7dcccc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9024,6 +9024,8 @@ let
 
   cura = callPackage ../applications/misc/cura { };
 
+  printrun = callPackage ../applications/misc/printrun { };
+
   slim = callPackage ../applications/display-managers/slim {
     libpng = libpng12;
   };
-- 
GitLab


From bc2984d77dcaf501a59381fbbb54fbc8844c6872 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Sat, 29 Mar 2014 23:33:37 +0100
Subject: [PATCH 2717/3789] nvidia-x11: Fix build with kernel 3.13.

---
 pkgs/os-specific/linux/nvidia-x11/default.nix |   2 -
 .../linux/nvidia-x11/kernel-3.13.patch        | 122 ------------------
 2 files changed, 124 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/nvidia-x11/kernel-3.13.patch

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index d46692e6cdc..7391a6fdf4c 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.13") ./kernel-3.13.patch;
-
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
diff --git a/pkgs/os-specific/linux/nvidia-x11/kernel-3.13.patch b/pkgs/os-specific/linux/nvidia-x11/kernel-3.13.patch
deleted file mode 100644
index 477ac1369e0..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/kernel-3.13.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -rupN NVIDIA-Linux-x86_64-331.38.orig/kernel/nv-acpi.c NVIDIA-Linux-x86_64-331.38/kernel/nv-acpi.c
---- NVIDIA-Linux-x86_64-331.38.orig/kernel/nv-acpi.c	2014-01-25 09:39:47.126966926 +0100
-+++ NVIDIA-Linux-x86_64-331.38/kernel/nv-acpi.c	2014-01-26 09:59:45.853427603 +0100
-@@ -303,7 +303,10 @@ static int nv_acpi_remove(struct acpi_de
- 
-     if (pNvAcpiObject->notify_handler_installed)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
-+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
-         NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
-+#endif
- 
-         // remove event notifier
-         status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
-@@ -1076,10 +1079,17 @@ RM_STATUS NV_API_CALL nv_acpi_dsm_method
-     NvU8 argument3[4]; /* For all DSM sub functions, input size is 4 */
-     NvU32 data_size;
-     acpi_handle dev_handle  = NULL;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
- #ifdef DEVICE_ACPI_HANDLE
-     nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); 
-     dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev);
- #endif
-+#else
-+#ifdef ACPI_HANDLE
-+    nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); 
-+    dev_handle = ACPI_HANDLE(&nvl->dev->dev);
-+#endif
-+#endif
- 
-     if (!dev_handle)
-         return RM_ERR_NOT_SUPPORTED;
-@@ -1179,12 +1189,21 @@ RM_STATUS NV_API_CALL nv_acpi_ddc_method
-     NvU32 i;
-     acpi_handle dev_handle  = NULL;
-     acpi_handle lcd_dev_handle  = NULL;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
- #ifdef DEVICE_ACPI_HANDLE
-     nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); 
-     dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev);
- #else
-         return RM_ERR_NOT_SUPPORTED;
- #endif
-+#else
-+#ifdef ACPI_HANDLE
-+    nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); 
-+    dev_handle = ACPI_HANDLE(&nvl->dev->dev);
-+#else
-+        return RM_ERR_NOT_SUPPORTED;
-+#endif
-+#endif
-     if (!dev_handle)
-         return RM_ERR_INVALID_ARGUMENT;
- 
-@@ -1294,12 +1313,21 @@ RM_STATUS NV_API_CALL nv_acpi_rom_method
-     struct acpi_object_list input = { 2, rom_arg };
-     acpi_handle dev_handle  = NULL;
-     uint32_t offset, length;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
- #ifdef DEVICE_ACPI_HANDLE
-     nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); 
--    dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev);
-+    dev_handle = ACPI_DEVICE_HANDLE(&nvl->dev->dev);
- #else
-     return RM_ERR_NOT_SUPPORTED;
- #endif
-+#else
-+#ifdef ACPI_HANDLE
-+    nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); 
-+    dev_handle = ACPI_HANDLE(&nvl->dev->dev);
-+#else
-+    return RM_ERR_NOT_SUPPORTED;
-+#endif
-+#endif
- 
-     if (!dev_handle)
-         return RM_ERR_INVALID_ARGUMENT;
-@@ -1364,12 +1392,21 @@ RM_STATUS NV_API_CALL nv_acpi_dod_method
-     union acpi_object *dod;
-     acpi_handle dev_handle = NULL;
-     NvU32 i, count = (*pSize / sizeof(NvU32));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
- #ifdef DEVICE_ACPI_HANDLE
-     nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-     dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev);
- #else
-     return RM_ERR_NOT_SUPPORTED;
- #endif
-+#else
-+#ifdef ACPI_HANDLE
-+    nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+    dev_handle = ACPI_HANDLE(&nvl->dev->dev);
-+#else
-+    return RM_ERR_NOT_SUPPORTED;
-+#endif
-+#endif
- 
-     if (!dev_handle)
-         return RM_ERR_INVALID_ARGUMENT;
-diff -rupN NVIDIA-Linux-x86_64-331.38.orig/kernel/uvm/nvidia_uvm_linux.h NVIDIA-Linux-x86_64-331.38/kernel/uvm/nvidia_uvm_linux.h
---- NVIDIA-Linux-x86_64-331.38.orig/kernel/uvm/nvidia_uvm_linux.h	2014-01-25 09:39:47.172966925 +0100
-+++ NVIDIA-Linux-x86_64-331.38/kernel/uvm/nvidia_uvm_linux.h	2014-01-25 09:46:40.572999245 +0100
-@@ -405,11 +405,17 @@ typedef void irqreturn_t;
- // not require the RCU's read lock on current->cred.
- //
- //
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-+#define NV_KUID_TO_UID(value) (__kuid_val(value))
-+#else
-+#define NV_KUID_TO_UID(value) (value)
-+#endif
-+
- #if defined(NV_TASK_STRUCT_HAS_CRED)
- #define NV_CURRENT_EUID() \
--    (((typeof(*current->cred) __force __kernel *)current->cred)->euid)
-+        NV_KUID_TO_UID(((typeof(*current->cred) __force __kernel *)current->cred)->euid)
- #else
--#define NV_CURRENT_EUID() (current->euid)
-+#define NV_CURRENT_EUID() NV_KUID_TO_UID(current->euid)
- #endif
- 
- #define NV_ATOMIC_SET(data,val)         atomic_set(&(data), (val))
-- 
GitLab


From 925cce304fd4e3297a7d7135418a21781025184c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 29 Mar 2014 18:47:53 -0500
Subject: [PATCH 2718/3789] cb0cat is now cb1cat

Submissions for CAESAR are now over, so CBEAMr0 has become CBEAMr1 with
some minor alterations.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/cb0cat/default.nix | 24 ------------------------
 pkgs/tools/security/cb1cat/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/tools/security/cb0cat/default.nix
 create mode 100644 pkgs/tools/security/cb1cat/default.nix

diff --git a/pkgs/tools/security/cb0cat/default.nix b/pkgs/tools/security/cb0cat/default.nix
deleted file mode 100644
index 0f84cfa6ebc..00000000000
--- a/pkgs/tools/security/cb0cat/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name    = "cb0cat-${version}";
-  version = "20131216153906";
-
-  src = fetchurl {
-    url    = "https://www.cblnk.com/cb0cat/dist/${name}.tgz";
-    sha256 = "182767nxfyiis7ac8bn5v8rxb9vlly8n5w42pz1dd0751xwdlp82";
-  };
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mv cb0cat $out/bin
-  '';
-
-  meta = {
-    description = "cryptographic tool based on the CBEAMr0 sponge function";
-    homepage    = "https://www.cblnk.com";
-    license     = stdenv.lib.licenses.bsd3;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
-  };
-}
diff --git a/pkgs/tools/security/cb1cat/default.nix b/pkgs/tools/security/cb1cat/default.nix
new file mode 100644
index 00000000000..7c3d9a1661e
--- /dev/null
+++ b/pkgs/tools/security/cb1cat/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name    = "cb1cat-${version}";
+  version = "20140328100000";
+
+  src = fetchurl {
+    url    = "https://www.cblnk.com/cb1cat/dist/${name}.tgz";
+    sha256 = "0fbly4fg2qsb4kx9wgv357bsa3mmmy8xmy0yszw80k50ixphjswv";
+  };
+
+  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 fbc96e29d82..af3f231b576 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -426,7 +426,7 @@ let
 
   aescrypt = callPackage ../tools/misc/aescrypt { };
 
-  cb0cat = callPackage ../tools/security/cb0cat { };
+  cb1cat = callPackage ../tools/security/cb1cat { };
 
   ahcpd = callPackage ../tools/networking/ahcpd { };
 
-- 
GitLab


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 2719/3789] 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
-- 
GitLab


From 81b4248d8d56863a0054ab19ea02a15e3a41d720 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 29 Mar 2014 19:28:39 -0500
Subject: [PATCH 2720/3789] ssdeep: Fix darwin build

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/ssdeep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix
index c59e50f4ae4..c5c47441704 100644
--- a/pkgs/tools/security/ssdeep/default.nix
+++ b/pkgs/tools/security/ssdeep/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1p7dgchq8hgadnxz5qh95ay17k5j74l4qyd15wspc54lb603p2av";
   };
 
-  postFixup = ''
+  postFixup = stdenv.lib.optionalString stdenv.isLinux ''
     patchelf --set-rpath "$(patchelf --print-rpath $out/bin/ssdeep):$out/lib" $out/bin/ssdeep
   '';
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "A program for calculating fuzzy hashes";
     homepage    = "http://www.ssdeep.sf.net";
     license     = stdenv.lib.licenses.gpl2;
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }
-- 
GitLab


From c2347401150addbfbe69b2f05b0857b0294bdaeb Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 29 Mar 2014 19:30:13 -0500
Subject: [PATCH 2721/3789] mps: broken on Darwin unfortunately

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/mps/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix
index d01f5f84fec..6e1e8c8e113 100644
--- a/pkgs/development/libraries/mps/default.nix
+++ b/pkgs/development/libraries/mps/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "A flexible memory management and garbage collection library";
     homepage    = "http://www.ravenbrook.com/project/mps";
     license     = stdenv.lib.licenses.sleepycat;
-    platforms   = stdenv.lib.platforms.unix;
+    platforms   = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }
-- 
GitLab


From c038133721c59d206283999513cfb892fcec1412 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 29 Mar 2014 19:55:07 -0500
Subject: [PATCH 2722/3789] fsharp: fix missing --replace argument

This should fix the Hydra build.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/fsharp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index 8cc283bc3f1..963c7e2cb5c 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ mono pkgconfig autoconf automake which ];
   configurePhase = ''
-    substituteInPlace ./autogen.sh "/usr/bin/env sh" "/bin/sh"
+    substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "/bin/sh"
     ./autogen.sh --prefix $out
   '';
 
-- 
GitLab


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 2723/3789] 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; };
-- 
GitLab


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 2724/3789] uzbl: build with webkitgtk2, cleanup

---
 .../networking/browsers/uzbl/default.nix      | 65 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  8 +--
 2 files changed, 30 insertions(+), 43 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";
+  meta = with stdenv.lib; {
+    description = "Tiny externally controllable webkit browser";
+    homepage    = "http://uzbl.org/";
+    license     = licenses.gpl3;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ raskin ];
+  };
 
-  inherit buildInputs;
-  configureFlags = [];
+  src = fetchurl {
+    name = "${name}.tar.gz";
+    url = "https://github.com/uzbl/uzbl/archive/2012.05.14.tar.gz";
+    sha256 = "1flpf0rg0c3n9bjifr37zxljn9yxslg8vkll7ghkm341x76cbkwn";
+  };
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["addInputs" "setVars" "doMakeInstall" "doWrap"];
+  preConfigure = ''
+    makeFlags="$makeFlags PREFIX=$out"
+    makeFlags="$makeFlags PYINSTALL_EXTRA=--prefix=$out"
+  '';
 
-  setVars = a.noDepEntry (''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -L${a.libX11}/lib -lX11"
-  '');
+  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"
+  '';
 
-  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
-    '';
+  nativeBuildInputs = [ pkgconfig python makeWrapper ];
 
-  installFlags = "PREFIX=$out PYINSTALL_EXTRA=\"--prefix=$out\"";
-      
-  meta = {
-    description = "Tiny externally controllable webkit browser";
-    maintainers = [a.lib.maintainers.raskin];
-  };
+  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 { };
-- 
GitLab


From 61ecf919e1303b6c1119faaa5e05b0c2a920daf3 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sun, 30 Mar 2014 04:26:24 +0200
Subject: [PATCH 2725/3789] New package: wal-e

A Postgres WAL-shipping disaster recovery and replication toolkit
---
 pkgs/tools/backup/wal-e/default.nix | 32 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/backup/wal-e/default.nix

diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix
new file mode 100644
index 00000000000..b1cc248e1a5
--- /dev/null
+++ b/pkgs/tools/backup/wal-e/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pythonPackages, lzop, postgresql, pv }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "wal-e-${version}";
+  version = "0.6.9";
+
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "https://github.com/wal-e/wal-e/archive/v${version}.tar.gz";
+    sha256 = "1yzz9hic8amq7mp0kh04hsmwisk5r374ddja5g8345bl8y3bzbgk";
+  };
+
+  # needs tox
+  doCheck = false;
+
+  propagatedBuildInputs = [
+    pythonPackages.boto
+    pythonPackages.gevent
+    postgresql
+    lzop
+    pv
+  ];
+
+  meta = {
+    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;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 938297faab9..df25e7dec5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2120,6 +2120,8 @@ let
 
   vtun = callPackage ../tools/networking/vtun { };
 
+  wal_e = callPackage ../tools/backup/wal-e { };
+
   wbox = callPackage ../tools/networking/wbox {};
 
   welkin = callPackage ../tools/graphics/welkin {};
-- 
GitLab


From 390a4b9164c71659640d359a5b54a8ae6307badb Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Sun, 30 Mar 2014 14:27:58 +0800
Subject: [PATCH 2726/3789] haskell: import git-date 0.2.1

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

diff --git a/pkgs/development/libraries/haskell/git-date/default.nix b/pkgs/development/libraries/haskell/git-date/default.nix
new file mode 100644
index 00000000000..9124da6c7a6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/git-date/default.nix
@@ -0,0 +1,19 @@
+{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2, time
+, utf8String
+}:
+
+cabal.mkDerivation (self: {
+  pname = "git-date";
+  version = "0.2.1";
+  sha256 = "17xiim439igg1gfcfwpzxjkgpmfqqh9v79jm4bg0f9h5dijij79l";
+  buildDepends = [ time utf8String ];
+  testDepends = [
+    QuickCheck testFramework testFrameworkQuickcheck2 time utf8String
+  ];
+  meta = {
+    homepage = "https://github.com/singpolyma/git-date-haskell";
+    description = "Bindings to the date parsing from Git";
+    license = self.stdenv.lib.licenses.gpl2;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f0b940d02a0..5812f2f5dc3 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
 
   gio = callPackage ../development/libraries/haskell/gio {};
 
+  gitDate = callPackage ../development/libraries/haskell/git-date {};
+
   github = callPackage ../development/libraries/haskell/github {};
 
   gitit = callPackage ../development/libraries/haskell/gitit {};
-- 
GitLab


From 9186f0b5dd39322208663108d00685d7faeee69a Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Sun, 30 Mar 2014 14:28:35 +0800
Subject: [PATCH 2727/3789] haskell: import persistent-mysql 1.3.0.2

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

diff --git a/pkgs/development/libraries/haskell/persistent-mysql/default.nix b/pkgs/development/libraries/haskell/persistent-mysql/default.nix
new file mode 100644
index 00000000000..7ff8a9de430
--- /dev/null
+++ b/pkgs/development/libraries/haskell/persistent-mysql/default.nix
@@ -0,0 +1,19 @@
+{ cabal, aeson, blazeBuilder, conduit, monadControl, mysql
+, mysqlSimple, persistent, resourcet, text, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "persistent-mysql";
+  version = "1.3.0.2";
+  sha256 = "0yv2f8zqypbp5swdpxmgnfmmfsr6lwhb27k0hl9bh7ya76anhvqy";
+  buildDepends = [
+    aeson blazeBuilder conduit monadControl mysql mysqlSimple
+    persistent resourcet text transformers
+  ];
+  meta = {
+    homepage = "http://www.yesodweb.com/book/persistent";
+    description = "Backend for the persistent library using MySQL database server";
+    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 5812f2f5dc3..363cede76cd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1941,6 +1941,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   persistent = callPackage ../development/libraries/haskell/persistent {};
 
+  persistentMysql = callPackage ../development/libraries/haskell/persistent-mysql {};
+
   persistentPostgresql = callPackage ../development/libraries/haskell/persistent-postgresql {};
 
   persistentSqlite = callPackage ../development/libraries/haskell/persistent-sqlite {};
-- 
GitLab


From bad9de86b6cb3e5a304d7fcd7d035dfa29ea9363 Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Sun, 30 Mar 2014 14:46:28 +0800
Subject: [PATCH 2728/3789] buildLocalCabal: do not set LANG/LOCALE_ARCHIVE on
 non-linux machines

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 363cede76cd..fe449dad45c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2903,13 +2903,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   # Build a cabal package given a local .cabal file
   buildLocalCabal = src: name: let
-    cabalExpr = pkgs.stdenv.mkDerivation {
+    cabalExpr = pkgs.stdenv.mkDerivation ({
       name = "${name}.nix";
 
-      LANG = "en_US.UTF-8";
-
-      LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
-
       buildCommand = ''
       ${self.cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \
           | grep -v FILTERME | sed \
@@ -2917,7 +2913,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
             -e 's/{ cabal/{ cabal, src/' \
             -e 's/pname = \([^\n]*\)/pname = \1\n  inherit src;\n  jailbreak = true;/'  > $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; };
 
   cabalDev = callPackage ../development/tools/haskell/cabal-dev {};
-- 
GitLab


From b894dfffb3f1b6f9051ea0b649a05b4ad4ccf12f Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sun, 30 Mar 2014 13:00:25 +0200
Subject: [PATCH 2729/3789] added mtpfs to mount MTP devices via usb using FUSE

---
 pkgs/tools/filesystems/mtpfs/default.nix | 26 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  3 +++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/filesystems/mtpfs/default.nix

diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix
new file mode 100644
index 00000000000..7725b0d7af8
--- /dev/null
+++ b/pkgs/tools/filesystems/mtpfs/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, fuse, libmtp, glib, libmad, libid3tag }:
+
+stdenv.mkDerivation rec {
+  name = "mtpfs-1.1";
+
+  buildInputs = [ pkgconfig fuse libmtp glib libid3tag libmad ];
+
+  # adding LIBS is a hack, duno why it does not find libid3tag.so by adding buildInputs
+  preConfigure = ''
+    export MAD_CFLAGS=${libmad}/include
+    export MAD_LIBS=${libmad}/lib/libmad.so
+    export LIBS=${libid3tag}/lib/libid3tag.so
+  '';
+
+  src = fetchurl {
+    url = "http://www.adebenham.com/files/mtp/${name}.tar.gz";
+    sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv";
+  };
+
+  meta = {
+    homepage = https://code.google.com/p/mtpfs/;
+    description = "FUSE Filesystem providing access to MTP devices";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.qknight ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da2edad1e60..59c234a4865 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4929,6 +4929,7 @@ let
 
   libmtp = callPackage ../development/libraries/libmtp { };
 
+
   libmsgpack = callPackage ../development/libraries/libmsgpack { };
 
   libnatspec = callPackage ../development/libraries/libnatspec { };
@@ -5375,6 +5376,8 @@ let
 
   mtdev = callPackage ../development/libraries/mtdev { };
 
+  mtpfs = callPackage ../tools/filesystems/mtpfs { };
+
   mu = callPackage ../tools/networking/mu {
     texinfo = texinfo4;
   };
-- 
GitLab


From c394d4079d65d9af5145c7d253bb5d18e3c2a451 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 16:44:42 +0200
Subject: [PATCH 2730/3789] xmonad: fix build with ghc 7.8.1

---
 pkgs/applications/window-managers/xmonad/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix
index 54ef0b274aa..c80c8f1c9db 100644
--- a/pkgs/applications/window-managers/xmonad/default.nix
+++ b/pkgs/applications/window-managers/xmonad/default.nix
@@ -10,8 +10,9 @@ cabal.mkDerivation (self: {
     extensibleExceptions filepath mtl utf8String X11
   ];
   postInstall = ''
+    shopt -s globstar
     mkdir -p $out/share/man/man1
-    mv $out/share/xmonad-*/man/*.1 $out/share/man/man1/
+    mv "$out/"**"/man/"*.1 $out/share/man/man1/
   '';
 
   patches = [
-- 
GitLab


From 1c192e1feac0572ecad7801d8b0311dbc7ecbdbc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 30 Mar 2014 16:52:56 +0200
Subject: [PATCH 2731/3789] Another attempt to fix the installer test

http://hydra.nixos.org/build/9904133
---
 nixos/modules/profiles/qemu-guest.nix    | 10 +++++++++-
 nixos/modules/virtualisation/qemu-vm.nix |  5 -----
 nixos/tests/installer.nix                |  4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix
index c8e6fd4aa76..0a92b7ace50 100644
--- a/nixos/modules/profiles/qemu-guest.nix
+++ b/nixos/modules/profiles/qemu-guest.nix
@@ -5,5 +5,13 @@
 
 {
   boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "9p" "9pnet_virtio" ];
-  boot.kernelModules = [ "virtio_balloon" "virtio_console" ];
+  boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" ];
+
+  boot.initrd.postDeviceCommands =
+    ''
+      # Set the system time from the hardware clock to work around a
+      # bug in qemu-kvm > 1.5.2 (where the VM clock is initialised
+      # to the *boot time* of the host).
+      hwclock -s
+    '';
 }
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 80bc71bbb8c..a866b513f0f 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -291,11 +291,6 @@ in
         if test -z "$FSTYPE"; then
             mke2fs -t ext4 /dev/vda
         fi
-
-        # Set the system time from the hardware clock to work around a
-        # bug in qemu-kvm > 1.5.2 (where the VM clock is initialised
-        # to the *boot time* of the host).
-        hwclock -s
       '';
 
     boot.initrd.postMountCommands =
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index b32012ea034..7929ef872b5 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -39,7 +39,8 @@ let
 
       { imports =
           [ ./hardware-configuration.nix
-            "''${modulesPath}/testing/test-instrumentation.nix"
+            <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
+            <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
           ];
 
         boot.loader.grub.version = ${toString grubVersion};
@@ -48,7 +49,6 @@ let
         ''}
         boot.loader.grub.device = "${grubDevice}";
         boot.loader.grub.extraConfig = "serial; terminal_output.serial";
-        boot.initrd.kernelModules = [ "virtio_console" ];
 
         environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ];
       }
-- 
GitLab


From aaf01268ffde61bd970df886fb2d11f8dc96175d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 30 Mar 2014 17:03:15 +0200
Subject: [PATCH 2732/3789] Revert "slim: remove duplicate code"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f7d5e83abbe95ed06aac58f4d1a2e971fae4d186.  It
breaks the Firefox and Xfce tests:

  in job ‘tests.firefox.x86_64-linux’:
  cannot coerce a boolean to a string

  in job ‘tests.xfce.x86_64-linux’:
  infinite recursion encountered
---
 lib/maintainers.nix                                 |  1 -
 .../modules/services/x11/display-managers/slim.nix  |  4 +---
 pkgs/applications/display-managers/slim/default.nix | 13 ++++++++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 938e1ed5455..944935425e3 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -37,7 +37,6 @@
   ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
   iElectric = "Domen Kozar <domen@dev.si>";
   iyzsong = "Song Wenwu <iyzsong@gmail.com>";
-  JagaJaga = "Arseniy Seroka <ars.seroka@gmail.com>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 29cdc4cdabc..b4f42ec7649 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -85,9 +85,7 @@ in
       
       package = mkOption {
         type = types.package;
-        default = pkgs.slim.override { 
-          theme = slimThemesDir; 
-          };
+        default = pkgs.slim;
         description = ''
           Configure slim package.
         '';
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 96c9e149c9f..caf8a7c4222 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -2,7 +2,18 @@
 , fontconfig, freetype, pam, dbus_libs, makeWrapper, pkgs, theme ? null }:
 
 let 
-  slimThemesDir = if theme == null then "$out/share/slim/themes" else theme;
+  slimThemesDir =
+      let
+        unpackedTheme = pkgs.stdenv.mkDerivation {
+          name = "slim-theme";
+          buildCommand = ''
+            ensureDir $out
+            cd $out
+            unpackFile ${theme}
+            ln -s * default
+          '';
+        };
+    in if theme == null then "$out/share/slim/themes" else unpackedTheme;
 in
 
 stdenv.mkDerivation rec {
-- 
GitLab


From 075168ca817420f6cb845353791945e251aff122 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 30 Mar 2014 17:26:43 +0200
Subject: [PATCH 2733/3789] nixos-hardware-scan: Detect QEMU

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 10 +++++++++-
 nixos/tests/installer.nix                              |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index bf7cdcd3711..d42c4c1f1dc 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -216,14 +216,22 @@ foreach my $path (glob "/sys/class/block/*") {
 }
 
 
+my $dmi = `@dmidecode@/sbin/dmidecode`;
+
+
 # Check if we're a VirtualBox guest.  If so, enable the guest
 # additions.
-my $dmi = `@dmidecode@/sbin/dmidecode`;
 if ($dmi =~ /Manufacturer: innotek/) {
     push @attrs, "services.virtualbox.enable = true;"
 }
 
 
+# Likewise for QEMU.
+if ($dmi =~ /Manufacturer: Bochs/) {
+    push @imports, "<nixpkgs/nixos/modules/profiles/qemu-guest.nix>";
+}
+
+
 # Generate the swapDevices option from the currently activated swap
 # devices.
 my @swaps = read_file("/proc/swaps");
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 7929ef872b5..c6d30d060f2 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -39,7 +39,6 @@ let
 
       { imports =
           [ ./hardware-configuration.nix
-            <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
             <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
           ];
 
-- 
GitLab


From 6f4a62e9e4342fc5303d026f108b3f84febe2a3d Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 30 Mar 2014 19:24:21 +0300
Subject: [PATCH 2734/3789] youtubeDL: update from 2014.03.25.1 to 2014.03.30.1

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index a70678c5034..6e2f92e9c1c 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.03.25.1";
+  version = "2014.03.30.1";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "09jayir0n10pgp6h3swzlx4d2x82by6f3dgbvnlvby73h5lpf668";
+    sha256 = "07xdhgc2sgr7bqkaxwcihvx6l0m6alp3i8d0ij7cxrk6b6rvwrgx";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From c53ae9b46251b0c7e4906cd556a20d921c45d645 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 30 Mar 2014 19:27:19 +0300
Subject: [PATCH 2735/3789] spaceFM: update from 0.9.2 to 0.9.4

---
 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 6d52f63ff6b..e1f98fceace 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -3,14 +3,14 @@
 }:
 
 let
-  version = "0.9.2";
+  version = "0.9.4";
 
 in stdenv.mkDerivation rec {
   name = "spacefm-${version}";
 
   src = fetchurl {
     url = "https://github.com/IgnorantGuru/spacefm/blob/pkg/${version}/${name}.tar.xz?raw=true";
-    sha256 = "3767137d74aa78597ffb42a6121784e91a4276efcd5d718b3793b9790f82268c";
+    sha256 = "0marwa031jk24q8hy90dr7yw6rv5hn1shar404zpb1k57v4nr23m";
   };
 
   buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig makeWrapper ];
-- 
GitLab


From d084be99654c62c1b0cfcdd3b597b1caade61bb7 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 30 Mar 2014 19:29:17 +0300
Subject: [PATCH 2736/3789] perlPackages.HTMLTiny: update from 1.03 to 1.05

---
 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 d5cd011bbae..f3663083384 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4069,10 +4069,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   HTMLTiny = buildPerlPackage rec {
-    name = "HTML-Tiny-1.03";
+    name = "HTML-Tiny-1.05";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz";
-      sha256 = "1nc9vr0z699jwv8jaxxpkfhspiv7glhdp500hqyzdm2jxfw8azrg";
+      sha256 = "18zxg7z51f5daidnwl9vxsrs3lz0y6n5ddqhpb748bjyk3awkkfp";
     };
   };
 
-- 
GitLab


From 66d8a9c72505b23865272982e616abbab7f5d000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Sun, 23 Feb 2014 22:22:29 +0100
Subject: [PATCH 2737/3789] yafc: update to 1.3.2

---
 pkgs/applications/networking/yafc/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix
index bdbb53d1675..752a7824e6f 100644
--- a/pkgs/applications/networking/yafc/default.nix
+++ b/pkgs/applications/networking/yafc/default.nix
@@ -1,13 +1,13 @@
-{stdenv, fetchurl, readline, libssh, intltool}:
+{stdenv, fetchurl, readline, libssh, intltool, libbsd}:
 
 stdenv.mkDerivation rec {
-  name = "yafc-1.2.3";
+  name = "yafc-1.3.2";
   src = fetchurl {
-    url = "https://github.com/downloads/sebastinas/yafc/${name}.tar.xz";
-    sha256 = "11h5r9ragfpil338kq981wxnifacflqfwgydhmy00b3fbdlnxzsi";
+    url = "http://www.yafc-ftp.com/upload/${name}.tar.xz";
+    sha256 = "0rrhik00xynxg5s3ffqlyynvy8ssv8zfaixkpb77baxa274gnbd7";
   };
 
-  buildInputs = [ readline libssh intltool ];
+  buildInputs = [ readline libssh intltool libbsd ];
 
   meta = {
     description = "ftp/sftp client with readline, autocompletion and bookmarks";
-- 
GitLab


From b372ce598ae8a55df4315e721d66b7ef31901e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Sun, 30 Mar 2014 18:30:45 +0200
Subject: [PATCH 2738/3789] SDL2: update to 2.0.3

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

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 6964d8ac804..b122248bb23 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -22,11 +22,11 @@ let
       '';
 in
 stdenv.mkDerivation rec {
-  name = "SDL2-2.0.2";
+  name = "SDL2-2.0.3";
 
   src = fetchurl {
     url = "http://www.libsdl.org/release/${name}.tar.gz";
-    sha256 = "0l78h3wlirnxxrdw3kkm9amhgjn6xrs9l5j871r552wabbw5f0ar";
+    sha256 = "0369ngvb46x6c26h8zva4x22ywgy6mvn0wx87xqwxg40pxm9m9m5";
   };
 
   # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
-- 
GitLab


From 5d098e8206a4538999c64150c871b55e53a1bcc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Sun, 30 Mar 2014 19:23:01 +0200
Subject: [PATCH 2739/3789] qpid-cpp: update to 0.26

Also, remove a workaround that's no longer needed.
---
 pkgs/servers/amqp/qpid-cpp/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix
index 9fc3520002c..69c0a3dff41 100644
--- a/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/pkgs/servers/amqp/qpid-cpp/default.nix
@@ -1,22 +1,17 @@
-{ stdenv, fetchurl, cmake, python, boost, libuuid }:
+{ stdenv, fetchurl, cmake, python, boost, libuuid, ruby }:
 
 stdenv.mkDerivation rec {
   name = "${project}-cpp-${version}";
 
   project = "qpid";
-  version = "0.24";
+  version = "0.26";
 
   src = fetchurl {
     url = "mirror://apache/${project}/${version}/${name}.tar.gz";
-    sha256 = "08nfks5jjipy5i4b6mz62ijrz5ryq32c478ix7l3fzmaim3cy8b8";
+    sha256 = "1c03yi19d5h5h78h37add9csmy0mzvvmvn7zkcalwszabdhsb5yk";
   };
 
-  buildInputs = [ cmake python boost libuuid ];
-
-  # workaround this
-  #/nix/store/n38ns73bm4iv62fihd9ih5b39w54yyaf-boost-1.54.0/include/boost/ptr_container/detail/map_iterator.hpp:52:48:
-  #error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
-  cmakeFlags = "-DENABLE_WARNINGS=OFF";
+  buildInputs = [ cmake python boost libuuid ruby ];
 
   # the subdir managementgen wants to install python stuff in ${python} and
   # the installation tries to create some folders in /var
-- 
GitLab


From 0fdd641b21631dc64db71b81caf77418b88c46f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 30 Mar 2014 19:32:10 +0200
Subject: [PATCH 2740/3789] Ensure that slim's theme applies to slimlock

---
 .../services/x11/display-managers/slim.nix    | 30 ++++++------------
 .../display-managers/slim/default.nix         | 23 ++------------
 .../display-managers/slim/runtime-paths.patch | 31 ++++++++++++++++---
 3 files changed, 38 insertions(+), 46 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index b4f42ec7649..cfe3ee53224 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -7,8 +7,6 @@ let
   dmcfg = config.services.xserver.displayManager;
 
   cfg = dmcfg.slim;
-  
-  slimPackage = cfg.package;
 
   slimConfig = pkgs.writeText "slim.cfg"
     ''
@@ -35,7 +33,7 @@ let
           ln -s * default
         '';
       };
-    in if cfg.theme == null then "${slimPackage}/share/slim/themes" else unpackedTheme;
+    in if cfg.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme;
 
 in
 
@@ -82,22 +80,6 @@ in
           the focus is placed on the password.
         '';
       };
-      
-      package = mkOption {
-        type = types.package;
-        default = pkgs.slim;
-        description = ''
-          Configure slim package.
-        '';
-        example = ''
-          pkgs.slim.override { 
-            theme = pkgs.fetchurl {
-              url = http://download.berlios.de/slim/slim-wave.tar.gz;
-              sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
-            }; 
-          };
-        '';
-      };
 
       autoLogin = mkOption {
         type = types.bool;
@@ -125,9 +107,15 @@ in
           { SLIM_CFGFILE = slimConfig;
             SLIM_THEMESDIR = slimThemesDir;
           };
-        execCmd = "exec ${slimPackage}/bin/slim";
+        execCmd = "exec ${pkgs.slim}/bin/slim";
       };
 
+    services.xserver.displayManager.sessionCommands =
+      ''
+        # Export the config/themes for slimlock.
+        export SLIM_THEMESDIR=${slimThemesDir}
+      '';
+
     # Allow null passwords so that the user can login as root on the
     # installation CD.
     security.pam.services.slim = { allowNullPassword = true; startSession = true; };
@@ -135,7 +123,7 @@ in
     # Allow slimlock to work.
     security.pam.services.slimlock = {};
 
-    environment.systemPackages = [ slimPackage ];
+    environment.systemPackages = [ pkgs.slim ];
 
   };
 
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index caf8a7c4222..bf2c34b9318 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -1,20 +1,5 @@
 { stdenv, fetchurl, cmake, pkgconfig, xorg, libjpeg, libpng
-, fontconfig, freetype, pam, dbus_libs, makeWrapper, pkgs, theme ? null }:
-
-let 
-  slimThemesDir =
-      let
-        unpackedTheme = pkgs.stdenv.mkDerivation {
-          name = "slim-theme";
-          buildCommand = ''
-            ensureDir $out
-            cd $out
-            unpackFile ${theme}
-            ln -s * default
-          '';
-        };
-    in if theme == null then "$out/share/slim/themes" else unpackedTheme;
-in
+, fontconfig, freetype, pam, dbus_libs, makeWrapper, pkgs }:
 
 stdenv.mkDerivation rec {
   name = "slim-1.3.6";
@@ -35,7 +20,7 @@ stdenv.mkDerivation rec {
       ./run-once.patch
     ];
 
-  preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc --replace /lib $out/lib";
+  preConfigure = "substituteInPlace CMakeLists.txt --replace /lib $out/lib";
 
   cmakeFlags = [ "-DUSE_PAM=1" ];
 
@@ -47,10 +32,6 @@ stdenv.mkDerivation rec {
       xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft makeWrapper
     ];
 
-  postInstall = ''
-    wrapProgram $out/bin/slimlock --set SLIM_THEMESDIR "${slimThemesDir}" --set SLIM_CFGFILE "$out/etc/slim.cfg"
-  '';
-
   NIX_CFLAGS_LINK = "-lXmu";
 
   meta = {
diff --git a/pkgs/applications/display-managers/slim/runtime-paths.patch b/pkgs/applications/display-managers/slim/runtime-paths.patch
index 2e4868092e5..5a8e07bfbf0 100644
--- a/pkgs/applications/display-managers/slim/runtime-paths.patch
+++ b/pkgs/applications/display-managers/slim/runtime-paths.patch
@@ -1,6 +1,6 @@
-diff -ru -x '*~' slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp
+diff -ru slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp
 --- slim-1.3.6-orig/app.cpp	2013-10-02 00:38:05.000000000 +0200
-+++ slim-1.3.6/app.cpp	2013-10-15 11:02:55.629263422 +0200
++++ slim-1.3.6/app.cpp	2014-03-30 19:01:04.115414201 +0200
 @@ -200,7 +200,9 @@
  
  	/* Read configuration and theme */
@@ -23,8 +23,31 @@ diff -ru -x '*~' slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp
  		themeName = cfg->getOption("current_theme");
  		string::size_type pos;
  		if ((pos = themeName.find(",")) != string::npos) {
---- slim-1.3.6-orig/slimlock.cpp	2014-02-05 01:58:01.576560731 +0400
-+++ slim-1.3.6/slimlock.cpp	2014-02-05 02:11:16.587634246 +0400
+diff -ru slim-1.3.6-orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt
+--- slim-1.3.6-orig/CMakeLists.txt	2013-10-02 00:38:05.000000000 +0200
++++ slim-1.3.6/CMakeLists.txt	2014-03-30 19:16:48.445069729 +0200
+@@ -23,7 +23,7 @@
+ 
+ set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory")
+ set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/slim")
+-set(SYSCONFDIR "/etc")
++set(SYSCONFDIR "$ENV{out}/etc")
+ set(LIBDIR "/lib")
+ set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man")
+ 
+@@ -40,7 +40,7 @@
+ set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPACKAGE=\"slim\"")
+ set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DVERSION=\"${SLIM_VERSION}\"")
+ set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"")
+-set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"")
++set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"/etc\"")
+ 
+ # Flags
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O2")
+Only in slim-1.3.6: CMakeLists.txt~
+diff -ru slim-1.3.6-orig/slimlock.cpp slim-1.3.6/slimlock.cpp
+--- slim-1.3.6-orig/slimlock.cpp	2013-10-02 00:38:05.000000000 +0200
++++ slim-1.3.6/slimlock.cpp	2014-03-30 19:01:04.115414201 +0200
 @@ -106,13 +106,17 @@
  	unsigned int cfg_passwd_timeout;
  	// Read user's current theme
-- 
GitLab


From 048a7e9d9ce30d1459302386d3aab0061d08bedb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Sun, 30 Mar 2014 19:34:33 +0200
Subject: [PATCH 2741/3789] minecraft: update to latest launcher

I changed the versioning scheme to the latest launcher date, which is
independent of minecraft version and is actually what the expression gets.
---
 pkgs/games/minecraft/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 6a3d528bde0..b4ec7eb311f 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -2,11 +2,11 @@
 , mesa, openal, alsaOss }:
 
 stdenv.mkDerivation {
-  name = "minecraft-1.4.7";
+  name = "minecraft-2013.07.01";
 
   src = fetchurl {
-    url = "https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft.jar";
-    sha256 = "92db974aa759a3f17f3cd61550fa5010e335c57dd813dad9e39b9cc013420a49";
+    url = "https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar";
+    sha256 = "04pj4l5q0a64jncm2kk45r7nxnxa2z9n110dcxbbahdi6wk0png8";
   };
 
   phases = "installPhase";
-- 
GitLab


From 0469f92fafbaad45d5aebc4b2bea64bc59ce2ce8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 30 Mar 2014 20:35:25 +0200
Subject: [PATCH 2742/3789] Bring back mkOrder

---
 lib/modules.nix                    | 34 +++++++++++++++++++++++++-----
 nixos/doc/manual/configuration.xml | 16 ++++++++++++--
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 6d9dc0e3ad3..017c9255246 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -155,8 +155,14 @@ rec {
     let
       # Process mkOverride properties, adding in the default
       # value specified in the option declaration (if any).
-      defsFinal = filterOverrides
+      defsFinal' = filterOverrides
         ((if opt ? default then [{ file = head opt.declarations; value = mkOptionDefault opt.default; }] else []) ++ defs);
+      # Sort mkOrder properties.
+      defsFinal =
+        # Avoid sorting if we don't have to.
+        if any (def: def.value._type or "" == "order") defsFinal'
+        then sortProperties defsFinal'
+        else defsFinal';
       files = map (def: def.file) defsFinal;
       # Type-check the remaining definitions, and merge them if
       # possible.
@@ -180,7 +186,7 @@ rec {
       };
 
   /* Given a config set, expand mkMerge properties, and push down the
-     mkIf properties into the children.  The result is a list of
+     other properties into the children.  The result is a list of
      config sets that do not have properties at top-level.  For
      example,
 
@@ -201,7 +207,7 @@ rec {
       map (mapAttrs (n: v: mkIf cfg.condition v)) (pushDownProperties cfg.content)
     else if cfg._type or "" == "override" then
       map (mapAttrs (n: v: mkOverride cfg.priority v)) (pushDownProperties cfg.content)
-    else
+    else # FIXME: handle mkOrder?
       [ cfg ];
 
   /* Given a config value, expand mkMerge properties, and discharge
@@ -253,6 +259,19 @@ rec {
       strip = def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def;
     in concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs;
 
+  /* Sort a list of properties.  The sort priority of a property is
+     1000 by default, but can be overriden by wrapping the property
+     using mkOrder. */
+  sortProperties = defs:
+    let
+      strip = def:
+        if def.value._type or "" == "order"
+        then def // { value = def.value.content; inherit (def.value) priority; }
+        else def;
+      defs' = map strip defs;
+      compare = a: b: (a.priority or 1000) < (b.priority or 1000);
+    in sort compare defs';
+
   /* Hack for backward compatibility: convert options of type
      optionSet to configOf.  FIXME: remove eventually. */
   fixupOptionType = loc: opt:
@@ -302,8 +321,13 @@ rec {
 
   mkFixStrictness = id; # obsolete, no-op
 
-  # FIXME: Add mkOrder back in. It's not currently used anywhere in
-  # NixOS, but it should be useful.
+  mkOrder = priority: content:
+    { _type = "order";
+      inherit priority content;
+    };
+
+  mkBefore = mkOrder 500;
+  mkAfter = mkOrder 1500;
 
 
   /* Compatibility. */
diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml
index 307719d2cd2..246ab11587a 100644
--- a/nixos/doc/manual/configuration.xml
+++ b/nixos/doc/manual/configuration.xml
@@ -443,8 +443,20 @@ Note that both <filename>configuration.nix</filename> and
 define an option, NixOS will try to <emphasis>merge</emphasis> the
 definitions.  In the case of
 <option>environment.systemPackages</option>, that’s easy: the lists of
-packages can simply be concatenated.  For other types of options, a
-merge may not be possible: for instance, if two modules define
+packages can simply be concatenated.  The value in
+<filename>configuration.nix</filename> is merged last, so for
+list-type options, it will appear at the end of the merged list. If
+you want it to appear first, you can use <varname>mkBefore</varname>:
+
+<programlisting>
+boot.kernelModules = mkBefore [ "kvm-intel" ];
+</programlisting>
+
+This causes the <literal>kvm-intel</literal> kernel module to be
+loaded before any other kernel modules.</para>
+
+<para>For other types of options, a merge may not be possible. For
+instance, if two modules define
 <option>services.httpd.adminAddr</option>,
 <command>nixos-rebuild</command> will give an error:
 
-- 
GitLab


From 5c2ef1353c1be17b2835718bbc5a88b00d0e91c7 Mon Sep 17 00:00:00 2001
From: Chris Farmiloe <chrisfarms@gmail.com>
Date: Sun, 30 Mar 2014 21:38:49 +0200
Subject: [PATCH 2743/3789] Update disnix related sources that were referencing
 dead hydra tarball builds

---
 pkgs/tools/package-management/disnix/default.nix          | 4 ++--
 pkgs/tools/package-management/disnix/disnixos/default.nix | 8 ++++----
 pkgs/tools/package-management/disnix/dysnomia/default.nix | 7 ++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index 5c9120cf33e..ff29316edbf 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "disnix-0.3pre8aa12b65ced9029f7c17a494cee25e6ffc69fdea";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/6763179/download/4/disnix-0.3pre8aa12b65ced9029f7c17a494cee25e6ffc69fdea.tar.gz;
-    sha256 = "0zmsaz1kvc7dl1igh6z74jxy3w5p2zbfm9jsczdjdh3947fkni4p";
+    url = http://hydra.nixos.org/build/9876935/download/4/disnix-0.3pre15e93a364ad9439d8336e659921600d48252045d.tar.gz;
+    sha256 = "1kgc6cacpp3ly7c62ah6pdprdl1bab08b4ir4dcrrm44x6fa1k63";
   };
   
   buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty dysnomia ];
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 4c811dd3f71..7420353499f 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, disnix, socat, pkgconfig }:
+{ stdenv, fetchurl, disnix, socat, pkgconfig, getopt }:
 
 stdenv.mkDerivation {
   name = "disnixos-0.2prebb320d396f93d7062c28d6a54105d8e8196b9d99";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/6769017/download/3/disnixos-0.2prebb320d396f93d7062c28d6a54105d8e8196b9d99.tar.gz;
-    sha256 = "0jw05qjn0fbf4xb2g8a8i0padmsw17ayr4acw7z784bljrm1z055";
+    url = http://hydra.nixos.org/build/9877039/download/3/disnixos-0.2preb10c56eeb1be3046645eea90c779e2d64045581f.tar.gz;
+    sha256 = "1pkpf6vp9q3jjp212lghbs1km8iqh4rm9xa5jm0dqb5ya25f0jf2";
   };
   
-  buildInputs = [ socat pkgconfig disnix ];
+  buildInputs = [ socat pkgconfig disnix getopt ];
   
   dontStrip = true;
   
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index 2a5852863f9..5c937bc8aef 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -9,6 +9,7 @@
 , enableTomcatWebApplication ? false
 , enableMongoDatabase ? false
 , catalinaBaseDir ? "/var/tomcat"
+, getopt
 }:
 
 assert enableMySQLDatabase -> mysql != null;
@@ -20,8 +21,8 @@ assert enableMongoDatabase -> mongodb != null;
 stdenv.mkDerivation {
   name = "dysnomia-0.3pred677260f77bb202c7490f7db08dbd8442c9db484";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/6763096/download/1/dysnomia-0.3pred677260f77bb202c7490f7db08dbd8442c9db484.tar.gz;
-    sha256 = "0k7qpqa9inzxjdryd7zfzxid8k1icsxxw995chzw4wrlgxns16xy";
+    url = http://hydra.nixos.org/build/9146265/download/1/dysnomia-0.3pre313a5f99a166fee2e0245dfd25f41ec9ed958075.tar.gz;
+    sha256 = "0fgbqybr9rfr95fkmv1hpq7al0p1kxa385k6sjc7iwwcxs4cmxf5";
   };
   
   preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
@@ -37,7 +38,7 @@ stdenv.mkDerivation {
      ${if enableMongoDatabase then "--with-mongodb" else "--without-mongodb"}
    '';
   
-  buildInputs = []
+  buildInputs = [ getopt ]
     ++ stdenv.lib.optional enableEjabberdDump ejabberd
     ++ stdenv.lib.optional enableMySQLDatabase mysql
     ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
-- 
GitLab


From aa86cc8a7cf58244dd8daa10dec6091357706b32 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 23:26:11 +0200
Subject: [PATCH 2744/3789] haskell-monadloc: add version 0.7.1

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

diff --git a/pkgs/development/libraries/haskell/monadloc/default.nix b/pkgs/development/libraries/haskell/monadloc/default.nix
new file mode 100644
index 00000000000..9ff7383565e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monadloc/default.nix
@@ -0,0 +1,14 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "monadloc";
+  version = "0.7.1";
+  sha256 = "1a773nysrsj61ka7bdacb0i7dxlgb1fjz3x5w9c1w1dv7rmhynmj";
+  buildDepends = [ transformers ];
+  meta = {
+    homepage = "http://github.com/pepeiborra/monadloc";
+    description = "A class for monads which can keep a monadic call trace";
+    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 fe449dad45c..c62dfbec6a2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1720,6 +1720,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   monadcryptorandom = callPackage ../development/libraries/haskell/monadcryptorandom {};
 
+  monadloc = callPackage ../development/libraries/haskell/monadloc {};
+
   monadLoops = callPackage ../development/libraries/haskell/monad-loops {};
 
   monadLogger = callPackage ../development/libraries/haskell/monad-logger {};
-- 
GitLab


From e825c6ac38197a6bc845ff04abfbe411c059ddf4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 23:26:21 +0200
Subject: [PATCH 2745/3789] haskell-cake3: add version 0.3.0.1

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

diff --git a/pkgs/development/tools/haskell/cake3/default.nix b/pkgs/development/tools/haskell/cake3/default.nix
new file mode 100644
index 00000000000..dd4e78cf70a
--- /dev/null
+++ b/pkgs/development/tools/haskell/cake3/default.nix
@@ -0,0 +1,23 @@
+{ cabal, attoparsec, deepseq, filepath, haskellSrcMeta
+, languageJavascript, mimeTypes, monadloc, mtl, optparseApplicative
+, syb, systemFilepath, text, textFormat
+}:
+
+cabal.mkDerivation (self: {
+  pname = "cake3";
+  version = "0.3.0.1";
+  sha256 = "0s91kgfh6y14m60na7bsr41gzd573vra5c0mgp1a3pzngsj0cvhm";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    attoparsec deepseq filepath haskellSrcMeta languageJavascript
+    mimeTypes monadloc mtl optparseApplicative syb systemFilepath text
+    textFormat
+  ];
+  meta = {
+    homepage = "https://github.com/grwlf/cake3";
+    description = "Third cake the Makefile EDSL";
+    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 c62dfbec6a2..2b8ab42e2f1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2816,6 +2816,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   BNFCMeta = callPackage ../development/tools/haskell/BNFC-meta {};
 
+  cake3 = callPackage ../development/tools/haskell/cake3 {};
+
   cpphs = callPackage ../development/tools/misc/cpphs {};
 
   Ebnf2ps = callPackage ../development/tools/parsing/Ebnf2ps {};
-- 
GitLab


From 4dd4f85430982eb2a775492d2bc55757be1ecb25 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 31 Mar 2014 02:51:14 -0400
Subject: [PATCH 2746/3789] Revert "haskell-smtps-gmail: update to version
 1.1.0"

The smtps-gmail upgrade causes a build failure:

/nix/store/8h8mravvbcm09rhybxq7hi4459lkssg8-stdenv/setup: line 937: ./Setup: No such file or directory

This reverts commit a7c80c11e5cfee6fc847fa7b228e11b4a0188060.
---
 .../libraries/haskell/smtps-gmail/default.nix  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/smtps-gmail/default.nix b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
index 0dfb2ab5665..d41a37d1e5b 100644
--- a/pkgs/development/libraries/haskell/smtps-gmail/default.nix
+++ b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
@@ -1,19 +1,23 @@
-{ cabal, base64Bytestring, cprngAes, dataDefault, filepath
-, mimeMail, network, stringsearch, text, tls
+{ cabal, base64String, cprngAes, network, tlsExtra, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "smtps-gmail";
-  version = "1.1.0";
-  sha256 = "0zr2ndpwfnb9pkv69vx94p0vpghl0khd0wbmccjpk6hlrp6fsj66";
+  version = "1.0.0";
+  sha256 = "0kv5m8rg5z1iic10av3bscdygnph1iab4b22sq3hmx6a93abqkc2";
+  isLibrary = true;
+  isExecutable = true;
   buildDepends = [
-    base64Bytestring cprngAes dataDefault filepath mimeMail network
-    stringsearch text tls
+    base64String cprngAes network tlsExtra utf8String
   ];
   meta = {
     homepage = "https://github.com/enzoh/smtps-gmail";
-    description = "Gmail SMTP Client";
+    description = "Gmail API";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
+  # adding a Setup script as it's needed by nix
+  preConfigure = ''
+    printf "import Distribution.Simple\nmain = defaultMain\n" > Setup.hs
+  '';
 })
-- 
GitLab


From 46e44ae7c4ca01c5b30c33ca7c20e1e318a990d9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 31 Mar 2014 03:35:13 -0400
Subject: [PATCH 2747/3789] haskell-mime-mail: Update, set sendmail to be found
 in PATH

See snoyberg/mime-mail#23
---
 pkgs/development/libraries/haskell/mime-mail/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix
index fe8a9a35176..7ba50976168 100644
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ b/pkgs/development/libraries/haskell/mime-mail/default.nix
@@ -1,15 +1,16 @@
 { cabal, base64Bytestring, blazeBuilder, filepath, hspec, random
-, text
+, text, sendmail ? "sendmail"
 }:
 
 cabal.mkDerivation (self: {
   pname = "mime-mail";
-  version = "0.4.4.1";
-  sha256 = "0jzbkrd62alvgyx9bkrzicz88hjjnnavpv6hl22cxnirz41h8hw0";
+  version = "0.4.4.2";
+  sha256 = "0s38xgv6kycnfahqi5dnrjn3wkaq35w87cv8p12pq0qq2x7dvawd";
   buildDepends = [
     base64Bytestring blazeBuilder filepath random text
   ];
   testDepends = [ blazeBuilder hspec text ];
+  configureFlags = [ "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"${sendmail}\"" ];
   meta = {
     homepage = "http://github.com/snoyberg/mime-mail";
     description = "Compose MIME email messages";
-- 
GitLab


From 46ef4f691000c2040b09336a29281299dfce0fdc Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Mon, 31 Mar 2014 09:59:04 +0800
Subject: [PATCH 2748/3789] import thumbor and dependencies:

derpconf, backports_ssl_match_hostname_3_4_0_2, thumborPexif,
upgrade tornado to 3.2 (that contains security fixes)
---
 pkgs/top-level/python-packages.nix | 86 ++++++++++++++++++++++++++++--
 1 file changed, 83 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a4be8d1704..66c28e8b61c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -460,6 +460,20 @@ rec {
     };
   });
 
+  backports_ssl_match_hostname_3_4_0_2 = pythonPackages.buildPythonPackage rec {
+    name = "backports.ssl_match_hostname-3.4.0.2";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.4.0.2.tar.gz";
+      md5 = "788214f20214c64631f0859dc79f23c6";
+    };
+
+    meta = {
+      description = "The Secure Sockets layer is only actually *secure*";
+      homepage = http://bitbucket.org/brandon/backports.ssl_match_hostname;
+    };
+  };
+
   bcdoc = buildPythonPackage rec {
     name = "bcdoc-0.12.1";
 
@@ -1484,6 +1498,22 @@ rec {
     };
   };
 
+  derpconf = pythonPackages.buildPythonPackage rec {
+    name = "derpconf-0.4.9";
+
+    propagatedBuildInputs = [ six ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/d/derpconf/${name}.tar.gz";
+      md5 = "a164807d7bf0c4adf1de781305f29b82";
+    };
+
+    meta = {
+      description = "derpconf abstracts loading configuration files for your app";
+      homepage = https://github.com/globocom/derpconf;
+      license = licenses.mit;
+    };
+  };
 
   dpkt = buildPythonPackage rec {
     name = "dpkt-1.8";
@@ -1807,6 +1837,7 @@ rec {
     propagatedBuildInputs = [ pythonPackages.pycurl ];
 
   });
+  # */
 
   logilab_astng = buildPythonPackage rec {
     name = "logilab-astng-0.24.3";
@@ -8258,11 +8289,13 @@ rec {
 
 
   tornado = buildPythonPackage rec {
-    name = "tornado-3.1.1";
+    name = "tornado-3.2";
+
+    propagatedBuildInputs = [ backports_ssl_match_hostname_3_4_0_2 ];
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/t/tornado/${name}.tar.gz";
-      sha256 = "1ipx23ix8hyd88rywmwr7bfdgkvkdac87xq3f9l5vkm0wjzh8n9l";
+      url = "https://pypi.python.org/packages/source/t/tornado/${name}.tar.gz";
+      md5 = "bd83cee5f1a5c5e139e87996d00b251b";
     };
 
     doCheck = false;
@@ -8834,4 +8867,51 @@ rec {
     };
   };
 
+
+  thumbor = pythonPackages.buildPythonPackage rec {
+    name = "thumbor-4.0.4";
+
+    propagatedBuildInputs = [
+                    tornado
+                    pycrypto
+                    pycurl
+                    pillow
+                    derpconf
+                    python_magic
+                    thumborPexif
+                    (pkgs.opencv.override {
+                        gtk = null;
+                        glib = null;
+                        xineLib = null;
+                        gstreamer = null;
+                        ffmpeg = null;
+                    }) ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/t/thumbor/${name}.tar.gz";
+      md5 = "cf639a1cc57ee287b299ace450444408";
+    };
+
+    meta = {
+      description = "Thumbor is a smart imaging service. It enables on-demand crop, resizing and flipping of images.";
+      homepage = https://github.com/globocom/thumbor/wiki;
+      license = licenses.mit;
+    };
+  };
+
+  thumborPexif = pythonPackages.buildPythonPackage rec {
+    name = "thumbor-pexif-0.14";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/t/thumbor-pexif/${name}.tar.gz";
+      md5 = "fb4cdb60f4a0bead5193fb483ccd3430";
+    };
+
+    meta = {
+      description = "Module to parse and edit the EXIF data tags in a JPEG image";
+      homepage = http://www.benno.id.au/code/pexif/;
+      license = licenses.mit;
+    };
+  };
+
 }); in pythonPackages
-- 
GitLab


From f733eb899a448115a3feadf67018b9d17d55b1c7 Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Mon, 31 Mar 2014 15:52:44 +0800
Subject: [PATCH 2749/3789] remove the unbreak-syntax-highlight hack

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 66c28e8b61c..d87eb45dc69 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1837,7 +1837,6 @@ rec {
     propagatedBuildInputs = [ pythonPackages.pycurl ];
 
   });
-  # */
 
   logilab_astng = buildPythonPackage rec {
     name = "logilab-astng-0.24.3";
-- 
GitLab


From c20383e756a5883ec2805caa98d67897ec0cb252 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Mar 2014 11:10:56 +0200
Subject: [PATCH 2750/3789] Another fix to the installer tests

---
 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 c6d30d060f2..151458fbd5e 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -176,7 +176,7 @@ let
       # Test nixos-option.
       $machine->succeed("nixos-option boot.initrd.kernelModules | grep virtio_console");
       $machine->succeed("nixos-option -d boot.initrd.kernelModules | grep 'List of modules'");
-      $machine->succeed("nixos-option -l boot.initrd.kernelModules | grep /etc/nixos/configuration.nix");
+      $machine->succeed("nixos-option -l boot.initrd.kernelModules | grep qemu-guest.nix");
 
       $machine->shutdown;
 
-- 
GitLab


From 5ba0d51f681e68e8d85d9bc28aba64c838eaa784 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Mar 2014 11:15:11 +0200
Subject: [PATCH 2751/3789] Fix VirtualBox image generation

http://hydra.nixos.org/build/9905410
---
 nixos/modules/virtualisation/virtualbox-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 06bea2d8acf..8323325dabf 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -92,7 +92,7 @@ with pkgs.lib;
         --audiocontroller ac97 --audio alsa \
         --rtcuseutc on \
         --usb on --mouse usbtablet
-      VBoxManage storagectl "$vmName" --name SATA --add sata --sataportcount 4 --bootable on --hostiocache on
+      VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on
       VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \
         --medium ${config.system.build.virtualBoxImage}/disk.vdi
 
-- 
GitLab


From 6167da54ea35b78ec93daffaa1bb1033d2ac1a67 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Mar 2014 11:23:44 +0200
Subject: [PATCH 2752/3789] gpsd: Disable the tests

They bind to TCP ports and fail randomly:

http://hydra.nixos.org/build/9905518
---
 pkgs/servers/gpsd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix
index a52ca2b6871..62fbd3337f7 100644
--- a/pkgs/servers/gpsd/default.nix
+++ b/pkgs/servers/gpsd/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
         systemd=yes udevdir="$out/lib/udev" chrpath=no
   '';
 
-  doCheck = true;
+  doCheck = false;
 
   checkPhase = ''
     export LD_LIBRARY_PATH="$PWD"
-- 
GitLab


From c66be6378d8bbcea271b2d2102741fdda87ec8fe Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Mon, 31 Mar 2014 17:53:00 +0800
Subject: [PATCH 2753/3789] postgresql: properly fix permissions issue by in
 postStart

as per postgresql manual, interactions with psql should be carried
out with the postgresql system user and postgresql db user by default.

ensure it happens in postStart.
---
 nixos/modules/services/databases/postgresql.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index a83b1a110fe..33ee7244e3f 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -225,14 +225,14 @@ in
         # Wait for PostgreSQL to be ready to accept connections.
         postStart =
           ''
-            while ! psql postgres -c "" 2> /dev/null; do
+            while ! su -s ${pkgs.stdenv.shell} postgres -c 'psql postgres -c ""' 2> /dev/null; do
                 if ! kill -0 "$MAINPID"; then exit 1; fi
                 sleep 0.1
             done
 
             if test -e "${cfg.dataDir}/.first_startup"; then
               ${optionalString (cfg.initialScript != null) ''
-                cat "${cfg.initialScript}" | psql postgres
+                cat "${cfg.initialScript}" | su -s ${pkgs.stdenv.shell} postgres -c 'psql postgres'
               ''}
               rm -f "${cfg.dataDir}/.first_startup"
             fi
-- 
GitLab


From 9d8a8126e982e8aacfcd76d07abb947cb60d7f21 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 31 Mar 2014 12:23:27 +0200
Subject: [PATCH 2754/3789] systemd: Add support for path units.

This allows to define systemd.path(5) units, for example like this:

{
  systemd = let
    description = "Set Key Permissions for xyz.key";
  in {
    paths.set-key-perms = {
      inherit description;
      before = [ "network.target" ];
      wantedBy = [ "multi-user.target" ];
      pathConfig.PathChanged = "/run/keys/xyz.key";
    };

    services.set-key-perms = {
      inherit description;
      serviceConfig.Type = "oneshot";
      script = "chown myspecialkeyuser /run/keys/xyz.key";
    };
  };
}

The example here is actually useful in order to set permissions for the
NixOps keys target to ensure those permisisons aren't reset whenever the
key file is reuploaded.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../system/boot/systemd-unit-options.nix        | 17 +++++++++++++++++
 nixos/modules/system/boot/systemd.nix           | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 113990814ef..d9dc6549f36 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -321,6 +321,23 @@ in rec {
   };
 
 
+  pathOptions = unitOptions // {
+
+    pathConfig = mkOption {
+      default = {};
+      example = { PathChanged = "/some/path"; Unit = "changedpath.service"; };
+      type = types.attrsOf unitOption;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Path]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.path</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+  };
+
+
   mountOptions = unitOptions // {
 
     what = mkOption {
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 49502b3e685..72d72402409 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -304,6 +304,15 @@ let
         '';
     };
 
+  pathToUnit = name: def:
+    { inherit (def) wantedBy requiredBy enable;
+      text = commonUnitText def +
+        ''
+          [Path]
+          ${attrsToSection def.pathConfig}
+        '';
+    };
+
   mountToUnit = name: def:
     { inherit (def) wantedBy requiredBy enable;
       text = commonUnitText def +
@@ -472,6 +481,13 @@ in
       description = "Definition of systemd timer units.";
     };
 
+    systemd.paths = mkOption {
+      default = {};
+      type = types.attrsOf types.optionSet;
+      options = [ pathOptions unitConfig ];
+      description = "Definition of systemd path units.";
+    };
+
     systemd.mounts = mkOption {
       default = [];
       type = types.listOf types.optionSet;
@@ -657,6 +673,7 @@ in
       // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services
       // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets
       // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.timers
+      // mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.paths
       // listToAttrs (map
                    (v: let n = escapeSystemdPath v.where;
                        in nameValuePair "${n}.mount" (mountToUnit n v)) cfg.mounts)
-- 
GitLab


From 8d965e3a47bd0e076a6d4996933c822b71e400fe Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 31 Mar 2014 11:55:17 +0100
Subject: [PATCH 2755/3789] haskellPackages.thDesugar: Update to 1.3.1

---
 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 42ff1d78198..827828d6474 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.0";
-  sha256 = "1wfypk1hcxr2918qp63df5xlx00rqwnaa59mivnlqs558g4kjx6j";
+  version = "1.3.1";
+  sha256 = "1wi0c5d1w6vjjk580zhypgqnnkndcsx4cmx5qy01w97h6kyj8913";
   buildDepends = [ mtl syb ];
   testDepends = [ hspec HUnit mtl syb ];
   meta = {
-- 
GitLab


From cff179f829650be1de32f030dfb73c7b8284ed76 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Mar 2014 10:56:02 -0500
Subject: [PATCH 2756/3789] hashcat: version 0.47

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/hashcat/default.nix | 48 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/tools/security/hashcat/default.nix

diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix
new file mode 100644
index 00000000000..5e173724190
--- /dev/null
+++ b/pkgs/tools/security/hashcat/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, p7zip, patchelf }:
+
+let
+  bits    = if stdenv.system == "x86_64-linux" then "64" else "32";
+  libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ];
+
+  fixBin = x: ''
+    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+      --set-rpath ${libPath} ${x}
+  '';
+in
+stdenv.mkDerivation rec {
+  name    = "hashcat-${version}";
+  version = "0.47";
+
+  src = fetchurl {
+    url    = "http://hashcat.net/files/${name}.7z";
+    sha256 = "0mc4lv4qfxabp794xfzgr63fhwk7lvbg12pry8a96lldp0jwp6i3";
+  };
+
+  buildInputs = [ p7zip patchelf ];
+
+  unpackPhase = "7z x $src > /dev/null && cd ${name}";
+
+  installPhase = ''
+    mkdir -p $out/bin $out/libexec
+    cp -R * $out/libexec
+
+    echo -n "/" > $out/bin/eula.accepted
+    ln -s $out/libexec/hashcat-cli${bits}.bin $out/bin/hashcat
+    ln -s $out/libexec/hashcat-cliXOP.bin $out/bin/hashcat-xop
+    ln -s $out/libexec/hashcat-cliAVX.bin $out/bin/hashcat-avx
+  '';
+
+  fixupPhase = ''
+    ${fixBin "$out/libexec/hashcat-cli${bits}.bin"}
+    ${fixBin "$out/libexec/hashcat-cliXOP.bin"}
+    ${fixBin "$out/libexec/hashcat-cliAVX.bin"}
+  '';
+
+  meta = {
+    description = "Fast password cracker";
+    homepage    = "http://hashcat.net/hashcat/";
+    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 df25e7dec5c..f7e7e51dc78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1172,6 +1172,8 @@ let
 
   hardlink = callPackage ../tools/system/hardlink { };
 
+  hashcat = callPackage ../tools/security/hashcat { };
+
   halibut = callPackage ../tools/typesetting/halibut { };
 
   hddtemp = callPackage ../tools/misc/hddtemp { };
-- 
GitLab


From 3ef0a880cbd7d7efe58e70800cea045b5134b073 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Mar 2014 11:22:50 -0500
Subject: [PATCH 2757/3789] p0f: version 3.06b

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/p0f/default.nix | 38 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/security/p0f/default.nix

diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix
new file mode 100644
index 00000000000..2c54e0b3cb8
--- /dev/null
+++ b/pkgs/tools/security/p0f/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, libpcap }:
+
+stdenv.mkDerivation rec {
+  name    = "p0f-${version}";
+  version = "3.06b";
+
+  src = fetchurl {
+    url    = "http://lcamtuf.coredump.cx/p0f3/releases/${name}.tgz";
+    sha256 = "1rydqvr78a3rjp9iwfbw4bs7jfb4p22962makdgw8yjmw8dr6lfi";
+  };
+
+  buildInputs = [ libpcap ];
+
+  buildPhase = ''
+    substituteInPlace config.h --replace "p0f.fp" "$out/etc/p0f.fp"
+    ./build.sh
+    cd tools && make && cd ..
+  '';
+
+  installPhase = ''
+    mkdir -p $out/sbin $out/etc
+
+    cp ./p0f                $out/sbin
+    cp ./p0f.fp             $out/etc
+
+    cp ./tools/p0f-client   $out/sbin
+    cp ./tools/p0f-sendsyn  $out/sbin
+    cp ./tools/p0f-sendsyn6 $out/sbin
+  '';
+
+  meta = {
+    description = "Passive network reconnaissance and fingerprinting tool";
+    homepage    = "http://lcamtuf.coredump.cx/p0f3/";
+    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 f7e7e51dc78..bec5bca1428 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1650,6 +1650,8 @@ let
     inherit (gnome3) gnome_icon_theme gnome_icon_theme_symbolic;
   };
 
+  p0f = callPackage ../tools/security/p0f { };
+
   hurdPartedCross =
     if crossSystem != null && crossSystem.config == "i586-pc-gnu"
     then (makeOverridable
-- 
GitLab


From 7ebd856a3801d35872c60b112fce51132b45aff5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Mar 2014 19:16:52 +0200
Subject: [PATCH 2758/3789] Provide nixos-container unconditionally

---
 nixos/modules/virtualisation/containers.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 7e45d9f8b22..16df108c21e 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -267,9 +267,7 @@ in
         ${cfg.localAddress} ${name}.containers
       '') config.containers);
 
-    environment.systemPackages = optional (config.containers != {}) nixos-container;
-
-    system.build.foo = nixos-container;
+    environment.systemPackages = [ nixos-container ];
 
   };
 }
-- 
GitLab


From bdb658d033df47c97a0cdbe9628fdcf8c086e149 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Mar 2014 19:17:17 +0200
Subject: [PATCH 2759/3789] nixpkgs-lint: Tweak

---
 maintainers/scripts/nixpkgs-lint.pl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/maintainers/scripts/nixpkgs-lint.pl b/maintainers/scripts/nixpkgs-lint.pl
index d74f5c740f5..7e9ff91ebe0 100755
--- a/maintainers/scripts/nixpkgs-lint.pl
+++ b/maintainers/scripts/nixpkgs-lint.pl
@@ -31,8 +31,7 @@ GetOptions("package|p=s" => \$filter,
            "maintainer|m=s" => \$maintainer,
            "file|f=s" => \$path,
            "help" => sub { showHelp() }
-    )
-    or die("syntax: $0 ...\n");
+    ) or exit 1;
 
 # Evaluate Nixpkgs into an XML representation.
 my $xml = `nix-env -f '$path' -qa '$filter' --xml --meta --drv-path`;
-- 
GitLab


From 6da72a4456ea7cc12219c962739f279e5060fd66 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Mar 2014 19:21:36 +0200
Subject: [PATCH 2760/3789] nixos-container: Rewrite in Perl

Also fix race condition when multiple containers are created
simultaneously (as NixOps tends to do).
---
 nixos/modules/virtualisation/containers.nix   |   5 +-
 .../modules/virtualisation/nixos-container.pl | 198 ++++++++++++++++++
 .../modules/virtualisation/nixos-container.sh | 171 ---------------
 3 files changed, 201 insertions(+), 173 deletions(-)
 create mode 100644 nixos/modules/virtualisation/nixos-container.pl
 delete mode 100644 nixos/modules/virtualisation/nixos-container.sh

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 16df108c21e..9964cd431cd 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -18,8 +18,9 @@ let
     name = "nixos-container";
     dir = "bin";
     isExecutable = true;
-    src = ./nixos-container.sh;
-    inherit (pkgs) bash socat;
+    src = ./nixos-container.pl;
+    perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
+    inherit (pkgs) socat;
   };
 
 in
diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
new file mode 100644
index 00000000000..dfc856e8b66
--- /dev/null
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -0,0 +1,198 @@
+#! @perl@
+
+use strict;
+use File::Path;
+use File::Slurp;
+use Fcntl ':flock';
+use Getopt::Long qw(:config gnu_getopt);
+
+my $socat = '@socat@/bin/socat';
+
+# Parse the command line.
+
+sub showHelp {
+    print <<EOF;
+Usage: nixos-container list
+       nixos-container create <container-name> [--config <string>] [--ensure-unique-name]
+       nixos-container destroy <container-name>
+       nixos-container start <container-name>
+       nixos-container stop <container-name>
+       nixos-container login <container-name>
+       nixos-container root-shell <container-name>
+       nixos-container set-root-password <container-name> <password>
+       nixos-container show-ip <container-name>
+EOF
+    exit 0;
+}
+
+my $ensureUniqueName = 0;
+my $extraConfig = "";
+
+GetOptions(
+    "help" => sub { showHelp() },
+    "ensure-unique-name" => \$ensureUniqueName,
+    "config=s" => \$extraConfig
+    ) or exit 1;
+
+my $action = $ARGV[0] or die "$0: no action specified\n";
+
+
+# Execute the selected action.
+
+mkpath("/etc/containers", 0, 0755);
+mkpath("/var/lib/containers", 0, 0700);
+
+if ($action eq "list") {
+    foreach my $confFile (glob "/etc/containers/*.conf") {
+        $confFile =~ /\/([^\/]+).conf$/ or next;
+        print "$1\n";
+    }
+    exit 0;
+}
+
+my $containerName = $ARGV[1] or die "$0: no container name specified\n";
+$containerName =~ /^[a-zA-Z0-9\-]+$/ or die "$0: invalid container name\n";
+
+if ($action eq "create") {
+    # Acquire an exclusive lock to prevent races with other
+    # invocations of ‘nixos-container create’.
+    my $lockFN = "/run/lock/nixos-container";
+    open(my $lock, '>>', $lockFN) or die "$0: opening $lockFN: $!";
+    flock($lock, LOCK_EX) or die "$0: could not lock $lockFN: $!";
+
+    my $confFile = "/etc/containers/$containerName.conf";
+    my $root = "/var/lib/containers/$containerName";
+
+    # Maybe generate a unique name.
+    if ($ensureUniqueName) {
+        my $base = $containerName;
+        for (my $nr = 0; ; $nr++) {
+            $containerName = "$base-$nr";
+            $confFile = "/etc/containers/$containerName.conf";
+            $root = "/var/lib/containers/$containerName";
+            last unless -e $confFile || -e $root;
+        }
+    }
+
+    die "$0: container ‘$containerName’ already exists\n" if -e $confFile;
+
+    # Get an unused IP address.
+    my %usedIPs;
+    foreach my $confFile2 (glob "/etc/containers/*.conf") {
+        my $s = read_file($confFile2) or die;
+        $usedIPs{$1} = 1 if $s =~ /^HOST_ADDRESS=([0-9\.]+)$/m;
+        $usedIPs{$1} = 1 if $s =~ /^LOCAL_ADDRESS=([0-9\.]+)$/m;
+    }
+
+    my ($ipPrefix, $hostAddress, $localAddress);
+    for (my $nr = 1; $nr < 255; $nr++) {
+        $ipPrefix = "10.233.$nr";
+        $hostAddress = "$ipPrefix.1";
+        $localAddress = "$ipPrefix.2";
+        last unless $usedIPs{$hostAddress} || $usedIPs{$localAddress};
+        $ipPrefix = undef;
+    }
+
+    die "$0: out of IP addresses\n" unless defined $ipPrefix;
+
+    my @conf;
+    push @conf, "PRIVATE_NETWORK=1\n";
+    push @conf, "HOST_ADDRESS=$hostAddress\n";
+    push @conf, "LOCAL_ADDRESS=$localAddress\n";
+    write_file($confFile, \@conf);
+
+    close($lock);
+
+    print STDERR "host IP is $hostAddress, container IP is $localAddress\n";
+
+    mkpath("$root/etc/nixos", 0, 0755);
+
+    my $nixosConfig = <<EOF;
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{ boot.isContainer = true;
+  security.initialRootPassword = mkDefault "!";
+  networking.hostName = mkDefault "$containerName";
+  networking.useDHCP = false;
+  imports = [ <nixpkgs/nixos/modules/virtualisation/container-login.nix> ];
+  $extraConfig
+}
+EOF
+    my $nixosConfigFile = "$root/etc/nixos/configuration.nix";
+    write_file($nixosConfigFile, $nixosConfig);
+
+    # The per-container directory is restricted to prevent users on
+    # the host from messing with guest users who happen to have the
+    # same uid.
+    my $profileDir = "/nix/var/nix/profiles/per-container";
+    mkpath($profileDir, 0, 0700);
+    $profileDir = "$profileDir/$containerName";
+    mkpath($profileDir, 0, 0755);
+
+    system("nix-env", "-p", "$profileDir/system",
+           "-I", "nixos-config=$nixosConfigFile", "-f", "<nixpkgs/nixos>",
+           "--set", "-A", "system") == 0
+        or die "$0: failed to build initial container configuration\n";
+
+    print "$containerName\n" if $ensureUniqueName;
+    exit 0;
+}
+
+my $confFile = "/etc/containers/$containerName.conf";
+die "$0: container ‘$containerName’ does not exist\n" if !-e $confFile;
+
+sub stopContainer {
+    system("systemctl", "stop", "container\@$containerName") == 0
+        or die "$0: failed to stop container\n";
+}
+
+if ($action eq "destroy") {
+    my $root = "/var/lib/containers/$containerName";
+    my $profileDir = "/nix/var/nix/profiles/per-container/$containerName";
+
+    my $status = `systemctl show 'container\@$containerName'`;
+    stopContainer if $status =~ /ActiveState=active/;
+
+    rmtree($profileDir) if -e $profileDir;
+    rmtree($root) if -e $root;
+    unlink($confFile) or die;
+}
+
+elsif ($action eq "start") {
+    system("systemctl", "start", "container\@$containerName") == 0
+        or die "$0: failed to start container\n";
+}
+
+elsif ($action eq "stop") {
+    stopContainer;
+}
+
+elsif ($action eq "login") {
+    exec($socat, "unix:/var/lib/containers/$containerName/var/lib/login.socket", "-,echo=0,raw");
+}
+
+elsif ($action eq "root-shell") {
+    exec($socat, "unix:/var/lib/containers/$containerName/var/lib/root-shell.socket", "-");
+}
+
+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:/var/lib/containers/$containerName/var/lib/root-shell.socket", "-");
+    print SOCAT "passwd\n";
+    print SOCAT "$password\n";
+    print SOCAT "$password\n";
+    close(SOCAT);
+}
+
+elsif ($action eq "show-ip") {
+    my $s = read_file($confFile) or die;
+    $s =~ /^LOCAL_ADDRESS=([0-9\.]+)$/m or die "$0: cannot get IP address\n";
+    print "$1\n";
+}
+
+else {
+    die "$0: unknown action ‘$action’\n";
+}
diff --git a/nixos/modules/virtualisation/nixos-container.sh b/nixos/modules/virtualisation/nixos-container.sh
deleted file mode 100644
index 47abf96072f..00000000000
--- a/nixos/modules/virtualisation/nixos-container.sh
+++ /dev/null
@@ -1,171 +0,0 @@
-#! @bash@/bin/sh -e
-
-usage() {
-    echo "Usage: $0 list" >&2
-    echo "       $0 create <container-name> [--config <string>] [--ensure-unique-name]" >&2
-    echo "       $0 update <container-name>" >&2
-    echo "       $0 destroy <container-name>" >&2
-    echo "       $0 login <container-name>" >&2
-    echo "       $0 root-shell <container-name>" >&2
-    echo "       $0 set-root-password <container-name> <password>" >&2
-    echo "       $0 show-ip <container-name>" >&2
-}
-
-args="`getopt --options '' -l help -l config: -l ensure-unique-name -- "$@"`"
-eval "set -- $args"
-extraConfig=
-ensureUniqueName=
-while [ $# -gt 0 ]; do
-    case "$1" in
-        (--help) usage; exit 0;;
-        (--config) shift; extraConfig=$1;;
-        (--ensure-unique-name) ensureUniqueName=1;;
-        (--) shift; break;;
-        (*) break;;
-    esac
-    shift
-done
-
-action="$1"
-if [ -z "$action" ]; then usage; exit 1; fi
-shift
-
-getContainerRoot() {
-    root="/var/lib/containers/$container"
-    if ! [ -d "$root" ]; then
-        echo "$0: container ‘$container’ does not exist" >&2
-        exit 1
-    fi
-}
-
-if [ $action = list ]; then
-    for i in $(cd /etc/containers && echo *.conf); do
-        echo "$(basename "$i" .conf)"
-    done
-    exit 0
-fi
-
-container="$1"
-if [ -z "$container" ]; then usage; exit 1; fi
-shift
-
-if [ $action = create ]; then
-
-    if [ -n "$ensureUniqueName" ]; then
-        # FIXME: race
-        nr=0
-        while [ -e "/etc/containers/$container-$nr.conf" -o -e "/var/lib/containers/$container-$nr" ]; do
-            : $((nr++))
-        done
-        container="$container-$nr"
-    fi
-
-    confFile="/etc/containers/$container.conf"
-    root="/var/lib/containers/$container"
-
-    if [ -e "$confFile" -o -e "$root/nix" ]; then
-        echo "$0: container ‘$container’ already exists" >&2
-        exit 1
-    fi
-
-    profileDir="/nix/var/nix/profiles/per-container/$container"
-    mkdir -m 0755 -p "$root/etc/nixos" "$profileDir"
-
-    config="
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-{ boot.isContainer = true;
-  security.initialRootPassword = mkDefault \"!\";
-  networking.hostName = mkDefault \"$container\";
-  networking.useDHCP = false;
-  imports = [ <nixpkgs/nixos/modules/virtualisation/container-login.nix> ];
-  $extraConfig
-}"
-    configFile="$root/etc/nixos/configuration.nix"
-    echo "$config" > "$configFile"
-
-    nix-env -p "$profileDir/system" -I "nixos-config=$configFile" -f '<nixpkgs/nixos>' --set -A system
-
-    # Allocate a new /8 network in the 10.233.* range.  FIXME: race
-    network="$(sed -e 's/.*_ADDRESS=10\.233\.\(.*\)\..*/\1/; t; d' /etc/containers/*.conf | sort -n | tail -n1)"
-    if [ -z "$network" ]; then network=0; else : $((network++)); fi
-
-    hostAddress="10.233.$network.1"
-    localAddress="10.233.$network.2"
-    echo "host IP is $hostAddress, container IP is $localAddress" >&2
-
-    cat > "$confFile" <<EOF
-PRIVATE_NETWORK=1
-HOST_ADDRESS=$hostAddress
-LOCAL_ADDRESS=$localAddress
-EOF
-
-    echo "starting container@$container.service..." >&2
-    systemctl start "container@$container.service"
-
-    # Print generated container name on stdout.
-    if [ -n "$ensureUniqueName" ]; then
-        echo "$container"
-    fi
-
-elif [ $action = update ]; then
-
-    getContainerRoot
-
-    configFile="$root/etc/nixos/configuration.nix"
-    profileDir="/nix/var/nix/profiles/per-container/$container"
-
-    nix-env -p "$profileDir/system" -I "nixos-config=$configFile" -f '<nixpkgs/nixos>' --set -A system
-
-    echo "reloading container@$container.service..." >&2
-    systemctl reload "container@$container.service"
-
-elif [ $action = destroy ]; then
-
-    getContainerRoot
-
-    confFile="/etc/containers/$container.conf"
-    if [ -e "$confFile" -a ! -w "$confFile" ]; then
-        echo "$0: cannot destroy declarative container (remove it from your configuration.nix instead)"
-        exit 1
-    fi
-
-    if systemctl show "container@$container.service" | grep -q ActiveState=active; then
-        echo "stopping container@$container.service..." >&2
-        systemctl stop "container@$container.service"
-    fi
-
-    rm -f "$confFile"
-    rm -rf "$root"
-
-elif [ $action = login ]; then
-
-    getContainerRoot
-    exec @socat@/bin/socat "unix:$root/var/lib/login.socket" -,echo=0,raw
-
-elif [ $action = root-shell ]; then
-
-    getContainerRoot
-    exec @socat@/bin/socat "unix:$root/var/lib/root-shell.socket" -
-
-elif [ $action = set-root-password ]; then
-
-    password="$1"
-    if [ -z "$password" ]; then usage; exit 1; fi
-
-    # FIXME: not very secure.
-    getContainerRoot
-    (echo "passwd"; echo "$password"; echo "$password") | @socat@/bin/socat "unix:$root/var/lib/root-shell.socket" -
-
-elif [ $action = show-ip ]; then
-
-    getContainerRoot
-    . "/etc/containers/$container.conf"
-    echo "$LOCAL_ADDRESS"
-
-else
-    echo "$0: unknown action ‘$action’" >&2
-    exit 1
-fi
-- 
GitLab


From c6ebbd29e5caed11632c70a859737ce7b11aeb47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 31 Mar 2014 20:02:25 +0200
Subject: [PATCH 2761/3789] add v4l2loopback: a kernel module to create V4L2
 loopback devices

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

diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix
new file mode 100644
index 00000000000..af1cf6d320c
--- /dev/null
+++ b/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, kernel, kmod }:
+
+stdenv.mkDerivation rec {
+  name = "v4l2loopback-${version}-${kernel.version}";
+  version = "0.8.0";
+
+  src = fetchurl {
+    url = "https://github.com/umlaeute/v4l2loopback/archive/v${version}.tar.gz";
+    sha256 = "1rhsgc4prrj8s6njixic7fs5m3gs94v9hhf3am6lnfh5yv6yab9h";
+  };
+  
+  preBuild = ''
+    substituteInPlace Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install"
+    sed -i '/depmod/d' Makefile
+    export PATH=${kmod}/sbin:$PATH
+  '';
+  
+  buildInputs = [ kmod ];
+  
+  makeFlags = [
+    "KERNELRELEASE=${kernel.modDirVersion}"
+    "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "a kernel module to create V4L2 loopback devices";
+    homepage = https://github.com/umlaeute/v4l2loopback;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.iElectric ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df25e7dec5c..1cce996ab93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6985,6 +6985,8 @@ let
     cryptodev = callPackage ../os-specific/linux/cryptodev { };
 
     e1000e = callPackage ../os-specific/linux/e1000e {};
+    
+    v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; 
 
     frandom = callPackage ../os-specific/linux/frandom { };
 
-- 
GitLab


From 4a70bdf5e4929ce038751e647d1d7aae4c2618c9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:02:25 +0200
Subject: [PATCH 2762/3789] haskell-mtl: update to version 2.1.3.1

---
 .../development/libraries/haskell/mtl/2.1.3.1.nix | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  7 +++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/mtl/2.1.3.1.nix

diff --git a/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix
new file mode 100644
index 00000000000..e9fa49510c1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix
@@ -0,0 +1,15 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "mtl";
+  version = "2.1.3.1";
+  sha256 = "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp";
+  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-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2b8ab42e2f1..2991862969b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -153,7 +153,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     html         = self.html_1_0_1_2;
     HTTP         = self.HTTP_4000_2_11;
     HUnit        = self.HUnit_1_2_5_2;
-    mtl          = self.mtl_2_1_2;
+    mtl          = self.mtl_2_1_3_1;
     network      = self.network_2_4_2_2;
     OpenGL       = self.OpenGL_2_9_1_0;
     OpenGLRaw    = self.OpenGLRaw_1_4_0_0;
@@ -1761,7 +1761,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   mtl_2_1_2 = callPackage ../development/libraries/haskell/mtl/2.1.2.nix {
     transformers = self.transformers_0_3_0_0;
   };
-  mtl = self.mtl_2_1_2;
+  mtl_2_1_3_1 = callPackage ../development/libraries/haskell/mtl/2.1.3.1.nix {
+    transformers = self.transformers_0_3_0_0;
+  };
+  mtl = self.mtl_2_1_3_1;
 
   mtlparse = callPackage ../development/libraries/haskell/mtlparse {};
 
-- 
GitLab


From 9109cff1a1891b03ea273397d316944ea1de4551 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:03:00 +0200
Subject: [PATCH 2763/3789] haskell-streaming-commons: add version 0.1.0.2

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

diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix
new file mode 100644
index 00000000000..fec0ddf79cd
--- /dev/null
+++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix
@@ -0,0 +1,17 @@
+{ cabal, deepseq, hspec, network, QuickCheck, text, transformers
+, zlib
+}:
+
+cabal.mkDerivation (self: {
+  pname = "streaming-commons";
+  version = "0.1.0.2";
+  sha256 = "1idlhvlv5pg20xq8h4rmphyflvpc9q88krwm498mh3s4983ik28c";
+  buildDepends = [ network text transformers zlib ];
+  testDepends = [ deepseq hspec QuickCheck text zlib ];
+  meta = {
+    homepage = "https://github.com/fpco/streaming-commons";
+    description = "Common lower-level functions needed by various streaming data libraries";
+    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 2991862969b..ba263948662 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2258,6 +2258,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   StrafunskiStrategyLib = callPackage ../development/libraries/haskell/Strafunski-StrategyLib {};
 
+  streamingCommons = callPackage ../development/libraries/haskell/streaming-commons {};
+
   streamproc = callPackage ../development/libraries/haskell/streamproc {};
 
   strict = callPackage ../development/libraries/haskell/strict {};
-- 
GitLab


From 372e6f7f83e5666cb4efafb8edf33538b167eb0f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:03:13 +0200
Subject: [PATCH 2764/3789] haskell-conduit-extra: add version 1.0.0

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

diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix
new file mode 100644
index 00000000000..fe90468255a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "conduit-extra";
+  version = "1.0.0";
+  sha256 = "120c3zay8svdw3b9nqgxlrj45a1d4xf0sijkg367m7hp22szvz8a";
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "Temporary placeholder package";
+    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 ba263948662..3a8df35b404 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -816,6 +816,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   conduitCombinators = callPackage ../development/libraries/haskell/conduit-combinators {};
 
+  conduitExtra = callPackage ../development/libraries/haskell/conduit-extra {};
+
   ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
 
   configurator = callPackage ../development/libraries/haskell/configurator {};
-- 
GitLab


From 98b82062b0e99c6bc756d2479ce7523f2bd8b5ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:04:13 +0200
Subject: [PATCH 2765/3789] haskell-stm: add version 2.4.3

---
 pkgs/development/libraries/haskell/stm/2.4.3.nix | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix              |  5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/stm/2.4.3.nix

diff --git a/pkgs/development/libraries/haskell/stm/2.4.3.nix b/pkgs/development/libraries/haskell/stm/2.4.3.nix
new file mode 100644
index 00000000000..28c3da5cba2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stm/2.4.3.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "stm";
+  version = "2.4.3";
+  sha256 = "0vzw4s06d5scfy4ircl81ym8ylkw9ckzsp8rq950dvipmaj1xhis";
+  meta = {
+    description = "Software Transactional Memory";
+    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 3a8df35b404..27f375b97ac 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -165,7 +165,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     regexCompat  = self.regexCompat_0_95_1;
     regexPosix   = self.regexPosix_0_95_2;
     split        = self.split_0_2_2;
-    stm          = self.stm_2_4_2;
+    stm          = self.stm_2_4_3;
     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
@@ -2349,7 +2349,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   stm_2_3 = callPackage ../development/libraries/haskell/stm/2.3.nix {};
   stm_2_4 = callPackage ../development/libraries/haskell/stm/2.4.nix {};
   stm_2_4_2 = callPackage ../development/libraries/haskell/stm/2.4.2.nix {};
-  stm = self.stm_2_4_2;
+  stm_2_4_3 = callPackage ../development/libraries/haskell/stm/2.4.3.nix {};
+  stm = self.stm_2_4_3;
 
   stmChans = callPackage ../development/libraries/haskell/stm-chans {};
 
-- 
GitLab


From 305531cbd96317634d8c5806b35a67b322effd0d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:05:02 +0200
Subject: [PATCH 2766/3789] haskell-case-insensitive: add version 1.2.0.0

---
 .../haskell/case-insensitive/1.2.0.0.nix        | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  5 +++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix

diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix
new file mode 100644
index 00000000000..aa8996b0fc3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix
@@ -0,0 +1,17 @@
+{ cabal, deepseq, hashable, HUnit, testFramework
+, testFrameworkHunit, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "case-insensitive";
+  version = "1.2.0.0";
+  sha256 = "0ybdmqaqh9hdl3dl5kx8qhs4b67g78fhnkqnd3y2lpgqjvhnbzp4";
+  buildDepends = [ deepseq hashable text ];
+  testDepends = [ HUnit testFramework testFrameworkHunit text ];
+  meta = {
+    homepage = "https://github.com/basvandijk/case-insensitive";
+    description = "Case insensitive string comparison";
+    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 27f375b97ac..d3192e4e9f7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     inherit (self) cabal ghc;
     async        = self.async_2_0_1_5;
     attoparsec   = self.attoparsec_0_11_2_1;
-    caseInsensitive = self.caseInsensitive_1_1_0_3;
+    caseInsensitive = self.caseInsensitive_1_2_0_0;
     cgi          = self.cgi_3001_1_8_5;
     fgl          = self.fgl_5_4_2_4;
     GLUT         = self.GLUT_2_5_1_0;
@@ -729,7 +729,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {};
   caseInsensitive_1_1_0_3 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.3.nix {};
-  caseInsensitive = self.caseInsensitive_1_1_0_3;
+  caseInsensitive_1_2_0_0 = callPackage ../development/libraries/haskell/case-insensitive/1.2.0.0.nix {};
+  caseInsensitive = self.caseInsensitive_1_2_0_0;
 
   cautiousFile = callPackage ../development/libraries/haskell/cautious-file {};
 
-- 
GitLab


From c6da40c42f8e4feb2271e5398c70b71e68a57461 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:23 +0200
Subject: [PATCH 2767/3789] haskell-haddock: add version 2.14.1

---
 .../tools/documentation/haddock/2.14.1.nix    | 22 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  6 ++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/tools/documentation/haddock/2.14.1.nix

diff --git a/pkgs/development/tools/documentation/haddock/2.14.1.nix b/pkgs/development/tools/documentation/haddock/2.14.1.nix
new file mode 100644
index 00000000000..c63503c85ba
--- /dev/null
+++ b/pkgs/development/tools/documentation/haddock/2.14.1.nix
@@ -0,0 +1,22 @@
+{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, hspec
+, QuickCheck, xhtml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "haddock";
+  version = "2.14.1";
+  sha256 = "1mxkphzdfd5c8dklfl09ajqwhw8ibvzl0cqrfr2j8rn0j03w46x6";
+  isLibrary = true;
+  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/";
+    description = "A documentation-generation tool for Haskell libraries";
+    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 d3192e4e9f7..d9f00fb3f0b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -175,7 +175,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     zlib         = self.zlib_0_5_4_1;
     cabalInstall = self.cabalInstall_1_18_0_3;
     alex         = self.alex_3_1_3;
-    haddock      = self.haddock_2_13_2_1;
+    haddock      = self.haddock_2_14_1;
     happy        = self.happy_1_19_3;
     primitive    = self.primitive_0_5_2_1;      # semi-official, but specified
   };
@@ -2839,8 +2839,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   haddock_2_11_0 = callPackage ../development/tools/documentation/haddock/2.11.0.nix {};
   haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {};
   haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {};
-  haddock_2_13_2_1 = callPackage ../development/tools/documentation/haddock/2.13.2.1.nix {};
-  haddock = self.haddock_2_13_2_1;
+  haddock_2_14_1 = callPackage ../development/tools/documentation/haddock/2.14.1.nix {};
+  haddock = self.haddock_2_14_1;
 
   happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {};
   happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {};
-- 
GitLab


From 3bb288859b770a22575700b20168bc74ba7f90fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:34 +0200
Subject: [PATCH 2768/3789] haskell-HList: update to version 0.3.4.1

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

diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix
index fda43c09baf..15a7741d335 100644
--- a/pkgs/development/libraries/haskell/HList/default.nix
+++ b/pkgs/development/libraries/haskell/HList/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HList";
-  version = "0.3.4.0";
-  sha256 = "0jx0bfsc17c6bx621n7k0wfa5s59kcpi45p6wr8g4gyw846hjw9q";
+  version = "0.3.4.1";
+  sha256 = "02hw496qv2p0nnbz7lq7jfqnis19qqjsylyvdksqbwmjprk32rh2";
   buildDepends = [ mtl tagged ];
   testDepends = [ cmdargs doctest filepath hspec lens mtl syb ];
   buildTools = [ diffutils ];
-- 
GitLab


From 9af5b2d37092bb3abcf033f18ccbe4c907365f2b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:35 +0200
Subject: [PATCH 2769/3789] haskell-authenticate: update to version 1.3.2.8

---
 .../libraries/haskell/authenticate/default.nix      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix
index a0cbd89f4d8..884f4175ba5 100644
--- a/pkgs/development/libraries/haskell/authenticate/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate/default.nix
@@ -1,16 +1,17 @@
 { cabal, aeson, attoparsec, blazeBuilder, caseInsensitive, conduit
-, httpConduit, httpTypes, network, tagstreamConduit, text
-, transformers, unorderedContainers, xmlConduit
+, httpConduit, httpTypes, monadControl, network, resourcet
+, tagstreamConduit, text, transformers, unorderedContainers
+, xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "authenticate";
-  version = "1.3.2.7";
-  sha256 = "1b7bshbjg2141bywjiw69x1x6k30hx9gcqzjaqy7r1jfhnwcjz43";
+  version = "1.3.2.8";
+  sha256 = "1ylijkj32li9nm4x16d66h6a74q07m4v3n2dqm67by548wfyh1j9";
   buildDepends = [
     aeson attoparsec blazeBuilder caseInsensitive conduit httpConduit
-    httpTypes network tagstreamConduit text transformers
-    unorderedContainers xmlConduit
+    httpTypes monadControl network resourcet tagstreamConduit text
+    transformers unorderedContainers xmlConduit
   ];
   meta = {
     homepage = "http://github.com/yesodweb/authenticate";
-- 
GitLab


From 4d8821a7c501aa8107bcaa93657ff777c6a8ba57 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:36 +0200
Subject: [PATCH 2770/3789] haskell-basic-prelude: update to version 0.3.7

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

diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix
index 8d31acb399f..807b80b8122 100644
--- a/pkgs/development/libraries/haskell/basic-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "basic-prelude";
-  version = "0.3.6.0";
-  sha256 = "1sm89mva8vkhqp230g965b0k4n3g0c8w4sfsad8m1wh434g3k732";
+  version = "0.3.7";
+  sha256 = "1lk4f41f226v7na1cw0c8y62lm3pgwmn4560g1wmhvyxcj7185q5";
   buildDepends = [
     hashable liftedBase ReadArgs safe systemFilepath text transformers
     unorderedContainers vector
-- 
GitLab


From b0b0d8603c53b0ea9dc25da0054b85ce10ae6927 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:37 +0200
Subject: [PATCH 2771/3789] haskell-classy-prelude: update to version 0.8.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 99fa5a138b8..6768e6cfda3 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.8.1.1";
-  sha256 = "14iq0zdmw4f2i3c282hs89c4a763wcm7vn5n0f6kcvcpjgjyahgi";
+  version = "0.8.2";
+  sha256 = "1kvab1vns1mp0i0nyn0flg2m6f2sl8w1yr2c0x54172f20rdm5lv";
   buildDepends = [
     basicPrelude chunkedData enclosedExceptions hashable liftedBase
     monoTraversable semigroups systemFilepath text time transformers
-- 
GitLab


From 5996a836a62c40a899d11685515e604f56dca37e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:39 +0200
Subject: [PATCH 2772/3789] haskell-cryptohash-conduit: update to version 0.1.1

---
 .../libraries/haskell/cryptohash-conduit/default.nix  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix b/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix
index 501edf03ae0..78c0c101659 100644
--- a/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix
@@ -1,10 +1,13 @@
-{ cabal, conduit, cryptohash, transformers }:
+{ cabal, conduit, conduitExtra, cryptohash, resourcet, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "cryptohash-conduit";
-  version = "0.1.0";
-  sha256 = "08x45dy5crxc63gd4psryrzprz7lc5hbzjl23q56c3iqbvrx2r7w";
-  buildDepends = [ conduit cryptohash transformers ];
+  version = "0.1.1";
+  sha256 = "1kmlskgb0jx8hkzdncr24aqir9k1kyfcb2rypvkdld1yin4nslga";
+  buildDepends = [
+    conduit conduitExtra cryptohash resourcet transformers
+  ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-cryptohash-conduit";
     description = "cryptohash conduit";
-- 
GitLab


From 896df7da5a4233b4278c086b095e1a4ace6aab55 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:41 +0200
Subject: [PATCH 2773/3789] haskell-html-conduit: update to version 1.1.0.4

---
 .../libraries/haskell/html-conduit/default.nix      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix
index 4f02c8a6fa2..244b1c2dcce 100644
--- a/pkgs/development/libraries/haskell/html-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/html-conduit/default.nix
@@ -1,14 +1,15 @@
-{ cabal, conduit, hspec, HUnit, resourcet, systemFilepath
-, tagstreamConduit, text, transformers, xmlConduit, xmlTypes
+{ cabal, conduit, conduitExtra, hspec, HUnit, resourcet
+, systemFilepath, tagstreamConduit, text, transformers, xmlConduit
+, xmlTypes
 }:
 
 cabal.mkDerivation (self: {
   pname = "html-conduit";
-  version = "1.1.0.3";
-  sha256 = "08f8dqndd2smjf5zycpsjsl50z9rqgi4ynlks4paw1xqlin0n1cl";
+  version = "1.1.0.4";
+  sha256 = "1bl6h38fvhiidzxly49l7jickcg0s4fy59m4cizfjarxll9cspwb";
   buildDepends = [
-    conduit resourcet systemFilepath tagstreamConduit text transformers
-    xmlConduit xmlTypes
+    conduit conduitExtra resourcet systemFilepath tagstreamConduit text
+    transformers xmlConduit xmlTypes
   ];
   testDepends = [ hspec HUnit xmlConduit ];
   meta = {
-- 
GitLab


From a839273d8755a937001e30fa25a2424b24999ed8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:42 +0200
Subject: [PATCH 2774/3789] haskell-http-reverse-proxy: update to version
 0.3.1.4

---
 .../haskell/http-reverse-proxy/default.nix     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index 25608789d74..957dbe02006 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -1,17 +1,19 @@
 { cabal, async, blazeBuilder, caseInsensitive, conduit
-, dataDefaultClass, hspec, httpClient, httpConduit, httpTypes
-, liftedBase, monadControl, network, networkConduit, resourcet
-, text, transformers, wai, waiLogger, warp, word8
+, conduitExtra, dataDefaultClass, hspec, httpClient, httpConduit
+, httpTypes, liftedBase, monadControl, network, networkConduit
+, resourcet, streamingCommons, text, transformers, wai, waiLogger
+, warp, word8
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.3.1.2";
-  sha256 = "0c7xg5l5di87dwn0pq5ymh1bj5zzj7hmj6cvwp3b1q6cb3fcwfnp";
+  version = "0.3.1.4";
+  sha256 = "0j7k6njyp3qss08gja5p62zvqxdh7bpqfbzvkm23gdv8v1bgh5h6";
   buildDepends = [
-    async blazeBuilder caseInsensitive conduit dataDefaultClass
-    httpClient httpTypes liftedBase monadControl network networkConduit
-    resourcet text transformers wai waiLogger word8
+    async blazeBuilder caseInsensitive conduit conduitExtra
+    dataDefaultClass httpClient httpTypes liftedBase monadControl
+    network networkConduit resourcet streamingCommons text transformers
+    wai waiLogger word8
   ];
   testDepends = [
     blazeBuilder conduit hspec httpConduit httpTypes liftedBase network
-- 
GitLab


From fb4ae347f145216c04e3ae3020d98d25d54fd45d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:45 +0200
Subject: [PATCH 2775/3789] haskell-language-c: update to version 0.4.3

---
 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 5b638ea9dab..c415e3a2b93 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.2";
-  sha256 = "07pf4v4n7kvr5inkhs24b7g55pmkk4k5ihi6s5dbc200l01wz133";
+  version = "0.4.3";
+  sha256 = "0y5yn0jaairqixxqx7c80z5y5mc6czshps7wghjci1s39mn9cjf6";
   buildDepends = [ filepath syb ];
   buildTools = [ alex happy ];
   meta = {
-- 
GitLab


From 1139e22b096cf79f7fb016e5f0da2d7238f4dc43 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:46 +0200
Subject: [PATCH 2776/3789] haskell-monad-logger: update to version 0.3.4.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 a66ad0faf01..4aa394aff40 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.4.0";
-  sha256 = "16nrzms87klbs26rbaw4j8xal5k7glpbhg7r2x1m3gxbdhsp696n";
+  version = "0.3.4.1";
+  sha256 = "1i5192060svqhc1iv215b98hah6p29bzdqin6ng5qpq8d44hdnpm";
   buildDepends = [
     blazeBuilder conduit fastLogger liftedBase monadControl monadLoops
     mtl resourcet stm stmChans text transformers transformersBase
-- 
GitLab


From 7448e13d57d7d5b5c9f9e512a33393a4c0c1fb64 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:47 +0200
Subject: [PATCH 2777/3789] haskell-mono-traversable: update to version 0.4.0.4

---
 .../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 a1de3e9ad16..113a4b67b41 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.3";
-  sha256 = "04g2ihk4n71zrz09si2k8j46y53i5vllps9xizgs0bmikmrgh29f";
+  version = "0.4.0.4";
+  sha256 = "1ikrdhr4f3755xim6j9db60a9y0mpdnljmck84qh47yk2axfp0n9";
   buildDepends = [
     comonad dlist dlistInstances hashable semigroupoids semigroups text
     transformers unorderedContainers vector vectorAlgorithms
-- 
GitLab


From 818bf53040212a9172b077281d11628c86e73dbb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:48 +0200
Subject: [PATCH 2778/3789] haskell-persistent-postgresql: update to version
 1.3.0.5

---
 .../libraries/haskell/persistent-postgresql/default.nix  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
index e529747e7a7..85b1a10b5ba 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -1,14 +1,15 @@
 { cabal, aeson, blazeBuilder, conduit, monadControl, persistent
-, postgresqlLibpq, postgresqlSimple, text, time, transformers
+, postgresqlLibpq, postgresqlSimple, resourcet, text, time
+, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent-postgresql";
-  version = "1.3.0.3";
-  sha256 = "00frqpv7wbksbjl714nhrian45p61kggxhpin9hawbwn2siwsg2m";
+  version = "1.3.0.5";
+  sha256 = "0abk38jzc7k93wrzn3pq90xj0mqln4nqrgzmmy0d3p4gmbzmnnia";
   buildDepends = [
     aeson blazeBuilder conduit monadControl persistent postgresqlLibpq
-    postgresqlSimple text time transformers
+    postgresqlSimple resourcet text time transformers
   ];
   jailbreak = true;
   meta = {
-- 
GitLab


From d8194207096a6a53895c72f1bcc449f1296e4a1b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:50 +0200
Subject: [PATCH 2779/3789] haskell-persistent-sqlite: update to version
 1.3.0.5

---
 .../libraries/haskell/persistent-sqlite/default.nix      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
index 009aa3b6299..cb12d9cbe84 100644
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
@@ -1,15 +1,16 @@
 { cabal, aeson, conduit, monadControl, monadLogger, persistent
-, text, transformers
+, resourcet, text, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent-sqlite";
-  version = "1.3.0.3";
-  sha256 = "0b7dp2hiza02rnnph44rd2vls06jipmixi32icbijmcqk83hfglq";
+  version = "1.3.0.5";
+  sha256 = "05b7byc4z7mhni90cj2aan63f599wv0511zqbsm6kbylk1zpyizb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson conduit monadControl monadLogger persistent text transformers
+    aeson conduit monadControl monadLogger persistent resourcet text
+    transformers
   ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
-- 
GitLab


From a7828e9cc5669a0727f11ec6052f625314791dea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:51 +0200
Subject: [PATCH 2780/3789] haskell-persistent-template: update to version
 1.3.1.3

---
 .../libraries/haskell/persistent-template/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 1340ceaaf95..994632c40e2 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "1.3.1.2";
-  sha256 = "1gdwwx55ihnqxgyw0wsx0pr4dcs2hdbp5xbnx6l1j03rn5x1sglq";
+  version = "1.3.1.3";
+  sha256 = "0q5ysv1r6p4mg79waq2g6ql11rap6znawkplddblpaa8lq9qalj6";
   buildDepends = [
     aeson monadControl monadLogger persistent text transformers
     unorderedContainers
-- 
GitLab


From 48600834caff8cd70bb018c8914a35c6c8842241 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:52 +0200
Subject: [PATCH 2781/3789] haskell-persistent: update to version 1.3.0.6

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

diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index a3faace8d49..b16c89dac70 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "1.3.0.4";
-  sha256 = "09p7nf6dnjz83qp7invkmzcr55zglm0y54p8pb1y6acjpnw3glkl";
+  version = "1.3.0.6";
+  sha256 = "0rj5yi8nziym9cb9c9vw6vdjflf2yfz02i39p6dsdy084f1ivpk8";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
     liftedBase monadControl monadLogger pathPieces resourcePool
-- 
GitLab


From 9b61153ce32a6f684a017f8cbc5f40caaac8248e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:53 +0200
Subject: [PATCH 2782/3789] haskell-pool-conduit: update to version 0.1.2.2

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

diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix
index e97fbb983a7..e7c1489d5cb 100644
--- a/pkgs/development/libraries/haskell/pool-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pool-conduit";
-  version = "0.1.2.1";
-  sha256 = "1mcx66xv1irxd66cfv23h4n7fplg5a0hyldlgk8km0k395mjw8k8";
+  version = "0.1.2.2";
+  sha256 = "1jg7kymr1v82xl9122q9fly385jhm1hr2406g35ydl9wnh4aaiw8";
   buildDepends = [
     monadControl resourcePool resourcet transformers
   ];
-- 
GitLab


From 20395fd9d386d1c34d9d1bb87d5a938607988ab3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:54 +0200
Subject: [PATCH 2783/3789] haskell-postgresql-simple: update to version
 0.4.2.1

---
 .../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 56c4a5965e1..20222609cff 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.0";
-  sha256 = "0g31a7s2h9d6f3igvrddbr357sk4vabvg88mmvb194pps66y8zzn";
+  version = "0.4.2.1";
+  sha256 = "1547n7rh0gsrjaa8f9lc4diljpps09kdf0gkm0cjf1gk2kr7lh94";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq
     scientific text time transformers uuid vector
-- 
GitLab


From 429e248af766a95136be2c7f31a500e04ad34095 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:56 +0200
Subject: [PATCH 2784/3789] haskell-project-template: update to version 0.1.4.1

---
 .../haskell/project-template/default.nix        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix
index d5cd0da22a3..58dc06e6aa5 100644
--- a/pkgs/development/libraries/haskell/project-template/default.nix
+++ b/pkgs/development/libraries/haskell/project-template/default.nix
@@ -1,18 +1,19 @@
-{ cabal, base64Bytestring, conduit, hspec, mtl, QuickCheck
-, resourcet, systemFileio, systemFilepath, text, transformers
+{ cabal, base64Bytestring, conduit, conduitExtra, hspec, mtl
+, QuickCheck, resourcet, systemFileio, systemFilepath, text
+, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "project-template";
-  version = "0.1.4";
-  sha256 = "1fmpb7jrn7mry8wq5jyxhkwyr61fknhi7p8mmqs7xn8lxwbj5904";
+  version = "0.1.4.1";
+  sha256 = "1vsx8a4kzdcwbdy47hb2wz32najsa6bqq6jkyal9nbc5ydwb65lb";
   buildDepends = [
-    base64Bytestring conduit mtl resourcet systemFileio systemFilepath
-    text transformers
+    base64Bytestring conduit conduitExtra mtl resourcet systemFileio
+    systemFilepath text transformers
   ];
   testDepends = [
-    base64Bytestring conduit hspec QuickCheck systemFilepath text
-    transformers
+    base64Bytestring conduit hspec QuickCheck resourcet systemFilepath
+    text transformers
   ];
   meta = {
     homepage = "https://github.com/fpco/haskell-ide";
-- 
GitLab


From 3d534a268efb73c565d7934a4e3e90f2d871d751 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:57 +0200
Subject: [PATCH 2785/3789] haskell-resourcet: update to version 0.4.10.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 cb554314752..8413802faa1 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 = "0.4.10.1";
-  sha256 = "05skxqxhbmsyjn72w1c9n924d865wxadfsxlavk0nmbd7ygmnazb";
+  version = "0.4.10.2";
+  sha256 = "0k0l4909b30hc2apxgzjz1rxbqqkhqnqchz53wi6zyhvbh46ffh6";
   buildDepends = [
     liftedBase mmorph monadControl mtl transformers transformersBase
   ];
-- 
GitLab


From df7e61047d5ee8cd4d6863fb9cb7cf1b02254911 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:04 +0200
Subject: [PATCH 2786/3789] haskell-snap-core: update to version 0.9.6.2

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

diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
index 351e8d94323..0a1d1b7c5cf 100644
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ b/pkgs/development/libraries/haskell/snap/core.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-core";
-  version = "0.9.6.1";
-  sha256 = "1wfjkbck2dc4a1nxz62yprf68g66m9vhvxihn9c5xypxjpgj2r9k";
+  version = "0.9.6.2";
+  sha256 = "1s77p2q4zrpw2fksklqc9sgcb214fijsk88lqqasdiw9kb9xmwij";
   buildDepends = [
     attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
     bytestringMmap caseInsensitive deepseq enumerator filepath hashable
-- 
GitLab


From eaa032aa9269ba11544ff36cb0d3b43db5267e1c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:05 +0200
Subject: [PATCH 2787/3789] haskell-snap-server: update to version 0.9.4.1

---
 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 80cffd6b432..4634ec554eb 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.0";
-  sha256 = "0jcg99byygdxx42p1w0a8nvyh2w2hrqj2j9n76hf7sa65f67j828";
+  version = "0.9.4.1";
+  sha256 = "07k7gndzmh4d2mghi8qv25frvdlgmn7497hh6j22ki0al0zrs0l9";
   buildDepends = [
     attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
     caseInsensitive enumerator MonadCatchIOTransformers mtl network
-- 
GitLab


From a893fa5b751fb700d7fb6aeef8042b69687d816f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:07 +0200
Subject: [PATCH 2788/3789] haskell-system-filepath: update to version 0.4.10

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

diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix
index 2e060e252dd..fba75d7b847 100644
--- a/pkgs/development/libraries/haskell/system-filepath/default.nix
+++ b/pkgs/development/libraries/haskell/system-filepath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "system-filepath";
-  version = "0.4.9";
-  sha256 = "0qxbibq6lj7gyw62crp774pv2a8cm83rllw5yjjsg372nk4m1is0";
+  version = "0.4.10";
+  sha256 = "176g5jm1gd6lrkmhfz9qh5aqwfbpwyr30yknfcc49wl7jkfhisiq";
   buildDepends = [ deepseq text ];
   meta = {
     homepage = "https://john-millikin.com/software/haskell-filesystem/";
-- 
GitLab


From 4c8d2419b5c2474b89515a54a8189bf0dede6f45 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:09 +0200
Subject: [PATCH 2789/3789] haskell-wai-extra: update to version 2.1.1.1

---
 .../libraries/haskell/wai-extra/default.nix   | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index df13922601c..ef91a872687 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -1,23 +1,24 @@
 { cabal, ansiTerminal, base64Bytestring, blazeBuilder
-, blazeBuilderConduit, caseInsensitive, conduit, dataDefault
-, fastLogger, hspec, httpTypes, HUnit, liftedBase, network
-, resourcet, stringsearch, text, time, transformers, void, wai
-, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit
+, blazeBuilderConduit, caseInsensitive, conduit, conduitExtra
+, dataDefault, fastLogger, hspec, httpTypes, HUnit, liftedBase
+, network, resourcet, stringsearch, text, time, transformers, void
+, wai, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "2.1.1";
-  sha256 = "1bsc9sjmp9hspdif4f81iqjkcaflv6b7rd42g62qj790a4b70igf";
+  version = "2.1.1.1";
+  sha256 = "1mqpy1klr4b5dvgk89hqyd8c2vg7rl0vypy3m9hxr2r4bzifkqc1";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
-    caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase
-    network resourcet stringsearch text time transformers void wai
-    waiLogger word8 zlibConduit
+    caseInsensitive conduit conduitExtra dataDefault fastLogger
+    httpTypes liftedBase network resourcet stringsearch text time
+    transformers void wai waiLogger word8 zlibConduit
   ];
   testDepends = [
-    blazeBuilder conduit dataDefault fastLogger hspec httpTypes HUnit
-    resourcet text transformers wai waiTest zlib zlibBindings
+    blazeBuilder conduit conduitExtra dataDefault fastLogger hspec
+    httpTypes HUnit resourcet text transformers wai waiTest zlib
+    zlibBindings
   ];
   jailbreak = true;
   meta = {
-- 
GitLab


From f312041fc4677a1da796f311d90f2fb94077bc5f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:10 +0200
Subject: [PATCH 2790/3789] haskell-wai-handler-launch: update to version
 2.0.1.2

---
 .../libraries/haskell/wai-handler-launch/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix
index f25206e69ac..9be53472582 100644
--- a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix
+++ b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix
@@ -1,14 +1,14 @@
-{ cabal, blazeBuilder, blazeBuilderConduit, conduit, httpTypes
-, transformers, wai, warp, zlibConduit
+{ cabal, blazeBuilder, blazeBuilderConduit, conduit, conduitExtra
+, httpTypes, transformers, wai, warp, zlibConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-handler-launch";
-  version = "2.0.1.1";
-  sha256 = "10izbri1a8mjb2q4r1badw63qbp3vxnw5v2hzskq6911bckqkskc";
+  version = "2.0.1.2";
+  sha256 = "1mcjxv4dkcc5rx1bj8zc5m2q2ifcdwhsl4x4fnrv1ir9kclzsm7q";
   buildDepends = [
-    blazeBuilder blazeBuilderConduit conduit httpTypes transformers wai
-    warp zlibConduit
+    blazeBuilder blazeBuilderConduit conduit conduitExtra httpTypes
+    transformers wai warp zlibConduit
   ];
   meta = {
     description = "Launch a web app in the default browser";
-- 
GitLab


From b217dfc617881d08a34a0300a78fec7f91622c28 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:12 +0200
Subject: [PATCH 2791/3789] haskell-wai-test: update to version 2.0.1.1

---
 .../libraries/haskell/wai-test/default.nix           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix
index 5e3a666726a..e55bf8805e3 100644
--- a/pkgs/development/libraries/haskell/wai-test/default.nix
+++ b/pkgs/development/libraries/haskell/wai-test/default.nix
@@ -1,15 +1,15 @@
 { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
-, conduit, cookie, deepseq, hspec, httpTypes, network, text
-, transformers, wai
+, conduit, conduitExtra, cookie, deepseq, hspec, httpTypes, network
+, text, transformers, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-test";
-  version = "2.0.1";
-  sha256 = "0c803l3cz5bjf60l97sy1isxhnmbpzr5x39yhnck28r0vykycnrj";
+  version = "2.0.1.1";
+  sha256 = "08mkn6v8kxlcn2qb5rz9m5mqzl9wy43mxs2jzl1gavkf9bhwc93s";
   buildDepends = [
-    blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie
-    deepseq httpTypes network text transformers wai
+    blazeBuilder blazeBuilderConduit caseInsensitive conduit
+    conduitExtra cookie deepseq httpTypes network text transformers wai
   ];
   testDepends = [ hspec wai ];
   meta = {
-- 
GitLab


From d16e52b872d7d9025eec6e103dbabccd7ef7fa57 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:13 +0200
Subject: [PATCH 2792/3789] haskell-wai-websockets: update to version 2.1.0.1

---
 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 4b4038fd411..5558f2e32ce 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";
-  sha256 = "094imqhkn4ghifgp2qhs4hnby3zzdd84fhmyvvy7igcpz1rmll7a";
+  version = "2.1.0.1";
+  sha256 = "1ic1wgfp16j6lhypn1psmicafjavbhq5rvm32xqwkb65abhpg571";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 12ec59aa775e50dc19c63145e862b32f2a7d1ef3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:14 +0200
Subject: [PATCH 2793/3789] haskell-wai: update to version 2.1.0.1

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

diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
index f17b999f149..a0164a3950c 100644
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@@ -1,13 +1,14 @@
-{ cabal, blazeBuilder, conduit, httpTypes, network, text
-, transformers, vault
+{ cabal, blazeBuilder, conduit, conduitExtra, httpTypes, network
+, text, transformers, vault
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai";
-  version = "2.1.0";
-  sha256 = "0n3dgm1pwv9baxrx0qh0iq1mh9i7ihhki3h4ks5k74d37w7bwcjy";
+  version = "2.1.0.1";
+  sha256 = "03gp3ijdpyyh7zic89laj0y4wsi8f49lbqlqq8w9msfgizjhvdv6";
   buildDepends = [
-    blazeBuilder conduit httpTypes network text transformers vault
+    blazeBuilder conduit conduitExtra httpTypes network text
+    transformers vault
   ];
   meta = {
     homepage = "https://github.com/yesodweb/wai";
-- 
GitLab


From 3e2eb89cb6bd7a5a290e1d679eb08cce15884aa0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:15 +0200
Subject: [PATCH 2794/3789] haskell-warp-tls: update to version 2.0.3.2

---
 .../libraries/haskell/warp-tls/default.nix          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix
index c21e3b0d432..b04d9439d2d 100644
--- a/pkgs/development/libraries/haskell/warp-tls/default.nix
+++ b/pkgs/development/libraries/haskell/warp-tls/default.nix
@@ -1,14 +1,15 @@
-{ cabal, conduit, cprngAes, dataDefaultClass, network
-, networkConduit, tls, transformers, wai, warp
+{ cabal, conduit, conduitExtra, cprngAes, dataDefaultClass, network
+, networkConduit, resourcet, streamingCommons, tls, transformers
+, wai, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "warp-tls";
-  version = "2.0.3.1";
-  sha256 = "1cyf4syblisi5hana7h2g72yyrjln40v3b6jq2253nglqip79l5w";
+  version = "2.0.3.2";
+  sha256 = "1dqaq1z4gb3sya41hiwsxgl4f0v7sqza7aazf2vc7dd5x5izp02w";
   buildDepends = [
-    conduit cprngAes dataDefaultClass network networkConduit tls
-    transformers wai warp
+    conduit conduitExtra cprngAes dataDefaultClass network
+    networkConduit resourcet streamingCommons tls transformers wai warp
   ];
   meta = {
     homepage = "http://github.com/yesodweb/wai";
-- 
GitLab


From cb81cfeaa9d2af26273688565a828d8ff03e879e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:17 +0200
Subject: [PATCH 2795/3789] haskell-warp: update to version 2.1.3.3

---
 .../libraries/haskell/warp/default.nix        | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index abd301dcc78..c67ea5c25e0 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -1,23 +1,25 @@
 { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
-, conduit, doctest, hashable, hspec, HTTP, httpDate, httpTypes
-, HUnit, liftedBase, network, networkConduit, QuickCheck
-, simpleSendfile, text, time, transformers, unixCompat, void, wai
+, conduit, conduitExtra, doctest, hashable, hspec, HTTP, httpDate
+, httpTypes, HUnit, liftedBase, network, networkConduit, QuickCheck
+, simpleSendfile, streamingCommons, text, time, transformers
+, unixCompat, void, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.1.3";
-  sha256 = "00861dimzvbbqx3pbpihfml8k2fkvsw8kda7mkkix59xqsjwc1nz";
+  version = "2.1.3.3";
+  sha256 = "1dbarrjb6y4cbc1dc265b008b6d5qziqnikdbnbdlrwfzr97cz23";
   buildDepends = [
-    blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
-    httpDate httpTypes liftedBase network networkConduit simpleSendfile
-    text transformers unixCompat void wai
+    blazeBuilder blazeBuilderConduit caseInsensitive conduit
+    conduitExtra hashable httpDate httpTypes liftedBase network
+    networkConduit simpleSendfile streamingCommons text transformers
+    unixCompat void wai
   ];
   testDepends = [
-    blazeBuilder blazeBuilderConduit caseInsensitive conduit doctest
-    hashable hspec HTTP httpDate httpTypes HUnit liftedBase network
-    networkConduit QuickCheck simpleSendfile text time transformers
-    unixCompat void wai
+    blazeBuilder blazeBuilderConduit caseInsensitive conduit
+    conduitExtra doctest hashable hspec HTTP httpDate httpTypes HUnit
+    liftedBase network networkConduit QuickCheck simpleSendfile
+    streamingCommons text time transformers unixCompat void wai
   ];
   doCheck = false;
   meta = {
-- 
GitLab


From bc9140a6089b2864ccb140dc6ae25f55537f0de0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:18 +0200
Subject: [PATCH 2796/3789] haskell-xml-conduit: update to version 1.2.0.1

---
 .../libraries/haskell/xml-conduit/default.nix   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 60bc750823b..d31f1d0e70d 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -1,20 +1,21 @@
 { cabal, attoparsec, attoparsecConduit, blazeBuilder
-, blazeBuilderConduit, blazeHtml, blazeMarkup, conduit, dataDefault
-, deepseq, hspec, HUnit, monadControl, resourcet, systemFilepath
-, text, transformers, xmlTypes
+, blazeBuilderConduit, blazeHtml, blazeMarkup, conduit
+, conduitExtra, dataDefault, deepseq, hspec, HUnit, monadControl
+, resourcet, systemFilepath, text, transformers, xmlTypes
 }:
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "1.2.0";
-  sha256 = "0sh4f645ysj2dzd58a1b1y2pqqcg6khav27lgy2j3fqgm6mryxhj";
+  version = "1.2.0.1";
+  sha256 = "0ry3h1csblssv2x8b63hvl2gqc0wyzyqbvp6iyisrk77wkz72jw9";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
-    blazeHtml blazeMarkup conduit dataDefault deepseq monadControl
-    resourcet systemFilepath text transformers xmlTypes
+    blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq
+    monadControl resourcet systemFilepath text transformers xmlTypes
   ];
   testDepends = [
-    blazeMarkup conduit hspec HUnit text transformers xmlTypes
+    blazeMarkup conduit hspec HUnit resourcet text transformers
+    xmlTypes
   ];
   meta = {
     homepage = "http://github.com/snoyberg/xml";
-- 
GitLab


From ab6453c483e406b07c63503bca5038838c187ecf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:20 +0200
Subject: [PATCH 2797/3789] haskell-yaml: update to version 0.8.8.1

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

diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index e9a9c075c32..5b0d4ad3f47 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";
-  sha256 = "0fv56x40ici6hx2dfy85fg7zy213mn82h84czhj4xbvjszg8wycw";
+  version = "0.8.8.1";
+  sha256 = "1lkw05rx88jckzlkslb945zswn6g7i3vxsgxpj9pkcxvh3y9zagv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -13,8 +13,8 @@ cabal.mkDerivation (self: {
     unorderedContainers vector
   ];
   testDepends = [
-    aeson conduit hspec HUnit text transformers unorderedContainers
-    vector
+    aeson conduit hspec HUnit resourcet text transformers
+    unorderedContainers vector
   ];
   meta = {
     homepage = "http://github.com/snoyberg/yaml/";
-- 
GitLab


From 900abbfa212b8099e287bd696b224868c8ec0f3d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:21 +0200
Subject: [PATCH 2798/3789] haskell-yesod-auth: update to version 1.3.0.2

---
 .../libraries/haskell/yesod-auth/default.nix      | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 71c5dff4dad..93e1bb9cadd 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -2,21 +2,22 @@
 , blazeMarkup, cryptohash, dataDefault, emailValidate, fileEmbed
 , hamlet, httpConduit, httpTypes, liftedBase, mimeMail, network
 , persistent, persistentTemplate, pwstoreFast, random, resourcet
-, safe, shakespeareCss, shakespeareJs, text, time, transformers
-, unorderedContainers, wai, yesodCore, yesodForm, yesodPersistent
+, safe, shakespeare, shakespeareCss, shakespeareJs, text, time
+, transformers, unorderedContainers, wai, yesodCore, yesodForm
+, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.3.0.1";
-  sha256 = "0c9vrjn7ypwqidyz65icr0i8xb956gaga8jbqrwvc9x624brxhxy";
+  version = "1.3.0.2";
+  sha256 = "1lx9xz5jrr63256w64isndwr323khsyyn8ah1iv1vy7n54y9afpk";
   buildDepends = [
     aeson authenticate base16Bytestring blazeHtml blazeMarkup
     cryptohash dataDefault emailValidate fileEmbed hamlet httpConduit
     httpTypes liftedBase mimeMail network persistent persistentTemplate
-    pwstoreFast random resourcet safe shakespeareCss shakespeareJs text
-    time transformers unorderedContainers wai yesodCore yesodForm
-    yesodPersistent
+    pwstoreFast random resourcet safe shakespeare shakespeareCss
+    shakespeareJs text time transformers unorderedContainers wai
+    yesodCore yesodForm yesodPersistent
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
-- 
GitLab


From 564f192d3331dada2138f7014ac0133a175a15a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:23 +0200
Subject: [PATCH 2799/3789] haskell-yesod-bin: update to version 1.2.7.4

---
 .../libraries/haskell/yesod-bin/default.nix   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index e939b1e4ee7..baf4a9dd4d5 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -1,26 +1,26 @@
 { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit
-, dataDefaultClass, fileEmbed, filepath, fsnotify, ghcPaths
-, httpConduit, httpReverseProxy, httpTypes, liftedBase, network
-, networkConduit, optparseApplicative, parsec, projectTemplate
-, resourcet, shakespeare, shakespeareCss, shakespeareJs
-, shakespeareText, split, systemFileio, systemFilepath, tar, text
-, time, transformers, unixCompat, unorderedContainers, wai, warp
-, yaml, zlib
+, conduitExtra, dataDefaultClass, fileEmbed, filepath, fsnotify
+, ghcPaths, httpConduit, httpReverseProxy, httpTypes, liftedBase
+, network, networkConduit, optparseApplicative, parsec
+, projectTemplate, resourcet, shakespeare, shakespeareCss
+, shakespeareJs, shakespeareText, split, streamingCommons
+, systemFileio, systemFilepath, tar, text, time, transformers
+, unixCompat, unorderedContainers, wai, warp, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.7.3";
-  sha256 = "05kbfnkigk4p1vjw0h1pkp7jfczjq99vgrsaz45faajadnhffnpz";
+  version = "1.2.7.4";
+  sha256 = "1nhpn8855jhvjmh5fdvjic20lyx6k054kfp8j0lwvdcd79c7bl77";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    attoparsec base64Bytestring blazeBuilder Cabal conduit
+    attoparsec base64Bytestring blazeBuilder Cabal conduit conduitExtra
     dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit
     httpReverseProxy httpTypes liftedBase network networkConduit
     optparseApplicative parsec projectTemplate resourcet shakespeare
-    shakespeareCss shakespeareJs shakespeareText split systemFileio
-    systemFilepath tar text time transformers unixCompat
+    shakespeareCss shakespeareJs shakespeareText split streamingCommons
+    systemFileio systemFilepath tar text time transformers unixCompat
     unorderedContainers wai warp yaml zlib
   ];
   meta = {
-- 
GitLab


From 11679b331a305881772da762772634e122963b0e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:24 +0200
Subject: [PATCH 2800/3789] haskell-yesod-core: update to version 1.2.9.2

---
 .../libraries/haskell/yesod-core/default.nix  | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 55cd76784a0..3083eb0c929 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -1,30 +1,32 @@
 { cabal, aeson, async, attoparsecConduit, blazeBuilder, blazeHtml
 , blazeMarkup, caseInsensitive, cereal, clientsession, conduit
-, cookie, dataDefault, fastLogger, hamlet, hspec, httpTypes, HUnit
-, liftedBase, monadControl, monadLogger, network, networkConduit
-, parsec, pathPieces, QuickCheck, random, resourcet, safe
-, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs, text
-, time, transformers, transformersBase, unixCompat, vector, wai
-, waiExtra, waiLogger, waiTest, warp, yesodRoutes
+, conduitExtra, cookie, dataDefault, fastLogger, hamlet, hspec
+, httpTypes, HUnit, liftedBase, monadControl, monadLogger, 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.9.1";
-  sha256 = "1j37jf82csdvjgb36034c0pqrmzd5r131hfqh43jp4m1wqsrib5k";
+  version = "1.2.9.2";
+  sha256 = "1ip5rra426agqv5v2hmxcp1g3xjvi9wnixrpdnxvifflhr7gchfl";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
-    caseInsensitive cereal clientsession conduit cookie dataDefault
-    fastLogger hamlet httpTypes liftedBase monadControl monadLogger
-    parsec pathPieces random resourcet safe shakespeare shakespeareCss
-    shakespeareI18n shakespeareJs text time transformers
+    caseInsensitive cereal clientsession conduit conduitExtra cookie
+    dataDefault fastLogger hamlet httpTypes liftedBase monadControl
+    monadLogger parsec pathPieces random resourcet safe shakespeare
+    shakespeareCss shakespeareI18n shakespeareJs text time transformers
     transformersBase unixCompat vector wai waiExtra waiLogger warp
     yesodRoutes
   ];
   testDepends = [
-    async blazeBuilder conduit hamlet hspec httpTypes HUnit liftedBase
-    network networkConduit QuickCheck random resourcet shakespeareCss
-    shakespeareJs text transformers wai waiTest
+    async blazeBuilder conduit conduitExtra hamlet hspec httpTypes
+    HUnit liftedBase network networkConduit QuickCheck random resourcet
+    shakespeare shakespeareCss shakespeareJs streamingCommons text
+    transformers wai waiTest
   ];
   jailbreak = true;
   meta = {
-- 
GitLab


From 03d2b9953744b08967e4357eafc02869e02fcbcd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:25 +0200
Subject: [PATCH 2801/3789] haskell-yesod-form: update to version 1.3.8.1

---
 .../libraries/haskell/yesod-form/default.nix        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 2f58cbb6408..a67eccb00c2 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -1,18 +1,19 @@
 { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
 , byteable, dataDefault, emailValidate, hamlet, hspec, network
-, persistent, resourcet, shakespeareCss, shakespeareJs, text, time
-, transformers, wai, xssSanitize, yesodCore, yesodPersistent
+, persistent, resourcet, shakespeare, shakespeareCss, shakespeareJs
+, text, time, transformers, wai, xssSanitize, yesodCore
+, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.8";
-  sha256 = "0cdpdgclhasdmynp9fhf9yhl33nwh71bmg344x51xkp5347w614b";
+  version = "1.3.8.1";
+  sha256 = "0cyvyr3whrbswawv5rcfmq9nhk3kf4d3vgfm8z01prcqdsc4yh21";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable
     dataDefault emailValidate hamlet network persistent resourcet
-    shakespeareCss shakespeareJs text time transformers wai xssSanitize
-    yesodCore yesodPersistent
+    shakespeare shakespeareCss shakespeareJs text time transformers wai
+    xssSanitize yesodCore yesodPersistent
   ];
   testDepends = [ hspec text time ];
   meta = {
-- 
GitLab


From a540080b0c4f2e449a8791619e6f897f6ab6ede8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:26 +0200
Subject: [PATCH 2802/3789] haskell-yesod-static: update to version 1.2.2.4

---
 .../haskell/yesod-static/default.nix          | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index a009cd60378..78d941b371b 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -1,6 +1,6 @@
-{ cabal, async, base64Bytestring, byteable, conduit, cryptohash
-, cryptohashConduit, dataDefault, fileEmbed, filepath, hjsmin
-, hspec, httpTypes, HUnit, mimeTypes, processConduit, resourcet
+{ 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
@@ -8,21 +8,21 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "1.2.2.3";
-  sha256 = "1lxnrd2972yj3a56kz9giz15h2g9qh12pgylpsxhpvscf3xajwml";
+  version = "1.2.2.4";
+  sha256 = "1dpd175kd1yda2fs8zzs00j8nhdvzsgqywkkh934qz7zr7p1rawl";
   buildDepends = [
-    async base64Bytestring byteable conduit cryptohash
+    async base64Bytestring byteable conduit conduitExtra cryptohash
     cryptohashConduit dataDefault fileEmbed filepath hjsmin httpTypes
     mimeTypes resourcet shakespeareCss systemFileio systemFilepath text
     transformers unixCompat unorderedContainers wai waiAppStatic
     yesodCore
   ];
   testDepends = [
-    async base64Bytestring byteable conduit cryptohash
+    async base64Bytestring byteable conduit conduitExtra cryptohash
     cryptohashConduit dataDefault fileEmbed filepath hjsmin hspec
-    httpTypes HUnit mimeTypes processConduit resourcet shakespeareCss
-    systemFileio systemFilepath text transformers unixCompat
-    unorderedContainers wai waiAppStatic waiTest yesodCore yesodTest
+    httpTypes HUnit mimeTypes resourcet shakespeareCss systemFileio
+    systemFilepath text transformers unixCompat unorderedContainers wai
+    waiAppStatic waiTest yesodCore yesodTest
   ];
   doCheck = false;
   meta = {
-- 
GitLab


From 6c72ef973cefd19d65fb673ed9e10995af950a54 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:27 +0200
Subject: [PATCH 2803/3789] haskell-yesod-test: update to version 1.2.1.2

---
 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 38a319a8745..9a9cdc4e295 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.1";
-  sha256 = "0rbavw67cfqyav6xakacag0sd0gixbz3sls06px6q6pnpzk9q9d4";
+  version = "1.2.1.2";
+  sha256 = "12b747sd5rrypv1i2b5rpa3qgpnzibwjw7rlv02hyz8g7kf6wvbm";
   buildDepends = [
     attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
     cookie hspec htmlConduit httpTypes HUnit monadControl network
-- 
GitLab


From a5c678110bd2b878fa681908f0fa0e193490e7af Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:07:29 +0200
Subject: [PATCH 2804/3789] haskell-yesod: update to version 1.2.5.2

---
 .../libraries/haskell/yesod/default.nix       | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 21efff9f0e0..a3416cf59c6 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -1,19 +1,20 @@
-{ cabal, aeson, blazeHtml, blazeMarkup, dataDefault, fastLogger
-, hamlet, monadControl, monadLogger, networkConduit, safe
-, shakespeareCss, shakespeareJs, text, transformers
-, unorderedContainers, wai, waiExtra, warp, yaml, yesodAuth
-, yesodCore, yesodForm, yesodPersistent
+{ cabal, aeson, blazeHtml, blazeMarkup, conduitExtra, dataDefault
+, fastLogger, hamlet, monadControl, monadLogger, networkConduit
+, safe, shakespeare, shakespeareCss, shakespeareJs, text
+, transformers, unorderedContainers, wai, waiExtra, warp, yaml
+, yesodAuth, yesodCore, yesodForm, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.2.5.1";
-  sha256 = "1q4fnhvc5kl17z5hkbwa35rqp68nflmayszxj1v65gvplagv5cxn";
+  version = "1.2.5.2";
+  sha256 = "0vvpzyfwzgnnd8h60pqz5z1474isp487p43vx7cyzhj423c50p6r";
   buildDepends = [
-    aeson blazeHtml blazeMarkup dataDefault fastLogger hamlet
-    monadControl monadLogger networkConduit safe shakespeareCss
-    shakespeareJs text transformers unorderedContainers wai waiExtra
-    warp yaml yesodAuth yesodCore yesodForm yesodPersistent
+    aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger
+    hamlet monadControl monadLogger networkConduit safe shakespeare
+    shakespeareCss shakespeareJs text transformers unorderedContainers
+    wai waiExtra warp yaml yesodAuth yesodCore yesodForm
+    yesodPersistent
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
-- 
GitLab


From 0a150f97c8c26df1ae95c2325c6d0df0c51de4a0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:51:46 +0200
Subject: [PATCH 2805/3789] haskell-conduit-extra: this package doesn't contain
 any modules, so we cannot have documentation

Apparently, Michael Snoyman made all his code depend on an empty package
just in case it turns out that the extra dependency might come in useful
in the future. Go figure.
---
 pkgs/development/libraries/haskell/conduit-extra/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix
index fe90468255a..82ab990947d 100644
--- a/pkgs/development/libraries/haskell/conduit-extra/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix
@@ -4,6 +4,7 @@ cabal.mkDerivation (self: {
   pname = "conduit-extra";
   version = "1.0.0";
   sha256 = "120c3zay8svdw3b9nqgxlrj45a1d4xf0sijkg367m7hp22szvz8a";
+  noHaddock = true;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Temporary placeholder package";
-- 
GitLab


From d10dea86e463bde58fea0f10100bfc222285c5f6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Mar 2014 11:19:58 +0200
Subject: [PATCH 2806/3789] haskell-bytestring-lexing: update to version
 0.4.3.2

---
 .../libraries/haskell/bytestring-lexing/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
index 8c4f2af654e..9a013c9f245 100644
--- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bytestring-lexing";
-  version = "0.4.3.1";
-  sha256 = "1n0sk1xqwkj4whp0gav7hwr33xqmwl3ylqfnqix8wbwz6xpg9ygn";
+  version = "0.4.3.2";
+  sha256 = "09ymg1n21668wn4harxg0cqlz98fz990bangpy99w2z7d6cwbc05";
   buildTools = [ alex ];
   meta = {
     homepage = "http://code.haskell.org/~wren/";
-- 
GitLab


From 2ec626f196b7354b14b27ff0b7256dc8f9f0665f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Mar 2014 11:20:00 +0200
Subject: [PATCH 2807/3789] haskell-digestive-functors: update to version
 0.7.1.0

---
 .../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 4abea9429a5..d0bd50e584b 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.0.0";
-  sha256 = "1zn8vn6xcmp4w39b0k33bp7zsxvnn8g8p26mch4r8ng9ldcb2y8h";
+  version = "0.7.1.0";
+  sha256 = "0ry0ircxs6ml4wdz6hrn3jnyhniwdnn1dn21imq3kv68jlhfn3by";
   buildDepends = [ mtl text time ];
   testDepends = [
     HUnit mtl QuickCheck testFramework testFrameworkHunit
-- 
GitLab


From e4ee9e3f8f2d7df3ed7e74588594d326e1f73e2b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Mar 2014 11:20:01 +0200
Subject: [PATCH 2808/3789] haskell-hastache: update to version 0.6.0

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

diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix
index c864c7e0a5f..20fc429fc63 100644
--- a/pkgs/development/libraries/haskell/hastache/default.nix
+++ b/pkgs/development/libraries/haskell/hastache/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hastache";
-  version = "0.5.1";
-  sha256 = "05lm7mjzc1hamxcj8akq06081bhp907hrjdkhas3wzm6ran6rwn3";
+  version = "0.6.0";
+  sha256 = "1z609mhsc875ba3k6mlmlqpmqlwgxpav2asnf83yzq1q7bfs0cxh";
   buildDepends = [
     blazeBuilder filepath ieee754 mtl syb text transformers utf8String
   ];
-- 
GitLab


From 0560805bdf4f399b42b3922731eda5432d1b2cca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Mar 2014 11:20:03 +0200
Subject: [PATCH 2809/3789] haskell-process-conduit: update to version 1.0.0.2

---
 .../libraries/haskell/process-conduit/default.nix      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/process-conduit/default.nix b/pkgs/development/libraries/haskell/process-conduit/default.nix
index 45ac4495166..6148b9b508b 100644
--- a/pkgs/development/libraries/haskell/process-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/process-conduit/default.nix
@@ -1,13 +1,13 @@
-{ cabal, conduit, controlMonadLoop, hspec, mtl, shakespeareText
-, text
+{ cabal, conduit, controlMonadLoop, hspec, mtl, shakespeare
+, shakespeareText, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "process-conduit";
-  version = "1.0.0.1";
-  sha256 = "1b1bya316gxj3rgn7qpjmmcllgy9aac69rqw664sw1rnypnic780";
+  version = "1.0.0.2";
+  sha256 = "0rz18x7gy8w1h2xq0il49k515n0y3gpxnl7mfgkczc86965w7fzj";
   buildDepends = [
-    conduit controlMonadLoop mtl shakespeareText text
+    conduit controlMonadLoop mtl shakespeare shakespeareText text
   ];
   testDepends = [ conduit hspec ];
   meta = {
-- 
GitLab


From d46048907e4f2e736e9bc6947fecb80693439dc9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Mar 2014 11:20:05 +0200
Subject: [PATCH 2810/3789] haskell-smtps-gmail: update to version 1.1.0

---
 .../libraries/haskell/smtps-gmail/default.nix      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/smtps-gmail/default.nix b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
index d41a37d1e5b..a61daf6de25 100644
--- a/pkgs/development/libraries/haskell/smtps-gmail/default.nix
+++ b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
@@ -1,18 +1,18 @@
-{ cabal, base64String, cprngAes, network, tlsExtra, utf8String
+{ cabal, base64Bytestring, cprngAes, dataDefault, filepath
+, mimeMail, network, stringsearch, text, tls
 }:
 
 cabal.mkDerivation (self: {
   pname = "smtps-gmail";
-  version = "1.0.0";
-  sha256 = "0kv5m8rg5z1iic10av3bscdygnph1iab4b22sq3hmx6a93abqkc2";
-  isLibrary = true;
-  isExecutable = true;
+  version = "1.1.0";
+  sha256 = "0zr2ndpwfnb9pkv69vx94p0vpghl0khd0wbmccjpk6hlrp6fsj66";
   buildDepends = [
-    base64String cprngAes network tlsExtra utf8String
+    base64Bytestring cprngAes dataDefault filepath mimeMail network
+    stringsearch text tls
   ];
   meta = {
     homepage = "https://github.com/enzoh/smtps-gmail";
-    description = "Gmail API";
+    description = "Gmail SMTP Client";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From dd6092c5e543f437310495cce5c5b12e63ddd0dc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Mar 2014 11:20:07 +0200
Subject: [PATCH 2811/3789] haskell-stm-chans: update to version 3.0.0.2

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

diff --git a/pkgs/development/libraries/haskell/stm-chans/default.nix b/pkgs/development/libraries/haskell/stm-chans/default.nix
index e8bd79a9a80..2b8c9d1080a 100644
--- a/pkgs/development/libraries/haskell/stm-chans/default.nix
+++ b/pkgs/development/libraries/haskell/stm-chans/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stm-chans";
-  version = "3.0.0";
-  sha256 = "1nnl5h88dshcmk0ydhkf84kkf6989igxry9r0z7lwlxfgf7q9nim";
+  version = "3.0.0.2";
+  sha256 = "1zsa092yjxsdq8nm2yqagdfpip3i3ff3xdwvys99ns7ridxbyynh";
   buildDepends = [ stm ];
   meta = {
     homepage = "http://code.haskell.org/~wren/";
-- 
GitLab


From 1cd1c489a83d877ee276f67b8f904bfc0b6641a2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Mar 2014 11:20:09 +0200
Subject: [PATCH 2812/3789] haskell-type-level-natural-number: update to
 version 2.0

---
 .../libraries/haskell/type-level-natural-number/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix
index 8dff0ffd58f..62690186ee8 100644
--- a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix
+++ b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix
@@ -2,10 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "type-level-natural-number";
-  version = "1.1.1";
-  sha256 = "1zc26nckpcixxp1m818jhzi3dj1ysnjfc2xliq4rpmf5583k6mjw";
+  version = "2.0";
+  sha256 = "17zgm5ys1z61kxxczz3bzi9m3c48py6pvyx3cqk3xlh1w7n58ryk";
   meta = {
-    description = "Simple, Haskell 2010-compatible type level natural numbers";
+    description = "Simple type level natural numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 80fd70f759a18b6ec59df832d57dd620b8a6a41c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Mar 2014 11:20:11 +0200
Subject: [PATCH 2813/3789] haskell-xss-sanitize: update to version 0.3.5.2

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

diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
index e92d761edcb..31f7a06c1fe 100644
--- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix
+++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xss-sanitize";
-  version = "0.3.5";
-  sha256 = "13iggcivpvzlzlx0n1pb6lyw55lc7d7hzihf1llphq6lmdy6l49s";
+  version = "0.3.5.2";
+  sha256 = "1lkawsing0x776078qi1565aj1nr4smxhql1xzfw0bjihbgs1d6b";
   buildDepends = [
     attoparsec cssText network tagsoup text utf8String
   ];
-- 
GitLab


From 68409a09819b9d7855e4e39dc05e646176a4c606 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Mar 2014 11:20:12 +0200
Subject: [PATCH 2814/3789] haskell-cake3: update to version 0.4.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 dd4e78cf70a..c5c35ac571c 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.3.0.1";
-  sha256 = "0s91kgfh6y14m60na7bsr41gzd573vra5c0mgp1a3pzngsj0cvhm";
+  version = "0.4.0.0";
+  sha256 = "15v50m60fr2mgfm2irxfaw4pi2s3bx187p0y0ns20rqfy0dasxyx";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From db21a0da9770cc887271615f6ddf8b063d043dd9 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sun, 30 Mar 2014 21:53:39 -0430
Subject: [PATCH 2815/3789] pakcs: update hash for 1.11.3 release, which was
 updated without a version change.

---
 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 a3b80c02545..37acb4f6d1f 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 = "006bq6cmycq2f4xb3zmnmxyngj64hppk3a083hy0qzj7gl77zvfw";
+    sha256 = "165f29zgb7ldl51zfwgc31fk6a67w0gznp5lhvb6i5m013g2ddi8";
   };
 
 in
-- 
GitLab


From 5d68efd2308f3256acfe90b25e4f89268343e304 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sun, 30 Mar 2014 21:54:43 -0430
Subject: [PATCH 2816/3789] aldor: update to 1.2.0 version in development.

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

diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix
index 57d1bf74154..ddf16bc2219 100644
--- a/pkgs/development/compilers/aldor/default.nix
+++ b/pkgs/development/compilers/aldor/default.nix
@@ -2,12 +2,12 @@
 , autoconf, automake, libtool, openjdk, perl }:
 
 stdenv.mkDerivation {
-  name = "aldor-1.1.0";
+  name = "aldor-1.2.0";
 
   src = fetchgit {
     url = "https://github.com/pippijn/aldor";
-    sha256 = "14xv3jl15ib2knsdz0bd7jx64zg1qrr33q5zcr8gli860ps8gkg3";
-    rev = "f7b95835cf709654744441ddb1c515bfc2bec998";
+    sha256 = "1l9fc2cgwabifwbijcp293abc8hcv40nzx2w31jkxh8n0plbiczn";
+    rev = "15471e75f3d65b93150f414ebcaf59a03054b68d";
   };
 
   buildInputs = [ gmp which flex bison makeWrapper autoconf automake libtool
-- 
GitLab


From 61fb503eb7cf121f647a99e1c9c0b532ad75a14e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Mar 2014 22:46:41 +0200
Subject: [PATCH 2817/3789] haskell-http-types: jailbreak to fix build with
 recent case-insensitive

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

diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix
index ed24e1ede74..ab523e07cf2 100644
--- a/pkgs/development/libraries/haskell/http-types/default.nix
+++ b/pkgs/development/libraries/haskell/http-types/default.nix
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "02l1lhl2ajbm5f7zq363nlb21dpdg1m0qsy330arccmds7z9g7a2";
   buildDepends = [ blazeBuilder caseInsensitive text ];
   testDepends = [ blazeBuilder hspec QuickCheck text ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/aristidb/http-types";
     description = "Generic HTTP types for Haskell (for both client and server code)";
-- 
GitLab


From 69b53c990a710035759933a123bb84bcc5867191 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Mar 2014 23:10:08 +0200
Subject: [PATCH 2818/3789] structured-haskell-mode: re-generate with latest
 cabal2nix

---
 .../editors/emacs-modes/structured-haskell-mode/default.nix    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix
index 25055df8ea3..a832c7d5942 100644
--- a/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix
+++ b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix
@@ -11,13 +11,12 @@ cabal.mkDerivation (self: {
   postInstall = ''
     emacs -L elisp --batch -f batch-byte-compile "elisp/"*.el
     install -d $out/share/emacs/site-lisp
-    install "elisp/"*.elc $out/share/emacs/site-lisp
+    install "elisp/"*.el "elisp/"*.elc  $out/share/emacs/site-lisp
   '';
   meta = {
     homepage = "https://github.com/chrisdone/structured-haskell-mode";
     description = "Structured editing Emacs mode for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.pSub ];
   };
 })
-- 
GitLab


From e1c55a346a89d57059fd5cf3c4b932f615a3ea14 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Tue, 1 Apr 2014 00:04:00 +0200
Subject: [PATCH 2819/3789] ccid: Bump to 1.4.16.

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

diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index fdcd15a4b82..458111be400 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
 stdenv.mkDerivation rec {
-  version = "1.4.15";
+  version = "1.4.16";
   name = "ccid-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/c/ccid/ccid_${version}.orig.tar.bz2";
-    sha256 = "02lrdmqlw2ilbmgcpi2h7w741p025c10frxdn5w3wnzi8qi1hdjl";
+    sha256 = "0a0e6aa38863c79e38673c085254fa94fd0aa040b9622304a8d6d4222b7e7ea0";
   };
 
   patchPhase = ''
-- 
GitLab


From 073eab850a1d9c45413b8ebfa3867399fc7a3bc8 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 1 Apr 2014 00:28:23 +0200
Subject: [PATCH 2820/3789] slasp: Add nodejs package + update other nodejs
 packages

---
 pkgs/top-level/node-packages-generated.nix | 715 ++++++++++++---------
 pkgs/top-level/node-packages.json          |   1 +
 2 files changed, 397 insertions(+), 319 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 12314c0ee16..d8f4f2078c7 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -246,7 +246,7 @@
     ];
     passthru.names = [ "adm-zip" ];
   };
-  by-spec."adm-zip"."~0.4.3" =
+  by-spec."adm-zip"."^0.4.3" =
     self.by-version."adm-zip"."0.4.4";
   by-version."adm-zip"."0.4.4" = lib.makeOverridable self.buildNodePackage {
     name = "node-adm-zip-0.4.4";
@@ -265,6 +265,8 @@
     ];
     passthru.names = [ "adm-zip" ];
   };
+  by-spec."adm-zip"."~0.4.3" =
+    self.by-version."adm-zip"."0.4.4";
   by-spec."almond"."*" =
     self.by-version."almond"."0.2.9";
   by-version."almond"."0.2.9" = lib.makeOverridable self.buildNodePackage {
@@ -765,14 +767,14 @@
     passthru.names = [ "astw" ];
   };
   by-spec."async"."*" =
-    self.by-version."async"."0.2.10";
-  by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage {
-    name = "node-async-0.2.10";
+    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.2.10.tgz";
-        name = "async-0.2.10.tgz";
-        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+        url = "http://registry.npmjs.org/async/-/async-0.6.2.tgz";
+        name = "async-0.6.2.tgz";
+        sha1 = "41fd038a3812c0a8bc1842ecf08ba63eb0392bef";
       })
     ];
     buildInputs =
@@ -783,7 +785,7 @@
     ];
     passthru.names = [ "async" ];
   };
-  "async" = self.by-version."async"."0.2.10";
+  "async" = self.by-version."async"."0.6.2";
   by-spec."async"."0.1.15" =
     self.by-version."async"."0.1.15";
   by-version."async"."0.1.15" = lib.makeOverridable self.buildNodePackage {
@@ -845,6 +847,23 @@
   };
   by-spec."async"."0.2.x" =
     self.by-version."async"."0.2.10";
+  by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage {
+    name = "node-async-0.2.10";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
+        name = "async-0.2.10.tgz";
+        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
   by-spec."async"."^0.2.10" =
     self.by-version."async"."0.2.10";
   by-spec."async"."~0.1.22" =
@@ -1880,14 +1899,14 @@
     passthru.names = [ "buffers" ];
   };
   by-spec."buffertools"."*" =
-    self.by-version."buffertools"."2.1.1";
-  by-version."buffertools"."2.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-buffertools-2.1.1";
+    self.by-version."buffertools"."2.1.2";
+  by-version."buffertools"."2.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-buffertools-2.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/buffertools/-/buffertools-2.1.1.tgz";
-        name = "buffertools-2.1.1.tgz";
-        sha1 = "10d54433f27ef419e845338a3c6bc6dd2c1f311c";
+        url = "http://registry.npmjs.org/buffertools/-/buffertools-2.1.2.tgz";
+        name = "buffertools-2.1.2.tgz";
+        sha1 = "d667afc1ef8b9932e90a25f2e3a66a929d42daab";
       })
     ];
     buildInputs =
@@ -1898,7 +1917,7 @@
     ];
     passthru.names = [ "buffertools" ];
   };
-  "buffertools" = self.by-version."buffertools"."2.1.1";
+  "buffertools" = self.by-version."buffertools"."2.1.2";
   by-spec."buffertools".">=1.1.1 <2.0.0" =
     self.by-version."buffertools"."1.1.1";
   by-version."buffertools"."1.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -2392,14 +2411,14 @@
     passthru.names = [ "class-extend" ];
   };
   by-spec."clean-css"."2.1.x" =
-    self.by-version."clean-css"."2.1.7";
-  by-version."clean-css"."2.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "clean-css-2.1.7";
+    self.by-version."clean-css"."2.1.8";
+  by-version."clean-css"."2.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "clean-css-2.1.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.7.tgz";
-        name = "clean-css-2.1.7.tgz";
-        sha1 = "beef4e12945c2f8c1ec6101cf0275a38fdf43c65";
+        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.8.tgz";
+        name = "clean-css-2.1.8.tgz";
+        sha1 = "2b4b2fd60f32441096216ae25a21faa74580dc83";
       })
     ];
     buildInputs =
@@ -2412,7 +2431,7 @@
     passthru.names = [ "clean-css" ];
   };
   by-spec."clean-css"."~2.1.0" =
-    self.by-version."clean-css"."2.1.7";
+    self.by-version."clean-css"."2.1.8";
   by-spec."cli"."0.4.x" =
     self.by-version."cli"."0.4.5";
   by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage {
@@ -3049,7 +3068,7 @@
     deps = [
       self.by-version."inherits"."2.0.1"
       self.by-version."typedarray"."0.0.5"
-      self.by-version."readable-stream"."1.1.11"
+      self.by-version."readable-stream"."1.1.12"
     ];
     peerDependencies = [
     ];
@@ -3174,7 +3193,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.7.4"
+      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"
@@ -3208,7 +3227,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.7.4"
+      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"
@@ -3251,7 +3270,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.7.4"
+      self.by-version."debug"."0.8.0"
       self.by-version."raw-body"."1.1.3"
       self.by-version."multiparty"."2.2.0"
     ];
@@ -3280,7 +3299,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.7.4"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -3309,7 +3328,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.7.4"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -3338,7 +3357,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.7.4"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -3377,7 +3396,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.7.4"
+      self.by-version."debug"."0.8.0"
       self.by-version."raw-body"."1.1.3"
       self.by-version."multiparty"."2.2.0"
     ];
@@ -3482,7 +3501,7 @@
     buildInputs =
       (self.nativeDeps."connect-timeout" or []);
     deps = [
-      self.by-version."debug"."0.7.4"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -3856,15 +3875,15 @@
     ];
     passthru.names = [ "cookies" ];
   };
-  by-spec."copy-paste"."~0.1.0" =
-    self.by-version."copy-paste"."0.1.0";
-  by-version."copy-paste"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-copy-paste-0.1.0";
+  by-spec."copy-paste"."~0.2.0" =
+    self.by-version."copy-paste"."0.2.0";
+  by-version."copy-paste"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-copy-paste-0.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/copy-paste/-/copy-paste-0.1.0.tgz";
-        name = "copy-paste-0.1.0.tgz";
-        sha1 = "d748638a4eccfa83af064eeb4bfc625cb300d28c";
+        url = "http://registry.npmjs.org/copy-paste/-/copy-paste-0.2.0.tgz";
+        name = "copy-paste-0.2.0.tgz";
+        sha1 = "6a83a3a073fc144adfa83cd03adb8db35953c424";
       })
     ];
     buildInputs =
@@ -4288,14 +4307,14 @@
     passthru.names = [ "dateformat" ];
   };
   by-spec."debug"."*" =
-    self.by-version."debug"."0.7.4";
-  by-version."debug"."0.7.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-debug-0.7.4";
+    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.7.4.tgz";
-        name = "debug-0.7.4.tgz";
-        sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
+        url = "http://registry.npmjs.org/debug/-/debug-0.8.0.tgz";
+        name = "debug-0.8.0.tgz";
+        sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
       })
     ];
     buildInputs =
@@ -4327,42 +4346,40 @@
   };
   by-spec."debug"."0.7.4" =
     self.by-version."debug"."0.7.4";
-  by-spec."debug".">= 0.7.3 < 1" =
-    self.by-version."debug"."0.7.4";
-  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."debuglog"."0.0.2" =
-    self.by-version."debuglog"."0.0.2";
-  by-version."debuglog"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-debuglog-0.0.2";
+  by-version."debug"."0.7.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-debug-0.7.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/debuglog/-/debuglog-0.0.2.tgz";
-        name = "debuglog-0.0.2.tgz";
-        sha1 = "6c0dcf07e2c3f74524629b741668bd46c7b362eb";
+        url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
+        name = "debug-0.7.4.tgz";
+        sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
       })
     ];
     buildInputs =
-      (self.nativeDeps."debuglog" or []);
+      (self.nativeDeps."debug" or []);
     deps = [
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "debuglog" ];
+    passthru.names = [ "debug" ];
   };
-  by-spec."decompress"."~0.1.5" =
-    self.by-version."decompress"."0.1.8";
-  by-version."decompress"."0.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-decompress-0.1.8";
+  by-spec."debug".">= 0.7.3 < 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.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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/decompress/-/decompress-0.1.8.tgz";
-        name = "decompress-0.1.8.tgz";
-        sha1 = "5a8b5caa9ca5dd50112320383f8f047d5823d6e9";
+        url = "http://registry.npmjs.org/decompress/-/decompress-0.2.0.tgz";
+        name = "decompress-0.2.0.tgz";
+        sha1 = "548f7d789181afe2378ddff1db18784ffa181410";
       })
     ];
     buildInputs =
@@ -4370,11 +4387,11 @@
     deps = [
       self.by-version."adm-zip"."0.4.4"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."mout"."0.9.0"
       self.by-version."rimraf"."2.2.6"
-      self.by-version."stream-combiner"."0.0.4"
+      self.by-version."stream-combiner"."0.0.2"
       self.by-version."tar"."0.1.19"
       self.by-version."tempfile"."0.1.3"
+      self.by-version."map-key"."0.1.0"
     ];
     peerDependencies = [
     ];
@@ -4398,7 +4415,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.11"
+      self.by-version."readable-stream"."1.1.12"
       self.by-version."nopt"."2.2.0"
     ];
     peerDependencies = [
@@ -4888,23 +4905,23 @@
     passthru.names = [ "domutils" ];
   };
   by-spec."download"."~0.1.6" =
-    self.by-version."download"."0.1.10";
-  by-version."download"."0.1.10" = lib.makeOverridable self.buildNodePackage {
-    name = "node-download-0.1.10";
+    self.by-version."download"."0.1.12";
+  by-version."download"."0.1.12" = lib.makeOverridable self.buildNodePackage {
+    name = "node-download-0.1.12";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/download/-/download-0.1.10.tgz";
-        name = "download-0.1.10.tgz";
-        sha1 = "732065fc96259abd47543c2711467bcf7ed66af5";
+        url = "http://registry.npmjs.org/download/-/download-0.1.12.tgz";
+        name = "download-0.1.12.tgz";
+        sha1 = "ff596658f301c340a292ac0ac1972790084568ad";
       })
     ];
     buildInputs =
       (self.nativeDeps."download" or []);
     deps = [
-      self.by-version."decompress"."0.1.8"
+      self.by-version."decompress"."0.2.0"
       self.by-version."each-async"."0.1.2"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."request"."2.31.0"
+      self.by-version."request"."2.34.0"
       self.by-version."through2"."0.4.1"
     ];
     peerDependencies = [
@@ -4951,6 +4968,25 @@
     ];
     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 {
@@ -5164,15 +5200,15 @@
   "escape-html" = self.by-version."escape-html"."1.0.1";
   by-spec."escape-html"."1.0.1" =
     self.by-version."escape-html"."1.0.1";
-  by-spec."escodegen"."1.2.x" =
-    self.by-version."escodegen"."1.2.0";
-  by-version."escodegen"."1.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "escodegen-1.2.0";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.2.0.tgz";
-        name = "escodegen-1.2.0.tgz";
-        sha1 = "09de7967791cc958b7f89a2ddb6d23451af327e1";
+        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.0.tgz";
+        name = "escodegen-1.3.0.tgz";
+        sha1 = "9d7b4aa74aa32f300474381c098f930eb1e9973a";
       })
     ];
     buildInputs =
@@ -5300,7 +5336,26 @@
     ];
     passthru.names = [ "esmangle" ];
   };
-  by-spec."esprima"."1.0.x" =
+  by-spec."esprima"."1.1.x" =
+    self.by-version."esprima"."1.1.1";
+  by-version."esprima"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "esprima-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
+        name = "esprima-1.1.1.tgz";
+        sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."esprima" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "esprima" ];
+  };
+  by-spec."esprima"."~ 1.0.2" =
     self.by-version."esprima"."1.0.4";
   by-version."esprima"."1.0.4" = lib.makeOverridable self.buildNodePackage {
     name = "esprima-1.0.4";
@@ -5319,8 +5374,6 @@
     ];
     passthru.names = [ "esprima" ];
   };
-  by-spec."esprima"."~ 1.0.2" =
-    self.by-version."esprima"."1.0.4";
   by-spec."esprima"."~1.0.2" =
     self.by-version."esprima"."1.0.4";
   by-spec."esprima"."~1.0.4" =
@@ -5624,7 +5677,7 @@
       self.by-version."request"."2.9.203"
       self.by-version."connect"."2.3.9"
       self.by-version."openid"."0.5.5"
-      self.by-version."xml2js"."0.4.1"
+      self.by-version."xml2js"."0.4.2"
       self.by-version."node-swt"."0.1.1"
       self.by-version."node-wsfederation"."0.1.1"
       self.by-version."debug"."0.5.0"
@@ -5705,7 +5758,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.7.4"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -5759,7 +5812,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.7.4"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -5789,7 +5842,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.7.4"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -5820,7 +5873,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.7.4"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -5850,7 +5903,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.7.4"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -5881,7 +5934,7 @@
       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.7.4"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -6666,7 +6719,7 @@
     buildInputs =
       (self.nativeDeps."fs-walk" or []);
     deps = [
-      self.by-version."async"."0.2.10"
+      self.by-version."async"."0.6.2"
     ];
     peerDependencies = [
     ];
@@ -6925,14 +6978,14 @@
     passthru.names = [ "getobject" ];
   };
   by-spec."gh"."*" =
-    self.by-version."gh"."1.9.0";
-  by-version."gh"."1.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "gh-1.9.0";
+    self.by-version."gh"."1.9.1";
+  by-version."gh"."1.9.1" = lib.makeOverridable self.buildNodePackage {
+    name = "gh-1.9.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/gh/-/gh-1.9.0.tgz";
-        name = "gh-1.9.0.tgz";
-        sha1 = "a681f25314d2e69e4f2471fc4bf4378e9b0d8f3e";
+        url = "http://registry.npmjs.org/gh/-/gh-1.9.1.tgz";
+        name = "gh-1.9.1.tgz";
+        sha1 = "1862071cddc13cfd31545c64256ab731bb334194";
       })
     ];
     buildInputs =
@@ -6941,12 +6994,12 @@
       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."copy-paste"."0.1.0"
       self.by-version."github"."0.1.15"
-      self.by-version."handlebars"."1.0.11"
-      self.by-version."inquirer"."0.3.5"
-      self.by-version."moment"."2.4.0"
-      self.by-version."nopt"."2.1.2"
+      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."truncate"."1.0.2"
       self.by-version."update-notifier"."0.1.8"
@@ -6958,8 +7011,8 @@
     ];
     passthru.names = [ "gh" ];
   };
-  "gh" = self.by-version."gh"."1.9.0";
-  by-spec."github"."~0.1.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";
@@ -7340,7 +7393,7 @@
       (self.nativeDeps."grunt-contrib-cssmin" or []);
     deps = [
       self.by-version."chalk"."0.4.0"
-      self.by-version."clean-css"."2.1.7"
+      self.by-version."clean-css"."2.1.8"
       self.by-version."maxmin"."0.1.0"
     ];
     peerDependencies = [
@@ -7462,7 +7515,7 @@
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.4"
-      self.by-version."karma"."0.12.1"
+      self.by-version."karma"."0.12.2"
     ];
     passthru.names = [ "grunt-karma" ];
   };
@@ -7532,7 +7585,7 @@
       self.by-version."coffee-script"."1.7.1"
       self.by-version."jade"."1.3.0"
       self.by-version."q"."2.0.1"
-      self.by-version."xml2js"."0.4.1"
+      self.by-version."xml2js"."0.4.2"
       self.by-version."msgpack"."0.2.2"
     ];
     peerDependencies = [
@@ -7582,28 +7635,7 @@
     passthru.names = [ "gzippo" ];
   };
   "gzippo" = self.by-version."gzippo"."0.2.0";
-  by-spec."handlebars"."1.0.11" =
-    self.by-version."handlebars"."1.0.11";
-  by-version."handlebars"."1.0.11" = lib.makeOverridable self.buildNodePackage {
-    name = "handlebars-1.0.11";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/handlebars/-/handlebars-1.0.11.tgz";
-        name = "handlebars-1.0.11.tgz";
-        sha1 = "28b8af8b1f3658ef377e621e0d6b07078fc450a9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."handlebars" or []);
-    deps = [
-      self.by-version."optimist"."0.3.7"
-      self.by-version."uglify-js"."1.2.6"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "handlebars" ];
-  };
-  by-spec."handlebars"."1.3.x" =
+  by-spec."handlebars"."1.3.0" =
     self.by-version."handlebars"."1.3.0";
   by-version."handlebars"."1.3.0" = lib.makeOverridable self.buildNodePackage {
     name = "handlebars-1.3.0";
@@ -7624,6 +7656,8 @@
     ];
     passthru.names = [ "handlebars" ];
   };
+  by-spec."handlebars"."1.3.x" =
+    self.by-version."handlebars"."1.3.0";
   by-spec."handlebars"."~1.0.11" =
     self.by-version."handlebars"."1.0.12";
   by-version."handlebars"."1.0.12" = lib.makeOverridable self.buildNodePackage {
@@ -7977,7 +8011,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.11"
+      self.by-version."readable-stream"."1.1.12"
     ];
     peerDependencies = [
     ];
@@ -8209,7 +8243,7 @@
     deps = [
       self.by-version."lodash"."2.4.1"
       self.by-version."coffee-script-redux"."2.0.0-beta8"
-      self.by-version."istanbul"."0.2.6"
+      self.by-version."istanbul"."0.2.7"
       self.by-version."estraverse"."1.5.0"
       self.by-version."escodegen"."1.1.0"
       self.by-version."which"."1.0.5"
@@ -8321,6 +8355,8 @@
   };
   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" =
@@ -8419,8 +8455,6 @@
   };
   by-spec."inquirer"."~0.3.1" =
     self.by-version."inquirer"."0.3.5";
-  by-spec."inquirer"."~0.3.4" =
-    self.by-version."inquirer"."0.3.5";
   by-spec."inquirer"."~0.4.0" =
     self.by-version."inquirer"."0.4.1";
   by-version."inquirer"."0.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -8446,6 +8480,8 @@
     ];
     passthru.names = [ "inquirer" ];
   };
+  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 {
@@ -8533,7 +8569,7 @@
       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.2.10"
+      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."passport"."0.2.0"
@@ -8589,6 +8625,25 @@
     ];
     passthru.names = [ "is-root" ];
   };
+  by-spec."isarray"."0.0.1" =
+    self.by-version."isarray"."0.0.1";
+  by-version."isarray"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-isarray-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+        name = "isarray-0.0.1.tgz";
+        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."isarray" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "isarray" ];
+  };
   by-spec."isbinaryfile"."~0.1.8" =
     self.by-version."isbinaryfile"."0.1.9";
   by-version."isbinaryfile"."0.1.9" = lib.makeOverridable self.buildNodePackage {
@@ -8630,21 +8685,21 @@
     passthru.names = [ "isbinaryfile" ];
   };
   by-spec."istanbul"."*" =
-    self.by-version."istanbul"."0.2.6";
-  by-version."istanbul"."0.2.6" = lib.makeOverridable self.buildNodePackage {
-    name = "istanbul-0.2.6";
+    self.by-version."istanbul"."0.2.7";
+  by-version."istanbul"."0.2.7" = lib.makeOverridable self.buildNodePackage {
+    name = "istanbul-0.2.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.6.tgz";
-        name = "istanbul-0.2.6.tgz";
-        sha1 = "2c56f1c715aa47fc67eed291123adef8bc45e6a1";
+        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.7.tgz";
+        name = "istanbul-0.2.7.tgz";
+        sha1 = "bb482e1d06a0fea00993a10b2ee266fc740642bc";
       })
     ];
     buildInputs =
       (self.nativeDeps."istanbul" or []);
     deps = [
-      self.by-version."esprima"."1.0.4"
-      self.by-version."escodegen"."1.2.0"
+      self.by-version."esprima"."1.1.1"
+      self.by-version."escodegen"."1.3.0"
       self.by-version."handlebars"."1.3.0"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."nopt"."2.2.0"
@@ -8660,11 +8715,11 @@
     ];
     passthru.names = [ "istanbul" ];
   };
-  "istanbul" = self.by-version."istanbul"."0.2.6";
+  "istanbul" = self.by-version."istanbul"."0.2.7";
   by-spec."istanbul"."~0.2.3" =
-    self.by-version."istanbul"."0.2.6";
+    self.by-version."istanbul"."0.2.7";
   by-spec."istanbul"."~0.2.4" =
-    self.by-version."istanbul"."0.2.6";
+    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 {
@@ -9143,14 +9198,14 @@
     passthru.names = [ "junk" ];
   };
   by-spec."karma"."*" =
-    self.by-version."karma"."0.12.1";
-  by-version."karma"."0.12.1" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-0.12.1";
+    self.by-version."karma"."0.12.2";
+  by-version."karma"."0.12.2" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-0.12.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.12.1.tgz";
-        name = "karma-0.12.1.tgz";
-        sha1 = "7e785eea935174c8d53d9841f82380079d8c077b";
+        url = "http://registry.npmjs.org/karma/-/karma-0.12.2.tgz";
+        name = "karma-0.12.2.tgz";
+        sha1 = "9c145720fb088807b3af8de4c68a4c530e45c4de";
       })
     ];
     buildInputs =
@@ -9178,15 +9233,15 @@
     ];
     passthru.names = [ "karma" ];
   };
-  "karma" = self.by-version."karma"."0.12.1";
+  "karma" = self.by-version."karma"."0.12.2";
   by-spec."karma".">=0.11.11" =
-    self.by-version."karma"."0.12.1";
+    self.by-version."karma"."0.12.2";
   by-spec."karma".">=0.9" =
-    self.by-version."karma"."0.12.1";
+    self.by-version."karma"."0.12.2";
   by-spec."karma".">=0.9.3" =
-    self.by-version."karma"."0.12.1";
+    self.by-version."karma"."0.12.2";
   by-spec."karma"."~0.12.0" =
-    self.by-version."karma"."0.12.1";
+    self.by-version."karma"."0.12.2";
   by-spec."karma-chrome-launcher"."*" =
     self.by-version."karma-chrome-launcher"."0.1.2";
   by-version."karma-chrome-launcher"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -9203,7 +9258,7 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.1"
+      self.by-version."karma"."0.12.2"
     ];
     passthru.names = [ "karma-chrome-launcher" ];
   };
@@ -9222,12 +9277,12 @@
     buildInputs =
       (self.nativeDeps."karma-coverage" or []);
     deps = [
-      self.by-version."istanbul"."0.2.6"
+      self.by-version."istanbul"."0.2.7"
       self.by-version."ibrik"."1.1.1"
       self.by-version."dateformat"."1.0.7-1.2.3"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.1"
+      self.by-version."karma"."0.12.2"
     ];
     passthru.names = [ "karma-coverage" ];
   };
@@ -9249,7 +9304,7 @@
       self.by-version."xmlbuilder"."0.4.2"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.1"
+      self.by-version."karma"."0.12.2"
     ];
     passthru.names = [ "karma-junit-reporter" ];
   };
@@ -9270,7 +9325,7 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.1"
+      self.by-version."karma"."0.12.2"
       self.by-version."mocha"."1.18.2"
     ];
     passthru.names = [ "karma-mocha" ];
@@ -9292,7 +9347,7 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.1"
+      self.by-version."karma"."0.12.2"
       self.by-version."requirejs"."2.1.11"
     ];
     passthru.names = [ "karma-requirejs" ];
@@ -9312,13 +9367,13 @@
     buildInputs =
       (self.nativeDeps."karma-sauce-launcher" or []);
     deps = [
-      self.by-version."wd"."0.2.13"
-      self.by-version."sauce-connect-launcher"."0.3.2"
+      self.by-version."wd"."0.2.14"
+      self.by-version."sauce-connect-launcher"."0.3.3"
       self.by-version."q"."0.9.7"
       self.by-version."saucelabs"."0.1.1"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.1"
+      self.by-version."karma"."0.12.2"
     ];
     passthru.names = [ "karma-sauce-launcher" ];
   };
@@ -9606,7 +9661,7 @@
       self.by-version."mime"."1.2.11"
       self.by-version."request"."2.34.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."clean-css"."2.1.7"
+      self.by-version."clean-css"."2.1.8"
       self.by-version."source-map"."0.1.33"
     ];
     peerDependencies = [
@@ -10252,6 +10307,26 @@
     ];
     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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/map-key/-/map-key-0.1.0.tgz";
+        name = "map-key-0.1.0.tgz";
+        sha1 = "7ce8f677ba4051e23ddab5ce0d19c256cbf701fc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."map-key" or []);
+    deps = [
+      self.by-version."mout"."0.9.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "map-key" ];
+  };
   by-spec."maxmin"."^0.1.0" =
     self.by-version."maxmin"."0.1.0";
   by-version."maxmin"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -10722,6 +10797,8 @@
     self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."0.x.x" =
     self.by-version."mkdirp"."0.3.5";
+  by-spec."mkdirp"."^0.3.5" =
+    self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."~0.3.3" =
     self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."~0.3.4" =
@@ -10765,7 +10842,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.7.4"
+      self.by-version."debug"."0.8.0"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."glob"."3.2.3"
     ];
@@ -11150,6 +11227,25 @@
     ];
     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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mout/-/mout-0.9.0.tgz";
+        name = "mout-0.9.0.tgz";
+        sha1 = "4b6ef8cae5099151d9a7ddb6ebb9a56f9de6aaeb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mout" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mout" ];
+  };
   by-spec."mout"."~0.6.0" =
     self.by-version."mout"."0.6.0";
   by-version."mout"."0.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -11190,23 +11286,6 @@
   };
   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";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mout/-/mout-0.9.0.tgz";
-        name = "mout-0.9.0.tgz";
-        sha1 = "4b6ef8cae5099151d9a7ddb6ebb9a56f9de6aaeb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mout" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "mout" ];
-  };
   by-spec."mpath"."0.1.1" =
     self.by-version."mpath"."0.1.1";
   by-version."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -11339,7 +11418,7 @@
     buildInputs =
       (self.nativeDeps."multiparty" or []);
     deps = [
-      self.by-version."readable-stream"."1.1.11"
+      self.by-version."readable-stream"."1.1.12"
       self.by-version."stream-counter"."0.2.0"
     ];
     peerDependencies = [
@@ -11690,26 +11769,27 @@
     passthru.names = [ "nib" ];
   };
   by-spec."nijs"."*" =
-    self.by-version."nijs"."0.0.13";
-  by-version."nijs"."0.0.13" = lib.makeOverridable self.buildNodePackage {
-    name = "nijs-0.0.13";
+    self.by-version."nijs"."0.0.14";
+  by-version."nijs"."0.0.14" = lib.makeOverridable self.buildNodePackage {
+    name = "nijs-0.0.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nijs/-/nijs-0.0.13.tgz";
-        name = "nijs-0.0.13.tgz";
-        sha1 = "eba11ace22e3ff73a9dc526b2b955c2e04472572";
+        url = "http://registry.npmjs.org/nijs/-/nijs-0.0.14.tgz";
+        name = "nijs-0.0.14.tgz";
+        sha1 = "e4851865ee94567e33c7c7e6d7d92c031e8f1eab";
       })
     ];
     buildInputs =
       (self.nativeDeps."nijs" or []);
     deps = [
       self.by-version."optparse"."1.0.5"
+      self.by-version."slasp"."0.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "nijs" ];
   };
-  "nijs" = self.by-version."nijs"."0.0.13";
+  "nijs" = self.by-version."nijs"."0.0.14";
   by-spec."node-appc"."0.2.0" =
     self.by-version."node-appc"."0.2.0";
   by-version."node-appc"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -12000,7 +12080,7 @@
     buildInputs =
       (self.nativeDeps."node-wsfederation" or []);
     deps = [
-      self.by-version."xml2js"."0.4.1"
+      self.by-version."xml2js"."0.4.2"
     ];
     peerDependencies = [
     ];
@@ -12040,7 +12120,7 @@
       (self.nativeDeps."nodemailer" or []);
     deps = [
       self.by-version."mailcomposer"."0.2.8"
-      self.by-version."simplesmtp"."0.3.23"
+      self.by-version."simplesmtp"."0.3.24"
       self.by-version."optimist"."0.6.1"
     ];
     peerDependencies = [
@@ -12239,7 +12319,7 @@
       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.5"
+      self.by-version."npm-registry-client"."0.4.6"
       self.by-version."npm-user-validate"."0.0.3"
       self.by-version."npmconf"."0.1.13"
       self.by-version."npmlog"."0.0.6"
@@ -12318,14 +12398,14 @@
     passthru.names = [ "npm-registry-client" ];
   };
   by-spec."npm-registry-client"."~0.4.4" =
-    self.by-version."npm-registry-client"."0.4.5";
-  by-version."npm-registry-client"."0.4.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npm-registry-client-0.4.5";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.4.5.tgz";
-        name = "npm-registry-client-0.4.5.tgz";
-        sha1 = "7d6fdca46139470715f9477ddb5ad3e770d4de7b";
+        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";
       })
     ];
     buildInputs =
@@ -12346,7 +12426,7 @@
     passthru.names = [ "npm-registry-client" ];
   };
   by-spec."npm-registry-client"."~0.4.5" =
-    self.by-version."npm-registry-client"."0.4.5";
+    self.by-version."npm-registry-client"."0.4.6";
   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 {
@@ -14195,22 +14275,23 @@
     passthru.names = [ "readable-stream" ];
   };
   by-spec."readable-stream"."1.1" =
-    self.by-version."readable-stream"."1.1.11";
-  by-version."readable-stream"."1.1.11" = lib.makeOverridable self.buildNodePackage {
-    name = "node-readable-stream-1.1.11";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.11.tgz";
-        name = "readable-stream-1.1.11.tgz";
-        sha1 = "76ae0d88df2ac36c59e7c205e0cafc81c57bc07d";
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.12.tgz";
+        name = "readable-stream-1.1.12.tgz";
+        sha1 = "960d442bbf5f6690b6b20550413931021af8e506";
       })
     ];
     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."debuglog"."0.0.2"
+      self.by-version."inherits"."2.0.1"
     ];
     peerDependencies = [
     ];
@@ -14223,9 +14304,9 @@
   by-spec."readable-stream"."~1.0.24" =
     self.by-version."readable-stream"."1.0.26";
   by-spec."readable-stream"."~1.1.8" =
-    self.by-version."readable-stream"."1.1.11";
+    self.by-version."readable-stream"."1.1.12";
   by-spec."readable-stream"."~1.1.9" =
-    self.by-version."readable-stream"."1.1.11";
+    self.by-version."readable-stream"."1.1.12";
   by-spec."readdirp"."~0.2.3" =
     self.by-version."readdirp"."0.2.5";
   by-version."readdirp"."0.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -14648,37 +14729,6 @@
     ];
     passthru.names = [ "request" ];
   };
-  by-spec."request"."~2.31.0" =
-    self.by-version."request"."2.31.0";
-  by-version."request"."2.31.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-request-2.31.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.31.0.tgz";
-        name = "request-2.31.0.tgz";
-        sha1 = "4c8ac967c9a4b9410cb4ba1a61fdb644267eeeff";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request" or []);
-    deps = [
-      self.by-version."qs"."0.6.6"
-      self.by-version."json-stringify-safe"."5.0.0"
-      self.by-version."forever-agent"."0.5.2"
-      self.by-version."node-uuid"."1.4.1"
-      self.by-version."mime"."1.2.11"
-      self.by-version."tough-cookie"."0.9.15"
-      self.by-version."form-data"."0.1.2"
-      self.by-version."tunnel-agent"."0.3.0"
-      self.by-version."http-signature"."0.10.0"
-      self.by-version."oauth-sign"."0.3.0"
-      self.by-version."hawk"."1.0.0"
-      self.by-version."aws-sign2"."0.5.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "request" ];
-  };
   by-spec."request"."~2.33.0" =
     self.by-version."request"."2.33.0";
   by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage {
@@ -14710,6 +14760,8 @@
     ];
     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 {
@@ -15013,6 +15065,8 @@
   };
   by-spec."rimraf"."2.x.x" =
     self.by-version."rimraf"."2.2.6";
+  by-spec."rimraf"."^2.2.2" =
+    self.by-version."rimraf"."2.2.6";
   by-spec."rimraf"."~2" =
     self.by-version."rimraf"."2.2.6";
   by-spec."rimraf"."~2.0.2" =
@@ -15113,14 +15167,14 @@
   };
   "s3http" = self.by-version."s3http"."0.0.5";
   by-spec."sauce-connect-launcher"."~0.3.0" =
-    self.by-version."sauce-connect-launcher"."0.3.2";
-  by-version."sauce-connect-launcher"."0.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sauce-connect-launcher-0.3.2";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.3.2.tgz";
-        name = "sauce-connect-launcher-0.3.2.tgz";
-        sha1 = "bcae99571cf78d2e7b2d863eee28fa72f9c90846";
+        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";
       })
     ];
     buildInputs =
@@ -15193,14 +15247,14 @@
     passthru.names = [ "sax" ];
   };
   by-spec."selenium-webdriver"."*" =
-    self.by-version."selenium-webdriver"."2.40.0";
-  by-version."selenium-webdriver"."2.40.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-selenium-webdriver-2.40.0";
+    self.by-version."selenium-webdriver"."2.41.0";
+  by-version."selenium-webdriver"."2.41.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-selenium-webdriver-2.41.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.40.0.tgz";
-        name = "selenium-webdriver-2.40.0.tgz";
-        sha1 = "ca4603c08311ec3688d67e1c8e8263cb9c1c1450";
+        url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.41.0.tgz";
+        name = "selenium-webdriver-2.41.0.tgz";
+        sha1 = "d084dfbc73bdf33aedc7d731eaab028affad7f16";
       })
     ];
     buildInputs =
@@ -15211,7 +15265,7 @@
     ];
     passthru.names = [ "selenium-webdriver" ];
   };
-  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.40.0";
+  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.41.0";
   by-spec."semver"."*" =
     self.by-version."semver"."2.2.1";
   by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -15338,7 +15392,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.7.4"
+      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"
@@ -15361,7 +15415,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.7.4"
+      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"
@@ -15384,7 +15438,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.7.4"
+      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"
@@ -15407,7 +15461,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.7.4"
+      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"
@@ -15621,14 +15675,14 @@
     passthru.names = [ "shelljs" ];
   };
   by-spec."should"."*" =
-    self.by-version."should"."3.2.0-beta1";
-  by-version."should"."3.2.0-beta1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-should-3.2.0-beta1";
+    self.by-version."should"."3.2.0";
+  by-version."should"."3.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-should-3.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/should/-/should-3.2.0-beta1.tgz";
-        name = "should-3.2.0-beta1.tgz";
-        sha1 = "91481d7eb1a8c1329616a8544ccec05c6a47354c";
+        url = "http://registry.npmjs.org/should/-/should-3.2.0.tgz";
+        name = "should-3.2.0.tgz";
+        sha1 = "0dbbaec439c37eac010d4c0c2304815598be659f";
       })
     ];
     buildInputs =
@@ -15639,7 +15693,7 @@
     ];
     passthru.names = [ "should" ];
   };
-  "should" = self.by-version."should"."3.2.0-beta1";
+  "should" = self.by-version."should"."3.2.0";
   by-spec."sigmund"."~1.0.0" =
     self.by-version."sigmund"."1.0.0";
   by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -15702,14 +15756,14 @@
     passthru.names = [ "simple-lru-cache" ];
   };
   by-spec."simplesmtp".">= 0.1.22" =
-    self.by-version."simplesmtp"."0.3.23";
-  by-version."simplesmtp"."0.3.23" = lib.makeOverridable self.buildNodePackage {
-    name = "node-simplesmtp-0.3.23";
+    self.by-version."simplesmtp"."0.3.24";
+  by-version."simplesmtp"."0.3.24" = lib.makeOverridable self.buildNodePackage {
+    name = "node-simplesmtp-0.3.24";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.23.tgz";
-        name = "simplesmtp-0.3.23.tgz";
-        sha1 = "f452cb8f6dfa6cdd5bbdded5d6dc010493ff0c27";
+        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.24.tgz";
+        name = "simplesmtp-0.3.24.tgz";
+        sha1 = "7423226b0735a8dbf87c07c3888f33ba2135a0e7";
       })
     ];
     buildInputs =
@@ -15722,6 +15776,28 @@
     ];
     passthru.names = [ "simplesmtp" ];
   };
+  by-spec."slasp"."*" =
+    self.by-version."slasp"."0.0.3";
+  by-version."slasp"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-slasp-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/slasp/-/slasp-0.0.3.tgz";
+        name = "slasp-0.0.3.tgz";
+        sha1 = "fb9aba74f30fc2f012d0ff2d34d4b5c678c11f9f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."slasp" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "slasp" ];
+  };
+  "slasp" = self.by-version."slasp"."0.0.3";
+  by-spec."slasp"."0.0.3" =
+    self.by-version."slasp"."0.0.3";
   by-spec."sliced"."0.0.3" =
     self.by-version."sliced"."0.0.3";
   by-version."sliced"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -16302,6 +16378,26 @@
     ];
     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" =
     self.by-version."stream-combiner"."0.0.4";
   by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -16356,7 +16452,7 @@
     buildInputs =
       (self.nativeDeps."stream-counter" or []);
     deps = [
-      self.by-version."readable-stream"."1.1.11"
+      self.by-version."readable-stream"."1.1.12"
     ];
     peerDependencies = [
     ];
@@ -16533,7 +16629,7 @@
     deps = [
       self.by-version."css-parse"."1.7.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."debug"."0.7.4"
+      self.by-version."debug"."0.8.0"
       self.by-version."sax"."0.5.8"
       self.by-version."glob"."3.2.9"
     ];
@@ -16558,7 +16654,7 @@
     deps = [
       self.by-version."css-parse"."1.7.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."debug"."0.7.4"
+      self.by-version."debug"."0.8.0"
       self.by-version."sax"."0.5.8"
       self.by-version."glob"."3.2.9"
     ];
@@ -16859,9 +16955,9 @@
     ];
     passthru.names = [ "tar" ];
   };
-  by-spec."tar"."~0.1.17" =
+  by-spec."tar"."^0.1.18" =
     self.by-version."tar"."0.1.19";
-  by-spec."tar"."~0.1.18" =
+  by-spec."tar"."~0.1.17" =
     self.by-version."tar"."0.1.19";
   by-spec."tar"."~0.1.19" =
     self.by-version."tar"."0.1.19";
@@ -16931,7 +17027,7 @@
     self.by-version."temp"."0.6.0";
   by-spec."temp"."~0.7.0" =
     self.by-version."temp"."0.7.0";
-  by-spec."tempfile"."~0.1.2" =
+  by-spec."tempfile"."^0.1.2" =
     self.by-version."tempfile"."0.1.3";
   by-version."tempfile"."0.1.3" = lib.makeOverridable self.buildNodePackage {
     name = "node-tempfile-0.1.3";
@@ -17499,25 +17595,6 @@
     ];
     passthru.names = [ "uglify-js" ];
   };
-  by-spec."uglify-js"."~1.2" =
-    self.by-version."uglify-js"."1.2.6";
-  by-version."uglify-js"."1.2.6" = lib.makeOverridable self.buildNodePackage {
-    name = "uglify-js-1.2.6";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.6.tgz";
-        name = "uglify-js-1.2.6.tgz";
-        sha1 = "d354b2d3c1cf10ebc18fa78c11a28bdd9ce1580d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uglify-js" or []);
-    deps = [
-    ];
-    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 {
@@ -17827,7 +17904,7 @@
       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.5"
+      self.by-version."npm-registry-client"."0.4.6"
       self.by-version."npmconf"."0.1.13"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."less"."1.7.0"
@@ -18379,14 +18456,14 @@
     passthru.names = [ "watch" ];
   };
   by-spec."wd"."~0.2.12" =
-    self.by-version."wd"."0.2.13";
-  by-version."wd"."0.2.13" = lib.makeOverridable self.buildNodePackage {
-    name = "wd-0.2.13";
+    self.by-version."wd"."0.2.14";
+  by-version."wd"."0.2.14" = lib.makeOverridable self.buildNodePackage {
+    name = "wd-0.2.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wd/-/wd-0.2.13.tgz";
-        name = "wd-0.2.13.tgz";
-        sha1 = "12dd4a479d9c676a17a290b63da2acf41182e44f";
+        url = "http://registry.npmjs.org/wd/-/wd-0.2.14.tgz";
+        name = "wd-0.2.14.tgz";
+        sha1 = "834dfc756e03a68013ff3a3f62aea0cb1302f879";
       })
     ];
     buildInputs =
@@ -18868,14 +18945,14 @@
     passthru.names = [ "xml2js" ];
   };
   by-spec."xml2js".">= 0.0.1" =
-    self.by-version."xml2js"."0.4.1";
-  by-version."xml2js"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-xml2js-0.4.1";
+    self.by-version."xml2js"."0.4.2";
+  by-version."xml2js"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-xml2js-0.4.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.1.tgz";
-        name = "xml2js-0.4.1.tgz";
-        sha1 = "dee0630173a5c6ea62797f848615fd55c6bc6992";
+        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.2.tgz";
+        name = "xml2js-0.4.2.tgz";
+        sha1 = "93911c393c4a332a2dce1222801eb571453b2f90";
       })
     ];
     buildInputs =
@@ -18889,7 +18966,7 @@
     passthru.names = [ "xml2js" ];
   };
   by-spec."xml2js".">=0.1.7" =
-    self.by-version."xml2js"."0.4.1";
+    self.by-version."xml2js"."0.4.2";
   by-spec."xmlbuilder"."0.4.2" =
     self.by-version."xmlbuilder"."0.4.2";
   by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage {
@@ -19058,7 +19135,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.10"
+      self.by-version."download"."0.1.12"
       self.by-version."request"."2.27.0"
       self.by-version."file-utils"."0.1.5"
     ];
@@ -19098,7 +19175,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.10"
+      self.by-version."download"."0.1.12"
       self.by-version."request"."2.30.0"
       self.by-version."file-utils"."0.1.5"
       self.by-version."class-extend"."0.1.1"
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 25ce3121227..07adedb9a70 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -119,4 +119,5 @@
 , { "titanium": "3.2.1" }
 , "gh"
 , "deepmerge"
+, "slasp"
 ]
-- 
GitLab


From 2d4ce25b5b5183a5c7bfe839acf8a89a1e853ffd Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 31 Mar 2014 20:54:47 -0400
Subject: [PATCH 2821/3789] Add linux 3.14

---
 .../os-specific/linux/kernel/common-config.nix |  4 +++-
 pkgs/os-specific/linux/kernel/linux-3.14.nix   | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                | 12 +++++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-3.14.nix

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 8b96a321634..a2b139dc6fc 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -167,7 +167,9 @@ with stdenv.lib;
   STRICT_DEVMEM y # Filter access to /dev/mem
   SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
   DEVKMEM n # Disable /dev/kmem
-  CC_STACKPROTECTOR y # Detect buffer overflows on the stack
+  ${optionalString (versionOlder version "3.14") ''
+    CC_STACKPROTECTOR y # Detect buffer overflows on the stack
+  ''}
   ${optionalString (versionAtLeast version "3.12") ''
     USER_NS y # Support for user namespaces
   ''}
diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
new file mode 100644
index 00000000000..31e6226a3de
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "3.14";
+  extraMeta.branch = "3.14";
+  modDirVersion = "3.14.0";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa";
+  };
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25780de9b35..cc83d0ea4d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6966,6 +6966,15 @@ let
       ];
   };
 
+  linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.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
+      ];
+  };
+
 
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
@@ -7062,8 +7071,9 @@ let
   linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
   linuxPackages_3_13_grsecurity = linuxPackagesFor pkgs.linux_3_13_grsecurity linuxPackages_3_13_grsecurity;
   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_13;
+  linuxPackages_latest = pkgs.linuxPackages_3_14;
 
   # The current default kernel / kernel modules.
   linux = linuxPackages.kernel;
-- 
GitLab


From 92192847fc955a4b1542589639ee369c01e4b1ce Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Mar 2014 20:48:58 -0500
Subject: [PATCH 2822/3789] concurrencykit: version 0.4.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../libraries/concurrencykit/default.nix      | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/concurrencykit/default.nix

diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix
new file mode 100644
index 00000000000..59de923ad43
--- /dev/null
+++ b/pkgs/development/libraries/concurrencykit/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name    = "concurrencykit-${version}";
+  version = "0.4.1";
+
+  src = fetchurl {
+    url    = "http://concurrencykit.org/releases/ck-${version}.tar.gz";
+    sha256 = "1gi5gpkxvbb6vkhjm9kab7dz1av2i11f1pggxp001rqq2mi3i6aq";
+  };
+
+  meta = {
+    description = "A library of safe, high-performance concurrent data structures";
+    homepage    = "http://concurrencykit.org";
+    license     = stdenv.lib.licenses.bsd2;
+    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 df25e7dec5c..c8a0e812890 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -711,6 +711,8 @@ let
 
   colordiff = callPackage ../tools/text/colordiff { };
 
+  concurrencykit = callPackage ../development/libraries/concurrencykit { };
+
   connect = callPackage ../tools/networking/connect { };
 
   conspy = callPackage ../os-specific/linux/conspy {};
-- 
GitLab


From 1ae4db3a80b7cd35bb9ea17464893b56664b17f9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 1 Apr 2014 03:18:38 +0200
Subject: [PATCH 2823/3789] chromium: Fix build of stable channel.

Build failure on Hydra:

https://hydra.nixos.org/build/9823160

This was caused by the update of file in 5885709.

As file seems to be used for only one substition in the gyp files, we
can now drop the build dependency on file and patch out the substition
expression, as it is done before actually testing if the value has been
set by -D (gyp, y u no have lazy eval!?).

PS: Proudly untested against beta and dev channels, redeployed my own
Hydra and building on my workstation here really is ... annoying (lavg
41 on a system with nproc 8, less than 8 GB RAM and you probably will
have as much "fun" as I just had writing this commit mess...a....g

FUCK^H^H^H^H^H^H...e).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../applications/networking/browsers/chromium/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index df5c2bff0d3..c4040ec0356 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -8,7 +8,7 @@
 , libusb1, libexif, pciutils
 
 , python, pythonPackages, perl, pkgconfig
-, nspr, udev, krb5, file
+, nspr, udev, krb5
 , utillinux, alsaLib
 , gcc, bison, gperf
 , glib, gtk, dbus_glib
@@ -54,6 +54,7 @@ let
       sed -i -r \
         -e 's/-f(stack-protector)(-all)?/-fno-\1/' \
         -e 's|/bin/echo|echo|' \
+        -e "/python_arch/s/: *'[^']*'/: '""'/" \
         build/common.gypi
       sed -i '/not RunGN/,+1d' build/gyp_chromium
       sed -i -e 's|/usr/bin/gcc|gcc|' \
@@ -165,8 +166,7 @@ in stdenv.mkDerivation rec {
     nspr udev
     (if useOpenSSL then openssl else nss)
     utillinux alsaLib
-    gcc bison gperf
-    krb5 file
+    gcc bison gperf krb5
     glib gtk dbus_glib
     libXScrnSaver libXcursor libXtst mesa
     pciutils protobuf speechd libXdamage
@@ -223,8 +223,10 @@ in stdenv.mkDerivation rec {
     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 = ''
-- 
GitLab


From def448f127ddc6383f1811de74eb04bf28615018 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Mon, 31 Mar 2014 22:59:01 -0400
Subject: [PATCH 2824/3789] rippled: added comment on commented out config
 options

---
 nixos/modules/services/misc/rippled.nix | 32 ++++++++-----------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix
index 7d339a48b97..e4d1caa565c 100644
--- a/nixos/modules/services/misc/rippled.nix
+++ b/nixos/modules/services/misc/rippled.nix
@@ -18,18 +18,6 @@ let
     /var/log/rippled/debug.log
 
   ''
-  /*
-  + optionalString (cfg.ips != null) ''
-    [ips]
-    ${concatStringsSep "\n" cfg.ips}
-
-  ''
-  + optionalString (cfg.ipsFixed != null) ''
-    [ips_fixed]
-    ${concatStringsSep "\n" cfg.ipsFixed}
-
-  ''
-  */
   + optionalString (cfg.peerIp != null) ''
     [peer_ip]
     ${cfg.peerIp}
@@ -57,6 +45,16 @@ in
 	description = "Whether to enable rippled";
       };
 
+      #
+      # Rippled has a simple configuration file layout that is easy to 
+      # build with nix. Many of the options are defined here but are 
+      # commented out until the code to append them to the config above
+      # is written and they are tested.
+      #
+      # If you find a yourself implementing more options, please submit a 
+      # pull request.
+      #
+
       /*
       ips = mkOption {
         default = [ "r.ripple.com 51235" ];
@@ -286,16 +284,6 @@ in
 
   config = mkIf cfg.enable {
 
-    environment = {
-      etc = singleton
-        { source = rippledStateCfgFile;
-	  target = "rippled";
-	};
-	
-	# users can attempt to send RPC commands to the server.
-	systemPackages = [ pkgs.rippled ];
-    };
-
     users.extraUsers = singleton
       { name = "rippled";
         description = "Ripple server user";
-- 
GitLab


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 2825/3789] 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
   ];
 
-- 
GitLab


From 9493159017858013b7f7c33a158fa6973bed705c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 1 Apr 2014 00:56:23 -0500
Subject: [PATCH 2826/3789] kernel: remove 3.11 series (EOL)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/linux-3.11.nix | 17 -----------------
 pkgs/top-level/all-packages.nix              | 10 ----------
 2 files changed, 27 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.11.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-3.11.nix b/pkgs/os-specific/linux/kernel/linux-3.11.nix
deleted file mode 100644
index 6c3c37663c6..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.11.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "3.11.10";
-  extraMeta.branch = "3.11";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "00g4rbkjsmyzzm9zmdll8qqs1mffa0pybwjpn9jnli2kgh9inzyb";
-  };
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
-  features.netfilterRPFilter = true;
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2bb49f63b0..573b7042705 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6941,15 +6941,6 @@ let
     '';
   });
 
-  linux_3_11 = makeOverridable (import ../os-specific/linux/kernel/linux-3.11.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
-      ];
-  };
-
   linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) {
     inherit fetchurl stdenv perl buildLinux;
     kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
@@ -7069,7 +7060,6 @@ let
   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;
-  linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11);
   linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
   linuxPackages_3_13_grsecurity = linuxPackagesFor pkgs.linux_3_13_grsecurity linuxPackages_3_13_grsecurity;
   linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13);
-- 
GitLab


From bdff718c5beac36c46f9d1e458ef25a50aef752c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 1 Apr 2014 01:10:28 -0500
Subject: [PATCH 2827/3789] kernel: add lockdep expression

Lockdep is the kernel's locking validation/debugging tool and has seen
heavy pro-active usage and development. In Linux 3.14, it's now
available directly to userspace for the same purpose. It comes with a
convenient utility to LD_PRELOAD a shared library for validation, or a
user-space API to link to directly.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/lockdep.nix | 25 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/lockdep.nix

diff --git a/pkgs/os-specific/linux/kernel/lockdep.nix b/pkgs/os-specific/linux/kernel/lockdep.nix
new file mode 100644
index 00000000000..4b1805fc39e
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/lockdep.nix
@@ -0,0 +1,25 @@
+{ stdenv, kernel }:
+
+assert stdenv.lib.versionAtLeast kernel.version "3.14";
+stdenv.mkDerivation {
+  name = "lockdep-linux-${kernel.version}";
+  inherit (kernel) src patches;
+
+  preConfigure = "cd tools/lib/lockdep";
+  installPhase = ''
+    mkdir -p $out/bin $out/lib $out/include
+
+    cp -R include/liblockdep $out/include
+    make install DESTDIR=$out prefix=""
+
+    substituteInPlace $out/bin/lockdep --replace "./liblockdep.so" "$out/lib/liblockdep.so"
+  '';
+
+  meta = {
+    description = "User-space locking validation via the kernel";
+    homepage    = "https://kernel.org/";
+    license     = stdenv.lib.licenses.gpl2;
+    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 573b7042705..b0405bbd656 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7031,6 +7031,8 @@ let
 
     perf = callPackage ../os-specific/linux/kernel/perf.nix { };
 
+    lockdep = callPackage ../os-specific/linux/kernel/lockdep.nix { };
+
     psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { };
 
     spl = callPackage ../os-specific/linux/spl/default.nix { };
-- 
GitLab


From 51e449aabbc922faa00dc7b5cbd0f106eba7f928 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 1 Apr 2014 09:33:04 +0200
Subject: [PATCH 2828/3789] chromium: Fix build of beta and dev channels.

Okay, now this time we really broke beta and dev, because python_arch no
longer is in build/common.gypi anymore.

This just adds chrome/chrome_tests.gypi to the list of files to be
changed by sed.

Also, this time I did test at least whether gyp is running fine and
interrupted after the first 1000 build targets, so all channels *should*
now build fine.

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 c4040ec0356..213e75ee6ef 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -55,7 +55,7 @@ let
         -e 's/-f(stack-protector)(-all)?/-fno-\1/' \
         -e 's|/bin/echo|echo|' \
         -e "/python_arch/s/: *'[^']*'/: '""'/" \
-        build/common.gypi
+        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 \
-- 
GitLab


From 1459896be15887fe093932de18f8179aa2a32868 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 1 Apr 2014 02:59:20 -0500
Subject: [PATCH 2829/3789] kernel: add myself to maintainer list

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/manual-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index dd199814760..6805355052a 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -198,6 +198,7 @@ let
         repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;
         maintainers = [
           maintainers.shlevy
+          maintainers.thoughtpolice
         ];
         platforms = platforms.linux;
       };
-- 
GitLab


From 4202a9315a6786e2b6f7e12fa84689624e7822d6 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 1 Apr 2014 02:59:53 -0500
Subject: [PATCH 2830/3789] grsecurity: add myself to maintainer list

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 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 b0405bbd656..36a9211785c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6872,7 +6872,7 @@ let
   # config options you need (e.g. by overriding extraConfig). See list of options here:
   # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
   linux_3_2_grsecurity = lowPrio (lib.addMetaAttrs {
-    maintainers = with lib.maintainers; [ wizeman ];
+    maintainers = with lib.maintainers; [ wizeman thoughtpolice ];
   } (lib.overrideDerivation (linux_3_2.override (args: {
     kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_55 kernelPatches.grsec_path ];
     argsOverride = {
@@ -6881,7 +6881,7 @@ let
   })) (args: grsecurityOverrider args)));
 
   linux_3_13_grsecurity = lowPrio (lib.addMetaAttrs {
-    maintainers = with lib.maintainers; [ wizeman ];
+    maintainers = with lib.maintainers; [ wizeman thoughtpolice ];
   } (lib.overrideDerivation (linux_3_13.override (args: {
     kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_7 kernelPatches.grsec_path ];
     argsOverride = {
-- 
GitLab


From 7288f25bd1ecaf19182ba2a7bfa4b488303e17ad Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 1 Apr 2014 03:00:17 -0500
Subject: [PATCH 2831/3789] kernel: stable/longterm updates

 - longterm: 3.4.83  -> 3.4.85
 - longterm: 3.10.33 -> 3.10.35
 - longterm: 3.12.14 -> 3.12.15
 - stable:   3.13.7  -> 3.13.8

NOTE: This will break the testing grsec kernel at the moment (there's
not a 3.18.8 patch yet), but it's destined to be upgraded to 3.14 soon
anyway.

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.12.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.13.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 4c6e01271fb..e5dbfe0d27b 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.33";
+  version = "3.10.35";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0pdrzhdylan87nrhpz9dxx3da0008hkch4k1cjw46gg2jmxcryhh";
+    sha256 = "01hznshgclxgs9hvag1i1a69k95nf61z00q6qly4ym25wb77znyv";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index e2ec7295a5f..c758768a5ef 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.14";
+  version = "3.12.15";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1fv5mr8y5kn7077brajgv6l4shs8044i6pkh6phv7ms5ywacbllx";
+    sha256 = "08y42y5piibql0v6pwdp19nxvw5jngs4nw404lwh412zk0cnh4gn";
   };
 
   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 c7658cc232e..b2be5ff2074 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.7";
+  version = "3.13.8";
   extraMeta.branch = "3.13";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0llyc343hzk8a2vhv63xja269jfqaavz613x98y71qfi05ald524";
+    sha256 = "0z6lfsf1ldv7id3fm6l5jdn7c6076605wj7mfi90pgf079kbbqwj";
   };
 
   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 294f616242d..5eeddb35adb 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.83";
+  version = "3.4.85";
   extraMeta.branch = "3.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1jammd31cgzymaqd2qwrm1shx5xwpaxmpnv658fix275fn35a8gb";
+    sha256 = "1ldbq9qka6bdgic4ydl9pnny734gyi2vxzdsnfmfi8mx7bnar29y";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 010688a763b59c35f7fb8b713ac5ab2588d8e9ab Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 1 Apr 2014 03:47:27 -0500
Subject: [PATCH 2832/3789] btsync: 1.2.91 -> 1.3.77

This also does some various cleanup on the build process. In particular,
patchelf was not properly setting the rpath so e.g. librt and libm did
not point into glibc inside the Nix store on my Ubuntu system. This
properly sets the library paths on installation.

Also, the download URL for BitTorrent Sync changed, which is incredibly
annoying, because the URL doesn't encode version information. So maybe
this will fail later. :(

(A final note: this also changes the package name from 'btsync-bin' to
just 'btsync', and cleans up some meta attributes.)

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

diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix
index c6277da704e..8a2c8a6e07e 100644
--- a/pkgs/applications/networking/bittorrentsync/default.nix
+++ b/pkgs/applications/networking/bittorrentsync/default.nix
@@ -1,47 +1,43 @@
 { stdenv, fetchurl, patchelf }:
 
-# this package contains the daemon version of bittorrent sync
-# it's unfortunately closed source.
-
 let
-  # TODO: arm, ppc, osx
-
   arch = if stdenv.system == "x86_64-linux" then "x64"
     else if stdenv.system == "i686-linux" then "i386"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
-    
-  interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2"
-    else if stdenv.system == "i686-linux" then "ld-linux.so.2"
-    else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  version = "1.2.91";
-  sha256 = if stdenv.system == "x86_64-linux" then "1rx5mmk3ffkh6dbm0m33nyx6spsxqjw9djclcf9x9bs3zfyzgmnd"
-    else if stdenv.system == "i686-linux" then "1566mp01149gsb57dv87420w1vq2f3adp6g1c90xdxjxzd67yqpw"
+  sha256 = if stdenv.system == "x86_64-linux" then "1x95pag8ncjx3svm4424fjk5nmbdg8m87fsxy9sc63ba3qs9645j"
+    else if stdenv.system == "i686-linux" then "0l8d85ib6kbpz5sh9v0qga03i4xph61iiy9xlhazm9h30d5a6l8v"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-in stdenv.mkDerivation {
-  name = "btsync-bin-${version}";
-  src = fetchurl {
-    url = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz";
+  libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ];
+in
+stdenv.mkDerivation rec {
+  name = "btsync-${version}";
+  version = "1.3.77";
+
+  src  = fetchurl {
+    url  = "http://download-lb.utorrent.com/endpoint/btsync/os/linux-${arch}/track/stable";
+    name = "btsync-${arch}-${version}.tar.gz";
     inherit sha256;
   };
 
-  sourceRoot = ".";
+  dontStrip   = true; # Don't strip, otherwise patching the rpaths breaks
+  sourceRoot  = ".";
+  buildInputs = [ patchelf ];
 
   installPhase = ''
     ensureDir "$out/bin/"
     cp -r "btsync" "$out/bin/"
 
-    patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
-      "$out/bin/btsync"
+    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+      --set-rpath ${libPath} "$out/bin/btsync"
   '';
 
-  buildInputs = [ patchelf ];
-
   meta = {
-    homepage = "http://labs.bittorrent.com/experiments/sync.html";
     description = "Automatically sync files via secure, distributed technology";
-    license = stdenv.lib.licenses.unfree;
-    maintainers = [ stdenv.lib.maintainers.iElectric ];
+    homepage    = "http://www.bittorrent.com/sync";
+    license     = stdenv.lib.licenses.unfreeRedistributable;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iElectric thoughtpolice ];
   };
 }
-- 
GitLab


From 44f48620415c8f395394aaad2e3b702185dd78a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 1 Apr 2014 10:53:34 +0200
Subject: [PATCH 2833/3789] xorg.xtrans: maintenance update

---
 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 c1e274081ea..0ec14c8d62c 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2060,11 +2060,11 @@ let
   })) // {inherit libX11 xbitmaps libXcursor libXmu ;};
 
   xtrans = (stdenv.mkDerivation ((if overrides ? xtrans then overrides.xtrans else x: x) {
-    name = "xtrans-1.3.3";
+    name = "xtrans-1.3.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/xtrans-1.3.3.tar.bz2;
-      sha256 = "1gq9i9p1q7wgaj1vm1n5mrw0rp0bpcdk4hdy9yj82i92rsnv8bb2";
+      url = mirror://xorg/individual/lib/xtrans-1.3.4.tar.bz2;
+      sha256 = "0fjq9xa37k1czkidj3c5sads51gibrjvrxz9ag3hh9fmxzilwk85";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 9de73701e82..a3faf256926 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -180,7 +180,7 @@ mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2
 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2
 mirror://xorg/individual/app/xset-1.2.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2
-mirror://xorg/individual/lib/xtrans-1.3.3.tar.bz2
+mirror://xorg/individual/lib/xtrans-1.3.4.tar.bz2
 mirror://xorg/individual/app/xvinfo-1.1.2.tar.bz2
 mirror://xorg/individual/app/xwd-1.0.6.tar.bz2
 mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2
-- 
GitLab


From 19bc051ca11be6abef4bc7ca705a9faa56c356e7 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 1 Apr 2014 03:00:17 -0500
Subject: [PATCH 2834/3789] kernel: stable/longterm updates

 - longterm: 3.4.83  -> 3.4.85
 - longterm: 3.10.33 -> 3.10.35
 - longterm: 3.12.14 -> 3.12.15
 - stable:   3.13.7  -> 3.13.8

NOTE: This will break the testing grsec kernel at the moment (there's
not a 3.13.8 patch yet), but it's destined to be upgraded to 3.14 soon
anyway.

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.12.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.13.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 4c6e01271fb..e5dbfe0d27b 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.33";
+  version = "3.10.35";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0pdrzhdylan87nrhpz9dxx3da0008hkch4k1cjw46gg2jmxcryhh";
+    sha256 = "01hznshgclxgs9hvag1i1a69k95nf61z00q6qly4ym25wb77znyv";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index e2ec7295a5f..c758768a5ef 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.14";
+  version = "3.12.15";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1fv5mr8y5kn7077brajgv6l4shs8044i6pkh6phv7ms5ywacbllx";
+    sha256 = "08y42y5piibql0v6pwdp19nxvw5jngs4nw404lwh412zk0cnh4gn";
   };
 
   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 c7658cc232e..b2be5ff2074 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.7";
+  version = "3.13.8";
   extraMeta.branch = "3.13";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0llyc343hzk8a2vhv63xja269jfqaavz613x98y71qfi05ald524";
+    sha256 = "0z6lfsf1ldv7id3fm6l5jdn7c6076605wj7mfi90pgf079kbbqwj";
   };
 
   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 294f616242d..5eeddb35adb 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.83";
+  version = "3.4.85";
   extraMeta.branch = "3.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1jammd31cgzymaqd2qwrm1shx5xwpaxmpnv658fix275fn35a8gb";
+    sha256 = "1ldbq9qka6bdgic4ydl9pnny734gyi2vxzdsnfmfi8mx7bnar29y";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 0fd5a3af0c2fd71dc05ed04738b4527cc1dccdca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 1 Apr 2014 11:30:16 +0200
Subject: [PATCH 2835/3789] libyaml: minor update to fix CVE-2014-2525

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

diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix
index 15ba83b757a..d0ad17048aa 100644
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/pkgs/development/libraries/libyaml/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 let
-  version = "0.1.5";
+  version = "0.1.6";
 in
 stdenv.mkDerivation {
   name = "libyaml-${version}";
 
   src = fetchurl {
     url = "http://pyyaml.org/download/libyaml/yaml-${version}.tar.gz";
-    sha256 = "1vrv5ly58bkmcyc049ad180f2m8iav6l9h3v8l2fqdmrny7yx1zs";
+    sha256 = "0j9731s5zjb8mjx7wzf6vh7bsqi38ay564x6s9nri2nh9cdrg9kx";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 886320136e2d7640bf3dd1634c72611a3d1c21cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 1 Apr 2014 13:25:48 +0200
Subject: [PATCH 2836/3789] bittorrentSync: use versioned url for download

---
 pkgs/applications/networking/bittorrentsync/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix
index 8a2c8a6e07e..c260b75c9fe 100644
--- a/pkgs/applications/networking/bittorrentsync/default.nix
+++ b/pkgs/applications/networking/bittorrentsync/default.nix
@@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
   version = "1.3.77";
 
   src  = fetchurl {
-    url  = "http://download-lb.utorrent.com/endpoint/btsync/os/linux-${arch}/track/stable";
-    name = "btsync-${arch}-${version}.tar.gz";
+    url  = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz";
     inherit sha256;
   };
 
-- 
GitLab


From db2f743156579d12478f744749e1017fb3682cef Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Tue, 1 Apr 2014 13:14:20 +0200
Subject: [PATCH 2837/3789] gnome-screenshot: new package

Utility used in the GNOME desktop environment for taking screenshots

http://en.wikipedia.org/wiki/GNOME_Screenshot
---
 .../gnome-3/core/gnome-screenshot/default.nix | 39 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix

diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
new file mode 100644
index 00000000000..0d891e4625d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -0,0 +1,39 @@
+{ 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.12.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-screenshot/3.12/${name}.tar.xz";
+    sha256 = "ae4bf706652ae9b28c7930d22c2c37469a78d7f6656d312960b3c75ee5c36eb1";
+  };
+
+  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 ];
+
+  installFlags = "gsettingsschemadir=\${out}/share/gnome-screenshot/glib-2.0/schemas/";
+
+  postInstall = ''
+    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:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/gnome-screenshot:$XDG_ICON_DIRS"
+  '';
+
+  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/default.nix b/pkgs/desktops/gnome-3/default.nix
index 61dfe2b1795..9e79460ec42 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -64,6 +64,8 @@ rec {
 
   gnome_terminal = callPackage ./core/gnome-terminal { };
 
+  gnome-screenshot = callPackage ./core/gnome-screenshot { };
+
   gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
 
   gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
-- 
GitLab


From 75fb34eb6d5355a156f60ccfb07712c2fa922294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 1 Apr 2014 13:44:28 +0000
Subject: [PATCH 2838/3789] add pythonPackages.gunicorn

---
 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 d87eb45dc69..11c8feb48b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3222,6 +3222,22 @@ rec {
     };
   };
 
+  gunicorn = buildPythonPackage rec {
+    name = "gunicorn-18.0";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/g/gunicorn/${name}.tar.gz";
+      md5 = "c7138b9ac7515a42066922d2b6120fbe";
+    };
+    
+    buildInputs = [ pytest ];
+
+    meta = {
+      homepage = http://pypi.python.org/pypi/gunicorn;
+      description = "WSGI HTTP Server for UNIX";
+    };
+  };
+
   hcs_utils = buildPythonPackage rec {
     name = "hcs_utils-1.3";
 
-- 
GitLab


From 0ded8e6de3da16e9c84ec7f4e5c382565585e04b Mon Sep 17 00:00:00 2001
From: George Kollias <georgioskollias@gmail.com>
Date: Tue, 1 Apr 2014 20:20:33 +0300
Subject: [PATCH 2839/3789] Added MonetDB NixOS module.

---
 nixos/modules/misc/ids.nix                   |  2 +
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/databases/monetdb.nix | 88 ++++++++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 nixos/modules/services/databases/monetdb.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 9c413e36d56..ddf3b6bc509 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -123,6 +123,7 @@
       ngircd = 112;
       btsync = 113;
       minecraft = 114;
+      monetdb = 115;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -221,6 +222,7 @@
       jenkins = 109;
       systemd-journal-gateway = 110;
       notbit = 111;
+      monetdb = 112;
 
       # 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 652a99e7c5a..1b5ffd9740d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -95,6 +95,7 @@
   ./services/databases/openldap.nix
   ./services/databases/postgresql.nix
   ./services/databases/virtuoso.nix
+  ./services/databases/monetdb.nix
   ./services/games/ghost-one.nix
   ./services/games/minecraft-server.nix
   ./services/hardware/acpid.nix
diff --git a/nixos/modules/services/databases/monetdb.nix b/nixos/modules/services/databases/monetdb.nix
new file mode 100644
index 00000000000..9d3059c7f45
--- /dev/null
+++ b/nixos/modules/services/databases/monetdb.nix
@@ -0,0 +1,88 @@
+{ config, pkgs, ... }:
+let
+  cfg = config.services.monetdb;
+  monetdbUser = "monetdb";
+in
+with pkgs.lib;
+{
+
+  ###### interface
+
+  options = {
+
+    services.monetdb = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable MonetDB database server.";
+      };
+
+      package = mkOption {
+        type = types.path;
+        description = "MonetDB package to use.";
+      };
+
+      dbfarmDir = mkOption {
+        type = types.path;
+        default = "/var/lib/monetdb";
+        description = ''
+          Specifies location of Monetdb dbfarm (keeps database and auxiliary files).
+        '';
+      };
+
+      port = mkOption {
+        default = "50000";
+        example = "50000";
+        description = "Port to listen on.";
+      };
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers.monetdb = 
+      { name = monetdbUser;
+        uid = config.ids.uids.monetdb;
+        description = "monetdb user";
+        home = cfg.dbfarmDir;
+      };
+
+    users.extraGroups.monetdb.gid = config.ids.gids.monetdb;
+
+    environment.systemPackages = [ cfg.package ];
+
+    systemd.services.monetdb =
+      { description = "MonetDB Server";
+
+        wantedBy = [ "multi-user.target" ];
+
+        after = [ "network.target" ];
+
+        path = [ cfg.package ];
+
+        preStart =
+          ''
+            # Initialise the database.
+            if ! test -e ${cfg.dbfarmDir}/.merovingian_properties; then
+                mkdir -m 0700 -p ${cfg.dbfarmDir}
+                chown -R ${monetdbUser} ${cfg.dbfarmDir}
+                ${cfg.package}/bin/monetdbd create ${cfg.dbfarmDir}
+                ${cfg.package}/bin/monetdbd set port=${cfg.port} ${cfg.dbfarmDir}
+            fi
+          '';
+
+        serviceConfig.ExecStart = "${cfg.package}/bin/monetdbd start -n ${cfg.dbfarmDir}";
+
+        serviceConfig.ExecStop = "${cfg.package}/bin/monetdbd stop ${cfg.dbfarmDir}";
+
+        unitConfig.RequiresMountsFor = "${cfg.dbfarmDir}";
+      };
+
+  };
+
+}
-- 
GitLab


From ec1acce4e964c6192149a23d247931ca7cb7029a Mon Sep 17 00:00:00 2001
From: George Kollias <georgioskollias@gmail.com>
Date: Tue, 1 Apr 2014 20:41:37 +0300
Subject: [PATCH 2840/3789] fixed monetdb's gid to be the same with its id.

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

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index ddf3b6bc509..2153779ce55 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -222,7 +222,7 @@
       jenkins = 109;
       systemd-journal-gateway = 110;
       notbit = 111;
-      monetdb = 112;
+      monetdb = 115;
 
       # When adding a gid, make sure it doesn't match an existing uid.
 
-- 
GitLab


From 407a6857c615a260e36f19e82f251978726e26b2 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 2 Apr 2014 02:15:38 +0200
Subject: [PATCH 2841/3789] grsecurity: Update stable and test patches

stable: 3.0-3.2.55-201403252026 -> 3.0-3.2.55-201403300851
test:   3.0-3.13.7-201403252047 -> 3.0-3.13.8-201404011912
---
 pkgs/os-specific/linux/kernel/patches.nix | 14 +++++++-------
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 492fe647a88..d4e4ed30b18 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -75,22 +75,22 @@ rec {
   grsecurity_3_0_3_2_55 =
     { name = "grsecurity-3.0-3.2.55";
       patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403252026.patch;
-        sha256 = "1jfy4cfzgfixyyq5436fzwhg9ch31ynq6d5sxzajqkvmprq5kbhn";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403300851.patch;
+        sha256 = "1a1bhf5i3jx1c6l1bibc5ppd12xzpdk7a5q83rivjiixv37s1x85";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55
       features.apparmor = true;
     };
 
-  grsecurity_3_0_3_13_7 =
-    { name = "grsecurity-3.0-3.13.7";
+  grsecurity_3_0_3_13_8 =
+    { name = "grsecurity-3.0-3.13.8";
       patch = fetchurl {
-        url = http://grsecurity.net/test/grsecurity-3.0-3.13.7-201403252047.patch;
-        sha256 = "0f3mhkf15fpgy28rkfkd0wnccvz2n7s21gppnksl5w9dlw8m7mib";
+        url = http://grsecurity.net/test/grsecurity-3.0-3.13.8-201404011912.patch;
+        sha256 = "1fwb41l7gjkdyl08b6a9mg4ahnw55yk0a7kd69ca8zrqd0j668ci";
       };
       features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.7
+      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.8
       features.apparmor = true;
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2bb49f63b0..189fb517618 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6883,7 +6883,7 @@ let
   linux_3_13_grsecurity = lowPrio (lib.addMetaAttrs {
     maintainers = with lib.maintainers; [ wizeman ];
   } (lib.overrideDerivation (linux_3_13.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_7 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_8 kernelPatches.grsec_path ];
     argsOverride = {
       modDirVersion = "${linux_3_13.modDirVersion}-grsec";
     };
-- 
GitLab


From f61110d65d8324e621feb2c25e081f125000a3ce Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Mar 2014 23:31:09 -0500
Subject: [PATCH 2842/3789] nixos: murmur service

Murmur is the headless server component of the Mumble chat system.

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

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 9c413e36d56..44e27732f42 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -123,6 +123,7 @@
       ngircd = 112;
       btsync = 113;
       minecraft = 114;
+      murmur = 115;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 652a99e7c5a..3d0585b9dff 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -180,6 +180,7 @@
   ./services/networking/ircd-hybrid/default.nix
   ./services/networking/kippo.nix
   ./services/networking/minidlna.nix
+  ./services/networking/murmur.nix
   ./services/networking/nat.nix
   ./services/networking/networkmanager.nix
   ./services/networking/ngircd.nix
diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
new file mode 100644
index 00000000000..2a5549beaf8
--- /dev/null
+++ b/nixos/modules/services/networking/murmur.nix
@@ -0,0 +1,253 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.murmur;
+  configFile = pkgs.writeText "murmurd.ini" ''
+    database=/var/lib/murmur/murmur.sqlite
+    dbDriver=QSQLITE
+
+    autobanAttempts=${toString cfg.autobanAttempts}
+    autobanTimeframe=${toString cfg.autobanTimeframe}
+    autobanTime=${toString cfg.autobanTime}
+
+    logfile=/var/log/murmur/murmurd.log
+    pidfile=${cfg.pidfile}
+
+    welcome="${cfg.welcome}"
+    port=${toString cfg.port}
+
+    ${if cfg.hostName == "" then "" else "host="+cfg.hostName}
+    ${if cfg.password == "" then "" else "serverpassword="+cfg.password}
+
+    bandwidth=${toString cfg.bandwidth}
+    users=${toString cfg.users}
+
+    textmessagelength=${toString cfg.textMsgLength}
+    imagemessagelength=${toString cfg.imgMsgLength}
+    allowhtml=${if cfg.allowHtml then "true" else "false"}
+    logdays=${toString cfg.logDays}
+    bonjour=${if cfg.bonjour then "true" else "false"}
+    sendversion=${if cfg.sendVersion then "true" else "false"}
+
+    ${if cfg.registerName     == "" then "" else "registerName="+cfg.registerName}
+    ${if cfg.registerPassword == "" then "" else "registerPassword="+cfg.registerPassword}
+    ${if cfg.registerUrl      == "" then "" else "registerUrl="+cfg.registerUrl}
+    ${if cfg.registerHostname == "" then "" else "registerHostname="+cfg.registerHostname}
+
+    certrequired=${if cfg.clientCertRequired then "true" else "false"}
+    ${if cfg.sslCert == "" then "" else "sslCert="+cfg.sslCert}
+    ${if cfg.sslKey  == "" then "" else "sslKey="+cfg.sslKey}
+  '';
+in
+{
+  options = {
+    services.murmur = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "If enabled, start the Murmur Service.";
+      };
+
+      autobanAttempts = mkOption {
+        type = types.int;
+        default = 10;
+        description = ''
+          Number of attempts a client is allowed to make in
+          <literal>autobanTimeframe</literal> seconds, before being
+          banned for <literal>autobanTime</literal>.
+        '';
+      };
+
+      autobanTimeframe = mkOption {
+        type = types.int;
+        default = 120;
+        description = ''
+          Timeframe in which a client can connect without being banned
+          for repeated attempts (in seconds).
+        '';
+      };
+
+      autobanTime = mkOption {
+        type = types.int;
+        default = 300;
+        description = "The amount of time an IP ban lasts (in seconds).";
+      };
+
+      pidfile = mkOption {
+        type = types.path;
+        default = "/tmp/murmurd.pid";
+        description = "Path to PID file for Murmur daemon.";
+      };
+
+      welcome = mkOption {
+        type = types.str;
+        default = "";
+        description = "Welcome message for connected clients.";
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 64738;
+        description = "Ports to bind to (UDP and TCP).";
+      };
+
+      hostName = mkOption {
+        type = types.str;
+        default = "";
+        description = "Host to bind to. Defaults binding on all addresses.";
+      };
+
+      password = mkOption {
+        type = types.str;
+        default = "";
+        description = "Required password to join server, if specified.";
+      };
+
+      bandwidth = mkOption {
+        type = types.int;
+        default = 72000;
+        description = ''
+          Maximum bandwidth (in bits per second) that clients may send
+          speech at.
+        '';
+      };
+
+      users = mkOption {
+        type = types.int;
+        default = 100;
+        description = "Maximum number of concurrent clients allowed.";
+      };
+
+      textMsgLength = mkOption {
+        type = types.int;
+        default = 5000;
+        description = "Max length of text messages. Set 0 for no limit.";
+      };
+
+      imgMsgLength = mkOption {
+        type = types.int;
+        default = 131072;
+        description = "Max length of image messages. Set 0 for no limit.";
+      };
+
+      allowHtml = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Allow HTML in client messages, comments, and channel
+          descriptions.
+        '';
+      };
+
+      logDays = mkOption {
+        type = types.int;
+        default = 31;
+        description = ''
+          How long to store RPC logs for in the database. Set 0 to
+          keep logs forever, or -1 to disable DB logging.
+        '';
+      };
+
+      bonjour = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable Bonjour auto-discovery, which allows clients over
+          your LAN to automatically discover Murmur servers.
+        '';
+      };
+
+      sendVersion = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Send Murmur version in UDP response.";
+      };
+
+      registerName = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          Public server registration name, and also the name of the
+          Root channel. Even if you don't publicly register your
+          server, you probably still want to set this.
+        '';
+      };
+
+      registerPassword = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          Public server registry password, used authenticate your
+          server to the registry to prevent impersonation; required for
+          subsequent registry updates.
+        '';
+      };
+
+      registerUrl = mkOption {
+        type = types.str;
+        default = "";
+        description = "URL website for your server.";
+      };
+
+      registerHostname = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          DNS hostname where your server can be reached. This is only
+          needed if you want your server to be accessed by its
+          hostname and not IP - but the name *must* resolve on the
+          internet properly.
+        '';
+      };
+
+      clientCertRequired = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Require clients to authenticate via certificates.";
+      };
+
+      sslCert = mkOption {
+        type = types.str;
+        default = "";
+        description = "Path to your SSL certificate.";
+      };
+
+      sslKey = mkOption {
+        type = types.str;
+        default = "";
+        description = "Path to your SSL key.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.extraUsers.murmur = {
+      description     = "Murmur Service user";
+      home            = "/var/lib/murmur";
+      createHome      = true;
+      uid             = config.ids.uids.murmur;
+    };
+
+    systemd.services.murmur = {
+      description = "Murmur Chat Service";
+      wantedBy    = [ "multi-user.target" ];
+      after       = [ "network.target "];
+
+      serviceConfig = {
+        Type      = "forking";
+        PIDFile   = cfg.pidfile;
+        Restart   = "always";
+        User      = "murmur";
+        ExecStart = "${pkgs.murmur}/bin/murmurd -ini ${configFile}";
+        PermissionsStartOnly = true;
+      };
+
+      preStart = ''
+        mkdir -p /var/log/murmur
+        chown -R murmur /var/log/murmur
+      '';
+    };
+  };
+}
-- 
GitLab


From 788354cc348d976eeb84e5e8041ea5563d931504 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Mar 2014 23:33:46 -0500
Subject: [PATCH 2843/3789] nixos: add mumble test

This tests that both the client and server work. With screenshots!

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/tests/default.nix |  1 +
 nixos/tests/mumble.nix  | 54 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 nixos/tests/mumble.nix

diff --git a/nixos/tests/default.nix b/nixos/tests/default.nix
index 4aeb7f55ac3..955c87b2714 100644
--- a/nixos/tests/default.nix
+++ b/nixos/tests/default.nix
@@ -25,6 +25,7 @@ with import ../lib/testing.nix { inherit system minimal; };
   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; });
diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix
new file mode 100644
index 00000000000..509742f2899
--- /dev/null
+++ b/nixos/tests/mumble.nix
@@ -0,0 +1,54 @@
+{ pkgs, ... }:
+
+let
+  client = { config, pkgs, ... }: {
+    imports = [ ./common/x11.nix ];
+    environment.systemPackages = [ pkgs.mumble ];
+  };
+in
+{
+  nodes = {
+    server = { config, pkgs, ... }: {
+      services.murmur.enable       = true;
+      services.murmur.registerName = "NixOS tests";
+    };
+
+    client1 = client;
+    client2 = client;
+  };
+
+  testScript = ''
+    startAll;
+
+    $server->waitForUnit("murmur.service");
+    $client1->waitForX;
+    $client2->waitForX;
+
+    $client1->execute("mumble mumble://client1\@server/test &");
+    $client2->execute("mumble mumble://client2\@server/test &");
+
+    $server->sleep(10); # Wait for Mumble UI to pop up
+
+    # cancel client audio configuration
+    $client1->sendKeys("esc");
+    $client2->sendKeys("esc");
+    $server->sleep(1);
+
+    # cancel client cert configuration
+    $client1->sendKeys("esc");
+    $client2->sendKeys("esc");
+    $server->sleep(1);
+
+    # accept server certificate
+    $client1->sendChars("y");
+    $client2->sendChars("y");
+
+    # Find clients in logs
+    $server->waitUntilSucceeds("grep -q 'client1' /var/log/murmur/murmurd.log");
+    $server->waitUntilSucceeds("grep -q 'client2' /var/log/murmur/murmurd.log");
+
+    $server->sleep(5); # wait to get screenshot
+    $client1->screenshot("screen1");
+    $client2->screenshot("screen2");
+  '';
+}
-- 
GitLab


From 1b042b7b359d0cfd23d9759815c58feb55f99363 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Wed, 2 Apr 2014 11:58:39 +0200
Subject: [PATCH 2844/3789] gnome-system-log: new package

Graphical, menu-driven viewer that you can use to view and monitor your system logs

https://help.gnome.org/users/gnome-system-log/3.9/
---
 .../gnome-3/core/gnome-system-log/default.nix | 43 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  6 ++-
 2 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-system-log/default.nix

diff --git a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
new file mode 100644
index 00000000000..8b387627da5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
@@ -0,0 +1,43 @@
+{ 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 ];
+
+  installFlags = "gsettingsschemadir=\${out}/share/gnome-system-log/glib-2.0/schemas/";
+
+  postInstall = ''
+    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:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/gnome-system-log:$XDG_ICON_DIRS"
+  '';
+
+  preFixup = ''
+    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/default.nix b/pkgs/desktops/gnome-3/default.nix
index 9e79460ec42..a9b883a6e11 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -60,11 +60,13 @@ rec {
 
   gnome_shell = callPackage ./core/gnome-shell { };
 
+  gnome-screenshot = callPackage ./core/gnome-screenshot { };
+
   gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };
 
-  gnome_terminal = callPackage ./core/gnome-terminal { };
+  gnome-system-log = callPackage ./core/gnome-system-log { };
 
-  gnome-screenshot = callPackage ./core/gnome-screenshot { };
+  gnome_terminal = callPackage ./core/gnome-terminal { };
 
   gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
 
-- 
GitLab


From f7b19ea8b3bf6427c25c577bbd177e22b31dc8d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 2 Apr 2014 12:40:52 +0200
Subject: [PATCH 2845/3789] typo

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

diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix
index af1cf6d320c..5b88d4c7556 100644
--- a/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    description = "a kernel module to create V4L2 loopback devices";
+    description = "A kernel module to create V4L2 loopback devices";
     homepage = https://github.com/umlaeute/v4l2loopback;
     license = licenses.gpl2;
     maintainers = [ maintainers.iElectric ];
-- 
GitLab


From dddb15668e4951340b72b553795cf199efa75c30 Mon Sep 17 00:00:00 2001
From: Gergely Risko <errge@nilcons.com>
Date: Wed, 2 Apr 2014 13:07:34 +0200
Subject: [PATCH 2846/3789] Update lens-datetime to 0.2.1

---
 .../development/libraries/haskell/lens-datetime/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/lens-datetime/default.nix b/pkgs/development/libraries/haskell/lens-datetime/default.nix
index 2de451f4177..72781f39cdb 100644
--- a/pkgs/development/libraries/haskell/lens-datetime/default.nix
+++ b/pkgs/development/libraries/haskell/lens-datetime/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "lens-datetime";
-  version = "0.2";
-  sha256 = "0wrs7alz1zfg1xrg04lhz01mrd1gcz2xr8b5mxfdvq94f5m87sdr";
+  version = "0.2.1";
+  sha256 = "1wqks7ynw3njlizdd9hvgrc1xjxcgcfck9ppj1lgg8wr3l2myi72";
   buildDepends = [ lens time ];
   meta = {
-    homepage = "http://github.com/klao/lens-datetime";
+    homepage = "http://github.com/nilcons/lens-datetime";
     description = "Lenses for Data.Time.* types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From c928d1b4bcfa397d597e7c776d280f93bfb0761c Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Wed, 2 Apr 2014 13:57:33 +0200
Subject: [PATCH 2847/3789] gnome-calculator: new package

Application that solves mathematical equations
and is suitable as a default application in a Desktop environment

https://wiki.gnome.org/action/show/Apps/Calculator
---
 .../gnome-3/core/gnome-calculator/default.nix | 38 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-calculator/default.nix

diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
new file mode 100644
index 00000000000..805f0e5276d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, intltool, fetchurl, pkgconfig, libxml2
+, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, itstool, gnome3, librsvg, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-calculator-3.12.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-calculator/3.12/${name}.tar.xz";
+    sha256 = "22882c770251203be85f728d73b0d3946728774fd437cf460cd6d958fc4b4dc5";
+  };
+
+  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 ];
+
+  installFlags = "gsettingsschemadir=\${out}/share/gnome-calculator/glib-2.0/schemas/";
+
+  postInstall = ''
+    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:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/gnome-calculator:$XDG_ICON_DIRS"
+  '';
+
+  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/default.nix b/pkgs/desktops/gnome-3/default.nix
index 9e79460ec42..b46e0821068 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -40,6 +40,8 @@ rec {
 
   gnome_control_center = callPackage ./core/gnome-control-center { };
 
+  gnome-calculator = callPackage ./core/gnome-calculator { };
+
   gnome_common = callPackage ./core/gnome-common { };
 
   gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
-- 
GitLab


From 90cf41c0d7017e32f966e09a8c83487b431fde73 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 2 Apr 2014 09:05:01 -0400
Subject: [PATCH 2848/3789] mariadb: Bump

---
 pkgs/servers/sql/mariadb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index db6797a8d68..a6105c12890 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff }:
 
 stdenv.mkDerivation rec {
-  name = "mariadb-10.0.8";
+  name = "mariadb-10.0.10";
 
   src = fetchurl {
-    url = "http://tweedo.com/mirror/mariadb/${name}/kvm-tarbake-jaunty-x86/${name}.tar.gz";
-    md5 = "2b925d0beae8101f1f3f98102da91bf7";
+    url = "https://fossies.org/linux/misc/${name}.tar.gz";
+    md5 = "14ce22b8197d4eae88d237776d47220f";
   };
 
   buildInputs = [ cmake ncurses openssl bison boost libxml2 libaio judy libevent groff ];
-- 
GitLab


From e8c6c60b93f7d3d113f0ffbcc232d19b9a5bdc44 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 2 Apr 2014 04:21:42 +0200
Subject: [PATCH 2849/3789] linux: Update to 3.2.56

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index cee4bf31dfe..1dd13724857 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.55";
+  version = "3.2.56";
   extraMeta.branch = "3.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "15fj7kd3ba52in1siqbdq45i7xzb53yy88l9k4bgfgds3j8wxj9m";
+    sha256 = "08858sx63bsay185ywwyh01wnms7lyh9rvgwznwnzmjpnfi3hihm";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 52d233af22f591e8527d23ef979566fae0c59e39 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 2 Apr 2014 04:22:07 +0200
Subject: [PATCH 2850/3789] grsecurity: Update stable patch from
 3.0-3.2.55-201403300851 -> 3.0-3.2.56-201404012135

---
 pkgs/os-specific/linux/kernel/patches.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index d4e4ed30b18..c5b6362108e 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -72,14 +72,14 @@ rec {
   };
 
 
-  grsecurity_3_0_3_2_55 =
-    { name = "grsecurity-3.0-3.2.55";
+  grsecurity_3_0_3_2_56 =
+    { name = "grsecurity-3.0-3.2.56";
       patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403300851.patch;
-        sha256 = "1a1bhf5i3jx1c6l1bibc5ppd12xzpdk7a5q83rivjiixv37s1x85";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.56-201404012135.patch;
+        sha256 = "1l7c1l5cxv1j9iw12rxf7nsvbmg6jna96y1bxc8i4yi0jwiwn2nc";
       };
       features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55
+      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.56
       features.apparmor = true;
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 189fb517618..1f39a230abe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6874,7 +6874,7 @@ let
   linux_3_2_grsecurity = lowPrio (lib.addMetaAttrs {
     maintainers = with lib.maintainers; [ wizeman ];
   } (lib.overrideDerivation (linux_3_2.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_55 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_56 kernelPatches.grsec_path ];
     argsOverride = {
       modDirVersion = "${linux_3_2.modDirVersion}-grsec";
     };
-- 
GitLab


From e33d79dd547f6f2bd0892bf638be4b6c01197ad2 Mon Sep 17 00:00:00 2001
From: Gergely Risko <errge@nilcons.com>
Date: Wed, 2 Apr 2014 17:07:44 +0200
Subject: [PATCH 2851/3789] Disable check for haskell/math-functions, it fails
 on i686

---
 pkgs/development/libraries/haskell/math-functions/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix
index 7faca58fd85..a7a9d92fb97 100644
--- a/pkgs/development/libraries/haskell/math-functions/default.nix
+++ b/pkgs/development/libraries/haskell/math-functions/default.nix
@@ -12,6 +12,8 @@ cabal.mkDerivation (self: {
     HUnit ieee754 QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2 vector
   ];
+  # fails on i686 at version 0.1.5.2
+  doCheck = false;
   meta = {
     homepage = "https://github.com/bos/math-functions";
     description = "Special functions and Chebyshev polynomials";
-- 
GitLab


From 53ce02b7c002a44e7c8a402f5cf824a1da2281f2 Mon Sep 17 00:00:00 2001
From: Gergely Risko <errge@nilcons.com>
Date: Wed, 2 Apr 2014 17:29:33 +0200
Subject: [PATCH 2852/3789] Jailbreak the whole haskell/Chart "ecosystem", not
 just Chart

---
 pkgs/development/libraries/haskell/Chart-cairo/default.nix    | 1 +
 pkgs/development/libraries/haskell/Chart-diagrams/default.nix | 1 +
 pkgs/development/libraries/haskell/Chart-gtk/default.nix      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
index 3b9e6fb4e33..55c893bcc81 100644
--- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
@@ -9,6 +9,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     cairo Chart colour dataDefaultClass lens mtl operational time
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/timbod7/haskell-chart/wiki";
     description = "Cairo backend for Charts";
diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
index 008869713ef..2593b67edbc 100644
--- a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
     diagramsPostscript diagramsSvg lens mtl operational SVGFonts text
     time
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/timbod7/haskell-chart/wiki";
     description = "Diagrams backend for Charts";
diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
index a2e695a891d..4745dda31cc 100644
--- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.2";
   sha256 = "0qq72cf1m2gvcksa1jj5g9qi6b47pmpzh3grhs7kh3m7qyq0a56g";
   buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/timbod7/haskell-chart/wiki";
     description = "Utility functions for using the chart library with GTK";
-- 
GitLab


From 4e875dd3ff68d7502db377967044461d01cf08dd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 Apr 2014 17:44:02 +0200
Subject: [PATCH 2853/3789] esniper: update to version 2.29.0

---
 pkgs/applications/networking/esniper/default.nix    |  8 ++++----
 .../networking/esniper/fix-ebay-login.patch         | 13 -------------
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/applications/networking/esniper/fix-ebay-login.patch

diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index ee263245218..0a9703d5e34 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }:
 
 stdenv.mkDerivation {
-  name = "esniper-2.28.0";
+  name = "esniper-2.29.0";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/esniper/esniper-2-28-0.tgz";
-    sha256 = "c2b0ccb757616b32f2d6cf54a4a5e367405fa7bcd6e6ed11835fe4f8a06a016b";
+    url    = "mirror://sourceforge/esniper/esniper-2-29-0.tgz";
+    sha256 = "052jfbzm0a88h3hss2vg1vfdrhibjwhbcdnwsbkk5i1z0jj16xxc";
   };
 
   buildInputs = [ openssl curl ];
 
   # Add support for CURL_CA_BUNDLE variable.
   # Fix <http://sourceforge.net/p/esniper/bugs/648/>.
-  patches = [ ./find-ca-bundle.patch ./fix-ebay-login.patch ];
+  patches = [ ./find-ca-bundle.patch ];
 
   postInstall = ''
     sed <"frontends/snipe" >"$out/bin/snipe" \
diff --git a/pkgs/applications/networking/esniper/fix-ebay-login.patch b/pkgs/applications/networking/esniper/fix-ebay-login.patch
deleted file mode 100644
index 07d0a577a08..00000000000
--- a/pkgs/applications/networking/esniper/fix-ebay-login.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- esniper-orig/auction.c	2014-03-23 22:28:46.684289574 +0100
-+++ esniper/auction.c	2014-03-23 22:24:00.540568653 +0100
-@@ -424,7 +424,9 @@
- 		if ((pp->srcId && !strcmp(pp->srcId, "SignInAlertSupressor"))||
- 		    (pp->pageName &&
- 			(!strncasecmp(pp->pageName, "MyeBay", 6) ||
--			 !strncasecmp(pp->pageName, "My eBay", 7))
-+                        !strncasecmp(pp->pageName, "My eBay", 7) ||
-+                        !strncasecmp(pp->pageName, "Watch list", 10) ||
-+                        !strncasecmp(pp->pageName, "User Agreement", 10))
- 		    ))
- 			loginTime = time(NULL);
- 		else if (pp->pageName &&
-- 
GitLab


From 9415c34e3d128e13a30c20f0ea5596a8969e8220 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Apr 2014 00:26:01 +0200
Subject: [PATCH 2854/3789] haskell-ghc-mod: update to version 4.0.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 260fff8ae82..fca6ea9cd55 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, ghcPaths
-, ghcSybUtils, hlint, hspec, ioChoice, syb, time, transformers
+{ cabal, Cabal, convertible, doctest, emacs, filepath, ghcSybUtils
+, hlint, hspec, ioChoice, syb, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "3.1.7";
-  sha256 = "1mv6m1fcqkm4i27jw1aniwfq2dhpn4m7kicyq4l70zmkfr7y7c5s";
+  version = "4.0.0";
+  sha256 = "11l0wycx0l0wqq8a3wsiw88fr8pahjzh65yxqw6r1rgj10cszai8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    Cabal convertible filepath ghcPaths ghcSybUtils hlint ioChoice syb
-    time transformers
+    Cabal convertible filepath ghcSybUtils hlint ioChoice syb time
+    transformers
   ];
   testDepends = [
-    Cabal convertible doctest filepath ghcPaths ghcSybUtils hlint hspec
-    ioChoice syb time transformers
+    Cabal convertible doctest filepath ghcSybUtils hlint hspec ioChoice
+    syb time transformers
   ];
   buildTools = [ emacs ];
   postInstall = ''
-- 
GitLab


From ed119be3f18a38e285c839a419cb98c9d9653f26 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Apr 2014 00:26:02 +0200
Subject: [PATCH 2855/3789] haskell-shakespeare-css: update to version 1.0.7.4

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

diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index ae966a4501e..8f06ee67361 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.7.3";
-  sha256 = "0f2l1i4h3h5xps74nx3gy1mbi96m12rzgidlh4ilxz6p7dx9wnbq";
+  version = "1.0.7.4";
+  sha256 = "1lb3w0498bdsd2cmz2ns11dv5abif0wsilbqy0ymfb1dgl2rbpmz";
   buildDepends = [ parsec shakespeare text transformers ];
   testDepends = [ hspec HUnit shakespeare text ];
   meta = {
-- 
GitLab


From c073ab5f92710d669ad8543ece2ee6d045d100d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Apr 2014 00:26:03 +0200
Subject: [PATCH 2856/3789] haskell-snap-server: update to version 0.9.4.2

---
 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 4634ec554eb..4dca1dea284 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.1";
-  sha256 = "07k7gndzmh4d2mghi8qv25frvdlgmn7497hh6j22ki0al0zrs0l9";
+  version = "0.9.4.2";
+  sha256 = "05na8gqbqy0nznasaxfkp4hr7h0s6ypm8000mhn50d27v8nk526m";
   buildDepends = [
     attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
     caseInsensitive enumerator MonadCatchIOTransformers mtl network
-- 
GitLab


From 41cfbc1a82fe2686954d8b5147976ba04803fae6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Apr 2014 00:26:04 +0200
Subject: [PATCH 2857/3789] haskell-unix-bytestring: update to version 0.3.7.2

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

diff --git a/pkgs/development/libraries/haskell/unix-bytestring/default.nix b/pkgs/development/libraries/haskell/unix-bytestring/default.nix
index 174fc925aae..484ab6148a2 100644
--- a/pkgs/development/libraries/haskell/unix-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/unix-bytestring/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-bytestring";
-  version = "0.3.7";
-  sha256 = "1qwgs2bwga057csfa8izq0kc5vwi2vcaz2snlcgp0h9vql3qmvrg";
+  version = "0.3.7.2";
+  sha256 = "0n1i7pcdwhs0wz6spf3pndr8i74qn0cdzr3p46w4r4mvvwr76i2s";
   meta = {
     homepage = "http://code.haskell.org/~wren/";
     description = "Unix/Posix-specific functions for ByteStrings";
-- 
GitLab


From 1237886a918511cc361245474e1a122206046135 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Apr 2014 00:26:06 +0200
Subject: [PATCH 2858/3789] haskell-cabal2nix: update to version 1.61

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

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 9dc8536a4c0..7ad20ee066b 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.60";
-  sha256 = "1jp4rq8gfdz5knm9cbralhjyw2a391cck49422bskl7c23p94y3l";
+  version = "1.61";
+  sha256 = "058bwswkhsj3rbxl42n23ri79smmhkaj6wid4c6x02yl3m8l7xsy";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
-- 
GitLab


From cf4142b015876f69d530206655501e5320b90172 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Apr 2014 00:27:12 +0200
Subject: [PATCH 2859/3789] haskell-bytestring-show: update to version 0.3.5.6

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

diff --git a/pkgs/development/libraries/haskell/bytestring-show/default.nix b/pkgs/development/libraries/haskell/bytestring-show/default.nix
index b71b2a3ad83..19b8f15bc6d 100644
--- a/pkgs/development/libraries/haskell/bytestring-show/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-show/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bytestring-show";
-  version = "0.3.5.5";
-  sha256 = "0vd8f3jrzi2s119rcn20k6srk6l7ypiars1mxw1n1jrjx8ill2y4";
+  version = "0.3.5.6";
+  sha256 = "04h81a0bh2fvnkby1qafnydb29gzk6d4d311i2lbn7lm2vyjw919";
   buildDepends = [ binary ];
   meta = {
     homepage = "http://code.haskell.org/~dolio/";
-- 
GitLab


From 79a4148aa2c1554399b3c05e809b32d09d7e087c Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Wed, 2 Apr 2014 18:26:21 +0200
Subject: [PATCH 2860/3789] gnome-font-viewer: new package

Program that can preview fonts and create thumbnails for fonts
---
 .../core/gnome-font-viewer/default.nix        | 39 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix

diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
new file mode 100644
index 00000000000..8a1b0054e39
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
@@ -0,0 +1,39 @@
+{ 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 ];
+
+  installFlags = "gsettingsschemadir=\${out}/share/gnome-font-viewer/glib-2.0/schemas/";
+
+  postInstall = ''
+    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:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/gnome-font-viewer:$XDG_ICON_DIRS"
+  '';
+
+  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/default.nix b/pkgs/desktops/gnome-3/default.nix
index 9e79460ec42..03bd3203b28 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -42,6 +42,8 @@ rec {
 
   gnome_common = callPackage ./core/gnome-common { };
 
+  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 { };
-- 
GitLab


From 457fdb38425fd00378f213f9bd5c306ed99395bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 27 Feb 2014 08:22:41 +0100
Subject: [PATCH 2861/3789] texinfo: move ncurses support into
 texinfoInteractive

This, for example, drops the stdenv dependency on ncurses.
---
 pkgs/development/tools/misc/texinfo/5.2.nix | 5 +++--
 pkgs/top-level/all-packages.nix             | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix
index 1bb8fca0ecf..0a7446fe534 100644
--- a/pkgs/development/tools/misc/texinfo/5.2.nix
+++ b/pkgs/development/tools/misc/texinfo/5.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, perl, xz }:
+{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }:
 
 stdenv.mkDerivation rec {
   name = "texinfo-5.2";
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
   };
 
-  buildInputs = [ ncurses perl xz ];
+  buildInputs = [ perl xz ]
+    ++ stdenv.lib.optional interactive ncurses;
 
   preInstall = ''
     installFlags="TEXMF=$out/texmf-dist";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90cb16d0bec..08ac0eb93d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3914,6 +3914,9 @@ let
   texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
   texinfo4 = texinfo413;
   texinfo = texinfo5;
+  texinfoInteractive = appendToName "interactive" (
+    texinfo.override { interactive = true; }
+  );
 
   texi2html = callPackage ../development/tools/misc/texi2html { };
 
-- 
GitLab


From 267d0a5ab6c56150c9476c54a6d7988e8e95939a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 27 Feb 2014 08:28:35 +0100
Subject: [PATCH 2862/3789] Merge #1633: --enable-symlinks in ncurses and
 e2fsprogs

---
 pkgs/development/libraries/ncurses/default.nix | 2 +-
 pkgs/tools/filesystems/e2fsprogs/default.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 2e5db48b7df..993993cecd0 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (rec {
   patches = [ ./patch-ac ];
 
   configureFlags = ''
-    --with-shared --without-debug --enable-pc-files
+    --with-shared --without-debug --enable-pc-files --enable-symlinks
     ${if unicode then "--enable-widec" else ""}${if cxx then "" else "--without-cxx-binding"}
   '';
 
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 16e836e2ddc..dcbf7235e49 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency).
-  configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck";
+  configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck --enable-symlink-install";
 
   enableParallelBuilding = true;
 
-- 
GitLab


From 25f0b7cb5060fa64205f085204f488ed45a17412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 1 Mar 2014 13:56:30 +0100
Subject: [PATCH 2863/3789] gcc-{,cross-}wrapper: add 'cpp' wrapper (close
 #1820)

The gcc-wrapper doesn't wrap 'cpp'. This breaks some software (such as
Buildroot) because the 'cpp' they get come from the non-wrapped gcc
package which doesn't know about any standard include paths.

gcc-cross-wrapper is untested.
---
 pkgs/build-support/gcc-cross-wrapper/builder.sh | 2 ++
 pkgs/build-support/gcc-wrapper/builder.sh       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/build-support/gcc-cross-wrapper/builder.sh b/pkgs/build-support/gcc-cross-wrapper/builder.sh
index 5a5bd45a8f8..2dfa315d168 100644
--- a/pkgs/build-support/gcc-cross-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/builder.sh
@@ -87,6 +87,8 @@ mkGccWrapper $out/bin/$crossConfig-gcc $gccPath/$crossConfig-gcc
 mkGccWrapper $out/bin/$crossConfig-g++ $gccPath/$crossConfig-g++
 ln -s $crossConfig-g++ $out/bin/$crossConfig-c++
 
+mkGccWrapper $out/bin/$crossConfig-cpp $gccPath/$crossConfig-cpp
+
 mkGccWrapper $out/bin/$crossConfig-g77 $gccPath/$crossConfig-g77
 ln -s $crossConfig-g77 $out/bin/$crossConfig-f77
 
diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh
index e7c3400e9f7..b19f2dc067c 100644
--- a/pkgs/build-support/gcc-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-wrapper/builder.sh
@@ -154,6 +154,8 @@ then
     ln -sv g++ $out/bin/c++
 fi
 
+mkGccWrapper $out/bin/cpp $gccPath/cpp
+
 if mkGccWrapper $out/bin/gfortran $gccPath/gfortran
 then
     ln -sv gfortran $out/bin/g77
-- 
GitLab


From de11c288c17864258fec530255a8d6b7d5eecf4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Mar 2014 14:00:54 +0100
Subject: [PATCH 2864/3789] gcc-wrapper: preferLocalBuild, as it does little
 work

This is re-revert of e31523a369a.
---
 pkgs/build-support/gcc-wrapper/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
index 1f521f40585..8e8b0b90945 100644
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@@ -73,6 +73,8 @@ stdenv.mkDerivation {
        abort "don't know the name of the dynamic linker for this platform");
   };
 
+  preferLocalBuild = true;
+
   meta =
     let gcc_ = if gcc != null then gcc else {}; in
     (if gcc_ ? meta then removeAttrs gcc.meta ["priority"] else {}) //
-- 
GitLab


From 1046b4ccabdef4313520fb41be627232ffa44fc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 9 Mar 2014 21:38:15 +0100
Subject: [PATCH 2865/3789] Merge #1905: perl: disable tests that involve
 networking

I rebased the branch not to include newer changes from master.
---
 pkgs/development/interpreters/perl/5.16/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index a8c17545303..bbd9e003b2c 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -70,6 +70,8 @@ stdenv.mkDerivation rec {
   testsToSkip = ''
     lib/Net/hostent.t \
     dist/IO/t/{io_multihomed.t,io_sock.t} \
+    dist/Net-Ping/t/*.t \
+    cpan/autodie/t/truncate.t \
     t/porting/{maintainers.t,regen.t} \
     cpan/Socket/t/get{name,addr}info.t \
   '' + optionalString stdenv.isFreeBSD ''
-- 
GitLab


From 1f6a15d7ded115ece48419cb1e642816b2145db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 10 Mar 2014 20:30:27 +0100
Subject: [PATCH 2866/3789] Merge #1901: add preFixupPhases to stdenv; for
 gsettings

Without this stdenv change it seems difficult to fix some glib's gsettings issues,
as the folders in question may (not) be created in installPhase.
---
 doc/stdenv.xml                                |  7 +++++++
 pkgs/desktops/gnome-3/core/baobab/default.nix | 15 +++++----------
 pkgs/development/libraries/glib/default.nix   |  2 ++
 pkgs/development/libraries/glib/setup-hook.sh | 17 +++++++++++++++++
 pkgs/stdenv/generic/setup.sh                  |  2 +-
 pkgs/stdenv/mingw/setup.sh                    |  2 +-
 6 files changed, 33 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/libraries/glib/setup-hook.sh

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 1846886919d..74eb63b4b49 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -298,6 +298,13 @@ executed and in what order:
     </listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><varname>preFixupPhases</varname></term>
+    <listitem>
+      <para>Additional phases executed just before the fixup phase.</para>
+    </listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>preDistPhases</varname></term>
     <listitem>
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index 07805644d90..5121f1f69be 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -1,7 +1,7 @@
 { stdenv, intltool, fetchurl, vala, libgtop
 , pkgconfig, gtk3, glib, hicolor_icon_theme
 , bash, makeWrapper, itstool, libxml2
-, gnome3, librsvg, gdk_pixbuf }:
+, gnome3, librsvg, gdk_pixbuf, file }:
 
 stdenv.mkDerivation rec {
   name = "baobab-3.10.1";
@@ -22,19 +22,14 @@ 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 ];
-
-  installFlags = "gsettingsschemadir=\${out}/share/baobab/glib-2.0/schemas/";
-
-  postInstall = ''
-    wrapProgram "$out/bin/baobab" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/baobab:$XDG_ICON_DIRS"
-  '';
+                  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:${gnome3.gsettings_desktop_schemas}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index af4b152dcce..033a1def3ce 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
     sha256 = "1d98mbqjmc34s8095lkw1j1bwvnnkw9581yfvjaikjvfjsaz29qd";
   };
 
+  setupHook = ./setup-hook.sh;
+
   buildInputs = [ libelf ]
     ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ];
 
diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh
new file mode 100644
index 00000000000..e5c0c372da0
--- /dev/null
+++ b/pkgs/development/libraries/glib/setup-hook.sh
@@ -0,0 +1,17 @@
+# Install gschemas, if any, in a package-specific directory
+installFlagsArray+=("gsettingsschemadir=$out/gsettings-schemas/$name/glib-2.0/schemas/")
+
+make_glib_find_gsettings_schemas() {
+	# For packages that need gschemas of other packages (e.g. empathy)
+	if [ -d "$1/gsettings-schemas/*/glib-2.0/schemas" ]; then
+		addToSearchPath GSETTINGS_SCHEMAS_PATH "$1/gsettings-schemas/"*
+	fi
+}
+
+envHooks+=(make_glib_find_gsettings_schemas)
+
+glibPreFixupPhase() {
+	addToSearchPath GSETTINGS_SCHEMAS_PATH "$out/gsettings-schemas/$name"
+}
+
+preFixupPhases="$preFixupPhases glibPreFixupPhase"
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 4740c638633..d79131ac067 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -877,7 +877,7 @@ genericBuild() {
     if [ -z "$phases" ]; then
         phases="$prePhases unpackPhase patchPhase $preConfigurePhases \
             configurePhase $preBuildPhases buildPhase checkPhase \
-            $preInstallPhases installPhase fixupPhase installCheckPhase \
+            $preInstallPhases installPhase $preFixupPhases fixupPhase installCheckPhase \
             $preDistPhases distPhase $postPhases";
     fi
 
diff --git a/pkgs/stdenv/mingw/setup.sh b/pkgs/stdenv/mingw/setup.sh
index 592580a829e..c757eb7ae54 100755
--- a/pkgs/stdenv/mingw/setup.sh
+++ b/pkgs/stdenv/mingw/setup.sh
@@ -725,7 +725,7 @@ genericBuild() {
     if test -z "$phases"; then
         phases="$prePhases unpackPhase patchPhase $preConfigurePhases \
             configurePhase $preBuildPhases buildPhase checkPhase \
-            $preInstallPhases installPhase fixupPhase \
+            $preInstallPhases installPhase $preFixupPhases fixupPhase \
             $preDistPhases distPhase $postPhases";
     fi
 
-- 
GitLab


From 23d38a3e223df9f25ed5493794f21b4a0e9f607c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 16 Mar 2014 08:23:59 +0100
Subject: [PATCH 2867/3789] gcc44: disable parallel build

Maybe 4.4 is no longer needed? #699
---
 pkgs/development/compilers/gcc/4.4/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix
index e81ca398319..99c342da780 100644
--- a/pkgs/development/compilers/gcc/4.4/default.nix
+++ b/pkgs/development/compilers/gcc/4.4/default.nix
@@ -246,7 +246,8 @@ stdenv.mkDerivation ({
       enableMultilib version; };
 
   # ghdl does not build fine with parallel building
-  enableParallelBuilding = !langVhdl && !langAda;
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46173
+  #enableParallelBuilding = !langVhdl && !langAda;
 
   meta = {
     homepage = http://gcc.gnu.org/;
-- 
GitLab


From 1ed628acb21fd8ee7d6b70947b2fbbd61d13ec01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 19 Mar 2014 08:37:05 +0100
Subject: [PATCH 2868/3789] gcc-wrapper: don't fail when cpp doesn't exist

This is fixup for 1d3917bb #1820. Gnatboot doesn't have cpp.
---
 pkgs/build-support/gcc-wrapper/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh
index b19f2dc067c..c79680712ee 100644
--- a/pkgs/build-support/gcc-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-wrapper/builder.sh
@@ -154,7 +154,7 @@ then
     ln -sv g++ $out/bin/c++
 fi
 
-mkGccWrapper $out/bin/cpp $gccPath/cpp
+mkGccWrapper $out/bin/cpp $gccPath/cpp || true
 
 if mkGccWrapper $out/bin/gfortran $gccPath/gfortran
 then
-- 
GitLab


From c4371afd06ae0185aef6bb6d503e2629b5c7cd82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 19 Mar 2014 19:56:51 +0100
Subject: [PATCH 2869/3789] stdenv/setup.sh: make substitute* not drop EOF
 newline

This should solve #1982.
---
 pkgs/stdenv/generic/setup.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index d79131ac067..1d79a45678c 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -304,9 +304,11 @@ substitute() {
 
     local -a params=("$@")
 
-    local n p pattern replacement varName
+    local n p pattern replacement varName content
 
-    local content="$(cat $input)"
+    # a slightly hacky way to keep newline at the end
+    content="$(cat $input; echo -n X)"
+    content="${content%X}"
 
     for ((n = 2; n < ${#params[*]}; n += 1)); do
         p=${params[$n]}
-- 
GitLab


From 0119561d99250a9e2bda50a377d3ba53b9827aba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 2 Apr 2014 21:07:23 +0200
Subject: [PATCH 2870/3789] nodePackages: add react.js and update
 node-packages-generated.nix

---
 pkgs/top-level/node-packages-generated.nix | 256 +++++++++++++++++----
 pkgs/top-level/node-packages.json          |   1 +
 2 files changed, 214 insertions(+), 43 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index d8f4f2078c7..b764512ff0b 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -1018,6 +1018,25 @@
     ];
     passthru.names = [ "backoff" ];
   };
+  by-spec."base62"."0.1.1" =
+    self.by-version."base62"."0.1.1";
+  by-version."base62"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-base62-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/base62/-/base62-0.1.1.tgz";
+        name = "base62-0.1.1.tgz";
+        sha1 = "7b4174c2f94449753b11c2651c083da841a7b084";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."base62" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "base62" ];
+  };
   by-spec."base64-js"."~0.0.4" =
     self.by-version."base64-js"."0.0.6";
   by-version."base64-js"."0.0.6" = lib.makeOverridable self.buildNodePackage {
@@ -5140,6 +5159,29 @@
     ];
     passthru.names = [ "entities" ];
   };
+  by-spec."envify"."~1.2.0" =
+    self.by-version."envify"."1.2.1";
+  by-version."envify"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "envify-1.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/envify/-/envify-1.2.1.tgz";
+        name = "envify-1.2.1.tgz";
+        sha1 = "ac34e3676f9035d59518fef57d9914a24a18767a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."envify" or []);
+    deps = [
+      self.by-version."xtend"."2.1.2"
+      self.by-version."through"."2.3.4"
+      self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"
+      self.by-version."jstransform"."3.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "envify" ];
+  };
   by-spec."errorhandler"."1.0.0" =
     self.by-version."errorhandler"."1.0.0";
   by-version."errorhandler"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -5378,6 +5420,25 @@
     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" =
+    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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz";
+        name = "esprima-fb-3001.1.0-dev-harmony-fb.tgz";
+        sha1 = "b77d37abcd38ea0b77426bb8bc2922ce6b426411";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."esprima-fb" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    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 {
@@ -7515,7 +7576,7 @@
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.4"
-      self.by-version."karma"."0.12.2"
+      self.by-version."karma"."0.12.3"
     ];
     passthru.names = [ "grunt-karma" ];
   };
@@ -8994,6 +9055,34 @@
   by-spec."jsesc"."~0.4.3" =
     self.by-version."jsesc"."0.4.3";
   by-spec."jshint"."*" =
+    self.by-version."jshint"."2.5.0";
+  by-version."jshint"."2.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "jshint-2.5.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/jshint/-/jshint-2.5.0.tgz";
+        name = "jshint-2.5.0.tgz";
+        sha1 = "82fd1a235ffce75fad1b40b2a38bef47beac8c54";
+      })
+    ];
+    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"
+      self.by-version."strip-json-comments"."0.1.1"
+    ];
+    peerDependencies = [
+    ];
+    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";
@@ -9019,9 +9108,6 @@
     ];
     passthru.names = [ "jshint" ];
   };
-  "jshint" = self.by-version."jshint"."2.4.4";
-  by-spec."jshint"."~2.4.0" =
-    self.by-version."jshint"."2.4.4";
   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 {
@@ -9178,6 +9264,28 @@
     ];
     passthru.names = [ "jsprim" ];
   };
+  by-spec."jstransform"."~3.0.0" =
+    self.by-version."jstransform"."3.0.0";
+  by-version."jstransform"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-jstransform-3.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/jstransform/-/jstransform-3.0.0.tgz";
+        name = "jstransform-3.0.0.tgz";
+        sha1 = "a2591ab6cee8d97bf3be830dbfa2313b87cd640b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."jstransform" or []);
+    deps = [
+      self.by-version."base62"."0.1.1"
+      self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"
+      self.by-version."source-map"."0.1.31"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "jstransform" ];
+  };
   by-spec."junk"."~0.2.0" =
     self.by-version."junk"."0.2.2";
   by-version."junk"."0.2.2" = lib.makeOverridable self.buildNodePackage {
@@ -9198,14 +9306,14 @@
     passthru.names = [ "junk" ];
   };
   by-spec."karma"."*" =
-    self.by-version."karma"."0.12.2";
-  by-version."karma"."0.12.2" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-0.12.2";
+    self.by-version."karma"."0.12.3";
+  by-version."karma"."0.12.3" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-0.12.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.12.2.tgz";
-        name = "karma-0.12.2.tgz";
-        sha1 = "9c145720fb088807b3af8de4c68a4c530e45c4de";
+        url = "http://registry.npmjs.org/karma/-/karma-0.12.3.tgz";
+        name = "karma-0.12.3.tgz";
+        sha1 = "2599e3e8797de991cf68ed80290e7462c1e8483d";
       })
     ];
     buildInputs =
@@ -9233,24 +9341,24 @@
     ];
     passthru.names = [ "karma" ];
   };
-  "karma" = self.by-version."karma"."0.12.2";
+  "karma" = self.by-version."karma"."0.12.3";
   by-spec."karma".">=0.11.11" =
-    self.by-version."karma"."0.12.2";
+    self.by-version."karma"."0.12.3";
   by-spec."karma".">=0.9" =
-    self.by-version."karma"."0.12.2";
+    self.by-version."karma"."0.12.3";
   by-spec."karma".">=0.9.3" =
-    self.by-version."karma"."0.12.2";
+    self.by-version."karma"."0.12.3";
   by-spec."karma"."~0.12.0" =
-    self.by-version."karma"."0.12.2";
+    self.by-version."karma"."0.12.3";
   by-spec."karma-chrome-launcher"."*" =
-    self.by-version."karma-chrome-launcher"."0.1.2";
-  by-version."karma-chrome-launcher"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-chrome-launcher-0.1.2";
+    self.by-version."karma-chrome-launcher"."0.1.3";
+  by-version."karma-chrome-launcher"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-chrome-launcher-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.2.tgz";
-        name = "karma-chrome-launcher-0.1.2.tgz";
-        sha1 = "f7154d03be01f4c246368d56d43d7232e14ccce6";
+        url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.3.tgz";
+        name = "karma-chrome-launcher-0.1.3.tgz";
+        sha1 = "b7f82dd9c83c84d26355bf31159739706973a3ec";
       })
     ];
     buildInputs =
@@ -9258,11 +9366,11 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.2"
+      self.by-version."karma"."0.12.3"
     ];
     passthru.names = [ "karma-chrome-launcher" ];
   };
-  "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.2";
+  "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.3";
   by-spec."karma-coverage"."*" =
     self.by-version."karma-coverage"."0.2.1";
   by-version."karma-coverage"."0.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -9282,7 +9390,7 @@
       self.by-version."dateformat"."1.0.7-1.2.3"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.2"
+      self.by-version."karma"."0.12.3"
     ];
     passthru.names = [ "karma-coverage" ];
   };
@@ -9304,7 +9412,7 @@
       self.by-version."xmlbuilder"."0.4.2"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.2"
+      self.by-version."karma"."0.12.3"
     ];
     passthru.names = [ "karma-junit-reporter" ];
   };
@@ -9325,7 +9433,7 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.2"
+      self.by-version."karma"."0.12.3"
       self.by-version."mocha"."1.18.2"
     ];
     passthru.names = [ "karma-mocha" ];
@@ -9347,21 +9455,21 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.2"
+      self.by-version."karma"."0.12.3"
       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.4";
-  by-version."karma-sauce-launcher"."0.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-sauce-launcher-0.2.4";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.4.tgz";
-        name = "karma-sauce-launcher-0.2.4.tgz";
-        sha1 = "9d33b23d44c7580ea0d9d1651fd56d96276d8cd7";
+        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";
       })
     ];
     buildInputs =
@@ -9373,11 +9481,11 @@
       self.by-version."saucelabs"."0.1.1"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.2"
+      self.by-version."karma"."0.12.3"
     ];
     passthru.names = [ "karma-sauce-launcher" ];
   };
-  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.4";
+  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.5";
   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 {
@@ -12630,7 +12738,7 @@
       (fetchurl {
         url = "https://github.com/ciaranj/node-oauth/tarball/master";
         name = "oauth-0.9.11.tgz";
-        sha256 = "8716e78676584860379f3ccc0f510beea508152d1728f3f17e8e760e12b0ef8f";
+        sha256 = "14cc7a064e3eda0948ac8db72fae140cb7b0fdbe031375d02cd6d0359c8b8faa";
       })
     ];
     buildInputs =
@@ -14156,6 +14264,27 @@
   };
   by-spec."rc"."~0.3.4" =
     self.by-version."rc"."0.3.4";
+  by-spec."react"."*" =
+    self.by-version."react"."0.10.0";
+  by-version."react"."0.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-react-0.10.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/react/-/react-0.10.0.tgz";
+        name = "react-0.10.0.tgz";
+        sha1 = "8c82753593d3f325ca99d820f7400ab02f1ee1f8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."react" or []);
+    deps = [
+    ];
+    peerDependencies = [
+      self.by-version."envify"."1.2.1"
+    ];
+    passthru.names = [ "react" ];
+  };
+  "react" = self.by-version."react"."0.10.0";
   by-spec."read"."1" =
     self.by-version."read"."1.0.5";
   by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -15877,14 +16006,14 @@
   by-spec."slide"."~1.1.5" =
     self.by-version."slide"."1.1.5";
   by-spec."smartdc"."*" =
-    self.by-version."smartdc"."7.2.0";
-  by-version."smartdc"."7.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "smartdc-7.2.0";
+    self.by-version."smartdc"."7.2.1";
+  by-version."smartdc"."7.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "smartdc-7.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/smartdc/-/smartdc-7.2.0.tgz";
-        name = "smartdc-7.2.0.tgz";
-        sha1 = "2b4f9375f2c709061e96440976767774d5e4fe86";
+        url = "http://registry.npmjs.org/smartdc/-/smartdc-7.2.1.tgz";
+        name = "smartdc-7.2.1.tgz";
+        sha1 = "6fce690557f6b563c061d6adee161d6b33d06148";
       })
     ];
     buildInputs =
@@ -15902,7 +16031,7 @@
     ];
     passthru.names = [ "smartdc" ];
   };
-  "smartdc" = self.by-version."smartdc"."7.2.0";
+  "smartdc" = self.by-version."smartdc"."7.2.1";
   by-spec."smartdc-auth"."1.0.1" =
     self.by-version."smartdc-auth"."1.0.1";
   by-version."smartdc-auth"."1.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -16143,6 +16272,26 @@
     ];
     passthru.names = [ "source-map" ];
   };
+  by-spec."source-map"."0.1.31" =
+    self.by-version."source-map"."0.1.31";
+  by-version."source-map"."0.1.31" = lib.makeOverridable self.buildNodePackage {
+    name = "node-source-map-0.1.31";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz";
+        name = "source-map-0.1.31.tgz";
+        sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."source-map" or []);
+    deps = [
+      self.by-version."amdefine"."0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "source-map" ];
+  };
   by-spec."source-map"."0.1.x" =
     self.by-version."source-map"."0.1.33";
   by-spec."source-map".">= 0.1.2" =
@@ -16593,6 +16742,25 @@
     ];
     passthru.names = [ "strip-ansi" ];
   };
+  by-spec."strip-json-comments"."0.1.x" =
+    self.by-version."strip-json-comments"."0.1.1";
+  by-version."strip-json-comments"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "strip-json-comments-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.1.tgz";
+        name = "strip-json-comments-0.1.1.tgz";
+        sha1 = "eb5a750bd4e8dc82817295a115dc11b63f01d4b0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."strip-json-comments" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "strip-json-comments" ];
+  };
   by-spec."strong-data-uri"."~0.1.0" =
     self.by-version."strong-data-uri"."0.1.1";
   by-version."strong-data-uri"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -19083,6 +19251,8 @@
     ];
     passthru.names = [ "xtend" ];
   };
+  by-spec."xtend"."~2.1.2" =
+    self.by-version."xtend"."2.1.2";
   by-spec."yargs"."~1.1.2" =
     self.by-version."yargs"."1.1.3";
   by-version."yargs"."1.1.3" = lib.makeOverridable self.buildNodePackage {
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 07adedb9a70..025c636b737 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -120,4 +120,5 @@
 , "gh"
 , "deepmerge"
 , "slasp"
+, "react"
 ]
-- 
GitLab


From 7b6225c3a4104c7fb5a373de7046e82d5eeb4bcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 2 Apr 2014 21:37:27 +0200
Subject: [PATCH 2871/3789] mesa: try enabling tests again

I know this doesn't really belong into this branch, but rebuilding time
is expensive (and I forgot in x-updates).

Tests do work locally for me, but we might hit that mentioned bug again.
---
 pkgs/development/libraries/mesa/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index e5cd54c572f..2996fac4bb0 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -95,8 +95,7 @@ stdenv.mkDerivation {
     ;
 
   enableParallelBuilding = true;
-  #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672,
-    #tests for 10.* fail to link due to some RTTI problem
+  doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672,
 
   # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM;
   #   also move libOSMesa to $osmesa, as it's relatively big
-- 
GitLab


From 0b1e408b6b7c0dcb5d4d800f4795279dda50f9b3 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Tue, 1 Apr 2014 23:52:52 +0200
Subject: [PATCH 2872/3789] vlc: Build with VDPAU support (close #2096)

---
 pkgs/applications/video/vlc/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index de2615d8334..2c5b53c596a 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -6,6 +6,7 @@
 , mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image
 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
 , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
+, libvdpau
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
       udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
       libkate libtiger libv4l samba liboggz libass libdvbpsi libva
       xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
-      libdc1394 libraw1394 libopus libebml libmatroska
+      libdc1394 libraw1394 libopus libebml libmatroska libvdpau
     ];
 
   nativeBuildInputs = [ pkgconfig ];
@@ -34,6 +35,7 @@ stdenv.mkDerivation rec {
       "--with-kde-solid=$out/share/apps/solid/actions"
       "--enable-dc1394"
       "--enable-ncurses"
+      "--enable-vdpau"
     ];
 
   preConfigure = ''sed -e "s@/bin/echo@echo@g" -i configure'';
-- 
GitLab


From 44190ff1b9124735dcc4212c6ae48eb8b9bcc225 Mon Sep 17 00:00:00 2001
From: Gergely Risko <errge@nilcons.com>
Date: Wed, 2 Apr 2014 23:34:31 +0200
Subject: [PATCH 2873/3789] Update ffmpeg dependency in oraclejdk7

---
 pkgs/development/compilers/jdk/jdk7-linux.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/jdk/jdk7-linux.nix
index 106b9fa02d7..2d2c07c67ff 100644
--- a/pkgs/development/compilers/jdk/jdk7-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk7-linux.nix
@@ -9,7 +9,7 @@
 , glib
 , libxml2
 , libav_0_8
-, ffmpeg_0_6
+, ffmpeg
 , libxslt
 , mesa_noglu
 , freetype
@@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
    * libXt is only needed on amd64
    */
   libraries =
-    [stdenv.gcc.libc glib libxml2 libav_0_8 ffmpeg_0_6 libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf] ++
+    [stdenv.gcc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf] ++
     (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.gcc.gcc] else []);
 
   passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
-- 
GitLab


From 0c66dbaee6647abfb4d2774588a0cf0ad8d4f02b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 2 Apr 2014 17:58:54 -0400
Subject: [PATCH 2874/3789] Enable CC_STACKPROTECTOR_REGULAR on linux 3.14+

---
 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 a2b139dc6fc..5aed09105cc 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -167,8 +167,10 @@ with stdenv.lib;
   STRICT_DEVMEM y # Filter access to /dev/mem
   SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
   DEVKMEM n # Disable /dev/kmem
-  ${optionalString (versionOlder version "3.14") ''
+  ${if versionOlder version "3.14" then ''
     CC_STACKPROTECTOR y # Detect buffer overflows on the stack
+  '' else ''
+    CC_STACKPROTECTOR_REGULAR y
   ''}
   ${optionalString (versionAtLeast version "3.12") ''
     USER_NS y # Support for user namespaces
-- 
GitLab


From 7973471c7b18224bcf15a6efb080e328a99fb387 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 30 Mar 2014 20:21:40 +0300
Subject: [PATCH 2875/3789] perlPackages.IOSocketInet6: update from 2.71 to
 2.72

---
 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 f3663083384..43d81b6da86 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4373,10 +4373,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   IOSocketInet6 = buildPerlPackage rec {
-    name = "IO-Socket-INET6-2.71";
+    name = "IO-Socket-INET6-2.72";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
-      sha256 = "041iv3fdskvk7in73bf7253ah9aiqwxzi4zxfiwkn0jlb7mnqjrl";
+      sha256 = "1fqypz6qa5rw2d5y2zq7f49frwra0aln13nhq5gi514j2zx21q45";
     };
     propagatedBuildInputs = [Socket6];
     doCheck = false;
-- 
GitLab


From 9f957d054f0645ae451450fd0240f74243349b64 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 3 Apr 2014 07:03:42 +0300
Subject: [PATCH 2876/3789] hostapd: update from 2.0 to 2.1

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

diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 410fa6a7ad6..a8988f0a452 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -2,11 +2,11 @@
 stdenv.mkDerivation rec {
 
   name = "hostapd-${version}";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchurl {
     url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
-    sha256 = "262ce394b930bccc3d65fb99ee380f28d36444978f524c845a98e8e29f4e9d35";
+    sha256 = "121gpcs1ws7m2v8jk091jhmz3pm2xmhwkv96gqkyb4k0bgsi0waw";
   };
 
   buildInputs = [ libnl openssl pkgconfig ];
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://hostap.epitest.fi;
+    repositories.git = git://w1.fi/hostap.git;
     description = "A user space daemon for access point and authentication servers";
     license = licenses.gpl2;
     maintainers = [ maintainers.phreedom ];
-- 
GitLab


From bf0bc1044d843ae93121eff2e6fd55c7448c7200 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 3 Apr 2014 07:27:31 +0300
Subject: [PATCH 2877/3789] youtubeDL: update from 2014.03.30.1 to 2014.04.02

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 6e2f92e9c1c..1a99cb291c4 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.03.30.1";
+  version = "2014.04.02";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "07xdhgc2sgr7bqkaxwcihvx6l0m6alp3i8d0ij7cxrk6b6rvwrgx";
+    sha256 = "1c9d5wjl0aaqfvz868wbkr3dwby9vjkx0hkbnwx0wnpg48nlnwpm";
   };
 
   buildInputs = [ python ];
-- 
GitLab


From 8654b6b51ce367c2e4980d52766ff7f8d51a84dd Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 3 Apr 2014 07:36:35 +0300
Subject: [PATCH 2878/3789] perlPackages.GD: update from 2.50 to 2.53

---
 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 43d81b6da86..249a8dfe571 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3712,10 +3712,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   GD = buildPerlPackage rec {
-    name = "GD-2.50";
+    name = "GD-2.53";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz";
-      sha256 = "1qm8l0z2568byw4zmaqf954y3rm8nzx1nnz6cxnxd3d4cz894lvd";
+      sha256 = "1ampz82kf0ixybncfgpvq2bp9nq5sjsmmw4c8srsv0g5jpz02pfh";
     };
 
     buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype
-- 
GitLab


From 899fd2942a040ef20c00abb0f9aff63b2f839520 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 3 Apr 2014 07:45:37 +0300
Subject: [PATCH 2879/3789] units: update from 2.02 to 2.10

---
 pkgs/tools/misc/units/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix
index 0d1a962cbf6..84f0f63bd25 100644
--- a/pkgs/tools/misc/units/default.nix
+++ b/pkgs/tools/misc/units/default.nix
@@ -1,13 +1,14 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation {
-  name = "units-2.02";
+  name = "units-2.10";
 
   src = fetchurl {
-    url = mirror://gnu/units/units-2.02.tar.gz;
-    sha256 = "16jfji9g1zc99agd5dcinajinhcxr4dgq2lrbc9md69ir5qgld1b";
+    url = mirror://gnu/units/units-2.10.tar.gz;
+    sha256 = "0fa4bk5aqyis5zisz6l8mqqk76njj6zgx3pbrjp5kvraz1dz78lc";
   };
 
   meta = {
     description = "Unit conversion tool";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From 4bdf7f4bea20023b54a9c0f80e298edef5927cc4 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 3 Apr 2014 07:52:32 +0300
Subject: [PATCH 2880/3789] liboauth: update from 1.0.1 to 1.0.2

---
 pkgs/development/libraries/liboauth/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix
index 5a3b54544b5..b3eee8ed434 100644
--- a/pkgs/development/libraries/liboauth/default.nix
+++ b/pkgs/development/libraries/liboauth/default.nix
@@ -2,11 +2,11 @@
 
 
 stdenv.mkDerivation rec {
-  name = "liboauth-1.0.1";
+  name = "liboauth-1.0.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/liboauth/${name}.tar.gz";
-    sha256 = "12wdwq09nba8dzzcgcpbzmgcjr141ky69pm78s15hyyvw4px71sh";
+    sha256 = "1qs58yzydw20dmzvx22i541w641kwd6ja80s9na1az32n1krh6zv";
   };
 
   buildInputs = [ nss openssl ];
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     description = "C library implementing the OAuth secure authentication protocol";
     homepage = http://liboauth.sourceforge.net/;
+    repositories.git = https://github.com/x42/liboauth.git;
   };
 
 }
-- 
GitLab


From 3830fa819596df1e6d336ee581fc709fecd8cc99 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 3 Apr 2014 07:55:17 +0300
Subject: [PATCH 2881/3789] add git repositry and meta.branch

---
 pkgs/applications/misc/mupdf/default.nix  | 1 +
 pkgs/development/libraries/giflib/4.1.nix | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 57ac7da9b78..ef7571f5d14 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://mupdf.com/;
+    repositories.git = git://git.ghostscript.com/mupdf.git;
     description = "Lightweight PDF viewer and toolkit written in portable C";
     license = "GPLv3+";
     maintainers = with stdenv.lib.maintainers; [ viric ];
diff --git a/pkgs/development/libraries/giflib/4.1.nix b/pkgs/development/libraries/giflib/4.1.nix
index 35d66b3647b..13cd1c79b6a 100644
--- a/pkgs/development/libraries/giflib/4.1.nix
+++ b/pkgs/development/libraries/giflib/4.1.nix
@@ -6,5 +6,8 @@ stdenv.mkDerivation {
     url = mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2;
     sha256 = "1v9b7ywz7qg8hli0s9vv1b8q9xxb2xvqq2mg1zpr73xwqpcwxhg1";
   };
+  meta = {
+    branch = "4.1";
+  };
 }
 
-- 
GitLab


From 901a2fc581c14430c63696a12d5ebfc93ac429d1 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 3 Apr 2014 07:56:36 +0300
Subject: [PATCH 2882/3789] manpages: update from 3.62 to 3.63

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

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index b43cc8a7995..f384aa512eb 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.62";
+  name = "man-pages-3.63";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "1pxnbznrzckzdnlfbdsg9hjd2g93q6b433l4gp095kdxxjqm1mgk";
+    sha256 = "06iw95d3xpr9y5kbf889g4zvqlp7z68yabk3sjylbjdzapyqhgz6";
   };
 
   preBuild =
@@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Linux development manual pages";
     homepage = http://www.kernel.org/doc/man-pages/;
+    repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages;
   };
 }
-- 
GitLab


From 5150da8a5cf1c48c984a2b41e5f7ac4bd47745de Mon Sep 17 00:00:00 2001
From: vi <noreply@example.org>
Date: Thu, 3 Apr 2014 13:39:52 +0800
Subject: [PATCH 2883/3789] Added a derivation for Goerzen's `ftphs`.

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

diff --git a/pkgs/development/libraries/haskell/ftphs/default.nix b/pkgs/development/libraries/haskell/ftphs/default.nix
new file mode 100644
index 00000000000..c682c593ea6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ftphs/default.nix
@@ -0,0 +1,18 @@
+{ cabal, hslogger, MissingH, mtl, network, parsec, regexCompat }:
+
+cabal.mkDerivation (self: {
+  pname = "ftphs";
+  version = "1.0.9.1";
+  sha256 = "1whvawaifhi5xgmiagdayjf7m6p6vs71mvc4a4csd4vzzjr0a2yf";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    hslogger MissingH mtl network parsec regexCompat
+  ];
+  meta = {
+    homepage = "http://software.complete.org/ftphs";
+    description = "FTP Client and Server Library";
+    license = "LGPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d9f00fb3f0b..64bf6e18e0e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1083,6 +1083,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   fileLocation = callPackage ../development/libraries/haskell/file-location {};
 
+  ftphs = callPackage ../development/libraries/haskell/ftphs {};
+
   extensibleEffects = callPackage ../development/libraries/haskell/extensible-effects {};
 
   extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {};
-- 
GitLab


From 685d5a02a23a6fa52a82a79f3ec27d659c5a8a3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 3 Apr 2014 09:12:26 +0200
Subject: [PATCH 2884/3789] mesa: disable tests again

Still affected by https://bugs.freedesktop.org/show_bug.cgi?id=67672
---
 pkgs/development/libraries/mesa/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 2996fac4bb0..b7de29109dc 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation {
     ;
 
   enableParallelBuilding = true;
-  doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672,
+  #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672
 
   # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM;
   #   also move libOSMesa to $osmesa, as it's relatively big
-- 
GitLab


From bf8991175a19f8addd9622c61e7df946dec33522 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 3 Apr 2014 10:22:59 +0300
Subject: [PATCH 2885/3789] global: update from 6.2.9 to 6.2.12

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

diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index d1cd59d8828..4048d21c8f7 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libtool, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "global-6.2.9";
+  name = "global-6.2.12";
 
   src = fetchurl {
     url = "mirror://gnu/global/${name}.tar.gz";
-    sha256 = "00y38kp0zbpjl9c9phldy7j2ihqc54qn4cdgk0azbjdsv75k3n6q";
+    sha256 = "05jkhya1cs6yqhkf8nw5x56adkxxrqyga7sq7hx44dbf7alczwfa";
   };
 
   buildInputs = [ libtool ncurses ];
-- 
GitLab


From 9cc46ebd926b9b76d3c11d186088aa44ab555014 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 3 Apr 2014 10:26:55 +0300
Subject: [PATCH 2886/3789] ipmiutil: update from 2.9.2 to 2.9.3

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

diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index 9f2afb9a0b2..c5f33c32359 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "ipmiutil";
-  version = "2.9.2";
+  version = "2.9.3";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "1n7amk8wbx9a9gbm37nyb8v0c37qgp6hv4hn3nln80rr6g98f9n3";
+    sha256 = "1dwyxp4jn5wxzyahd0x839kj1q7z6xin1wybpx9na4xsgscj6v27";
   };
 
   buildInputs = [ openssl ];
-- 
GitLab


From 9b4080b7af615241f65925f8082bcdb175b11159 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 3 Apr 2014 10:28:15 +0300
Subject: [PATCH 2887/3789] mercurialFull: update from 2.9.1 to 2.9.2

---
 pkgs/applications/version-management/mercurial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 609e2654d59..5fdafe8ac2a 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -2,7 +2,7 @@
 , guiSupport ? false, tk ? null, curses }:
 
 let
-  name = "mercurial-2.9.1";
+  name = "mercurial-2.9.2";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "06n07di6cf57bglnbh8szimngclyvf9c5ismz470gnyb9r1v23x2";
+    sha256 = "0lwgncim4cy91ly8389h2bbhl4nbi8xjgp0kx37kgq8q2lx2nil6";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
-- 
GitLab


From 586d19d787eb4efb9294d3141fd3fff60e83cac2 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 3 Apr 2014 10:30:47 +0300
Subject: [PATCH 2888/3789] mc: update from 4.8.11 to 4.8.12

---
 pkgs/tools/misc/mc/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index 88194ec0fdf..594947ba13d 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -2,11 +2,11 @@
 , libX11, libICE, perl, zip, unzip, gettext, slang}:
 
 stdenv.mkDerivation rec {
-  name = "mc-4.8.11";
+  name = "mc-4.8.12";
   
   src = fetchurl {
-    url = http://www.midnight-commander.org/downloads/mc-4.8.11.tar.bz2;
-    sha256 = "1yjm6rp9h3491mar7vdw88mgvydmz7zdj97mmjkqyf5bidx4w2hf";
+    url = http://www.midnight-commander.org/downloads/mc-4.8.12.tar.bz2;
+    sha256 = "15lkwcis0labshq9k8c2fqdwv8az2c87qpdqwp5p31s8gb1gqm0h";
   };
   
   buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs ];
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "File Manager and User Shell for the GNU Project";
     homepage = http://www.midnight-commander.org;
+    repositories.git = git://github.com/MidnightCommander/mc.git;
     license = "GPLv2+";
     maintainers = [ stdenv.lib.maintainers.sander ];
   };
-- 
GitLab


From dd01251657a968840ce552945747bc1652921e57 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 3 Apr 2014 10:40:05 +0300
Subject: [PATCH 2889/3789] perlPackages.TestWarn: update from 0.24 to 0.30

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 249a8dfe571..98778736f3b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8634,10 +8634,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestWarn = buildPerlPackage {
-    name = "Test-Warn-0.24";
+    name = "Test-Warn-0.30";
     src = fetchurl {
-      url = mirror://cpan/authors/id/C/CH/CHORNY/Test-Warn-0.24.tar.gz;
-      sha256 = "12r1mcwrm6cgc3ppgawwv265vmrighj4bl6xc5c41f4c2l6bdxml";
+      url = mirror://cpan/authors/id/C/CH/CHORNY/Test-Warn-0.30.tar.gz;
+      sha256 = "0haf2ii7br5z0psmkvlvmx2z2q9qz1c70gx0969r378qjidmb5w1";
     };
     propagatedBuildInputs = [ SubUplevel TreeDAGNode ];
     meta = {
-- 
GitLab


From 91dd38ab796c5ed7ce33a222c283b5851ef3e2f9 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 3 Apr 2014 10:42:27 +0300
Subject: [PATCH 2890/3789] perlPackages.TermReadLineGnu: update from 1.20 to
 1.24

---
 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 98778736f3b..dae501c7814 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8055,10 +8055,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TermReadLineGnu = buildPerlPackage rec {
-    name = "Term-ReadLine-Gnu-1.20";
+    name = "Term-ReadLine-Gnu-1.24";
     src = fetchurl {
       url = "mirror://cpan/authors/id/H/HA/HAYASHI/${name}.tar.gz";
-      sha256 = "00fvkqbnpmyld59jv2vbfw1szr5d0xxmbgl59gr7qijp9c497ni5";
+      sha256 = "0dp18pgn8vl4dh6rgzcp1kzk4j6wjrrxd6sfcrrywy7jg4b7ikfc";
     };
     buildInputs = [ pkgs.readline pkgs.ncurses ];
     NIX_CFLAGS_LINK = "-lreadline";
-- 
GitLab


From 5d34b323a56dbd7b1370775b67b449992d9eeb00 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 3 Apr 2014 10:46:02 +0300
Subject: [PATCH 2891/3789] mpv: update from 0.3.2 to 0.3.7

---
 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 f059472aa9b..b37a8a87630 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -52,7 +52,7 @@ let
     sha256 = "03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873";
   };
 
-  version = "0.3.2";
+  version = "0.3.7";
 
 in
 
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
-    sha256 = "1vzdhzry2adyp2yh2dmy1qznqhnzar7g24rhi0vv624jgd20qax2";
+    sha256 = "1qmwmjvgdwh88l2caw2xy1d2h1cdg2w1hl4q5iwx2c0q7a99h41m";
   };
 
   buildInputs = with stdenv.lib;
-- 
GitLab


From c4339a029e163ed3d319847558bb3af26250341c Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Thu, 3 Apr 2014 14:25:37 +0100
Subject: [PATCH 2892/3789] haskellPackages.twitterConduit: New expression

I've had to patch authenticate-oauth to get this working. The patch
comes from a commit that's already in master, so future versions will
have this and it's ok if cabal2nix ends up discarding this information.
---
 .../haskell/authenticate-oauth/RSA2.patch     | 57 +++++++++++++++++++
 .../haskell/authenticate-oauth/default.nix    |  3 +
 .../haskell/twitter-conduit/default.nix       | 28 +++++++++
 .../haskell/twitter-types/default.nix         | 23 ++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++
 5 files changed, 115 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/authenticate-oauth/RSA2.patch
 create mode 100644 pkgs/development/libraries/haskell/twitter-conduit/default.nix
 create mode 100644 pkgs/development/libraries/haskell/twitter-types/default.nix

diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/RSA2.patch b/pkgs/development/libraries/haskell/authenticate-oauth/RSA2.patch
new file mode 100644
index 00000000000..6a888aa3277
--- /dev/null
+++ b/pkgs/development/libraries/haskell/authenticate-oauth/RSA2.patch
@@ -0,0 +1,57 @@
+From c401c2c585b5345243211e981c123a92b995b448 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 25 Jan 2014 13:35:52 +0300
+Subject: [PATCH] authenticate-oauth.cabal: allow RSA-2
+
+The only cosmetic change is rename of 'ha_SHA1' to 'hashSHA1'
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ authenticate-oauth/Web/Authenticate/OAuth.hs | 10 ++++++++--
+ authenticate-oauth/authenticate-oauth.cabal  |  2 +-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/authenticate-oauth/Web/Authenticate/OAuth.hs b/authenticate-oauth/Web/Authenticate/OAuth.hs
+index 3f38c8c..eccd0f1 100644
+--- a/authenticate-oauth/Web/Authenticate/OAuth.hs
++++ b/authenticate-oauth/Web/Authenticate/OAuth.hs
+@@ -21,7 +21,7 @@ module Web.Authenticate.OAuth
+       paramEncode, addScope, addMaybeProxy
+     ) where
+ import           Blaze.ByteString.Builder     (toByteString, Builder)
+-import           Codec.Crypto.RSA             (ha_SHA1, rsassa_pkcs1_v1_5_sign)
++import qualified Codec.Crypto.RSA             as RSA
+ import           Control.Exception
+ import           Control.Monad
+ import           Control.Monad.IO.Class       (MonadIO, liftIO)
+@@ -346,7 +346,13 @@ genSign oa tok req =
+     PLAINTEXT ->
+       return $ BS.intercalate "&" $ map paramEncode [oauthConsumerSecret oa, tokenSecret tok]
+     RSASHA1 pr ->
+-      liftM (encode . toStrict . rsassa_pkcs1_v1_5_sign ha_SHA1 pr) (getBaseString tok req)
++      liftM (encode . toStrict . RSA.rsassa_pkcs1_v1_5_sign
++#if MIN_VERSION_RSA(2, 0, 0)
++                                     RSA.hashSHA1
++#else
++                                     RSA.ha_SHA1
++#endif
++                                     pr) (getBaseString tok req)
+ 
+ #if MIN_VERSION_http_conduit(2, 0, 0)
+ addAuthHeader :: BS.ByteString -> Credential -> Request -> Request
+diff --git a/authenticate-oauth/authenticate-oauth.cabal b/authenticate-oauth/authenticate-oauth.cabal
+index 00507da..e11c3bd 100644
+--- a/authenticate-oauth/authenticate-oauth.cabal
++++ b/authenticate-oauth/authenticate-oauth.cabal
+@@ -19,7 +19,7 @@ library
+                    , transformers                  >= 0.1      && < 0.4
+                    , bytestring                    >= 0.9
+                    , crypto-pubkey-types           >= 0.1      && < 0.5
+-                   , RSA                           >= 1.2      && < 1.3
++                   , RSA                           >= 1.2      && < 2.1
+                    , time
+                    , data-default
+                    , base64-bytestring             >= 0.1      && < 1.1
+-- 
+1.9.1
+
diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
index 15c8267ca3e..9a75bd0cea5 100644
--- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
@@ -7,6 +7,8 @@ cabal.mkDerivation (self: {
   pname = "authenticate-oauth";
   version = "1.4.0.8";
   sha256 = "1mc36d6lkmqywzsxhzwv4445mmwdz0rr5ibd2a1nbgw5c5jw76fy";
+  patches = [ ./RSA2.patch ];
+  patchFlags = "-p2";
   buildDepends = [
     base64Bytestring blazeBuilder blazeBuilderConduit conduit
     cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl
@@ -17,5 +19,6 @@ cabal.mkDerivation (self: {
     description = "Library to authenticate with OAuth for Haskell web applications";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
new file mode 100644
index 00000000000..d3985877077
--- /dev/null
+++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
@@ -0,0 +1,28 @@
+{ cabal, aeson, attoparsec, attoparsecConduit, authenticateOauth
+, conduit, dataDefault, doctest, failure, filepath, hlint
+, httpClientMultipart, httpConduit, httpTypes, lens, liftedBase
+, monadControl, monadLogger, resourcet, shakespeareText, text, time
+, transformers, transformersBase, twitterTypes
+}:
+
+cabal.mkDerivation (self: {
+  pname = "twitter-conduit";
+  version = "0.0.2";
+  sha256 = "1bkn0lfwwr5lnw4xfzdjiad48r1qz6m4z0nq1inz45gflmjwmghj";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson attoparsec attoparsecConduit authenticateOauth conduit
+    dataDefault failure httpClientMultipart httpConduit httpTypes lens
+    liftedBase monadControl monadLogger resourcet shakespeareText text
+    time transformers transformersBase twitterTypes
+  ];
+  testDepends = [ doctest filepath hlint ];
+  meta = {
+    homepage = "https://github.com/himura/twitter-conduit";
+    description = "Twitter API package with conduit interface and Streaming API support";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix
new file mode 100644
index 00000000000..299d39c4546
--- /dev/null
+++ b/pkgs/development/libraries/haskell/twitter-types/default.nix
@@ -0,0 +1,23 @@
+{ cabal, aeson, attoparsec, httpTypes, HUnit, shakespeareText
+, testFramework, testFrameworkHunit, testFrameworkThPrime, text
+, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "twitter-types";
+  version = "0.2.20130101";
+  sha256 = "0y7pymwcv8i5f8hqh4h018xp5bd998l8fx9f2a8x6d53c7l34wmd";
+  buildDepends = [ aeson httpTypes text unorderedContainers ];
+  testDepends = [
+    aeson attoparsec httpTypes HUnit shakespeareText testFramework
+    testFrameworkHunit testFrameworkThPrime text unorderedContainers
+  ];
+  meta = {
+    homepage = "https://github.com/himura/twitter-types";
+    description = "Twitter JSON parser and types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+  doCheck = false;
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 64bf6e18e0e..a963dd2b1e6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2522,6 +2522,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   tuple = callPackage ../development/libraries/haskell/tuple {};
 
+  twitterConduit = callPackage ../development/libraries/haskell/twitter-conduit {};
+
+  twitterTypes = callPackage ../development/libraries/haskell/twitter-types {};
+
   TypeCompose = callPackage ../development/libraries/haskell/TypeCompose {};
 
   typeEq = callPackage ../development/libraries/haskell/type-eq {};
-- 
GitLab


From fee81c37398f547faddfff7ee10d945bb4513f09 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Apr 2014 15:42:18 +0200
Subject: [PATCH 2893/3789] Always enable container logins

---
 nixos/modules/module-list.nix                    | 1 +
 nixos/modules/virtualisation/container-login.nix | 6 ++++--
 nixos/modules/virtualisation/containers.nix      | 1 -
 nixos/modules/virtualisation/nixos-container.pl  | 1 -
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1c2fca1f88b..a7bf69cfc79 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -294,6 +294,7 @@
   ./tasks/scsi-link-power-management.nix
   ./tasks/swraid.nix
   ./testing/service-runner.nix
+  ./virtualisation/container-login.nix
   ./virtualisation/containers.nix
   ./virtualisation/libvirtd.nix
   #./virtualisation/nova.nix
diff --git a/nixos/modules/virtualisation/container-login.nix b/nixos/modules/virtualisation/container-login.nix
index 09eaf90ae65..fb5e333b32a 100644
--- a/nixos/modules/virtualisation/container-login.nix
+++ b/nixos/modules/virtualisation/container-login.nix
@@ -1,8 +1,10 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
+
+with lib;
 
 {
 
-  config = {
+  config = mkIf config.boot.isContainer {
 
     # Provide a login prompt on /var/lib/login.socket.  On the host,
     # you can connect to it by running ‘socat
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 9964cd431cd..6c8a6f876c8 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -105,7 +105,6 @@ in
                         security.initialRootPassword = mkDefault "!";
                         networking.hostName = mkDefault name;
                         networking.useDHCP = false;
-                        imports = [ ./container-login.nix ];
                       };
                     in [ extraConfig config.config ];
                   prefix = [ "containers" name ];
diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index dfc856e8b66..b08ed076658 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -116,7 +116,6 @@ with pkgs.lib;
   security.initialRootPassword = mkDefault "!";
   networking.hostName = mkDefault "$containerName";
   networking.useDHCP = false;
-  imports = [ <nixpkgs/nixos/modules/virtualisation/container-login.nix> ];
   $extraConfig
 }
 EOF
-- 
GitLab


From 269926df0d1e0b03b9697f84e5b9720fa966b293 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Apr 2014 15:43:27 +0200
Subject: [PATCH 2894/3789] container-login.nix -> container-config.nix

---
 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 a7bf69cfc79..e6694b8c99b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -294,7 +294,7 @@
   ./tasks/scsi-link-power-management.nix
   ./tasks/swraid.nix
   ./testing/service-runner.nix
-  ./virtualisation/container-login.nix
+  ./virtualisation/container-config.nix
   ./virtualisation/containers.nix
   ./virtualisation/libvirtd.nix
   #./virtualisation/nova.nix
-- 
GitLab


From 1ad9a654be1120a6844c9eb7520188e874178ebe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Apr 2014 16:02:53 +0200
Subject: [PATCH 2895/3789] Make starting a container synchronous

So now "systemctl start container@foo" will only return after the
container has reached multi-user.target.
---
 ...ntainer-login.nix => container-config.nix} | 14 +++++++++++
 nixos/modules/virtualisation/containers.nix   | 25 ++++++++++++++++---
 2 files changed, 36 insertions(+), 3 deletions(-)
 rename nixos/modules/virtualisation/{container-login.nix => container-config.nix} (79%)

diff --git a/nixos/modules/virtualisation/container-login.nix b/nixos/modules/virtualisation/container-config.nix
similarity index 79%
rename from nixos/modules/virtualisation/container-login.nix
rename to nixos/modules/virtualisation/container-config.nix
index fb5e333b32a..3d107899e4f 100644
--- a/nixos/modules/virtualisation/container-login.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -53,6 +53,20 @@ with lib;
           };
       };
 
+    systemd.services.container-startup-done =
+      { description = "Container Startup Notification";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "multi-user.target" ];
+        script =
+          ''
+            if [ -p /var/lib/startup-done ]; then
+              echo done > /var/lib/startup-done
+            fi
+          '';
+        serviceConfig.Type = "oneshot";
+        serviceConfig.RemainAfterExit = true;
+      };
+
   };
 
 }
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 6c8a6f876c8..9be79cec369 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -150,11 +150,21 @@ in
         path = [ pkgs.iproute ];
 
         environment.INSTANCE = "%i";
+        environment.root = "/var/lib/containers/%i";
+
+        preStart =
+          ''
+            mkdir -p -m 0755 $root/var/lib
+
+            # Create a named pipe to get a signal when the container
+            # has finished booting.
+            rm -f $root/var/lib/startup-done
+            mkfifo $root/var/lib/startup-done
+         '';
 
         script =
           ''
-            root="/var/lib/containers/$INSTANCE"
-            mkdir -p -m 0755 "$root/etc"
+            mkdir -p -m 0755 "$root/etc" "$root/var/lib"
             if ! [ -e "$root/etc/os-release" ]; then
               touch "$root/etc/os-release"
             fi
@@ -209,6 +219,13 @@ in
               "$SYSTEM_PATH/init"
           '';
 
+        postStart =
+          ''
+            # This blocks until the container-startup-done service
+            # writes something to this pipe.
+            read x < $root/var/lib/startup-done
+          '';
+
         preStop =
           ''
             pid="$(cat /sys/fs/cgroup/systemd/machine/$INSTANCE.nspawn/system/tasks 2> /dev/null)"
@@ -238,8 +255,10 @@ in
               . "/etc/containers/$INSTANCE.conf"
             fi
             echo $SYSTEM_PATH/bin/switch-to-configuration test | \
-              ${pkgs.socat}/bin/socat unix:/var/lib/containers/$INSTANCE/var/lib/root-shell.socket -
+              ${pkgs.socat}/bin/socat unix:$root/var/lib/root-shell.socket -
           '';
+
+        serviceConfig.SyslogIdentifier = "container %i";
       };
 
     # Generate a configuration file in /etc/containers for each
-- 
GitLab


From b0b3fa928ad572c67bc3545c2b160bd8aef79d7a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Apr 2014 16:35:11 +0200
Subject: [PATCH 2896/3789] Disable container support in containers

Systemd-nspawn doesn't support nesting, so providing nixos-container
inside a container doesn't make sense.
---
 nixos/modules/virtualisation/containers.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 9be79cec369..097dd3993eb 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -140,7 +140,7 @@ in
   };
 
 
-  config = {
+  config = mkIf (!config.boot.isContainer) {
 
     systemd.services."container@" =
       { description = "Container '%i'";
@@ -222,7 +222,8 @@ in
         postStart =
           ''
             # This blocks until the container-startup-done service
-            # writes something to this pipe.
+            # 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
           '';
 
-- 
GitLab


From 1e4fa227fe434c2042a2c690f62a7072afa36e93 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Apr 2014 16:25:21 +0200
Subject: [PATCH 2897/3789] nixos-container: Don't destroy declarative
 containers

---
 nixos/modules/virtualisation/nixos-container.pl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index b08ed076658..e42a3edd024 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -1,6 +1,7 @@
 #! @perl@
 
 use strict;
+use POSIX;
 use File::Path;
 use File::Slurp;
 use Fcntl ':flock';
@@ -148,6 +149,9 @@ sub stopContainer {
 }
 
 if ($action eq "destroy") {
+    die "$0: cannot destroy declarative container (remove it from your configuration.nix instead)\n"
+        unless POSIX::access($confFile, &POSIX::W_OK);
+
     my $root = "/var/lib/containers/$containerName";
     my $profileDir = "/nix/var/nix/profiles/per-container/$containerName";
 
-- 
GitLab


From 819e7c9fbd57698ecbf3653067c497b5887cfd87 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Apr 2014 16:26:03 +0200
Subject: [PATCH 2898/3789] Add a test for NixOS containers

---
 nixos/modules/installer/cd-dvd/channel.nix |  2 +-
 nixos/tests/containers.nix                 | 79 ++++++++++++++++++++++
 nixos/tests/default.nix                    |  1 +
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/containers.nix

diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index 9aca5b89d25..74428f66dfa 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -28,7 +28,7 @@ in
 {
   # Provide the NixOS/Nixpkgs sources in /etc/nixos.  This is required
   # for nixos-install.
-  boot.postBootCommands =
+  boot.postBootCommands = mkAfter
     ''
       if ! [ -e /var/lib/nixos/did-channel-init ]; then
         echo "unpacking the NixOS/Nixpkgs sources..."
diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix
new file mode 100644
index 00000000000..d72e80b71af
--- /dev/null
+++ b/nixos/tests/containers.nix
@@ -0,0 +1,79 @@
+# Test for NixOS' container support.
+
+{ pkgs, ... }:
+
+{
+
+  machine =
+    { config, pkgs, ... }:
+    { imports = [ ../modules/installer/cd-dvd/channel.nix ];
+      virtualisation.writableStore = true;
+      virtualisation.memorySize = 768;
+
+      containers.webserver =
+        { privateNetwork = true;
+          hostAddress = "10.231.136.1";
+          localAddress = "10.231.136.2";
+          config =
+            { services.httpd.enable = true;
+              services.httpd.adminAddr = "foo@example.org";
+            };
+        };
+
+      virtualisation.pathsInNixDB = [ pkgs.stdenv ];
+    };
+
+  testScript =
+    ''
+      $machine->succeed("nixos-container list") =~ /webserver/;
+
+      # Start the webserver container.
+      $machine->succeed("nixos-container start webserver");
+
+      # Since "start" returns after the container has reached
+      # multi-user.target, we should now be able to access it.
+      my $ip = $machine->succeed("nixos-container show-ip webserver");
+      chomp $ip;
+      $machine->succeed("ping -c1 $ip");
+      $machine->succeed("curl --fail http://$ip/ > /dev/null");
+
+      # Stop the container.
+      $machine->succeed("nixos-container stop webserver");
+      $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null");
+
+      # Make sure we have a NixOS tree (required by ‘nixos-container create’).
+      $machine->succeed("nix-env -qa -A nixos.pkgs.hello >&2");
+
+      # Create some containers imperatively.
+      my $id1 = $machine->succeed("nixos-container create foo --ensure-unique-name");
+      chomp $id1;
+      $machine->log("created container $id1");
+
+      my $id2 = $machine->succeed("nixos-container create foo --ensure-unique-name");
+      chomp $id2;
+      $machine->log("created container $id2");
+
+      die if $id1 eq $id2;
+
+      my $ip1 = $machine->succeed("nixos-container show-ip $id1");
+      chomp $ip1;
+      my $ip2 = $machine->succeed("nixos-container show-ip $id2");
+      chomp $ip2;
+      die if $ip1 eq $ip2;
+
+      # Start one of them.
+      $machine->succeed("nixos-container start $id1");
+
+      # Execute commands via the root shell.
+      $machine->succeed("echo uname | nixos-container root-shell $id1") =~ /Linux/;
+      $machine->succeed("nixos-container set-root-password $id1 foobar");
+
+      # Destroy the containers.
+      $machine->succeed("nixos-container destroy $id1");
+      $machine->succeed("nixos-container destroy $id2");
+
+      # Destroying a declarative container should fail.
+      $machine->fail("nixos-container destroy webserver");
+    '';
+
+}
diff --git a/nixos/tests/default.nix b/nixos/tests/default.nix
index 5b68862a2cd..20deed2a249 100644
--- a/nixos/tests/default.nix
+++ b/nixos/tests/default.nix
@@ -8,6 +8,7 @@ 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);
-- 
GitLab


From f2cb92f5d4ac559c29def5cea90503c93ae0d344 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Apr 2014 20:13:35 +0200
Subject: [PATCH 2899/3789] maxima: update to version 5.33.0

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

diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 684ac321900..7123b476f35 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -2,7 +2,7 @@
 
 let
   name    = "maxima";
-  version = "5.32.1";
+  version = "5.33.0";
 
   searchPath =
     stdenv.lib.makeSearchPath "bin"
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
-    sha256 = "0krxha1jckgw5s52bjasf7bnkcnq81qyi2k1bcglgqzfp79b44gw";
+    sha256 = "13axm11xw0f3frx5b0qdidi7igkn1524fzz77s9rbpl2yy2nrbz2";
   };
 
   buildInputs = [sbcl texinfo perl makeWrapper];
-- 
GitLab


From 6e086caa8aca6c5d90bc32536efd705a674ecd10 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Apr 2014 20:44:31 +0200
Subject: [PATCH 2900/3789] xterm: Don't enable unless X11 is enabled

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

diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix
index edc61c103ea..7321199b818 100644
--- a/nixos/modules/services/x11/desktop-managers/xterm.nix
+++ b/nixos/modules/services/x11/desktop-managers/xterm.nix
@@ -19,7 +19,7 @@ in
 
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf (config.services.xserver.enable && cfg.enable) {
 
     services.xserver.desktopManager.session = singleton
       { name = "xterm";
-- 
GitLab


From 6c6d7dc11db0bf645c1799abd32af2be9094ee0b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 3 Apr 2014 14:19:18 -0500
Subject: [PATCH 2901/3789] ssh: Don't set xauth if not running xserver

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

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index a66679dff90..89333533465 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -31,7 +31,7 @@ in
 
       setXAuthLocation = mkOption {
         type = types.bool;
-        default = true;
+        default = config.services.xserver.enable;
         description = ''
           Whether to set the path to <command>xauth</command> for X11-forwarded connections.
           This causes a dependency on X11 packages.
-- 
GitLab


From 52fbaee8d753ca87c8d6439256e044633ecabe4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 3 Apr 2014 22:46:45 +0200
Subject: [PATCH 2902/3789] solr: add extraJars option

---
 nixos/modules/services/search/solr.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix
index a79b1194c80..a1567c535d9 100644
--- a/nixos/modules/services/search/solr.nix
+++ b/nixos/modules/services/search/solr.nix
@@ -23,6 +23,10 @@ let
       ln -s ${pkgs.ant}/lib/ant/lib/ant.jar $out/lib/
       ln -s ${cfg.solrPackage}/lib/ext/* $out/lib/
       ln -s ${pkgs.openjdk}/lib/openjdk/lib/tools.jar $out/lib/
+    '' + optionalString (cfg.extraJars != []) ''
+      for f in ${concatStringsSep " " cfg.extraJars}; do
+         cp $f $out/lib
+      done
     '';
   };
 
@@ -54,6 +58,14 @@ in {
         '';
       };
 
+      extraJars = mkOption {
+        type = types.listOf types.path;
+        default = [];
+        description = ''
+          List of paths pointing to jars. Jars are copied to commonLibFolder to be available to java/solr.
+        '';
+      };
+
       log4jConfiguration = mkOption {
         type = types.lines;
         default = ''
-- 
GitLab


From 8b5c6172378fdd447fb89acf4dbf2e1d5ed0f416 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 3 Apr 2014 21:36:13 -0400
Subject: [PATCH 2903/3789] Add fuse to env by default

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

diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index b0bcd2eb373..f9b40b8366a 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -148,7 +148,7 @@ in
     system.fsPackages = [ pkgs.dosfstools ];
 
     environment.systemPackages =
-      [ pkgs.ntfs3g pkgs.cifs_utils ]
+      [ pkgs.ntfs3g pkgs.cifs_utils pkgs.fuse ]
       ++ config.system.fsPackages;
 
     environment.etc.fstab.text =
-- 
GitLab


From f82b678508a9c870866522c3779bd4377fe74757 Mon Sep 17 00:00:00 2001
From: Arvin Moezzi <moezzia@gmail.com>
Date: Fri, 4 Apr 2014 09:25:21 +0200
Subject: [PATCH 2904/3789] calibre: upgrade from 1.25.0 to 1.31.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index f3d7c26fe5c..c2d8e7979e4 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-1.25.0";
+  name = "calibre-1.31.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "1y221r5vgq426ldqjrx3qvgf3j3v2wncwzra747psvhwf95zd5fd";
+    sha256 = "1fl42y8ppw8s51v66dqsrg1ib28yi6z5779r9wfvdbl9v1clilfc";
   };
 
   inherit python;
-- 
GitLab


From 7df1ce5088f3404b985aac4bb1814f98463a43a0 Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Thu, 3 Apr 2014 18:54:10 +0200
Subject: [PATCH 2905/3789] syncthing: new package and nixos module

---
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/networking/syncthing.nix | 73 +++++++++++++++++++
 .../networking/syncthing/default.nix          | 51 +++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 127 insertions(+)
 create mode 100644 nixos/modules/services/networking/syncthing.nix
 create mode 100644 pkgs/applications/networking/syncthing/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 652a99e7c5a..5d8461bb885 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -198,6 +198,7 @@
   ./services/networking/sabnzbd.nix
   ./services/networking/searx.nix
   ./services/networking/supybot.nix
+  ./services/networking/syncthing.nix
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
   ./services/networking/tftpd.nix
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
new file mode 100644
index 00000000000..345693fec76
--- /dev/null
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -0,0 +1,73 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.syncthing;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.syncthing = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the Syncthing, self-hosted open-source alternative
+          to Dropbox and BittorrentSync. Initial interface will be
+          available on http://127.0.0.1:8080/.
+        '';
+      };
+
+      user = mkOption {
+        default = "syncthing";
+        description = ''
+          Syncthing will be run under this user (user must exist,
+          this can be your user name).
+        '';
+      };
+
+      dataDir = mkOption {
+        default = "/var/lib/syncthing";
+        description = ''
+          Path where the `.syncthing` (settings and keys) and `Sync`
+          (your synced files) directories will exist. This can be your home
+          directory.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.syncthing.enable {
+
+    systemd.services.syncthing =
+      {
+        description = "Syncthing service";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        environment.STNORESTART = "placeholder";  # do not self-restart
+        environment.HOME = "${config.services.syncthing.dataDir}";
+        serviceConfig = {
+          User = "${config.services.syncthing.user}";
+          ExecStart = "${pkgs.syncthing}/bin/syncthing -home=${config.services.syncthing.dataDir}/.syncthing";
+          Restart = "always";
+        };
+
+      };
+
+    environment.systemPackages = [ pkgs.syncthing ];
+
+  };
+
+}
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
new file mode 100644
index 00000000000..50bc61eeeff
--- /dev/null
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, fetchgit, go }:
+
+stdenv.mkDerivation rec {
+  name = "syncthing-${version}";
+  version = "0.7.1";
+
+  src = fetchgit {
+    url = "git://github.com/calmh/syncthing.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "1rja837kimiq15km8cridbm5yxvkm6mkvkwywdi76qf9rm0pcjl1";
+  };
+
+  buildInputs = [ go ];
+
+  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"
+
+    export GOPATH="`pwd`/Godeps/_workspace:`pwd`/dependencies"
+
+    go test -cpu=1,2,4 ./...
+
+    mkdir ./bin
+
+    go build -o ./bin/syncthing -ldflags "-w -X main.Version v${version}" ./cmd/syncthing
+    go build -o ./bin/stcli -ldflags "-w -X main.Version v${version}" ./cmd/stcli
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp -r ./bin $out
+  '';
+
+  meta = {
+    homepage = http://syncthing.net/;
+    description = "Syncthing replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized";
+    license = with stdenv.lib.licenses; mit;
+    maintainers = with stdenv.lib.maintainers; [ matejc ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efe5e3834ea..5c43aa90d2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9111,6 +9111,8 @@ let
     gpgSupport = true;
   };
 
+  syncthing = callPackage ../applications/networking/syncthing { };
+
   # linux only by now
   synergy = callPackage ../applications/misc/synergy { };
 
-- 
GitLab


From f530ead0ba741bc588fd679297364885a3f421a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 4 Apr 2014 10:46:19 +0200
Subject: [PATCH 2906/3789] syncthing: add preStart script to create dataDir

---
 nixos/modules/services/networking/syncthing.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 345693fec76..8ca16730a94 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -49,7 +49,7 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.syncthing.enable {
+  config = mkIf cfg.enable {
 
     systemd.services.syncthing =
       {
@@ -57,12 +57,17 @@ in
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         environment.STNORESTART = "placeholder";  # do not self-restart
-        environment.HOME = "${config.services.syncthing.dataDir}";
+        environment.HOME = "${cfg.dataDir}";
         serviceConfig = {
-          User = "${config.services.syncthing.user}";
-          ExecStart = "${pkgs.syncthing}/bin/syncthing -home=${config.services.syncthing.dataDir}/.syncthing";
+          User = "${cfg.user}";
+          PermissionsStartOnly = true;
           Restart = "always";
+          ExecStart = "${pkgs.syncthing}/bin/syncthing -home=${cfg.dataDir}/.syncthing";
         };
+        preStart = ''
+          mkdir -p ${cfg.dataDir}
+          chown ${cfg.user} ${cfg.dataDir}
+        '';
 
       };
 
-- 
GitLab


From ece01ad65f27fa2b0f0c715b1d9c5d0d5c91e424 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Fri, 4 Apr 2014 16:35:44 +0400
Subject: [PATCH 2907/3789] vacuum-graphviz: add pkg

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

diff --git a/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix b/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix
new file mode 100644
index 00000000000..3810512756f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix
@@ -0,0 +1,13 @@
+{ cabal, filepath, graphviz, vacuum }:
+
+cabal.mkDerivation (self: {
+  pname = "vacuum-graphviz";
+  version = "2.1.0.1";
+  sha256 = "093ba6n30a6gyifnk3bd50rkx8qldjqq9vsk92pnq152ibs36b2m";
+  buildDepends = [ filepath graphviz vacuum ];
+  meta = {
+    description = "A library for transforming vacuum graphs into GraphViz output";
+    license = self.stdenv.lib.licenses.gpl3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a963dd2b1e6..522baf33ff2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2584,6 +2584,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   vacuumCairo = callPackage ../development/libraries/haskell/vacuum-cairo {};
 
+  vacuumGraphviz = callPackage ../development/libraries/haskell/vacuum-graphviz {};
+
   vado = callPackage ../development/libraries/haskell/vado {};
 
   vault = callPackage ../development/libraries/haskell/vault {};
-- 
GitLab


From d89138f6ac1c7047c0ef496d8fd37f07bbab9dba Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Fri, 4 Apr 2014 17:04:32 +0400
Subject: [PATCH 2908/3789] vacuum-graphviz: add jailbreak

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

diff --git a/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix b/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix
index 3810512756f..2db9e3c83c1 100644
--- a/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix
+++ b/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "2.1.0.1";
   sha256 = "093ba6n30a6gyifnk3bd50rkx8qldjqq9vsk92pnq152ibs36b2m";
   buildDepends = [ filepath graphviz vacuum ];
+  jailbreak = true;
   meta = {
     description = "A library for transforming vacuum graphs into GraphViz output";
     license = self.stdenv.lib.licenses.gpl3;
-- 
GitLab


From 1abd4b2264043d1a33ebb85ba0595d5448a96dbf Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Fri, 4 Apr 2014 16:04:26 +0200
Subject: [PATCH 2909/3789] libdvdread: update to 4.2.1

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

diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index ee5d2e5e50e..2593274d89b 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libdvdcss}:
 
 stdenv.mkDerivation {
-  name = "libdvdread-4.1.3";
+  name = "libdvdread-4.2.1";
   
   src = fetchurl {
-    url = http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-4.1.3.tar.bz2;
-    sha1 = "fc4c7ba3e49929191e057b435bc4f867583ea8d5";
+    url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.2.1.tar.xz;
+    sha256 = "af9b98f049580a6521d56c978b736d3d609562dd12955e11d50e26d97542dcd4";
   };
 
   buildInputs = [libdvdcss];
-- 
GitLab


From 13f40aea332f84bb82f1aed9a7ba62423d439b93 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Fri, 4 Apr 2014 16:14:38 +0200
Subject: [PATCH 2910/3789] libpwquality: factor out from gnome-control-center

---
 .../core/gnome-control-center/default.nix     | 23 +++++--------------
 .../libraries/libpwquality/default.nix        | 12 ++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 20 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/libraries/libpwquality/default.nix

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 ed9adb370d4..6b8f427d410 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -1,24 +1,13 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, libcanberra, accountservice
-, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk, pulseaudio, fontconfig
-, cracklib, python, krb5, networkmanagerapplet, libwacom, samba, libnotify, libxkbfile
-, shared_mime_info, tzdata, icu, libtool, docbook_xsl, docbook_xsl_ns, makeWrapper }:
+{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
+, libcanberra, accountservice, libpwquality, pulseaudio, fontconfig
+, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk, libxkbfile
+, cracklib, python, krb5, networkmanagerapplet, libwacom, samba, libnotify
+, shared_mime_info, tzdata, icu, libtool, docbook_xsl, docbook_xsl_ns }:
 
 # http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
 # TODO: bluetooth, networkmanager, wacom, smbclient, printers
 
-let
-  libpwquality = stdenv.mkDerivation rec {
-    name = "libpwquality-1.2.3";
-
-    src = fetchurl {
-      url = "https://fedorahosted.org/releases/l/i/libpwquality/${name}.tar.bz2";
-      sha256 = "0sjiabvl5277nfxyy96jdz65a0a3pmkkwrfbziwgik83gg77j75i";
-    };
-
-    buildInputs = [ cracklib python ];
-  };
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "gnome-control-center-3.10.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix
new file mode 100644
index 00000000000..aaa39783fa7
--- /dev/null
+++ b/pkgs/development/libraries/libpwquality/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, cracklib, fetchurl, python }:
+
+stdenv.mkDerivation rec {
+  name = "libpwquality-1.2.3";
+
+  src = fetchurl {
+    url = "https://fedorahosted.org/releases/l/i/libpwquality/${name}.tar.bz2";
+    sha256 = "0sjiabvl5277nfxyy96jdz65a0a3pmkkwrfbziwgik83gg77j75i";
+  };
+
+  buildInputs = [ cracklib python ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c43aa90d2c..1daa2eba8a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5112,6 +5112,8 @@ let
 
   libpseudo = callPackage ../development/libraries/libpseudo { };
 
+  libpwquality = callPackage ../development/libraries/libpwquality { };
+  
   libqalculate = callPackage ../development/libraries/libqalculate { };
 
   librsvg = callPackage ../development/libraries/librsvg {
-- 
GitLab


From a86c688e6659efda324afbbf74eec9957b240e4a Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Fri, 4 Apr 2014 16:04:39 +0200
Subject: [PATCH 2911/3789] gnome-disk-utility: new package

A udisks graphical front-end

http://en.wikipedia.org/wiki/GNOME_Disks
---
 .../core/gnome-disk-utility/default.nix       | 47 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix

diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
new file mode 100644
index 00000000000..9ab5259a630
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -0,0 +1,47 @@
+{ 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.12.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-disk-utility/3.12/${name}.tar.xz";
+    sha256 = "46e0698c4a7baa8719a79935066e103447011fb47528a28dbb49e35eeec409d8";
+  };
+
+  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 ];
+
+  installFlags = "gsettingsschemadir=\${out}/share/gnome-disk-utility/glib-2.0/schemas/";
+
+  postInstall = ''
+    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:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/gnome-disk-utility:$XDG_ICON_DIRS"
+  '';
+
+  preFixup = ''
+    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/default.nix b/pkgs/desktops/gnome-3/default.nix
index 6a404d0a4b4..b4bb2c8320e 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -44,6 +44,8 @@ rec {
 
   gnome_common = callPackage ./core/gnome-common { };
 
+  gnome-disk-utility = callPackage ./core/gnome-disk-utility { };
+
   gnome-font-viewer = callPackage ./core/gnome-font-viewer { };
 
   gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
-- 
GitLab


From d2ca851c0433b0f49839e8c1fdf67a85f718e787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 4 Apr 2014 16:48:10 +0200
Subject: [PATCH 2912/3789] python-autopep8: new package

autopep8 is a tool that automatically formats Python code to conform to
the PEP 8 style guide.

https://pypi.python.org/pypi/autopep8/
---
 pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 11c8feb48b8..c37ef8e0e00 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -460,6 +460,29 @@ rec {
     };
   });
 
+  autopep8 = buildPythonPackage (rec {
+    name = "autopep8-1.0";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/a/autopep8/${name}.tar.gz";
+      md5 = "41782e66efcbaf9d761bb45a2d2929bb";
+    };
+
+    propagatedBuildInputs = [ pep8 ];
+
+    # One test fails:
+    # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests)
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "A tool that automatically formats Python code to conform to the PEP 8 style guide";
+      homepage = https://pypi.python.org/pypi/autopep8/;
+      license = licenses.mit;
+      platforms = platforms.all;
+      maintainers = [ maintainers.bjornfor ];
+    };
+  });
+
   backports_ssl_match_hostname_3_4_0_2 = pythonPackages.buildPythonPackage rec {
     name = "backports.ssl_match_hostname-3.4.0.2";
 
-- 
GitLab


From 4ab58240a9c5cf977767965d978a8f6bb7127f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 4 Apr 2014 20:29:10 +0200
Subject: [PATCH 2913/3789] pidgin: adopt the orphan, as I use it daily

CC #992.
---
 .../networking/instant-messengers/pidgin/default.nix             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 41a1abc5ee7..6e6fd6d0eb6 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -56,5 +56,6 @@ stdenv.mkDerivation rec {
     homepage = http://pidgin.im;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
+    maintainers = [ maintainers.vcunat ];
   };
 }
-- 
GitLab


From c6797b373f379f7a7f8a7da01bdf3f6751f11f2e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 4 Apr 2014 17:05:57 -0400
Subject: [PATCH 2914/3789] Turn on user-controlled wpa-cli on the livecd

Fixes #1204
---
 nixos/modules/profiles/installation-device.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 3b058c6e971..85ae51ec68e 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -45,6 +45,7 @@ with pkgs.lib;
 
     # Enable wpa_supplicant, but don't start it by default.
     networking.wireless.enable = true;
+    networking.wireless.userControlled.enable = true;
     jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 "";
 
     # Tell the Nix evaluator to garbage collect more aggressively.
-- 
GitLab


From 671e346eb28a84787ad7bf34cd38b54e190b28fb Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 4 Apr 2014 23:21:38 +0200
Subject: [PATCH 2915/3789] gnome3: add glib-networking gio modules

With glib-networking, epiphany and other gnome apps
can access https and other networking protocols.
---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 85be61bfc1e..f4230fd1dd2 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -43,7 +43,8 @@ in {
         '';
       };
 
-    environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules" ];
+    environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules"
+                                                "${pkgs.glib_networking}/lib/gio/modules" ];
     environment.systemPackages =
       [ gnome3.evince
         gnome3.eog
@@ -54,6 +55,7 @@ in {
         gnome3.gucharmap
         gnome3.nautilus
         gnome3.yelp
+        pkgs.glib_networking
         pkgs.ibus
         gnome3.gnome_shell
         gnome3.gnome_settings_daemon
-- 
GitLab


From 6df2b09015fc6f107ee20d0f75375266efc72fd3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 5 Apr 2014 00:19:56 +0200
Subject: [PATCH 2916/3789] haskell-ghc-mod: revert update to version 4.x

flymake-mode no longer works in the new version. This needs further
testing before we can upgrade.
---
 .../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 fca6ea9cd55..260fff8ae82 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, doctest, emacs, filepath, ghcPaths
+, ghcSybUtils, hlint, hspec, ioChoice, syb, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "4.0.0";
-  sha256 = "11l0wycx0l0wqq8a3wsiw88fr8pahjzh65yxqw6r1rgj10cszai8";
+  version = "3.1.7";
+  sha256 = "1mv6m1fcqkm4i27jw1aniwfq2dhpn4m7kicyq4l70zmkfr7y7c5s";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    Cabal convertible filepath ghcSybUtils hlint ioChoice syb time
-    transformers
+    Cabal convertible filepath ghcPaths ghcSybUtils hlint ioChoice syb
+    time transformers
   ];
   testDepends = [
-    Cabal convertible doctest filepath ghcSybUtils hlint hspec ioChoice
-    syb time transformers
+    Cabal convertible doctest filepath ghcPaths ghcSybUtils hlint hspec
+    ioChoice syb time transformers
   ];
   buildTools = [ emacs ];
   postInstall = ''
-- 
GitLab


From 750d5e4a83ef1d99ec8f9f2b302364ed27726588 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 5 Apr 2014 00:32:19 +0200
Subject: [PATCH 2917/3789] gnome-control-center: show icons

---
 .../gnome-3/core/gnome-control-center/default.nix    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 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 6b8f427d410..ac9c53422b3 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -1,7 +1,8 @@
 { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
 , libcanberra, accountservice, libpwquality, pulseaudio, fontconfig
-, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk, libxkbfile
-, cracklib, python, krb5, networkmanagerapplet, libwacom, samba, libnotify
+, 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 }:
 
 # http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
@@ -15,6 +16,10 @@ stdenv.mkDerivation rec {
     sha256 = "1ac34kqkf174w0qc12p927dfhcm69xnv7fqzmbhjab56rn49wypn";
   };
 
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
   buildInputs = with gnome3;
     [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
       libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
@@ -33,7 +38,8 @@ stdenv.mkDerivation rec {
 
   postInstall = with gnome3; ''
     wrapProgram $out/bin/gnome-control-center \
-      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:${gnome_settings_daemon}/share:${glib}/share:${gtk}/share:${colord}/share:$out/share"
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${gsettings_desktop_schemas}/share:${gnome_settings_daemon}/share:${glib}/share:${gtk}/share:${colord}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS"
     for i in $out/share/applications/*; do
       substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
     done
-- 
GitLab


From c69eb7c2c1d996ae07725ae9763a7484c2afb449 Mon Sep 17 00:00:00 2001
From: Alexander Kjeldaas <ak@formalprivacy.com>
Date: Tue, 13 Aug 2013 14:26:35 +0200
Subject: [PATCH 2918/3789] Remove timestamp from the kernel.

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

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 6805355052a..47f5c034c74 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -102,7 +102,11 @@ let
         runHook postConfigure
       '';
 
-      buildFlags = [ "KBUILD_BUILD_VERSION=1-NixOS" platform.kernelTarget ] ++ optional isModular "modules";
+      buildFlags = [
+        "KBUILD_BUILD_VERSION=1-NixOS"
+        "KBUILD_BUILD_TIMESTAMP=Thu_Jan__1_00:00:01_UTC_1970"
+	platform.kernelTarget
+      ] ++ optional isModular "modules";
 
       installFlags = [
         "INSTALLKERNEL=${installkernel}"
-- 
GitLab


From f67015cae49400eba539b9ec8b9920643581c77c Mon Sep 17 00:00:00 2001
From: Alexander Kjeldaas <ak@formalprivacy.com>
Date: Fri, 16 Aug 2013 02:42:11 +0200
Subject: [PATCH 2919/3789] Make initrd and the kernel builds repeatable.

---
 pkgs/build-support/kernel/cpio-clean.pl   | 20 ++++++++++++++++++++
 pkgs/build-support/kernel/make-initrd.nix |  5 +++--
 pkgs/build-support/kernel/make-initrd.sh  |  2 +-
 pkgs/top-level/all-packages.nix           |  4 +++-
 pkgs/top-level/perl-packages.nix          |  8 ++++++++
 5 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/build-support/kernel/cpio-clean.pl

diff --git a/pkgs/build-support/kernel/cpio-clean.pl b/pkgs/build-support/kernel/cpio-clean.pl
new file mode 100644
index 00000000000..de38dee49f0
--- /dev/null
+++ b/pkgs/build-support/kernel/cpio-clean.pl
@@ -0,0 +1,20 @@
+use strict;
+
+# Make inode number, link info and mtime consistent in order to get a consistent hash.
+#
+# Author: Alexander Kjeldaas <ak@formalprivacy.com>
+
+use Archive::Cpio;
+
+my $cpio = Archive::Cpio->new;
+my $IN = \*STDIN;
+my $ino = 1;
+$cpio->read_with_handler($IN, sub {
+        my ($e) = @_;
+        $e->{inode} = $ino;
+        $ino++;
+        $e->{nlink} = 1;
+        $e->{mtime} = 1;
+	$cpio->write_one(\*STDOUT, $e);
+    });
+$cpio->write_trailer(\*STDOUT);
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix
index 4ddf0706e03..0582ca55301 100644
--- a/pkgs/build-support/kernel/make-initrd.nix
+++ b/pkgs/build-support/kernel/make-initrd.nix
@@ -12,10 +12,10 @@
 # `contents = {object = ...; symlink = /init;}' is a typical
 # argument.
 
-{stdenv, perl, cpio, contents, ubootChooser, compressor}:
+{stdenv, perl, perlArchiveCpio, cpio, contents, ubootChooser, compressor}:
 
 let
-  inputsFun = ubootName : [perl cpio]
+  inputsFun = ubootName : [perl cpio perlArchiveCpio ]
     ++ stdenv.lib.optional (ubootName != null) [ (ubootChooser ubootName) ];
   makeUInitrdFun = ubootName : (ubootName != null);
 in
@@ -35,6 +35,7 @@ stdenv.mkDerivation {
   exportReferencesGraph =
     map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents;
   pathsFromGraph = ./paths-from-graph.pl;
+  cpioClean = ./cpio-clean.pl;
 
   crossAttrs = {
     nativeBuildInputs = inputsFun stdenv.cross.platform.uboot;
diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh
index f6cadaf0281..17b261f9840 100644
--- a/pkgs/build-support/kernel/make-initrd.sh
+++ b/pkgs/build-support/kernel/make-initrd.sh
@@ -36,7 +36,7 @@ storePaths=$(perl $pathsFromGraph closure-*)
 
 # Put the closure in a gzipped cpio archive.
 mkdir -p $out
-(cd root && find * -print0 | cpio -o -H newc --null | $compressor > $out/initrd)
+(cd root && find * -print0 | cpio -o -H newc --null | perl $cpioClean | $compressor > $out/initrd)
 
 if [ -n "$makeUInitrd" ]; then
     mv $out/initrd $out/initrd.gz
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efe5e3834ea..c1c5092b5e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -354,7 +354,7 @@ let
 
   makeInitrd = {contents, compressor ? "gzip -9"}:
     import ../build-support/kernel/make-initrd.nix {
-      inherit stdenv perl cpio contents ubootChooser compressor;
+      inherit stdenv perl perlArchiveCpio cpio contents ubootChooser compressor;
     };
 
   makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
@@ -6179,6 +6179,8 @@ let
 
   ack = perlPackages.ack;
 
+  perlArchiveCpio = perlPackages.ArchiveCpio;
+
   perlcritic = perlPackages.PerlCritic;
   
   planetary_annihilation = callPackage ../games/planetaryannihilation { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index dae501c7814..6ac7f76e3c5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -200,6 +200,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ArchiveCpio = buildPerlPackage {
+    name = "Archive-Cpio-0.09";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PI/PIXEL/Archive-Cpio-0.09.tar.gz;
+      sha256 = "1cf8k5zjykdbc1mn8lixlkij6jklwn6divzyq2grycj3rpd36g5c";
+    };
+  };
+
   ArchiveZip = buildPerlPackage {
     name = "Archive-Zip-1.16";
     src = fetchurl {
-- 
GitLab


From 4aeb10b09a02a64f9839c61d02875e75531845cc Mon Sep 17 00:00:00 2001
From: Alexander Kjeldaas <ak@formalprivacy.com>
Date: Tue, 1 Oct 2013 13:14:14 +0200
Subject: [PATCH 2920/3789] Make cpufrequtils compilation pure.

---
 .../linux/cpufrequtils/default.nix            |  5 ++++
 .../remove-pot-creation-date.patch            | 24 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/os-specific/linux/cpufrequtils/remove-pot-creation-date.patch

diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix
index c94e22adb38..d056e60f2da 100644
--- a/pkgs/os-specific/linux/cpufrequtils/default.nix
+++ b/pkgs/os-specific/linux/cpufrequtils/default.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
     sha256 = "127i38d4w1hv2dzdy756gmbhq25q3k34nqb2s0xlhsfhhdqs0lq0";
   };
 
+  patches = [
+    # I am not 100% sure that this is ok, but it breaks repeatable builds.
+    ./remove-pot-creation-date.patch
+  ];
+
   patchPhase = ''
     sed -e "s@= /usr/bin/@= @g" \
       -e "s@/usr/@$out/@" \
diff --git a/pkgs/os-specific/linux/cpufrequtils/remove-pot-creation-date.patch b/pkgs/os-specific/linux/cpufrequtils/remove-pot-creation-date.patch
new file mode 100644
index 00000000000..0116ed9eab0
--- /dev/null
+++ b/pkgs/os-specific/linux/cpufrequtils/remove-pot-creation-date.patch
@@ -0,0 +1,24 @@
+diff -u cpufrequtils-008/Makefile cpufrequtils-008.new/Makefile
+--- cpufrequtils-008/Makefile	2012-05-06 01:17:18.000000000 +0200
++++ cpufrequtils-008.new/Makefile	2013-08-16 20:52:29.961086536 +0200
+@@ -205,7 +205,8 @@
+ 	@xgettext --default-domain=$(PACKAGE) --add-comments \
+ 		--keyword=_ --keyword=N_ $(UTIL_SRC) && \
+ 	test -f $(PACKAGE).po && \
+-	mv -f $(PACKAGE).po po/$(PACKAGE).pot
++	mv -f $(PACKAGE).po po/$(PACKAGE).pot && \
++        sed -i -e'/POT-Creation/d' po/*.pot
+ 
+ update-gmo: po/$(PACKAGE).pot
+ 	 @for HLANG in $(LANGUAGES); do \
+@@ -217,6 +218,7 @@
+ 			echo "msgmerge for $$HLANG failed!"; \
+ 			rm -f po/$$HLANG.new.po; \
+ 		fi; \
++		sed -i -e'/POT-Creation/d' po/*.po; \
+ 		msgfmt --statistics -o po/$$HLANG.gmo po/$$HLANG.po; \
+ 	done;
+ 
+Common subdirectories: cpufrequtils-008/man and cpufrequtils-008.new/man
+Common subdirectories: cpufrequtils-008/po and cpufrequtils-008.new/po
+Common subdirectories: cpufrequtils-008/utils and cpufrequtils-008.new/utils
-- 
GitLab


From 85b1ede2bfa8c8e7cf946a7372d3b05f15e7735a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 5 Apr 2014 12:53:28 +0200
Subject: [PATCH 2921/3789] glib gschemas hook: fixup #1901

- move frome $out to $out/share
- fix quoting that prevented globbing
- indent by spaces (as it is more common in nixpkgs; 4 spaces for shell)

More work is still needed for some individual packages.
---
 pkgs/development/libraries/glib/setup-hook.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh
index e5c0c372da0..f173744e5ca 100644
--- a/pkgs/development/libraries/glib/setup-hook.sh
+++ b/pkgs/development/libraries/glib/setup-hook.sh
@@ -1,17 +1,17 @@
 # Install gschemas, if any, in a package-specific directory
-installFlagsArray+=("gsettingsschemadir=$out/gsettings-schemas/$name/glib-2.0/schemas/")
+installFlagsArray+=("gsettingsschemadir=$out/share/gsettings-schemas/$name/glib-2.0/schemas/")
 
 make_glib_find_gsettings_schemas() {
-	# For packages that need gschemas of other packages (e.g. empathy)
-	if [ -d "$1/gsettings-schemas/*/glib-2.0/schemas" ]; then
-		addToSearchPath GSETTINGS_SCHEMAS_PATH "$1/gsettings-schemas/"*
-	fi
+    # For packages that need gschemas of other packages (e.g. empathy)
+    if [ -d "$1"/share/gsettings-schemas/*/glib-2.0/schemas ]; then
+        addToSearchPath GSETTINGS_SCHEMAS_PATH "$1/share/gsettings-schemas/"*
+    fi
 }
 
 envHooks+=(make_glib_find_gsettings_schemas)
 
 glibPreFixupPhase() {
-	addToSearchPath GSETTINGS_SCHEMAS_PATH "$out/gsettings-schemas/$name"
+    addToSearchPath GSETTINGS_SCHEMAS_PATH "$out/share/gsettings-schemas/$name"
 }
 
 preFixupPhases="$preFixupPhases glibPreFixupPhase"
-- 
GitLab


From 413ebfb2469b394a4f4d48ba3567be3c68344722 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 23 Mar 2014 18:12:07 +0100
Subject: [PATCH 2922/3789] virt-manager: update to 1.0.1, fix & update
 dependencies, gtk3 support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Vte, add gtk3 support, enable introspection, update to 0.35.90
- Spice-gtk, add gtk3 support
- gtk-vnc, add gtk3 support
- Add libvirt-glib (thanks @bjornfor)
- Add usbredir
- qemu, enable usbredir
- spice-gtk, enable usbredir
- virt-manager, update to 1.0.1

[Bjørn:
* Set namePrefix = "" to preserve package name "virt-manager"
  (instead of "python2.7-virt-manager")
* Add dconf to GIO_EXTRA_MODULES to get persistent settings in
  virt-manager. Without it:
  GLib-GIO-Message: Using the 'memory' GSettings backend. Your settings will not be saved or shared with other applications.
* Add ${gtk3}/share to XDG_DATA_DIRS to unbreak "Take Screenshot"
  feature (fixes "Settings schema 'org.gtk.Settings.FileChooser' is not installed")
* gtk-vnc: don't pull "pkgs" attrset for optionalString, use stdenv.lib.optionalString instead.
]
---
 .../virtualization/qemu/default.nix           |  4 +-
 .../virtualization/virt-manager/default.nix   | 91 +++++++++----------
 pkgs/desktops/gnome-3/core/vte/default.nix    | 23 ++---
 .../libraries/libvirt-glib/default.nix        | 48 ++++++++++
 .../libraries/spice-gtk/default.nix           | 11 ++-
 .../libraries/usbredir/default.nix            | 23 +++++
 pkgs/tools/admin/gtk-vnc/default.nix          | 19 ++--
 pkgs/top-level/all-packages.nix               | 11 ++-
 8 files changed, 148 insertions(+), 82 deletions(-)
 create mode 100644 pkgs/development/libraries/libvirt-glib/default.nix
 create mode 100644 pkgs/development/libraries/usbredir/default.nix

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 7f3bf8fafc8..af2e1efb59e 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -3,7 +3,7 @@
 , makeWrapper
 , sdlSupport ? true, SDL
 , vncSupport ? true, libjpeg, libpng
-, spiceSupport ? true, spice, spice_protocol
+, spiceSupport ? true, spice, spice_protocol, usbredir
 , x86Only ? false
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     ]
     ++ stdenv.lib.optionals sdlSupport [ SDL ]
     ++ stdenv.lib.optionals vncSupport [ libjpeg libpng ]
-    ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ];
+    ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice usbredir ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index fb2dde66442..dba0d11b425 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -1,74 +1,67 @@
 { stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl, python
 , makeWrapper, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc, vte
-, spiceSupport ? true, spice_gtk
+, gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib
+, avahi, dconf, spiceSupport ? true, spice_gtk
 }:
 
 with stdenv.lib;
+with pythonPackages;
 
-let version = "0.9.5"; in
-
-stdenv.mkDerivation rec {
+buildPythonPackage rec {
   name = "virt-manager-${version}";
+  version = "1.0.1";
+  namePrefix = "";
 
   src = fetchurl {
-    url = "http://virt-manager.et.redhat.com/download/sources/virt-manager/virt-manager-${version}.tar.gz";
-    sha256 = "0gc06cdbq6c2a06l939516lvjii7lr0wng90kqgl1i5q5wlgnajx";
+    url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
+    sha256 = "1n248kack1fni8y17ysgq5xhvffcgy4l62hnd0zvr4kjw0579qq8";
   };
 
-  pythonPath = with pythonPackages;
-    [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes
+  propagatedBuildInputs =
+    [ eventlet greenlet gflags netaddr sqlalchemy carrot routes
       paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate
       distutils_extra simplejson readline glance cheetah lockfile httplib2
-      # !!! should libvirt be a build-time dependency?  Note that
-      # libxml2Python is a dependency of libvirt.py.
-      libvirt libxml2Python urlgrabber virtinst pyGtkGlade pythonDBus gnome_python
-      gtkvnc vte
+      urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3
+      libvirt libxml2Python ipaddr vte
     ] ++ optional spiceSupport spice_gtk;
 
   buildInputs =
-    [ pythonPackages.python
-      pythonPackages.wrapPython
-      pythonPackages.mox
-      pythonPackages.urlgrabber
+    [ mox
       intltool
-      pyGtkGlade
-      pythonDBus
-      gnome_python
       gtkvnc
-    ] ++ pythonPath;
-
-  buildPhase = "make";
-
-  nativeBuildInputs = [ makeWrapper pythonPackages.wrapPython ];
+      gtk3
+      libvirt-glib
+      avahi
+      glib
+      gobjectIntrospection
+    ];
 
-  # TODO
-  # virt-manager     -> import gtk.glade -> No module named glade --> fixed by removing 'pygtk' and by only using pyGtkGlade
-  #                  -> import gconf     -> ImportError: No module named gconf
-  #                        -> pfad um gtk-2.0 erweitern in virt-manger runner -> /nix/store/hnyxc9i4yz2mc42n44ms13mn8n486s5h-gnome-python-2.28.1/lib/python2.7/site-packages/gtk-2.0
-  #                  -> Error starting Virtual Machine Manager: Failed to contact configuration server; the most common cause is a missing or misconfigured D-Bus session bus daemon. See http://projects.gnome.org/gconf/ for information. (Details -  1: GetIOR failed: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.gnome.GConf was not provided by any .service files)
-
-#Traceback (most recent call last):
-#  File "/nix/store/y9rcdiv6686sqcv4r39p575s37jzc2cz-virt-manager-0.9.1/share/virt-manager/virt-manager.py", line 383, in <module>
-#    main()
-#  File "/nix/store/y9rcdiv6686sqcv4r39p575s37jzc2cz-virt-manager-0.9.1/share/virt-manager/virt-manager.py", line 315, in main
-#    config = virtManager.config.vmmConfig(appname, appversion, glade_dir)
-#  File "/nix/store/y9rcdiv6686sqcv4r39p575s37jzc2cz-virt-manager-0.9.1/share/virt-manager/virtManager/config.py", line 98, in __init__
-#    self.conf.add_dir(self.conf_dir, gconf.CLIENT_PRELOAD_NONE)
-#GError: Failed to contact configuration server; the most common cause is a missing or misconfigured D-Bus session bus daemon. See http://projects.gnome.org/gconf/ for information. (Details -  1: GetIOR failed: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.gnome.GConf was not provided by any .service files)
-# -> fixed by http://nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications & a restart
-  # virt-manager-tui -> ImportError: No module named newt_syrup.dialogscreen
+  configurePhase = ''
+    sed -i 's/from distutils.core/from setuptools/g' setup.py
+    sed -i 's/from distutils.command.install/from setuptools.command.install/g' setup.py
+    python setup.py configure --prefix=$out
+  '';
 
-  installPhase = ''
-    make install
+  buildPhase = "true";
 
-    # A hack, but the most reliable method so far
-    echo "#!/usr/bin/env python" | cat - src/virt-manager.py > $out/bin/virt-manager
-    echo "#!/usr/bin/env python" | cat - src/virt-manager-tui.py > $out/bin/virt-manager-tui
+  postInstall = ''
+    # GI_TYPELIB_PATH is needed at runtime for GObject stuff to work
+    for file in "$out"/bin/*; do
+        wrapProgram "$file" \
+            --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \
+            --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"
+    done
 
-    wrapPythonPrograms
+    ${glib}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas
   '';
 
-  meta = {
+  # Failed tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
     homepage = http://virt-manager.org;
     description = "Desktop user interface for managing virtual machines";
     longDescription = ''
@@ -76,7 +69,7 @@ stdenv.mkDerivation rec {
       virtual machines through libvirt. It primarily targets KVM VMs, but also
       manages Xen and LXC (linux containers).
     '';
-    license = "GPLv2";
-    maintainers = with stdenv.lib.maintainers; [qknight];
+    license = licenses.gpl2;
+    maintainers = with maintainers; [qknight offline];
   };
 }
diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix
index b0e522c0f29..d98ddc716de 100644
--- a/pkgs/desktops/gnome-3/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/core/vte/default.nix
@@ -1,32 +1,21 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses
-, pythonSupport ? false, python, pygtk}:
+{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
 
-  versionMajor = "0.34";
-  versionMinor = "9";
+  versionMajor = "0.35";
+  versionMinor = "90";
   moduleName   = "vte";
   
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "1q93dsxg56f57mxblmh8kn4v9kyc643j2pjf1j3mn2kxypnwaf3g";
+    sha256 = "c47182d1724db479095b918898ce62297ec71988f24cd575506151c59f7b98cf";
   };
 
-  buildInputs = [ intltool pkgconfig gnome3.glib gnome3.gtk ncurses ] ++
-                stdenv.lib.optionals pythonSupport [python pygtk];
+  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
 
-  configureFlags = ''
-    ${if pythonSupport then "--enable-python" else "--disable-python"}
-  '';
-
-  postInstall = stdenv.lib.optionalString pythonSupport ''
-    cd $(toPythonPath $out)/gtk-2.0
-    for n in *; do
-      ln -s "gtk-2.0/$n" "../$n"
-    done
-  '';
+  configureFlags = ''--enable-introspection'';
 
   meta = {
     homepage = http://www.gnome.org/;
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
new file mode 100644
index 00000000000..afce119e396
--- /dev/null
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl
+, nettle, libgcrypt, python, pygobject, gobjectIntrospection, libcap_ng
+}:
+
+stdenv.mkDerivation rec {
+  name = "libvirt-glib-0.1.8";
+
+  src = fetchurl {
+    url = "http://libvirt.org/sources/glib/${name}.tar.gz";
+    sha256 = "0ld7g9vlpdzx8rm90i8y1gnpygkn20x5z12gvsgms7dy5nala3ns";
+  };
+
+  buildInputs = [
+    pkgconfig libvirt glib libxml2 intltool libtool yajl nettle libgcrypt
+    python pygobject gobjectIntrospection libcap_ng
+  ];
+
+  # Compiler flag -fstack-protector-all fixes this build error:
+  #
+  #   ./.libs/libvirt-glib-1.0.so: undefined reference to `__stack_chk_guard'
+  #
+  # And the extra include path fixes this build error:
+  #
+  #   In file included from ../libvirt-gobject/libvirt-gobject-domain-device.h:30:0,
+  #                    from /tmp/nix-build-libvirt-glib-0.1.7.drv-2/libvirt-glib-0.1.7/libvirt-gobject/libvirt-gobject.h:33,
+  #                    from <stdin>:4:
+  #   ../libvirt-gobject/libvirt-gobject-domain.h:33:29: fatal error: libvirt/libvirt.h: No such file or directory
+  #   compilation terminated.
+  #   make[3]: *** [LibvirtGObject-1.0.gir] Error 1
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="-fstack-protector-all -I${libvirt}/include"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Library for working with virtual machines";
+    longDescription = ''
+      libvirt-glib wraps libvirt to provide a high-level object-oriented API better
+      suited for glib-based applications, via three libraries:
+
+      - libvirt-glib    - GLib main loop integration & misc helper APIs
+      - libvirt-gconfig - GObjects for manipulating libvirt XML documents
+      - libvirt-gobject - GObjects for managing libvirt objects
+    '';
+    homepage = http://libvirt.org/;
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index 60bf24dfd78..adb1fe90558 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -1,6 +1,7 @@
 { 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 }:
+, cyrus_sasl, python, pygtk, autoconf, automake, libtool, usbredir
+, gtk3, enableGTK3 ? false }:
 
 with stdenv.lib;
 
@@ -13,9 +14,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    gtk spice_protocol celt_0_5_1 openssl pulseaudio pixman gobjectIntrospection
-    libjpeg_turbo zlib cyrus_sasl python pygtk
-  ];
+    spice_protocol celt_0_5_1 openssl pulseaudio pixman gobjectIntrospection
+    libjpeg_turbo zlib cyrus_sasl python pygtk usbredir
+  ] ++ (if enableGTK3 then [ gtk3 ] else [ gtk ]);
 
   nativeBuildInputs = [ pkgconfig intltool libtool autoconf automake ];
 
@@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--disable-maintainer-mode"
-    "--with-gtk=2.0"
+    (if enableGTK3 then "--with-gtk3" else "--with-gtk=2.0")
   ];
 
   dontDisableStatic = true; # Needed by the coroutine test
diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix
new file mode 100644
index 00000000000..7f05daab021
--- /dev/null
+++ b/pkgs/development/libraries/usbredir/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, libusb }:
+
+stdenv.mkDerivation rec {
+  name = "usbredir-${version}";
+  version = "0.6";
+
+  src = fetchurl {
+    url = "http://spice-space.org/download/usbredir/${name}.tar.bz2";
+    sha256 = "028184960044ea4124030000b3c55a35c3238835116e3a0fbcaff449df2c8edf";
+  };
+
+  buildInputs = [ pkgconfig libusb ];
+  propagatedBuildInputs = [ libusb ];
+
+  meta = with stdenv.lib; {
+    description = "USB traffic redirection protocol";
+    homepage = http://spice-space.org/page/UsbRedir;
+    license = licenses.lgpl21;
+
+    maintainers = [ maintainers.offline ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index d4c45b7ba96..c3a82b2e4a2 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, gobjectIntrospection
 , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
 , libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs, pulseaudio
-, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt }:
-
+, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala
+, pygobject3, enableGTK3 ? false }:
 
 stdenv.mkDerivation rec {
   name = "gtk-vnc-${version}";
@@ -14,21 +14,24 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    python gtk pygtk gnutls cairo libtool pkgconfig glib libffi libgcrypt
-    intltool cyrus_sasl pulseaudio pygobject perl perlPackages.TextCSV
-  ];
+    python gnutls cairo libtool pkgconfig glib libffi libgcrypt
+    intltool cyrus_sasl pulseaudio perl perlPackages.TextCSV
+    gobjectIntrospection
+  ] ++ (if enableGTK3 then [ gtk3 vala pygobject3 ] else [ gtk pygtk pygobject ]);
 
   NIX_CFLAGS_COMPILE = "-fstack-protector-all";
   configureFlags = [
     "--with-python"
     "--with-examples"
+    (if enableGTK3 then "--with-gtk=3.0" else "--with-gtk=2.0")
   ];
 
-  makeFlags = "CODEGENDIR=${pygobject}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/";
+  makeFlags = stdenv.lib.optionalString (!enableGTK3)
+    "CODEGENDIR=${pygobject}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/";
 
   meta = with stdenv.lib; {
     description = "A GTK VNC widget";
-    maintainers = with maintainers; [ raskin ];
+    maintainers = with maintainers; [ raskin offline ];
     platforms = platforms.linux;
     license = licenses.lgpl21;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2b10785962..39434aa4bb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5222,6 +5222,8 @@ let
 
   libvirt = callPackage ../development/libraries/libvirt { };
 
+  libvirt-glib = callPackage ../development/libraries/libvirt-glib { };
+
   libvisio = callPackage ../development/libraries/libvisio { };
 
   libvisual = callPackage ../development/libraries/libvisual { };
@@ -5910,6 +5912,10 @@ let
 
   ustr = callPackage ../development/libraries/ustr { };
 
+  usbredir = callPackage ../development/libraries/usbredir {
+    libusb = libusb1;
+  };
+
   ucommon = callPackage ../development/libraries/ucommon { };
 
   vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
@@ -9301,7 +9307,10 @@ let
   virtviewer = callPackage ../applications/virtualization/virt-viewer {};
   virtmanager = callPackage ../applications/virtualization/virt-manager {
     inherit (gnome) gnome_python;
-    vte = gnome.vte.override { pythonSupport = true; };
+    vte = gnome3.vte;
+    dconf = gnome3.dconf;
+    gtkvnc = gtkvnc.override { enableGTK3 = true; };
+    spice_gtk = spice_gtk.override { enableGTK3 = true; };
   };
 
   virtinst = callPackage ../applications/virtualization/virtinst {};
-- 
GitLab


From 63d91b75a1c613a330f0754edf8d81844a92d201 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 5 Apr 2014 14:43:00 -0400
Subject: [PATCH 2923/3789] Revert "Merge branch 'k3b' of
 git://github.com/ttuegel/nixpkgs"

It turns out this doesn't work due to setuid issues. I had been under
the impression that it was partially broken, but it is in fact totally
broken.

This reverts commit 718466074fa03de4dc1ab0d333fb43d8bbed2c8f, reversing
changes made to ea9c8d6a131502009ec583f1c7f785b511c36b8c.
---
 pkgs/applications/misc/k3b/default.nix | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix
index 9f9e29f537e..06565065ce5 100644
--- a/pkgs/applications/misc/k3b/default.nix
+++ b/pkgs/applications/misc/k3b/default.nix
@@ -1,12 +1,8 @@
 { stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
 , flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
 , kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null
-, makeWrapper, cdrkit, cdrdao, dvdplusrwtools
 }:
 
-let
-  runtimeDeps = [ cdrkit cdrdao dvdplusrwtools ];
-in
 stdenv.mkDerivation rec {
   name = "k3b-2.0.2";
   
@@ -20,22 +16,10 @@ stdenv.mkDerivation rec {
       flac libsamplerate libdvdread lame libsndfile
       libmad gettext stdenv.gcc.libc
       kdelibs kdemultimedia automoc4 phonon
-      libkcddb makeWrapper
-    ]
-    # Runtime dependencies are *not* propagated so they are easy to override.
-    ++ runtimeDeps;
+      libkcddb
+    ];
 
   enableParallelBuilding = true;
-
-  postInstall =
-    # Wrap k3b with PATH to required tools, so they can be found without being
-    # installed in a profile. The PATH is suffixed so that profile-installed
-    # tools take preference.
-    let extraPath = stdenv.lib.makeSearchPath "bin" runtimeDeps;
-    in ''
-      wrapProgram "$out/bin/k3b" --suffix PATH : ${extraPath}
-      wrapProgram "$out/bin/k3bsetup" --suffix PATH : ${extraPath}
-    '';
                   
   meta = with stdenv.lib; {
     description = "CD/DVD Burning Application for KDE";
-- 
GitLab


From dc614aff9294e085dc28f03f91eeaef54feabf0a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sat, 5 Apr 2014 20:54:47 +0200
Subject: [PATCH 2924/3789] libresample: Add package

---
 .../libraries/libresample/default.nix         | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/libresample/default.nix

diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix
new file mode 100644
index 00000000000..9ef1ada0a42
--- /dev/null
+++ b/pkgs/development/libraries/libresample/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, cmake}:
+
+let
+  patch = fetchurl {
+    url = http://ftp.debian.org/debian/pool/main/libr/libresample/libresample_0.1.3-3.diff.gz;
+    sha256 = "063w8rqxw87fc89gas47vk0ll7xl8cy7d8g70gm1l62bqkkajklx";
+  };
+in
+stdenv.mkDerivation {
+  name = "libresample-0.1.3";
+  src = fetchurl {
+    url = http://ftp.debian.org/debian/pool/main/libr/libresample/libresample_0.1.3.orig.tar.gz;
+    sha256 = "05a8mmh1bw5afqx0kfdqzmph4x2npcs4idx0p0v6q95lwf22l8i0";
+  };
+  patches = [ patch ];
+  preConfigure = ''
+    cat debian/patches/1001_shlib-cmake.patch | patch -p1
+  '';
+  buildInputs = [ cmake ];
+  
+  meta = {
+    description = "A real-time library for sampling rate conversion library";
+    license = stdenv.lib.licenses.lgpl2Plus;
+    homepage = https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html;
+    maintainers = stdenv.lib.maintainers.sander;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7bcc84b5d18..833a7ae86fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4955,6 +4955,8 @@ let
   libre = callPackage ../development/libraries/libre {};
   librem = callPackage ../development/libraries/librem {};
 
+  libresample = callPackage ../development/libraries/libresample {};
+
   libsamplerate = callPackage ../development/libraries/libsamplerate {
     stdenv = if stdenv.isDarwin
       then overrideGCC stdenv gccApple
-- 
GitLab


From bd1a95ee608f70ffb673f4cb1c4dd109e1f32485 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 5 Apr 2014 15:01:05 -0400
Subject: [PATCH 2925/3789] Remove superfluous newline

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 226f3323482..988c3739f77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4940,7 +4940,6 @@ let
 
   libmtp = callPackage ../development/libraries/libmtp { };
 
-
   libmsgpack = callPackage ../development/libraries/libmsgpack { };
 
   libnatspec = callPackage ../development/libraries/libnatspec { };
-- 
GitLab


From 9d544e633a2d592227cf78347331bbf44c2e28cb Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 5 Apr 2014 15:55:16 -0400
Subject: [PATCH 2926/3789] mailutils is broken.

#887
---
 pkgs/tools/networking/mailutils/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index 8ebe7df35e7..3ac82e51bf8 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -51,5 +51,8 @@ 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;
   };
 }
-- 
GitLab


From 47f0f34fca89a64c33671b45ddda8d37b3d5cf8d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 3 Apr 2014 14:07:52 -0500
Subject: [PATCH 2927/3789] nmap: Build the non-graphical version by default

---
 pkgs/tools/security/nmap/default.nix | 35 +++++++++++++++++-----------
 pkgs/top-level/all-packages.nix      |  5 +++-
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index a6452cdb89b..56964c1f692 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -1,10 +1,18 @@
-{ stdenv, fetchurl, libpcap, libX11, gtk, pkgconfig
-, openssl, python, pygtk, makeWrapper, pygobject
-, pycairo, pysqlite
+{ stdenv, fetchurl, libpcap, pkgconfig, openssl
+, graphicalSupport ? false
+, libX11 ? null
+, gtk ? null
+, python ? null
+, pygtk ? null
+, makeWrapper ? null
+, pygobject ? null
+, pycairo ? null
+, pysqlite ? null
 }:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "nmap-${version}";
+  name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
   version = "6.40";
 
   src = fetchurl {
@@ -12,21 +20,22 @@ stdenv.mkDerivation rec {
     sha256 = "491f77d8b3fb3bb38ba4e3850011fe6fb43bbe197f9382b88cb59fa4e8f7a401";
   };
 
-  patches = [ ./zenmap.patch ];
+  patches = optional graphicalSupport ./zenmap.patch;
 
-  postInstall =
-    ''
+  postInstall = optionalString graphicalSupport ''
       wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0
-    '';
+  '';
 
-  buildInputs =
-    [ libpcap libX11 gtk pkgconfig openssl python pygtk makeWrapper pysqlite ];
+  buildInputs = [ libpcap pkgconfig openssl ]
+    ++ optionals graphicalSupport [
+      libX11 gtk python pygtk makeWrapper pysqlite pygobject pycairo
+    ];
 
   meta = {
     description = "A free and open source utility for network discovery and security auditing.";
     homepage    = "http://www.nmap.org";
-    license     = stdenv.lib.licenses.gpl2;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ mornfall thoughtpolice ];
+    license     = licenses.gpl2;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ mornfall thoughtpolice ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efe5e3834ea..7310cf6852f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1539,8 +1539,11 @@ let
 
   npth = callPackage ../development/libraries/npth {};
 
-  nmap = callPackage ../tools/security/nmap {
+  nmap = callPackage ../tools/security/nmap { };
+
+  nmap_graphical = callPackage ../tools/security/nmap {
     inherit (pythonPackages) pysqlite;
+    graphicalSupport = true;
   };
 
   notbit = callPackage ../applications/networking/notbit { };
-- 
GitLab


From 923372335321e996b0088ca6aa43ab43fbf3729b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 6 Apr 2014 00:56:57 +0400
Subject: [PATCH 2928/3789] Temporary patch for Wireshark build

---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index ed2ce4c12c0..256681ec54e 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -17,6 +17,10 @@ stdenv.mkDerivation {
     geoip libnl c-ares gtk python
   ];
 
+  preConfigure = ''
+    sed -re 's/g_memmove/memmove/' -i $(grep -rl g_memmove .)
+  '';
+
   configureFlags = "--disable-usr-local --disable-silent-rules --with-gtk2 --without-gtk3 --without-qt --with-ssl";
 
   desktopItem = makeDesktopItem {
-- 
GitLab


From 28ab3acb58b0e5a5ffa932c9c6eb19db05a6c334 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 5 Apr 2014 13:41:23 -0500
Subject: [PATCH 2929/3789] su: Make the su package a provider of only the su
 binary

Additionally, provide su with the base system and remove su from the
util-linux package as it is now provided by shadow.
---
 nixos/modules/config/system-path.nix          | 1 +
 pkgs/os-specific/linux/shadow/default.nix     | 8 +++++++-
 pkgs/os-specific/linux/util-linux/default.nix | 4 ++++
 pkgs/top-level/all-packages.nix               | 2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 2f61947c3bc..1913e17f929 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -46,6 +46,7 @@ let
       pkgs.rsync
       pkgs.strace
       pkgs.sysvtools
+      pkgs.su
       pkgs.time
       pkgs.usbutils
       pkgs.utillinux
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 1055fccd8aa..9d024ae3109 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./keep-path.patch dots_in_usernames ];
 
+  outputs = [ "out" "su" ];
+
   # 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";
@@ -35,10 +37,14 @@ stdenv.mkDerivation rec {
       substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc}/sbin/nscd
     '';
 
-  # Don't install ‘groups’, since coreutils already provides it.
   postInstall =
     ''
+      # Don't install ‘groups’, since coreutils already provides it.
       rm $out/bin/groups $out/share/man/man1/groups.*
+
+      # Move the su binary into the su package
+      mkdir -p $su/bin
+      mv $out/bin/su $su/bin
     '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 3f676d37dd8..ec43ee1e64f 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -36,6 +36,10 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (ncurses != null) ncurses
     ++ stdenv.lib.optional (perl != null) perl;
 
+  postInstall = ''
+    rm $out/bin/su # su should be supplied by the su package (shadow)
+  '';
+
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1daa2eba8a5..da971258d50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1995,7 +1995,7 @@ let
 
   stunnel = callPackage ../tools/networking/stunnel { };
 
-  su = shadow;
+  su = shadow.su;
 
   surfraw = callPackage ../tools/networking/surfraw { };
 
-- 
GitLab


From 31ab1fd7aee16ac755a08067c91def333a09d521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 6 Apr 2014 00:21:30 +0200
Subject: [PATCH 2930/3789] teamviewer: fix brokenness after updates / GC

Teamviewer puts symlinks to nix store paths in ~/.teamviewer. When those
paths become garbage collected, teamviewer crashes upon start because of
those broken symlinks. An easy workaround to this behaviour is simply to
delete all symlinks before we start teamviewer. Teamviewer will fixup
the symlinks, just like it did the first time the user ran it.
---
 .../networking/remote/teamviewer/default.nix             | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 8c629519764..1bf40eabfae 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wine, makeWrapper
-, bash }:
+, bash, findutils, coreutils }:
 
 assert stdenv.system == "i686-linux";
 let
@@ -31,6 +31,13 @@ stdenv.mkDerivation {
 
     cat > $out/bin/teamviewer << EOF
     #!${bash}/bin/sh
+    # Teamviewer puts symlinks to nix store paths in ~/.teamviewer. When those
+    # paths become garbage collected, teamviewer crashes upon start because of
+    # those broken symlinks. An easy workaround to this behaviour is simply to
+    # delete all symlinks before we start teamviewer. Teamviewer will fixup the
+    # symlinks, just like it did the first time the user ran it.
+    ${findutils}/bin/find "\$HOME"/.teamviewer/*/*/"Program Files/TeamViewer/" -type l -print0 | ${findutils}/bin/xargs -0 ${coreutils}/bin/rm
+
     export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
     export PATH=${topath}\''${PATH:+:\$PATH}
     $out/share/teamviewer/wrapper wine "c:\Program Files\TeamViewer\Version7\TeamViewer.exe" "\$@"
-- 
GitLab


From a68c12d35b64bf4b97e772860967af1ea085cdf4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 5 Apr 2014 18:39:53 -0400
Subject: [PATCH 2931/3789] git: Remove phony not-supported wrappers.

Fixes #1751
---
 .../version-management/git-and-tools/git/default.nix   | 10 ++++------
 1 file changed, 4 insertions(+), 6 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 9be32b9accd..9eaa7d219b0 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -47,8 +47,7 @@ stdenv.mkDerivation {
   postInstall =
     ''
       notSupported() {
-        echo -e "#\!/bin/sh\necho '`basename $1` not supported, $2'\nexit 1" > "$1"
-        chmod +x $1
+        unlink $1 || true
       }
 
       # Install git-subtree.
@@ -94,7 +93,7 @@ stdenv.mkDerivation {
                      --set GITPERLLIB "$gitperllib"   \
                      --prefix PATH : "${svn}/bin" ''
        else '' # replace git-svn by notification script
-        notSupported $out/libexec/git-core/git-svn "reinstall with config git = { svnSupport = true } set"
+        notSupported $out/libexec/git-core/git-svn
        '')
 
    + (if sendEmailSupport then
@@ -106,7 +105,7 @@ stdenv.mkDerivation {
         wrapProgram $out/libexec/git-core/git-send-email \
                      --set GITPERLLIB "$gitperllib" ''
        else '' # replace git-send-email by notification script
-        notSupported $out/libexec/git-core/git-send-email "reinstall with config git = { sendEmailSupport = true } set"
+        notSupported $out/libexec/git-core/git-send-email
        '')
 
    + stdenv.lib.optionalString withManual ''# Install man pages and Info manual
@@ -123,8 +122,7 @@ stdenv.mkDerivation {
      '' else ''
        # Don't wrap Tcl/Tk, replace them by notification scripts
        for prog in bin/gitk libexec/git-core/git-gui; do
-         notSupported "$out/$prog" \
-                      "reinstall with config git = { guiSupport = true; } set"
+         notSupported "$out/$prog"
        done
      '');
 
-- 
GitLab


From 09cdc6edf55a3db1bca5104196a1edb48c5997c5 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sat, 5 Apr 2014 21:31:40 -0400
Subject: [PATCH 2932/3789] f2fs-tools,ncdc: set platform and add myself to
 maintainers

---
 pkgs/applications/networking/p2p/ncdc/default.nix | 2 ++
 pkgs/tools/filesystems/f2fs-tools/default.nix     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix
index a06185ed2ae..794f6fe4308 100644
--- a/pkgs/applications/networking/p2p/ncdc/default.nix
+++ b/pkgs/applications/networking/p2p/ncdc/default.nix
@@ -15,5 +15,7 @@ stdenv.mkDerivation rec {
     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
+    maintainers = [ stdenv.lib.maintainers.emery ];
   };
 }
diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix
index 72f417ff10b..f52ead32acd 100644
--- a/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -21,5 +21,7 @@ stdenv.mkDerivation rec {
     homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/";
     description = "Userland tools for the f2fs filesystem";
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.emery ];
   };
 }
-- 
GitLab


From 8d0259caf4f551cc72cceff7766161e14d11632f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 2 Apr 2014 11:01:25 -0500
Subject: [PATCH 2933/3789] nixos: reserve some uids/gids

I have some NixOS modules that I keep out of tree, and having UIDs/GIDs
reserved is quite helpful.

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

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 91df29236b8..b7912b6630e 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -126,6 +126,9 @@
       monetdb = 115;
       rippled = 116;
       murmur = 117;
+      foundationdb = 118;
+      newrelic = 119;
+      starbound = 120;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -225,6 +228,9 @@
       systemd-journal-gateway = 110;
       notbit = 111;
       monetdb = 115;
+      foundationdb = 118;
+      newrelic = 119;
+      starbound = 120;
 
       # When adding a gid, make sure it doesn't match an existing uid.
 
-- 
GitLab


From 35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 5 Apr 2014 15:51:42 +0200
Subject: [PATCH 2934/3789] Fix gsettings schemas usage for several packages
 due to #1901

Also add icons to epiphany
---
 pkgs/applications/graphics/shotwell/default.nix   | 10 ++++++++--
 pkgs/applications/misc/surf/default.nix           |  7 +++++--
 .../networking/browsers/dwb/default.nix           |  6 +++---
 .../networking/browsers/vimb/default.nix          |  6 +++---
 .../networking/browsers/vimprobable2/default.nix  |  7 +++++--
 .../telepathy/logger/default.nix                  |  2 --
 .../networking/newsreaders/liferea/default.nix    |  5 ++---
 pkgs/desktops/gnome-3/core/baobab/default.nix     |  2 +-
 pkgs/desktops/gnome-3/core/dconf/default.nix      | 12 ++++++++++--
 pkgs/desktops/gnome-3/core/empathy/default.nix    |  8 ++++----
 pkgs/desktops/gnome-3/core/eog/default.nix        |  6 ++++--
 pkgs/desktops/gnome-3/core/epiphany/default.nix   | 15 +++++++--------
 pkgs/desktops/gnome-3/core/evince/default.nix     |  8 ++++----
 .../core/evolution-data-server/default.nix        |  2 --
 pkgs/desktops/gnome-3/core/folks/default.nix      |  2 --
 pkgs/desktops/gnome-3/core/gcr/default.nix        |  9 +++++++--
 .../gnome-3/core/gnome-calculator/default.nix     |  6 ++----
 .../gnome-3/core/gnome-control-center/default.nix |  6 ++++--
 .../gnome-3/core/gnome-disk-utility/default.nix   |  6 ++----
 .../gnome-3/core/gnome-font-viewer/default.nix    |  6 ++----
 .../gnome-3/core/gnome-keyring/default.nix        |  6 +++---
 .../gnome-3/core/gnome-screenshot/default.nix     |  6 ++----
 .../gnome-3/core/gnome-session/default.nix        |  5 +++--
 .../core/gnome-settings-daemon/default.nix        |  4 ++--
 .../desktops/gnome-3/core/gnome-shell/default.nix |  8 +++-----
 .../gnome-3/core/gnome-system-log/default.nix     |  6 ++----
 .../gnome-3/core/gnome-terminal/default.nix       |  8 ++++----
 pkgs/desktops/gnome-3/core/gucharmap/default.nix  |  6 ++----
 pkgs/desktops/gnome-3/core/mutter/default.nix     |  9 +++++++--
 pkgs/desktops/gnome-3/core/nautilus/default.nix   |  4 ++--
 pkgs/desktops/gnome-3/core/vino/default.nix       |  4 ++--
 pkgs/desktops/gnome-3/core/yelp/default.nix       |  6 ++----
 pkgs/desktops/gnome-3/misc/gitg/default.nix       | 11 +++--------
 pkgs/development/libraries/gvfs/default.nix       |  4 ++--
 pkgs/development/libraries/ibus/default.nix       |  4 ++--
 .../networking/network-manager-applet/default.nix | 11 +++++------
 36 files changed, 119 insertions(+), 114 deletions(-)

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 2a3ed77609f..1953f951d16 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -33,11 +33,17 @@ in stdenv.mkDerivation rec {
   preConfigure = ''
     patchShebangs .
   '';
-  
+
   postInstall = ''
+    mkdir -p $out/share/gsettings-schemas/$name
+    mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/
+  '';
+
+  preFixup = ''
     wrapProgram "$out/bin/shotwell" \
      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-     --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gsettings_desktop_schemas}/share:${gtk3}/share:$out/share"
+     --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
 
diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/misc/surf/default.nix
index 42792ba8f91..651cfcca406 100644
--- a/pkgs/applications/misc/surf/default.nix
+++ b/pkgs/applications/misc/surf/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "01b8hq8z2wd7ssym5bypx2b15mrs1lhgkrcgxf700kswxvxcrhgx";
   };
 
-  buildInputs = [ gtk makeWrapper webkit pkgconfig glib libsoup ];
+  buildInputs = [ gtk makeWrapper webkit gsettings_desktop_schemas pkgconfig glib libsoup ];
 
   # Allow users set their own list of patches
   inherit patches;
@@ -21,9 +21,12 @@ stdenv.mkDerivation rec {
   preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ];
   installPhase = ''
     make PREFIX=/ DESTDIR=$out install
+  '';
+
+  preFixup = ''
     wrapProgram "$out/bin/surf" \
       --prefix GIO_EXTRA_MODULES : ${glib_networking}/lib/gio/modules \
-      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share"
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = {
diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index e14996d35f4..dcdbe724194 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -10,17 +10,17 @@ stdenv.mkDerivation {
     sha256 = "145sq2wv0s0n32cwpwgy59ff6ppcv80ialak7nnj1rpqicfqb72h";
   };
 
-  buildInputs = [ pkgconfig makeWrapper 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=''
     makeFlagsArray=(CPPFLAGS="-Wno-error" GTK=3 PREFIX=$out);
   '';
 
-  postInstall=''
+  preFixup=''
     wrapProgram "$out/bin/dwb" \
      --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"
     wrapProgram "$out/bin/dwbem" \
      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules"
   '';
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index 10bca4848dd..6cb52be775c 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
     sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/default.h
   '';
 
-  buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit ];
+  buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  postInstall = ''
+  preFixup = ''
     wrapProgram "$out/bin/vimb" \
       --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
-      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share"
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = {
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index 2a44449c750..f723e3791f3 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -14,13 +14,16 @@ stdenv.mkDerivation rec {
     sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, config.h
   '';
 
-  buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit ];
+  buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ];
 
   installPhase = ''
     make PREFIX=/ DESTDIR=$out install
+  '';
+
+  preFixup = ''
     wrapProgram "$out/bin/vimprobable2" \
       --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
-      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share"
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = {
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index bd8cffd40e4..173dfe9c929 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--enable-call";
 
-  installFlags = "gsettingsschemadir=\${out}/share/telepathy/logger/glib-2.0/schemas/";
-
   meta = {
     description = "Logger service for Telepathy framework";
     homepage = http://telepathy.freedesktop.org/wiki/Logger ;
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 83eeb18d126..650e3237fe4 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -28,16 +28,15 @@ stdenv.mkDerivation rec {
   ];
 
   preFixup = ''
-    rm $out/share/icons/hicolor/icon-theme.cache'';
+    rm $out/share/icons/hicolor/icon-theme.cache
 
-  postInstall  = ''
     for f in "$out"/bin/*; do
       wrapProgram "$f" \
         --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
         --prefix LD_LIBRARY_PATH : "${gnome3.libgnome_keyring}/lib" \
         --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
         --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking}/lib/gio/modules" \
-        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:${gnome3.gtk}/share:$out/share"
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
     done
   '';
 
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index 5121f1f69be..9381f45105d 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     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:${gnome3.gsettings_desktop_schemas}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 4ee8143bb2b..a485b18c5e5 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
-, libxml2, intltool, docbook_xsl_ns, docbook_xsl }:
+, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "dconf-${version}";
@@ -11,7 +11,15 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
-                  intltool docbook_xsl docbook_xsl_ns ];
+                  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
+  '';
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 1f7a027fd3e..a227c1422d6 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -39,12 +39,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  installFlags = "gsettingsschemadir=\${out}/share/empathy/glib-2.0/schemas/";
-
-  postInstall = ''
+  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:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/empathy:${telepathy_logger}/share/telepathy/logger:${folks}/share/folks:${evolution_data_server}/share/evolution-data-server"
+      --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"
+
+    rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index 99e87b3c584..57f19dcaa32 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -14,11 +14,13 @@ stdenv.mkDerivation rec {
     [ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg
       gsettings_desktop_schemas shared_mime_info gnome_icon_theme gnome_desktop libexif ];
 
-  postInstall = ''
+  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.gsettings_desktop_schemas}/share:${gnome3.gtk}/share:$out/share"
+      --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; {
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 7da49dbc738..9df3a7ed01e 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -1,10 +1,8 @@
 { 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 }:
-
-# TODO: icons and theme still does not work
-# use packaged gnome3.gnome_icon_theme_symbolic 
+, sqlite, gcr, avahi, nss, isocodes, itstool, file
+, hicolor_icon_theme, gdk_pixbuf, librsvg }:
 
 stdenv.mkDerivation rec {
   name = "epiphany-3.10.3";
@@ -18,6 +16,8 @@ stdenv.mkDerivation rec {
   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 ];
 
@@ -30,13 +30,12 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss";
 
-  installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
-
   enableParallelBuilding = true;
 
-  postInstall = ''
+  preFixup = ''
     wrapProgram "$out/bin/epiphany" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
+      --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; {
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index de8f28ddaab..3a2688a64b9 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
     makeWrapper libsecret librsvg
   ];
 
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
-
   configureFlags = [
     "--disable-nautilus" # Do not use nautilus
   ];
@@ -40,12 +38,14 @@ stdenv.mkDerivation rec {
       sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
     '';
 
-  postInstall = ''
+  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:${gnome3.gsettings_desktop_schemas}/share:${gtk3}/share:${shared_mime_info}/share:$out/share"
+      --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
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 30805c1c597..0ded30b11ab 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
   configureFlags = ["--disable-uoa" "--with-nspr-includes=${nspr}/include/nspr" "--with-nss-includes=${nss}/include/nss"]
                    ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
 
-  installFlags = "gsettingsschemadir=\${out}/share/evolution-data-server/glib-2.0/schemas/";
-
   meta = with stdenv.lib; {
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix
index 9b0f403b079..12518c634c4 100644
--- a/pkgs/desktops/gnome-3/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/core/folks/default.nix
@@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
 
   postBuild = "rm -rf $out/share/gtk-doc";
 
-  installFlags = "gsettingsschemadir=\${out}/share/folks/glib-2.0/schemas/";
-
   meta = {
     description = "Folks";
 
diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix
index 059942530ea..a1fdd471282 100644
--- a/pkgs/desktops/gnome-3/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/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 }:
+, gobjectIntrospection, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "gcr-3.10.1";
@@ -12,11 +12,16 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig intltool gnupg p11_kit glib gobjectIntrospection
-    libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk
+    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/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index 805f0e5276d..981ae3bd9df 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -20,12 +20,10 @@ stdenv.mkDerivation rec {
                   libxml2 gnome3.gtksourceview
                   gnome3.gsettings_desktop_schemas makeWrapper ];
 
-  installFlags = "gsettingsschemadir=\${out}/share/gnome-calculator/glib-2.0/schemas/";
-
-  postInstall = ''
+  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:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/gnome-calculator:$XDG_ICON_DIRS"
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
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 ac9c53422b3..a3f2e2b7584 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -36,13 +36,15 @@ stdenv.mkDerivation rec {
     substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/"
   '';
 
-  postInstall = with gnome3; ''
+  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:${gsettings_desktop_schemas}/share:${gnome_settings_daemon}/share:${glib}/share:${gtk}/share:${colord}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS"
+      --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
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 9ab5259a630..c02f8f0a665 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -25,12 +25,10 @@ stdenv.mkDerivation rec {
                   libnotify libdvdread libcanberra_gtk3 docbook_xsl
                   gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
 
-  installFlags = "gsettingsschemadir=\${out}/share/gnome-disk-utility/glib-2.0/schemas/";
-
-  postInstall = ''
+  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:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/gnome-disk-utility:$XDG_ICON_DIRS"
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
index 8a1b0054e39..cba651ca36a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
@@ -22,12 +22,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop
                   gnome3.gsettings_desktop_schemas makeWrapper ];
 
-  installFlags = "gsettingsschemadir=\${out}/share/gnome-font-viewer/glib-2.0/schemas/";
-
-  postInstall = ''
+  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:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/gnome-font-viewer:$XDG_ICON_DIRS"
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index b557e210645..dbb8da93c6c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
     "--with-pkcs11-modules=$$out/lib/pkcs11/"
   ];
 
-  postInstall = ''
+  preFixup = ''
     wrapProgram "$out/bin/gnome-keyring" \
-      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share"
+      --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"
+      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index 0d891e4625d..349df0b103c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -21,12 +21,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
                   gnome3.gsettings_desktop_schemas makeWrapper ];
 
-  installFlags = "gsettingsschemadir=\${out}/share/gnome-screenshot/glib-2.0/schemas/";
-
-  postInstall = ''
+  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:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/gnome-screenshot:$XDG_ICON_DIRS"
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 804a0c54a41..f999702af54 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -14,12 +14,13 @@ stdenv.mkDerivation rec {
 
   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 ];
 
-  postInstall = ''
+  preFixup = ''
     wrapProgram "$out/bin/gnome-session" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gsettings_desktop_schemas}/share:$out/share"
+      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index 668a53d2bf8..7a50b8db56f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
       polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
       libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
 
-  postInstall = ''
+  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:${gnome3.gsettings_desktop_schemas}/share:$out/share"
+      --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 59f62b6948d..519347f14c8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -22,22 +22,20 @@ 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 ];
 
-  configureFlags = "--disable-static";
-
   preBuild = ''
     patchShebangs src/data-to-c.pl
     substituteInPlace data/Makefile --replace " install-keysDATA" ""
   '';
 
-  postInstall = with gnome3; ''
+  preFixup = with gnome3; ''
     wrapProgram "$out/bin/gnome-shell" \
       --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-menus}:/share:${ibus}/share:${gnome_settings_daemon}/share:${gnome_control_center}/share:${gdm}/share:${glib}/share:${gnome_themes_standard}/share:${mutter}/share:${gnome_icon_theme}/share:${gsettings_desktop_schemas}/share:${gtk}/share:$out/share"
+      --prefix XDG_DATA_DIRS : "${gnome-menus}:/share:${ibus}/share:${gnome_settings_daemon}/share:${gnome_control_center}/share:${gdm}/share:${glib}/share:${gnome_themes_standard}/share:${mutter}/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"
+      --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
index 8b387627da5..7152332217a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
@@ -21,12 +21,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
                   gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
 
-  installFlags = "gsettingsschemadir=\${out}/share/gnome-system-log/glib-2.0/schemas/";
-
-  postInstall = ''
+  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:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/gnome-system-log:$XDG_ICON_DIRS"
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index 31ee53e9713..541db5720db 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];
 
-  postInstall = ''
-    wrapProgram "$out/libexec/gnome-terminal-server" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gsettings_desktop_schemas}/share:$out/share"
+  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/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index bf630e1947d..a6bf72b2fc7 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -25,11 +25,9 @@ stdenv.mkDerivation rec {
                   gnome3.yelp_tools libxml2 file desktop_file_utils
                   gnome3.gsettings_desktop_schemas makeWrapper ];
 
-  installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
-
-  postInstall = ''
+  preFixup = ''
     wrapProgram "$out/bin/gucharmap" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index e6454aa8e5d..0acfa9f36ae 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
 , pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3
-, libtool }:
+, libtool, makeWrapper }:
 
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,12 @@ stdenv.mkDerivation rec {
   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 ];
+      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/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 091e48626ae..2041a71a82c 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
   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 ];
 
-  postInstall = ''
+  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"
+      --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; {
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
index b431a199bf7..65668dce6a2 100644
--- a/pkgs/desktops/gnome-3/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/core/vino/default.nix
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify file makeWrapper ];
 
-  postInstall = ''
+  preFixup = ''
     for f in "$out/bin/vino-passwd" "$out/libexec/vino-server"; do
-      wrapProgram $f --prefix XDG_DATA_DIRS : "${gtk3}/share:$out/share"
+      wrapProgram $f --prefix XDG_DATA_DIRS : "${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
     done
   '';
 
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index d84bd288707..b58aa99721e 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -20,12 +20,10 @@ stdenv.mkDerivation rec {
                   libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
                   gnome3.gsettings_desktop_schemas ];
 
-  installFlags = "gsettingsschemadir=\${out}/share/yelp/glib-2.0/schemas/";
-
-  postInstall = ''
+  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"
+      --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; {
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
index 26268f4c90c..7ca35a8255f 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix
@@ -9,12 +9,10 @@ stdenv.mkDerivation rec {
   name = "gitg-0.3.2";
 
   src = fetchurl {
-    url = "https://download.gnome.org/sources/gitg/0.3/${name}.tar.xz";
+    url = "mirror://gnome/sources/gitg/0.3/${name}.tar.xz";
     sha256 = "03vc59d1r3326piqdph6qjqnc40chm1lpg52lpf8466ddjs0x8vp";
   };
 
-  configureFlags = [ "--disable-static" ];
-
   preCheck = ''
     substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash"
   '';
@@ -29,14 +27,11 @@ stdenv.mkDerivation rec {
                   libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg
                   gobjectIntrospection makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ];
 
-  postInstall = ''
+  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:${gnome3.gsettings_desktop_schemas}/share:$out/share"
-  '';
-
-  preFixup = ''
+      --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
   '';
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 73b74a12c66..3f20147d0e9 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   # ToDo: one probably should specify schemas for samba and others here
-  fixupPhase = ''
-    wrapProgram $out/libexec/gvfsd --set GSETTINGS_SCHEMA_DIR "$out/share/glib-2.0/schemas"
+  preFixup = ''
+    wrapProgram $out/libexec/gvfsd --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/development/libraries/ibus/default.nix
index 75eb1b4134c..905f11dfdc2 100644
--- a/pkgs/development/libraries/ibus/default.nix
+++ b/pkgs/development/libraries/ibus/default.nix
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
 
   preBuild = "patchShebangs ./scripts";
 
-  postInstall = ''
+  preFixup = ''
     for f in "$out"/bin/*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share" \
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
                        --prefix PYTHONPATH : "$(toPythonPath ${pygobject3})" \
                        --prefix LD_LIBRARY_PATH : "${gnome3.gtk3}/lib:${atk}/lib:$out/lib" \
                        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 6db55ada192..8d0d4521b86 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    gnome3.gtk libglade networkmanager libnotify libsecret dbus_glib
+    gnome3.gtk libglade networkmanager libnotify libsecret dbus_glib gsettings_desktop_schemas
     polkit isocodes makeWrapper udev gnome3.gconf gnome3.libgnome_keyring
   ];
 
@@ -44,9 +44,12 @@ stdenv.mkDerivation rec {
     ln -s ${networkmanager_openvpn}/libexec/* $out/libexec/
     ln -s ${networkmanager_vpnc}/libexec/* $out/libexec/
     ln -s ${networkmanager_openconnect}/libexec/* $out/libexec/
+  '';
+
+  preFixup = ''
     wrapProgram "$out/bin/nm-applet" \
       --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
-      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:${gnome3.gtk}/share:$out/share" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
       --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
       --prefix PATH ":" "${gnome3.gconf}/bin"
   '';
@@ -57,9 +60,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = with maintainers; [ phreedom urkud rickynils ];
     platforms = platforms.linux;
-
-    # resolve collision between evince and nm-applet for
-    # gschemas.compiled
-    priority = 6;
   };
 }
-- 
GitLab


From 1653c118bd079d0ba19fc85c8abe94e35739db53 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@immobiliare.it>
Date: Thu, 3 Apr 2014 16:39:46 +0200
Subject: [PATCH 2935/3789] pastebinit: new package

A software that lets you send anything you want directly to a pastebin from the command line

https://launchpad.net/pastebinit
---
 pkgs/tools/misc/pastebinit/default.nix | 33 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/tools/misc/pastebinit/default.nix

diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix
new file mode 100644
index 00000000000..cf41de29c50
--- /dev/null
+++ b/pkgs/tools/misc/pastebinit/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, python3Packages }:
+
+python3Packages.buildPythonPackage rec {
+  version = "1.4.1";
+  name = "pastebinit-${version}";
+
+  src = fetchurl {
+    url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${name}.tar.bz2";
+    md5 = "b771872a9483cf92be90a3e4420fd3c9";
+  };
+
+  configurePhase = "export DETERMINISTIC_BUILD=1";
+
+  buildPhase = "";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/etc
+    cp -a pastebinit $out/bin
+    cp -a pastebin.d $out/etc
+    substituteInPlace $out/bin/pastebinit --replace "'/etc/pastebin.d" "'$out/etc/pastebin.d"
+  '';
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://launchpad.net/pastebinit;
+    description = "A software that lets you send anything you want directly to a pastebin from 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 f2b10785962..550999b438e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1763,6 +1763,8 @@ let
 
   cntlm = callPackage ../tools/networking/cntlm { };
 
+  pastebinit = callPackage ../tools/misc/pastebinit { };
+  
   psmisc = callPackage ../os-specific/linux/psmisc { };
 
   pstoedit = callPackage ../tools/graphics/pstoedit { };
-- 
GitLab


From c01cc1a0e42c79cfd2e012c29a395eddbeb6f73b Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 5 Apr 2014 09:48:19 +0200
Subject: [PATCH 2936/3789] add haskell-cheapskate-0.1.0.1   (markdown
 processor)

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

diff --git a/pkgs/development/libraries/haskell/cheapskate/default.nix b/pkgs/development/libraries/haskell/cheapskate/default.nix
new file mode 100644
index 00000000000..0ef18440e37
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cheapskate/default.nix
@@ -0,0 +1,20 @@
+{ cabal, blazeHtml, dataDefault, mtl, syb, text, uniplate
+, xssSanitize
+}:
+
+cabal.mkDerivation (self: {
+  pname = "cheapskate";
+  version = "0.1.0.1";
+  sha256 = "0slrvbaamnwxx89kqjcr62058j00s2dw4c16q1swf817az2p66h8";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    blazeHtml dataDefault mtl syb text uniplate xssSanitize
+  ];
+  meta = {
+    homepage = "http://github.com/jgm/cheapskate";
+    description = "Experimental markdown processor";
+    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 522baf33ff2..8960e980fc7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -757,6 +757,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {};
 
+  cheapskate = callPackage ../development/libraries/haskell/cheapskate {};
+
   checkers = callPackage ../development/libraries/haskell/checkers {};
 
   chell = callPackage ../development/libraries/haskell/chell {};
-- 
GitLab


From 7f6a2f81b92068c85876662a36a976c4839adb2b Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 5 Apr 2014 09:35:52 +0200
Subject: [PATCH 2937/3789] idris: upgrade to 0.9.12

---
 pkgs/development/compilers/idris/default.nix | 24 ++++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index a22c8bf7762..c32c14cf584 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -1,23 +1,23 @@
 { cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint, binary
-, boehmgc, Cabal, deepseq, filepath, gmp, happy, haskeline
-, languageJava, libffi, llvmGeneral, llvmGeneralPure, mtl, network
-, parsers, split, text, time, transformers, trifecta
-, unorderedContainers, utf8String, vector, vectorBinaryInstances
-, xml, zlib
+, boehmgc, Cabal, cheapskate, deepseq, filepath, gmp, happy
+, haskeline, languageJava, lens, libffi, llvmGeneral
+, llvmGeneralPure, mtl, network, parsers, split, text, time
+, transformers, trifecta, unorderedContainers, utf8String, vector
+, vectorBinaryInstances, xml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "idris";
-  version = "0.9.11.2";
-  sha256 = "16xgiygn0j3kl3l36lnv6wz422nz2bvn3lk86xkdfvwjpv4630yn";
+  version = "0.9.12";
+  sha256 = "151h9qkx7yw24q0b60r78hki1y8m6sxmfars7wywnbzk3kalqb6x";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    annotatedWlPprint ansiTerminal ansiWlPprint binary Cabal deepseq
-    filepath haskeline languageJava libffi llvmGeneral llvmGeneralPure
-    mtl network parsers split text time transformers trifecta
-    unorderedContainers utf8String vector vectorBinaryInstances xml
-    zlib
+    annotatedWlPprint ansiTerminal ansiWlPprint binary Cabal cheapskate
+    deepseq filepath haskeline languageJava lens libffi llvmGeneral
+    llvmGeneralPure mtl network parsers split text time transformers
+    trifecta unorderedContainers utf8String vector
+    vectorBinaryInstances xml zlib
   ];
   buildTools = [ happy ];
   extraLibraries = [ boehmgc gmp ];
-- 
GitLab


From b36f6ce3d4e7f57c51601cb4d7d4ad70e4ffe42d Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 5 Apr 2014 09:55:11 +0200
Subject: [PATCH 2938/3789] ghc-mod: upgrade to 4.0.1

---
 .../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 260fff8ae82..0e60526e8fc 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, ghcPaths
-, ghcSybUtils, hlint, hspec, ioChoice, syb, time, transformers
+{ cabal, Cabal, convertible, doctest, emacs, filepath, ghcSybUtils
+, hlint, hspec, ioChoice, syb, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "3.1.7";
-  sha256 = "1mv6m1fcqkm4i27jw1aniwfq2dhpn4m7kicyq4l70zmkfr7y7c5s";
+  version = "4.0.1";
+  sha256 = "13dgphwspp91bycnmcxgxzv4470wpjv5zfswwgmad644i77nixmm";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    Cabal convertible filepath ghcPaths ghcSybUtils hlint ioChoice syb
-    time transformers
+    Cabal convertible filepath ghcSybUtils hlint ioChoice syb time
+    transformers
   ];
   testDepends = [
-    Cabal convertible doctest filepath ghcPaths ghcSybUtils hlint hspec
-    ioChoice syb time transformers
+    Cabal convertible doctest filepath ghcSybUtils hlint hspec ioChoice
+    syb time transformers
   ];
   buildTools = [ emacs ];
   postInstall = ''
-- 
GitLab


From cdc4c7039dac9ba520f68923bd995a374fcd2997 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 5 Apr 2014 10:42:17 +0200
Subject: [PATCH 2939/3789] add haskell-data-hash-0.2.0.0

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

diff --git a/pkgs/development/libraries/haskell/data-hash/default.nix b/pkgs/development/libraries/haskell/data-hash/default.nix
new file mode 100644
index 00000000000..c8e4887063c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-hash/default.nix
@@ -0,0 +1,15 @@
+{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }:
+
+cabal.mkDerivation (self: {
+  pname = "data-hash";
+  version = "0.2.0.0";
+  sha256 = "1bfsbc4fkg3jqgbgka1mg6k1fizynvvxbhf2zb0x1apgr579mcrm";
+  testDepends = [
+    QuickCheck testFramework testFrameworkQuickcheck2
+  ];
+  meta = {
+    description = "Combinators for building fast hashing functions";
+    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 8960e980fc7..6d52e5843b0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -913,6 +913,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   dataenc = callPackage ../development/libraries/haskell/dataenc {};
 
+  dataHash = callPackage ../development/libraries/haskell/data-hash {};
+
   dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {};
 
   dataLens = callPackage ../development/libraries/haskell/data-lens {};
-- 
GitLab


From 773ce7aa32199bc6b256af4d6a77aabee6ea67fe Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 5 Apr 2014 10:44:52 +0200
Subject: [PATCH 2940/3789] add haskell-tree-view-0.4

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

diff --git a/pkgs/development/libraries/haskell/tree-view/default.nix b/pkgs/development/libraries/haskell/tree-view/default.nix
new file mode 100644
index 00000000000..7ceefb815d8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tree-view/default.nix
@@ -0,0 +1,13 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "tree-view";
+  version = "0.4";
+  sha256 = "0mzywp6nipc6zs98dy4ny2s3r9d745lqpjazfnj5y4hx8swyckgn";
+  buildDepends = [ mtl ];
+  meta = {
+    description = "Render trees as foldable HTML and Unicode art";
+    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 6d52e5843b0..fb0b0dc3aaa 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2522,6 +2522,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   traverseWithClass = callPackage ../development/libraries/haskell/traverse-with-class {};
 
+  treeView = callPackage ../development/libraries/haskell/tree-view {};
+
   trifecta = callPackage ../development/libraries/haskell/trifecta {};
 
   tuple = callPackage ../development/libraries/haskell/tuple {};
-- 
GitLab


From 6249cc729e342c85b5ac222fb2908880847b86ae Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 5 Apr 2014 10:36:21 +0200
Subject: [PATCH 2941/3789] add haskell-syntactic-1.11

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

diff --git a/pkgs/development/libraries/haskell/syntactic/default.nix b/pkgs/development/libraries/haskell/syntactic/default.nix
new file mode 100644
index 00000000000..e18cf7b5937
--- /dev/null
+++ b/pkgs/development/libraries/haskell/syntactic/default.nix
@@ -0,0 +1,22 @@
+{ cabal, constraints, dataHash, mtl, QuickCheck, tasty, tastyGolden
+, tastyQuickcheck, tastyTh, transformers, treeView, tuple
+, utf8String
+}:
+
+cabal.mkDerivation (self: {
+  pname = "syntactic";
+  version = "1.11";
+  sha256 = "1j4k4qwi17x9z0cjf9adndaj5wbs8prs36xpz2icf7mlwcr9pvrz";
+  buildDepends = [
+    constraints dataHash mtl transformers treeView tuple
+  ];
+  testDepends = [
+    mtl QuickCheck tasty tastyGolden tastyQuickcheck tastyTh utf8String
+  ];
+  meta = {
+    homepage = "https://github.com/emilaxelsson/syntactic";
+    description = "Generic abstract syntax, and utilities for embedded languages";
+    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 fb0b0dc3aaa..186a39ecd77 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2304,6 +2304,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   sybWithClassInstancesText = callPackage ../development/libraries/haskell/syb/syb-with-class-instances-text.nix {};
 
+  syntactic = callPackage ../development/libraries/haskell/syntactic {};
+
   syz = callPackage ../development/libraries/haskell/syz {};
 
   SDLImage = callPackage ../development/libraries/haskell/SDL-image {};
-- 
GitLab


From bf129a2c238e5ffe99e7778851042c16ba467496 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sun, 6 Apr 2014 12:39:51 +0200
Subject: [PATCH 2942/3789] Allow undefined uids and gids when mutableUsers =
 true

Groups and users without gid/uid are created with
useradd/groupadd after the passwd/group merge phase
if mutableUsers = true.

This should fix #2114.
---
 nixos/modules/config/users-groups.nix | 96 ++++++++++++++++++++-------
 1 file changed, 73 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 2d9b941a2ca..c5d44223ecf 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -7,6 +7,9 @@ let
   ids = config.ids;
   cfg = config.users;
 
+  nonUidUsers = filterAttrs (n: u: u.uid == null) cfg.extraUsers;
+  nonGidGroups = filterAttrs (n: g: g.gid == null) cfg.extraGroups;
+
   passwordDescription = ''
     The options <literal>hashedPassword</literal>,
     <literal>password</literal> and <literal>passwordFile</literal>
@@ -31,7 +34,10 @@ let
 
       name = mkOption {
         type = types.str;
-        description = "The name of the user account. If undefined, the name of the attribute set will be used.";
+        description = ''
+          The name of the user account. If undefined, the name of the
+          attribute set will be used.
+        '';
       };
 
       description = mkOption {
@@ -46,8 +52,14 @@ let
       };
 
       uid = mkOption {
-        type = with types; uniq int;
-        description = "The account UID.";
+        type = with types; nullOr int;
+        default = null;
+        description = ''
+          The account UID. If the <literal>mutableUsers</literal> 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).
+        '';
       };
 
       group = mkOption {
@@ -151,12 +163,21 @@ let
 
       name = mkOption {
         type = types.str;
-        description = "The name of the group. If undefined, the name of the attribute set will be used.";
+        description = ''
+          The name of the group. If undefined, the name of the attribute set
+          will be used.
+        '';
       };
 
       gid = mkOption {
-        type = with types; uniq int;
-        description = "The GID of the group.";
+        type = with types; nullOr int;
+        default = null;
+        description = ''
+          The group GID. If the <literal>mutableUsers</literal> option
+          is false, the GID cannot be null. Otherwise, the GID might be
+          null, in which case a free GID is picked on activation (by the
+          groupadd command).
+        '';
       };
 
       members = mkOption {
@@ -218,13 +239,15 @@ let
 
   groupFile = pkgs.writeText "group" (
     concatStringsSep "\n" (map (g: mkGroupEntry g.name) (
-      sortOn "gid" (attrValues cfg.extraGroups)
+      let f = g: g.gid != null; in
+        sortOn "gid" (filter f (attrValues cfg.extraGroups))
     ))
   );
 
   passwdFile = pkgs.writeText "passwd" (
     concatStringsSep "\n" (map (u: mkPasswdEntry u.name) (
-      sortOn "uid" (filter (u: u.createUser) (attrValues cfg.extraUsers))
+      let f = u: u.createUser && (u.uid != null); in
+        sortOn "uid" (filter f (attrValues cfg.extraUsers))
     ))
   );
 
@@ -261,11 +284,11 @@ let
       then builtins.trace "Duplicate ${idAttr} ${id}" { dup = true; acc = null; }
       else { dup = false; acc = newAcc; }
     ) { dup = false; acc = {}; } (builtins.attrNames set)).dup;
-  uidsAreUnique = idsAreUnique cfg.extraUsers "uid";
-  gidsAreUnique = idsAreUnique cfg.extraGroups "gid";
-in
 
-{
+  uidsAreUnique = idsAreUnique (filterAttrs (n: u: u.uid != null) cfg.extraUsers) "uid";
+  gidsAreUnique = idsAreUnique (filterAttrs (n: g: g.gid != null) cfg.extraGroups) "gid";
+
+in {
 
   ###### interface
 
@@ -424,16 +447,31 @@ in
             }
           fi
         '';
-        mkhome = n: u:
-         let
-            uid = toString u.uid;
-            gid = toString ((getGroup u.group).gid);
-            h = u.home;
-          in ''
-            test -a "${h}" || mkdir -p "${h}" || true
-            test "$(stat -c %u "${h}")" = ${uid} || chown ${uid} "${h}" || true
-            test "$(stat -c %g "${h}")" = ${gid} || chgrp ${gid} "${h}" || true
-          '';
+        mkhome = n: u: ''
+          uid="$(id -u ${u.name})"
+          gid="$(id -g ${u.name})"
+          h="${u.home}"
+          test -a "$h" || mkdir -p "$h" || true
+          test "$(stat -c %u "$h")" = $uid || chown $uid "$h" || true
+          test "$(stat -c %g "$h")" = $gid || chgrp $gid "$h" || true
+        '';
+        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}" \
+              "${u.name}"
+            echo "${u.name}:x" | ${pkgs.shadow}/sbin/chpasswd -e
+          fi
+        '';
       in stringAfter [ "etc" ] ''
         touch /etc/group
         touch /etc/passwd
@@ -441,6 +479,8 @@ in
         VISUAL=${merger passwdFile} ${pkgs.shadow}/sbin/vipw &>/dev/null
         ${pkgs.shadow}/sbin/grpconv
         ${pkgs.shadow}/sbin/pwconv
+        ${concatStrings (mapAttrsToList groupadd nonGidGroups)}
+        ${concatStrings (mapAttrsToList useradd nonUidUsers)}
         ${concatStrings (mapAttrsToList mkhome mkhomeUsers)}
         ${concatStrings (mapAttrsToList setpw setpwUsers)}
       '';
@@ -448,7 +488,17 @@ in
     # for backwards compatibility
     system.activationScripts.groups = stringAfter [ "users" ] "";
 
-    assertions = [ { assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique); message = "uids and gids must be unique!"; } ];
+    assertions = [
+      { assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique);
+        message = "uids and gids must be unique!";
+      }
+      { assertion = cfg.mutableUsers || (nonUidUsers == {});
+        message = "When mutableUsers is false, no uid can be null";
+      }
+      { assertion = cfg.mutableUsers || (nonGidGroups == {});
+        message = "When mutableUsers is false, no gid can be null";
+      }
+    ];
 
   };
 
-- 
GitLab


From 7de29bd26f5e514e95d5d261c08f3029337eecb3 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sun, 6 Apr 2014 11:56:43 +0100
Subject: [PATCH 2943/3789] Create the 'postgres' superuser

Old PostgreSQL installations were created using the 'root' database
user. In this case, we need to create a new 'postgres' account, as we
now assume that this is the superuser account.

Unfortunately, these machines will be left with a 'root' user as
well (which will have ownership of some databases). While PostgreSQL
does let you rename superuser accounts, you can only do that when you
are connected as a *different* database user. Thus we'd have to create a
special superuser account to do the renaming. As we default to using
ident authentication, we would have to create a system level user to do
this. This all feels rather complex, so I'm currently opting to keep the
'root' user on these old machines.
---
 nixos/modules/services/databases/postgresql.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 33ee7244e3f..08a9cdd9f5d 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -197,6 +197,7 @@ in
                 fi
                 rm -f ${cfg.dataDir}/*.conf
                 touch "${cfg.dataDir}/.first_startup"
+                touch "${cfg.dataDir}/postgresql-user-created"
             fi
 
             ln -sfn "${configFile}" "${cfg.dataDir}/postgresql.conf"
@@ -230,6 +231,11 @@ in
                 sleep 0.1
             done
 
+            if ! [ -e ${cfg.dataDir}/postgresql-user-created ]; then
+              createuser --superuser postgres
+              touch ${cfg.dataDir}/postgresql-user-created
+            fi
+
             if test -e "${cfg.dataDir}/.first_startup"; then
               ${optionalString (cfg.initialScript != null) ''
                 cat "${cfg.initialScript}" | su -s ${pkgs.stdenv.shell} postgres -c 'psql postgres'
-- 
GitLab


From e2066841106a6b89093ab685368742efa4e3c2c1 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sun, 6 Apr 2014 12:00:02 +0100
Subject: [PATCH 2944/3789] Use PostgreSQL 9.3's `pg_isready` to wait for
 connectivity

The postgresql module has a postStart section that waits for a database
to accept connections before continuing. However, this assumes various
properties about the database - specifically the database user
and (implicitly) the database name. This means that for old
installations, this command fails because there is no 'postgres' user,
and the service never starts.

While 7deff39 does create the 'postgres' user, a better solution is to
use `pg_isready`, who's sole purpose is to check if the database is
accepting connections. This has no dependency on users, so should be
more robust.
---
 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 08a9cdd9f5d..ed66c15e304 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -226,7 +226,7 @@ in
         # Wait for PostgreSQL to be ready to accept connections.
         postStart =
           ''
-            while ! su -s ${pkgs.stdenv.shell} postgres -c 'psql postgres -c ""' 2> /dev/null; do
+            while ! ${pkgs.postgresql93}/bin/pg_isready > /dev/null; do
                 if ! kill -0 "$MAINPID"; then exit 1; fi
                 sleep 0.1
             done
-- 
GitLab


From 5174e6db807f36e3024adeaa1107c0486e88b135 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 6 Apr 2014 12:25:15 +0200
Subject: [PATCH 2945/3789] gnome-backgrounds: new package

---
 .../services/x11/desktop-managers/gnome3.nix     |  1 +
 .../gnome-3/core/gnome-backgrounds/default.nix   | 16 ++++++++++++++++
 pkgs/desktops/gnome-3/default.nix                |  2 ++
 3 files changed, 19 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index f4230fd1dd2..4f876b9b111 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -57,6 +57,7 @@ in {
         gnome3.yelp
         pkgs.glib_networking
         pkgs.ibus
+        gnome3.gnome-backgrounds
         gnome3.gnome_shell
         gnome3.gnome_settings_daemon
         gnome3.gnome_terminal
diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
new file mode 100644
index 00000000000..41f75e6e3c5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-backgrounds-3.12.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-backgrounds/3.12/${name}.tar.xz";
+    sha256 = "77a893025a0bed5753631a810154cad53fb2cf34c8ee988016217cd8862eab42";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index b4bb2c8320e..00bc653c1f9 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -38,6 +38,8 @@ rec {
 
   gjs = callPackage ./core/gjs { };
 
+  gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
+
   gnome_control_center = callPackage ./core/gnome-control-center { };
 
   gnome-calculator = callPackage ./core/gnome-calculator { };
-- 
GitLab


From c70c038624dcefecfc9736d39eba30f516f88dc5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 6 Apr 2014 12:33:28 +0200
Subject: [PATCH 2946/3789] gnome-dictionary: new package

Dictionary is the GNOME application to look up definitions

https://wiki.gnome.org/Apps/Dictionary
---
 .../gnome-3/core/gnome-dictionary/default.nix | 38 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix

diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
new file mode 100644
index 00000000000..6f68916b781
--- /dev/null
+++ b/pkgs/desktops/gnome-3/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/default.nix b/pkgs/desktops/gnome-3/default.nix
index 00bc653c1f9..4f902a96358 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -46,6 +46,8 @@ rec {
 
   gnome_common = callPackage ./core/gnome-common { };
 
+  gnome-dictionary = callPackage ./core/gnome-dictionary { };
+
   gnome-disk-utility = callPackage ./core/gnome-disk-utility { };
 
   gnome-font-viewer = callPackage ./core/gnome-font-viewer { };
-- 
GitLab


From eca21f192602e1fafac30e1ca53ac6d769b23a08 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 6 Apr 2014 12:47:17 +0200
Subject: [PATCH 2947/3789] totem-pl-parser: new package

Simple GObject-based library to parse and save a host of playlist formats

https://wiki.gnome.org/Apps/Videos
---
 .../gnome-3/core/totem-pl-parser/default.nix  | 20 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix

diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
new file mode 100644
index 00000000000..f1b3bfe53c1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/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/default.nix b/pkgs/desktops/gnome-3/default.nix
index 4f902a96358..04fa0df9003 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -108,6 +108,8 @@ rec {
 
   rest = callPackage ./core/rest { };
 
+  totem-pl-parser = callPackage ./core/totem-pl-parser { };
+
   vte = callPackage ./core/vte { };
 
   vino = callPackage ./core/vino { };
-- 
GitLab


From 994a1ee4ef105401eddbb7419181a6ed5b7b45d4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 6 Apr 2014 14:44:40 +0200
Subject: [PATCH 2948/3789] grilo: new package

Framework that provides access to various sources of multimedia content, using a pluggable system

https://wiki.gnome.org/action/show/Projects/Grilo
---
 pkgs/desktops/gnome-3/core/grilo/default.nix | 22 ++++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/grilo/default.nix

diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix
new file mode 100644
index 00000000000..2a7f270300a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/grilo/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib, libxml2, gnome3 }:
+
+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" ];
+
+  buildInputs = [ pkgconfig file intltool glib libxml2 gnome3.totem-pl-parser ];
+
+  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/default.nix b/pkgs/desktops/gnome-3/default.nix
index 04fa0df9003..e471616d960 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -80,6 +80,8 @@ rec {
 
   gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
 
+  grilo = callPackage ./core/grilo { };
+
   gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
 
   gucharmap = callPackage ./core/gucharmap { };
-- 
GitLab


From 289d554babc7184c8d350fb9ecd86b0ad2b6bda7 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 6 Apr 2014 14:45:33 +0200
Subject: [PATCH 2949/3789] totem: new package

Movie player for the GNOME desktop based on GStreamer

https://wiki.gnome.org/Apps/Videos
---
 pkgs/desktops/gnome-3/core/totem/default.nix | 48 ++++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix            |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/totem/default.nix

diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
new file mode 100644
index 00000000000..a6acbd192db
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -0,0 +1,48 @@
+{ 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 ];
+  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
+                  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
+                  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"
+
+    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/default.nix b/pkgs/desktops/gnome-3/default.nix
index e471616d960..ee40ff19e71 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -110,6 +110,8 @@ rec {
 
   rest = callPackage ./core/rest { };
 
+  totem = callPackage ./core/totem { };
+
   totem-pl-parser = callPackage ./core/totem-pl-parser { };
 
   vte = callPackage ./core/vte { };
-- 
GitLab


From 56709a0ac90497dfe1b1e339ba8fbbcb595d6072 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 6 Apr 2014 15:23:08 +0200
Subject: [PATCH 2950/3789] gnome-disk-utility: remove duplicated preFixup
 attribute

---
 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index c02f8f0a665..e96da3168e0 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
     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"
-  '';
-
-  preFixup = ''
     rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
-- 
GitLab


From 331d234ef6ecd6f32fb2a589a9a97ebf0bf85a9c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 6 Apr 2014 10:54:44 -0400
Subject: [PATCH 2951/3789] Add sproxy

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

diff --git a/pkgs/tools/networking/sproxy/default.nix b/pkgs/tools/networking/sproxy/default.nix
new file mode 100644
index 00000000000..342da193ffc
--- /dev/null
+++ b/pkgs/tools/networking/sproxy/default.nix
@@ -0,0 +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
+}:
+
+cabal.mkDerivation (self: {
+  pname = "sproxy";
+  version = "0.7.4";
+  src = fetchurl {
+    url = "https://github.com/zalora/sproxy/archive/0.7.4.tar.gz";
+    sha256 = "1zlsln0ihg7p8jk5gdvm9as6gk4fs8vaa547iq2yvna4c1wb4amr";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    aeson attoparsec caseInsensitive certificate concurrentExtra
+    cryptoRandom curl dataDefault hslogger HTTP 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
+  ];
+  meta = {
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99730b15d3e..924f6a95d60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1951,6 +1951,8 @@ let
 
   sparsehash = callPackage ../development/libraries/sparsehash { };
 
+  sproxy = haskellPackages.callPackage ../tools/networking/sproxy { };
+
   stardict = callPackage ../applications/misc/stardict/stardict.nix {
     inherit (gnome) libgnomeui scrollkeeper;
   };
-- 
GitLab


From 79c9d556e0d1d9c3d82786e222784e76abd59358 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 6 Apr 2014 11:10:01 -0400
Subject: [PATCH 2952/3789] Add sproxy-web

---
 pkgs/tools/networking/sproxy-web/default.nix | 26 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/networking/sproxy-web/default.nix

diff --git a/pkgs/tools/networking/sproxy-web/default.nix b/pkgs/tools/networking/sproxy-web/default.nix
new file mode 100644
index 00000000000..fa3221a7759
--- /dev/null
+++ b/pkgs/tools/networking/sproxy-web/default.nix
@@ -0,0 +1,26 @@
+{ cabal, aeson, blazeHtml, blazeMarkup, configurator, hflags
+, httpTypes, mtl, postgresqlSimple, resourcePool, scotty, text
+, waiExtra, waiMiddlewareStatic, fetchurl
+}:
+
+cabal.mkDerivation (self: {
+  pname = "sproxy-web";
+  version = "0.1.0.2";
+  src = fetchurl {
+    url = "https://github.com/zalora/sproxy-web/archive/0.1.0.2.tar.gz";
+    sha256 = "1rdzglvsas0rdgq3j5c9ll411yk168x7v3l7w8zdjgafa947j4d4";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    aeson blazeHtml blazeMarkup configurator hflags httpTypes mtl
+    postgresqlSimple resourcePool scotty text waiExtra
+    waiMiddlewareStatic
+  ];
+  meta = {
+    homepage = "http://bitbucket.org/zalorasea/sproxy-web";
+    description = "Web interface to sproxy";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 924f6a95d60..d8e94a3ba25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1953,6 +1953,8 @@ let
 
   sproxy = haskellPackages.callPackage ../tools/networking/sproxy { };
 
+  sproxy-web = haskellPackages.callPackage ../tools/networking/sproxy-web { };
+
   stardict = callPackage ../applications/misc/stardict/stardict.nix {
     inherit (gnome) libgnomeui scrollkeeper;
   };
-- 
GitLab


From 8d3d50191d3ca9cbb835d0d73f5daa431b00cda1 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 6 Apr 2014 01:46:28 -0500
Subject: [PATCH 2953/3789] spiped: version 1.3.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/networking/spiped/default.nix | 25 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/networking/spiped/default.nix

diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix
new file mode 100644
index 00000000000..1dd8804fb3d
--- /dev/null
+++ b/pkgs/tools/networking/spiped/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, openssl }:
+
+stdenv.mkDerivation rec {
+  name    = "spiped-${version}";
+  version = "1.3.1";
+
+  src = fetchurl {
+    url    = "http://www.tarsnap.com/spiped/${name}.tgz";
+    sha256 = "1viglk61v1v2ga1n31r0h8rvib5gy2h02lhhbbnqh2s6ps1sjn4a";
+  };
+
+  buildInputs = [ openssl ];
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1
+    make install BINDIR=$out/bin MAN1DIR=$out/share/man/man1
+  '';
+
+  meta = {
+    description = "utility for secure encrypted channels between sockets";
+    homepage    = "https://www.tarsnap.com/spiped.html";
+    license     = stdenv.lib.licenses.bsd2;
+    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 d8e94a3ba25..d0fea1417de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1951,6 +1951,8 @@ let
 
   sparsehash = callPackage ../development/libraries/sparsehash { };
 
+  spiped = callPackage ../tools/networking/spiped { };
+
   sproxy = haskellPackages.callPackage ../tools/networking/sproxy { };
 
   sproxy-web = haskellPackages.callPackage ../tools/networking/sproxy-web { };
-- 
GitLab


From 43dc48845bb6ca6ec1aaa918f1e33a6874c70eca Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 6 Apr 2014 20:36:11 +0200
Subject: [PATCH 2954/3789] gnome-system-log: remove duplicated preFixup
 attribute

---
 pkgs/desktops/gnome-3/core/gnome-system-log/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
index 7152332217a..cdc4b732b97 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
@@ -25,9 +25,6 @@ stdenv.mkDerivation rec {
     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"
-  '';
-
-  preFixup = ''
     rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
-- 
GitLab


From 2b8002e44babe44e3dba0cc623ffd1d22ba39daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 6 Apr 2014 21:20:23 +0200
Subject: [PATCH 2955/3789] cinnamon: fixup gschemas

---
 pkgs/desktops/cinnamon/cinnamon-desktop.nix | 4 ----
 pkgs/desktops/cinnamon/cinnamon-session.nix | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop.nix b/pkgs/desktops/cinnamon/cinnamon-desktop.nix
index e158b489884..d3cf04e835d 100644
--- a/pkgs/desktops/cinnamon/cinnamon-desktop.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-desktop.nix
@@ -22,10 +22,6 @@ stdenv.mkDerivation {
     xkeyboard_config libxkbfile libX11 libXrandr libXext
   ];
 
-  postInstall  = ''
-    ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
-  '';
-
   meta = {
     homepage = "http://cinnamon.linuxmint.com";
     description = "Library and data for various Cinnamon modules";
diff --git a/pkgs/desktops/cinnamon/cinnamon-session.nix b/pkgs/desktops/cinnamon/cinnamon-session.nix
index 850dd4e6c5a..4caa95be061 100644
--- a/pkgs/desktops/cinnamon/cinnamon-session.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-session.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   };
 
 
-  configureFlags = "--disable-schemas-compile --enable-systemd --disable-gconf" ;
+  configureFlags = "--enable-systemd --disable-gconf" ;
 
   patches = [ ./remove-sessionmigration.patch ./timeout.patch];
 
@@ -23,17 +23,17 @@ stdenv.mkDerivation {
     gtk3 dbus_glib upower json_glib
     intltool systemd xorg.xtrans
     makeWrapper
+    cinnamon-desktop/*gschemas*/
    ];
 
   preBuild = "patchShebangs ./scripts";
 
 
-  postInstall  = ''
-    ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
+  postFixup  = ''
     rm $out/share/icons/hicolor/icon-theme.cache
 
     for f in "$out"/bin/*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:${cinnamon-desktop}/share"
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas:$GSETTINGS_SCHEMAS_PATH"
     done
   '';
 
-- 
GitLab


From b4399324c1c8813849c4a4209de118d9cebe8b00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 6 Apr 2014 21:40:55 +0200
Subject: [PATCH 2956/3789] cinnamon gschemas: fix wrong and pointless part

---
 pkgs/desktops/cinnamon/cinnamon-session.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-session.nix b/pkgs/desktops/cinnamon/cinnamon-session.nix
index 4caa95be061..534fa11f046 100644
--- a/pkgs/desktops/cinnamon/cinnamon-session.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-session.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     rm $out/share/icons/hicolor/icon-theme.cache
 
     for f in "$out"/bin/*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas:$GSETTINGS_SCHEMAS_PATH"
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
     done
   '';
 
-- 
GitLab


From 784062214ce43ea9d2f6a1ea068e952d517476fe Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 17 Mar 2014 18:28:10 -0500
Subject: [PATCH 2957/3789] gradm: fix gradm_pam path

We alredy rewrote /sbin/gradm, which technically matches
/sbin/gradm_pam, so this ends up working exactly as we want. Otherwise
we rewrite twice and gradm can't execute the PAM module with '-p'

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/gradm/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix
index 680547be57c..7f6f373b098 100644
--- a/pkgs/os-specific/linux/gradm/default.nix
+++ b/pkgs/os-specific/linux/gradm/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
     substituteInPlace ./Makefile --replace "/usr/include/security/pam_" "${pam}/include/security/pam_"
     substituteInPlace ./gradm_defs.h --replace "/sbin/grlearn"   "$out/sbin/grlearn"
     substituteInPlace ./gradm_defs.h --replace "/sbin/gradm"     "$out/sbin/gradm"
-    substituteInPlace ./gradm_defs.h --replace "/sbin/gradm_pam" "$out/sbin/gradm_pam"
   '';
 
   postInstall = ''
-- 
GitLab


From ef903555fda39785832f11c2b0b8fb8f3f96dbfc Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 17 Mar 2014 18:29:28 -0500
Subject: [PATCH 2958/3789] gradm: learn of all accesses for /nix/store

This is necessary for gradm's learning mode to work, as otherwise the
/nix/store directory is marked hidden, which causes the kernel to reject
the linker loading ld-linux.so

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/gradm/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix
index 7f6f373b098..62a3cfa631e 100644
--- a/pkgs/os-specific/linux/gradm/default.nix
+++ b/pkgs/os-specific/linux/gradm/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
     KERNEL=="grsec",          MODE="0622"
     LABEL="permissions_end"
     EOF
+
+    echo "inherit-learn /nix/store" >> $out/etc/grsec/learn_config
   '';
 
   makeFlags =
-- 
GitLab


From 7863956686ab2243a850164c92e85bc5ce13d8ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:19:01 +0200
Subject: [PATCH 2959/3789] haskell-trifecta: update to version 1.4.2

---
 .../libraries/haskell/trifecta/default.nix        | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/haskell/trifecta/default.nix b/pkgs/development/libraries/haskell/trifecta/default.nix
index d9a9a2a01c5..09f3b112c1b 100644
--- a/pkgs/development/libraries/haskell/trifecta/default.nix
+++ b/pkgs/development/libraries/haskell/trifecta/default.nix
@@ -6,25 +6,14 @@
 
 cabal.mkDerivation (self: {
   pname = "trifecta";
-  version = "1.4.1";
-  sha256 = "0w8x9n7n57y997iajm42z44nm846fj88shc04dffn1xif3jw5zfc";
+  version = "1.4.2";
+  sha256 = "13kj1xz2bxixsqsrywdx3snl1hjkyv437ifwfrys1m4hnkv4aqai";
   buildDepends = [
     ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup
     charset comonad deepseq fingertree hashable lens mtl parsers
     reducers semigroups transformers unorderedContainers utf8String
   ];
   testDepends = [ doctest filepath ];
-  postPatch = ''
-    substituteInPlace trifecta.cabal \
-      --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.8," \
-      --replace "blaze-html           >= 0.5     && < 0.7," "blaze-html           >= 0.5     && < 0.8," \
-      --replace "blaze-markup         >= 0.5     && < 0.6," "blaze-markup         >= 0.5     && < 0.7," \
-      --replace "hashable             >= 1.2.1   && < 1.3," "hashable             >= 1.1     && < 1.3," \
-      --replace "hashable             >= 1.2     && < 1.3," "hashable             >= 1.1     && < 1.3," \
-      --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2," \
-      --replace "comonad              == 3.*,"              "comonad              >= 3       && < 5," \
-      --replace "comonad              >= 3       && < 4,"   "comonad              >= 3       && < 5,"
-  '';
   meta = {
     homepage = "http://github.com/ekmett/trifecta/";
     description = "A modern parser combinator library with convenient diagnostics";
-- 
GitLab


From 070f071469a8847f81633ac9a871c2d0d4359e88 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:19:52 +0200
Subject: [PATCH 2960/3789] cosmetic: re-generate expressions with cabal2nix

---
 pkgs/development/libraries/haskell/math-functions/default.nix | 1 -
 pkgs/development/libraries/haskell/mime-mail/default.nix      | 4 ++--
 pkgs/development/libraries/haskell/twitter-types/default.nix  | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix
index a7a9d92fb97..b14449626c8 100644
--- a/pkgs/development/libraries/haskell/math-functions/default.nix
+++ b/pkgs/development/libraries/haskell/math-functions/default.nix
@@ -12,7 +12,6 @@ cabal.mkDerivation (self: {
     HUnit ieee754 QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2 vector
   ];
-  # fails on i686 at version 0.1.5.2
   doCheck = false;
   meta = {
     homepage = "https://github.com/bos/math-functions";
diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix
index 7ba50976168..e2559c70fee 100644
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ b/pkgs/development/libraries/haskell/mime-mail/default.nix
@@ -1,5 +1,5 @@
 { cabal, base64Bytestring, blazeBuilder, filepath, hspec, random
-, text, sendmail ? "sendmail"
+, sendmail ? "sendmail", text
 }:
 
 cabal.mkDerivation (self: {
@@ -10,7 +10,7 @@ cabal.mkDerivation (self: {
     base64Bytestring blazeBuilder filepath random text
   ];
   testDepends = [ blazeBuilder hspec text ];
-  configureFlags = [ "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"${sendmail}\"" ];
+  configureFlags = "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"${sendmail}\"";
   meta = {
     homepage = "http://github.com/snoyberg/mime-mail";
     description = "Compose MIME email messages";
diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix
index 299d39c4546..a7fb544afc1 100644
--- a/pkgs/development/libraries/haskell/twitter-types/default.nix
+++ b/pkgs/development/libraries/haskell/twitter-types/default.nix
@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
     aeson attoparsec httpTypes HUnit shakespeareText testFramework
     testFrameworkHunit testFrameworkThPrime text unorderedContainers
   ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/himura/twitter-types";
     description = "Twitter JSON parser and types";
@@ -19,5 +20,4 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
-  doCheck = false;
 })
-- 
GitLab


From 483e2d7d7d0a3da5dba3262e568e549df4e30d10 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:20:21 +0200
Subject: [PATCH 2961/3789] haskell-smtps-gmail: update to version 1.1.1

---
 .../development/libraries/haskell/smtps-gmail/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/smtps-gmail/default.nix b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
index a61daf6de25..eb8d97805a0 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.0";
-  sha256 = "0zr2ndpwfnb9pkv69vx94p0vpghl0khd0wbmccjpk6hlrp6fsj66";
+  version = "1.1.1";
+  sha256 = "1ccj9rmbplh0c7h6rpg3ry213nb1lrhf7hm2vl7kq9lv0nb7cy97";
   buildDepends = [
     base64Bytestring cprngAes dataDefault filepath mimeMail network
     stringsearch text tls
@@ -16,8 +16,4 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-  # adding a Setup script as it's needed by nix
-  preConfigure = ''
-    printf "import Distribution.Simple\nmain = defaultMain\n" > Setup.hs
-  '';
 })
-- 
GitLab


From 267a1692f313c84d9a18959c2c2e879c81c603c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:23:01 +0200
Subject: [PATCH 2962/3789] haskell-fdo-notify: add version 0.3.1

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

diff --git a/pkgs/development/libraries/haskell/fdo-notify/default.nix b/pkgs/development/libraries/haskell/fdo-notify/default.nix
new file mode 100644
index 00000000000..86f3d7e0d1d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fdo-notify/default.nix
@@ -0,0 +1,14 @@
+{ cabal, dbus }:
+
+cabal.mkDerivation (self: {
+  pname = "fdo-notify";
+  version = "0.3.1";
+  sha256 = "1n4zk1i7g34w0wk5zy8n4r63xbglxf62h8j78kv5fc2yn95l30vh";
+  buildDepends = [ dbus ];
+  meta = {
+    homepage = "http://bitbucket.org/taejo/fdo-notify/";
+    description = "Desktop Notifications client";
+    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 186a39ecd77..08757faf4c8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1080,8 +1080,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   executablePath = callPackage ../development/libraries/haskell/executable-path {};
 
   fay = callPackage ../development/libraries/haskell/fay {};
+
   fayBase = callPackage ../development/libraries/haskell/fay-base {};
 
+  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
 
-- 
GitLab


From 9000db8b1ef49c23c5eded7efa5fdf1a0472a6c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:23:06 +0200
Subject: [PATCH 2963/3789] haskell-git-annex: update to version 5.20140402

---
 .../git-and-tools/git-annex/default.nix          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 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 d64230aa50d..93735d266d6 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
@@ -1,9 +1,9 @@
 { cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable
 , caseInsensitive, clientsession, cryptoApi, cryptohash, curl
 , dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance
-, extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet
-, hinotify, hS3, hslogger, HTTP, httpClient, httpConduit, httpTypes
-, IfElse, json, liftedBase, lsof, MissingH
+, extensibleExceptions, fdoNotify, feed, filepath, git, gnupg1
+, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient
+, httpConduit, httpTypes, IfElse, json, liftedBase, lsof, MissingH
 , MonadCatchIOTransformers, monadControl, mtl, network
 , networkConduit, networkInfo, networkMulticast
 , networkProtocolXmpp, openssh, optparseApplicative, perl
@@ -16,16 +16,16 @@
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140320";
-  sha256 = "0jhg5nbvdsiaprpj4h57fpfskhx0nqva4yx6krfd90i9gwgkm8l5";
+  version = "5.20140402";
+  sha256 = "138zs2nf8k9kvywsajnd5ij9yksaijrgjd75v1b6c6mc3jjy3vhm";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     aeson async blazeBuilder bloomfilter byteable caseInsensitive
     clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus
-    dlist dns editDistance extensibleExceptions feed filepath gnutls
-    hamlet hinotify hS3 hslogger HTTP httpClient httpConduit httpTypes
-    IfElse json liftedBase MissingH MonadCatchIOTransformers
+    dlist dns editDistance extensibleExceptions fdoNotify feed filepath
+    gnutls hamlet hinotify hS3 hslogger HTTP httpClient httpConduit
+    httpTypes IfElse json liftedBase MissingH MonadCatchIOTransformers
     monadControl mtl network networkConduit networkInfo
     networkMulticast networkProtocolXmpp optparseApplicative QuickCheck
     random regexTdfa SafeSemaphore securemem SHA stm tasty tastyHunit
-- 
GitLab


From 36ac60f7573fa3b7ac4f9ac6fadaa331bb177d45 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:23:07 +0200
Subject: [PATCH 2964/3789] haskell-dns: update to version 1.2.1

---
 .../libraries/haskell/dns/default.nix            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
index 5b2d99fb90e..97a120f2123 100644
--- a/pkgs/development/libraries/haskell/dns/default.nix
+++ b/pkgs/development/libraries/haskell/dns/default.nix
@@ -1,19 +1,19 @@
 { cabal, attoparsec, attoparsecConduit, binary, blazeBuilder
-, conduit, doctest, hspec, iproute, mtl, network, networkConduit
-, random
+, conduit, conduitExtra, doctest, hspec, iproute, mtl, network
+, random, resourcet
 }:
 
 cabal.mkDerivation (self: {
   pname = "dns";
-  version = "1.2.0";
-  sha256 = "1pzwvb1qycjw6qw34xhd4ap9jl0cc79d3i09b23bg0vqcz80vmpr";
+  version = "1.2.1";
+  sha256 = "0xv8mj2x8ijqgi7gnh2shr7ns9qghiczm3lw9n37mxk02zbvw8h0";
   buildDepends = [
-    attoparsec attoparsecConduit binary blazeBuilder conduit iproute
-    mtl network networkConduit random
+    attoparsec attoparsecConduit binary blazeBuilder conduit
+    conduitExtra iproute mtl network random resourcet
   ];
   testDepends = [
-    attoparsec attoparsecConduit binary blazeBuilder conduit doctest
-    hspec iproute mtl network networkConduit random
+    attoparsec attoparsecConduit binary blazeBuilder conduit
+    conduitExtra doctest hspec iproute mtl network random resourcet
   ];
   testTarget = "spec";
   meta = {
-- 
GitLab


From ee105b4a94b201e1185f14b6584dea877b9e253e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:23:09 +0200
Subject: [PATCH 2965/3789] haskell-fb: update to version 1.0

---
 .../libraries/haskell/fb/default.nix          | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix
index dbade4c9f84..89f8a2121f8 100644
--- a/pkgs/development/libraries/haskell/fb/default.nix
+++ b/pkgs/development/libraries/haskell/fb/default.nix
@@ -1,5 +1,5 @@
-{ cabal, aeson, attoparsec, attoparsecConduit, base16Bytestring
-, base64Bytestring, cereal, conduit, cryptoApi, cryptohash
+{ cabal, aeson, attoparsec, base16Bytestring, base64Bytestring
+, cereal, conduit, conduitExtra, cryptoApi, cryptohash
 , cryptohashCryptoapi, dataDefault, hspec, httpConduit, httpTypes
 , HUnit, liftedBase, monadControl, monadLogger, QuickCheck
 , resourcet, text, time, transformers, transformersBase
@@ -8,18 +8,17 @@
 
 cabal.mkDerivation (self: {
   pname = "fb";
-  version = "0.15.2";
-  sha256 = "1nkgw4978kwhqs7h6rlsspx2f9dbmsywjn57v2fg1c1lg271rz1d";
+  version = "1.0";
+  sha256 = "1pkjpzhdysq5vn302wipz62w6v9fibpvd4smaylv8wgn09si91ji";
   buildDepends = [
-    aeson attoparsec attoparsecConduit base16Bytestring
-    base64Bytestring cereal conduit cryptoApi cryptohash
-    cryptohashCryptoapi dataDefault httpConduit httpTypes liftedBase
-    monadControl monadLogger resourcet text time transformers
-    transformersBase unorderedContainers
+    aeson attoparsec base16Bytestring base64Bytestring cereal conduit
+    conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault
+    httpConduit httpTypes liftedBase monadControl monadLogger resourcet
+    text time transformers transformersBase unorderedContainers
   ];
   testDepends = [
     aeson conduit dataDefault hspec httpConduit HUnit liftedBase
-    monadControl QuickCheck text time transformers
+    monadControl QuickCheck resourcet text time transformers
   ];
   doCheck = false;
   meta = {
-- 
GitLab


From 8c022626b207128fa3c396c7850167be5ba5d87d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:23:11 +0200
Subject: [PATCH 2966/3789] haskell-hakyll: update to version 4.5.0.1

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

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index cd051bd938c..13128b75b9f 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.0.0";
-  sha256 = "19rmib508zcaada7xj0p84dbkjwzfiaxaszpmc763wlpx15azw8z";
+  version = "4.5.0.1";
+  sha256 = "0zl8zjwkyrh5c0l190q6qw1w6mwhw7jsjk3l7qjpgxbmv730q7nz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From b605e51010972ed9952ac88da39a536605eff94a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:23:13 +0200
Subject: [PATCH 2967/3789] haskell-hint: update to version 0.4.1.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 5534c2fc9da..09fdfe232a6 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.0.0";
-  sha256 = "0xs56ws7vwdjgvg7d31iqa111342an6rxvwhh7c3h4z1bq5l1l61";
+  version = "0.4.1.0";
+  sha256 = "1hc66yfzg9jrm5h3hd52rm4ca8ha0j93rhjpjh6hhzr4a40jv0pl";
   buildDepends = [
     exceptions extensibleExceptions filepath ghcMtl ghcPaths mtl random
     utf8String
-- 
GitLab


From 481df7e6cdfb2ba8e7e4a1eb2954c242ef35c9c0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:23:15 +0200
Subject: [PATCH 2968/3789] haskell-hoogle: update to version 4.2.31

---
 pkgs/development/libraries/haskell/hoogle/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index 53b037ec301..995a4ef5d9a 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -1,19 +1,19 @@
 { cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive
 , cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes
-, parsec, QuickCheck, random, safe, shake, tagsoup, text, time
-, transformers, uniplate, vector, vectorAlgorithms, wai, warp
+, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text
+, time, transformers, uniplate, vector, vectorAlgorithms, wai, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.30";
-  sha256 = "0vw0chqsq8wmi1mpdxj1c9g4ah7lqxm8rwh85j2vyp56vfscw9q1";
+  version = "4.2.31";
+  sha256 = "176lyj236ncq0lg7vbl4bbm1a98ficj82aranrhyxdjzmbk3i67x";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit
     deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random
-    safe shake tagsoup text time transformers uniplate vector
+    resourcet safe shake tagsoup text time transformers uniplate vector
     vectorAlgorithms wai warp
   ];
   testDepends = [ filepath ];
-- 
GitLab


From 9b4cd56e99bba277f0a8e14f6f8986caf09bf209 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:23:16 +0200
Subject: [PATCH 2969/3789] haskell-hspec: update to version 1.9.1

---
 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 0c41ab471f8..5ba74dde34c 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.0";
-  sha256 = "01nwxx63l9cl1smld7pwm59k6shs865iiy1jqwi97lkhzhy9cvhl";
+  version = "1.9.1";
+  sha256 = "1klx7gxg4a98rjhln6ixlmfvsgpxdkdg56jbl06bfxp2lmfyxm9p";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From bda2594998ddd50183259b14d419b60d71bd9188 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:23:17 +0200
Subject: [PATCH 2970/3789] haskell-language-ecmascript: update to version
 0.16.1

---
 .../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 79404ffbcf0..1a53881fd29 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";
-  sha256 = "1gz0089llxfmq9v2j5hp85h7w2vw50sgbl6dcd7i0s8m5zd3dmqg";
+  version = "0.16.1";
+  sha256 = "0pqb1r60jjmiwk9giaxnrp9a07h4a97kp6g0nznwpdy32x849gx3";
   buildDepends = [
     dataDefaultClass Diff mtl parsec QuickCheck testingFeat uniplate
     wlPprint
-- 
GitLab


From db1a390d9d494c5295af6ed24bed101dcfac7e52 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:23:18 +0200
Subject: [PATCH 2971/3789] haskell-hlint: update to version 1.8.60

---
 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 72ba1ba6b87..17ae7d508d3 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.59";
-  sha256 = "14yn63zbbqwvxlis0kwga4mrz6qjr8kq1cq7f0rcilgqgh1dkwh8";
+  version = "1.8.60";
+  sha256 = "10kc4g9sipd5758n3x2xndaw1c887263gvff0y395drfgqh5qxal";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 713bac535126f044251e26a7f44162960d10f44d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:29 +0200
Subject: [PATCH 2972/3789] haskell-attoparsec-conduit: update to version 1.1.0

---
 .../libraries/haskell/attoparsec-conduit/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
index 68b08e50686..bdf42ba947d 100644
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -1,15 +1,13 @@
-{ cabal, attoparsec, conduit, hspec, resourcet, text, transformers
-}:
+{ cabal, conduit }:
 
 cabal.mkDerivation (self: {
   pname = "attoparsec-conduit";
-  version = "1.0.1.2";
-  sha256 = "1j05r7mvm83wgnka7asmwd1dj4ajkg548mryyhpr7dd53vn5lbx0";
-  buildDepends = [ attoparsec conduit text transformers ];
-  testDepends = [ attoparsec conduit hspec resourcet text ];
+  version = "1.1.0";
+  sha256 = "18xn3nzxfghcd88cana1jw85ijv0ysw3bp36fb6r5wsf6m79z01y";
+  buildDepends = [ conduit ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
-    description = "Consume attoparsec parsers via conduit";
+    description = "Consume attoparsec parsers via conduit. (deprecated)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
-- 
GitLab


From 6a8decdf5859cb3a3fffcb27ad536ca97e08c1d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:31 +0200
Subject: [PATCH 2973/3789] haskell-aws: update to version 0.8.6

---
 .../libraries/haskell/aws/default.nix         | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix
index af8b2785aa9..de7377c7532 100644
--- a/pkgs/development/libraries/haskell/aws/default.nix
+++ b/pkgs/development/libraries/haskell/aws/default.nix
@@ -1,21 +1,23 @@
-{ cabal, attempt, base64Bytestring, blazeBuilder, caseInsensitive
-, cereal, conduit, cryptoApi, cryptohash, cryptohashCryptoapi
-, dataDefault, failure, filepath, httpConduit, httpTypes
-, liftedBase, monadControl, mtl, resourcet, text, time
-, transformers, utf8String, xmlConduit
+{ cabal, aeson, attempt, attoparsecConduit, base16Bytestring
+, base64Bytestring, blazeBuilder, caseInsensitive, cereal, conduit
+, cryptoApi, cryptohash, cryptohashCryptoapi, dataDefault, failure
+, filepath, httpConduit, httpTypes, liftedBase, monadControl, mtl
+, resourcet, text, time, transformers, unorderedContainers
+, utf8String, vector, xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "aws";
-  version = "0.8.4";
-  sha256 = "0p4m07lw33wd82phwfvyr1alqx3bsafnf25n60h1mss7l0rzyn0i";
+  version = "0.8.6";
+  sha256 = "19hjwj15zmhmf33n2d2dkwan59ylwkaslh85sh04v05hsm8y5y1a";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    attempt base64Bytestring blazeBuilder caseInsensitive cereal
-    conduit cryptoApi cryptohash cryptohashCryptoapi dataDefault
-    failure filepath httpConduit httpTypes liftedBase monadControl mtl
-    resourcet text time transformers utf8String xmlConduit
+    aeson attempt attoparsecConduit base16Bytestring base64Bytestring
+    blazeBuilder caseInsensitive cereal conduit cryptoApi cryptohash
+    cryptohashCryptoapi dataDefault failure filepath httpConduit
+    httpTypes liftedBase monadControl mtl resourcet text time
+    transformers unorderedContainers utf8String vector xmlConduit
   ];
   meta = {
     homepage = "http://github.com/aristidb/aws";
-- 
GitLab


From 5f8857d4f542dd75d2a0e5913c21a638ca20cf51 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:32 +0200
Subject: [PATCH 2974/3789] haskell-basic-prelude: update to version 0.3.8

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

diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix
index 807b80b8122..b923e444b1e 100644
--- a/pkgs/development/libraries/haskell/basic-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "basic-prelude";
-  version = "0.3.7";
-  sha256 = "1lk4f41f226v7na1cw0c8y62lm3pgwmn4560g1wmhvyxcj7185q5";
+  version = "0.3.8";
+  sha256 = "0lywnsds0q1nr466s3pc2izfr58kp23z7ing9k7dlgbmh9cqxypg";
   buildDepends = [
     hashable liftedBase ReadArgs safe systemFilepath text transformers
     unorderedContainers vector
-- 
GitLab


From b19cfe15ae4b5a8da59fe554a7a7fe1b3f7fa96e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:33 +0200
Subject: [PATCH 2975/3789] haskell-blaze-builder-conduit: update to version
 1.1.0

---
 .../haskell/blaze-builder-conduit/default.nix     | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
index 16c352b7a33..932714cceb4 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
@@ -1,18 +1,13 @@
-{ cabal, blazeBuilder, conduit, hspec, QuickCheck, text
-, transformers
-}:
+{ cabal, conduit }:
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder-conduit";
-  version = "1.0.0";
-  sha256 = "15q0b0k5dxrp9cw2b4qf9mmjwz1mmxrn3890df5rc9z6yajajrc6";
-  buildDepends = [ blazeBuilder conduit text transformers ];
-  testDepends = [
-    blazeBuilder conduit hspec QuickCheck transformers
-  ];
+  version = "1.1.0";
+  sha256 = "0xxyn3lhcn1bkybhrl5dx68d0adf26ilf34gv0mxkwpfj7m7d3k3";
+  buildDepends = [ conduit ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
-    description = "Convert streams of builders to streams of bytestrings";
+    description = "Convert streams of builders to streams of bytestrings. (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
-- 
GitLab


From 2b2ddb51650411b064e39647dd76c5705bb7ef56 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:34 +0200
Subject: [PATCH 2976/3789] haskell-checkers: update to version 0.3.2

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

diff --git a/pkgs/development/libraries/haskell/checkers/default.nix b/pkgs/development/libraries/haskell/checkers/default.nix
index 4742f5104da..06b89ba85b4 100644
--- a/pkgs/development/libraries/haskell/checkers/default.nix
+++ b/pkgs/development/libraries/haskell/checkers/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "checkers";
-  version = "0.3.1";
-  sha256 = "0lhy8bk8kkj540kjbc76j4x4xsprqwlmxdrss4r0j1bxgmfwha6p";
+  version = "0.3.2";
+  sha256 = "0v8i6754syvjh2p5qdqh95j3swkar9077gidsnahwk9h6qfsx6r3";
   buildDepends = [ QuickCheck random ];
   meta = {
     description = "Check properties on standard classes and data structures";
-- 
GitLab


From 3c4434726289bc211c7981153549e267bc6f2f1b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:36 +0200
Subject: [PATCH 2977/3789] haskell-classy-prelude-conduit: update to version
 0.8.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 eec5677a89f..d128ee0a5a4 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.8.0";
-  sha256 = "1br2gjzafxgq6ksxl895m5acaffnswd1dhcjppx6gnyfa6i3fq1m";
+  version = "0.8.1";
+  sha256 = "16wiii630ivcsxrjkmks995lcn0q0plmzbg4h08g5mdgscql2ax1";
   buildDepends = [
     classyPrelude conduit conduitCombinators monadControl resourcet
     systemFileio transformers void
-- 
GitLab


From 005dad6f3a655d8bf92753c6f1d8779524fd9ec2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:37 +0200
Subject: [PATCH 2978/3789] haskell-classy-prelude: update to version 0.8.3.1

---
 .../libraries/haskell/classy-prelude/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
index 6768e6cfda3..e9b6d71eeb3 100644
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@@ -1,17 +1,17 @@
 { cabal, basicPrelude, chunkedData, enclosedExceptions, hashable
-, hspec, liftedBase, monoTraversable, QuickCheck, semigroups
+, hspec, liftedBase, monoTraversable, QuickCheck, semigroups, stm
 , systemFilepath, text, time, transformers, unorderedContainers
 , vector, vectorInstances
 }:
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude";
-  version = "0.8.2";
-  sha256 = "1kvab1vns1mp0i0nyn0flg2m6f2sl8w1yr2c0x54172f20rdm5lv";
+  version = "0.8.3.1";
+  sha256 = "1mszblcww2pqy1zybib7rd4y6sqbd5nih0zzfi9zb69bwwb7mjai";
   buildDepends = [
     basicPrelude chunkedData enclosedExceptions hashable liftedBase
-    monoTraversable semigroups systemFilepath text time transformers
-    unorderedContainers vector vectorInstances
+    monoTraversable semigroups stm systemFilepath text time
+    transformers unorderedContainers vector vectorInstances
   ];
   testDepends = [
     hspec QuickCheck transformers unorderedContainers
-- 
GitLab


From 5a5fe665f8e0bb113b5ff7be173f43ecf039334d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:38 +0200
Subject: [PATCH 2979/3789] haskell-conduit-combinators: update to version
 0.2.4

---
 .../haskell/conduit-combinators/default.nix     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
index 5431f3dbe3a..fdf5c4625fd 100644
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -1,17 +1,18 @@
 { cabal, base16Bytestring, base64Bytestring, chunkedData, conduit
-, hspec, monoTraversable, mwcRandom, primitive, silently
-, systemFileio, systemFilepath, text, transformers
-, transformersBase, unixCompat, vector, void
+, conduitExtra, hspec, monadControl, monoTraversable, mwcRandom
+, primitive, resourcet, silently, systemFileio, systemFilepath
+, text, transformers, transformersBase, unixCompat, vector, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.2.3.1";
-  sha256 = "078i0727nhy75y6bxav6sxr1gz9cq04nvskdnzwabljppd34dqg4";
+  version = "0.2.4";
+  sha256 = "0pxzvxd1j48l7j2anv61bxv1accl0jc6vdf9vv0l3s2358smzwwv";
   buildDepends = [
-    base16Bytestring base64Bytestring chunkedData conduit
-    monoTraversable mwcRandom primitive systemFileio systemFilepath
-    text transformers transformersBase unixCompat vector void
+    base16Bytestring base64Bytestring chunkedData conduit conduitExtra
+    monadControl monoTraversable mwcRandom primitive resourcet
+    systemFileio systemFilepath text transformers transformersBase
+    unixCompat vector void
   ];
   testDepends = [
     base16Bytestring base64Bytestring chunkedData hspec monoTraversable
-- 
GitLab


From 940ba2cf76c9cbbacaa5fc5b0228ba1e8fb233a9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:39 +0200
Subject: [PATCH 2980/3789] haskell-conduit-extra: update to version 1.1.0

---
 .../haskell/conduit-extra/default.nix         | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix
index 82ab990947d..67b4186e606 100644
--- a/pkgs/development/libraries/haskell/conduit-extra/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix
@@ -1,13 +1,25 @@
-{ cabal }:
+{ cabal, attoparsec, blazeBuilder, conduit, exceptions, filepath
+, hspec, monadControl, network, primitive, resourcet
+, streamingCommons, text, transformers, transformersBase
+}:
 
 cabal.mkDerivation (self: {
   pname = "conduit-extra";
-  version = "1.0.0";
-  sha256 = "120c3zay8svdw3b9nqgxlrj45a1d4xf0sijkg367m7hp22szvz8a";
+  version = "1.1.0";
+  sha256 = "08s8nafsdkd4dwmi2vsid82z8iv178vm9jbb322ygnbpf2a9y96y";
+  buildDepends = [
+    attoparsec blazeBuilder conduit filepath monadControl network
+    primitive resourcet streamingCommons text transformers
+    transformersBase
+  ];
+  testDepends = [
+    attoparsec blazeBuilder conduit exceptions hspec resourcet text
+    transformers transformersBase
+  ];
   noHaddock = true;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
-    description = "Temporary placeholder package";
+    description = "Batteries included conduit: adapters for common libraries";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 065e44f198974856cd70533d78fc2a1fdd2d47a3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:41 +0200
Subject: [PATCH 2981/3789] haskell-conduit: update to version 1.1.0

---
 .../libraries/haskell/conduit/default.nix          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 8a73ef04d1d..ac6211f2b38 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -1,15 +1,15 @@
-{ cabal, hspec, liftedBase, mmorph, monadControl, mtl, QuickCheck
-, resourcet, text, textStreamDecode, transformers, transformersBase
-, void
+{ cabal, exceptions, hspec, liftedBase, mmorph, monadControl, mtl
+, QuickCheck, resourcet, text, textStreamDecode, transformers
+, transformersBase, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.17.1";
-  sha256 = "0s2cszwfmz7j249bdydh0d97r5br1p6nizw7ycbkxlmpcrmdvifk";
+  version = "1.1.0";
+  sha256 = "17y8fnvl9s3676sslhc04abs4zqh90l2rdcazxglv0sfrfsdgwnq";
   buildDepends = [
-    liftedBase mmorph monadControl mtl resourcet text textStreamDecode
-    transformers transformersBase void
+    exceptions liftedBase mmorph monadControl mtl resourcet text
+    textStreamDecode transformers transformersBase void
   ];
   testDepends = [
     hspec mtl QuickCheck resourcet text transformers void
-- 
GitLab


From c94198f13e200d8ade1813d44ad583cbcfdb2063 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:42 +0200
Subject: [PATCH 2982/3789] haskell-diagrams-lib: update to version 1.1.0.4

---
 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 c8c8bf5434d..4fcd944c15c 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.3";
-  sha256 = "1g4kcmpqsnb25yqvd6yv026znp7s5jhnqg1nvfxcaq0zz84w9ckh";
+  version = "1.1.0.4";
+  sha256 = "0i3n07qi7gnlbxxsd8j7wgqdqbjp8h44z837lajfwd108j01fw0i";
   buildDepends = [
     active colour dataDefaultClass diagramsCore filepath fingertree
     hashable intervals lens MemoTrie monoidExtras optparseApplicative
-- 
GitLab


From 7ccdd41c27ecc2ec98924d1948ab07f576ae2bb8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:43 +0200
Subject: [PATCH 2983/3789] haskell-distributive: update to version 0.4.3.1

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

diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix
index 4a0167eb030..053f938ae56 100644
--- a/pkgs/development/libraries/haskell/distributive/default.nix
+++ b/pkgs/development/libraries/haskell/distributive/default.nix
@@ -4,13 +4,13 @@
 
 cabal.mkDerivation (self: {
   pname = "distributive";
-  version = "0.4.1";
-  sha256 = "0izsgasml3didklkk6z274fzfd1c6qnn0wlzprcz0bnd07zkh814";
+  version = "0.4.3.1";
+  sha256 = "17ny7nlxg6x08f88dyl15wsdhgi0cgafxdsl5wdw5vv6y0jsrx27";
   buildDepends = [ tagged transformers transformersCompat ];
   testDepends = [ doctest filepath ];
   meta = {
     homepage = "http://github.com/ekmett/distributive/";
-    description = "Haskell 98 Distributive functors -- Dual to Traversable";
+    description = "Distributive functors -- Dual to Traversable";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 0fc2a8e0259d7032941f739ccc0f17cc71126e2d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:44 +0200
Subject: [PATCH 2984/3789] haskell-esqueleto: update to version 1.3.9

---
 pkgs/development/libraries/haskell/esqueleto/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix
index fd314d12d51..14d5cfda068 100644
--- a/pkgs/development/libraries/haskell/esqueleto/default.nix
+++ b/pkgs/development/libraries/haskell/esqueleto/default.nix
@@ -5,15 +5,16 @@
 
 cabal.mkDerivation (self: {
   pname = "esqueleto";
-  version = "1.3.5";
-  sha256 = "0lz17fr4by31h1qdw0djbsb1zx9xgll5iphqq18gp587l799iy2p";
+  version = "1.3.9";
+  sha256 = "0dh11q77w0npilnbxyij6z7k7cx9cciwqs479xdjgjygnxa1xwdc";
   buildDepends = [
     conduit monadLogger persistent resourcet tagged text transformers
     unorderedContainers
   ];
   testDepends = [
     conduit hspec HUnit monadControl monadLogger persistent
-    persistentSqlite persistentTemplate QuickCheck text transformers
+    persistentSqlite persistentTemplate QuickCheck resourcet text
+    transformers
   ];
   meta = {
     homepage = "https://github.com/meteficha/esqueleto";
-- 
GitLab


From a0d08de0c6441907bd73d1fddbf16182e3ab286e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:45 +0200
Subject: [PATCH 2985/3789] haskell-ghc-mtl: update to version 1.2.0.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 1379d4a8ee8..592961aa554 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.1.0.0";
-  sha256 = "1vmiy00fsdp1jzmpjrz8wzxbv3185h27aspw412pmcr4v1n29kxc";
+  version = "1.2.0.0";
+  sha256 = "0fk3adc56nhi46nf2w5ybp3cd9l13qqbpd5nbhfhbqj3g73j8p5a";
   buildDepends = [ exceptions extensibleExceptions mtl ];
   meta = {
     homepage = "http://hub.darcs.net/jcpetruzza/ghc-mtl";
-- 
GitLab


From 77a6ba8e0bf7646c1a153dbbdcad0fbc395039eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:47 +0200
Subject: [PATCH 2986/3789] haskell-http-client-conduit: update to version
 0.3.0

---
 .../libraries/haskell/http-client-conduit/default.nix  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-client-conduit/default.nix b/pkgs/development/libraries/haskell/http-client-conduit/default.nix
index 1c47b68f06c..29840fa6ac0 100644
--- a/pkgs/development/libraries/haskell/http-client-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-client-conduit/default.nix
@@ -1,13 +1,13 @@
-{ cabal, conduit, httpClient, resourcet, transformers }:
+{ cabal, httpClient }:
 
 cabal.mkDerivation (self: {
   pname = "http-client-conduit";
-  version = "0.2.0.1";
-  sha256 = "0fy9vkxh7hvmp9ijifq8nx6y5y92n6d3s1vdyg53ln65pclc6jn5";
-  buildDepends = [ conduit httpClient resourcet transformers ];
+  version = "0.3.0";
+  sha256 = "0k2vq9y7kfbkhcsszjr74ahq5nw5z7dbzjhw1ixbigcr56axsd19";
+  buildDepends = [ httpClient ];
   meta = {
     homepage = "https://github.com/snoyberg/http-client";
-    description = "Frontend support for using http-client with conduit";
+    description = "Frontend support for using http-client with conduit (deprecated)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From ac9a4fc8124b13b1759265e3b320b818104996a0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:48 +0200
Subject: [PATCH 2987/3789] haskell-http-client-multipart: update to version
 0.3.0.0

---
 .../haskell/http-client-multipart/default.nix     | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-client-multipart/default.nix b/pkgs/development/libraries/haskell/http-client-multipart/default.nix
index 068efdcb543..3cf09f583a7 100644
--- a/pkgs/development/libraries/haskell/http-client-multipart/default.nix
+++ b/pkgs/development/libraries/haskell/http-client-multipart/default.nix
@@ -1,18 +1,13 @@
-{ cabal, blazeBuilder, filepath, httpClient, httpTypes, mimeTypes
-, random, text, transformers
-}:
+{ cabal, httpClient }:
 
 cabal.mkDerivation (self: {
   pname = "http-client-multipart";
-  version = "0.2.0.0";
-  sha256 = "1bahkysh771p3mrfan1gmm6jyx62w3k57ba4rsnx7h1gwbilm878";
-  buildDepends = [
-    blazeBuilder filepath httpClient httpTypes mimeTypes random text
-    transformers
-  ];
+  version = "0.3.0.0";
+  sha256 = "18za6s3658hgm95rrygghrz0b643c7nkzaimb14v2hv82w3k9crg";
+  buildDepends = [ httpClient ];
   meta = {
     homepage = "https://github.com/snoyberg/http-client";
-    description = "Generate multipart uploads for http-client";
+    description = "Generate multipart uploads for http-client. (deprecated)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From e97158dca2cac868811333a3bf506bc1de8666fd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:49 +0200
Subject: [PATCH 2988/3789] haskell-http-client: update to version 0.3.0.2

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

diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index 7ebdd3cee6a..8816ec91a83 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -1,22 +1,22 @@
-{ cabal, base64Bytestring, blazeBuilder, caseInsensitive, cookie
-, dataDefaultClass, deepseq, failure, hspec, httpTypes
-, monadControl, network, publicsuffixlist, text, time, transformers
-, zlib, zlibBindings
+{ cabal, async, base64Bytestring, blazeBuilder, caseInsensitive
+, cookie, dataDefaultClass, deepseq, exceptions, filepath, hspec
+, httpTypes, mimeTypes, monadControl, network, publicsuffixlist
+, random, streamingCommons, text, time, transformers, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.2.2.4";
-  sha256 = "19dymsi39m2m7i99xsmcl9gigqm6jhynnv0w8w230mq8vraq1mcw";
+  version = "0.3.0.2";
+  sha256 = "1r858ml809c21q9q2kv0105y89cizncxym9mf1f0f165aa2hx71m";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie
-    dataDefaultClass deepseq failure httpTypes network publicsuffixlist
-    text time transformers zlibBindings
+    dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes
+    network publicsuffixlist random streamingCommons text time
+    transformers
   ];
   testDepends = [
-    base64Bytestring blazeBuilder caseInsensitive deepseq failure hspec
+    async base64Bytestring blazeBuilder caseInsensitive deepseq hspec
     httpTypes monadControl network text time transformers zlib
-    zlibBindings
   ];
   doCheck = false;
   meta = {
-- 
GitLab


From 837c45dc0a6027c3e02437dc6a01b73904d2d05e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:50 +0200
Subject: [PATCH 2989/3789] haskell-http-conduit: update to version 2.1.0

---
 .../haskell/http-conduit/default.nix          | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index 398459f6076..1ea6ebafd8c 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -1,22 +1,22 @@
-{ cabal, blazeBuilder, caseInsensitive, conduit, connection, cookie
-, dataDefaultClass, hspec, httpClient, httpClientConduit
-, httpClientMultipart, httpClientTls, httpTypes, HUnit, liftedBase
-, network, networkConduit, resourcet, text, time, transformers
-, utf8String, wai, warp, warpTls
+{ cabal, blazeBuilder, caseInsensitive, conduit, conduitExtra
+, connection, cookie, dataDefaultClass, hspec, httpClient
+, httpClientTls, httpTypes, HUnit, liftedBase, monadControl, mtl
+, network, networkConduit, resourcet, streamingCommons, text, time
+, transformers, utf8String, wai, warp, warpTls
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "2.0.0.8";
-  sha256 = "1yralv1nalvdpgamnbjl8xm4lrx22m3v6jancrzisq38a680q96b";
+  version = "2.1.0";
+  sha256 = "1qlqhrrc130c8wvgbbbkb7qrm8gp48gkv5xanqgb26amvny98gsv";
   buildDepends = [
-    conduit httpClient httpClientConduit httpClientTls httpTypes
-    liftedBase resourcet transformers
+    conduit httpClient httpClientTls httpTypes liftedBase monadControl
+    mtl resourcet transformers
   ];
   testDepends = [
-    blazeBuilder caseInsensitive conduit connection cookie
-    dataDefaultClass hspec httpClient httpClientMultipart httpTypes
-    HUnit liftedBase network networkConduit text time transformers
+    blazeBuilder caseInsensitive conduit conduitExtra connection cookie
+    dataDefaultClass hspec httpClient httpTypes HUnit liftedBase
+    network networkConduit streamingCommons text time transformers
     utf8String wai warp warpTls
   ];
   doCheck = false;
-- 
GitLab


From 7c5538a58632c469b00d5452db6e020d3bdd56cd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:52 +0200
Subject: [PATCH 2990/3789] haskell-http-reverse-proxy: update to version
 0.3.1.5

---
 .../libraries/haskell/http-reverse-proxy/default.nix     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index 957dbe02006..ff47ba14241 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.4";
-  sha256 = "0j7k6njyp3qss08gja5p62zvqxdh7bpqfbzvkm23gdv8v1bgh5h6";
+  version = "0.3.1.5";
+  sha256 = "0rzwh5ph23592qycriam932bgb6q2nvjr7wayqz0sjvvxv661bk0";
   buildDepends = [
     async blazeBuilder caseInsensitive conduit conduitExtra
     dataDefaultClass httpClient httpTypes liftedBase monadControl
@@ -16,8 +16,9 @@ cabal.mkDerivation (self: {
     wai waiLogger word8
   ];
   testDepends = [
-    blazeBuilder conduit hspec httpConduit httpTypes liftedBase network
-    networkConduit transformers wai warp
+    blazeBuilder conduit conduitExtra hspec httpConduit httpTypes
+    liftedBase network networkConduit resourcet streamingCommons
+    transformers wai warp
   ];
   doCheck = false;
   meta = {
-- 
GitLab


From dbd66791a54c3f765db165c7d259e3405f3b70a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:53 +0200
Subject: [PATCH 2991/3789] haskell-http-types: update to version 0.8.4

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

diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix
index ab523e07cf2..a3fa1c8c9ee 100644
--- a/pkgs/development/libraries/haskell/http-types/default.nix
+++ b/pkgs/development/libraries/haskell/http-types/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-types";
-  version = "0.8.3";
-  sha256 = "02l1lhl2ajbm5f7zq363nlb21dpdg1m0qsy330arccmds7z9g7a2";
+  version = "0.8.4";
+  sha256 = "0bz7g537if863vk29z72hndf1x019dj7shj1aa77pssrxma3a685";
   buildDepends = [ blazeBuilder caseInsensitive text ];
   testDepends = [ blazeBuilder hspec QuickCheck text ];
   jailbreak = true;
-- 
GitLab


From d5f85b022a89aca5e963fd54fa7d9bb54aaa44e0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:54 +0200
Subject: [PATCH 2992/3789] haskell-mime-mail: update to version 0.4.5.1

---
 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 e2559c70fee..80fc8e1b4af 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.4.2";
-  sha256 = "0s38xgv6kycnfahqi5dnrjn3wkaq35w87cv8p12pq0qq2x7dvawd";
+  version = "0.4.5.1";
+  sha256 = "01r6dxdp3183ahggda6dizdz1c3qpmpyxn6csalzvss52ds4ilsf";
   buildDepends = [
     base64Bytestring blazeBuilder filepath random text
   ];
-- 
GitLab


From 6bef23dd1518f278eb048379d4e1b8c7af0eb025 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:55 +0200
Subject: [PATCH 2993/3789] haskell-network-conduit-tls: update to version
 1.1.0

---
 .../haskell/network-conduit-tls/default.nix       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
index 4884a462a6d..e4c5bb7ab6b 100644
--- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
@@ -1,17 +1,18 @@
-{ cabal, conduit, connection, cprngAes, dataDefault, HUnit
-, monadControl, mtl, network, networkConduit, systemFileio
+{ cabal, conduit, conduitExtra, connection, cprngAes, dataDefault
+, HUnit, monadControl, mtl, network, streamingCommons, systemFileio
 , systemFilepath, tls, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "network-conduit-tls";
-  version = "1.0.4.2";
-  sha256 = "1pgb6k6g10hy2k4sihj88n6w7400d4grja2crhhv1cydqdn858rc";
+  version = "1.1.0";
+  sha256 = "1q9wx7bvr4a65rkyfn2vd3h9bfpsvm9zcqqjhjsrgb91l6x5bdqi";
   buildDepends = [
-    conduit connection cprngAes dataDefault monadControl network
-    networkConduit systemFileio systemFilepath tls transformers
+    conduit conduitExtra connection cprngAes dataDefault monadControl
+    network streamingCommons systemFileio systemFilepath tls
+    transformers
   ];
-  testDepends = [ conduit connection HUnit mtl networkConduit ];
+  testDepends = [ conduit conduitExtra connection HUnit mtl ];
   meta = {
     homepage = "https://github.com/snoyberg/conduit";
     description = "Create TLS-aware network code with conduits";
-- 
GitLab


From 78fc4f1083817c42102c29be9eb2405a5dd095a9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:57 +0200
Subject: [PATCH 2994/3789] haskell-network-conduit: update to version 1.1.0

---
 .../libraries/haskell/network-conduit/default.nix  | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index c2f00b68f8f..7c7b649311a 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -1,17 +1,13 @@
-{ cabal, conduit, liftedBase, monadControl, network, transformers
-}:
+{ cabal, conduit }:
 
 cabal.mkDerivation (self: {
   pname = "network-conduit";
-  version = "1.0.4";
-  sha256 = "1a7p3gs0rczx0rhz27410rr6fzy3l0nsj6kk5wi0nqvqfyh7jb9c";
-  buildDepends = [
-    conduit liftedBase monadControl network transformers
-  ];
-  testDepends = [ conduit ];
+  version = "1.1.0";
+  sha256 = "06amxl8rg4zfnmgc1iyq5mxy9qihcqddqgqkbfvaf25mwr43992p";
+  buildDepends = [ conduit ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
-    description = "Stream socket data using conduits";
+    description = "Stream socket data using conduits. (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
-- 
GitLab


From c94833a157a193b65489fbd662be4e395aaa76a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:58 +0200
Subject: [PATCH 2995/3789] haskell-pipes-safe: update to version 2.1.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 dddc27157dd..c1d5a603da0 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.0.2";
-  sha256 = "004xjf0aqa73gxn8kj9844pwbkriv3hk9sbnwxx26pgvqvwjlrsj";
+  version = "2.1.0";
+  sha256 = "0qm02hwmrqlncnlxix7mdgzbf0mzally4k7ydwg06nqi35bb7s3j";
   buildDepends = [ exceptions pipes transformers ];
   meta = {
     description = "Safety for the pipes ecosystem";
-- 
GitLab


From 52eaa92c9f6f1b507063614d1b772df92c65646c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:29:59 +0200
Subject: [PATCH 2996/3789] haskell-pool-conduit: update to version 0.1.2.3

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

diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix
index e7c1489d5cb..cb1682673af 100644
--- a/pkgs/development/libraries/haskell/pool-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix
@@ -2,14 +2,14 @@
 
 cabal.mkDerivation (self: {
   pname = "pool-conduit";
-  version = "0.1.2.2";
-  sha256 = "1jg7kymr1v82xl9122q9fly385jhm1hr2406g35ydl9wnh4aaiw8";
+  version = "0.1.2.3";
+  sha256 = "1myjbmbh0jm89ycx9d961mpgw8hp7al8wgnsls4p19gvr73gcbfv";
   buildDepends = [
     monadControl resourcePool resourcet transformers
   ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
-    description = "Resource pool allocations via ResourceT";
+    description = "Resource pool allocations via ResourceT. (deprecated)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
-- 
GitLab


From 5ef1beb6d2d90cdf1e51e517c46199bbc64b2e99 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:30:00 +0200
Subject: [PATCH 2997/3789] haskell-process-conduit: update to version 1.1.0.0

---
 .../libraries/haskell/process-conduit/default.nix     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/process-conduit/default.nix b/pkgs/development/libraries/haskell/process-conduit/default.nix
index 6148b9b508b..3ecd88515b2 100644
--- a/pkgs/development/libraries/haskell/process-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/process-conduit/default.nix
@@ -1,13 +1,14 @@
-{ cabal, conduit, controlMonadLoop, hspec, mtl, shakespeare
-, shakespeareText, text
+{ cabal, conduit, controlMonadLoop, hspec, mtl, resourcet
+, shakespeare, shakespeareText, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "process-conduit";
-  version = "1.0.0.2";
-  sha256 = "0rz18x7gy8w1h2xq0il49k515n0y3gpxnl7mfgkczc86965w7fzj";
+  version = "1.1.0.0";
+  sha256 = "1b3snck651cpb7i3c78cn264zrjan3lzydf59209abkvb6fv1hql";
   buildDepends = [
-    conduit controlMonadLoop mtl shakespeare shakespeareText text
+    conduit controlMonadLoop mtl resourcet shakespeare shakespeareText
+    text
   ];
   testDepends = [ conduit hspec ];
   meta = {
-- 
GitLab


From a9290ec05f24f388141a367cccfe88e2875835b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:30:02 +0200
Subject: [PATCH 2998/3789] haskell-resourcet: update to version 1.1.0.1

---
 .../libraries/haskell/resourcet/default.nix           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index 8413802faa1..111afbf6a7a 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -1,13 +1,14 @@
-{ cabal, hspec, liftedBase, mmorph, monadControl, mtl, transformers
-, transformersBase
+{ cabal, exceptions, hspec, liftedBase, mmorph, monadControl, mtl
+, transformers, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "0.4.10.2";
-  sha256 = "0k0l4909b30hc2apxgzjz1rxbqqkhqnqchz53wi6zyhvbh46ffh6";
+  version = "1.1.0.1";
+  sha256 = "02w2gz0zn039bz1ig91jd0zkg9w1nxpi3byh6ybdsnbyddwfy376";
   buildDepends = [
-    liftedBase mmorph monadControl mtl transformers transformersBase
+    exceptions liftedBase mmorph monadControl mtl transformers
+    transformersBase
   ];
   testDepends = [ hspec liftedBase transformers ];
   meta = {
-- 
GitLab


From ca00f844ae41fe2ff6628b6c269b990e091c5e3d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:30:03 +0200
Subject: [PATCH 2999/3789] haskell-scotty-hastache: update to version 0.2.1

---
 .../libraries/haskell/scotty-hastache/default.nix     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/scotty-hastache/default.nix b/pkgs/development/libraries/haskell/scotty-hastache/default.nix
index 76e6fe45ad1..7f10ad2d68f 100644
--- a/pkgs/development/libraries/haskell/scotty-hastache/default.nix
+++ b/pkgs/development/libraries/haskell/scotty-hastache/default.nix
@@ -1,14 +1,13 @@
-{ cabal, blazeHtml, blazeMarkup, filepath, hastache, httpTypes, mtl
-, scotty, text, wai, warp
+{ cabal, filepath, hastache, httpTypes, mtl, scotty, text, wai
+, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "scotty-hastache";
-  version = "0.2.0";
-  sha256 = "105cxlasj4sl4ddzg8ms6k95078q10zcm2c86jcn76s0jmv95669";
+  version = "0.2.1";
+  sha256 = "1yyip8iq1n71iidmpbfs7rifxvpphyrcaf4z394rx36hq72ka8dn";
   buildDepends = [
-    blazeHtml blazeMarkup filepath hastache httpTypes mtl scotty text
-    wai warp
+    filepath hastache httpTypes mtl scotty text wai warp
   ];
   meta = {
     homepage = "https://github.com/scotty-web/scotty-hastache";
-- 
GitLab


From fe1584ef1834c07cd139d68db4aa9df680929f70 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:30:04 +0200
Subject: [PATCH 3000/3789] haskell-snap-loader-dynamic: update to version
 0.10.0.1

---
 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 abe4d4cc074..ec054cc8065 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";
-  sha256 = "0wnrsbnf3crfxhhraz4my08m6yhmqj632rv6cdy9ili3wxjkqd57";
+  version = "0.10.0.1";
+  sha256 = "0iqhspvfp0d6qivis2l3v0rqrnb8qbzvi4n53zgyb9cwvqxx5fix";
   buildDepends = [ directoryTree hint mtl snapCore time ];
   meta = {
     homepage = "http://snapframework.com/";
-- 
GitLab


From 7f143d564660d33b221f09f6cc4f7aa0dfa3fb50 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:30:05 +0200
Subject: [PATCH 3001/3789] haskell-stm-conduit: update to version 2.4.0

---
 .../libraries/haskell/stm-conduit/default.nix     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index 07d1fc03bf0..201a2ea02f9 100644
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -1,16 +1,17 @@
-{ cabal, async, cereal, cerealConduit, conduit, HUnit, liftedAsync
-, liftedBase, monadControl, monadLoops, QuickCheck, resourcet, stm
-, stmChans, testFramework, testFrameworkHunit
+{ cabal, async, cereal, cerealConduit, conduit, conduitExtra, HUnit
+, liftedAsync, liftedBase, monadControl, monadLoops, QuickCheck
+, resourcet, stm, stmChans, testFramework, testFrameworkHunit
 , testFrameworkQuickcheck2, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "stm-conduit";
-  version = "2.3.0";
-  sha256 = "1qvzqzk822sc0sjblgqb5y73mggsvh70zpzz908isfiqcwp7llc4";
+  version = "2.4.0";
+  sha256 = "03ifxr3pspwmzf0xdh7mj3q1wiz13d86w9pdhiqa6b1d1qw6rvha";
   buildDepends = [
-    async cereal cerealConduit conduit liftedAsync liftedBase
-    monadControl monadLoops resourcet stm stmChans transformers
+    async cereal cerealConduit conduit conduitExtra liftedAsync
+    liftedBase monadControl monadLoops resourcet stm stmChans
+    transformers
   ];
   testDepends = [
     conduit HUnit QuickCheck resourcet stm stmChans testFramework
-- 
GitLab


From 30177a3c8f9ecaa126bedad85069c1e0da52b5c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:30:06 +0200
Subject: [PATCH 3002/3789] haskell-tagstream-conduit: update to version
 0.5.5.1

---
 .../haskell/tagstream-conduit/default.nix          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
index c28301e4183..ecdcbb1b63c 100644
--- a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
@@ -1,17 +1,19 @@
 { cabal, attoparsec, attoparsecConduit, blazeBuilder
-, blazeBuilderConduit, caseInsensitive, conduit, dataDefault, hspec
-, HUnit, QuickCheck, text, transformers, xmlConduit
+, blazeBuilderConduit, caseInsensitive, conduit, conduitExtra
+, dataDefault, hspec, HUnit, QuickCheck, resourcet, text
+, transformers, xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "tagstream-conduit";
-  version = "0.5.5";
-  sha256 = "17157chhw610f8az6c25qzq5mmhpb1a8m12kdc2k8khgynpkrj5f";
+  version = "0.5.5.1";
+  sha256 = "0bpxjhqqqigfnwcxx3h2am5zmgr1lyaxaac3lnz490j6zf8x9jn7";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
-    caseInsensitive conduit dataDefault text transformers xmlConduit
+    caseInsensitive conduit conduitExtra dataDefault resourcet text
+    transformers xmlConduit
   ];
-  testDepends = [ conduit hspec HUnit QuickCheck text ];
+  testDepends = [ conduit hspec HUnit QuickCheck resourcet text ];
   meta = {
     homepage = "http://github.com/yihuang/tagstream-conduit";
     description = "streamlined html tag parser";
-- 
GitLab


From 3b9fff330c5585d80cfcd08a4f834ec6c6a929ac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:30:08 +0200
Subject: [PATCH 3003/3789] haskell-thyme: update to version 0.3.2.0

---
 .../libraries/haskell/thyme/default.nix            | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix
index 08563c6f2c5..fe79454781a 100644
--- a/pkgs/development/libraries/haskell/thyme/default.nix
+++ b/pkgs/development/libraries/haskell/thyme/default.nix
@@ -1,18 +1,18 @@
-{ cabal, aeson, attoparsec, Cabal, deepseq, filepath, lens
-, QuickCheck, random, systemPosixRedirect, text, time, transformers
+{ cabal, aeson, attoparsec, Cabal, deepseq, filepath, mtl
+, profunctors, QuickCheck, random, systemPosixRedirect, text, time
 , vector, vectorSpace
 }:
 
 cabal.mkDerivation (self: {
   pname = "thyme";
-  version = "0.3.1.1";
-  sha256 = "00c15zy7190mghpvrpwl0hp8w1mp386vvff8w2zdpgl792cvdby8";
+  version = "0.3.2.0";
+  sha256 = "1jrhqrvmkq8n943l6dkyszg4qz47jbddr80qg7k51a9nrg8fins4";
   buildDepends = [
-    aeson attoparsec deepseq lens QuickCheck random text time
-    transformers vector vectorSpace
+    aeson attoparsec deepseq mtl profunctors QuickCheck random text
+    time vector vectorSpace
   ];
   testDepends = [
-    attoparsec Cabal filepath lens QuickCheck random
+    attoparsec Cabal filepath mtl profunctors QuickCheck random
     systemPosixRedirect text time vectorSpace
   ];
   doCheck = false;
-- 
GitLab


From 8375a09cbbc3566f80508ca9b7ecd9cb1c879777 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Apr 2014 23:30:10 +0200
Subject: [PATCH 3004/3789] haskell-zlib-conduit: update to version 1.1.0

---
 .../libraries/haskell/zlib-conduit/default.nix      | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
index b283c496a29..f9cd966df73 100644
--- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
@@ -1,16 +1,13 @@
-{ cabal, conduit, hspec, QuickCheck, resourcet, transformers, void
-, zlibBindings
-}:
+{ cabal, conduit }:
 
 cabal.mkDerivation (self: {
   pname = "zlib-conduit";
-  version = "1.0.0";
-  sha256 = "0q0l4qw1f2cwjj71n4i082ba47x1xba695q8xk0ky2vw5s8cg0bv";
-  buildDepends = [ conduit transformers void zlibBindings ];
-  testDepends = [ conduit hspec QuickCheck resourcet transformers ];
+  version = "1.1.0";
+  sha256 = "1b22mca8bbg7f84h8y0qsb5ckzg2dw1b26y27x7b7xdxqbwpz93a";
+  buildDepends = [ conduit ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
-    description = "Streaming compression/decompression via conduits";
+    description = "Streaming compression/decompression via conduits. (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
-- 
GitLab


From 0b3100322e0df7377a6b87e78ec22ea243e0261c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 5 Apr 2014 00:33:58 +0200
Subject: [PATCH 3005/3789] haskell-exceptions: update to version 0.5

---
 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 a206b7c186e..5d58654e51d 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.3.3.1";
-  sha256 = "091frx3hmx7lq10z7f8q98pz0sa1lj23i7z4z98gh1980r525fah";
+  version = "0.5";
+  sha256 = "0l9gpifp23j6hvyq8p48rxsnv9adqbf7z096dzvd8v5xqqybgyxi";
   buildDepends = [ mtl transformers ];
   testDepends = [
     mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers
-- 
GitLab


From 5f45cc48c5180d83e58fcb7b9419e841bdcef0bf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 5 Apr 2014 00:33:59 +0200
Subject: [PATCH 3006/3789] haskell-intervals: update to version 0.7

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

diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix
index 88a001afadd..73e1d2d7197 100644
--- a/pkgs/development/libraries/haskell/intervals/default.nix
+++ b/pkgs/development/libraries/haskell/intervals/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "intervals";
-  version = "0.4.2";
-  sha256 = "08l7q22rlhyigls1qksf7lnb7g1yrkmdh9clq68xxaf6wzm26aaz";
+  version = "0.7";
+  sha256 = "00kwq57x72xi5kca7symb98nzs1j82r6bkgvr83aqpvq0ql9ka9d";
   buildDepends = [ distributive ];
   testDepends = [ doctest filepath ];
   meta = {
-- 
GitLab


From ea916f0b323d29172fb547f33b493b7974d7dc9b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 Apr 2014 18:29:36 +0200
Subject: [PATCH 3007/3789] haskell-blaze-builder-conduit: there is no code in
 this module to generate documentation for

---
 .../libraries/haskell/blaze-builder-conduit/default.nix          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
index 932714cceb4..1c6670f17ab 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.1.0";
   sha256 = "0xxyn3lhcn1bkybhrl5dx68d0adf26ilf34gv0mxkwpfj7m7d3k3";
   buildDepends = [ conduit ];
+  noHaddock = true;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Convert streams of builders to streams of bytestrings. (deprecated)";
-- 
GitLab


From 2a0a12f333dc7a276c3cd47a2a6825da8bc8d4a0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 5 Apr 2014 00:58:14 +0200
Subject: [PATCH 3008/3789] Upgrade hashable to version 1.2.x.

This change in the GHC 7.6.3 profile violates Haskell Platform, but it fixes
many builds that would not succeed otherwise (such as Trifecta). Overriding
hashable locally in an expression is out of question: the package is used
virtually everywhere.
---
 .../libraries/haskell/haskell-platform/2013.2.0.0.nix           | 1 +
 pkgs/top-level/haskell-packages.nix                             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 2e0181bd1a7..f209c39d438 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
@@ -30,6 +30,7 @@ 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 = {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 08757faf4c8..01462724e03 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -190,7 +190,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     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;
+    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;
-- 
GitLab


From ee7880993bae18f0de219a6f093aa516c1b7768a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 Apr 2014 18:49:47 +0200
Subject: [PATCH 3009/3789] haskell-attoparsec-conduit: there is no code in
 this module to generate documentation for

---
 .../development/libraries/haskell/attoparsec-conduit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
index bdf42ba947d..21a15ea80e7 100644
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.1.0";
   sha256 = "18xn3nzxfghcd88cana1jw85ijv0ysw3bp36fb6r5wsf6m79z01y";
   buildDepends = [ conduit ];
+  noHaddock = true;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Consume attoparsec parsers via conduit. (deprecated)";
-- 
GitLab


From 5fcc9d2b680aeaeb869bb33cca4ebd7a988fd131 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 Apr 2014 20:31:19 +0200
Subject: [PATCH 3010/3789] haskell-network-conduit: there is no code in this
 module to generate documentation for

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

diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index 7c7b649311a..1f252c03660 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.1.0";
   sha256 = "06amxl8rg4zfnmgc1iyq5mxy9qihcqddqgqkbfvaf25mwr43992p";
   buildDepends = [ conduit ];
+  noHaddock = true;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Stream socket data using conduits. (deprecated)";
-- 
GitLab


From acd673be4b1efe37ed5fa10c70d24215e2e1ae39 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 Apr 2014 20:32:09 +0200
Subject: [PATCH 3011/3789] haskell-zlib-conduit: there is no code in this
 module to generate documentation for

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

diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
index f9cd966df73..3029cc8c3b6 100644
--- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.1.0";
   sha256 = "1b22mca8bbg7f84h8y0qsb5ckzg2dw1b26y27x7b7xdxqbwpz93a";
   buildDepends = [ conduit ];
+  noHaddock = true;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Streaming compression/decompression via conduits. (deprecated)";
-- 
GitLab


From 4b57acece18be9ee5d86349500f6afe01e3da3bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 Apr 2014 20:52:50 +0200
Subject: [PATCH 3012/3789] haskell-http-client-conduit: there is no code in
 this module to generate documentation for

---
 .../libraries/haskell/http-client-conduit/default.nix            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/http-client-conduit/default.nix b/pkgs/development/libraries/haskell/http-client-conduit/default.nix
index 29840fa6ac0..019136e47ca 100644
--- a/pkgs/development/libraries/haskell/http-client-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-client-conduit/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.3.0";
   sha256 = "0k2vq9y7kfbkhcsszjr74ahq5nw5z7dbzjhw1ixbigcr56axsd19";
   buildDepends = [ httpClient ];
+  noHaddock = true;
   meta = {
     homepage = "https://github.com/snoyberg/http-client";
     description = "Frontend support for using http-client with conduit (deprecated)";
-- 
GitLab


From 65c46befcfc917025d8038d80ab1292c2c9b915d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 6 Apr 2014 23:59:34 +0200
Subject: [PATCH 3013/3789] gnome-shell: depend upon gnome-settings-daemon
 gsettings schemas

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 519347f14c8..087b5778163 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       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 ];
+      at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
 
   preBuild = ''
     patchShebangs src/data-to-c.pl
@@ -32,7 +32,7 @@ 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-menus}:/share:${ibus}/share:${gnome_settings_daemon}/share:${gnome_control_center}/share:${gdm}/share:${glib}/share:${gnome_themes_standard}/share:${mutter}/share:${gtk}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --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"
-- 
GitLab


From 296dd89030790ab1d95bed7bbe688a18aff38335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 7 Apr 2014 00:43:50 +0200
Subject: [PATCH 3014/3789] buildPythonPackage: don't return on shellHook

Entering environment might not always be the desired effect.
---
 pkgs/development/python-modules/generic/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index d0234c29ed9..9dedd3ceae7 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -163,7 +163,6 @@ python.stdenv.mkDerivation (attrs // {
     export PYTHONPATH="/tmp/$name/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
     python setup.py develop --prefix /tmp/$name
     ${postShellHook}
-    return
   '';
 
   meta = with lib.maintainers; {
-- 
GitLab


From 3d3648f26133bad1218e3ba28211a0e7ac8f10ae Mon Sep 17 00:00:00 2001
From: vi <noreply@example.org>
Date: Mon, 7 Apr 2014 12:15:33 +0800
Subject: [PATCH 3015/3789] Added a derivation for Ozgun's's retry (Haskell.)

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

diff --git a/pkgs/development/libraries/haskell/retry/default.nix b/pkgs/development/libraries/haskell/retry/default.nix
new file mode 100644
index 00000000000..d57898593b2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/retry/default.nix
@@ -0,0 +1,15 @@
+{ cabal, dataDefault, liftedBase, monadControl, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "retry";
+  version = "0.3.0.0";
+  sha256 = "00yjk5784h4w1cckw17w1k5r94acc3ycnprk642ndgggz3lxm36n";
+  buildDepends = [
+    dataDefault liftedBase monadControl transformers
+  ];
+  meta = {
+    description = "Retry combinators for monadic actions that may fail";
+    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 01462724e03..4a97c92bb80 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2177,6 +2177,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   resourcet = callPackage ../development/libraries/haskell/resourcet {};
 
+  retry = callPackage ../development/libraries/haskell/retry {};
+
   rethinkdb = callPackage ../development/libraries/haskell/rethinkdb {};
 
   rfc5051 = callPackage ../development/libraries/haskell/rfc5051 {};
-- 
GitLab


From 53d7a1c88215d94e341f6fefbe13b2af820eb54d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 11:54:38 +0200
Subject: [PATCH 3016/3789] haskell-criterion: downgrade to hastache 0.5.1 to
 fix the build

Closes <https://github.com/NixOS/nixpkgs/pull/2133>.
---
 .../libraries/haskell/hastache/0.5.1.nix      | 19 +++++++++++++++++++
 .../hastache/{default.nix => 0.6.0.nix}       |  0
 pkgs/top-level/haskell-packages.nix           |  8 ++++++--
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/hastache/0.5.1.nix
 rename pkgs/development/libraries/haskell/hastache/{default.nix => 0.6.0.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/hastache/0.5.1.nix b/pkgs/development/libraries/haskell/hastache/0.5.1.nix
new file mode 100644
index 00000000000..462c76a487e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hastache/0.5.1.nix
@@ -0,0 +1,19 @@
+{ cabal, blazeBuilder, filepath, HUnit, ieee754, mtl, syb, text
+, transformers, utf8String
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hastache";
+  version = "0.5.1";
+  sha256 = "05lm7mjzc1hamxcj8akq06081bhp907hrjdkhas3wzm6ran6rwn3";
+  buildDepends = [
+    blazeBuilder filepath ieee754 mtl syb text transformers utf8String
+  ];
+  testDepends = [ HUnit mtl syb text ];
+  meta = {
+    homepage = "http://github.com/lymar/hastache";
+    description = "Haskell implementation of Mustache templates";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/0.6.0.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/hastache/default.nix
rename to pkgs/development/libraries/haskell/hastache/0.6.0.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4a97c92bb80..4648d76a7a1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -849,7 +849,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   cprngAes = callPackage ../development/libraries/haskell/cprng-aes {};
 
-  criterion = callPackage ../development/libraries/haskell/criterion {};
+  criterion = callPackage ../development/libraries/haskell/criterion {
+    hastache = self.hastache_0_5_1;
+  };
 
   Crypto = callPackage ../development/libraries/haskell/Crypto {};
 
@@ -1323,7 +1325,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   haskore = callPackage ../development/libraries/haskell/haskore {};
 
-  hastache = callPackage ../development/libraries/haskell/hastache {};
+  hastache_0_5_1 = callPackage ../development/libraries/haskell/hastache/0.5.1.nix {};
+  hastache_0_6_0 = callPackage ../development/libraries/haskell/hastache/0.6.0.nix {};
+  hastache = self.hastache_0_6_0;
 
   heredoc = callPackage ../development/libraries/haskell/heredoc {};
 
-- 
GitLab


From 1f6bfa19adfc1e658fc12f541e6dc9a5fde1102f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Apr 2014 12:24:17 +0200
Subject: [PATCH 3017/3789] Gnome 3 should not be a release blocker

---
 nixos/release-combined.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 94bc2f796eb..49c55094640 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -61,7 +61,6 @@ in rec {
         (all nixos.tests.printing)
         (all nixos.tests.proxy)
         (all nixos.tests.xfce)
-        (all nixos.tests.gnome3)
 
         nixpkgs.tarball
         (all nixpkgs.emacs)
-- 
GitLab


From fa6b9baea9d2364cac8dffda04cb3bf4f7f77ee7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 5 Apr 2014 18:56:45 +0200
Subject: [PATCH 3018/3789] Revert "udisks1: bump to fix CVE-2014-0004"

This reverts commit 0194a44d63c613065bb5c55d50470881c00563c2 because
it breaks udisks on 13.10 (e.g. running "udisks --enumerate" will
print "Unit udisks.service failed to load").

(cherry picked from commit d7daf1a47f0d3d759555a3f0a0f09398c69c6b28)
---
 pkgs/os-specific/linux/udisks/1-default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix
index 485880f0cbb..99506e81583 100644
--- a/pkgs/os-specific/linux/udisks/1-default.nix
+++ b/pkgs/os-specific/linux/udisks/1-default.nix
@@ -3,11 +3,11 @@
 , libxslt, docbook_xsl, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "udisks-1.0.5";
+  name = "udisks-1.0.4";
 
   src = fetchurl {
     url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j";
+    sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5";
   };
 
   patches = [ ./purity.patch ./no-pci-db.patch ];
@@ -33,11 +33,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  configureFlags = [
-    "--localstatedir=/var"
-    "--enable-lvm2"
-    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-  ];
+  configureFlags = "--localstatedir=/var --enable-lvm2";
 
   meta = {
     homepage = http://www.freedesktop.org/wiki/Software/udisks;
-- 
GitLab


From 59ea2d7ba5089b64f5ba7c243c17c73a1a66f8b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 5 Apr 2014 19:10:35 +0200
Subject: [PATCH 3019/3789] Apply patch for CVE-2014-0004 to udisks-1.0.4

(cherry picked from commit 3b1f9899618f81794ce8b88fe4eaa867e549eb06)
---
 pkgs/os-specific/linux/udisks/1-default.nix   |  2 +-
 .../linux/udisks/cve-2014-0004.patch          | 82 +++++++++++++++++++
 2 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/udisks/cve-2014-0004.patch

diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix
index 99506e81583..8c112417f0a 100644
--- a/pkgs/os-specific/linux/udisks/1-default.nix
+++ b/pkgs/os-specific/linux/udisks/1-default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5";
   };
 
-  patches = [ ./purity.patch ./no-pci-db.patch ];
+  patches = [ ./purity.patch ./no-pci-db.patch ./cve-2014-0004.patch ];
 
   postPatch =
     ''
diff --git a/pkgs/os-specific/linux/udisks/cve-2014-0004.patch b/pkgs/os-specific/linux/udisks/cve-2014-0004.patch
new file mode 100644
index 00000000000..ce907507538
--- /dev/null
+++ b/pkgs/os-specific/linux/udisks/cve-2014-0004.patch
@@ -0,0 +1,82 @@
+commit ebf61ed8471a45cf8bce7231de00cb1bbc140708
+Author: Martin Pitt <martin.pitt@ubuntu.com>
+Date:   Wed Mar 5 14:07:44 2014 +0100
+
+    Fix buffer overflow in mount path parsing
+    
+    In the mount monitor we parse mount points from /proc/self/mountinfo.  Ensure
+    that we don't overflow the buffers on platforms where mount paths could be
+    longer than PATH_MAX (unknown if that can actually happen), as at least the
+    mount paths for hotpluggable devices are somewhat user-controlled.
+    
+    Thanks to Florian Weimer for discovering this bug, and to David Zeuthen
+    for his initial patch!
+    
+    CVE-2014-0004
+
+Index: udisks-1.0.4/src/mount-monitor.c
+===================================================================
+--- udisks-1.0.4.orig/src/mount-monitor.c	2011-08-25 20:27:33.000000000 +0200
++++ udisks-1.0.4/src/mount-monitor.c	2014-03-10 13:38:18.309406561 +0100
+@@ -39,6 +39,11 @@
+ #include "mount.h"
+ #include "private.h"
+ 
++/* build a %Ns format string macro with N == PATH_MAX */
++#define xstr(s) str(s)
++#define str(s) #s
++#define PATH_MAX_FMT "%" xstr(PATH_MAX) "s"
++
+ /*--------------------------------------------------------------------------------------------------------------*/
+ 
+ enum
+@@ -320,8 +325,8 @@ mount_monitor_ensure (MountMonitor *moni
+       guint mount_id;
+       guint parent_id;
+       guint major, minor;
+-      gchar encoded_root[PATH_MAX];
+-      gchar encoded_mount_point[PATH_MAX];
++      gchar encoded_root[PATH_MAX + 1];
++      gchar encoded_mount_point[PATH_MAX + 1];
+       gchar *mount_point;
+       dev_t dev;
+ 
+@@ -329,7 +334,7 @@ mount_monitor_ensure (MountMonitor *moni
+         continue;
+ 
+       if (sscanf (lines[n],
+-                  "%d %d %d:%d %s %s",
++                  "%d %d %d:%d " PATH_MAX_FMT " " PATH_MAX_FMT,
+                   &mount_id,
+                   &parent_id,
+                   &major,
+@@ -340,6 +345,8 @@ mount_monitor_ensure (MountMonitor *moni
+           g_warning ("Error parsing line '%s'", lines[n]);
+           continue;
+         }
++      encoded_root[sizeof encoded_root - 1] = '\0';
++      encoded_mount_point[sizeof encoded_mount_point - 1] = '\0';
+ 
+       /* ignore mounts where only a subtree of a filesystem is mounted */
+       if (g_strcmp0 (encoded_root, "/") != 0)
+@@ -358,15 +365,17 @@ mount_monitor_ensure (MountMonitor *moni
+           sep = strstr (lines[n], " - ");
+           if (sep != NULL)
+             {
+-              gchar fstype[PATH_MAX];
+-              gchar mount_source[PATH_MAX];
++              gchar fstype[PATH_MAX + 1];
++              gchar mount_source[PATH_MAX + 1];
+               struct stat statbuf;
+ 
+-              if (sscanf (sep + 3, "%s %s", fstype, mount_source) != 2)
++              if (sscanf (sep + 3, PATH_MAX_FMT " " PATH_MAX_FMT, fstype, mount_source) != 2)
+                 {
+                   g_warning ("Error parsing things past - for '%s'", lines[n]);
+                   continue;
+                 }
++              fstype[sizeof fstype - 1] = '\0';
++              mount_source[sizeof mount_source - 1] = '\0';
+ 
+               if (g_strcmp0 (fstype, "btrfs") != 0)
+                 continue;
-- 
GitLab


From 2f51ca9609fbdec380888640dcec1df2917861df Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Apr 2014 13:20:29 +0200
Subject: [PATCH 3020/3789] Add a regression test for udisks

---
 nixos/release-combined.nix |  1 +
 nixos/tests/default.nix    |  1 +
 nixos/tests/udisks.nix     | 56 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 nixos/tests/udisks.nix

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 49c55094640..741ab62bbc0 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -60,6 +60,7 @@ in rec {
         (all nixos.tests.openssh)
         (all nixos.tests.printing)
         (all nixos.tests.proxy)
+        (all nixos.tests.udisks)
         (all nixos.tests.xfce)
 
         nixpkgs.tarball
diff --git a/nixos/tests/default.nix b/nixos/tests/default.nix
index 955c87b2714..0a749ad5fde 100644
--- a/nixos/tests/default.nix
+++ b/nixos/tests/default.nix
@@ -38,6 +38,7 @@ with import ../lib/testing.nix { inherit system minimal; };
   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/udisks.nix b/nixos/tests/udisks.nix
new file mode 100644
index 00000000000..e3e3f740d07
--- /dev/null
+++ b/nixos/tests/udisks.nix
@@ -0,0 +1,56 @@
+{ 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/;
+      $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 ]");
+    '';
+
+}
\ No newline at end of file
-- 
GitLab


From eb22e5f0269cd28591b66e456dcb1044570fc165 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Apr 2014 13:21:13 +0200
Subject: [PATCH 3021/3789] Remove ignored argument to sync

---
 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 31f3281cefe..358c29e515f 100644
--- a/nixos/lib/test-driver/test-driver.pl
+++ b/nixos/lib/test-driver/test-driver.pl
@@ -147,7 +147,7 @@ sub runTests {
     $log->nest("syncing", sub {
         foreach my $vm (values %vms) {
             next unless $vm->isUp();
-            $vm->execute("sync /tmp/xchg");
+            $vm->execute("sync");
         }
     });
 
-- 
GitLab


From 98a1d07fd3a8704ee537808d185d06c3bfe35a3a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 6 Apr 2014 11:47:42 -0500
Subject: [PATCH 3022/3789] boolector: add version 1.5 and 1.6

There are two versions here because beginning with 1.6.0, Boolector has
a more restrictive, unfree license which disallows commercial use.

As a result, Boolector 1.5 is the default 'boolector' expression.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/boolector/default.nix       | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/applications/science/logic/boolector/default.nix

diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix
new file mode 100644
index 00000000000..3879ee8ef47
--- /dev/null
+++ b/pkgs/applications/science/logic/boolector/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, zlib, useV16 ? false }:
+
+let
+  v15 = rec {
+    name    = "boolector-${version}";
+    version = "1.5.118";
+    src = fetchurl {
+      url    = "http://fmv.jku.at/boolector/${name}-with-sat-solvers.tar.gz";
+      sha256 = "17j7q02rryvfwgvglxnhx0kv8hxwy8wbhzawn48lw05i98vxlmk9";
+    };
+  };
+
+  v16 = rec {
+    name    = "boolector-${version}";
+    version = "1.6.0";
+    src = fetchurl {
+      url    = "http://fmv.jku.at/boolector/${name}-with-sat-solvers.tar.gz";
+      sha256 = "0jka4r6bc3i24axgdp6qbq6gjadwz9kvi11s2c5sbwmdnjd7cp85";
+    };
+  };
+
+  boolectorPkg = if useV16 then v16 else v15;
+  license = with stdenv.lib.licenses; if useV16 then unfreeRedistributable else gpl3;
+in
+stdenv.mkDerivation (boolectorPkg // {
+  buildInputs = [ zlib ];
+  enableParallelBuilding = false;
+
+  buildPhase = "./build.sh";
+
+  installPhase = ''
+    mkdir -p $out/bin $out/lib $out/include
+    cp boolector/boolector      $out/bin
+    cp boolector/deltabtor      $out/bin
+    cp boolector/synthebtor     $out/bin
+    cp boolector/libboolector.a $out/lib
+    cp boolector/boolector.h    $out/include
+  '';
+
+  meta = {
+    inherit license;
+    description = "An extremely fast SMT solver for bit-vectors and arrays";
+    homepage    = "http://fmv.jku.at/boolector";
+    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 ce9bf517e62..4885dc004d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10278,6 +10278,12 @@ let
 
   z3 = callPackage ../applications/science/logic/z3 {};
 
+  boolector   = boolector15;
+  boolector15 = callPackage ../applications/science/logic/boolector {};
+  boolector16 = lowPrio (callPackage ../applications/science/logic/boolector {
+    useV16 = true;
+  });
+
   ### SCIENCE / ELECTRONICS
 
   eagle = callPackage_i686 ../applications/science/electronics/eagle { };
-- 
GitLab


From c494289c1290fc3350a209ddd498e647ff6a899f Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 7 Apr 2014 15:30:18 +0200
Subject: [PATCH 3023/3789] linux: Update to 3.13.9

---
 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 b2be5ff2074..136b5241347 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.8";
+  version = "3.13.9";
   extraMeta.branch = "3.13";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0z6lfsf1ldv7id3fm6l5jdn7c6076605wj7mfi90pgf079kbbqwj";
+    sha256 = "1nfxmxmpvw9lr5595ivsshdhk81bjcbx8k92qs0qql6d06bpa921";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 807fad571a892abcdca133acb98bbb03ac557efc Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 7 Apr 2014 15:30:37 +0200
Subject: [PATCH 3024/3789] grsecurity: Update stable and test patches

stable: 3.0-3.2.56-201404012135 -> 3.0-3.2.56-201404062126
test:   3.0-3.13.8-201404011912 -> 3.0-3.13.9-201404062127
---
 pkgs/os-specific/linux/kernel/patches.nix | 14 +++++++-------
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index c5b6362108e..5156abc1c4f 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -75,22 +75,22 @@ rec {
   grsecurity_3_0_3_2_56 =
     { name = "grsecurity-3.0-3.2.56";
       patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.56-201404012135.patch;
-        sha256 = "1l7c1l5cxv1j9iw12rxf7nsvbmg6jna96y1bxc8i4yi0jwiwn2nc";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.56-201404062126.patch;
+        sha256 = "0pm8a6h5dky1frg7bi6ldq849w8xz8isnlw5jpbzix46m3myy3x0";
       };
       features.grsecurity = true;
       # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.56
       features.apparmor = true;
     };
 
-  grsecurity_3_0_3_13_8 =
-    { name = "grsecurity-3.0-3.13.8";
+  grsecurity_3_0_3_13_9 =
+    { name = "grsecurity-3.0-3.13.9";
       patch = fetchurl {
-        url = http://grsecurity.net/test/grsecurity-3.0-3.13.8-201404011912.patch;
-        sha256 = "1fwb41l7gjkdyl08b6a9mg4ahnw55yk0a7kd69ca8zrqd0j668ci";
+        url = http://grsecurity.net/test/grsecurity-3.0-3.13.9-201404062127.patch;
+        sha256 = "0kwqgw2a44wqhwjwws63ww15apb8jki372iccq7h1w5vi551sl0m";
       };
       features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.8
+      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.9
       features.apparmor = true;
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce9bf517e62..5383093bcd4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6915,7 +6915,7 @@ let
   linux_3_13_grsecurity = lowPrio (lib.addMetaAttrs {
     maintainers = with lib.maintainers; [ wizeman thoughtpolice ];
   } (lib.overrideDerivation (linux_3_13.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_8 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_9 kernelPatches.grsec_path ];
     argsOverride = {
       modDirVersion = "${linux_3_13.modDirVersion}-grsec";
     };
-- 
GitLab


From 5aa4495cb56ef99df21e9ac42cc2cc98d460426c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 6 Apr 2014 11:47:42 -0500
Subject: [PATCH 3025/3789] boolector: add version 1.5 and 1.6

There are two versions here because beginning with 1.6.0, Boolector has
a more restrictive, unfree license which disallows commercial use.

As a result, Boolector 1.5 is the default 'boolector' expression.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/boolector/default.nix       | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/applications/science/logic/boolector/default.nix

diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix
new file mode 100644
index 00000000000..3879ee8ef47
--- /dev/null
+++ b/pkgs/applications/science/logic/boolector/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, zlib, useV16 ? false }:
+
+let
+  v15 = rec {
+    name    = "boolector-${version}";
+    version = "1.5.118";
+    src = fetchurl {
+      url    = "http://fmv.jku.at/boolector/${name}-with-sat-solvers.tar.gz";
+      sha256 = "17j7q02rryvfwgvglxnhx0kv8hxwy8wbhzawn48lw05i98vxlmk9";
+    };
+  };
+
+  v16 = rec {
+    name    = "boolector-${version}";
+    version = "1.6.0";
+    src = fetchurl {
+      url    = "http://fmv.jku.at/boolector/${name}-with-sat-solvers.tar.gz";
+      sha256 = "0jka4r6bc3i24axgdp6qbq6gjadwz9kvi11s2c5sbwmdnjd7cp85";
+    };
+  };
+
+  boolectorPkg = if useV16 then v16 else v15;
+  license = with stdenv.lib.licenses; if useV16 then unfreeRedistributable else gpl3;
+in
+stdenv.mkDerivation (boolectorPkg // {
+  buildInputs = [ zlib ];
+  enableParallelBuilding = false;
+
+  buildPhase = "./build.sh";
+
+  installPhase = ''
+    mkdir -p $out/bin $out/lib $out/include
+    cp boolector/boolector      $out/bin
+    cp boolector/deltabtor      $out/bin
+    cp boolector/synthebtor     $out/bin
+    cp boolector/libboolector.a $out/lib
+    cp boolector/boolector.h    $out/include
+  '';
+
+  meta = {
+    inherit license;
+    description = "An extremely fast SMT solver for bit-vectors and arrays";
+    homepage    = "http://fmv.jku.at/boolector";
+    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 5383093bcd4..2e4f7db3a94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10278,6 +10278,12 @@ let
 
   z3 = callPackage ../applications/science/logic/z3 {};
 
+  boolector   = boolector15;
+  boolector15 = callPackage ../applications/science/logic/boolector {};
+  boolector16 = lowPrio (callPackage ../applications/science/logic/boolector {
+    useV16 = true;
+  });
+
   ### SCIENCE / ELECTRONICS
 
   eagle = callPackage_i686 ../applications/science/electronics/eagle { };
-- 
GitLab


From ff49602b174c394671bc289db5fe7b899963dc63 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:08 +0200
Subject: [PATCH 3026/3789] haskell-git-annex: update to version 5.20140405

---
 .../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 93735d266d6..dcf76160ec6 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.20140402";
-  sha256 = "138zs2nf8k9kvywsajnd5ij9yksaijrgjd75v1b6c6mc3jjy3vhm";
+  version = "5.20140405";
+  sha256 = "0nbfnv9z2jhx2jr2nma0y1znvbaa09rv1drl6wk27j6xsbiq3p3k";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 6acbb0df129513a47fc7bce60b3e09ad04190443 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:10 +0200
Subject: [PATCH 3027/3789] haskell-DAV: update to version 0.6.2

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

diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix
index 1fc28b4e50b..ac5a6636e76 100644
--- a/pkgs/development/libraries/haskell/DAV/default.nix
+++ b/pkgs/development/libraries/haskell/DAV/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "DAV";
-  version = "0.6.1";
-  sha256 = "0j82fz5z9cwnl41qqs69gv0li25rkjndd8lnf4zy7bbdy558nxgz";
+  version = "0.6.2";
+  sha256 = "1alnjm0rfr7kwj6jax10bg8rcs8523n5dxyvw0mm65qykf78cprl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 1acfe0a81172d8e8a69f2501b33cf05205e2e45b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:12 +0200
Subject: [PATCH 3028/3789] haskell-HStringTemplate: update to version 0.7.3

---
 .../development/libraries/haskell/HStringTemplate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
index 6f96bbbcb7f..0f02d96fcd4 100644
--- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix
+++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HStringTemplate";
-  version = "0.7.1";
-  sha256 = "0hqc1496xazihlww8j90m1cwzj7cihqbfjdly9s8kjf8d5my64ld";
+  version = "0.7.3";
+  sha256 = "1gw4v16nk0878qplcx6by2bl4280lwyn9a252p6ldaqlbk9vygw8";
   buildDepends = [
     blazeBuilder deepseq filepath mtl parsec syb text time utf8String
     void
-- 
GitLab


From e235f6b6081341eb36b7d7dad7c0559504c8114f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:14 +0200
Subject: [PATCH 3029/3789] haskell-Hipmunk: update to version 5.2.0.13

---
 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 e2f78497a7a..faaed63399a 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.12";
-  sha256 = "0gybmwwij6gs3gsklcvck0nc1niyh6pvirnxgrcwclrz94ivpj42";
+  version = "5.2.0.13";
+  sha256 = "0ddf7cbwaswyszq9rs5jq353npbry8l2cc7p5wq9wq97yplz10bc";
   buildDepends = [ StateVar transformers ];
   meta = {
     homepage = "https://github.com/meteficha/Hipmunk";
-- 
GitLab


From b5ab38cd74dfd91bcc16ca792068669f812dcddf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:15 +0200
Subject: [PATCH 3030/3789] haskell-TypeCompose: update to version 0.9.10

---
 pkgs/development/libraries/haskell/TypeCompose/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/TypeCompose/default.nix b/pkgs/development/libraries/haskell/TypeCompose/default.nix
index b7c1a23d3d5..083f438e170 100644
--- a/pkgs/development/libraries/haskell/TypeCompose/default.nix
+++ b/pkgs/development/libraries/haskell/TypeCompose/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "TypeCompose";
-  version = "0.9.9";
-  sha256 = "0i89r1yaglkcc1fdhn0m4hws5rqcpmkg32ddznch7a3rz1l9gqwg";
+  version = "0.9.10";
+  sha256 = "1wpldqdf6czl36fs4pvvj2z3kg1487sanqncp4rbmgrrhbfmqxxq";
   meta = {
     homepage = "https://github.com/conal/TypeCompose";
     description = "Type composition classes & instances";
-- 
GitLab


From 448d6458a64a074e10faf839c2d9cd09b58c50f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:17 +0200
Subject: [PATCH 3031/3789] haskell-crypto-conduit: update to version 0.5.3

---
 .../libraries/haskell/crypto-conduit/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
index 3668c46dc68..bcc357fbed3 100644
--- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
@@ -1,15 +1,17 @@
-{ cabal, cereal, conduit, cryptoApi, cryptocipher
-, cryptohashCryptoapi, hspec, skein, transformers
+{ cabal, cereal, conduit, conduitExtra, cryptoApi, cryptocipher
+, cryptohashCryptoapi, hspec, resourcet, skein, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "crypto-conduit";
-  version = "0.5.2.2";
-  sha256 = "1969jys4za3m818jvnfcsv5hpc50bcvkrmy9lxr8fz854q01vhk2";
-  buildDepends = [ cereal conduit cryptoApi transformers ];
+  version = "0.5.3";
+  sha256 = "1xvjfkwd4rqlgyz172s2mihfqz1pac84qhc72c4zw1nwadsh6dgl";
+  buildDepends = [
+    cereal conduit conduitExtra cryptoApi resourcet transformers
+  ];
   testDepends = [
-    cereal conduit cryptoApi cryptocipher cryptohashCryptoapi hspec
-    skein transformers
+    cereal conduit conduitExtra cryptoApi cryptocipher
+    cryptohashCryptoapi hspec skein transformers
   ];
   jailbreak = true;
   doCheck = false;
-- 
GitLab


From 9e04637777b27ce615f31265e2610ab52c33aefa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:19 +0200
Subject: [PATCH 3032/3789] haskell-cryptohash-cryptoapi: update to version
 0.1.3

---
 .../libraries/haskell/cryptohash-cryptoapi/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix b/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix
index 7041bcc5285..020b34298ad 100644
--- a/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptohash-cryptoapi";
-  version = "0.1.2";
-  sha256 = "1i2qxyq5qk4jzgkl7kndy10sbmzmagamfnqvl300qm3msi9k0kfy";
+  version = "0.1.3";
+  sha256 = "0wj53p32js8lfg0i8akrljpash0jdiyv2vcqpmjbd4dq2fx81w2n";
   buildDepends = [ cereal cryptoApi cryptohash tagged ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-cryptohash-cryptoapi";
-- 
GitLab


From ec4e1295ca41a29e79ce69cf3923326e3e0f6e32 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:21 +0200
Subject: [PATCH 3033/3789] haskell-fay-base: update to version 0.19.1.1

---
 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 6e9ed486884..fae2c8ee93f 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";
-  sha256 = "1b4v8l3adhcpply9yqk1pc1cgsvqlamvk60rvcb89kw5clrbvr4r";
+  version = "0.19.1.1";
+  sha256 = "1qn48aj7j33gvb6vmz986cqi41zvh62sbmmvwgyhpmrhsfkm5wkz";
   buildDepends = [ fay ];
   meta = {
     homepage = "https://github.com/faylang/fay-base";
-- 
GitLab


From 1b32db652a8c802d3dba3df4e3cbae3968ed7062 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:23 +0200
Subject: [PATCH 3034/3789] haskell-fay: update to version 0.19.1.2

---
 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 ec5f0a48b87..3af423e5745 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.1.1";
-  sha256 = "1jjv7l4x1bxr4whhcn4vh4b3ac4wfnb6l322jmdj60nh9sj8dzpf";
+  version = "0.19.1.2";
+  sha256 = "1v6fnyzvs55sf602ja74x5cwkg97rc46ybv8ybrnsg9jvhscynpr";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From afd7e3c1de8a4121ce557c7c525d09e06f7eabed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:25 +0200
Subject: [PATCH 3035/3789] haskell-hakyll: update to version 4.5.0.2

---
 pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 13128b75b9f..56977517b9e 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.0.1";
-  sha256 = "0zl8zjwkyrh5c0l190q6qw1w6mwhw7jsjk3l7qjpgxbmv730q7nz";
+  version = "4.5.0.2";
+  sha256 = "1aphn76iq0cxxnb2ixddr017wbp6caxwjh5azfa4cy2lw2jmznyz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 7f6404001d5ea5ed24f0735077e812066d2bdc91 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:26 +0200
Subject: [PATCH 3036/3789] haskell-hspec-meta: update to version 1.9.2

---
 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 28edba11cac..c522dc9f968 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.0";
-  sha256 = "1jvx748aay8ln23p382y03gk6hc19f3z62za4326i0d3cyapfqdv";
+  version = "1.9.2";
+  sha256 = "0df54njh3i2gq10rkibqaq36xzv16pd2pp18wy28w6x5xff5hvm5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 59f7f63792e049974265dfeaffc641b73d9f3931 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:28 +0200
Subject: [PATCH 3037/3789] haskell-hspec: update to version 1.9.2

---
 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 5ba74dde34c..8d316caf4c8 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.1";
-  sha256 = "1klx7gxg4a98rjhln6ixlmfvsgpxdkdg56jbl06bfxp2lmfyxm9p";
+  version = "1.9.2";
+  sha256 = "0q8a1n03d70l86l2yy98j180xbnfq0ijgcf5llv439b65lc4zcyf";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 7e539c72efa23bfecf36961f045e006daf0c45fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:30 +0200
Subject: [PATCH 3038/3789] haskell-quickcheck-io: update to version 0.1.1

---
 pkgs/development/libraries/haskell/quickcheck-io/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/quickcheck-io/default.nix b/pkgs/development/libraries/haskell/quickcheck-io/default.nix
index b7c33b6d1a0..9e345f80053 100644
--- a/pkgs/development/libraries/haskell/quickcheck-io/default.nix
+++ b/pkgs/development/libraries/haskell/quickcheck-io/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "quickcheck-io";
-  version = "0.1.0";
-  sha256 = "167ds7c7p1lcfsylxhq2sr0jxbviyim1n42dhyr0s0b6hazw8cjs";
+  version = "0.1.1";
+  sha256 = "16q3sqvxnaqmbb1zbda8f61mdlmmzxhrznqxab113lmg380nwfm2";
   buildDepends = [ HUnit QuickCheck ];
   meta = {
     description = "Use HUnit assertions as QuickCheck properties";
-- 
GitLab


From cbe4a977de3af36e285df2016393f7e5388c5b39 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:32 +0200
Subject: [PATCH 3039/3789] haskell-random-fu: update to version 0.2.5.0

---
 .../libraries/haskell/random-fu/default.nix          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix
index 8dd228ad3db..41999e535e0 100644
--- a/pkgs/development/libraries/haskell/random-fu/default.nix
+++ b/pkgs/development/libraries/haskell/random-fu/default.nix
@@ -1,14 +1,14 @@
-{ cabal, erf, gamma, monadLoops, mtl, randomShuffle, randomSource
-, rvar, syb, transformers, vector
+{ cabal, erf, mathFunctions, monadLoops, mtl, randomShuffle
+, randomSource, rvar, syb, transformers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "random-fu";
-  version = "0.2.4.0";
-  sha256 = "1wiwh52qfs699mcj3ylwc97pyabczn6dr8j92qczs89g8vvi91wd";
+  version = "0.2.5.0";
+  sha256 = "1yfq7mvplzdk64i7z5ip8vjynn48a65z28xrhcv91qi0yjxsxdm0";
   buildDepends = [
-    erf gamma monadLoops mtl randomShuffle randomSource rvar syb
-    transformers vector
+    erf mathFunctions monadLoops mtl randomShuffle randomSource rvar
+    syb transformers vector
   ];
   meta = {
     homepage = "https://github.com/mokus0/random-fu";
-- 
GitLab


From 73411b90dd88f7329e81db361ca174211c118ddf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:34 +0200
Subject: [PATCH 3040/3789] haskell-resourcet: update to version 1.1.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 111afbf6a7a..7995227a8c0 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.0.1";
-  sha256 = "02w2gz0zn039bz1ig91jd0zkg9w1nxpi3byh6ybdsnbyddwfy376";
+  version = "1.1.1";
+  sha256 = "0v80wlxpcikr41p8wxa2kr184ghp94bgb5fwym9c27k8djig2awy";
   buildDepends = [
     exceptions liftedBase mmorph monadControl mtl transformers
     transformersBase
-- 
GitLab


From 9b15ca717872f9fba0d4293f78603db042790669 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:36 +0200
Subject: [PATCH 3041/3789] haskell-temporary: update to version 1.2.0.2

---
 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 cf5d76f8cd6..585eaf58682 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.1";
-  sha256 = "12z8qnqn1fg9ymaav5ds7gk067lmj0bv1lhhxcnvmvjcpk1l5b54";
+  version = "1.2.0.2";
+  sha256 = "1ynvhmc6b385sn8qw3sni3cwmz7pmppns546416xil9mhbiya87z";
   buildDepends = [ exceptions filepath transformers ];
   jailbreak = true;
   meta = {
-- 
GitLab


From aebf705dbfad3f20a7e245af069a3b5cf84e97d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:37 +0200
Subject: [PATCH 3042/3789] haskell-twitter-types: update to version
 0.2.20140406

---
 .../libraries/haskell/twitter-types/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix
index a7fb544afc1..aea8f3dbc3a 100644
--- a/pkgs/development/libraries/haskell/twitter-types/default.nix
+++ b/pkgs/development/libraries/haskell/twitter-types/default.nix
@@ -1,15 +1,15 @@
-{ cabal, aeson, attoparsec, httpTypes, HUnit, shakespeareText
+{ cabal, aeson, attoparsec, httpTypes, HUnit, shakespeare
 , testFramework, testFrameworkHunit, testFrameworkThPrime, text
 , unorderedContainers
 }:
 
 cabal.mkDerivation (self: {
   pname = "twitter-types";
-  version = "0.2.20130101";
-  sha256 = "0y7pymwcv8i5f8hqh4h018xp5bd998l8fx9f2a8x6d53c7l34wmd";
+  version = "0.2.20140406";
+  sha256 = "0zzdnmcx57w2j2bypwnxkrmaa2zw945g8717lm0c2wzk31kjbvi8";
   buildDepends = [ aeson httpTypes text unorderedContainers ];
   testDepends = [
-    aeson attoparsec httpTypes HUnit shakespeareText testFramework
+    aeson attoparsec httpTypes HUnit shakespeare testFramework
     testFrameworkHunit testFrameworkThPrime text unorderedContainers
   ];
   doCheck = false;
-- 
GitLab


From 180673ccec593ea5ad5708aa929608c8d329eae5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:39 +0200
Subject: [PATCH 3043/3789] haskell-yesod-bin: update to version 1.2.8

---
 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 baf4a9dd4d5..46b78fcbd8f 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.7.4";
-  sha256 = "1nhpn8855jhvjmh5fdvjic20lyx6k054kfp8j0lwvdcd79c7bl77";
+  version = "1.2.8";
+  sha256 = "0hic32k1ii1j2hrwxj7pc7vv26dmq8rv7h7as1fw0bwlysrnw8nm";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 8673cef70d2f1c34755c8b3d75a3fa2fcb6b2879 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:41 +0200
Subject: [PATCH 3044/3789] haskell-yesod-core: update to version 1.2.11

---
 .../libraries/haskell/yesod-core/default.nix   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 3083eb0c929..ab968a53048 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -1,23 +1,23 @@
 { cabal, aeson, async, attoparsecConduit, blazeBuilder, blazeHtml
 , blazeMarkup, caseInsensitive, cereal, clientsession, conduit
 , conduitExtra, cookie, dataDefault, fastLogger, hamlet, hspec
-, httpTypes, HUnit, liftedBase, monadControl, monadLogger, 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
+, 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.9.2";
-  sha256 = "1ip5rra426agqv5v2hmxcp1g3xjvi9wnixrpdnxvifflhr7gchfl";
+  version = "1.2.11";
+  sha256 = "0vg07g5735qsr01wpgxpjzjc7w9nrqvkhfnd90jzdvg3kg33dgih";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit conduitExtra cookie
     dataDefault fastLogger hamlet httpTypes liftedBase monadControl
-    monadLogger parsec pathPieces random resourcet safe shakespeare
+    monadLogger mtl parsec pathPieces random resourcet safe shakespeare
     shakespeareCss shakespeareI18n shakespeareJs text time transformers
     transformersBase unixCompat vector wai waiExtra waiLogger warp
     yesodRoutes
-- 
GitLab


From 6876e696b4196f31b007a2e8601eb4da98084e9c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:43 +0200
Subject: [PATCH 3045/3789] haskell-HaRe: update to version 0.7.2.2

---
 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 11c36f320f2..7cbc6630584 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.0";
-  sha256 = "0i769mryjr3v9vh4zkdycpha8skq9xcdln3plrxx55bf42c4aqi9";
+  version = "0.7.2.2";
+  sha256 = "0w9cjs3r99k4mf835higcsllk0h8lbich1v9wb2pvwbqi3i9r0sp";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From bdc3361515471f54252783332ebb83c2f8e29146 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 12:43:45 +0200
Subject: [PATCH 3046/3789] haskell-keter: update to version 1.3.0

---
 .../tools/haskell/keter/default.nix           | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix
index a56e64953c0..1cffefd6da3 100644
--- a/pkgs/development/tools/haskell/keter/default.nix
+++ b/pkgs/development/tools/haskell/keter/default.nix
@@ -1,26 +1,25 @@
 { cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive
-, conduit, dataDefault, filepath, fsnotify, hspec, httpClient
-, httpClientConduit, httpConduit, httpReverseProxy, httpTypes
-, liftedBase, mtl, network, networkConduit, networkConduitTls
-, random, regexTdfa, stm, systemFileio, systemFilepath, tar, text
-, time, transformers, unixCompat, unorderedContainers, vector, wai
-, waiAppStatic, waiExtra, warp, warpTls, yaml, zlib
+, conduit, conduitExtra, dataDefault, filepath, fsnotify, hspec
+, httpConduit, httpReverseProxy, httpTypes, liftedBase, mtl
+, network, networkConduitTls, random, regexTdfa, stm, systemFileio
+, systemFilepath, tar, text, time, transformers, unixCompat
+, unorderedContainers, vector, wai, waiAppStatic, waiExtra, warp
+, warpTls, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "keter";
-  version = "1.2.1";
-  sha256 = "160kw3c2h9i1rwhicm860ahanx9p9qskrnfxsa68484j0cmw1ga9";
+  version = "1.3.0";
+  sha256 = "1fvb93iga4c0kfv29ksrmn9bjznl7wfspg1v9a5d3svwrszl4is3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson async attoparsec blazeBuilder caseInsensitive conduit
-    dataDefault filepath fsnotify httpClient httpClientConduit
-    httpConduit httpReverseProxy httpTypes liftedBase mtl network
-    networkConduit networkConduitTls random regexTdfa stm systemFileio
-    systemFilepath tar text time transformers unixCompat
-    unorderedContainers vector wai waiAppStatic waiExtra warp warpTls
-    yaml zlib
+    conduitExtra dataDefault filepath fsnotify httpConduit
+    httpReverseProxy httpTypes liftedBase mtl network networkConduitTls
+    random regexTdfa stm systemFileio systemFilepath tar text time
+    transformers unixCompat unorderedContainers vector wai waiAppStatic
+    waiExtra warp warpTls yaml zlib
   ];
   testDepends = [ conduit hspec transformers ];
   meta = {
-- 
GitLab


From 9ec3e833f7d22594cf63042b67be0e5cd2b7b212 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:03:55 +0200
Subject: [PATCH 3047/3789] hledger-web: patch to fix build with recent
 versions of conduit

Cc: @simonmichael
---
 .../haskell/hledger-web/build-fix.patch       | 47 +++++++++++++++++++
 .../libraries/haskell/hledger-web/default.nix |  1 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/hledger-web/build-fix.patch

diff --git a/pkgs/development/libraries/haskell/hledger-web/build-fix.patch b/pkgs/development/libraries/haskell/hledger-web/build-fix.patch
new file mode 100644
index 00000000000..45862bf1679
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hledger-web/build-fix.patch
@@ -0,0 +1,47 @@
+Only in hledger-web-0.22.4: dist
+diff -urw hledger-web-0.22.4-orig/Hledger/Web/Main.hs hledger-web-0.22.4/Hledger/Web/Main.hs
+--- hledger-web-0.22.4-orig/Hledger/Web/Main.hs	2014-04-07 13:00:41.168884350 +0200
++++ hledger-web-0.22.4/Hledger/Web/Main.hs	2014-04-07 13:14:46.584599468 +0200
+@@ -15,7 +15,8 @@
+ -- import Yesod.Default.Main   (defaultMain)
+ import Settings            --  (parseExtra)
+ import Application          (makeApplication)
+-import Data.Conduit.Network (HostPreference(HostIPv4))
++import Data.String
++import Data.Conduit.Network
+ import Network.Wai.Handler.Warp (runSettings, defaultSettings, settingsPort)
+ import Network.Wai.Handler.Launch (runUrlPort)
+ --
+@@ -65,7 +66,7 @@
+   app <- makeApplication opts j' AppConfig{appEnv = Development
+                                           ,appPort = p
+                                           ,appRoot = pack u
+-                                          ,appHost = HostIPv4
++                                          ,appHost = fromString "*4"
+                                           ,appExtra = Extra "" Nothing staticRoot
+                                           }
+   if server_ opts
+diff -urw hledger-web-0.22.4-orig/hledger-web.cabal hledger-web-0.22.4/hledger-web.cabal
+--- hledger-web-0.22.4-orig/hledger-web.cabal	2014-04-07 13:00:41.168884350 +0200
++++ hledger-web-0.22.4/hledger-web.cabal	2014-04-07 13:16:26.376772344 +0200
+@@ -128,7 +128,7 @@
+                    , http-conduit
+                    , http-client          >= 0.2 && < 0.3
+                    , HUnit
+-                   , network-conduit
++                   , network-conduit, conduit-extra
+                    , old-locale
+                    , parsec
+                    , regexpr              >= 0.5.1
+@@ -220,7 +220,7 @@
+                    , http-conduit
+                    , http-client          >= 0.2 && < 0.3
+                    , HUnit
+-                   , network-conduit
++                   , network-conduit, conduit-extra
+                    , old-locale
+                    , parsec
+                    , regexpr              >= 0.5.1
+Only in hledger-web-0.22.4: Setup
+Only in hledger-web-0.22.4: Setup.hi
+Only in hledger-web-0.22.4: Setup.o
diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index eee84c338e6..58328ae9cf5 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -22,6 +22,7 @@ cabal.mkDerivation (self: {
   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";
-- 
GitLab


From 017a8975e7a32e125df3a99c17141f5280394cde Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:25:57 +0200
Subject: [PATCH 3048/3789] haskell-github: patch to fix build with recent
 versions of conduit

Cc: @jwiegley
---
 pkgs/development/libraries/haskell/github/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix
index 0c1d0b3135d..5fd23514583 100644
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ b/pkgs/development/libraries/haskell/github/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     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";
-- 
GitLab


From a29b90b4c726afb44181ca1b0b5e12207a165540 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:30:12 +0200
Subject: [PATCH 3049/3789] haskell-language-javascript: update to version
 0.5.12

---
 .../haskell/language-javascript/default.nix         | 13 ++++++-------
 pkgs/top-level/haskell-packages.nix                 |  4 +++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix
index 94d693aa7c8..647c3be498d 100644
--- a/pkgs/development/libraries/haskell/language-javascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-javascript/default.nix
@@ -1,18 +1,17 @@
-{ cabal, blazeBuilder, Cabal, happy, HUnit, mtl, QuickCheck
-, testFramework, testFrameworkHunit, utf8Light, utf8String, alex
+{ cabal, alex, blazeBuilder, Cabal, happy, HUnit, mtl, QuickCheck
+, testFramework, testFrameworkHunit, utf8Light, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "language-javascript";
-  version = "0.5.9";
-  sha256 = "1m1fs2vaw3yn9ryd49aprxc5l10xkr86mlxxf5bk6qp51wnp9xqh";
-  buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
+  version = "0.5.12";
+  sha256 = "1zzgjxqgfl6k2z4cwh0961ipfc5fminfdg2162g45h2nrv63mq05";
+  buildDepends = [ blazeBuilder mtl utf8String ];
   testDepends = [
     blazeBuilder Cabal HUnit mtl QuickCheck testFramework
     testFrameworkHunit utf8Light utf8String
   ];
-  buildTools = [ happy alex ];
-  preConfigure = "rm -rv dist; $SHELL runalex.sh";
+  buildTools = [ alex happy ];
   meta = {
     homepage = "http://github.com/alanz/language-javascript";
     description = "Parser for JavaScript";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4648d76a7a1..ca689949b39 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1600,7 +1600,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   languageJava = callPackage ../development/libraries/haskell/language-java {};
 
-  languageJavascript = callPackage ../development/libraries/haskell/language-javascript {};
+  languageJavascript = callPackage ../development/libraries/haskell/language-javascript {
+    alex = self.alex_3_1_3;
+  };
 
   languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {};
 
-- 
GitLab


From 4dc15c087a4b255f7b7c7203bc11e769d23ac49a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 24 Mar 2014 00:29:30 -0500
Subject: [PATCH 3050/3789] musl: version 1.0.0

NB: This currently doesn't add a working musl-wrapper around musl-gcc to
allow it to work properly (musl has its own dynamic linker as well as
libc too which must be accounted for). But at the moment it builds fine,
and I plan on working more on it in the future. So lets get it
integrated and building on Hydra.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/musl/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/os-specific/linux/musl/default.nix

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
new file mode 100644
index 00000000000..014591f0b55
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name    = "musl-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url    = "http://www.musl-libc.org/releases/${name}.tar.gz";
+    sha256 = "0chs9h8k4d0iwv8w7n1w02nll3ypwqa2gag6r4czznkj55fz9mqs";
+  };
+
+  enableParallelBuilding = true;
+  configurePhase = ''
+    ./configure --enable-shared --enable-static --prefix=$out --syslibdir=$out/lib
+  '';
+
+  meta = {
+    description = "An efficient, small, quality libc implementation";
+    homepage    = "http://www.musl-libc.org";
+    license     = stdenv.lib.licenses.mit;
+    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 2e4f7db3a94..046eead410c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7170,6 +7170,8 @@ let
 
   multipath_tools = callPackage ../os-specific/linux/multipath-tools { };
 
+  musl = callPackage ../os-specific/linux/musl { };
+
   nettools = callPackage ../os-specific/linux/net-tools { };
 
   neverball = callPackage ../games/neverball {
-- 
GitLab


From 1140f06e0fbafb4cfc64c0760d91cd67ba46ef59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 7 Apr 2014 20:31:54 +0200
Subject: [PATCH 3051/3789] openssl: 1.0.1f -> 1.0.1g

CVE-2014-0160, CVE-2014-0076
---
 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 7d7ccacd14a..0d57018dcd6 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.1f";
+  name = "openssl-1.0.1g";
 
   opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
     (throw "openssl needs its platform name cross building" null)
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
       "http://www.openssl.org/source/${name}.tar.gz"
       "http://openssl.linux-mirror.org/source/${name}.tar.gz"
     ];
-    sha256 = "0nnbr70dg67raqsqvlypzxa1v5xsv9gp91f9pavyckfn2w5sihkc";
+    sha256 = "0a70qdqccg16nw4bbawa6pjvzn05vfp5wkwg6jl0grch7f683jsk";
   };
 
   patches = patchesCross false;
-- 
GitLab


From 05ec85105009cbd92af15e6fe8168861ba52580f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 7 Apr 2014 13:52:01 -0500
Subject: [PATCH 3052/3789] kernel: longterm updates

 - longterm: 3.4.85  -> 3.4.86
 - longterm: 3.10.35 -> 3.10.36
 - longterm: 3.12.15 -> 3.12.17

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.12.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.4.nix  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index e5dbfe0d27b..520b41ec206 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.35";
+  version = "3.10.36";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "01hznshgclxgs9hvag1i1a69k95nf61z00q6qly4ym25wb77znyv";
+    sha256 = "1bx94v829qvv5r9h6cj5ddyj5n6qddy8bppnl8minjnqsv5l0vnr";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index c758768a5ef..e997e1951ef 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.15";
+  version = "3.12.17";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "08y42y5piibql0v6pwdp19nxvw5jngs4nw404lwh412zk0cnh4gn";
+    sha256 = "1knjmzk5gyab0b1prmna2bb8zz19sjmmjm24h6agmpq6q4bbnc5q";
   };
 
   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 5eeddb35adb..28542b88966 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.85";
+  version = "3.4.86";
   extraMeta.branch = "3.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1ldbq9qka6bdgic4ydl9pnny734gyi2vxzdsnfmfi8mx7bnar29y";
+    sha256 = "1gb0pgpikl2fvwbkzpyh38ji0i656jgz902918kvxsip263w675q";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 8cd95471d753248f7f7f1c70cd700c62730de3be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 7 Apr 2014 21:31:29 +0200
Subject: [PATCH 3053/3789] nixos: add type definitions to
 virtualisation.libvirtd.* options

---
 nixos/modules/virtualisation/libvirtd.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 583b09192e3..6d36fd4caa0 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -24,6 +24,7 @@ in
 
     virtualisation.libvirtd.enable =
       mkOption {
+        type = types.bool;
         default = false;
         description =
           ''
@@ -36,6 +37,7 @@ in
 
     virtualisation.libvirtd.enableKVM =
       mkOption {
+        type = types.bool;
         default = true;
         description =
           ''
@@ -45,6 +47,7 @@ in
 
     virtualisation.libvirtd.extraConfig =
       mkOption {
+        type = types.lines;
         default = "";
         description =
           ''
-- 
GitLab


From 7dff8a8aaf1c1c86e2b98ec63cf18524fbb76a7a Mon Sep 17 00:00:00 2001
From: Alex Berg <chexxor@gmail.com>
Date: Mon, 7 Apr 2014 07:33:34 +0200
Subject: [PATCH 3054/3789] Bump Docker to v0.9.1. Tested pulling, committing,
 pushing.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../virtualization/docker/default.nix         | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index b718d89c8c7..40385d9d36a 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,36 +1,33 @@
-{ stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, iptables, lvm2
-, bash}:
+{ stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge_utils, devicemapper,
+btrfsProgs, iptables, bash}:
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "0.7.6";
+  version = "0.9.1";
 
   src = fetchurl {
     url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz";
-    sha256 = "0anlzba2vm1fs5nf0dl2svrgj3ddsbl5iyhsm8vfbi3f23vppkfv";
+    sha256 = "0m4s21dxd1bj08xrmi7iw77djj3cpxvjsin12p6v6v1qnigm18ww";
   };
 
   phases = ["unpackPhase" "preBuild" "buildPhase" "installPhase"];
 
-  buildInputs = [ makeWrapper go sqlite lxc iproute lvm2 iptables ];
+  buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables ];
 
   preBuild = ''
     patchShebangs ./hack
   '';
 
   buildPhase = ''
-    mkdir -p src/github.com/dotcloud
-    ln -sn "../../../" "src/github.com/dotcloud/docker"
-    export GOPATH="$(pwd):$(pwd)/vendor"
-    export DOCKER_GITCOMMIT="bc3b2ec0622f50879ae96f042056b6bd2e0b4fba"
-    export DOCKER_INITPATH="$out/libexec/docker/dockerinit"
+    export AUTO_GOPATH=1
+    export DOCKER_GITCOMMIT="867b2a90c228f62cdcd44907ceef279a2d8f1ac5"
     ./hack/make.sh dynbinary
   '';
 
   installPhase = ''
     install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/bin/docker
-    install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit
-    wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:${lvm2}:sbin:${lxc}/bin:${iptables}/sbin"
+    install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/bin/dockerinit
+    wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin"
 
     # systemd
     install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
-- 
GitLab


From 08c7105503b5c5a3e636d9b55577e619e6706db9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 7 Apr 2014 16:34:29 -0400
Subject: [PATCH 3055/3789] haskell-scotty: fix build with new conduit

---
 .../libraries/haskell/scotty/default.nix            |  5 +++--
 .../libraries/haskell/scotty/new-conduit.patch      | 13 +++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/scotty/new-conduit.patch

diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
index 278a26d1536..42f4068f9a9 100644
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -1,15 +1,16 @@
 { cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault
 , httpTypes, mtl, regexCompat, text, transformers, wai, waiExtra
-, warp
+, warp, conduitExtra
 }:
 
 cabal.mkDerivation (self: {
   pname = "scotty";
   version = "0.7.1";
   sha256 = "07aj74jq0hh86ik4x5p5q65b47q44rrnd6mkp039wj9l6dmyrv3c";
+  patches = [ ./new-conduit.patch ];
   buildDepends = [
     aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes
-    mtl regexCompat text transformers wai waiExtra warp
+    mtl regexCompat text transformers wai waiExtra warp conduitExtra
   ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/scotty/new-conduit.patch b/pkgs/development/libraries/haskell/scotty/new-conduit.patch
new file mode 100644
index 00000000000..74c6ebdc161
--- /dev/null
+++ b/pkgs/development/libraries/haskell/scotty/new-conduit.patch
@@ -0,0 +1,13 @@
+diff -Naur scotty-0.7.1-orig/scotty.cabal scotty-0.7.1/scotty.cabal
+--- scotty-0.7.1-orig/scotty.cabal	2014-03-19 17:27:33.000000000 -0400
++++ scotty-0.7.1/scotty.cabal	2014-04-07 10:59:39.933144140 -0400
+@@ -82,7 +82,8 @@
+                        transformers     >= 0.3.0.0  && < 0.4,
+                        wai              >= 2.0.0    && < 2.2,
+                        wai-extra        >= 2.0.1    && < 2.2,
+-                       warp             >= 2.1.1    && < 2.2
++                       warp             >= 2.1.1    && < 2.2,
++                       conduit-extra
+ 
+   GHC-options: -Wall -fno-warn-orphans
+ 
-- 
GitLab


From c7899ae8ea52de237bde56fda71372991de78bf0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 7 Apr 2014 16:35:26 -0400
Subject: [PATCH 3056/3789] haskell-libjenkins: fix build with new conduit

---
 pkgs/development/libraries/haskell/libjenkins/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/libjenkins/default.nix b/pkgs/development/libraries/haskell/libjenkins/default.nix
index 722e280c6e5..67f0b698d47 100644
--- a/pkgs/development/libraries/haskell/libjenkins/default.nix
+++ b/pkgs/development/libraries/haskell/libjenkins/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   pname = "libjenkins";
   version = "0.4.2.0";
   sha256 = "11013klk2gvcaf2d2gmi0bf3jg2m82li19szqlwb325kdjmdf546";
+  patches = [ ./new-conduit.patch ];
   buildDepends = [
     async conduit free httpClient httpConduit httpTypes lens
     monadControl network text transformers xmlConduit
@@ -17,6 +18,7 @@ cabal.mkDerivation (self: {
     transformers xmlConduit
   ];
   doCheck = false;
+  jailbreak = true;
   meta = {
     description = "Jenkins API interface";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From cea0460d41cd0719b0d82577f8fd6637415ff4ad Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 7 Apr 2014 16:37:02 -0400
Subject: [PATCH 3057/3789] Missed file

---
 .../haskell/libjenkins/new-conduit.patch      | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/libjenkins/new-conduit.patch

diff --git a/pkgs/development/libraries/haskell/libjenkins/new-conduit.patch b/pkgs/development/libraries/haskell/libjenkins/new-conduit.patch
new file mode 100644
index 00000000000..fda68fde5f9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/libjenkins/new-conduit.patch
@@ -0,0 +1,23 @@
+diff -Naur libjenkins-0.4.2.0-orig/libjenkins.cabal libjenkins-0.4.2.0/libjenkins.cabal
+--- libjenkins-0.4.2.0-orig/libjenkins.cabal	2014-02-17 13:11:22.000000000 -0500
++++ libjenkins-0.4.2.0/libjenkins.cabal	2014-04-07 11:40:30.046473593 -0400
+@@ -52,6 +52,7 @@
+     , text          >= 0.11
+     , transformers  >= 0.3
+     , xml-conduit   >= 1.1
++    , resourcet
+ 
+ test-suite doctest
+   default-language:  Haskell2010
+diff -Naur libjenkins-0.4.2.0-orig/src/Jenkins/Rest/Internal.hs libjenkins-0.4.2.0/src/Jenkins/Rest/Internal.hs
+--- libjenkins-0.4.2.0-orig/src/Jenkins/Rest/Internal.hs	2014-02-17 13:11:22.000000000 -0500
++++ libjenkins-0.4.2.0/src/Jenkins/Rest/Internal.hs	2014-04-07 11:40:02.221415450 -0400
+@@ -22,7 +22,7 @@
+ import           Control.Monad.Trans.Reader (ReaderT, runReaderT, ask, local)
+ import           Control.Monad.Trans.Maybe (MaybeT(..), mapMaybeT)
+ import           Data.ByteString.Lazy (ByteString)
+-import           Data.Conduit (ResourceT)
++import           Control.Monad.Trans.Resource (ResourceT)
+ import           Data.Data (Data, Typeable)
+ import           Data.Text (Text)
+ import qualified Data.Text.Encoding as Text
-- 
GitLab


From ff836a6f15dbd4e53d44f436eb25aab87287127e Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 8 Apr 2014 00:18:46 +0200
Subject: [PATCH 3058/3789] pythonPackages: ipdb, use ipythonLight by default

---
 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 5a4be8d1704..f5af0f6c65b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3370,7 +3370,7 @@ rec {
       url = "http://pypi.python.org/packages/source/i/ipdb/ipdb-0.7.tar.gz";
       md5 = "d879f9b2b0f26e0e999809585dcaec61";
     };
-    propagatedBuildInputs = [ pythonPackages.ipython ];
+    propagatedBuildInputs = [ pythonPackages.ipythonLight ];
   };
 
   ipdbplugin = buildPythonPackage {
@@ -3379,7 +3379,7 @@ rec {
       url = "https://pypi.python.org/packages/source/i/ipdbplugin/ipdbplugin-1.4.tar.gz";
       md5 = "f9a41512e5d901ea0fa199c3f648bba7";
     };
-    propagatedBuildInputs = [ pythonPackages.nose pythonPackages.ipython ];
+    propagatedBuildInputs = [ pythonPackages.nose pythonPackages.ipythonLight ];
   };
 
 
-- 
GitLab


From 593c633aa8fb12cc23cdfe1a750ef9976601a81b Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 6 Apr 2014 20:51:32 +0200
Subject: [PATCH 3059/3789] emacs-idris-mode: upgrade to support idris 0.9.12

---
 pkgs/applications/editors/emacs-modes/idris/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix
index 289c8868876..8671a926f67 100644
--- a/pkgs/applications/editors/emacs-modes/idris/default.nix
+++ b/pkgs/applications/editors/emacs-modes/idris/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, emacs }:
 
 stdenv.mkDerivation rec {
-  name = "idris-mode-20140223";
+  name = "idris-mode-20140405";
 
   src = fetchgit {
     url = https://github.com/idris-hackers/idris-mode.git;
-    rev = "486470533e74c55192e92a1afa050475915ee1e7";
-    sha256 = "ff2e6bd8fbf421e8f2db0789d2ff56c5103775b911b99bab64e4652d332bad43";
+    rev = "2e2d18fb757da4b42940ebe2a57d7a117175489f";
+    sha256 = "d4b52c6c43c038c94a7464cd9c849cd40c01696c440da8b057c00a9be22f9ac0";
   };
 
   buildInputs = [ emacs ];
-- 
GitLab


From a4ebaa61e426b3a9c2625be37cfb4828a64a30d6 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 8 Apr 2014 09:27:09 +0200
Subject: [PATCH 3060/3789] Update dd-agent to 4.2.0

---
 pkgs/tools/networking/dd-agent/default.nix | 11 ++++++-----
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index d9fa49320a5..1e0f26cc92c 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, python, sysstat, unzip }:
+{ stdenv, fetchurl, python, sysstat, unzip, tornado, makeWrapper }:
 
 stdenv.mkDerivation rec {
-    version = "4.0.1";
+    version = "4.2.0";
     name = "dd-agent-${version}";
 
     src = fetchurl {
       url = "https://github.com/DataDog/dd-agent/archive/${version}.zip";
-      sha256 = "0gybdbjkj7qwnzic03xkypagb30zhm22gp3nkwrdhi8fdmwz3nm1";
+      sha256 = "0lp3h3flb50i64kgkj9kyyf3p1xm0nipxi22w5pmhb71l678d216";
     };
 
-    buildInputs = [ python unzip ];
-    propagatedBuildInputs = [ python ];
+    buildInputs = [ python unzip makeWrapper ];
+    propagatedBuildInputs = [ python tornado ];
 
     postUnpack = "export sourceRoot=$sourceRoot/packaging";
 
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
     postInstall = ''
       mv $out/usr/* $out
       rmdir $out/usr
+      wrapProgram $out/bin/dd-forwarder --prefix PYTHONPATH : $PYTHONPATH
     '';
 
     meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 046eead410c..ed5a3d3ab73 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7835,7 +7835,7 @@ let
     inherit (gnome) GConf libglade;
   };
 
-  "dd-agent" = callPackage ../tools/networking/dd-agent { };
+  "dd-agent" = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; };
 
   dia = callPackage ../applications/graphics/dia {
     inherit (pkgs.gnome) libart_lgpl libgnomeui;
-- 
GitLab


From 694cc6172a4c717d03ec80c2081c2a3f329484d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Apr 2014 09:42:05 +0200
Subject: [PATCH 3061/3789] Enable the firewall by default

Fixes #2135.
---
 nixos/doc/manual/release-notes.xml             | 18 ++++++++++++++----
 nixos/modules/services/networking/firewall.nix |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes.xml
index 8899cbb2149..68feb80e090 100644
--- a/nixos/doc/manual/release-notes.xml
+++ b/nixos/doc/manual/release-notes.xml
@@ -21,10 +21,6 @@ enhancements are the following:
   <listitem><para>NixOS is now based on Glibc 2.18 and GCC
   4.8.</para></listitem>
 
-  <listitem><para>The mysql55 service has been merged into the
-  mysql service, which no longer sets a default for the 'package
-  option.</para></listitem>
-
 </itemizedlist>
 
 </para>
@@ -34,10 +30,24 @@ following incompatible changes:
 
 <itemizedlist>
 
+  <listitem><para>The firewall is now enabled by default. If you don’t
+  want this, you need to disable it explicitly:
+
+<programlisting>
+networking.firewall.enable = false;
+</programlisting>
+
+  </para></listitem>
+
   <listitem><para>The option
   <option>boot.loader.grub.memtest86</option> has been renamed to
   <option>boot.loader.grub.memtest86.enable</option>.</para></listitem>
 
+  <listitem><para>The <literal>mysql55</literal> service has been
+  merged into the <literal>mysql</literal> service, which no longer
+  sets a default for the option
+  <option>services.mysql.package</option>.</para></listitem>
+
 </itemizedlist>
 
 </para>
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 07e05fa6d05..62d92ba50e1 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -54,7 +54,7 @@ in
 
     networking.firewall.enable = mkOption {
       type = types.bool;
-      default = false;
+      default = true;
       description =
         ''
           Whether to enable the firewall.  This is a simple stateful
-- 
GitLab


From 3a9a8b58adaf4755cbbe80a4a485e238216e14bd Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Tue, 8 Apr 2014 11:35:18 +0100
Subject: [PATCH 3062/3789] haskellPackages.httpClientMultipart: Do not build
 haddocks

This package now has no modules, so there is no documentation to build.
The library itself is deprecated, and should probably be removed from
nixpkgs soon.
---
 .../libraries/haskell/http-client-multipart/default.nix         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/http-client-multipart/default.nix b/pkgs/development/libraries/haskell/http-client-multipart/default.nix
index 3cf09f583a7..4413bf54d70 100644
--- a/pkgs/development/libraries/haskell/http-client-multipart/default.nix
+++ b/pkgs/development/libraries/haskell/http-client-multipart/default.nix
@@ -11,4 +11,6 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
+  # This library now contains now modules as it is deprecated.
+  noHaddock = true;
 })
-- 
GitLab


From 604306c34a43d536ce7c51abcad1a73aa41ec2a1 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 8 Apr 2014 12:33:30 +0200
Subject: [PATCH 3063/3789] Don't add users if createUser is false

---
 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 c5d44223ecf..061f51ccda7 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -7,7 +7,7 @@ let
   ids = config.ids;
   cfg = config.users;
 
-  nonUidUsers = filterAttrs (n: u: u.uid == null) cfg.extraUsers;
+  nonUidUsers = filterAttrs (n: u: u.createUser && u.uid == null) cfg.extraUsers;
   nonGidGroups = filterAttrs (n: g: g.gid == null) cfg.extraGroups;
 
   passwordDescription = ''
-- 
GitLab


From 1e7c38920d2cc5c3cfcc3b1c66564bece73188d9 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Tue, 8 Apr 2014 11:44:41 +0100
Subject: [PATCH 3064/3789] Remove haskellPackages.aesonLens

This doesn't build, has no reverse dependencies, and the lens library
itself now provides this functionality.
---
 .../libraries/haskell/aeson-lens/default.nix      | 15 ---------------
 pkgs/top-level/haskell-packages.nix               |  2 --
 2 files changed, 17 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/aeson-lens/default.nix

diff --git a/pkgs/development/libraries/haskell/aeson-lens/default.nix b/pkgs/development/libraries/haskell/aeson-lens/default.nix
deleted file mode 100644
index f2d1915e122..00000000000
--- a/pkgs/development/libraries/haskell/aeson-lens/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, aeson, doctest, lens, text, unorderedContainers, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "aeson-lens";
-  version = "0.5.0.0";
-  sha256 = "1pr8cxkx41wi7095cp1gpqrwadwx6azcrdi1kr1ik0fs6606dkks";
-  buildDepends = [ aeson lens text unorderedContainers vector ];
-  testDepends = [ doctest ];
-  meta = {
-    description = "Lens of Aeson";
-    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 ca689949b39..89a51db5f9b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -532,8 +532,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     blazeBuilder = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") then self.blazeBuilder else null;
   };
 
-  aesonLens = callPackage ../development/libraries/haskell/aeson-lens {};
-
   aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {};
 
   alternativeIo = callPackage ../development/libraries/haskell/alternative-io {};
-- 
GitLab


From d9332659d2ef276c40487c7b5c1609d0543d69d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 12:48:00 +0200
Subject: [PATCH 3065/3789] haskell-Elm: require a recent version of binary

---
 pkgs/top-level/haskell-packages.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ca689949b39..e49ddbfc1d5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1035,7 +1035,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   elerea = callPackage ../development/libraries/haskell/elerea {};
 
-  Elm = callPackage ../development/compilers/elm/elm.nix {};
+  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; };
+    };
+  };
 
   elmServer = callPackage ../development/compilers/elm/elm-server.nix {};
 
-- 
GitLab


From 1b1225fb0b0a1672d7ae72b4b09cbfd98fa7459b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 11:52:54 +0200
Subject: [PATCH 3066/3789] flymake-cursor: remove redundant 'meta.platforms =
 stdenv.lib.platforms.all' setting

---
 .../applications/editors/emacs-modes/flymake-cursor/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
index 4b2692a5e22..b47ea0fd866 100644
--- a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
+++ b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
@@ -26,7 +26,5 @@ stdenv.mkDerivation rec {
     description = "Displays flymake error msg in minibuffer after delay";
     homepage = http://www.emacswiki.org/emacs/flymake-cursor.el;
     license = stdenv.lib.licenses.publicDomain;
-
-    platforms = stdenv.lib.platforms.all;
   };
 }
-- 
GitLab


From 79f19f687cf5b1406325fa34ad0d8fa0e4b3803e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 11:52:11 +0200
Subject: [PATCH 3067/3789] flymake-cursor: the sha256 hash of the file has
 changed

No change was documented on the emacs wiki. Not sure what happened. :-(
---
 .../applications/editors/emacs-modes/flymake-cursor/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
index b47ea0fd866..eae338d241d 100644
--- a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
+++ b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.emacswiki.org/emacs/download/flymake-cursor.el";
-    sha256 = "1qqppd1786w8pl1avjb01n23lwihb7m0hr23abjklsxz03gmp4qz";
+    sha256 = "10cpzrd588ya52blghxss5zkn6x8hc7bx1h0qbcdlybbmkjgpkxr";
   };
 
   phases = [ "buildPhase" "installPhase"];
-- 
GitLab


From 7f90e454fb33fce76c721945f8636517c3443ea5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 11:51:28 +0200
Subject: [PATCH 3068/3789] ikiwiki: update to version 3.20140227

---
 pkgs/applications/misc/ikiwiki/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index c0dce81c803..b347f971ee0 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
 
 let
   name = "ikiwiki";
-  version = "3.20140125";
+  version = "3.20140227";
 
   lib = stdenv.lib;
 in
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "06r95xhm8pnvswgmkf3j7h4n6b1nmk0v0znmnzblkdx7xh12m0hd";
+    sha256 = "1bbpqs4c1la1yqcxcxj3xip3wadjnjq0wawv19j6d6baymm66cr3";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
-- 
GitLab


From d9c8db4a20a86d66ab35f5a7f1a11db54973173b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 13:17:40 +0200
Subject: [PATCH 3069/3789] Elm: fix build by ignoring the build instructions
 provided by upstream

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.

Close <https://github.com/NixOS/nixpkgs/issues/2089>.
---
 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 5a9ba8f6379..bc9f73b2849 100644
--- a/pkgs/development/compilers/elm/elm.nix
+++ b/pkgs/development/compilers/elm/elm.nix
@@ -23,6 +23,10 @@ cabal.mkDerivation (self: {
     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";
-- 
GitLab


From ccd104940c8b03dc48b665985d633b30ccb85cca Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 8 Apr 2014 06:22:44 -0500
Subject: [PATCH 3070/3789] spiped: add patch to fix linux build

The build fails with permission denied on /dev/stderr, which I imagine
is due to the fact it's in a chroot build. So disable all that for now.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/networking/spiped/default.nix      |  2 ++
 .../networking/spiped/no-dev-stderr.patch     | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/networking/spiped/no-dev-stderr.patch

diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix
index 1dd8804fb3d..7f17c981b93 100644
--- a/pkgs/tools/networking/spiped/default.nix
+++ b/pkgs/tools/networking/spiped/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ openssl ];
+  patches = [ ./no-dev-stderr.patch ];
+
   installPhase = ''
     mkdir -p $out/bin $out/share/man/man1
     make install BINDIR=$out/bin MAN1DIR=$out/share/man/man1
diff --git a/pkgs/tools/networking/spiped/no-dev-stderr.patch b/pkgs/tools/networking/spiped/no-dev-stderr.patch
new file mode 100644
index 00000000000..742a2e483d4
--- /dev/null
+++ b/pkgs/tools/networking/spiped/no-dev-stderr.patch
@@ -0,0 +1,26 @@
+From 7a2bbb0d0098d7a33ad3794d0199879ad50e755a Mon Sep 17 00:00:00 2001
+From: Austin Seipp <aseipp@pobox.com>
+Date: Tue, 8 Apr 2014 06:21:41 -0500
+Subject: [PATCH] Remove use of /dev/stderr
+
+Signed-off-by: Austin Seipp <aseipp@pobox.com>
+---
+ POSIX/posix-l.sh | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/POSIX/posix-l.sh b/POSIX/posix-l.sh
+index b3f0e31..71d6fe8 100755
+--- a/POSIX/posix-l.sh
++++ b/POSIX/posix-l.sh
+@@ -7,8 +7,6 @@ for LIB in rt xnet; do
+ 		fi
+ 		printf "%s" "-l${LIB}";
+ 		FIRST=NO;
+-	else
+-		echo "WARNING: POSIX violation: make's CC doesn't understand -l${LIB}" >/dev/stderr
+ 	fi
+ 	rm -f a.out
+ done
+-- 
+1.8.3.2
+
-- 
GitLab


From bab9a16e50918166e518af60b505f9608f0a7719 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:49:37 +0200
Subject: [PATCH 3071/3789] perlPackages.version: update from 0.9902 to 0.9908

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6ac7f76e3c5..1edd5dd6c05 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9321,10 +9321,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   version = buildPerlPackage rec {
-    name = "version-0.9902";
+    name = "version-0.9908";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/version/${name}.tar.gz";
-      sha256 = "17fdj3hxks33plapj3hinjgmyblnh302z52rq4b9spnz22q5vhww";
+      url = "mirror://cpan/authors/id/J/JP/JPEACOCK/${name}.tar.gz";
+      sha256 = "0nq84i1isk01ikwjxxynqyzz4g4g6hcbjq8l426n0hr42znlfmn4";
     };
   };
 
-- 
GitLab


From 4594bd017b9a9afad3194ccbf9cdaeac6ae342a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:49:42 +0200
Subject: [PATCH 3072/3789] perlPackages.DataSerializer: update from 0.59 to
 0.60

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1edd5dd6c05..ae0520a29b0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1910,10 +1910,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DataSerializer = buildPerlPackage {
-    name = "Data-Serializer-0.59";
+    name = "Data-Serializer-0.60";
     src = fetchurl {
-      url = mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.59.tar.gz;
-      sha256 = "1mydpbacrkirafcjxcg1c0gnls1kxiv0qvdd4q2yd6vsyay0ayqr";
+      url = mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.60.tar.gz;
+      sha256 = "0ca4s811l7f2bqkx7vnyxbpp4f0qska89g2pvsfb3k0bhhbk0jdk";
     };
     meta = {
       description = "Modules that serialize data structures";
-- 
GitLab


From f9e3f4f4af4cef32373d87b7f76f0fc719374e39 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:49:47 +0200
Subject: [PATCH 3073/3789] perlPackages.DataVisitor: update from 0.28 to 0.30

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ae0520a29b0..c1e29964fea 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1971,10 +1971,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DataVisitor = buildPerlPackage rec {
-    name = "Data-Visitor-0.28";
+    name = "Data-Visitor-0.30";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz";
-      sha256 = "1998syyprmqnhpgznmk7ia3zd8saw34q7pbaprxarcz7a3bncyjc";
+      url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz";
+      sha256 = "0m7d1505af9z2hj5aw020grcmjjlvnkjpvjam457d7k5qfy4m8lf";
     };
     buildInputs = [ TestRequires ];
     propagatedBuildInputs =
-- 
GitLab


From ebb5c742d71a8837092dd0b0ab7849bab4cbf264 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:50:02 +0200
Subject: [PATCH 3074/3789] perlPackages.DateManip: update from 6.42 to 6.43

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c1e29964fea..b67c441c971 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1995,10 +1995,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DateManip = buildPerlPackage {
-    name = "Date-Manip-6.42";
+    name = "Date-Manip-6.43";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.42.tar.gz;
-      sha256 = "18zkdvam3qddv810hgzszk2zxra14whl0fs03ba79babqhbpbzna";
+      url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.43.tar.gz;
+      sha256 = "0jwg87j31gw2fn8csm1zyfqxd0dxh8sbv940ma9idg6g7856zfrz";
     };
     propagatedBuildInputs = [ TestInter ];
     meta = {
-- 
GitLab


From de72951544f6fba2ad66ea815de246e9bc97eefe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:50:07 +0200
Subject: [PATCH 3075/3789] perlPackages.DateTime: update from 1.07 to 1.08

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b67c441c971..848fcace420 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2018,10 +2018,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DateTime = buildPerlModule {
-    name = "DateTime-1.07";
+    name = "DateTime-1.08";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.07.tar.gz;
-      sha256 = "1cm4zsgzz4phigak0nb48l661vkqhz93kfbb9jd83d1hq74myq31";
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.08.tar.gz;
+      sha256 = "0ijhb1mqrfp1pbj4r3wkpp0hdj3zg355skxdn6dsiv439fp65asf";
     };
     buildInputs = [ TestFatal ];
     propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ];
-- 
GitLab


From 55ca4f013513dfb234a69b0e663107d6a4b60ca2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:50:11 +0200
Subject: [PATCH 3076/3789] perlPackages.DateTimeSet: update from 0.31 to
 0.3400

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 848fcace420..215f334d18f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2177,10 +2177,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DateTimeSet = buildPerlPackage {
-    name = "DateTime-Set-0.31";
+    name = "DateTime-Set-0.3400";
     src = fetchurl {
-      url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Set-0.31.tar.gz;
-      sha256 = "499b59e42a1129bf10fd269eb7542d337a29fbbcbf08ef8313fd465d3ae5df02";
+      url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Set-0.3400.tar.gz;
+      sha256 = "1b27699zkj68w5ll9chjhs52vmf39f9via6x5r5844as30qh9zxb";
     };
     propagatedBuildInputs = [ DateTime SetInfinite ];
     meta = {
-- 
GitLab


From 5aeb9b3c61f90db1b1bf9b7644a3c93fb088815e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:50:15 +0200
Subject: [PATCH 3077/3789] perlPackages.DebugShowStuff: update from 1.14 to
 1.16

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 215f334d18f..e73a44015ab 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2218,10 +2218,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DebugShowStuff = buildPerlPackage {
-    name = "Debug-ShowStuff-1.14";
+    name = "Debug-ShowStuff-1.16";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MI/MIKO/Debug-ShowStuff-1.14.tar.gz;
-      sha256 = "023c6f7y93k9qxxfa2fsvc5jkbv3rh6i3nw6zvxa5cg57xfypd7h";
+      url = mirror://cpan/authors/id/M/MI/MIKO/Debug-ShowStuff-1.16.tar.gz;
+      sha256 = "1drcrnji3yrd0s3xb69bxnqa51s19c13w68vhvjad3nvswn5vpd4";
     };
     propagatedBuildInputs = [ ClassISA DevelStackTrace StringUtil TermReadKey TextTabularDisplay TieIxHash ];
     meta = {
-- 
GitLab


From 1531d1751281f9eafcbac967e88cb00e5f08e376 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:50:20 +0200
Subject: [PATCH 3078/3789] perlPackages.DevelChecklib: update from 0.98 to
 1.01

---
 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 e73a44015ab..941f358539e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2244,10 +2244,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DevelChecklib = buildPerlPackage rec {
-    name = "Devel-CheckLib-0.98";
+    name = "Devel-CheckLib-1.01";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MA/MATTN/${name}.tar.gz";
-      sha256 = "2b6b62665403bcdce67b53eb3bee7b57b6576026640c01aa57c7126e32ce20da";
+      sha256 = "14q9mibxdgqkia73426q6xw6km5bf1hhkgg2nf7x4zhnlksahbwr";
     };
     propagatedBuildInputs = [ IOCaptureOutput ];
   };
-- 
GitLab


From 697b169bd4c4fff9f33147cef46d8ac85704bbf6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:50:23 +0200
Subject: [PATCH 3079/3789] perlPackages.DevelGlobalDestruction: update from
 0.09 to 0.12

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 941f358539e..2232dc5ea82 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2465,10 +2465,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DevelGlobalDestruction = buildPerlPackage {
-    name = "Devel-GlobalDestruction-0.09";
+    name = "Devel-GlobalDestruction-0.12";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Devel-GlobalDestruction-0.09.tar.gz;
-      sha256 = "1hvrv88167rc2chqgxpd6q0ir5fki1q6r3w11v3lxfs118fdi65m";
+      url = mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalDestruction-0.12.tar.gz;
+      sha256 = "0w4a4y9w4yldxlhks95nx8qaivpbzc40b1p8xg3y8467ixkbg9cq";
     };
     propagatedBuildInputs = [ SubExporterProgressive ];
     meta = {
-- 
GitLab


From 22e43904c393f368d225415bf109d1871f210d32 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:50:29 +0200
Subject: [PATCH 3080/3789] perlPackages.DevelHide: update from 0.0008 to
 0.0009

---
 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 2232dc5ea82..a3936f9e7ad 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2478,10 +2478,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DevelHide = buildPerlPackage rec {
-    name = "Devel-Hide-0.0008";
+    name = "Devel-Hide-0.0009";
     src = fetchurl {
       url = "mirror://cpan/authors/id/F/FE/FERREIRA/${name}.tar.gz";
-      sha256 = "14hwwirpc9cnwn50rshb8hb778mia4ni75jv2dih8l9i033m4i26";
+      sha256 = "1phnzbw58v6551nhv6sg86m72nx9w5j4msh1hg4jvkakkq5w9pki";
     };
   };
 
-- 
GitLab


From a0a50476c01798d34cffa8096fbb9d04188619b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:50:33 +0200
Subject: [PATCH 3081/3789] perlPackages.DevelStackTrace: update from 1.30 to
 1.31

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a3936f9e7ad..cc2cb302cbe 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2499,10 +2499,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DevelStackTrace = buildPerlPackage {
-    name = "Devel-StackTrace-1.30";
+    name = "Devel-StackTrace-1.31";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.30.tar.gz;
-      sha256 = "1m13wzg4pmbc0f1w2rn9ybqwkqg66zw9zv34ayk7gr3349v7kbzl";
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.31.tar.gz;
+      sha256 = "0djvqfbq9ag1bpw0bcksidfy13n91xbl53py3d7w0y2323hjc957";
     };
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
-- 
GitLab


From b053b81d4ce934e8060b37ef614ab92f950c24b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:50:37 +0200
Subject: [PATCH 3082/3789] perlPackages.DevelStackTraceAsHTML: update from
 0.11 to 0.14

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cc2cb302cbe..bcc5891a478 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2512,10 +2512,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DevelStackTraceAsHTML = buildPerlPackage {
-    name = "Devel-StackTrace-AsHTML-0.11";
+    name = "Devel-StackTrace-AsHTML-0.14";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Devel-StackTrace-AsHTML-0.11.tar.gz;
-      sha256 = "0y0r42gszp3bxbs9j2nn3xgs8ij1cnadrywwwdc6r0y8m0siyapg";
+      url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Devel-StackTrace-AsHTML-0.14.tar.gz;
+      sha256 = "0yl296y0qfwybwjgqjzd4j2w2bj5a2nz342qqgxchnf5bqynl1c9";
     };
     propagatedBuildInputs = [ DevelStackTrace ];
     meta = {
-- 
GitLab


From b8b23dd8439d578d06484e79b23224db2677c98d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:50:40 +0200
Subject: [PATCH 3083/3789] perlPackages.DigestMD4: update from 1.5 to 1.9

---
 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 bcc5891a478..01450b86245 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2570,10 +2570,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DigestMD4 = buildPerlPackage rec {
-    name = "Digest-MD4-1.5";
+    name = "Digest-MD4-1.9";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/${name}.tar.gz";
-      sha256 = "c7d7a32f5c2710c929b5688a7b057ec8ddbc51cf278f623e771fc02dcabd6a1f";
+      sha256 = "19ma1hmvgiznq95ngzvm6v4dfxc9zmi69k8iyfcg6w14lfxi0lb6";
     };
   };
 
-- 
GitLab


From adbe515602b9c863d21235296c693ea0601c3460 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:50:44 +0200
Subject: [PATCH 3084/3789] perlPackages.DistZilla: update from 4.300036 to
 4.300039

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 01450b86245..50923cd19bf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2621,10 +2621,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DistZilla = buildPerlPackage {
-    name = "Dist-Zilla-4.300036";
+    name = "Dist-Zilla-4.300039";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-4.300036.tar.gz;
-      sha256 = "d78c1425d51571d9bc61ed3b20c5aaec1eb59e756ceda3ac40ed727e6c93bf21";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-4.300039.tar.gz;
+      sha256 = "10cighwsqp53kbk2gwlnl9m18sbs7ijr2v37vwca9qxbscy2yr21";
     };
     buildInputs = [ FileShareDirInstall SoftwareLicense TestFatal TestFileShareDir TestScript ];
     propagatedBuildInputs = [ AppCmd CPANUploader ClassLoad ConfigINI ConfigMVP ConfigMVPReaderINI DataSection DateTime FileCopyRecursive FileFindRule FileHomeDir FileShareDir FileShareDirInstall Filepushd HashMergeSimple JSON ListAllUtils ListMoreUtils LogDispatchouli Moose MooseAutobox MooseXLazyRequire MooseXRoleParameterized MooseXSetOnce MooseXTypes MooseXTypesPathClass MooseXTypesPerl PPI ParamsUtil PathClass PerlPrereqScanner PerlVersion PodEventual SoftwareLicense StringFormatter StringRewritePrefix SubExporter SubExporterForMethods TermReadKey TestDeep TextGlob TextTemplate TryTiny YAMLTiny autobox namespaceautoclean CPANMetaRequirements ];
-- 
GitLab


From c07739c247b794e85d9db0f65c091e211f9cad0d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:50:48 +0200
Subject: [PATCH 3085/3789] perlPackages.DistZillaPluginBundleTestingMania:
 update from 0.20 to 0.21

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 50923cd19bf..373c193b678 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2637,10 +2637,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DistZillaPluginBundleTestingMania = buildPerlPackage {
-    name = "Dist-Zilla-PluginBundle-TestingMania-0.20";
+    name = "Dist-Zilla-PluginBundle-TestingMania-0.21";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-PluginBundle-TestingMania-0.20.tar.gz;
-      sha256 = "073e17a98b0f88a1b60ce45a325d7447a19db394fcc6f01472bacb1956106da8";
+      url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-PluginBundle-TestingMania-0.21.tar.gz;
+      sha256 = "1cbq7v799bf93iqp19v1ln6bcf6gvmc0qw3gf4bq445wsm7w62wy";
     };
     buildInputs = [ CaptureTiny DistZilla MooseAutobox perl ];
     propagatedBuildInputs = [ DistZilla DistZillaPluginMojibakeTests DistZillaPluginNoTabsTests DistZillaPluginTestCPANChanges DistZillaPluginTestCPANMetaJSON DistZillaPluginTestCompile DistZillaPluginTestDistManifest DistZillaPluginTestEOL DistZillaPluginTestKwalitee DistZillaPluginTestMinimumVersion DistZillaPluginTestPerlCritic DistZillaPluginTestPodLinkCheck DistZillaPluginTestPortability DistZillaPluginTestSynopsis DistZillaPluginTestUnusedVars DistZillaPluginTestVersion JSONPP ListMoreUtils Moose PodCoverageTrustPod TestCPANMeta TestPerlCritic TestVersion namespaceautoclean ];
-- 
GitLab


From 531c1e65c523b5c855a1178b53241f03a6baea52 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:50:51 +0200
Subject: [PATCH 3086/3789] perlPackages.DistZillaPluginPodWeaver: update from
 3.101642 to 3.102000

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 373c193b678..03e2fb7b421 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2693,10 +2693,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DistZillaPluginPodWeaver = buildPerlPackage {
-    name = "Dist-Zilla-Plugin-PodWeaver-3.101642";
+    name = "Dist-Zilla-Plugin-PodWeaver-3.102000";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-3.101642.tar.gz;
-      sha256 = "66066a236be7bd0a3e0ae764a4b9ac10408d40693a1c800c5fdd7e03c3542e00";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-3.102000.tar.gz;
+      sha256 = "0xayy50fgfc7wlsnygz28ka2ax9pmr0rn845i8d6p40amrkzzlml";
     };
     buildInputs = [ FileFindRule ];
     propagatedBuildInputs = [ DistZilla ListMoreUtils Moose PPI PodElementalPerlMunger PodWeaver namespaceautoclean ];
-- 
GitLab


From c8e83e488284e3770f7e0b16a62d326e78a8c05d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:50:55 +0200
Subject: [PATCH 3087/3789] perlPackages.DistZillaPluginTestEOL: update from
 0.07 to 0.10

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 03e2fb7b421..d615f3d5d6c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2798,10 +2798,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DistZillaPluginTestEOL = buildPerlPackage {
-    name = "Dist-Zilla-Plugin-Test-EOL-0.07";
+    name = "Dist-Zilla-Plugin-Test-EOL-0.10";
     src = fetchurl {
-      url = mirror://cpan/authors/id/X/XE/XENO/Dist-Zilla-Plugin-Test-EOL-0.07.tar.gz;
-      sha256 = "c010ef618478e82fbc601abfc241c74fed1fdafe954d8b3ebcb7abe0e09967a8";
+      url = mirror://cpan/authors/id/X/XE/XENO/Dist-Zilla-Plugin-Test-EOL-0.10.tar.gz;
+      sha256 = "1sl7zvjzpwf7wl188a3j13k1qcb63hawx82iy6r3dx2gns8nc0nw";
     };
     buildInputs = [ DistZilla TestScript ];
     propagatedBuildInputs = [ DistZilla Moose TestEOL namespaceautoclean ];
-- 
GitLab


From 293a26e46a2b8cdec16ee13197fb279d34eb4c23 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:50:59 +0200
Subject: [PATCH 3088/3789] perlPackages.EmailAbstract: update from 3.004 to
 3.007

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d615f3d5d6c..c5cb9188a45 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2932,10 +2932,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   EmailAbstract = buildPerlPackage {
-    name = "Email-Abstract-3.004";
+    name = "Email-Abstract-3.007";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.004.tar.gz;
-      sha256 = "0fiaagxc2hy5g3qiipv4cspkwbaggdmsxbll1f4jx2qnq5hm668d";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.007.tar.gz;
+      sha256 = "1a7aynf5jd5lr77x4k51hphnbmxf6p0s2gm1a6fbmxjqlnimm48h";
     };
     propagatedBuildInputs = [ EmailSimple MROCompat ];
     meta = {
-- 
GitLab


From e5e0ba713b40b87161c3894355368bd08aff8a30 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:51:04 +0200
Subject: [PATCH 3089/3789] perlPackages.EmailAddress: update from 1.897 to
 1.901

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c5cb9188a45..6aa2040fc15 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2944,10 +2944,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   EmailAddress = buildPerlPackage {
-    name = "Email-Address-1.897";
+    name = "Email-Address-1.901";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.897.tar.gz;
-      sha256 = "17v5jvwhkd5clyihwsldnh4k7vpmaisn064s3mkxlr9dnz7nd10r";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.901.tar.gz;
+      sha256 = "00svsmv2hk35ybpd7jxcsn7k54i0q9ph5lf8ksv9nkh1abraprkz";
     };
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
-- 
GitLab


From 8e5416e01faba60aab90ec67c6a3782dc69528a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:51:07 +0200
Subject: [PATCH 3090/3789] perlPackages.EmailMessageID: update from 1.402 to
 1.404

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6aa2040fc15..4ce759f4fc5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2969,10 +2969,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   EmailMessageID = buildPerlPackage {
-    name = "Email-MessageID-1.402";
+    name = "Email-MessageID-1.404";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.402.tar.gz;
-      sha256 = "1zzbxdygh992dn9k9jlxjzcmaniy83dqlc8lkas9w9wlhngvwni1";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.404.tar.gz;
+      sha256 = "0lyq9r3x7cs7cncf0yiazbi7aq4c5d4m3wxwgqdd4r5p9gxdjj4n";
     };
     propagatedBuildInputs = [ EmailAddress ];
     meta = {
-- 
GitLab


From 0e01506bf6e3749b0e03a3ca752452e6a8eb8718 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:51:11 +0200
Subject: [PATCH 3091/3789] perlPackages.EmailSimple: update from 2.102 to
 2.203

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4ce759f4fc5..e44ca43a53d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3048,10 +3048,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   EmailSimple = buildPerlPackage {
-    name = "Email-Simple-2.102";
+    name = "Email-Simple-2.203";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.102.tar.gz;
-      sha256 = "19da1a06vnixhqfl41mfjrihvvxjgdgkq9bczp8k9mpr29xlbnq4";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.203.tar.gz;
+      sha256 = "0hzbp8ay62d6jwrn4q7hqmhkaigf8lc0plz0g46yhwzp3x9xfa55";
     };
     propagatedBuildInputs = [ EmailDateFormat ];
     meta = {
-- 
GitLab


From d2187ff378e7e822817ece41e30d4a420a1a8c6e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:51:16 +0200
Subject: [PATCH 3092/3789] perlPackages.Error: update from 0.17019 to 0.17022

---
 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 e44ca43a53d..a5245d079e3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3133,10 +3133,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Error = buildPerlPackage rec {
-    name = "Error-0.17019";
+    name = "Error-0.17022";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
-      sha256 = "0m09jwjs2x8j50bh3cg3m2mbxa7qh9i2krgq7z8h1pgl5dscyg2i";
+      sha256 = "1vzpz6syb82ir8svp2wjh95x6lpf01lgkxn2xy60ixrszc24zdya";
     };
   };
 
-- 
GitLab


From 9c90b4faf66ae98beadf1bd33de46e85a514fb42 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:51:19 +0200
Subject: [PATCH 3093/3789] perlPackages.EvalClosure: update from 0.08 to 0.11

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a5245d079e3..0123f31d66a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3141,10 +3141,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   EvalClosure = buildPerlPackage {
-    name = "Eval-Closure-0.08";
+    name = "Eval-Closure-0.11";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DO/DOY/Eval-Closure-0.08.tar.gz;
-      sha256 = "01x449ljj8mhr3jgfvnhzn0zz3xc81krslxiq29srqccsqjf933k";
+      url = mirror://cpan/authors/id/D/DO/DOY/Eval-Closure-0.11.tar.gz;
+      sha256 = "1b3rc9smdyyi0janckfiyg1kwph893sqwx7dr5n4mky0x8x3v4m1";
     };
     buildInputs = [ TestFatal TestRequires ];
     propagatedBuildInputs = [ SubExporter TryTiny ];
-- 
GitLab


From b602b53964075610e71d31f8e1c4593395725f57 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:51:26 +0200
Subject: [PATCH 3094/3789] perlPackages.ExceptionBase: update from 0.25 to
 0.2401

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0123f31d66a..10291edea09 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3156,10 +3156,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ExceptionBase = buildPerlPackage {
-    name = "Exception-Base-0.25";
+    name = "Exception-Base-0.2401";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.25.tar.gz;
-      sha256 = "1s2is862xba2yy633wn2nklrya36yrlwxlbpqjrv8m31xj2c8khw";
+      url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.2401.tar.gz;
+      sha256 = "0z4pckv3iwzz5s4xrv96kg9620s96kim57nfrxbqhh6pyd5jfazv";
     };
     buildInputs = [ TestUnitLite ];
     meta = {
-- 
GitLab


From 055cf38d5814a7b46225bb631b9735cab2510963 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:51:29 +0200
Subject: [PATCH 3095/3789] perlPackages.ExporterLite: update from 0.02 to 0.04

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 10291edea09..c297d6c983f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3223,10 +3223,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ExporterLite = buildPerlPackage {
-    name = "Exporter-Lite-0.02";
+    name = "Exporter-Lite-0.04";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MS/MSCHWERN/Exporter-Lite-0.02.tar.gz;
-      sha256 = "20c1e9b7ddc017b788feb34c032fc585e2c5b46a484e93f519373fd18830ce0e";
+      url = mirror://cpan/authors/id/N/NE/NEILB/Exporter-Lite-0.04.tar.gz;
+      sha256 = "01g6a2ixgdi825v0l4ny3vx4chzsfxirka741x0i057cf6y5ciir";
     };
     meta = {
       license = "perl";
-- 
GitLab


From d644332491e496a26563f3eec9c6be04c8636e3e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:51:36 +0200
Subject: [PATCH 3096/3789] perlPackages.ExtUtilsCBuilder: update from 0.280212
 to 0.280216

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c297d6c983f..f142ac80237 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3234,10 +3234,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ExtUtilsCBuilder = buildPerlPackage rec {
-    name = "ExtUtils-CBuilder-0.280212";
+    name = "ExtUtils-CBuilder-0.280216";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
-      sha256 = "0zc4hkcb8wk7nm0b2b6pb1lpih52blx6x2w6x99bcr0d581807xg";
+      url = "mirror://cpan/authors/id/A/AM/AMBS/ExtUtils/${name}.tar.gz";
+      sha256 = "09d5sq9mgcnmjf2yp8rwd0cc1fa8kq7nbwjqxiqdykwmavmgm5ml";
     };
     buildInputs = [ PerlOSType ];
   };
-- 
GitLab


From 05ff444d56e621b91f66eec089869f2917ed71b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:51:39 +0200
Subject: [PATCH 3097/3789] perlPackages.ExtUtilsDepends: update from 0.304 to
 0.306

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f142ac80237..76fd2591682 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3264,10 +3264,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ExtUtilsDepends = buildPerlPackage {
-    name = "ExtUtils-Depends-0.304";
+    name = "ExtUtils-Depends-0.306";
     src = fetchurl {
-      url = mirror://cpan/authors/id/F/FL/FLORA/ExtUtils-Depends-0.304.tar.gz;
-      sha256 = "0fjlkcz1i1j02hhwi1wjgd79qlppjkbasrj44h5ry1f238g6a1q3";
+      url = mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.306.tar.gz;
+      sha256 = "0s935hmxjl6md47i80abcfaghqwhnv0ikzzqln80w4ydhg5qn9a5";
     };
     meta = {
       license = "perl";
-- 
GitLab


From ae520cd46549ade371202afc4db482b116d6825b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:51:43 +0200
Subject: [PATCH 3098/3789] perlPackages.ExtUtilsHelpers: update from 0.021 to
 0.022

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 76fd2591682..20303bd9d79 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3277,10 +3277,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ExtUtilsHelpers = buildPerlPackage {
-    name = "ExtUtils-Helpers-0.021";
+    name = "ExtUtils-Helpers-0.022";
     src = fetchurl {
-      url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.021.tar.gz;
-      sha256 = "26b85077f4197b30e62ffec87d3f78111522619d62858d2ab45a64687351892a";
+      url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.022.tar.gz;
+      sha256 = "15dalfwmpfmifw312i5pwiai8134pxf7b2804shlqhdk1xqczy6k";
     };
     meta = {
       description = "Various portability utilities for module builders";
-- 
GitLab


From 3a8fbfda11899eaafffb94a24a26375356159c21 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:51:47 +0200
Subject: [PATCH 3099/3789] perlPackages.ExtUtilsInstallPaths: update from
 0.009 to 0.010

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 20303bd9d79..ed369aabf4a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3289,10 +3289,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ExtUtilsInstallPaths = buildPerlPackage {
-    name = "ExtUtils-InstallPaths-0.009";
+    name = "ExtUtils-InstallPaths-0.010";
     src = fetchurl {
-      url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.009.tar.gz;
-      sha256 = "1b0827a4acf40d38552c4348767000f7e2d8cf5fd0d19436bf8747d2a72d77bc";
+      url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.010.tar.gz;
+      sha256 = "0mi1px42in7i442jqncg3gmxd5zn7sw5b2s85h690rz433qvyk6i";
     };
     propagatedBuildInputs = [ ExtUtilsConfig ];
     meta = {
-- 
GitLab


From 7b13fd4a4e10db25d99c970ecaebb7e5bdad8a34 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:51:50 +0200
Subject: [PATCH 3100/3789] perlPackages.ExtUtilsParseXS: update from 3.22 to
 3.24

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ed369aabf4a..4f1958850e5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3334,10 +3334,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ExtUtilsParseXS = buildPerlPackage rec {
-    name = "ExtUtils-ParseXS-3.22";
+    name = "ExtUtils-ParseXS-3.24";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
-      sha256 = "03i93xfm9064vg2z70mcfwpnbmciafzrng113vmb8w8g117pvr84";
+      url = "mirror://cpan/authors/id/S/SM/SMUELLER/${name}.tar.gz";
+      sha256 = "07ipa2ssflw3ais8gbjdk4l8z2k1p65nfjwkxm37g6zw1210pdih";
     };
   };
 
-- 
GitLab


From 19cca58cd4331297da8b0c0e21ed6b71f94d4c71 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:51:55 +0200
Subject: [PATCH 3101/3789] perlPackages.FatalException: update from 0.05 to
 0.0204

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4f1958850e5..4f98ae2ab30 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3380,10 +3380,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   FatalException = buildPerlPackage {
-    name = "Fatal-Exception-0.05";
+    name = "Fatal-Exception-0.0204";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DE/DEXTER/Fatal-Exception-0.05.tar.gz;
-      sha256 = "0kzfwc44vpxla3j637kfmnwmv57g6x4899ijqb4ljamk7whms298";
+      url = mirror://cpan/authors/id/D/DE/DEXTER/Fatal-Exception-0.0204.tar.gz;
+      sha256 = "10a9j0fa83s3apv0xgi01l2h6s43my031097hg72wa80n07rgs2c";
     };
     buildInputs = [ ExceptionWarning TestAssert TestUnitLite ];
     propagatedBuildInputs = [ ExceptionBase ExceptionDied ];
-- 
GitLab


From e297787704d0e13f79297d605bf2b3c221a134c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:51:58 +0200
Subject: [PATCH 3102/3789] perlPackages.FileChangeNotify: update from 0.23 to
 0.24

---
 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 4f98ae2ab30..f7109187fd0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3418,10 +3418,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   FileChangeNotify = buildPerlModule rec {
-    name = "File-ChangeNotify-0.23";
+    name = "File-ChangeNotify-0.24";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "18aq6lcldniciw189ihmcji98y6zqa1gdl3mjqdg8f37i9amn4i3";
+      sha256 = "090i265f73jlcl5rv250791vw32j9vvl4nd5abc7myg0klb8109w";
     };
     buildInputs = [ TestException ];
     propagatedBuildInputs =
-- 
GitLab


From 70e0d0a921111fcc94168efa111e482bc868aa03 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:52:02 +0200
Subject: [PATCH 3103/3789] perlPackages.FileShare: update from 0.02 to 0.03

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f7109187fd0..5306674f921 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3590,10 +3590,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   FileShare = buildPerlPackage {
-    name = "File-Share-0.02";
+    name = "File-Share-0.03";
     src = fetchurl {
-      url = mirror://cpan/authors/id/I/IN/INGY/File-Share-0.02.tar.gz;
-      sha256 = "1vdgyf3m08s4pwj70bgbb31jsj8hixdl940m15phyx2hpy8dkabw";
+      url = mirror://cpan/authors/id/J/JO/JOENIO/File-Share-0.03.tar.gz;
+      sha256 = "0siy9p6b7zbln5yq6g8z1nwm76ia23kkdj1k5pywsh3n6dn2lxa2";
     };
     propagatedBuildInputs = [ FileShareDir ];
     meta = {
-- 
GitLab


From 93e50bec8cc14ecbf4e385948d8d4a38ba8b84eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:52:06 +0200
Subject: [PATCH 3104/3789] perlPackages.FileShareDirInstall: update from 0.04
 to 0.08

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5306674f921..6d11ee5c459 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3619,10 +3619,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   FileShareDirInstall = buildPerlPackage {
-    name = "File-ShareDir-Install-0.04";
+    name = "File-ShareDir-Install-0.08";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GW/GWYN/File-ShareDir-Install-0.04.tar.gz;
-      sha256 = "14gyl1l1crnsb7ihz6czaw7k0v2dnan0380pbxz8kmk66nnhaxzc";
+      url = mirror://cpan/authors/id/G/GW/GWYN/File-ShareDir-Install-0.08.tar.gz;
+      sha256 = "188pgn43wa6hgpcrv997lp3bad50030p4wmrcdzvfrqxj0bx2amf";
     };
     meta = {
       description = "Install shared files";
-- 
GitLab


From f964d637f77b005bbe180cafd697618938b58d68 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:52:10 +0200
Subject: [PATCH 3105/3789] perlPackages.FontTTF: update from 0.43 to 0.48

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6d11ee5c459..8ec6c1acad9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3690,10 +3690,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   FontTTF = buildPerlPackage {
-    name = "Font-TTF-0.43";
+    name = "Font-TTF-0.48";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MH/MHOSKEN/Font-TTF-0.43.tar.gz;
-      sha256 = "0782mj5n5a2qbghvvr20x51llizly6q5smak98kzhgq9a7q3fg89";
+      url = mirror://cpan/authors/id/M/MH/MHOSKEN/Font-TTF-0.48.tar.gz;
+      sha256 = "0lhz7v8ihaj35y6kr7jb971hgc4iqh1nz3qbfkignb9i8b1dw97r";
     };
   };
 
-- 
GitLab


From 17fd0cc41417a12f07b0c8315e1c0e135f18d797 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:52:14 +0200
Subject: [PATCH 3106/3789] perlPackages.ForksSuper: update from 0.67 to 0.72

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8ec6c1acad9..1db752aef13 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3698,10 +3698,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ForksSuper = buildPerlPackage {
-    name = "Forks-Super-0.67";
+    name = "Forks-Super-0.72";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.67.tar.gz;
-      sha256 = "8831cd70e1eb3d4ab7d9a8c3692caa7b7220dc888cd1a8dc5640fb2a08379141";
+      url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.72.tar.gz;
+      sha256 = "0zyqwyndb3gnbsh43b6xyl3wmlnyi18vz3yrbsvp3lccz4d0v7qp";
     };
     doCheck = false;
     meta = {
-- 
GitLab


From 0799fc8cb22acebbcb4a09894f76411a5d3ff7c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:52:18 +0200
Subject: [PATCH 3107/3789] perlPackages.FreezeThaw: update from 0.43 to 0.5001

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1db752aef13..9c6c6d057dc 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3711,10 +3711,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   FreezeThaw = buildPerlPackage {
-    name = "FreezeThaw-0.43";
+    name = "FreezeThaw-0.5001";
     src = fetchurl {
-      url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.43.tar.gz;
-      sha256 = "1qamc5aggp35xk590a4hy660f2rhc2l7j65hbyxdya9yvg7z437l";
+      url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.5001.tar.gz;
+      sha256 = "0h8gakd6b9770n2xhld1hhqghdar3hrq2js4mgiwxy86j4r0hpiw";
     };
     doCheck = false;
   };
-- 
GitLab


From 223edd8fe4eb3f97ce8e93ec827d5fb61c179c25 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:52:22 +0200
Subject: [PATCH 3108/3789] perlPackages.GoogleProtocolBuffers: update from
 0.08 to 0.11

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9c6c6d057dc..111615da77b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3803,10 +3803,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   GoogleProtocolBuffers = buildPerlPackage rec {
-    name = "Google-ProtocolBuffers-0.08";
+    name = "Google-ProtocolBuffers-0.11";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/G/GA/GARIEV/${name}.tar.gz";
-      sha256 = "0pxfphg671wh56h59pf0zrj7m1cr0yga95hf3w54563pzcw2vqv3";
+      url = "mirror://cpan/authors/id/S/SA/SAXJAZMAN/protobuf/${name}.tar.gz";
+      sha256 = "0k2skcbfzn2aw1f218l47h4kgq5rj9qsam3sd6zw4qq3zyp0amb1";
     };
     propagatedBuildInputs = [ ClassAccessor ParseRecDescent ];
     patches =
-- 
GitLab


From 08be8f66ec5dd8dc42b5f64ca3a601b4d0392ed1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:52:25 +0200
Subject: [PATCH 3109/3789] perlPackages.Graph: update from 0.94 to 0.96

---
 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 111615da77b..3d71d8501cb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3818,10 +3818,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Graph = buildPerlPackage rec {
-    name = "Graph-0.94";
+    name = "Graph-0.96";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JH/JHI/${name}.tar.gz";
-      sha256 = "1lyfl9s4mkhahnpxk2z5v6j750jqb4sls56b9rnkl5lni9ms7xgn";
+      sha256 = "09wpiz7v0gv07zb7h8gwgjrwj16cdycs60d08cjlyj1s926zlbl3";
     };
 
     buildInputs = [ TestPod TestPodCoverage ];
-- 
GitLab


From 21cbb9eede91df80b64cc80249f99f99e0b1ba3e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:52:29 +0200
Subject: [PATCH 3110/3789] perlPackages.HTMLFormHandler: update from 0.40055
 to 0.40056

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3d71d8501cb..f98a0135da1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4001,10 +4001,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   HTMLFormHandler = buildPerlPackage {
-    name = "HTML-FormHandler-0.40055";
+    name = "HTML-FormHandler-0.40056";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40055.tar.gz;
-      sha256 = "47e3cf69e2475cba86356eda340e6622df0525e2d0aa2343aef9f924f13d86cd";
+      url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40056.tar.gz;
+      sha256 = "012wijl69qjazghq2ywikk0jdxjbd9rfsxmwwq7lbpfjy2fiymqx";
     };
     buildInputs = [ FileShareDirInstall PadWalker TestDifferences TestException TestMemoryCycle ];
     propagatedBuildInputs = [ ClassLoad DataClone DateTime DateTimeFormatStrptime EmailValid FileShareDir HTMLTree JSON ListAllUtils Moose MooseXGetopt MooseXTypes MooseXTypesCommon MooseXTypesLoadableClass SubExporter SubName TryTiny aliased namespaceautoclean ];
-- 
GitLab


From c9e26b0632de14a3e1400cbe5635ef8b72f6c8b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:52:34 +0200
Subject: [PATCH 3111/3789] perlPackages.HTMLSelectorXPath: update from 0.15 to
 0.16

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f98a0135da1..71488d25748 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4030,10 +4030,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   HTMLSelectorXPath = buildPerlPackage {
-    name = "HTML-Selector-XPath-0.15";
+    name = "HTML-Selector-XPath-0.16";
     src = fetchurl {
-      url = mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.15.tar.gz;
-      sha256 = "0wnb561yp1r3mqw2hmd16zm45lqqm2mp823s1rx2k4qw141rmkpv";
+      url = mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.16.tar.gz;
+      sha256 = "0v12plal866ifcv7m8x22abrddd6cf12gn55qclk53qqa6c8f8m6";
     };
     buildInputs = [ TestBase ];
     meta = {
-- 
GitLab


From dfd408338c2bd9fce7a42151f5caf30e38195a46 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:52:39 +0200
Subject: [PATCH 3112/3789] perlPackages.HTMLTemplate: update from 2.9 to 2.95

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 71488d25748..90d8210b6a7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4069,10 +4069,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   HTMLTemplate = buildPerlPackage rec {
-    name = "HTML-Template-2.9";
+    name = "HTML-Template-2.95";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/S/SA/SAMTREGAR/${name}.tar.gz";
-      sha256 = "0is026jn1731lvfjglv4003dsr8drshvw25zlbjrywk59kx7nsb2";
+      url = "mirror://cpan/authors/id/W/WO/WONKO/${name}.tar.gz";
+      sha256 = "07ahpfgidxsw2yb7y8i7bbr8s64aq6qgq832h9jswmksxbd0l43q";
     };
   };
 
-- 
GitLab


From 8d185a638b165f2161dc97b42370f7e3ea3e40c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:52:42 +0200
Subject: [PATCH 3113/3789] perlPackages.HTTPLite: update from 2.4 to 2.43

---
 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 90d8210b6a7..a645dc15d33 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4198,10 +4198,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   HTTPLite = buildPerlPackage rec {
-    name = "HTTP-Lite-2.4";
+    name = "HTTP-Lite-2.43";
     src = fetchurl {
       url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz";
-      sha256 = "66f4fc0f93eeb42c09737f83b21de1944212ae9b2acb784d5103e8208491477b";
+      sha256 = "10svyy8r5ca86spz21r0k2mdy8g2slzssin4qbg101zc9kr5r65a";
     };
   };
 
-- 
GitLab


From b8487aeb8075d36d73a62c6c227499370187a6ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:52:45 +0200
Subject: [PATCH 3114/3789] perlPackages.HTTPParserXS: update from 0.14 to 0.16

---
 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 a645dc15d33..00dc4002420 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4232,10 +4232,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   HTTPParserXS = buildPerlPackage rec {
-    name = "HTTP-Parser-XS-0.14";
+    name = "HTTP-Parser-XS-0.16";
     src = fetchurl {
       url = "mirror://cpan/authors/id/K/KA/KAZUHO/${name}.tar.gz";
-      sha256 = "06srbjc380kvvj76r8n5c2y282j5zfgn0s0zmb9h3shwrynfqj05";
+      sha256 = "1sp9vllf012paslmn11b7z7fbk3hhkcp7gj59yp6qzh11xzpxlai";
     };
     buildInputs = [ TestMore ];
   };
-- 
GitLab


From 3dd6683cb21a5181ed16a56a3241c6842b952e77 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:52:49 +0200
Subject: [PATCH 3115/3789] perlPackages.HashMerge: update from 0.12 to 0.200

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 00dc4002420..63b270c5303 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3876,10 +3876,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   HashMerge = buildPerlPackage rec {
-    name = "Hash-Merge-0.12";
+    name = "Hash-Merge-0.200";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Hash/${name}.tar.gz";
-      sha256 = "07h7dyldxwqhq3x4fp9hacnc4vgipp0jk50b5cbvib975nfxx98z";
+      url = "mirror://cpan/authors/id/R/RE/REHSACK/${name}.tar.gz";
+      sha256 = "0r1a2axz85wn6573zrl9rk8mkfl2cvf1gp9vwya5qndp60rz1ya7";
     };
     propagatedBuildInputs = [ Clone ];
     meta = {
-- 
GitLab


From 771c5e56582e079f782f47734ead4e7de91005da Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:52:52 +0200
Subject: [PATCH 3116/3789] perlPackages.HashMultiValue: update from 0.13 to
 0.15

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 63b270c5303..981170d0a8e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3902,10 +3902,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   HashMultiValue = buildPerlPackage {
-    name = "Hash-MultiValue-0.13";
+    name = "Hash-MultiValue-0.15";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Hash-MultiValue-0.13.tar.gz;
-      sha256 = "0flflmk2kxq9sjmhxr1547lidgigibhck912j4ambdwg21sbxjjd";
+      url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Hash-MultiValue-0.15.tar.gz;
+      sha256 = "1jc37kwpa1fl88va8bd1p95h0vjv1gsvmn7pc2pxj62ga6x0wpc0";
     };
     meta = {
       description = "Store multiple values per key";
-- 
GitLab


From aa3278dd1f5ca6f7dc33c3726abad702436912ed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:52:56 +0200
Subject: [PATCH 3117/3789] perlPackages.HashUtilFieldHashCompat: update from
 0.03 to 0.07

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 981170d0a8e..6795288222c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3914,10 +3914,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   HashUtilFieldHashCompat = buildPerlPackage {
-    name = "Hash-Util-FieldHash-Compat-0.03";
+    name = "Hash-Util-FieldHash-Compat-0.07";
     src = fetchurl {
-      url = mirror://cpan/authors/id/N/NU/NUFFIN/Hash-Util-FieldHash-Compat-0.03.tar.gz;
-      sha256 = "0pmai98a89j82fjksfax87brmpimjn74kr7bl874lc1k40dfhx47";
+      url = mirror://cpan/authors/id/E/ET/ETHER/Hash-Util-FieldHash-Compat-0.07.tar.gz;
+      sha256 = "1fbqcjvp5slkfyf63g8scrbdpkpw3g9z9557xvfaxn09aki7g1bn";
     };
     propagatedBuildInputs = [ Testuseok ];
     meta = {
-- 
GitLab


From 8aef65dc04d4bd42d95ead4a37243e710f23902c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:53:00 +0200
Subject: [PATCH 3118/3789] perlPackages.HookLexWrap: update from 0.22 to 0.24

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6795288222c..84792f7366d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3939,10 +3939,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   HookLexWrap = buildPerlPackage rec {
-    name = "Hook-LexWrap-0.22";
+    name = "Hook-LexWrap-0.24";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/C/CH/CHORNY/${name}.zip";
-      sha256 = "eda90ba26f8a0cef02d38f08a1786a203beec1309279493c78eed13567d0fa7e";
+      url = "mirror://cpan/authors/id/C/CH/CHORNY/${name}.tar.gz";
+      sha256 = "0nyfirbdrgs2cknifqr1pf8xd5q9xnv91gy7jha4crp1hjqvihj4";
     };
     buildInputs = [ pkgs.unzip ];
   };
-- 
GitLab


From 6d394b51770becff94946dc7d6eee24709323018 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:53:04 +0200
Subject: [PATCH 3119/3789] perlPackages.IOAll: update from 0.50 to 0.60

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 84792f7366d..3c16a1a0c25 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4292,10 +4292,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   IOAll = buildPerlPackage {
-    name = "IO-All-0.50";
+    name = "IO-All-0.60";
     src = fetchurl {
-      url = mirror://cpan/authors/id/I/IN/INGY/IO-All-0.50.tar.gz;
-      sha256 = "13mc913jqqfkaily48cd886x0n6x6zw59c00fmkhqc97xh1kdckc";
+      url = mirror://cpan/authors/id/F/FR/FREW/IO-All-0.60.tar.gz;
+      sha256 = "1bwsd2f5rlivcqyd7rb0ap5vrzv8s8fappi3b1v553yr5vl5pyq9";
     };
     propagatedBuildInputs = [ IOString ];
     meta = {
-- 
GitLab


From 811474227f610d504559e668b891cf0ec16f64f6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:53:08 +0200
Subject: [PATCH 3120/3789] perlPackages.IOCaptureOutput: update from 1.1102 to
 1.1103

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3c16a1a0c25..91fcc000aac 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4308,10 +4308,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   IOCaptureOutput = buildPerlPackage rec {
-    name = "IO-CaptureOutput-1.1102";
+    name = "IO-CaptureOutput-1.1103";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz";
-      sha256 = "2ea16dbecb21a3c2be49a93fb1e7e51275bed3f7ef3ac30cbdbff5d0178d43c7";
+      url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
+      sha256 = "1bcl7p87ysbzab6hssq19xn3djzc0yk9l4hk0a2mqbqb8hv6p0m5";
     };
   };
 
-- 
GitLab


From 5a74c9e87a362837fbd562d43592d535b6c3daeb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:53:12 +0200
Subject: [PATCH 3121/3789] perlPackages.IODigest: update from 0.10 to 0.11

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 91fcc000aac..3363c93773d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4331,10 +4331,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   IODigest = buildPerlPackage {
-    name = "IO-Digest-0.10";
+    name = "IO-Digest-0.11";
     src = fetchurl {
-      url = mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.10.tar.gz;
-      sha256 = "1g6ilxqv2a7spf273v7k0721c6am7pwpjrin3h5zaqxfmd312nav";
+      url = mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.11.tar.gz;
+      sha256 = "14kz7z4xw179aya3116wxac29l4y2wmwrba087lya4v2gxdgiz4g";
     };
     propagatedBuildInputs = [PerlIOviadynamic];
   };
-- 
GitLab


From 798a139bd30372e1c124c7994be7fe87f0994ccf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:53:16 +0200
Subject: [PATCH 3122/3789] perlPackages.IOTieCombine: update from 1.002 to
 1.004

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3363c93773d..3001e39c822 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4422,10 +4422,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   IOTieCombine = buildPerlPackage {
-    name = "IO-TieCombine-1.002";
+    name = "IO-TieCombine-1.004";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/IO-TieCombine-1.002.tar.gz;
-      sha256 = "fd4f59e82852fd8b868dd1642cb6ec9caf32a597803fdce2cbe8d580c3b41d44";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/IO-TieCombine-1.004.tar.gz;
+      sha256 = "0awyyjdbjjawdkzs08rfjhfkkm7pni523x3ddmq9ixa82ibnn430";
     };
     meta = {
       homepage = https://github.com/rjbs/io-tiecombine;
-- 
GitLab


From 67b484af45e7740ab208b858ffc814225f4fe579 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:53:20 +0200
Subject: [PATCH 3123/3789] perlPackages.IPCRun3: update from 0.046 to 0.048

---
 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 3001e39c822..f42782ef202 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4459,10 +4459,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   IPCRun3 = buildPerlPackage rec {
-    name = "IPC-Run3-0.046";
+    name = "IPC-Run3-0.048";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "033miv4z6g50q71blj8l1g846frngm1v5l3mcv38dslkjqimxxp4";
+      sha256 = "0r9m8q78bg7yycpixd7738jm40yz71p2q7inm766kzsw3g6c709x";
     };
   };
 
-- 
GitLab


From 02fce7df41e6be13dc96efe6913dc1938654e5f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:53:26 +0200
Subject: [PATCH 3124/3789] perlPackages.JSONXS: update from 2.33 to 2.34

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f42782ef202..1c23b8a53ea 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4610,10 +4610,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   JSONXS = buildPerlPackage {
-    name = "JSON-XS-2.33";
+    name = "JSON-XS-2.34";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-2.33.tar.gz;
-      sha256 = "0p68f85xz6xx2c9ydz4bij5x4d1747rxs3jdq53ab915mnc1qfdl";
+      url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-2.34.tar.gz;
+      sha256 = "1sh0i73skxp3rvd9w8phxqncw9m1r5ibnb9qxxm21bmrfwkxybx6";
     };
     propagatedBuildInputs = [ CommonSense ];
     meta = {
-- 
GitLab


From b4c012700f642a3ad2bde1b23d5170eda76c3269 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:53:30 +0200
Subject: [PATCH 3125/3789] perlPackages.LWPUserAgent: update from 6.04 to 6.05

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1c23b8a53ea..f08f7ef99b3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4923,10 +4923,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LWPUserAgent = buildPerlPackage {
-    name = "LWP-UserAgent-6.04";
+    name = "LWP-UserAgent-6.05";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/libwww-perl-6.04.tar.gz;
-      sha256 = "0z92fpwk6lh2gghv050r0qb216jmjl2m0c6zby935q8lv0q5wwgr";
+      url = mirror://cpan/authors/id/G/GA/GAAS/libwww-perl-6.05.tar.gz;
+      sha256 = "08wgwyz7748pv5cyngxia0xl6nragfnhrp4p9s78xhgfyygpj9bv";
     };
     propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPNegotiate HTTPMessage LWPMediaTypes NetHTTP URI WWWRobotRules ];
     meta = {
-- 
GitLab


From eaf4f0c7c7a8e18c77d3227d0ea8653ee89367cd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:53:33 +0200
Subject: [PATCH 3126/3789] perlPackages.LWPxParanoidAgent: update from 1.07 to
 1.10

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f08f7ef99b3..9c5f8525c52 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4966,10 +4966,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LWPxParanoidAgent = buildPerlPackage rec {
-    name = "LWPx-ParanoidAgent-1.07";
+    name = "LWPx-ParanoidAgent-1.10";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/B/BR/BRADFITZ/${name}.tar.gz";
-      sha256 = "bd7ccbe6ed6b64195a967e9b2b04c185b7b97e8ec5a8835bb45dbcd42a18e76a";
+      url = "mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/${name}.tar.gz";
+      sha256 = "0i306p7mdqx09qfsf6b3rnn5xw9v9r3md4swlbk9z0mskjl0l4w4";
     };
     doCheck = false; # 3 tests fail, probably because they try to connect to the network
     propagatedBuildInputs = [ LWP NetDNS ];
-- 
GitLab


From 34e0eb81beb6bddfe34e5968cc21635bea06bb5e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:53:37 +0200
Subject: [PATCH 3127/3789] perlPackages.LinguaENTagger: update from 0.23 to
 0.24

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9c5f8525c52..4169fb21712 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4676,10 +4676,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LinguaENTagger = buildPerlPackage {
-    name = "Lingua-EN-Tagger-0.23";
+    name = "Lingua-EN-Tagger-0.24";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.23.tar.gz;
-      sha256 = "0xq6567gijczxzq72ghfa9jr8zyc1p0ax9s12mv7slibpkfkm2d2";
+      url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.24.tar.gz;
+      sha256 = "0qksqh1zi8fz76a29s2ll4g6yr8y6agmzgq7ngccvgj3gza5q241";
     };
     propagatedBuildInputs = [ HTMLParser HTMLTagset LinguaStem /* MemoizeExpireLRU */ ];
     meta = {
-- 
GitLab


From 25f3995666fb018c0a3f42766933675d820c34b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:53:41 +0200
Subject: [PATCH 3128/3789] perlPackages.LocaleMaketext: update from 1.13 to
 1.23

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4169fb21712..02577d7faa8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4754,10 +4754,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LocaleMaketext = buildPerlPackage {
-    name = "Locale-Maketext-1.13";
+    name = "Locale-Maketext-1.23";
     src = fetchurl {
-      url = mirror://cpan/authors/id/F/FE/FERREIRA/Locale-Maketext-1.13.tar.gz;
-      sha256 = "0qvrhcs1f28ix3v8hcd5xr4z9s7plz4g5a4q1cjp7bs0c3w2yl6z";
+      url = mirror://cpan/authors/id/T/TO/TODDR/Locale-Maketext-1.23.tar.gz;
+      sha256 = "1r1sq7djafvk5abzc4l068p39dz44hlpgdldj3igvn2bjz78cli1";
     };
     propagatedBuildInputs = [I18NLangTags];
   };
-- 
GitLab


From 7d76f2c4b0debae7a3fcab77bdef3a22f6baa198 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:53:44 +0200
Subject: [PATCH 3129/3789] perlPackages.LocaleMaketextSimple: update from 0.18
 to 0.21

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 02577d7faa8..a543f7460fe 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4772,10 +4772,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LocaleMaketextSimple = buildPerlPackage {
-    name = "Locale-Maketext-Simple-0.18";
+    name = "Locale-Maketext-Simple-0.21";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Simple-0.18.tar.gz;
-      sha256 = "14kx7vkxyfqndy90rzavrjp2346aidyc7x5dzzdj293qf8s4q6ig";
+      url = mirror://cpan/authors/id/J/JE/JESSE/Locale-Maketext-Simple-0.21.tar.gz;
+      sha256 = "1ad9vh45j8c32nzkbjipinawyg1pnjckwlhsjqcqs47vyi8zy2dh";
     };
   };
 
-- 
GitLab


From f52121cab024af49c4355ad294fad4ae3d0cb8cb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:53:48 +0200
Subject: [PATCH 3130/3789] perlPackages.LockFileSimple: update from 0.207 to
 0.208

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a543f7460fe..0755bcc548e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4795,10 +4795,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LockFileSimple = buildPerlPackage rec {
-    name = "LockFile-Simple-0.207";
+    name = "LockFile-Simple-0.208";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JV/JV/LockFile-Simple-0.207.tar.gz";
-      sha256 = "171vi9y6jlkny0d4jaavz48d1vbxljknnmbq8h22fi8lnc5kvipa";
+      url = "mirror://cpan/authors/id/S/SC/SCHWIGON/lockfile-simple/LockFile-Simple-0.208.tar.gz";
+      sha256 = "18pk5a030dsg1h6wd8c47wl8pzrpyh9zi9h2c9gs9855nab7iis5";
     };
   };
 
-- 
GitLab


From 70c85b5d7af0cfc98bc6b815e9267a1955c4c0a9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:53:51 +0200
Subject: [PATCH 3131/3789] perlPackages.Log4Perl: update from 1.41 to 1.43

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0755bcc548e..9b4cffa8ff9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4842,10 +4842,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Log4Perl = buildPerlPackage rec {
-    name = "Log-Log4perl-1.41";
+    name = "Log-Log4perl-1.43";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Log/${name}.tar.gz";
-      sha256 = "0dajkgvlwsb4zdw6x3fil2n5phypq829dmqf8l9s88g9smms2a2i";
+      url = "mirror://cpan/authors/id/M/MS/MSCHILLI/${name}.tar.gz";
+      sha256 = "19rmm1nlcradfj74rrvkjwmfighmjj9fiisml2j23i248vyz4cay";
     };
   };
 
-- 
GitLab


From 21d3c04e8075de0b6553a7cd359e1c0d317291ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:53:55 +0200
Subject: [PATCH 3132/3789] perlPackages.LogContextual: update from 0.005003 to
 0.006003

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9b4cffa8ff9..14802d69549 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4803,10 +4803,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LogContextual = buildPerlPackage {
-    name = "Log-Contextual-0.005003";
+    name = "Log-Contextual-0.006003";
     src = fetchurl {
-      url = mirror://cpan/authors/id/F/FR/FREW/Log-Contextual-0.005003.tar.gz;
-      sha256 = "8519ae92bd8685d003460f99151996e94f38c3c8f12b90634857558605d13719";
+      url = mirror://cpan/authors/id/F/FR/FREW/Log-Contextual-0.006003.tar.gz;
+      sha256 = "0940s910n67arqvz7aji4z6vgzzl52aq3l3jg8vq4ygnkn7c9k21";
     };
     buildInputs = [ TestFatal ];
     propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ];
-- 
GitLab


From b79bfc7de16093c41d0280c34c210e98d62bb3fd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:54:00 +0200
Subject: [PATCH 3133/3789] perlPackages.LogDispatchArray: update from 1.002 to
 1.003

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 14802d69549..d532e03c955 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4850,10 +4850,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LogDispatchArray = buildPerlPackage {
-    name = "Log-Dispatch-Array-1.002";
+    name = "Log-Dispatch-Array-1.003";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatch-Array-1.002.tar.gz;
-      sha256 = "268ec720eec3651d3dadcad7d16f033b47f883c72d6f2547c4ccbe7fb22a4940";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatch-Array-1.003.tar.gz;
+      sha256 = "0dvzp0gsh17jqg02460ndchyapr1haahndq1p9v6mwkv5wf9680c";
     };
     buildInputs = [ TestDeep ];
     propagatedBuildInputs = [ LogDispatch ];
-- 
GitLab


From 7bc7132ddf939089efd74500e8080a578565fce5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:54:04 +0200
Subject: [PATCH 3134/3789] perlPackages.LogDispatchouli: update from 2.006 to
 2.009

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d532e03c955..b4cb347a49c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4865,10 +4865,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LogDispatchouli = buildPerlPackage {
-    name = "Log-Dispatchouli-2.006";
+    name = "Log-Dispatchouli-2.009";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.006.tar.gz;
-      sha256 = "bd33b4fcf88ccfb694593ea6d7b330f053e6afee40f27acdf690c24547365354";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.009.tar.gz;
+      sha256 = "09iw27r36gmljlm6gjfczn2sf4s1js697q8na8xw4wlnz7x4bv59";
     };
     buildInputs = [ TestDeep TestFatal ];
     propagatedBuildInputs = [ LogDispatch LogDispatchArray ParamsUtil StringFlogger SubExporter SubExporterGlobExporter TryTiny ];
-- 
GitLab


From 96fb4dbb5bb64b8d4e02cce2e35a90d8adafc62d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:54:07 +0200
Subject: [PATCH 3135/3789] perlPackages.MailIMAPClient: update from 2.2.9 to
 3.35

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b4cb347a49c..9645d8522a1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4990,10 +4990,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MailIMAPClient = buildPerlPackage {
-    name = "Mail-IMAPClient-2.2.9";
+    name = "Mail-IMAPClient-3.35";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DJ/DJKERNEN/Mail-IMAPClient-2.2.9.tar.gz;
-      sha256 = "1jb04mn66d6022xjqmax49cdn55f2fdzp6knfnchmrcmf90a8rzs";
+      url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.35.tar.gz;
+      sha256 = "0qzn8370cr91jnq1kawy6v16bcz49pch6inmw85rhzg87j1h6ica";
     };
     buildInputs = [ParseRecDescent];
   };
-- 
GitLab


From 4c217a50945e59f682e11695ce20e83b84aa37e3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:54:11 +0200
Subject: [PATCH 3136/3789] perlPackages.MailTools: update from 2.04 to 2.13

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9645d8522a1..1ee66882d1d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4999,10 +4999,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MailTools = buildPerlPackage {
-    name = "MailTools-2.04";
+    name = "MailTools-2.13";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.04.tar.gz;
-      sha256 = "0w91rcrz4v0pjdnnv2mvlbrm9ww32f7ajhr7xkjdhhr3455p7adx";
+      url = mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.13.tar.gz;
+      sha256 = "1djjl05ndn8dmwri4vw5wfky5sqy7sf63qaijvhf9g5yh53405kj";
     };
     propagatedBuildInputs = [TimeDate TestPod];
   };
-- 
GitLab


From f79624df5aea1a272258ff90f11226d920ae77a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:54:15 +0200
Subject: [PATCH 3137/3789] perlPackages.MathPlanePath: update from 101 to 114

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1ee66882d1d..2498fcb7a16 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5042,10 +5042,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MathPlanePath = buildPerlPackage rec {
-    name = "Math-PlanePath-101";
+    name = "Math-PlanePath-114";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz";
-      sha256 = "0g24zhgyxs56zv966xb487vvmhqqxvvsbbz4mck8n4l31rabk8jj";
+      url = "mirror://cpan/authors/id/K/KR/KRYDE/${name}.tar.gz";
+      sha256 = "11808k6aqf7gfkv0k0r8586zk8dm0jg5idkdb839gzlr97ns2y61";
     };
     propagatedBuildInputs = [ MathLibm constant-defer ];
   };
-- 
GitLab


From 8b8a07ed17c889fb36cdb29b2acfb8c116e36fd0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:54:18 +0200
Subject: [PATCH 3138/3789] perlPackages.ModuleBuildWithXSpp: update from 0.13
 to 0.14

---
 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 2498fcb7a16..feb547063ce 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5218,10 +5218,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ModuleBuildWithXSpp = buildPerlModule rec {
-    name = "Module-Build-WithXSpp-0.13";
+    name = "Module-Build-WithXSpp-0.14";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SM/SMUELLER/${name}.tar.gz";
-      sha256 = "05c5dssgl7ykj64nkzy4nwfrs0hd1lvfidhflrs3f1c7hc0z9g46";
+      sha256 = "0d39fjg9c0n820bk3fb50vvlwhdny4hdl69xmlyzql5xzp4cicsk";
     };
     propagatedBuildInputs = [ ExtUtilsXSpp ExtUtilsCppGuess ];
   };
-- 
GitLab


From ea1fcba63c3e2a659d56b109c06872aea227eee0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:54:23 +0200
Subject: [PATCH 3139/3789] perlPackages.ModuleFind: update from 0.11 to 0.12

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index feb547063ce..53d053cb865 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5240,10 +5240,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ModuleFind = buildPerlPackage {
-    name = "Module-Find-0.11";
+    name = "Module-Find-0.12";
     src = fetchurl {
-      url = mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.11.tar.gz;
-      sha256 = "15ykcwplbqh5hc0fw4cx6g0f22zr0hrfkdkv1s34n9yg574dq3b5";
+      url = mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.12.tar.gz;
+      sha256 = "1lc33jdv4pgmm7nkr9bff0lhwjhhw91kaf6iiy2n7i7mw8dfv47l";
     };
     meta = {
       description = "Find and use installed modules in a (sub)category";
-- 
GitLab


From 7b89b377819ed190ee73c2935db45250f7d28f33 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:54:27 +0200
Subject: [PATCH 3140/3789] perlPackages.ModuleImplementation: update from 0.06
 to 0.07

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 53d053cb865..d12b17deae8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5252,10 +5252,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ModuleImplementation = buildPerlPackage {
-    name = "Module-Implementation-0.06";
+    name = "Module-Implementation-0.07";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/Module-Implementation-0.06.tar.gz;
-      sha256 = "0v8qajzkpkwb9mfj2p46j352bwiszkg1zk778b008axqb817hfys";
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/Module-Implementation-0.07.tar.gz;
+      sha256 = "15r93l8danysfhb7wn2zww1s02hajki4k3xjfxbpz7ckadqq6jbk";
     };
     buildInputs = [ TestFatal TestRequires ];
     propagatedBuildInputs = [ ModuleRuntime TryTiny ];
-- 
GitLab


From f6eb58826f3bbcc5a4f4f19217ebf2075473e657 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:54:31 +0200
Subject: [PATCH 3141/3789] perlPackages.ModulePath: update from 0.09 to 0.13

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d12b17deae8..8790926beec 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5347,10 +5347,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ModulePath = buildPerlPackage {
-    name = "Module-Path-0.09";
+    name = "Module-Path-0.13";
     src = fetchurl {
-      url = mirror://cpan/authors/id/N/NE/NEILB/Module-Path-0.09.tar.gz;
-      sha256 = "5330a76ff56800778d825548b4d631510a1a6b4f04725dddca95e68c4ed3ac18";
+      url = mirror://cpan/authors/id/N/NE/NEILB/Module-Path-0.13.tar.gz;
+      sha256 = "1kzsi0z142gcspyyp81za29bq0y74l57a8i2q7gz4zcchf2xm23g";
     };
     buildInputs = [ DevelFindPerl ];
     meta = {
-- 
GitLab


From bce3f0f7089ea41c257a909bd5920ded511d2e66 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:54:35 +0200
Subject: [PATCH 3142/3789] perlPackages.ModulePluggable: update from 4.8 to
 5.1

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8790926beec..283a8e36171 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5360,10 +5360,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ModulePluggable = buildPerlPackage {
-    name = "Module-Pluggable-4.8";
+    name = "Module-Pluggable-5.1";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-4.8.tar.gz;
-      sha256 = "0gc2sanga3207l3dnmb05isc7m87l1j94v9ll3z4sbb3vs49gdd2";
+      url = mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-5.1.tar.gz;
+      sha256 = "0vwi433pk7n1ia5wy67j3545jvmjf1hb4jwcvzrz25mv8d03bp72";
     };
     patches = [
       # !!! merge this patch into Perl itself (which contains Module::Pluggable as well)
-- 
GitLab


From c6dc49d29bf724a5d383ee41d83bce3ab0f7f3d2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:54:38 +0200
Subject: [PATCH 3143/3789] perlPackages.ModulePluggableFast: update from 0.18
 to 0.19

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 283a8e36171..775bdaefc27 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5376,10 +5376,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ModulePluggableFast = buildPerlPackage {
-    name = "Module-Pluggable-Fast-0.18";
+    name = "Module-Pluggable-Fast-0.19";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SR/SRI/Module-Pluggable-Fast-0.18.tar.gz;
-      sha256 = "140c311x2darrc2p1drbkafv7qwhzdcff4ad300n6whsx4dfp6wr";
+      url = mirror://cpan/authors/id/M/MR/MRAMBERG/Module-Pluggable-Fast-0.19.tar.gz;
+      sha256 = "0pq758wlasmh77xyd2xh75m5b2x14s8pnsv63g5356gib1q5gj08";
     };
     propagatedBuildInputs = [UNIVERSALrequire];
   };
-- 
GitLab


From aa1a352064729670922c677e22c5f62d40d9d4a9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:54:41 +0200
Subject: [PATCH 3144/3789] perlPackages.ModuleRuntime: update from 0.013 to
 0.014

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 775bdaefc27..117833a9f26 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5385,10 +5385,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ModuleRuntime = buildPerlPackage {
-    name = "Module-Runtime-0.013";
+    name = "Module-Runtime-0.014";
     src = fetchurl {
-      url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.013.tar.gz;
-      sha256 = "08qhqg1qshrispcpzf24jbbpx2gh5ks84amnv9wmd46wj0yy0dzc";
+      url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.014.tar.gz;
+      sha256 = "19326f094jmjs6mgpwkyisid54k67w34br8yfh0gvaaml87gwi2c";
     };
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
-- 
GitLab


From 0e7425ce2837c514725fd0d74ac275f8452502d3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:54:46 +0200
Subject: [PATCH 3145/3789] perlPackages.MooseAutobox: update from 0.13 to 0.15

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 117833a9f26..7db52a1f4cb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5478,10 +5478,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MooseAutobox = buildPerlPackage {
-    name = "Moose-Autobox-0.13";
+    name = "Moose-Autobox-0.15";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Moose-Autobox-0.13.tar.gz;
-      sha256 = "3474b3e6dfe099fcca34089375ace6612cca35d4d8f9a0b8b4e48fbf88541b21";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Moose-Autobox-0.15.tar.gz;
+      sha256 = "0xcayrfm08dqas1mq8lnf8nxkvzdgcmv6xs5lqah17bxqxgznrl9";
     };
     buildInputs = [ TestException ];
     propagatedBuildInputs = [ Moose SyntaxKeywordJunction autobox ];
-- 
GitLab


From f7a2bc48dd8a45c7b6454962478ad42200b2b02b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:54:50 +0200
Subject: [PATCH 3146/3789] perlPackages.MooseXAliases: update from 0.10 to
 0.11

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7db52a1f4cb..84a44a9b9f3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5509,10 +5509,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MooseXAliases = buildPerlPackage rec {
-    name = "MooseX-Aliases-0.10";
+    name = "MooseX-Aliases-0.11";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz";
-      sha256 = "1n3z06x6d7sl2can7gn1q4qpclg6sjl6i8fd9y3yipmaxbk97clz";
+      url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz";
+      sha256 = "0j07zqczjfmng3md6nkha7560i786d0cp3gdmrx49hr64jbhz1f4";
     };
     buildInputs = [ TestFatal TestRequires ];
     propagatedBuildInputs = [ Moose ];
-- 
GitLab


From 82457b53b4b331421a6a555a8049b6987966174e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:54:53 +0200
Subject: [PATCH 3147/3789] perlPackages.MooseXConfigFromFile: update from 0.11
 to 0.13

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 84a44a9b9f3..d4c8e04691e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5574,10 +5574,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MooseXConfigFromFile = buildPerlPackage {
-    name = "MooseX-ConfigFromFile-0.11";
+    name = "MooseX-ConfigFromFile-0.13";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-ConfigFromFile-0.11.tar.gz;
-      sha256 = "963e7dbb2bc7ca18995db903c64b0841c4e8d3877009bff5475125673c3b02b4";
+      url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-ConfigFromFile-0.13.tar.gz;
+      sha256 = "0pf5f05hs2i765cnw9sw1hdxf7vz480iyyngjawr4yqjkv4r5nz7";
     };
     buildInputs = [ Moose TestCheckDeps TestDeep TestFatal TestNoWarnings TestRequires TestWithoutModule ];
     propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathTiny TryTiny namespaceautoclean ];
-- 
GitLab


From 6678e8e1a360b6bf828378d551c6a28ddf47340e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:54:56 +0200
Subject: [PATCH 3148/3789] perlPackages.MooseXNonMoose: update from 0.22 to
 0.26

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d4c8e04691e..5810caf226d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5710,10 +5710,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MooseXNonMoose = buildPerlPackage {
-    name = "MooseX-NonMoose-0.22";
+    name = "MooseX-NonMoose-0.26";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DO/DOY/MooseX-NonMoose-0.22.tar.gz;
-      sha256 = "0mhyabg5f6kngkm1w7hfglkdzjdn5pbgm7vgia0aqy9mwwclbpdp";
+      url = mirror://cpan/authors/id/D/DO/DOY/MooseX-NonMoose-0.26.tar.gz;
+      sha256 = "0zdaiphc45s5xj0ax5mkijf5d8v6w6yccb3zplgj6f30y7n55gnb";
     };
     buildInputs = [ TestFatal ];
     propagatedBuildInputs = [ ListMoreUtils Moose ];
-- 
GitLab


From 6bfd49596c220b835de9af4dc78889fea733a426 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:55:00 +0200
Subject: [PATCH 3149/3789] perlPackages.MooseXOneArgNew: update from 0.003 to
 0.004

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5810caf226d..cc1970911ad 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5724,10 +5724,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MooseXOneArgNew = buildPerlPackage {
-    name = "MooseX-OneArgNew-0.003";
+    name = "MooseX-OneArgNew-0.004";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.003.tar.gz;
-      sha256 = "bd1879192f542dbc0741dbd1ba71f29bd22a0fce372d7a6ae04dbded51d71123";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.004.tar.gz;
+      sha256 = "1frfrqaj283z1x95cqbbj3cvmb6rj50ngs47jq8myz6d1bg4zwff";
     };
     buildInputs = [ Moose ];
     propagatedBuildInputs = [ Moose MooseXRoleParameterized namespaceautoclean ];
-- 
GitLab


From 48cf24ace04fa77bc5fccda16a74d6f8f930ad13 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:55:04 +0200
Subject: [PATCH 3150/3789] perlPackages.MooseXRoleParameterized: update from
 1.00 to 1.02

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cc1970911ad..d456d22fc7b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5763,10 +5763,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MooseXRoleParameterized = buildPerlPackage {
-    name = "MooseX-Role-Parameterized-1.00";
+    name = "MooseX-Role-Parameterized-1.02";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SA/SARTAK/MooseX-Role-Parameterized-1.00.tar.gz;
-      sha256 = "0642h71j90i0jrqxz1snizkw9pch8v1s1w0zndrcl5bb85lx3z7y";
+      url = mirror://cpan/authors/id/S/SA/SARTAK/MooseX-Role-Parameterized-1.02.tar.gz;
+      sha256 = "089czh2pipvdajjy4rxlix0y20ilp3ldbzi0vs68b7k6k9q3mqdk";
     };
     buildInputs = [ TestFatal TestMoose ];
     propagatedBuildInputs = [ Moose ];
-- 
GitLab


From 49df464bf4083b3612786a559fe9ca8afb9c2ca2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:55:07 +0200
Subject: [PATCH 3151/3789] perlPackages.MooseXTraitsPluggable: update from
 0.10 to 0.12

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d456d22fc7b..58176c630a3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5863,10 +5863,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MooseXTraitsPluggable = buildPerlPackage rec {
-    name = "MooseX-Traits-Pluggable-0.10";
+    name = "MooseX-Traits-Pluggable-0.12";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz";
-      sha256 = "0gv79bsnacrzwpac3dll64zj40qcsbp4kdk8yr9z5bwim7nkvnv3";
+      url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz";
+      sha256 = "1jjqmcidy4kdgp5yffqqwxrsab62mbhbpvnzdy1rpwnb1savg5mb";
     };
     buildInputs =[ TestException ];
     propagatedBuildInputs =
-- 
GitLab


From cd94d0198f7ced4be95d7134fe19bf33546c05b6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:55:11 +0200
Subject: [PATCH 3152/3789] perlPackages.MooseXTypesPerl: update from 0.101341
 to 0.101343

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 58176c630a3..b7b0b34c0c8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5973,10 +5973,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MooseXTypesPerl = buildPerlPackage {
-    name = "MooseX-Types-Perl-0.101341";
+    name = "MooseX-Types-Perl-0.101343";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Types-Perl-0.101341.tar.gz;
-      sha256 = "d1081a734d62121f3262b18170022de2f51ebcc0a8b8afe1b1273d7cb3e58c97";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Types-Perl-0.101343.tar.gz;
+      sha256 = "0nijy676q27bvjb8swxrb1j4lq2xq8jbqkaxs1l9q81k7jpvx17h";
     };
     propagatedBuildInputs = [ MooseXTypes ParamsUtil ];
     meta = {
-- 
GitLab


From 153809475688a97ba41d7fb725c3c9f5ca21752c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:55:16 +0200
Subject: [PATCH 3153/3789] perlPackages.MooseXTypesStringlike: update from
 0.001 to 0.002

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b7b0b34c0c8..070c309a015 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5986,10 +5986,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MooseXTypesStringlike = buildPerlPackage {
-    name = "MooseX-Types-Stringlike-0.001";
+    name = "MooseX-Types-Stringlike-0.002";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/MooseX-Types-Stringlike-0.001.tar.gz;
-      sha256 = "2ba71fff105d851ea6aee85bef5d6629726138a2b005b77a163a8bfb403cea03";
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/MooseX-Types-Stringlike-0.002.tar.gz;
+      sha256 = "18g07bvhcrhirb1yhcz55y7nsvkw1wq285d1hyb0jxrzgr0ga94k";
     };
     buildInputs = [ Moose ];
     propagatedBuildInputs = [ MooseXTypes ];
-- 
GitLab


From e6b6a0d4fce11d5856faa19d8ff3faf94a2b3802 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:55:19 +0200
Subject: [PATCH 3154/3789] perlPackages.MooseXTypesStructured: update from
 0.28 to 0.30

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 070c309a015..8aec006b600 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6003,10 +6003,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MooseXTypesStructured = buildPerlPackage {
-    name = "MooseX-Types-Structured-0.28";
+    name = "MooseX-Types-Structured-0.30";
     src = fetchurl {
-      url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/MooseX-Types-Structured-0.28.tar.gz;
-      sha256 = "12snpf65bh3jyx9w1h1sark83l0w51s3jdcr4ygw57cxvq39yl43";
+      url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Structured-0.30.tar.gz;
+      sha256 = "0svfgbyzwdipywh7bfp954hncm8ihfr8xpppcyy59wr1inx2f55c";
     };
     buildInputs = [ DateTime MooseXTypesDateTime TestFatal ];
     propagatedBuildInputs = [ DevelPartialDump Moose MooseXTypes SubExporter ];
-- 
GitLab


From f4b043b8e09ecaf4a1042dbec681eb38b2505daa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:55:24 +0200
Subject: [PATCH 3155/3789] perlPackages.MooseXTypesURI: update from 0.03 to
 0.05

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8aec006b600..466648fe34c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6020,10 +6020,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MooseXTypesURI = buildPerlPackage {
-    name = "MooseX-Types-URI-0.03";
+    name = "MooseX-Types-URI-0.05";
     src = fetchurl {
-      url = mirror://cpan/authors/id/F/FL/FLORA/MooseX-Types-URI-0.03.tar.gz;
-      sha256 = "056v08kzcd93h8l69iqdxbr05h85bgz6jvp6iwc0vv68dacr299s";
+      url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-URI-0.05.tar.gz;
+      sha256 = "08acqm23ff22hicb3l4wc7szvdhlxpan7qmpgl15ilawrmz60p82";
     };
     propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathClass namespaceclean Testuseok URI URIFromHash ];
     meta = {
-- 
GitLab


From 11979f6cfad73868d3b9674bd344bb63826c93cb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:55:29 +0200
Subject: [PATCH 3156/3789] perlPackages.NetAddrIP: update from 4.071 to 4.072

---
 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 466648fe34c..3ee05df6877 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6120,10 +6120,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   NetAddrIP = buildPerlPackage rec {
-    name = "NetAddr-IP-4.071";
+    name = "NetAddr-IP-4.072";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MI/MIKER/${name}.tar.gz";
-      sha256 = "0m8d8ccygpjhbsv00vjfz8cvkjcn8dws0k4x58vbvnbjdv3yhxb3";
+      sha256 = "17gwhhbz25021w5k4ggp8j3plix5yixgb2vr1mj39fa0p3gafm09";
     };
   };
 
-- 
GitLab


From 470adc4acfa83d2f8ae7d5d61db8764ba4021aad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:55:33 +0200
Subject: [PATCH 3157/3789] perlPackages.NetAmazonS3Policy: update from 0.1.2
 to 0.1.6

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3ee05df6877..22ab24a5e4a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6193,10 +6193,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   NetAmazonS3Policy = buildPerlPackage {
-    name = "Net-Amazon-S3-Policy-0.1.2";
+    name = "Net-Amazon-S3-Policy-0.1.6";
     src = fetchurl {
-      url = mirror://cpan/authors/id/P/PO/POLETTIX/Net-Amazon-S3-Policy-0.1.2.tar.gz;
-      sha256 = "1kkzimvxwxx0mypf75dalksxmvwsb8b575yx2nzmvjkvjg3j9na0";
+      url = mirror://cpan/authors/id/P/PO/POLETTIX/Net-Amazon-S3-Policy-0.1.6.tar.gz;
+      sha256 = "056rhq6vsdpwi2grbmxj8341qjrz0258civpnhs78j37129nxcfj";
     };
     propagatedBuildInputs = [ JSON ];
     meta = {
-- 
GitLab


From 8da8abba86c0e74b2e7e9ae4ccdf9b817b71cca9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:55:37 +0200
Subject: [PATCH 3158/3789] perlPackages.NetDNS: update from 0.63 to 0.74

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 22ab24a5e4a..2a18f79d210 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6257,10 +6257,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   NetDNS = buildPerlPackage {
-    name = "Net-DNS-0.63";
+    name = "Net-DNS-0.74";
     src = fetchurl {
-      url = mirror://cpan/authors/id/O/OL/OLAF/Net-DNS-0.63.tar.gz;
-      sha256 = "1pswrwhkav051xahm3k4cbyhi8kqpfmaz85lw44kwi2wc7mz4prk";
+      url = mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-0.74.tar.gz;
+      sha256 = "0clwl4nqzg23d6l9d9gc8ijl1lbghhfrbavjlvhd1wll5r8ayr7g";
     };
     propagatedBuildInputs = [NetIP DigestHMAC];
     doCheck = false;
-- 
GitLab


From c168ae1bbfad8c23dc28dcc7a6f5767f834f54aa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:55:41 +0200
Subject: [PATCH 3159/3789] perlPackages.NetHTTP: update from 6.05 to 6.06

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2a18f79d210..cb24b5801f6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6267,10 +6267,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   NetHTTP = buildPerlPackage {
-    name = "Net-HTTP-6.05";
+    name = "Net-HTTP-6.06";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/Net-HTTP-6.05.tar.gz;
-      sha256 = "1r2bv3cw4m054qfsm6i7rpvhrql1d78izpc36prv3xvahfsqxawc";
+      url = mirror://cpan/authors/id/G/GA/GAAS/Net-HTTP-6.06.tar.gz;
+      sha256 = "1m1rvniffadq99gsy25298ia3lixwymr6kan64jd3ylyi7nkqkhx";
     };
     meta = {
       description = "Low-level HTTP connection (client)";
-- 
GitLab


From acf86052dd046a318f25b82e9493449a4191e77d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:55:44 +0200
Subject: [PATCH 3160/3789] perlPackages.NetLDAP: update from 0.43 to 0.4001

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cb24b5801f6..49ebe062303 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6290,11 +6290,11 @@ let self = _self // overrides; _self = with self; {
   };
 
   NetLDAP = buildPerlPackage {
-    name = "Net-LDAP-0.43";
+    name = "Net-LDAP-0.4001";
     propagatedBuildInputs = [ ConvertASN1 ];
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GB/GBARR/perl-ldap-0.43.tar.gz;
-      sha256 = "0ak7393zs8ps6r6in5ilr9l1mzxxh529jr768sjzx4273p7li3m0";
+      url = mirror://cpan/authors/id/G/GB/GBARR/perl-ldap-0.4001.tar.gz;
+      sha256 = "0spwid70yxkh5zbad3ldw8yb2m5shkm59a7f0kllw8bb7ccczqps";
     };
   };
 
-- 
GitLab


From d94a1ee167cede96ab1aa8dfa3459c7820316da1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:55:50 +0200
Subject: [PATCH 3161/3789] perlPackages.NetOpenIDCommon: update from 1.14 to
 1.18

---
 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 49ebe062303..13ada85e019 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6455,10 +6455,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   NetOpenIDCommon = buildPerlPackage rec {
-    name = "Net-OpenID-Common-1.14";
+    name = "Net-OpenID-Common-1.18";
     src = fetchurl {
       url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz";
-      sha256 = "24ac83539b188d85bd2c7bd67e355aab0ede3f98170b23cb50bd30b11b4387ff";
+      sha256 = "13hy5j6hcggb4l2r4pnwdh30p20wwja0chpmqm8y6wnnsp1km07f";
     };
     propagatedBuildInputs = [ CryptDHGMP URI HTMLParser HTTPMessage XMLSimple ];
   };
-- 
GitLab


From 2a1b8bc26a3c3ecab22edcdab0e17233397d1f7c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:55:55 +0200
Subject: [PATCH 3162/3789] perlPackages.NetOpenIDConsumer: update from 1.13 to
 1.15

---
 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 13ada85e019..c64c6167037 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6464,10 +6464,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   NetOpenIDConsumer = buildPerlPackage rec {
-    name = "Net-OpenID-Consumer-1.13";
+    name = "Net-OpenID-Consumer-1.15";
     src = fetchurl {
       url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz";
-      sha256 = "4ab927b6756366fa4cef2b54088645849f32fc7e0cd8de0a50001bbf62946fd8";
+      sha256 = "1nh9988436rmmmd6x2zz1fyrqy2005a1gvqzgvnc1pg2ylg61fqf";
     };
     propagatedBuildInputs = [ NetOpenIDCommon JSON LWP ];
   };
-- 
GitLab


From 97e5d3c0d0dfc2696445f4121e3ad9f8ab1d680b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:55:59 +0200
Subject: [PATCH 3163/3789] perlPackages.NetSMTP: update from 1.22 to 1.25

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c64c6167037..f555f676ba7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6341,10 +6341,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   NetSMTP = buildPerlPackage {
-    name = "Net-SMTP-1.22";
+    name = "Net-SMTP-1.25";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GB/GBARR/libnet-1.22.tar.gz;
-      sha256 = "113c36qilbvd69yhkm2i2ba20ajff7cdpgvlqx96j9bb1hfmhb1p";
+      url = mirror://cpan/authors/id/S/SH/SHAY/libnet-1.25.tar.gz;
+      sha256 = "01f3l4aj3ynl8syyrl122k4bmfds77yw5q36aafrgaq22fnb3b2a";
     };
     patchPhase = "chmod a-x Configure";
     doCheck = false; # The test suite fails, because it requires network access.
-- 
GitLab


From 0c5d9983bf0e9943f7c3677336c43ca7937ab3cf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:56:02 +0200
Subject: [PATCH 3164/3789] perlPackages.NetSSLeay: update from 1.52 to 1.58

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f555f676ba7..d19aaf2d5ac 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6378,10 +6378,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   NetSSLeay = buildPerlPackage rec {
-    name = "Net-SSLeay-1.52";
+    name = "Net-SSLeay-1.58";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Net/${name}.tar.gz";
-      sha256 = "1fkpdlpg99rdq2vlm6bgmqc8iazhcrfzvbpwxnn20k0viwpy7v28";
+      url = "mirror://cpan/authors/id/M/MI/MIKEM/${name}.tar.gz";
+      sha256 = "0mizg2g07fa4c13zpnhmjc87psal5gp5hi23kqpynigmkp0m1p0b";
     };
     buildInputs = [ pkgs.openssl ];
     OPENSSL_PREFIX = pkgs.openssl;
-- 
GitLab


From 630586c6059af3acb68f8c40037c7e098cdd43e6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:56:07 +0200
Subject: [PATCH 3165/3789] perlPackages.NumberCompare: update from 0.01 to
 0.03

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d19aaf2d5ac..fea135fa888 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6408,10 +6408,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   NumberCompare = buildPerlPackage rec {
-    name = "Number-Compare-0.01";
+    name = "Number-Compare-0.03";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Number/${name}.tar.gz";
-      sha256 = "1vs95lbax3f63jg98jwkiahlvg1jhmd0xyyzmbxxifsl7fkv1d9j";
+      url = "mirror://cpan/authors/id/R/RC/RCLAMP/${name}.tar.gz";
+      sha256 = "09q8i0mxvr7q9vajwlgawsi0hlpc119gnhq4hc933d03x0vkfac3";
     };
   };
 
-- 
GitLab


From 68dd97208cb5c4b285d886b258737b46f6d156dd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:56:11 +0200
Subject: [PATCH 3166/3789] perlPackages.ObjectInsideOut: update from 3.97 to
 3.98

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index fea135fa888..8279bce760c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6424,10 +6424,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ObjectInsideOut = buildPerlPackage {
-    name = "Object-InsideOut-3.97";
+    name = "Object-InsideOut-3.98";
     src = fetchurl {
-      url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Object-InsideOut-3.97.tar.gz;
-      sha256 = "19yr15w361lxxx2djy0ciwjpyd5bcs0skm3yw97w3xidw6r0wf0v";
+      url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Object-InsideOut-3.98.tar.gz;
+      sha256 = "1zxfm2797p8b9dsvnbgd6aa4mgpxqxjqzbpfbla1g7f9alxm9f1z";
     };
     propagatedBuildInputs = [ ExceptionClass ];
     meta = {
-- 
GitLab


From ab6accf891b28372eb7fb3cab8b0d310b9568f7c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:56:43 +0200
Subject: [PATCH 3167/3789] perlPackages.ObjectSignature: update from 1.05 to
 1.07

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8279bce760c..6c38c8f6c2a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6439,10 +6439,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ObjectSignature = buildPerlPackage {
-    name = "Object-Signature-1.05";
+    name = "Object-Signature-1.07";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AD/ADAMK/Object-Signature-1.05.tar.gz;
-      sha256 = "10k9j18jpb16brv0hs7592r7hx877290pafb8gnk6ydy7hcq9r2j";
+      url = mirror://cpan/authors/id/A/AD/ADAMK/Object-Signature-1.07.tar.gz;
+      sha256 = "0c8l7195bjvx0v6zmkgdnxvwg7yj2zq8hi7xd25a3iikd12dc4f6";
     };
   };
 
-- 
GitLab


From c07679d2efbc8568a637736a6d33359c1e3133c3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:56:47 +0200
Subject: [PATCH 3168/3789] perlPackages.PPIxRegexp: update from 0.034 to 0.036

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6c38c8f6c2a..de57c1c5b70 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6788,10 +6788,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PPIxRegexp = buildPerlPackage {
-    name = "PPIx-Regexp-0.034";
+    name = "PPIx-Regexp-0.036";
     src = fetchurl {
-      url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.034.tar.gz;
-      sha256 = "512a358f4bd6196df0601ff36f7831e0ba142fb8ef2bc3995e19bceabd0b5ae7";
+      url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.036.tar.gz;
+      sha256 = "1nnaxf1dmywacdgh8f1s2ki8jkrf2vi6bfhk70p1r9k1001idlfk";
     };
     propagatedBuildInputs = [ ListMoreUtils PPI TaskWeaken ];
     meta = {
-- 
GitLab


From fcec9de869b4833318b2eb2094469d35275078c6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:56:51 +0200
Subject: [PATCH 3169/3789] perlPackages.PSGI: update from 1.03 to 1.102

---
 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 de57c1c5b70..84b41d8b716 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6824,10 +6824,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PSGI = buildPerlPackage rec {
-    name = "PSGI-1.03";
+    name = "PSGI-1.102";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
-      sha256 = "0b1k7smg50xfdhrjifa2gkkm52vna41alvbw8vb2pk99jmgnngh6";
+      sha256 = "0iqzxs8fv63510knm3zr3jr3ky4x7diwd7y24mlshzci81kl8v55";
     };
   };
 
-- 
GitLab


From 5adbf4d447a4dd1229eaeb0627834e5e444d7083 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:56:55 +0200
Subject: [PATCH 3170/3789] perlPackages.PackageStash: update from 0.34 to 0.36

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 84b41d8b716..2e9339042ff 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6488,10 +6488,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PackageStash = buildPerlPackage {
-    name = "Package-Stash-0.34";
+    name = "Package-Stash-0.36";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.34.tar.gz;
-      sha256 = "1674zs96ndq3czs6v8xkdqqz4fnka0i2835nnns9zbw2q01yirj6";
+      url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.36.tar.gz;
+      sha256 = "1wbkdkm5gp5cpp84kr9cbbsrg0v908kxrcg4k86mx8ypgj6g8750";
     };
     buildInputs = [ DistCheckConflicts TestFatal TestRequires ];
     propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation PackageDeprecationManager ];
-- 
GitLab


From 3aed6ef4e900a0921e04a25c67cd212f2f950ae4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:56:59 +0200
Subject: [PATCH 3171/3789] perlPackages.PackageStashXS: update from 0.26 to
 0.28

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2e9339042ff..ef5e8d28e5a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6503,10 +6503,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PackageStashXS = buildPerlPackage {
-    name = "Package-Stash-XS-0.26";
+    name = "Package-Stash-XS-0.28";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-XS-0.26.tar.gz;
-      sha256 = "1pfdpb3x40f5ldp5kp0d9xvrz4wk2fc3ww53wrq4dp326s08h7r9";
+      url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-XS-0.28.tar.gz;
+      sha256 = "11nl69n8i56p91pd0ia44ip0vpv2cxwpbfakrv01vvv8az1cbn13";
     };
     buildInputs = [ TestRequires TestFatal ];
     meta = {
-- 
GitLab


From 5a410b1a9d46f164ce3c5e8a73d8e1dba7e075ec Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:57:03 +0200
Subject: [PATCH 3172/3789] perlPackages.PadWalker: update from 1.96 to 1.98

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ef5e8d28e5a..49748367f66 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6832,10 +6832,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PadWalker = buildPerlPackage {
-    name = "PadWalker-1.96";
+    name = "PadWalker-1.98";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-1.96.tar.gz;
-      sha256 = "180c72l3ssnsdbyifl9lzdz83x4zidf3nfgyx6l0j41a5wj0w9fz";
+      url = mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-1.98.tar.gz;
+      sha256 = "0v2pldb5awflf10w1p9pwn8w37lkpfc2h459gd9zz6p57883ibw0";
     };
     meta = {
     };
-- 
GitLab


From 2c967e872eadf17f132bdcf639d39a60f547dc27 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:57:06 +0200
Subject: [PATCH 3173/3789] perlPackages.ParamsValidate: update from 1.07 to
 1.08

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 49748367f66..bc6fca2944f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6539,10 +6539,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ParamsValidate = buildPerlModule {
-    name = "Params-Validate-1.07";
+    name = "Params-Validate-1.08";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.07.tar.gz;
-      sha256 = "15mz2wxarxjlr3365m1hhcnfs6d2mw3m0yimnlv06j13cxs39py1";
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.08.tar.gz;
+      sha256 = "0641hbz5bx6jnk8dx2djnkd67fh7h1zx6x1bgmivkrh2yky9ch6h";
     };
     buildInputs = [ TestFatal ];
     propagatedBuildInputs = [ ModuleImplementation ];
-- 
GitLab


From 0f845d8e8b16807653c5608359a2a77d8bae52a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:57:10 +0200
Subject: [PATCH 3174/3789] perlPackages.ParseRecDescent: update from 1.965001
 to 1.967009

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index bc6fca2944f..03afc7288df 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6582,10 +6582,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ParseRecDescent = buildPerlPackage rec {
-    name = "Parse-RecDescent-1.965001";
+    name = "Parse-RecDescent-1.967009";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DC/DCONWAY/${name}.tar.gz";
-      sha256 = "0r4dnrjgxv5irkyx1kgkg8vj6wqx67q5hbkifpb54906kc1n7yh0";
+      url = "mirror://cpan/authors/id/J/JT/JTBRAUN/${name}.tar.gz";
+      sha256 = "11y6fpz4j6kdimyaz2a6ig0jz0x7csqslhxaipxnjqi5h85hy071";
     };
   };
 
-- 
GitLab


From 745dd43b0513b359b86f1d0c30e4ec515c43cc17 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:57:13 +0200
Subject: [PATCH 3175/3789] perlPackages.PathClass: update from 0.29 to 0.33

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 03afc7288df..f825775ba54 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6590,10 +6590,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PathClass = buildPerlPackage {
-    name = "Path-Class-0.29";
+    name = "Path-Class-0.33";
     src = fetchurl {
-      url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.29.tar.gz;
-      sha256 = "1z3wvci2qcb1m9qrkxphbnfnr4jqgxbxnxrmdb25ks8gap98hk4z";
+      url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.33.tar.gz;
+      sha256 = "0xy6s04xpslpzbb90x67yvfv0pjqnj1szxlx16vfx690iskcd36d";
     };
     meta = {
       description = "Cross-platform path specification manipulation";
-- 
GitLab


From 09c37dbe2e2e293ddd0329789915d5326e9bac38 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:57:17 +0200
Subject: [PATCH 3176/3789] perlPackages.PathTiny: update from 0.026 to 0.052

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f825775ba54..b850d6f8514 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6602,10 +6602,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PathTiny = buildPerlPackage {
-    name = "Path-Tiny-0.026";
+    name = "Path-Tiny-0.052";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.026.tar.gz;
-      sha256 = "e79ee187bbf7fdef387886a8c929bd0a1171fb54db1984d79f4e04d90f733cc6";
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.052.tar.gz;
+      sha256 = "1b70yhbdww9k5m4a4lhdd71jrxdxhi10533slmxynxa04nyn2f0a";
     };
     buildInputs = [ DevelHide Filepushd TestDeep TestFailWarnings TestFatal perl ];
     propagatedBuildInputs = [ autodie ];
-- 
GitLab


From ef5891c1fbb7ada5a39997defe000563882e8708 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:57:20 +0200
Subject: [PATCH 3177/3789] perlPackages.PerlCritic: update from 1.118 to 1.121

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b850d6f8514..74a2f40df1f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6635,10 +6635,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PerlCritic = buildPerlPackage {
-    name = "Perl-Critic-1.118";
+    name = "Perl-Critic-1.121";
     src = fetchurl {
-      url = mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-1.118.tar.gz;
-      sha256 = "666d2bef3ac924598c06a05277680da5910e10d94c5ec161336f6509c11155e8";
+      url = mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-1.121.tar.gz;
+      sha256 = "1y2bxjwzlp6ix51h36a5g3dqpaviaajij1rn22hpvcqxh4hh6car";
     };
     buildInputs = [ TestDeep ];
     propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress ExceptionClass IOString ListMoreUtils PPI PPIxRegexp PPIxUtilities PerlTidy PodSpell Readonly StringFormat TaskWeaken ];
-- 
GitLab


From 3594bdb5086e9f0ed3116f53212ea154fb6d44ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:57:24 +0200
Subject: [PATCH 3178/3789] perlPackages.PerlIOviadynamic: update from 0.12 to
 0.14

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 74a2f40df1f..2e69e8f009d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6658,10 +6658,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PerlIOviadynamic = buildPerlPackage {
-    name = "PerlIO-via-dynamic-0.12";
+    name = "PerlIO-via-dynamic-0.14";
     src = fetchurl {
-      url = mirror://cpan/authors/id/C/CL/CLKAO/PerlIO-via-dynamic-0.12.tar.gz;
-      sha256 = "140hay9q8q9sz1fa2s57ijp5l2448fkcg7indgn6k4vc7yshmqz2";
+      url = mirror://cpan/authors/id/A/AL/ALEXMV/PerlIO-via-dynamic-0.14.tar.gz;
+      sha256 = "0jbb3xpbqzmr625blvnjszd69l3cwxzi7bhmkj5x48dgv3s7mkca";
     };
   };
 
-- 
GitLab


From f85e0bf18d91bb91b1dc406d53890e13de97f711 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:57:29 +0200
Subject: [PATCH 3179/3789] perlPackages.PerlMagick: update from 6.86 to 6.87

---
 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 2e69e8f009d..c883549dbd0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6674,10 +6674,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PerlMagick = buildPerlPackage rec {
-    name = "PerlMagick-6.86";
+    name = "PerlMagick-6.87";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JC/JCRISTY/${name}.tar.gz";
-      sha256 = "18xgh8r9pjxg9yi119gnsln1r4p4sk1r8bxd3iy0qj77frmksisi";
+      sha256 = "1bf2g80wdny2dfrrmfgk7cqrxzflx3qp1dnd3919grvrqdviyh16";
     };
     buildInputs = [pkgs.imagemagick];
     preConfigure =
-- 
GitLab


From 16baef6c4f6aaee80100282e9558792446a3f6df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:57:34 +0200
Subject: [PATCH 3180/3789] perlPackages.PerlOSType: update from 1.002 to 1.007

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c883549dbd0..b65a59a48ad 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6688,10 +6688,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PerlOSType = buildPerlPackage rec {
-    name = "Perl-OSType-1.002";
+    name = "Perl-OSType-1.007";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Perl/${name}.tar.gz";
-      sha256 = "0clbfgq0800dip3821ibh29vrwcc159qnakidbiqrmhcisd95xbs";
+      url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
+      sha256 = "0aryn8dracfjfnks07b5rvsza4csinlsj6cn92jv3sv8sg3rmdxk";
     };
   };
 
-- 
GitLab


From 5ba155ff1c53ca3862d69b06925da1403a903615 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:57:37 +0200
Subject: [PATCH 3181/3789] perlPackages.PerlPrereqScanner: update from 1.018
 to 1.019

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b65a59a48ad..cfb70353672 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6864,10 +6864,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PerlPrereqScanner = buildPerlPackage {
-    name = "Perl-PrereqScanner-1.018";
+    name = "Perl-PrereqScanner-1.019";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.018.tar.gz;
-      sha256 = "11zkam8svpgcjhjda0ap3afd797a69ndcc64fy3xw0j8v8kxa6hc";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.019.tar.gz;
+      sha256 = "1ndgq2c7s1042c3zxjsmjfpf4lnwfg6w36hmvhh3yk9qihcprbgj";
     };
     buildInputs = [ PPI TryTiny ];
     propagatedBuildInputs = [ GetoptLongDescriptive ListMoreUtils ModulePath Moose PPI ParamsUtil StringRewritePrefix namespaceautoclean ];
-- 
GitLab


From 0dc0068ac9ee720860e95e029f8e470bb16ea7ad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:57:40 +0200
Subject: [PATCH 3182/3789] perlPackages.Plack: update from 1.0024 to 1.0030

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cfb70353672..b89597188e9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6716,10 +6716,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Plack = buildPerlPackage {
-    name = "Plack-1.0024";
+    name = "Plack-1.0030";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0024.tar.gz;
-      sha256 = "485f69275d73401739a829cfee3bbc9bfa20a0843470791066365ac07fac04a1";
+      url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0030.tar.gz;
+      sha256 = "0bb9aqb0h9q4qjgkw756gf695h4qg6vim54s6f2icgsazdi63zq7";
     };
     buildInputs = [ FileShareDirInstall TestRequires ];
     propagatedBuildInputs = [ ApacheLogFormatCompiler DevelStackTrace DevelStackTraceAsHTML FileShareDir FilesysNotifySimple HTTPBody HTTPMessage HashMultiValue LWP StreamBuffered TestTCP TryTiny URI ];
-- 
GitLab


From c7298cceb513a779bac9b708397d02cf38ed6614 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:57:44 +0200
Subject: [PATCH 3183/3789] perlPackages.PodCoverage: update from 0.19 to 0.23

---
 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 b89597188e9..e48fbd255e8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6892,10 +6892,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PodCoverage = buildPerlPackage rec {
-    name = "Pod-Coverage-0.19";
+    name = "Pod-Coverage-0.23";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RC/RCLAMP/${name}.tar.gz";
-      sha256 = "1krsz4zwmnmq3z29p5vmyr5fdzrn8v0sg6rf3qxk7xpxw4z5np84";
+      sha256 = "01xifj83dv492lxixijmg6va02rf3ydlxly0a9slmx22r6qa1drh";
     };
     propagatedBuildInputs = [DevelSymdump];
   };
-- 
GitLab


From de844a8a78d0df67db34ed116ac922f58bb6db07 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:57:47 +0200
Subject: [PATCH 3184/3789] perlPackages.PodElemental: update from 0.102362 to
 0.103000

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e48fbd255e8..aebf06dc445 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6915,10 +6915,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PodElemental = buildPerlPackage {
-    name = "Pod-Elemental-0.102362";
+    name = "Pod-Elemental-0.103000";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.102362.tar.gz;
-      sha256 = "2b56a2783650f170bc7131bb36de65e4e3372a54bab596a798debebbf2af8732";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.103000.tar.gz;
+      sha256 = "0ykf49n6ysm7ab5zwm8a009zzrzsnhxw94a9jvbq80yywzhnm847";
     };
     buildInputs = [ TestDeep TestDifferences ];
     propagatedBuildInputs = [ MixinLinewise Moose MooseAutobox MooseXTypes PodEventual StringRewritePrefix StringTruncate SubExporter SubExporterForMethods TestDeep TestDifferences namespaceautoclean ];
-- 
GitLab


From 61db692996eb72e71af38896dc90b8ac740a541d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:57:50 +0200
Subject: [PATCH 3185/3789] perlPackages.PodEscapes: update from 1.04 to 1.06

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index aebf06dc445..b89484f2ba2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6945,10 +6945,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PodEscapes = buildPerlPackage {
-    name = "Pod-Escapes-1.04";
+    name = "Pod-Escapes-1.06";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SB/SBURKE/Pod-Escapes-1.04.tar.gz;
-      sha256 = "1wrg5dnsl785ygga7bp6qmakhjgh9n4g3jp2l85ab02r502cagig";
+      url = mirror://cpan/authors/id/N/NE/NEILB/Pod-Escapes-1.06.tar.gz;
+      sha256 = "15dpzlgc2ywyxk2svc810nmyx6pm1nj8cji7a0rqr9x6m0v11xdm";
     };
   };
 
-- 
GitLab


From 4ee3b69644f3cae7b5b8b3dae23344e8c3a6b1bf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:57:54 +0200
Subject: [PATCH 3186/3789] perlPackages.PodMarkdown: update from 1.322 to
 2.000

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b89484f2ba2..0a142380126 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6980,10 +6980,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PodMarkdown = buildPerlPackage {
-    name = "Pod-Markdown-1.322";
+    name = "Pod-Markdown-2.000";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-1.322.tar.gz;
-      sha256 = "375091d89d9662b0c41bedad391927d6904d05f740e1bb689b494b4b35e979f7";
+      url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-2.000.tar.gz;
+      sha256 = "0qix7gmrc2ypm5dl1w5ajnjy32xlmy73wb3zycc1pxl5lipigsx8";
     };
     buildInputs = [ TestDifferences ];
     meta = {
-- 
GitLab


From b587ad6d82b04b5dd9a66afddf4ba98d6739f1e7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:57:58 +0200
Subject: [PATCH 3187/3789] perlPackages.ProbePerl: update from 0.01 to 0.03

---
 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 0a142380126..0a836ea53d1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7026,10 +7026,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ProbePerl = buildPerlPackage rec {
-    name = "Probe-Perl-0.01";
+    name = "Probe-Perl-0.03";
     src = fetchurl {
       url = "mirror://cpan/authors/id/K/KW/KWILLIAMS/${name}.tar.gz";
-      sha256 = "9b7d211139e42b2a2952c9a4b9f55ac12705e256f4a0acd4ac6ff665aeaddd87";
+      sha256 = "0c9wiaz0mqqknafr4jdr0g2gdzxnn539182z0icqaqvp5qgd5r6r";
     };
   };
 
-- 
GitLab


From 4c6399941c6a8ef338cd5145fdcdff9322f55914 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:01 +0200
Subject: [PATCH 3188/3789] perlPackages.Redis: update from 1.961 to 1.2001

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0a836ea53d1..1e5c5892f36 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7050,10 +7050,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Redis = buildPerlPackage {
-    name = "Redis-1.961";
+    name = "Redis-1.2001";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/ME/MELO/Redis-1.961.tar.gz;
-      sha256 = "029g4s1ima354yv1j26nlq4f0yahkllkibicml6p3mj5gg2ywbbq";
+      url = mirror://cpan/authors/id/D/DP/DPAVLIN/Redis-1.2001.tar.gz;
+      sha256 = "1d16dr2qjmb3vswghrk5ygggcmz2rzw7qnw3g87prwi08z5ryih0";
     };
     buildInputs = [ IOString TestDeep TestFatal ];
     propagatedBuildInputs = [ TryTiny ];
-- 
GitLab


From a051b5a491f5ed082f0de0c22013935855e88bc9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:05 +0200
Subject: [PATCH 3189/3789] perlPackages.ReturnValue: update from 1.302 to
 1.666004

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1e5c5892f36..238fd657ebf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7130,10 +7130,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ReturnValue = buildPerlPackage {
-    name = "Return-Value-1.302";
+    name = "Return-Value-1.666004";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.302.tar.gz;
-      sha256 = "0hf5rmfap49jh8dnggdpvapy5r4awgx5hdc3acc9ff0vfqav8azm";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666004.tar.gz;
+      sha256 = "0xr7ic212p36arzdpph2l2yy1y88c7qaf4nng3gqb29zc9kzy3bc";
     };
   };
 
-- 
GitLab


From 9ca920edd45befcce8ddf98a0065e3aef89261d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:08 +0200
Subject: [PATCH 3190/3789] perlPackages.RoleHasMessage: update from 0.005 to
 0.006

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 238fd657ebf..cdb514c26ab 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7138,10 +7138,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   RoleHasMessage = buildPerlPackage {
-    name = "Role-HasMessage-0.005";
+    name = "Role-HasMessage-0.006";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.005.tar.gz;
-      sha256 = "bc6cecf3022159dc415fb931e38291425d6aa8a9542d980b14ea692141337ca9";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.006.tar.gz;
+      sha256 = "1lylfvarjfy6wy34dfny3032pc6r33mjby5yzzhmxybg8zhdp9pn";
     };
     buildInputs = [ Moose ];
     propagatedBuildInputs = [ Moose MooseXRoleParameterized StringErrf TryTiny namespaceclean ];
-- 
GitLab


From 53a801d5694aaa36d2939d3f6b080e55fa002fa7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:11 +0200
Subject: [PATCH 3191/3789] perlPackages.RoleIdentifiable: update from 0.005 to
 0.007

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cdb514c26ab..6f6d68615e0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7152,10 +7152,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   RoleIdentifiable = buildPerlPackage {
-    name = "Role-Identifiable-0.005";
+    name = "Role-Identifiable-0.007";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.005.tar.gz;
-      sha256 = "86910b6052d50bc64d1613bc1274f2ae17d553bfc3f0247a3fe3f7bb2cdd3aee";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.007.tar.gz;
+      sha256 = "1bbkj2wqpbfdw1cbm99vg9d94rvzba19m18xhnylaym0l78lc4sn";
     };
     buildInputs = [ Moose ];
     propagatedBuildInputs = [ Moose ];
-- 
GitLab


From 36e00c99bc75903509a51ed180c1459473d29b7c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:15 +0200
Subject: [PATCH 3192/3789] perlPackages.RoleTiny: update from 1.002004 to
 1.003003

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6f6d68615e0..ed7a71f0bad 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7166,10 +7166,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   RoleTiny = buildPerlPackage {
-    name = "Role-Tiny-1.002004";
+    name = "Role-Tiny-1.003003";
     src = fetchurl {
-      url = mirror://cpan/authors/id/I/IL/ILMARI/Role-Tiny-1.002004.tar.gz;
-      sha256 = "0n126kazifmx6grdk4rmq226xklfc996cqw4ix26z9jcccl4v756";
+      url = mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-1.003003.tar.gz;
+      sha256 = "1k823g4wnya18yx2v1xrfl73qqavqpzvaydyg1r7gdzcdvdwl4mp";
     };
     buildInputs = [ TestFatal ];
     meta = {
-- 
GitLab


From 290b3b42c86a9d1f8cb55340cb9c887e3bb8b84d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:18 +0200
Subject: [PATCH 3193/3789] perlPackages.RpcXML: update from 0.73 to 0.78

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ed7a71f0bad..31fbf128bc5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7120,10 +7120,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   RpcXML = buildPerlPackage {
-    name = "RPC-XML-0.73";
+    name = "RPC-XML-0.78";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.73.tar.gz;
-      sha256 = "a023649603240e7a19fc52a8316a41c854639c0600058ea4d1e436fe1b1b7734";
+      url = mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.78.tar.gz;
+      sha256 = "0spci3sj2hq9k916sk9k2gchqrbnz9lwmlcnwf1k33wzl8j2gh52";
     };
     propagatedBuildInputs = [LWP XMLLibXML XMLParser];
     doCheck = false;
-- 
GitLab


From 9f4358e8d58c86debb908bee51a1b8b78692947d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:23 +0200
Subject: [PATCH 3194/3789] perlPackages.SOAPLite: update from 0.716 to 1.11

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 31fbf128bc5..074f439415b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7278,10 +7278,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   SOAPLite = buildPerlPackage {
-    name = "SOAP-Lite-0.716";
+    name = "SOAP-Lite-1.11";
     src = fetchurl {
-      url = mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-0.716.tar.gz;
-      sha256 = "0vhnv5bdhy3gzwiaw1ly69r7lxvahz796v210x5nyij7a04ndwbz";
+      url = mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.11.tar.gz;
+      sha256 = "1zhy06v72r95ih3lx5rlx0bvkq214ndmcmn97m5k2rkxxy4ybpp4";
     };
     propagatedBuildInputs = [ ClassInspector HTTPDaemon LWP TaskWeaken URI XMLParser ];
     meta = {
-- 
GitLab


From 4578679a41219bbe29e5cc25b164c083da02d43c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:26 +0200
Subject: [PATCH 3195/3789] perlPackages.SafeIsa: update from 1.000002 to
 1.000004

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 074f439415b..ea06e2c3ed2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7192,10 +7192,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   SafeIsa = buildPerlPackage {
-    name = "Safe-Isa-1.000002";
+    name = "Safe-Isa-1.000004";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MS/MSTROUT/Safe-Isa-1.000002.tar.gz;
-      sha256 = "07jr4fy6zbw9zwpalxzxlkn4nym6fd0304fsrb5ag0v156ygpwvl";
+      url = mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000004.tar.gz;
+      sha256 = "0sqwma0xqxrgnsm0jfy17szq87bskzq67cdh7p934qdifh5nfwn9";
     };
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
-- 
GitLab


From 481cb548162cd7a35fbaa866c307475d49015344 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:29 +0200
Subject: [PATCH 3196/3789] perlPackages.ScopeUpper: update from 0.21 to 0.24

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ea06e2c3ed2..8048c066daf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7225,10 +7225,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ScopeUpper = buildPerlPackage {
-    name = "Scope-Upper-0.21";
+    name = "Scope-Upper-0.24";
     src = fetchurl {
-      url = mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.21.tar.gz;
-      sha256 = "058nfnzp31k7hmdvbsr72nvrw0i23gwjplb6g6pag3s18m7fl1p6";
+      url = mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.24.tar.gz;
+      sha256 = "159jcwliyb7j80858pi052hkmhgy4cdbjha419kmhhqc9s1rhd5g";
     };
     meta = {
       homepage = http://search.cpan.org/dist/Scope-Upper/;
-- 
GitLab


From a0bf9e77f3b073342b5e4dee08bf3023053e24d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:33 +0200
Subject: [PATCH 3197/3789] perlPackages.SetObject: update from 1.26 to 1.34

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8048c066daf..cac5f050deb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7249,10 +7249,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   SetObject = buildPerlPackage {
-    name = "Set-Object-1.26";
+    name = "Set-Object-1.34";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SA/SAMV/Set-Object-1.26.tar.gz;
-      sha256 = "1hx3wrw8xkvaggacc8zyn86hfi3079ahmia1n8vsw7dglp1bbhmj";
+      url = mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.34.tar.gz;
+      sha256 = "1dipd6k572pzqjzbj9vagb2k347qcg29lsxzx9y214bhnw7fgvjp";
     };
   };
 
-- 
GitLab


From e79643d5eab91ab5ae19ab457dcafca8ac29d3e7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:36 +0200
Subject: [PATCH 3198/3789] perlPackages.SetScalar: update from 1.26 to 1.29

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cac5f050deb..a3fa4a3d27f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7257,10 +7257,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   SetScalar = buildPerlPackage {
-    name = "Set-Scalar-1.26";
+    name = "Set-Scalar-1.29";
     src = fetchurl {
-      url = mirror://cpan/authors/id/J/JH/JHI/Set-Scalar-1.26.tar.gz;
-      sha256 = "121r9n8lqk081vjzn9ppm4zklz1l0c0v0ab94c05y5vrsn5l0zl8";
+      url = mirror://cpan/authors/id/D/DA/DAVIDO/Set-Scalar-1.29.tar.gz;
+      sha256 = "07aiqkyi1p22drpcyrrmv7f8qq6fhrxh007achy2vryxyck1bp53";
     };
     meta = {
       license = "perl";
-- 
GitLab


From ffba45324f7d097b8b71b6041a0eedde06fa514a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:40 +0200
Subject: [PATCH 3199/3789] perlPackages.Socket6: update from 0.23 to 0.25

---
 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 a3fa4a3d27f..8b84c885adc 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7293,10 +7293,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Socket6 = buildPerlPackage rec {
-    name = "Socket6-0.23";
+    name = "Socket6-0.25";
     src = fetchurl {
       url = "mirror://cpan/authors/id/U/UM/UMEMOTO/${name}.tar.gz";
-      sha256 = "eda753f0197e8c3c8d4ab20a634561ce84011fa51aa5ff40d4dbcb326ace0833";
+      sha256 = "1ads4k4vvq6pnxkdw0s8gaj03w4h9snxyw7zyikfzd20fy76yx6s";
     };
     buildInputs = [ pkgs.which ];
   };
-- 
GitLab


From 872ff90fd164715e18d132719a402b5caaf6e0db Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:45 +0200
Subject: [PATCH 3200/3789] perlPackages.SpreadsheetParseExcel: update from
 0.58 to 0.2603

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8b84c885adc..09509bad862 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7333,10 +7333,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   SpreadsheetParseExcel = buildPerlPackage rec {
-    name = "Spreadsheet-ParseExcel-0.58";
+    name = "Spreadsheet-ParseExcel-0.2603";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/${name}.tar.gz";
-      sha256 = "1ha32kfgf0b9mk00dvsx0jq72xsx0qskmgrnixcdfh044lcxzk17";
+      url = "mirror://cpan/authors/id/K/KW/KWITKNR/${name}.tar.gz";
+      sha256 = "0q5qq982528cdpqdj2wszrnf5g2rfphx0b413lczx7nvkkyy9xqz";
     };
 
     propagatedBuildInputs = [ IOStringy OLEStorageLight ];
-- 
GitLab


From 83e8666cdded9d0aadb6a12ca71c6b2be0825326 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:48 +0200
Subject: [PATCH 3201/3789] perlPackages.StringCRC32: update from 1.4 to 1.5

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 09509bad862..765290eb953 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7494,10 +7494,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   StringCRC32 = buildPerlPackage rec {
-      name = "String-CRC32-1.4";
+      name = "String-CRC32-1.5";
       src = fetchurl {
-        url = mirror://cpan/authors/id/S/SO/SOENKE/String-CRC32-1.4.tar.gz;
-        sha256 = "0lc3d4szxagwzcw6pxq3mmkvdlrz2zkw4i13crf42nvivv7gda8l";
+        url = mirror://cpan/authors/id/S/SO/SOENKE/String-CRC32-1.5.tar.gz;
+        sha256 = "0m3hjk292hnxyi8nkfy8hlr1khnbf2clgkb4kzj0ycq8gcd2z0as";
       };
       meta = {
         maintainers = with maintainers; [ ocharles ];
-- 
GitLab


From 110a78818e0ebb3d5f0c7aa4878e125fb835d15e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:52 +0200
Subject: [PATCH 3202/3789] perlPackages.StringErrf: update from 0.006 to 0.007

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 765290eb953..4c5c527e707 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7506,10 +7506,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   StringErrf = buildPerlPackage {
-    name = "String-Errf-0.006";
+    name = "String-Errf-0.007";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.006.tar.gz;
-      sha256 = "2c09631fbece8e85a94785abede882f5d29e0f21f72239d01332b3bafd9c53ac";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.007.tar.gz;
+      sha256 = "1apnmxdsqwrvn1kkbba4sw6yh6hdfxxar545p6m9dkid7xsiqjfj";
     };
     buildInputs = [ JSON TimeDate ];
     propagatedBuildInputs = [ ParamsUtil StringFormatter SubExporter ];
-- 
GitLab


From 9bac327a0dc8a3fdd6d7b787d51c401824e85ad6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:55 +0200
Subject: [PATCH 3203/3789] perlPackages.StringFormat: update from 1.16 to 1.17

---
 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 4c5c527e707..c6801e25242 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7546,10 +7546,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   StringFormat = buildPerlPackage rec {
-    name = "String-Format-1.16";
+    name = "String-Format-1.17";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DA/DARREN/${name}.tar.gz";
-      sha256 = "edb27dd055ad71012a439f262f9394517adb585a5c27ba72c1819bae2c23729a";
+      sha256 = "0sxfavcsb349rfafxflq2f9h3xpxabrw0q7vhmh9n3hjij8fa1jk";
     };
   };
 
-- 
GitLab


From 8a1d56b8fc09fb433fbc301d6239982e7b49ab77 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:58:58 +0200
Subject: [PATCH 3204/3789] perlPackages.StringMkPasswd: update from 0.02 to
 0.05

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c6801e25242..9eb79008037 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7567,10 +7567,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   StringMkPasswd = buildPerlPackage {
-    name = "String-MkPasswd-0.02";
+    name = "String-MkPasswd-0.05";
     src = fetchurl {
-      url = mirror://cpan/authors/id/C/CG/CGRAU/String-MkPasswd-0.02.tar.gz;
-      sha256 = "0si4xfgf8c2pfag1cqbr9jbyvg3hak6wkmny56kn2qwa4ljp9bk6";
+      url = mirror://cpan/authors/id/C/CG/CGRAU/String-MkPasswd-0.05.tar.gz;
+      sha256 = "15lvcc8c9hp6mg3jx02wd3b85aphn8yl5db62q3pam04c0sgh42k";
     };
   };
 
-- 
GitLab


From ba3e8121b730f40692c600d310882c49434504ea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:59:02 +0200
Subject: [PATCH 3205/3789] perlPackages.StringRewritePrefix: update from 0.006
 to 0.007

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9eb79008037..b7003dffa73 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7575,10 +7575,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   StringRewritePrefix = buildPerlPackage {
-    name = "String-RewritePrefix-0.006";
+    name = "String-RewritePrefix-0.007";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/String-RewritePrefix-0.006.tar.gz;
-      sha256 = "1b9fg805g0agsyij28w8hhmnf485bii8zl03i092mv1p2hqrpxll";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/String-RewritePrefix-0.007.tar.gz;
+      sha256 = "18nxl1vgkcx0r7ifkmbl9fp73f8ihiqhqqf3vq6sj5b3cgawrfsw";
     };
     propagatedBuildInputs = [ SubExporter ];
     meta = {
-- 
GitLab


From 2c6ece8bad0c7484c37f564c4c18fc622040d1a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:59:05 +0200
Subject: [PATCH 3206/3789] perlPackages.StringToIdentifierEN: update from 0.10
 to 0.11

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b7003dffa73..1fa0b9e11d6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7601,10 +7601,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   StringToIdentifierEN = buildPerlPackage rec {
-    name = "String-ToIdentifier-EN-0.10";
+    name = "String-ToIdentifier-EN-0.11";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/String/${name}.tar.gz";
-      sha256 = "1xm0v1cq9hdgx4mswa9wdr2lqk7z9kh1bwjkx4wb5xljd0lxhas6";
+      url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz";
+      sha256 = "1bawghkgkkx7j3avnrj5sg3vix1z5564ks6wf9az3jc2knh8s5nh";
     };
     propagatedBuildInputs =
       [ LinguaENInflectPhrase TextUnidecode namespaceclean ];
-- 
GitLab


From dfac5cabcebe6a2c380dc894e3357d94d7d36f91 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:59:08 +0200
Subject: [PATCH 3207/3789] perlPackages.StringTruncate: update from 1.100601
 to 1.100602

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1fa0b9e11d6..86bc49b515b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7611,10 +7611,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   StringTruncate = buildPerlPackage {
-    name = "String-Truncate-1.100601";
+    name = "String-Truncate-1.100602";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100601.tar.gz;
-      sha256 = "1mas04qa6sj6x34mid8i6swddcnb3c9zfkgkd72kvz5zip2f4f24";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100602.tar.gz;
+      sha256 = "0vjz4fd4cvcy12gk5bdha7z73ifmfpmk748khha94dhiq3pd98xa";
     };
     propagatedBuildInputs = [ SubExporter SubInstall ];
     meta = {
-- 
GitLab


From 38f98cb4f9a5b1d4a0df70398be7840e0e783166 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:59:12 +0200
Subject: [PATCH 3208/3789] perlPackages.SubExporterForMethods: update from
 0.100050 to 0.100051

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 86bc49b515b..a6f6a971e8d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7666,10 +7666,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   SubExporterForMethods = buildPerlPackage {
-    name = "Sub-Exporter-ForMethods-0.100050";
+    name = "Sub-Exporter-ForMethods-0.100051";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100050.tar.gz;
-      sha256 = "67dfaa39c58995ed1d341d7f2e785a68b7ba4ade72608f491459b8d2dee6df33";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100051.tar.gz;
+      sha256 = "127wniw53p7pp7r2vazicply3v1gmnhw4w7jl6p74i0grnsixipm";
     };
     propagatedBuildInputs = [ SubExporter SubName ];
     meta = {
-- 
GitLab


From 515e5a3bee5f2b075f3de8d3aca43bd20875216b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:59:16 +0200
Subject: [PATCH 3209/3789] perlPackages.SubExporterGlobExporter: update from
 0.003 to 0.004

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a6f6a971e8d..0918a933ace 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7679,10 +7679,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   SubExporterGlobExporter = buildPerlPackage {
-    name = "Sub-Exporter-GlobExporter-0.003";
+    name = "Sub-Exporter-GlobExporter-0.004";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.003.tar.gz;
-      sha256 = "4cb082331151360756f3b2f8122fdd44597a207d62bd3f2ecb13578005116ab1";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.004.tar.gz;
+      sha256 = "025wgjavrbzh52jb4v0w2fxqh7r5181k935h9cyy2rm1qk49fg8p";
     };
     propagatedBuildInputs = [ SubExporter ];
     meta = {
-- 
GitLab


From 2443fb656b716ba960e10a65acb7fbbb6f76f72c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:59:20 +0200
Subject: [PATCH 3210/3789] perlPackages.SubExporterProgressive: update from
 0.001006 to 0.001011

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0918a933ace..ceefcf8cfcb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7693,10 +7693,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   SubExporterProgressive = buildPerlPackage {
-    name = "Sub-Exporter-Progressive-0.001006";
+    name = "Sub-Exporter-Progressive-0.001011";
     src = fetchurl {
-      url = mirror://cpan/authors/id/L/LE/LEONT/Sub-Exporter-Progressive-0.001006.tar.gz;
-      sha256 = "0s13fz86c8slhgban10sywp2skjdxnl3nvkqqy7pbwg81g3v9rr2";
+      url = mirror://cpan/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001011.tar.gz;
+      sha256 = "01kwzbqwdhvadpphnczid03nlyj0h4cxaq3m3v2401bckkkcc606";
     };
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
-- 
GitLab


From bf37d845a44f5454f50448d787391f78dfe86d5d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:59:24 +0200
Subject: [PATCH 3211/3789] perlPackages.SubName: update from 0.05 to 0.0502

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ceefcf8cfcb..8042d088ddf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7741,10 +7741,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   SubName = buildPerlPackage {
-    name = "Sub-Name-0.05";
+    name = "Sub-Name-0.0502";
     src = fetchurl {
-      url = mirror://cpan/authors/id/F/FL/FLORA/Sub-Name-0.05.tar.gz;
-      sha256 = "1w9sf51ai2r3i0kv5wnq7h9g3hcd6zb6i51ivvykb3hzx82vilf9";
+      url = mirror://cpan/authors/id/C/CH/CHIPS/Sub-Name-0.0502.tar.gz;
+      sha256 = "1r197binpdy4xfh65qkxxvi9c39pmvvcny4rl8a7zrk1jcws6fac";
     };
     meta = {
       description = "(Re)name a sub";
-- 
GitLab


From f3ceb4529259195b3cc8eea29cf112b4d7f039c6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:59:28 +0200
Subject: [PATCH 3212/3789] perlPackages.Switch: update from 2.16 to 2.17

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8042d088ddf..f959fb0276d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7812,10 +7812,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Switch = buildPerlPackage rec {
-    name = "Switch-2.16";
+    name = "Switch-2.17";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RG/RGARCIA/Switch-2.16.tar.gz";
-      sha256 = "1n7rgp1q3zwglv1pka3bnhq5g41334lwc53g31w6g44my8kqz31h";
+      url = "mirror://cpan/authors/id/C/CH/CHORNY/Switch-2.17.tar.gz";
+      sha256 = "0xbdjdgzfj9zwa4j3ipr8bfk7bcici4hk89hq5d27rhg2isljd9i";
     };
     doCheck = false;                             # FIXME: 2/293 test failures
   };
-- 
GitLab


From f8da8e1b54fb8736d9f14ca21bc055b389cfcc6f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:59:32 +0200
Subject: [PATCH 3213/3789] perlPackages.SyntaxKeywordJunction: update from
 0.003006 to 0.003007

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f959fb0276d..57c486df8b2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7847,10 +7847,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   SyntaxKeywordJunction = buildPerlPackage {
-    name = "Syntax-Keyword-Junction-0.003006";
+    name = "Syntax-Keyword-Junction-0.003007";
     src = fetchurl {
-      url = mirror://cpan/authors/id/F/FR/FREW/Syntax-Keyword-Junction-0.003006.tar.gz;
-      sha256 = "182ab56d86bf3acf292d4ed5893ae0134f43843cdadba3e18f9885e6f86035ec";
+      url = mirror://cpan/authors/id/F/FR/FREW/Syntax-Keyword-Junction-0.003007.tar.gz;
+      sha256 = "0c8jvy5lkshw5gyl037gmkh7c51k3sdvpywq0zwlw4ikvrcgsglj";
     };
     propagatedBuildInputs = [ SubExporterProgressive TestRequires syntax ];
     meta = {
-- 
GitLab


From 63b750c25763ea23d08ac5fad1c56f203eea4c27 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:59:36 +0200
Subject: [PATCH 3214/3789] perlPackages.TAPParserSourceHandlerpgTAP: update
 from 3.29 to 3.30

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 57c486df8b2..0f2d25d9739 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7869,10 +7869,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TAPParserSourceHandlerpgTAP = buildPerlModule {
-    name = "TAP-Parser-SourceHandler-pgTAP-3.29";
+    name = "TAP-Parser-SourceHandler-pgTAP-3.30";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.29.tar.gz;
-      sha256 = "918aa9ada7a05334ace7304e7b9e002bbf0b569bfcf8fb06118777bdabd60e1b";
+      url = mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.30.tar.gz;
+      sha256 = "08gadqf898r23sx07sn13555cp9zkwp8igjlh1fza2ycfivpfl9f";
     };
     meta = {
       homepage = http://search.cpan.org/dist/Tap-Parser-Sourcehandler-pgTAP/;
-- 
GitLab


From df775c9f0c49dc71a27bff226c6905fd651b753e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:59:39 +0200
Subject: [PATCH 3215/3789] perlPackages.TermProgressBar: update from 2.13 to
 2.14

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0f2d25d9739..84b1b279775 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8019,10 +8019,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TermProgressBar = buildPerlPackage {
-    name = "Term-ProgressBar-2.13";
+    name = "Term-ProgressBar-2.14";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SZ/SZABGAB/Term-ProgressBar-2.13.tar.gz;
-      sha256 = "95a56e1529928b7a0d7adf5bc2f54b9b9ae9da58c43b519af74a1e6596209b3c";
+      url = mirror://cpan/authors/id/S/SZ/SZABGAB/Term-ProgressBar-2.14.tar.gz;
+      sha256 = "18cj7mzbis9xk0v32g2700vq9b4p9v5msk02mglf244cj77bflf6";
     };
     buildInputs = [ CaptureTiny TestException ];
     propagatedBuildInputs = [ ClassMethodMaker TermReadKey ];
-- 
GitLab


From 1ac32ce082e58f81a0ffa0008cd5ecb62de3916e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:59:43 +0200
Subject: [PATCH 3216/3789] perlPackages.TermReadKey: update from 2.30 to 2.31

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 84b1b279775..cf0599b5179 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8055,10 +8055,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TermReadKey = buildPerlPackage {
-    name = "TermReadKey-2.30";
+    name = "TermReadKey-2.31";
     src = fetchurl {
-      url = mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.30.tar.gz;
-      md5 = "f0ef2cea8acfbcc58d865c05b0c7e1ff";
+      url = mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.31.tar.gz;
+      sha256 = "1czarrdxgnxmmbaasjnq3sj14nf1cvzhm37padq6xvl7h7r2acb2";
     };
   };
 
-- 
GitLab


From 702568c6b03cf1e8f2de87edeb0814a83e9aef2b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:59:47 +0200
Subject: [PATCH 3217/3789] perlPackages.TestBase: update from 0.60 to 0.62

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cf0599b5179..704fb05f013 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8132,10 +8132,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestBase = buildPerlPackage rec {
-    name = "Test-Base-0.60";
+    name = "Test-Base-0.62";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
-      sha256 = "0yf030nay85xzas1qxn1nw6lhfsrcbgh3nq7bxbb11nxhvdaj2bx";
+      url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
+      sha256 = "1b11xllllp49kkq1wwr57pijqlx1c37nbyssdlszvvhrp6kww363";
     };
     propagatedBuildInputs = [ Spiffy ];
   };
-- 
GitLab


From 0c65639e50222cff778adee1071477e92226d58f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:59:51 +0200
Subject: [PATCH 3218/3789] perlPackages.TestDeep: update from 0.110 to 0.112

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 704fb05f013..dd6bf007344 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8167,10 +8167,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestDeep = buildPerlPackage {
-    name = "Test-Deep-0.110";
+    name = "Test-Deep-0.112";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-0.110.tar.gz;
-      sha256 = "12rd9fknm778685ypyc599lcmzbqvbqnjhcrkybgpq2siai9q4h5";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-0.112.tar.gz;
+      sha256 = "1vg1bb1lpqpj0pxk738ykip4kw3agbi88g90wxb3pc11l84nlsan";
     };
     propagatedBuildInputs = [ TestNoWarnings TestTester ];
     meta = {
-- 
GitLab


From f2d9a7231e1191cfcf357cc6f3adb065077eb44e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:59:55 +0200
Subject: [PATCH 3219/3789] perlPackages.TestDifferences: update from 0.61 to
 0.4801

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index dd6bf007344..1f48312c8ae 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8179,10 +8179,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestDifferences = buildPerlPackage {
-    name = "Test-Differences-0.61";
+    name = "Test-Differences-0.4801";
     src = fetchurl {
-      url = mirror://cpan/authors/id/O/OV/OVID/Test-Differences-0.61.tar.gz;
-      sha256 = "044wg7nqmhvh5ms8z305f9bzldhigr020l1a7iqycxqv05h6b6vm";
+      url = mirror://cpan/authors/id/O/OV/OVID/Test-Differences-0.4801.tar.gz;
+      sha256 = "1p5bqyq3gxfb1q4wajd28498fsbqk7f2y7pk9c3rnh0x36cqbvyw";
     };
     propagatedBuildInputs = [ TextDiff ];
     meta = {
-- 
GitLab


From 6794e6c6c5b796896d025027876a07d59e4db471 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 13:59:59 +0200
Subject: [PATCH 3220/3789] perlPackages.TestException: update from 0.31 to
 0.32

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1f48312c8ae..f43463fa938 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8222,10 +8222,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestException = buildPerlPackage rec {
-    name = "Test-Exception-0.31";
+    name = "Test-Exception-0.32";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
-      sha256 = "1lyd6mcg00348xsn9fl59spx68a69ybli7h7gd2k0p4y21q8p0ks";
+      url = "mirror://cpan/authors/id/A/AD/ADIE/${name}.tar.gz";
+      sha256 = "0issbjh5yl62lpaff5zhn28zhbf8sv8n2g79vklfr5s703k2fi5s";
     };
     propagatedBuildInputs = [ SubUplevel ];
   };
-- 
GitLab


From 1b9a23e35570d8f76a31a1efa177cf6e2cd68775 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:00:03 +0200
Subject: [PATCH 3221/3789] perlPackages.TestMinimumVersion: update from
 0.101080 to 0.101081

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f43463fa938..5b3fb79a9c5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8841,10 +8841,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestMinimumVersion = buildPerlPackage {
-    name = "Test-MinimumVersion-0.101080";
+    name = "Test-MinimumVersion-0.101081";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Test-MinimumVersion-0.101080.tar.gz;
-      sha256 = "51fc0bd73ece9d41887f8d0a57ee27fbc205c271c5b5246111efe7d3247ddfb0";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Test-MinimumVersion-0.101081.tar.gz;
+      sha256 = "1javb92s0bl7gj2m3fsvzd0mn5r76clmayq8878mq12g4smdvpi2";
     };
     buildInputs = [ TestTester ];
     propagatedBuildInputs = [ FileFindRule FileFindRulePerl PerlMinimumVersion YAMLTiny ];
-- 
GitLab


From 8c51e9cadc5788c2c8f3de9452185f108860157e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:00:07 +0200
Subject: [PATCH 3222/3789] perlPackages.TestMockTime: update from 0.09 to 0.12

---
 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 5b3fb79a9c5..22482612b6a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8371,10 +8371,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestMockTime = buildPerlPackage rec {
-    name = "Test-MockTime-0.09";
+    name = "Test-MockTime-0.12";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DD/DDICK/${name}.tar.gz";
-      sha256 = "1j2riyikzyfkxsgkfdqirs7xa8q5d06b9klpk7l9sgydwqdvxdv3";
+      sha256 = "104p9qsqcchfbxh6b6w7q9jhkwb4hc424js0cyivyanjm6bcqvj9";
     };
   };
 
-- 
GitLab


From a36bb367f1e66d295b0d0340152a64a41936924f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:00:12 +0200
Subject: [PATCH 3223/3789] perlPackages.TestMojibake: update from 0.8 to 0.9

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 22482612b6a..b59d0e059e6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8379,10 +8379,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestMojibake = buildPerlPackage {
-    name = "Test-Mojibake-0.8";
+    name = "Test-Mojibake-0.9";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SY/SYP/Test-Mojibake-0.8.tar.gz;
-      sha256 = "66d82ca4fe539bb69ee8179d96370e50777a9547176428baf4dbe190ef78b4cb";
+      url = mirror://cpan/authors/id/S/SY/SYP/Test-Mojibake-0.9.tar.gz;
+      sha256 = "0b7jamkmws6k3cvzwrz3r5vcpjrdhr8wndf82i5nx2z19xsy33ym";
     };
     meta = {
       homepage = https://github.com/creaktive/Test-Mojibake;
-- 
GitLab


From 7f6a6111b761f6a3a086e93d407154fbdbe6f994 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:00:18 +0200
Subject: [PATCH 3224/3789] perlPackages.TestMost: update from 0.31 to 0.33

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b59d0e059e6..1cc94f959e3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8394,10 +8394,10 @@ let self = _self // overrides; _self = with self; {
   TestMore = TestSimple;
 
   TestMost = buildPerlPackage {
-    name = "Test-Most-0.31";
+    name = "Test-Most-0.33";
     src = fetchurl {
-      url = mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.31.tar.gz;
-      sha256 = "0ddc6034dc7cde3631dde41ecb558ed823fc07804bfd051b8ec9a70131862ab7";
+      url = mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.33.tar.gz;
+      sha256 = "0jp4jcwk97bgf85wwyjpxfsx4165s6w1v4ymn9gnv03yn77inyij";
     };
     propagatedBuildInputs = [ ExceptionClass TestDeep TestDifferences TestException TestWarn ];
     meta = {
-- 
GitLab


From 781d9a018599d4171c4b508d77282bb859be81d9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:00:21 +0200
Subject: [PATCH 3225/3789] perlPackages.TestRoutine: update from 0.015 to
 0.018

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1cc94f959e3..40a95c46747 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8523,10 +8523,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestRoutine = buildPerlPackage {
-    name = "Test-Routine-0.015";
+    name = "Test-Routine-0.018";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.015.tar.gz;
-      sha256 = "04hm18sx90k38vxk70g8zj9wp0i7h4436cxflbc6pspvphv2fjg3";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.018.tar.gz;
+      sha256 = "1slaljcija2pbsxdyrqsh09pgajxbln68gb47l9fwffb6gsp5f3m";
     };
     buildInputs = [ TestFatal ];
     propagatedBuildInputs = [ Moose namespaceautoclean namespaceclean ParamsUtil SubExporter ];
-- 
GitLab


From 64c178f2c4ef3b50ddc3a0ca4291ac5528a18004 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:00:25 +0200
Subject: [PATCH 3226/3789] perlPackages.TestSynopsis: update from 0.06 to 0.10

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 40a95c46747..85c458c43a0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8568,10 +8568,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestSynopsis = buildPerlPackage {
-    name = "Test-Synopsis-0.06";
+    name = "Test-Synopsis-0.10";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Test-Synopsis-0.06.tar.gz;
-      sha256 = "fb3eed184eaf8a3c2338ec14b7235fa75fc43cf5f3774d927a4c947a5141db1b";
+      url = mirror://cpan/authors/id/Z/ZO/ZOFFIX/Test-Synopsis-0.10.tar.gz;
+      sha256 = "0gbk4d2vwlldsj5shmbdar3a29vgrw84ldsvm26mflkr5ji34adv";
     };
     meta = {
       description = "Test your SYNOPSIS code";
-- 
GitLab


From 9dbec03ddebb739436ba264fbb213adc9cdda325 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:00:29 +0200
Subject: [PATCH 3227/3789] perlPackages.TestWWWMechanizeCatalyst: update from
 0.58 to 0.59

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 85c458c43a0..dd45234c8fe 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8698,10 +8698,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestWWWMechanizeCatalyst = buildPerlPackage {
-    name = "Test-WWW-Mechanize-Catalyst-0.58";
+    name = "Test-WWW-Mechanize-Catalyst-0.59";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BO/BOBTFISH/Test-WWW-Mechanize-Catalyst-0.58.tar.gz;
-      sha256 = "1pa2m064skxfwsm93hffxcyky4kcn2q418vnw2fn79ich6wrcijd";
+      url = mirror://cpan/authors/id/I/IL/ILMARI/Test-WWW-Mechanize-Catalyst-0.59.tar.gz;
+      sha256 = "1hr1p8m3sv16ws8qb90nshza28qlmllnb6qxriwdvwddp2y517jv";
     };
     doCheck = false; # listens on an external port
     propagatedBuildInputs = [ CatalystRuntime LWP Moose namespaceclean TestWWWMechanize WWWMechanize ];
-- 
GitLab


From 167a636e5c1092465558e4da168b6f161b1bf7eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:00:32 +0200
Subject: [PATCH 3228/3789] perlPackages.TextAligner: update from 0.07 to 0.10

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index dd45234c8fe..1eda7822edc 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8751,10 +8751,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextAligner = buildPerlPackage {
-    name = "Text-Aligner-0.07";
+    name = "Text-Aligner-0.10";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AN/ANNO/Text-Aligner-0.07.tar.gz;
-      sha256 = "1vpb87binmmysr4sxfjinxg4bh3rb4rmrx48yyczgmyddmda9rik";
+      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Aligner-0.10.tar.gz;
+      sha256 = "0d80x5jrv5j9yi234rdnjvnsnmhm4jsssqv7bpkl1fhjd1kfc7v0";
     };
     meta = {
       description = "Align text in columns";
-- 
GitLab


From 9b26002d06b991b8ac10379b802fcea7fb9e4e03 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:00:36 +0200
Subject: [PATCH 3229/3789] perlPackages.TextBibTeX: update from 0.66 to 0.69

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1eda7822edc..a001e81b0bf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8762,11 +8762,11 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextBibTeX = buildPerlModule {
-    name = "Text-BibTeX-0.66";
+    name = "Text-BibTeX-0.69";
     buildInputs = [ ConfigAutoConf ExtUtilsLibBuilder ];
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AM/AMBS/Text/Text-BibTeX-0.66.tar.gz;
-      sha256 = "0wymg190afqfhr5i9ws02jgnksk06h3w45770ynjjr1fs343b9j7";
+      url = mirror://cpan/authors/id/A/AM/AMBS/Text/Text-BibTeX-0.69.tar.gz;
+      sha256 = "1gzh5zh2ggfp15q5im7gpr1krq4mzmhbjdivyb2x03vcg0qdkk3z";
     };
     meta = {
       description = "Interface to read and parse BibTeX files";
-- 
GitLab


From b2fa401f5966d8e100764341c03ba7d7dc77bf1d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:00:40 +0200
Subject: [PATCH 3230/3789] perlPackages.TextCSV: update from 1.10 to 1.32

---
 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 a001e81b0bf..5232a0da309 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8775,10 +8775,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextCSV = buildPerlPackage rec {
-    name = "Text-CSV-1.10";
+    name = "Text-CSV-1.32";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MA/MAKAMAKA/${name}.tar.gz";
-      sha256 = "0vb0093v3kk7iczb46zzdg7myfyjldwrk8wbk7ibk56gvj350f7c";
+      sha256 = "1bzrizyp8n2013nhd34j52bzdqcp9la30aqbdfkij52ssxkfm7xl";
     };
   };
 
-- 
GitLab


From 53778344ef498d318c0ac3b5716917938f5d9211 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:00:43 +0200
Subject: [PATCH 3231/3789] perlPackages.TextMicroTemplate: update from 0.19 to
 0.20

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5232a0da309..cd88f85a28b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8855,10 +8855,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextMicroTemplate = buildPerlPackage {
-    name = "Text-MicroTemplate-0.19";
+    name = "Text-MicroTemplate-0.20";
     src = fetchurl {
-      url = mirror://cpan/authors/id/K/KA/KAZUHO/Text-MicroTemplate-0.19.tar.gz;
-      sha256 = "0hli95kn67slr6ixffcx6qvv36hlr03hij28029k3f8d7b7f32za";
+      url = mirror://cpan/authors/id/K/KA/KAZUHO/Text-MicroTemplate-0.20.tar.gz;
+      sha256 = "0da44kd3z4n23wivy99583cscmiay2xv0wq9dzx6mg8vq874kx74";
     };
     meta = {
       description = "Micro template engine with Perl5 language";
-- 
GitLab


From ad5b3a3b1affc24def30c57e74e5db66757c667c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:00:47 +0200
Subject: [PATCH 3232/3789] perlPackages.TextTable: update from 1.128 to 1.129

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cd88f85a28b..de69d2e4f23 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8905,10 +8905,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextTable = buildPerlPackage {
-    name = "Text-Table-1.128";
+    name = "Text-Table-1.129";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.128.tar.gz;
-      sha256 = "0j9y38y9x9ljjpnvp5clwkfvhnja6vjlnhb8yshv2mmz2h6by70c";
+      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.129.tar.gz;
+      sha256 = "1b8l86yvvsncnx0w45w095n1h7lff6nxjy87dzk7zgvkmr0ary7c";
     };
     buildInputs = [ TestPod TestPodCoverage ];
     propagatedBuildInputs = [ TextAligner ];
-- 
GitLab


From 684245d61ef5e50d321f46fa03e075f5c5bf961b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:00:51 +0200
Subject: [PATCH 3233/3789] perlPackages.TextWikiFormat: update from 0.80 to
 0.81

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index de69d2e4f23..ad353872503 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9017,10 +9017,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextWikiFormat = buildPerlPackage {
-    name = "Text-WikiFormat-0.80";
+    name = "Text-WikiFormat-0.81";
     src = fetchurl {
-      url = mirror://cpan/authors/id/C/CY/CYCLES/Text-WikiFormat-0.80.tar.gz;
-      sha256 = "0i1mg3ivxhx09x0w06k15izc92bknwqwh0ghpmhlq9s9iw12mmry";
+      url = mirror://cpan/authors/id/C/CY/CYCLES/Text-WikiFormat-0.81.tar.gz;
+      sha256 = "0cxbgx879bsskmnhjzamgsa5862ddixyx4yr77lafmwimnaxjg74";
     };
     propagatedBuildInputs = [ URI ];
     meta = {
-- 
GitLab


From c6b1a953e12a323589805d2d1a59a03e36f8483d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:00:56 +0200
Subject: [PATCH 3234/3789] perlPackages.TieIxHash: update from 1.22 to 1.23

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ad353872503..da74a6792ed 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9051,10 +9051,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TieIxHash = buildPerlPackage {
-    name = "Tie-IxHash-1.22";
+    name = "Tie-IxHash-1.23";
     src = fetchurl {
-      url = mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.22.tar.gz;
-      sha256 = "0f0m0x8nkidxd0pxnls1i8kc8d7bd89dqgihz29wj3ggk43qffr7";
+      url = mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.23.tar.gz;
+      sha256 = "0mmg9iyh42syal3z1p2pn9airq65yrkfs66cnqs9nz76jy60pfzs";
     };
     meta = {
       description = "Ordered associative arrays for Perl";
-- 
GitLab


From 7f1aa495cac761492385801cafa11c350f929e2c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:00:59 +0200
Subject: [PATCH 3235/3789] perlPackages.TimeDate: update from 1.16 to 2.30

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index da74a6792ed..002151b5eb2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9072,10 +9072,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TimeDate = buildPerlPackage {
-    name = "TimeDate-1.16";
+    name = "TimeDate-2.30";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GB/GBARR/TimeDate-1.16.tar.gz;
-      sha256 = "1cvcpaghn7dc14m9871sfw103g3m3a00m2mrl5iqb0mmh40yyhkr";
+      url = mirror://cpan/authors/id/G/GB/GBARR/TimeDate-2.30.tar.gz;
+      sha256 = "11lf54akr9nbivqkjrhvkmfdgkbhw85sq0q4mak56n6bf542bgbm";
     };
   };
 
-- 
GitLab


From 060058691370a7a75f8da3d804d8521f63d49fc1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:01:02 +0200
Subject: [PATCH 3236/3789] perlPackages.TimeDuration: update from 1.1 to 1.06

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 002151b5eb2..b496495fb6f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9080,10 +9080,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TimeDuration = buildPerlPackage {
-    name = "Time-Duration-1.1";
+    name = "Time-Duration-1.06";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AV/AVIF/Time-Duration-1.1.tar.gz;
-      sha256 = "a69c419c4892f21eba10002e2ab8c55b657b6691cf6873544ef99ef5fd188f4e";
+      url = mirror://cpan/authors/id/A/AV/AVIF/Time-Duration-1.06.tar.gz;
+      sha256 = "0krzgxifghwir1ibxg147sfpqyyv8xpvipx0nwlwgyay46x4gdpp";
     };
     buildInputs = [ TestPod TestPodCoverage ];
     meta = {
-- 
GitLab


From 8ae221d62127838a999531b91ac4ed5af70e14e5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:01:06 +0200
Subject: [PATCH 3237/3789] perlPackages.TreeSimpleVisitorFactory: update from
 0.10 to 0.12

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b496495fb6f..2a222cc0e71 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9142,10 +9142,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TreeSimpleVisitorFactory = buildPerlPackage {
-    name = "Tree-Simple-VisitorFactory-0.10";
+    name = "Tree-Simple-VisitorFactory-0.12";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/ST/STEVAN/Tree-Simple-VisitorFactory-0.10.tar.gz;
-      sha256 = "1ghcgnb3xvqjyh4h4aa37x98613aldnpj738z9b80p33bbfxq158";
+      url = mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-VisitorFactory-0.12.tgz;
+      sha256 = "1g27xl48q1vr7aikhxg4vvcsj1si8allxz59vmnks61wsw4by7vg";
     };
     propagatedBuildInputs = [TreeSimple];
     buildInputs = [TestException];
-- 
GitLab


From e4559ba4365b2b29c9725a695c9ff9b37f6ecda1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:01:09 +0200
Subject: [PATCH 3238/3789] perlPackages.URIFromHash: update from 0.03 to 0.04

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2a222cc0e71..08277f33214 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9277,10 +9277,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   URIFromHash = buildPerlPackage {
-    name = "URI-FromHash-0.03";
+    name = "URI-FromHash-0.04";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/URI-FromHash-0.03.tar.gz;
-      sha256 = "0yzk69mdf8rmkx1wxm5mn1a1zzd0zq4x1w83vyj9ja40v73q0k4i";
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/URI-FromHash-0.04.tar.gz;
+      sha256 = "03yckli4fj8cgsyh1l1lmyxj56q9qc04a3r8kv0whbnb37zz1j23";
     };
     propagatedBuildInputs = [ ParamsValidate URI ];
     meta = {
-- 
GitLab


From c0048552ff9faa2f2d0264500c1d37ca1650774f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:01:12 +0200
Subject: [PATCH 3239/3789] perlPackages.WWWCurl: update from 4.15 to 4.17

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 08277f33214..b3aa2bb9ec9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9353,10 +9353,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   WWWCurl = buildPerlPackage rec {
-    name = "WWW-Curl-4.15";
+    name = "WWW-Curl-4.17";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/WWW/${name}.tar.gz";
-      sha256 = "18az7k0jsr642lp6dfy0b2s7vx0cd7sj9dgk93wff73safa09x1y";
+      url = "mirror://cpan/authors/id/S/SZ/SZBALINT/${name}.tar.gz";
+      sha256 = "1fmp9aib1kaps9vhs4dwxn7b15kgnlz9f714bxvqsd1j1q8spzsj";
     };
     buildInputs = [ pkgs.curl ];
     preConfigure =
-- 
GitLab


From 81f0e185f0670b9a74cbaa81efe719ce0102c214 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:01:16 +0200
Subject: [PATCH 3240/3789] perlPackages.WWWMechanize: update from 1.72 to 1.73

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b3aa2bb9ec9..a363e490f5d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9367,10 +9367,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   WWWMechanize = buildPerlPackage {
-    name = "WWW-Mechanize-1.72";
+    name = "WWW-Mechanize-1.73";
     src = fetchurl {
-      url = mirror://cpan/authors/id/J/JE/JESSE/WWW-Mechanize-1.72.tar.gz;
-      sha256 = "0vs3p2697675bswjayfmm37lg3xsxm94z1mif18s732kwvnpg6m6";
+      url = mirror://cpan/authors/id/E/ET/ETHER/WWW-Mechanize-1.73.tar.gz;
+      sha256 = "1zrw8aadhwy48q51x2z2rqlkwf17bya4j4h3hy89mw783j96rmg9";
     };
     propagatedBuildInputs = [ HTMLForm HTMLParser HTMLTree HTTPDaemon HTTPMessage HTTPServerSimple LWP LWPUserAgent TestWarn URI ];
     doCheck = false;
-- 
GitLab


From 0d2fb0040ce477b725d0c537fbf3ec8e4a0ec6d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:01:20 +0200
Subject: [PATCH 3241/3789] perlPackages.Wx: update from 0.9922 to 0.9923

---
 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 a363e490f5d..1a98f5fb2d5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9412,10 +9412,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Wx = buildPerlPackage rec {
-    name = "Wx-0.9922";
+    name = "Wx-0.9923";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz";
-      sha256 = "11x3cvffcyi4b2c6pz9awks3zrg83bg1cwapm4psdiqnd568safw";
+      sha256 = "1ja2fkz0xabafyc6gnp3nnwsbkkjsf44kq9x5zz6cb5fsp3p9sck";
     };
     propagatedBuildInputs = [ ExtUtilsXSpp AlienWxWidgets ];
     # Testing requires an X server:
-- 
GitLab


From 3aec099b907813a97b600d5c243213b671322ab8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:01:23 +0200
Subject: [PATCH 3242/3789] perlPackages.X11GUITest: update from 0.21 to 0.28

---
 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 1a98f5fb2d5..2deb69e6da7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9435,10 +9435,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   X11GUITest = buildPerlPackage rec {
-    name = "X11-GUITest-0.21";
+    name = "X11-GUITest-0.28";
     src = fetchurl {
       url = "mirror://cpan/authors/id/C/CT/CTRONDLP/${name}.tar.gz";
-      sha256 = "0akjk2x2d3j1f95wn93mh6nvq8p6c9jcqmvkh1mli5jxr1rmhjx8";
+      sha256 = "0jznws68skdzkhgkgcgjlj40qdyh9i75r7fw8bqzy406f19xxvnw";
     };
     buildInputs = [pkgs.x11 pkgs.xorg.libXtst pkgs.xorg.libXi];
     NIX_CFLAGS_LINK = "-lX11 -lXext -lXtst";
-- 
GitLab


From abdd1e4ce5b0e1c0f48b4316ac7ecb7a82e1c94e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:01:27 +0200
Subject: [PATCH 3243/3789] perlPackages.XMLLibXML: update from 2.0014 to
 2.0115

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2deb69e6da7..595c43d023f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9455,10 +9455,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   XMLLibXML = buildPerlPackage rec {
-    name = "XML-LibXML-2.0014";
+    name = "XML-LibXML-2.0115";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/XML/${name}.tar.gz";
-      sha256 = "0r2mw6pnygj2bpng9f4q5jfn4iawhkj47ys3sbnvqymyp1afihf6";
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "0d6l6idl2920x9xi097fvzfdn9i0s8qa9ksw4bz2w1wh3zsn07zm";
     };
     SKIP_SAX_INSTALL = 1;
     buildInputs = [ pkgs.libxml2 ];
-- 
GitLab


From 5789357f363f5c6cea883fac1db24f580715243f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:01:31 +0200
Subject: [PATCH 3244/3789] perlPackages.XMLLibXSLT: update from 1.87 to 1.89

---
 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 595c43d023f..7a03c965944 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9479,10 +9479,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   XMLLibXSLT = buildPerlPackage rec {
-    name = "XML-LibXSLT-1.87";
+    name = "XML-LibXSLT-1.89";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
-      sha256 = "18kxa51a0prr8dx0w7q7wa8gdgalswzqa24sjkxmgs0f9yhcixz1";
+      sha256 = "0py7ll5vj2k977l4r2g8bbz0hdy0hhkdq0mzblrwizify0825b12";
     };
     buildInputs = [ pkgs.zlib pkgs.libxml2 pkgs.libxslt ];
     propagatedBuildInputs = [ XMLLibXML ];
-- 
GitLab


From 8626dc7d49cbcfe5a2a794bdfbce424814fd17b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:01:34 +0200
Subject: [PATCH 3245/3789] perlPackages.XMLNamespaceSupport: update from 1.09
 to 1.11

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7a03c965944..c13004daaa7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9489,10 +9489,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   XMLNamespaceSupport = buildPerlPackage {
-    name = "XML-NamespaceSupport-1.09";
+    name = "XML-NamespaceSupport-1.11";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RB/RBERJON/XML-NamespaceSupport-1.09.tar.gz;
-      sha256 = "0ny2i4pf6j8ggfj1x02rm5zm9a37hfalgx9w9kxnk69xsixfwb51";
+      url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.11.tar.gz;
+      sha256 = "1sklgcldl3w6gn706vx1cgz6pm4y5lfgsjxnfqyk20pilgq530bd";
     };
   };
 
-- 
GitLab


From a6d0e043300a1c1640a27b1903bd70788d848f46 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:01:38 +0200
Subject: [PATCH 3246/3789] perlPackages.XMLParser: update from 2.36 to 2.41

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c13004daaa7..e42cd8afeeb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9497,10 +9497,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   XMLParser = buildPerlPackage {
-    name = "XML-Parser-2.36";
+    name = "XML-Parser-2.41";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz;
-      sha256 = "0gyp5qfbflhkin1zv8l6wlkjwfjvsf45a3py4vc6ni82fj32kmcz";
+      url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz;
+      sha256 = "1sadi505g5qmxr36lgcbrcrqh3a5gcdg32b405gnr8k54b6rg0dl";
     };
     makeMakerFlags = "EXPATLIBPATH=${pkgs.expat}/lib EXPATINCPATH=${pkgs.expat}/include";
   };
-- 
GitLab


From 0a019d402304e204283cc627a7b7e2f80b75c7df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:01:41 +0200
Subject: [PATCH 3247/3789] perlPackages.XMLRegExp: update from 0.03 to 0.04

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e42cd8afeeb..b5c56e23435 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9528,10 +9528,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   XMLRegExp = buildPerlPackage {
-    name = "XML-RegExp-0.03";
+    name = "XML-RegExp-0.04";
     src = fetchurl {
-      url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-RegExp-0.03.tar.gz;
-      sha256 = "1gkarylvdk3mddmchcwvzq09gpvx5z26nybp38dg7mjixm5bs226";
+      url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-RegExp-0.04.tar.gz;
+      sha256 = "0m7wj00a2kik7wj0azhs1zagwazqh3hlz4255n75q21nc04r06fz";
     };
   };
 
-- 
GitLab


From a296adc1a1a1b43c98045e46025822f3e8b7329d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:01:46 +0200
Subject: [PATCH 3248/3789] perlPackages.XMLSimple: update from 2.18 to 2.20

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b5c56e23435..0c5a63c18d9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9558,10 +9558,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   XMLSimple = buildPerlPackage {
-    name = "XML-Simple-2.18";
+    name = "XML-Simple-2.20";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.18.tar.gz;
-      sha256 = "09k8fvc9m5nd5rqq00rwm3m0wx7iwd6vx0vc947y58ydi30nfjd5";
+      url = mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.20.tar.gz;
+      sha256 = "0jj3jiray1l4pi9wkjcpxjc3v431whdwx5aqnhgdm4i7h3817zsw";
     };
     propagatedBuildInputs = [XMLParser];
   };
-- 
GitLab


From f2e9c3dad181306b3471f0613892c0b42636e5d1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:01:49 +0200
Subject: [PATCH 3249/3789] perlPackages.XMLWriter: update from 0.612 to 0.624

---
 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 0c5a63c18d9..51f59da14e3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9577,10 +9577,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   XMLWriter = buildPerlPackage rec {
-    name = "XML-Writer-0.612";
+    name = "XML-Writer-0.624";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JO/JOSEPHW/${name}.tar.gz";
-      sha256 = "1prvgbjxynxg6061qxzfbbimjvil04513hf3hsilv0hdg58nb9jk";
+      sha256 = "0yyz0dh9b4clailbxyi90dfrqpyc6py77rmmz6qmkx7ynlpyxk46";
     };
   };
 
-- 
GitLab


From 5bad11016b802649dc800315372098970a1a5822 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:01:52 +0200
Subject: [PATCH 3250/3789] perlPackages.YAMLSyck: update from 1.22 to 1.27

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 51f59da14e3..f9a26ec4ca3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9598,10 +9598,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   YAMLSyck = buildPerlPackage {
-    name = "YAML-Syck-1.22";
+    name = "YAML-Syck-1.27";
     src = fetchurl {
-      url = mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.22.tar.gz;
-      sha256 = "0n3k71i0b8mhdrl5kp1cwyvjbkqahyqkhp81wl3qnkfhyi39f55y";
+      url = mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.27.tar.gz;
+      sha256 = "1y9dw18fz3s8v4n80wf858cjq4jlaza25wvsgv60a6z2l0sfax6y";
     };
     meta = {
       homepage = http://search.cpan.org/dist/YAML-Syck;
-- 
GitLab


From 0273315c627bdbf9b0a134c86703b04bb53635cd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:01:56 +0200
Subject: [PATCH 3251/3789] perlPackages.aliased: update from 0.30 to 0.31

---
 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 f9a26ec4ca3..3a27db6cbbe 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -88,10 +88,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   aliased = buildPerlPackage rec {
-    name = "aliased-0.30";
+    name = "aliased-0.31";
     src = fetchurl {
       url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz";
-      sha256 = "1iqcbfv600m31rfvl7r9ckr0hh0vny63q7a6yyhfrh4ppcgj4ig4";
+      sha256 = "0gxfqdddlq5g1b2zs99b251hz52z9ys4yni7j2p8gyk5zij3wm1s";
     };
   };
 
-- 
GitLab


From ca577f28b1683121b63e4998f07cbdbecdf2ecd4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:00 +0200
Subject: [PATCH 3252/3789] perlPackages.boolean: update from 0.30 to 0.32

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3a27db6cbbe..64e64bb71fd 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -385,10 +385,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   boolean = buildPerlPackage {
-    name = "boolean-0.30";
+    name = "boolean-0.32";
     src = fetchurl {
-      url = mirror://cpan/authors/id/I/IN/INGY/boolean-0.30.tar.gz;
-      sha256 = "f46e7a6121d5728ef2ce285a82d1dde94f6dfa0b846a612db75b1dcd37b9fc7f";
+      url = mirror://cpan/authors/id/I/IN/INGY/boolean-0.32.tar.gz;
+      sha256 = "1icihm1cib90klfjrk069s7031n1c7xk3fmkr2bfxrwqda4di7jg";
     };
     meta = {
       homepage = https://github.com/ingydotnet/boolean-pm/tree;
-- 
GitLab


From 0cb15d8ff8013ab7b8f010dae3611760a72835c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:03 +0200
Subject: [PATCH 3253/3789] perlPackages.cam_pdf: update from 1.52 to 1.60

---
 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 64e64bb71fd..a43b97bf232 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -516,10 +516,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   cam_pdf = buildPerlPackage rec {
-    name = "CAM-PDF-1.52";
+    name = "CAM-PDF-1.60";
     src = fetchurl {
       url = "mirror://cpan/authors/id/C/CD/CDOLAN/${name}.tar.gz";
-      sha256 = "1lamnx0vcqzzcxdmj5038gvyn6z5xcy9756jhndgpggjfkzilwkh";
+      sha256 = "12dv5ssf3y7yjz9mrrqnfzx8nf4ydk1qijf5fx59495671zzqsp7";
     };
     propagatedBuildInputs = [ CryptRC4 TextPDF ];
     buildInputs = [ TestMore ];
-- 
GitLab


From 7514552d3eb126d1d340df4170add0b38747bddb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:06 +0200
Subject: [PATCH 3254/3789] perlPackages.constant: update from 1.15 to 1.27

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a43b97bf232..ae9e48b3234 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1509,10 +1509,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   constant = buildPerlPackage {
-    name = "constant-1.15";
+    name = "constant-1.27";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SA/SAPER/constant-1.15.tar.gz;
-      sha256 = "1ygz0hd1fd3q88r6dlw14kpyh06zjprksdci7qva6skxz3261636";
+      url = mirror://cpan/authors/id/S/SA/SAPER/constant-1.27.tar.gz;
+      sha256 = "0ari0jggiifz3q7vxb8nlcsc3g6bj8c0c0drsrphv0079c956i3l";
     };
   };
 
-- 
GitLab


From 3984a70646de79a8ff7e36b94bce8231ab9dbb5d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:10 +0200
Subject: [PATCH 3255/3789] perlPackages.if: update from 0.0601 to 0.01000001

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ae9e48b3234..648ef3b15d7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4282,10 +4282,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   "if" = buildPerlPackage {
-    name = "if-0.0601";
+    name = "if-0.01000001";
     src = fetchurl {
-      url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/if-0.0601.tar.gz;
-      sha256 = "fb2b7329aa111a673cd22dc2889167e52058aead0de2fe0855b32dd658d5c1b7";
+      url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/if-0.01000001.tar.gz;
+      sha256 = "0vb40cb20b22layp5v9xa30hmcnhxidwjkfwcrxwhrvwypy2cmgw";
     };
     meta = {
     };
-- 
GitLab


From 2a43291e62583d359bbc09c303fed13e290a5c8b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:15 +0200
Subject: [PATCH 3256/3789] perlPackages.maatkit: update from 4790 to 7540

---
 pkgs/development/perl-modules/maatkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix
index d9a1f777f3a..b30e2f12fc6 100644
--- a/pkgs/development/perl-modules/maatkit/default.nix
+++ b/pkgs/development/perl-modules/maatkit/default.nix
@@ -1,11 +1,11 @@
 {buildPerlPackage, stdenv, fetchurl, DBDmysql}:
 
 buildPerlPackage rec {
-  name = "maatkit-4790";
+  name = "maatkit-7540";
 
   src = fetchurl {
     url = "http://maatkit.googlecode.com/files/${name}.tar.gz" ;
-    sha256 = "0lf6dgh1w96m234hrkhagyyvv1m1ldchpzsg6iswvkj6sbvv7d7h";
+    sha256 = "1a7rxrddkrsfxb2wj01ha91ld0vapfkqcy8j9p08l76zz2l8p2v1";
   };
 
   buildInputs = [ DBDmysql ] ;
-- 
GitLab


From 4955d0e8764564dbf41d07cca34754a7a73f27c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:19 +0200
Subject: [PATCH 3257/3789] perlPackages.namespaceclean: update from 0.24 to
 0.25

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 648ef3b15d7..2c93e6a8d16 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6106,10 +6106,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   namespaceclean = buildPerlPackage rec {
-    name = "namespace-clean-0.24";
+    name = "namespace-clean-0.25";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RI/RIBASUSHI/namespace-clean-0.24.tar.gz;
-      sha256 = "0c0jj44f3y26scybnxp2lnkcydjqh0lfr6l1jsy13r3x9r4d8qd6";
+      url = mirror://cpan/authors/id/R/RI/RIBASUSHI/namespace-clean-0.25.tar.gz;
+      sha256 = "016dds70ql1mp18b07chkxiy4drn976ibnbshqc2hmhrh9xjnsll";
     };
     propagatedBuildInputs = [ BHooksEndOfScope PackageStash ];
     meta = {
-- 
GitLab


From 18a14b3455d61ddbb322a76bd5a135da3c9fe503 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:22 +0200
Subject: [PATCH 3258/3789] perlPackages.strictures: update from 1.004004 to
 1.005004

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2c93e6a8d16..87b3d4d217a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7473,10 +7473,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   strictures = buildPerlPackage {
-    name = "strictures-1.004004";
+    name = "strictures-1.005004";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/strictures-1.004004.tar.gz;
-      sha256 = "0d7fanr4ggmlqvdxf63ci7nxba2vrdz9558xy35hfpm8max7s48j";
+      url = mirror://cpan/authors/id/H/HA/HAARG/strictures-1.005004.tar.gz;
+      sha256 = "0y9q0v68060x5r3wfprwnjry6si7x9x5rkqz7nrf8fkxng7ndw5v";
     };
     meta = {
       homepage = http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git;
-- 
GitLab


From ecc8da9672d4a77b45d71c0b6da0f5fca3361765 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:26 +0200
Subject: [PATCH 3259/3789] perlPackages.AlienWxWidgets: update from 0.64 to
 0.65

---
 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 87b3d4d217a..23d1a2419dd 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -96,10 +96,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   AlienWxWidgets = buildPerlPackage rec {
-    name = "Alien-wxWidgets-0.64";
+    name = "Alien-wxWidgets-0.65";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz";
-      sha256 = "1frmvdppzw1vrbk2jvwxh5a5qafl7bigflpgwpkzdg4v9nswgbmx";
+      sha256 = "0h4g7jl0p8a35kyvsji3qlb75mbcfqpvvmwh7s9krkbqklqjlxxl";
     };
     propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ];
   };
-- 
GitLab


From f548b6c06a6e5f1fe0657d70b0c1fc80506327c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:29 +0200
Subject: [PATCH 3260/3789] perlPackages.AnyEvent: update from 7.05 to 7.07

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 23d1a2419dd..dea2d6f7522 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -105,10 +105,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   AnyEvent = buildPerlPackage {
-    name = "AnyEvent-7.05";
+    name = "AnyEvent-7.07";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.05.tar.gz;
-      sha256 = "0022y5xbn3dn5x0q1kzvx15icf3g1cqqljrfhyriy794a42fply6";
+      url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.07.tar.gz;
+      sha256 = "01iilh11xc2gw6fxxr6il3r6n1k4cf6swaddgbhi525wfzlchk2c";
     };
     meta = {
       maintainers = with maintainers; [ ocharles ];
-- 
GitLab


From 79d6aa625d481f5eee46f92a68944e7c7c3d8de1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:33 +0200
Subject: [PATCH 3261/3789] perlPackages.AppCLI: update from 0.07 to 0.313

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index dea2d6f7522..7d6ab4a64ad 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -156,10 +156,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   AppCLI = buildPerlPackage {
-    name = "App-CLI-0.07";
+    name = "App-CLI-0.313";
     src = fetchurl {
-      url = mirror://cpan/authors/id/C/CL/CLKAO/App-CLI-0.07.tar.gz;
-      sha256 = "000866qsm7jck3ini69b02sgbjwp6s297lsds002r7xk2wb6fqcz";
+      url = mirror://cpan/authors/id/C/CO/CORNELIUS/App-CLI-0.313.tar.gz;
+      sha256 = "0ni1z14xis1b634qjc3zra9c9pl2icfr6sp5qxs0xy8nvib65037";
     };
     propagatedBuildInputs = [LocaleMaketextSimple];
   };
-- 
GitLab


From 353bb1c2f7d3e837dba3a392703fd3d57b8579a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:36 +0200
Subject: [PATCH 3262/3789] perlPackages.BHooksEndOfScope: update from 0.12 to
 0.13

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7d6ab4a64ad..9a91d33b206 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -331,10 +331,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   BHooksEndOfScope = buildPerlPackage {
-    name = "B-Hooks-EndOfScope-0.12";
+    name = "B-Hooks-EndOfScope-0.13";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BO/BOBTFISH/B-Hooks-EndOfScope-0.12.tar.gz;
-      sha256 = "1gagn8b9zhbwk4f4cllrvir1mspvq0ladsy0pfkwl9w85q1843lj";
+      url = mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.13.tar.gz;
+      sha256 = "1f5d0lbkwf23dfjn60g6fynmjhy5rxdyxcpdfb07srm73qpg2zpi";
     };
     propagatedBuildInputs = [ ModuleImplementation ModuleRuntime SubExporterProgressive ];
     meta = {
-- 
GitLab


From 282fe2da2ab7bdf106208acd0c8572976a342cba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:40 +0200
Subject: [PATCH 3263/3789] perlPackages.BoostGeometryUtils: update from 0.12
 to 0.15

---
 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 9a91d33b206..98a1c6d45f3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -398,10 +398,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   BoostGeometryUtils = buildPerlModule rec {
-    name = "Boost-Geometry-Utils-0.12";
+    name = "Boost-Geometry-Utils-0.15";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AA/AAR/${name}.tar.gz";
-      sha256 = "1pywbxjf05qpcixshblhd2cham601zwa9w7c3k5waz4cdild6g1m";
+      sha256 = "1jnihz3029x51a455nxa0jx2z125x38q3vkkggsgdlrvawzxsm00";
     };
     propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsTypemapsDefault ];
   };
-- 
GitLab


From d8cd48542b7c18472c7f912f8c79d4a24fa0c04f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:44 +0200
Subject: [PATCH 3264/3789] perlPackages.CGICookieXS: update from 0.16 to 0.18

---
 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 98a1c6d45f3..2a7e04ae5b1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1037,10 +1037,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CGICookieXS = buildPerlPackage rec {
-    name = "CGI-Cookie-XS-0.16";
+    name = "CGI-Cookie-XS-0.18";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AG/AGENT/${name}.tar.gz";
-      sha256 = "1jrd3f11sz17117nvssrrf6r80fr412615n5ffspbsap4n816bnn";
+      sha256 = "1iixvnm0l1q24vdlnayb4vd8fns2bdlhm6zb7fpi884ppm5cp6a6";
     };
   };
 
-- 
GitLab


From 626061e79d7c26f7ed4efcbb3033c232ce295fd0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:48 +0200
Subject: [PATCH 3265/3789] perlPackages.CGIExpand: update from 2.03 to 2.04

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2a7e04ae5b1..c8bd1bac447 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1045,10 +1045,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CGIExpand = buildPerlPackage {
-    name = "CGI-Expand-2.03";
+    name = "CGI-Expand-2.04";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BO/BOWMANBS/CGI-Expand-2.03.tar.gz;
-      sha256 = "0p59is2mynybii8r1cpci2i17xzwhrrs4741hndhkcp4spggr0z1";
+      url = mirror://cpan/authors/id/B/BO/BOWMANBS/CGI-Expand-2.04.tar.gz;
+      sha256 = "0jk2vvk4mlz7phq3h3wpryix46adi7fkkzvkv0ssn5xkqy3pqlny";
     };
     propagatedBuildInputs = [ TestException ];
     meta = {
-- 
GitLab


From beeb78701738bc7b070540486e2846ca42f4be63 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:51 +0200
Subject: [PATCH 3266/3789] perlPackages.CaptureTiny: update from 0.21 to 0.24

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c8bd1bac447..e036b7a9488 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -540,10 +540,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CaptureTiny = buildPerlPackage {
-    name = "Capture-Tiny-0.21";
+    name = "Capture-Tiny-0.24";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.21.tar.gz;
-      sha256 = "1lvz2639zsjpr3001b2xyidnsd4kcgll5fvaa0pm928wzldb49wg";
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.24.tar.gz;
+      sha256 = "0rg0m9irhx8jwamxdi2ms4vhhxy7q050gjrn2m051spqfa26zkwv";
     };
     meta = {
       homepage = https://metacpan.org/release/Capture-Tiny;
-- 
GitLab


From 9d8ef258e361b20f1254a596062fc542706d0566 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:53 +0200
Subject: [PATCH 3267/3789] perlPackages.CatalystAuthenticationStoreDBIxClass:
 update from 0.1503 to 0.1506

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e036b7a9488..e527c0bf54f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -639,10 +639,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CatalystAuthenticationStoreDBIxClass = buildPerlPackage {
-    name = "Catalyst-Authentication-Store-DBIx-Class-0.1503";
+    name = "Catalyst-Authentication-Store-DBIx-Class-0.1506";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Authentication-Store-DBIx-Class-0.1503.tar.gz;
-      sha256 = "1l11if91gjfrga7i7bjxwa0zybhkkrpgg6ps3nxm30vmg7xqaf4d";
+      url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-DBIx-Class-0.1506.tar.gz;
+      sha256 = "0i5ja7690fs9nhxcij6lw51j804sm8s06m5mvk1n8pi8jljrymvw";
     };
     propagatedBuildInputs = [ CatalystModelDBICSchema CatalystPluginAuthentication CatalystRuntime DBIxClass ListMoreUtils Moose namespaceautoclean TryTiny ];
     meta = {
-- 
GitLab


From b5f3b441605f6bfd4a1ab554292169a409f4cb0b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:02:58 +0200
Subject: [PATCH 3268/3789] perlPackages.CatalystDevel: update from 1.37 to
 1.39

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e527c0bf54f..fc236501478 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -676,10 +676,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CatalystDevel = buildPerlPackage {
-    name = "Catalyst-Devel-1.37";
+    name = "Catalyst-Devel-1.39";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Devel-1.37.tar.gz;
-      sha256 = "0yk526py65iy40z10d6w0fspb8fam5rf1hzsxnfyy4lpy91lp7s9";
+      url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Devel-1.39.tar.gz;
+      sha256 = "12m50bbkggjmpxihv3wnvr0g2qng0zwhlzi5ygppjz8wh2x73qxw";
     };
     buildInputs = [ TestFatal ];
     propagatedBuildInputs = [ CatalystRuntime CatalystActionRenderView CatalystPluginConfigLoader CatalystPluginStaticSimple ConfigGeneral FileChangeNotify FileCopyRecursive FileShareDir ModuleInstall Moose MooseXDaemonize MooseXEmulateClassAccessorFast namespaceautoclean namespaceclean PathClass Starman TemplateToolkit ];
-- 
GitLab


From b62a1edf53018f91aa88579ff9770377bd62f08d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:02 +0200
Subject: [PATCH 3269/3789] perlPackages.CatalystDispatchTypeRegex: update from
 5.90032 to 5.90033

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index fc236501478..2d41641508d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -692,10 +692,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CatalystDispatchTypeRegex = buildPerlModule {
-    name = "Catalyst-DispatchType-Regex-5.90032";
+    name = "Catalyst-DispatchType-Regex-5.90033";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MG/MGRIMES/Catalyst-DispatchType-Regex-5.90032.tar.gz;
-      sha256 = "003e31fe0c1d6dfc6be4d9cd47cb058a9b53a73bb6a9f74a132a43dbfbbb5e3c";
+      url = mirror://cpan/authors/id/M/MG/MGRIMES/Catalyst-DispatchType-Regex-5.90033.tar.gz;
+      sha256 = "0rdi8jxj9fz81l9pxl7q190v69vkgxgixcpals555xyiafnqk4vy";
     };
     propagatedBuildInputs = [ Moose TextSimpleTable ];
     meta = {
-- 
GitLab


From 599ae0f43c911fc741e1ebced1e9c71f2a34dff8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:06 +0200
Subject: [PATCH 3270/3789] perlPackages.CatalystManual: update from 5.9006 to
 5.9007

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2d41641508d..61d9a2e8710 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -723,10 +723,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CatalystManual = buildPerlPackage {
-    name = "Catalyst-Manual-5.9006";
+    name = "Catalyst-Manual-5.9007";
     src = fetchurl {
-      url = mirror://cpan/authors/id/H/HK/HKCLARK/Catalyst-Manual-5.9006.tar.gz;
-      sha256 = "0cl9nqg5jrqcf2h3pgk6q8408czf5s0k0xh3ra884c9cnx84mr95";
+      url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Manual-5.9007.tar.gz;
+      sha256 = "140526pzzqc1vyxkk9fxvp9ds3kk2rncf8nf7iz0adlr219pkg3j";
     };
     meta = {
       description = "The Catalyst developer's manual";
-- 
GitLab


From 04cdf8a974f674cdf853f02f1388da9738eb2e65 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:09 +0200
Subject: [PATCH 3271/3789] perlPackages.CatalystPluginConfigLoader: update
 from 0.30 to 0.33

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 61d9a2e8710..4c906ad6330 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -860,10 +860,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CatalystPluginConfigLoader = buildPerlPackage rec {
-    name = "Catalyst-Plugin-ConfigLoader-0.30";
+    name = "Catalyst-Plugin-ConfigLoader-0.33";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz";
-      sha256 = "1rshgsvs9ngpd4nang4flq6mx9v71w1z5klp1rm8llc88pxlqahm";
+      url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz";
+      sha256 = "0m18yqcwx5fzz4lrd5db8x8wyir1061pclv5jb9g963wbg4zk43g";
     };
     propagatedBuildInputs = [CatalystRuntime DataVisitor ConfigAny MROCompat];
   };
-- 
GitLab


From 2017c7a1eba156fbff5fb817b44288e380311b59 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:12 +0200
Subject: [PATCH 3272/3789] perlPackages.CatalystPluginSession: update from
 0.36 to 0.39

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4c906ad6330..f646597cd8c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -894,10 +894,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CatalystPluginSession = buildPerlPackage {
-    name = "Catalyst-Plugin-Session-0.36";
+    name = "Catalyst-Plugin-Session-0.39";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-0.36.tar.gz;
-      sha256 = "14wgkrg3w69gwg6zg991k5f611xqsnyx0i0xzhw9rx2j5nf9rj4b";
+      url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Plugin-Session-0.39.tar.gz;
+      sha256 = "0m4a003qgz7848iyckwbigg2vw3kmfxggh1razrnzxrbz3n6x5gi";
     };
     buildInputs = [ TestDeep TestException TestWWWMechanizePSGI ];
     propagatedBuildInputs = [ CatalystRuntime Moose MooseXEmulateClassAccessorFast MROCompat namespaceclean ObjectSignature ];
-- 
GitLab


From 66d3ba9cae7001533d90a0e579205238f6648f56 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:16 +0200
Subject: [PATCH 3273/3789] perlPackages.CatalystPluginStackTrace: update from
 0.11 to 0.12

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f646597cd8c..0bc1fb42da0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -928,10 +928,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CatalystPluginStackTrace = buildPerlPackage {
-    name = "Catalyst-Plugin-StackTrace-0.11";
+    name = "Catalyst-Plugin-StackTrace-0.12";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Plugin-StackTrace-0.11.tar.gz;
-      sha256 = "1ingivnga1yb4dqsj6icc4a58i9wdalzpn2qflsn8n2skgm223qb";
+      url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-StackTrace-0.12.tar.gz;
+      sha256 = "1b2ksz74cpigxqzf63rddar3vfmnbpwpdcbs11v0ml89pb8ar79j";
     };
     propagatedBuildInputs = [ CatalystRuntime DevelStackTrace MROCompat ];
     meta = {
-- 
GitLab


From 03e9004bc82a17656c422bb3bc1cc6a44774b561 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:19 +0200
Subject: [PATCH 3274/3789] perlPackages.CatalystPluginStaticSimple: update
 from 0.30 to 0.31

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0bc1fb42da0..eba26793850 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -941,10 +941,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CatalystPluginStaticSimple = buildPerlPackage {
-    name = "Catalyst-Plugin-Static-Simple-0.30";
+    name = "Catalyst-Plugin-Static-Simple-0.31";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AB/ABRAXXA/Catalyst-Plugin-Static-Simple-0.30.tar.gz;
-      sha256 = "18zar1n4imgnv7b4dr5sxyikry4668ngqgc6f0dr210bqafvwv7w";
+      url = mirror://cpan/authors/id/A/AB/ABRAXXA/Catalyst-Plugin-Static-Simple-0.31.tar.gz;
+      sha256 = "1mcns9qdpnja153prbyypwjicgpm1sn7rw75k7hm28g3vf59z733";
     };
     patches = [ ../development/perl-modules/catalyst-plugin-static-simple-etag.patch ];
     propagatedBuildInputs = [ CatalystRuntime MIMETypes Moose MooseXTypes namespaceautoclean ];
-- 
GitLab


From da172c171ba459c5bbf4a04dcbff6a3786fefafc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:23 +0200
Subject: [PATCH 3275/3789] perlPackages.CatalystViewDownload: update from 0.07
 to 0.09

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index eba26793850..04a37fbdd3c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -955,10 +955,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CatalystViewDownload = buildPerlPackage rec {
-    name = "Catalyst-View-Download-0.07";
+    name = "Catalyst-View-Download-0.09";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz";
-      sha256 = "1c6k4x6az0fkany16zlyaqhlp7bcx922vl4qzd3z707vs6pc06rz";
+      url = "mirror://cpan/authors/id/G/GA/GAUDEON/${name}.tar.gz";
+      sha256 = "1qgq6y9iwfbhbkbgpw9czang2ami6z8jk1zlagrzdisy4igqzkvs";
     };
     buildInputs = [  TestWWWMechanizeCatalyst Testuseok ];
     propagatedBuildInputs = [ CatalystRuntime TextCSV XMLSimple ];
-- 
GitLab


From d67240b5b90d0912bd44de4b11fc5cd48a30e32f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:28 +0200
Subject: [PATCH 3276/3789] perlPackages.CatalystViewTT: update from 0.40 to
 0.41

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 04a37fbdd3c..2ef0e3bd8cc 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -979,10 +979,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CatalystViewTT = buildPerlPackage {
-    name = "Catalyst-View-TT-0.40";
+    name = "Catalyst-View-TT-0.41";
     src = fetchurl {
-      url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-View-TT-0.40.tar.gz;
-      sha256 = "0j73mk631p9x0b0l24ikavh9nxl6lpya4g46fpanjk396d2zj8bs";
+      url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-View-TT-0.41.tar.gz;
+      sha256 = "1yrigxqapxj4k1qkykiiqy6a30ljb7hlkaw80d7n0n5mpm67j1nb";
     };
     propagatedBuildInputs = [ CatalystRuntime ClassAccessor MROCompat PathClass TemplateToolkit TemplateTimer ];
     meta = {
-- 
GitLab


From 442f027c69ef41d89c46f1cddc5c530e7566d0fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:31 +0200
Subject: [PATCH 3277/3789] perlPackages.CatalystXComponentTraits: update from
 0.16 to 0.19

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2ef0e3bd8cc..321be019f4c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -992,10 +992,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CatalystXComponentTraits = buildPerlPackage rec {
-    name = "CatalystX-Component-Traits-0.16";
+    name = "CatalystX-Component-Traits-0.19";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/CatalystX/${name}.tar.gz";
-      sha256 = "0a2mhfgv0kqmaxf2crs8mqk44lyhd9qcwlpzhrc0b0dh4z503mr4";
+      url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz";
+      sha256 = "0iq4ci8m6g2c4g01fvdl568y7pjz28f3widk986v3pyhr7ll8j88";
     };
     propagatedBuildInputs =
       [ CatalystRuntime MooseXTraitsPluggable namespaceautoclean ListMoreUtils ];
-- 
GitLab


From 3049b02731bc80d0f4dc12fc5573f85bad9209e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:34 +0200
Subject: [PATCH 3278/3789] perlPackages.ClassBase: update from 0.03 to 0.05

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 321be019f4c..9f5452b7044 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1144,10 +1144,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ClassBase = buildPerlPackage rec {
-    name = "Class-Base-0.03";
+    name = "Class-Base-0.05";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AB/ABW/${name}.tar.gz";
-      sha256 = "149875qzfyayvkb6dm8frg0kmkzyjswwrjz7gyvwi7l8b19kiyk4";
+      url = "mirror://cpan/authors/id/S/SZ/SZABGAB/${name}.tar.gz";
+      sha256 = "0vryy6b64f2wbfc2zzzvh6ravkp5i4kjdxhjbj3s08g9pwyc67y6";
     };
   };
 
-- 
GitLab


From adaa09ea51eb51c77ee0c66b243d01ae49172010 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:37 +0200
Subject: [PATCH 3279/3789] perlPackages.ClassC3: update from 0.24 to 0.26

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9f5452b7044..f56d86027e2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1152,10 +1152,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ClassC3 = buildPerlPackage {
-    name = "Class-C3-0.24";
+    name = "Class-C3-0.26";
     src = fetchurl {
-      url = mirror://cpan/authors/id/F/FL/FLORA/Class-C3-0.24.tar.gz;
-      sha256 = "1nhwf7bj7z5szk7sxmq0ynqh2k9p42a7zkfyikkairfb78xckpkz";
+      url = mirror://cpan/authors/id/H/HA/HAARG/Class-C3-0.26.tar.gz;
+      sha256 = "008xg6gf5qp2fdjqzfpg0fzhw7f308ddkxwvzdcaa9zq59sg5x6s";
     };
     propagatedBuildInputs = [ AlgorithmC3 ];
     meta = {
-- 
GitLab


From 9fbd2668a5824b0313daca41f4dc422dca4ed143 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:41 +0200
Subject: [PATCH 3280/3789] perlPackages.ClassLoad: update from 0.20 to 0.21

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f56d86027e2..5a6255da510 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1309,10 +1309,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ClassLoad = buildPerlPackage {
-    name = "Class-Load-0.20";
+    name = "Class-Load-0.21";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/Class-Load-0.20.tar.gz;
-      sha256 = "084cxrm0hcpyz3ly1iqkcjpl4bs03n42na37d3pzwa8xbs44ag42";
+      url = mirror://cpan/authors/id/E/ET/ETHER/Class-Load-0.21.tar.gz;
+      sha256 = "0z04r0jdk8l3qd96f75q3042p76hr4i747dg87s7xrpp0bjbmn8h";
     };
     buildInputs = [ TestFatal TestRequires ];
     propagatedBuildInputs = [ DataOptList ModuleImplementation ModuleRuntime PackageStash TryTiny ];
-- 
GitLab


From a826bd48361d47c31bd0c4af9ad39cf876623637 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:45 +0200
Subject: [PATCH 3281/3789] perlPackages.ClassMethodMaker: update from 2.18 to
 2.21

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5a6255da510..37a2e216d83 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1255,10 +1255,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ClassMethodMaker = buildPerlPackage {
-    name = "Class-MethodMaker-2.18";
+    name = "Class-MethodMaker-2.21";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SC/SCHWIGON/Class-MethodMaker-2.18.tar.gz;
-      sha256 = "223b7a79025e9bff984d755f9744182505e110680b13eedbac2831d45ddbeeba";
+      url = mirror://cpan/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-2.21.tar.gz;
+      sha256 = "0gca1cjy2k0mrpfnbyzm5islzfayqfvg3zzlrlm7n60p0cb48y7w";
     };
     preConfigure = "patchShebangs .";
     meta = {
-- 
GitLab


From 9a091a98b87ebd048a4b715b4a8000fe680ca6a9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:49 +0200
Subject: [PATCH 3282/3789] perlPackages.ClassMethodModifiers: update from 2.00
 to 2.10

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 37a2e216d83..35941ada790 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1268,10 +1268,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ClassMethodModifiers = buildPerlPackage {
-    name = "Class-Method-Modifiers-2.00";
+    name = "Class-Method-Modifiers-2.10";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SA/SARTAK/Class-Method-Modifiers-2.00.tar.gz;
-      sha256 = "0lvj38ahqqyhv9dpi7ks1cq35f19nfw8ygxw22x2mcmagl8mnkhs";
+      url = mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.10.tar.gz;
+      sha256 = "1dp757rzv6a9k7q0bpmjxv69g4r893vb143qq7fyqlwzg0zva3s2";
     };
     buildInputs = [ TestFatal ];
     meta = {
-- 
GitLab


From 4c05aacb52c51c4a96508e1e0431735fbde9350c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:52 +0200
Subject: [PATCH 3283/3789] perlPackages.ClassThrowable: update from 0.10 to
 0.11

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 35941ada790..346ad4190ff 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1301,10 +1301,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ClassThrowable = buildPerlPackage {
-    name = "Class-Throwable-0.10";
+    name = "Class-Throwable-0.11";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/ST/STEVAN/Class-Throwable-0.10.tar.gz;
-      sha256 = "01hjrfb951c9j83ncg5drnam8vsfdgkjjv0kjshxhkl93sgnlvdl";
+      url = mirror://cpan/authors/id/K/KM/KMX/Class-Throwable-0.11.tar.gz;
+      sha256 = "1vjadr0kqmfi9s3wfxjbqqgc7fqrk87n6b1a5979sbxxk5yh8hyk";
     };
   };
 
-- 
GitLab


From 5198214d7074abe6208c90ccea504ac4ad431fcc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:55 +0200
Subject: [PATCH 3284/3789] perlPackages.ClassUnload: update from 0.07 to 0.08

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 346ad4190ff..d3de94f5848 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1339,10 +1339,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ClassUnload = buildPerlPackage rec {
-    name = "Class-Unload-0.07";
+    name = "Class-Unload-0.08";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Class//${name}.tar.gz";
-      sha256 = "1alvn94j0wgfyyym092g9cq0mbhzin0zf7lfja6578jk5cc788rr";
+      url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz";
+      sha256 = "097gr3r2jgnm1175m4lpg4a97hv2mxrn9r0b2c6bn1x9xdhkywgh";
     };
     propagatedBuildInputs = [ ClassInspector ];
   };
-- 
GitLab


From 02cd3d3f2dbf6edc053e5c6a30326ba212bd889c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:03:58 +0200
Subject: [PATCH 3285/3789] perlPackages.ClassXSAccessor: update from 1.16 to
 1.19

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d3de94f5848..8a7a910db8a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1348,10 +1348,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ClassXSAccessor = buildPerlPackage {
-    name = "Class-XSAccessor-1.16";
+    name = "Class-XSAccessor-1.19";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SM/SMUELLER/Class-XSAccessor-1.16.tar.gz;
-      sha256 = "1yjpw9kssy4m52407k45hxjnqz02494z7x8j44pjzkyi8msafvg5";
+      url = mirror://cpan/authors/id/S/SM/SMUELLER/Class-XSAccessor-1.19.tar.gz;
+      sha256 = "1wm6013il899jnm0vn50a7iv9v6r4nqywbqzj0csyf8jbwwnpicr";
     };
     meta = {
       description = "Generate fast XS accessors without runtime compilation";
-- 
GitLab


From 35a8be6a0c524c7d27f9700939a999ab5aa24fe3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:04:02 +0200
Subject: [PATCH 3286/3789] perlPackages.CompressRawBzip2: update from 2.063 to
 2.064

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8a7a910db8a..07b3667ebd5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1383,10 +1383,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CompressRawBzip2 = buildPerlPackage {
-    name = "Compress-Raw-Bzip2-2.063";
+    name = "Compress-Raw-Bzip2-2.064";
     src = fetchurl {
-      url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.063.tar.gz;
-      sha256 = "0qi2jg76pgx1qkh4897g746cxqjr2njzzbyv2k9pq4m1m2v3jr6s";
+      url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.064.tar.gz;
+      sha256 = "0aqbggr9yf4hn21a9fra111rlmva3w8f3mqvbchl5l86knkbkwy3";
     };
 
     # Don't build a private copy of bzip2.
-- 
GitLab


From 00eaaf091a46dad3d84025f11fd3ee49ac34051a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:04:05 +0200
Subject: [PATCH 3287/3789] perlPackages.CompressRawZlib: update from 2.063 to
 2.065

---
 pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
index 9310e3ca081..5d22970155b 100644
--- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
+++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, buildPerlPackage, zlib, stdenv }:
 
 buildPerlPackage rec {
-  name = "Compress-Raw-Zlib-2.063";
+  name = "Compress-Raw-Zlib-2.065";
 
   src = fetchurl {
-    url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz";
-    sha256 = "16cn9pq4pngncs3qhlam0yw2l0q7hq4qfdyxp03jaad6ndc4dzp9";
+    url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+    sha256 = "1i09h3dvn8ipaj1l2nq2qd19wzhn7wcpbsipdkcniwi0sgy1kf1p";
   };
 
   preConfigure = ''
-- 
GitLab


From 8843b31863ffd230c60e9b337483091ea2dc9164 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:04:08 +0200
Subject: [PATCH 3288/3789] perlPackages.ConfigMVP: update from 2.200004 to
 2.200007

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 07b3667ebd5..1a728886a0f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1464,10 +1464,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ConfigMVP = buildPerlPackage {
-    name = "Config-MVP-2.200004";
+    name = "Config-MVP-2.200007";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200004.tar.gz;
-      sha256 = "dbe473f4b0fc649b82574aa71b0c5da3359058e181928d5e9197fc0ef247c3ec";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200007.tar.gz;
+      sha256 = "10hc8v22mv56wqi6drpl4pw3r8y3xrgh80ayrb2gir80ah9s5bvi";
     };
     buildInputs = [ TestFatal ];
     propagatedBuildInputs = [ ClassLoad Moose MooseXOneArgNew ParamsUtil RoleHasMessage RoleIdentifiable Throwable TieIxHash TryTiny ];
-- 
GitLab


From 42d2cf897eb67947ccca17c16646654c9fb8a3e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:04:12 +0200
Subject: [PATCH 3289/3789] perlPackages.ConfigTiny: update from 2.12 to 2.20

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1a728886a0f..477d831ecf1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1493,10 +1493,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ConfigTiny = buildPerlPackage rec {
-    name = "Config-Tiny-2.12";
+    name = "Config-Tiny-2.20";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
-      sha256 = "1a5b7f5e8245a3e7be859df571209353be30abc7292815ee0f459b8dc87cdb5b";
+      url = "mirror://cpan/authors/id/R/RS/RSAVAGE/${name}.tgz";
+      sha256 = "0grgb7av1hwpl20xh91jipla1xi0h7vx6c538arxmvgm1f71cql2";
     };
   };
 
-- 
GitLab


From 665f7e653a7bd6c8d359262bce008d942f738709 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:04:15 +0200
Subject: [PATCH 3290/3789] perlPackages.Coro: update from 6.33 to 6.37

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 477d831ecf1..4d7a2d1288f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1559,10 +1559,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Coro = buildPerlPackage {
-    name = "Coro-6.33";
+    name = "Coro-6.37";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.33.tar.gz;
-      sha256 = "1497wd9df10y65rb0w5h4h6wiy3smw9maw7z0gbz6dir774znfb5";
+      url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.37.tar.gz;
+      sha256 = "08qkwv7rpyb7zcp128crjakflc027sjkx9d2s1gzc21grsq9a456";
     };
     propagatedBuildInputs = [ AnyEvent Guard CommonSense ];
     meta = {
-- 
GitLab


From 4b906253d80a4209575896c70791cbf09e46f2aa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:04:22 +0200
Subject: [PATCH 3291/3789] perlPackages.CryptDHGMP: update from 0.00011 to
 0.00012

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4d7a2d1288f..797bb2a1a23 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1671,10 +1671,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CryptDHGMP = buildPerlPackage rec {
-    name = "Crypt-DH-GMP-0.00011";
+    name = "Crypt-DH-GMP-0.00012";
     src = fetchurl {
-      url = "mirror://cpan/authors/id//D/DM/DMAKI/${name}.tar.gz";
-      sha256 = "0c9sz67lh2d2pn9z82hngzns4sqqnawdc8a1yl7p7pc0l4r0q3hz";
+      url = "mirror://cpan/authors/id/D/DM/DMAKI/${name}.tar.gz";
+      sha256 = "0f5gdprcql4kwzgxl2s6ngcfg1jl45lzcqh7dkv5bkwlwmxa9rsi";
     };
     buildInputs = [ DevelChecklib TestRequires pkgs.gmp ];
     NIX_CFLAGS_COMPILE = "-I${pkgs.gmp}/include";
-- 
GitLab


From 33d9f8bd5c9a6d51970b93a57b98983ec71eb588 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:04:25 +0200
Subject: [PATCH 3292/3789] perlPackages.CryptOpenSSLRandom: update from 0.04
 to 0.06

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 797bb2a1a23..4b4bbf3183d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1765,10 +1765,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CryptOpenSSLRandom = buildPerlPackage rec {
-    name = "Crypt-OpenSSL-Random-0.04";
+    name = "Crypt-OpenSSL-Random-0.06";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/I/IR/IROBERTS/${name}.tar.gz";
-      sha256 = "acf7eb81023cd1f40d8c60b893096d041513df2be2aefe145cc7ae1a3dcc78c7";
+      url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz";
+      sha256 = "10yhjh04jxdf4ghqqvrcfds7vvylxv671l57lkkbg3k8qzpdzd7g";
     };
     NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include";
     NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto";
-- 
GitLab


From 3f323615b286d9c4372b83e42b599f55d2854b50 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:04:28 +0200
Subject: [PATCH 3293/3789] perlPackages.CryptPasswdMD5: update from 1.3 to
 1.40

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4b4bbf3183d..6144f62d563 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1691,10 +1691,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CryptPasswdMD5 = buildPerlPackage {
-    name = "Crypt-PasswdMD5-1.3";
+    name = "Crypt-PasswdMD5-1.40";
     src = fetchurl {
-      url = mirror://cpan/authors/id/L/LU/LUISMUNOZ/Crypt-PasswdMD5-1.3.tar.gz;
-      sha256 = "13j0v6ihgx80q8jhyas4k48b64gnzf202qajyn097vj8v48khk54";
+      url = mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-1.40.tgz;
+      sha256 = "0j0r74f18nk63phddzqbf7wqma2ci4p4bxvrwrxsy0aklbp6lzdp";
     };
   };
 
-- 
GitLab


From d3a072b81c48ff40c5894f5d3e9f7b332204541f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:04:37 +0200
Subject: [PATCH 3294/3789] perlPackages.CryptRandPasswd: update from 0.03 to
 0.05

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6144f62d563..c086312e5e4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1724,10 +1724,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CryptRandPasswd = buildPerlPackage {
-    name = "Crypt-RandPasswd-0.03";
+    name = "Crypt-RandPasswd-0.05";
     src = fetchurl {
-      url = mirror://cpan/authors/id/N/NE/NEILB/Crypt-RandPasswd-0.03.tar.gz;
-      sha256 = "0sz2b4gj2mcwj0nqvxw3gs5m49jzfbi0vla51hj957dvfk00plhf";
+      url = mirror://cpan/authors/id/N/NE/NEILB/Crypt-RandPasswd-0.05.tar.gz;
+      sha256 = "0djcjzk0wmlf02gx9935m7c1dhpmdwx3hjal8x80aa92baavwf2s";
     };
   };
 
-- 
GitLab


From 4f8820cce6e797cfc497d175381b0d9b69c87c2f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:04:40 +0200
Subject: [PATCH 3295/3789] perlPackages.CryptRijndael: update from 1.11 to
 1.12

---
 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 c086312e5e4..bdd2ee151ff 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1741,10 +1741,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CryptRijndael = buildPerlPackage rec {
-    name = "Crypt-Rijndael-1.11";
+    name = "Crypt-Rijndael-1.12";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz";
-      sha256 = "8f8833bc8839e0d4aa3c26d86d2f39ceb9b13e52a9f5e4fd928da2e71989d3b4";
+      sha256 = "1rgzlxp882cc52287awwha4ipglm6nxw5jryd6cshrr99qcx55m0";
     };
   };
 
-- 
GitLab


From ce938b40bf49e3ec3adcf36090757f917ab436d0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:04:44 +0200
Subject: [PATCH 3296/3789] perlPackages.CryptUnixCryptXS: update from 0.09 to
 0.10

---
 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 bdd2ee151ff..a1b4f5d1fe1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1749,10 +1749,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CryptUnixCryptXS = buildPerlPackage rec {
-    name = "Crypt-UnixCrypt_XS-0.09";
+    name = "Crypt-UnixCrypt_XS-0.10";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BO/BORISZ/${name}.tar.gz";
-      sha256 = "527c32b8b6eb50d52b081ceae4be2d748e718e40ea85940da59a3adeb3a33156";
+      sha256 = "1d3xamq2mm3v2bfb1ay66crljm0bigfbhay1fqglcsrb75b7ls7r";
     };
   };
 
-- 
GitLab


From c67a5180bf402edc5f9a9d2e0d587cffee909e71 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:04:49 +0200
Subject: [PATCH 3297/3789] perlPackages.DBDPg: update from 2.19.3 to 3.0.0

---
 pkgs/development/perl-modules/DBD-Pg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix
index be5faa330ae..619f2f14b96 100644
--- a/pkgs/development/perl-modules/DBD-Pg/default.nix
+++ b/pkgs/development/perl-modules/DBD-Pg/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, buildPerlPackage, DBI, postgresql }:
 
 buildPerlPackage rec {
-  name = "DBD-Pg-2.19.3";
+  name = "DBD-Pg-3.0.0";
 
   src = fetchurl {
-    url = "mirror://cpan/modules/by-module/DBD/${name}.tar.gz";
-    sha256 = "0ai6p2094hrh6kjlwfjvpw2z8wqa3scr4ba3p6rqza3z9c9hsd9p";
+    url = "mirror://cpan/authors/id/T/TU/TURNSTEP/${name}.tar.gz";
+    sha256 = "10s1dhpxxqfl421388l6gzfdm1gzxf5iah42i1w6yji9mgkz8hf8";
   };
 
   buildInputs = [ postgresql ];
-- 
GitLab


From 2624dc357571ab5ff96f2d3ceb4662bb6e74a748 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:04:53 +0200
Subject: [PATCH 3298/3789] perlPackages.DBDSQLite: update from 1.37 to 1.42

---
 pkgs/development/perl-modules/DBD-SQLite/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix
index 06688ded22a..7b1741c3d1e 100644
--- a/pkgs/development/perl-modules/DBD-SQLite/default.nix
+++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, buildPerlPackage, DBI, sqlite }:
 
 buildPerlPackage rec {
-  name = "DBD-SQLite-1.37";
+  name = "DBD-SQLite-1.42";
 
   src = fetchurl {
-    url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
-    sha256 = "0197kvlziaj2wfdbzlhdlqmzvb29fmfyy6y2isbbwlg0b0f7ccd1";
+    url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/${name}.tar.gz";
+    sha256 = "14x9cjsc8dz8ad1nad0bqiq9cbk1rjfb8h5y0rpk3pdl38y6afxb";
   };
 
   propagatedBuildInputs = [ DBI ];
-- 
GitLab


From 639c075ca54c782f84bb42593383080d90ed1254 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:04:57 +0200
Subject: [PATCH 3299/3789] perlPackages.DBI: update from 1.630 to 1.631

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a1b4f5d1fe1..ad489448dd4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2287,10 +2287,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DBI = buildPerlPackage {
-    name = "DBI-1.630";
+    name = "DBI-1.631";
     src = fetchurl {
-      url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.630.tar.gz;
-      sha256 = "18szayj2bl28fm9frf9v1dwncj67bx3rvw8ny1zwbvc6alshs5ji";
+      url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.631.tar.gz;
+      sha256 = "04fmrnchhwi7jx4niaiv93vmi343hdm3xj04w9zr2m9hhqh782np";
     };
     meta = {
       homepage = http://dbi.perl.org/;
-- 
GitLab


From bfe8e8148ac8212c61978be63090a9e1a16392eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:05:01 +0200
Subject: [PATCH 3300/3789] perlPackages.DBIxClassCandy: update from 0.002103
 to 0.002104

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ad489448dd4..82d89f55ee7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2315,10 +2315,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DBIxClassCandy = buildPerlPackage {
-    name = "DBIx-Class-Candy-0.002103";
+    name = "DBIx-Class-Candy-0.002104";
     src = fetchurl {
-      url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Candy-0.002103.tar.gz;
-      sha256 = "1vcaigvzxq9jjkhw2bkayrnsa76sakr3wrv7009f1dxyfa0iyrsk";
+      url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Candy-0.002104.tar.gz;
+      sha256 = "0b0fsm3waqm43qmhcynb2s6p8hi9yr41p9c4c5aq6l58x3xwvp34";
     };
     propagatedBuildInputs = [ TestDeep TestFatal DBIxClass LinguaENInflect StringCamelCase ];
     meta = {
-- 
GitLab


From 83a4c1ed79038e618d30a9e67f6247862d76b34b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:05:04 +0200
Subject: [PATCH 3301/3789] perlPackages.DataCompare: update from 1.22 to
 1.2102

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 82d89f55ee7..cc76cac2146 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1810,10 +1810,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DataCompare = buildPerlPackage rec {
-    name = "Data-Compare-1.22";
+    name = "Data-Compare-1.2102";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz";
-      sha256 = "1bz8qasp3ndiprxq2l0llbc0xbnjq11lz0l1lfzxiap7v1y2r3yf";
+      url = "mirror://cpan/authors/id/D/DC/DCANTRELL/${name}.tar.gz";
+      sha256 = "0v1997gnq3gpcr7f64jmyay2l60s5z6gsiy5hbpn1p2l2hrfnwlj";
     };
     propagatedBuildInputs = [ FileFindRule ];
   };
-- 
GitLab


From 28410f40b4f15c3f14698bcdec62c07bf9c43d12 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Apr 2014 14:05:09 +0200
Subject: [PATCH 3302/3789] perlPackages.DataPage: update from 2.01 to 2.02

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cc76cac2146..df06b82ab29 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1887,10 +1887,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DataPage = buildPerlPackage {
-    name = "Data-Page-2.01";
+    name = "Data-Page-2.02";
     src = fetchurl {
-      url = mirror://cpan/authors/id/L/LB/LBROCARD/Data-Page-2.01.tar.gz;
-      sha256 = "0mvhlid9qx9yd94rgr4lfz9kvflimc1dzcah0x7q5disw39aqrzr";
+      url = mirror://cpan/authors/id/L/LB/LBROCARD/Data-Page-2.02.tar.gz;
+      sha256 = "1hvi92c4h2angryc6pngw7gbm3ysc2jfmyxk2wh9ia4vdwpbs554";
     };
     propagatedBuildInputs = [TestException ClassAccessorChained];
   };
-- 
GitLab


From 2ba552fb2e7745ddbc52001208f89f7f82310251 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Apr 2014 13:27:51 +0200
Subject: [PATCH 3303/3789] Revert "Fix services.udisks.enable."

This reverts commit 02a30bea44edf1116dcab16c5e64501312b2927b,
necessary after reverting to udisks 1.0.4.

http://hydra.nixos.org/build/10194840
---
 nixos/modules/services/hardware/udisks.nix  | 2 --
 pkgs/os-specific/linux/udisks/1-default.nix | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/nixos/modules/services/hardware/udisks.nix b/nixos/modules/services/hardware/udisks.nix
index a3527468cce..531ee192573 100644
--- a/nixos/modules/services/hardware/udisks.nix
+++ b/nixos/modules/services/hardware/udisks.nix
@@ -40,8 +40,6 @@ with pkgs.lib;
       '';
 
     services.udev.packages = [ pkgs.udisks ];
-
-    systemd.packages = [ pkgs.udisks ];
   };
 
 }
diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix
index 8c112417f0a..09731d54ab7 100644
--- a/pkgs/os-specific/linux/udisks/1-default.nix
+++ b/pkgs/os-specific/linux/udisks/1-default.nix
@@ -19,11 +19,6 @@ stdenv.mkDerivation rec {
       substituteInPlace src/main.c --replace \
         "/sbin:/bin:/usr/sbin:/usr/bin" \
         "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin"
-
-      # For some reason @libexec@ is set to 'lib/' when building.
-      # Passing --libexecdir in configureFlags didn't help.
-      substituteInPlace data/systemd/udisks.service.in \
-        --replace "@libexecdir@" "$out/libexec"
     '';
 
   buildInputs =
-- 
GitLab


From 06614031d634f2b4af90d87c140465cba0731275 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 6 Apr 2014 21:20:45 +0200
Subject: [PATCH 3304/3789] accountservice: add dbus and systemd services

Enable by default with gnome3.
---
 nixos/modules/module-list.nix                 |  1 +
 .../services/desktops/accountservice.nix      | 40 +++++++++++++++++++
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../libraries/accountservice/default.nix      |  7 +++-
 4 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/services/desktops/accountservice.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 86bb87e91de..0b482dcda1b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -96,6 +96,7 @@
   ./services/databases/postgresql.nix
   ./services/databases/virtuoso.nix
   ./services/databases/monetdb.nix
+  ./services/desktops/accountservice.nix
   ./services/games/ghost-one.nix
   ./services/games/minecraft-server.nix
   ./services/hardware/acpid.nix
diff --git a/nixos/modules/services/desktops/accountservice.nix b/nixos/modules/services/desktops/accountservice.nix
new file mode 100644
index 00000000000..b21207f05a1
--- /dev/null
+++ b/nixos/modules/services/desktops/accountservice.nix
@@ -0,0 +1,40 @@
+# AccountsService daemon.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.accounts-daemon = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable AccountsService, a DBus service for accessing
+          the list of user accounts and information attached to those accounts.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.accounts-daemon.enable {
+
+    environment.systemPackages = [ pkgs.accountservice ];
+
+    services.dbus.packages = [ pkgs.accountservice ];
+
+    systemd.packages = [ pkgs.accountservice ];
+  };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 4f876b9b111..381ebc7ad29 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -22,6 +22,7 @@ in {
     # Enable helpful DBus services.
     security.polkit.enable = true;
     services.udisks2.enable = true;
+    services.accounts-daemon.enable = true;
     networking.networkmanager.enable = true;
     services.upower.enable = config.powerManagement.enable;
 
diff --git a/pkgs/development/libraries/accountservice/default.nix b/pkgs/development/libraries/accountservice/default.nix
index 8cab9e39e19..9734a6bc980 100644
--- a/pkgs/development/libraries/accountservice/default.nix
+++ b/pkgs/development/libraries/accountservice/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool, libtool, gobjectIntrospection, polkit }:
+{ stdenv, fetchurl, pkgconfig, glib, intltool
+, libtool, gobjectIntrospection, polkit, systemd }:
 
 stdenv.mkDerivation rec {
   name = "accountsservice-0.6.35";
@@ -8,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0f1hzl6hw56xvwgmd4yvmdyj15xj1fafw45pzv3qarww7h0wg8b5";
   };
 
-  buildInputs = [ pkgconfig glib intltool libtool gobjectIntrospection polkit ];
+  buildInputs = [ pkgconfig glib intltool libtool
+                  gobjectIntrospection polkit systemd ];
 
+  configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
 }
-- 
GitLab


From b0d0ffc0b2231064ec0d00003a2f757bc27de414 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 7 Apr 2014 18:35:02 +0200
Subject: [PATCH 3305/3789] libxklavier: add gobject introspection support

---
 pkgs/development/libraries/libxklavier/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
index cb3c3b23e7f..18f57473fb9 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libX11, libXi, xkeyboard_config, libxml2
-, libICE, glib, libxkbfile, isocodes }:
+, libICE, glib, libxkbfile, isocodes, gobjectIntrospection }:
 
 let
   version = "5.3";
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
+  buildInputs = [ gobjectIntrospection ];
+
   configureFlags = ''
     --with-xkb-base=${xkeyboard_config}/etc/X11/xkb
     --disable-xmodmap-support
-- 
GitLab


From 285d8f013c2b49401d30300b33a0bce7a3a3c501 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 7 Apr 2014 18:35:47 +0200
Subject: [PATCH 3306/3789] libgnomekbd: new package

Keyboard management library. Used by gnome-control-center.
---
 .../gnome-3/core/libgnomekbd/default.nix      | 24 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/libgnomekbd/default.nix

diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix
new file mode 100644
index 00000000000..1156474e5a7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/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/default.nix b/pkgs/desktops/gnome-3/default.nix
index ee40ff19e71..0a9a0b39aaf 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -62,6 +62,8 @@ rec {
 
   libgnome_keyring = callPackage ./core/libgnome-keyring { };
 
+  libgnomekbd = callPackage ./core/libgnomekbd { };
+
   folks = callPackage ./core/folks { };
 
   gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
-- 
GitLab


From 04c2fe4cbe017277db058291e7e4c46d6427fa39 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 7 Apr 2014 18:36:23 +0200
Subject: [PATCH 3307/3789] gnome-control-center: propagate libgnomekbd in user
 env

---
 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a3f2e2b7584..92a6b6c2c40 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "1ac34kqkf174w0qc12p927dfhcm69xnv7fqzmbhjab56rn49wypn";
   };
 
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
   propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
                             hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
 
-- 
GitLab


From 79cef74f4ddbbcb4affd5cafe9f693b689109a0a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 7 Apr 2014 21:29:46 +0200
Subject: [PATCH 3308/3789] gnome-system-monitor: new package

System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used

https://help.gnome.org/users/gnome-system-monitor/3.10/
---
 .../core/gnome-system-monitor/default.nix     | 38 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix

diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
new file mode 100644
index 00000000000..91fbe67957f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/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/default.nix b/pkgs/desktops/gnome-3/default.nix
index 0a9a0b39aaf..dac1a730eb0 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -78,6 +78,8 @@ rec {
 
   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 { };
-- 
GitLab


From 9b737eb28222f701f16d7e278f0db6c5b809e8c9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 7 Apr 2014 23:52:40 +0200
Subject: [PATCH 3309/3789] libmusicbrainz5: new major version

---
 .../libraries/libmusicbrainz/5.x.nix          | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/libmusicbrainz/5.x.nix

diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix
new file mode 100644
index 00000000000..7cdb8fb4691
--- /dev/null
+++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, cmake, neon, libdiscid }:
+
+stdenv.mkDerivation rec {
+  name = "libmusicbrainz-5.0.1";
+
+  buildInputs = [ cmake neon libdiscid ];
+
+  src = fetchurl {
+    url = "https://github.com/downloads/metabrainz/libmusicbrainz/${name}.tar.gz";
+    md5 = "a0406b94c341c2b52ec0fe98f57cadf3";
+  };
+
+  dontUseCmakeBuildDir=true;
+
+  meta = {
+    homepage = http://musicbrainz.org/doc/libmusicbrainz;
+    description = "MusicBrainz Client Library (5.x version)";
+    longDescription = ''
+      The libmusicbrainz (also known as mb_client or MusicBrainz Client
+      Library) is a development library geared towards developers who wish to
+      add MusicBrainz lookup capabilities to their applications.'';
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0fea1417de..9bee27b52eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5065,6 +5065,8 @@ let
 
   libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { };
 
+  libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { };
+
   libmusicbrainz = libmusicbrainz3;
 
   libnet = callPackage ../development/libraries/libnet { };
-- 
GitLab


From 3feb20356e8b82c9a3638fbda655a14ea11d6e38 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 7 Apr 2014 23:53:07 +0200
Subject: [PATCH 3310/3789] evince: enable gobject introspection

---
 pkgs/desktops/gnome-3/core/evince/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 3a2688a64b9..4b50840534c 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -2,6 +2,7 @@
 , 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 {
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig intltool perl perlXMLParser libxml2
-    glib gtk3 pango atk gdk_pixbuf
+    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
@@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--disable-nautilus" # Do not use nautilus
+    "--enable-introspection"
   ];
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-- 
GitLab


From ea3644cb098306fb767ae50426270491d190547a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 7 Apr 2014 23:54:07 +0200
Subject: [PATCH 3311/3789] sushi: new package

A quick previewer for Nautilus

http://en.wikipedia.org/wiki/Sushi_(software)
---
 nixos/modules/module-list.nix                 |  1 +
 .../services/desktops/gnome3/sushi.nix        | 38 +++++++++++++++++++
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 pkgs/desktops/gnome-3/core/sushi/default.nix  | 38 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 5 files changed, 80 insertions(+)
 create mode 100644 nixos/modules/services/desktops/gnome3/sushi.nix
 create mode 100644 pkgs/desktops/gnome-3/core/sushi/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0b482dcda1b..ecf1901d500 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -97,6 +97,7 @@
   ./services/databases/virtuoso.nix
   ./services/databases/monetdb.nix
   ./services/desktops/accountservice.nix
+  ./services/desktops/gnome3/sushi.nix
   ./services/games/ghost-one.nix
   ./services/games/minecraft-server.nix
   ./services/hardware/acpid.nix
diff --git a/nixos/modules/services/desktops/gnome3/sushi.nix b/nixos/modules/services/desktops/gnome3/sushi.nix
new file mode 100644
index 00000000000..7fe37e26f43
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/sushi.nix
@@ -0,0 +1,38 @@
+# GNOME Sushi daemon.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.gnome3.sushi = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable Sushi, a quick previewer for nautilus.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.gnome3.sushi.enable {
+
+    environment.systemPackages = [ pkgs.gnome3.sushi ];
+
+    services.dbus.packages = [ pkgs.gnome3.sushi ];
+
+  };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 381ebc7ad29..985884595ab 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -23,6 +23,7 @@ in {
     security.polkit.enable = true;
     services.udisks2.enable = true;
     services.accounts-daemon.enable = true;
+    services.gnome3.sushi.enable = true;
     networking.networkmanager.enable = true;
     services.upower.enable = config.powerManagement.enable;
 
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
new file mode 100644
index 00000000000..55729a54669
--- /dev/null
+++ b/pkgs/desktops/gnome-3/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.8.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/sushi/3.8/${name}.tar.xz";
+    sha256 = "c4f24d0961ce8fc5ef3a4fe9af178e368c7117459df2c0be12c8f953646c82dd";
+  };
+
+  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/default.nix b/pkgs/desktops/gnome-3/default.nix
index dac1a730eb0..fb92cd80998 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -114,6 +114,8 @@ rec {
 
   rest = callPackage ./core/rest { };
 
+  sushi = callPackage ./core/sushi { };
+
   totem = callPackage ./core/totem { };
 
   totem-pl-parser = callPackage ./core/totem-pl-parser { };
-- 
GitLab


From 968740e0c1e36d5cab3e6bfe566e3ee709a620b5 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 8 Apr 2014 07:04:11 -0500
Subject: [PATCH 3312/3789] capstone: version 2.1.2

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../libraries/capstone/default.nix            | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/capstone/default.nix

diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
new file mode 100644
index 00000000000..37d1c118e4a
--- /dev/null
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name    = "capstone-${version}";
+  version = "2.1.2";
+
+  src = fetchurl {
+    url    = "http://www.capstone-engine.org/download/${version}/${name}.tgz";
+    sha256 = "1k6px3vdcsfby3lakss5sazs875kbzkzqk7cj79xrm2y5ik1vr29";
+  };
+
+  buildPhase = false;
+  installPhase = "PREFIX=$out ./make.sh install";
+
+  meta = {
+    description = "advanced disassembly library";
+    homepage    = "http://www.capstone-engine.org";
+    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 ed5a3d3ab73..7b9cc109f59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -576,6 +576,8 @@ let
 
   ccnet = callPackage ../tools/networking/ccnet { };
 
+  capstone = callPackage ../development/libraries/capstone { };
+
   ditaa = callPackage ../tools/graphics/ditaa { };
 
   direnv = callPackage ../tools/misc/direnv { };
-- 
GitLab


From caf98828bb2f8d40448ca3a6782b881a0f2cec58 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Apr 2014 15:13:27 +0200
Subject: [PATCH 3313/3789] nixos-generate-config: Fix PCI/USB checks

As reported by Kirill Elagin, read_file doesn't chomp its output. So
the equality tests on PCI/USB vendor and device IDs were failing.
---
 .../installer/tools/nixos-generate-config.pl       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index d42c4c1f1dc..da1d2688277 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -96,9 +96,9 @@ my $videoDriver;
 
 sub pciCheck {
     my $path = shift;
-    my $vendor = read_file "$path/vendor";
-    my $device = read_file "$path/device";
-    my $class = read_file "$path/class";
+    my $vendor = read_file "$path/vendor"; chomp $vendor;
+    my $device = read_file "$path/device"; chomp $device;
+    my $class = read_file "$path/class"; chomp $class;
 
     my $module;
     if (-e "$path/driver/module") {
@@ -130,6 +130,7 @@ 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" ||
@@ -156,6 +157,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/;
 }
 
@@ -170,9 +172,9 @@ push @attrs, "hardware.opengl.videoDrivers = [ \"$videoDriver\" ];" if $videoDri
 
 sub usbCheck {
     my $path = shift;
-    my $class = read_file "$path/bInterfaceClass";
-    my $subclass = read_file "$path/bInterfaceSubClass";
-    my $protocol = read_file "$path/bInterfaceProtocol";
+    my $class = read_file "$path/bInterfaceClass"; chomp $class;
+    my $subclass = read_file "$path/bInterfaceSubClass"; chomp $subclass;
+    my $protocol = read_file "$path/bInterfaceProtocol"; chomp $protocol;
 
     my $module;
     if (-e "$path/driver/module") {
-- 
GitLab


From 57cfb4315e875f9755bc3a7e8f73d8401797ad3a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 8 Apr 2014 10:12:52 -0500
Subject: [PATCH 3314/3789] haskell: sbv 3.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../libraries/haskell/sbv/default.nix         | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/sbv/default.nix

diff --git a/pkgs/development/libraries/haskell/sbv/default.nix b/pkgs/development/libraries/haskell/sbv/default.nix
new file mode 100644
index 00000000000..a4450bdc892
--- /dev/null
+++ b/pkgs/development/libraries/haskell/sbv/default.nix
@@ -0,0 +1,19 @@
+{ cabal, deepseq, filepath, HUnit, mtl, QuickCheck, random, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "sbv";
+  version = "3.0";
+  sha256 = "16k9f0x4amg7mm8ib22nyk1rngrbf9311gl2m15hbdq49jp8ik9i";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    deepseq filepath HUnit mtl QuickCheck random syb
+  ];
+  testDepends = [ filepath HUnit syb ];
+  meta = {
+    homepage = "http://leventerkok.github.com/sbv/";
+    description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
+    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 acffb2b08b5..7172f4d0f42 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2207,6 +2207,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   SafeSemaphore = callPackage ../development/libraries/haskell/SafeSemaphore {};
 
+  sbv = callPackage ../development/libraries/haskell/sbv {};
+
   scientific = callPackage ../development/libraries/haskell/scientific {};
 
   scotty = callPackage ../development/libraries/haskell/scotty {};
-- 
GitLab


From 54a8e0ed0f8bdbd6dafe8a9af38ca15df2645c1b Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 8 Apr 2014 17:42:04 +0200
Subject: [PATCH 3315/3789] flashplayer: Update from 11.2.202.346 ->
 11.2.202.350

---
 .../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 a33c879ad92..a78ab7d27f7 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.346";
+  version = "11.2.202.350";
 
   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 = "19jgiw5f0ksxqgi6jkla4qq7gx9gnn9jmpjgqanb7mhl5fdl0v55";
+        sha256 = "0f5y05c0acvdzd7a7qi93kd17byazf9swm6gml5rph5bc25aw77l";
       }
     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 = "01f4zady0r0n5rfqq2285svc13wiypmfrm8fnirmr5lpwl5d89ra";
+        sha256 = "0nsrj56xbpn8r4365zby8qbc38cl2anb5ky0h7jwyh7xyrs9xmml";
       }
     else throw "Flash Player is not supported on this platform";
 
-- 
GitLab


From 35abc43092d4a1d8452b6f40e3be0df508ddfdc0 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 8 Apr 2014 10:49:04 -0500
Subject: [PATCH 3316/3789] cb1cat: 20140328100000 -> 20140403153000

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/cb1cat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/cb1cat/default.nix b/pkgs/tools/security/cb1cat/default.nix
index 7c3d9a1661e..546ace2d8ed 100644
--- a/pkgs/tools/security/cb1cat/default.nix
+++ b/pkgs/tools/security/cb1cat/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "cb1cat-${version}";
-  version = "20140328100000";
+  version = "20140403153000";
 
   src = fetchurl {
     url    = "https://www.cblnk.com/cb1cat/dist/${name}.tgz";
-    sha256 = "0fbly4fg2qsb4kx9wgv357bsa3mmmy8xmy0yszw80k50ixphjswv";
+    sha256 = "1zi0rxbgmp6vkcarg493gfgn7pnfdpz0iplcgslbc45n2bxkv70q";
   };
 
   installPhase = ''
-- 
GitLab


From f14540a6191ea5652a01245fc51197baf0ead2f5 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 8 Apr 2014 10:53:50 -0500
Subject: [PATCH 3317/3789] fsharp: 3.1 -> 3.1.0

This matches the traditional upstream versioning for FSharp in the wild

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/fsharp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index 963c7e2cb5c..1d795504589 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "fsharp-${version}";
-  version = "3.1";
+  version = "3.1.0";
 
   src = fetchgit {
     url = "https://github.com/fsharp/fsharp";
-- 
GitLab


From 95272dc61a4824554f3190d29fc10f240bad7667 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Apr 2014 18:14:46 +0200
Subject: [PATCH 3318/3789] nixUnstable: Update to 1.7pre3576_2b6c8ef

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 28497647f86..c9cf7dc7916 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.7pre3538_4900957";
+  name = "nix-1.7pre3576_2b6c8ef";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/9862372/download/5/${name}.tar.xz";
-    sha256 = "05l9j892cscf0ig6s0kxkfigzqwrsza4g38a40s87yvd2cr14pxq";
+    url = "http://hydra.nixos.org/build/10201398/download/5/${name}.tar.xz";
+    sha256 = "7a735ac859a88a7042b1a7f33f3ab94e9374a0695c68cceb63d4536a79986236";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];
-- 
GitLab


From f251d0d3867a0350e9dd6f21d1812c1f38ea8233 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Tue, 8 Apr 2014 17:21:47 +0100
Subject: [PATCH 3319/3789] Remove haskellPackages.lensAeson

This is now part of haskellPackages.lens
---
 .../libraries/haskell/lens-aeson/default.nix  | 23 -------------------
 pkgs/top-level/haskell-packages.nix           |  2 --
 2 files changed, 25 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/lens-aeson/default.nix

diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix
deleted file mode 100644
index 7ea890a5eb3..00000000000
--- a/pkgs/development/libraries/haskell/lens-aeson/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ cabal, aeson, attoparsec, doctest, filepath, genericDeriving
-, lens, semigroups, simpleReflect, text, unorderedContainers
-, utf8String, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lens-aeson";
-  version = "0.1.2";
-  sha256 = "1h0w8p227r8gzvgqjl210i0z7xxv3435vwyi3j7vkm7a05cdk03l";
-  buildDepends = [
-    aeson attoparsec lens text unorderedContainers utf8String vector
-  ];
-  testDepends = [
-    doctest filepath genericDeriving semigroups simpleReflect
-  ];
-  meta = {
-    homepage = "http://github.com/lens/lens-aeson/";
-    description = "Law-abiding lenses for aeson";
-    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 ca689949b39..7e03102f624 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1620,8 +1620,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   lens = callPackage ../development/libraries/haskell/lens {};
 
-  lensAeson = callPackage ../development/libraries/haskell/lens-aeson {};
-
   lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {};
 
   lensFamilyCore = callPackage ../development/libraries/haskell/lens-family-core {};
-- 
GitLab


From 6a3d9a84c43869589c804f8b7590220d815cb064 Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Tue, 8 Apr 2014 20:13:19 +0200
Subject: [PATCH 3320/3789] searx: upgrade to latest

---
 pkgs/top-level/python-packages.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bed95bf29fb..4fe14a3bbe2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8795,19 +8795,21 @@ rec {
   };
 
   searx = buildPythonPackage rec {
-    name = "searx-${version}";
-    version = "0.2.0";
+    name = "searx-${rev}";
+    rev = "44d3af9fb2482cd0df1a8ababbe2fdf27ab33172";
 
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/s/searx/${name}.tar.gz";
-      sha256 = "19hxjg3vhq7fygcvfhsr3i40c8kbi7i76ym9cv2s03b3zijd38w0";
+    src = fetchgit {
+      url = "git://github.com/asciimoo/searx";
+      inherit rev;
+      sha256 = "1w505pzdkkcglq782wg7f5fxrw9i5jzp7px20c2xz18pps2m3rsm";
     };
 
-    propagatedBuildInputs = [ pyyaml lxml grequests flaskbabel flask requests gevent speaklater Babel pytz ];
+    propagatedBuildInputs = [ pyyaml lxml grequests flaskbabel flask requests
+      gevent speaklater Babel pytz dateutil ];
 
     meta = {
       homepage = https://github.com/asciimoo/searx;
-      description = "A privacy-respecting, hackable metasearch engine.";
+      description = "A privacy-respecting, hackable metasearch engine";
       license = stdenv.lib.licenses.agpl3Plus;
       maintainers = [ stdenv.lib.maintainers.matejc ];
     };
-- 
GitLab


From f5865a515529557820198fab173d48fda85fbdf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 6 Apr 2014 19:54:59 +0200
Subject: [PATCH 3321/3789] linux: switch to 3.12 by default (latest longterm)

Close #2151.
---
 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 7b9cc109f59..4862a0cdcf6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7105,7 +7105,7 @@ let
 
   # The current default kernel / kernel modules.
   linux = linuxPackages.kernel;
-  linuxPackages = linuxPackages_3_10;
+  linuxPackages = linuxPackages_3_12;
 
   # A function to build a manually-configured kernel
   linuxManualConfig = pkgs.buildLinux;
-- 
GitLab


From 23c7a249d33b22c1e19437679339110e9dfb8b50 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 21:35:30 +0200
Subject: [PATCH 3322/3789] ghc: add release version 7.8.1

---
 pkgs/development/compilers/ghc/7.8.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.8.1.nix b/pkgs/development/compilers/ghc/7.8.1.nix
index f58ca9cc1fc..c007eb23da8 100644
--- a/pkgs/development/compilers/ghc/7.8.1.nix
+++ b/pkgs/development/compilers/ghc/7.8.1.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "7.8.0.20140228";
+  version = "7.8.1";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "http://www.haskell.org/ghc/dist/7.8.1-rc2/${name}-src.tar.bz2";
-    sha256 = "09xlgz1xg0182wjy62h3j0xvnhllhjlyvj30vc3him98parnr76w";
+    url = "http://www.haskell.org/ghc/dist/7.8.1/${name}-src.tar.xz";
+    sha256 = "1j4b7ap87vbwqvf8ck1ksrldw2w626f50w20gs4klm6jpvz66xp0";
   };
 
   buildInputs = [ ghc perl gmp ncurses ];
-- 
GitLab


From 9553141e21e9c2b31ed6480039e6524d26081711 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 13:29:45 +0200
Subject: [PATCH 3323/3789] haskell-Chart-cairo: update to version 1.2.2

---
 pkgs/development/libraries/haskell/Chart-cairo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
index 55c893bcc81..90f93edd4dc 100644
--- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart-cairo";
-  version = "1.2";
-  sha256 = "08aaf7yb2vry75g15md2012rnmyfrn7awwvba7c38d4h6vm95llg";
+  version = "1.2.2";
+  sha256 = "1bbi5bvrh8wmgzv5am5ndgdr68gd68ipparkkk9ld4majwf4vm6w";
   buildDepends = [
     cairo Chart colour dataDefaultClass lens mtl operational time
   ];
-- 
GitLab


From b7f8dbf57d2cab0b0b0d3664cc863f9ec1bc276a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 13:29:47 +0200
Subject: [PATCH 3324/3789] haskell-Chart-diagrams: update to version 1.2.2

---
 pkgs/development/libraries/haskell/Chart-diagrams/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
index 2593b67edbc..22e432f2f32 100644
--- a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart-diagrams";
-  version = "1.2";
-  sha256 = "11pvyasra4mxid6826z6rkjhr71lg37fihzr8mgvjw3arascgqxz";
+  version = "1.2.2";
+  sha256 = "144dy9vp3x04s03jrkyfqczpwayb8k7dq702w9wm3d8q4ysva62q";
   buildDepends = [
     blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib
     diagramsPostscript diagramsSvg lens mtl operational SVGFonts text
-- 
GitLab


From 849b2144ab72ae78e2a8b3a549ae3ef197d8358e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 13:29:48 +0200
Subject: [PATCH 3325/3789] haskell-Chart-gtk: update to version 1.2.2

---
 pkgs/development/libraries/haskell/Chart-gtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
index 4745dda31cc..8b1ce6b89e7 100644
--- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart-gtk";
-  version = "1.2";
-  sha256 = "0qq72cf1m2gvcksa1jj5g9qi6b47pmpzh3grhs7kh3m7qyq0a56g";
+  version = "1.2.2";
+  sha256 = "1mg6nln0jwp6hals9vhhsfqiwix424fv1v1p4h99s0xwy5cna1z9";
   buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ];
   jailbreak = true;
   meta = {
-- 
GitLab


From 485dc4d93b05303de33334ffce00bd451a475b44 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 13:29:50 +0200
Subject: [PATCH 3326/3789] haskell-Chart: update to version 1.2.2

---
 pkgs/development/libraries/haskell/Chart/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix
index 5f7e8c2cb4b..7604cd28b8e 100644
--- a/pkgs/development/libraries/haskell/Chart/default.nix
+++ b/pkgs/development/libraries/haskell/Chart/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart";
-  version = "1.2";
-  sha256 = "0cvp2j2hgsdk93f4rbd8y7s11hlr3zg15qkpxhd7p7sl2k6j2r5x";
+  version = "1.2.2";
+  sha256 = "0yd3xca500lbzvlvhdsbrkiy53laikq6hc290rc061agvd535a7p";
   buildDepends = [
     colour dataDefaultClass lens mtl operational time
   ];
-- 
GitLab


From 26972702e0779b10be04034895447a0d16ba6579 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 13:29:52 +0200
Subject: [PATCH 3327/3789] haskell-dyre: update to version 0.8.12

---
 pkgs/development/libraries/haskell/dyre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/dyre/default.nix b/pkgs/development/libraries/haskell/dyre/default.nix
index 8b3d2cab677..178f01952ea 100644
--- a/pkgs/development/libraries/haskell/dyre/default.nix
+++ b/pkgs/development/libraries/haskell/dyre/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dyre";
-  version = "0.8.11";
-  sha256 = "0sg5csshznbbyvq72s4sps7bkjlkfxiwcy4i3ip83lrxjw1msvr8";
+  version = "0.8.12";
+  sha256 = "10hnlysy4bjvvznk8v902mlk4jx95qf972clyi1l32xkqrf30972";
   buildDepends = [
     binary executablePath filepath ghcPaths ioStorage time xdgBasedir
   ];
-- 
GitLab


From 363d62dbfd0229bb0997e96d95f8570cf05fb632 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 13:29:54 +0200
Subject: [PATCH 3328/3789] haskell-ghc-mod: update to version 4.0.2

---
 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 0e60526e8fc..185f70785e5 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.0.1";
-  sha256 = "13dgphwspp91bycnmcxgxzv4470wpjv5zfswwgmad644i77nixmm";
+  version = "4.0.2";
+  sha256 = "10ndlydx0ymz8fbcgjjnzyak7lly34012bsghwj0i0dc5ja1pic8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 556736cc2be80f767f448ee66d7b2f6ff58c95c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 13:29:56 +0200
Subject: [PATCH 3329/3789] haskell-hakyll: update to version 4.5.1.0

---
 pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 56977517b9e..5e40bb851f0 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.0.2";
-  sha256 = "1aphn76iq0cxxnb2ixddr017wbp6caxwjh5azfa4cy2lw2jmznyz";
+  version = "4.5.1.0";
+  sha256 = "0p78wscz9gwg1as49wjl49ydzbv972w6wmbmvhw1rfb9d5xana1i";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From b885ecf16c0e0bbc1a10451250c471e0180c32f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 13:29:57 +0200
Subject: [PATCH 3330/3789] haskell-http-client-multipart: update to version
 0.3.0.0

---
 .../libraries/haskell/http-client-multipart/default.nix        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-client-multipart/default.nix b/pkgs/development/libraries/haskell/http-client-multipart/default.nix
index 4413bf54d70..9cad23a7999 100644
--- a/pkgs/development/libraries/haskell/http-client-multipart/default.nix
+++ b/pkgs/development/libraries/haskell/http-client-multipart/default.nix
@@ -5,12 +5,11 @@ cabal.mkDerivation (self: {
   version = "0.3.0.0";
   sha256 = "18za6s3658hgm95rrygghrz0b643c7nkzaimb14v2hv82w3k9crg";
   buildDepends = [ httpClient ];
+  noHaddock = true;
   meta = {
     homepage = "https://github.com/snoyberg/http-client";
     description = "Generate multipart uploads for http-client. (deprecated)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
-  # This library now contains now modules as it is deprecated.
-  noHaddock = true;
 })
-- 
GitLab


From ef5661c01f57f49381b69269f440567aaa64f296 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 13:29:59 +0200
Subject: [PATCH 3331/3789] haskell-tasty: update to version 0.8.0.4

---
 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 706053a3e03..13e4e37e4b0 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.2";
-  sha256 = "0xn0qc1d7bq8s7988x58snq5ipvmi7g87rg89r1l21yxl6a85zw5";
+  version = "0.8.0.4";
+  sha256 = "016niwympxbxpg3yq7samgh92l20wxm2h6cwhqal4zdj8n9262j0";
   buildDepends = [
     ansiTerminal async deepseq mtl optparseApplicative regexTdfa stm
     tagged unboundedDelays
-- 
GitLab


From bed88f0ff7a1ddbbf45a4b36dbe87871474c0eb1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 13:30:01 +0200
Subject: [PATCH 3332/3789] haskell-twitter-conduit: update to version 0.0.2.1

---
 .../libraries/haskell/twitter-conduit/default.nix  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
index d3985877077..4d14ed4582a 100644
--- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
@@ -1,21 +1,21 @@
 { cabal, aeson, attoparsec, attoparsecConduit, authenticateOauth
 , conduit, dataDefault, doctest, failure, filepath, hlint
-, httpClientMultipart, httpConduit, httpTypes, lens, liftedBase
-, monadControl, monadLogger, resourcet, shakespeareText, text, time
+, httpClient, httpConduit, httpTypes, lens, liftedBase
+, monadControl, monadLogger, resourcet, shakespeare, text, time
 , transformers, transformersBase, twitterTypes
 }:
 
 cabal.mkDerivation (self: {
   pname = "twitter-conduit";
-  version = "0.0.2";
-  sha256 = "1bkn0lfwwr5lnw4xfzdjiad48r1qz6m4z0nq1inz45gflmjwmghj";
+  version = "0.0.2.1";
+  sha256 = "1z0d8hwjrdw8gkww9zkn9cqv3g40my952li8pm3c164d7ywswszq";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson attoparsec attoparsecConduit authenticateOauth conduit
-    dataDefault failure httpClientMultipart httpConduit httpTypes lens
-    liftedBase monadControl monadLogger resourcet shakespeareText text
-    time transformers transformersBase twitterTypes
+    dataDefault failure httpClient httpConduit httpTypes lens
+    liftedBase monadControl monadLogger resourcet shakespeare text time
+    transformers transformersBase twitterTypes
   ];
   testDepends = [ doctest filepath hlint ];
   meta = {
-- 
GitLab


From e49e74ebf48ba1edd6ee2bcfa5d14158beb7aaf8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 13:30:02 +0200
Subject: [PATCH 3333/3789] haskell-twitter-types: update to version
 0.2.20140407

---
 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 aea8f3dbc3a..05c37c02f41 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.20140406";
-  sha256 = "0zzdnmcx57w2j2bypwnxkrmaa2zw945g8717lm0c2wzk31kjbvi8";
+  version = "0.2.20140407";
+  sha256 = "171m7fqq82g630r1x5advq04qfkdljvc8d8ygyafr2x44ss2a996";
   buildDepends = [ aeson httpTypes text unorderedContainers ];
   testDepends = [
     aeson attoparsec httpTypes HUnit shakespeare testFramework
-- 
GitLab


From 3010e63fb780cffad90e224e80ffcaf8651a7dac Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 7 Apr 2014 15:37:02 +0200
Subject: [PATCH 3334/3789] gst-plugins-bad: disable faac by default because
 it's unfree

A lot of packages are not built in hydra due to gst-plugins-bad
being unfree. Make faac dependency optional.
---
 pkgs/development/libraries/gstreamer/bad/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 7647c0f64db..eed4c12f254 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,11 +1,14 @@
 { stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc
-, faac, faad2, libass, libkate, libmms
+, faacSupport ? false, faac ? null
+, faad2, libass, libkate, libmms
 , libmodplug, mpeg2dec, mpg123 
 , openjpeg, libopus, librsvg
 , timidity, libvdpau, wayland
 , libwebp, xvidcore, gnutls
 }:
 
+assert faacSupport -> faac != null;
+
 stdenv.mkDerivation rec {
   name = "gst-plugins-bad-1.2.3";
 
@@ -32,10 +35,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gst-plugins-base orc
-    faac faad2 libass libkate libmms
+    faad2 libass libkate libmms
     libmodplug mpeg2dec mpg123 
     openjpeg libopus librsvg
     timidity libvdpau wayland
     libwebp xvidcore gnutls
-  ];
+  ] ++ stdenv.lib.optional faacSupport faac;
 }
-- 
GitLab


From dcd0e68b177954278a767e55e63e80260daa3ea0 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 8 Apr 2014 16:13:08 -0500
Subject: [PATCH 3335/3789] stunnel: adopt, bump to version 5.01

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/networking/stunnel/default.nix | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 672f05577dd..0ea7a948c8d 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchurl, openssl }:
 
-stdenv.mkDerivation {
-  name = "stunnel-5.00";
-  
+stdenv.mkDerivation rec {
+  name    = "stunnel-${version}";
+  version = "5.01";
+
   src = fetchurl {
-    url = http://www.stunnel.org/downloads/stunnel-5.00.tar.gz;
-    sha256 = "04xwfppvmj0wrzar3rbypax93jb10f1skh3gq86gy6pglx96v648";
+    url    = "http://www.stunnel.org/downloads/${name}.tar.gz";
+    sha256 = "0sw87x7yrgjx43a5x0cy71p2vr5j0l8n5pv49hq159p8zxcbyr95";
   };
 
-  buildInputs = [openssl];
+  buildInputs = [ openssl ];
+  configureFlags = [ "--with-ssl=${openssl}" ];
 
-  configureFlags = [
-    "--with-ssl=${openssl}"
-  ];
-  
   meta = {
-    description = "Stunnel - Universal SSL wrapper";
-    homepage = http://www.stunnel.org/;
-    license = "GPLv2";
+    description = "universal tls/ssl wrapper";
+    homepage    = "http://www.stunnel.org/";
+    license     = stdenv.lib.licenses.gpl2Plus;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }
-- 
GitLab


From e09250d41ccaf65c570ba94c0335493365807770 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Apr 2014 00:09:31 +0200
Subject: [PATCH 3336/3789] Disable allowUnfree by default

Fixes #2134.
---
 nixos/doc/manual/release-notes.xml        | 21 +++++++++++++++++++--
 nixos/lib/eval-config.nix                 |  7 ++++++-
 nixos/modules/services/security/fprot.nix |  6 ++++--
 pkgs/stdenv/generic/default.nix           |  2 +-
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes.xml
index 68feb80e090..10815ba613a 100644
--- a/nixos/doc/manual/release-notes.xml
+++ b/nixos/doc/manual/release-notes.xml
@@ -7,7 +7,7 @@
 
 <section xml:id="sec-release-14.02">
 
-<title>Release 14.02 (“Baboon”, 2014/02/??)</title>
+<title>Release 14.04 (“Baboon”, 2014/04/??)</title>
 
 <para>This is the second stable release branch of NixOS.  The main
 enhancements are the following:
@@ -18,7 +18,7 @@ enhancements are the following:
   <xref linkend="sec-uefi-installation"/> for
   details.</para></listitem>
 
-  <listitem><para>NixOS is now based on Glibc 2.18 and GCC
+  <listitem><para>NixOS is now based on Glibc 2.19 and GCC
   4.8.</para></listitem>
 
 </itemizedlist>
@@ -30,6 +30,23 @@ following incompatible changes:
 
 <itemizedlist>
 
+  <listitem><para>Nixpkgs no longer exposes unfree packages by
+  default. If your NixOS configuration requires unfree packages from
+  Nixpkgs, you need to enable support for them explicitly by setting:
+
+<programlisting>
+nixpkgs.config.allowUnfree = true;
+</programlisting>
+
+  Otherwise, you get an error message such as:
+
+<screen>
+error: package ‘nvidia-x11-331.49-3.12.17’ in ‘…/nvidia-x11/default.nix:56’
+  has an unfree license, refusing to evaluate
+</screen>
+
+  </para></listitem>
+
   <listitem><para>The firewall is now enabled by default. If you don’t
   want this, you need to disable it explicitly:
 
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 4b8c7354a7e..e082b174454 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -26,10 +26,15 @@ rec {
 
   # These are the extra arguments passed to every module.  In
   # particular, Nixpkgs is passed through the "pkgs" argument.
+  # FIXME: we enable config.allowUnfree to make packages like
+  # nvidia-x11 available. This isn't a problem because if the user has
+  # ‘nixpkgs.config.allowUnfree = false’, then evaluation will fail on
+  # the 64-bit package anyway. However, it would be cleaner to respect
+  # nixpkgs.config here.
   extraArgs = extraArgs_ // {
     inherit pkgs modules baseModules;
     modulesPath = ../modules;
-    pkgs_i686 = import ./nixpkgs.nix { system = "i686-linux"; };
+    pkgs_i686 = import ./nixpkgs.nix { system = "i686-linux"; config.allowUnfree = true; };
     utils = import ./utils.nix pkgs;
   };
 
diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix
index 9f1fc4ed6d8..a109191be55 100644
--- a/nixos/modules/services/security/fprot.nix
+++ b/nixos/modules/services/security/fprot.nix
@@ -18,7 +18,6 @@ in {
 	};
 
 	productData = mkOption {
-	  default = "${pkgs.fprot}/opt/f-prot/product.data";
 	  description = ''
 	    product.data file. Defaults to the one supplied with installation package.
 	  '';
@@ -32,7 +31,6 @@ in {
 	};
 
 	licenseKeyfile = mkOption {
-	  default = "${pkgs.fprot}/opt/f-prot/license.key";
 	  description = ''
 	    License keyfile. Defaults to the one supplied with installation package.
 	  '';
@@ -45,6 +43,10 @@ in {
   ###### implementation
 
   config = mkIf cfg.updater.enable {
+
+    services.fprot.updater.productData = "${pkgs.fprot}/opt/f-prot/product.data";
+    services.fprot.updater.licenseKeyfile = "${pkgs.fprot}/opt/f-prot/license.key";
+
     environment.systemPackages = [ pkgs.fprot ];
     environment.etc = singleton {
       source = "${pkgs.fprot}/opt/f-prot/f-prot.conf";
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index f1cf34b160c..03000d0cdd8 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -14,7 +14,7 @@ let lib = import ../../../lib; in lib.makeOverridable (
 
 let
 
-  allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1";
+  allowUnfree = config.allowUnfree or false && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1";
 
   allowBroken = builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
 
-- 
GitLab


From 627923d5b7dd4d2a7633a9b7771f76f522961810 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Apr 2014 00:12:48 +0200
Subject: [PATCH 3337/3789] Replace $HYDRA_DISALLOW_UNFREE with
 $NIXPKGS_ALLOW_UNFREE

We've never used this environment variable in Hydra (except for a few
days). This is also more consistent with $NIXPKGS_ALLOW_BROKEN.
---
 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 03000d0cdd8..ea61e7d68a2 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -14,7 +14,7 @@ let lib = import ../../../lib; in lib.makeOverridable (
 
 let
 
-  allowUnfree = config.allowUnfree or false && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1";
+  allowUnfree = config.allowUnfree or false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1";
 
   allowBroken = builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
 
-- 
GitLab


From 331fa06c79ff562fbf39ff842404fd316a6e81bb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Apr 2014 00:13:52 +0200
Subject: [PATCH 3338/3789] =?UTF-8?q?Add=20a=20flag=20=E2=80=98config.allo?=
 =?UTF-8?q?wBroken=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 ea61e7d68a2..3a475933d24 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -16,7 +16,7 @@ let
 
   allowUnfree = config.allowUnfree or false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1";
 
-  allowBroken = builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
+  allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
 
   unsafeGetAttrPos = builtins.unsafeGetAttrPos or (n: as: null);
 
-- 
GitLab


From 2bb8d963b1b5b3925f22efdd3dbecbbad2961425 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Apr 2014 00:17:16 +0200
Subject: [PATCH 3339/3789] Die tabs die

---
 nixos/modules/services/security/fprot.nix | 72 +++++++++++------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix
index a109191be55..5f8d398996f 100644
--- a/nixos/modules/services/security/fprot.nix
+++ b/nixos/modules/services/security/fprot.nix
@@ -10,31 +10,31 @@ in {
 
     services.fprot = {
       updater = {
-	enable = mkOption {
-	  default = false;
-	  description = ''
-	    Whether to enable automatic F-Prot virus definitions database updates.
-	  '';
-	};
-
-	productData = mkOption {
-	  description = ''
-	    product.data file. Defaults to the one supplied with installation package.
-	  '';
-	};
-
-	frequency = mkOption {
-	  default = 30;
-	  description = ''
-	    Update virus definitions every X minutes.
-	  '';
-	};
-
-	licenseKeyfile = mkOption {
-	  description = ''
-	    License keyfile. Defaults to the one supplied with installation package.
-	  '';
-	};
+        enable = mkOption {
+          default = false;
+          description = ''
+            Whether to enable automatic F-Prot virus definitions database updates.
+          '';
+        };
+
+        productData = mkOption {
+          description = ''
+            product.data file. Defaults to the one supplied with installation package.
+          '';
+        };
+
+        frequency = mkOption {
+          default = 30;
+          description = ''
+            Update virus definitions every X minutes.
+          '';
+        };
+
+        licenseKeyfile = mkOption {
+          description = ''
+            License keyfile. Defaults to the one supplied with installation package.
+          '';
+        };
 
       };
     };
@@ -44,8 +44,8 @@ in {
 
   config = mkIf cfg.updater.enable {
 
-    services.fprot.updater.productData = "${pkgs.fprot}/opt/f-prot/product.data";
-    services.fprot.updater.licenseKeyfile = "${pkgs.fprot}/opt/f-prot/license.key";
+    services.fprot.updater.productData = mkDefault "${pkgs.fprot}/opt/f-prot/product.data";
+    services.fprot.updater.licenseKeyfile = mkDefault "${pkgs.fprot}/opt/f-prot/license.key";
 
     environment.systemPackages = [ pkgs.fprot ];
     environment.etc = singleton {
@@ -69,22 +69,22 @@ in {
 
     jobs = {
       fprot_updater = {
-	name = "fprot-updater";
-	  task = true;
+        name = "fprot-updater";
+          task = true;
 
-	  # have to copy fpupdate executable because it insists on storing the virus database in the same dir
+          # have to copy fpupdate executable because it insists on storing the virus database in the same dir
           preStart = ''
             mkdir -m 0755 -p ${stateDir}
             chown ${fprotUser}:${fprotGroup} ${stateDir}
-	    cp ${pkgs.fprot}/opt/f-prot/fpupdate ${stateDir}
-	    ln -sf ${cfg.updater.productData} ${stateDir}/product.data
+            cp ${pkgs.fprot}/opt/f-prot/fpupdate ${stateDir}
+            ln -sf ${cfg.updater.productData} ${stateDir}/product.data
           '';
-	  #setuid = fprotUser;
-	  #setgid = fprotGroup;
+          #setuid = fprotUser;
+          #setgid = fprotGroup;
           exec = "/var/lib/fprot/fpupdate --keyfile ${cfg.updater.licenseKeyfile}";
-      }; 
+      };
     };
 
  };
 
-}
\ No newline at end of file
+}
-- 
GitLab


From 452a1f9318ef3baeb967b648b439e0de10e41b88 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 8 Apr 2014 18:26:52 -0400
Subject: [PATCH 3340/3789] Revert "Turn on user-controlled wpa-cli on the
 livecd"

user-controlled wpa-cli requires explicit interface setting for some
reason

This reverts commit c6797b373f379f7a7f8a7da01bdf3f6751f11f2e.
---
 nixos/modules/profiles/installation-device.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 85ae51ec68e..3b058c6e971 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -45,7 +45,6 @@ with pkgs.lib;
 
     # Enable wpa_supplicant, but don't start it by default.
     networking.wireless.enable = true;
-    networking.wireless.userControlled.enable = true;
     jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 "";
 
     # Tell the Nix evaluator to garbage collect more aggressively.
-- 
GitLab


From 2bc0f7b701a41aaf2e2f4615ab3dbe66e38573c8 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 8 Apr 2014 13:23:12 +0200
Subject: [PATCH 3341/3789] evolution-data-server: fix gsettings schemas and
 add dbus service

---
 nixos/modules/module-list.nix                 |  1 +
 .../desktops/gnome3/evolution-data-server.nix | 39 +++++++++++++++++++
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../core/evolution-data-server/default.nix    | 10 ++++-
 4 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/services/desktops/gnome3/evolution-data-server.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ecf1901d500..7e69eabdeac 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -97,6 +97,7 @@
   ./services/databases/virtuoso.nix
   ./services/databases/monetdb.nix
   ./services/desktops/accountservice.nix
+  ./services/desktops/gnome3/evolution-data-server.nix
   ./services/desktops/gnome3/sushi.nix
   ./services/games/ghost-one.nix
   ./services/games/minecraft-server.nix
diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
new file mode 100644
index 00000000000..64592133666
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
@@ -0,0 +1,39 @@
+# Evolution Data Server daemon.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.gnome3.evolution-data-server = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable Evolution Data Server, a collection of services for 
+          storing addressbooks and calendars.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.gnome3.evolution-data-server.enable {
+
+    environment.systemPackages = [ pkgs.evolution_data_server ];
+
+    services.dbus.packages = [ pkgs.evolution_data_server ];
+
+  };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 985884595ab..626c683f9dc 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -23,6 +23,7 @@ in {
     security.polkit.enable = true;
     services.udisks2.enable = true;
     services.accounts-daemon.enable = true;
+    services.gnome3.evolution-data-server.enable = true;
     services.gnome3.sushi.enable = true;
     networking.networkmanager.enable = true;
     services.upower.enable = config.powerManagement.enable;
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 0ded30b11ab..9e7d0cb3da0 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret
-, p11_kit, db, nspr, nss, libical, gperf, valaSupport ? true, vala }:
+, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }:
 
 
 stdenv.mkDerivation rec {
@@ -12,13 +12,19 @@ stdenv.mkDerivation rec {
 
   buildInputs = with gnome3;
     [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret
-      gcr p11_kit db nspr nss libgweather libical libgdata gperf ]
+      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;
   };
-- 
GitLab


From f88597d6e4feb5bb11e8e84f7c396d02a245cb44 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 8 Apr 2014 13:24:56 +0200
Subject: [PATCH 3342/3789] gnome-contacts: new package

Contacts is GNOME's integrated address book

https://wiki.gnome.org/Apps/Contacts
---
 .../gnome-contacts/configure_dbus_glib.patch  | 10 ++++
 .../gnome-3/core/gnome-contacts/default.nix   | 51 +++++++++++++++++++
 .../gnome-contacts/fix_row_selected.patch     | 11 ++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 4 files changed, 74 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-contacts/configure_dbus_glib.patch
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-contacts/fix_row_selected.patch

diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/configure_dbus_glib.patch b/pkgs/desktops/gnome-3/core/gnome-contacts/configure_dbus_glib.patch
new file mode 100644
index 00000000000..926762defbd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/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/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
new file mode 100644
index 00000000000..f8059f952e6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/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/core/gnome-contacts/fix_row_selected.patch b/pkgs/desktops/gnome-3/core/gnome-contacts/fix_row_selected.patch
new file mode 100644
index 00000000000..b379b4b8ee9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/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/default.nix b/pkgs/desktops/gnome-3/default.nix
index fb92cd80998..73a3843bad2 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -40,6 +40,8 @@ rec {
 
   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 { };
-- 
GitLab


From 8553993887fcb821c06f91e43b0a5ca3b6c3111e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 8 Apr 2014 15:02:15 +0200
Subject: [PATCH 3343/3789] telepathy-mission-control: add dbus service,
 enabled by default on gnome3

---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/desktops/telepathy.nix | 39 +++++++++++++++++++
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../telepathy/mission-control/default.nix     |  9 ++++-
 4 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/services/desktops/telepathy.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7e69eabdeac..867cedacaec 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -99,6 +99,7 @@
   ./services/desktops/accountservice.nix
   ./services/desktops/gnome3/evolution-data-server.nix
   ./services/desktops/gnome3/sushi.nix
+  ./services/desktops/telepathy.nix
   ./services/games/ghost-one.nix
   ./services/games/minecraft-server.nix
   ./services/hardware/acpid.nix
diff --git a/nixos/modules/services/desktops/telepathy.nix b/nixos/modules/services/desktops/telepathy.nix
new file mode 100644
index 00000000000..bd417db88af
--- /dev/null
+++ b/nixos/modules/services/desktops/telepathy.nix
@@ -0,0 +1,39 @@
+# Telepathy daemon.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.telepathy = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable Telepathy service, a communications framework
+          that enables real-time communication via pluggable protocol backends.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.telepathy.enable {
+
+    environment.systemPackages = [ pkgs.telepathy_mission_control ];
+
+    services.dbus.packages = [ pkgs.telepathy_mission_control ];
+
+  };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 626c683f9dc..dffa82437c8 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -25,6 +25,7 @@ in {
     services.accounts-daemon.enable = true;
     services.gnome3.evolution-data-server.enable = true;
     services.gnome3.sushi.enable = true;
+    services.telepathy.enable = true;
     networking.networkmanager.enable = true;
     services.upower.enable = config.powerManagement.enable;
 
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
index 5d44f97a1be..a8142fc1e5c 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }:
+{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-5.16.0";
@@ -9,7 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "1l61w6j04mbrjsbcfrlc0safh9nlsjnj0z6lszal64r9bhkcghzd";
   };
 
-  buildInputs = [ telepathy_glib ];
+  buildInputs = [ telepathy_glib makeWrapper ];
 
   nativeBuildInputs = [ pkgconfig libxslt ];
+
+  preFixup = ''
+    wrapProgram "$out/libexec/mission-control-5" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
 }
-- 
GitLab


From 9219c503c940e87806139fed4d9c94ca20fe726c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 8 Apr 2014 20:27:37 +0200
Subject: [PATCH 3344/3789] file-roller: fix gsettings schemas

---
 pkgs/desktops/gnome-3/desktop/file-roller/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/desktop/file-roller/default.nix b/pkgs/desktops/gnome-3/desktop/file-roller/default.nix
index 0f48103c93d..41f1fb0097f 100644
--- a/pkgs/desktops/gnome-3/desktop/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/desktop/file-roller/default.nix
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive
                   attr bzip2 acl makeWrapper ];
 
-  postInstall = ''
+  preFixup = ''
     wrapProgram "$out/bin/file-roller" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share"
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From c56af6102a53dd6463483b968cf82d14646f03b7 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 8 Apr 2014 22:44:22 +0200
Subject: [PATCH 3345/3789] at-spi2-core: add dbus module, enabled on gnome3 by
 default

---
 nixos/modules/module-list.nix                 |  1 +
 .../services/desktops/gnome3/at-spi2-core.nix | 39 +++++++++++++++++++
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 3 files changed, 41 insertions(+)
 create mode 100644 nixos/modules/services/desktops/gnome3/at-spi2-core.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 867cedacaec..b9da7786d2c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -97,6 +97,7 @@
   ./services/databases/virtuoso.nix
   ./services/databases/monetdb.nix
   ./services/desktops/accountservice.nix
+  ./services/desktops/gnome3/at-spi2-core.nix
   ./services/desktops/gnome3/evolution-data-server.nix
   ./services/desktops/gnome3/sushi.nix
   ./services/desktops/telepathy.nix
diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
new file mode 100644
index 00000000000..7a25a794c2e
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
@@ -0,0 +1,39 @@
+# at-spi2-core daemon.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.gnome3.at-spi2-core = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable at-spi2-core, a service for the Assistive Technologies
+          available on the GNOME platform.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.gnome3.at-spi2-core.enable {
+
+    environment.systemPackages = [ pkgs.gnome3.at_spi2_core ];
+
+    services.dbus.packages = [ pkgs.gnome3.at_spi2_core ];
+
+  };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index dffa82437c8..0a4afcd81a3 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -23,6 +23,7 @@ in {
     security.polkit.enable = true;
     services.udisks2.enable = true;
     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.telepathy.enable = true;
-- 
GitLab


From ba200a2c3cfe1e122eec30e588f37430a50feff7 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 8 Apr 2014 23:09:57 +0200
Subject: [PATCH 3346/3789] gnome-dictionary: remove the duplicated entry under
 desktop/

---
 pkgs/desktops/gnome-3/default.nix             |  2 --
 .../desktop/gnome-dictionary/default.nix      | 20 -------------------
 2 files changed, 22 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/desktop/gnome-dictionary/default.nix

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 73a3843bad2..d9a673fb4c7 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -139,8 +139,6 @@ rec {
 
   file-roller = callPackage ./desktop/file-roller { };
 
-  gnome_dictionary = callPackage ./desktop/gnome-dictionary { };
-
   gnome_desktop = callPackage ./desktop/gnome-desktop { };
 
   gtksourceview = callPackage ./desktop/gtksourceview { };
diff --git a/pkgs/desktops/gnome-3/desktop/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/desktop/gnome-dictionary/default.nix
deleted file mode 100644
index 3e952f99eb0..00000000000
--- a/pkgs/desktops/gnome-3/desktop/gnome-dictionary/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gnome_doc_utils, intltool, which
-, libxml2, libxslt, itstool }:
-
-stdenv.mkDerivation rec {
-  version = "3.10.0";
-  name = "gnome-dictionary-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-dictionary/3.10/${name}.tar.xz";
-    sha256 = "1mqf6ln0cgrw12n9fg81sjbhavrgzvvq7fy3gl55il7pa3z612r5";
-  };
-
-  buildInputs = [ gnome3.gtk ];
-  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libxml2 libxslt itstool ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-
-}
-- 
GitLab


From a3115707dd1563cfdab75ae716a33aeba4c651ce Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 9 Apr 2014 00:02:20 +0200
Subject: [PATCH 3347/3789] Add environment.gnome3.excludePackages

Give the user a full desktop, and the possibility to exclude
non-base packages from the default list of packages.
---
 lib/lists.nix                                 |  3 ++
 .../services/x11/desktop-managers/gnome3.nix  | 43 +++++++++++++------
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 71a89702796..6c7773304de 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -226,4 +226,7 @@ in rec {
   deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y;
 
   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 0a4afcd81a3..bebda772352 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -15,6 +15,13 @@ in {
       description = "Enable Gnome 3 desktop manager.";
     };
 
+    environment.gnome3.excludePackages = mkOption {
+      default = [];
+      example = "[ pkgs.gnome3.totem ]";
+      type = types.listOf types.package;
+      description = "Which packages gnome should exclude from the default environment";
+    };
+
   };
 
   config = mkIf cfg.enable {
@@ -51,25 +58,35 @@ in {
     environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules"
                                                 "${pkgs.glib_networking}/lib/gio/modules" ];
     environment.systemPackages =
-      [ gnome3.evince
+      [ gnome3.dconf
+        pkgs.glib_networking
+        pkgs.ibus
+        gnome3.gnome-backgrounds
+        gnome3.gnome_control_center
+        gnome3.gnome_icon_theme
+        gnome3.gnome_settings_daemon
+        gnome3.gnome_shell
+        gnome3.gnome_themes_standard
+      ] ++ (lists.difference [
+        gnome3.baobab
         gnome3.eog
-        gnome3.dconf
-        gnome3.vino
         gnome3.epiphany
-        gnome3.baobab
+        gnome3.evince
         gnome3.gucharmap
         gnome3.nautilus
+        gnome3.totem
+        gnome3.vino
         gnome3.yelp
-        pkgs.glib_networking
-        pkgs.ibus
-        gnome3.gnome-backgrounds
-        gnome3.gnome_shell
-        gnome3.gnome_settings_daemon
+        gnome3.gnome-calculator
+        gnome3.gnome-contacts
+        gnome3.gnome-font-viewer
+        gnome3.gnome-screenshot
+        gnome3.gnome-system-log
+        gnome3.gnome-system-monitor
         gnome3.gnome_terminal
-        gnome3.gnome_icon_theme
-        gnome3.gnome_themes_standard
-        gnome3.gnome_control_center
-      ];
+
+        gnome3.file-roller
+      ] config.environment.gnome3.excludePackages);
   };
 
 
-- 
GitLab


From 3ff158289a22a259db35abd80e317be7e34b32b8 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 8 Apr 2014 19:21:06 -0500
Subject: [PATCH 3348/3789] lockdep: refactor into non-kernel package

Lockdep doesn't *really* require the kernel package - just the kernel
sources. It's really a user-space tool just compiled from some portable
code within the kernel, nothing more.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../{kernel/lockdep.nix => lockdep/default.nix}  | 16 ++++++++++------
 pkgs/top-level/all-packages.nix                  |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)
 rename pkgs/os-specific/linux/{kernel/lockdep.nix => lockdep/default.nix} (58%)

diff --git a/pkgs/os-specific/linux/kernel/lockdep.nix b/pkgs/os-specific/linux/lockdep/default.nix
similarity index 58%
rename from pkgs/os-specific/linux/kernel/lockdep.nix
rename to pkgs/os-specific/linux/lockdep/default.nix
index 4b1805fc39e..77cb43a7b53 100644
--- a/pkgs/os-specific/linux/kernel/lockdep.nix
+++ b/pkgs/os-specific/linux/lockdep/default.nix
@@ -1,9 +1,13 @@
-{ stdenv, kernel }:
+{ stdenv, fetchurl }:
 
-assert stdenv.lib.versionAtLeast kernel.version "3.14";
-stdenv.mkDerivation {
-  name = "lockdep-linux-${kernel.version}";
-  inherit (kernel) src patches;
+stdenv.mkDerivation rec {
+  name    = "lockdep-${version}";
+  version = "3.14";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa";
+  };
 
   preConfigure = "cd tools/lib/lockdep";
   installPhase = ''
@@ -16,7 +20,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "User-space locking validation via the kernel";
+    description = "userspace locking validation tool built on the Linux kernel";
     homepage    = "https://kernel.org/";
     license     = stdenv.lib.licenses.gpl2;
     platforms   = stdenv.lib.platforms.linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4862a0cdcf6..016f9582066 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7065,8 +7065,6 @@ let
 
     perf = callPackage ../os-specific/linux/kernel/perf.nix { };
 
-    lockdep = callPackage ../os-specific/linux/kernel/lockdep.nix { };
-
     psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { };
 
     spl = callPackage ../os-specific/linux/spl/default.nix { };
@@ -7131,6 +7129,8 @@ let
 
   lm_sensors = callPackage ../os-specific/linux/lm-sensors { };
 
+  lockdep = callPackage ../os-specific/linux/lockdep { };
+
   lsiutil = callPackage ../os-specific/linux/lsiutil { };
 
   kmod = callPackage ../os-specific/linux/kmod { };
-- 
GitLab


From 692ee73af1ca3bad404f89fcf73ce3f679ffafe4 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 8 Apr 2014 19:37:47 -0500
Subject: [PATCH 3349/3789] libseccomp: version 2.1.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../libraries/libseccomp/default.nix          | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/libraries/libseccomp/default.nix

diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
new file mode 100644
index 00000000000..32ac480c1f8
--- /dev/null
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, getopt }:
+
+stdenv.mkDerivation rec {
+  name    = "libseccomp-${version}";
+  version = "2.1.1";
+
+  src = fetchurl {
+    url    = "mirror://sourceforge/libseccomp/libseccomp-${version}.tar.gz";
+    sha256 = "0744mjx5m3jl1hzz13zypivl88m0wn44mf5gsrd3yf3w80gc24l8";
+  };
+
+  # This fixes the check for 'getopt' to function appropriately.
+  # Additionally, this package can optionally include the kernel
+  # headers if they exist, or use its own inline copy of the source
+  # for talking to the seccomp filter - we opt to always use the
+  # inline copy
+  patchPhase = ''
+    substituteInPlace ./configure --replace "verify_deps getopt" ""
+    substituteInPlace ./configure --replace getopt ${getopt}/bin/getopt
+    substituteInPlace ./configure --replace 'opt_sysinc_seccomp="yes"' 'opt_sysinc_seccomp="no"'
+  '';
+
+  meta = {
+    description = "high level library for the Linux Kernel seccomp filter";
+    homepage    = "http://sourceforge.net/projects/libseccomp";
+    license     = stdenv.lib.licenses.lgpl2;
+    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 016f9582066..397f6574bc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4868,6 +4868,8 @@ let
   libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };
   libgnome_keyring3 = gnome3.libgnome_keyring;
 
+  libseccomp = callPackage ../development/libraries/libseccomp { };
+
   libsecret = callPackage ../development/libraries/libsecret { };
 
   libgtop = callPackage ../development/libraries/libgtop {};
-- 
GitLab


From 29c0d0047faffed8055da6a7c84c0a36743f8ce0 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 8 Apr 2014 21:15:55 -0500
Subject: [PATCH 3350/3789] luajit: adopt, upgrade, optimize

 - Build the 'amalgamation' by default - more RAM needed to build, but
   better overall performance
 - Upgrade to version 2.0.3
 - Adopt as maintainer

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../interpreters/luajit/default.nix           | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index f74ad18d5e4..46c0b49c3b8 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -1,28 +1,31 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation rec{
-    version = "2.0.2";
-    name = "LuaJIT-${version}";
+stdenv.mkDerivation rec {
+  name    = "luajit-${version}";
+  version = "2.0.3";
 
-    src = fetchurl {
-        url="http://luajit.org/download/${name}.tar.gz";
-        sha256="0f3cykihfdn3gi6na9p0xjd4jnv26z18m441n5vyg42q9abh4ln0";
-    };
+  src = fetchurl {
+    url    = "http://luajit.org/download/LuaJIT-${version}.tar.gz";
+    sha256 = "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm";
+  };
 
-    patchPhase = stdenv.lib.optionalString (stdenv.gcc.libc != null)
-    ''
-      substituteInPlace Makefile \
-        --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig
-    '';
+  enableParallelBuilding = true;
 
-    installPhase = ''
-        make install PREFIX=$out
-    '';
+  patchPhase = stdenv.lib.optionalString (stdenv.gcc.libc != null)
+  ''
+    substituteInPlace Makefile \
+      --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig
+  '';
 
-    meta = {
-        description= "Just-in-time compiler and interpreter for lua 5.1.";
-        homepage = http://luajit.org;
-        license = stdenv.lib.licenses.mit;
-	platorms = stdenv.lib.platforms.linux;
-    };
+  configurePhase = false;
+  buildFlags     = [ "amalg" ]; # Build highly optimized version
+  installPhase   = "make install PREFIX=$out";
+
+  meta = {
+    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 ];
+  };
 }
-- 
GitLab


From d2efe82eaab157b935723de85727d03a6033fa20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 9 Apr 2014 11:21:16 +0200
Subject: [PATCH 3351/3789] munin: 2.0.19 -> 2.0.20

---
 pkgs/servers/monitoring/munin/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index a0c0423042e..8d1b03ddf34 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, fetchgit, makeWrapper, which, coreutils, rrdtool, perl, perlPackages
+{ stdenv, fetchurl, makeWrapper, which, coreutils, rrdtool, perl, perlPackages
 , python, ruby, openjdk, nettools
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.19";
+  version = "2.0.20";
   name = "munin-${version}";
 
-  src = fetchgit {
-    url = "git://github.com/munin-monitoring/munin.git";
-    rev = "refs/tags/${version}";
-    sha256 = "0027rrdrmcql68b475jlxnfgkijbfngynkjpdii6fgaszswqz3ay";
+  src = fetchurl {
+    url = "https://github.com/munin-monitoring/munin/archive/${version}.tar.gz";
+    sha256 = "17b24fsr8abipq09hipnh6cd4h2aiwyzyjhg0wpplngwals54qmc";
   };
 
   buildInputs = [ 
-- 
GitLab


From 09e245b3ab146ea721c00e82bc22ba45b4e47296 Mon Sep 17 00:00:00 2001
From: vi <noreply@example.org>
Date: Wed, 9 Apr 2014 16:32:14 +0800
Subject: [PATCH 3352/3789] Derivations for HandsomeSoup and hxt-xpath
 (Haskell.)

---
 .../libraries/haskell/HandsomeSoup/default.nix | 18 ++++++++++++++++++
 .../libraries/haskell/hxt-http/default.nix     | 14 ++++++++++++++
 .../libraries/haskell/hxt-xpath/default.nix    | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  6 ++++++
 4 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/HandsomeSoup/default.nix
 create mode 100644 pkgs/development/libraries/haskell/hxt-http/default.nix
 create mode 100644 pkgs/development/libraries/haskell/hxt-xpath/default.nix

diff --git a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix
new file mode 100644
index 00000000000..f20efdae4cf
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix
@@ -0,0 +1,18 @@
+{ cabal, HTTP, hxt, hxtHttp, MaybeT, mtl, network, parsec
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "HandsomeSoup";
+  version = "0.3.2";
+  sha256 = "0ixqk32sfv6kj41vc6fzflv6f6jwvnkvcdf9pmgkc675218ggh53";
+  buildDepends = [
+    HTTP hxt hxtHttp MaybeT mtl network parsec transformers
+  ];
+  meta = {
+    homepage = "https://github.com/egonSchiele/HandsomeSoup";
+    description = "Work with HTML more easily in HXT";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hxt-http/default.nix b/pkgs/development/libraries/haskell/hxt-http/default.nix
new file mode 100644
index 00000000000..14867df7fc1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hxt-http/default.nix
@@ -0,0 +1,14 @@
+{ cabal, HTTP, hxt, network, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "hxt-http";
+  version = "9.1.4";
+  sha256 = "176k71dc30cnjjr9y9vphs0aixs3ww16197qyc491qjrzhymm2g2";
+  buildDepends = [ HTTP hxt network parsec ];
+  meta = {
+    homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
+    description = "Interface to native Haskell HTTP package HTTP";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hxt-xpath/default.nix b/pkgs/development/libraries/haskell/hxt-xpath/default.nix
new file mode 100644
index 00000000000..91524320ece
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hxt-xpath/default.nix
@@ -0,0 +1,14 @@
+{ cabal, filepath, hxt, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "hxt-xpath";
+  version = "9.1.2.1";
+  sha256 = "0r9xzxwdqaj0arz9pv6f272dz73m83agbln9q9bclmgqys6l0kr9";
+  buildDepends = [ filepath hxt parsec ];
+  meta = {
+    homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
+    description = "The XPath modules for HXT";
+    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 7172f4d0f42..6a72057b190 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1519,10 +1519,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hxtCharproperties = callPackage ../development/libraries/haskell/hxt-charproperties {};
 
+  hxtHttp = callPackage ../development/libraries/haskell/hxt-http {};
+
   hxtRegexXmlschema = callPackage ../development/libraries/haskell/hxt-regex-xmlschema {};
 
   hxtUnicode = callPackage ../development/libraries/haskell/hxt-unicode {};
 
+  hxtXpath = callPackage ../development/libraries/haskell/hxt-xpath {};
+
   hybridVectors = callPackage ../development/libraries/haskell/hybrid-vectors {};
 
   iCalendar = callPackage ../development/libraries/haskell/iCalendar {};
@@ -2875,6 +2879,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   haddock_2_14_1 = callPackage ../development/tools/documentation/haddock/2.14.1.nix {};
   haddock = self.haddock_2_14_1;
 
+  HandsomeSoup = callPackage ../development/libraries/haskell/HandsomeSoup {};
+
   happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {};
   happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {};
   happy_1_18_6 = callPackage ../development/tools/parsing/happy/1.18.6.nix {};
-- 
GitLab


From cf5ac3bded304a00685907b90475dcc797f4f1b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:16:43 +0200
Subject: [PATCH 3353/3789] zsh: update from 5.0.2 to 5.0.5

---
 pkgs/shells/zsh/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 50a33700b3b..37ffb09288e 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -2,13 +2,13 @@
 
 let
 
-  version = "5.0.2";
+  version = "5.0.5";
 
   documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2";
-    sha256 = "99ee08cfc91935af8714bd98db652f016d6c7a8a71ba7c6d6223910cd0b7fbf1";
+    sha256 = "1wljqii2lkz5kc4y3xs65isnahvnlj678b9zv31bn444mapjpwp4";
   };
-  
+
 in
 
 stdenv.mkDerivation {
@@ -16,9 +16,9 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2";
-    sha256 = "eb220ae5a8076191ec6b4c6a5a2f18122d074a19f25b45f0320b44b8166c5a03";
+    sha256 = "1bwfz9n850pclzmzrb437icfhzv1s5pgh2dhs92f194gdkxx4936";
   };
-  
+
   buildInputs = [ ncurses coreutils ];
 
   preConfigure = ''
-- 
GitLab


From 30aa995a42975faca880cf2348dc2fab2a818fa2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:16:49 +0200
Subject: [PATCH 3354/3789] busybox: update from 1.21.1 to 1.22.1

---
 pkgs/os-specific/linux/busybox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index fd1e83100ed..7226acf0e57 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -37,11 +37,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.21.1";
+  name = "busybox-1.22.1";
 
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "00qk938q90jv14mxmadm8pgs3jymkknc6xicw4512mn85s8y0nyd";
+    sha256 = "12v7nri79v8gns3inmz4k24q7pcnwi00hybs0wddfkcy1afh42xf";
   };
 
   configurePhase = ''
-- 
GitLab


From 715a61ad7ad3d1d0c334438df3489c9da4a43a33 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:16:55 +0200
Subject: [PATCH 3355/3789] docbook5_xsl: update from 1.75.2 to 1.78.1

---
 .../data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix
index c143ce16698..bfe454a49fe 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "docbook-xsl-ns-1.75.2";
+  name = "docbook-xsl-ns-1.78.1";
   
   src = fetchurl {
     url = "mirror://sourceforge/docbook/${name}.tar.bz2";
-    sha256 = "1pr7m0hmqilk25hjx33kq2vqn2xf6cx6zhxqm35fdvnjccazlxg2";
+    sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng";
   };
 
   buildPhase = "true";
-- 
GitLab


From 37f327acfd753fff64e3a78681f61a26ab5ecedd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:17:04 +0200
Subject: [PATCH 3356/3789] fail2ban: update from 0.8.12 to 0.8.13

---
 pkgs/tools/security/fail2ban/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index b28c761ec2c..8d6a6241ad3 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages, unzip, gamin }:
 
-let version = "0.8.12"; in
+let version = "0.8.13"; in
 
 pythonPackages.buildPythonPackage {
   name = "fail2ban-${version}";
@@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage {
   src = fetchurl {
     url    = "https://github.com/fail2ban/fail2ban/zipball/${version}";
     name   = "fail2ban-${version}.zip";
-    sha256 = "17cassfn3gdgw530g7gh9fvffsixfb30zamzlfmx7s5x80rnqd3k";
+    sha256 = "0c63i5jsn2n6hv6fb6q922ksxfpppah9415vpydiv0vpf23pq0cb";
   };
 
   buildInputs = [ unzip ];
-- 
GitLab


From 44e8fe67d032bab39c2a78607d544ff9e43118eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:17:11 +0200
Subject: [PATCH 3357/3789] flex: update from 2.5.35 to 2.5.39

---
 pkgs/development/tools/parsing/flex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index 8047080a125..c5337d647de 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bison, m4 }:
 
 stdenv.mkDerivation {
-  name = "flex-2.5.35";
+  name = "flex-2.5.39";
 
   src = fetchurl {
-    url = mirror://sourceforge/flex/flex-2.5.35.tar.bz2;
-    sha256 = "0ysff249mwhq0053bw3hxh58djc0gy7vjan2z1krrf9n5d5vvv0b";
+    url = mirror://sourceforge/flex/flex-2.5.39.tar.bz2;
+    sha256 = "0zv15giw3gma03y2bzw78hjfy49vyir7vbcgnh9bb3637dgvblmd";
   };
 
   buildInputs = [ bison ];
-- 
GitLab


From c244d6e1b853c7513ddaaabedca0508230074f32 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:17:23 +0200
Subject: [PATCH 3358/3789] gitAndTools.stgit: update from 0.16 to 0.17.1

---
 .../version-management/git-and-tools/stgit/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index 6518f32ef7c..d4b74390c4c 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, git }:
 
 let
-  name = "stgit-0.16";
+  name = "stgit-0.17.1";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "http://download.gna.org/stgit/${name}.tar.gz";
-    sha256 = "0hla6401g2kicaakz4awk67yf8fhqbw1shn1p9ma5x6ca29s3w82";
+    sha256 = "1pka0ns9x0kabn036zsf0mwmwiynckhnva51kgxsch9fqah6acyl";
   };
 
   buildInputs = [ python git ];
-- 
GitLab


From 1682bde4e0a9101fa0aeb69af63b94ee1c3bc6d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:17:25 +0200
Subject: [PATCH 3359/3789] gitAndTools.svn2git: update from 2.2.2 to 2.2.5

---
 .../version-management/git-and-tools/svn2git/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index 0053a1dfafb..b0cfcaeb110 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, ruby, makeWrapper, git }:
 
 let
-  version = "2.2.2";
+  version = "2.2.5";
 in
 stdenv.mkDerivation {
   name = "svn2git-${version}";
 
   src = fetchurl {
     url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz";
-    sha256 = "14zinkpgybz15jvbfw0sb432w6f5w4sa5pdqycjwva8v8lxqn9mh";
+    sha256 = "1afmrr80357pg3kawyghhc55z1pszaq8fyrrjmxa6nr9dcrqjwwh";
   };
 
   buildInputs = [ ruby makeWrapper ];
-- 
GitLab


From 9def1935980346ef7b166014bfba6990ccd24b55 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:17:36 +0200
Subject: [PATCH 3360/3789] libsigcxx: update from 2.2.11 to 2.3.1

---
 pkgs/development/libraries/libsigcxx/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix
index a127e7322eb..610d14568ae 100644
--- a/pkgs/development/libraries/libsigcxx/default.nix
+++ b/pkgs/development/libraries/libsigcxx/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gnum4 }:
 
 stdenv.mkDerivation rec {
-  name = "libsigc++-2.2.11";
+  name = "libsigc++-2.3.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libsigc++/2.2/${name}.tar.xz";
-    sha256 = "0ms93q7r8zznsqkfdj1ds9533f0aqfaw3kdkqv154rzmfigh8d4q";
+    url = "mirror://gnome/sources/libsigc++/2.3/${name}.tar.xz";
+    sha256 = "14q3sq6d43f6wfcmwhw4v1aal4ba0h5x9v6wkxy2dnqznd95il37";
   };
 
   buildInputs = [ pkgconfig gnum4 ];
-- 
GitLab


From b7d0a9a61460c92b9575823602037d31ec220a31 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:17:40 +0200
Subject: [PATCH 3361/3789] ltrace: update from 0.5.3 to 0.7.3

---
 pkgs/development/tools/misc/ltrace/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix
index a436f29df14..af736821668 100644
--- a/pkgs/development/tools/misc/ltrace/default.nix
+++ b/pkgs/development/tools/misc/ltrace/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, elfutils }:
 
 stdenv.mkDerivation rec {
-  name = "ltrace-0.5.3";
+  name = "ltrace-0.7.3";
 
   src = fetchurl {
-    url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.3.orig.tar.gz;
-    sha256 = "0cmyw8zyw8b1gszrwizcm53cr0mig1iw3kv18v5952m9spb2frjw";
+    url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2;
+    sha256 = "00wmbdghqbz6x95m1mcdd3wd46l6hgcr4wggdp049dbifh3qqvqf";
   };
 
   buildInputs = [ elfutils ];
-- 
GitLab


From 2cc462eb114c224f3d2dca09f8bf7060b3f10523 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:17:45 +0200
Subject: [PATCH 3362/3789] lxc: update from 1.0.1 to 1.0.3

---
 pkgs/os-specific/linux/lxc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index d59bb142f9f..1fcdcbc2837 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "lxc-1.0.1";
+  name = "lxc-1.0.3";
 
   src = fetchurl {
     url = "http://github.com/lxc/lxc/archive/${name}.tar.gz";
-    sha256 = "14fjzicv1s3niwag301i7m9vb9jlh3hnd9ks9jjkzp8xyxgb0rrv";
+    sha256 = "04k45jgj2i501yhm467s1a1yk7h7q0fjhspys158w1a2m1hari4z";
   };
 
   buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ];
-- 
GitLab


From 740c502a775bf1783ddcef757124eb712e9479f9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:17:57 +0200
Subject: [PATCH 3363/3789] swiProlog: update from 6.6.2 to 6.6.3

---
 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 aa027401b4d..2070da0bee4 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.2";
+  version = "6.6.3";
 in
 stdenv.mkDerivation {
   name = "swi-prolog-${version}";
 
   src = fetchurl {
     url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz";
-    sha256 = "1kdnc1r5c4320v5s6axk6w0jnqbkza295hdi9s5kyd8r78v6x6g4";
+    sha256 = "01dr66d7rm2xvxwm6wy71bbjvfrmzxgvmaz3sl1fb63cn8d78nz3";
   };
 
   buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama
-- 
GitLab


From 2d4919dbb46669ec88394436919cf5662de6491b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:18:03 +0200
Subject: [PATCH 3364/3789] apacheHttpd_2_4: update from 2.4.7 to 2.4.9

---
 pkgs/servers/http/apache-httpd/2.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 2bbe9798de4..7deab6584f8 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
 assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.7";
+  version = "2.4.9";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "06z7ij0avr8f3rvp6ifk3dn8j73i17cn4avz4fp1as43061qsdk4";
+    sha256 = "00vnhki0rdwlhl4cjgvkq5vpf8szx2sdd3yi7bcg7jj7z86wk37p";
   };
 
   buildInputs = [perl] ++
-- 
GitLab


From fd9ea0f6398017f7b71e93a5018321f61d94e800 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:40:11 +0200
Subject: [PATCH 3365/3789] ltrace: fix build with latest gcc (by disabling
 -Werror)

---
 pkgs/development/tools/misc/ltrace/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix
index af736821668..1d20d8eef45 100644
--- a/pkgs/development/tools/misc/ltrace/default.nix
+++ b/pkgs/development/tools/misc/ltrace/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ elfutils ];
 
-  preBuild =
+  preConfigure =
     ''
+      configureFlags="--disable-werror"
       makeFlagsArray=(INSTALL="install -c")
     '';
 
-- 
GitLab


From 8cd9a5145be6d2a9d3be646baf44bccda07a517a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:12:41 +0200
Subject: [PATCH 3366/3789] haskell-scotty: update to version 0.7.2

---
 .../libraries/haskell/scotty/default.nix          | 15 +++++++--------
 .../libraries/haskell/scotty/new-conduit.patch    | 13 -------------
 2 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/scotty/new-conduit.patch

diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
index 42f4068f9a9..cc5ae260477 100644
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -1,16 +1,15 @@
-{ cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault
-, httpTypes, mtl, regexCompat, text, transformers, wai, waiExtra
-, warp, conduitExtra
+{ cabal, aeson, blazeBuilder, caseInsensitive, conduit
+, conduitExtra, dataDefault, httpTypes, mtl, regexCompat, text
+, transformers, wai, waiExtra, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "scotty";
-  version = "0.7.1";
-  sha256 = "07aj74jq0hh86ik4x5p5q65b47q44rrnd6mkp039wj9l6dmyrv3c";
-  patches = [ ./new-conduit.patch ];
+  version = "0.7.2";
+  sha256 = "1y14af3qciwycgaxzx6rjan2jgfchjzs4zbxzh8p8s1d0l4gsqlb";
   buildDepends = [
-    aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes
-    mtl regexCompat text transformers wai waiExtra warp conduitExtra
+    aeson blazeBuilder caseInsensitive conduit conduitExtra dataDefault
+    httpTypes mtl regexCompat text transformers wai waiExtra warp
   ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/scotty/new-conduit.patch b/pkgs/development/libraries/haskell/scotty/new-conduit.patch
deleted file mode 100644
index 74c6ebdc161..00000000000
--- a/pkgs/development/libraries/haskell/scotty/new-conduit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur scotty-0.7.1-orig/scotty.cabal scotty-0.7.1/scotty.cabal
---- scotty-0.7.1-orig/scotty.cabal	2014-03-19 17:27:33.000000000 -0400
-+++ scotty-0.7.1/scotty.cabal	2014-04-07 10:59:39.933144140 -0400
-@@ -82,7 +82,8 @@
-                        transformers     >= 0.3.0.0  && < 0.4,
-                        wai              >= 2.0.0    && < 2.2,
-                        wai-extra        >= 2.0.1    && < 2.2,
--                       warp             >= 2.1.1    && < 2.2
-+                       warp             >= 2.1.1    && < 2.2,
-+                       conduit-extra
- 
-   GHC-options: -Wall -fno-warn-orphans
- 
-- 
GitLab


From 7ff62b5ddc996bf712e9206e358bb14639beb27c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:13:35 +0200
Subject: [PATCH 3367/3789] haskell-direct-sqlite: update to version 2.3.12

---
 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 12e61ebb9ef..14be91cd1bf 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.11";
-  sha256 = "0pd5qv8aq47d5n2sd99yblxiq70zvmy2rc71ys73a3d846k0ncs0";
+  version = "2.3.12";
+  sha256 = "14dcgmn3mfx69qx412dc8cxa4ia3adsf8gm5q4yscpp8rf78m178";
   buildDepends = [ text ];
   testDepends = [ base16Bytestring HUnit text ];
   meta = {
-- 
GitLab


From 51c6724fa3cebc6248bbc6408581c5f5906e615a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:13:37 +0200
Subject: [PATCH 3368/3789] haskell-esqueleto: update to version 1.3.10

---
 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 14d5cfda068..9103480d48f 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.9";
-  sha256 = "0dh11q77w0npilnbxyij6z7k7cx9cciwqs479xdjgjygnxa1xwdc";
+  version = "1.3.10";
+  sha256 = "0q333m7xaanxb1vzgf2yn6d7y3pgkbj9mjw5gnywms36v5zsfik7";
   buildDepends = [
     conduit monadLogger persistent resourcet tagged text transformers
     unorderedContainers
-- 
GitLab


From 346f6037c005658c441fda931db74f93b9de4708 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:13:39 +0200
Subject: [PATCH 3369/3789] haskell-hashed-storage: update to version 0.5.11

---
 pkgs/development/libraries/haskell/hashed-storage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix
index 77a4251259d..e2a82e13b3e 100644
--- a/pkgs/development/libraries/haskell/hashed-storage/default.nix
+++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hashed-storage";
-  version = "0.5.10";
-  sha256 = "1k7drnk0y5apjvwsiw85032yvxllbi7ndg6h9x207gnjxm64m0h5";
+  version = "0.5.11";
+  sha256 = "0s8mnayxlvwrrii2l63b372yi5g08br6gpbgz2256d8y128mwjvk";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From b34cc2cd2e7628b9485dd435fca0e28c973fbb44 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:13:41 +0200
Subject: [PATCH 3370/3789] haskell-mime-types: update to version 0.1.0.4

---
 pkgs/development/libraries/haskell/mime-types/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix
index 5dd5f65c9e7..50c25ada340 100644
--- a/pkgs/development/libraries/haskell/mime-types/default.nix
+++ b/pkgs/development/libraries/haskell/mime-types/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mime-types";
-  version = "0.1.0.3";
-  sha256 = "0mzhkqcjlnrs9mwn2crsr1m2mf6pgygs1s3ks8akz1618v6jm6y1";
+  version = "0.1.0.4";
+  sha256 = "0bxhkwz8p7mhg5kspbpc5zm4k50pc0r5pzjr6807y88x8vjpvj2x";
   buildDepends = [ text ];
   meta = {
     homepage = "https://github.com/yesodweb/wai";
-- 
GitLab


From 7fdd6b188015b784c09b076a87e08ba08e6918b4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:13:43 +0200
Subject: [PATCH 3371/3789] haskell-monad-logger: update to version 0.3.5.1

---
 .../libraries/haskell/monad-logger/default.nix        | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix
index 4aa394aff40..ba6efdac835 100644
--- a/pkgs/development/libraries/haskell/monad-logger/default.nix
+++ b/pkgs/development/libraries/haskell/monad-logger/default.nix
@@ -1,15 +1,16 @@
-{ cabal, blazeBuilder, conduit, fastLogger, liftedBase
+{ cabal, blazeBuilder, conduit, exceptions, fastLogger, liftedBase
 , monadControl, monadLoops, mtl, resourcet, stm, stmChans, text
 , transformers, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "monad-logger";
-  version = "0.3.4.1";
-  sha256 = "1i5192060svqhc1iv215b98hah6p29bzdqin6ng5qpq8d44hdnpm";
+  version = "0.3.5.1";
+  sha256 = "0kc23y1l3ja2ym0pr19kcm8aiv8g8skh24p9i3vm74chadsn81pv";
   buildDepends = [
-    blazeBuilder conduit fastLogger liftedBase monadControl monadLoops
-    mtl resourcet stm stmChans text transformers transformersBase
+    blazeBuilder conduit exceptions fastLogger liftedBase monadControl
+    monadLoops mtl resourcet stm stmChans text transformers
+    transformersBase
   ];
   meta = {
     homepage = "https://github.com/kazu-yamamoto/logger";
-- 
GitLab


From f063e5e5927f6513b3bebac49167f5fe74ec4cab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:13:45 +0200
Subject: [PATCH 3372/3789] haskell-network-simple: update to version 0.3.1

---
 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 72d8c8af8c8..cde31643c71 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.0";
-  sha256 = "046nbgdwazbqffcim1gxry1mf35yg41g52zdk86h9whhiwjzlywz";
+  version = "0.3.1";
+  sha256 = "0bk015d0np07887flah76vgrgrqaqj4x1sdxmghvazj8c78nkan8";
   buildDepends = [ exceptions network transformers ];
   meta = {
     homepage = "https://github.com/k0001/network-simple";
-- 
GitLab


From 2986e7cb24ecf5839d7c063dc5470de34b61167e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:13:48 +0200
Subject: [PATCH 3373/3789] haskell-streaming-commons: update to version 0.1.1

---
 .../libraries/haskell/streaming-commons/default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix
index fec0ddf79cd..4bcb46887bc 100644
--- a/pkgs/development/libraries/haskell/streaming-commons/default.nix
+++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix
@@ -1,13 +1,13 @@
-{ cabal, deepseq, hspec, network, QuickCheck, text, transformers
-, zlib
+{ cabal, async, deepseq, hspec, network, QuickCheck, text
+, transformers, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "streaming-commons";
-  version = "0.1.0.2";
-  sha256 = "1idlhvlv5pg20xq8h4rmphyflvpc9q88krwm498mh3s4983ik28c";
+  version = "0.1.1";
+  sha256 = "1mzpdhdc5kq9pfpsjs6v1j1qa1pdj1ca4s32z4bjq751jayj6ds6";
   buildDepends = [ network text transformers zlib ];
-  testDepends = [ deepseq hspec QuickCheck text zlib ];
+  testDepends = [ async 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";
-- 
GitLab


From 0a74f6d3e7f313a4fa0158b5c3cb65a943967c9a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:13:50 +0200
Subject: [PATCH 3374/3789] haskell-wai: update to version 2.1.0.2

---
 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 a0164a3950c..18c6e08c0b3 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.1";
-  sha256 = "03gp3ijdpyyh7zic89laj0y4wsi8f49lbqlqq8w9msfgizjhvdv6";
+  version = "2.1.0.2";
+  sha256 = "02hj07s3vlhbd2hds5pyksghildadjqhr8mmiyabwb7ap8iybidg";
   buildDepends = [
     blazeBuilder conduit conduitExtra httpTypes network text
     transformers vault
-- 
GitLab


From b67feb09902605d527f2e9b25fff883ee66c6216 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:13:52 +0200
Subject: [PATCH 3375/3789] haskell-warp-tls: update to version 2.0.3.3

---
 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 b04d9439d2d..cca9da9eb3d 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.2";
-  sha256 = "1dqaq1z4gb3sya41hiwsxgl4f0v7sqza7aazf2vc7dd5x5izp02w";
+  version = "2.0.3.3";
+  sha256 = "03fjghsa9zvrvg7ickph577zzr62n91gsb99v9k47s4nd2xri2rj";
   buildDepends = [
     conduit conduitExtra cprngAes dataDefaultClass network
     networkConduit resourcet streamingCommons tls transformers wai warp
-- 
GitLab


From cde2e2839ac17c29dab2cb6890124516f06e3c45 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:13:54 +0200
Subject: [PATCH 3376/3789] haskell-warp: update to version 2.1.4

---
 pkgs/development/libraries/haskell/warp/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index c67ea5c25e0..75ccd0e6f5d 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -1,4 +1,4 @@
-{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
+{ cabal, async, blazeBuilder, blazeBuilderConduit, caseInsensitive
 , conduit, conduitExtra, doctest, hashable, hspec, HTTP, httpDate
 , httpTypes, HUnit, liftedBase, network, networkConduit, QuickCheck
 , simpleSendfile, streamingCommons, text, time, transformers
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.1.3.3";
-  sha256 = "1dbarrjb6y4cbc1dc265b008b6d5qziqnikdbnbdlrwfzr97cz23";
+  version = "2.1.4";
+  sha256 = "090xbjqwj8wzxiaal2jdsk7dbqv07c1cw32w7v8xxi2dkvv6nwbb";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit
     conduitExtra hashable httpDate httpTypes liftedBase network
@@ -16,7 +16,7 @@ cabal.mkDerivation (self: {
     unixCompat void wai
   ];
   testDepends = [
-    blazeBuilder blazeBuilderConduit caseInsensitive conduit
+    async blazeBuilder blazeBuilderConduit caseInsensitive conduit
     conduitExtra doctest hashable hspec HTTP httpDate httpTypes HUnit
     liftedBase network networkConduit QuickCheck simpleSendfile
     streamingCommons text time transformers unixCompat void wai
-- 
GitLab


From a138d54df290504c939b244d88ec17870634ab4f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:13:55 +0200
Subject: [PATCH 3377/3789] haskell-websockets: update to version 0.8.2.1

---
 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 c0d500ace71..cc5caddb6ec 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.0";
-  sha256 = "1gphlil7n0g9y6vqwyn9fc4sl2ccninznc59p11052j8q6yb34ia";
+  version = "0.8.2.1";
+  sha256 = "0ayh20a6xj3ab9ld3lmrazx94vbbf1xn65nxcpkq7cvm8ggim7a6";
   buildDepends = [
     attoparsec base64Bytestring binary blazeBuilder caseInsensitive
     entropy ioStreams mtl network random SHA text
-- 
GitLab


From 011f22e49bb085209c6805ccb48f9a469aa19c2c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:13:57 +0200
Subject: [PATCH 3378/3789] haskell-yesod-core: update to version 1.2.11.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 ab968a53048..cea81592ba4 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.11";
-  sha256 = "0vg07g5735qsr01wpgxpjzjc7w9nrqvkhfnd90jzdvg3kg33dgih";
+  version = "1.2.11.1";
+  sha256 = "079nhpfsp8sqm0j5wck3fqx5b3g12r0l9214wybj2wnxpaddzhzx";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit conduitExtra cookie
-- 
GitLab


From 1bf2bd612c62ff9e99e5fa7aadf00966ef750728 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Apr 2014 12:14:04 +0200
Subject: [PATCH 3379/3789] haskell-HTF: update to version 0.11.3.0

---
 pkgs/development/libraries/haskell/HTF/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix
index 877fa68ab00..041c619850a 100644
--- a/pkgs/development/libraries/haskell/HTF/default.nix
+++ b/pkgs/development/libraries/haskell/HTF/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HTF";
-  version = "0.11.2.1";
-  sha256 = "194wjcs06cbxjfgfcax697405c0vlaklnvh705ffrxmrrww77z7l";
+  version = "0.11.3.0";
+  sha256 = "0kw0yxmxr3whi6cvrxnrpzyikbjqwvcram5mjc27b46k2p38zxpj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 1bb391e2bbb5921601b23a88af7e658cd602ff07 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 9 Apr 2014 16:10:16 +0200
Subject: [PATCH 3380/3789] pythonPackages: sqlalchemy-imageattach, fix tests
 on darwin

---
 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 5a4be8d1704..4169871e99e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6889,7 +6889,7 @@ rec {
 
     checkPhase = ''
       cd tests
-      export LD_LIBRARY_PATH=${pkgs.imagemagick}/lib
+      export MAGICK_HOME="${pkgs.imagemagick}"
       export PYTHONPATH=$PYTHONPATH:../
       py.test
       cd ..
-- 
GitLab


From 316e809ff869c38c78d2cd561416b5168fab9de0 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sat, 22 Mar 2014 21:38:04 -0400
Subject: [PATCH 3381/3789] cjdns: update to 20130303

build system is now nodejs based
new nixos module to start cjdns
---
 nixos/modules/module-list.nix               |   1 +
 nixos/modules/services/networking/cjdns.nix | 207 ++++++++++++++++++++
 pkgs/tools/networking/cjdns/builder.sh      |   9 +
 pkgs/tools/networking/cjdns/default.nix     |  26 ++-
 4 files changed, 228 insertions(+), 15 deletions(-)
 create mode 100644 nixos/modules/services/networking/cjdns.nix
 create mode 100644 pkgs/tools/networking/cjdns/builder.sh

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 86bb87e91de..94d5afdb097 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -159,6 +159,7 @@
   ./services/networking/bind.nix
   ./services/networking/bitlbee.nix
   ./services/networking/btsync.nix
+  ./services/networking/cjdns.nix
   ./services/networking/connman.nix
   ./services/networking/cntlm.nix
   ./services/networking/chrony.nix
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
new file mode 100644
index 00000000000..9b715ec6384
--- /dev/null
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -0,0 +1,207 @@
+# You may notice the commented out sections in this file,
+# it would be great to configure cjdns from nix, but cjdns 
+# reads its configuration from stdin, including the private
+# key and admin password, all nested in a JSON structure.
+#
+# Until a good method of storing the keys outside the nix 
+# store and mixing them back into a string is devised
+# (without too much shell hackery), a skeleton of the
+# configuration building lies commented out.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.cjdns;
+
+  /*
+  # can't keep keys and passwords in the nix store,
+  # but don't want to deal with this stdin quagmire.
+
+  cjdrouteConf = '' {
+    "admin": {"bind": "${cfg.admin.bind}", "password": "\${CJDNS_ADMIN}" },
+    "privateKey": "\${CJDNS_KEY}",
+
+    "interfaces": {
+    ''
+
+    + optionalString (cfg.interfaces.udp.bind.address != null) ''
+      "UDPInterface": [ {
+        "bind": "${cfg.interfaces.udp.bind.address}:"''
+	   ${if cfg.interfaces.upd.bind.port != null
+             then ${toString cfg.interfaces.udp.bind.port}
+	     else ${RANDOM}
+	   fi)
+      + '' } ]''
+
+    + (if cfg.interfaces.eth.bind != null then ''
+      "ETHInterface": [ {
+        "bind": "${cfg.interfaces.eth.bind}",
+        "beacon": ${toString cfg.interfaces.eth.beacon}
+      } ]
+    '' fi )
+    + ''
+    },
+    "router": { "interface": { "type": "TUNInterface" }, },
+    "security": [ { "setuser": "nobody" } ]
+    }
+    '';   
+
+    cjdrouteConfFile = pkgs.writeText "cjdroute.conf" cjdrouteConf
+    */
+in
+
+{
+  options = {
+
+    services.cjdns = {
+
+      enable = mkOption {
+        type = types.bool;
+	default = false;
+        description = ''
+          Enable this option to start a instance of the 
+          cjdns network encryption and and routing engine.
+          Configuration will be read from <literal>confFile</literal>.
+        '';
+      };
+
+      confFile = mkOption {
+	default = "/etc/cjdroute.conf";
+        description = ''
+          Configuration file to pipe to cjdroute.
+        '';
+      };
+
+      /*
+      admin = {
+        bind = mkOption {
+	  default = "127.0.0.1:11234";
+	  description = ''
+            Bind the administration port to this address and port.
+	  '';
+        };
+
+	passwordFile = mkOption {
+	  example = "/root/cjdns.adminPassword";
+	  description = ''
+	    File containing a password to the administration port.
+	  '';
+	};
+      };
+
+      keyFile = mkOption {
+        type = types.str;
+	example = "/root/cjdns.key";
+	description = ''
+	  Path to a file containing a cjdns private key on a single line.
+	'';
+      };
+      
+      passwordsFile = mkOption {
+        type = types.str;
+	default = null;
+	example = "/root/cjdns.authorizedPasswords";
+	description = ''
+	  A file containing a list of json dictionaries with passwords.
+	  For example:
+	    {"password": "s8xf5z7znl4jt05g922n3wpk75wkypk"},
+	    { "name": "nice guy",
+	      "password": "xhthk1mglz8tpjrbbvdlhyc092rhpx5"},
+	    {"password": "3qfxyhmrht7uwzq29pmhbdm9w4bnc8w"}
+	  '';
+	};
+
+      interfaces = {
+        udp = {
+	  bind = { 
+            address = mkOption {
+	      default = "0.0.0.0";
+	      description = ''
+	        Address to bind UDP tunnels to; disable by setting to null;
+	      '';
+ 	    };
+	    port = mkOption {
+	      type = types.int;
+	      default = null;
+	      description = ''
+	        Port to bind UDP tunnels to.
+	        A port will be choosen at random if this is not set.
+	        This option is required to act as the server end of 
+	        a tunnel.
+	      '';
+ 	    };
+	  };
+	};
+
+	eth = {
+	  bind = mkOption {
+	    default = null;
+	    example = "eth0";
+	    description = ''
+	      Bind to this device and operate with native wire format.
+	    '';
+	  };
+
+	  beacon = mkOption {
+	    default = 2;
+	    description = ''
+	      Auto-connect to other cjdns nodes on the same network.
+	      Options:
+	        0 -- Disabled.
+
+                1 -- Accept beacons, this will cause cjdns to accept incoming
+		     beacon messages and try connecting to the sender.
+
+		2 -- Accept and send beacons, this will cause cjdns to broadcast
+		     messages on the local network which contain a randomly
+		     generated per-session password, other nodes which have this
+                     set to 1 or 2 will hear the beacon messages and connect
+                     automatically.
+            '';
+	  };
+	  
+	  connectTo = mkOption {
+	    type = types.listOf types.str;
+	    default = [];
+	    description = ''
+	      Credentials for connecting look similar to UDP credientials
+              except they begin with the mac address, for example:
+              "01:02:03:04:05:06":{"password":"a","publicKey":"b"}
+	    '';
+	  };
+        };
+      };
+      */
+    };
+  };
+
+  config = mkIf config.services.cjdns.enable {
+
+    boot.kernelModules = [ "tun" ];
+
+    /*
+    networking.firewall.allowedUDPPorts = mkIf (cfg.udp.bind.port != null) [
+      cfg.udp.bind.port
+    ];
+    */
+
+    systemd.services.cjdns = {
+      description = "encrypted networking for everybody";
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network.target" ];
+      before = [ "network.target" ];
+      path = [ pkgs.cjdns ];
+
+      serviceConfig = {
+        Type = "forking";
+	ExecStart = ''
+          ${pkgs.stdenv.shell} -c "${pkgs.cjdns}/sbin/cjdroute < ${cfg.confFile}"
+	'';
+	Restart = "on-failure";
+      };
+    };
+  };
+}
diff --git a/pkgs/tools/networking/cjdns/builder.sh b/pkgs/tools/networking/cjdns/builder.sh
new file mode 100644
index 00000000000..c2e3701c046
--- /dev/null
+++ b/pkgs/tools/networking/cjdns/builder.sh
@@ -0,0 +1,9 @@
+source $stdenv/setup
+
+unpackPhase
+cd git-export
+
+bash do
+
+mkdir -p $out/sbin
+cp cjdroute $out/sbin
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index b42f202099b..48e21f4507e 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,31 +1,27 @@
-{ stdenv, fetchgit, cmake }:
+{ stdenv, fetchgit, nodejs, which, python27 }:
 
 let
-  rev = "f7b02ac0cc";
+  date = "20140303";
+  rev = "f11ce1fd4795b0173ac0ef18c8a6f752aa824adb";
 in
 stdenv.mkDerivation {
-  name = "cjdns-20130620-${stdenv.lib.strings.substring 0 7 rev}";
+  name = "cjdns-${date}-${stdenv.lib.strings.substring 0 7 rev}";
 
   src = fetchgit {
-    url = "https://github.com/cjdelisle/cjdns.git";
+    url = "git://github.com/cjdelisle/cjdns.git";
     inherit rev;
-    sha256 = "1580a62yhph62nv7q2jdqrbkyk9a9g5i17snibkxyykc7rili5zq";
+    sha256 = "1bxhf9f1v0slf9mz3ll6jf45mkwvwxlf3yqxx9k23kjyr1nsc8s8";
   };
 
-  preConfigure = ''
-    sed -i -e '/toolchain.*CACHE/d' CMakeLists.txt
-  '';
+  buildInputs = [ which python27 nodejs];
 
-  doCheck = true;
-  checkPhase = "ctest";
-
-  buildInputs = [ cmake ];
+  builder = ./builder.sh;
 
   meta = {
     homepage = https://github.com/cjdelisle/cjdns;
     description = "Encrypted networking for regular people";
-    license = "GPLv3+";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ viric emery ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From d54a8052812d7ab93a18f667edc15bcda4640bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 9 Apr 2014 18:56:54 +0200
Subject: [PATCH 3382/3789] gnome3: downgrade 3.12 packages to 3.10

---
 pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix  | 6 +++---
 pkgs/desktops/gnome-3/core/gnome-calculator/default.nix   | 6 +++---
 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix | 6 +++---
 pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix   | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index 41f75e6e3c5..3879b81859a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-backgrounds-3.12.0";
+  name = "gnome-backgrounds-3.10.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-backgrounds/3.12/${name}.tar.xz";
-    sha256 = "77a893025a0bed5753631a810154cad53fb2cf34c8ee988016217cd8862eab42";
+    url = "mirror://gnome/sources/gnome-backgrounds/3.10/${name}.tar.xz";
+    sha256 = "11rv03m4hznpx0brf47hil04199z3jjvl1aq7q0lnill3yrffiyc";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index 981ae3bd9df..205961a9171 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -3,11 +3,11 @@
 , itstool, gnome3, librsvg, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-calculator-3.12.0";
+  name = "gnome-calculator-3.10.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-calculator/3.12/${name}.tar.xz";
-    sha256 = "22882c770251203be85f728d73b0d3946728774fd437cf460cd6d958fc4b4dc5";
+    url = "mirror://gnome/sources/gnome-calculator/3.10/${name}.tar.xz";
+    sha256 = "0gkddnk9x76895xrz0ps4yny36w62fhi459gwmxqqb9kx5934n1f";
   };
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index e96da3168e0..334471c2943 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/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.12.0";
+  name = "gnome-disk-utility-3.10.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-disk-utility/3.12/${name}.tar.xz";
-    sha256 = "46e0698c4a7baa8719a79935066e103447011fb47528a28dbb49e35eeec409d8";
+    url = "mirror://gnome/sources/gnome-disk-utility/3.10/${name}.tar.xz";
+    sha256 = "1amqi2bribxn8r8k8mvxh3710rmdll9963smf0v59v0iwxi3mqil";
   };
 
   doCheck = true;
diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index 349df0b103c..7b94d0f9027 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -3,11 +3,11 @@
 , itstool, gnome3, librsvg, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-screenshot-3.12.0";
+  name = "gnome-screenshot-3.10.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-screenshot/3.12/${name}.tar.xz";
-    sha256 = "ae4bf706652ae9b28c7930d22c2c37469a78d7f6656d312960b3c75ee5c36eb1";
+    url = "mirror://gnome/sources/gnome-screenshot/3.10/${name}.tar.xz";
+    sha256 = "1nb56kzcj5z4hmrmxap5r53smi52ki3pc8qmhi4rymkgqswyk7bh";
   };
 
   doCheck = true;
-- 
GitLab


From 5d12cbf1c20f45fe0c47dc94ee7894ee5c09be3b Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Wed, 9 Apr 2014 20:42:08 +0200
Subject: [PATCH 3383/3789] add back old version of flex for grub2

---
 .../development/tools/parsing/flex/2.5.35.nix | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/parsing/flex/2.5.35.nix

diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix
new file mode 100644
index 00000000000..8047080a125
--- /dev/null
+++ b/pkgs/development/tools/parsing/flex/2.5.35.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, bison, m4 }:
+
+stdenv.mkDerivation {
+  name = "flex-2.5.35";
+
+  src = fetchurl {
+    url = mirror://sourceforge/flex/flex-2.5.35.tar.bz2;
+    sha256 = "0ysff249mwhq0053bw3hxh58djc0gy7vjan2z1krrf9n5d5vvv0b";
+  };
+
+  buildInputs = [ bison ];
+
+  propagatedNativeBuildInputs = [ m4 ];
+
+  crossAttrs = {
+    preConfigure = ''
+      export ac_cv_func_malloc_0_nonnull=yes
+      export ac_cv_func_realloc_0_nonnull=yes
+    '';
+  };
+
+  meta = {
+    homepage = http://flex.sourceforge.net/;
+    description = "A fast lexical analyser generator";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ea5b6864ed..e0727ec4222 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1122,7 +1122,7 @@ let
     buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
   };
 
-  grub2 = callPackage ../tools/misc/grub/2.0x.nix { libusb = libusb1; };
+  grub2 = callPackage ../tools/misc/grub/2.0x.nix { libusb = libusb1; flex = flex_2_5_35; };
 
   grub2_efi = grub2.override { EFIsupport = true; };
 
@@ -3733,6 +3733,7 @@ let
   checkstyle = callPackage ../development/tools/analysis/checkstyle { };
 
   flex = callPackage ../development/tools/parsing/flex { };
+  flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
 
   m4 = gnum4;
 
-- 
GitLab


From e856584e1a38688bcb5c2ad9153172111e62969b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 9 Apr 2014 21:04:49 +0200
Subject: [PATCH 3384/3789] nixos/jenkins-service: fix 'group' option
 documentation

Both for master and slave.
---
 .../services/continuous-integration/jenkins/default.nix        | 3 ++-
 .../modules/services/continuous-integration/jenkins/slave.nix  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index c3dc59a9fbd..b264a2e4bb4 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -25,7 +25,8 @@ in {
         default = "jenkins";
         type = with types; string;
         description = ''
-          User the jenkins server should execute under.
+          If the default user "jenkins" is configured then this is the primary
+          group of that user.
         '';
       };
 
diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix
index 1d31ab830f6..9d952b2d2be 100644
--- a/nixos/modules/services/continuous-integration/jenkins/slave.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix
@@ -33,7 +33,8 @@ in {
         default = "jenkins";
         type = with types; string;
         description = ''
-          User the jenkins slave agent should execute under.
+          If the default slave agent user "jenkins" is configured then this is
+          the primary group of that user.
         '';
       };
 
-- 
GitLab


From 8fdf8984d2e83fef0602456c75baafaf274bd8d7 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 9 Apr 2014 01:57:26 +0200
Subject: [PATCH 3385/3789] chromium: Update stable channel from 33.0.1750.152
 -> 34.0.1847.116

---
 pkgs/applications/networking/browsers/chromium/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index 782356640c8..49b5e2b4221 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -11,8 +11,8 @@
     sha256 = "1na5d6z4a0wkabn7cj62vyiv3mmvcb6qdvrkyy6fj79h7gk2hb7k";
   };
   stable = {
-    version = "33.0.1750.152";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.152.tar.xz";
-    sha256 = "0byc23vwn9alsva0jqvwvgnbx2bm7x48m3jln02y4fpf1f265m4z";
+    version = "34.0.1847.116";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.116.tar.xz";
+    sha256 = "04cpfav5rqa117igvzmrw0045r2ljxg5fqb46qgqvkgff30pjrfx";
   };
 }
-- 
GitLab


From a644b7ba601f541ceda2e4a2f492cff8683feaaf Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 7 Apr 2014 16:03:01 +0200
Subject: [PATCH 3386/3789] icedtea7: Update from 2.4.5 -> 2.4.6

---
 .../development/compilers/icedtea/sources.nix | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/icedtea/sources.nix b/pkgs/development/compilers/icedtea/sources.nix
index 95d6928b3ab..6600c811786 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}.5";
+    version = "${branch}.6";
 
     url = "http://icedtea.wildebeest.org/download/source/icedtea-${version}.tar.xz";
-    sha256 = "0nrhbn2q7cm21hpq1f5ds0v0rnsznmdyiifi8w4l1ykyqw9n9yfk";
+    sha256 = "06gsrci7934xmlddmi9wpawpgb1mp7c8cx3jmjsq91kdljmvqcy3";
 
     hg_url = "http://icedtea.classpath.org/hg/release/icedtea7-forest-${branch}";
 
     bundles = {
       openjdk = rec {
-        changeset = "410eb7fef869";
+        changeset = "b028e58c1b77";
         url = "${hg_url}/archive/${changeset}.tar.gz";
-        sha256 = "2de151c7275d91ef082e63fcc0957c5f9290404ec6e20ecfa1e752e16bfab707";
+        sha256 = "e6be030ac5934781d9682dc3108980fa7d2330c32da3cea4ae74df11fbaa92f2";
       };
 
       corba = rec {
-        changeset = "3594dbde270d";
+        changeset = "48ef1bb6d120";
         url = "${hg_url}/corba/archive/${changeset}.tar.gz";
-        sha256 = "d1f97e143fe94ae3a56b45bb5a90f8ab10ec2be4ff770a788f0a1ac677e27a7d";
+        sha256 = "2fcfe699797154da8b4ba5242e32468b2f3f42a0cb17039915bfb1f84887a5b6";
       };
 
       jaxp = rec {
-        changeset = "8fe156ad49e2";
+        changeset = "e0ba4b9a8b91";
         url = "${hg_url}/jaxp/archive/${changeset}.tar.gz";
-        sha256 = "0a2a40186cedfbeb8f87b0bc86bea2830943943081d4289fc74f7a783b2e1af3";
+        sha256 = "e7014057721b8392676bd24760c3f7b3dd40548abb3c8dfbe8df2fa04d7c1fca";
       };
 
       jaxws = rec {
-        changeset = "32ea8b1ed91a";
+        changeset = "4bd947cd146b";
         url = "${hg_url}/jaxws/archive/${changeset}.tar.gz";
-        sha256 = "08a169b6b02883759ec7a412aa91aa3e37480761cb50b95d092dbcdb2fc9a3d0";
+        sha256 = "17ed5278872ad0c9ec3a849caf1480e5942b714e35c9a4a949d09daac4b34c5a";
       };
 
       jdk = rec {
-        changeset = "9db88c18e114";
+        changeset = "b5282042aae0";
         url = "${hg_url}/jdk/archive/${changeset}.tar.gz";
-        sha256 = "285e5b8ccbb29f3f9f9ea9ea7856d1ed97465c57d091fbcd9b2e55a1ffbb543e";
+        sha256 = "ab9b0e973625604b12a2f027cb2a6f9bc5160ef7df55408da6ca8a9c3aaed2d5";
       };
 
       langtools = rec {
-        changeset = "dabd37b7e295";
+        changeset = "06eeb77dac24";
         url = "${hg_url}/langtools/archive/${changeset}.tar.gz";
-        sha256 = "86cb370ce2084c4b699d8c002ebe6c026e86206ffa82a2f3d7906aadb94ed79f";
+        sha256 = "a67e62618c70ef9190b2aef2b49be9d79624be9363bda258828b17494e092477";
       };
 
       hotspot = rec {
-        changeset = "2cb58882dac3";
+        changeset = "172674e0ab65";
         url = "${hg_url}/hotspot/archive/${changeset}.tar.gz";
-        sha256 = "d8c1681ae76e660c1888065933cedbbc1309869c7a2fb98f07c424716d5ebaf9";
+        sha256 = "2aadfe9b1848a619bd2d35f802b3e71ef5286e7822f9e7b02ce2539ca817d9b0";
       };
     };
   };
-- 
GitLab


From 442e1bbaaba7f8274c8003b01e6c1ed8a38921f8 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 7 Apr 2014 23:17:05 +0200
Subject: [PATCH 3387/3789] icedtea7: Fix building v2.4.6 by backporting fix

See http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1726
---
 .../compilers/icedtea/build-fix-2.4.6.patch   | 58 +++++++++++++++++++
 .../development/compilers/icedtea/default.nix |  2 +
 2 files changed, 60 insertions(+)
 create 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
new file mode 100644
index 00000000000..d5fcd9f4456
--- /dev/null
+++ b/pkgs/development/compilers/icedtea/build-fix-2.4.6.patch
@@ -0,0 +1,58 @@
+
+# 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 a8f9617a634..de3a013e7df 100644
--- a/pkgs/development/compilers/icedtea/default.nix
+++ b/pkgs/development/compilers/icedtea/default.nix
@@ -43,6 +43,8 @@ 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
-- 
GitLab


From f6799983bd736465735c387c4f5cbe0919d07350 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 7 Apr 2014 16:03:31 +0200
Subject: [PATCH 3388/3789] icedtea7_web: Update from 1.4.2 -> 1.5

Fixes CVE-2012-4540.
---
 pkgs/development/compilers/icedtea-web/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix
index 9123aaa988c..14a203770f8 100644
--- a/pkgs/development/compilers/icedtea-web/default.nix
+++ b/pkgs/development/compilers/icedtea-web/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "icedtea-web-${version}";
 
-  version = "1.4.2";
+  version = "1.5";
 
   src = fetchurl {
     url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz";
 
-    sha256 = "0bfw4icxjfkdxqmiqgp9lfs1ca9rydl57g3yhlxrif0fpzyyb3fl";
+    sha256 = "0bbwa944kaam0r8ldlqrrj9z9zj54v6zdc3q663ck59shw5z828w";
   };
 
   buildInputs = [ gtk2 xulrunner zip pkgconfig npapi_sdk ];
-- 
GitLab


From 76551abef2e5490af5ec3e37924cf29748798f32 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 8 Apr 2014 11:36:44 +0200
Subject: [PATCH 3389/3789] icedtea7_web: Fix configure phase not finding bash

---
 pkgs/development/compilers/icedtea-web/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix
index 14a203770f8..c9697bac36c 100644
--- a/pkgs/development/compilers/icedtea-web/default.nix
+++ b/pkgs/development/compilers/icedtea-web/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jdk, gtk2, xulrunner, zip, pkgconfig, perl, npapi_sdk }:
+{ stdenv, fetchurl, jdk, gtk2, xulrunner, zip, pkgconfig, perl, npapi_sdk, bash }:
 
 stdenv.mkDerivation rec {
   name = "icedtea-web-${version}";
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     substituteInPlace javac.in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
+
+    configureFlags="BIN_BASH=${bash}/bin/bash $configureFlags"
   '';
 
   configureFlags = [
-- 
GitLab


From c50abd0e136cb8eec3527edc292d195a16fd5149 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 10 Apr 2014 00:34:59 +0200
Subject: [PATCH 3390/3789] linux: Update to 3.2.57

---
 pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 1dd13724857..a73ded41edf 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.56";
+  version = "3.2.57";
   extraMeta.branch = "3.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "08858sx63bsay185ywwyh01wnms7lyh9rvgwznwnzmjpnfi3hihm";
+    sha256 = "0njiqa5fi82a4dls9z1cp33lza00bg15x93c19bsyalp53xqbnab";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 5dfc6584a505956648d31ee3cc664d48dff458c6 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 10 Apr 2014 00:34:59 +0200
Subject: [PATCH 3391/3789] grsecurity: Update stable patch from
 3.0-3.2.56-201404062126 -> 3.0-3.2.57-201404091758

---
 pkgs/os-specific/linux/kernel/patches.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 5156abc1c4f..8e3cb5f7aaa 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -72,14 +72,14 @@ rec {
   };
 
 
-  grsecurity_3_0_3_2_56 =
-    { name = "grsecurity-3.0-3.2.56";
+  grsecurity_3_0_3_2_57 =
+    { name = "grsecurity-3.0-3.2.57";
       patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.56-201404062126.patch;
-        sha256 = "0pm8a6h5dky1frg7bi6ldq849w8xz8isnlw5jpbzix46m3myy3x0";
+        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.57-201404091758.patch;
+        sha256 = "07rswg6vqyak9ccan954izx1fr0c6c6fn8whlzl0787dabpai3i3";
       };
       features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.56
+      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.57
       features.apparmor = true;
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0727ec4222..0de56da8311 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6913,7 +6913,7 @@ let
   linux_3_2_grsecurity = lowPrio (lib.addMetaAttrs {
     maintainers = with lib.maintainers; [ wizeman thoughtpolice ];
   } (lib.overrideDerivation (linux_3_2.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_56 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_57 kernelPatches.grsec_path ];
     argsOverride = {
       modDirVersion = "${linux_3_2.modDirVersion}-grsec";
     };
-- 
GitLab


From d912cdf264d3ecba17fbf8e156bee6c65055dced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 9 Apr 2014 23:04:47 +0000
Subject: [PATCH 3392/3789] gstreamer-1.0: use different function name for env
 hook than gstreamer-0.10

---
 pkgs/development/libraries/gstreamer/core/setup-hook.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/core/setup-hook.sh b/pkgs/development/libraries/gstreamer/core/setup-hook.sh
index 4e75044e732..04863ab3b61 100644
--- a/pkgs/development/libraries/gstreamer/core/setup-hook.sh
+++ b/pkgs/development/libraries/gstreamer/core/setup-hook.sh
@@ -1,9 +1,9 @@
-addGstreamerLibPath () {
+addGstreamer1LibPath () {
     if test -d "$1/lib/gstreamer-1.0"
     then
         export GST_PLUGIN_SYSTEM_PATH_1_0="${GST_PLUGIN_SYSTEM_PATH_1_0}${GST_PLUGIN_SYSTEM_PATH_1_0:+:}$1/lib/gstreamer-1.0"
     fi
 }
 
-envHooks=(${envHooks[@]} addGstreamerLibPath)
+envHooks=(${envHooks[@]} addGstreamer1LibPath)
 
-- 
GitLab


From ab12d10f8705216fb9c5bcfafb00fd5a0335a868 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Thu, 10 Apr 2014 02:02:59 +0200
Subject: [PATCH 3393/3789] git: Update to 1.9.2

---
 .../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 9eaa7d219b0..649b0a7e4a2 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.1";
+  version = "1.9.2";
 
   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 = "0yx7qf9hqgfvrliqvk775pw3zh982nx5r16iw7n997q4ik7gnqpr";
+    sha256 = "1x4rb06vw4ckdflmn01r5l9spvn7cng4i5mm3sbd0n8cz0n6xz13";
   };
 
   patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
-- 
GitLab


From 5dd14a1059efcc26193cc37e61b8da94a25cbba9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 10 Apr 2014 07:52:26 +0200
Subject: [PATCH 3394/3789] nixos/phpfpm: Add option to set PHP package.

This allows to easily override the used PHP package, especially for
example if you want to use PHP 5.5 or if you want to override the
derivation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/web-servers/phpfpm.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix
index 76ec4124462..6ffe4beaa5d 100644
--- a/nixos/modules/services/web-servers/phpfpm.nix
+++ b/nixos/modules/services/web-servers/phpfpm.nix
@@ -35,6 +35,13 @@ in {
         '';
       };
 
+      phpPackage = mkOption {
+        default = pkgs.php54;
+        description = ''
+          The PHP package to use for running the FPM service.
+        '';
+      };
+
       poolConfigs = mkOption {
         type = types.attrsOf types.lines;
         default = {};
@@ -68,7 +75,7 @@ in {
         mkdir -p "${stateDir}"
       '';
       serviceConfig = {
-        ExecStart = "${pkgs.php54}/sbin/php-fpm -y ${cfgFile}";
+        ExecStart = "${cfg.phpPackage}/sbin/php-fpm -y ${cfgFile}";
         PIDFile = pidFile;
       };
     };
-- 
GitLab


From c7e94de91f903f7484e2bd644de9c179d76973a8 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 10 Apr 2014 02:27:43 +0200
Subject: [PATCH 3395/3789] lxc: set rootfs path somewhere outside /nix/store

This commit fixes lxc to eventually work
---
 pkgs/os-specific/linux/lxc/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 1fcdcbc2837..12305687c29 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -14,10 +14,14 @@ stdenv.mkDerivation rec {
 
   patches = [ ./install-localstatedir-in-store.patch ./support-db2x.patch ];
 
-  preConfigure = "export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
+  preConfigure = ''
+    export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml
+    substituteInPlace doc/rootfs/Makefile.am --replace '@LXCROOTFSMOUNT@' '$out/lib/lxc/rootfs'
+  '';
 
   configureFlags = [
     "--localstatedir=/var"
+    "--with-rootfs-path=/var/lib/lxc/rootfs"
     "--enable-doc"
     "--enable-tests"
     "--enable-apparmor"
-- 
GitLab


From 4219eb430d0f41508ef153dcfed6b665bbe83ae8 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 9 Apr 2014 11:40:26 +0200
Subject: [PATCH 3396/3789] intel-microcode: upgrade to 20140122

---
 pkgs/os-specific/linux/microcode/intel.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index d96a4943625..8de75fbc734 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, microcode2ucode }:
 
-let version = "20130906"; in
+let version = "20140122"; in
 
 stdenv.mkDerivation {
   name = "microcode-intel-${version}";
 
   src = fetchurl {
-    url = "http://downloadmirror.intel.com/23166/eng/microcode-${version}.tgz";
-    sha256 = "11k327icvijadq2zkgkc3sqwzraip9cviqm25566g09523ds0svv";
+    url = "http://downloadmirror.intel.com/23574/eng/microcode-${version}.tgz";
+    sha256 = "0r5ldb1jvrf0b6b112v3wdr7ikf2zky2jgby2lnqi1xwd34x42k8";
   };
 
   buildInputs = [ microcode2ucode ];
-- 
GitLab


From bf929ef73b00bc699b3035274f4a60e68ba1cbd7 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 9 Apr 2014 06:51:37 +0200
Subject: [PATCH 3397/3789] faac is redistributable, hydra is allowed to build
 it.

---
 pkgs/development/libraries/faac/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index 8bfaaf3ea49..2c4f8da7783 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.audiocoding.com/faac.html;
     # Incompatible with GPL. Some changes to the base code, included in faac,
     # are under LGPL though.
-    license = "unfree";
+    license = "unfree-redistributable";
   };
 }
-- 
GitLab


From 3ada08785f2bd191d3195e332b5c225f1d730038 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 9 Apr 2014 11:06:46 +0200
Subject: [PATCH 3398/3789] avidemux: make faacSupport optional

---
 pkgs/applications/video/avidemux/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index d706d16241c..485d8c54eb3 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -1,20 +1,23 @@
 {stdenv, fetchurl, cmake, pkgconfig, libxml2, qt4, gtk, gettext, SDL,
 libXv, pixman, libpthreadstubs, libXau, libXdmcp, libxslt, x264,
-alsaLib, lame, faac, faad2, libvorbis, yasm, libvpx, xvidcore, libva }:
+alsaLib, lame, faad2, libvorbis, yasm, libvpx, xvidcore, libva,
+faac ? null, faacSupport ? false }:
 
 assert stdenv ? glibc;
+assert faacSupport -> faac != null;
 
 stdenv.mkDerivation {
   name = "avidemux-2.5.6";
-  
+
   src = fetchurl {
     url = mirror://sourceforge/avidemux/avidemux_2.5.6.tar.gz;
     sha256 = "12wvxz0n2g85f079d8mdkkp2zm279d34m9v7qgcqndh48cn7znnn";
   };
-  
+
   buildInputs = [ cmake pkgconfig libxml2 qt4 gtk gettext SDL libXv
-    pixman libpthreadstubs libXau libXdmcp libxslt x264 alsaLib 
-    lame faac faad2 libvorbis yasm libvpx xvidcore libva ];
+    pixman libpthreadstubs libXau libXdmcp libxslt x264 alsaLib
+    lame faad2 libvorbis yasm libvpx xvidcore libva
+  ] ++ stdenv.lib.optional faacSupport faac;
 
   cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include" +
     " -DGETTEXT_INCLUDE_DIR=${gettext}/include" +
@@ -34,7 +37,7 @@ stdenv.mkDerivation {
     make install
   '';
 
-  meta = { 
+  meta = {
     homepage = http://fixounet.free.fr/avidemux/;
     description = "Free video editor designed for simple video editing tasks";
     maintainers = with stdenv.lib.maintainers; [viric];
-- 
GitLab


From c69577b7d6ea96cd605043440145ea6e094674b5 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 10 Apr 2014 12:20:50 +0200
Subject: [PATCH 3399/3789] nixos: fix shell on conatiners

---
 nixos/modules/programs/shadow.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 15b083b72d2..7e9133099ed 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -94,7 +94,7 @@ in
         groupmod = { rootOK = true; };
         groupmems = { rootOK = true; };
         groupdel = { rootOK = true; };
-        login = { startSession = true; allowNullPassword = true; showMotd = true; updateWtmp = true; };
+        login = { startSession = !config.boot.isContainer; allowNullPassword = true; showMotd = true; updateWtmp = true; };
         chpasswd = { rootOK = true; };
         chgpasswd = { rootOK = true; };
       };
-- 
GitLab


From 0b170187e364e6af9892e6d83247c090a132739c Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 10 Apr 2014 12:29:46 +0200
Subject: [PATCH 3400/3789] nixos: disable ntp on containers by default

---
 nixos/modules/services/networking/ntpd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix
index 3d388cb1064..fb7d6802136 100644
--- a/nixos/modules/services/networking/ntpd.nix
+++ b/nixos/modules/services/networking/ntpd.nix
@@ -36,7 +36,7 @@ in
     services.ntp = {
 
       enable = mkOption {
-        default = true;
+        default = !config.boot.isContainer;
         description = ''
           Whether to synchronise your machine's time using the NTP
           protocol.
-- 
GitLab


From c3c045c59d52e0282eb89d3a50b8d016d658ee61 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 10 Apr 2014 13:31:23 +0200
Subject: [PATCH 3401/3789] Add logstash-forwarder.

---
 .../tools/misc/logstash-forwarder/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/tools/misc/logstash-forwarder/default.nix

diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix
new file mode 100644
index 00000000000..52180c75c98
--- /dev/null
+++ b/pkgs/tools/misc/logstash-forwarder/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchgit, go }:
+stdenv.mkDerivation {
+  name = "logstash-forwarder-20140410";
+  src = fetchgit {
+    url = https://github.com/elasticsearch/logstash-forwarder.git;
+    rev = "ec504792108ab6536b45bcf6dff6d26a6b56fef3";
+    sha256 = "309545ceaec171bee997cad260bef1433e041b9f3bfe617d475bcf79924f943d";
+  };
+  buildInputs = [ go ];
+  installPhase = ''
+    mkdir -p $out/bin
+    cp build/bin/logstash-forwarder $out/bin
+  '';
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    homepage = https://github.com/elasticsearch/logstash-forwarder;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0de56da8311..9e8c8487ec2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1282,6 +1282,8 @@ let
 
   logstash = callPackage ../tools/misc/logstash { };
 
+  logstash-forwarder = callPackage ../tools/misc/logstash-forwarder { };
+
   kippo = callPackage ../servers/kippo { };
 
   klavaro = callPackage ../games/klavaro {};
-- 
GitLab


From fe7599b2b2c0f327d2a7672d081f64bbdf6ec2f3 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 10 Apr 2014 14:10:00 +0200
Subject: [PATCH 3402/3789] openldap: Update from 2.4.38 to 2.4.39

---
 pkgs/development/libraries/openldap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index c4be3358049..c8e8ff35277 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssl, cyrus_sasl, db, groff}:
 
 stdenv.mkDerivation rec {
-  name = "openldap-2.4.38";
+  name = "openldap-2.4.39";
 
   src = fetchurl {
     url = "ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/${name}.tgz";
-    sha256 = "1l8zng86alhcmmmw09r1c4dzl7yvk6dy5fq9zia96pgck4srl848";
+    sha256 = "19zq9dc7dl03wmqd11fbsdii1npyq1vlicl3nxbfygqh8xrwhrw2";
   };
 
   buildInputs = [ openssl cyrus_sasl db groff ];
-- 
GitLab


From 3dca6b98cb6549ef7ba0195a6ac1bbc811f8db66 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Apr 2014 10:53:49 +0200
Subject: [PATCH 3403/3789] Fix permissions on /var/lib/startup-done

---
 nixos/modules/virtualisation/containers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 097dd3993eb..9d54ddb9948 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -159,7 +159,7 @@ in
             # Create a named pipe to get a signal when the container
             # has finished booting.
             rm -f $root/var/lib/startup-done
-            mkfifo $root/var/lib/startup-done
+            mkfifo -m 0600 $root/var/lib/startup-done
          '';
 
         script =
-- 
GitLab


From da4f180252e9a8f539a019569efc82000ffe5440 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Apr 2014 11:32:50 +0200
Subject: [PATCH 3404/3789] =?UTF-8?q?Bring=20back=20=E2=80=98nixos-contain?=
 =?UTF-8?q?er=20update=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/virtualisation/nixos-container.pl | 71 +++++++++++++------
 1 file changed, 50 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index e42a3edd024..b6919852b28 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -54,6 +54,25 @@ if ($action eq "list") {
 my $containerName = $ARGV[1] or die "$0: no container name specified\n";
 $containerName =~ /^[a-zA-Z0-9\-]+$/ or die "$0: invalid container name\n";
 
+sub writeNixOSConfig {
+    my ($nixosConfigFile) = @_;
+
+    my $nixosConfig = <<EOF;
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{ boot.isContainer = true;
+  security.initialRootPassword = mkDefault "!";
+  networking.hostName = mkDefault "$containerName";
+  networking.useDHCP = false;
+  $extraConfig
+}
+EOF
+
+    write_file($nixosConfigFile, $nixosConfig);
+}
+
 if ($action eq "create") {
     # Acquire an exclusive lock to prevent races with other
     # invocations of ‘nixos-container create’.
@@ -108,20 +127,8 @@ if ($action eq "create") {
 
     mkpath("$root/etc/nixos", 0, 0755);
 
-    my $nixosConfig = <<EOF;
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-{ boot.isContainer = true;
-  security.initialRootPassword = mkDefault "!";
-  networking.hostName = mkDefault "$containerName";
-  networking.useDHCP = false;
-  $extraConfig
-}
-EOF
     my $nixosConfigFile = "$root/etc/nixos/configuration.nix";
-    write_file($nixosConfigFile, $nixosConfig);
+    writeNixOSConfig $nixosConfigFile;
 
     # The per-container directory is restricted to prevent users on
     # the host from messing with guest users who happen to have the
@@ -140,9 +147,16 @@ EOF
     exit 0;
 }
 
+my $root = "/var/lib/containers/$containerName";
+my $profileDir = "/nix/var/nix/profiles/per-container/$containerName";
 my $confFile = "/etc/containers/$containerName.conf";
 die "$0: container ‘$containerName’ does not exist\n" if !-e $confFile;
 
+sub isContainerRunning {
+    my $status = `systemctl show 'container\@$containerName'`;
+    return $status =~ /ActiveState=active/;
+}
+
 sub stopContainer {
     system("systemctl", "stop", "container\@$containerName") == 0
         or die "$0: failed to stop container\n";
@@ -152,11 +166,7 @@ if ($action eq "destroy") {
     die "$0: cannot destroy declarative container (remove it from your configuration.nix instead)\n"
         unless POSIX::access($confFile, &POSIX::W_OK);
 
-    my $root = "/var/lib/containers/$containerName";
-    my $profileDir = "/nix/var/nix/profiles/per-container/$containerName";
-
-    my $status = `systemctl show 'container\@$containerName'`;
-    stopContainer if $status =~ /ActiveState=active/;
+    stopContainer if isContainerRunning;
 
     rmtree($profileDir) if -e $profileDir;
     rmtree($root) if -e $root;
@@ -172,18 +182,37 @@ elsif ($action eq "stop") {
     stopContainer;
 }
 
+elsif ($action eq "update") {
+    my $nixosConfigFile = "$root/etc/nixos/configuration.nix";
+
+    # FIXME: may want to be more careful about clobbering the existing
+    # configuration.nix.
+    writeNixOSConfig $nixosConfigFile if defined $extraConfig;
+
+    system("nix-env", "-p", "$profileDir/system",
+           "-I", "nixos-config=$nixosConfigFile", "-f", "<nixpkgs/nixos>",
+           "--set", "-A", "system") == 0
+        or die "$0: failed to build container configuration\n";
+
+    if (isContainerRunning) {
+        print STDERR "reloading container...\n";
+        system("systemctl", "reload", "container\@$containerName") == 0
+            or die "$0: failed to reload container\n";
+    }
+}
+
 elsif ($action eq "login") {
-    exec($socat, "unix:/var/lib/containers/$containerName/var/lib/login.socket", "-,echo=0,raw");
+    exec($socat, "unix:$root/var/lib/login.socket", "-,echo=0,raw");
 }
 
 elsif ($action eq "root-shell") {
-    exec($socat, "unix:/var/lib/containers/$containerName/var/lib/root-shell.socket", "-");
+    exec($socat, "unix:$root/var/lib/root-shell.socket", "-");
 }
 
 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:/var/lib/containers/$containerName/var/lib/root-shell.socket", "-");
+    open(SOCAT, "|-", $socat, "unix:$root/var/lib/root-shell.socket", "-");
     print SOCAT "passwd\n";
     print SOCAT "$password\n";
     print SOCAT "$password\n";
-- 
GitLab


From ac8c924c0931237461266c2780e744c63880180c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Apr 2014 13:12:34 +0200
Subject: [PATCH 3405/3789] =?UTF-8?q?nixos-container:=20Add=20=E2=80=98run?=
 =?UTF-8?q?=E2=80=99=20and=20=E2=80=98root-login=E2=80=99=20commands?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

And remove ‘root-shell’.
---
 .../virtualisation/container-config.nix       | 51 +++++++++++++++----
 nixos/modules/virtualisation/containers.nix   |  2 +-
 .../modules/virtualisation/nixos-container.pl | 16 ++++--
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 3d107899e4f..21e64c8c095 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -30,27 +30,58 @@ with lib;
           };
       };
 
-    # Provide a non-interactive login root shell on
-    # /var/lib/root-shell.socket.  On the host, you can connect to it
-    # by running ‘socat unix:<path-to-container>/var/lib/root-shell.socket -’.
-    systemd.sockets.root-shell =
-      { description = "Root Shell Socket";
+    # 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.
+    systemd.sockets.root-login =
+      { description = "Root Login Socket";
         wantedBy = [ "sockets.target" ];
         socketConfig =
-          { ListenStream = "/var/lib/root-shell.socket";
-            SocketMode = "0600"; # only root can connect, obviously
+          { ListenStream = "/var/lib/root-login.socket";
+            SocketMode = "0600";
             Accept = true;
           };
       };
 
-    systemd.services."root-shell@" =
-      { description = "Root Shell %i";
+    systemd.services."root-login@" =
+      { description = "Root Login %i";
+        environment.TERM = "linux";
+        serviceConfig =
+          { Type = "simple";
+            StandardInput = "socket";
+            ExecStart = "${pkgs.socat}/bin/socat -t0 - \"exec:${pkgs.shadow}/bin/login -f root,pty,setsid,setpgid,stderr,ctty\"";
+            TimeoutStopSec = 1; # FIXME
+          };
+      };
+
+    # Provide a daemon on /var/lib/run-command.socket that reads a
+    # command from stdin and executes it.
+    systemd.sockets.run-command =
+      { description = "Run Command Socket";
+        wantedBy = [ "sockets.target" ];
+        socketConfig =
+          { ListenStream = "/var/lib/run-command.socket";
+            SocketMode = "0600";  # only root can connect
+            Accept = true;
+          };
+      };
+
+    systemd.services."run-command@" =
+      { description = "Run Command %i";
+        environment.TERM = "linux";
         serviceConfig =
           { Type = "simple";
             StandardInput = "socket";
-            ExecStart = "${pkgs.bash}/bin/bash --login";
             TimeoutStopSec = 1; # FIXME
           };
+        script =
+          ''
+            #! ${pkgs.stdenv.shell} -e
+            source /etc/bashrc
+            read c
+            eval "command=($c)"
+            exec "''${command[@]}"
+          '';
       };
 
     systemd.services.container-startup-done =
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 9d54ddb9948..fbdd3f9034c 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -256,7 +256,7 @@ in
               . "/etc/containers/$INSTANCE.conf"
             fi
             echo $SYSTEM_PATH/bin/switch-to-configuration test | \
-              ${pkgs.socat}/bin/socat unix:$root/var/lib/root-shell.socket -
+              ${pkgs.socat}/bin/socat unix:$root/var/lib/run-command.socket -
           '';
 
         serviceConfig.SyslogIdentifier = "container %i";
diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index b6919852b28..d7e8c7339b6 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -19,7 +19,8 @@ Usage: nixos-container list
        nixos-container start <container-name>
        nixos-container stop <container-name>
        nixos-container login <container-name>
-       nixos-container root-shell <container-name>
+       nixos-container root-login <container-name>
+       nixos-container run <container-name> -- args...
        nixos-container set-root-password <container-name> <password>
        nixos-container show-ip <container-name>
 EOF
@@ -205,14 +206,21 @@ elsif ($action eq "login") {
     exec($socat, "unix:$root/var/lib/login.socket", "-,echo=0,raw");
 }
 
-elsif ($action eq "root-shell") {
-    exec($socat, "unix:$root/var/lib/root-shell.socket", "-");
+elsif ($action eq "root-login") {
+    exec($socat, "unix:$root/var/lib/root-login.socket", "-,echo=0,raw");
+}
+
+elsif ($action eq "run") {
+    shift @ARGV; shift @ARGV;
+    open(SOCAT, "|-", $socat, "unix:$root/var/lib/run-command.socket", "-");
+    print SOCAT join(' ', map { "'$_'" } @ARGV), "\n";
+    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/root-shell.socket", "-");
+    open(SOCAT, "|-", $socat, "unix:$root/var/lib/run-command.socket", "-");
     print SOCAT "passwd\n";
     print SOCAT "$password\n";
     print SOCAT "$password\n";
-- 
GitLab


From a34bfbab4cac9d7abcab88a47694e1cc32111dba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Apr 2014 14:23:38 +0200
Subject: [PATCH 3406/3789] Add option networking.nat.internalInterfaces

This allows applying NAT to an interface, rather than an IP range.
---
 nixos/modules/services/networking/nat.nix | 55 +++++++++++++++++------
 1 file changed, 41 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index ce28f018828..d684d8e3122 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -10,6 +10,8 @@ let
 
   cfg = config.networking.nat;
 
+  dest = if cfg.externalIP == null then "-j MASQUERADE" else "-j SNAT --to-source ${cfg.externalIP}";
+
 in
 
 {
@@ -27,14 +29,27 @@ in
         '';
     };
 
+    networking.nat.internalInterfaces = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "eth0" ];
+      description =
+        ''
+          The interfaces for which to perform NAT. Packets coming from
+          these interface and destined for the external interface will
+          be rewritten.
+        '';
+    };
+
     networking.nat.internalIPs = mkOption {
       type = types.listOf types.str;
-      example = [ "192.168.1.0/24" ] ;
+      default = [];
+      example = [ "192.168.1.0/24" ];
       description =
         ''
           The IP address ranges for which to perform NAT.  Packets
-          coming from these networks and destined for the external
-          interface will be rewritten.
+          coming from these addresses (on any interface) and destined
+          for the external interface will be rewritten.
         '';
     };
 
@@ -80,25 +95,37 @@ in
 
         preStart =
           ''
+            iptables -t nat -F PREROUTING
             iptables -t nat -F POSTROUTING
             iptables -t nat -X
-          ''
-          + (concatMapStrings (network:
-            ''
-            iptables -t nat -A POSTROUTING \
-              -s ${network} -o ${cfg.externalInterface} \
-              ${if cfg.externalIP == null
-                then "-j MASQUERADE"
-                else "-j SNAT --to-source ${cfg.externalIP}"}
-            ''
-          ) cfg.internalIPs) +
-          ''
+
+            # We can't match on incoming interface in POSTROUTING, so
+            # mark packets coming from the external interfaces.
+            ${concatMapStrings (iface: ''
+              iptables -t nat -A PREROUTING \
+                -i '${iface}' -j MARK --set-mark 1
+            '') cfg.internalInterfaces}
+
+            # NAT the marked packets.
+            ${optionalString (cfg.internalInterfaces != []) ''
+              iptables -t nat -A POSTROUTING -m mark --mark 1 \
+                -o ${cfg.externalInterface} ${dest}
+            ''}
+
+            # NAT packets coming from the internal IPs.
+            ${concatMapStrings (range: ''
+              iptables -t nat -A POSTROUTING \
+                -s '${range}' -o ${cfg.externalInterface} ${dest}}
+            '') cfg.internalIPs}
+
             echo 1 > /proc/sys/net/ipv4/ip_forward
           '';
 
         postStop =
           ''
+            iptables -t nat -F PREROUTING
             iptables -t nat -F POSTROUTING
+            iptables -t nat -X
           '';
       };
   };
-- 
GitLab


From 6a7a8a144fae43fae51232703bf742c8bcee8d67 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Apr 2014 14:57:40 +0200
Subject: [PATCH 3407/3789] Document NixOS containers

---
 nixos/doc/manual/containers.xml             | 242 ++++++++++++++++++++
 nixos/doc/manual/manual.xml                 |   1 +
 nixos/modules/virtualisation/containers.nix |   2 +
 3 files changed, 245 insertions(+)
 create mode 100644 nixos/doc/manual/containers.xml

diff --git a/nixos/doc/manual/containers.xml b/nixos/doc/manual/containers.xml
new file mode 100644
index 00000000000..b8f170fc614
--- /dev/null
+++ b/nixos/doc/manual/containers.xml
@@ -0,0 +1,242 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="ch-containers">
+
+<title>Containers</title>
+
+<para>NixOS allows you to easily run other NixOS instances as
+<emphasis>containers</emphasis>. Containers are a light-weight
+approach to virtualisation that runs software in the container at the
+same speed as in the host system. NixOS containers share the Nix store
+of the host, making container creation very efficient.</para>
+
+<warning><para>Currently, NixOS containers are not perfectly isolated
+from the host system. This means that a user with root access to the
+container can do things that affect the host. So you should not give
+container root access to untrusted users.</para></warning>
+
+<para>NixOS containers can be created in two ways: imperatively, using
+the command <command>nixos-container</command>, and declaratively, by
+specifying them in your <filename>configuration.nix</filename>. The
+declarative approach implies that containers get upgraded along with
+your host system when you run <command>nixos-rebuild</command>, which
+is often not what you want. By contrast, in the imperative approach,
+containers are configured and updated independently from the host
+system.</para>
+
+
+<section><title>Imperative container management</title>
+
+<para>We’ll cover imperative container management using
+<command>nixos-container</command> first. You create a container with
+identifier <literal>foo</literal> as follows:
+
+<screen>
+$ nixos-container create foo
+</screen>
+
+This creates the container’s root directory in
+<filename>/var/lib/containers/foo</filename> and a small configuration
+file in <filename>/etc/containers/foo.conf</filename>. It also builds
+the container’s initial system configuration and stores it in
+<filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You
+can modify the initial configuration of the container on the command
+line. For instance, to create a container that has
+<command>sshd</command> running, with the given public key for
+<literal>root</literal>:
+
+<screen>
+$ nixos-container create foo --config 'services.openssh.enable = true; \
+  users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];'
+</screen>
+
+</para>
+
+<para>Creating a container does not start it. To start the container,
+run:
+
+<screen>
+$ nixos-container start foo
+</screen>
+
+This command will return as soon as the container has booted and has
+reached <literal>multi-user.target</literal>. On the host, the
+container runs within a systemd unit called
+<literal>container@<replaceable>container-name</replaceable>.service</literal>.
+Thus, if something went wrong, you can get status info using
+<command>systemctl</command>:
+
+<screen>
+$ systemctl status container@foo
+</screen>
+
+</para>
+
+<para>If the container has started succesfully, you can log in as
+root using the <command>root-login</command> operation:
+
+<screen>
+$ nixos-container root-login foo
+[root@foo:~]#
+</screen>
+
+Note that only root on the host can do this (since there is no
+authentication).  You can also get a regular login prompt using the
+<command>login</command> operation, which is available to all users on
+the host:
+
+<screen>
+$ nixos-container login foo
+foo login: alice
+Password: ***
+</screen>
+
+With <command>nixos-container run</command>, you can execute arbitrary
+commands in the container:
+
+<screen>
+$ nixos-container run foo -- uname -a
+Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
+</screen>
+
+</para>
+
+<para>There are several ways to change the configuration of the
+container. First, on the host, you can edit
+<literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
+and run
+
+<screen>
+$ nixos-container update foo
+</screen>
+
+This will build and activate the new configuration. You can also
+specify a new configuration on the command line:
+
+<screen>
+$ nixos-container update foo --config 'services.httpd.enable = true; \
+  services.httpd.adminAddr = "foo@example.org";'
+
+$ curl http://$(nixos-container show-ip foo)/
+&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
+</screen>
+
+However, note that this will overwrite the container’s
+<filename>/etc/nixos/configuration.nix</filename>.</para>
+
+<para>Alternatively, you can change the configuration from within the
+container itself by running <command>nixos-rebuild switch</command>
+inside the container. Note that the container by default does not have
+a copy of the NixOS channel, so you should run <command>nix-channel
+--update</command> first.</para>
+
+<para>Containers can be stopped and started using
+<literal>nixos-container stop</literal> and <literal>nixos-container
+start</literal>, respectively, or by using
+<command>systemctl</command> on the container’s service unit. To
+destroy a container, including its file system, do
+
+<screen>
+$ nixos-container destroy foo
+</screen>
+
+</para>
+
+</section>
+
+
+<section><title>Declarative container specification</title>
+
+<para>You can also specify containers and their configuration in the
+host’s <filename>configuration.nix</filename>.  For example, the
+following specifies that there shall be a container named
+<literal>database</literal> running PostgreSQL:
+
+<programlisting>
+containers.database =
+  { config =
+      { config, pkgs, ... }:
+      { services.postgresql.enable = true;
+        services.postgresql.package = pkgs.postgresql92;
+      };
+  };
+</programlisting>
+
+If you run <literal>nixos-rebuild switch</literal>, the container will
+be built and started. If the container was already running, it will be
+updated in place, without rebooting.</para>
+
+<para>By default, declarative containers share the network namespace
+of the host, meaning that they can listen on (privileged)
+ports. However, they cannot change the network configuration. You can
+give a container its own network as follows:
+
+<programlisting>
+containers.database =
+  { privateNetwork = true;
+    hostAddress = "192.168.100.10";
+    localAddress = "192.168.100.11";
+  };
+</programlisting>
+
+This gives the container a private virtual Ethernet interface with IP
+address <literal>192.168.100.11</literal>, which is hooked up to a
+virtual Ethernet interface on the host with IP address
+<literal>192.168.100.10</literal>.  (See the next section for details
+on container networking.)</para>
+
+<para>To disable the container, just remove it from
+<filename>configuration.nix</filename> and run <literal>nixos-rebuild
+switch</literal>. Note that this will not delete the root directory of
+the container in <literal>/var/lib/containers</literal>.</para>
+
+</section>
+
+
+<section><title>Networking</title>
+
+<para>When you create a container using <literal>nixos-container
+create</literal>, it gets it own private IPv4 address in the range
+<literal>10.233.0.0/16</literal>. You can get the container’s IPv4
+address as follows:
+
+<screen>
+$ nixos-container show-ip foo
+10.233.4.2
+
+$ ping -c1 10.233.4.2
+64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms
+</screen>
+
+</para>
+
+<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
+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
+network.</para>
+
+<para>By default, containers cannot talk to the outside network. If
+you want that, you should set up Network Address Translation (NAT)
+rules on the host to rewrite container traffic to use your external
+IP address. This can be accomplished using the following configuration
+on the host:
+
+<programlisting>
+networking.nat.enable = true;
+networking.nat.internalInterfaces = ["c-+"];
+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
+that matches all container interfaces.</para>
+
+</section>
+
+
+</chapter>
+
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index f9775f4f017..5753a8ff9e7 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -54,6 +54,7 @@
   <xi:include href="running.xml" />
   <!-- <xi:include href="userconfiguration.xml" /> -->
   <xi:include href="troubleshooting.xml" />
+  <xi:include href="containers.xml" />
   <xi:include href="development.xml" />
 
   <xi:include href="release-notes.xml" />
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index fbdd3f9034c..c53bd7d3509 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -281,6 +281,8 @@ in
           '';
       }) config.containers;
 
+    # FIXME: auto-start containers.
+
     # Generate /etc/hosts entries for the containers.
     networking.extraHosts = concatStrings (mapAttrsToList (name: cfg: optionalString (cfg.localAddress != null)
       ''
-- 
GitLab


From 8aa84644f9ffaed98b73706c2822ba06955c5c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Wed, 9 Apr 2014 22:32:11 +0200
Subject: [PATCH 3408/3789] libtxc_dxtn_s2tc: add v1.0 (close #2194)

S2TC is a patent-free S3TC compatible implementation and provides texture
compression to mesa.
---
 .../libraries/libtxc_dxtn_s2tc/default.nix    | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix

diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
new file mode 100644
index 00000000000..86f5029e9a5
--- /dev/null
+++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, autoreconfHook, mesa }:
+
+let version = "1.0"; in
+
+stdenv.mkDerivation rec {
+  name = "libtxc_dxtn_s2tc-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/divVerent/s2tc/archive/v${version}.tar.gz";
+    sha256 = "0ibfdib277fhbqvxzan0bmglwnsl1y1rw2g8skvz82l1sfmmn752";
+  };
+
+  buildInputs = [ autoreconfHook mesa ];
+
+  meta = {
+    description = "A patent-free S3TC compatible implementation";
+    homepage = https://github.com/divVerent/s2tc;
+    repositories.git = https://github.com/divVerent/s2tc.git;
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.page ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e8c8487ec2..7e368d1820d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5203,6 +5203,8 @@ let
 
   libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { };
 
+  libtxc_dxtn_s2tc = callPackage ../development/libraries/libtxc_dxtn_s2tc { };
+
   libgeotiff = callPackage ../development/libraries/libgeotiff { };
 
   libunistring = callPackage ../development/libraries/libunistring { };
-- 
GitLab


From 297bcd2088d5bd85641aa47c52949a512838a250 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:37:52 +0200
Subject: [PATCH 3409/3789] pango on darwin: attempt to fix build

Supply older flex (new doesn't build), and disable introspection.
---
 pkgs/development/libraries/pango/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix              | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index b94a00b1b54..fbf3b0f34d4 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx";
   };
 
-  buildInputs = [ gobjectIntrospection ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];
-
+  buildInputs = with stdenv.lib;
+    optional (!stdenv.isDarwin) gobjectIntrospection # build problems
+    ++ optionals stdenv.isDarwin [ gettext fontconfig ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e368d1820d..c9336b254fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4564,7 +4564,9 @@ let
   };
   cairomm = callPackage ../development/libraries/cairomm { };
 
-  pango = callPackage ../development/libraries/pango { };
+  pango = callPackage ../development/libraries/pango (
+    lib.optionalAttrs stdenv.isDarwin { flex = flex_2_5_35; } # flex fails to build
+  );
   pangomm = callPackage ../development/libraries/pangomm { };
 
   pangox_compat = callPackage ../development/libraries/pangox-compat { };
-- 
GitLab


From 88691049ae48f07503daecae2ea317bfa83ea29d Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 10 Apr 2014 20:40:38 +0200
Subject: [PATCH 3410/3789] postgresql93: fix darwin builds

ossp-uuid does not build on darwin
---
 pkgs/servers/sql/postgresql/9.3.x.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index 3b5c820c94d..672eeb8da6e 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, zlib, readline, libossp_uuid }:
 
+with stdenv.lib;
+
 let version = "9.3.3"; in
 
 stdenv.mkDerivation rec {
@@ -10,13 +12,13 @@ stdenv.mkDerivation rec {
     sha256 = "e925d8abe7157bd8bece6b7c0dd0c343d87a2b4336f85f4681ce596af99c3879";
   };
 
-  buildInputs = [ zlib readline libossp_uuid ];
+  buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
 
   enableParallelBuilding = true;
 
   makeFlags = [ "world" ];
 
-  configureFlags =
+  configureFlags = optional (!stdenv.isDarwin)
     ''
       --with-ossp-uuid
     '';
-- 
GitLab


From 07dc578572a2d0cad3a9c531c91d4e86e5446d86 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 21:19:40 +0200
Subject: [PATCH 3411/3789] llvm(Packages) on darwin: attempts to fix

- mark llvm34 as broken on darwin (so it doesn't install by default with nix-env)
- don't use our gcc for llvm_34 (might fix the build)
- switch also clang default to 3.3 on darwin (llvm was before)
---
 pkgs/development/compilers/llvm/3.4/llvm.nix |  1 +
 pkgs/top-level/all-packages.nix              | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 7f58abea1fa..fad11b7a123 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -54,5 +54,6 @@ in stdenv.mkDerivation rec {
     license     = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
     platforms   = stdenv.lib.platforms.all;
+    broken      = stdenv.isDarwin;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9336b254fc..fff43792fcc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2424,7 +2424,7 @@ let
   clangUnwrapped = llvm: pkg: callPackage pkg {
       stdenv = if stdenv.isDarwin
          then stdenvAdapters.overrideGCC stdenv gccApple
-         else stdenvAdapters.overrideGCC stdenv gcc48;
+         else stdenv;
       llvm = llvm;
   };
 
@@ -2926,10 +2926,9 @@ let
 
   lessc = callPackage ../development/compilers/lessc { };
 
-  llvm = if stdenv.isDarwin then llvm_33 # until someone solves build problems with _34
-    else llvmPackages.llvm;
+  llvm = llvmPackages.llvm;
 
-  llvm_34 = llvmPackages.llvm;
+  llvm_34 = llvmPackages_34.llvm;
   llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix;
   llvm_32 = llvm_v ../development/compilers/llvm/3.2;
   llvm_31 = llvm_v ../development/compilers/llvm/3.1;
@@ -2940,12 +2939,14 @@ let
       else stdenv;
   };
 
-  llvmPackages = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
-    inherit newScope fetchurl;
+  llvmPackages = if !stdenv.isDarwin then llvmPackages_34 else {
+    # until someone solves build problems with _34
+    llvm = llvm_33;
+    clang = clang_33;
+  };
+  llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
+    inherit stdenv newScope fetchurl;
     isl = isl_0_12;
-    stdenv = if stdenv.isDarwin
-      then stdenvAdapters.overrideGCC stdenv gcc48
-      else stdenv;
   });
   llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; };
 
-- 
GitLab


From 7839df9a092570cfd7e5db2f3fc895ed0ada7aea Mon Sep 17 00:00:00 2001
From: vi <me@vikramverma.com>
Date: Fri, 11 Apr 2014 10:20:21 +0800
Subject: [PATCH 3412/3789] New derivation: language-c-inline (haskell)

---
 .../haskell/language-c-inline/default.nix         | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/language-c-inline/default.nix

diff --git a/pkgs/development/libraries/haskell/language-c-inline/default.nix b/pkgs/development/libraries/haskell/language-c-inline/default.nix
new file mode 100644
index 00000000000..9e57490db34
--- /dev/null
+++ b/pkgs/development/libraries/haskell/language-c-inline/default.nix
@@ -0,0 +1,15 @@
+{ cabal, filepath, languageCQuote, mainlandPretty }:
+
+cabal.mkDerivation (self: {
+  pname = "language-c-inline";
+  version = "0.3.0.1";
+  sha256 = "0dw1fqwg9hhwgvak0ykhafbxp4gnb2ww9lc83m8kzkyzn1ccb6hg";
+  buildDepends = [ filepath languageCQuote mainlandPretty ];
+  doCheck = false;
+  meta = {
+    homepage = "https://github.com/mchakravarty/language-c-inline/";
+    description = "Inline C & Objective-C code in Haskell for language interoperability";
+    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 81e894db95e..2d837ec8433 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1601,6 +1601,8 @@ 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 {};
 
-- 
GitLab


From 31f375532759e5ace6ed3738011e2028bbebabc6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 11 Apr 2014 11:08:22 +0400
Subject: [PATCH 3413/3789] Adding TCPFlow: a tool to separate tcp streams when
 capturing

---
 pkgs/tools/networking/tcpflow/default.nix     | 29 +++++++++++++++++++
 .../tools/networking/tcpflow/default.upstream |  1 +
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/networking/tcpflow/default.nix
 create mode 100644 pkgs/tools/networking/tcpflow/default.upstream

diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/tools/networking/tcpflow/default.nix
new file mode 100644
index 00000000000..9c5f6f44ae0
--- /dev/null
+++ b/pkgs/tools/networking/tcpflow/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl, openssl, zlib, libpcap, boost, cairo}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="tcpflow";
+    version="1.4.4";
+    name="${baseName}-${version}";
+    hash="0k2lxlvn1x8avkrijc22scrj4p2g5agfskbgfc2d0w9zgrg61xdn";
+    url="http://www.digitalcorpora.org/downloads/tcpflow/tcpflow-1.4.4.tar.gz";
+    sha256="0k2lxlvn1x8avkrijc22scrj4p2g5agfskbgfc2d0w9zgrg61xdn";
+  };
+  buildInputs = [
+    openssl zlib libpcap boost cairo
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+  meta = {
+    inherit (s) version;
+    description = ''TCP stream extractor'';
+    license = stdenv.lib.licenses.gpl3 ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/networking/tcpflow/default.upstream b/pkgs/tools/networking/tcpflow/default.upstream
new file mode 100644
index 00000000000..72802e4d046
--- /dev/null
+++ b/pkgs/tools/networking/tcpflow/default.upstream
@@ -0,0 +1 @@
+url http://www.digitalcorpora.org/downloads/tcpflow/
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fff43792fcc..583a51a5e70 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2035,6 +2035,8 @@ let
   tcpcrypt = callPackage ../tools/security/tcpcrypt { };
 
   tcpdump = callPackage ../tools/networking/tcpdump { };
+  
+  tcpflow = callPackage ../tools/networking/tcpflow { };
 
   teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer { };
 
-- 
GitLab


From d65daf11b0706c1289f761133f37f5066132b949 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:22 +0200
Subject: [PATCH 3414/3789] haskell-HTF: update to version 0.11.3.4

---
 pkgs/development/libraries/haskell/HTF/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix
index 041c619850a..aeb80822f61 100644
--- a/pkgs/development/libraries/haskell/HTF/default.nix
+++ b/pkgs/development/libraries/haskell/HTF/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HTF";
-  version = "0.11.3.0";
-  sha256 = "0kw0yxmxr3whi6cvrxnrpzyikbjqwvcram5mjc27b46k2p38zxpj";
+  version = "0.11.3.4";
+  sha256 = "0db47fvp33k83dnhvpygprm06p3z397f5ci154vqk7krjpxb2ynx";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 6c0ce0abf7c6a52178b5909da4b583525ae63bde Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:24 +0200
Subject: [PATCH 3415/3789] haskell-active: update to version 0.1.0.11

---
 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 99e217ba647..168b555bd4a 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.10";
-  sha256 = "173ri9hv86sjfp3a0jp1y3v8rz0lfb6nz3yilcfvgc9sglcxa4bm";
+  version = "0.1.0.11";
+  sha256 = "0acm039s8aja54r66y6m456x49g8w3adyx1zs7yv1h6xyy7v7gcv";
   buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
   testDepends = [
     newtype QuickCheck semigroupoids semigroups vectorSpace
-- 
GitLab


From b0d1df0f8fbe6f245ab7c0f3778a06388e235303 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:25 +0200
Subject: [PATCH 3416/3789] haskell-aws: update to version 0.9

---
 .../libraries/haskell/aws/default.nix         | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix
index de7377c7532..7394583c667 100644
--- a/pkgs/development/libraries/haskell/aws/default.nix
+++ b/pkgs/development/libraries/haskell/aws/default.nix
@@ -1,23 +1,22 @@
-{ cabal, aeson, attempt, attoparsecConduit, base16Bytestring
-, base64Bytestring, blazeBuilder, caseInsensitive, cereal, conduit
-, cryptoApi, cryptohash, cryptohashCryptoapi, dataDefault, failure
-, filepath, httpConduit, httpTypes, liftedBase, monadControl, mtl
-, resourcet, text, time, transformers, unorderedContainers
-, utf8String, vector, xmlConduit
+{ cabal, aeson, base16Bytestring, base64Bytestring, blazeBuilder
+, byteable, caseInsensitive, cereal, conduit, conduitExtra
+, cryptohash, dataDefault, filepath, httpConduit, httpTypes
+, liftedBase, monadControl, mtl, resourcet, text, time
+, transformers, unorderedContainers, utf8String, vector, xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "aws";
-  version = "0.8.6";
-  sha256 = "19hjwj15zmhmf33n2d2dkwan59ylwkaslh85sh04v05hsm8y5y1a";
+  version = "0.9";
+  sha256 = "07sdz179vqfdcnm6rrdg068xdyqw8m2565bdba5a1s987vdvps21";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson attempt attoparsecConduit base16Bytestring base64Bytestring
-    blazeBuilder caseInsensitive cereal conduit cryptoApi cryptohash
-    cryptohashCryptoapi dataDefault failure filepath httpConduit
-    httpTypes liftedBase monadControl mtl resourcet text time
-    transformers unorderedContainers utf8String vector xmlConduit
+    aeson base16Bytestring base64Bytestring blazeBuilder byteable
+    caseInsensitive cereal conduit conduitExtra cryptohash dataDefault
+    filepath httpConduit httpTypes liftedBase monadControl mtl
+    resourcet text time transformers unorderedContainers utf8String
+    vector xmlConduit
   ];
   meta = {
     homepage = "http://github.com/aristidb/aws";
-- 
GitLab


From 6cbf27406d14d57ade63a19a298e0aaeeba3147b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:26 +0200
Subject: [PATCH 3417/3789] haskell-binary-conduit: update to version 1.2.1.1

---
 .../libraries/haskell/binary-conduit/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/binary-conduit/default.nix b/pkgs/development/libraries/haskell/binary-conduit/default.nix
index 0149fcabe72..4126910db75 100644
--- a/pkgs/development/libraries/haskell/binary-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/binary-conduit/default.nix
@@ -1,14 +1,14 @@
 { cabal, binary, conduit, hspec, QuickCheck, quickcheckAssertions
-, vector
+, resourcet, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "binary-conduit";
-  version = "1.2";
-  sha256 = "1m58zgmivapn51gs5983vpsivzkki94kkac014mwvnp90q46nkvx";
-  buildDepends = [ binary conduit vector ];
+  version = "1.2.1.1";
+  sha256 = "0f6ki793fbgxpsqadfj796b4rbv6zhn4v4rrd48r48zzw9hmxmzd";
+  buildDepends = [ binary conduit resourcet vector ];
   testDepends = [
-    binary conduit hspec QuickCheck quickcheckAssertions
+    binary conduit hspec QuickCheck quickcheckAssertions resourcet
   ];
   meta = {
     homepage = "http://github.com/qnikst/binary-conduit";
-- 
GitLab


From 3dd79d7e62a767f9e698c63cc82912c670eb13bf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:27 +0200
Subject: [PATCH 3418/3789] haskell-classy-prelude-conduit: update to version
 0.9.0

---
 .../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 d128ee0a5a4..5324054423b 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.8.1";
-  sha256 = "16wiii630ivcsxrjkmks995lcn0q0plmzbg4h08g5mdgscql2ax1";
+  version = "0.9.0";
+  sha256 = "1lvi5n2km6l2saspiczpkvaq6670bp658kn83s334h6s6wlba3dz";
   buildDepends = [
     classyPrelude conduit conduitCombinators monadControl resourcet
     systemFileio transformers void
-- 
GitLab


From 820757f40293d5fba60a0a0b04d43810168129a9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:28 +0200
Subject: [PATCH 3419/3789] haskell-classy-prelude: update to version 0.9.0

---
 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 e9b6d71eeb3..4c142a23f3a 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.8.3.1";
-  sha256 = "1mszblcww2pqy1zybib7rd4y6sqbd5nih0zzfi9zb69bwwb7mjai";
+  version = "0.9.0";
+  sha256 = "1y4440jy7x9ns4kyb638f5lfa1h3vq3wwcwzkpswr8rf8f7z1bj6";
   buildDepends = [
     basicPrelude chunkedData enclosedExceptions hashable liftedBase
     monoTraversable semigroups stm systemFilepath text time
-- 
GitLab


From 73b6fdefa8597d937ee640dbf0fb8df6a2f71d51 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:29 +0200
Subject: [PATCH 3420/3789] haskell-criterion: update to version 0.8.0.2

---
 pkgs/development/libraries/haskell/criterion/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix
index ba8f1b70c77..e106138ef24 100644
--- a/pkgs/development/libraries/haskell/criterion/default.nix
+++ b/pkgs/development/libraries/haskell/criterion/default.nix
@@ -1,15 +1,15 @@
 { cabal, aeson, binary, deepseq, filepath, Glob, hastache, mtl
-, mwcRandom, parsec, statistics, time, transformers, vector
+, mwcRandom, parsec, statistics, text, time, transformers, vector
 , vectorAlgorithms
 }:
 
 cabal.mkDerivation (self: {
   pname = "criterion";
-  version = "0.8.0.1";
-  sha256 = "1f4wsaiyq0zks71jgfx43774vxkf9l362a9kfd2jhsnxx7zkv5sq";
+  version = "0.8.0.2";
+  sha256 = "126c3i9i88wqs5ihif4kpsc1gdqas57acd8h5jbyfqhgbwi1s7gz";
   buildDepends = [
     aeson binary deepseq filepath Glob hastache mtl mwcRandom parsec
-    statistics time transformers vector vectorAlgorithms
+    statistics text time transformers vector vectorAlgorithms
   ];
   meta = {
     homepage = "https://github.com/bos/criterion";
-- 
GitLab


From e39071103ea9e226e5a1bc67d6e0e2647a8f8153 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:30 +0200
Subject: [PATCH 3421/3789] haskell-diagrams-core: update to version 1.1.0.2

---
 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 3529faaf6af..eb9207a936f 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.1";
-  sha256 = "1jr827cd3qa631glwc9h247w0wnrx84gj2iwxj18b4y78d0ajz69";
+  version = "1.1.0.2";
+  sha256 = "1py1dk6w6f00kd48kxbdbxmd3rakxdmwgpb09g346vmkbxkj56mq";
   buildDepends = [
     dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace
     vectorSpacePoints
-- 
GitLab


From 5b0bd8e16e03cd4de1fc7e4ea43233c7f1707983 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:31 +0200
Subject: [PATCH 3422/3789] haskell-fay: update to version 0.19.2

---
 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 3af423e5745..f7bf07b4fba 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.1.2";
-  sha256 = "1v6fnyzvs55sf602ja74x5cwkg97rc46ybv8ybrnsg9jvhscynpr";
+  version = "0.19.2";
+  sha256 = "08lq2x87gsf5szdj613k9h3qxzpb99hjhxnq3vggs2kf0ijp6xmh";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 8fb3c001ee3dbb3dcac9f06ebdc4495c6a4373db Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:32 +0200
Subject: [PATCH 3423/3789] haskell-hmatrix: update to version 0.15.2.1

---
 pkgs/development/libraries/haskell/hmatrix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index 51670f63973..bb0c48b9118 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hmatrix";
-  version = "0.15.2.0";
-  sha256 = "0rlgyqgl9x08f38nznbv50asbph0zp9dqk0l156hxz792590payl";
+  version = "0.15.2.1";
+  sha256 = "0pcs3dsxmaznsb82r71f4kf7xbwvj94cy1fmyya52nv3nldnk1jg";
   buildDepends = [ binary deepseq random storableComplex vector ];
   extraLibraries = [ blas gsl liblapack ];
   meta = {
-- 
GitLab


From 47a7805337751d0ec25214c467a18574cc0ac150 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:33 +0200
Subject: [PATCH 3424/3789] haskell-hxt-xpath: update to version 9.1.2.1

---
 pkgs/development/libraries/haskell/hxt-xpath/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/hxt-xpath/default.nix b/pkgs/development/libraries/haskell/hxt-xpath/default.nix
index 91524320ece..73e350bd77b 100644
--- a/pkgs/development/libraries/haskell/hxt-xpath/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-xpath/default.nix
@@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
     description = "The XPath modules for HXT";
-    license = self.stdenv.lib.licenses.mit;
+    license = "unknown";
     platforms = self.ghc.meta.platforms;
   };
 })
-- 
GitLab


From 237bf0f8b7c55ddf0745e82bbd567e3bce89309d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:35 +0200
Subject: [PATCH 3425/3789] haskell-language-c: update to version 0.4.4

---
 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 c415e3a2b93..188ca99a5be 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.3";
-  sha256 = "0y5yn0jaairqixxqx7c80z5y5mc6czshps7wghjci1s39mn9cjf6";
+  version = "0.4.4";
+  sha256 = "0pfadijrcfvxvdrwk8n54pqvpmi4qa5w7s0l9shxbkvpj0dmnp50";
   buildDepends = [ filepath syb ];
   buildTools = [ alex happy ];
   meta = {
-- 
GitLab


From 977aa979bf7c02b350018a9b0eb6bd34520629d1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:37 +0200
Subject: [PATCH 3426/3789] haskell-quickcheck-instances: update to version
 0.3.8

---
 .../libraries/haskell/quickcheck-instances/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
index 00ea65388fd..b45fab000ca 100644
--- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
+++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "quickcheck-instances";
-  version = "0.3.7";
-  sha256 = "0zf2b2zisfx7j7i4jnb79w5hhk5dy53w23fi876flx3vl6mfvszw";
+  version = "0.3.8";
+  sha256 = "0132a37zi1haz1aaggxa1hr421bcmxlbaa4m2l53m2rmr4z5mgkg";
   buildDepends = [
     hashable QuickCheck text time unorderedContainers
   ];
-- 
GitLab


From 37b804f7df01711c8959a59f51e319ceb1181872 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:38 +0200
Subject: [PATCH 3427/3789] haskell-semigroups: update to version 0.13.0.1

---
 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 432eb77ae3e..22dfb5e8896 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.12.2";
-  sha256 = "0qk6m477iwk17j2a1yfxfkhvfrdv94nnx32zlqjqqxjfbi71c30g";
+  version = "0.13.0.1";
+  sha256 = "12zd1pvggjj81hi7vm9z8fxcwsg6r2xbsg3qjs8snnybadi0qlfl";
   buildDepends = [ hashable nats text unorderedContainers ];
   meta = {
     homepage = "http://github.com/ekmett/semigroups/";
-- 
GitLab


From 9b2b87379c76ddb9d49f022c9e728710ea2b5c31 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:39 +0200
Subject: [PATCH 3428/3789] haskell-tf-random: update to version 0.5

---
 pkgs/development/libraries/haskell/tf-random/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tf-random/default.nix b/pkgs/development/libraries/haskell/tf-random/default.nix
index 3ff0b2d9b84..79e27f87fc6 100644
--- a/pkgs/development/libraries/haskell/tf-random/default.nix
+++ b/pkgs/development/libraries/haskell/tf-random/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tf-random";
-  version = "0.4";
-  sha256 = "0yi7699zswpsn9a39ccqkyd0117sppjnqggclnhs1wm7ql1glc27";
+  version = "0.5";
+  sha256 = "0445r2nns6009fmq0xbfpyv7jpzwv0snccjdg7hwj4xk4z0cwc1f";
   buildDepends = [ primitive random time ];
   meta = {
     description = "High-quality splittable pseudorandom number generator";
-- 
GitLab


From 967027576bb4e60a74b30c219249a29fbd03e976 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:40 +0200
Subject: [PATCH 3429/3789] haskell-thyme: update to version 0.3.3.0

---
 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 fe79454781a..e321f21b2ca 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.2.0";
-  sha256 = "1jrhqrvmkq8n943l6dkyszg4qz47jbddr80qg7k51a9nrg8fins4";
+  version = "0.3.3.0";
+  sha256 = "0mpwwpc82xcdyawz87rcmvga1miw7cx538nnh379m2ibn0g71zaa";
   buildDepends = [
     aeson attoparsec deepseq mtl profunctors QuickCheck random text
     time vector vectorSpace
-- 
GitLab


From a72ef2976c2b4f55d9173693ee9de06e0594dccd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:41 +0200
Subject: [PATCH 3430/3789] haskell-yesod-auth: update to version 1.3.0.4

---
 pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 93e1bb9cadd..182e6bcf5b2 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.3.0.2";
-  sha256 = "1lx9xz5jrr63256w64isndwr323khsyyn8ah1iv1vy7n54y9afpk";
+  version = "1.3.0.4";
+  sha256 = "0r4xhr9xg6n3jxpj3mrcaf4mgzz8h4is772k84sgnir5my9lrsr7";
   buildDepends = [
     aeson authenticate base16Bytestring blazeHtml blazeMarkup
     cryptohash dataDefault emailValidate fileEmbed hamlet httpConduit
-- 
GitLab


From 8c3a7ea68cb0784c13816c47904a95e09db2a35e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:42 +0200
Subject: [PATCH 3431/3789] haskell-yesod-form: update to version 1.3.8.2

---
 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 a67eccb00c2..42e1f13242e 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.1";
-  sha256 = "0cyvyr3whrbswawv5rcfmq9nhk3kf4d3vgfm8z01prcqdsc4yh21";
+  version = "1.3.8.2";
+  sha256 = "0sx2rk4z4hzwz3nzcg487wm5bdpdm612ikp0slfph1wkzc39h12a";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable
     dataDefault emailValidate hamlet network persistent resourcet
-- 
GitLab


From cf000e0d0fffa14b9c86621ed858da07eaaee2f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 12:56:43 +0200
Subject: [PATCH 3432/3789] haskell-yesod-persistent: update to version 1.2.2.3

---
 .../libraries/haskell/yesod-persistent/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
index a96db23f952..432adeee9af 100644
--- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-persistent";
-  version = "1.2.2.2";
-  sha256 = "112wr85k8a7ah1m5s8b9h1dm3hbglckdhngp12d67rccrr4mmgjq";
+  version = "1.2.2.3";
+  sha256 = "1699grrxb1qwfiivh9ihnczkcbwl4gcqdk7m02lc09r9gjr920p8";
   buildDepends = [
     blazeBuilder conduit persistent persistentTemplate resourcePool
     resourcet transformers yesodCore
-- 
GitLab


From b62ac3995c5ceddc35c45b043d1efc956156995a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Apr 2014 23:30:31 +0200
Subject: [PATCH 3433/3789] haskell-hastache: remove obsolete version 0.5.1

---
 .../libraries/haskell/hastache/0.5.1.nix      | 19 -------------------
 .../hastache/{0.6.0.nix => default.nix}       |  0
 pkgs/top-level/haskell-packages.nix           |  8 ++------
 3 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/hastache/0.5.1.nix
 rename pkgs/development/libraries/haskell/hastache/{0.6.0.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/hastache/0.5.1.nix b/pkgs/development/libraries/haskell/hastache/0.5.1.nix
deleted file mode 100644
index 462c76a487e..00000000000
--- a/pkgs/development/libraries/haskell/hastache/0.5.1.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ cabal, blazeBuilder, filepath, HUnit, ieee754, mtl, syb, text
-, transformers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hastache";
-  version = "0.5.1";
-  sha256 = "05lm7mjzc1hamxcj8akq06081bhp907hrjdkhas3wzm6ran6rwn3";
-  buildDepends = [
-    blazeBuilder filepath ieee754 mtl syb text transformers utf8String
-  ];
-  testDepends = [ HUnit mtl syb text ];
-  meta = {
-    homepage = "http://github.com/lymar/hastache";
-    description = "Haskell implementation of Mustache templates";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hastache/0.6.0.nix b/pkgs/development/libraries/haskell/hastache/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/hastache/0.6.0.nix
rename to pkgs/development/libraries/haskell/hastache/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 81e894db95e..4cd01747167 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -847,9 +847,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   cprngAes = callPackage ../development/libraries/haskell/cprng-aes {};
 
-  criterion = callPackage ../development/libraries/haskell/criterion {
-    hastache = self.hastache_0_5_1;
-  };
+  criterion = callPackage ../development/libraries/haskell/criterion {};
 
   Crypto = callPackage ../development/libraries/haskell/Crypto {};
 
@@ -1329,9 +1327,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   haskore = callPackage ../development/libraries/haskell/haskore {};
 
-  hastache_0_5_1 = callPackage ../development/libraries/haskell/hastache/0.5.1.nix {};
-  hastache_0_6_0 = callPackage ../development/libraries/haskell/hastache/0.6.0.nix {};
-  hastache = self.hastache_0_6_0;
+  hastache = callPackage ../development/libraries/haskell/hastache {};
 
   heredoc = callPackage ../development/libraries/haskell/heredoc {};
 
-- 
GitLab


From e2e74154e2e286079b75bab18d4e6b2ba7696893 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 11 Apr 2014 09:44:47 +0200
Subject: [PATCH 3434/3789] fix tarball (dragonegg missing in llvmPackages on
 darwin)

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 583a51a5e70..d3882ee625b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2945,6 +2945,7 @@ let
     # until someone solves build problems with _34
     llvm = llvm_33;
     clang = clang_33;
+    dragonegg = null;
   };
   llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
     inherit stdenv newScope fetchurl;
-- 
GitLab


From 8c12816d594e4cc6ab590012e67cbbaca440e8c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 11 Apr 2014 09:55:46 +0200
Subject: [PATCH 3435/3789] pango on darwin: amend the wrong fix

I didn't realize pango doesn't depend on flex directly,
only through introspection which caused build problems by itself, too.
---
 pkgs/development/libraries/pango/default.nix | 2 +-
 pkgs/top-level/all-packages.nix              | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index fbf3b0f34d4..2dc71bb2d11 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = with stdenv.lib;
-    optional (!stdenv.isDarwin) gobjectIntrospection # build problems
+    optional (!stdenv.isDarwin) gobjectIntrospection # build problems of itself and flex
     ++ optionals stdenv.isDarwin [ gettext fontconfig ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3882ee625b..64c91fb05bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4568,9 +4568,7 @@ let
   };
   cairomm = callPackage ../development/libraries/cairomm { };
 
-  pango = callPackage ../development/libraries/pango (
-    lib.optionalAttrs stdenv.isDarwin { flex = flex_2_5_35; } # flex fails to build
-  );
+  pango = callPackage ../development/libraries/pango { };
   pangomm = callPackage ../development/libraries/pangomm { };
 
   pangox_compat = callPackage ../development/libraries/pangox-compat { };
-- 
GitLab


From f741be954cb408642117f4d63ebf7de7f612c621 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:05:12 +0200
Subject: [PATCH 3436/3789] Offer consistently named attributes for the two
 available flex versions.

---
 .../development/tools/parsing/flex/{default.nix => 2.5.39.nix} | 0
 pkgs/top-level/all-packages.nix                                | 3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename pkgs/development/tools/parsing/flex/{default.nix => 2.5.39.nix} (100%)

diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/2.5.39.nix
similarity index 100%
rename from pkgs/development/tools/parsing/flex/default.nix
rename to pkgs/development/tools/parsing/flex/2.5.39.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64c91fb05bc..16e266b59c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3738,8 +3738,9 @@ let
 
   checkstyle = callPackage ../development/tools/analysis/checkstyle { };
 
-  flex = callPackage ../development/tools/parsing/flex { };
   flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
+  flex_2_5_39 = callPackage ../development/tools/parsing/flex/2.5.39.nix { };
+  flex = flex_2_5_39;
 
   m4 = gnum4;
 
-- 
GitLab


From 6913650adcd72d2f9823bb5a20b8adbcde5c185d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:05:53 +0200
Subject: [PATCH 3437/3789] maude: use old flex version; the new one causes
 build errors

This issue has been fixed in the latest alpha release.
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16e266b59c1..589ad51ff49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3309,6 +3309,7 @@ let
 
   maude = callPackage ../development/interpreters/maude {
     bison = bison2;
+    flex = flex_2_5_35;
   };
 
   octave = callPackage ../development/interpreters/octave {
-- 
GitLab


From e35c2f6d4c8467de94afcf9187c97730341c30ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:06:06 +0200
Subject: [PATCH 3438/3789] all-packages.nix: drop trailing whitespace

---
 pkgs/top-level/all-packages.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 589ad51ff49..467d092eab9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1771,7 +1771,7 @@ let
   cntlm = callPackage ../tools/networking/cntlm { };
 
   pastebinit = callPackage ../tools/misc/pastebinit { };
-  
+
   psmisc = callPackage ../os-specific/linux/psmisc { };
 
   pstoedit = callPackage ../tools/graphics/pstoedit { };
@@ -1911,7 +1911,7 @@ let
   sg3_utils = callPackage ../tools/system/sg3_utils { };
 
   sharutils = callPackage ../tools/archivers/sharutils { };
-  
+
   shotwell = callPackage ../applications/graphics/shotwell { };
 
   shebangfix = callPackage ../tools/misc/shebangfix { };
@@ -2035,7 +2035,7 @@ let
   tcpcrypt = callPackage ../tools/security/tcpcrypt { };
 
   tcpdump = callPackage ../tools/networking/tcpdump { };
-  
+
   tcpflow = callPackage ../tools/networking/tcpflow { };
 
   teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer { };
@@ -5144,7 +5144,7 @@ let
   libpseudo = callPackage ../development/libraries/libpseudo { };
 
   libpwquality = callPackage ../development/libraries/libpwquality { };
-  
+
   libqalculate = callPackage ../development/libraries/libqalculate { };
 
   librsvg = callPackage ../development/libraries/librsvg {
@@ -6225,7 +6225,7 @@ let
   perlArchiveCpio = perlPackages.ArchiveCpio;
 
   perlcritic = perlPackages.PerlCritic;
-  
+
   planetary_annihilation = callPackage ../games/planetaryannihilation { };
 
 
@@ -7040,8 +7040,8 @@ let
     cryptodev = callPackage ../os-specific/linux/cryptodev { };
 
     e1000e = callPackage ../os-specific/linux/e1000e {};
-    
-    v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; 
+
+    v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { };
 
     frandom = callPackage ../os-specific/linux/frandom { };
 
@@ -9722,8 +9722,8 @@ let
   mars = callPackage ../games/mars { };
 
   micropolis = callPackage ../games/micropolis { };
-  
-  mnemosyne = callPackage ../games/mnemosyne { 
+
+  mnemosyne = callPackage ../games/mnemosyne {
     inherit (pythonPackages) matplotlib cherrypy sqlite3;
   };
 
-- 
GitLab


From 846906fc53e5cf1b4d6a893bfbfcc6abf6028451 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 11:09:59 +0200
Subject: [PATCH 3439/3789] ipsec-tools: fix build by passing old version of
 flex

---
 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 467d092eab9..8fe3d87190a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1679,7 +1679,7 @@ let
            { hurd = gnu.hurdCrossIntermediate; })
     else null;
 
-  ipsecTools = callPackage ../os-specific/linux/ipsec-tools { };
+  ipsecTools = callPackage ../os-specific/linux/ipsec-tools { flex = flex_2_5_35; };
 
   patch = gnupatch;
 
-- 
GitLab


From b5773eeccb378026be547cc71d6bf5bcb211945c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 11:41:32 +0200
Subject: [PATCH 3440/3789] R: update to version 3.1.0

---
 pkgs/applications/science/math/R/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 88f4653cf7b..4a58c15941c 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "R-3.0.3";
+  name = "R-3.1.0";
 
   src = fetchurl {
     url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "1mp6zp25nycn8bxnnq97gq6n21c6vprm6qc4drwap57j82azsz5r";
+    sha256 = "1qjzbw341bvi1h4jwbvdkvq8j0z9l3m85mpgrlfw0n2cz2806s4a";
   };
 
   buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt
-- 
GitLab


From ad65a1e064a8fce60232f09b219c52ea2913e8ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 11:47:01 +0200
Subject: [PATCH 3441/3789] Revert "nixos: fix shell on conatiners"

This reverts commit c69577b7d6ea96cd605043440145ea6e094674b5.
See https://github.com/NixOS/nixpkgs/pull/2198 for further details.
---
 nixos/modules/programs/shadow.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 7e9133099ed..15b083b72d2 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -94,7 +94,7 @@ in
         groupmod = { rootOK = true; };
         groupmems = { rootOK = true; };
         groupdel = { rootOK = true; };
-        login = { startSession = !config.boot.isContainer; allowNullPassword = true; showMotd = true; updateWtmp = true; };
+        login = { startSession = true; allowNullPassword = true; showMotd = true; updateWtmp = true; };
         chpasswd = { rootOK = true; };
         chgpasswd = { rootOK = true; };
       };
-- 
GitLab


From 2da09363bf49a17ce6ce2ac2d390ee7ca0cc8fa3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Apr 2014 11:50:37 +0200
Subject: [PATCH 3442/3789] nix: Update to 1.7

---
 nixos/modules/services/misc/nix-daemon.nix         |  2 +-
 pkgs/tools/package-management/nix/default.nix      |  6 ++----
 pkgs/tools/package-management/nix/hash-check.patch | 14 --------------
 pkgs/top-level/all-packages.nix                    |  3 +++
 4 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/tools/package-management/nix/hash-check.patch

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 785d4397347..bbcf290a795 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -253,7 +253,7 @@ in
 
   config = {
 
-    nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin" ];
+    nix.chrootDirs = [ "/bin" ];
 
     environment.etc."nix/nix.conf".source = nixConf;
 
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index b02d80078aa..16a276273cc 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -5,15 +5,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.6.1";
+  name = "nix-1.7";
 
   src = fetchurl {
     url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-    sha256 = "31d15f99b2405924a4be278334cc973a71999303631e6798c1d294db9be4bf84";
+    sha256 = "349163654f2ae3e1a17fb3da7ed164a4cac153728bbe9a26764e17556d3dcc92";
   };
 
-  patches = [ ./hash-check.patch ];
-
   nativeBuildInputs = [ perl pkgconfig ];
 
   buildInputs = [ curl openssl boehmgc sqlite ];
diff --git a/pkgs/tools/package-management/nix/hash-check.patch b/pkgs/tools/package-management/nix/hash-check.patch
deleted file mode 100644
index 421ebb70a4f..00000000000
--- a/pkgs/tools/package-management/nix/hash-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-commit 11cb4bfb257f18c906ef1d6f14ed450be8fa49fe upstream
-
-diff --git a/src/libstore/build.cc b/src/libstore/build.cc
-index dcd7343..4329d9a 100644
---- a/src/libstore/build.cc
-+++ b/src/libstore/build.cc
-@@ -2749,6 +2749,7 @@ void SubstitutionGoal::finished()
-     logPipe.readSide.close();
- 
-     /* Get the hash info from stdout. */
-+    string dummy = readLine(outPipe.readSide);
-     string expectedHashStr = statusOk(status) ? readLine(outPipe.readSide) : "";
-     outPipe.readSide.close();
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8fe3d87190a..0d2caf45b10 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10510,10 +10510,13 @@ let
     stateDir = config.nix.stateDir or "/nix/var";
   };
 
+  nixUnstable = nixStable;
+  /*
   nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
     storeDir = config.nix.storeDir or "/nix/store";
     stateDir = config.nix.stateDir or "/nix/var";
   };
+  */
 
   nixops = callPackage ../tools/package-management/nixops { };
 
-- 
GitLab


From ed82f188f9aa44d37212235e54d3be995ddc233f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Apr 2014 12:54:44 +0200
Subject: [PATCH 3443/3789] nix-repl: Update

---
 pkgs/tools/package-management/nix-repl/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix
index 648abe882c4..f812ea58a0b 100644
--- a/pkgs/tools/package-management/nix-repl/default.nix
+++ b/pkgs/tools/package-management/nix-repl/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = https://github.com/edolstra/nix-repl.git;
-    rev = "81d658fe4afda234028cd4551e12491db4303957";
-    sha256 = "067mj8as99n0hkrr2qss3y3hnr8c5zy4n8bqx3z900n3j43cwzyc";
+    rev = "1734e8a1491ef831c83c2620b6b0f4a590b67c1f";
+    sha256 = "12fld2780jh3ww2n59s9z7afwjkmfhwh4dqn3wjva4ff8fx3n0mf";
   };
 
   buildInputs = [ nix readline boehmgc ];
@@ -21,8 +21,9 @@ stdenv.mkDerivation rec {
       mkdir -p $out/bin
       g++ -O3 -Wall -std=c++0x \
         -o $out/bin/nix-repl nix-repl.cc \
-        -I${nix}/include/nix -L${nix}/lib/nix \
-        -lformat -lutil -lstore -lexpr -lmain -lreadline -lgc
+        -I${nix}/include/nix \
+        -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \
+        -DNIX_VERSION=${(builtins.parseDrvName nix.name).version}
     '';
 
   meta = {
-- 
GitLab


From 62521d9ec65ac7fef9f67b45e101411f8b300d8a Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 2 Feb 2014 20:15:38 +0100
Subject: [PATCH 3444/3789] openttd: upgrade to 1.4.0

---
 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 6b385bc2e56..7e2b4221d52 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.3.3";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz";
-    sha256 = "0pfagqw8i1c6zrzarlwivrcac8b8ai1inam9qc01hj3h04nfv4b9";
+    sha256 = "0m89pr7m7xg71q1j3869dfrbhv88g90cw9zn0jlpg8crsj4wnnyq";
   };
 
   buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ];
-- 
GitLab


From d87ae02fc1522d5208fcf833156fe9d7cc9ca36a Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 24 Feb 2014 15:19:23 +0100
Subject: [PATCH 3445/3789] synergy: upgrade to 1.4.17

---
 pkgs/applications/misc/synergy/cryptopp.patch | 51 ++++++++-----------
 pkgs/applications/misc/synergy/default.nix    | 20 ++++----
 2 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/pkgs/applications/misc/synergy/cryptopp.patch b/pkgs/applications/misc/synergy/cryptopp.patch
index d0aebb87261..1c296423acd 100644
--- a/pkgs/applications/misc/synergy/cryptopp.patch
+++ b/pkgs/applications/misc/synergy/cryptopp.patch
@@ -1,32 +1,30 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3b61fc0..2206646 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -133,6 +133,9 @@ if (UNIX)
+diff -urN synergy-1.4.17-Source/CMakeLists.txt synergy-1.4.17-Source-fix/CMakeLists.txt
+--- synergy-1.4.17-Source/CMakeLists.txt	2014-03-14 21:34:19.000000000 +0100
++++ synergy-1.4.17-Source-fix/CMakeLists.txt	2014-04-11 13:37:18.839338710 +0200
+@@ -145,6 +145,9 @@
  	check_type_size(long SIZEOF_LONG)
  	check_type_size(short SIZEOF_SHORT)
  
-+    # let's just assume cryptopp exists (provided by the Nix expression)
-+    list(APPEND libs cryptopp)
++	# let's just assume cryptopp exists (provided by the Nix expression)
++	list(APPEND libs cryptopp)
 +
  	# pthread is used on both Linux and Mac
  	check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
  	if (HAVE_PTHREAD)
-@@ -303,7 +306,6 @@ if (VNC_SUPPORT)
+@@ -317,7 +320,6 @@
  endif()
  
  add_subdirectory(src)
--add_subdirectory(tools)
+-add_subdirectory(ext)
  
  if (WIN32)
- 	# add /analyze in order to unconver potential bugs in the source code
-diff --git a/src/lib/io/CCryptoMode.h b/src/lib/io/CCryptoMode.h
-index 9b7e8ad..0d659ac 100644
---- a/src/lib/io/CCryptoMode.h
-+++ b/src/lib/io/CCryptoMode.h
-@@ -17,9 +17,9 @@
- 
- #pragma once
+ 	# TODO:	consider using /analyze to uncover potential bugs in the source code.
+diff -urN synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h synergy-1.4.17-Source-fix/src/lib/io/CryptoMode_cryptopp.h
+--- synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h	2014-02-28 13:36:45.000000000 +0100
++++ synergy-1.4.17-Source-fix/src/lib/io/CryptoMode_cryptopp.h	2014-04-11 13:36:01.111985556 +0200
+@@ -25,6 +25,6 @@
+ #	pragma GCC system_header
+ #endif 
  
 -#include <cryptopp562/gcm.h>
 -#include <cryptopp562/modes.h>
@@ -34,21 +32,14 @@ index 9b7e8ad..0d659ac 100644
 +#include <cryptopp/gcm.h>
 +#include <cryptopp/modes.h>
 +#include <cryptopp/aes.h>
- #include "ECryptoMode.h"
- #include "CString.h"
+diff -urN synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h synergy-1.4.17-Source-fix/src/lib/io/CryptoStream_cryptopp.h
+--- synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h	2014-02-28 13:36:45.000000000 +0100
++++ synergy-1.4.17-Source-fix/src/lib/io/CryptoStream_cryptopp.h	2014-04-11 13:36:07.173013005 +0200
+@@ -25,5 +25,5 @@
+ #	pragma GCC system_header
+ #endif
  
-diff --git a/src/lib/io/CCryptoStream.h b/src/lib/io/CCryptoStream.h
-index 104b1f6..09c4dc4 100644
---- a/src/lib/io/CCryptoStream.h
-+++ b/src/lib/io/CCryptoStream.h
-@@ -20,8 +20,8 @@
- #include "BasicTypes.h"
- #include "CStreamFilter.h"
- #include "CCryptoMode.h"
 -#include <cryptopp562/osrng.h>
 -#include <cryptopp562/sha.h>
 +#include <cryptopp/osrng.h>
 +#include <cryptopp/sha.h>
- 
- class CCryptoOptions;
- 
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index c01d67943e5..834b514148b 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,29 +1,31 @@
-{ stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst, libXrandr, xinput
-, cryptopp ? null, unzip ? null }:
+{ stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst, libXrandr, xinput, curl
+, cryptopp ? null, unzip }:
 
 assert stdenv.isLinux -> cryptopp != null;
-assert !stdenv.isLinux -> unzip != null;
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "synergy-1.4.15";
+  name = "synergy-1.4.17";
 
   src = fetchurl {
-    url = "http://synergy.googlecode.com/files/${name}-Source.tar.gz";
-    sha256 = "0l1mxxky9hacyva0npzkgkwg4wkmihzq3abdrds0w5f6is44adv4";
+    url = "http://fossfiles.com/synergy/${name}-r2055-Source.tar.gz";
+    sha256 = "1mwaapvq9vsm0rdpq99fyzcw6wbp83rg6cylcqcgjjd21c6y9iwm";
   };
 
   patches = optional stdenv.isLinux ./cryptopp.patch;
 
-  postPatch = if stdenv.isLinux then ''
+  postPatch = (if stdenv.isLinux then ''
     sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \
       set(HAVE_X11_EXTENSIONS_XRANDR_H true)' CMakeLists.txt
   '' else ''
-    ${unzip}/bin/unzip -d tools/cryptopp562 tools/cryptopp562.zip
+    ${unzip}/bin/unzip -d ext/cryptopp562 ext/cryptopp562.zip
+  '') + ''
+    ${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip
+    ${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip
   '';
 
-  buildInputs = [ cmake x11 libX11 libXi libXtst libXrandr xinput ]
+  buildInputs = [ cmake x11 libX11 libXi libXtst libXrandr xinput curl ]
              ++ optional stdenv.isLinux cryptopp;
 
   # At this moment make install doesn't work for synergy
-- 
GitLab


From 2396e9d036522e4f4aa81a7735ab6241cc5aed88 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 15:21:38 +0200
Subject: [PATCH 3446/3789] perlPackages.PackageStash: Revert "update from 0.34
 to 0.36"

This reverts commit 5adbf4d447a4dd1229eaeb0627834e5e444d7083. The update broke
the test suite of perl-Moose [1], which is required by Hydra.

[1] http://hydra.nixos.org/build/10268974
---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index df06b82ab29..a6bd4c82e6e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6488,10 +6488,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PackageStash = buildPerlPackage {
-    name = "Package-Stash-0.36";
+    name = "Package-Stash-0.34";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.36.tar.gz;
-      sha256 = "1wbkdkm5gp5cpp84kr9cbbsrg0v908kxrcg4k86mx8ypgj6g8750";
+      url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.34.tar.gz;
+      sha256 = "1674zs96ndq3czs6v8xkdqqz4fnka0i2835nnns9zbw2q01yirj6";
     };
     buildInputs = [ DistCheckConflicts TestFatal TestRequires ];
     propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation PackageDeprecationManager ];
-- 
GitLab


From b8a6eef6fa4641babc2a05118c955026fea9a44d Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 11 Apr 2014 16:36:02 +0200
Subject: [PATCH 3447/3789] gradm: Attempt to fix build failure by using older
 flex

Thanks to @thoughtpolice for noticing and suggesting the fix!
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d2caf45b10..6685f259061 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6817,7 +6817,9 @@ let
 
   gpm = callPackage ../servers/gpm { };
 
-  gradm = callPackage ../os-specific/linux/gradm { };
+  gradm = callPackage ../os-specific/linux/gradm {
+    flex = flex_2_5_35;
+  };
 
   hdparm = callPackage ../os-specific/linux/hdparm { };
 
-- 
GitLab


From b9281e6a2dd3252052e69e15609b8e871c97c711 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Apr 2014 16:26:00 +0200
Subject: [PATCH 3448/3789] Fix NAT module

---
 nixos/modules/services/networking/nat.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index d684d8e3122..3d3899a5c41 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -115,7 +115,7 @@ in
             # NAT packets coming from the internal IPs.
             ${concatMapStrings (range: ''
               iptables -t nat -A POSTROUTING \
-                -s '${range}' -o ${cfg.externalInterface} ${dest}}
+                -s '${range}' -o ${cfg.externalInterface} ${dest}
             '') cfg.internalIPs}
 
             echo 1 > /proc/sys/net/ipv4/ip_forward
-- 
GitLab


From 017408e048ae2419baf0adba424b51d85b063a30 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Apr 2014 16:29:45 +0200
Subject: [PATCH 3449/3789] =?UTF-8?q?Use=20iptables'=20=E2=80=98-w?=
 =?UTF-8?q?=E2=80=99=20flag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This prevents errors like "Another app is currently holding the
xtables lock" if the firewall and NAT services are starting in
parallel.  (Longer term, we should probably move to a single service
for managing the iptables rules.)
---
 nixos/modules/services/networking/firewall.nix |  6 +++---
 nixos/modules/services/networking/nat.nix      | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 62d92ba50e1..a1ca5dcdcb1 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -32,9 +32,9 @@ let
     ''
       # Helper command to manipulate both the IPv4 and IPv6 tables.
       ip46tables() {
-        iptables "$@"
+        iptables -w "$@"
         ${optionalString config.networking.enableIPv6 ''
-          ip6tables "$@"
+          ip6tables -w "$@"
         ''}
       }
     '';
@@ -386,7 +386,7 @@ in
 
             # Optionally respond to ICMPv4 pings.
             ${optionalString cfg.allowPing ''
-              iptables -A nixos-fw -p icmp --icmp-type echo-request ${optionalString (cfg.pingLimit != null)
+              iptables -w -A nixos-fw -p icmp --icmp-type echo-request ${optionalString (cfg.pingLimit != null)
                 "-m limit ${cfg.pingLimit} "
               }-j nixos-fw-accept
             ''}
diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index 3d3899a5c41..7f4094de12f 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -95,26 +95,26 @@ in
 
         preStart =
           ''
-            iptables -t nat -F PREROUTING
-            iptables -t nat -F POSTROUTING
-            iptables -t nat -X
+            iptables -w -t nat -F PREROUTING
+            iptables -w -t nat -F POSTROUTING
+            iptables -w -t nat -X
 
             # We can't match on incoming interface in POSTROUTING, so
             # mark packets coming from the external interfaces.
             ${concatMapStrings (iface: ''
-              iptables -t nat -A PREROUTING \
+              iptables -w -t nat -A PREROUTING \
                 -i '${iface}' -j MARK --set-mark 1
             '') cfg.internalInterfaces}
 
             # NAT the marked packets.
             ${optionalString (cfg.internalInterfaces != []) ''
-              iptables -t nat -A POSTROUTING -m mark --mark 1 \
+              iptables -w -t nat -A POSTROUTING -m mark --mark 1 \
                 -o ${cfg.externalInterface} ${dest}
             ''}
 
             # NAT packets coming from the internal IPs.
             ${concatMapStrings (range: ''
-              iptables -t nat -A POSTROUTING \
+              iptables -w -t nat -A POSTROUTING \
                 -s '${range}' -o ${cfg.externalInterface} ${dest}
             '') cfg.internalIPs}
 
@@ -123,9 +123,9 @@ in
 
         postStop =
           ''
-            iptables -t nat -F PREROUTING
-            iptables -t nat -F POSTROUTING
-            iptables -t nat -X
+            iptables -w -t nat -F PREROUTING
+            iptables -w -t nat -F POSTROUTING
+            iptables -w -t nat -X
           '';
       };
   };
-- 
GitLab


From 13185280fee4111dc07f794e528fa3a73f421f3a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Apr 2014 17:15:56 +0200
Subject: [PATCH 3450/3789] Fix tests broken due to the firewall being enabled
 by default

---
 .../continuous-integration/jenkins/default.nix     |  2 +-
 nixos/modules/services/networking/avahi-daemon.nix |  4 ++++
 nixos/tests/bittorrent.nix                         |  8 ++++++--
 nixos/tests/containers.nix                         |  4 +++-
 nixos/tests/firewall.nix                           |  3 ++-
 nixos/tests/installer.nix                          |  2 ++
 nixos/tests/ipv6.nix                               |  1 +
 nixos/tests/jenkins.nix                            | 14 ++++++++++----
 nixos/tests/mumble.nix                             |  1 +
 nixos/tests/mysql-replication.nix                  |  9 +++++----
 nixos/tests/nat.nix                                |  3 +++
 nixos/tests/nfs.nix                                |  2 ++
 nixos/tests/printing.nix                           |  3 ++-
 nixos/tests/proxy.nix                              | 11 +++++------
 nixos/tests/quake3.nix                             |  1 +
 nixos/tests/tomcat.nix                             |  9 ++++-----
 16 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index b264a2e4bb4..23fa32ef511 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -43,7 +43,7 @@ in {
         default = 8080;
         type = types.uniq types.int;
         description = ''
-          Specifies port number on which the jenkins HTTP interface listens. The default is 8080
+          Specifies port number on which the jenkins HTTP interface listens. The default is 8080.
         '';
       };
 
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index 2256de89630..d7dfca2c8dc 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -142,6 +142,10 @@ in
     services.dbus.enable = true;
     services.dbus.packages = [avahi];
 
+    # Enabling Avahi without exposing it in the firewall doesn't make
+    # sense.
+    networking.firewall.allowedUDPPorts = [ 5353 ];
+
   };
 
 }
diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 6e67edb0b82..f84b65699d3 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -33,6 +33,8 @@ in
           services.httpd.enable = true;
           services.httpd.adminAddr = "foo@example.org";
           services.httpd.documentRoot = "/tmp";
+
+          networking.firewall.enable = false; # FIXME: figure out what ports we actually need
         };
 
       router =
@@ -50,11 +52,13 @@ in
           virtualisation.vlans = [ 2 ];
           networking.defaultGateway =
             nodes.router.config.networking.interfaces.eth2.ipAddress;
+          networking.firewall.enable = false;
         };
 
       client2 =
         { config, pkgs, ... }:
         { environment.systemPackages = [ pkgs.transmission ];
+          networking.firewall.enable = false;
         };
     };
 
@@ -66,8 +70,8 @@ in
       # Enable NAT on the router and start miniupnpd.
       $router->waitForUnit("nat");
       $router->succeed(
-          "iptables -t nat -N MINIUPNPD",
-          "iptables -t nat -A PREROUTING -i eth1 -j MINIUPNPD",
+          "iptables -w -t nat -N MINIUPNPD",
+          "iptables -w -t nat -A PREROUTING -i eth1 -j MINIUPNPD",
           "echo 1 > /proc/sys/net/ipv4/ip_forward",
           "miniupnpd -f ${miniupnpdConf nodes}"
       );
diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix
index d72e80b71af..06b793ed7ac 100644
--- a/nixos/tests/containers.nix
+++ b/nixos/tests/containers.nix
@@ -17,6 +17,8 @@
           config =
             { services.httpd.enable = true;
               services.httpd.adminAddr = "foo@example.org";
+              networking.firewall.allowedTCPPorts = [ 80 ];
+              networking.firewall.allowPing = true;
             };
         };
 
@@ -65,7 +67,7 @@
       $machine->succeed("nixos-container start $id1");
 
       # Execute commands via the root shell.
-      $machine->succeed("echo uname | nixos-container root-shell $id1") =~ /Linux/;
+      $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/;
       $machine->succeed("nixos-container set-root-password $id1 foobar");
 
       # Destroy the containers.
diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix
index de32b98e5d2..15653dedf3c 100644
--- a/nixos/tests/firewall.nix
+++ b/nixos/tests/firewall.nix
@@ -17,6 +17,7 @@
         { config, pkgs, ... }:
         { services.httpd.enable = true;
           services.httpd.adminAddr = "foo@example.org";
+          networking.firewall.enable = false;
         };
     };
 
@@ -33,7 +34,7 @@
       $walled->succeed("curl -v http://localhost/ >&2");
 
       # Connections to the firewalled machine should fail.
-      $attacker->fail("curl -v http://walled/ >&2");
+      $attacker->fail("curl --fail --connect-timeout 2 http://walled/ >&2");
       $attacker->fail("ping -c 1 walled >&2");
 
       # Outgoing connections/pings should still work.
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 151458fbd5e..b0c0aa328f0 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -79,6 +79,8 @@ let
       virtualisation.writableStore = true;
       virtualisation.pathsInNixDB = channelContents ++ [ pkgs.hello.src ];
       virtualisation.memorySize = 768;
+
+      networking.firewall.allowedTCPPorts = [ 80 ];
     };
 
   channelContents = [ pkgs.rlwrap ];
diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix
index 29d675e180a..48c20d7f5c9 100644
--- a/nixos/tests/ipv6.nix
+++ b/nixos/tests/ipv6.nix
@@ -12,6 +12,7 @@
         { config, pkgs, ... }:
         { services.httpd.enable = true;
           services.httpd.adminAddr = "foo@example.org";
+          networking.firewall.allowedTCPPorts = [ 80 ];
         };
 
       router =
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index e6524ec5653..40223482791 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -3,21 +3,27 @@
 #   2. jenkins user can be extended on both master and slave
 #   3. jenkins service not started on slave node
 { pkgs, ... }:
+
 {
   nodes = {
-    master = { pkgs, config, ... }: {
-        services.jenkins.enable = true;
+
+    master =
+      { config, pkgs, ... }:
+      { services.jenkins.enable = true;
 
         # should have no effect
         services.jenkinsSlave.enable = true;
 
         users.extraUsers.jenkins.extraGroups = [ "users" ];
       };
-    slave = { pkgs, config, ... }: {
-        services.jenkinsSlave.enable = true;
+
+    slave =
+      { config, pkgs, ... }:
+      { services.jenkinsSlave.enable = true;
 
         users.extraUsers.jenkins.extraGroups = [ "users" ];
       };
+
   };
 
   testScript = ''
diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix
index 509742f2899..10658eb5f02 100644
--- a/nixos/tests/mumble.nix
+++ b/nixos/tests/mumble.nix
@@ -11,6 +11,7 @@ in
     server = { config, pkgs, ... }: {
       services.murmur.enable       = true;
       services.murmur.registerName = "NixOS tests";
+      networking.firewall.allowedTCPPorts = [ config.services.murmur.port ];
     };
 
     client1 = client;
diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index f8c82f7ce9c..44586322600 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
@@ -15,10 +15,11 @@ in
         services.mysql.replication.role = "master";
         services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
         services.mysql.initialScript = pkgs.writeText "initmysql"
-        ''
-          create user '${replicateUser}'@'%' identified by '${replicatePassword}';
-          grant replication slave on *.* to '${replicateUser}'@'%';
-        '';
+          ''
+            create user '${replicateUser}'@'%' identified by '${replicatePassword}';
+            grant replication slave on *.* to '${replicateUser}'@'%';
+          '';
+        networking.firewall.allowedTCPPorts = [ 3306 ];
       };
 
     slave1 =
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index a13714d60a9..259ab99d301 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -12,6 +12,7 @@
     { client =
         { config, pkgs, nodes, ... }:
         { virtualisation.vlans = [ 1 ];
+          networking.firewall.allowPing = true;
           networking.defaultGateway =
             nodes.router.config.networking.interfaces.eth2.ipAddress;
         };
@@ -19,6 +20,7 @@
       router =
         { config, pkgs, ... }:
         { virtualisation.vlans = [ 2 1 ];
+          networking.firewall.allowPing = true;
           networking.nat.enable = true;
           networking.nat.internalIPs = [ "192.168.1.0/24" ];
           networking.nat.externalInterface = "eth1";
@@ -27,6 +29,7 @@
       server =
         { config, pkgs, ... }:
         { virtualisation.vlans = [ 2 ];
+          networking.firewall.enable = false;
           services.httpd.enable = true;
           services.httpd.adminAddr = "foo@example.org";
           services.vsftpd.enable = true;
diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix
index 51abf57e1b7..7bc99aef3b5 100644
--- a/nixos/tests/nfs.nix
+++ b/nixos/tests/nfs.nix
@@ -13,6 +13,7 @@ let
             options = "vers=${toString version}";
           }
         ];
+      networking.firewall.enable = false; # FIXME: only open statd
     };
 
 in
@@ -31,6 +32,7 @@ in
               /data 192.168.1.0/255.255.255.0(rw,no_root_squash,no_subtree_check,fsid=0)
             '';
           services.nfs.server.createMountPoints = true;
+          networking.firewall.enable = false; # FIXME: figure out what ports need to be allowed
         };
     };
 
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 13cc3115d50..b5ca0f25e21 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -17,6 +17,7 @@
               Allow from all
             </Location>
           '';
+        networking.firewall.allowedTCPPorts = [ 631 ];
       };
 
     client =
@@ -37,7 +38,7 @@
       $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;
       $client->succeed("curl --fail http://localhost:631/");
       $client->succeed("curl --fail http://server:631/");
-      $server->fail("curl --fail http://client:631/");
+      $server->fail("curl --fail --connect-timeout 2  http://client:631/");
 
       # Add a HP Deskjet printer connected via USB to the server.
       $server->succeed("lpadmin -p DeskjetLocal -v usb://HP/Deskjet%205400%20series?serial=TH93I152S123XY -m 'drv:///sample.drv/deskjet.ppd' -E");
diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index 3b79c16ea2c..dd64ca02e16 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -5,12 +5,10 @@ let
   backend =
     { config, pkgs, ... }:
 
-    {
-      services.openssh.enable = true;
-
-      services.httpd.enable = true;
+    { services.httpd.enable = true;
       services.httpd.adminAddr = "foo@example.org";
       services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html";
+      networking.firewall.allowedTCPPorts = [ 80 ];
     };
 
 in
@@ -21,8 +19,7 @@ in
     { proxy =
         { config, pkgs, nodes, ... }:
 
-        {
-          services.httpd.enable = true;
+        { services.httpd.enable = true;
           services.httpd.adminAddr = "bar@example.org";
           services.httpd.extraModules = ["proxy_balancer"];
 
@@ -50,6 +47,8 @@ in
               # For testing; don't want to wait forever for dead backend servers.
               ProxyTimeout      5
             '';
+
+          networking.firewall.allowedTCPPorts = [ 80 ];
         };
 
       backend1 = backend;
diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix
index fefbd75b4a3..2ebac84ca06 100644
--- a/nixos/tests/quake3.nix
+++ b/nixos/tests/quake3.nix
@@ -37,6 +37,7 @@ rec {
                 "'+map q3dm7' '+addbot grunt' '+addbot daemia' 2> /tmp/log";
             };
           nixpkgs.config.packageOverrides = overrides;
+          networking.firewall.allowedUDPPorts = [ 27960 ];
         };
 
       client1 = client;
diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix
index 6bc88ec82fa..6ec21a72192 100644
--- a/nixos/tests/tomcat.nix
+++ b/nixos/tests/tomcat.nix
@@ -5,13 +5,12 @@
     server =
       { pkgs, config, ... }:
 
-      {
-        services.tomcat.enable = true;
+      { services.tomcat.enable = true;
         services.httpd.enable = true;
         services.httpd.adminAddr = "foo@bar.com";
-        services.httpd.extraSubservices = [
-          { serviceType = "tomcat-connector"; }
-        ];
+        services.httpd.extraSubservices =
+          [ { serviceType = "tomcat-connector"; } ];
+        networking.firewall.allowedTCPPorts = [ 80 ];
       };
 
     client = { };
-- 
GitLab


From e2bc9a3d14d08ddfaeb08b02065a6adb026e7582 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Apr 2014 17:16:23 +0200
Subject: [PATCH 3451/3789] Include Archive::Cpio in the installation CD

http://hydra.nixos.org/build/10268978
---
 nixos/modules/installer/cd-dvd/installation-cd-base.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index 07c054b391a..74a2f50f027 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -29,8 +29,9 @@ with pkgs.lib;
   boot.kernel.sysctl."vm.overcommit_memory" = "1";
 
   # To speed up installation a little bit, include the complete stdenv
-  # in the Nix store on the CD.
-  isoImage.storeContents = [ pkgs.stdenv pkgs.busybox ];
+  # in the Nix store on the CD.  Archive::Cpio is needed for the
+  # initrd builder.
+  isoImage.storeContents = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio ];
 
   # EFI booting
   isoImage.makeEfiBootable = true;
-- 
GitLab


From 8026caec43f85dc5c5b0a5f04638157d51f4e7ac Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 11 Apr 2014 10:34:56 -0500
Subject: [PATCH 3452/3789] Add c2hsc to haskell-packages.nix

---
 .../libraries/haskell/c2hsc/default.nix       | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/c2hsc/default.nix

diff --git a/pkgs/development/libraries/haskell/c2hsc/default.nix b/pkgs/development/libraries/haskell/c2hsc/default.nix
new file mode 100644
index 00000000000..ac52a88e63b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/c2hsc/default.nix
@@ -0,0 +1,20 @@
+{ cabal, cmdargs, filepath, HStringTemplate, languageC, mtl, split
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "c2hsc";
+  version = "0.6.5";
+  sha256 = "0c5hzi4nw9n3ir17swbwymkymnpiw958z8r2hw6656ijwqkxvzgd";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    cmdargs filepath HStringTemplate languageC mtl split transformers
+  ];
+  meta = {
+    homepage = "https://github.com/jwiegley/c2hsc";
+    description = "Convert C API header files to .hsc and .hsc.helper.c 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 3e1904403a8..4cc9356c16e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -707,6 +707,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   c2hs = callPackage ../development/libraries/haskell/c2hs {};
 
+  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; }; };
-- 
GitLab


From 7be040cdcbadd68cfbfe6c10f6f3b05dbce7c8ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= <ertesx@gmx.de>
Date: Fri, 11 Apr 2014 21:17:22 +0200
Subject: [PATCH 3453/3789] maintainers: ertes: New temporary email address.

---
 lib/maintainers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 971f7f40284..34896dfaeac 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -29,7 +29,7 @@
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
   emery = "Emery Hemingawy <emery@vfemail.net>";
-  ertes = "Ertugrul Söylemez <es@ertes.de>";
+  ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
   garbas = "Rok Garbas <rok@garbas.si>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
-- 
GitLab


From baf2a4d4b9cd812f7af8d87196d59e7aaa036f0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 11 Apr 2014 21:28:34 +0200
Subject: [PATCH 3454/3789] ugly tarball fix for llvmPackages support on Darwin

---
 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 6685f259061..f12616b22a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2941,12 +2941,12 @@ let
       else stdenv;
   };
 
-  llvmPackages = if !stdenv.isDarwin then llvmPackages_34 else {
+  llvmPackages = if !stdenv.isDarwin then llvmPackages_34 else llvmPackages_34 // {
     # until someone solves build problems with _34
     llvm = llvm_33;
     clang = clang_33;
-    dragonegg = null;
   };
+
   llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
     inherit stdenv newScope fetchurl;
     isl = isl_0_12;
-- 
GitLab


From 4604d52df4f89afeaca3093c8f3dfdcea5aac15f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 21:28:55 +0200
Subject: [PATCH 3455/3789] GHC version 7.8.1 has been deprecated because of a
 serious bug. We'll have version 7.8.2 out soon.

http://www.haskell.org/pipermail/ghc-devs/2014-April/004605.html
http://www.haskell.org/pipermail/ghc-devs/2014-April/004616.html
---
 pkgs/development/compilers/ghc/{7.8.1.nix => 7.8.2.nix} | 6 +++---
 pkgs/top-level/all-packages.nix                         | 2 +-
 pkgs/top-level/haskell-defaults.nix                     | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename pkgs/development/compilers/ghc/{7.8.1.nix => 7.8.2.nix} (88%)

diff --git a/pkgs/development/compilers/ghc/7.8.1.nix b/pkgs/development/compilers/ghc/7.8.2.nix
similarity index 88%
rename from pkgs/development/compilers/ghc/7.8.1.nix
rename to pkgs/development/compilers/ghc/7.8.2.nix
index c007eb23da8..8200c8c759e 100644
--- a/pkgs/development/compilers/ghc/7.8.1.nix
+++ b/pkgs/development/compilers/ghc/7.8.2.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "7.8.1";
+  version = "7.8.2";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "http://www.haskell.org/ghc/dist/7.8.1/${name}-src.tar.xz";
-    sha256 = "1j4b7ap87vbwqvf8ck1ksrldw2w626f50w20gs4klm6jpvz66xp0";
+    url = "http://www.haskell.org/ghc/dist/7.8.2/${name}-src.tar.xz";
+    sha256 = "15kyz98zq22sgwkzy2bkx0yz98qkrzgdigz919vafd7fxnkf3la5";
   };
 
   buildInputs = [ ghc perl gmp ncurses ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f12616b22a9..e5ed92405ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2810,7 +2810,7 @@ let
   haskellPackages_ghc763_profiling    = recurseIntoAttrs (haskell.packages_ghc763.profiling);
   haskellPackages_ghc763              = recurseIntoAttrs (haskell.packages_ghc763.highPrio);
   # Reasonably current HEAD snapshot.
-  haskellPackages_ghc781 = haskell.packages_ghc781;
+  haskellPackages_ghc782 = haskell.packages_ghc782;
   haskellPackages_ghcHEAD = haskell.packages_ghcHEAD;
 
   haxe = callPackage ../development/compilers/haxe { };
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 2d4bdea6006..5a84b4339e2 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -23,7 +23,7 @@
       cabalInstall = self.cabalInstall_1_18_0_3.override { Cabal = null; };
     };
 
-  ghc781Prefs =
+  ghc782Prefs =
     self : self.haskellPlatformArgs_future self // {
       haskellPlatform = null;
       extensibleExceptions = self.extensibleExceptions_0_1_1_4;
@@ -404,10 +404,10 @@
                prefFun = ghc763Prefs;
              };
 
-  packages_ghc781 =
-    packages { ghcPath = ../development/compilers/ghc/7.8.1.nix;
+  packages_ghc782 =
+    packages { ghcPath = ../development/compilers/ghc/7.8.2.nix;
                ghcBinary = ghc742Binary;
-               prefFun = ghc781Prefs;
+               prefFun = ghc782Prefs;
              };
 
   # Reasonably current HEAD snapshot. Should *always* be lowPrio.
-- 
GitLab


From ea95516bf8a63cb9162cd3686bd6fc521deed8ac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:13:47 +0200
Subject: [PATCH 3456/3789] haskell-parsers: add version 0.11

---
 .../parsers/{default.nix => 0.10.3.nix}       |  0
 .../libraries/haskell/parsers/0.11.nix        | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 +++-
 3 files changed, 22 insertions(+), 1 deletion(-)
 rename pkgs/development/libraries/haskell/parsers/{default.nix => 0.10.3.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/parsers/0.11.nix

diff --git a/pkgs/development/libraries/haskell/parsers/default.nix b/pkgs/development/libraries/haskell/parsers/0.10.3.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/parsers/default.nix
rename to pkgs/development/libraries/haskell/parsers/0.10.3.nix
diff --git a/pkgs/development/libraries/haskell/parsers/0.11.nix b/pkgs/development/libraries/haskell/parsers/0.11.nix
new file mode 100644
index 00000000000..c5d91f167cc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/parsers/0.11.nix
@@ -0,0 +1,19 @@
+{ cabal, attoparsec, charset, doctest, filepath, parsec, text
+, transformers, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "parsers";
+  version = "0.11";
+  sha256 = "0k3xm9ww4q2wkjik4n4ww6ys79kl7xyzbhcb7xi81jz9py0xciqd";
+  buildDepends = [
+    attoparsec charset parsec text transformers unorderedContainers
+  ];
+  testDepends = [ doctest filepath ];
+  meta = {
+    homepage = "http://github.com/ekmett/parsers/";
+    description = "Parsing combinators";
+    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 4cc9356c16e..ee9daa210d8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1948,7 +1948,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   parsec3 = self.parsec_3_1_5;
   parsec  = self.parsec3;
 
-  parsers = callPackage ../development/libraries/haskell/parsers {};
+  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;
 
   parsimony = callPackage ../development/libraries/haskell/parsimony {};
 
-- 
GitLab


From e1bdc5c164e9cb2794f17c43170baa67ce43e658 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:14:14 +0200
Subject: [PATCH 3457/3789] haskell-statistics: add version 0.11.0.0

---
 .../statistics/{default.nix => 0.10.5.2.nix}  |  0
 .../libraries/haskell/statistics/0.11.0.0.nix | 28 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  7 ++++-
 3 files changed, 34 insertions(+), 1 deletion(-)
 rename pkgs/development/libraries/haskell/statistics/{default.nix => 0.10.5.2.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/statistics/0.11.0.0.nix

diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/0.10.5.2.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/statistics/default.nix
rename to pkgs/development/libraries/haskell/statistics/0.10.5.2.nix
diff --git a/pkgs/development/libraries/haskell/statistics/0.11.0.0.nix b/pkgs/development/libraries/haskell/statistics/0.11.0.0.nix
new file mode 100644
index 00000000000..11d2ff6daa6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/statistics/0.11.0.0.nix
@@ -0,0 +1,28 @@
+{ cabal, binary, deepseq, erf, HUnit, ieee754, mathFunctions
+, monadPar, mwcRandom, primitive, QuickCheck, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2, vector
+, vectorAlgorithms, vectorBinaryInstances
+}:
+
+cabal.mkDerivation (self: {
+  pname = "statistics";
+  version = "0.11.0.0";
+  sha256 = "1pmkdy7v78ajl5b5rjshgabhcakb9ji5wlq79ajr1b5adif1d1d9";
+  buildDepends = [
+    binary deepseq erf mathFunctions monadPar mwcRandom primitive
+    vector vectorAlgorithms vectorBinaryInstances
+  ];
+  testDepends = [
+    binary 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/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ee9daa210d8..1d433d9d275 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2279,10 +2279,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   StateVar = callPackage ../development/libraries/haskell/StateVar {};
 
-  statistics = callPackage ../development/libraries/haskell/statistics {
+  statistics_0_10_5_2 = callPackage ../development/libraries/haskell/statistics/0.10.5.2.nix {
     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 {};
 
-- 
GitLab


From a0264d3db89f8d2efc32d8895bc8d119bd4600f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:14:24 +0200
Subject: [PATCH 3458/3789] haskell-active: update to version 0.1.0.12

---
 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 168b555bd4a..7bfb0a045ee 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.11";
-  sha256 = "0acm039s8aja54r66y6m456x49g8w3adyx1zs7yv1h6xyy7v7gcv";
+  version = "0.1.0.12";
+  sha256 = "0ra0wnpyc23sz2w9qk6afcxsrva55nv9vyv70dvw6xhc82vi3khs";
   buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
   testDepends = [
     newtype QuickCheck semigroupoids semigroups vectorSpace
-- 
GitLab


From c203d9c5fa6af4b1cbc70d214c3c78b952b513a4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:14:26 +0200
Subject: [PATCH 3459/3789] haskell-cereal-conduit: update to version 0.7.2.1

---
 .../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 4021b15df9c..fa13321fff7 100644
--- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
@@ -2,9 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "cereal-conduit";
-  version = "0.7.2";
-  sha256 = "03jlhpz82a7j7n0351db0h7pkxihik3fv0wgjny7i0vlq7gyqdpl";
-  buildDepends = [ cereal conduit transformers ];
+  version = "0.7.2.1";
+  sha256 = "1qjx5y8hznpanchhjfrmi0r6vmiqsj0lh9x09n563gschs8dfisw";
+  buildDepends = [ cereal conduit resourcet transformers ];
   testDepends = [ cereal conduit HUnit mtl resourcet transformers ];
   meta = {
     homepage = "https://github.com/litherum/cereal-conduit";
-- 
GitLab


From 7cc83c8c746175b8e0a5c60dc951fcb56af14ce4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:14:33 +0200
Subject: [PATCH 3460/3789] haskell-dual-tree: update to version 0.2.0.2

---
 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 f8ef34a1723..7b2023c0812 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.1";
-  sha256 = "0v9kdhnwq8nv30ci5q7n43abl0wag21i06wp8pv1xgrva4lhswm5";
+  version = "0.2.0.2";
+  sha256 = "0w0kfzij22209slddyzr2g77khcgpv4ridhvkgl8z3d5sp7ggby1";
   buildDepends = [ monoidExtras newtype semigroups ];
   jailbreak = true;
   meta = {
-- 
GitLab


From 35e8034716c39fa0abc314796da2afe291c8d835 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:14:35 +0200
Subject: [PATCH 3461/3789] haskell-hxt-unicode: update to version 9.0.2.2

---
 pkgs/development/libraries/haskell/hxt-unicode/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hxt-unicode/default.nix b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
index fbe402cea5f..55017c4193e 100644
--- a/pkgs/development/libraries/haskell/hxt-unicode/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt-unicode";
-  version = "9.0.2.1";
-  sha256 = "1ng3qaiwkaav1kmf0yxkm44887xphbx6slva3fskzx0sgkd1v0vp";
+  version = "9.0.2.2";
+  sha256 = "1iljbk7f7d4wkl592bp0vw807683sqdxfnigindkrvr9p1xvwg8r";
   buildDepends = [ hxtCharproperties ];
   meta = {
     homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
-- 
GitLab


From ecbb36caf1d00d10a4587ed9b4cc06fa89d50ddb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:14:37 +0200
Subject: [PATCH 3462/3789] haskell-hxt: update to version 9.3.1.4

---
 pkgs/development/libraries/haskell/hxt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix
index 820a6549d34..440be70a60b 100644
--- a/pkgs/development/libraries/haskell/hxt/default.nix
+++ b/pkgs/development/libraries/haskell/hxt/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt";
-  version = "9.3.1.3";
-  sha256 = "1ynca1d0wzql3vny9wxi47bim64h1l56gdamwkfhh4snajqkamwd";
+  version = "9.3.1.4";
+  sha256 = "0klngcnq5rdhpwim2znzcljhqw8k3x7c91bgb16g008zp3lay1rf";
   buildDepends = [
     binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
     hxtUnicode mtl network parsec
-- 
GitLab


From 2379850cada7b96defe87a68f2a87e8446f350c3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:14:39 +0200
Subject: [PATCH 3463/3789] haskell-monad-logger: update to version 0.3.6

---
 .../libraries/haskell/monad-logger/default.nix   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix
index ba6efdac835..5468f4127fc 100644
--- a/pkgs/development/libraries/haskell/monad-logger/default.nix
+++ b/pkgs/development/libraries/haskell/monad-logger/default.nix
@@ -1,16 +1,16 @@
-{ cabal, blazeBuilder, conduit, exceptions, fastLogger, liftedBase
-, monadControl, monadLoops, mtl, resourcet, stm, stmChans, text
-, transformers, transformersBase
+{ cabal, blazeBuilder, conduit, conduitExtra, exceptions
+, fastLogger, liftedBase, monadControl, monadLoops, mtl, resourcet
+, stm, stmChans, text, transformers, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "monad-logger";
-  version = "0.3.5.1";
-  sha256 = "0kc23y1l3ja2ym0pr19kcm8aiv8g8skh24p9i3vm74chadsn81pv";
+  version = "0.3.6";
+  sha256 = "0a3dbk3c1jv8zbxrb5vzf5ypwwzkamxd35rm8pjn13aqcnnznniq";
   buildDepends = [
-    blazeBuilder conduit exceptions fastLogger liftedBase monadControl
-    monadLoops mtl resourcet stm stmChans text transformers
-    transformersBase
+    blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase
+    monadControl monadLoops mtl resourcet stm stmChans text
+    transformers transformersBase
   ];
   meta = {
     homepage = "https://github.com/kazu-yamamoto/logger";
-- 
GitLab


From 43a77ee1ab68c5fb71a1e79b5c815017bb27bc17 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:14:41 +0200
Subject: [PATCH 3464/3789] haskell-monoid-extras: update to version 0.3.3.2

---
 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 17df8cbeecc..b9987255c0f 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.1";
-  sha256 = "1176sazk10vapia1qvcm2rxckn2vxfav21277rsgf11hvn3lzznc";
+  version = "0.3.3.2";
+  sha256 = "0v4xir47ki83f9w2rii06w3jwrvqljnbiivgh6k8jxl0bdfslh11";
   buildDepends = [ groups semigroupoids semigroups ];
   jailbreak = true;
   meta = {
-- 
GitLab


From e77f2cd689fc69ad6f86ad9e784fe6a3d5ab87f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:14:43 +0200
Subject: [PATCH 3465/3789] haskell-texmath: update to version 0.6.6.1

---
 pkgs/development/libraries/haskell/texmath/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index 8dd3f5c6fc9..7c97f5b8e3f 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.6.6";
-  sha256 = "0mbimlvqsfx6w4dvilidy5cd9732kf6bnfnn6n7rnmq88avxxnmc";
+  version = "0.6.6.1";
+  sha256 = "0s6rh4frjc76g1nmwhnnpnsszrnhpi9zx478zqiln1fg0yc9fhxq";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ pandocTypes parsec syb xml ];
-- 
GitLab


From fd376138b2f705ef72cfb1c5e663a4bb514ce02c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:14:45 +0200
Subject: [PATCH 3466/3789] haskell-yesod-core: update to version 1.2.12

---
 .../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 cea81592ba4..5051eaff698 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, 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, 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.11.1";
-  sha256 = "079nhpfsp8sqm0j5wck3fqx5b3g12r0l9214wybj2wnxpaddzhzx";
+  version = "1.2.12";
+  sha256 = "0bgi140v2z25cfvcydzaif7id8mv341r8iclkiz0lbqxs7d29zxz";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit conduitExtra cookie
-    dataDefault 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 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
-- 
GitLab


From f5dd4d383b69f6e9392e3c9d5ab9489b2b9d93c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:15:13 +0200
Subject: [PATCH 3467/3789] haskell-HTTP: update to version 4000.2.12

---
 .../libraries/haskell/HTTP/{4000.2.11.nix => 4000.2.12.nix} | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/HTTP/{4000.2.11.nix => 4000.2.12.nix} (88%)

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.11.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.12.nix
similarity index 88%
rename from pkgs/development/libraries/haskell/HTTP/4000.2.11.nix
rename to pkgs/development/libraries/haskell/HTTP/4000.2.12.nix
index f48642462c6..b42703a403f 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.11.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.12.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
-  version = "4000.2.11";
-  sha256 = "17jlmh3v6k0mhd9nh1y5pf2br17lkx4wp9sa7q81wvprw998nw97";
+  version = "4000.2.12";
+  sha256 = "0zaynz8s70xzqxxrr8yjxwc7qspd4q2ig1vqjz1p4qqm72rs3jwl";
   buildDepends = [ mtl network parsec ];
   testDepends = [
     caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1d433d9d275..2b09d59250a 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_5;
     hashable     = self.hashable_1_2_1_0;
     html         = self.html_1_0_1_2;
-    HTTP         = self.HTTP_4000_2_11;
+    HTTP         = self.HTTP_4000_2_12;
     HUnit        = self.HUnit_1_2_5_2;
     mtl          = self.mtl_2_1_3_1;
     network      = self.network_2_4_2_2;
@@ -1350,8 +1350,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_11 = callPackage ../development/libraries/haskell/HTTP/4000.2.11.nix {};
-  HTTP = self.HTTP_4000_2_11;
+  HTTP_4000_2_12 = callPackage ../development/libraries/haskell/HTTP/4000.2.12.nix {};
+  HTTP = self.HTTP_4000_2_12;
 
   httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {};
 
-- 
GitLab


From 86177f06e9e2ce6c070d85f4effa589bab1cd22b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:16:21 +0200
Subject: [PATCH 3468/3789] haskell-haskell-src: add version 1.0.1.6

---
 .../libraries/haskell/haskell-src/1.0.1.6.nix     | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  5 +++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix

diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix
new file mode 100644
index 00000000000..9e78f2800a7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix
@@ -0,0 +1,15 @@
+{ cabal, happy, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "haskell-src";
+  version = "1.0.1.6";
+  sha256 = "1vscvbsly7k0zqb7fi6bm38dfacyl8qgmv0h25fqkn95c0v5dif7";
+  buildDepends = [ syb ];
+  buildTools = [ happy ];
+  meta = {
+    description = "Support for manipulating Haskell source code";
+    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 2b09d59250a..aa73622164b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -148,7 +148,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     fgl          = self.fgl_5_4_2_4;
     GLUT         = self.GLUT_2_5_1_0;
     GLURaw       = self.GLURaw_1_4_0_0;
-    haskellSrc   = self.haskellSrc_1_0_1_5;
+    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;
@@ -1321,7 +1321,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   haskellSrc_1_0_1_3 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.3.nix {};
   haskellSrc_1_0_1_4 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.4.nix {};
   haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {};
-  haskellSrc = self.haskellSrc_1_0_1_5;
+  haskellSrc_1_0_1_6 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.6.nix {};
+  haskellSrc = self.haskellSrc_1_0_1_6;
 
   haskellSrcExts = callPackage ../development/libraries/haskell/haskell-src-exts {};
 
-- 
GitLab


From f32be2da85051bad18116d16959eecea1628babc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 10:17:44 +0200
Subject: [PATCH 3469/3789] haddock: update to version 2.14.2

---
 .../tools/documentation/haddock/{2.14.1.nix => 2.14.2.nix}  | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/tools/documentation/haddock/{2.14.1.nix => 2.14.2.nix} (88%)

diff --git a/pkgs/development/tools/documentation/haddock/2.14.1.nix b/pkgs/development/tools/documentation/haddock/2.14.2.nix
similarity index 88%
rename from pkgs/development/tools/documentation/haddock/2.14.1.nix
rename to pkgs/development/tools/documentation/haddock/2.14.2.nix
index c63503c85ba..c4677f202dd 100644
--- a/pkgs/development/tools/documentation/haddock/2.14.1.nix
+++ b/pkgs/development/tools/documentation/haddock/2.14.2.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haddock";
-  version = "2.14.1";
-  sha256 = "1mxkphzdfd5c8dklfl09ajqwhw8ibvzl0cqrfr2j8rn0j03w46x6";
+  version = "2.14.2";
+  sha256 = "0h96jj6y093h4gcqpiq0nyv7h5wjg8ji7z1im9ydivmsv0627prk";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index aa73622164b..7f708438fc7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -175,7 +175,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     zlib         = self.zlib_0_5_4_1;
     cabalInstall = self.cabalInstall_1_18_0_3;
     alex         = self.alex_3_1_3;
-    haddock      = self.haddock_2_14_1;
+    haddock      = self.haddock_2_14_2;
     happy        = self.happy_1_19_3;
     primitive    = self.primitive_0_5_2_1;      # semi-official, but specified
   };
@@ -2882,8 +2882,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   haddock_2_11_0 = callPackage ../development/tools/documentation/haddock/2.11.0.nix {};
   haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {};
   haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {};
-  haddock_2_14_1 = callPackage ../development/tools/documentation/haddock/2.14.1.nix {};
-  haddock = self.haddock_2_14_1;
+  haddock_2_14_2 = callPackage ../development/tools/documentation/haddock/2.14.2.nix {};
+  haddock = self.haddock_2_14_2;
 
   HandsomeSoup = callPackage ../development/libraries/haskell/HandsomeSoup {};
 
-- 
GitLab


From 716cffc1bb97afd3ad6afe02889d224be841fd24 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 22:28:18 +0200
Subject: [PATCH 3470/3789] haskell-language-c-inline: re-generate with
 cabal2nix

---
 pkgs/development/libraries/haskell/language-c-inline/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/language-c-inline/default.nix b/pkgs/development/libraries/haskell/language-c-inline/default.nix
index 9e57490db34..58c3e37c853 100644
--- a/pkgs/development/libraries/haskell/language-c-inline/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-inline/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.3.0.1";
   sha256 = "0dw1fqwg9hhwgvak0ykhafbxp4gnb2ww9lc83m8kzkyzn1ccb6hg";
   buildDepends = [ filepath languageCQuote mainlandPretty ];
+  testDepends = [ languageCQuote ];
   doCheck = false;
   meta = {
     homepage = "https://github.com/mchakravarty/language-c-inline/";
-- 
GitLab


From ce15e84af3149f48fe5a752ec3bb1793b8840b47 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 22:28:26 +0200
Subject: [PATCH 3471/3789] haskell-diagrams-contrib: update to version 1.1.1.4

---
 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 f2a654302b6..aca28a02490 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.2";
-  sha256 = "09dfnvriih4lkici34bj9nvww245hzl95crldblwyjwi2c8qcy69";
+  version = "1.1.1.4";
+  sha256 = "0n2r6k65kxvk5mwm193yhzwnj3bhignq4xdslfpv2m1afdvws2y1";
   buildDepends = [
     arithmoi circlePacking colour dataDefault dataDefaultClass
     diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec
-- 
GitLab


From d2e61750dfbd628592abb5d8a1de4700cc018eaa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 22:28:27 +0200
Subject: [PATCH 3472/3789] haskell-diagrams-lib: update to version 1.1.0.6

---
 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 4fcd944c15c..fd839e42857 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.4";
-  sha256 = "0i3n07qi7gnlbxxsd8j7wgqdqbjp8h44z837lajfwd108j01fw0i";
+  version = "1.1.0.6";
+  sha256 = "125krfaf73k2m73scnjdl0d76acwc6n9vhvvaqxxy1ln57caqh5x";
   buildDepends = [
     active colour dataDefaultClass diagramsCore filepath fingertree
     hashable intervals lens MemoTrie monoidExtras optparseApplicative
-- 
GitLab


From 50b1a8ea0b621a7a09be17a2ade0805e43221e03 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Apr 2014 22:28:28 +0200
Subject: [PATCH 3473/3789] haskell-diagrams-postscript: update to version
 1.0.2.4

---
 pkgs/development/libraries/haskell/diagrams/postscript.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix
index 9716177ede5..55e2c975b0e 100644
--- a/pkgs/development/libraries/haskell/diagrams/postscript.nix
+++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-postscript";
-  version = "1.0.2.2";
-  sha256 = "00xzzx6dvraa8gbk3agqvrmxjnpvq4hik7kahidw4k37hxyyvwm3";
+  version = "1.0.2.4";
+  sha256 = "0vjzvjyrbmnjgl8ln58a44nhh4abq5q2c6fvlpxpfhxh2ligsmas";
   buildDepends = [
     dataDefaultClass diagramsCore diagramsLib dlist filepath hashable
     lens monoidExtras mtl semigroups split vectorSpace
-- 
GitLab


From 5a3fa7f88f2fe10eddecb708b0b9c559eda841b4 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 2 Apr 2014 13:35:44 +0200
Subject: [PATCH 3474/3789] nvidia-x11: patch for kernel 3.14 support

---
 pkgs/os-specific/linux/nvidia-x11/default.nix       |  2 ++
 pkgs/os-specific/linux/nvidia-x11/kernel-3.14.patch | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create 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 7391a6fdf4c..74863496a0f 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -21,6 +21,8 @@ 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
new file mode 100644
index 00000000000..07fb7652d32
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/kernel-3.14.patch
@@ -0,0 +1,12 @@
+--- 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
-- 
GitLab


From b21853f2550db54a9494e51bc51274a23e54a57f Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 11 Apr 2014 23:20:49 +0200
Subject: [PATCH 3475/3789] Fix initrd breaking by recent repeatable-builds
 changes

See the comments at https://github.com/NixOS/nixpkgs/commit/f67015cae49400eba539b9ec8b9920643581c77c
for more information.

Please note: this makes initrd unrepeatable again, but most people will prefer that above an unbootable system.
---
 pkgs/build-support/kernel/cpio-clean.pl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/build-support/kernel/cpio-clean.pl b/pkgs/build-support/kernel/cpio-clean.pl
index de38dee49f0..ddc6435a5a8 100644
--- a/pkgs/build-support/kernel/cpio-clean.pl
+++ b/pkgs/build-support/kernel/cpio-clean.pl
@@ -11,9 +11,6 @@ my $IN = \*STDIN;
 my $ino = 1;
 $cpio->read_with_handler($IN, sub {
         my ($e) = @_;
-        $e->{inode} = $ino;
-        $ino++;
-        $e->{nlink} = 1;
         $e->{mtime} = 1;
 	$cpio->write_one(\*STDOUT, $e);
     });
-- 
GitLab


From c23050e23136a5aeaca2f93a0d0bdca66607e348 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 11 Apr 2014 19:21:50 -0400
Subject: [PATCH 3476/3789] Revert "Use PostgreSQL 9.3's `pg_isready` to wait
 for connectivity"

Reverting postgres superuser changes until after stable.

This reverts commit e2066841106a6b89093ab685368742efa4e3c2c1.
---
 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 ed66c15e304..08a9cdd9f5d 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -226,7 +226,7 @@ in
         # Wait for PostgreSQL to be ready to accept connections.
         postStart =
           ''
-            while ! ${pkgs.postgresql93}/bin/pg_isready > /dev/null; do
+            while ! su -s ${pkgs.stdenv.shell} postgres -c 'psql postgres -c ""' 2> /dev/null; do
                 if ! kill -0 "$MAINPID"; then exit 1; fi
                 sleep 0.1
             done
-- 
GitLab


From e9e60103de7fa4572c28d8fd1ecf5b9ed3178fb8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 11 Apr 2014 19:22:39 -0400
Subject: [PATCH 3477/3789] Revert "Create the 'postgres' superuser"

Reverting postgres superuser changes until after stable.

This reverts commit 7de29bd26f5e514e95d5d261c08f3029337eecb3.
---
 nixos/modules/services/databases/postgresql.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 08a9cdd9f5d..33ee7244e3f 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -197,7 +197,6 @@ in
                 fi
                 rm -f ${cfg.dataDir}/*.conf
                 touch "${cfg.dataDir}/.first_startup"
-                touch "${cfg.dataDir}/postgresql-user-created"
             fi
 
             ln -sfn "${configFile}" "${cfg.dataDir}/postgresql.conf"
@@ -231,11 +230,6 @@ in
                 sleep 0.1
             done
 
-            if ! [ -e ${cfg.dataDir}/postgresql-user-created ]; then
-              createuser --superuser postgres
-              touch ${cfg.dataDir}/postgresql-user-created
-            fi
-
             if test -e "${cfg.dataDir}/.first_startup"; then
               ${optionalString (cfg.initialScript != null) ''
                 cat "${cfg.initialScript}" | su -s ${pkgs.stdenv.shell} postgres -c 'psql postgres'
-- 
GitLab


From 9b077bac584c3d192ea0ba5be0a93a5a5c570208 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 11 Apr 2014 19:22:43 -0400
Subject: [PATCH 3478/3789] Revert "postgresql: properly fix permissions issue
 by in postStart"

Reverting postgres superuser changes until after stable.

This reverts commit c66be6378d8bbcea271b2d2102741fdda87ec8fe.
---
 nixos/modules/services/databases/postgresql.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 33ee7244e3f..a83b1a110fe 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -225,14 +225,14 @@ in
         # Wait for PostgreSQL to be ready to accept connections.
         postStart =
           ''
-            while ! su -s ${pkgs.stdenv.shell} postgres -c 'psql postgres -c ""' 2> /dev/null; do
+            while ! psql postgres -c "" 2> /dev/null; do
                 if ! kill -0 "$MAINPID"; then exit 1; fi
                 sleep 0.1
             done
 
             if test -e "${cfg.dataDir}/.first_startup"; then
               ${optionalString (cfg.initialScript != null) ''
-                cat "${cfg.initialScript}" | su -s ${pkgs.stdenv.shell} postgres -c 'psql postgres'
+                cat "${cfg.initialScript}" | psql postgres
               ''}
               rm -f "${cfg.dataDir}/.first_startup"
             fi
-- 
GitLab


From 0122697550ab9ed5fae949a0756b10d6e674bd70 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 11 Apr 2014 19:23:03 -0400
Subject: [PATCH 3479/3789] Revert "Merge branch 'postgresql-user' of
 git://github.com/ocharles/nixpkgs"

Reverting postgres superuser changes until after stable.

This reverts commit 6cc0cc7ff6136963acb32b5107696484b6220562, reversing
changes made to 3c4be425dbe2d5a00f2923210a86ce7e7a4c516f.
---
 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 a83b1a110fe..cc4230d4d6a 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -190,7 +190,7 @@ in
                 mkdir -m 0700 -p ${cfg.dataDir}
                 if [ "$(id -u)" = 0 ]; then
                   chown -R postgres ${cfg.dataDir}
-                  su -s ${pkgs.stdenv.shell} postgres -c initdb
+                  su -s ${pkgs.stdenv.shell} postgres -c 'initdb -U root'
                 else
                   # For non-root operation.
                   initdb
-- 
GitLab


From 71d7bec227b4d8e3622e0248a1cd6d3f1ba4b2b0 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 11 Apr 2014 21:32:30 -0500
Subject: [PATCH 3480/3789] p0f: build fix attempt for Hydra

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/p0f/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix
index 2c54e0b3cb8..377639ce2e6 100644
--- a/pkgs/tools/security/p0f/default.nix
+++ b/pkgs/tools/security/p0f/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libpcap }:
+{ stdenv, fetchurl, libpcap, bash }:
 
 stdenv.mkDerivation rec {
   name    = "p0f-${version}";
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     substituteInPlace config.h --replace "p0f.fp" "$out/etc/p0f.fp"
+    substituteInPlace build.sh --replace "/bin/bash" "${bash}/bin/bash"
     ./build.sh
     cd tools && make && cd ..
   '';
-- 
GitLab


From acd5a9d8b4946634127705f96d141062e0a234c8 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 11 Apr 2014 21:35:08 -0500
Subject: [PATCH 3481/3789] spiped: attempt to fix linux Hydra build

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/networking/spiped/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix
index 7f17c981b93..ac2736ffb19 100644
--- a/pkgs/tools/networking/spiped/default.nix
+++ b/pkgs/tools/networking/spiped/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl }:
+{ stdenv, fetchurl, openssl, coreutils }:
 
 stdenv.mkDerivation rec {
   name    = "spiped-${version}";
@@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl ];
   patches = [ ./no-dev-stderr.patch ];
 
+  postPatch = ''
+    substituteInPlace POSIX/posix-l.sh --replace "rm" "${coreutils}/bin/rm"
+  '';
+
   installPhase = ''
     mkdir -p $out/bin $out/share/man/man1
     make install BINDIR=$out/bin MAN1DIR=$out/share/man/man1
-- 
GitLab


From 036a7708a203e420cfc279bbdeef554f5e475891 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 11 Apr 2014 21:37:19 -0500
Subject: [PATCH 3482/3789] libseccomp: attempt to fix Hydra build

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/libseccomp/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 32ac480c1f8..a66d31d2ec4 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, getopt }:
+{ stdenv, fetchurl, getopt, bash }:
 
 stdenv.mkDerivation rec {
   name    = "libseccomp-${version}";
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
   # for talking to the seccomp filter - we opt to always use the
   # inline copy
   patchPhase = ''
+    substituteInPlace ./configure --replace "/bin/bash" "${bash}/bin/bash"
     substituteInPlace ./configure --replace "verify_deps getopt" ""
     substituteInPlace ./configure --replace getopt ${getopt}/bin/getopt
     substituteInPlace ./configure --replace 'opt_sysinc_seccomp="yes"' 'opt_sysinc_seccomp="no"'
-- 
GitLab


From cf24cf1184ad6fc62292b9668c836e5a1435902c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 11 Apr 2014 21:40:31 -0500
Subject: [PATCH 3483/3789] capstone: attempt to fix Linux build, remove Darwin
 build

The Darwin build seems fixable but I can't test right now.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/capstone/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index 37d1c118e4a..d61c82bb7d3 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, bash }:
 
 stdenv.mkDerivation rec {
   name    = "capstone-${version}";
@@ -10,13 +10,18 @@ stdenv.mkDerivation rec {
   };
 
   buildPhase = false;
+
+  patchPhase = ''
+    substituteInPlace make.sh --replace "/usr/bin/env bash" "${bash}/bin/bash"
+  '';
+
   installPhase = "PREFIX=$out ./make.sh install";
 
   meta = {
     description = "advanced disassembly library";
     homepage    = "http://www.capstone-engine.org";
     license     = stdenv.lib.licenses.bsd3;
-    platforms   = stdenv.lib.platforms.unix;
+    platforms   = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }
-- 
GitLab


From 172dc1336f108ee81b0f5f8b9be3d27706b1c032 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 6 Apr 2014 14:18:12 -0500
Subject: [PATCH 3484/3789] nixos: add grsecurity module (#1875)

This module implements a significant refactoring in grsecurity
configuration for NixOS, making it far more usable by default and much
easier to configure.

 - New security.grsecurity NixOS attributes.
   - All grsec kernels supported
   - Allows default 'auto' grsec configuration, or custom config
   - Supports custom kernel options through kernelExtraConfig
   - Defaults to high-security - user must choose kernel, server/desktop
     mode, and any virtualisation software. That's all.
   - kptr_restrict is fixed under grsecurity (it's unwriteable)
 - grsecurity patch creation is now significantly abstracted
   - only need revision, version, and SHA1
   - kernel version requirements are asserted for sanity
   - built kernels can have the uname specify the exact grsec version
     for development or bug reports. Off by default (requires
     `security.grsecurity.config.verboseVersion = true;`)
 - grsecurity sysctl support
   - By default, disabled.
   - For people who enable it, NixOS deploys a 'grsec-lock' systemd
     service which runs at startup. You are expected to configure sysctl
     through NixOS like you regularly would, which will occur before the
     service is started. As a result, changing sysctl settings requires
     a reboot.
 - New default group: 'grsecurity'
   - Root is a member by default
   - GRKERNSEC_PROC_GID is implicitly set to the 'grsecurity' GID,
     making it possible to easily add users to this group for /proc
     access
 - AppArmor is now automatically enabled where it wasn't before, despite
   implying features.apparmor = true

The most trivial example of enabling grsecurity in your kernel is by
specifying:

    security.grsecurity.enable          = true;
    security.grsecurity.testing         = true;      # testing 3.13 kernel
    security.grsecurity.config.system   = "desktop"; # or "server"

This specifies absolutely no virtualisation support. In general, you
probably at least want KVM host support, which is a little more work.
So:

    security.grsecurity.enable = true;
    security.grsecurity.stable = true; # enable stable 3.2 kernel
    security.grsecurity.config = {
      system   = "server";
      priority = "security";
      virtualisationConfig   = "host";
      virtualisationSoftware = "kvm";
      hardwareVirtualisation = true;
    }

This module has primarily been tested on Hetzner EX40 & VQ7 servers
using NixOps.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/config/sysctl.nix           |  18 +-
 nixos/modules/config/users-groups.nix     |   2 +
 nixos/modules/misc/ids.nix                |   1 +
 nixos/modules/module-list.nix             |   1 +
 nixos/modules/security/grsecurity.nix     | 421 ++++++++++++++++++++++
 pkgs/os-specific/linux/kernel/patches.nix |  51 ++-
 pkgs/top-level/all-packages.nix           |  35 --
 7 files changed, 467 insertions(+), 62 deletions(-)
 create mode 100644 nixos/modules/security/grsecurity.nix

diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index 8f9b31dccff..a910c699cc9 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -6,7 +6,7 @@ let
 
   sysctlOption = mkOptionType {
     name = "sysctl option value";
-    check = x: isBool x || isString x || isInt x;
+    check = x: isBool x || isString x || isInt x || isNull x;
     merge = args: defs: (last defs).value; # FIXME: hacky way to allow overriding in configuration.nix.
   };
 
@@ -29,8 +29,9 @@ in
         <manvolnum>8</manvolnum></citerefentry>.  Note that sysctl
         parameters names must be enclosed in quotes
         (e.g. <literal>"vm.swappiness"</literal> instead of
-        <literal>vm.swappiness</literal>).  The value of each parameter
-        may be a string, integer or Boolean.
+        <literal>vm.swappiness</literal>).  The value of each
+        parameter may be a string, integer, boolean, or null
+        (signifying the option will not appear at all).
       '';
     };
 
@@ -39,7 +40,9 @@ in
   config = {
 
     environment.etc."sysctl.d/nixos.conf".text =
-      concatStrings (mapAttrsToList (n: v: "${n}=${if v == false then "0" else toString v}\n") config.boot.kernel.sysctl);
+      concatStrings (mapAttrsToList (n: v:
+        optionalString (v != null) "${n}=${if v == false then "0" else toString v}\n"
+      ) config.boot.kernel.sysctl);
 
     systemd.services.systemd-sysctl =
       { description = "Apply Kernel Variables";
@@ -65,8 +68,9 @@ in
 
     # Hide kernel pointers (e.g. in /proc/modules) for unprivileged
     # users as these make it easier to exploit kernel vulnerabilities.
-    boot.kernel.sysctl."kernel.kptr_restrict" = 1;
-
+    #
+    # Removed under grsecurity.
+    boot.kernel.sysctl."kernel.kptr_restrict" =
+      if config.security.grsecurity.enable then null else 1;
   };
-
 }
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 061f51ccda7..c27a94a22d5 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -392,6 +392,7 @@ in {
         home = "/root";
         shell = cfg.defaultUserShell;
         group = "root";
+        extraGroups = [ "grsecurity" ];
         hashedPassword = mkDefault config.security.initialRootPassword;
       };
       nobody = {
@@ -420,6 +421,7 @@ in {
       nixbld.gid = ids.gids.nixbld;
       utmp.gid = ids.gids.utmp;
       adm.gid = ids.gids.adm;
+      grsecurity.gid = ids.gids.grsecurity;
     };
 
     system.activationScripts.users =
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index b7912b6630e..c6581fee551 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -231,6 +231,7 @@
       foundationdb = 118;
       newrelic = 119;
       starbound = 120;
+      grsecurity = 121;
 
       # 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 54194f781cb..b2f530474b5 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -62,6 +62,7 @@
   ./security/apparmor-suid.nix
   ./security/ca.nix
   ./security/duosec.nix
+  ./security/grsecurity.nix
   ./security/pam.nix
   ./security/pam_usb.nix
   ./security/polkit.nix
diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
new file mode 100644
index 00000000000..1759413c558
--- /dev/null
+++ b/nixos/modules/security/grsecurity.nix
@@ -0,0 +1,421 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.security.grsecurity;
+
+  mkKernel = kernel: patch:
+    assert patch.kversion == kernel.version;
+      { inherit kernel patch;
+        inherit (patch) grversion revision;
+      };
+
+  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;
+
+  ## -- 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 ''
+      SECURITY_APPARMOR y
+      DEFAULT_SECURITY_APPARMOR y
+      GRKERNSEC y
+      ${grsecMainConfig}
+
+      GRKERNSEC_PROC_USER ${boolToKernOpt cfg.config.restrictProc}
+      ${if !cfg.config.restrictProc then ""
+        else "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);
+in
+{
+  options = {
+    security.grsecurity = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable grsecurity support. This enables advanced exploit
+          hardening for the Linux kernel, and adds support for
+          administrative Role-Based Acess Control (RBAC) via
+          <literal>gradm</literal>. It also includes traditional
+          utilities for PaX.
+        '';
+      };
+
+      stable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable the stable grsecurity patch, based on Linux 3.2.
+        '';
+      };
+
+      vserver = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable the stable grsecurity/vserver patches, based on Linux 3.2.
+        '';
+      };
+
+      testing = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable the testing grsecurity patch, based on Linux 3.13.
+        '';
+      };
+
+      config = {
+        mode = mkOption {
+          type = types.str;
+          default = "auto";
+          example = "custom";
+          description = ''
+            grsecurity configuration mode. This specifies whether
+            grsecurity is auto-configured or otherwise completely
+            manually configured. Can either by
+            <literal>custom</literal> or <literal>auto</literal>.
+
+            <literal>auto</literal> is recommended.
+          '';
+        };
+
+        priority = mkOption {
+          type = types.str;
+          default = "security";
+          example = "performance";
+          description = ''
+            grsecurity configuration priority. This specifies whether
+            the kernel configuration should emphasize speed or
+            security. Can either by <literal>security</literal> or
+            <literal>performance</literal>.
+          '';
+        };
+
+        system = mkOption {
+          type = types.str;
+          default = "";
+          example = "desktop";
+          description = ''
+            grsecurity system configuration. This specifies whether
+            the kernel configuration should be suitable for a Desktop
+            or a Server. Can either by <literal>server</literal> or
+            <literal>desktop</literal>.
+          '';
+        };
+
+        virtualisationConfig = mkOption {
+          type = types.str;
+          default = "none";
+          example = "host";
+          description = ''
+            grsecurity virtualisation configuration. This specifies
+            the virtualisation role of the machine - that is, whether
+            it will be a virtual machine guest, a virtual machine
+            host, or neither. Can be one of <literal>none</literal>,
+            <literal>host</literal>, or <literal>guest</literal>.
+          '';
+        };
+
+        hardwareVirtualisation = mkOption {
+          type = types.nullOr types.bool;
+          default = null;
+          example = true;
+          description = ''
+            grsecurity hardware virtualisation configuration. Set to
+            <literal>true</literal> if your machine supports hardware
+            accelerated virtualisation.
+          '';
+        };
+
+        virtualisationSoftware = mkOption {
+          type = types.str;
+          default = "";
+          example = "kvm";
+          description = ''
+            grsecurity virtualisation software. Set this to the
+            specified virtual machine technology if the machine is
+            running as a guest, or a host.
+
+            Can be one of <literal>kvm</literal>,
+            <literal>xen</literal>, <literal>vmware</literal> or
+            <literal>virtualbox</literal>.
+          '';
+        };
+
+        sysctl = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            If true, then set <literal>GRKERN_SYSCTL y</literal>. If
+            enabled then grsecurity can be controlled using sysctl
+            (and turned off). You are advised to *never* enable this,
+            but if you do, make sure to always set the sysctl
+            <literal>kernel.grsecurity.grsec_lock</literal> to
+            non-zero as soon as all sysctl options are set. *THIS IS
+            EXTREMELY IMPORTANT*!
+
+            If disabled, this also turns off the
+            <literal>systemd-sysctl</literal> service.
+          '';
+        };
+
+        denyChrootChmod = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            If true, then set <literal>GRKERN_CHROOT_CHMOD
+            y</literal>. If enabled, this denies processes inside a
+            chroot from setting the suid or sgid bits using
+            <literal>chmod</literal> or <literal>fchmod</literal>.
+
+            By default this protection is disabled - it makes it
+            impossible to use Nix to build software on your system,
+            which is what most users want.
+
+            If you are using NixOps to deploy your software to a
+            remote machine, you're encouraged to enable this as you
+            won't need to compile code.
+          '';
+        };
+
+        restrictProc = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            If true, then set <literal>GRKERN_PROC_USER
+            y</literal>. This restricts non-root users to only viewing
+            their own processes and restricts network-related
+            information, kernel symbols, and module information.
+          '';
+        };
+
+        unrestrictProcGid = mkOption {
+          type = types.int;
+          default = config.ids.gids.grsecurity;
+          description = ''
+            If set, specifies a GID which is exempt from
+            <literal>/proc</literal> restrictions (set by
+            <literal>GRKERN_PROC_USER</literal>). By default, this is
+            set to the GID for <literal>grsecurity</literal>, a
+            predefined NixOS group, which the <literal>root</literal>
+            account is a member of. You may conveniently add other
+            users to this group if you need access to
+            <literal>/proc</literal>
+          '';
+        };
+
+        disableRBAC = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            If true, then set <literal>GRKERN_NO_RBAC
+            y</literal>. This disables the
+            <literal>/dev/grsec</literal> device, which in turn
+            disables the RBAC system (and <literal>gradm</literal>).
+          '';
+        };
+
+        verboseVersion = mkOption {
+          type = types.bool;
+          default = false;
+          description = "Use verbose version in kernel localversion.";
+        };
+
+        kernelExtraConfig = mkOption {
+          type = types.str;
+          default = "";
+          description = "Extra kernel configuration parameters.";
+        };
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions =
+      [ { assertion = cfg.stable || cfg.testing;
+          message   = ''
+            If grsecurity is enabled, you must select either the
+            stable patch (with kernel 3.2), or the testing patch (with
+            kernel 3.13) to continue.
+          '';
+        }
+        { assertion = (cfg.stable -> !cfg.testing) || (cfg.testing -> !cfg.stable);
+          message   = ''
+            You must select either the stable or testing patch, not
+            both.
+          '';
+        }
+        { assertion = (cfg.testing -> !cfg.vserver);
+          message   = "The vserver patches are only supported in the stable kernel.";
+        }
+        { assertion = config.boot.kernelPackages.kernel.features ? grsecurity
+                   && config.boot.kernelPackages.kernel.features.grsecurity;
+          message = "grsecurity enabled, but kernel doesn't have grsec support";
+        }
+        { assertion = elem cfg.config.mode [ "auto" "custom" ];
+          message = "grsecurity mode must either be 'auto' or 'custom'.";
+        }
+        { assertion = cfg.config.mode == "auto" -> elem cfg.config.system [ "desktop" "server" ];
+          message = "when using auto grsec mode, system must be either 'desktop' or 'server'";
+        }
+        { assertion = cfg.config.mode == "auto" -> elem cfg.config.priority [ "performance" "security" ];
+          message = "when using auto grsec mode, priority must be 'performance' or 'security'.";
+        }
+        { assertion = cfg.config.mode == "auto" -> elem cfg.config.virtualisationConfig [ "host" "guest" "none" ];
+          message = "when using auto grsec mode, 'virt' must be 'host', 'guest' or 'none'.";
+        }
+        { assertion = (cfg.config.mode == "auto" && (elem cfg.config.virtualisationConfig [ "host" "guest" ])) ->
+              cfg.config.hardwareVirtualisation != null;
+          message   = "when using auto grsec mode with virtualisation, you must specify if your hardware has virtualisation extensions";
+        }
+        { assertion = (cfg.config.mode == "auto" && (elem cfg.config.virtualisationConfig [ "host" "guest" ])) ->
+              elem cfg.config.virtualisationSoftware [ "kvm" "xen" "virtualbox" "vmware" ];
+          message   = "virtualisation software must be 'kvm', 'xen', 'vmware' or 'virtualbox'";
+        }
+      ];
+
+    systemd.services.grsec-lock = mkIf cfg.config.sysctl {
+      description     = "grsecurity sysctl-lock Service";
+      requires        = [ "sysctl.service" ];
+      wantedBy        = [ "multi-user.target" ];
+      serviceConfig.Type = "oneshot";
+      serviceConfig.RemainAfterExit = "yes";
+      script = ''
+        locked=`cat /proc/sys/kernel/grsecurity/grsec_lock`
+        if [ "$locked" == "0" ]; then
+            echo 1 > /proc/sys/kernel/grsecurity/grsec_lock
+            echo grsecurity sysctl lock - enabled
+        else
+            echo grsecurity sysctl lock already enabled - doing nothing
+        fi
+      '';
+    };
+
+#   systemd.services.grsec-learn = {
+#     description     = "grsecurity learning Service";
+#     wantedBy        = [ "local-fs.target" ];
+#     serviceConfig   = {
+#       Type = "oneshot";
+#       RemainAfterExit = "yes";
+#       ExecStart = "${pkgs.gradm}/sbin/gradm -VFL /etc/grsec/learning.logs";
+#       ExecStop  = "${pkgs.gradm}/sbin/gradm -D";
+#     };
+#   };
+
+    system.activationScripts.grsec =
+      ''
+        mkdir -p /etc/grsec
+        if [ ! -f /etc/grsec/learn_config ]; then
+          cp ${pkgs.gradm}/etc/grsec/learn_config /etc/grsec
+        fi
+        if [ ! -f /etc/grsec/policy ]; then
+          cp ${pkgs.gradm}/etc/grsec/policy /etc/grsec
+        fi
+        chmod -R 0600 /etc/grsec
+      '';
+
+    # Enable apparmor support, gradm udev rules, and utilities
+    security.apparmor.enable   = true;
+    boot.kernelPackages        = grsecPackage;
+    services.udev.packages     = [ pkgs.gradm ];
+    environment.systemPackages = [ pkgs.gradm pkgs.paxctl pkgs.pax-utils ];
+  };
+}
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 8e3cb5f7aaa..267e5657e6c 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -18,6 +18,18 @@ let
       };
     };
 
+  grsecPatch = { grversion ? "3.0", kversion, revision, branch, sha256 }:
+    { name = "grsecurity-${grversion}-${kversion}";
+      inherit grversion kversion revision;
+      patch = fetchurl {
+        url = "http://grsecurity.net/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch";
+        inherit sha256;
+      };
+      features.grsecurity = true;
+      # The grsec kernel patchset includes AppArmor patches
+      features.apparmor = true;
+    };
+
   makeAppArmorPatch = {apparmor, version}:
     stdenv.mkDerivation {
       name = "apparmor-${version}.patch";
@@ -26,6 +38,7 @@ let
         cat ${apparmor}/kernel-patches/${version}/* > $out
       '';
     };
+
 in
 
 rec {
@@ -71,31 +84,29 @@ rec {
     sha256 = "00b1rqgd4yr206dxp4mcymr56ymbjcjfa4m82pxw73khj032qw3j";
   };
 
+  grsecurity_stable = grsecPatch
+    { kversion  = "3.2.57";
+      revision  = "201404111812";
+      branch    = "stable";
+      sha256    = "1kp2f5g5jdl6r833fm5l2sgf7qsjddl2br7mislc37iqgwzjmhlx";
+    };
 
-  grsecurity_3_0_3_2_57 =
-    { name = "grsecurity-3.0-3.2.57";
-      patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-3.0-3.2.57-201404091758.patch;
-        sha256 = "07rswg6vqyak9ccan954izx1fr0c6c6fn8whlzl0787dabpai3i3";
-      };
-      features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.57
-      features.apparmor = true;
+  grsecurity_vserver = grsecPatch
+    { kversion  = "3.2.57";
+      revision  = "vs2.3.2.16-201404111814";
+      branch    = "vserver";
+      sha256    = "025kxk4j8kx7v5gmpafls67747l39ssfmzh0drg0hyg2yc0hjk2c";
     };
 
-  grsecurity_3_0_3_13_9 =
-    { name = "grsecurity-3.0-3.13.9";
-      patch = fetchurl {
-        url = http://grsecurity.net/test/grsecurity-3.0-3.13.9-201404062127.patch;
-        sha256 = "0kwqgw2a44wqhwjwws63ww15apb8jki372iccq7h1w5vi551sl0m";
-      };
-      features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.9
-      features.apparmor = true;
+  grsecurity_unstable = grsecPatch
+    { kversion  = "3.13.9";
+      revision  = "201404111815";
+      branch    = "test";
+      sha256    = "1ikqvi0hv32m5rgxa8dpqr5v84hx7bnjfr6c1bvsfqikc818isvy";
     };
 
-  grsec_path =
-    { name = "grsec-path";
+  grsec_fix_path =
+    { name = "grsec-fix-path";
       patch = ./grsec-path.patch;
     };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5ed92405ea..9295ba13645 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6907,39 +6907,6 @@ let
     kernelPatches = [];
   };
 
-  grsecurityOverrider = args: {
-    # 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 ++ [ gmp ];
-    preConfigure = ''
-      ${args.preConfigure or ""}
-      sed -i 's|-I|-I${gmp}/include -I|' scripts/gcc-plugin.sh
-      sed -i 's|HOST_EXTRACFLAGS +=|HOST_EXTRACFLAGS += -I${gmp}/include|' tools/gcc/Makefile
-      sed -i 's|HOST_EXTRACXXFLAGS +=|HOST_EXTRACXXFLAGS += -I${gmp}/include|' tools/gcc/Makefile
-    '';
-  };
-
-  # Note: grsec is not enabled automatically, you need to specify which kernel
-  # config options you need (e.g. by overriding extraConfig). See list of options here:
-  # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
-  linux_3_2_grsecurity = lowPrio (lib.addMetaAttrs {
-    maintainers = with lib.maintainers; [ wizeman thoughtpolice ];
-  } (lib.overrideDerivation (linux_3_2.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_57 kernelPatches.grsec_path ];
-    argsOverride = {
-      modDirVersion = "${linux_3_2.modDirVersion}-grsec";
-    };
-  })) (args: grsecurityOverrider args)));
-
-  linux_3_13_grsecurity = lowPrio (lib.addMetaAttrs {
-    maintainers = with lib.maintainers; [ wizeman thoughtpolice ];
-  } (lib.overrideDerivation (linux_3_13.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_9 kernelPatches.grsec_path ];
-    argsOverride = {
-      modDirVersion = "${linux_3_13.modDirVersion}-grsec";
-    };
-  })) (args: grsecurityOverrider args)));
-
   linux_3_2_apparmor = lowPrio (linux_3_2.override {
     kernelPatches = [ kernelPatches.apparmor_3_2 ];
     extraConfig = ''
@@ -7104,7 +7071,6 @@ 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_grsecurity = linuxPackagesFor pkgs.linux_3_2_grsecurity linuxPackages_3_2_grsecurity;
   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;
@@ -7112,7 +7078,6 @@ let
   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;
   linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
-  linuxPackages_3_13_grsecurity = linuxPackagesFor pkgs.linux_3_13_grsecurity linuxPackages_3_13_grsecurity;
   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!
-- 
GitLab


From 83cb0354e9485a7d38e05072635e5437d967248a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 11 Apr 2014 10:10:24 +0200
Subject: [PATCH 3485/3789] clang_34: make it evaluate to 3.4 even 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 9295ba13645..fc4b1e14313 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2418,7 +2418,7 @@ let
 
   clang = wrapClang llvmPackages.clang;
 
-  clang_34 = wrapClang llvmPackages.clang;
+  clang_34 = wrapClang llvmPackages_34.clang;
   clang_33 = wrapClang (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix);
   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);
-- 
GitLab


From aee930586f35992a3921a6cc3e9e219fd7e69b21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 12 Apr 2014 11:57:43 +0200
Subject: [PATCH 3486/3789] drumkv1: update from 0.4.0 to 0.4.1

---
 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 9a812fd261a..39f6ae0ded4 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.0";
+  version = "0.4.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "0bhj4liv6c0rw0gsh1zygj4a9vmwl3jdz2j6zzdxbqdk21xq4zpz";
+    sha256 = "0wxbn5qm3dn9spwbm618flgrwvls7bipg0nhgn0lv4za2g823g56";
   };
 
   buildInputs = [ jackaudio libsndfile lv2 qt4 ];
-- 
GitLab


From 440a174e2d179e78686a2b798d02fe0168bc9dfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 12 Apr 2014 11:58:13 +0200
Subject: [PATCH 3487/3789] samplv1: update from 0.4.0 to 0.4.1

---
 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 2748dfd5db4..f1d3be317d1 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.0";
+  version = "0.4.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${name}.tar.gz";
-    sha256 = "04vldwpm4059czwd4i5yv07daqjnzs2zsrld779likans9ib3ri8";
+    sha256 = "1cx3qs9vrdwmym2qsghqq53bshnjqgpqypsilr1m2i1cpfnfrr6x";
   };
 
   buildInputs = [ jackaudio libsndfile lv2 qt4 ];
-- 
GitLab


From 02e693c400e4ec9fd644d26da3d777684d99f1bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 12 Apr 2014 11:58:29 +0200
Subject: [PATCH 3488/3789] synthv1: update from 0.4.0 to 0.4.1

---
 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 229d4fdac14..4037b88ecb7 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.0";
+  version = "0.4.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/synthv1/${name}.tar.gz";
-    sha256 = "0zyxja1s74fr95qbwsyykggs3af2ndm2hz1l0avb645xgm93vcfv";
+    sha256 = "1j1x8n3rlwrh373wqmm6mj3cgyk3apvnpqygx1700fl4cf249agl";
   };
 
   buildInputs = [ qt4 jackaudio lv2 ];
-- 
GitLab


From 6c1ac8159b50c1586b4d66365d31c0e5002c0526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 12 Apr 2014 11:59:03 +0200
Subject: [PATCH 3489/3789] oxygen_gtk: update from 1.4.4 to 1.4.5

---
 pkgs/misc/themes/gtk2/oxygen-gtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
index 1bd4d5f35b4..c3d846c566c 100644
--- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
+++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
@@ -2,12 +2,12 @@
   cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.4";
+  version = "1.4.5";
   name = "oxygen-gtk2-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2";
-    sha256 = "1w3300v7kclpaccvd0wsajgay4mgg2fbbi1nd0zak0p5nn40sqf8";
+    sha256 = "00ykq4aafakdkvww7kz84bvg9wc2gdji4m7z87f49hj1jxm84v2v";
   };
 
   buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf
-- 
GitLab


From c62b9e56f85a3e368308d9dab28f1f4bf12cd742 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 12 Apr 2014 14:40:03 +0200
Subject: [PATCH 3490/3789] perl: Finance::Quote 1.29

---
 pkgs/top-level/perl-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a6bd4c82e6e..c61b4c74ffc 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3667,11 +3667,11 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ TestScript ];
   };
 
-  FinanceQuote = buildPerlPackage {
-    name = "Finance-Quote-1.19";
+  FinanceQuote = buildPerlPackage rec {
+    name = "Finance-Quote-1.29";
     src = fetchurl {
-      url = mirror://sourceforge/finance-quote/1.19/Finance-Quote-1.19.tar.gz;
-      sha256 = "0z1dqxw4by7rkwm113qp2mlhl5r0znr22kzinvr1p82svn0zvm2d";
+      url = "mirror://cpan/authors/id/E/EC/ECOCODE/${name}.tar.gz";
+      sha256 = "0rx8whixbhwq2imd3ffx3vcqdgfbjj6y1s01m38b52x3bjn9hw0f";
     };
     propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc JSON ];
     meta = {
-- 
GitLab


From 4fea09ca4c3f8db6b95a67d2c27efd32c6f2ae7b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 7 Apr 2014 10:36:39 -0500
Subject: [PATCH 3491/3789] google_api_python_client: Add package

Closes #2178

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4fe14a3bbe2..ecf039fed4d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3208,6 +3208,24 @@ rec {
     propagatedBuildInputs = [ gdata hcs_utils keyring simplejson ];
   };
 
+  google_api_python_client = buildPythonPackage rec {
+    name = "google-api-python-client-1.2";
+
+    src = fetchurl {
+      url = "https://google-api-python-client.googlecode.com/files/google-api-python-client-1.2.tar.gz";
+      sha256 = "0xd619w71xk4ldmikxqhaaqn985rc2hy4ljgwfp50jb39afg7crw";
+    };
+
+    propagatedBuildInputs = [ httplib2 ];
+
+    meta = with stdenv.lib; {
+      description = "The core Python library for accessing Google APIs";
+      homepage = "https://code.google.com/p/google-api-python-client/";
+      license = licenses.asl20;
+      platforms = platforms.unix;
+    };
+  };
+
   greenlet = buildPythonPackage rec {
     name = "greenlet-0.3.1";
 
-- 
GitLab


From 796ea8ee11ebbcbdc381b3ec7e300b8bd787069b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 12 Apr 2014 16:59:29 +0200
Subject: [PATCH 3492/3789] haskell: add uri package

---
 pkgs/development/libraries/haskell/uri/default.nix | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/uri/default.nix

diff --git a/pkgs/development/libraries/haskell/uri/default.nix b/pkgs/development/libraries/haskell/uri/default.nix
new file mode 100644
index 00000000000..aa94c931e54
--- /dev/null
+++ b/pkgs/development/libraries/haskell/uri/default.nix
@@ -0,0 +1,14 @@
+{ cabal, parsec, safe, utf8String }:
+
+cabal.mkDerivation (self: {
+  pname = "uri";
+  version = "0.1.6.2";
+  sha256 = "0f2ms8awm4x7pw8ms6in0mxspqmnhv8bxas0947rkrzc5m9k0h3s";
+  buildDepends = [ parsec safe utf8String ];
+  meta = {
+    homepage = "http://gitorious.org/uri";
+    description = "Library for working with URIs";
+    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 672b8ffe594..2d952056c59 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2492,6 +2492,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   unorderedContainers_0_2_3_3 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.3.nix {};
   unorderedContainers = self.unorderedContainers_0_2_3_3;
 
+  uri = callPackage ../development/libraries/haskell/uri {};
+
   url = callPackage ../development/libraries/haskell/url {};
 
   urlencoded = callPackage ../development/libraries/haskell/urlencoded {};
-- 
GitLab


From 99d8ef06733caa60573c5bb14de889a369bfa6a1 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Fri, 11 Apr 2014 11:45:06 +0100
Subject: [PATCH 3493/3789] haskellPackages.snapCORS: New expression

---
 .../libraries/haskell/snap-cors/default.nix   | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/snap-cors/default.nix

diff --git a/pkgs/development/libraries/haskell/snap-cors/default.nix b/pkgs/development/libraries/haskell/snap-cors/default.nix
new file mode 100644
index 00000000000..d805817838a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/snap-cors/default.nix
@@ -0,0 +1,19 @@
+{ cabal, attoparsec, caseInsensitive, hashable, network, snap, text
+, transformers, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "snap-cors";
+  version = "1.2.2";
+  sha256 = "1f32sj7y87lr0wjs3j3ynh95c4j4yx4fzizbgdfnjai1apcjkhcs";
+  buildDepends = [
+    attoparsec caseInsensitive hashable network snap text transformers
+    unorderedContainers
+  ];
+  meta = {
+    homepage = "http://github.com/ocharles/snap-cors";
+    description = "Add CORS headers to Snap 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 7f708438fc7..854af609423 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2260,6 +2260,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};
 
+  snapCORS = callPackage ../development/libraries/haskell/snap-cors {};
+
   snapLoaderDynamic = callPackage ../development/libraries/haskell/snap/loader-dynamic.nix {};
 
   snapLoaderStatic = callPackage ../development/libraries/haskell/snap/loader-static.nix {};
-- 
GitLab


From 3f1af5f709852baf59ea4a7bc5ac7270973fd115 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sat, 12 Apr 2014 16:06:35 +0100
Subject: [PATCH 3494/3789] haskellPackages.bert: Update to 1.2.2.2

---
 pkgs/development/libraries/haskell/bert/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/bert/default.nix b/pkgs/development/libraries/haskell/bert/default.nix
index e2d482b364e..96c421b708d 100644
--- a/pkgs/development/libraries/haskell/bert/default.nix
+++ b/pkgs/development/libraries/haskell/bert/default.nix
@@ -1,14 +1,14 @@
-{ cabal, async, binary, binaryConduit, conduit, mtl, network
-, networkConduit, parsec, smallcheck, tasty, tastyHunit
-, tastySmallcheck, time, void
+{ cabal, async, binary, binaryConduit, conduit, conduitExtra, mtl
+, network, parsec, smallcheck, tasty, tastyHunit, tastySmallcheck
+, time, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "bert";
-  version = "1.2.2.1";
-  sha256 = "1x23grykamyclx6a5jzyqwp3hwr2ma61zvmz89f3cj06sa49cgs0";
+  version = "1.2.2.2";
+  sha256 = "0bjrqgm0dpsrk1nivxmw2wvx33v7z7swgy3p5fb51vg7y81776cz";
   buildDepends = [
-    binary binaryConduit conduit mtl network networkConduit parsec time
+    binary binaryConduit conduit conduitExtra mtl network parsec time
     void
   ];
   testDepends = [
-- 
GitLab


From 0ef3c4777825d3afc1ea59e6ab83b02523bcb917 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 12 Apr 2014 10:15:39 -0500
Subject: [PATCH 3495/3789] Add recipes for a few Haskell libraries

---
 .../haskell/data-ordlist/default.nix          | 12 ++++++++++++
 .../libraries/haskell/logging/default.nix     | 19 +++++++++++++++++++
 .../haskell/missing-foreign/default.nix       | 12 ++++++++++++
 .../haskell/time-recurrence/default.nix       | 19 +++++++++++++++++++
 .../libraries/haskell/timeparsers/default.nix | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix           | 10 ++++++++++
 6 files changed, 85 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/data-ordlist/default.nix
 create mode 100644 pkgs/development/libraries/haskell/logging/default.nix
 create mode 100644 pkgs/development/libraries/haskell/missing-foreign/default.nix
 create mode 100644 pkgs/development/libraries/haskell/time-recurrence/default.nix
 create mode 100644 pkgs/development/libraries/haskell/timeparsers/default.nix

diff --git a/pkgs/development/libraries/haskell/data-ordlist/default.nix b/pkgs/development/libraries/haskell/data-ordlist/default.nix
new file mode 100644
index 00000000000..ca506bc01e9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-ordlist/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "data-ordlist";
+  version = "0.4.6";
+  sha256 = "13gsvqifwlxcz10x704fy26288l0km2kfdlh4w9hl31a9vd427sx";
+  meta = {
+    description = "Set and bag operations on ordered lists";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/logging/default.nix b/pkgs/development/libraries/haskell/logging/default.nix
new file mode 100644
index 00000000000..1c7323f54cf
--- /dev/null
+++ b/pkgs/development/libraries/haskell/logging/default.nix
@@ -0,0 +1,19 @@
+{ cabal, binary, fastLogger, hspec, liftedBase, monadControl
+, monadLogger, pcreLight, text, thyme, transformers, vectorSpace
+}:
+
+cabal.mkDerivation (self: {
+  pname = "logging";
+  version = "1.3.0";
+  sha256 = "1d2is6p828xvh59f9b971xf0w2l229652rniccxpm2mcfs893c79";
+  buildDepends = [
+    binary fastLogger liftedBase monadControl monadLogger pcreLight
+    text thyme transformers vectorSpace
+  ];
+  testDepends = [ hspec monadLogger ];
+  meta = {
+    description = "Simplified logging in IO for application writers";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/missing-foreign/default.nix b/pkgs/development/libraries/haskell/missing-foreign/default.nix
new file mode 100644
index 00000000000..9ffbc37468a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/missing-foreign/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "missing-foreign";
+  version = "0.1.1";
+  sha256 = "11f8pknbarlj956nmalqhd2v704z7d7xbi61hs1q8vb2p36kc6wy";
+  meta = {
+    description = "Convenience functions for FFI work";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/time-recurrence/default.nix b/pkgs/development/libraries/haskell/time-recurrence/default.nix
new file mode 100644
index 00000000000..0e23f84ebfc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/time-recurrence/default.nix
@@ -0,0 +1,19 @@
+{ cabal, dataOrdlist, HUnit, mtl, testFramework, testFrameworkHunit
+, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "time-recurrence";
+  version = "0.9.2";
+  sha256 = "1arqmkagmswimbh78qfz5bcilk9i14w29j4vf4i89d00vac3vrzm";
+  buildDepends = [ dataOrdlist mtl time ];
+  testDepends = [
+    dataOrdlist HUnit mtl testFramework testFrameworkHunit time
+  ];
+  meta = {
+    homepage = "http://github.com/hellertime/time-recurrence";
+    description = "Generate recurring dates";
+    license = self.stdenv.lib.licenses.gpl3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/timeparsers/default.nix b/pkgs/development/libraries/haskell/timeparsers/default.nix
new file mode 100644
index 00000000000..57c9c7e3da7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/timeparsers/default.nix
@@ -0,0 +1,13 @@
+{ cabal, attoparsec, convertible, mtl, time }:
+
+cabal.mkDerivation (self: {
+  pname = "timeparsers";
+  version = "0.3.2";
+  sha256 = "1dicp58f2amn5rgmnlfjpv4aj7ak6jrdlba2marglddvj4ycq1h7";
+  buildDepends = [ attoparsec convertible mtl time ];
+  meta = {
+    description = "Attoparsec parsers for various Date/Time formats";
+    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 203847bcb00..fcf14325a82 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -923,6 +923,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {};
 
+  dataOrdlist = callPackage ../development/libraries/haskell/data-ordlist {};
+
   dataPprint = callPackage ../development/libraries/haskell/data-pprint {};
 
   dataReify = callPackage ../development/libraries/haskell/data-reify {};
@@ -1689,6 +1691,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   logfloat = callPackage ../development/libraries/haskell/logfloat {};
 
+  logging = callPackage ../development/libraries/haskell/logging {};
+
   logict = callPackage ../development/libraries/haskell/logict {};
 
   lushtags = callPackage ../development/libraries/haskell/lushtags {};
@@ -1729,6 +1733,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   misfortune = callPackage ../development/libraries/haskell/misfortune {};
 
+  missingForeign = callPackage ../development/libraries/haskell/missing-foreign {};
+
   MissingH = callPackage ../development/libraries/haskell/MissingH {
     testpack = null;
   };
@@ -2526,6 +2532,10 @@ 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 {};
+
+  timeRecurrence = callPackage ../development/libraries/haskell/time-recurrence {};
+
   timezoneOlson = callPackage ../development/libraries/haskell/timezone-olson {};
 
   timezoneSeries = callPackage ../development/libraries/haskell/timezone-series {};
-- 
GitLab


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 3496/3789] 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 { };
-- 
GitLab


From 97982c4085bcf2a73d5933a93d30589aea045a36 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 12 Apr 2014 19:27:26 +0400
Subject: [PATCH 3497/3789] Update MDBTools Git version

---
 pkgs/tools/misc/mdbtools/git.nix | 15 +++++++++------
 pkgs/top-level/all-packages.nix  |  4 +++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix
index e7342d9b3e6..2805514965e 100644
--- a/pkgs/tools/misc/mdbtools/git.nix
+++ b/pkgs/tools/misc/mdbtools/git.nix
@@ -1,22 +1,25 @@
 { stdenv, fetchurl, fetchgit, glib, readline, bison, flex, pkgconfig,
-  libiconv, autoconf, automake, libtool }:
+  libiconv, autoconf, automake, libtool, which, txt2man, gnome_doc_utils,
+  scrollkeeper}:
 
 stdenv.mkDerivation {
   name = "mdbtools-git";
 
   src = fetchgit {
     url = "http://github.com/brianb/mdbtools.git";
-    rev = "5ac44b69d9375cca3e1055b70fd22abf7fbf17ab";
-    sha256 = "094e6b480c6fda3a000d0d8539b209d2d7c204a440660a21c11f2e1c9b3aa345";
+    rev = "dfd752ec022097ee1e0999173aa604d8a0c0ca8b";
+    sha256 = "0ibj36yxlhwjgi7cj170lwpbzdbgidkq5p8raa59v76bdrxwmb0n";
   };
 
   buildInputs = [glib readline bison flex pkgconfig libiconv autoconf automake
-    libtool];
+    libtool which txt2man gnome_doc_utils scrollkeeper ];
 
   preConfigure = ''
     sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c
-    export NIX_LDFLAGS="$NIX_LDFLAGS -liconv"
-    ./autogen.sh
+    sed -e '/ENABLE_GTK_DOC/aAM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test x$enable_gtk_doc = xyes)' \
+    -e  '/ENABLE_GTK_DOC/aAM_CONDITIONAL(ENABLE_SK, test x$enable_scrollkeeper = xyes)'          \
+    -i configure.ac
+    autoreconf -i -f
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc4b1e14313..888f62d0f06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1394,7 +1394,9 @@ 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;
+  };
 
   megacli = callPackage ../tools/misc/megacli { };
 
-- 
GitLab


From c3efd1a3f759b026b664a01a641f9e9028134fb5 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 12 Apr 2014 10:50:57 -0500
Subject: [PATCH 3498/3789] Update httrack recipe

Closes #2222

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/backup/httrack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix
index 4fa3345d220..a77689c85fc 100644
--- a/pkgs/tools/backup/httrack/default.nix
+++ b/pkgs/tools/backup/httrack/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, zlib, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "3.47.27";
+  version = "3.48.3";
   name = "httrack-${version}";
 
   src = fetchurl {
     url = "http://mirror.httrack.com/httrack-${version}.tar.gz";
-    sha256 = "1qgrs9wdqq4v9ywlb1b89i95w4a36y741l49xbpmb7mb7nvbz5kw";
+    sha256 = "1lg5rrql01q3z7fwcij5p64r22x4vbswcky80gajx5f62kxlxn0r";
   };
 
   buildInputs = [ zlib openssl ];
-- 
GitLab


From b296895abe8ed8bd89ed9d0d7e3bf9ba3168180c Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 12 Apr 2014 11:05:25 -0500
Subject: [PATCH 3499/3789] Allow lsof to build on darwin (fixes #2219)

Closes #2219, closes #2223

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/misc/lsof/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 2469a0210b3..ec3a5e9bcbf 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -12,7 +12,9 @@ stdenv.mkDerivation {
   
   preBuild = "sed -i Makefile -e 's/^CFGF=/&	-DHASIPv6=1/;';";
   
-  configurePhase = "./Configure -n linux;";
+  configurePhase = if stdenv.isDarwin
+    then "./Configure -n darwin;"
+    else "./Configure -n linux;";
   
   installPhase = ''
     mkdir -p $out/bin $out/man/man8
-- 
GitLab


From 64efd184ed389527bcfbe2f71c312546431f0261 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 12 Apr 2014 11:16:03 -0500
Subject: [PATCH 3500/3789] grsecurity: Fix GRKERNSEC_PROC restrictions

Previously we were setting GRKERNSEC_PROC_USER y, which was a little bit
too strict. It doesn't allow a special group (e.g. the grsecurity group
users) to access /proc information - this requires
GRKERNSEC_PROC_USERGROUP y, and the two are mutually exclusive.

This was also not in line with the default automatic grsecurity
configuration - it actually defaults to USERGROUP (although it has a
default GID of 1001 instead of ours), not USER.

This introduces a new option restrictProcWithGroup - enabled by default
- which turns on GRKERNSEC_PROC_USERGROUP instead. It also turns off
restrictProc by default and makes sure both cannot be enabled.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/security/grsecurity.nix | 42 ++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index 1759413c558..913a0afc452 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -78,9 +78,14 @@ let
       GRKERNSEC y
       ${grsecMainConfig}
 
-      GRKERNSEC_PROC_USER ${boolToKernOpt cfg.config.restrictProc}
-      ${if !cfg.config.restrictProc then ""
-        else "GRKERNSEC_PROC_GID "+(toString cfg.config.unrestrictProcGid)}
+      ${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}
@@ -278,7 +283,7 @@ in
 
         restrictProc = mkOption {
           type = types.bool;
-          default = true;
+          default = false;
           description = ''
             If true, then set <literal>GRKERN_PROC_USER
             y</literal>. This restricts non-root users to only viewing
@@ -287,18 +292,31 @@ in
           '';
         };
 
+        restrictProcWithGroup = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            If true, then set <literal>GRKERN_PROC_USERGROUP
+            y</literal>. This is similar to
+            <literal>restrictProc</literal> except it allows a special
+            group (specified by <literal>unrestrictProcGid</literal>)
+            to still access otherwise classified information in
+            <literal>/proc</literal>.
+          '';
+        };
+
         unrestrictProcGid = mkOption {
           type = types.int;
           default = config.ids.gids.grsecurity;
           description = ''
             If set, specifies a GID which is exempt from
             <literal>/proc</literal> restrictions (set by
-            <literal>GRKERN_PROC_USER</literal>). By default, this is
-            set to the GID for <literal>grsecurity</literal>, a
-            predefined NixOS group, which the <literal>root</literal>
-            account is a member of. You may conveniently add other
-            users to this group if you need access to
-            <literal>/proc</literal>
+            <literal>GRKERN_PROC_USERGROUP</literal>). By default,
+            this is set to the GID for <literal>grsecurity</literal>,
+            a predefined NixOS group, which the
+            <literal>root</literal> account is a member of. You may
+            conveniently add other users to this group if you need
+            access to <literal>/proc</literal>
           '';
         };
 
@@ -346,6 +364,10 @@ in
         { assertion = (cfg.testing -> !cfg.vserver);
           message   = "The vserver patches are only supported in the stable kernel.";
         }
+        { assertion = (cfg.config.restrictProc -> !cfg.config.restrictProcWithGroup) ||
+                      (cfg.config.restrictProcWithGroup -> !cfg.config.restrictProc);
+          message   = "You cannot enable both restrictProc and restrictProcWithGroup";
+        }
         { assertion = config.boot.kernelPackages.kernel.features ? grsecurity
                    && config.boot.kernelPackages.kernel.features.grsecurity;
           message = "grsecurity enabled, but kernel doesn't have grsec support";
-- 
GitLab


From 1ae918b0d2f6192bb07fc457b6bda89bba38a6c1 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 20:24:43 +0200
Subject: [PATCH 3501/3789] gtk3: bugfix update 3.12.0 -> .1

---
 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 c8e4299e1a7..82e2e41aff8 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 = "0";
+  ver_min = "1";
   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 = "0jvf9dawq82x1xsr2f56fw3y7yfwapgdj16gr4d5m6q2shf78sgb";
+    sha256 = "1kbp0bmyzh7lbxv9y349vrj3d0n0hn68r5kyvg5683snvdgsx6ki";
   };
 
   nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
-- 
GitLab


From 2fd160f02731745ff1d258003793649b8ee182d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 12 Apr 2014 17:18:50 +0200
Subject: [PATCH 3502/3789] haskell: update yi to 0.8.1

---
 pkgs/applications/editors/yi/yi-contrib.nix | 10 +++++---
 pkgs/applications/editors/yi/yi.nix         | 27 ++++++++++-----------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/editors/yi/yi-contrib.nix b/pkgs/applications/editors/yi/yi-contrib.nix
index 6dd75301187..c7d3f094016 100644
--- a/pkgs/applications/editors/yi/yi-contrib.nix
+++ b/pkgs/applications/editors/yi/yi-contrib.nix
@@ -1,10 +1,12 @@
-{ cabal, dataAccessor, filepath, mtl, split, yi }:
+{ cabal, filepath, lens, mtl, split, time, transformersBase, yi }:
 
 cabal.mkDerivation (self: {
   pname = "yi-contrib";
-  version = "0.7.2";
-  sha256 = "074cq1y0pp66r2fqqszd8w2pws8jbfwq9g39w3rsgjnw83058fr8";
-  buildDepends = [ dataAccessor filepath mtl split yi ];
+  version = "0.8.1";
+  sha256 = "0jsbga30x302mr708vj5y7cpc961vh85dshpq2zlrf44dh0kmpvf";
+  buildDepends = [
+    filepath lens mtl split time transformersBase yi
+  ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/Yi";
     description = "Add-ons to Yi, the Haskell-Scriptable Editor";
diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix
index b358f5488dc..96e4a06965c 100644
--- a/pkgs/applications/editors/yi/yi.nix
+++ b/pkgs/applications/editors/yi/yi.nix
@@ -1,31 +1,30 @@
 { cabal, alex, binary, Cabal, cautiousFile, concreteTyperep
-, dataAccessor, dataAccessorMtl, dataAccessorTemplate, derive, Diff
-, dlist, dyre, filepath, fingertree, glib, gtk, hashable, hint
-, HUnit, mtl, pango, parsec, pointedlist, QuickCheck, random
-, regexBase, regexTdfa, split, testFramework, testFrameworkHunit
-, time, uniplate, unixCompat, unorderedContainers, utf8String, vty
+, dataDefault, derive, Diff, dlist, dyre, filepath, fingertree
+, glib, gtk, hashable, hint, HUnit, lens, mtl, pango, parsec
+, pointedlist, QuickCheck, random, regexBase, regexTdfa, safe
+, split, tasty, tastyHunit, tastyQuickcheck, time, transformersBase
+, uniplate, unixCompat, unorderedContainers, utf8String, vty
 , xdgBasedir
 }:
 
 cabal.mkDerivation (self: {
   pname = "yi";
-  version = "0.7.2";
-  sha256 = "0g0hvr4zqcrmdl6mbdmrfxd5m51fhkhslvl9piwq83g2wirxqbvm";
+  version = "0.8.1";
+  sha256 = "1hyqlydc0na9pkb3fkbp13c6vnp4f80z8237bvrv12wkk5syyn23";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary Cabal cautiousFile concreteTyperep dataAccessor
-    dataAccessorMtl dataAccessorTemplate derive Diff dlist dyre
-    filepath fingertree glib gtk hashable hint mtl pango parsec
-    pointedlist QuickCheck random regexBase regexTdfa split time
-    uniplate unixCompat unorderedContainers utf8String vty xdgBasedir
+    binary Cabal cautiousFile concreteTyperep dataDefault derive Diff
+    dlist dyre filepath fingertree glib gtk hashable hint lens mtl
+    pango parsec pointedlist QuickCheck random regexBase regexTdfa safe
+    split time transformersBase uniplate unixCompat unorderedContainers
+    utf8String vty xdgBasedir
   ];
   testDepends = [
-    filepath HUnit QuickCheck testFramework testFrameworkHunit
+    filepath HUnit QuickCheck tasty tastyHunit tastyQuickcheck
   ];
   buildTools = [ alex ];
   configureFlags = "-fpango";
-  jailbreak = true;
   doCheck = false;
   meta = {
     homepage = "http://haskell.org/haskellwiki/Yi";
-- 
GitLab


From 010132e302d390676da456ed75e20018b1379cd9 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 12 Apr 2014 11:37:45 -0500
Subject: [PATCH 3503/3789] Change several package constraints from linux to
 unix

They all build on Darwin.
---
 .../version-management/git-and-tools/tig/default.nix            | 2 +-
 pkgs/development/tools/build-managers/ninja/default.nix         | 2 +-
 pkgs/development/tools/misc/global/default.nix                  | 2 +-
 pkgs/tools/networking/iperf/default.nix                         | 2 +-
 pkgs/tools/networking/mosh/default.nix                          | 2 +-
 pkgs/tools/networking/pdnsd/default.nix                         | 2 +-
 pkgs/tools/networking/socat/default.nix                         | 2 +-
 7 files changed, 7 insertions(+), 7 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 23009efdbd5..fd9011130e3 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     description = "Text-mode interface for git";
     maintainers = with maintainers; [ garbas bjornfor iElectric ];
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index b5c0b0a03da..75c2da8a28d 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://martine.github.io/ninja/;
     license = licenses.asl20;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
 }
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 4048d21c8f7..fdb5f72af83 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/global/;
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/networking/iperf/default.nix b/pkgs/tools/networking/iperf/default.nix
index 2ee8a90cb4a..33d8ee2fd63 100644
--- a/pkgs/tools/networking/iperf/default.nix
+++ b/pkgs/tools/networking/iperf/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "http://sourceforge.net/projects/iperf/"; 
     description = "Tool to measure IP bandwidth using UDP or TCP";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     license = "as-is";
   };
 }
diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix
index 2708210af80..e781af7c235 100644
--- a/pkgs/tools/networking/mosh/default.nix
+++ b/pkgs/tools/networking/mosh/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     '';
     license = "GPLv3+";
     maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix
index 4b111475e69..14f57b61a2f 100644
--- a/pkgs/tools/networking/pdnsd/default.nix
+++ b/pkgs/tools/networking/pdnsd/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     description = "Permanent DNS caching";
     homepage = http://www.phys.uu.nl/~rombouts/pdnsd.html;
     license = "GPLv3+";
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [viric];
   };
 }
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix
index 7da82796b1c..84ba2106a26 100644
--- a/pkgs/tools/networking/socat/default.nix
+++ b/pkgs/tools/networking/socat/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     description = "A utility for bidirectional data transfer between two independent data channels";
     homepage = http://www.dest-unreach.org/socat/;
     repositories.git = git://repo.or.cz/socat.git;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.gpl2;
     maintainers = stdenv.lib.maintainers.eelco;
   };
-- 
GitLab


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 3504/3789] 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";
-- 
GitLab


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 3505/3789] 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.
 
-- 
GitLab


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 3506/3789] 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) ''
-- 
GitLab


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 3507/3789] 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 = ''
-- 
GitLab


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 3508/3789] 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 = [
-- 
GitLab


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 3509/3789] 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 {};
-- 
GitLab


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 3510/3789] 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 ];
-- 
GitLab


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 3511/3789] 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 ];
-- 
GitLab


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 3512/3789] 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{ } ;
 
-- 
GitLab


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 3513/3789] 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 = ''
-- 
GitLab


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 3514/3789] 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;
-- 
GitLab


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 3515/3789] 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
-- 
GitLab


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 3516/3789] 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 ];
   };
 })
-- 
GitLab


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 3517/3789] 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 { };
-- 
GitLab


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 3518/3789] 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 =
-- 
GitLab


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 3519/3789] 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 ];
-- 
GitLab


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 3520/3789] 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 { };
 
-- 
GitLab


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 3521/3789] 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 =
-- 
GitLab


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 3522/3789] 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;
-- 
GitLab


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 3523/3789] 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";
-- 
GitLab


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 3524/3789] 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 =
-- 
GitLab


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 3525/3789] 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 ];
-- 
GitLab


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 3526/3789] 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{ } ;
-- 
GitLab


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 3527/3789] 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 = [
-- 
GitLab


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 3528/3789] 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 ];
-- 
GitLab


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 3529/3789] 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 ];
   };
 }
-- 
GitLab


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 3530/3789] 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.
-- 
GitLab


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 3531/3789] 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";
-- 
GitLab


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 3532/3789] 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
       )
     '';
-- 
GitLab


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 3533/3789] 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 ];
-- 
GitLab


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 3534/3789] 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 ];
   };
 }
-- 
GitLab


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 3535/3789] 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];
-- 
GitLab


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 3536/3789] 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>
 
-- 
GitLab


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 3537/3789] 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>
-- 
GitLab


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 3538/3789] 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
-- 
GitLab


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 3539/3789] 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; }'
-- 
GitLab


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 3540/3789] 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 { };
-- 
GitLab


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 3541/3789] 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 { };
-- 
GitLab


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 3542/3789] 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;
 
-- 
GitLab


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 3543/3789] 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 ];
-- 
GitLab


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 3544/3789] 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
-- 
GitLab


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 3545/3789] 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;
-- 
GitLab


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 3546/3789] 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=$!
         '';
-- 
GitLab


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 3547/3789] 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" \
-- 
GitLab


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 3548/3789] 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; {
-- 
GitLab


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 3549/3789] 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 { };
-- 
GitLab


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 3550/3789] 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 { };
-- 
GitLab


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 3551/3789] 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
-- 
GitLab


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 3552/3789] 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";
-- 
GitLab


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 3553/3789] 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; {
-- 
GitLab


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 3554/3789] 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
-- 
GitLab


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 3555/3789] 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):
-- 
GitLab


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 3556/3789] 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 { };
-- 
GitLab


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 3557/3789] 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" />
-- 
GitLab


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 3558/3789] 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>
 
-- 
GitLab


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 3559/3789] 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; }'
-- 
GitLab


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 3560/3789] 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
   '';
 
-- 
GitLab


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 3561/3789] 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, ... }:
-- 
GitLab


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 3562/3789] 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 | 94 +++++++++++++++++++++----------------------
 nixos/release.nix     |  2 +-
 2 files changed, 46 insertions(+), 50 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; };
-
-  complete = { testScript, makeCoverageReport ? false, ... } @ t: t // rec {
+    let
 
-    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 t.testScript
-      then t.testScript { inherit nodes; }
-      else t.testScript;
+      testScript' =
+        # Call the test script with the computed nodes.
+        if builtins.isFunction testScript
+        then testScript { inherit nodes; }
+        else 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];
-        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;
-
-    report = releaseTools.gcovReport { coverageRuns = [ test ]; };
-
-    result = if makeCoverageReport then report else test;
-  };
+      # 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"}
+        ''; # "
+
+      test = runTests driver;
+
+      report = releaseTools.gcovReport { coverageRuns = [ 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"; };
 
-- 
GitLab


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 3563/3789] 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)
-- 
GitLab


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 3564/3789] 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;
-- 
GitLab


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 3565/3789] 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 { };
-- 
GitLab


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 3566/3789] 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;
         '';
-    });
+    };
 }
-- 
GitLab


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 3567/3789] =?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
 
-- 
GitLab


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 3568/3789] 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
-- 
GitLab


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 3569/3789] 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">
+
+<title>NixOS tests</title>
+
+<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. -->
 
-<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>
+<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 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:
+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>
 
-- 
GitLab


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 3570/3789] 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
-- 
GitLab


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 3571/3789] 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>
-- 
GitLab


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 3572/3789] 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)
-- 
GitLab


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 3573/3789] 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 = [
-- 
GitLab


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 3574/3789] 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 ++
-- 
GitLab


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 3575/3789] 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
 
-- 
GitLab


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 3576/3789] 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;
 
-- 
GitLab


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 3577/3789] 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' )
   '';
-- 
GitLab


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 3578/3789] 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...
-- 
GitLab


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 3579/3789] 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();
+         }
+ 
-- 
GitLab


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 3580/3789] 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" ];
+
   };
 
 
-- 
GitLab


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 3581/3789] 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;
-- 
GitLab


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 3582/3789] 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 =
-- 
GitLab


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 3583/3789] 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 { };
-- 
GitLab


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 3584/3789] 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;
-- 
GitLab


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 3585/3789] 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 = [
-- 
GitLab


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 3586/3789] 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" ];
-- 
GitLab


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 3587/3789] 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";
 
-- 
GitLab


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 3588/3789] 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";
 
-- 
GitLab


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 3589/3789] 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 {};
-- 
GitLab


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 3590/3789] 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.
 
-- 
GitLab


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 3591/3789] 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 { };
-- 
GitLab


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 3592/3789] 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;
+  };
+}
-- 
GitLab


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 3593/3789] 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;
-- 
GitLab


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 3594/3789] 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 {};
-- 
GitLab


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 3595/3789] 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 {};
-- 
GitLab


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 3596/3789] 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 {};
-- 
GitLab


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 3597/3789] 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 {};
-- 
GitLab


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 3598/3789] 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";
-- 
GitLab


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 3599/3789] 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 {};
-- 
GitLab


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 3600/3789] 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 {
-- 
GitLab


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 3601/3789] 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' )
   '';
-- 
GitLab


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 3602/3789] 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
-- 
GitLab


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 3603/3789] 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 =
-- 
GitLab


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 3604/3789] 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 =
-- 
GitLab


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 3605/3789] 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
 
-- 
GitLab


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 3606/3789] 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
-- 
GitLab


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 3607/3789] 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 {
-- 
GitLab


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 3608/3789] 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;
-- 
GitLab


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 3609/3789] 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,
           ''}
         }
       '')
-- 
GitLab


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 3610/3789] 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
-- 
GitLab


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 3611/3789] 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/;
-- 
GitLab


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 3612/3789] 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
-- 
GitLab


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 3613/3789] 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 { };
-- 
GitLab


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 3614/3789] 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
+ 
-- 
GitLab


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 3615/3789] 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/";
-- 
GitLab


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 3616/3789] 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 ];
   };
 })
-- 
GitLab


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 3617/3789] Update node packages, add pure-css

---
 pkgs/top-level/node-packages-generated.nix | 1835 +++++++++++---------
 pkgs/top-level/node-packages.json          |    1 +
 2 files changed, 1000 insertions(+), 836 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."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."constants-browserify"."0.0.1"
       self.by-version."crypto-browserify"."1.0.9"
-      self.by-version."util"."0.10.3"
+      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."buffer"."2.1.5"
-      self.by-version."url"."0.7.9"
+      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."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"
+      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"
     ];
     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"
-    ];
-    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"
+      self.by-version."debug"."0.8.1"
     ];
     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 {
@@ -9052,45 +9151,17 @@
     ];
     passthru.names = [ "jsesc" ];
   };
-  by-spec."jsesc"."~0.4.3" =
-    self.by-version."jsesc"."0.4.3";
-  by-spec."jshint"."*" =
-    self.by-version."jshint"."2.5.0";
-  by-version."jshint"."2.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "jshint-2.5.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jshint/-/jshint-2.5.0.tgz";
-        name = "jshint-2.5.0.tgz";
-        sha1 = "82fd1a235ffce75fad1b40b2a38bef47beac8c54";
-      })
-    ];
-    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"
-      self.by-version."strip-json-comments"."0.1.1"
-    ];
-    peerDependencies = [
-    ];
-    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";
+  by-spec."jsesc"."~0.4.3" =
+    self.by-version."jsesc"."0.4.3";
+  by-spec."jshint"."*" =
+    self.by-version."jshint"."2.5.0";
+  by-version."jshint"."2.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "jshint-2.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jshint/-/jshint-2.4.4.tgz";
-        name = "jshint-2.4.4.tgz";
-        sha1 = "4162238314c649f987752651e8e064e30a68706e";
+        url = "http://registry.npmjs.org/jshint/-/jshint-2.5.0.tgz";
+        name = "jshint-2.5.0.tgz";
+        sha1 = "82fd1a235ffce75fad1b40b2a38bef47beac8c54";
       })
     ];
     buildInputs =
@@ -9103,11 +9174,15 @@
       self.by-version."htmlparser2"."3.3.0"
       self.by-version."console-browserify"."0.1.6"
       self.by-version."exit"."0.1.2"
+      self.by-version."strip-json-comments"."0.1.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "jshint" ];
   };
+  "jshint" = self.by-version."jshint"."2.5.0";
+  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,15 +17369,15 @@
     ];
     passthru.names = [ "throttleit" ];
   };
-  by-spec."through"."~2.2.7" =
-    self.by-version."through"."2.2.7";
-  by-version."through"."2.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-through-2.2.7";
+  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.2.7.tgz";
-        name = "through-2.2.7.tgz";
-        sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd";
+        url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz";
+        name = "through-2.3.4.tgz";
+        sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455";
       })
     ];
     buildInputs =
@@ -17272,15 +17388,15 @@
     ];
     passthru.names = [ "through" ];
   };
-  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";
+  by-spec."through"."~2.2.7" =
+    self.by-version."through"."2.2.7";
+  by-version."through"."2.2.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-through-2.2.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz";
-        name = "through-2.3.4.tgz";
-        sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455";
+        url = "http://registry.npmjs.org/through/-/through-2.2.7.tgz";
+        name = "through-2.2.7.tgz";
+        sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd";
       })
     ];
     buildInputs =
@@ -17291,7 +17407,9 @@
     ];
     passthru.names = [ "through" ];
   };
-  by-spec."through2"."~0.4.0" =
+  by-spec."through"."~2.3.4" =
+    self.by-version."through"."2.3.4";
+  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" }
 ]
-- 
GitLab


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 3618/3789] linux-headers-2.6.28: Remove, no longer used

---
 .../linux/kernel-headers/2.6.28.nix           | 61 -------------------
 pkgs/top-level/all-packages.nix               | 14 ++---
 2 files changed, 5 insertions(+), 70 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,24 +6874,22 @@ 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 { };
-
-  linuxHeaders37 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { };
+  linuxHeaders = linuxHeaders37;
 
-  linuxHeaders26Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix {
+  linuxHeaders24Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.4.nix {
     inherit stdenv fetchurl perl;
     cross = assert crossSystem != null; crossSystem;
   });
 
-  linuxHeaders24Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.4.nix {
+  linuxHeaders26Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.6.32.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
     else if ver == "2.6" then linuxHeaders26Cross
@@ -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) {
-- 
GitLab


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 3619/3789] 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
-- 
GitLab


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 3620/3789] 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.
-- 
GitLab


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 3621/3789] 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 ];
 
-- 
GitLab


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 3622/3789] 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    | 715 ++----------------
 .../linux/systemd/libc-bug-accept4-arm.patch  |  81 --
 pkgs/top-level/all-packages.nix               |   4 +-
 7 files changed, 125 insertions(+), 816 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);
+@@ -2561,7 +2561,7 @@ static int start_unit_one(
  
-                         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(
+                 log_debug("Adding %s to the set", p);
+                 r = set_consume(s, p);
+-                if (r < 0)
++                if (r < 0 && r != -EEXIST)
                          return log_oom();
+         }
  
-                 r = set_consume(s, p);
--                if (r < 0) {
-+                if (r < 0 && r != -EEXIST) {
-                         log_error("Failed to add path to set.");
-                         return r;
-                 }
 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;
-- 
GitLab


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 3623/3789] 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; };
-- 
GitLab


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 3624/3789] 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 ];
-- 
GitLab


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 3625/3789] 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;
 
-- 
GitLab


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 3626/3789] 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 { };
-- 
GitLab


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 3627/3789] 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 ];
-
-    jobs.cpufreq =
-      { description = "CPU Frequency Governor Setup";
-
-        after = [ "systemd-modules-load.service" ];
-        wantedBy = [ "multi-user.target" ];
-
-        unitConfig.ConditionPathIsReadWrite = "/sys/devices/";
+    boot.kernelModules = [ "acpi-cpufreq" "speedstep-lib" "pcc-cpufreq"
+      "cpufreq_${cfg.cpuFreqGovernor}"
+    ];
 
-        path = [ pkgs.cpufrequtils ];
+    environment.systemPackages = [ cpupower ];
 
-        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";
       };
-  };
+    };
 
+  };
 }
-- 
GitLab


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 3628/3789] 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}"
-- 
GitLab


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 3629/3789] 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’.
-- 
GitLab


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 3630/3789] 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
-- 
GitLab


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 3631/3789] 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;
-- 
GitLab


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 3632/3789] 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";
-- 
GitLab


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 3633/3789] 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 = {
-- 
GitLab


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 3634/3789] 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.
-- 
GitLab


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 3635/3789] 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
-- 
GitLab


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 3636/3789] 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"
-- 
GitLab


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 3637/3789] 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 { };
-- 
GitLab


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 3638/3789] 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;
-- 
GitLab


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 3639/3789] 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 ];
-- 
GitLab


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 3640/3789] 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 ];
   };
 })
-- 
GitLab


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 3641/3789] 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 { };
-- 
GitLab


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 3642/3789] 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 = [
-- 
GitLab


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 3643/3789] 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
 
-- 
GitLab


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 3644/3789] 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.
-- 
GitLab


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 3645/3789] 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
-- 
GitLab


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 3646/3789] 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
-- 
GitLab


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 3647/3789] 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 ];
-- 
GitLab


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 3648/3789] 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 { };
 
-- 
GitLab


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 3649/3789] 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;
 }
-- 
GitLab


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 3650/3789] 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";
-- 
GitLab


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 3651/3789] 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
-- 
GitLab


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 3652/3789] 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;
-- 
GitLab


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 3653/3789] 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 =
-- 
GitLab


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 3654/3789] 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 {
-- 
GitLab


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 3655/3789] 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
-- 
GitLab


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 3656/3789] 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.
-- 
GitLab


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 3657/3789] 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 {};
 
-- 
GitLab


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 3658/3789] 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}
 ''
-- 
GitLab


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 3659/3789] 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 ];
-- 
GitLab


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 3660/3789] 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 {};
-- 
GitLab


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 3661/3789] 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";
-- 
GitLab


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 3662/3789] 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";
     };
-- 
GitLab


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 3663/3789] 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/");
-- 
GitLab


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 3664/3789] 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;
-- 
GitLab


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 3665/3789] 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 != [])
-- 
GitLab


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 3666/3789] 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";
+
   };
 }
-- 
GitLab


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 3667/3789] 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');
+      };
     '';
 
 }
-- 
GitLab


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 3668/3789] 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";
+
   };
 }
-- 
GitLab


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 3669/3789] 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; {
-- 
GitLab


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 3670/3789] 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 = {
-- 
GitLab


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 3671/3789] 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"
   '';
 }
-- 
GitLab


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 3672/3789] 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 = {
-- 
GitLab


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 3673/3789] 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; {
-- 
GitLab


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 3674/3789] 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
   '';
 }
-- 
GitLab


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 3675/3789] 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.
-- 
GitLab


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 3676/3789] =?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;
-- 
GitLab


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 3677/3789] 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
+  };
 }
-- 
GitLab


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 3678/3789] 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
-- 
GitLab


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 3679/3789] 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 ];
-- 
GitLab


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 3680/3789] 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 ];
-- 
GitLab


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 3681/3789] 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;
 
-- 
GitLab


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 3682/3789] 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 =
-- 
GitLab


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 3683/3789] 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
-- 
GitLab


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 3684/3789] =?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 ]');
+      };
     '';
 
 }
-- 
GitLab


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 3685/3789] 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;
-- 
GitLab


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 3686/3789] 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,
-- 
GitLab


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 3687/3789] 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 ];
-- 
GitLab


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 3688/3789] 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 ];
-- 
GitLab


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 3689/3789] 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}
-- 
GitLab


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 3690/3789] 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         | 59 ++++++++++++++-----
 nixos/modules/tasks/kbd.nix                   | 14 +----
 9 files changed, 71 insertions(+), 96 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.services."nix-daemon" =
-      { description = "Nix Daemon";
+    systemd.packages = [ nix ];
 
-        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/
+      # 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/
       done
 
-      for i in ${toString cfg.packages}; do
-        ln -s $i/etc/systemd/system/* $out/
+      # 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 ];
       };
 
-- 
GitLab


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 3691/3789] 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 =
-- 
GitLab


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 3692/3789] 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= ''
-- 
GitLab


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 3693/3789] 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 { };
-- 
GitLab


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 3694/3789] 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.";
     };
 
-- 
GitLab


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 3695/3789] 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 =
-- 
GitLab


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 3696/3789] 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;
-- 
GitLab


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 3697/3789] 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.
-- 
GitLab


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 3698/3789] 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 \
-- 
GitLab


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 3699/3789] 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
 
-- 
GitLab


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 3700/3789] 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
-- 
GitLab


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 3701/3789] 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")
-- 
GitLab


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 3702/3789] 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
-- 
GitLab


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 3703/3789] 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 ];
   };
 }
-- 
GitLab


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 3704/3789] 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 = {
-- 
GitLab


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 3705/3789] 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
-- 
GitLab


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 3706/3789] 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 {
-- 
GitLab


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 3707/3789] 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 ];
-- 
GitLab


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 3708/3789] 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 = {
-- 
GitLab


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 3709/3789] 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 ".";
-- 
GitLab


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 3710/3789] 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 =
-- 
GitLab


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 3711/3789] 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 { };
-- 
GitLab


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 3712/3789] 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";
-- 
GitLab


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 3713/3789] 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() {
-- 
GitLab


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 3714/3789] 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 );
-- 
GitLab


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 3715/3789] 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;
   };
-- 
GitLab


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 3716/3789] 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’.
-- 
GitLab


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 3717/3789] 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
-- 
GitLab


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 3718/3789] 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
-- 
GitLab


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 3719/3789] 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’.
-- 
GitLab


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 3720/3789] 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;
-- 
GitLab


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 3721/3789] 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.
-- 
GitLab


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 3722/3789] 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";
           };
       };
 
-- 
GitLab


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 3723/3789] 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
-- 
GitLab


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 3724/3789] #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:
-- 
GitLab


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 3725/3789] 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
-- 
GitLab


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 3726/3789] 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";
       };
 
   };
-- 
GitLab


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 3727/3789] 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 };
     }
-- 
GitLab


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 3728/3789] 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 =
           ''
-- 
GitLab


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 3729/3789] 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
-- 
GitLab


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 3730/3789] 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"
-- 
GitLab


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 3731/3789] 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 {
-- 
GitLab


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 3732/3789] 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";
-- 
GitLab


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 3733/3789] 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") {
-- 
GitLab


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 3734/3789] 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;
 
-- 
GitLab


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 3735/3789] 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
-- 
GitLab


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 3736/3789] 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
-- 
GitLab


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 3737/3789] 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
-- 
GitLab


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 3738/3789] 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}";
 
-- 
GitLab


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 3739/3789] 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
+}
-- 
GitLab


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 3740/3789] 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")
-- 
GitLab


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 3741/3789] 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);
 }
-- 
GitLab


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 3742/3789] 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
     '';
   };
 
-- 
GitLab


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 3743/3789] 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',
-- 
GitLab


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 3744/3789] 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{ };
     
-- 
GitLab


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 3745/3789] 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 = ''
-- 
GitLab


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 3746/3789] 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 { };
-- 
GitLab


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 3747/3789] 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 {};
-- 
GitLab


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 3748/3789] 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;
-- 
GitLab


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 3749/3789] 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
 
 
-- 
GitLab


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 3750/3789] 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
-- 
GitLab


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 3751/3789] 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 = ''
-- 
GitLab


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 3752/3789] 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..."
-- 
GitLab


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 3753/3789] 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 =
-- 
GitLab


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 3754/3789] 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/";
-- 
GitLab


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 3755/3789] 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 ];
-}
-- 
GitLab


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 3756/3789] 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;
-- 
GitLab


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 3757/3789] 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" ];
 
-- 
GitLab


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 3758/3789] 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 ]");
+    '';
+
+})
-- 
GitLab


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 3759/3789] 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;
 
-- 
GitLab


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 3760/3789] 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;
   };
 
-- 
GitLab


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 3761/3789] 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 }:
 
-- 
GitLab


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 3762/3789] 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"];
   };
 }
-- 
GitLab


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 3763/3789] 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
   '';
 
-- 
GitLab


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 3764/3789] 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";
       };
     };
 
-- 
GitLab


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 3765/3789] 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 {
-- 
GitLab


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 3766/3789] 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
-- 
GitLab


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 3767/3789] 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
-- 
GitLab


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 3768/3789] 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";
+
+        serviceConfig.Type = "oneshot";
+        serviceConfig.RemainAfterExit = true;
 
-        preStart =
+        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 );
 
-- 
GitLab


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 3769/3789] 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
-- 
GitLab


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 3770/3789] 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
   '';
 
-- 
GitLab


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 3771/3789] 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"
-- 
GitLab


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 3772/3789] 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
zcmd444SZEsneV^OTL>Yg2MBFUW8Fa7Mw_;qHY(bT9%xh?V|#$KO*QIi%Q%d~Xsmeu
z+&j$7fh067q!UYMv5;oBMK3z2sl{GIbPkXzMO13RVGy13!k%ELGmKN6s%Y-_x6j^i
z%8**Uwfyt>tWWk{FVA}3*0Y}VthLwqyLYs_GZYG$;4f_IjouEVjcMe6$_<&YG0{e2
znJ8sbOkCw1JqJUkr#0-QEcKM4emV^;O$KS{p^%qiyy{)$#k?^8!zMb}n6?{?Df7!0
zxXTvn@$5g9tB(sZPVVHtT=kRaP)q*gmoE9qi|P$I1(S6O(fGiz3oIuWwXSlb<|;Ry
z8FZtWtK3R6=vLZ;?l;@a=)d1$PRzH$CjB{MwxxmcuFN~jNpVs&$s*O0Y|<Q3f;69$
zB(;%Jq$Q*dQao|hPwEqcuCWig#w;qt(_gQyr5`;*Z$%aTj*X3thHUV&hh55#cNE|(
ze@kwL2idFKChA8Iyf?2llvLQXvE#*d4LlpW&x04C%<^H=yyCjCYjV*8y?F!70Nyen
zEQ7cD>kw|hwGz}xIk|ER{un2B$pUktKMUN9Q@9}M<V@TtOfcYQ9UKW&Ik|9rW%l72
zo!Q4`Q)Um3bk1;cA(O~=+LYOy*^ucdgyMH*e>OH&W7{k9mG)C3q4?UofyRhn*qzX_
zuux%4O*u6El6sY<I~%gTNm=q(*yg{rDjzZnbH5rJ+ffe<9ncU$zCVOl-`T%^zi<x;
zH}IYXz9!-1V&HD+*|g@2ah{;f_NYl^jai+I#hu&~%D|1jo$Caz!5Van{JY-`LE{PN
zKX{`#QS0+G3~mwIdDhtJL&o&EN70MceAu+18=0zzvBANBgJct;?+`c`^)V?4zs$W+
z`V>x~E1kkegqLL8_!P42&D-i<a<yn<*12`aGjzREsD1aD{yiNj>3^r+fAfrD|7&Lt
zx*gIBYn>}TMBwQZ<i33F8GQqfilx*uS?ZV%7SNF+DZOXbq4OWiU2e?2){yG=xe;><
z{7gS3S|6dWgz5oXaDOs3R?+CaKMS0N1(dd;o_6K&-uzAP63>%`S;+HLLa>Uuex2m2
zHb#9X3#eSh52^bC{9Qc1*ybQ`o`Vn1LBChe`jmT&=OdJV2U#DaY`@CD!<bLGlQT=R
zVcW?KlNZhOLRYW*J?i%PGApH_0~-3kr!P6^Zt!5N2S&fUM}1rC-5%xf{*V6q3f|l8
zV%`qrQKouJ$bXXeE#Q-&Ji&W_t7O>1`xhzSLwPD1F<ashvzfHEGUDk;M|s42l(d2O
zKGG+7mLB!+d>mPxoEbKCq&89?X^6Cwe6KI@)1$rLokKtU^wUV6#wyAI8&ZSr75;i`
z%)_^qI<*#wI`>fbzracTsK3;#u!ma@|AmY2IO*wdGVkdyIuuJdQv{Q-IjS)g6%UZz
zuNk9d=rd#bMAUS-)T2zg-<v;)E|;5hzG)#m>qzD+k#jV8w`)jc)VV%sPQ)m0RJonZ
zPoS-Am9Z%Y=FOC!0MFgPKKU-jREO+|lgr*L86*oQ@BVuE!4xznoWg-L|C99VIJvSu
z{@aH}qSy|N71cAD4Q{9H<esoL<t#I`K;6(p`U=GlxS?b^ztS($xK#NI&}Gbm0%JD>
z4i)MH>p1#lTkWS|58-d3D<8EFjHr)J%gMphn$V<H<`U=e&?U}e2D=faJg{3~vp{xh
zU&wiyHV?Yh$Yir8pS#^se4hmlI3Ir;U8zDo&D3j_yur~h4y1pQ`Nijuc?6mN_P76C
z=9Op3eCs)6t~o{eAzkt26|b*#Zk+d1j8Ey)2(SYkt*r}tbH$KkU_ao7-~&^0#b#h^
z2H(v|@_ilM1dJ212lgTG_v+OIZLm!>!utTQm(X?zZI_g^T}<1fC2dbi9`GPZe$pb*
z<{;&x=t=-zx*7)N*Tf6E-<2IdX*q>@Gw9y_-lG0%`~_n`V{_XTVbcOlrQ=}3m0=^E
z#5Eog>)fAKniJv&vi0;lp7{Flue{5QiYIFu!k+D~r@qHO>PsiHw2`dUCWZ`y@nO^U
zvwmCW>abBCs`ok3nn*GqnTqxAl&-gG9+?(rJat@G?4#@|N4n|FF}t8`^c~(DCcVy~
zs}YSO%`-n#dtjlv6{q_Jj`aKy+AznCYOH(s()N~{%!%d>$@4+%ds1`P6LV67U!naD
z#>=RQKj7|Y(YSST@1d?&&rW5rB#aB;)Rq7F*w~R^{BMP?;!Pd%h{r=@4}Q4|!6$C@
zxz*nMvM`6Q_6FJSka_l4-0pIP`xNm3n4<d#GL!#+_Z8;7{1@PT6L^&7{ResT(Vh88
z@w(sDxG`qE`(6)Dzxz3OaV{Hqtv6oQdwL(($OLUlZR9feE*&Y=4I94M^e5iM<Jd#^
z*9K2zn_}o+EjUz@FJ5_bJM#YEJIv@I#(W=?oV@9(pTvIn-h6}ngbw7Ea&m{?Q*4j?
zYVfUc2mN>H!nbHQTs7zpH<Gpuy0JC*XPHmARp}mYt}my)u{XLC;GJO(yzl~G^}*AM
z-h5SK(HEQnT-DK7rH><NU{%0l6JO^x!_Os2e30Zj^0LpL@@!MGFq<|SKW%k`Zkb*5
zUH*!?lB4SVgOB46Je!IA18$Uh!e=75#4IPbeLAwL5gxK%iwghB7>@lzZ(cOS-cNc@
zZ@$jCH*Y~pZL&LGjUL4&_2$*S0$6e8i4f!0q<h_Hvezw7^twl@&cG})pC~*D%n1MK
zzhWZ)u>loZBFw?a_nzO3ov`_@K82V1D(#!GSx`Tv{j2ZN{xa(C4Wi+Gj|R~z8U3Z`
zXN*1Izpvt5dU-$iG+ZZLT<3<(t+~2cgE0(Oh1%@*d3Fze>{9rwyoaPav+(z5YZ9y6
zRkCyVhT^fYSGf!PHY?~ydH4Baez{j~qleQVybrw<UN*`vVlDBfy;B?PUf0^zKV3Q%
zdS7qe+9rSJ{e=g?CG?Trd~MwW?v<7B#Pqr|qfV}#|5sM)eSk61>&7nW%{L?l-0H>$
z+=kSEd!gCo)>3wPD|Mc8a#s%Xf4-BOO#TI#U2f&jE_YIPms^q8<xWiQa@BU$QvC7d
zq%J2nb1P{B`a$`G)GoKIW0xCC?_v(z<wl%cZn$rkTb~>NN9+mhjYUHLZ18FnK7ZYt
zKe_<ErqG9kQz-Aa8-4w!k+01)C!$u-#=gL_>@Dl39PRRWSjWqYd8grQ!UvU2)EeM9
z%0j8t=*BIAnbR5q-?nBM{gkKPnO8r?Aq_bN=}nnAJTh3)-_er(7*DxLf|>AeP`g}c
zsA%`qR~`Kx7^lCR{tEekhsLmEeAD0b<{vsWcA}hj>BxgT2lNbQ7`qmI+0xTZ?k)5D
z{t`v}GqyLjJzTcYpKbNxgWZ3;g?hnr#Pl8y@O@{oy~i{0emVAYhfl+DU_Iv3TaFwm
zB?tP|SV~bZp6Ye0I(prop_2{xez70o|NZ^fk6RY{jO>hkzuRO6-RYK7Scx7pM~tTN
zHTy|jz8~5%&6vu@u+eNKf7qClZ`W$n7>jgU;s7>yJ4t?u{Od~WW|FZrKeNug0RBWR
z{QgX@`>tmAfDM)pPzf$t=PqaLdo~w8a`Sq0hjC?+$^2ohlkBJ6xr~LrPb&XG#_FQN
zeBLAcpQSOv|3Bfs%6z+7u_QL=PW9%EWTBU`_CKR7IucDjFw#Pq<oteQB|I$fh+@y;
zrnT@3bjs_)zJWP?QQ?ioJmk%xJPVFVssCFFf5|gzmcl&#hxq>(|4&5+-M_|;z0h2Q
ze~kA#=|g=<k5fGB|DQ2e9%h~}rYno>EnLO>_u%(lY<;jkSPf1)vFDPD?8If*jl=TU
z@jH8#DZfbTX6mh=pMK!Y2fm)y^85~-cK}m;x05%Q_Z0s-D0>^vPf*sZ_jqsqJ2#jU
zX&bxo)<`}yaZv$(zNV#-^$~T0^-?wO3EuBOf9mSa;Pub)mnAFgANF?CqRw;J^c3}~
z)!uP($9exMd@<={{`=ygd0!zbe)+an>(X-3cLQyw4Z2&gvGO0^1q_F_-%wlLtNzrS
zI6xisr!k>1XVP8p;%Rr9WDQT4<C!<{VUk_$->5GSx2N4Nfm;`_lfZimaM!ADa5L$3
zuEt0b*mn{`kUp${r@~S5M>F-Bg-;TDow(nf>gjHu+d|zI;2FVTyhW|zyjuh8sOtN2
zV~*bUBz@O`cd)*G3wRw254s=m=t>r@Qh(qsyg%&eUvVAYOg)Es&rN0Bjf{lb2boL0
zK)bEi!YA?r`7Gysuilfr?k~adWAwR&yzMi|gGS@r@6mY?biUrF^I>2uUI^@Y=#Sds
z56K_<iD>kn<@2qe>==0sg5}d?QmYQVk3IsLZWgb>wVit3CclN}?dVz7k2O^J_-l@<
z_H`|cuHm~>9KhZNdOsJO^nPFpc?P^$<7gf*;IIeSZvpmNALf|sAw0QEef#|TGVP~R
zXBl;lq7!Yj-8+N!$vxoyeK%$n<^Cr;o=^E~;KlHvKS`T5c-ppL&~2ML==P{@pZ?EM
zCwN{)zWDKo^3acqXeT}Fhqh_-c@mo^UqW%0=YKm^(@kD2w1%=b<Q2oguRQWRb)Lr_
zi#Ek&8h6Q`Aik4vLZWqu@;ddOMW?Wp9|4BuiHzSybvE!GrOqXkd22arc%Yvj@%Y^5
zZpNlaC#9Q5X&VF26z%TvaX$bL{`I$Gql?K~T+;r1e*6BC_FCVmeHC@@puNV+t<?Jg
z?G+zU>_l;ilf)+vyfIvilQ2)nA6L9B!Sj4lurA%ov(`zQsjIo=IR7=DXkKZj>|?;x
zT#)9ug}fHZ)1-Rd50JhF%pTTq7I}4~Q{-*ozx?$pju!oOjr%aZVC|b%xyEsFqpYu`
zD<47sZe$J*<Ac=`KdomjzhXsie*69C>z7$ue+!*U<7XzC^VRqjb@(pE{vmSxw5$2O
z0-F<$_a6W3MBp($#nC<WQ}^bgohF7-6T(MkZX1=|uI0VVg7?=BdhKP8AHC3=2-?K(
zgP%thS5z`5Q)b~ue^{{XPopD?3U4ZbKau!r8F`Wa7<};kz(2UbnD$Q_bC~}JNQUP*
zq&8BNdh(C1Xz0yf(bSu-CN5h`d(ohN{<HiH4(jJN@bvgK;eNOJV$tHQk&Z;bJ#0Ti
zjAVF3v0ZGn7uyvK!MYw?16l;<U4jE|JwBTD0(O^}l#}}~wm>kM$BX@Z>wZ^pxfaGi
zi}c+e>&?73^S&4T%20k6?N<G2>_i=7*k;Vi{>Wdsn0fP7Vy^OozWpz(LwtWGPWz%i
z|322L#v7kou@fQFR;cD(<1er^o~&s9Z}c<F7&wam6TqJZ{I~n?SqqI${Poz04CS5t
z-$32%XVq<_E-`?D;@rzA_vR*W?Wf*Vz-sVe5jz^~BJbnC5nq~py&U%Ww9>=1qX6yL
zv`=Fj7I}7~4wy;W1^CHtxY+OW8-mIB8PfU}A1xSX8k6xig-wE_aisBB%kx%J52=lG
zl5tbc{|?s5edwrkT5GLhe0q<Yo;NtX9lou=o@*Ys23aUxBOmNW@-=6*@Lzb!7gAZv
zJlV8Gh3UL&9vFgF$^H|5xylrWvMEy>`V082!JHuf<F8BVX|0GHcc`C*_z0R~W&-aN
zc3M8c9q{jyTI&MeB>Q7;M!$~TE<QcrjUUgipzdLGDl?<lW;VLDEi~wE@$l+*e@iT3
zr>8ggF;=G=LoO$L-*L<A!C1(0BF5Si0~YiZ;l{uv4Ls?hWYPsZ#!BJK;M0Mh)`3r(
zB(H;h^S><etZ{CUFZg;D+mV^ZPy=<2_~li8IdO!FA<Cn?d$BQS*Icc*eF6TLFBo(!
z$}C_9bJHnrZBU%QE6LY9^<U&gX9z~oHXSbU)tHM$htQ|v*!G{REpn&Nn!V`R7L5^n
z9nC2}KsMS}h{NNkRh&<@(?&ePksH-m(Ap!Yzt689rG7v4N_`{6#lKHq9kdB>!Vlet
z4>_v1kK*xx9nf6U#=G_sf;mQU@5AV-^t$cMMV$`TCczxCj5<px)0{I*UBwR#@0vd}
z7ir#U<ULE7=Am=V8M6PHHyF>kP>OYe7oSQN=Ac{N+~>cupIUPx>%Y@;33J62TYK}V
zZT>vc=g%V@@5(ElA)i`fUiPVIAAU&ew)glnY_a%%6Z%zZOWy<hP~SbQjm>Cj{>9`^
zuz=&klOA0#`HUUboC2=I6Y+!1qG`nL@Mn{XyBuL`=cKc;-HH{Jp|4uU&h%+IhMrAl
zT&V4pv^#tL5dP}#&IxDwlimMk>i)j-hhY7~S#Z83I3@GP<LIP#{sY+^X!vB%5A(<8
z(GAc4_V-k<4=<WW`%7S#&YkdMG(#Y!nY2a!A2z0i|9eTpq#<m~MEaADU7SnWytzbp
zyaxT=a611MFJJtdMt;cL2EUz%Y?l1-V4j%;UYZ+9=c%?kGzNZvzAq|#Tr^Ss!V6<3
zzD4>d_MnOOP4k%Z78Y@kt+S^xt~FNu7(MaS3QPS^R!dp!%t7~88h?Jd_WnHkfxH!4
zm+ib4ITzqtc6QMw2IEcd$FLit9vx0W^OWda&b$8q51;?obT8J}g<UB}f22nXfoT%O
zSVNx|4^I~U3b`>8c{(S%p?cCg>D*sXUp(vf>nhf`Ty~ATw4e6@+S?1nqxJaHx3GRT
z6>9UZe)-MB<yQM`wh;qSOfCr=)%loTrv(^#U#<5<GCyB9`S4D~2V*fG=4RS!AF~+O
zTj{<HI8I=r;G5<vW36<1@!z+QKWv0o(GSr){6^@Jd{@J>uEe0*m1J)Pc!6zRFPR{t
z|4^*Pm$_nx^1Zd*QhX)_+%=x;iaPPXC>O5cnPk^YpO?_jGWuxY`F3<f^S$h!=6w0g
zEpv)CQGT=+3#ZK6_rTuCb_TI=Z_k9f^0_tl@1(qgBwN`3Bse9}75H^jv6tkx-FL&M
z^lH((!JGF#$h+p_EBG(oyo3L-1ont>y=(8FwQSJ+vgS3$EJRi$E?4{enU{)jmFK;<
z$_8)Ei+!u9e-q{YIDRknr90$TRF&jU3~8NQZ1XeKNeQ1@3X6DFEM|!Rip8wwf0h_e
zHT`R!VlU4j#+9D;^ZeWY8auI<7}MU*Fpq(EH2LX~ZGXly<<gf!lzaBF<Drp@z%7Uk
z$xm1L&#{?()4^Bg6Ohf<dB2eLg8Z<y?joPWhidRutZ4~#*?c^a<T=Ijj|D%0uRwjl
z%h6urM|0|r^=uQTN~E$;&Qk<&#t7yAPT6N@BRZZZcC#NiiaAvR^J$(3C_Bo#e5yHb
zm(C@{!xyc$@wqE9%o_o(XMp2@l6cP5oGZ8&``8bhomGSGzoE0+Rlg&dH_kfu7w~p#
zzi2G3Pvl=Y&4aE(-IU;<=l@KbR@x^$`S-h@B_`5Eosjg(={miRl5SlpKPyE(xSCX#
zTSYzTPax;-de8I)pJgkJ^=&sspAGb-u_2vmpfAZ`5##(QzL(;fYF|wq>8VNX2CrfF
zNnjmQY=&oV{8EOW#5s{whXQ);0rmmv1h5ZBh$8~K3D_g>cR%r-ErQWejH$@3?Sj68
zo`0V#{2%z+w}?77kQ5)XiauGt#=ie7->i?azZahb%lFR|Q~54^G*ebZzbaoU7#*y=
zc|VR08z-56R6H@a7B-=eb=NUZ2!<b@`iLiY*8kuWwTk{)12AIXnPIND3z(XB|D1Yh
z`Z`A5Ddvr!{rmj({j`6cIb|*7r9Rvpw0BhB$NA9`pK=g*?aVQXDQ<t;i(`rraMhgH
z2h3p3v3XbA=>qhvk#?UIedxg@&{s`apre{|G#|E7H)tE>y`A^Bfls^ypT7m4Bj8a<
zc^&0PcL|R6wAOj^r|0JrSFve_k3YIIH0XXwH2ZetC&X>Mc$067z^$T(IxjFcc0!Zz
z%l>w(Vn4XDHgGfK2RP|`&OzQ^1MGHikpHi-c(dP*SV2u`Jc#w@k;SxG;lohBo4~g;
z9#l!*T9y0pAl3n+0j~J-6<>#j4*K~K<NqY{!U|7*$wD(_kAb7sv^C6=N#K|idJkP?
ztl?jeJmmj(P``{A*k#mzkopIilb*Av>+91GJlygBOZ2H6e56ku)McI;b@;!%q|MWQ
zn@CBU!_0AN(?Z>6JREQJ_^9zSO#L50M;m1w)C>3-=UwyYQ`A3nR;)?$o#wcm%wyhp
zm_uP>et@6Pdk}95{C&-bXRi|uQg3Hf#2n?n*2bml1jVHkhtm2$v85jBczYB4FO54b
z;a#yPttS+JQf%tr_28euE@e91{XDaFENEV3{pe<{#IMA*V{hE;lwC@h)|*2-4^d_^
zd)%#F`&HiaX7V<B@4LPCO}uX^DevdKpZET+sck1o_13sm+OJMA_LIbJFBx<v8K-cV
zxub(;_+2=}^OE;4FHItm_tsyGomk9sJI`<CIf_hlj-Zie#dll2Etz0P6Kjbfv#zl4
z<xE%p8qXd(p^$yxn96^JPFcW^uN2qWM9pJ%of{`lFn{jDj`IF9o<rtlowqv@N>Fdg
z10$8}S?*OndofXSbFPxu<qM4G%8mi|;Jx53-ic?}K4bUL&l>kL;4=X_p|?=(5UawL
zM3dS-y}5t`T456F-Ay&c{>Oa3(4?Hu&(U|$c2$vvY2F$i-vRhcnF|ZRoAw;^XfIy4
zhjjMQUgQ2kFt8QsgNS90<AP7AFV;<7UGc&G$l&yd?MyTF>gn2psC)x!^@rdKYwF@&
z$vqy-ICy<kzB4xE(GY7tPdAEXFT4i-$uE0^GT{;SXlKvZb|TcBW~_U#!>gh7*21^x
zC*%~*Kt(&)2O;kQwM#tcZUUBQ_(z}q2_C#6?f(hhA)gN?#S`!+9##=b>dYtb(oSJE
zKHIy=SKP4;{#su$rixTfdf|)4948$n?Imp|ZPD`=UYXSYGGV>kdZl=+1$LJYf0_S3
zRnlLw<hit6lb_$f|2qFUepcNVpuc_z<KL6%YWHujlafJQ^`QF!$pL=~L(dxB$(_2G
zbsfC!@#XUw=841KVqU%ix#24qbHDpMb&R#iU4^aOsb}*k_uJkWatd{de>wNyUv=kW
z_Q4U!kbS2b&LNC0QC<5};3558>7w_e(i`MHnot@0`O=Yp=e?FbHD-;y-^<f^ElYV$
z@m+Dy1ULzwt@O=Ww-8g`Z&sZ>UYj3L$E5FZ6$drx)vjVY+V@?r`t%dE7|Y~s!>^y1
zp)c&#0p2%%Q*$Nn@wM)L-uo}|$2&Oh<-LpgWqy5PrK8KJkH7BKSDbh;_2Ct`uXK0v
z-b%T#*1BKic|L7Ty3^G@Tod(-v(hE*G}_{?NfhfyylL>MsO9Xz9zPYtT_2MDz|WNr
zxz>Arz*XFnwdm=w-u$K@KG+!x+F^q#4n9Rc9zJXN|9}UhO5=`w1kOhnc2XzI|D!(K
zVbzD9-dfY_ciI1~s7&gN#m&WYASr)r`?l@x)DGL0!S|OA?ZpQz`p_@mwzc_fOZ8&~
zz5-{2M}xk<f-RWnfLHp({S(*s`cL>Uw)p*jj(p)WpZv%CJZx12I~7C6yfT}zO)o0D
zCwAN~tEOyyKuh|bSl-W%lK=O9eqY^S%%pe6&@m6*bF4jj{4(q=eccm7$GozGl&$p3
zT8Gtce~g%7MTUIg`M><K#wwNViha{>x0&)!_+?S`XLiT_(J#~f`qH2bIS9@Q^8Vb<
z``_rtKmWYA$1d4RXYiA1qK(8fsi&Bd#k2gJ`~IXDJGhQB7ejl<vyYO$sF0#Btq~*}
zwf_*Y2iXYCt+yecsmQ5Mem{Gfs?VfV(O%LX-L0wQT#we#%&`?SO#g9DKX{(X9<XqZ
z^WP+H&g)#P%{oH(RQc;Cl@HPX6yGM@ieKD@52pN0<WKVR$*WP`TJp;LyhVQA3i3jJ
z-i_q7(q8<Kj=vu~0v-DoXbq=cJa;QbF8$8p!+W^;yfwea+`ZgyTdLn5#!r@h3y)T<
z8%!|fcDt9B;IxDO<x`aU6U1FToLYRiC%nB>ty^FIm^+4lFM5o<$+yXCU59w9aC(^k
z-g?4*#*^uN;ILtaWQ^Yc&-iZO5IXQIHtJAX{yg&f3^J?+pD=WM2wqq6d?C;6;yceF
zo^RusHOr`Iy&U?N)0c2iyl;n3Lp}Q(*vMEJeX49fWl#8Jih*<pZ*MNz<Tmj<M7idp
zA2)GE71&Ae4A#sWLiq8PQ}`IMO8NaB|G{6lGao)9{4-iFFpqrF*Tp5kd(iI>eXTLP
zAIt=OvVNnlCh~UEpVkU`7M}O|ZP=p*|CKTJq&@t#H`3{s&9^9XR>i*Omuda7!Y_Lb
zdf7}rrSf<R_}Y8W9Q(89i)a7d1D=YPY0aTCQ92u?eF?2G6o=C~Kx-1MGqeYxwS~ST
z(DwxK9%B~!d*s@`@M3Y4#orP()g+z4wfL`nbe(yw<GGR4_SWK_c`MILNXtlFq(0IH
zl0(`;8X|2c4U<x|Y2beoshQM5I(j$z!~D;Zo+nkacV17uCQ>u0g;cZ+3#NJJ_!IcM
z_|)MJ&ikk2>zjQclhrx>;}bb^&%7o%?)mK7*X8ifYkq~_{0sc_x{S`S-cq<UB_F!I
zFpN$O!|OUb9gA?jp`NqEA@oA_YKXFW@*CJ&YT|n*oeheZM3_FxyRRb_Hv5KbjBk=6
ze4`ZB|0$jio;8kB=$yv0;3Rt7xYOfSk*Y}z#GX3u=j?J8KkH<_J2QR{`|~|+NNuUF
z@}R5{ysA`oR(?EA+=%=Nz6H33@m|Gu2^FS2_j;Zy@b|CaKYCo4X1_ZhwR+t7tV7EA
zA8L}nJTKp|u*Y3;SC4C_dfcUt_PC2l73gU#aj$YxC8?TJm+5gEX`7na<67|^x1QAC
z@SN^)=kULo)Iv&<6lbrnBnQseRwfH=tR>~oX}z`dT4Ju1iM-yIUfbhJMgg7m@SqBM
z^qqu!lG6O@aq?A1dsE_*+M_j|+>h;HUxZDbQ(xEFf~YxZuKLNGM4#K(A(^-0$2qyN
z<b*tD(2v-+6APTGe5Wv@=`v*az=(%?)yyn)bE&Coy>;CLdoACb$;P%8+RPsJdT=CS
z%{KtpS?axx|IP7DZXIJkO5IlKgp#{Qnz5aA<csEJd#xKu?iy*Pj+e(7g=YM|u=2*K
zH%BlH?Wr4$&n?!EXT16W%#-Hp$1g=MgZ_hlgL3qJ^z5>ii&FqYHs6B*o_wD(8Yh0C
zGwT|QI<t<<*f+}Z%$aZYlP&lyUjI^aV^VR&n{(h%<DG3kE#vi`j@O@DkL*<^ko}o_
zoq0c3egk_ER{Tso`LCAUjqmE@<k#zrfc6EL7jt3k19ri~PkY_+X@5O7c5jsa!0+C=
zOusiCWd~N+gRvFZ(>lA$w*!3d!5ESq;CmA6Kv&GO0nm-UMSxeXzR~$Y)JnUSo#wlj
zw7a;8XVb+qV~JErswSC4n(>zAOmfC;rB0I6LTaFma2I~k-(|n@^*3>q8`>}Xp|utN
z(XBm<vB->1@lDb~zHxG%!CvjEv{LBjLhnpy+}DRcL_RIG=jL~Eocz{t@_(m%7?UQk
zATQZOkkKs0kIsrktbWnu`GKCDx3k11($kR(^J=ybvARY&eEMX+(JRWGY1sHkuy-8t
z+svm;$Zx~`BR&QG53m}U&$WjiHvJ=!O#g_9V{aLsk$BgLG2O(aR=b|xMg0I)j`qXs
zUG<YTkc=TF#+cje%|}i_&-&gYZ1;`qd3(g03$(tgj0^8O7$2V+Q60hPn)`=+!;*Td
z)=kB4SYGe#eRiOO>C@k^JWT9S`+`B<8JZQ}NfVl0P>3@wLg-Qz{6?SQ_cI>-jnJ=H
zl6W9KCcQGP&leVm{d#`0zE8TEZ;VRiqO;S1T;k}iR~AoC*Yk}Rbmgm<2Z%49(7B~P
zXx~c`55Of4KSDLY^J0#iDUcnBIPy20X${2DjNLsw#MwpO*CF3d;g3CvXe@f;x(~ab
z9#Bjk{1z4_5#S2h%ZVL0*A?S#n%fr@Vw5X(&1o~%9=A?mEUkkFofEXL$C|Y$<8Jr^
zpQtMyd*2+fH-pX3l_>^1l+5c4g@wO(iTp8a%iG{#6>zKYC#6GzWrn(^m+ykF@G%@8
z9%&>V6=$xE@Ej&jdRFe8O}iCeyvwiGHBw2L<|Fl2X-g*$7v~{Ma=A4ZvAeR-_#U?s
z{g)jTZ#B<~zxuXhxAvy2WM1FD^&pcTbTJawSnA4`OSg^i=>nh5d<a_=v4$xlp6!i`
zn+q{-%ydsDZwh;Z71|%1BiV{3%gfJc?0wN&BRTp$20gf$Jt>XPV!Ow|i?#Ns_IUS`
zBxlKcElFeMTyn1W<?P8eg{@9&Z;|+*Jum+&;(~m;z3%ssR}_6AZgj8sxIwY~zGVI~
zc#>tjenIC&k(+#_gYXAGz?0ejIM03E)AtTBeluMop+2Y3h|F&K69?VDH5Vc;+&4VZ
z5MP;ZKz8DNMD<9-d8b^e7$?t?r(`lIGdv=>$TwM}bJNHLC!uC3{G0?F@lm{g<{Z4|
zJaUE3B+EXX&HI~t-s>CSvw4raY7|Qf_%5D{_ow-uS(v}^NAJzoX`ejBd^m*NW&C*Y
zp#=I4K0o1XV(5s!CwZ;<hd=DWOyf-EI{caY@#XsYzn=5}=|R#4(x*uekv5V{Trq(K
zxsSl(jK*97eYP}rt#c=K&`;Wv@8}bDAK!aSE7%=#r-tG`QybZtice^ar=5uWhX0S}
zl{UC0oQPuJckxc#x5ldv&T4}%!g$3en=%+9O`qU6A<`7uOuO*|z4@t%GeX;Yu$THj
zoB#5svGdum<rIF&{ukea$d3cgE!a-{Ise>)#=Btiefe}!jD4o*q?mY*t|QXcg8V+&
znvlafgYi2N{UZkT*o_zT<}b~7enGAlU5KFz*d=_=Ue*wbFN!Cv1qb}MO4gRX>$*9&
z3AmaEgZB-*3-8P4m=o)fui#ALeL3$YS-h*j%Jia>z4?nWE%~U$*%o*f^chX`qUXKt
zXJjAfQ}dW$lmTPrTZ%CDkq5tWl8?Sem5e4hPVS53FK4c*V)m+Izi2yi-A<DBsI(7-
z9bvBlnt&%=Su8l@d346JiVKZ?3Mc7%^L!i6e5(DP2z(7CvYyTbF&rx?fAMC0EA7QC
z;7tyh*F<g3m0-h7A{#;06^bumCo3lMA0O_Bcyo2FVnodC2`4urN{ov(sz(gCrrtka
zR2SwOQU94(O{`aPBWAPnOW1E)KF^}UDPo?L_?4Q&{x{|2)Q?;J?xyb{4|}(ps$7pR
zcZfM1-?M2JbNr?e!QjLCYzW^x)zD2@H*2zfHx5j19pTNZ&<z}Yi&|^<$3oZ^=CN><
zg-=-Y5o7XM?bq?$N*DCn>qq2wb8;~EPvG>+h}l=yvEH4NTJPS?dUFEn%?Vm(p0(a=
z>Z2_>-5I`xG1u*u_dVr~M$8*RwaCa`ncb7&JJ_q&=EG`db#rFpetb^q@{KvR@bQqn
z6d!UC<IwvCzoxZmy_?(#eKtD8epeZHaeUS~FcP&R`D<r6x%A{gceP{>zK@%YIh`fH
z&<cC&yYP}UzG+)-PO2N4x?O!cF=kb==31D$3i-bj9l}2x$M(WY4%5Cty7gOZ?;k>g
zu?O747qDM%Jv$=&1KeLO-stLSyq`pen&4}oFC8WN^7rUwpf5|m^XlkJ1$-~+OHo%^
zz~`fZu4G<@uE68Ya69rZ>dJ@U^;p2?lyqhFS-R4mE0eCIq$?lxbVYVVHn_E6y;})?
z4f`is<KOpmWHzx6>Cam1(G%82d==Jf@lZZgzY2T78CB^hx=_t{ZQ3ti9Xe)j8VOe}
zEL3}Z)>!I}Md(AcdfzJe<051y@>Q(&q+65Wz4W$>xj1BB9v-tIo}OWkJ$Vr)96gu5
z&4EY37z(3f9xqI{`&#%A=B}C3<L39|g<;=FyeQ?vTFc3O*)HM1oX#Q-pdsMF9QLkX
zE)POh!m|%m@JT%Q4)H>*|IX%t{DR*_JN!LO`;Wus4UzLed(*x@oc8<1q5bb(2JMph
zBhV}x^9Rct+gOx$(Kbr&Uyi)zv)5ge_ovRO^XHOVNU~w<Fb=1L;+Kb|znT{mcO28$
z>gXX(v@-9_0gUS^^f|Gt+g&0WGtgLxUA5EMJ=pCjSFb#4eCv#`^SC!3*tdJ*JCrGo
zZ|QUs@IK4f4(zDtT>UciI<+^T^W0;*iSZwbi!QD2W`#r6-T5Ys?K<$M&x?q0M;&|(
z?3L!*Xol~{nNKV2RoRHWB+EB!ImK3(Tf3PzR}pjRE+2Y|`MNkC>#Rn3e85d??sl6x
zx|v72-4@EK(p{Ws?{c@ZPn@U{4}*DkLGCS_HLL_L`2}y{ImKLPTi6Rbo6}xss;S%k
zVo0%O*39^QUF<7=03FiZ2QlLQDePezZG_vzFzZjA3vZv9oowMJ(KgDs{oZegqxn7w
zYm%Be;G4{PcNKGdm^ofDts?eU4StF#M@=ujL1#8>){p4Dg+AgLFSeKsIqAIo68R{J
zX6$K4(O-zBp?&C(7i+G>HkacI%5UxsalW4Q@P*h&@qPO@2dCrv);t(8qk8{a=8|&e
zPOIU{Y-niDv2uKXe)gtA={9s`9d~Wb&70`Vtj=UeHu$NdlFia5&-hb1zZvlG68Z_|
z#}@5(zY6};q_gJ7F7Wv*GV^>X^K$3M<mvel-n^k@t74VN>Gp?+jVvf!-pKevR|6Zq
zjJ@%5+VD8@7-LR2g))3|r**iQiw$pQUPRZ2yWJsg9%F0=^B8^>ey(Dd6&erl^PKaT
zX9K`V`qCL*fN#ebN5B3Od_%%Bp3I+(=YGzi7V+$RvF&*go@>vE=jw6rJT#8IJsZD>
zkKYZ#Z)Fj``m^|`bF#k^zf>uHw-oufxZC}pk00wG{DJ!Ln9s*AjDz1Cco+Bq;@@k9
z*RCR74QJuiA9-oK&TX^jdNv!oip_2)+HA)8X`9V=okg2n^u;`VfR0~tk4@$5A|A8q
z*t38R=|QRA6lEX%rSz?6Th)JHTUWoxwodcLty9=|Y8>6d&dBCyK0$vypZpMbX}<hT
z;43mm{66an`Q*(yL;F%bxl^*1=+Ro@eYrVl#tAn3(%+1o_Q`90b8i1e_OXa}Tkdl{
zzArt$w~g!D8s?7j*-mbYdB*c=?TC}RoAu9x8S}CetX0__#&wwT2+xmaHtIg2e3<^t
z^0mmUjCk9sY$$av_j`5bSA}mSzK0AupamJP5^kB_H7^r`8fRXfV_}Qnr{?BI<Ij!=
z53O-DH?Q*NX3yuw-wau+^RiW%SHFY24-f;}%X(jX+ilDx7rjw;d8~Ke&3vo*(rS|J
z-*rsuT+Rk#`{#Q$pBP)NmG2y{!!DJX+j0wtqgLV{j15i5m(9L^B*dA>v3LZXyEQj!
zF>>f|rf40d`KA(IttB()vNmU5|9v^dc?2T?jItTUw#uJLyNU#{9Lou@7K{|vVPT>U
zw`y%Tjo58PxP!P3xF&vOjP|4ANBC}z_=LVAImmy(MNuEBgg?TmjCm`7t@!sCYgNG$
zZ0WYnkSUJqGB2wwbJjzZ_!?!bNi_b#<Z-^>p)mZ=SQL)YcxOH=dVzI>_TVeLbAn~t
zjB)&j82-T~`*rT7`0L>HI=3BO%OBX$$k}WEnR>Y$zvj-NM7FT~*L<J<4(+Y6e{GV}
z8iSZ!5**U#8FYj5=@?3*&cSr^4JR^?KSKP)kC(UMPjymtQ9<)`E9HulQ||4FKgyo?
zPsxX$xeE+yHOh6rPaUbAbd|n|AYOWb!}$y9MLX~vph<PBDA#>Px~t`GeVb}0^U%q8
zhDEw_vqE(u2`BdfU@$L?Rv`o75tQ9Zei^iWS3C!16@7bc>^ri=liiyr=iAaz<+boU
zfx3!&1~KFiup=oi*5t*X6-)E>A)#d|{l~rdCA2cvDBj8*0kNZ7h@F`oFA$g19iiIW
zAVliL{a)k!C)S<no_<hqOTQiS`l#YkXZ8qM3)_eXvad8PnsP$GzSwa7whTOjJp<J@
zeq6lAgH_zOqMp8=A6>zI!3y$k?Cr`gf5hJ_NOg_q?yYbiaE5fIn6tt7`R@kriP{f<
zcf=!MU%#7I?2j_VCoB9i>4VCaz$=wOPenO6S&|L!z?x=zb&>_nuX%MP8<jB@D*`xt
zZ&!1a_@nmW#2@b*5%iS#^lYcB%sNAl&NIp{-==svF)zg?|EJ=L=&11dKR&L+>}vXH
zThY-q5+Qke5<^`h(v2d&v`5uFeb9do_9L{17c1#+Gv%ja<EDGMc&fdPhsm#_t_O>J
zZ|?&c>K*~fzbtioc0F~pC!u|)Eu_sP#mBW@p?JCW#+n5qqw&=@QqH)O45Vve8@X`i
zV*-3-9?wNBz4zwdM=UprZU^758k3z?&Un=Rm->>vdVAqRocV@7($PuCc#?x%M5fii
zlZ_yjSrd)-yEh^C5P0i(($Few&Vm9)prVrXj^vSrkBz_?qYY;7A)V!j8YkDt`bYcO
z*sp2GBQnS7a=#QQp4TfU#wfccd7u}gNno`ALu-?781wlCp5yU8H_Uvj`>~R|tFC<1
zByg)KtFk!{qxs(RBW_?%OL^Ms?u+Sc0(HaH@ig&LZ~r?colqO;E$1R@f<7nqt%SD=
zbDSyNAsU7ABhUxm3eDi$LQ0ZSVd#O!x<^fTgen&m+MM04`YN6!5&qtOAZJOs@TJ7x
zF4yt+$zFohKb<igxsmtgj(+ZSV!ep1#|QkpXp8!|=?tj&YQb0e*K^W}+qM;Mq1_mI
zUnd>|yD`OC7vNWzzMlvm(NzxpmC$eCh3MCsh_!Vr3Lk{0ffwpqvQz(x`w9p4@Z4_j
z2yoE%mBJyd|KQb_g#W2$-5B<YIi+TfU6eO{Oa+JO#EQNB*!i4~6D>a|!TT*f-ZRg_
zyIk}Z@$_(y#`}n67xDMx2kxRlI17K#Aw4YR-EC*_?&fpgd-NRma%R%Qx7Nq^F!-jX
zLQ^J|Zww8(GnyKRW%rHLK}(E%&QRUVY+HH{=Z*OOE~B$9{jT^gzBeNS(ab){X&CyJ
z=nsMMRbWUT13mlzcn0H)aeaE6v8Q^kWFVQha(0ZlWK?qG8>tuRl5B&<csXzbI3Fs3
zgODGZH1uigq7w<R*Bs0j8owH!d%}!YUyr8(Bk1!+`efgW`M}BP9KG;0yvyg2{r2|s
z(cchbNOmVUd&4-XFz6lUTD<#Y8Bf?s>;*W6*q7E>@d)2Z#Gq%>kNB?q$ABYk<yqsg
zxS#KM|7C~p)ja-0IRm6I{Bym76K4>;d4%%@toMt20_JJ{T~We6#?ukuAlO=y$gdEu
z0+?AJ<`6K?1&ckx)3RVr!Q(5!l3h}aK`=49>>F_o%M{Pu?1oo?{Sn^axkL6MiY_4s
z4;R@()loSzc#N{o!0*SvbIbQ>FZw?VZXR65ug>#qC13P+`}8vhRmkuAZ@yas8<u1a
z=_vXvnyZ8TuTtO5JF{RGPUDO-`-o@!H2H0hUb9Yk*R<*R?M^Q6<sup9nNX&4kIpXf
z4Sh`;bJ4GmD|7lj>8tjplkovp_2o-75dWzo)swbz?%O!{cWKXOog!Nk#h(j&Jp4j*
zi+B7!`FnRV*G14b13maB_<F=D_%FDBjb3UWQP0bHmcRB*-p}RR$v^%Wb%;&-{@jAR
z?%y*hctlww?c{7{z-{asaOVsSxF4gB=RKe8kmr*y&hTG!mPcm~($kNg_OZH0bVr}}
zO)c@A4R0#?NxEl6YY%36&Ukp|NoaR3&)k8)Srg9S^Zb7Qc@594g*Vcs%j<K!*QfTZ
zZoH~HUxi(d+TD5Yen5B<V(diO|Gf+xb$?eIzMc3Mw!25PE{kIG^&B+=E^F-*5%w*-
z{Y-S>26VYz^@$11P(9WF+z);4jqklPU(T9Bb0}k0`)iEh0r#D67Co(=@9%w!@6-2V
zjdS*{i$2rp>HAOnOx+_pBm;PHvtPHkU)@&NW)Duk@q%uAqxBb8u|I9BB5(LUa=P-2
zRpbvooBv+q5ob&MckzkyS04XXPj8doWMN;d?vWSJtC(TmU$VIA>&Iuj%|A1gOizEn
z$EU@^XT5ukkJmp#1K&Cj50wuGT(f$5#B`6`OP>5S`BL)J<hN}iAvLp=G(?j9i=#i)
z8P*sHc!qA5OK(XZhUanLAM2o=)-$S$O|Mw1zLJc2e=RT>8S8s>zU9jgp`ZF@G}wp7
zo)zyv@b~GFdxdCB*nHCq{0{6H`m5NT*IsbSB)e3v=4Wgf>qz9w7-hZ7_@P|$tLm!`
zw4cCF@@UoGy7t(;wN8q&#tG?w^mH{mU*N5C0(&Alyu0^hFFgLQ<l98~l&v|GVn?f|
z!<_M=oVWzzKr+*~Sv|e+^tf56GhgV*E&e)3{oGur^4B@Y^x|Ny(mC_p#0fP1>OFX^
zx)ZSCB>w+N_;q71I@QrVa@^q?@F8?N(S2rJ)6or8W^^L@F57e&?R1CFB<fe7H<|;r
zW+DE-IksfM0>1YBbdQC`26N!)u|eHjFg7O8=I=Z`Ix{vt?c>OL=0#&e_xcpq6Wt?E
zd%6fe604`zd$KO-uhyAGKCPb4d4$nQm6hn^*T@Uj5n4a!Okl8{kdEH%>!fU%))2^<
zm<%!$&gfPTveueGJYbGNmCmdgY^_0(^haCas`WxsT>Z1}0h}+OZ#MayJ!bu&GssTi
zCY^J_M#x^wyBfdS47%6D58XMfScuLjR$d=A{~qB?P!kfcxqtcEwA)V7nZyor)lb^z
z;ln0%_epCZoGRkmw!7~TKF*OAd_|t!2K>i{Ci&yLM^rz^FSnbqRs06Wu-bFS7XD+~
z?jn5YE^^yv*>~n6_Mc@hx^8VQW_4xTXHtj$gR`9WSvZJaZBzaJGxX0HZS_Bc{wst2
z{d}+g46)!UzyA!dr@pxVYU|GYWwf0(b!ASrRdjlF=A~W6{gD=6jSHXqGD4@}w-#Cg
z__SqC-gns?Cs%DP&MPMLM}bca`i}{J%#LyA-s1eUYvE12E8h<9Bpcfl&y}~&>~o`>
zL!N*Q2_et0Wb;zGLH#qjF>id`K%b=>)#yeQdZBZXfnEe>m}LW-6MgQ&AHTQgBOo_3
zgbqyWb%{+JNnP9LE~dYwVSZaAo@GqPFL3s>*lV6za_vSp|GgRBK4xm_8h7#THPB#=
zlwT*i&Uhpi7lM{ke0!ubQaUSj=o)iEF^r)rxVt{F5x-}nyL2YsRTBeOY^{Oss<F9z
zQ>ihuhB36poyWLSn{AA1{eK_tkNeL{c;+0{iH@loz1WD&IMF^W>rM~8e2xE6W{%AE
zVLaxyo6Ec7Ki|glfd70s&ky;}i+Fypq)tE2DZigL@Z8Sx1m=sjc^eO5`_b`@F3-gH
zHoA2U@X*>bqB=o-xz>Q_d9+#MXaRb@hWgM5@1*A%<I2~2t>NDHtn*9&x4{BtFgEk0
zFmD_eCha}>m)p1J<JWa@S2*{MGlx~j@5@_h;5i$;zFYZrzR~J+=a^pfa*aFZiC%Y-
zg&nG0lW+6CDQvU{rnk-BJzZ;Lt!EqU-s!FO8qN<F*C~w&Vxt}XdE$A0ItiI;?&XYb
z-e5ny^)L07hdU)_FTT*2lzk@d1>Yp=Uthz$-`JhT6mY1cxt#UY4(W(w2%Kj_ap&1j
zBFkS7_U26zxY>L1G4PCKoSc>Aj_cVQMxLAYBib+0UO*yZ9~p_*YqD*(KkITA5IC(0
z&nr_bWMSd;{GSsa@XpRCZV)jmv!U$T{3Pbj71zT14Di8YD3i&pfG3mbBWyF)G)A-c
z<@eBU7{Bf!@Cn7I=CyWMPP?Ia2K(KaU+%Xd-<u<b=W@7-Gd;7h-<M1^HFNghd&9Hz
zn~u8e$TNa%jXdS#I)S^|FgJA!xSi}Z)OErSYgM+A@i7$d&xMnBXD8^6*p8lTDD>dS
zWbrzFXhb^b%_SLM2d#1R#V*ws=8`}M!8ejEol9=d#&76?XY6U<_pJi2$^2%Nep4mT
zS?OwI<%1&;b7-V!<I(-``i+<N``>lnLPsNZDqBsTVfC3U_8E$&>GR<~dY|eiqJB-W
z-!F51_K!_xRQ;t(>D=%~?=w~+&mwRC`0^|}Px74bD$BF{Jjiq6d5~wtd6MU(S6QBw
z=RuwqoCkSMK2P$z@Ku&){5;5W%6X9I)bk|IX|J+8tImTwr=JITUUZ)1dGV_(&+79a
z&)1v>dDfgKd0z4=%d_@8$n&-5L7tbMCwac^RhFl99^^UWJjiqAd6MU>S6QBQ=RuyA
zod<bdexBrc#j7mO`tu;q*PjP@zTrH{^U7CQo(<<go>!d*d0u^<<ay1jEKghgrAp&{
z54<?ucl#?FOTCC#>U`phir@ASzYQ71QvG;eSbH_x39mkhAOFtyttpM)CeOr;fup?(
z%T5u$y`B9>#f;NgZ|`O%_Ycpa{~HF}Ws0eDM&H{DV1H2Y{i<2)Io#0e&aX84Y8MT-
zRd;F+|7LIBHGbisyN)}kwa29Mn=$RL5L-U=HukEmzsPED>G@0fEyLGy&)p}qmvC!=
zo!6T8=#B;d_n$6i|3>>omvatR|L@{`mjC<?o-O}*4$rUkpOZY-_|JVjU+h0Gp1RTf
zf{%~RmvBDkNC&tq0|()<m_4jZ!KEF1weQS1z29p;Naqet$Kt0Jd8&IVw4d?Q2x;1P
zfO|{MvIb%?_NDpHKF814r@ke}eU$unv|myq-VDY$FFJeUh+^n#$@h59o<wN&8orHM
zn}6=k@3=$OeL3v~>7H2Kul%K7j_uICNGQHGOq-C-dMOsJZ;QSCk!(7vwx{<;;ElIG
z692BZKcaJ5r}syw=k1TMPon+67w?aJ_w@dV+Gu}-ICMVE^TT|X7zXbp3per&VR0Xb
zI~xjN@E+<|om&Q9bSCYEChiwve?)xOp1t-MPu3y_&QX26o_qAu8{Nh<zd!3x2Ry_4
z-cI#n{KhhSQPl;t`(R<E?d%HGIlK5qD8n96W?fU~?mD}3H$2%R*;eoI_FdTBZ$}^Z
z9D}#s{#+Sy(wY8c_e;*VN$2)0ujDKSXD^laEicb`HXi9c1h0-faN%w2gE>#cr}cgX
zUhH_!<l741{6u_K?^if3u;T&VW47}I=TshxU)SqaGY*!phiEz^n|I{nj}5pj326BQ
z=gN}3(9c=2xRd+R%;Fi5Q0iUz57AFuT4Sdz*Ut09_TBl2_r1)TtVu&Zds=lFmAB{6
z9roL}Lo&5GA4&IQ%eluc%6{H2psyUbariTt??cMC#|L~ruls>$Q_&cKA0}RS*j_y~
zGGpV#q0~F4hSGP$Ti8R>*}WO?q51~#wza_FmLnB>&v7qu(KlGygIibInXl9NW^_*9
zgs|tg2f00~Zw7dNLSu$Ky=fO_xa(!X-09(6b7PW~bT@21$R5|qy!Ns^Je)seAC5Cs
z;MN%7caZ6CV&9T%sAF~hN%To)ToR$)<9~h`zwI>(KGEmlxAI#XdQLdGWnpYl(#d^@
z@~y>kPluwki@}4B)$w~(+|w;S1;3wLVd=~|zwgLB-4mc|7J4Sz)WR9H41G$^Lh0h2
z9@-0C$KL7V4Quk3UBAYoI|UsP?B3-Xhe@Z9h;v2|``3VM^(~0Ki1SpoQ@HV?>}?|Z
zO5_vo9B?BaUp=C6rn??EZ?bO!_*EkdgY8~98y&u^sKbw=zbW)LVy(%**FDJWNCWz>
zwkD(BNL`eRW>y{38B@tv{N%R<bRKSBe42D)LE+hQQ?YE7^qRAL+_%!q7_uJgJyc7&
z3wX`wkm-X??m;=m9<jBq*R3VlnO?Wq47jt|kG0VU##gQ>%h|oG^GH(xy5N8O2If8Z
zw%~)<XLw;!oXx`a=p5A(sczj}x33J{xk-0GV9zI_Bb=q*F(*0T-b1@cqB}b=%eevj
zU{3USI#r2Ip$Gb2U;%t9gJ+Lh5Adznfn#xC$X-eRbe8yWdvz`h&3qrSuL-_t4|g&=
z)we~Q8T-6&+{u01CYxoinX_7g`NiJ6a4y4sJYgQn#rM#T@e<B*KLa#`jPr=>1K<Aa
zTX-qIRSx{gGgfAs?5Xgx-LsEPcG$IM4Y<dygD>pkTF5;8uY25D_@Qs6YH#RuIX_v^
zv`94HoSWked}eZ^^T<7M=aKs?=aEQul@p5J>#%9P<IDCl*(Pv^*!N{0|C7#qwe(`f
z#u5E4nDChhE|D2)MxgQYO$GX##&>|oCDeDHcSd9)xF4I=>#hUe7E9xHVd24YvoGNc
zxb@&uk>tz<a*3hmIzLxEYrvg?PF`kl2Cox1@Hf=noe#Z7^EbRhemd*J{S^D`J(R=m
z7<AivdfnU5r6qaB2YN7{@zHcAI%fZcxBt!gubMg7Z^`uu>%rV)_P*~!w#bA#gYL_Q
z?0fQ^ls$gcD(|-{pNK!03x}XHPI(4ek@?yT<*()Y`p}w@YWTj>elQn;7vfFC6#1b!
zMSKdu6Y*+@z9LgLj;N2Q>d?-sLqCxz)PaXXzzI`FaAKu(fD=}ov*47K))@!Rgwi_W
zz$q`SGY*`IrFF)EQ&C!{6pnbv+$tVUQXS~<XcrHeU&TYw9`I25RLZ+b?oXAjtwb*#
zH`JqCx@OFM*$V=BU69UKBOA%o_<Ww6De~Eq7x);T&yrWb=L<`59*3@YX`NEKO5jW>
ztuqdssik$sfitbN&Ny(YO6!aRXL@O!ao}83TBj6FiM%dWo!?Vl)h{8h*Sv(hYBIlD
zUYC^OJPuv8rFBZ_Dv{S~OY4jS=hD(T<G^`cX`ON4SfzEwfit7D&Ny&pmewhSQzEZf
zs`GowtL`P_b=gbE>+;O+me&=fIFCbDeQBLix=Q5r`qDb%z<EPyopIn?Sz2ctI1QzB
z#({HHX`ON4TwPkH6i$h}u2G$H$qPHCb(H1{yR;5)w3ezanJ=2s#d%qCN{{BI5`1>j
zmp4ymncHMne|lfO8vjG~b29KXPpkjQz|_2bt~vX&zZu&%g>SL{kwt~h9G{%W?-7xr
zq_2|4S|riT^Vri5T`&Kp+@EXzf$#V6DS%&`Q=dpblv6w)61)=+2wV5$6W6g8&oU=t
z-&a}q!IVGV@la0l@Ryy3a#89$!8xq*ss4BG)~4KqFmrZ%P4?*)eYdzKJ0BPc{G95!
z_=EU4Pq(MNct;s+s}}USk$kaj_3Q!n%lK(e|LxuRs@n(n4fD?YM1C)|dUmfn;V#y#
zHhK6O6B4w$z1QtZaP~8?E?52uU{<E{RUgM!+0A#$^wH0J(>zN)XP;Y{S(8oTPZ@sm
zrh4vx`}BQ1`KN1F<|p#qZ$EMgFLZKGH>}N<U%PRnaz?MaGbG>iQ|{AWyf<&+e53jC
zUbm8V6Y=*d9^E*y0pF$)TB47U|HyzlAHEvrA-5d5%O8Qp$GG!`Jhgw}QND@b{ptN{
z^A-4<JE`A~KV-N+MtD@<`^CvKoxSel?3(QMUA=Av=jqHI;v>jsBD6le;=X*5)`xNv
zX}dwcH@>GxkIsp;L0ft1p1iq%exAE89|hmlDJS>BUG#-MJ(=2&i_Y6PVzLi&7v$af
z);oLMQ}cS=mOBUBZ8?5F=`MUR+E%3L>&CA9Ny?(U_oQ_my)(NV+LMpzo0?VGa-L(!
zHCgV>$m*P;<hwoHpF25kz-@<y7gpiVA%pT&8%LgA+MR!X75#Jq8ySn<=XgIwou^lD
zPbaWzS>tR&?i1mu?s2HHq#xb+Io5zX$pIhaDt!9!DJA=R9oAaNRy^3@+@CW^zR^iN
z;GVp;C~L_$x^loBLa)s2y>2W1bLug^xeB3Y$nI1}ubZ4T!1uG@aP_MEv6;Q@^D_tB
z=irsr1j1)%1~Dhf#Vh4`-`s=abMQ&Jgg>8+&13Ds|EJrDo6z?L@Qa{7!biAQB9G(O
z!jB|tAz&R_IN-_T$<+P1R{F1SI<pgLbIL1&W^iePPe;M0)&XDP;4mK52fA~NJ_5ZV
zZjqI)sUP)u0dkY979-a!=ui8dYTN5>hd)_xXrn*rmijm-`1E-knx$8sF2S>a_ANf`
z&%>vqK2O94@!$p89fb$#H=0<Jm7FI-=hN-TPI$I-<&T1=bWe2lBhz;J_V|+M_h^)U
z9tJ08Zm+u^Tn^3~aI@edoTRJbqx4jK6i(8M6nxp7>vfkv-%0p+a9*#w7`aMTlGA2z
zE=RutSv^mlaJ&${2ru#GAb4$0-=9kb_?RL;q=yH<XV~Y<VQ@K{CyvjP=itfyvv_in
zzV^ct>4o|%)r<Y~DgBL$N61imE8a+sqEkGQee(E&JrK=H8AF@U)edOg3tk(L=W%FW
z4Bq0AWVjPt4}j<J!ZSL%$;VMT74YFX>JKkO@8Q8PxCHt##n%_{BSRmx;Jue}>4?Ul
z^kT`K@By8#Wju->Rn*bgQn}<VTP#^lg|=hxMY7v@S5fwo-;=3zIq8UW!_yy)YxLtd
zaF#)1Kk{6PTzA4d>B(~FUBVn;&=c0<*$(J^`faSuz^`vEu@vwN&*Oeo+V8vrodOTx
z)(?)tt?UlgX1@J6#(PB=eE`l<;0RaQDe1^GXy1MZxFC1&Qo6A{y)L)Km;d&&<S!fE
z2XBu;qh}kSQ9392X+Dt5G$%;T;=5!ldb7xE1$1tEv=@5m-|2IQpjG22OMA(p3f@UJ
z(upDHlRk)U>4Wr1wnaEP;I<V$Yy&sxfHy|`@gbQVrZ3^PWnmFF$uF=klHHbt#W5@S
z$!^FtOotCgouZB3Lf_I)$y0OB!H%NsaG-S=_()$RU(H#buKM$ca9aUwX=Jw+Jzah$
zV-Y-ikgWr)8+@K_1#jt$_#-^m`nq}%^ar|n*yl;W569=na-ScbF43R#X%l_)`LH(w
zTY4oO@^r`VqsQ-~3*Ff;uQ*O*OT_<!;^Dj^Poxv-^J4h1fj-6CqD~a&7SY=UeFu`z
zg*?;PoqqaX0bbH6PltS5HVGH>>TLVb<>Rs+zV^Y>fM)5*0dVPqSJH>-5`F0N=}-Ig
zd-{Nm$-byh>4tPo_G2yhq<tLv!6DF(bg0+sOR`Oa!(M0*|9ch|_2l$?0?%YO)<WkB
z<k*EAdlnXTb$^Lmdcf&5@JT!gcqIMPnCt?FwUkTuG!6qEtnh7!H%8F`l?}rOjmh*~
z18xm87w3z0+=F~~J`FDdyCGkoADs3AKYa(V(ND>`3p*iwl*~O^(MOGc$={ndkmp+X
zCi~Hc%$B2%J)HyYiaQvK=tBlR$d)Vv=OXS!dlA@_<-Sevbi=nP!{8vCWm9^9eF=Ox
zEq~vJNcI|^OOeG2$pLya<^sK6=Ig;u=wAly%J*y|GRe?x8MFuUh~z81l>J!-Uu)r$
z<S3gH%ptNDvOV6Ils}1nNGCRk=10*rXqMgC1P?o)wFB9TFTp&r7(B(l<=`63x6+U8
z@JBXo>B2L9ifqQxh4{u!(RRs>ycQlv50-+T?1ub}KHv)<>F5&rY^M+P*FhiB711mm
z>A#aa_@Vy9C-oQb%9~%{x8!{(bZ_fG50Lj_cqZD5^UM9-T}az$CmwEq)}_dKF+3FC
z9B5t)Uj05kf&FL&pA>j40UwVK*pqYFkEOn>mY^@~^ImK}w$W$%Jm02b1EeRfgBOy&
z`W8>x>09%wXxrf9Ao{$qi=5iPVJmdCfKMxQrF?uO56MvS(AW-iWC)pTMy{K%KZ`?Z
zQyk0U+Y)fK;FIdgz73Hldm>!KuU2r8u59x0@N5b4ku6DrhjdN6Xa<)y@CfXO;7LA<
zeO_z<hn9stFThiMZKYky!s6OReR|`cex<7|^gBa*L5{LD;)~=czLd@-TaZ->-E{68
zaJNF^d~j+<mKvK$U`Tes*h~fU{qCYInF-w*m&J8MSAL6dz($B}`5>|pPKjS3d2E3X
zo-D8rZOC^H{mCB8r!V!nxq~&_T}2;bb0@N<PwANa4cW2gyU;Q0g5<8ghroXpbT;2{
zX8!Q(5i*o-A>208E^!Am!b91RZP2+HJmjYYcEpDNl0yO+oNFFw^X0G!{N{jPpc|5d
zL%TWPB^h|~#ctHWo4}69Zp?wcB43JjLwt~|J^KN!O^+7WA(CAqJlO!Q_26VL<eocU
zKZ7~rMg9&jWM{U*tL^Zj6<H45IY7HJIx4*6lgN(9c5HG6+{@sZbixL&z<z86C*dPo
z;f)n+MFY54K5rVOpU5Jx71GaEpD+FJrT#3wY=AHI@I^W#9AsNguUF8^diuUxe3B1=
zZi+v_yyE%i%q<>&{JCWtG$zr_ozPhaUM=WPAAA}DZ_l1EuBySc0X(gFMHvalq>rO~
zkYJqlgPS$4C^PBO74Rdl9~O9NoNV*?AzswdU)<+I9q^?$f+byP0sgscspKTO>!EQi
z{E=;`hDV}P_C+*GfBL{hI=&tIl0i4;huCw5Z^CC7TC0VRk4s=b%E6@yoNB>Ew0ph@
zw&ZO4G2f@X2R_9YzSw@OrCoes(S8KBBTiqEvGDeIkKKGdypdkYmPlvBn@albf~G3!
zm)}(!yQRLW<_V2c(Y5nV#w~ie7upiYFVm?uvN8UcW{d}R#+!e@>kaTMuq!>_a<*OB
zSz=d);f?%_Q^cw?rYpgz3Ehxgkxh}Tgo|XAps#bSs{(tnAAVm6z2$cRlX1KP8pYF7
zA20gr8q2aPfsK(5;Ngj^yXZ?Y7R}K+@C)I&?9Bn_Hjk1Rr>BSyWxzMk*XL(2K9FGp
z^aeJ+$(NaA9q4Nso_I0=p7iGwbVz?>V?@7X706!t`U1Ro4%q6)0Dn2SJip+K{H3p&
zzn&*nvln^DK1jyT12?cU>MvNc2>uFZz`Y9INCytWr#ZV=lizv9ew?Jwz2Fkqk7IuS
zFF=p<>ulRG$ER}{Jbn)TidOMXV`4eDJqNFZgLFfBaWy<TZ9lLX&w;CWAwI}%?DzQ~
zU(~Z-=<9KCvgfky1D9iS2i%kNDW1sQc>F?71OH3*;Q+j7%=Nm5p|1m;9i#0*#$~{-
zM%qhPgzGi%Lih<^@njirH8u_i59D+V{DS#Kx_1;kI1C<<RU1c+`*@tq6PtX=Whp$#
zp2d?6^0V+ndZB(x;~iQ0lD)CTBjhMO6mKL;(dpS!Y>qdk{dh-1h(4h6C_Jj)g<l4}
zhwo(U09*V%$QWA%42>a;uk!S&>;dZ5ri;4Mu+o<`vMskdy>-V@aMb)D`eiRPM=ypJ
z@%sSuJjvLRZ8!>S$@=hu0rvnj)#ZTO0pH;5QE1VcDAI9v_V9w@{80;xdfH3=hi~UU
z^4C4I!F-|dcz|}2y~d+tx&*u<cWoRwczbaiT66JrL?iME#^2r<$QPb_F$-iWIoJ6z
zIBnyX65l3YG0?@LkC><E6O1gn(Vjx@!D&JV=NgdBQQ%wPBKb_DjpyTme--rY1sCb2
zWHL<O!ZTvsolU8XHnKUA-vr>dfvfNzUO+$M7q&<8l+E#C*vMOQ7Ox~9jl2Diz{g!h
zTQdyrGLl!4IGJECWqp|J&Wes&U@QLJPTBAyMVdTc5jknR#pu5kx+)fK9H~uF?mX;f
za=_RR-|f|240IxOYd_9>0Z!soCP%+o3q6<iWYb2w4CUVZ&e%$3;2~|)ueT2X{;dwW
zMqi?10y5NZikc3sC5e}_N07`)rrg`Nd*g`w6n*brMjgps-`^`PE?i?Rz4=+?{Jzg#
zeh=q3HevQ~ZhL4rw{zEUZYV#T+c9G}_l+sTxxe_YvC(SeqjPoj|21~x>Gn1G`UG(R
zco^cGg~=Rr!!uglXrBL54!Y&hgKpV%2VMO(o6cHP@;e@rt5@a>cMDI@IVtWOuQ1*G
zzFb#64vc@}9K}@ncy7+1TN^?DINuTCoKCiU&~5&=u@eiw+nd*!qA)y**!xFx&PV%9
z-0P^bg8OQH+;qRtq%3v@S)|K;?9QD2Bk!Dx;eJQXfK~9{yTc)D9~}wD_m8Nb2>V1j
zOQd^wr(Mta5_tW6U`ILoW2`;=u866a8T*c_``WA<@TJ-Y-C@q8>7JeWoU^g%`}>!A
z=drvqPde`u<+njq-az@cDf7<oKr8ou=`Or|mC#vX;2XaI5ao<k652n#bPaZBb-oVU
zQifgB*(sgf(|v7sbH;B%=^4M;&fU<m$0VI+t(5a@U3}&4aMIajC7eCnId~*wKXc4G
z*T9*iNP@FBoX3eIoyV&g54s;oXOyOJ9+BUH*=JI%`Dn_S@=osY*SWVC`(!$Irn7n8
zy;KS8-9^yAm<?fjLTk8_e(SxQhrBsgu6t-1Uk8C_peMG1vrE)58J&TFzH6Oa8@x1`
zZ*ex4Gkoyh@H^1L%{wQT{no{C@2uv^JohKn=sZlE^I)8htI=H}x=*4q1ux<bcT#a5
zn*C4kbx~mkzq6pbBe*N#DbYLbT@BgNv%ViZb1pUS-&2CD+j-VrXPk3m+=a*Qj&iq2
z8a?s*dM)w~`E*3sM-rXJ|1E~sywZ61^y@4uzbjc2;PpeEOV1DQf8!u`g?<=Z*17xn
z4f$))G4TssF2vDCoe>t_?*D1=yzqtOYmD5-du>5FC0=ZdC7?~?O>L)LpZ4^A+N3r4
z?}JCAV@)=cgjVZ-H|~)|OuUdxbT^D-A{pr34&CiCt_)trJss-fb=>VU{RYllBMXf|
z&SDnNlp`PRe%#^pg-+^x_y5z~G|(2Zbw5p#n8zBIy9Zyy+YWxiKH%-LszLXMuPyR6
z5og~Lx-0v*8<DeT#=#zSaDES65l<T6uW&Tx`>uE*JpW&KatZv<y(Jp6G58_9=N#%T
z&ZF+akIHywecL;Cdv|-lqq=1GZqB^zxsQI0bx1PHaf#cJS58KU+)KgfV#x>|hCLZ2
zUnHY2JpE(zS?%?iI9H$h0=@9;z#n*Dk#{~9+bi8G!|v<eB8|c8;U9J^_jzppQhtZv
zk>|!ve1)?Mi+O&S=P&Ub@E6_i?oRS_)B3~jtkF2o9Y-1i-nR$HmfwH>qx4gKRzE+c
zp9buKH@{-nL--nDWUb!~Z-@|M!p@i4p=Ry{tn|NOXq__X#{IFPZzMEMJR5I0&+>i5
zq3!=Ub_D$_R58EJPVoH*^NH@Jo6r0bbvUp63Fa5)hDXzHIz;}h=$P3T<<8$`_^dOV
zoYO31f6D#i_zxTZb8Mf^^si=|1@<VCOlRjzBerD@<<f6@#v6;ei%91_@D*6gYW`W3
zH9W6tSe5@Y=UVWE@|Mp3aV9ewFOJ*ac~8~LuxG_P?EHI&q*t7mDdQ}9FjjTm^jXff
z{>6WejV^qrF<<k~!ldVg%~sM7X+P=f<nJUM<@p=@FWzady8+ol;l4k9FuS1N()k#6
zIs5iOH+v2D{dKG_-kHvQh+%8}i0<g$Pnl)m7n3(k9o^lpvYq7D`}y0*Z}juGl5hL@
zo5^qT^EZ({$ItI4zuC`UOMb%7?;?M`@}2b~E6CSfZQ&ts5}$pXbk;mc{S@UX>POPx
z+E>K8v|cOq+NhTheAV;Yx09bD-zMKK$*<tIp%zoNgtB_(^AL9yUr=sFm%j&X!rAE|
zHUDYI9Dj4jte6ur<@|V4KgoJ)$ZRDoy*^}4k=8baOzoeLM{0Uo$m}PzzddB?6Co3y
zOZ|BvvyD`DGtW0s|J@;zoln_9+T6%9`G)`fts&F;UfSM3pQL5Y<i8_iULdW-;i`QX
z^+`>%U2-+PufD;tnOC?6HbiRUJ};fc4&KF^|3ANTFZSpveorJkWo}k6oRGfV(0~1o
zB>z`Z)?jqMIsP1WweF<ufaV)4eq)P+%oWU=1@6q{x5zlRu6rzX7di9Z$OL?M?v|{z
z^qZH@9J4arZn&{CS4-V;i#rFYC!bPxRcnnB_3tY;+%L)450`USx$Y^qXs^2o%QLI;
z_<BcbZGNW{9$$xlr#l%hrZ0=N$yYhMulvom@q1hsj)T+gR|%)NK2H2TYE66`Tn1ky
zTyFDm`6#&PJpH+3wc=I6<#HdF_khdPad5fqRl;SFk4rtcOdAK6H@!-@1Tu<&O9T3?
z-|5j>xp*ffzbA)J6S0VezGcuo#qSDg4Kec)*012*#_!Elje~#LD}{etV{iduaOIgX
z$eQaqY=wSXNaIjr+lqJdyLjF1^l|XPQF~=<!taUCMdRS}jq`-h#pB@f(0RhAdK`SX
zyY!Wj7y2w4UuwhkU8iigY<CF#QJf)eKjk*^{+e;{S@=rf^Ah^g2(G32+{k=YGY&pi
zpC^1S83&(=R}-ITXHI^A#(bmcc7MP(V)~8C(%-j?O!57A|F^6=kvHd)i2){a1fTXP
zUN*t*&i>$|`1SbQwF%~@#DDiC4#xiYdMF+A?(XOIdFiAv-<<wc`c?ewLj49j`27?9
zhx9ZY*S<)1*7INZJ>#Xddt8109MH4$s%JfY=Qo)cKMp)%Z`mT&0R7reiO}|&KFzNk
zhh~1b<BvY}0-8N~?Qg~`oAsR5KFH`o&5!uyqB-CJzuCq2ySiJ~$t}UoM~vj#on6`h
zz5Lf0C(bZ+#cTIW*SdU3W%u+@<${8KOGLWzUihK4X}#$sE^%&O<hECeZpOI24KAIt
zBL18;LGzV$1F>D*`HXDP;mi5GhS!aQQ{yXz6XRp@S$6P3-wt+i&-h~`Z~fg-)Il5E
zCRomtPex76q!fNRzuU4uYDV8M4xSaSAf7MfbKm9rPW-Mz&6VTe!jEFSV*2}1xV*#1
zg>SF%ozAUO!><x9b9`L*#<k`uAD3%b7ghbrm}*iT$s#q7>Pd|xo76;_Luw}J_YPY~
zt)w>6V$u@QQc?#=-``j_@U0C&kAEkP5wzTSsWBmzsVn$jx&~YQD$$+v>E<`1YOWqf
z26w(nxb*qBTnjF;RqfcRYsSIpZLbtgFX2z<Hy}&>3E^XpgHO$Q!e{n4`1~UB3XS34
zlRwvvgU|P0WqcI#(A*%I={LP)gQLbN{AI+9&Kd{D&%IJOzJ$*lGSdnz=Km7+HgHy5
z)!qL-=iECp3^#Cw84{dM<xH3;jYQ7?Nim{cUW}+%FK<bV)Ls&zXzAmq*s9G_@4Nva
zLoyIB5kU?yX;YfE6SbPs*j`=|EhUzOpb@p6dk?1<2cH&gpQl=r%=7)7doN5VN&nCP
z@!vnm`P?&SzpcI2+H0@9*4lgT!8U^KYzp>Lvo+0G7|gi~rYv>0PF-4L9`~1)TNw*I
zFOF@w@?~KCga0B}1?QI-k6q|Mf~^nxuFV-8bzP_to#;>I_m??CqHKzX6QAXKxvTuL
z8r)pDGOBycG&e3wVBT@Tu4KmBm2}sbY*pj!O1jT$N7}f_9dp=~lKZ{VUY#dRZ@E&p
zE7kOaF~c3ZUY7d=mM8S@q78gBTV~=z^!YA0y6BV7ovyEBJF~EziHBrAtJ}`H{GD+Q
z+gU$p4mP*(wzj(Mt#?Yb+(GoL@nv(!l9iOL>RF6UbgEbXVl2@OY;=PsY%|(?37n;V
zSvZ3yleyURUBKBmTin8$>|MlJNZiAa*qX-Ej;RZs;FmzV{{)U(YH)M{N9Gc66#t9h
zSXYB%DfbjrWk(pThDNes*4Mw%!DTbo7`bz}zto1$q@Vq^dB#c;_bofzOZ+(-pB8@m
zU#s=yVq5D_(w|?Bt#$l5ofv`t6xN$Bg7uR%SYP`xu&(+45!P!2EApp_JD-Ku7vw7h
zuUEYctk?a22y5rdwE3!EVw+mujJLU@Yh!gfJSTpWPe*IknMUyiH<g$x4s_u&*V?Vi
zB|Z!uoW+_@_a<^r;(=ssQY3bzxb@^)z}=%6;;}jg%cWU^<)6<VEdR+JgJt>H*R#gk
zO&!OO!_OnrUDkVT)He+uPoDMk9kkobTso8b#c$(%<jezybe0hDD2KglaDv|xjyqW7
z{cy$$4syp!5-TH^CFkXjbdq=(&Yvj;kIJ8|SQ*#d${9P`&gj0lnML^`iKlYeS4jMx
z&QQ|*aZRMXev&zR2YsHU`s6?TZPvec5Z9XRJ&mufbO&%Zu_m^G8yp-JKIEU1tz%v0
zKeu-Xzs%9xZOS=XhI?XYn>Af2iOb2{6lJ{&_tJd&-Gk-u@21D$Z}a@gbna+j4>;@U
z%B!)DfX^{6Qyw!7tj`ygEpNf;F^_dDFv|AeaxRkP6Env-JSjhQ+Rfik{%5}X^j+~t
z&s*k{KYw~GnmPW-O6k}j_v>tpe~wS}EwahT??YQD|K3>ilfUj}`g%<9TT}7LV#E1c
zXbjH7-I}Le`Mml=*7G4TUg7EjXD~6>&2!nyLD@WgT?c;Wdz{4-;5T|1e*aBkn0{G)
zBAau8YW#lGqP<qu(;dw7w#WHg_?f!5JE8dg7m5df-t(`Sjw~3iOz>}`A1g{%JwLW(
z9lYRlZ>wbKL)Ifk795EG&jP3H@gK3wuEl(B=G&{DA3K#L-O4Y*UUFkJ!!}!n-aI{S
z@CLE*>_o=g7_Fxs#bn>{`e%}OY|ba!l`X=LS>byqu?1DW1%1J@?XM>9>Nw@{a4#9>
z8PWDi;+mGyho!^{EyWkGKIV+2Em`1Cc{h~P+&Ss^ha)?G8}^qQBhIL6UQZt^Vi!fv
z%Io{f6B#FlyOgZ_jqu1J#?8X&J<If?16X9sy5n1%3q`q^#G%NhbH`=abm*_k`FK|M
z&I-DR?qA}admH_r<;$k8W$Ce<X~obsTSJYBPU0<`qA>)`r(Vh2tC(2vpUOG#<veh4
z>=$FF1lOnGyLo(1`6uE>mtNq-o6VlM&W{D`hlYEJl)nVu{_U(mje~GK<KmcP4E++n
ziYJLn3>jyk?%ERXu7&UNS$NREgD!i03iRz|c#!+5|I2wW1rH`RLHc(4dSY6UG03<`
zKL1PEK=1t}!Z?18f2l6gn#>D7r!5b<B{DIId0k!dio_E$2S|@u{fn_t{k~>AK8yH%
z4g1T{NoORm?!KU-XUFU4+}+Fly^`G*e7{5J=)2L;hr}!B==ytz^^I(JjOlFR`+dbR
z-7pfAPQ5TTdVllY_`zuG><)e(;8$=e{!in2fOGW*IE&AA2P?w8!`+m+6HND-cEPLb
zNuNbN`R+Am<jI@FLXh8A{^DRYPJ{fC3yaA=zm{L;n#>!QU$SF-{>9|)Apa8bseYYZ
z=+^VAUhpBfoM5n$qb%oEl%4#A_Rjnou;|<HU}YtB*@ape>RL@*$KF_l^=8#iJ^72;
zAECTry4CiO?ry#3>u2h?`5Jnj@t=$r{X24z@|)EbI#OLO{_x+Ci-!InD<u~nll&xK
z{-S&*$K{hPU3u@y2ivf%?wUv5neIv2-&t8A*x-B1u($j5k~7O98<}~>yPx5%dhW(W
z-Z(yIej;m7I@-lk?aW`oq0SN{hV#@C-jP3XGxL)45<5FoQ49-l(&c0xN8aE4;@GLh
z;6|}fis4m%|CBzOVi+xfpREz*uzV0nma2^<?w<5Sx7RFjx2DtZuxKcm56#kd`GMsW
zhYaP?^K1Dnlbtf(Y@G_fx9dJP@kkO2$=slMaQnZHof2P2zG)sGFY_eJ>htd_$-Ms?
zd3U+!3h!&K*8O_we~Oq~$wSS_ZzNr3CTc7s`iNq<yeCgP9(xne1!n=fbO)V#>aZ5w
z%>AaKOM|;8wmjW+XqRWHEIN&1Khe7m_|PTM6MN7Td$ykZofpPVX%4s@`F;ERq4Fen
zcoMQ3-X^Z=IA;S>CwiI6G!&Pir<vwPZy9wiDmQowu${G*>v<G!e8YTViYdQb>F7SP
z7xWdMn#x&{iM`M7sp@C%K^Dwqouzua@J%_yaxo_*{)>kjh=ZCt7^jPzHAG)6@RQZK
zr07`iVrj|TzJ!kyV{T<h2Zw3;zhv&VcyZS@*<6x6Ox%&pw_fJ!-ZJN7wj1h_zK6el
zRPE811H!A$996v6;<?DaM4qmQz}0@~0iwxVcu}_flZ-3zq0Us*d6&}V-p{*uU2Fd>
zz@Yv-n(Zqk@mjQ7=k*idS!Xv%XRY)4Pk%l(`WibZed;#~<w=TVuj_ckuut|H%02Le
zjb3at_Rvq%ckLNV6*&`$^H=55Ij=vs$ad)v@Q?D<^$2KkpvSB7{ioj2SH2ATrWljb
zCpD%u&Oh}O=lr_h)G+7M|0MPY`YGlo<+-PoM|tmh^)qn>`0sf2;aEPS6fx7>S6z|5
zqB%=)T6<BDZy~y}eaBl4N=LTCBYV?-&skH6t~{x~Z1Ov(r%;{@U8T!tABE%$_Az+p
zqmkuhPm7lxNfG~8)0^S*L~qvlx{t#<OTf(^)P6;yz2MRpKdDa18;^12hf$OJM4YeL
z2Q%0T)6nbYF767a?&PdnXhckY^c&O6*_q}fI3{)qy$L?C-UUyz{Hk!%TmB?t@{{1P
zlfM-&rn0FTA0mSi9baQP*ReA$z-PAqbcN`(sPn(|mu+;1hJ!mRUn=&NR?ga)=9yab
zpK0W|VzPhOne01LmM-DUs(JlZYIc81(LY4mp(`4Yv*KmxXPjqSYCzr+V|8>cbNR~k
zJL3#AJm!6yInpW5o)MICtao%K^OxP>(q#5t*q`hzeS`Ey^40Tff=3_a{=y`ky(5;n
zBHDmlezaI9eZ&8DBhMva`iB1`X-{6EG22*#e;6~%z|RK8v)UCr-1j`%*!lfR3;T*}
zcuYK#GTURrT-8YYiRm69CX{i^nA2Epq)*~Ioe{2jUGVR8?yi_@5M8-eV<{KS%MZrc
z#e;DtZD~!{hOY98K5YBO(lqj5*Sflab|o8TV9T864JLN}wO1<kk~&j^@XGc$nM2^a
z>X?~fPcwr_dK<h_mB);K#@x5zHPv+mGT=Y;qXPryz9#Lf4z({IgW5$FM_FW>)+K^T
z@u7c1-ELOA2hXxzp4U@_PiMcXEy484eZC316h401{G_Xx`JnXo-yS<VkFqO|v8S7~
z2VC~&)cBwq+oovN2cPOL%j^;GYIeqxxf|CKPb4xB+zU@fhzDf;oCbYncJ5`2qT^uq
zvhf>F14nJ-0lu_DoAb%T*ez>Lw)`2k`rAey)z=M-9pOUyv-+&Q_R{bF9G5qhxQq9E
zzdomax%6vRwO{+pGZooo#oxX|zvypo!sEM3*)IBIOnF0*{q*2Pd!?k;CjIIfjHNT5
zr!nLEH-Tp#1s>p$FHe5K4xYMCu<i?#4^aNUJdgZ-mR0rb$>%43pL~FG@d3K0IE#-v
zl)qZLKY93Fz%Zh*vogwLnd65!hX;JP;3H=fZvk(hzm(U$io3^=dz$ARk1@meN2Zm2
zf$Vd0n!i_ZcD<o?#)$vj%2zqxST+!+Wn<X&x)$m~-b-%KSLUNq*Xt~;Nsk&&Hi6xh
zmUok%`NsAKDv3Tead{+ptFw}=i9_WKb{W|YQvN>LO7?@DZ#P4`37@`PyUYc)#aZ&S
zUvHbSaMaBT?v>GWpLxy?_8qRqS}0G%JbXTGqmBOAEyU^qyVm^Li>CIN=aJ{TD{c8b
z@nPBD*$*Z=S=)@hQc8WDn2W5=jTOyHF7&o?jI-=exedA>V~#bQ+sL0OPbEL+*q5jK
zR(a|i@K1dQsn1YWbvk}nO7_HgHnNNJ-TAIL$11XS41UQNbYtYwci89UQaAXCrqpp#
z6g}B%NZ*{6?Um`CL3U&3n9>qX%aWJ#9I=<Rr2G{jbbOmj+rkrj4YNAG-#K_^g?)QR
zrT?nW;?FKqjZJBzy!7#+`rf^xS~q>1y1bQh+D$wAh>%b052em(9`K{~fxF{SYlvL~
zf5h@6*26L%7tY%~<@f6Ow?ng!N9a_|NjdP{HoG;%aDZKfe9)y@@6Kwy`5?NSbm>(I
zzZJ9a&5BY7FfT*@Pv8YU!CHf{xfh?&c^HMG?*9N|dmY9aUsPcP&k0Vk`{?^iV7xMc
zk>y7X#sv4{U<CKT*qrc0q8qVR2B$NDQT7z^_aD~I_!h06dlly%G?DIMmtb7Z2cKV^
z#JS|y>lzMfA76pBLLu}%-Wm^gx3XWpD$g3RQB450Ci<Tvc4{tl6O&n52>u+tPlrcR
z{@by$pu>^gSl7V{IuoF`?BwqX8*|7p+BLyv6WzCY!RIPXjL8P%fHB)xd!cu9f3A|)
zR9Ul0SJnCDuIW21eKjQ>;a-3gzD3>J;Ox7rk^=5jVTsN$Z`Zxrmiu;O$*S`(NOszS
zf%X|QiS1MEOSUBK({=-Vt+_Ih7310$&SjTQxkE|&bBpY&BEMj;uzO)2dkG9@@Z-$_
zpR$8J0$yeT@BAz{2CiF?Y23el>KBuPX!j4t&LZ<iWkX)gelde?V>%axngbpG)?~kl
zbfS7p&bCE;q0Y&FfVTU5?AFvL`Q>=4!rzC_=h9{aW6xRkxyoGXY|K(0{nk10is7+>
z0(UzT%LA^R0{i?JOUAoDw$)ev_GInz9_rD(6ROAfo8tz~XH_iLyu8Y90mtm&%)gU0
z&$1GB-ThiuW|+$lp?|AQ?UT<G^XR&_hO)Ie#bBS-Zjz@B{`ye*xMKtl>r~)3-o5Cj
z#Naaz5EFh{dHtN$&xO-kKQ!jnBA?e#SF#V4x>iM2VUzCQIMoEqs;@yhSP|M%uko}#
zpgw4$yeWU^wCY0cqfcVb@YquT-)NmIecUdt4d(*0W7dSmy%n20Fw!?-=1zU}H<&+w
zQFDmKN7^3<J;%X*PT5ZEeBfo+a$@h}c07F0W(;kO2cajtb`V&KR&l{0WY*CUzNHd;
zvd$1bv8n1V_7vk({r*$QLiQqPUK&pe^u=br?PFeH4Rn8!ZoJL(uMmG;?I7pqQ@XMH
z^H*g2P3Ev{1D&65g#K69%Rblm-^nvSt3ETfYiILoY}kHpnCb)%^vnCW1MKv{p%2UG
z1AMxYa<a#oTo_6B7G4FLU_5xJ3gh&w#TZ|ud0?uOgO|Fub00>~dimV`mP~iw6|&n^
zZ4j(y7(e2bE`#j}yjwo&ZqXFGvwRo@bj=JfV&9Ig1z*#Eu`7#RDzCg7Sc3#}25BR?
z7su~EEZH~>9$EDw_$jK~>Szw-T%$3^z9yG@HHzE|VS<CdB0ARe27@iydu=OumPaku
zY{kCUXB)rIIPiSR`*H%W($GKH4g?=VGwF!pZ^!-HistXH>h1;$`N%%3WIf2b&U>vB
zv*&hnj5!kdcl3MQzhl?#-%)=Rclmbuc!$3?zQe7?&C92?VzN2QJpiL?`M$39eH!22
z&G%07FZHB{N*~xBFExAPPA`c5q0O8<LK%Nt+Fa6pg|zRG_DAS;Gx_^G4Db2+nZAF3
z|1bvp$^QNOrL*;*v)#<InP)!F{{R8f-&()_?sA5`Vb(jhmgg=ae&H7S`r)l*e+B2f
z-o_aW=rs?+ACDVsZ}jOa-d4`v;#@3f@n9aG68O2Fy+~^()z_RsB$yusE^8kB;C-Y3
zy*f9uM`=YFJYW6D2xoW%(0SxtK=wZRdMbXz-E*?zQEU-Mg3?42JZ%kcIsPW<?%-U8
zN3uNN=quDS2v0ti7e6m7r$!i4!DeLP!tz(Zd1`oL*zZ@*TE5Fj-fa%;p5D;pdpT!S
zyc|T2dG8D@Z)FUBMK)`frCoicks|Q;OG2A96?}w#&$^cN9Cvik=eLI@6_ggH3dmK`
zsUumllJ2;qdpCp@`v$XZz348xD<ekyD_;e=t+ydgA(Pb3f+Ky5mtpEemXV(6E>un-
z13Fs3jrVuRtOblM<UhRZV!Qc@w<j*p7ulyC^Tp%+jNL_LlMA9R<rW~%a;HbYgEN;t
z9O*A*(C=gul5UwnuR|wpf207;0&J>DJzJ2I^dH=#r=cr<uVVXuo9Lof!v9|?9!&I|
zhmFQoE)rdfv-ZZr-0@SjB?OW9?M=|NaBOcp0=_L1Amg{4u^8)`lVm@UUM<_zW2AR*
z#)tOr+tlxXL)#6WX3U=I;2e($J<O%vP4P$;T7n-BI@mKgTVh&O2YejZM{>gDqQvjx
ztl13i$WMPnk1I3Kqlt2qvAcIMW^Z6#UIg8?RGfpGq0LRPo#h*}@j9Rl^>*Tub2@ib
zoE+cb8K-kg#a^(PHOTM9(j|n;&J1gL@^C*-l#F%dS+==y0$Pc0I}XBU{=1N6hoh9Y
zv~0V#L9=C=>kd5T0dEn1kiYu$<Md1QdBm!Z_`uwGZ>3saf5mPYs95eY-N|x`_;5-G
za}N5C;{~Oi$QsER$2(YYu!$tRlv$CiVNTX$+WYPS?~J|Y_wS8&J$5+!<~@tTF=98g
zp4j;<$|Jv<kYU)2fsHXZa$9*C=asCq(7%S)m8ZdTI#bNJ+Y<b1fBQ<tnUmg8!G{^{
zq#f%j-kIyZ$(T=5U#5le6KH<ls5y{&u`?F=mgU@6Xl=3fajx1{Nlo2W;jEO<_SS^*
zQ#SPsa_>fgb42c>tl8CwPi10u<3BPtoKpE|z_D`Qp175>MKaJ^dYI<kZ{{V7nQzfQ
z($q7p6S?ythrC<kZ^2&{{rzk4c#(dL1n8!m(KLdu9~shC<e`r{CxHui(=x*q@tL_+
zYiaCFR{=NU-1Y{Tj|Re`VJ*_a`iC}L&T{Dj7e(6F-17{&T&9<@(wQ2jM1RM;;R3Jy
z)kDawUGXv6w68nNm|n#AeP8LgzcoID{qkYp(j1l8uZzDOZoo%!L@=;_O7qKN*1-+X
zTRwT>1<pKmnK^rmHjfu1+mJDm!vTA&-i&Q7KNz36n=^z09s{msktTf~n#gx!`F-KY
z+tAsUx5nPwR^q%@MvV0nmKPj;4tS*JDIO2ma6)t4O!y#hIg=;LId03g#!quD#jJyz
zJ51frdBQt#s%5zHSeAFw7e1cf6F&=WiiYt6z6`R)atFe6@kAx<K3&lnMZzUJS4-l(
zwD(LU;S)dTMTh8x&b_iD+SsjhZxG))kp<ne9z{<9_s>zcDInL2v}53<;I8t-Vd}|3
zr=B7Br>3)V#)fnV=>o5Y4uWd}>n!Q46ST%1=01aQ`f3V&i?cyarHQw>nl(}Dv90BR
z`k#eg#V-b3M81TPtDN|`EI!9h=IzDkMpruV_kn39xS0uzYnY>m{X04n9DTpIHQvKq
z{P@V8C$MSPbiT!hp!3lmR=+b|q(>LxwDdl$S;pyo->d6=^vxdEAK+}xWXI`!>U&M^
z`&-oud>V(&$Ury`{(O+Wo7`Q<*U!RJE24i!{-l7_xAw%((?3IBo-4wG*}KqXSl1z6
zGVqGl{XX=69{L;j{Z7m5pWh2U_JMcSQmN#Qu}?<xdx<^ShwmERcyNUJI4eQzoTMG$
z#DEigckRb%<Cx)mqb$7Q=fg~kWC3<GeB!!e;0QdH0bcvMKE}&n+_i>$w5Ks7U0Q34
z6g0CkH%47+$V<B}?fxotw?4kLT%`V{5&BR-&+ooDfx%)-HsMEk$M?t1nrsl=`deGe
ztB_f~a9w0fP;U{KQpjKJ-`AXBdCci8$bJjie)+*jda&J4j1s$i2Ah@HSiy!~(YjNy
zD@FP&e$jj`UYWR$HKPYFUW+XGohh;X<l#v7%6;$k3(MTswf}K&p6JclUUUw%yMuFP
zY1gbMqr1GVbv^o_DP%bdCXuU-hYW359y`k<OP56>*Gx^rQ)$MsJ@V#s8aq>?$={dA
zij4RNcv<HjRlgFrXisoiJ)E}yA2%X<Z@6qx*+(weuR%7k|JlkeL{6+MF;-4Bb}uYH
z?!gb@p<G{R0>Q}no%GWx0;3O%8T?_zp=`$eUPW><ku%+eP%=h!OU{_i6|vfo9ARyc
zPS!R4LUigv`f-0xI?;Cy_BR@LSDa!^g^ql{@|kb3pP)-)r@1k*8M_?|gqxKm(K3s_
z;@jVYmdNCyaE3l0-6rkzp_570u&4dH{z&_I?Cz=^tPTDdn|w?3ddjD-`fR1~+Rs+(
zhC`8L@xQjpcaujREoXiTPM`)8w?%*9714cpYDMXJ!IfKHCZ6$~TF*Q54g6Q}!@4qU
zf>KWW!`ku@V38hWyTrAiLv+&j8T|ITRbBH-{ucZWTM(l;_;0E1>$_#coW1cX+M$2@
z*E^j5LI2tqHz|18n)tp*^VAvk+}7ub?_wi8tUEkUZB6{+lBv2kY(jAz^X7kCQ$G$o
z2`vqGB>=b9zlL)}s%z@IPHRowG*VqtV?Q}6S&;VEhM6AL&)7Abo?xHu4%Im*irtdz
zcl-~ITU!^%S6~d+*4905hvqlEWNkf*vHmP@DBkC}Jn%9H*hT8kekimG=;l2`<%Zk`
zvEi)&pXjFfEzHN}KohjEJmfq0d#-@o{V1|1$2)VC#twRADFdw9t4H2_$mNGJ1<s`^
z0yBR%1bkbt^`U3;dmgfpnZUrElAJFEt{bSESiMq;x=BxDU}Khd>VD3{o<aTJ2Va55
zII8Jgmbt5}`Auu&iL8-LOK&)`%85sAx8sqAtXO@UC3(e|82%XR=C#Zb3+>oDV#mV|
zSg|)?F)we8Kg#+|J_L*L{3!l^lMkZ#$TaCn^E<HxLDRMSSl@Y^gN4p2n}ci=^Wlr7
z2lvJkH8vT`P2I>|i#EZp&M?)SY=&9Gz|W^?XFL9J%?FzQC$KIx$l9MFXMYBqHuu*&
zPG3$3k`HUjDQ`^@U#IywQ<T0Vzg3~kd>fhI!)4R6rrh8%r_!eU7ai0uTd>wkKCnMu
z;9S7~orw9u@2=_rhPbEH0?zpYr>f7&)91p*GHbE2HG(WJ!s7<nMEq7F1DRuWr(%|R
z=8tgRV}Z3k@I4P5R9>-(vi~m0a~5Thc4%vs$61=xpUSTbCl<Ga{xarc@?k_BeT4O^
z*02`;-MDJis^h%>lf#}Qo)^dPQ}EyfH$#hU^CNz>{x!VAJNF_7`ZbTe7rC*+1y5P%
ziay)u?f%CUe2ks5)aVWV<4X9{TcB~ZJK=H3$$tfI$KS$w^LwllpNn@G@dPr)41}J=
z+%*zN-nEMdmXP-`pLFj8aXTlV_43j`kfwESa?cSm&GJs6C!9*szN0kqXDOH1P{x%z
zUMn|W?Ojw3-5@D9?-J#(&n4~6y+pacs+IFEQSK|Xa!Cx<MeSj?O4^%wiE=B6A67rd
z<M|=-%l9vSmF|*S!<bar+{SVkAd^@RnBcDX2QQ2rc)qwN{uy|dewM+0srb4MLpirM
zoC|+yonmF-wLEb;<M{1<_$8Tty+T;$J;gq*%fi3l)MifhJjPz0I`W){Slk-t3+Ofh
zai$}(X~W0GzHn)taVK4K9G}1k&5i!<e{4dBZ1e~IaRqu_Qx16ooZ^kg3Y^Uth%fF6
zo89Lsj`v)p&KKzd>mGQ5vj7vGSf9VZ6Ad+<z^|OpNHI<q)0VrG6I`#QT%9NC<xbYh
z<u6fA>m%{f>PwVkA8pc};(jh}kNaGcaw{)U?k{WQa+fHl{WWTD=_Sg|CU*5=p5T0}
zcJV`9pRMzR4NuJ7cY!B}?>}IWjn8`EdgSx?V)3)06QGB@gb$?eO7_fq6#6Fe2R=Zi
zOaAQk_=fx$%5LQhXwHy@#sdZHj{$cWK>JS`?kaGR(Tw#T??2Mtdtof0{{;N`qW^SY
zY8L&28vXNo;@yR+TxfE?4gJ4e*#U1zE=&vt&(r@gU>_!LGCz37D-HhfWZWn8r~DA<
zReC&!On{FlU#I`(q@3i%3CdMvNkV_h4P2sJo&JSOluPJOxjQaVu1^0?UZPw=f68sR
zM7cWsdoEE<I^THu|1oQs-RbG^E#DnGyZ`yI(H`nd<fNg0?&h+gk5;XZyTw<klle-x
zG2qtn!7;emNt#u_FD7{Mz2$SzQ8uS0?`d%KbdqO?JYRt?H=_@1bcqKr_oAoWi)}ks
z8cfP>E-&rnjB|@RkSA(OZ8X)|xPv@PnS)hFFLi9bsE!Rvr>xqQT+x1x2HJ0`wZFdB
z{>Dp`y`41igw{aSa>prG<%##dLb;nr6P_e@RJH+mW7YU2r*eGX=%bs`=9kU=#6aAi
z^mhyExC`wmF6csg3tyqVH<5Osoced6+}u|vcMWOkR}TE<grjlr*7>`OJUMiV1ZLpv
zPw;y`G^)bfLHZ-Y5wy{L-8pE{RLBoM$T!)8MR)1F=fHmhJkgN9by#+oCTwfxG^SaD
ze+pe(>z=Bt=?mWg&rO>*Jt;3+%n@kYHEnuq7jFw?1NRRP#OL*J?C2kyfL|ATjOkty
ze~8%QrNMZ9<$k1b{K_7dm*v+Fk!A%K`1Qv%er+DduX*x_*S3I*i~04vN%<}1#rrr{
zPy8BO;Me9FzvjrZcpSefW^X*tFH!n<er4S)er>MtYqr+D`1RtlZzSzJA0*|DQ?AOd
zvtOay>qz4s=d$#kD!-nBU#mJ#m&)<|0>AEpUw0+^N+8C#_Nx3^Z}0L~Xm2uUF9&DS
zE0nWHlkI2;_+26#jf1zYqy3CHza`>V!F--ycfqe!n9q@(@GG=YEaVbs(H#6oe*N(!
z`1Qvx!>_;2nqnsHU67G4<+*pzW-_+U%g77zU?FMed9Kh~J~NKz>N4t$<f-%A#qw>o
z>Nesvbb7{e^SH79x>qRI^$O*F^%crp{tD$Lze2et($337Bm7*zfu(ZbuTYnX+yh$W
zv71ZpfX6h4RQuRlZlZs69{ZQ)t9a4eaq(FAF=<H|a3b7{FBiW;xql!{`Lpm?w$5YJ
z(KK!yaFRT_KS407?W#<?z++F5Uga_90gq)b<}v6jnRo^sV-GQBE?<y|XKFl#k2sNu
z(#xHZzVKD}4>c#&_1^47e=8={k)B@Di~kH6D&Jv&^E?*^?ES=lsF-8ZgTJFN9CsCm
z<7p$q@w)B9tmTH|cVc6>61pg6bcWeNNYS#0_5O)QzOUtde&^nk*x{bpUOIgI;9D0R
z-{qu_Z<)>6wYmPHe9){%%c<Nf=4RIC(6PzLzkz%YSRW3vujglDXKnM|BvwhWIp^@L
zrnAHlkk91rjc24euPlfCj=w#<Q)im@KjZzwjyaq1z=PR(hW*RfsJL?#zwD11&Dl0&
zvDS(Jd|<JAAM;5V3HA<uQ;Z?&l>GBbH(t=nGP7N4Q@i{AioRi2YOcn4Ez^17N7v$?
z{nhV`oh6KJ)B@Ht<(GJSS$kaYuU+c}(QWtvTyr0L7VksX)tN=~fj-XoUt?!~fbP`c
zZ35p_8<F6^pE^4EwOG|y2Wy=>i*@c<t$F$FG1svCWj#jUoqWx%0)FWK3G6;c6|;sf
z@Gv^ssSL7QF=?5W!AAKf(6?;)z-6DP_T$D<uN&+mK4E{4`TChxkG-LEuJM{5bqw!`
zy#jUih%WCfS+r%-mXl@Qoxwiu1y8Fz{A09-pZ<J%&nE3z2RDvuFE_5en@c}UVjwv4
z$D=;tujRX04Q}Z(sLn;K)lS((*?XQ%eD(>P#1+dADI2tn|BU#kqiOP3*cLNp_ZjJt
z@>N~|9aH`ziLVmAjvSXZ+)XcOBk50Y=b;v0w}Ly%6FQ*>W5%Lyj={&3-xMkyd;;~S
zyltn6Ek7;XDUJtN@hvRE_I@*I8&CIBhS-+<&HUX=e)$V0P?z?QIHp>U%FAXh*!z9j
zsnwO#;rAwSNaq@BxM%z=`@y@*vlx4_#maW0c)AXsxKHrX`4qk{%Byeo0^twe9Q7)%
zmEl{8SUu>SGLOXIsNF+eXpQW_9}9jHJ7f!V#78Q>-ZcD?!kLvD45uMOT-wUePFoI}
zQ2^~}!#YYCSL5TBXvsY7-yDkPk(XmoPp#|OTJGG6ZiNjI{)luA{DNz?mX{H$`2@I_
zhJAS^c3JuR(#!fPZd+@dUUNUOuh>;)wKC4b2!CuTy>C+mTJFO?zCR5<WmkirO3U87
zwLFu)r8@h=V<srMZ8q_U{h{hv_NSyFbFJ<zNnQ9@7~{+37dpD^S4o2(GTl}CfV<L(
z>0?>`M&gb4FPN+|rOW}@r(aKOu7^BO{CzWhng*WQMzH4+W030E6#515Qee+!54MD1
z@ZAIb_HQkl9Ou$=ce16v>ntzulmc(7b3^gWfVC-dP;p0sCFNn`5`PMw^{q;aY*%O5
zn^E^jTP%Fl@#M{?Z~Sf1UwvzUmIZh?-8m2{29LH%F7`={eeNVUP{)yFSZ9%Dz?HS2
zKUCbBdt^%NE~fq(t}@^%)d{|6!<&V#Lwo|>ZEUZ#HuqiJW|?|aK2@X-;5$tn?h){L
zHQ(G{iC25u!QIV~b-n(s+V@tw{Yn3^;h#$7_MGouT67=Re`MA9{tGt2^>Y1g!lpW|
z-$(0xs`i^XjDA@QwuIPZF7*2v@CpwS!$iOP{*U{ueS6wZe!i`PTSA*Q(#ybOz?kZ2
z1CJfC`(Qd=rm=;ea?IG}G2(Q;kylLLAmeg{=GRBZ+=EerH5iV0hoaQ*#2A@|y`#VE
zrrg-4F7b(->o18<41AKxZJ}<)%ij@;fDJtTuEpiKz~bYF@QFD~=B(kNxG^8>Gs6SK
zF7(BOaqn*|R>zM;`{(%z-gy!pa#MD!vFD~*;|ArcjYHLsOg<nuh(SyGBG}oxK|hHT
z)Vu+YyE~jXMQo1`e`|k{{EDn2k7gJ@y_4}n!;j~f_uhMwF$L~4r_P24j6sedOPDW8
z%W5=nph@~o__bKq$?ja6Z@&yLKH5w@hB>nizXP1(^J+d&e#MWD`F6Pr9<%%>DjmS@
z0l$sTg3TYfr7;nFIRo#6wYdcxHA@zD0*CxxiLT_rAH-!X!Y}m2xAupJea1MnQJhE0
ze*m6bu6=0je~He%o;f;QiwBe3z_v2_Gz!l%JnFAi^uhvd7<bJ=%Ui~NDBk@Mcp$$}
zzOs)HD`A_K(ntB;`i75`S|)!4d7KTWdmk(Jd3}gLWW!JH(QgTyA`64C_pOUOtM+d3
z-aD!G{Vja2y<5EZURL}5X1>?nE#7-GweR!!UVFEA@10ot{wBWH-YwpHn`_^%=X>ql
z;=Ol5?fV<~UVFEA?`^7mpU3ywyTyBNW9|E|^S$<N@!s1|`+gnYYws5Cz3JNbYx!P#
zw|MWx-<IHEF5heK7Vo`I?fV?Q*WNAOd+ply*?h0PTfFyLweQ`0uf1Em_iBs^&pzL4
z@7NnW`Pz)hFO*KiiE2Fc_h8Pk$$^Fa%28Sibe!(p3QrQdsJQ)FzNYY+_%`%V>W-Su
z?K$mauldm@#>UPzWWRo9yKy+DXF;g)c1tH^rDM)uY+v)E-Yn|_<a^r8E!oDmOmRnx
zUEJAn<mkDUCwM*u?>zX<p!Co!8$y%2{Y%pG(ph|To)<cPXK2ioq2<mv|Mzvorul`h
zZ?>(L$hsWfev(+e%ZEyqc+>Qhjaw?)R%_&3$G)HIYTw~U<44Syb4xdoPyS#p`~-iS
z15>^glxC-gL*wo%w@w-kS4@4BbM4Kjho9c#z5>Qe)Jh)qB+OVrzQfZW4eezXa?IRf
zig(c0b4i<4!?K9+c)iUp<*(o8j+F9dq_iH{B!BL})%>PE7OhfziM2WkiX(tLQckt+
z3%R$bM4!$K6&YJ*g#PXetp@rBoW$6oM|MlzkUwx*-ujV}=l9zaku{#TqRdd;pYgVr
zQ{b(w$ov59S~5YYn|%s=8*M`_c*R?vY2k0bqxWgo4xV<hE5lTKZ$P{IX!qe%HY`og
zt}HW$?ayR)2roz5fZ6lbmVM&bTI@opyKOLmF_T?e{SI%m5N{~|s9^6VU;Ukv`y%VQ
z8D;D8PMf~l#FtFjhirl7CDB~>57qgBWk54LfnFO}wh1iN<(Tdg{cWYct^7Uh!J{MS
zpQgP4J}npgxAe|XKI?5eXrp&F@AE{H&$JCjlP~Xu&jazu8MQ~fEz~Psvyj^@$l@03
zhT)QP<93U7Ec=RHwQ<J4AhfA5fUEtQA6f4TqS@d8-9+Cb#nZf89($P!ALJJ*-@W83
zcq64l=%#DHjXjCIXLF}a8B5J+oz&Vnh5Av|XGi+G-qxgdBPYdEEeE51%3I!Wsh+0x
z#gF5^*~?nsOZczG?{!!^|8AtTniw62`R0*>;LPira{gC3gMVw;Jq*1>I|rJ=6E<V*
zJ+#?FpT~-vH+yU->U?KMIOCQMH)H0uWX!cK$oYvHlTN-f9BMyU8oK^)$+|JYVGH<&
z*8LIsT=VduyBWhlw5|M5Xm>W0hogr=ljrXhf5<qVA8}_y>li$36G!7LJ)$vm_1)n}
zDV_U^up$44;l`<brH9&kOM_|Fz0HNv-EmNQp}4Z#m|5MAe!0cA-X8_wg>lmZ-Rw0D
z%#9n7Ed^-Z89oAUXL1{g@b^K|zbW`ksF;eC<(uK_>&yo6#|gW|dWQ7pjQE)}crxLA
z)+JTm&#f)H#Ns9VpDvW_&MJMrIC(hiZhIi?55G|Q;^d+w7?Lre{LHaFuxngUe_44Y
zSH|b{lrO%!<de7M+WwNpjq-M<iquzlNxd3JtRLI$HCDOG`{(6?O&n!&19HQdYokf$
z;PEvMb1pRZzliK;jTm#)Jbr(Pbk=fnOEYfC5dV5@3;fjFn;$Oq=eM`W7c9I928|o_
zM`;?18k5Qc?weH}o@=*0FkAvh?bMTuN#_IGmA6IX47qW>uFtgfo*#><Q-8nZir%FD
zSK_tR39l^<ov<@xjFu$h-$nb9=hkxelFlA1T{*u$IUlcc`C!RgJy<epg~LhMcUA$*
zjn)g<2g?rk0s`;VUqoNI)gwKBW9a0b2<v}a4UD;O@PvF1Plk5>25(X>=p+uUv!3VT
zv`1bcZI<;4<w$D?cb1T^&FSTw3-bO!?hR#LWNrPxTl!0VtgmMs8Yz7bT1f6gpLUbb
z7WfVZ5q`8$edilp3Y_|wcqixFIK@?=UA)nZpHGBuyELiXdHLO?N3uI!c0629y$#`D
zX&%2--k1xYTx%i25_$^`$;x|xOZ48vFSM3SEp4HUzA?wNi%!2onR=RJSe?J#O_|>8
zaOso$_UE>jZsYg&Nw+NzenU?{Uy!`)^+#G9GrMKsv2!hpc;<tvD`zo>&;J;)41Gn*
z^@_%HR)785zVs?|W@KcqZMl)1E+9{fjO+Xq=>_)G-e|1tAoyA{g*r<!s7rCp%ba0k
z;BDm=_TSpwrYb|-j{-+nw$nN7>Ac=b<s$lYePBis`7QnYMRb5`l6iYs)Hg8*QDPk8
zjwGW?z0C8_B(&3Rq&Bdhw7Y-*5o~`;nTwZ)E^~3;#6n=aTfan^eZJlQsLE*$u%~v?
zt_LdmY;?3KqI0hwl)ynrIA8*77W_89%8&kUsjOvuwW;}|Wh^x%B0ZTKZL2Ut>2}w4
z>MhLXy<7eKOsYS@k<u2<I!F1SWzqa|7V}k0p$pv49kHm>veE_BSz?VxThifb^ICBv
znUCHzw_kIi+D_K{^*KrT8T;qwD7*Wj`HAw_K-3=92G0Aa2OZY7uU%B`K;LZgmY4h9
zv`Bi_ftK0WL=FWd4?RYDl5Zo=z_;M?phZh9ZO9Clx=DKk8LTwTUBT-*!hLVjyfvG7
zYfj5sgg>oKwT?;A&$f{k79-8}9P--zrF~QSOT(;BZ7T!5mPNh9`+jkHZ+E{RbfXWK
zKI0uKzX0v4bI*$Nv`=t^zF;5BlzZC(D@YBM_962>LqEp+j~#;E2g!3#e3{^q@7h1~
zD)X_(w#+l6Jq<sU3-FHSVD(jfUIWj8pYjm?-+I3iJ~?R01!xbCIq;Z`ZISU=AnzPt
zu*$$qT8je@Rnw3iTFdQwljQwu#`GM?=4Sigaq>UiN{lA4=^p(y<@0^9{8sT7x@N0w
zb+<}ZsVpDb#UsQHBLn7$7u(?%zRNa;e5lp)nN;CCkLlf^@2dM!bh$pE%ff^%(4<sg
z4wU|2%|@4pCf;o1J2cVyMYQ<u-UDU(3GpPcimYWMqxbQ?k9W!BPS!u2tbHVd_wl}u
z_eXelW{*g&wqQqV7ah^zwy2K!7#4h@q3HJ+bm*6(9rADV|1BM~C#p^d&5y$6SAj>k
z{PTnk_&>>`znvOx?}NVJxAX|#>oikbmfd+gdO*M3Pe*t2`=HX%+we6+izk}1Hgdnf
z-wi$Jtc03b%{`InNyh88LgDN8KV?|I`5!FH=ZwsY_;yBnPE@9o-}hfs4tRDUbT5?Y
z38O~fQaP3R`-}3!yGc7=9$%)`j`FY59xmkD5z1Yb$dL;$!b`gz8efjK_y*o{iF~`P
zHt)QZJc3~zwhO^A$z1cJ6l>EIHkz#0f*oYfRC`))^yw-1Ou{{<GvpJU$G3m@W!fM7
zf6)H)i`rM)vXwB-TifU#Hs`4+9^-GDdYQ+1Bl&yVRLf(G(&r}rW=x%J11?j;V^@#%
z-d(^&9gl0q!&AfKWfYeFWaXi2j>iq6b)MD;#92--XQ!E+XEMo|6&v~87|$bqdK%|7
zba1}JJbz=ngtWXrh`xL8nI)v>lD{{`YqNUa$lYW+W3QHeGk-5l{@xgOk-n6_UFuuO
zH<!9r^0!~h>+|<q@~kGUEopNjzZ+?HW1Ow!$@2H&B+tfJI?A~P^h15fR{L=?{YcY~
z?=(R>ooC#`IW;=Nf_JyDgR?d{>q0T>#b-;jiyvV}d?5d9Nq3NVygzQ9E$M8DnY{nC
z`)rAJfscBqcM0!Zdhe;8FEWdFw>TIt=KEaU+t|ONb3Qs;>MD@etDb4Sl=O4G==k{S
zGS~wh|DI6$+{9ClF-v?O!|=JcU-P3be2jBHDmva0dGdEapT?ehLe}T)9zMvKS@xE?
z_f<ISvz+pR($nmvOwre;_#N@TUCNqP<eh029mg6Na|Ny6KN~k=V+m<n<G>lduksx4
z6W}8!dtXI%Q{q8m)t8KqLh$Hc)$09PQg3yirsLgLQF^jR4j&17OXEjt?F!z8>p8o_
z?~g|OClmQD7%lkf;aVPR0_zE2YXY9%!S}av91N;g?eD3z`#FB+ldkgP+r11rV~0%I
z-cFuR&`0@5J;uSgP1rub<xB>_dLH~v#@8c0r(6nrI@BjV`E!>&o2Dm`3Cz*u6y<$*
zNw$ZSPamOm@-6%IGmjuY&QZsP9Qe!U%1fyyox3MQu3*RfHaK0uS%`b5a?YJA*_#7y
z#roRB3L`^Hi<7^1R!sKZ_z$2%le@K?rGCXbf0VH{(-mE?9lMHG#%BW_8iApoal2Ig
z0<NFE!7@ufHa13#rg;y)8oT0+4^yA|BYK<Mj(A-QG>68Fi-)x@qYc=2pH@vDh<oVI
z?iQ1*)4THct?|ohpMoo1%c0MDRbCTqs=T&6p}A;tU5z%g`5p03CNiUmy@4bC6Qwlm
zBb!RwlJ=|n9z;{oZzlO&`T-ngJo+K}2%lX&+hVU%?cWqh=7~mXKjC@s*p%>lFZLv@
z6}DFd!_*oKEGEyo$RnL+W0~KLh%awJ@4mW;zZGlV#5{nlnX`f#SkEm7wgqKiM*Sa5
zr#Pz#n5|Cer+zpFJ0I<-57${${ISoaU1>IHqO;C|$Iso)nXU=FF}|R){H}Dmq>d(F
zfiKJ2Gok$w!pVqt5?*x}r-vf(!-)5Ua0EX;fh--2?fhZtVs6TZ@WM?AFV=DPJ<iJ&
z%_QGN|KRmiyp5lyn!K%LVoqN&KZ$QG#`73+`nk8kBgLoVo(J~EAHxpY9NZIjiOzZO
zTmYxwTYBv8k(OJyH!VNF8s3-i4lbKdyf}7NcY1L{2J=!O-k9|Dxsu)78o`^4<Dm5W
z8TQDk4_USQbbKrPX5mlQ`|I@X4>-gzqwd`tN%zYd&V_*IO(9qQICU86Z(>iIeLZ`p
z{co0Ln$6|yny;|WvTiw0ga<5-GjaS>;v2F(Y{bwrmD{XylG+>mBb;^98l|aA^kXkX
zWW6qkB)2pUo|2w34<5)4h$luZ^NGk_GSDjAYTv|K_^%gPpu8!wS$7^E7;&E~IbN!4
zw_9cFO{uchZjN^)ItTjXw6?M>z49H{6|;e(dPlO~ENuo?8b2vRoJ4+Se2lrrEUu;*
z=7gqN{Dg2|H3!lAgag_f@t<q4t}aZm-q_#TMEe<U^HlJ_x?^+t7-O&s%P!(2sTaSZ
z-P{tjfv+z1%T43AgU99Z=zl<dw}*XA`CXO!d2gV9PIgyCdXC1<4e*rY%R-&SJTAR1
zd*4z^zn<Sb>B+eBc2zWnCG#bFJ=!vbzIYCKRIk!}-V;79Kuf-LiDw7DerEACmRSJh
z7chVvW1Fv9+`mFbjep7KJkKm1&ENCD-;x~XcIJs^LAIJ6<Qcs3)$GoaDcl!-5`0=F
zUp9-o!mnlrOBQJjImXoDlckT2OB-4I1o<~5bM5Y{E%Re00hhkGZgtMJ-2QNy7evPz
z%;;j$Z$_4?{bRI!EL&~+o8(Vrk;THF*;!HkBJ<2w^nKj7zvA12`c@zx=WSX&;0YOz
zOc?zU^PA|ab6-?m{KmSpxe1x<7vc5dky4vK01XGA;Q%xoh`V|Q;y<KLFS{e2nI9-C
zW<}+6=A!08wW0dq_0bU@y#$#AN}EN~F2;<?sf=PAq-%J!{t3^*w{YzucSro=CCwQw
z<<Tpezx%@2*$KXAT!>Y#bb8J}g*T6sTx5^hQND@ExXdMI4=G=hw<FFX|2w$rL3yiX
zB?m5)ReMduMY+UjsZGmU5ejC`JB~lVxD!5HBe-u1)s|?{)kEH#&cUqC4aVFPYJRc`
z$gMncBV(use9X+UcibIL<^}QU-QZlf*ut-5x8R2L61o1<+88(4u(ke8v}y2y66doe
zbLhn~_|vueG<OM~Lo;i07jji|Rl#jZ&XX_!aAo0v0{zPc7B*n)EkWsn&@z?Jhnim#
ze$EmfL<|Hn_ta<nG<)CCkNn%?2FikyQQ4NEZ6e1suA04|^r1vg$%&@T4Y{@0Hj=$x
z?TwU4Vw$i)JJhFfC*D+<)#@u_Bh5FhTQn9G!?xmw?=H{GZ!LT18saM}3*7YMeas=b
zslqj9Z@Kq`9mFg&W5=F}PgwZ8mVOvFSH6M$4f<QLGmF#)^Nh|nS;%=%s!zHT=XRg%
zC{m6yB~w?4XNSUR<awUE<F&@n-);PTj=xox{&xBMG=FQ~mHt+|4Rc#;{AYn_MRb)}
z(aJpGSgeik15F`L3t!es*^ir3IpKE|^LOwxqUMxf5PZJ^d}))@8Mf_R_@oUwqhPJq
z$>OQmqJGN^l&L?mvIT+^#+sME2mDxF32ex#grDBYug<>v4etjDJQMuBLsoHNIcEl*
z>9+=o$(#%Qnv6vpB4?()mAHkL{!r)WR&|d)om+Zf32-SUiFqiAdz{BwvkP1)HhXf1
zg`F=b9eOLaTwp&#eYyiAkG~>AKAZh|R(=I^xiPva8?>gWV;=Q;@Hl@vv-l={FJuQu
zTOOJG2l~jfh4!OgCmq~0%Lmzz3t$(<axRE;#=c@Ih2!}nKllr8B>1B8EPun+Da41k
zKl59sS`!0ja>kjWagy*AzwenWzLjh&pi2;!nB5u|fSGfB*}EqnZE{A$E}c6&k3L^R
z{kGrd%=5RVt>J<V&pC|2X4_1O7!TNsq)SbSQoPS1zxtKLZh66%C8OR0J{{>+!G}Wl
zl5+S)bHTmndC>&w(%B2_zvXZ2-TrskvkN^v_{Agsvi3LS+SBj}{XT3_u7mx%O`I*1
z4gx1L+%MTkmgSKh1lF(dt~%|)hYQ`{@G59AnKW!!TW0xN%gK3h@RDLz72lI#4eS}t
zV9=Og4Bdg=qVsQz*B5rd$Dg2l3*~<oowSwT4b-EUSm}^v7+F`1k!)`phMpsVV2n(G
zIU@)n@{B6xW&&g7;Pl?ozYxc%Jd!!}eDKp~bx&*%75%5;gWglIT?k6WVR*S#pG930
z>3_4~3>o?-TtLGUwjUgZj>&mdRbE_Ca(eOw<kh`8A5C`#Y21h=KKtMs3!5<<1Wprl
z5&X+PLL0th{s-c!Op+X1e17h-+#u3;6#r@cV1XavM%ZVxmNo5)68LSWKF**dhBqtT
zAs&qPRVj0JIeXo8hnHj|JbS)g$+hwIdgJPCqTVLz<y<6W#4S;pc7?m<nq1KOL9xW>
zmhGy)3j6K<0rrdAXdKr@9d`QEUYC*R%A>|Z9zt)$g0A=>a+kBez1LdiziYk5^SeCH
zf9J)qJNfmQ7w`9=BYn1V$ZqN7;A%hpmTe;C@g3j1^n;nXzSEkYnXkabiZW-do_-z~
zm?jTAIeHa16@Od)Ph-ilM*3`+lT-A2ur_Bir+-;?al@RQ;1Zpd2p!&Y(LYI^=E%=n
z;WGydwrM%;4i`-DiC|pHd`)@cfTgb&;*MMa-G%eMc)-KiY2(UIW3KO^4#^eWLB15&
zY-_n_(Y};4or$LS%%zmo{o^?vomHGGa<-1O;*$ANwS35nX#SeL@f`Zyj6KNV{0_x2
zLh}d{O7l{8IHvzciQ|h{!yzjai@PGaocXMiGVq*mHA-xc_?P*N_(9H`(b~u6m$|#0
zd1cflowC?bRwTTlZ;ixHHKOk{dB6@lvVBc6LuaJ#DV8-wy82`|S6^+sTz<yi==r?<
zHs++ESn;bJ;6T2|Z!%Y?yl~d#A5TvpPNTnjxDmXkg(u<Ys&U_;L0USN?1w$9`x9Nu
zT~n40X92GVpS1yRlUqO!D<n3vMudiR0?|`z!ljFut49*MViNC~)%={jC)61z*dgP&
z{M|%7x?4tPohE0a^q_-~HVvDV&S03BM<x}dmzdEs<4xxw852ZTgLBT~bcoxv@11$2
zf%Y~$-;(j|w3X|%n}@4@pJ!*V)`ONd<MVUIIZhnhGa1u=T(P32$hw;~$dISAZtrC+
z*Bbp4zP0>i3D3U{x^=O3H6HT`vR{17`w7W()?A?T7Id4zGWX}|y<~#mQS4K|2kipJ
z6=N`wqvXTBeN<;FqGvFNJ)O)a%nL2V#<vqkGis1e7X7lkr%!Xn1^iE}RDPoc?6&kY
zt+@+EcvxLMr_)~*H+v0bjm-!0PnNz0+!>`)w{U|#n8+#sV?BHl`LROhD)KEC?Ptt+
z%sGx5M%(7i2!)?%#?hD?wcxijZSNzmZ6QloW77xbz?1Rosl$w5H!f85U6tc+)<$7;
zpZWlu*3E|I?m%cf=v3>6`XIiy{GWiE70Fs6t9<Z*<=+<K_lPuRj3;_Lo#;0cwBDzj
zzD-DI&KX!ounka8lgb*}Ko=06IN!AWUs=;9{NvpgYF@PHqcyQ3vbopf`=oiq{U`0Y
zi_kNElC*)mJ6dF|E_;CO0gHEQ*at5t-%nlqTzu!;m+Ifz_vl*T5Z|QBs{Jay&Lw@4
zf84kyk&l;0lV@ehDgVg`|6a)|GFSP5!<^HaaW}<g!loa!vG2guK7=BF(+A<?ZB-tM
zSj(Q8M;lIIfIZuL<7va2%i8yiyhL`aWZZ3i#`Se}PT%oq-inj9zvxiP-vmGR7rVT}
zCleimIymbf!cKV<9xHK{9`TpGVJ6=SE;%0xeb2G(tH>ve3_~7qPK3#|N_Ht0e*)v|
zr~XIbwdDK_Y%<9?zgsMSU3i$YO@8X%!Md}awp!=#ZpkQ(Gtp!x1NTRpX~$W!i8J3h
zgC$G61F~81^4Lz8j?Cz5ir<K5noVVJS!P~}USQirheuu?UJQhnP0+TloQx&bj>-C;
zxvy=yWp-ycxS9FxMTF!qzfbWT;rR;BgFK@=_Q$LCOxYt>zKlIGo2>U_`@Ue0oYGv?
z&nNM#HP%R0_Bzw9wV>s)e&TzRNtNri$6>V0nE<J|X+Z7da-_YxESuvM;B!N=#@-HI
zR!QbJcVWj-z04==*mrB|%?s`S6dR7_*ni?T&F>7>3CUV7o2>QE!*Pam@t^VlLbBFW
zxjJ04_=x_Qz^1vk3mJcZf(Q22Xbwg;2}a2=&8;qTs@4^@{L9%BbCK!S0{``&sMU>~
za<mHXOY!w&4c<fi%5Li7V|i&kgVzG*^@8)(T3vNqeyvtk_DJann^{=ZaVfg3ei^zg
zxdh!Ftko6ptG4bQhqv+c+f~a~$J2Au#<j`3`B)7{!cAfy08b{L>^I?@;BDAdw$Z=U
zr8IWoG0srV`0#~y__XWy#&$N4jyU@1T0fchN7pB?zSQ3QsTvHQ;8*r$-Q%NiQ?0Xs
zu~M%SdoFc4)Kgyz-*yoWKX6fh*4O$YJ8f5RZ@i(XHTW%2rg%>%x;yGmf%@r_-BY!D
z%*^(e<zEn89Cvpm<#BdTt=^^l$_^mAUnAesz&4!V_LfA48;{#XwK9o)8T-KQD=yeJ
z{%>HprdIE-T>_SGybLVfMX<PaSg-|6TZUXkw#p{x<abtF-sKl_vO6p4r}{5H)8twm
z6Zt&{eiB<5G4z_Rq#K0ezDb6^2Dy8jZ>mFe37@L#1^Enl|2e<1_n98q>$xYV04=iH
z6WgBbTwZ=hEL*gX>`wIrEy=u#4IlqQqnF<_)#Urr$|qYnG8R1(p8$50hAj0kH)y>4
zn0cr^zJ5r17i@g}_$aYi(y!!R4rE!?=e7u+dtdx4c@uvZHmS{*SLwDM`GKf4%p)ex
zBYEN%sybfq(Y<j1-sDGg{QD{iZ!wQ(tiZ3R9oT(#b9V-K0@hK!M-9V4sfRKNp9S|-
z*72@2l>CJa;6k|iQVmys#_v+nC39cms~drLYreWaBG0UGb=2{_uU5w%exIk$NqfMk
zy0oA1`P|<4e$r+DSIxhvGiaOB<k21p>G`s&&dhF1{6vCLu-#RwcN4!V=lFM)(r=zo
zzU;ErL`TvX{m#E*v#0N*TTR|))7Ub#6mISCHbT26t?_LzcAD$7+CZIN{<DnL8>8<+
z!<G2pz&-FCFJ-w$2VSw@hvvU|nfg_?+F)#xujb=nzFdq^N_3N4UC%?E2`$kx5+A1I
zzU04ICY@?I@virTI?on;Bbf`(53Uys@@HwR_t)Cj8hgZp7qPJjE{pvk(wl7eL@d3+
z__E6#iAOwqDZs<n7<FBIhpa;t=OP|S<eWKy>>P++O}hN*w)uF(9vcVSZ`J0RNn*&F
z*Fs0x&3{Y2PS%^;3oJU7)b_O6y0o7-6XCwi+cDMkcTDB`RPID+hnAxnD~;$H7P`ha
zles;|9Q=c+paGpYjAYZ)9JB$;k?@toZJ7Fc75_GCy)O32)@|A<qqVK#Bs9NT;7dM#
z*WDHif0E~#W7D;H;(|;c0B&M&6WTsol6{T3+XdhIYw$y>_Bt+R(7z1*l}%gpVNPkL
zZ^?VT-1Rk@&=Jnt-w}_w>9XY>J}vqPw-z{*ZpU3(@+~H9T~jMFu~wh@BYURuqZ5qE
zpKRsUB<p?QY`BIq$(=EiE`y@c@pzN|qxFvX=C5TR$XDkI^-JTf!Nb<acj=mxYh_J&
zMzIMF`9}N`rKP>1FXO0iPbj=u0sNOuWC`@+T&SN{$JN_`U-KFAu5~f62nLPM?_o=k
z{T93XmR+d{VY){$F_0}!K9W&e_aEg}!I$5_|MevN_hkH9%Im%vjb+Po%JR$F-p0^k
zjqp?W#&tgnzkU{eUZFEIS@*L)EE{wKS7#$INhZ99KDp#c<yNt#75+BHtm&Gyr!kQc
znbrs%XqIomG51&g9G{dW+>sw0u(=V~)6}CrURlGjp{({nB{<H}2XlL<K0ZJn6_22L
ztG<*cOP~3-nm<)G0{W};`tQHGRbD;^ZJcZs&$7RW=a_>^qL-bo;#hS0>stHhdbEv=
z#@v{!34~*<z55az-za=;+1X%)>c8-?igHT-H0i>1;>W4^Yi_y-K8=}k(4M}X|M%g`
z#7haiL^IZ~S~oA3edU0qbD^iP1_Nezx((Sfg&4zjt60s0t?Gd7e(_8bGDl_L-Ix3g
z?qBjZc^@Y41OLoA#P&u?lg<TJqvAP#0^iZL#?8w;<W1nSyyK_wMW2>kn=#p`cz4Gv
z4D0ERTa2`y+3^*ldK>E=#*EjO*xANr^&OVIZER-W;W1?ASY}G=SQAfb3O=O56w0;9
z7ojwZzm=Z+l1INu8y;}_&zzRdA)6g*Ty#e42K;ULW$kHiR}4^cE~B@GHFh=4_77I-
zX}}$cFYGLRqCWb5uPFxGuE(C-wMKtq$HV4e^{{Wp&ryf=yfCNx{fM0v(KYZ0;i9pn
zJUR9NUm{OelIJ^&AMPb}H<j&6<dF@*0zbyw8j3G0Lw(p~WQWk1qnD~zYeamm><tG7
z?nOO8f1PYf_Zz@RHMp@wUb1Y`*7|B&ZZGuVj#g~Tio;}vOuh>@i99Q2%L#t+Net+&
zD=qMXEkfsERdM}e+1r`NgoD2G-+-&x^1uynCO!vXwY(q8)=6G$90{F%%sjx~oO!93
zS9oO9@)nnq`yRaQ*qf_1L&s|?!_#Wxv_-70<^MQ_r@>cp*9mqR*^H{+#S4-nlC84a
z`Or6!r6#ca!q=Ou>`v?m;fyqSkUiM<tF{LSO8b(_w-2Yx?FI5e2iAF<H=&qu!`Nml
zGCyxSZF`(kUbGo2t7T(qPGKuc5eFl9nAa?QbNHt72=z_4knF9l<+0r+>CYewtLgMR
z(PMSiX&d@$8|#(RV`JA}4A0n$FTPmdpM1F{FB{;E5&qLAi?dWMziNX)CrNCpjK_AX
z2b$<C5A<itKR(qe7N#ga@X+t?%bp9bB=-w~+vlN;_VQQpDqXPtP5sxq{0d3E-gD6P
z`>~bf3`)M~z96Eg%9>Y2>jb8RNALqOE|NSx_74}HWt|1>F68sjm1;IJ?B&3-Jo*mp
z$uG=!R9$CW&8u0)JM)ZWv<q#7gELv~MPNM2o|=`uRwPfMx~5|sY*CztldIaO)KBmv
zdm8w_hDn>8sR0}-B9jkVuv52Bz!sSCs=h*lee12P6Pg(x@<n}t^-saw8&ArCYnMI3
zz%fZWfns^`)wsxmid9ie4}Ki+P9yx(m<@W-2ew_A5BfFE#Q!PU&|D!MwLqDaw>eCB
z*k72?RI=dc|D>+Gd;>u#tN8*v9GPI54s1G;cs%+hymWvA#XP36+($*7vw;aa=y^OH
zfjc&1z?Uw!7#z_TcshyE0}sKR#ndhRO=Eqg((z*p*A2jUGyT1tGfWbD4)`H<7h53b
zF5`!3EB*kxJbpU#&L(#NU)@05;%+Rr(!N1|a*Ich3j^gD`1;jXVr`>$(APBmnMs=(
zpVmr~#7%&o(ral)@VnWspLt(nHID8pdDcGMcL=>&Z@|Z{aSWagBZp5k<XLmE*33dn
z2OqV^H+c8d9pEjAtwI-oxTBj5`_P$dZuoop-8mG(zqjc8h9S2Ly>6f^*wDM7TTZ@;
z1B(r7V!j!(F@&F!@7C<Vq1{%&C-~`0NoTxw%YQFkGJ76kBHu3^;RgIu>f7-~Mg+mo
z7I)|En~i?aIb50U68D6xVw<7nS$HJbBf|J05Bm#rW_pqbTutfj=kG#AV<4HwE}7@>
zOY(Sa@P8Ar&c&egTPDz6lTK^?g0kY~nuwRvz8dT51?4Nb?;z#bW$ih&CM+m>+<{<Y
zPHdrnm$CoG@ox?Hy*4a$zSa&MKOgGc4(^>V&%cs>uqVpHj_FX|Hq|&=`8$q3T($en
zg@+Um2QAuP1ud`*!4I5c4$f!VoVz*?JA>BW#7{lQdkS1S?yk!J#6PF8{S$sWi6x`_
zt_kDH!z0l&%1<<d<sQmS2JekMMJD216&IhX$#Pb;X@eIeTUP2U^Y*u3PyHW~*_>5@
ztlRQOzVNUJ*bBh7ov{Y(ve+2>uS|V2`Nxox(0q$a{eQF#xO~pn^*4pHikfG4!{fQq
z8pdWL{@WD3whX=*V%Q?=&iI*n`Fkj4P~i&;N}p#8+Q4ImgA#1s{P?d+_uW-_6)@!l
z6ZS5(=VT8fb9Tlo!nWv45fqGepL5b>D`g(RpMj4CogN);SIYY!e&a!W1)Czv?TdW>
zE_hfma2r_*Zj70iDk;vx$mD@X4{<!-B!;As@=f`^Sn=j*>P&gWVBzyoI=W1x^Bn$~
zd}H8^^eqoE#}}Y;f~(@juqoUfw<UNCN}M@(_TsdRd4EZBT*lSi*s=|-EM-D$sNTQ~
ztEjy?=4$9U+7y0)^e>RUTzB<dpDBI;TPf!nFg|Q};F$QTh4Uz=V>)(4#z*856PPK|
z$B=k$?2DP)-EkA=o&e|Qy4N5BeRQf3cmUs-;#=nCIp;n1*|?#g^~9<YdoU8Zz6ShR
z{yWP3EgPA;x50y=foQrrcD%!^gO`_Joa>wDLx%QsR~uuZy$QR3-WlJ`e+=#H@Po*O
z_v14z@Ev=nH#FR2hVXT4-w7{m+mCOnku%;cUo^TK+~R{IrjYo<cv9F`v8}!zWpaJ-
z8t|RWSJ+X%uld!zvpn6a$p>V?5HUXc7J?Ue@Xi+K)!iS?jj+4<>}ls-qe+y5cKw>a
zkXz02FUU8-{J%wI>iG?@{u{b^iv6q!J>AVAG+{2(`j#_Ii_BxDL-b%j(Kg0VPHUTX
z)sYFmRjSqlFV*t0&jq}J6Kp09K2WD9d~i;<EB@*QmxW>BqA6S0{z2iwEpV?0_B$6G
z@H7=f!`}FjxqEjqzV7qg{+$V~ydiJ}PK&*j6!pOSqnq)Ky7)(&;;zaxe2TN6)in4;
z?W^sY?c;i#Ij(lZ%a*r^@mSy<^r3`bfTN5kM&H>TuWsEP+hJ=NUZk(pnB+$D_VTxw
zmtLT~rE|E~eMEQY+*G<2URXI}cbwy!+5xZon|=AI`@@OZ!^o4BrCIRQB<j(;;CMlF
zrDR=5+z!un<d{Vq{0!P^^jv(#w@xu3drbTR$MFkSr2M<nDepGd2@7t(Iq$aD*D5)f
z^6s8$yt~u6Iosl!XFw0egxbG(PVW=BIlZyYgl{r;CpcLPY(2mzU*l@kf&SRjIyAVp
zbto3j){(v;NoNloX&Xp8Oh0|{O18~1_s01d_r^=+5I2A<b7@QQLh7S4d=T5!hun!?
zSenS+cHUvmx-n{l4!UExA*Z>JyV>afpAtKxzQX^E6YPBO&#}a}xvP?=ZpC;{^zU>#
z%$}*-<>;C`Uc?6O#`!=nr_tP4+65jN3+Ty=+3~n6f=iya)^Mr%?*X4Z)ZKtV(eYG2
zX9B?s`8j>Gvmx3<dXDrq_(b@eQ0xoWflHl328`f-BY*ee1Keo9t%K}KW0PslgKNbL
zF}57+c$hDw%ZpDa=O3DrpVNEo&#<#P1+{rUdTnd@D$-SE-HiL$Q?%Y?o^;pE**vw;
zZR7mVHB+p@fQt{8xfA?*I#Y?Why6ZuJtwr>TSF(;8>Z=V3VY@18V=!2)|7>ElW+-+
zZ{&Mb_Trz!=F);JmHoKE3?%(mKH-48==fDUu)Y`-Jv5G0|J$eo81W~rWj_BvGM@t{
z`09!98)Ne=gdO;R9n$SQammS?Fc7bsBU|iy;e$bNwlSW?-XPj<7H%`hQpIev(I?$6
zH5q)R83Wa_ia+6Aah^1^UA%~Th-p*|-(u=Hf?l<F(Z={;>F3aJUF-IEJ$;b9a0lPk
zxAqNcu3S5382;5*7yqs(ZJ1LSlrK>-K>RIv@P8x=Xx{-h|MJrddWrNa@s)HE%MGFv
z$av`?bER`*JD%HMnJmJ8CQld7EarxD=*pV^S1)3&%O8qbe63m0ztMeUPjXB?(Z&A_
zn-HbTJ4|D!H5k6cQ)-Vz*4bIi|7us|9AvKMdSgCVK1G`HJXhm+7>xf{YAxKnZqClQ
z!OMrU@Rvz1lkTx@4tFM#U${2(O=au$r6djoIW4%fu2OrHvF8>G_S>n?X8*(k%=7rq
ziT5dltXoQRy-lZ6BlxKcg|czs8P?F)$(tD$j1A<sy$u`ZVQ5X<B;z_2Y-el%dtS2Y
z17TAUy$HD?T|o3?&791kvUf|jX)3a&A%-?%hVaE;!_6N>XIoxUOi=@4L+7=p&{Yzd
zk>pqXJjieH0An(#Pw(`%S-dp9&ZesWocU%GF!bTyVm?7{5I<&mn4iE=gLJ5b$9tJ4
z24dsBw@hph@kuw!ciF7_Wd4SEuCJy8firaCq42lBAvQ-~>DPI8rxf#*Z`}cJ%Rgh6
ztw#9Y?TwZ|mnCzsInV1aFLnmvr93P7JKsuMte0jLW$O>3*WtHYO<F=PcujnD4j+VJ
zFO+;q@<aSC@Pv%_#D9Z7?K$34o^<A&74+$ZSG)K<l6=2Bc0zn=?xDz-FQAj&0Ns;4
zJ6rahr}N#Rc-L_YQ4{f0#=RRE+aJFdyvUF7Zt#nt1X|w>4Y0q3Lt(1t3ki*z%;oew
zA2wy7FLh*!vca#GJsz5fPAf|2vF%OSKI$dbLVX1;C;JWXv$HabJPx`d^FuT9UzOHb
zwZr_Na=@JNc$nWOou~Eo<XyCWhiGm3n5$HGA(o#JI~4M1C-deI`vm*hUkY4_&NUQc
zm#Aclec+*=cG34JhfOV-#W(3?Hfts5ef?(1A^a+e^_2ZvZM^|Kw`#8z+{5u=<dAr?
zu6Ll1UvHSJmN>)l&(R;SPZ6hld7PW^g?R0pFC_iPP7B|xf!Fil+BtWVc6U6&8BKM6
z*JIGXz7Ofg|87i{hU;?1hZkmfdlP@9{P0e8dqwks#<Jv7Bk-m9mF^+_@mV($0y%p6
zXH_{hZ`s~>o>lelws60;F@xbQ+VecdF>;P^G}^-5W;Wx#;Bv+u_A{-GhqJ_@P%rav
zbo297e*?H{H}IU=lB{`(K7_z#Yu^NNpT5I0=qdhS<w#cXZRo4i@dvbreh{UpM}L2s
zzaOrZvt6xYRz%{LdRf6W1biuE@muiCRACKY0&7#t1z0uiTDYGy)7=?6z^Ar0vj%t<
z;{lx-eop4_q<(`8_)Bm$v(~=u99F;TZGVQcU!&Xzd0wFG!{G4<M1CCGiTI$0a<a2%
zjN0D4l|-iIn0I@m^Q=njfD7bL%2(}*yYOXdeVL+-2LIX0n`w_bZfs(vjBG$AyEASC
zC&pb_ZUFWab}7z9We&I?zgPd8F&;e8lcRlLNPP9kfOWhpE<-XvvOsN$r@Fwe@a*xc
z_>ja`uXbq<+?3{E53lncVJ2tk;@Pew-(Z;7!N}M0FPs@h-VMUx|H7J8<H;g;ICk>I
zvBW1x+dH*({>eSV_rXUyc#y-R_w#&?XBW>Qp3m2Q5As{&`5PYmVxwQ@d7S63cn<LV
zCC_6#U*q{I&tLF-h3CsWf5!8twZHX!KhG8(eIMjezK3`o<oP1cmv~f8-yh}a<@sZt
z-L+qp`*WU0c=qt<yWmtG?&VP*)Tdz{bj{JbdA9Nl@!Z9uw(sQG%(IDSBah%1;OQUt
z_xSQEr}}sD{1%Vexr68Tc|OhaDV|UA{2mYTe)JPOJv<-b(f5@+t9VrZf8+Tbp7lJx
zUHiSA-?cm+<oN)P{(cva()FwF`uz~kI-d9O<at!j+j*Aoe7N@eetwtn<alo2QTiI5
z8+inSU|GSllt*<c&)axZhw?7uL3t)FA73}mWS&Vpm+@qHCh|1%OyFtaY2<0(N%N$5
z7?X@!Gx|FHHeoa5chk8GHodF)do5#R5x*Ac3;31%(^&%lz&cMdVE(vojo6Ir3Bmtv
z?@i#VtggNP=L~^xh<cbRqP7nO1SAP3fQUFHgejFFGFWGGlAH{ZiE~bXXw`&Cs>Gt=
zP=|UPtEe?v?X_0hP>1V8FIwAr9omzG2%@#vxwS3t_qU(tNe&3T{oMQi{NK;#ecux{
zd!E)_Ywfky9-f|)3HvMG&OS-`@K2S^eZd0kD+r&AjXqX;I(tQfrhd+TPQ)+XFy7ed
zo^jZ>T6gu1!QP5J8k=+QIy-^P?eNwPXiKzDpSH0c(%ENV!S~?ZG{dnkB(LB!oN&R(
z?@MbPj}AubAZxFUEjamjXIF5lz%MxY2a7){Uh6%<j5@KoPh#Xg>2j@BZmI6Ktd1iB
z*8Z#DAMmVm?Ynx<EyY0ZhL51*D=tFzD-$1PoYL^1Px%faIt1+nNzWh2;33oz6916i
z+2bqdIkOceeJA^M`?vnqve<vwzcb&m-oglu(p}1EKJyi7u0lqJ&ucCdztVXetwY3H
z>E9^zOY@BG@PA5t7P7JG{)+VEn&;F%>RH8w?=WR9E4-_Bnewm)z`bnR&$(ajWt+R<
z_SW4x-zeEP5Z=nVhI%7>H<dfFnh#Vi&E4ztX?@zwn=KvmW1sHd+xe+wy-h!+k?=yy
z0{EY=v#opD63)bKUz@hl+#790ulZ#MroNQ)SU2rH4*weZ>4#UhvR09<#zOx58t&jw
z;I~C@KyR{qyhm*z3tAoYH?lrUyjgSL8avf<CFd;OlI)~87P*7!_tJjkK48cml-g?c
zVu0xpWt#g$XJ$^jW}R=NS%2tUc@5=cqZ`tlb>-1sj_SDzefxKq>()?*-g?zsav}PB
z!OC}{bkm6*wHZ1cb*}K4dX6)Ay$pSkHENt2HrNeQx(g}C#~V7(JZDuX6S+P>c#`ls
z{F2$hWzZV=<Cs)W3-ya;{v5umcNK0w?vHV^y}`Y>TYGmgcDoqcT{dvwyNYSz)~FoT
zK<q2-p0yHq6*89KuxP=<Vd=u8p8-BI&6=J%PXPz-qn!IFQ+cH0E+)V5|8RM~Mp_To
zNfV0whISboYVEB&C{B3f#T`c+cS^dHHw3J8FXL3|&jE)E!71q9vN56&;g!GDvVISP
z{5^%ph<;>?rfP_vkLdu{hnMmVl2>_)45PhA_&}(THhKFU;x!%6$GCH}kAhyc3D|h=
zmN0&d#ck6}A1c9zR^X7P49-N5XCLLiS129++1;Y0dD?Gj5`4_QXGnV@!n?WLQQI7`
zds}Vssn+hDoNZW-{@NE9itKgMh%M-bw(^FGXgSFGVKeVHV6qJTO<miwmAy25LrF5z
z=5RYK5ZMx(mu`uDl_AJNzHDGTkao>OKCvR_XwPJr_$l!Hu5g&~>jK|clj@r-YFF#7
zoN#-$+VlwR(Z1Ar^x@gqo3Pc#dAc`5Ka-zO5|z%zfQMbHT^PyzsO#2S0D6x`yvpo%
zfxkJCBI)5IOI-v08+rd^H@(k&$4Bse?-SujwFBQK=RF?rtyXx7&R2;SW|lAgx9WKR
z5M{mcFO;Qre&?XP^yT_i-V^$MW`1ykuswpE;Nd$c4|}1vJ(`goKCxG2&$=oDhrkD~
z?0YiO3hz|5WJ8_%Is#l_{CdvN_%UwGVT>E!U!?z<pH%Lv2i5PDyZI31D*Y>mN#A;y
z^e-PKeew|LM?$Y7#bcO*B->l=-VpLZK;!i_dLcShJBA;o+=~xUuG0VLp!C9#rI~46
z91;AK{@)Ku@4;nmW*!&bhr*-j2jy3NCuin83{I-<afiq|;ShPfwq9^hdatd=X689W
zTZQjg<kfpn;Qt6e`;pp{1jK!BVyWGOGRrwkyL~qK!guv@#&K^EOj`YzaF}-e;nx|o
z>9$L9$%XK}3&8>BUe;D;Z6`icYIx?T0Q9mQ9jb7d`Rkd8C7D9^_qGnq5+5qux;qPf
z?9*-<`mxR9t)9&CwGS<87kpj%G(Y><YA5{rww<&olYa}g;(w1F)Ca-i#mx2}gg2ps
z(tBg^bY`A|=+uH&3x2vA4PX1nqfgBR`W{Q9>`uOmB{>saefS$`!9#7nH?z%!Y2C5e
ztG5NT2d6ve(sd4muRje;Clu<g#PxmWz%S=b1o5BM*xp+L^erS^#w(hefH89ND89;R
z*3Js&+veS@OH3TH#WMqFvlng|`J>dFc~g1W%tiCiOCM)%=+#>>yi3Dg0B=WOH19J2
zdo?x(ze%v%ZI}5j3S&^V$I-<IKfHGxg6RCsx}Saf!J4;_mHeaA-wj$@dn?_s2OnP5
z*+1GhgtL$V^o7H8ju$h;!v(?D4=*)k6$1M*=2>7XoEi-*RA!dVH)_Lz_txI?JiIE~
zn93?GOCcL<Gv^D#oB>7$Y3?K1OE_!!g7nD1k~7S9YP8-^()Y4L!sW<z#!+wYyw&C7
zJf_^z`Jk`trabg_I=8zX9vEd`VncdhQ!EV+r;X0MY2aY*?DEmhKxAllpp!SrJBx=F
zGRNy)B==EA47ayr<wPpdfx@-uw6EV2v`f=3oVlI#1?P%1ms%V4Q17d%8`z27Z`1p}
zT5}M#?FjJdEO1}4Nzko3!dM7i9g#Op8U6*sx(%#=pWwzE!#Uv_*e665M`q2zEm<^B
zhz=gzCu@#^pv`;)Ebr$$f!;@R&Zuta)ml(`bm^(bYX99$ce|TT?+i&lud~D9$cEmD
zz*aEf9BPl!CXKGXv}cTqzsI=v%UUpG&iGRI0QPJKXy2vjY6DN@ReQeZ=0z6dEHiDg
z`F@K{TaZgt7vG^vYt1aZYJfEmbQkhdx8>Fm<jfMdX7+c~H?_x%RpE1cs^Eo2E^@~%
z4E%JDReQEpA-HBo)ANzBb%vaK54;<(9@@nKYo+Z7@048KWm`i;$Dwb3+<)d<_@nvW
zIeQDfktaYpXf_nYrp=?k1NIWxw_%KZ`1uBbDaSXMw_n|Rq#9qzeeWU@i{|-;h`~*@
zNjg^H@^IRubM0!I>McZPAIKTTS>+e_w)0lHpBly+FIir@v%xX(H1@Ig1TD^H(1)0T
zGiPF~_4fzE>+dJez1hG;c|^a+lwJNwmd;H+Bfsd{mxHXyUN}o=KX_^GFIzKGzA@P;
zpJmf-a8zq_rKf+|H{Zj&z*_y#`HJ0q;<H-6X&fb2=v(BL-I;~k=O3(Z3AJW9_3<rt
z+q|1feXYGptGyh_R*@#wXszNEylX}O0;NXZh@Jr&Z>mOjYi)z4_gIC=ZmYDnJ18En
zw$f(ZH@3=%D|@+DIHPe~1bmFU!|}g_-?xQ*Zob1bU<)+fajicq1#Xoop10^Mhn9|^
z-yz)3kY2W6t#W31<)w^1w(AM}-wbB4wkM7F3TX-myFC~*ZmZBaOPA~AD|7t!;a8aq
z^4_~~oBVDaqw&*^F0ES!iFbt8^UlKh?)~Aw4g15swfa^_C~`CS^>XhU;FY=O%vj~I
zj^O_02=qM8`z_jY0j^I1SAE;u8p*n?^F7vX?Y(w*b5E4HItGs37T(eOHZn_~2^fU0
z?;Q}??B5>=`1OtJ;iTmqmaMlUIunO1Z}E+Ai#He2tW#;D_DO_`TCWZ0L=I*gj!YwG
z!Z)+i?Y-N0S3>uthf~(1$hx77KXaeXJ@f4l(kkBSWIYsd;3@ct*7c3+hdX!lUN2Zk
zE@9tV?|@7qpEpL}s_?sKlbeQhOGtTDmSu5w{b*#~4<!?kj<oCCbb=H0j(~S{4J;*X
zD&5n>I2>H=YB#-q^wmSXJbvzMsjO$GYmeH&iN$-UgL-`#eW-BrvakyYw(9Fh;HEo-
zrR*h?(WeOb8X$ZcHt%HIr1OXH?i=XmO=XmS8haH1_?O;7(HS+ud(TD(IG;G)An6^H
z);fQ4dO$1f*a8j{pPfqe90%Ne&jQmheWR_%xos_`O~<K@G<pp7ZUk4e2S`5#kyhs(
z0-e{TQD8vxckDUF=~qvhH+if=;Wy_m-F}5qE5g9rym_Fs!a0@kZ8y(@8F?nVc?PGh
z;kJVI&qzyIIxp~AhsKJ1gjQ%_3-3}2pD9c0akagYa=zr|7q8BYTR_~k)Ti$SdhNS<
zOFL^Y_GHMfv=sJ{)s*UbV0Zr*d1d_J0~6L`QO+-kAH+9@ymG`x29jU%+4tEGlAICI
znea#zyu%3(*stuKPMq#qs}AmyyrXYG>Kjg+BMRwlk}_xv8o%bY$osuE`EB;1_p_IJ
z8+flb5wzDYx~g_~HT0Vbh?c<FpNi-CIu{Iuc1Gl+Q$sZOjAZPpIP)|-edh?t0Xm;x
zrTJcyb*1Xrwt>B+2yGq$?1b0%vELC&a~BCb3zN?xZX<PXh_rWa2=C|}*17J-=rUe4
z`$YD2-Q4Zk?eF9)7VReOjlOVd9cQw7iBH25x=#@wwh6aW>zwy;*3w?hGq3kb&e~ve
z&OrCVwQnk(!hM4rJ9Rxgw2d=BYkk%=H_*49YRdPK$H)5>;M=Gpr3ZD-z6N#H#?^%!
znJx<tPq&Y#Ds$d0dL23)2`{Rm9RXy7R|JzXU|{Ge^<7`2{3+TkTI620LtEdWuYSRx
zP;>@uM1HwT>lEbup6>vQ$4Ymw*V~YW-kvy)d9sPT`p(g5q@4{dNhbG&>(a`@J1yOX
zoxIgjxb{u(@tvnRiz8Z`PuZfy0JOaz+zySm_eKiWc4u{puW2rI@{TNA>(A+oh6}^I
z!<)V?OgTfXaJuJhTRIrzyryB`n9k@(Cv+h&T8C}kP8g+r>ugH3#=u&_yMMgjg?}1t
z5T9t$m`k3Z4U7+cSpQ)Tx<X&+_1v4W&d+8%^sYh&aRJVpsI68whD@=(H{_;Oox(|A
zz}s2tM`Wkhj|g_IA3-@og`=Wh&CTFqNZ)?U3CE0l2`+AX1YN7<1>tjm{qLMGvNm<7
zzRWtRpcl!I8Z+U-ZK?Nr8H>9owWjX1O3R+eYfXLkA;#sQGRCb5T6XEp2fao(qt@r=
z?Vw~Y^w0e+&a`PfyM71Vsa)+f`XY0?eXVohb-V|WDpsF*Hd*VrN5pw<;4+P|1m?SR
z-aBaI^@_CSDs)9Nw?VHdOYL4NSPtVohF*O;Fc2;`c(4te;!P*MY1ZC5f^pFNsxusV
zUqpN=#oAD?KrS<|5F8AQ%hn6u_i7H63~6X6vNk*co#Hg!mI{_3lSI~8%n4bR_+1%%
zu#~q}3fsGnw6^ZidD-`<>ojC0^F}c;M*!MUf2`6p_lMYzMK=r_W(rPE?qq#~9AIc9
zoa&i@>^vNfYgzlww5*+HwzAJ~D`x#KZYhfG*ipppdZA*$*RCy`0XUMoQ$A$oAZsZb
zItX-zyC+abpmRv~6l}enkCOA5;n>KQ&jbtedPkN%zGq}<3gg%|almw27~MHx4-)ra
znEP45!aH{j=iT#c!m<hDdj<D!PIFr}VRZf()rn5_N#w>Sv%{nbrydL{AMrl+X8giO
z-I<AWV&1q98}r5s*e?*jC)ion?Kd=Z=rsC10&gVJry<?1gEs-bD;G?2|Ajo$;fWwR
z^WYNgUp<q<d>OIwKFrrQR_IrdZ-9)Q%{;YWeb=~U$U%GuB$u~Kj(mM{*Nkv#Pnfnd
z2HPSQdQrDO`NXSyr3rSn?o$5*7rtH9{R-pqxw<&lZt9vrUGu4HK6RZ-UFTBQ%hdJq
zKdFm&Qx|D6>+(|<`y!vO>om8nY1FlVx@J??h19i-x?ZQQ7ye0I#GATElUbL}{ohDk
ze$J)%InSv6LiYxT#=AHaadC+K)MvCd6CP>oN0t`wmXwWg>;rMA;34835)L`|Q}9qW
ze#Yn??QI>1KLt+(Blc6-VbX-{hdlfdUOV`+lKG$vv+{my%*q$BUnIWE!JR|L3wOAO
zZ*b=)F7EK=dasK+&wLJd=v!bHa&5Ta!`zRr>&gKa#(@V};LccZCpepTK)|I4eeS~@
z`r_eEK)4er=pAEl$L{UNown{*4<1j|wa2Y%4|RbH<G_O~aAz#I6P!<7;L>6167Hxj
zgFF3oF^=7QGvGknQC%Oqb?u@qaA6#HkOl6H1$TlAs0&;=Y+b?~)n#y}zb@%*wo;b`
z50mkM7udy&OOd~mv(WDSOy;XD*5RMKpV>saSSxk=3n^doFZbZI?<-wRlkUl}w`2B#
zq45BB;B*()H?2*)wkuGx&b;x#9fn;&@&qC$q;rsoc#Dd4`55#VfwW{E_+BW;8%;rL
zPG7kJ{HntTUaJo3+T&N<ZWwf6!U7p#0WXZT-n35bSKih8E8g1?|MuFhetfR&+$H3k
zo{^VT5BKM;w0yp{2z^&SOy61ied$x_BssIhTo56h;zf`93w_L++IMa0)p|g0_YjY$
z;H>)v7gPSU^<9B;*XjPi-e4pG?#%)w;|_p{kCWb#aiHUn`lhl31NBXH3I<-7V4yJW
z?Dd5SRtnQNdF^0advbwCE;`z@zBSa>R>38st>IbSx=-r|UMj<b!&u-rmU-BmFXR0m
zy_2SW@!^E&Js_QXlVAFW^>6ZpFw3$kF*C>~{k8HTpLFFRgAn{1&9i1N-CDaFTpWWg
zd%{T8AKo1x=^LcqUO-v9(1mZI4D(Jvn74cj@9aH-vNpSAnLRbe)X&;L@`_{z^)IOP
zQv{u%_Ae<<^*_H@G=SV|-MJ@7SpoVfUG^60Qab~gWi}alG5cemYR%*A)wyjmdileo
z?>$6%AK%@S{w9em;G_R5&}r(Mn{~7|%(npby~aRfR{BekME5$KeV1(6_sz}HF28+G
zy6vb!zPahReYo3>bi<D%+;#hKw;kbzA3?b5_Tg^Jal>;6cileRZG+wL!GybRAMUo0
z8y+Iub^CC)4RXT=5$?KuxZASb@NB|ew-0yQKsS6K;jY_<yKR6QK7er7?Ze%c<%VYw
z?z(-r+k$R*kZ{-S!`&8e!vlo7ZXfP8zZ>o++;#hKxB1*~AK|Xshr5k&F>tmBcileR
zq6gu&kGpu_tNFH)_kB%$gHLh#u4cQ|!N|JacQxD4oen5G@VlB;r*lrx*J)^Buk2vw
z5xs4lsjk=g&fz-8)*3a`*0}}0`Mx3FK8(NyobMWPQm04XRzx3tw%;oCJ%3bc^z%oh
z3!r^-j>aoXe8czB7HFKeNZj&ue>(8e4PCpLYlGJDhGx+lK|j!f4R6F9fHt7TE{+xK
zmCX7xowLvy!)hv)JgC0HCv+ymz(f627;>7zri!M$Fz)Iq>_)=Yd11Ws`?)Z_H-A9h
zHr^XRzCY1_!VQx1PlT?|KjVya&yP=Bsx$6iY2%xI{(^NqshR7#rn+Mw*qd=0u!XVG
z`YLVwUby%wYsgW0OP00ZjjV42zHn+7VbYnKwCn}+sJ)bPy%*-^Omu*|4>}L6vjoI<
zS@t>ycK^*XE!G|?*RnbPZpvO~%2oSkqX(2NqrGz7EpzshoVzBpTe#SxGgX?4EXG9o
z$pze3^TD^?8wRguzLI`YYhLr7GwlwB@8F#U&Ior{TE}wNsJ+*}1^rPcdPUY`oFO##
z2z|)r0UJFV@iuSSj<$BN4!;GN?1G*dowsE1i7D2*TFbR(ooiq1=Y3i~dv7DqA!qR(
zW!5;so;956{xY!DT5CS%?ZMR^+K}}`_`M;4!j!Mj`ev^$vK?Ljx^#ByW`9TFdqaY)
zn-K@J=aX6o-d^L2ywIaHIb|vAM*6+ZXYRiRyVu(5fWs2=?kIZZ6D`^YpAYyV7G*5$
z*-ATtotu~goVMux+#tq|@5*=o7JZX&TDqVxW1;mr_fGuaS}2?L-oe?d!pJv!{k(5}
zTIB1!h2gLF4g}`RGkYcPVuvWJCl~l@UFh6_xS+>>_x7Gb;%xdmgZ$dt;7kC;p52qp
zULAM1pYTPl;T{Dr?p&LG(#U2P^o$YAXb)@PP>?fC+0dV#JI&zSF7Eh;^sRH<aURQ9
zp(8Nm`NB6IJvf~5-7^`zrErol7R{<0*4SBU<JhqJc6QHMl%EYOZY6&71ZZ3L5Jpl5
zcR2kK#u{9)(G^&oo71Bi^R=YQ>;rFrjG6!r1i1U4ceAX>tp*-GAA5ua>xTIYo(}{f
z`aV6d0$xwM?cn=mA){L}@6ePEdscaIpQ?VAZt5Of1{^eB^CoBzx6U`SXL6gx-4*p&
zZTE$5I@<IPoKznL1FxUH!j0XuEi|AIT_WrCae@u-yNCL{_TFXcgwNWWxYwTQnZTQg
zxz^Ra5$=9)j|H06{T1^z<~AR&0Iz#*BEQBD-E_}{)~kWd)xBd$FSxjU?=pQaqVGk|
z2ZE7J-7`qzwF`e3IE<j(!<wl-q4Ml+B1iH4c9loHV@a>_`Q{?BBRDbo*4@GjpKmDV
z5I3d$1#5xpkAW+9U0t|RUQd+toha})FKTJ*_H&+J?f$#oK*s(ITl^pw9L_~gr8^=<
z2D8z-*nGzYT9<6<Z!PME=D~OPJv7nZ_B*pI;2E~oWetKRW|KzWQx{DY<MwqFcMnd1
zZ>8vzBG;tv)%VFMqjme%-K}c>^~ZJlqnn5Mqpvfx7jy-h)~C_U1>iX$U!;}0wOe<u
zGyNRW6R>%Ap`eX^Zl|AX(|S*6K;-JQ@GQ^J^zyC~lrL4-%|}(h?eoAl$}V_4pl^lg
z-t~NB&!FDUq<#8!9(w~>S<Fq^YgC)HRyJcbnz0(qSb<l(1KO><01KR2z#WfL?u7)Q
z`vtaSS>5?IZxK8BT>N(GTg$#{8}aOmxU{c)g1g@K6;EJp+>7qI>!+NR@|CuBKZRd=
zOR94Lcc^vl%tyVY%ppv&d&i(NIEwE^iLQ}5v}eeC<m`3oJU{jB5p4WcVRx9eBEy^a
zB?lnK3OB-(`7U7#NUM3pX(xA!P5QRpw}{hPNO6&{?ql4s+h^agTYJdQGY*;`{EYVo
z(!KmL=U2h2?34HJABhRe;76Zp>E25ic|iAYgddVCbPr}Q?VZoM;~zR>!TEro8zvo|
z_LB65e3-MgV~$+kExp1QIcu%-pJb#*b{MtOTHpPt8>YN^XXaS)>~q7sa^OFE^{&Th
zjMD?0KP(hX(`&oA1Ik<o{xJt0W&MzMp&!8<Y=4We&8&~oJ%cW4@79@Ey`fwPE`c*$
z5#$i@Pwn{}fuD8QsA;9>yP0bhuKf_b>j2H@-1VrV(y6Y}-zu-pmXr<?T=cyV<$Z#(
zg4hq}Od;=b3@UVRL$q1KT^r5mH=WsT=3(hLgPa*Q>&-1{|Fg97JD3CQ9L@kxM^DL>
z(z&wl(Qy-c^*i<iTb1X!J>gV)cj2t@>=jyjTeI8EI)^#4C(A|`6=AHw0qH!|mvOXT
z=PAcxi@&l*(={kB)f3}<MK*gc#}Y1>Y#DlI?_RV2eqIlK2!smJX>Y+$#-=HEj<Cw$
z6@2$#>y-8p;Pa?0Q|>hT#=|+Epz=bLQA(MDh2R&mX=|E1`)=x;FTT>6>LPFNn~du~
z>IJVtgUWP{op5N(_pUR?YF@q&T*wLY_BZ?8ry-9?RxN~%M8^-3->lgS!A)T6D;16s
z&s_41dwxJ;RtO9Q6P;&ZKIqD_z4mZMhCZS54h_Tx<3r!$4k&B>?lY)&AGm)Sx~c08
z&cSoi+$Uhngl`(RgU8DA531*VOvXs#BfKk|a)QA%;oR1Yc6qqv!A5NnK0zBH;nNqv
zCv?(1p6qeGdsbCrBz*l5@wyWy-UZ_gsjY%bA^b{n2Ku$VI&&cyvD!h;-Y-|G9>Gg{
zk$zxvFkA$WEXp)(!frBfamMp*gXbH%|G?QR@wK`5Ylz>c?_W`7HSiLD3D8a>UvnP_
z9=8|#+dC7ZI~Ty(-1pFZE9x2Lui+g;%$Mhrhr8He!f!QeX7;?)?+u(mapib)zsMuJ
zrwh+`lDy@76G6B$h%uYN*b4?4@9>o2Y4qU3{RJD3)?H2ZDteSxX=j8t^#0kL9ZU7-
zjG$o1d^5_AtTdzZrrs}O3)g&w;7!5Mv=6=+kS-{4$8hP`(5;UMBdbWy;|~q(p3%7>
z3%(1wrFw+ds(&YTR+xPdWM|D)yd6Faoulci{HDKapbKPJJCYhU(B25oU)r^uJqXPU
zR*HNnz6YW`nh3IRB(*MJjq3V7WvIOaT2n)685{GqkdcFZMh<?Qc;zAD8o^2YTY3`S
z;-w9g%bB+}`~l9>2$$w_PWtNx7Uv4r-ccU$^d?{{*)4&s@~G=J)pa)h0iD3f0@ldU
z!X?J{ovTMf7hz=P!uIrL;=v7g?G3vHFYOER#=-6&<DfAx@GNXit2}t_J7LP_{K05o
zF*O`1?v}hDSk9WvUcS9Hy@~QDyUWL24j*%g-dth7ly^<qOnH{ZhchE;?<sD3XB6rV
zv~`VWX{p=4o7rog#aVU74{mAf>96J=<c?9Bn%d1ibs6b}2OHBJW^D{CL+e$CeRcXs
z%2Pji4}`XqYTwqhL-#I@R2ud(#b5PJ%hO#P<9piN_2IrrYwG%2kQ2hKv%0qsrnXFR
z+ZOJu{_#V+yZ&vZb;l+$rFECuI)^ZQ`%mN5QP8?;24Tn>dxM;BQU6pI@(*)as%Hw}
z3LA<429w6gx07)`ny|0C@r>C=k}ddFOdlRFw}13C!ls2=yJv8IX@-S9_^2&=tn{6G
zMi1WdvDT=g2e%sAcKvprf2SMXX>7l5-^czTn9-O5OcCa6Ocb*c(}uYob2sL3%y!Hh
zm@dqx``j|plz|zIDZmtA&c;MBD=}@D>oIp@9>;9Qyn*S$e3~|8_}V)D=DQwqH|Ft<
zzo`$twiIEQyD^WaOqi9XuU~?PA=~B9Z@r0i1^l{@xq3eHlJXrY&HevE8u9&qT27?B
zd-i{o#%}L^mh-5Y<z%Dx6)#}^A2lc}H)q6<g=wo#Zy;zdX;8ScSL;fPIW%CSud+Mg
zk<10iuYT74(wTla$I)vkT;D;-j&y!5PPz%rv%luvo#)=`x<wCKcjQpMzq6ftIF!q}
z?at3MM@i1Uk@e%7v|}wgfA$bqhgueA41ufk87eQc4CPljDr2)-#(e8W);3Oh$yBP(
zYI5c=s}=p}7RC*EX#WrCqx+WNiGqvkz5yBzat>Ji8x(mFS>T3U*;`&@O}1f=1uwJN
zbJ^b+?6!i?nE0Btp?3p$T6wnv*(kIx66|gT)-!Q$!5%L@V+Wb*^{t{Mk_CtPke9eK
z$eLdBn7d9-wf9~?9~7p3i8mlq_E>~pO1Rfn%^wczU+jGc8qC@5q~G6}V|bGC1j{ye
zE8jfw74nW0upNQP;{A>=XHqR>MEvbpf~D3^DcXrjeN+y6FatS<a=}!|vcr4!=Lfod
z6W0z?I<-gbIuiVojK^M;(RFz19j|>V$Ae`Dy0k&+=V9Q<{MTg}+}hA<AIJQ_Tc!R%
zXX`v?sADX5`(_bO-F}<%es2ArfZMA7SMX8)py55f*3_`g^r3@3FtLR?v8Q7HnQ_>O
z8$IQyfxusLyMO#zryrF08sqz}TNb>`^yM|m@nHKl?#CJ5`IPkp_BXJ<i+w)!-zfV@
z$`05${(*MRP|EgWhWhERZ~WST=5p#9#vHrX%)3@<7&@I%IfcmejIZAQlP*VnvI^UK
z-{<bP+=@HOjZ^r?gl7|eKjpkc-Cw2df5+aAt^TR63vs_p*xT5zV1JW(ys_AsF&33$
z?#hz>_@9l1tu?33m;)<oc&ck3xL_dz1x{FN+DgAz+oyWkUAX1DaJz!`d3D~BQ78BE
z{&{`uPip-4+sC1g+t7O{>Gy??>#lIi)x7JK3tjf%)vaItpY=uk_zGnoW%C_+`iczK
z6PmEL$C*EWW_ab58TD~T^M3?8l@F};dUPZj6)lNIFV+~RRp-S$+*9c5<9YvNtR#z!
z$wh_$cCDQE6zrtCqnr_b_&V#kEO=T->pJ{BSMj#^Fm!mT!xvdJG^ev2KHCcae$kwB
z6TO;qMBtPAc5_H?%nb^||CkfR|8)M|t5<cZZm(X>aD}`&)EAYVS(obRWlRs3UwTC4
zZ~KqUPCJ2@=)r@N+ACO109Mx<y_V*l7ke9kX%^|`x;*Kfe}F%{8T|G?kbP}<t6NT&
z`xeDo;-!muBcqHYWvK7p#RfK}+y{)?sbf=ydpd5_cOvy2#T#?`(3gkltDzTY<Rs$v
z?dRP_Yp|ucYC-1~qi54waRKTO%yQ79>MZF%`#t1NXr42Ak|DC`;}OK2P1)Z3bwnpL
z_$y?Ljs@NO9y|8K^2=(Qrp&ZU#@E{ojY+$rv7xHAx;Y-J#2JsrDw1_Ac2#5CPS(^W
z?54VC5>Nf;(4Z1K9$VR58;{u~4auofa%B}vx1$Y}c5zLV^o@2+bXCkw)Ls@#ga$QM
z+0%0EDJH(aE^kT35=s(pZm^r;jZLw5T}!TsOxDC&?8?T5@yYzqpwf6_d9<7sv@|x`
z710K}s&<Xjl5!Hos%jf*8>$J2)%UkHH#A6%py`eEO|^9-$hYlTEwRxd%k67bZC%W6
zh}OqKW#ba#L-Z@roM@`8sBLUcP}hX|MtYU3p}KKEfzBi*+I5YT6IvE;v6~aBGfD-~
zL}LT3i_t2#K)bdfk&Hzvsc|XLYZ-0N%$pdp#wBLjvtxC!q;fVkC!3m+PM&dzT)Vc)
zu1(spHMNOkBHu~-)uJVfN*2wVNf(u=vB3s>nfWF}o0_8WSObGI(XNV8eI;2<J^y9i
zL~~P9JeEkrD#_vGv2BK_p&~}}`<m9!X!;zBdrh<L#r-XJ+DSe^(5{cR*yYMCkkjIr
z+YjPPfNgbkERkeP4cr<?mW)-$Ym+TDNRYHAm{GCwlB*`Fo3)I)*RH<4BpT}-C?_1G
z5~h~NVg`3AOkZY(1Y~{;S)wUcQCn3D3IjQsR4;r05n{QDRbEie$!532s81D|{1uJO
zb(Nr=9j&WttcWIKcC4YXxw^)#kAV~|N;jyaA4aF!8o<nfQAo%stF&lQNwJ-mXZjm&
zh}Ma=5{z=Jp`yi(#p8|fnV~@>AGA!Q#lNUMYxz7-r?d{#ih*EFjq#+A145zy(In|F
zO~h75<CTR1T7F}^+Q7=Ry|}R<8E>r1E4HE5L~VU-9aLBmrS-{N8%j+I`yALh=}i=s
zE-jh2bk4kUlnv*s<xB0=HMMn&j7C$KV)C)kWS2JL5yDe!0s;mFMJ*()t6dQjqo|E1
zk`ret?Sz7fw&|EkX-<MiHPM9K+z^k|)f%F4K&o0Rq7^kUqT`ixEvC%+O^AXz@uqmK
z>ZfcCB;(1@(SrI@?Ig4qwJU3@s$!x9kg%eLG0vZ8YM(OEF0#v;tAW1wgXs%o5{G=j
z3jkUH{W89Wt;N>FDw>mORbS=J4NjK~eTw^3)*8f6Z$#}5(h?C*#OkWtN~fw)%B}Ni
zc2PSIGN^&cIkhEfgk^R^Y!%IcY)tbQ@O)LijJDFm`1k}JYG{tu<=RVO!r}qb@~7q+
zAR7Ku+fdag{1%*r-xH=xGzF-Tk}AV6#ns5`)N1g{1&C=Dh#NN}*xUe|L9cQUS;eUY
zq9`!eu8PI#?5cQ-R>G`5kC67k_-NXY(PELbI(R^z;A@GBcx}1n0OCwnqDoTLT&LRA
zOt&%@Sei<p3_7L^4rC0;tb+L&bOIC_4P{TXKxFl~%vOeu45FABAzCSFDvvRRsSq<c
zKv_<~W{@@Ss0cH4WmILbRE&Y~DsLo06Qlu&DKpoUW{9+*Wp%X0VJQwDDE=?$tkO(X
z|3gZ1P~2hcc4agf6?im-H#a3?mCoF1#vRORPJmd<Y_W<J3H4S#XBJVPDq-L*)&Lnz
zc`h0!SFN(^TQ1RTmtTI_6f@Ld$^T9=Hx&2(H<?fS-$CZU*^v3v|8K~AN*|d|{eNWM
z$5H+pWF9JEibgW_rbgsOaohvQQ4}))A<}S_a#6dYUDC`Co#zU-FhG+NQD~Lj*kqVK
z^k}4{exV75nrN=5F#;q4<L7dh8ETdI%ltB4^JR5BS}($mCSi+BMx1b?LxxdQ#T)CH
znJc69(Q4RQ!kKRpV%>eM?5j?)nLB?(?Q*1~6?qB76v=i*4AulGF4P!@d7KlACp2}9
zqoME^nc~K#mUt~fi9MlsqFr#xDbw?&L?S1%B(T5IjA+ond?yK~FM|;xyj}olGaDru
ztCA8HPVHM6z>txxm{gE8#N{ED$qZ+GBN9T3Dkh9RGUaM;kVonf`(sH-Z=Q^>prm-t
zqNQ_8KXN4m0c9#gtgUOVL|j%Ojx=EakXMi&$v??XFzX;X_tj2+58L*>M1a{X%9RU1
z8XCB|whr0B%$7`rxvG)=*k3JKHh=N*Wp>e`^K4||B}I#top&mUlSmRQ9abR-t5dZI
z-;#O(Og!3veBD^35*E%`Qaqn5MYBp4lq@?>bNk$qWsBx4U24x=yab7*v}nn)lH%nH
zik8@=%a@ccUOI=NTdFy~#t1~2a4~B^BY-eXFoU`S``^R~HLp1V*3AS(><g;uqSZ*1
z%+>u15y77zIumE`E($42UJY_}O{}g7xA#L(L<ltETs`PVnI>f=Df{PFlbG3G<JCXu
zHa3`~myy)NUbj>ysTat|nuIGzxFQzItlfAgm}RT8Xp2qE?1RZxMK-5Eug$hdbTvyM
z))`v=iHI^*6J~DCOOnm7fWBM~NAOz3fE&W=;}E8@3UVcqmBJ72=avj3NF;$VG^WZ-
z>XoEsi2ynD{k&x&>!k){wPbAtB7<4AAm$kOI?Y=}R(et12=j7(Ag~vL5I=?C%v)tw
z*RDd`6XuwiCvO4y>S`-u4gL9`4ipS6P?SU5D#fsm6IfrEl%}!gI5nCWx5j@lXM&uG
zde(McOND(gyN>?QDXs8Wb+D4qie}15k;n?CsRed^zMXeUe<nmsKxLSp(Qk;k7LZ)&
zPQf<K%&Ur0%mKeB{0#;M0p=ArX%K-ApXL;U?8v;e4XYYgFwSIlxcm5Au&gTDTnC?X
z76<St8sXuDVL%yGn~cp3QuUDa(0Tg_;*hy7V>x`dYWuUQ5f0ihGtmGVk0Qa~rxY&E
zl2NG8kn2j7UXzIfF8w8;G$Oy5n)=Yy;R**KFpEprl{be{Tsf;i<z?x>^4ai|TyV-R
z0}Jz}p{<BT8=Qqlf+h*5d8?+W^1NxQa_ti;9N|4)?&<_eCNEZ`5&9hhpy}?~0s5it
zzGbna5@LYS9;}u!hoAayX4$@u8dZ%oZhHRIs+k3-B;>HmYm<q|Qi~CAQvQ^xapUX+
zYaRr57-KEa!cuLfOs}Y!%?+_NTH=8lhBT?KFOEi5YWf3^YR3eIrM6+Bu_<Vx!X(AZ
zmg=N9s^txfR4Hisv_Oi{<n5%%P<_yxXdV5nY%xnxyou&2v~#9`%5`8`&{J!5=@X%{
zLzhPy>1Lw*ABRW{);RrDd5im%PlAP4d7s`a;r8RedZlw12cKgmi%SKx!gR*8&t9#?
zp6#$-4{89?3>G*RH9|ryikrSZ%>@rM?d00YmL}$`G8*DcMB`1G)!>ZEc3|mh7y$Mm
zz<JO(CE^te87lgK28$9bODun8`DIH0@w`}ac>|29l4u?HwTU+MI4QXUW0re;YPAW)
zOAxIbUd`mG*pOvtFxF5h9gK%Gb!fB<mPD&-E9{2m`f{K&!J$^^f*D_-7NVIEc+h0h
zuDFZ))zNr4v#cGhl5%Ix;<<KhH6tgrqG@}7HGR0L@T!>yBIX3<ml)XC54Q{)RG@=?
zCceZSGvQqyuk(h?u!;i*?T}@f?h)gbo6)AeL1<hNvidpE=SRWl&t@M8bO+q4YoMS0
ztVVO@@{wX!Fs8kS9*a{$gV2N5M4KRZv!>`1zR$Gn6Fnw#q7+Oho-?_OX^%SluM7@j
z*x$g<bC71E#FYep;6UYr$7IbIr|M?Sn~ezbA`+ueH*=dI3MN)bGt!1y*1=_ZfJR=5
zDc&J_gJXSE?+m@<??c5})~xeOO2xcnV_A6|;x#iI?&XV|z{{pEY2iPAN^#LLY|UX<
z*7=Ut^ko*Pq&Y&wJf6mQVw2KkijI!o;}eQAvK+QBNPfwHCch*M{6?U{cBL3oo-4-~
zH&jUf8<MrrI^##<g|a`%<d|1(iZty5n!o_E(gF<$7lL*ROxTh9Q&@mVUPgJh%7Bvk
zGRlz%V#;<Ld2Ydd5}Sz=M{~wCufi0D$jM%d!0s$Xr0J@TiG{-Dm@};Wq%(2IrU?Ae
zxNNf^%0(2)n;ok#%R0+iO*m}PvM-OU85fzcCf9cCD+n{Z43KKZX4_~<F*uiCg1~dS
zn=IGRIcvK9Ao7I_u1v10EjNytKm{fwEOf}wWo6@-YR&S|Oh1{*&%UghSo1@N*SLRP
z!RcxtDH2j;x`g2ws+az7HF`l8^Uaopw`_IRlCbaulaSM9$sN&<@W~)SuA{MaRKw9a
z#1&ToYF0FAI#ZGsdC_K8eQ~r2A){GETy-mvAmS)I>!T}3*I>u0Kv8$OZ?+P=vQ7;p
zYwM-2H>gul(Hxg5ykF~@Fl)*rN<z|5rcrg)uxO9PLn{f@-i;@uQ|&Ug%2p(B9I${F
z9<b|G5i_%j*7!!S3Y~c3iL5!z9*ww0BQ-m!=R=Pna`nkJc|xH%h&u6Fc2C$;boP`a
z#Q}h*a723pW?RB+BITphRZea09dggXkqEp!2h)j|$-%gwewXegbZIlfxiiR)bR9>@
zlV{YXW+-5iNZ>|KQq#;#=wO}vA$K*Qi7GMKh!|`X3EB)S5_`g)(9G5)TS4d*w1+2T
z0QJRoL*ggu1PF!x!daF$Ds2GRzn>;#a3oC_tysU=BJnnCOask46RnOSKZaZdRSP0v
zLoGBW?rbneOk7feS<V}!g2|hQ4oZBHI#2ZU?hbMF^9E2f-dNdO;p&&AZ}Gszu=H)s
zK;}(s{?Tjd@i-^|c5q&shek0LRedXH;DKFsRM1g3*jWnqqdXfc+GUn>WG{@>3wAT6
zQ{jZwt5@e!k`s_mtrHpKB1bhR>=%SJFoJ_K-5SNxgn6Y4DvgS@uQapV?pq+%OZR3J
zAfiJy2O$x&S8RrBR>|U}TDUYd!V2<0N!9O+y!y$8HM0!@6dNus@@g2Bi~Z490)h09
z@D?K$TSw&3Zg?i#4NYh8H!3$g(Wz7tlQx@}G61Zau5B&xlA0LXgD&BjMU3Gc<YxaC
zSlcTa8dsY#*a53#OH2FnT9FuPYm#oMAH_s>f+KxV-<=&go2^ezMdk268sq7=oPBee
z!O|88)mDoEY3o<wfVKE6%UU|;?B#P770<b3&XOgImvB0(Xi3pR*Rybr=i=SuqGd&1
zntt~s3ybEJ6sxR~#a^uBf;s1w&M96tXZ9t?tJJf6*{tPr=Uy^*`GN&XTfBJD+>&|y
z>CZfqCs#6l9~b(qeHg3AZ{=V{V#Z=-U}j^MVJb1n!x)L~j@DpY<xIruiUX&)zG*Nc
zSjQ*ujx(F}%5QeKp(9fcvlnx}5x^HNn`@t77vxQW!dU24D{9gd_QKF}k{kjFStdI^
zupZW14fZyXD%ZY%QczuttGvkBV8m<kO&B*VzksEv1b-)Q6Woz>Ow(!?Xs7Je@g|iI
z3uE>ZxXACOHwQgtvOCt)Bm_}v;@L7a3qdEl)~uD%!ZcJTYrG&6CXWz8bwfI|89M$v
zl)yRLktOKJOuL4K=%o5&m2Jh7lj3!(nv`F^^5%*aV7I5Q&d*1lF%kS%8EZ<`uo$m|
zp(JReT$(u&jdd);#hd8>(yW(W8gveO#GBE-&@*RPO^N;WvBlV6YV%-Ti?->YG%M8_
z`vQa_M>JY<ks5<cK;Lm0@)i`ldI>em6xEm+ePtK_B|IU{j5y+^C1iDDe1(Z}v4wfQ
zw$V{AcyLWN8d1ZQJWq9{mnsOpJX*1$4_48-YUYe&O}+B@FhLAw|Evj^7EB$1a|qnY
z;qH|jXkW&H{O{-atUn(Sv_71eV?BGtSW^98{_|T0{n-KA@BAGcb0~kAuQT}1{@%|1
z{NI7;f0o_<_hR<H_Lo`0&$IjgUdsO0{=EDajPw8QA9|f}3H^zPGJc{b?>C{Lwhk>_
zLvtP0BrDIdt;iZHa;_B)hqFVWP)*%}OD{{VJm2yMv$MHA2{mS0U&^wqqXzQ6RuI|@
zSXLOnH4uQie&4{O!b64*8{W{g=G?|+1hcuZIo0!`Ma4@i5|%wFk~e022}Na*S2@f`
z1ue=OXbsHfg&JSb&wu=uH%KmEX`$mw_R{7G9iy@qBbbY`G?=wIo_bCjp{`nlGT7Uy
zG}>KH0oWIVtYAtg(fZ9fs^A{qK$vG0ZM1olT@{+Cv@dIAY!#aVDmGeKDZ$w)idQ$+
z>nKnidnw2`&IvYa4ySvhn5ai4b&4=+ex2fR&Y?6R4y#zs4<RbKO^PL~B`|-px2J8>
z#&|Sdi|p0h5cSTSSm^nTa>6?-=18tqsQ|!9Dd15VYhXvtQiWbCXKBxr2-AA^3}vM?
zyRSEza!jq|&50IkuA1p6IRVBh)?R47%sRv^K}yYoV1ieRqCR!2Rif2JhSx18>cY!f
z2B<hwgHR{+uT~94W^fiAhl-^s%;=okjMo~$t&wA*M)%`1%32m%<DPKr?}Ql-s*IV|
zHboh`x>yw}9YIOJuuAIcV%1FYiCAm}z>iiUKm&2JiaEF~>UP4K6=z?BGhww&l*-u0
z%`TPKFSECcoLbqai8vzxAlB9iXeBY0y;2(0H`oZfm1c;ds~VAfE1e<G?nOUJfh<Y_
zSo?5cE=sOG63|X;OsGiq*&fmx;?M?sOFu~K*u1SXD@X*c@<!A{MoZ1yNfquso7xDX
zQVi>G^v+fZSe4WP$2cp2dK5pE7DsNG`dLmpI@|+#wm@}o^j4^vXlbaZiL(N{j7(0%
zR0N(nHPrJ0omkRZ0Duo!Txq;9*;vt7XII8iRmDxQoGj28K11=vOIf2DxyYO<>jRM2
z47WB9nPY1>VXFb~0z?v80cX(W95;>4rg)to6K#;P{NNlCBl`jqb&aUL45f20(m^7J
z33#+-NY^a7qxCA(XwmxzbQz089e!;R;H||Du4suKMWXhIG+`}tjvac6N-g<V(KW=9
zlD(`_WGE@gRhP~N!_!n)`K8Fej$W@G1&9M|$(`m<YeFXjNmf*eos`Vzu&t%>`o?DZ
z;`oZud7wl<r71>Z!bD36bP87A7&%E7g6*{&H1JM<Q1+6!OTBZl6&YO7MLFx7XkD|5
z?;=^3wvoZXK?5g)h>JuN>Kg4}&{VzGal^Ozhfqt9a+n|xpu0=JTB&^;zO5tHAOJ{=
z&dLmmnN?s}4Y3#m$VOgNxR2%x9^7ITnP>^!QvCGI8V4rICpEBeH%B=^ApLcJa;wNW
z3!_q4g^HV~iQ-X)5gt%wEpvg(>UC0-Y7dC!B)TE-x|TlVV^Zor49&V5@M|Tc$!aw`
z#T+U}4HS!$<B$`dHZQeqH|u_YCK=ya>LQ=mojYcIoSXGmJYg+`DY3wTjl1))Mx?QU
z6FLe9@pZ<)K^PDCeKXKPrcj}(;nSRU??<B5Fbu#1>oIuX7S@MjX2|-;{D5E`A~5R{
zuVtnXW$2GNP<ZGM?<=S(%30<XgBks?MK10fDpDI(O)i&$h>UR1w_)h4g}w1)Im@mU
z<ZO5jNaljYTI3M0XtWZ6C)2N0Aw;iJr+vYd%!N&4XHD4PA|0T2IO$UFID=779*_q8
zOFU_Da@)&fa+vnVKn|EvIg44?P{PcY8O(`ED`9lHkh@tAs-@nhsM`uqX4xUrX#o1u
zxTr10;p!6DMmo6kL`^fNNdQD2#>Hdi;5FhKstiXE;`oN<@r?dR(`JsDWCoH``Z{aA
z&RO&Um}Mv=>gcA3$Pg;MZZUKWYc()BP~==K((Q{`3X_f5i{NiYaDcZ|GEmSCD|O9C
zVk(@BMct*#Bfwa)(z$aMm7Hs~u$(#8<Q4p#h(rtx2I@ZPIQlT%NL7*xGPAg>O@{^?
z-aETCv4Z3GjU32jsxu5t<&vwmxgL6ATgUpUAuu<{aMsC)M3c1!us9rTl`NWTHAF$e
zqD5A|mFq1Pu*ViUp7R`g)APpG+rT^*d2-A1Ma4%qWIgrN(>Koj!(Yz)FtB*W!YRi`
z{xW~{+VfBQQR1ri7msLud?2@!_kV-yR+jbn_<r|&PvGu&%q&gLJVEYD)+^10H}1dc
z_5J&=D#PZTfvbjpcmGu#9UZM@uKmbC_JjDX^;YZ43V$rr`t-j!=?`f?7HkbZqxc6~
zH(@_A?upjZez5;4?o(ZreAdagN%lil>wDM_ho5L&^PCgDMK<BT$1YX-o_E4uz&7=}
z_UpzDwr0Pe@L+2MyMub~d)4u)kDJ=~#vSJ1-=BN@R?Tw1by_fBqBbq#r5xO|M__pQ
zp{(0){f#vG&By)h$bdB#|DN3jj3)f|xR(*9*EMF7cO>pk(skVHvm&^?-?C|bYtu}>
zwHdP&vnkgxci@)M@86E!9&9*u?V$fWq4<dRRt1NxSn=Y~Pb}OxDywwf7oYxh_6bMr
zd*#bN|M@kOqpzJcsq*%mlYY8!M?olc-D%G~w|GX=yF(WI`%63Le=&XIoQM9tr09`H
zM_h7j$6FWt_~u*AX}<QHB`;4u=F+Psz1{G@5w}+i37=m*yzuyzdoOzLipws)t7%8o
z#mV&d#@zbVhr92%uKn)oPuWs-(`lXKuf6vD55BSFv-{Wfeo(pb+zTfC@Hcb!J~O@S
zp?_<;qUO8n^Cmw!HS)<rd%y7LeHRU`OKqv2^49pK-|hUzIUVnpoVD^l7aTkN-#;7h
zr{}+HKlziJPH%p7LhH=m-gW0^f1LY+r$77jftLNh|Kk~5#UJhOy=}*{d-8T(@$u@W
zjng{o=S7Y=D|q^M&Ux{ahX<@3f84RfV_rPn%8%RIPyCNNuN%6ib@3POejw-AFZ^J~
zmxg_Gjqkoco|SdQ&g|@0cf67_@Znq5bbRleuhniDvGSMgZ#BRB{*5c@I+rv)^}&#G
z|7Sa^el+*4i?c7d`207nIR2|uW$!Jmh}^#Lt-SL~ju?E*>}S64cHu2A-T#RFZsmi2
z`TO|$7o|VA`>c+;fAqIU%YHEK+A-g|;pXlqCQo|wnp>yWT~`#IyzY-jd~)^gE_&#j
zvkPnPyt8W3mJ=`EyLI>RPo_()=3QSuVfu$>ocgC<pSq&scbiwO{L}K%DSz!=_`82x
zvhUfK_Wb&a9~ZoK#(!-5`Tp0|ZG8G?({68h<JZs4eDD0!XK#O!&Z#}`?>p*S-@UHv
z<d+s#PPsYzvJKb1a^;1OUX%E!<E+)^91&dH6@Kxo8Phk;{l=tuv#z<^y72U>?dR?)
zT)TYfMa5@->(t}NO+4Yf(fh2sa_1d?@q}3mkD305(zmDNuDboq+gF@_>Ipv|5xD-f
zw+7Dt^(~?O`_4J?uc;y7h0pCAzV-GSj~TOZ$?->?Gx^i+pY_Qf%IY8e^Dmm}{`RIl
zsXKQ1-VdHV_Mwjk52*Rg_kJ+`7rqBR`03lN_y4l-&dPT#-7)5c_jh)82LE{Xj_-a{
z_R5v*XFT`Hmi^xkfA85Rzy0tP9rt`T^E)Fx_-xzjolk%J^7mWreW`5v?JKYN(_If<
z@Z=3&n%jKys4q;}^yuK<ZBFKOv^^hLx#62zuDK|`{jBr;^l<jF!tcFOI_HDy7X9|K
z#b259e$Ko*I(HP0zGCg=H<uM(wRo--|MLagSN(nP#+t8uVP4&hkzjOe-ixsh&$@lc
z#pj$q;_9YjMn>x2KJKK`@A9v;FCK8gfa3>$eC&Hio&CU#Cx7sRB~#D5bI2K+T6fND
z-+9Z}nLEz0dp;VGx9pE^O>8;gp%;I0YR&eekDv5<%G&$#{iTooeCWcuH(y&Z`Bz_C
z^~t;2U%R_!)z8azKelho-jToV{^a=Q?%%g9Rr&kG#_@l7;r0*yKIrdHfBlE)miFqG
zX14Bp_p|jsyY|`J%5T2nTR-SH<Hnpv_uuk(xZ|+_N34AKSCghZP&55^_taNC`RqHF
zH$NS?X!=u67XIn+6|jJvn5*CeU9gvXVM!589_B;BrW5xk?El377VaImUn1Ql_&>tt
z60h}J!k)tabL{u=Ux0ftaWCMm$DDyFA?`ZtcQ9|O9?X-NFJO2t%c>yHo22;$?gvSe
z#^$cP)j;?gxF=yhgg=ITFYy(a@5{ztfPFFcW7waO_E-#$G+1q<A5ZvV!qu)u%*}*-
zf;km)IcXjtte!M0u~q&$>{{$?m`iY@yt3{i{ukKqk^U*{hp@jx{MESCFCAV`fAx`@
zXRw!(o^P&Oe<A!i`~lqUgpJ1j5#|=$mtx)_E{^?s>?MR(V%jjH344#c_h6>tejBrp
za3AJ3r2P{9yNSCH{||9<vD$hc{}$rbVg!?O2|E(|O8iVO*0-=9CQT6cYTVnfx#Vko
zgEYgj%ZZyv*uB{0_;15~KXDJ@UXD>6Rrq^|*BHJ_*fY2XVhaw(V7`M<y=lUKM)+)O
zKY7&OAL4E%>;w$oPO&CnenQyOn8$D*i)kh9D$EYdR?HtMYaZdNF|Xk+CheuzYVYf~
zZzjAJGYBJCL@@t`J4M_q+;3tQ;~q;`8TL2H_X=T;;NOh>0QRex9}&)bSymJy+)WY3
zQ5I_m?hUww>tiq%6Mrq?7hwdW3hZfwZ^lGP$26=5hOD8)&Bm|3ss1?bRhSPj?U+%-
z{}o&KC|u_~BI_>lDjgz#r86zJlV%Y9ZTNF>pM<@L@UP;247(NcSB&s<0C9S`kVl%V
z-Pl)=Pk5sAW!StIV4X+!vzRLUqItFNYlL@U3-_MG2><THsP7vw-^0Cv^l9=<#O%iZ
zAmKm3-GLDveN5Oi!Zhw5Vb)^4hhOxle({ZEYaH(PFg?WW$NvrNeEf@Wi$+8rZTNqH
zxfS=%u)mJIk~r1%8tJaU-i7~h+;eaXS95TG3-><4t1#j(N-Mr0T>LHO1mgdU{cFN`
zjMcgea}DM(!k)!ELHxI{w_wUK5}h^?uRNkN;hx6qP3$7V3vt(CG**Aae<k7H#{E0$
zd>X&TvyreL<39~|D@J@%?VLfF@K*IckGTc+E9BXZIiC3E@gI$yPu%0!Dt97r;#FV8
z%pmL)<-^=TxOmYy*cW4Kyy`Hg;;tiXHTGNh#i!Qc)@#fq7~xM;;n=?+{8Q|im|sx#
zDs0ha3bUCsqEGQR(fC`0rByceFYzmX0Y>=eS2*q`u}>$SZFcLc*nB_9x{t6w;$KO;
zXifD031Q;Pr((p9zkqEMemk~k^)lSQApA7krKCLu|4G=BFfU<Lek*ZjV#eUlB0dNE
zC)ndKZ(uYwg7-~?i*|NmeucRKe+>KU81a`6G22OJ;XeU)8Ag0hZTKQa?f5BvL~Cn1
z=5+iWq&WundhB<wg;$pn-hi!g6`sU>GWMI;PhiAHG{0@Yt$J=D-PQPWu(L3i6Q(%f
zMJ3_FuOAYAKkh#hek<+{+}kn20nzgy!e7Hb1#<^s8h_REOX8IOMg0FDO$;NtUqbl#
z7>(6~*jJL~g*kp>NZR)!`jEfOaI#vJ5X*g-T^P?TTVrW{yGZqWjO+}fJj$Q>^Rg%`
zjK}zuS4>rQhEaY0G(V9C$7j|h_rdX*^=GF2pM?Kp9<|IXE}m&mn73&8M0;xf)ch$n
zN7$xvrtBnp!t7YNE~;_XirehEV?6PI<XqIwhqY!D@P9_gzW|1!e8wOei<Z|~zOgv7
zik2)ah%B4Eu*4b=%=QiP4Gj+Wjqn{E80kC4H_C72Cu&fsbE?V8*Rd2%lCpDT<?CS&
zmT`?zHCy?Vkx#G^InLV3HCBGC=8`HdHpZNsm*~!0i<8rHUs@5j@~hbf$al&qM{lH)
zVA_~*ielfwxiQFw%fI*=OgiD#0L+uE80;{{`vqMGZwvON+t~^q!@ow8nEUhc9F5;A
zZ@%rf=BIpzEbn+Xo$&u$(w$2>Gl9G1u@P*3<M?0YnRLrY_ZE5uC(8WqwNGKBYg&sf
zJ;o-|rEx2teqK7wVP1LCebgWzdU2WQ=HNLJ1Jzq~Kl5V_oldgFQEs{>(ls3>on$rD
ztMZbhOCBa&c}BW5q+3I}Cc?a*+A33x@ygpnx;>=ZqysGO&+Ah?e!)`pHucax^g7G<
zFt7LX;2bAF<#|7)o1PKiIWH#xW%V`bfn7dpvX=?lOD9`(dcU8MPBN?a^V0n<K6vDC

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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

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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

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;
-
-        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";
+  fetch = { file, sha256 }: import <nix/fetchurl.nix> {
+    url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/r18744/${file}";
+    inherit sha256;
+    executable = true;
+  };
 
-        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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
Y+`2}CYeQedwno?LPNi;WG-i$aFaP1Z?EnA(

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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
b(PiAqT7zeeUrn}Jm%$%d-&$)-8uxzygX=}f

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
zcmb5Xdz=;ZegFTNb79xBi=4eFT{dx0R8-Vau^|R^5KKwL<^T&4CCM=wwJm8+3~6j?
z^y~#B2+hhxQ6W1?NkR=xHmPZ-k@O&F2r(@xs3o>NmmMJo+inutn$%=}&(~+>DDj*8
z@#FCrX3os#^8UQ<@Av1j_g=f;y^iCU#=nG_ZuIN%qA@eMkIZpQ!kE-d<C+xTnoX0w
z7aHYHzNh%1>&@1R{NQ@|YR6t_e(JaV?(@G-%Utt$?3rxLg!ucyaOJIfeEYv9Ua0+v
zCa9QfP@DK}bKH1ACF@`KlV&p%ru>cJ@1MatH>fn5;V_lex829iyU5fxZE{S3a>hFt
znmqO0pq5Mo6}qk`O|hKtUOZ~d;+o_3SARJ^-hD3Z-#o`0_q^fISvXLp-+C&$DfF(Q
zeUq#4JCn-Mj=wpaAb3n~?SH73=DASZeQa=U!U!(M4=UyHaq0|(Dns24MxAN(hC;`5
z@H^<pQr@Gi-lYy+U)B4BH_%~dztt;tG4Ae^>eJUB%r?iH&F1i0?&@nUcfq0O)WP*t
zkG94>K)-@fZH)k15OgefV7O}m?aaS<IHcWL+JEq<#{PA|=5G>g)&B$jRBlyut65^l
zk_v*#HI#A8>gtu?<JBvpv7bsi8uMdsjw@FajAQO_IKdMxHiXBr!{IT0zjUEF?gT;Y
zLfY9#`3tz40%g3Q=6K&9RXbbMj`whAiqOLwsG1yO^*#qoOKKU5tIZZyj62;l+q5)M
zXU`OKyw%$rHk(yp!rNPG^;U%~w4F6U?ODDVKd7kf@9>;5gQ4m?uJ^e?>I{O*HDN2y
z>eun+Rz-XDnPeO@f!lZ+=znqT2MIGJmH#f!OKVSppA78?&tsq8eQesigb|%rz{8Ki
zU*F(zdAE-GW0u!8MD)~{y#Da6+;F(Hu&SB{Hk02RriBZ$DZJO>aVdBcT!CZqqQ}zO
z|HkxaGD|8y<+%aZTk!V7d!~CDJZij+7GCj|g%7@eBmvI~R(PTTtKbu_i8rpWcn8<;
zkL7(6Bs-{|^VQxa@FKW@34U8@VO$lx&&>s2OKQU9Z|nc=M8unjD&q^_!-y{hgZeM1
zf4<#}JOFR^x74;D)KCHSTg`BI-#bOWTvhTkk$2DAzH>GD${1*F%!78kv*EGX;QA`@
z81?lnWno?gznJ<o@I5WBu}~+%PxZKP3JoQr8-^WAx4(sM`<F&^OqDMTr(KHf06!)x
zoIV#`j4XYUzTaWY+H-i$^9)>TU7j!IInA?l!gQWb@qFZWaSc9S%kTPB-rvakv$>zc
zSa0Fo`8<D!ci@0Bxmpj;=W%~0-<R<H0-kT;-G$tLk9X9s&*u3O-hr>R@8%ggtv!wR
zALe;!+}4#*`OH<^k%jIle7~FLi}-#IchTy7yhHa@uH)`c9S-Mncd~ueedFWxnU@TQ
zGac~7xF<kE2Ru=>*4Z{39=XCC@8Nq7b&MGZuT(wnr`#9UTBi=D{|mfce$qSX$E)~u
z!X55vyC_J4r*7#0=>%|N>(1so@|IB>hbSlfh;GkP=1lH$FAi#MT=s6t?4k@;8hmwk
z$M4VK{SMx9rNKvcXZ&7mzW3swV-xSQyhmr%=g?j&_d(i6uhfg&o4H@hdvH@<$#3yx
zfjfAvui!2ozJ~9@QLE%EJHWR{2N>zv8xkf7(8suc8$NoCdxGCBT&HqP<eJ3Q#?{1?
z<~oII0#}CXG_EeL4z6~t)49Zh&XMb@;z8LuryJdio)?d`n&EVRH#!NKa*nL83Wgo<
z?wDXR3u}@sWT|3u8^f|0?n-BaHpdM*9=X&^0msO}hFGrq!~M3-#&93^q{&r8vo!aw
zUty+<P<DsDy91$<Us*Nz;4;~-lv&aSzjq%-CfC^dOR-@C(!Cl^U9xp!w_sg@ZIoRy
znOkl9OJr+lKd3wiFUe-jR{h+7mEj03=@seWeyfLNdmDP~cE?PaW`;w?Q(-)ebN8{2
zU5dU(_x>|@mu~6gS-6mnd7gK7P+$01kViLw59t`ub%I$~ar|lRPCjUxPn&=84&cq^
zs;|St8Y8wWGgE!L8$-d6G>aHV;Cy*}yroC)X-jZSrf&NTjTLyHgJ5})ej9Mide|{z
z*U~@zu9Q9rqW)9h*a^;W2cEX+$>H!i^$%^;f6ry{nDf#-ORauvrOf4*$nGP%-izUd
z;OG=+;P5PbNv>Z@42Lr)lL*$<M$unt51LhydF+Y%B06kQ?L5YH5qD^1>s~}%(fnfW
zXL46t$XiCTfIk%KyKInfw#l}+sHXPT(N`ONsgD(AeJGo;qPV`g!rK;3058qZ*!VAm
z+nUVriTsv*SrYpWMPr`GQf|@}$*Ob8;@aK7BAj1gdOLu<BVC}pXvBT`nZm_e{OXu)
z>C$f5@{u0;_g=C-gWxxU5C2cJdmTMx%*OB)?&9m~c_&}+)8b1%sHlGVJ@6p!5~f&P
z%=?n+xU`4v6RuRw$@NvibH?#<yjxtm*b6!wZ(nEH^j6R(k2s!e!(xk1%GDir->5?y
zPH|0DZKQ!U0gNgG4m0*U-yD1_;i$K5IIIB2#l=8+9@-wXIG<$c6Fox|+Bj(GESjS)
z>yAIK>Uh1jU3dbS>aF}@e0(ka)kQ<;RE_OD@pzr$zESb$Xm&V!n*Kz$8gx}X+Ul1t
zX1smjlj3dgW_btRL|!ef!A0#A>7QJ#O54_cI{1T?UymRES=t<z9{p|ddzaet)ZXIS
zr;WiJEwMIS{3Kq{`%eIecqWG|{gHuxq46wlxN9D|3tDttae?Yde(+;f?LH>?lCADV
zwj}qG_kZF3V=n1{>Bykuu*z@gfl=;~!vtgQ#P^1`GH+Y~4ow^W#&FlEV?kRd@OJ`h
zf_F(1v?Y*r-dBE3-N(0ph0VBRe7Cx_v@u-9vy&H(Zwzxh=d$9Rjo|{GjagnxW&>v)
z&#i9IW_>GgAidamfqYSPBIBLl29<w2KjOg*<C8u+em-^{nB`B7GOj7~dm7hkJWn$C
zOxOk4gl4lXY|XB({tG%-b|6*WHk#!wn5T&rC15*AZZtO0OSH8%tTYhLgq{{(^f!ac
z@;k64fNd}B&Jb+;uJe4V`ljDhc3ar&uCM-_cY??88y}&T;@y7=7T_yt+|qTWpw<kG
zhQ3mzslo-a7SujVzrv;Cy<q9z4n2DL-5m3YVvG6wZt$V_O?Dy~msgyj*iUUa#DBW~
zVwQMX<1=;ibZs}Vi1s_M#nZU9_a@8;I84Ru3Qr#21-qVA*S^D6IPi(a>g0k7vUkMV
zAfGY%d&4Bx33RnfJ1MiOItyKqVq9r_gA>gW3=Lmb{S~02>Zi;DRt~0%Ht>83J<{w2
z3=JKPtrJh~nqumfHqc10ESQrpvw(4)g)>*n3N~LcjX9$Bb}E*kK8+kuT)F`Hd6;o)
zOyWILg4XCh=<pmId_;VSt~esU-ogPsZvmDBa5%stIK(HSm++Crp3OmSeEJt0^MPk<
zj^bzV?3S@DxoWfU1Wc`7AAR*5Yvz6dV;Lz7hc-qpK7?G{7aojt&Q>%0?ZWu@cg2f}
z&CcjF$0hp-mo~xoS306G;lp*W6fDS8L3in6GZ5Z3K8`Nf79OF!6nD{z@n_WD%kjGx
zxcjzl)Q9DJcW?On=oZ!ap<qGxM6ur>_T#>=8QB@@+kI>%^qPjeiFYI$qM--gEk85P
ziNNT>W2xMF=(#D(5;sl&hsmD~KP3Hq#{<T^{aV92U9H4<vV|GO`m0kT7*g<jmiP)j
zt7mD?+Dfyynxsscas9ke4qT<+HHY`j#73zoUa!4^?ra5i4_b`@r}VSs-9k`VNqyxD
z+>Z{2r^;^wM#T%;HyAUE>kh8{@m1#DxMpuOW(L1?`CNy%7H|#m-uOZ75dQyrXy+hz
zYqNN_pJ(uk@3%Qbf7E^q9~$pLbmS+k--!LKD`)XF-s>)!oP91hfQRruuqUe5RQ(a(
z3$nv`*^Hp}_}S+8Rn%QU`z!Q5)&V#SnS?nV8(mHkGiEd{!M1>M^8fWbkLNa?)7Z-G
z;N8j2sWxT%&~FZXZVqkCDHuIq^n%M$W^v_Q+REB~BAay<un{}h_RuSpCfb=)hF`~m
z3bEju;~fU>mt%evuXa(-`p&UVL%Vi2=Qg81pd<BKd6q3q<4YmWnFQ~*q8mbDuvAt#
zjm_b~l<*VOq$@QZlb2k^<J3FaPMXe2p4bOn-<4Iq$m{QtFDQN5u)Fd*E)cGf71?tK
zym2S?3~HameoJ4C!9UV7GdCIY#%5!(50j7EM(z*(Kk<+;vw0^Supd6&jy_eMXY3E8
z3&@e=l*bvUmh;15Ip8X)Z*&@CN)()GdWbvpPQm|6V!jX_r3ax^MtqXsS#TTg5$G|u
zs&B?y8zSrn%+Tr(+k(AbTsxgIchmRVeT`ea;lsuaULaOEtT<1yY1}R0Db&$e9rw;E
z-!Btw)K4?8TpGh-a$CUbVk=9B=tnxRCrcmb9+T?}9rqgQ4uoU(?LKz0E)>2bb3L+k
zjMc_z`Jl4@G;=)bt*_z(K<iDRbX%u~zCf0Xq6@#(UUP0!xUxX}0KCoqX7r_Wz&3K0
z(6uF^7q%`V|Dr)lV%P3gc*E*U;8#2l>w>D{?^MiJqPg+Vy^QPV_&B+Wpz;)O^_)a&
z(NlRs!Jo<kUje_J{G)6uI0J|18|<3eP+o8Zc{<srkPrQhcHqom3yRduKNJpqllTmJ
zXM^?C>nv=_(<qm<xF);a96z@JU$fa5epfzxR=(}Rh%WA?aF+Kd{J$Yg!&B(HihPKF
zk}SX{okPG$Tf$3*{;wd8jBVg!lFwd#XB~2mzY=bwGan37?n7Z#aKis*0K>80!avxM
z?pIF2^RvGipVA2})K}JQ`|?#+n6F7*k=-NeM>v{IUwVEQ_s+L$(GiDlm&fls?kUlf
ze3g?OsBK2xtlXR6i|5g%>Sc4=!gDBR^5BYi@0+4yOgq7)aeTimwrSYF$aX6xYRE|x
zE8Dm<);C*$-_knHQOXZ#*fq<y){aMcza(Qs&vZEXAgLU>;|G;F7S5%$H2o9JS{r-t
zB>YI{?t^#5V^NOqKE@}T6;z07k2m~V@x?cRUARXVBi}0Dfcrl5m+7`L5ySnbz%3j&
z{$MTP@9U5r6s`-?WV^}jAye~W*su?L51e9~X|eVm+<3o*wi?69xRE{>o3s1a;$Mx|
zW%K19%GS%~Tig(@Tba(qGL2lk&=twF<T%NgQpjuS<|tQ$a9Q3Iugs#ahHXZ_!n;A`
zEad&aq3O$6Y?BL5dH8~Ue~h<2n|n#*o6sTn$w5%rSsV_t{<cs)l(jM0P54%u!}BkS
z^8S+jq;TLxdW(Q2^OpYnP5ffJ4wzt#^)IA9r9YPa790_8y{SK;3HDC<Q$BWY<==q4
z=j1x*cIlI^gA>bRt9BogE|G2&{^TbX(2IxQ7hk#&+P0D-$eQ)l+29X(Mkd#XZJN8m
z{$m5WcY>P~xRKsWnGK_+B!9Ut9HNa`CCU6ixQ=JVJ<^?nJS!HFO>9NJWRp{44PS8}
z{M9+;xN<-FQmi|(Tk&l-hO?;;zY-g*3up3uzQ#q{)?bFtnsXb%S>RqdzR7$yxqfIh
z5O!vjXAdeq`crux#c0#H6o>BQ(zx$H#%6K3@RP<LREEQ4jDL1%eO2RcjN5>NN#=XU
zCYhbbit;twFECbYjk^xtWqq}m?*|mmfSZfJO@5EYur=nFb>V#K<j`@c{9Zfu`E%69
zM#i_kYRbs8SG4a9e51K6;cGH=tS-+EhPg8M1aDEBb7Nb(&dQ<@Jc0#Yx&MvvDb3*a
zWpLz_=2oT0OsPLil?R|HabUS0pDjsFRQgTt%C#)K!Mqjk`okO1!P|3c4}UMt$;-!S
z6%FwlioRk%`lswW$R(WtfA_lE!WH0MvLm=(`aN@8_?u*&1Yg^a3Fcf@^#`L^8#+bp
zH^#Bbjst$?eKd{_GL9MaEBdM56mv!Db6HHwXQ5v?)&Zia;x6fehJBnZ9v;D_K^xi0
zgTyTJE*H)tJ5KymbD`Nx-g(*e)oDCWhZZw*htFqH$K#$T;)CYV3Asn@Jk?D2EDcOn
zo@wiK*?i>A+Fsqs6Dcni&B;anqUL}c!+R&F^dNsGu<=C21E;EYiWxeV@)FQ5SHtJ3
zq@X`}q3*3Sf!FkfjTl-vt#x__jvD^2G0VUUJ`}W1W!t*o*Dl)Z);Njz!~8VzBaBrv
zZZ(gFyWSW-t~-8C?NapfJheAOpNwx-VPiNwFTOYR87GZ1MO)v~IPnAI18TljwElbL
zMXc{a>|G#ViLD(2?oo1~O|j2U+?6TwyL`)Vcn7{iioD%5#6tT!hQnu&_v!S5Z&!D+
zAFHPDBb@B&@=o%m-{G6ZYi?Cd_|%+|N7*g3^Y-$0Q~qnerF_QVhtto1zJaF<e!F6i
z<{)s0PcrGkeO2C7S_|t#CkJ2n<(eC;uQqw|a~}*dj5Y1z<1?q?A}@~lWQ}+!BfZU>
z2sB+;o91mxH=kwmAZf=>Ciorlojh@nJe#s(<U;j(D&<=X8ms6#0$mr``6J^!Z}Y<V
zlig1CdFYDl<5%H#F^{xRHk_RA3zQdqiwW@n^sE&4CcBWxz7P)GDLz?f{dwi0U&SBB
z{xSx=yDdAnZ+@2fVfhMe-{(902TnhzyaKuZUfYN0`Jw;AKJo3|p`hj~FFQ04-UV%<
zu`jOuiTVbP8Qi5;G~W$;naL^}%Pn(Znbt-6{g(cakI_Q=ZCP`?MR37S#%KO`lIWtj
z5gXT3{*vGOrOV7fT>mZou#~axI!Vu63tT&F*;Q}$z2N`Gr%Xqt+UV~B^83QI_;s4Q
zE&L3=sJ`80>yW>pj~4oMyt~k4(Hsf-Zm;lM%mzt~%a|MSsh4$t%NH2K-qUDPzJYRp
z(`f5b>(fMYiPLPm;_qCIIFh=^GC7(w&uN~ycc)H*A7RN9-2rG#&R+O{4w7TX3xGlS
z5#@0QlDni6`7OOFnD+5o_*9<ll6RTo+w~ngvc;B*@+}(IDbNyLsh<M88uw9TwE??m
zC-|?4;r|Idfvi-XnMxTKJq>T7huW4am&+W~FUaLej}DXPnT`I{9J(i6yV<d^rgZOq
zYd;fa+e40-{T0Wwa`|6$tc^X{SDQ&a<t-JDN^f6I8=7nBL|-F=m80kx`6;*3*Teu`
z@q^m3A~w0em5*fqn~Y6mjQ>#h8RedcF|2%mWBkk7GRA?tTYsONXZL6;J`c7;JT6<3
z^wMS7l1_~UKPUw(@&&Bzzz1mL5)<;nXs;1#D;J&e9|$$?EC06$OrnF}cJt5#T&s`k
zur-PewI)M!CH~0Bhfb2$`#>jCjQP?iaMi8<i`?k_`*;toflqPyQ=_h>=SFl#zWjNO
z(U02BX3G&g{_bNVw4uDY$8|>*{YsrI@C&B9{l2PG3go}nQ*Il&-_&<`&!ZEfI81V^
zm^uYMl*3IR%ZwNNNjA)pOzA23N^2<=S)HCDrc5#arg?bf7<-}lWcpPsZP(_2gGLT3
z$@&~C<Mf%dYjh4DwLT4fYK=~@Ij96&XTZmQj?W|?(V4UHsB?3)Ugz4&ML#PunN(hM
zRxH|!4jHT}Mv*Nr-VMy9kpGP2hP(BXk+q<51NB?6GqWsjNLE&(BZ^#Qt9N#JrHa~V
zq0GA}o27rt8+m+r@dV?`F}?-xgyxbhPQg>;5A}!3DR0*pzzeT?hZw8uKk=B`M?0I+
zFI{9>)ZY6qGsoq_MDh1rctQD*{xA)m-yYj&y;ILG$LqrFH2PKF@@JHrhp(Xd_0_*t
z?jy#_>)yeN`V`Fsv*r?BfFJa1=a%U=%KJh?aM*x-lRq48Dh`Kt7Y3{1ja{^3Wyc#z
z)0Wlm;tRzo<VY*%oF|O(3#`*Qjq%uA7PQvd62U@_huCSb+C<Ee$^~t*Kfi0tmZxJo
zA^oR#?%#hA$8(HTI2TW8+#Y;2#29Q27u<{g8)I<5?fWiforCnC_>SMp!HsZY%Yhfx
zU8O$-9pI7LE^nWeE9HMP%$KED|1y)d-%b~e`(zk}51XfjHs1!$M$T6B5sdP?h2vR_
z>2+|bzSFq@<xXp+0Izw6k)cD#*5V3tgV=<KURNMf=;m(tpne7KEWUXs{7oow@y#i&
zuJRiiBfs2v56%}!o-<#)I;fn@GrEF#%_M*<uF)2@e6YGQI~-ml9~0V4C@_yzC?}0~
z2pzSms=l23>I89m^(A;^0cD%qa^*`G(>C$#Y=1cX>x<jVrqD-ja#Q%#N$L}xHNoEj
z$CuQmVt0ObkkdbI3WK3yapfr{oomdG(dD9_cvkv6iVM#QdrF$mW!|0s&T?7H0ZmM4
zedr>4(!t`_mA^7(*O##c%1;*HH#^=NYEFO+2QLiL&S@&2r?FVv0vlt}5{%5*Jd5{a
z$8MNOE+c<?Ie~mn7%G;xGcNJ%pDUllxX3S7@XxPMoT@cijrnKsk!-tshR?(66WqZv
zbH}v_-oB%b-;e&oZ|B<#+K=LK#(_Kw7WEHYFmZnxTA)YqY2OB?bf3zeLOYfg9_8&E
z&KmNvyN`9X%kPfnLg&L@%JXdkk3GaB&PY(X7=BL_ph*x^erjdWt{2M4Z&hAB<=-#e
zVsmV6c763W@GF`b|Nd|PyOrahRsycO@W*?w|KeNa>ynypvb+=^?&NprPx<{`eCJli
z+FZB~9>~?)!hIdWuk=w-z60|X<Ucd7dxxzqO5yK7C#yqTo|!A_XfhoYWVE9*x4ug>
z%t$8a<J*)Q!lyX#6uLKX!?E_?<c){vSA9-4>#d)r9H(s5TH0u4tm?<*zM4Bg*B?L0
z2ko=-W=pJp+vrbt5uCDnYc3s5r;3}qOmQQx$(t0hscsW;3m%8yPvWK<c|VIBSe|x~
znQCKRliW-u2dqmvBlze$GdcE|uH*Tm)KhG&G5!Ity7>RoD6h4Z^W!>mC?}b0HcKn4
zF(Chq9J@g>OTYN!jBja$oYWI5XzR79k)9IVo$&f)e7}VE;ziN;KVm$c7$1MaqhGDh
zNU%O*BDkMU*+4#LK{53WHgB(b;%x`n_zT9T-v#_~(KVah7G`3)3cn4yYK-Fhlp9p?
z<S;(|I`a>dAEVw}U}@xBQ~CST^qKLM+d$4DeLWaD@Qd32Ik^St>s^IXC6zDQ^<<}b
z<i&=Fi{S<J@oV+(=c>%jbVu#7UJ+hG&k-Umu66%<e2V5m(2<!G?MjyZ`+vuet1ft~
z>^H;VRN#}Xhq!f{yOVAO7n8wH%DX?rFQ?7>Lxi+0d-&U6-4Cpyt1X+;*o&e3hN$dZ
z_(8UO5WPlj4n5L{e=c}^e2VY}EVYdLH1F@HPpxmfKiq__lkY5jIS*ag(0S6Cl6UFP
zccW=LmnF>gJj>4f>o&*Q8tKK?pk)?)Ah|WgMODeJDQF%S{g9Wf2-?tHZDVJeDT;lL
zGIt;uvi>LW?+CP$ZsVKt0mhCT>$&pOi3sN{;8byPv%874%R$><+i(}W+O0ZwQ}@W3
z5x;z%^4NjO654<UwvD?*+kmxL-jTMHx4tXoJ<`?8U44;%NhIKJ<RblpUyrv$vEyPJ
z|B9~_GYX%?mEFz0;>wk^3Aw;&;(hDT`sxJw5S>45c{8Xig6|x^SL?nIQ{bgs8QY?G
z?G=}~3=dqmsvlGi@_svT<FnV({I>Ig)OnKF2Hn-onCogoakcVhJE$*zcsunJ->!kS
zY9~p18)yeW>%y6E@*uzALt9_+qIU)OZ;1Ez8rHe<t<^kqOzY6Zf5<>hWj?}pY^deW
zjOE3r;1kXJM00Y+yAL|UE7&^m%17aaKj&J@rFAn8aQ_O|H@Nn3{fMi^W&KniUy**7
zg3p9Mm~?>a&w0k?CuafM7dq(Mi`MAQU~HCev(gV*<Gv6-nz>W#vF6hpcOHDsTsQvD
zhw&H2=tH?v<xH(_Spd&@F8V~SYtxJJqv46R2ag)FC0vM)AYa4eR#oI5LKCe^dqQ-O
z-(cIp#@zvL$zS-iV1tK{DbO6$uD3iD)WoavrwUg5K=D4~@qu&JC&)8@b2xO>r+<3r
zJuqx#+WO>_VSc&WrCuth`Kb+IOOf~inUTCG7AC)2t*Q^ku$$b2lUrhWYK*aq#`5vs
zA)03og{;Y>--R{u7j4AUPC_({<B}@6Dn%}-M7^ZBp~5_R_nE--9dd1wKk?@-BR@Nm
zMVtiXO{|Y?^$5Ctl(Mrl&jOAFqx7rz{#Sxe`U730HPVi`Q$A5r{y1&abKrb-fgDo~
z9hJwIqO9z*d>V2));HFA1L<EI@1lP$VEwe{s2J`9G!;*Y&ulK7wIc_4Z(}>+@*M%|
zNkv!agB}*GD~STQ$+HiGHf0;71Df2Raw&Et!90-0CirbEb?t7}mmnj|5jR5<%^T>O
z?5=WwcFzELL*+}2xwV`$CGb_O{s4NUY10&o8c!wRZ91yFsPL8YzG&CHC`W4ipu+f~
z_42FWTXg6DFea^WvGb#O*~!RnLO&9t1+_7oD<o$SL_U?^*+wo~^Z}2_T_eNkT|;(V
zaz@`WZbXYG;O77uYaJ=$s5^xlw9fEG!`!FflHV?xsr)zOANvo7V3{%ZTDeO5<dJFb
zOvaYVfgkwKFxNRpG%n_<tl47C=91dI=*k2<Gm+<e^o)NXSq0C)KM<yA!}t$|@A@C?
zFnx(G*{t=kYkj<vEfF4+(~$kJF?w!c)zYv4F7xO!Kd7({B%_?cDzyi%j{{d*IaN)R
zQot3|?!m8o&V2}4+4*;5^265dYR`@IcB_1Ezm#&oh1MxS(~RSmMm1;Q;8$yIyIJ@m
z*Vc%upM|#skIfYThvg+;`D5W9oG30A&L_C=6yy45@Tl=N>MK{YCg0%4h=#(wQ;gaw
z<c8BAJF~)<zIe+A$wK>?jL*2#@xY_<0rY1~e_U>^<*kNI_XKyWYkvQKG_Q;=Tv$aN
z&G)Sen~STWF~M`AjOh?pBQ8|zI*a}-zST!|6FMrWeN{Zon8c5EZjOB;ue!hloW>g<
zCpBo>^w7V;)34!U#Q-KiSHaItLGX(2?j!ecWb|srtvoS0cdc;1TFuP)+zarb@;x{4
zd@k>nbN>_G8TSaZScLvq+kOYXZxh|L7MJhJ0aB)(@zsaQ(T_P1o{vnt!CHjn+^=RG
zrgYg&vHnV{K6O9DJHZsUr8TYAXAm9#Npe7WhnTTfFwmbZOFhl6{-K58NH~?>(1mz5
zNa8;b@4PgM&LRi87E!pVHjh3;FDHL^)D)o~dWP|&m5;xP=QsRl9|7>y{}jL04B0hG
znHFG}R0e-z#C_ntiSJo#(n07cy_G~qioY~RBby^xvhWtyz(%YQBleWea;UdlbKLpE
zDaCMF%MFgn%^waOcUAR6{1$G6YjRzQ3Ff8>fM22fehcv?{CSp>>qjo+Kis6>NsZ-0
zwE08&mQR!<XPKdmbP!Zlqtoy?knNYyA&V=0&;Y$^>BT$*ysDhF@K3xF`;{{vgkoHl
zXZ$E<l%y^2RdI$Qxp#8R362C6e6IQo`ZR?XE&b73jv0BT3)|KvTal0HW(v=QvZK=}
z>twIBGNPDI{+HthbHFD)n0TdFO#nY*KHu@~4Ew+Xe2|fT)>;JCE4Q<ji?#djwRzrV
z^aFF$uvfJHz{)qaNw7<9rjKk3XAIG20U80nZ70V)5bZx$Gx@_Iy23HR(_Q#fZPKfk
zHDJy^9V+&Q9?<lr8Zg;-OEBS&@YAkUsJ;f?Cjg)Lw9&uz*1VZFqi^xR`>8(zA4M@}
z6SN=)b3phzd5**GZSsf0>zNNV{%Yh|^B)bJvWj}*{b=qVdCg4y?{RFUslS{X4qwK;
zVo%W%4~F|(>C1&$|6_BrBS!w`V!johZZ7m6Hg55-d?%~7T=FEyGklRz9#`cOCio_P
z@e_B!-z)QKYam=nA1moY`M%$PS$T7GT$1t2UwEfr*E@gU|A8M^--Q2XCs^-c^{Dd0
zk?v@Y`v=CS1>f6sqHqe&SDM?Ru{L?aQ?5E2*vT4Me;+zHnmajqG4`==TUk8S%(o^2
zbd6CmD?7F1RK+34G2f7<%=fgGgWpfv`wccHh+H`EbQ^w2TN*ubXsTgeyj)3So2#i3
zdl+1DhUGx}vFd9WLu;w*h&OoeNT*7U4YpTtf%rzYUAV^1Ve<yz^@yjmN5CnUI@O-z
z9U67K(x_s4;pG@K6#T|3$zSPm++sWSyDOcKVkY59^4hS8n%l89!`&FI=@-A3@OQCS
zj(1I%@UN*_Sz~Ra`dCdL=rBicT3?8<pnK3U%VRnG#G7*H<lCzWuiTdO2eWp~Sz$%F
z$pn>akeLO-E53%418!(9ys<;F{Q=hPa<4uz-5h@(vDcZD!7r$!8N2GTF0)MEH7h&B
z2&ex#_QPWPrMU?!&#ccE?MG$~ryobQ+gQt4beqYyXsylqQ27>gep+%d#C-J-bJ9L|
zL;tmD%}K(WTuqJy&eeQR6!+K6i1hS}c5Kk0+i8Ul+|}d<@V{JehR(eQ+$0K$J)0Bc
zOYDBcyO_Vdh&Jfwz`Z<Q!1HIhi?$hXCt6B}+uR)QB!`skcKrVhQ?qFoUv4gU=?&4u
zc;645;CbZd#){TBzQR28Y0RlBzLF2pSof-&(LUy__bmp`{`aA$WNdS|i~L#}cu4uT
zl>b3KAo4Hyls-ykZ!XJ^e2Vu?;7N2>-6D0+h4AJBVL{L2Z4-rC%F%bleyht`V{;)g
z#6HjR;o!kadPsYuZ$yqv=CRAfr)S|mB&&a6J|iCQfOnG#cVh*e2@aPiZpuu)EZVcB
zxy1><vliKErCsAKq;Al0!sfJYvT%Tl4&#5cJW8%hd@tQ3S}Nv)Pxip0d+2BH=YKW+
z!xTF86mU3qhH{|zBHpTMGQYaqLisECZRLvlFuz3;@c}lYUGvtmk$!Ovb%>ATBY1yq
z>0IL5XRw#|di~5pMC-c0%kL-uk+srXx9&0K74BuO&hJ4*e$V4swn6jm8lT5_Qt)!O
zbRhnUY<mhGlWx#h2DnRyr{8*qPq4bGIPxlo*fC$MK183+$X{yR$z`HZv+$)kc;H88
zwBz@*Kd3VD-}ufvmdz!ojSFc*@*ul!f}pk?d$au#@F^XS4%mv`+^XN2lSamq1$-m;
z8+$-}yEPp0wFWDwoW@+|GRiKqb)`GtkD*)2%Ab6eZ$Wl_HO=!cejerU&gb0@;M{H^
zScQLdCTmK!g=55|0e8_9d_0k*Za}#rcp`CW_uhe<$C|O3ip^PzEuRj3F5SGoU2+n&
zo2%V7!%R_K;g&j2yhQz-{Jw|1X3tvvGZ1R;;@jtBlHhzq-(z2V@z2Mn$hO^;6)qSb
za)4e&ujAj?y<K;*ZZ7gYdet8IGFjH`W%DGA0|z`f|MA9n%Y3y7Z`(Oem-U(8UF+23
zpFE1Lo5t_QW54Qrbo6wt^SHEsNqS8>yYn&Ty7?`?Uomt04l+i66XowTKdw0<#X8Du
zzz@+{WBC7Xnd2_fe=Bi;V6fwnt!7=+O2LIsWZc!<S#NAMh3(m(wiB4_yrZ?dve}C&
zCij%hsXqY??Hp&W#2O}Y0hAYRrcy`wCdP}cjr#vOeTz?QE&x5Pu?TjJM>gAwb#^k3
zPlW&CfJ@~aU)uv*Me$R)2H(;5)-an52CxSkwJy)j(*@9AB&hV!Z^`m1c1(BcW8^AB
zt)^wW<rV6euxX{eqrn3jZ-2Ok_v_~HoYi>({j9yx`ZRoeVxmN@&+3OXzg_r2wx`vN
zV#VjrV(i3E;_0+|3+F)$*f?r|^d-7%-k#y~JZCs9{bIZ$q2!pdZ8P=^+cozy;cw-L
zvgG<)V4ds`N0+dFrND8r@5j!fFSECoB@-#WY2NB@e@3nb_$CzJTa{1H67-eR$f9hA
z;J}BjNpGj^yvoB}jHSy2o4S;%P2>i$>T|yzREqSed;<2i1DYj;r<VLcS^DT()OTbX
zpz{!A)Ze-i{bLV-&q?{~Z7$bw-*4r40&qrgj%-D=rbhM(+m@N&=gYF&DaIi9v=8z1
z8RCOg;7WF^#2QZ8Hmu8xd0srBeKq0>@r3w9d7=a|(8=`<uAW_-5yEBT4aTN5cTVx8
zQS?NZ1>RzIa<$D(R3~}ORi_jrr}5qee$6lSl-8%^TRH5J^r49<2OT|S^2X42XS~ME
zc#EyA(frredFVgAXRcj%(zzB1@0RjpzKI_$ypVbPEb<!^spC|WGnuF3oBEbMV7+vQ
ziESP0nYy&bFEPa43-)~$DKjIFZFwBOV;}M}1T9o2A2_Y}9q)$5_=Iac?hA=;rg7JN
zF0ihh%Cl_!S=>Je?3AmY&+~NNUC3QAul(+-d8T~E=T1JeTk*ro*jU-^L-x*G9M2;>
zlMAcwi{FWsi>UV#*1XK;`=*-wcxaaWLbwrGMy_jF^zoJs;P#$7D!7OC;%j1W65cDP
z<B#H-F4CC{=P#qKF@F`li*^(P(O>r+XJPly-7dU{51)4PK}Rb8LV7y=H|LOdWawS_
zA9c}B2V?8Ln7UfSbqc(+4wzEjx5JcQEURDI?4Zqz18v?#ZmWedin)QMY}b~Zv}OPw
zqb|B_XTPGxNG|G$$K^i&OA@&u4mhCq&F+S-{mj=np5LByHsEG$Ov}Eg?sx4vpIi+;
zA=7~Ac3=Y5%5-=^w)fUEqkT3>@764HwKOX~s>~ecHe?>(g1A&`=~I5$!G2^qOIp9T
zT=d5O>(#u#W7Eo%g`buGa%Kk|MRF90Y=14uzN8FrT#KxJn09+;Q+UwW)K1D<VD%^Y
zgSBdlHXoDTn@oGsU#ctpZ0EVk>qFDF{wKrePL2Ehz%tp;Fa9oTVUI6>Cwk&B0a*7n
z8V7Bn*B+B!aB93pu*u^8{nagd$lu3$YY4qHBt2YOAKvrR@#C5k%fN?>w|n2DeU(Mv
z47%BQJn4Jd?Ct@6<@BzlJ*yXiMYc+7k`;p`@K3d_uA91N#IT^7pEzOl$i~pFheJ+9
z%k~!2!niBwpxVm?!SyUL(nH~XY@S=zp1xbkX3qMbn9}NSGW`l4=@>tP`NkM0)JZ$;
zwFz{*G2ZI5@Y4=%UIaItwBtY@<urE!gLqIj@HzKL`CgkdUz<R#GI!%6YK)BC(u5sy
zU&d#t-$NPXlYGvR(MkBmDnlN#U3-{5%QyKlPIjTq(MIvo063J+i{|vS9$C6ldQv`s
ze1V`h%E4~ou02`%A8~A+U3-M3OQl1lPo-a_Z<RMRIprd>SD3Y187tov>1-C|9#;-h
zXX2!wLy9=f`1slMuYBP#>RUYwf31+eK|7AmRg7{y$`z6u>=1sG7ZiUJuZE60Se>e|
zlCx6W)W~1yS-eb4)M4{I-p@kixRkTQ&XEg?aw)PeikpNx@e91r?Gy*Ak~0Tb6e~C4
z;eVyB$|#?72tJYwSRao4__n=lA22+J9(($z?(%a5gYwDh7hP0I(x3KQUW&e#oZJl0
ztr1T`>#q~bl8eNTTUY_E^VLS9UH1Hs>b>JVJ<1$Zy*I9-HW%O@FeYqKk+~<^2l3rO
zyHB5URitn59TbCK8}?u~m0O(4JMB4a{ibx5_<TtvI%nWo*3J+|12=WhrTFRIGoA9+
zjrVfMZ^tPFNx{|Z>D!uw30?@#1nv&{)Y%QH=b&RQlJCl0ZAs=k{Gy#}QLgK*Uq*TY
z-ICGVzH(vsC{CK+%4>>e`Y#ZU9u4mRFBGaLyhBGF6YUKXjxBzP^|fy1Vi$RF_sAEi
ztf0Iv-x*!3z5$?H@x#-$y<Cm`cJ{Z{f2(iCopikSrdPzWFa|GbZ+~MizkFZ^UEIiF
zGw%^jC&|1g5B+^|As%=7mtIe~dZ)boVx4Psqwp@6w9W<@#Gk#bY-I#^$gdo?b6&I|
zeoJ!K-aYNboEgIkA3PT2<9MG}InK5bFXikRNOhB2%{V#JDgKts1#SPK?>_l`^o#X}
zkT1zr4*#RIL_Fqi4Cl)iDTA}pK<M-A_v$xiqVOE~`>X74%|U5@R)R4kfbR+PWsmC0
z7RLJVz$vU3bkVPjRle8>Yx|?My#Eb7<tLCkLKe`wCSPtj#T<V{@3Ng$6EJ3PAlyy4
zU8+Z$8l!UZPh#754n+1{IBVGW9hVI=KR=MrJZS64mT)WOw7(-|^OMS#2IPs>mYboI
z847AXxD`(;KI)@w%hUNmCJkS-KIlKiHr(-7CoZR7#nsXWvTd`Itn=4*WX2f^@DF;S
zWyIe$j~ny1<`E}=`?QZtQ0^@1>ud|@!GC6t{%bb3K)Z@Fb4A9;JPdgT>e$>%Gq5KM
zYsqOXso;+x`{akAso-_;s}jb4(ZVm;_)-k7p0_5HUp1L+jWOg_w_Ey?V|I8pLqVJ7
zMu3Z$m_EF<Wz88d7kGs!DxbTo_P64fc+6?&p*TY{P`er6(-^+M7^YteEr8wXZ{Rn;
z-^n}KMZH5uU?b7#&=VXGW1;8!sq-bSZw-fYL<iuN&#d;(21nXoH`X>B{#^{eEBpgz
zihZ39c@pET2|Lt2<+e#@Fb+Nc73C8x%y+f~fA^=rCR|_=!;f2A`$+gGIX|si(O6UP
z!$Z?K&x3Z~%4x5G7e%9J?(^gSH9kfAAGKx_nIm`d5cGk^iD5Oqd+0lryN^9ojA2M)
ze=sCY5-(I7%U{e_pR{lFrxp&$rr=VZI~VP#VQqxT(Jp=|IUZ|^nwej??U(F(0?+dp
zi{{}|!EfSuyOC_D9qXTEcE<WG!cjl(CD%jYhZr}0l|55WbED$3#{I50>&&%wNjgco
z(SDER?gH=-=}vH-MSrp%PC15X4ahd+Zm5fW99_x-H|FCTF}UJy`4E~*lusa=Uf|yM
z#b}ORc?RiL<rU;l{4c)4Okm7Pzd~2x*>So11L5=FPiu^!9q+ZzjIqFD3HRo*)^of*
z+0+%^sc-eEz0*AwN90pn_LFL@f%Z^a_>1AGV?kvZeoRg<pbPgGXj^^;bT%W<(DK@S
z;p6$?@bQ4F$Th@e`z5bgLN8?>0UyNotPM$lyH5DO6@Jf_`oo#f?pbm{HaD7+9z@3D
z_1evPW({`_vg2}@ku}Vz1(kn2kGz{lS@?D``rMv92t4A^wB}6U74f2QB)zD2@NCBB
zt3R;&Sm{6Gd^Ph<cJ3BjG{)G&^K!;3TwA|Px!~BZnoJuzXmf{8yJgl2@htdlo=$y%
z?=8B6Z{;RZE^&2vfN^S1;y}2;j*~dneQTVP$>T-i91MGScDd%O4IiJIHkvg)cvmv#
zo8hpJHYVc>PPhHh4((3k8Tw<#$s5`C(Y(9-LygOg$0QnRd=80e*=CK)@=rdftO2K%
zW(D{L_^ppXdv;HtyE*KMeFE3?C(!YkPR9LVji>PqTHQ_GJ<wM5R|*c|6ycvW`J9!x
zsVkc=cEK+lt=?c)j_<8LG|dl0<1Gw?ziVyw47Ei&F&-j1!pncypd;gK&{1QwW9F`N
z;|lVvf!)c)yvkVZ+FfMkf^&hNxhTf-Si*EE=6myOqf7r&`)GRQn;a->{iaX-Y})2p
z@52B1UHiHxp9JeU|A}sdUkfpOZy>kgE3H{81DoAjjE;~DNtPvZJ^qF$KM3C`zwjjO
zW$|q^etaW)MuLlP&U&>p<4RLE$#~Mu<a-r!F{UZ4E_;v}v)0Wz_N-0i<u`P#I6gk*
z4%*XxJMnBYc}Uk=hws~4=@s1S2bzmEJ!T#JEL$72okp9#Yi+;f!<aVUDkB|p>_6Vx
z&mi6tO`6$j)1ZswYCnDK&(bHnV);-$e@;3`xlif&Ty4Sm=4+GVXUXpgyPq#Q1GNVm
zC4RtH#1?I4-wX2=;97aZy2?rZ7-K8#XR}(jvoYGgLHo-zR>l^MIU2A0x!=WqGgba=
z{O2*wuQSd@9M<4JjZyleA!`ji;^rc~*#n&NS#{=7H0NX2q}#n5l2_sDR_co%rcstT
zJ3AJgzaX4ocaBVu%@+;Pfz9aCY+O%kWM+Oe>c_i={jH0Jb=Dg`9DX(PUE*)?h46-c
z#9z={_2LkIl77kP{Eeb1cYKC&OX7atvipN!dFt?&|5Sc8^Hn`j{@u=3?^8?#er}<U
zKc=0@@S^&-ooB5*{nY8?{8c8WF)SgrGzZpAC9n5I)!Ptm=_CJ|-xwAtlaT(&5AYtJ
zA}b#XzCS;x?L|Ln-8peAxs*rX%jI^?LFJOja<i|td#fpz{f5Bb!gqX*?meo<yc~W`
zEpfqK{2_8v#EyxU4(q4=gT8}ToB!p#$!-bXIoTX%jY2(5{S(OPM`e$|v(}jE&b(s%
zka&VV<v%ILbaK~LHD>t*>LU#t+t4rcRaYKTdR8`REA=+ncJTX{mri<p<YN1gYv=@S
zSPOPQ^8$t6C^J}A+bYN2uP5^AJ0~2W^K*x|@3Xw!9Or^&G3QLo(B<pSnQZmb%@lji
zSZ*I>H-yib7i^#6!#-2SzLCpdJ(GA({43s_#k2TW>&bM!S>_>@iQs#PFK7C~gJQM0
zcFcDD61a0M%x|?XzWgA3)MpB{pOJ&n??(Ft>AO6*LoZ9WYW%EyINncL;c$ZDg?x|{
z&hV$fq1F=Z8x@~MxL%?*4_F*9{s|`1v%gI*qu-zC6wX}oLgsnqt_Q4N!<jPm20YS9
zy}5>O6X_P^O6I9vEc*mFnRd=e)ZSTO>Xu!aVfdci7(M`xCqxg{XNvy9t-(e%^utzg
z`3C-$aCt7cyw_{13I}%l;6b`xa|#;YL}<<0pAHV!VC@fUa^NEu{>5*AhuG&rUq$Sd
z@D|luU1m<EHXr=w_-4qvY7Mg5qtWj1*-mxt%n_SI5q?y*;O{<m?djw$Px?KF-?V9E
zqyVk12F^d^x`As<u$lt&4lc9#e#xnP4)}j2Ip0N`{bcgF>h<WS*^+f|-S8nie$Olu
z=Yl7--<pfoU$iUd!&s5iOe^|i<dWy`(}LROvu41b8=&dpN~+wSR_y2a<m9mt(qq7o
zY-N6g+|U*BF+_{btaQ#oyPnOirBNO6Co&`ck&GkHnGWLFcJ^iwYthc4N(a2tZuWJp
z0T1f)EuM~ieEBpD`d|7Q>t8(9KM}`jjvL+s{W^07I>qy_Gs)G;7h^ux>J|7pGs|0F
zh3Cq$BbGOW2QR42WNk+V+kZKC2fB&2Hm?ZoWlzK}<{JDrp2at!f#ymh{~J9H{jvXc
zj9UxC;mFMgE3G-sBxk(M==N6DLTPP~c<Ai2%@ilURO_6X`o%WlE4aK9K5nH=oyjd+
z2nRY_s}mSI-GO$-+Gh7JW%1R23yvh8C;I^6U#m~xuUC)1wJt>CQSMV?YS=`<Z^r_>
z+E>;NEDrP+PNi41j%?(TLlw=Jk~74YnOoh^aaLL9u-$7qs^hbhiDItUKDU>7F~<1!
zv>_j$A#=i)ZJ&M;=$SX<?-e3{Pkck2w!dMmOA#CO_s7SNU&L7M!Y-M-_+YigYY*|%
zMeM6%U8}Vx;?J+*4}#O$m${G3IfShDYW;}S`)4SAmQ2v*My&~f?^r|DHH|$L+wi|M
z{{l~R_aGCE^Bu&OYWE9qyIZ+W;`bxmUl;#jXTWP+WBe>*?DVny^eMW$V!scdhs5K(
z+I!Hw-xtrSjLpxY0wOt`81p1~&;#4wq-DfE+9#ngO6LvoZH?N^!ejX5z*f;7;7-%m
zj+}ML=jx>W<+csQYa56&2Z6Ic9GMEe;O&hGr;N{!EJ$Vt$|F<vRh+`WQOSUfcd)4`
zVuq%eUSsh5a`cSOe!PRbd}Z02h74@sz4%A__@y_M6D#O>4{+wtHF>L#Drp~?VBTvc
z3jihy4wEX2C-T|B>Uo?6kS^!Sro?#Mb=j0zm4#NM+oQR<R<Avr%(-*mt#YbYG_76&
z-P3OIcq;SDoYm1aS+OyCX0q|C*dOa3X#B!8W$awjA@Gv&*I6Crv5pE|V|hvWiTUK+
z<!g43XP*pAk=#AS?}M=nmckDAxiIZ53={5C%ysUqrM)@4+e7TDT(S0*GG_<Rd<)t5
z^=!`42VVHY^51{MulV8h$>iUk#J){-BYlpZu6+U>JrCF%JHJkx;Sat^H`^{cQ91zo
zd&JUkf+_QZJ=M%TfJ51Y*OA{7TnRc6ZRB%Wea|{}D{IgK=L6sJ<xqPg=K+`Fz6^bI
zK8l@BCExyH=oD59&z9e`r}YA}2%Q?uok~9B3ms!^Z)a|ESJ`J?lXsUgu9to2&9@8q
zjl9}*H1|%3<P6@;NQbUxZNTH=U-U#0JqNDN-@$Ju>sMu$EMH7LyWBypP`H$xWrDHp
z0JC^sb0$T~>&%-b^7hGqbpZiuZVJ*(ORT=v-!f?Ur<2Oe>5a+eTmKw(y209{dDKrA
znCHuptF!)Oq?_bx$+s6ywFc;+`uK6-@=o}^pR0l6;4_YS<qcyV;N2IwW}%xJYg8M0
ze>yVIuut%L#~;_nr^uK65;*D9H^%!We}c2r9N|y8f&HPmz<C#AZ_g^PNWAGCwDEa|
zSL*6CLtUDCkv<-0o|ARb_5DTcL_Vn8o5O}%Txi|eK}%=N6@5~4@V8idYxOoUigflv
z$z(a{Z8$2ql09tbFSXA+MqRwAxd-DTyP^YqYJX09_K<}OJ(sb11v?-<RetKB_A|@i
z!1Am7gN8kjEs#w}d4Esc#kIrqA^F#uOP3f_=TAtF?2mPea$3yV)s~YBNvQuEbS$#Y
zB(HcHK4#s`zBcCGu>l_kwkN^qlh8ppCr^$qa7%gbB|&8aW0YSdx&(axPjvTI;UD@(
ze7K~t%v+D~8!#7;`xdVYKI~^kXI(YspC|*54wNtSg4!bdg49T7wF%!x<<wu3DcXK?
zUZ!$phv=utFP7Wk<&mlEKcr17yB|GYd3@zI&<n-#WXA9Y_NWPcBt4>c&Dn1FBdFa3
zuJt=DTKMGtOPs^U{OfMoPNL^TljfoIRo93A`QFU;sb0Ri_v*dMaaT@pgUXXx_?bH2
zr;c*st>pDJcjSQ+*_tLVipyHFn=PCc#`bf{jvvvSy@%m0>Y|f?d8uu;K%4k0Yb7HY
zc;fSX{~3G5<lkf{!?_3Djc;rCCV6gm598bIttHSY9p2L+w0A~+HQusZF%J2@Zy-m~
zUtfFdvB&<7XUW|UxPO=HM_hZk4s*$O5bdPXEKkrsd|H_et|U9~<N@NVusNTu%05G%
zx@<do*!q|$^a?RRMt)6$-{lv`-lf48=YZIlUv^J0Seuq3Mx~t<w4cf`x0VY!?l8mQ
zH#oCfeQLgLIep6Z*&Ie*vK{5Np=n0)V`UqhZ@~_zAHgi0I1e~d-s4s#BzNjZ@6&wO
z`O${)Nx%P?u}e1Yi2Y4Rum}gl?8h9=b^VEW<pJy)^NGm5_CuI_S+NSbf;Bkw{jb`G
zK`g-e5MRO;JO*s_PtuOYBU>vNRqlnj9DMhf)+uPcf?|aCP`)^aXYe84?9bxyYkp>>
zWD0!S_=@je;S2-EJDVI<du0-9Sb&rE?b>+qLeg`<hhC(-)n#ey!Lzg@e4Z(s0gGL;
zz;F2x@}HzXg_j<93jVb5&_-ajbK2na4fqnis<iUm#phy;ja^548E_V9r)d1A9R9Az
zJ0tmCJ4oFq*A>mr{#yGTY4<F~sXank>wg+}-C00}a?s2d9f?6>-3orXr6bRRruv&h
zk-opBDxMSm(Nh-p9Trdds&JF#c>-e?Iy>SW+F+~?g@2=UbG+xg_VDmA?bBp@tmP4&
zDvTq=xUByUFZ>(4un%6ij5F1ja5ebigFNeu_T}7_A4q(GbAOO=*_no2(!9Y8Vi)Px
zLHLKiJ5c>NYh7QX+-o`Z##6SKN2ees)4dJp$()IMiZ_s84<x$#oN)Tcs_Mj{pt3Ju
z{dAEF+z4OdS?QWP|0|M1SK|Utmd?Z~qCa_hY&kv`vATR>`KyjUH=M}0&xrAn^3&hO
zUwA_M6IE9}N6PIY_Zgkzl~%j%max|_F8Ha*4IG`Dp)+|@Cgr7})hcx9lFGl(evd~v
z7dyr{(cj@B#yS}59L?o4gA3t9d-PU;H`$;Z?}bP2q&P*o=Eqvg1Ro)z&<y&}jt4#B
zGrNvxer*fBY_s|_Hb+}q0WIgzw($LWA)1Rm0q#zWa1Bu|4^JU46N}M$&<yY;<2_(n
zzePVu?5^Y|!}@=GNcx>*jz4MpuzO!Pe_#pujmBA3?4?oe8Qf{@$Jb++!JGXX3VN?K
zCq>~e`)K$+@TR>v45*&=wf8KF+l7DWMdbl#+pd4mS;D_BJp(Q#Lho_T0yjqUN4XmN
z0yCQL5Uz!1VsFdu!c${jO>u+rEsB|Swv*0z+6d02)1}W=!jF`H;e7mDtr<#@ceZC@
z(3ke$u3&y#XKtJ(S)n{J1?E56D<B^Ft2nM>@ZCBCxN-IZYo%Em7*uuuFL<o4D6Fqe
z%*Q&PdQUT_VEkNFdQAFdCb*d_8Kf`Od;S-!KeqUmogE18hYpu9e`<4A==_!9C-^}8
zG{SgvuBB+Mb60E|jB5{V2p4xt-&0=a1D&b!g&2F1e*VFJx4DofRPIjcexE&|c3nwt
zZ6wQ?U-Y5!^J!0OHlPbJ#`@|!@M2ikaB4jMa~bc2oC$n4I(eQS<#)8+gSaf6aDycD
zfgKcQFYH)C+2xdL#JsGh%;coY@qNTA*Mm#>pgwi6^-1hNdSkn3QEus8@Hs<eMf144
z)~1R6KRT*&A$qM3uRXW#pk3xOScho3fv^6C%RG~ZOp*s0hn`~=zXPEQ+-iG1ZEL-U
z{x-tt@?Tw^<9H5UMYp_QZ5;j@>!vv49GVFa`dexVe(#8Xe}&(7({|E*fiVInIz#2;
zx2>VfUnws~9@@%uoTq)5+(W^_Lmt`I$=N#S=Z^1?Yf^r3LR?n7c5*IKdQLK$px?Qi
zi=eaB#0%nm#n9q?<yn+>na-s(Y2Slqe#mu*t4uka&!hQYoztoH^hqxtucPjRChKgD
zRP)3$xD>aGCuDnV-qWRCiE|?bzvl6<+rnF_r1MOf)6DXYxj^yKH0rCJ?ewX(rqSm#
z`i|zmw&MG0{Z*-!aP!2>16=ga`Kq!Zjs89QmLF+jOwk9PZP=P2U}$CTdR>k-;R$eD
zw=^Udd%G)|%9e7rH!`OAc=8|J`Wp;dV{iQ_x6kH;do>p3g>t%^|Nrwr=O6ve`5=u~
zWB20mYwV(l<W=K1!=4ABa{}1IdX)1qkXN0F^fL5ml({@!>#8yne@B@O8Y6m2Wm0b|
zGX~zCEWnrG*v^&YOZW>*vGMfJzKMG#Ev-$+1yk?&h|bjCT-{`b&;I$V;};D1qL1RY
z0qPBg{Qa5ZMN2d6h`Sa4s90uxdsOojIwMZ<b%(`UG;e5F^AXjbi>{S!kIqb)uQIU=
z|J$qMQ@kuZsCMxw#fKAI_WXIbK@WI<{RP5_be?c0yojG0{3N^zpIV!0<6?MoFo*ww
zO>TCEFW>X(_<K^H0KPujcUiBH-$I<ox!|k?E#_8j5FRc-j*bD7_+mP;8qLeT<;NJ-
z)1<Pi@U<AX|6sTUJd_x7+GG3{H~n_bpS2xT!<@_xjnB%%8pZ?;Tyj(J<5{NvSSxeA
z(hHFei1OR`^qCd37x_*NTp>5Wl|KnrvMo9{?SWS{FU5R4aLB()xvUX|{<0BPmg!Gt
z$0poWmZuf>zKOe-4|kvogh$~|JSrSAXB5ws^Eb5ezylr~{}yEN!H_l7Wv!uL9OvsS
zI`XpQmnmb=Tf~h8=yS51;#11ks3ZiRwIM;}RqDy+30~{Z_`8pNyu;Kb*D52wM>2gI
z{N9LL8osFJT3Pc~mwc+cbkG8xRZlR?%L#ww%3pInn$w~+2f=0HIpV~O`ZL6wSD+*1
zQ-k}uwRxWQ+mX|Qzr2{g8tY=@L*XygX3)OJI<^laBKdNNFO+k2=c>QAWaB=`G4QX_
z-M*g-TyOFG39a>td44K9f2{F)M6|l8b~dzD><E6GgNflZa+!IS`P*mv6=#$yr<K-M
zn{z?!$^tL}SCYJ;&X*&Gt~l=A(H&KCTZLys;ms)xRCAYdHyz;N-@2UgUy-ADwzJuM
zn6lSYrTY}eU^6RD{@Kwa^Oic>Q8xb81nqbW!qc+rtNX#%TB}EY%->X-ODxaXQY^S>
z5k9dyS|{vf=T^trbD_O=ti$h{o)}*B7nE^WGhB4gsl3;k%TLixdZ=7^AA1lv8z}q%
z`4X)`e4lqpwWUb@AfQdgroDZ6%H9qxID3pa9_7W&+MD?;|2)mNKjWEwbV;5wpW<0|
z5x%Uy&z@DrzCrHxEav>n;C89yflb77l9eyTdJ<mj9*o~@v+r)Gy{~}JfexKZySBd1
zSq-#%r}PD9=xFT^KET@B`K>(TpK(9MA9UD9m|4cN<h6zJpXOQT?+Et0REGPfxRZnA
zObmPr%IKUh_TyrU$ivuo@CxOiO9XpPu-m_1kkR=wlABM)upa^TCND)!Em6LZ@g;%-
zj{KA>_00VO?i1)sIg%!58s**&RFXkIbYm@Wu(mRTwizQy2hLoej@n;IKR3pGs2$~R
zMZcYvH=^f^iS|n5D64%Je-z?7a-OHl^^CPsk{R?hd6ru_YeqUox<zs0Pte_CT*tUV
zF2#)cdqw}n^9iokxg35=_MVhn1N$zYzsoVg{$co{)teS3a}nPJw?yat+zEVwe<gRu
zoGEZ8pJ@5P8Hvt7HMs|)wTFhB7BGAITcvTln5OK`82_}xenZiRxq6;`<es3Y?zs5A
zF6V;t`+8y~`EdMwVC0p*2ScAbW1O*Xwkyqi5`IwEsrb;XT9aFlPlVlx+k6B0>H%l3
zbH9*$qSXuVTyluHP4&&1Q<W7@Dc;|XfBM(pbp)Su2j6#QbuQUJxg<FSwkzL_TwZB)
zO$9hB4t5ybd_efxPI;Bx$@3=Zn<6rs!xjZmj;Se+%<*nQ0i2dJ?&Y;}>31uAs_#|w
zyOsCatI4;@ZRCI8*KWb0y`egr;%4$T!dU=Z?3<`u`R;*lIj;XL<E{u!xpLrJ33tUv
z(z`j}8rcL6)ou}dcGAZd;JTi_{jB{mhIdYBU9FS+p<{yDrqcRqCprlKx}tp`OM%4!
zPuJ4FbkBGACc0b|zrULI-|_zyID2)b2I8>H%0h<U9^c4s)um?z|8m|jc2ZS=^N*BO
z857vQcS^k*?YxTd{v~vwLz?o+VTx}y>hDwo19jWJ3H|Ll*Zh4|(M$WL8|6M1mxGWQ
z?JtyFS8mso$U&8!w)-|0kjD{!Yt8rTE@jBe*ts^wv=zP>#kM&?M6U-0JI{woYD>Pd
z{kxpq?@=2$Xzo8fN}O0%`4Q^L&NRx{bE+v5_4RbPuE_U1?ZP{Tvoe&c*IEj#&4&Ni
zY78cOI9wKwL3u)r-NNSvwNC+Cldo8vbGfp##k&IUQbu{joX-8Q=S@8s>j34B+L7rq
zxmMt7NDoZs`BE;eZN2)MNj5H!AEJCnR<@ls4Sj(7y4|<H{9zLQgWsVKd)~0siPCdN
zS>0C_&k9DplT0`46lEV#S;Y^IHwJ8rZH~@~-@W~u(oS%j6rDvA`0aJ^C1YruPiof)
zv%cURXT0UF2>0)yoa3`MgSykm3rmlt+_(IjyWeT*njf<{2I(~951m^%HwbEH7C94+
zdgme&XDScs-(FVzB>DMAm5-+#t)q8>(&$-yPv!5!7t`;(qj_*Ie^mPLV$q76LZfb~
zu$n#JCbO0{Wb>S2X;f{sD}SkH{oQox2`BnnAr0Pm)1MRVn4gkA_o+vtIK)uj`dYI2
zu`hruSv#+Gl$RDyAm5y=HXPP!Z{;2y>*4SCLhm==O-tXbe4d3?KDAFr_0hB4%<+Y$
zM81~TLOwEUtgu1R8Tl9S-Qn5E_FH*7pKmGFEh?tad*wjspE6N<XR5CM95@0dzQM!J
zAh8j)AtQc>&Uq-}03Qss)<Ha^we?P^&z_ZweSfnp*=^04MzQV2QSqE&9rdUDjpXC2
zj8`$S=5>*C{^kPjp^tuB-h}UT*WVtI417@Xz$N*Ry-OfF+B<SAF?@JaZT!bcewUvT
zjnQ|=d@DFn9Htnhd1$NFijf1vkFf83atezptwVi$XYVBQ>RI9@bU)|atqZrD$sEPV
z1K3YubLO;!kB6v_z9xS+x0?Lo=gRU`vN^>j)?axd<#${72e6fC^5yh(MLN5w%$PH2
z_7bTLt*tYza;J-G_X*!I9R_)SGOdby6Ma&_TID|8#Or5x@A&X%>Cor|_={X2v|48E
zx6b$wjjYeax0mtN*iTbU7k?C{N<RuK=$xzd_cjX5$5=dYwkTzGwGD^oaz@M!o}2l0
zKl%Bqku!pUx_nYgckOp8KF^xuWfh&@Cs_6VY>Vqd7C-oU>;ux+dTYx2nVjIUxanrk
zn1#j4Ik2StABDT61M|?EKGVgZ^4=JxX_TD~ObKA>R6V}m223g|xEr}ot-n11FCk~b
zQ{r!E&+2K)3-*`!roRQN?_bh4-rKwyc8vHHSzsP7Pu=n@<xJ_1$_w@cl_0=|l-5;K
zK7ZH4<D9tiTJ|t;p>MXj5r00-*&gCwpLW;L$Ng$sIxvU4^S;HPV_crWd)oU^IKcO`
zDKdvO#AWG+EQsG|*Iyg9s6FcZph`{?c%-8mIay$?>7D3d%4O{(tM?-V+CTYa?m6_$
zPVOZx*@ExkAHKwMBM<Tl_AU$DQGfcICea>9>1eef|Db^VaB{&5@EP*)K={wGjeMN3
zX`W1Wai<x6`n%QfAKEybSh=xA&Ca9c8L#&-^ep)+_Jl~rbQXyCoq3|JLsR%W-in>#
z^CF|%k<R;IeGcaos$9bBJF4>v6(`O<3EoH^`#Il0uqeOKh!OwazX!IZs&zuqe4NJi
zZ{VTfOKXfN`LEDO{Wa%@>>h0gK7}UruT6ml-h)R4C*Lg`T2HO@e%tw*r3LUcCOcb*
zbviVO`~l_(FL~&w&NflIg5U6WYmz>HlR>$C`U9`^5Ad8at8DxDK#X-2c6hP<Tii2z
zjZJIKg9`LLE*~wT*C6~kX!kO-y4uIOkJueM6VuMd+auBXk+Dlyv+Ck2u}|g`!oMN6
zL@qK3Z5;Q-QSGhQK2nD~t8@=K((bos{22!x`v`R!e`ni{0l)8Kl3~hjA-CM*?oBsy
z<tg8oJ7v#YG#AU>kng~ktVOATpX36S$*v2@UDt2HW(h9Fgqqd)H@YuUzPd|$*jTgN
zHHUWojB?l~^fvPqviInX1oH>@^mffx4|+hk(loNt*+*;#epBv|qpjqy)E;>&)<?0P
zt!?P2WKXgB>+rAsmPH%-Nb|<%>v|a*lLpVJwv9*sSAUle{!bMSG^K?H>Zq*jn*0LJ
zybU!cW?W!`_e5WEVD0RiVV#Gm2YlymRzv&6m5g9#{Ys*6;3)BaW~s*Q1<8zeAT7V*
z+W7Y={HCwE<fjd|HK(y$a8|~TFB{SrB{!UbL!EDc)1H96k|n*zzI%}!x{o@R4~Q3)
zk5=yb4)nkY_<iCdoDQ~|^)KApxVpKtk6N}<HZ;ZfljenRW(#L0=(pxTgahm-aCP4e
zEQ&W=cu;+49%KsVtl#1C-pbzq{zE@7vX2E`Rc=Y`xh*C>7Yo|ObL*@Vp7Oio*3Q>>
zqVwX~W0gp5)t~f|^qAyU@Cjzc!dCXkwGUc)GgmBraJ65Dxt46-Q_{Z)U{1QFqq6yJ
zw5$2c<#QDCAy3)C5O|PB{)VvHP;R@R{-eKNF51mvy<tDFXkHtBtxe$X=}x|x@uAB!
z&n6mAU|(co9kX!o%b15?YCDJZKaJo1GhMHMGyOfh6t+_Jliu^`l=oB`8NlyCFL3^Z
z-Y3kSrUpMK77#3wPwg`ZEZ)%#@mw>y%H~V7&Z;rTp?C6mm8YAebBespqs!xZ5#9R3
zTPd$GwSqG{=ip+0cy1>5s=gE6=A%w2(v8x?aZJn^;1PW-y-Lyks4?lpjH!=8n+A=<
zhZn<Vnp>0ZHSWRiBjC1$acI4VVru<erX=|_#@4ME<0Fh6TY+!+eAvW$c;3FxW`Q-1
zKa$KbC>N&k-`j~@<6D+-{P>OWdXckQJ?UhBQ8nuq(~)j}&hmuk`sCj1dWN+P|F+d#
zl~&Aoq4=G?8t>7yoVC3wt@YIM4`y@L_3Z3$*LZoHzvC0s{*Sr8N${8K+jPdl`5o{$
z>zMf6!*4xn?j~zi(RY*=b%_Bk;WEsjz5zZoCn#OR`EAt&&_;P!{In-*esj-;qsdD)
zphtqrEWY{3pW>;nAyaATAKKS9mC?7!l-bU=PD2~Cceu>@25^z3udC^EIhXpM2tCLC
z9lJNOpgKtZ3!Vkm($;W$wk4d`!(L~vh2MSQ?Ae@&%<t``DWNF`wV>QWf6FVTh~6#+
z$sKM>=<&|}y<(p|z&xKi#NVUhzKLsytJz`B@B-n2xSe?joe_detW_+9U8~L1JZYZu
zOXwrzy>j$aedljAe}(ZaIF<ZX3sTj}Im8nk^D@uVxKHckWOG&~4D!5->shWr%6gQW
z#XZM0I0arQlJj9q@1w1|-@`cEDe&2%%9o($GQO|io$;Ruqcwffp*lxx06j*&-vk}M
zmo!tphum0u#P|-=&JN+iTSg98YhaeEJi}RByT>at*ZxfBXDRbJ>h!bkLi{|z3o7>@
zQ_3s<Sn}gO6FT{U>SFMsJs2u8dPT%5YUfXZjlOHYBuD-yv?U*&Gh;gxQ{*W>jc3`7
z9a-SO9-L`%Nq8aiyZTvY+kW9FYgz?k5*SmCd1f>K7n1M5Z3!3B&#jc(4&Cke7}uvM
zdmXS{qcN*5FFLO--fPa-BN^RFI~H&LGpVgZQ_@!f%O-D1#50spKZdq9(MGbwnGN*0
zy#ybTFH+yc4E3#)S9`>znN8sLZhT;i+tPyeO{EsrP(CxdmHPS{)?1<H*}&xZ&x~$~
z$FPNVT;6So+rbxX=X>WCucZs6*?m3qI1k)mf4iNb4_2L$e6nY{n1|@TOMQ9IghRBS
zdpGl*@M4m+*$o~S|A6m$Gv~dWhpY>hG`}0;mTu_doPB&g{Dfyl-SZ+|KiMD6o;Unu
z`2Wk#`7Z?6$S+?pKK|J4oPA~Bsdq8{6SE>2Q(oq^=Hc{flcRICb}+tu@i!-Xr}BuG
zsf_#w&St^|vT=H5S2JrUCl81J^6%rv8*tq<Yq%?DmhZQ*Yy0HkF3dc8rKW@vTznw@
zE>@m)#Xs_?68VpnHIA#$arkK+_<cz|&o;d}r?@+SCOVHCn!F(WXo`o)Tg(TCI`4mR
z$F<~#N@JXLL7M@1^nlwi?>m#<idkfjm+-eFrt@3-4h*)%<yp2)-~J0(&{)MsKmYZ(
z#iw-scVZmvjOm)-T@u`XGk&lAq}cLIB$KZo+r5?Aulc)J=DKPQefSS52i<p=DP2YP
zx^}hsW6stT4?0<`ak76G5PM24L~HHv*O<?-zqQ8<8wL9;v~wlXPe&J?E83zb;ytF)
z6U%wu=fgwHukNF5^$neBzXTs8es?0vpU~gYz;=t?@&VBu>@zHeUj@FafUgsJp2z#U
zd2ZwR9G=hNxr^s4dWPTKQ)8ZMc8lS|)SJ!sw53_j{{07)Z>Ox*4H9E>ZeUPbOutsP
z=vV!nPQS8M`nG^?+n2^R3;Q%ko3elSKWQ#x4u72X_*<rFE_=osx~hJfZNttzvvwXE
z2>&W?<TGCJL+?4vDSGqUo7t0W*uOA~-z~O|;xgt%p!FZoR}uXve86{4OsC(!M6WUD
zllchGvc*~IjeDk=bo=oSo~N!|qu>3;+0a1eUe130XdCa~hwf>#FS$Ge7~Tmy)8Pwn
z)BOSZQQPlv*h4A!3X02F^A@o01G!)RwET$!qq2SXqWAxjdTY>4$=q7{d?vgOnYoHK
z&JtdLRk9)ee>d+w%e%R>tM?h&EusU!{SzOF`p)ElbDVjlli^2cW@dei^?IEVA2ssI
zTg4wa#U@XWo_P{(rrGv#wV%P078l-X>nq78QhcEKG|!u7=Mu3GYd3M`tF^OnPJ8u9
z?Y7dc#~Mn_I|^pvo<|h-?4*v)WNqM+@u9~Kgog6=?=DdmxvTf4hQmSN4&mt;ob7gU
z?tDeuPdXn|t`x1|b<sn*_iXT?-2D~Yp;hKA?oBz)Md2H=P=6J@n$1y%ex|Pk7W{%H
zL#~OxeJj~zZU}k2z3dbQbPjcW0=P!k*2zcJUZSq{T`_+Nh$b_vHH@@1c$W6tOu>(O
zxWc-G4$TFy>#mk@Zz(r<tMIS)9NmPTQTtobZP=zR<#zCG+qXi0bicDH+tPJEy5uqX
zLLb&V+O+KiOUvtmmNc@EIn`TRZDMWo#Dlk#wXQDXa+ce{mhgG@y9x)KWtMrJxuVo9
z)J4yFdn3F>dK*3Km?>Xj4Dtgs{>vy2UJmqgev<NuzYk5%rGK3n&j79cCy(1bi+5X2
zs)v2*Ueiw7?t_tjI?0b=4XX7gUNzAkT(y-))}-(8CG7gHGns=!-eJ#W&@J+3h#fNX
z$aS8~Pe0@D1Bp+Udy==ON5%8d@Ud3LIFmUv`B8TW4t`6obKY2eY>%D=*Va&H!_q$f
z)jHnwg`-pXCciM|*CTQJl7qiPj`yi9^%~!wkH4qEwc<LR<r<w69qrW@j*Pjb+(o%_
z;e{Ew>&Vw#9-{Z{-+pWSoe{-<th2ARs6FU(t8yghK>S#A7CyW`(3RkOQ$BFcuxk}=
zuz3m5NO=kI?wt<nMZq8KbWGIWZ6_vETPc4alwSTl^iAHzlkh9J5YJAhzg#?K>`R4w
z$|LLGQ#%)B<#MZXWHw$*A_wB9tKp@LKUi+|9<JckRzHKE$^PUn!@ODTSL5BuVo>=@
z>%;5=e)Rkh=XvnA-JPM&!9$$ABVUJ@Q}eigVf`xoonw4ZvyOEJ%uiZ+Jd5u?CDgi^
zA^aV+vmKx6hqU8@XXEi5I2V-o?#17clf8VGzqE(@^n=$`$G)-cm}F%)bl15UuMyv9
z-b3fOX--OKxpfkY=)Bj)KH;vfIW{Kw<3}CyX|4@iC#a{`NHLOPmoc7?{eR`X51drR
zmG@n@yJr}hK^g(Yk;E&4BJ!tEFo>Xypn{?_Fer)mq=%V?nJ~<>^G7hz?EC`_0W%6l
z*Hvkw`SZFaOIA%>vu4L=vc{MV5&y+yv)$A5f}{H^S>0XtiJ#^D{_5U4(;)1h_j%v<
zd7sbQaOT#nTes@esZ*y;ojO$)s3fep-f6%ir0ZjD^Cw*8k1C%W&G{xUpZN}cq5Gh}
z*3_0zC-KS)oNxCuJTYJMvIKRaKh7qMKW4xD?j(0Kmy5W}wPHKpt^RwyTcx!4!%Xn!
zZmNfD5W(C{byFVRJdAk@^whjvZRj!w)7(_^z$JE`#+Xca4PpFb`uD@%Dg1_%U&hB>
zb3c3LmGQsH4xW-L@?HH$&be1vBa_^N(^`GAglDWdz2_3Ixx3EnQTky#lbtw@%|vC0
zexi@o3}qX9z^92xu!aG><P#v<O;0Z}J_~g0DUPBYJ5qa!9Z7uY;a%^%8R?tZG2njY
z7U&znH%I$SRJQgeo{p{*Wo?K(B%{;NTYAQY;L=gi!FuA??Yvn1L~~-jTS+~GJ}DoP
zz;^W!_zGw7iD(|sTWf#QkV(Q>azk=dItsXt<J-yf;a%f8;q#c}4|ERX?6<+!$|T7q
zWYovEuy>~hcvSa%7aW>0AAttmnKxd(caq1~eVu*VH^JhGFKT>AWb+!s80+~ahIvIg
zD0|U7xs5#3{x8i3;1cF{)z$~V<ysA1)N$Z^!plelkGyg&;pv2>uMk(Yn0K_EPQK`Z
z)pkB~Dc37`#@H}$CN$Sr0WML^FJ+I#`T4zl<U7`Xrm?`vBG!_utYs|F*;U#{|1*Cq
zsD)>=hQFV8nR5+%2><8|74?JH3Cnj?Yi%zPwz@LyC_2f96Fn8Xr{~M_FVI7J=R*nF
z1btEC{Ex{qOg}n>bpOC}>9qDN5uSrv^ang=uBv(Oz#*Pr%Ja3nKb+^P7iWN2KVZ+l
z(dx?s!zfSkvw~|JoZ!K{WUBHIE_1<MeIXQ=4IVrAmCqmk>F@o$(yYBoJ_K?kkV}F5
zkvx)IlE33V_<dgokl9ldjl{ERZ|yyj%%{x;W)Qzt&xn`3k2Z)_a&;};AFw=!&opiD
zb?_X6pSOwjB%vuj31u<XjllOp=}XkRjAw@Rkwy4#jZAd+r>L9yy7VHwFP}38w5StP
z{qHYM{SEKMSequUg7uid?}q*u{VjC+HEmj{JVY<(BbvxxQD?<Srm7#wHYQrEVQk7+
z8`-WRejDsbMF%mtF`whx-}1RToxXJ;^_WdM?Y&mNiEBI)Kc(!R&oFINX8p#K*xz04
zDPx?Skj*bdpVT)3#5=-O-v}Ta0)yzn`TMLb!qz?U8u?Wh*b7-jKNwgJ4y1W!pP>z6
zdy10}AY-7J#{0w}=2OI3pA7M*?cdn<<J+LwHfROSQ=LVv$A}N?dF0@#v0mq&D1IDk
zMAEAolj0Z7Ese=%QE6El!gl#P`SlyVqk^mr?0OnIBFHQCDb1l|vsBrVVcN&5e1%`7
z{L#T*`zhEDHK4IdG#77a>=Nx|d;29I`KIwLSd05S^!L`{w2meHXlN}?yepagIJ8$k
z(Au_@e;r;QfR0t~^S(X1Grs?jm0iqJK1Y1!`+ToNGA@HI)0-`vCtW6qu1|XOX3JY;
zT+35@W0bbh`l(m`_98Zl_rg3ApKJY=zB_<^UogF2EutJ*{;z~q&+!ezND}&_w8qy_
zl#COtMCS;$Q}ua`iE3}9|DL{)D4Oz)=qY?8FC?EJQlTv4oxQ2Fk16jA>6CvjkdbYM
z{SVj&k-x0hJLce7*#CSO3C@mi=9`JsgY}s0plYfXvTljSQDA_G3jZwW*0^fN*DSrB
zrOhO-H2wzThGfx2yr((GSKdcvaaA7lk?=kL<LHP9_Whyu8U_yp<Cpr|`ww|~i5<&m
zKh;^f3E%Q9VxxF(82doS3RmiKH+erj3IBzOL+~N@0>vfH8Hz7WqwwLgS<`_ILHyI)
z3v#?GUS6qhOeUZ&bhf%JabK|QzqR-Rc#H=J)pb1aH`zTa*}^(Kht?J7#I$){v{7D{
zlUF6@$B8El?P7?#(dN}t{GOi|yvVdKTUeoZ-mRdIe4A&ZDTg_0^!+&=jZYPS&^AhY
z6=}yNv?pep=G+6XYK{-RD%H0c=k+Y;7mIi<-k1O`S>>gASy{k0C&*LdNYv^CTZ?gv
z+twmu>%cZ}kc@*Lt1><g>MQC$b<D|ij^bO|%af2@s9JI;nk?h|mvMWFQOZ>Pk77sk
zY#G!Y`5bnIV@EL_;DO9-q@2?!M|PO<4%X}O7mzL$qYUwq^7(u6vGn5{NZSX<OZgaR
z#Tr8YO+Kz4KrhijW1-G+rau*fGu>rhR3F0#_#ix4_!|9AdA~{Cf$Yk1KC0FvR7M+N
zoevk$JO_FO@24j1*$R!fLf<ar&el58+3}XTTml}WsLLpHzRiBSVn2H?mcV{RJ~`^6
zwh%u&t2&Xt+T#M!XkPx;&_FnS-^a--yThK#`myH3;1O0{;CDp+os2P7HgI3*k{5D)
zJb9^4%g(n~b8z@UW7Fy2v=W@2eheF9FLDuDSERP~kJ_vCIdF2f7l-ri7~Y+!eh;nX
zR~_NIslsUoIE@r-!QFoILHr)?IjCn_d4^A=Z4Y~<_}=bf!pBed70{;iUTbInUH)N|
zr8B`Lb0UeZ{&$Jv{3+z2#*i*>r@g@;&GQiD+y#D>+SAaxz4%+w3RnEn<aZPuPMC3o
zE9*Lb9-P%(yvwKgT5v??^7^&qoou0v{8ZL(v-Mr|`7NYX|7s$B0{3d0R^l419?U(q
z%<&m~KN)jU_lmZi(4GD0z*zUZVu<ukiuTFk^U?ty@68shO(4}()OQs|fTQ+@sb8tT
z4CA_lx_z25M8}K3(d?xiS-X$PZ%TMty&YRJd5h;YKIr?78i)VI>P6OflJ?qHTmY?1
za(fxy2@F{~P!c^Bd?FoN`wu{qm!yv*;TiVEL^50Ze-2JM!`%A*^6q5v)}9i54{joO
zdH&+w{>s2l92;8IAMl>$@{)tH3;a3r*NTLv8@wi*<R3zQi~;C?THhj$^kquVnzr;b
z)!#)=nmu|?@n6u>PEp&?Uv*|g(4TIn9n=SyBMcnY_>oW=<}r!8ym1$wAC3Jcai_J>
zV)(Ot%GL*ZiGHes^bz4N`b{FQ<=}7aV5%?p?EwFW7|X&g`NNwrWY7aCt=D>brQ`{A
zivBxzF9E0>@i~lE$HW7|smD8~-})5{t%=#TVr<v<X^`D^Jbw-xL%cJ^FvkN&?cc1R
z-eusSd9!@irEf})33O2DK_37bC#47J+b`0WhBIbrjwk)53cN;w7iYhWV@^^AoyJk0
zFuZyyb>hBjoWmNV>A*fNzE7Y-^N#wUmA%;Wcgcon>m$CSUMa?C(U3OY!L!@5lF5uQ
z;4L{hEF-x_{}<gev;}#NvU#(9i){WU=CsN`LVDJo2W4|P>87bYr616qw1J~OrM6UG
zR-PI1JOdoYLno^z`12CcKx^>EZ>zNmQ$|d>x#=!`gg$Qdk_7lCx{I%agPy~yRnrV>
z-sqo_kGfae>wYY_IFxC5i}iKk5ktRi#7?7j(40r}Ypegq^nGoQHm}HEEt$k#lzj}m
zpI9PX61(W5_8g>WIr;xcX}A~ftGsvFhpe?+@aNm(d|w6LSKEik*CF3$tdCnZFFjd%
z+h1n>kpsWr+!fP-j4AQm!oU0p%{w&~X#ODneb(Xuj`a0N3csq%)?9@7P?$L|Hmv8U
ziFDa_9IoJvPO%35w0fjnFS7U8CB8O}^TBy<J2=UwNAvRtzDCICD*1gRDQ6mU0+lH{
zk?LVs$C`SodGAF2D$t<H+FlsPBp)O{w5ROjx3PON@0tLe<*zcHtMyeu4@@nlZlW=B
ztOM}5_{7Ol4t;JE>j{go$E)1}{&6_hE{r`I<7_leo4$eFcM@Z?J+Cq*8eP$EVjab4
z8ZY4&@sShD6++ri2mPin2Z~S!*$NKYF$_9VKLg#-we$OWclOus-3dPT^X-~N{hSeJ
z*WZ)Kiqr*;ai_7S&b1ntMtGSIvE=<lLmP`m-?jeM$^H)7ZaeSkS<e_`A>j_j>=CTr
zh&~rk2R$1Bzv#V~<t53{?C2L_*)ius&n?K0VE;G$II46DDQ7<U=*$TDW;f90+BaVA
zzmF~Zn0@0Tcu)I|>&c6`hkPrmQry4n--}1;xPR5ZPm?}EIT7-E8{5%n^#^FQ+^@^a
zjF+^ntydpm;q)ZqS+kGN71Vn%&npx6Bm2ac)%gXKp|M(f0QTXdsy=&HXwNg5w~ziv
zw3ZHo+!+I|oFU44^fTe`MeXa4GA~GikLIW@SL*t@dAN8p^R7wcsWBbe=R@H6hs;ex
z6UN-CeWck>Sq}6Hk>)n}s1ptozExrWy;eVdEcY40${)L7VH4p1w=y5EGRl`frpjMH
z`HXYueD@b$k3C$R#hC)aWiw^!`O{qYCA4>?P5ZZ=Ko=O$yi~G4Hp{<x%k$}1o#dyb
zIaNK+g`=Lo!E-&U=b3CJliybUe3#z6zsMXU8k%(%{hsyeq}HS|@Qq~N$~<eg*0w;M
z^FNoo#@|BYVTid}nSDpLkd=98hs=i7sr!q8Er2l%mbLQjImt1#!B)S$nD;*MvSbf(
z2Ob*;p5Ng=hZfIC9?@1B|LvIT-Fx5q%h+_Qr8hiLp7417VPuKut$N}^U;HWhN+d&H
zV($AX`e@)AUn&#DuXbGU<;=mij-DAdRg!g#!Lm6e3)m&T88hAAJm8PHrLyM=klTyA
z{{c)a8N87Dg)rBo`yBHt<ncj3a#=F!Wn`7c9_bHrWoLDF6?YT%&MolHXo{mB>fD0a
z%w_);e(gx?&8scyNr&#(AMF2EAJQB%4sX~o3_43jQFL^%=t_MwhoSw)>>Fdwob5jB
z?SGeziFZ}+Qu+EV>aF&fOC2@NX&=7itM=*(ciB_Uf)=8!wUL-?x7t^}Ss`Z^bA79`
zah`^38lFFu#>#8io5^19qQ+(U87}*tW8x4^KGPZ_9r(?pviVD-&yvR)^pUaz<I9R}
zgRRbvi;Ky_mYtBFw|NCX??+eSj1Ci9)ep&|5!znwtNt2)&Vn8qQ_&^fG58RuZW<?5
zep?LNjcDX%3rDU-7l0lnbx*M_v8Py<1bV4c*0WommBEKPUJW1Eb63!L@3Uu;a?jYZ
z*wTA5wlsU@M+zO<!=Xwz4AWjEaOC?ub}oM8&gTy=hL(@R2mc2!3DB7z(oy2#2inY@
zgGJk?XnWI_WXv#8t1IwKy5U^uYi3s&W3oNRC!Ui}0Ch2sSpHD?s!t{B1g7uqamfQm
z&rGtOCcdd7PnEAWRoQA|m94h5`~p2x&uYb4eDEK17kOu%!&?;0+{)Uvs=xzz?2XOf
zXwR2b9(sSwTSrHTx1^&8m!R!k%KQ$X`m22Lmv~EkVv^D)68#bEY+--?4exfJ6*FJ0
z5I*D;abG+n-fV+^q{~Xa*)^S6@LvW#qHG6yoBD3>UDHr1J0?sVzR$LfHjTL<%pMN(
zmm9S=Bsz+#crC;g*;+OJZ26yh<0`VT%KAI|brapo{b!7QjBU&}z%Mu}gtErKk5%9S
zE!h{wbzhdcbzIGNINzb4tgvMagC9q_=y;r4Bi(AU#o6vnEFhodhgQ|Adi!T;Xf8N5
zel@&qzq7Obbn@n`66WgaBP;T<zsZlN9{x~&;Jg5IRMx?<*+_=kwK#Ma(b2$P6{%Ma
zRU~&7PiI`RxF9#nz-MHFbBrube5;1BgL94t?7j$eYPFfp>yW&Y@2T41@mb!!2Yfea
z?+$pF^S0m}yZ;9~w6?+6QMea-QJ8BlS8N^y@r3-GcSuJ2vLWNQt4Zkjb^RR~*2q%O
zAe+tK-r@O$TR;BfojJ>A%HO9C?M4{8zMUIvgAea3?xG(0*2-e`2AJ&D;w@UMvS}9e
z>wV4n)mE|{=sx`>GLU}Tf$TU)pA}yA{KFDnwd-Vzp~A0?dB-I2RT92uPOGs_{4=(O
z=g74(=j&E3icikdya(ErnQZ=#k=wyI^}eBA^iTPNxcJ}8ULRN6O1`;UEuLZIA>;CB
zoh$V$bm+@+CJAZKQwrbJn4C%?2k(1^{UXoIeACl`JUZNIae|ki&FgmW8GQpETyO7?
z&6j7AjS+wSt=xIQ;=Fhi-%^2x$`{^s2st`>qNUxjYj_^*yfdjz6YV6Ap}S<zTfWQ-
zXsET=mjUt6zc3yKeZQP>z|L3bzai+O@n9KslwCAblY1(X%04Rol+IG_X7kN~oKK{(
zCb>0B|9e91C)sG{jo9lnKTump?y7FO*VtSU>qQ3i+P!^_yDF#lsG$BaLp(T_p>xP*
z{T+Bz_naGR&zR)A*m06OhPJ}aI-v8$<H)SV36Br77f?Pfrmv^?4Sa;9U!Le}h4J*~
zKt{gu#?dpy3!+b)yaRfOzd|YPP5e4*EsJvEGsf|}1AR<Z{A1=tp#^pi<lWbcf2s8X
z=Gp8k9;i&RrUnnqq)rv^c}%_`&_%MOOn#T~>@MU%cbIR*NjB&i^d22%4rG|?LyG}D
z(;6G6sO7iDvuBsZJL5V}1Ad!V*1;M9b$ft%d-dz4zq3~cJk&n7;~RhvT~6nXU~fLG
z`F~|{o1Zr5b3H}+LlxuvAT1=Xx4j`-q<3c8Zs;G>AG>1yC!DJo)Hz03Eq?pJf5=4J
z=V_~L^hv+JGN#x$A?uE6W37i9+E_FUr#Lr=dQ`-jBSBl~oucJ-<;mQUHh+e`^Av6V
z3?1OPa_B%^=Wy0moVw0oy?&nj0AK{W4@0^&G^bs%XG6sP>qG<cc4C}oO}-|DU68!X
z(3!<g^jYTQ-DAX4<%Yd8Zr15MdUS;HJVKr^)d7B$Pl3i|eUFTDDBywGqC<XR(mC||
zHqnT*(y1y9b{*1+S1Qo+bcWOoJQqDAV=K7IUt*M>PGhr8%REE)W0&lIswBN|P<rie
zIVH%Ow9-F0gZe$?sj`(u{lM~QlDa0c`Log0G>)jAR<4jPo_PN768ep7eH!c6i|<G~
zmG&Ef4yo_VX&i$OwrkHWZLV>7`&js)hOp)*>$qy{rA;{J!rB=b@67fl!pMLs?a9>H
z3Yyp6>R;FPWpzI=j4Shvfp8z+p5|(}*Vv~0658_+XPzIFyW@qf9OZ4-cNBG2BKQqd
zkY0VGk}JB-K$I(G4vgdq4g<rvYOEi@RXiX$AbBCV_B6Dvpk4MN)3ml5$<StTza10%
z4$3D1d123N(>^gL+0kE%j_xeOKb5-Zd#<W?8GbF$mwqe%V2?)NwB7m<!hbyryL0&0
zTAR!;X#benDM9<HU67ADKZyQSwMOT<r8uV!|4H?K>#vmBc4}EXJNh@iycEBP2jzn!
z-y-c#d{+GxnV6ydz{BzEMV;7rIzrGk`cRCqn(<a?cs@qsOmMEPbQkI1l2?BQURL+U
z?@BU5{I`iX$!i4CD|*K@qNnx0MsKdB{#w664>R{2mR<qP?Ow5qd5>}ijQI(&MBfLI
zJlaawlY9Nt$M9~3wh%9mVXRS|#DjJ}H$13vpd%z+kzdBXYsTf#OW2EY$?Kd^NS*0(
zR)<x4O6L{66RD$Qm_vPoaa=x0(|9L#+&iaH<}6@0x{b!5zhUg_af9=V?zOyO_jpKO
zOITekEL|=*uSxrh9rI@KJn)=|KRCQQ#_7w3k0uPNIO}nw6<(Dt<D;R^#o({L?&2`^
z?2(@xPrdkui+#{bG*`b=8;dRv_;`s|HIH<Xsa!a*wO>5qba-jygY+n}$@c3E<&Z~)
zeZrB%ow+Z>=}Ym&%%$Fj?(je1kh>Te?~S{nx7OHW*7hd;?JDZ5qDTZC2EQ6(?QO_V
zyLO@TfOi&;g!vve^?Dzh+W5W5Fl=p+zOVL=)!bNfn+&q3kNGieFP}>%duM+c?E#<U
z`F?Z%LFq(U!pwPyADB!U@uR+Zr*pog(>v_(?$w%CjI+hfJ(jQ3KOW`XmwBg6_B`>G
z>*40{R#))_o~fKQ*x-H-4aoD5No>#Y-O|E{4$j^tk8RMoqT^xqG44b!K}M4Hh)w%C
zX?t?|ekSunI@jw(y{B?-<DH1P>!8vb(jQcMm-M|o=(^q+vG3ytx@*72N!I$o!|D5t
zrFjF-W6;CN;+GizdGRJ_r@8q$;^j9){@d3OrVp_<bfwN2iPmwwi*l31wGzI_PuEOX
zGOeBKb;NDq`eo8xL)=>Ia$Y-W%;TF!Ke69v#1~-4IDAygegf^5VdER&uE~jKTHy!r
zpaCb!M$feS{^X;N-4HtgW6A`^t2MkQxvKFkh+jn<cn|14Nmz2A89df0Px8B&XRp2>
zeAuH&S(;bTXHGS-UyoDYq)!h#dEE2f(cauheXI9uz1xNTbd5bzK>8!R@(J8#QT7$b
z;Wmx91wL-)6P`zSIPDkoH{{(wJSZEPFFl%PVf9zWpXgZ1K575<=WM0@`{O>l-emi?
ztNx9T?`Zbe2IZ-LyU_Awa1p(R(?6r&qq;GEL3eLWDWG@U>^%H?)^o%U5onI=w{7vy
z#6i2kxPRnc@>S!B_NadN+R^v$ry0<9rXBa^#b`$I^DXMfJ_%&)eDKs7t=dGkVcv}f
z`fg?R;c@udvredf#kq{gAFW?WE(UXh>yeX^N0QZ>2)6=%07!;Nc0NE@dWH1xe*%~9
zac^aLBAb6x@(w)I|I~+$+WVfI<hIg;NVABzi0QC#b{tD0<4EhI@Yz@TL4N(|A<4Kh
zo{2tl{P!d;kJ$0g+yDJ>a?iNgl=l&Jvi&yEU7QQOer(I;TN*t3=lC1oYxR<<*H!np
zbO7<hjfL}}PleAPd--mF<P!aL;Cuf2(%b(z{yI4N`(+pl&iC^Q_Kh?4QeSiw=B?7n
z)&8=HF;A)bkg}h4-^femk*2CTC?6bz6ZuEA789DnJIU_i6`YNwep8`&oaUc?UayeX
zSiS3yh36rEtga0`9^&k*EN%7>VC_h>fz=108)ee|-uf=>2Fvalcjs$I&kRA^2yNIy
z8)`g!gtMFD(6ueWIL6qZcF;H$Re8)W=r{RmHLtRIJpGis7^}yLzp&d3IPp&GMmwpK
z8JG(XM(7KM?^1-~JM5m0m>FaDmrIVqANb>VHt;&immV9Z9^$VT;3xS&zsA+hNjtpp
z^N%HqsaF{^)OSbVLS!noLv*C2$!x);-0_|bAz!vC>#*(}osfE<_@I67hP-s!hy5@*
zEkic-f(C!2xCFGvK5;qUbTJv^pQTMUznf>WvqSSRZDRGhkj^|{ER-&%dQcyIcjh_O
zd+Q3V4@=K0%Ly;xFFj?S=t&upi3hCjkJeD(L8~iu6|X@~;0yC!fjm^lH0xv<FTu0w
z$<^Xl@j;M&Yw<GDp3C!_NY{nkLeG_dX_`5H8unq@y4K_8gOAI5%klL|$)AV(RMvge
z;h*FCZ2!2I^5*NAOIeJ`8uKO7t!>uymQ5SCr))j*q|+D&Xa~N5A-z!T&pIRTp(|T^
z=tt5g#NQUsrxUHJ|3z`iK2Y*Z_nvIpRg{llnm$K=wQ(cJQ#jVcgS2&3!nU0mxYS<R
z&tWuoP8MJWY$=QT$I_RyuU7Mw<kjrr1v0=A;C5g)@FegOZ~*uas9eH&AD}doxW<9`
z{=MP^b=+qFCjq~JZ@obmifNAFh3Q9yYH%0*Kl0-o;^2va(zQOGk0FonKaeJfcZQ?;
z`|<CV#D}6o@#2XfeR)az-;~5VCGl^S#D`1r|8+@xv?Tp6{P@S_SXp7qI)||8r*a>g
zO*j$me}Vgl7*`%3F68dgJTpvv#{7u*j>N;o7il|mm4O~Vd=23vEsR%P@Ipf0_}yLX
zWo)!|q7-tH_WBdcd;6_yeUdg-8k4${^t+2&NgKhI647^+=<oVQtIlI({!;e%se8)U
zi#X!L_?!9B%)?@S+rxhY_1Cb60XPiIUiwK`MqC}R1=tNd3%m_{47j|r7?8}Bjy|37
z-AQCD?{<=R5PzN>_u)b6|D}@nvx(0x&*pC}iJPFb@G11#Px=?ppKLyli5BpT#<#4(
ztWyNMu-;GeU`d+$ZMZt8GTC=!^SHO<`PYW>c#1TSt@hJ=r6i4f1pRU>F3bEh9VKb*
z7)tXZ`Rrfhr`cSR#`<A-_&!FOr=)v{HtMUZ{Bcubvg)RF?CbrwnZzaGp=ZTI=q3S8
zruy$It@H!YYm)!I^1RHCJBzqyc|SSyzAc{#=3x03`DrCPgYswiaifSUT{j=W{lB+v
zj!chgjB(;_|55sYWIQ-Cj<e>?m?ar+$3xk_6RbtiHq8GAG!Ew(zceO)q;ZUKRpap&
zp<#7~{*cNt*3&1L<JoUt;}0d@u5-jE$vekM=ZM7hT@(5PeE$=kp-Wi0@UBDOj2gbp
z=A^P??7ULANDrXApe**qowTg)k>8|~l=bbBvXnn%Rh_IX=?hL0x#5p*J7Uxg+w<q8
zCy>9!J14QYKjPeXNb7x{_2VPX)?xMN4(WZ~S?uJ&r#;L&YtTLL0Y&$~e~Wy2zy-aB
zIT*IxB>gbSIlcZIRpSres3m<D?E>9+X98ze{FuFJYWKjV8$~x73seH4&uLt}wKjC3
zJ|B1FbvQ(u(7qvbQ^!4Uh`o~JyRxu=?@S@ftIi|MYQ`R|qdE@0C(vAWzsJc_`52cx
zcz=O#VgDielY`C>4VeRnbl!=lGbHoavp9QIX|iGK|EIMfQ=5|=&-7sfkKz0Oe?wj|
zt0QOaw^}3@D{S7Lt<08-9RppLxfXS0j;s2rPr|?8C!3V;(>irFJUEZ=ZS*?-m$n_?
z8|6iPk3)KG1<w{hqu=Ad<zRo4&MzHHSK*S8?wY_~Sno;q=nHV63}`GpqS9sWL=0TC
zR~5a=!^Oj4f%K4=_Ry@<oTf@;<x0!)^=a11?A$~CV0<%oVD@6>ER?M^=G{rJ@AdYI
zPw}(JU`Ofb%s-T+A121(2c|mhE{5Y3Ir}Y1@jkwtVRXQa?;agd!Lvxb<6y9-3!SY>
z>n%}ie_H3TwkhyX`p=Ud+A;4&Uc|c&THT%b24{R@TB2-|${o4-`NQ8hd~`r_tM9-^
zvh%6`+V#|w#$fAbmX~e#m-K_m7`~D4h7(KWdZ^RF(d1A6o2-82zUhBMn=`K1V-U_{
zM{6FV{`htI)M*X?{Wb0;b9>65Vbn=@XHnKj@6FK{`tCb87ygdK8*_n8-XwP(UV-1d
zd^AOK?Nxo(en->)eg^IP<aLg@7#~N?ArD}dl-`Rh%$pAOl7Y8f_l4G#l9Mj=iii8d
z$sT=ocR*+A)2@Esf$!i;@uJ6@oH6CTedyogOU-Yf31bO<rs#|Vw8JdF9V03E(fE6e
zD#u}C%#LoZFlSbvU#KpU<IACqeLq&0dx*Lxex<$p;|ddL`^t>gEbO=0q6y-VIq*4q
zz<GC}&wHbC==Jnn@y&S3qCRCeRN#ll{q>i>SO_P#Vl%+EioWn^zTF}J94r6v)3o0+
z$3Ob2QR50o5u0~dX*#lb*V*>2#+Q!7xc+~jPb#c6-^0*Xa#u1hu=#6llXBr{WTWHH
zDb&^)KcvSzC>ctfMIXts*@I~pA>-87yX32Mj4ulKM6C>^ADLfy>%*F(m9CLlxu2pv
zY1<Gu{{{9*(MDzetImB(B(1)JPboTN4=h*Bv-LUj=h5YEb~N8H8h7xoSPzEAZpU5W
zVM*3lDR-E`ZaEyDPG<93f7g6O@>BB=&T;K8Lq`9C{Zisl+jd#bi?`pCxv{|heAe6h
z#xjQ+T}Bx>yWdN5*uJ7O;V#*+^IDggdlDMR2f~|^SlhRyf%e<|#b0?e&|38GX@fyJ
z&=!^s(4byAQp$d}48CSg1}&%$V}i%m$YJEIc>1mXP~O68(K7PVdDPN>#n&Nt=zQ^Z
zOy|;%W)6}aGg<AH7~MaSYlJv>q3W)|x^**_cEOjU;miBV_6{>6G*>Kx23mK2a+rC~
zJ1+~qNr)HJK3(z!t6EY*2lS-qAN-YUquzIy)jqVLrM>-bjGdpVU-P|e+5W*%vS0io
zy`+>@(8uy^o!L{|%6AOy*q!pe8Eb7Lw7ET>EaC09TaVpNw0N90W7VL*db71@-AcUl
zApBhqU5?FPJ_GVgfS>!de(#vF{-FFZk9udoNw)6IAm7kepxXf7if4?X&gfXfsI$H`
zH`>KN0^I(Py~eC{6l<YTGd_sWm2Vi_SDb|Ga%oT6mHxWB_+{|Y_*$7#|MGCvd+G;s
z;Yp2!k`d)cpjU~ExQ@24-`sVX+oQWwxIMOAuBJTchHCRSsYg(U9BcOK|FYxnz~8~=
zIrgjVDt0`|y3hCb6mJyWOZK=)<~Z~dtyhUJb*`#(ODDlS^;VxBO`4DXj&+vNo?qxq
zw%*&U55M^2DReN&BY623d0ooaL$dmf|B$aW?ud6x0zC&D#MdfE^!gcPD-L@SD!pAV
zi0YZ<+YR(B-W~Ao#e0RnA<pHhbEzxbZAEklJAP}=w)Rbm-pZ$v?><)YTy*Ar&Roxq
zS^aPFL-`~6#<s&I^;P=3_67#>aC?!m2IZt=<X`*}--^tg{lk)f2#>8Uz>gMh+dkM(
ztzX4rd~*DDvTNUx)4nf`d}Ka^ue5F&N}<O{w}#hW!pAfNj?9gsZwGxYfqn!XrV<y<
zP=B93Ulx5>A7{PsRD`D0bFQU*{-4nAL~H4H<?(L#wnOwlZ}aBG$nN}?p?xIrLyM>Q
zRL`YrNG2QF<W=zvycO{8BJ^(2NV?z->Y31-p^xvc5awG^R_4aAt;}T&g|pp?^RXpH
z+?~Zg&^VCr=Gx-dB<Wda>8~`bKUsa~VRT7*76&r@Vb2ebabiB<DWa#<VLe~V3A*?7
z#B0@_)F*+Al8zeqTB_YNz9tf0AL~f=a4yU4;_s{ug?<hX8TL}dkT*I99UZl*M>x`k
z>~Sr_wqCZx?JiTjHD2oMgVT^dnscapr!QB~cxLrMXr+FPP1e@o>|Y*z?=bxHA#fk>
zsIR|-z3kfG;(y}i3f3-5-JX^WjXv?p=lRY@2K!it`X|1DS#*&^Hve+3H||6-%(Gcz
z8v&m=@umIU@vXVA`CNW)$1C}=z1dl;gU>k^Uy6Fx1vzCJUn#TwD{;<0+0A}+tsV4c
zXO+kKCh~9`jgezL`rZ|OPQQmQqwMQ`k+cr`Y@}m+g|mBlT*<hd#cPmZjKA<L`s&%)
z{8ik)ayj2-KzA(PYi%B*N0#$_ad$CmWx{J)t}DCE;^ri>=e*B%W3>M#w6Ht(I_raX
zQO*acd-37EwQwF~?_H&K)EL;RF`()zuZY*S79Y5Xcxdajd3Hbg!W-y^@9ZXCYu3FN
z?YS@HX1hb~{`<>gUAZTiQ(#2geml>99p8nnxC;La_D^!}#P-wAR}_9od8csw8P~bs
zVrlKqK^=QmN!Pf=Di^+r#2+s{%A8{^_Z3OKzq;^k-kZjIWvSN=h1@Ht@B03*v-{BL
zvV&u<yi@&ZE%Q@gEHDLF3{(SkKpU_FcpUh1;C0}Az})PZ7~leNAOR$Sdf)-zJHXRG
zA0XZDk8J-PTinRCB0d%xY0Wb`W&`z=EUz$%OBQOu*SGOo8|&xw%;g!fG;F%^Hyv|7
zF{d$S=y@o&>X`eLd1L@Kglt&0!J%|Een0UqUj51Vr-*-S;V0uCBmSvNKN<fb@%!f-
z8=oU?OuQuS)G&LPO72&3Kc(cJy5%O7+=onU&Mmp$g=p7#RQmp=_@WFtiDoxM&3o3L
z#gErqSo58P<MHBr##PpJEq(Ws7QE~^0-`6YYyHsYBIFw5w&<IaZezpP1b8Nyy1V!>
za-+=Me`p*1U_$bW{v)pVt+xMzzUT69#P7|QpS?I2j_t7g95L*zPjvN@=k~{WPkbGo
zo6Rq(Ses`aT;_D_ANCPvL+$0+8y&myeE)l(F1M#BnQZzV@pNtG-yO)L-k9R<wz9vG
z=Z%t6^sn2ApT@nFWyszSenJ0BAdhSxzX|_vd}+!!`<lAy+YZiOqX#lZO0FFQMxDnJ
zB5)8HhoWYdeZw&uXx&pEhqrnDJlEd=l7*6k&j6L*bj*3cRN!aa?*}BOs}p;QR&Qj?
zm+$>D;l*6R>POrg^r|PNmnV^tqWRz$?|oma)c^ixzc|)*B)#<rI0z4o3v0<cqcNSj
zYOk8cqGSr15LUU%l3v*A&cs#zmbowSdOqL3dTTl0LjUv6b%?h7Bj0#IZe$oQ<cppF
zw7)@TcxZ3cTCNeU6@bc*z+Vy8ueGi;R{A}l@j$xV(|qUidg^;v<t4#0g<OJ<nkBpG
z-@{3#b{Y3EbxnNzke#oY>VDZVbpG>Ck=1)$-i6oBB<*)-^Q$@I=5ekS+z(?M)I52;
z=39)*=*7s3*NZc$5B;D@_S)B^!%`M|x2xJnE4%J5{Wz=JF*XN#m!yxD+F<Ed$Lw8#
zJ*=J+%qdjQAN`y&Vc;v#s~TF>L7z(24*!k)9{*%*C?WIOZpZuvFm6&laxjbL#*64v
z-h7w1M;jxoQ9#d0HTc2Y0<7@$>V(>-y09>ih4^rGLyr&Q_vdw<ujWqTr8CG&Yfhhm
zz8}{(W*-n)cVf`<;91TOE3T6Cg1IMvIB|mDS%R>15vx-ro<FR8$d%krR@*WjYOcXJ
zozqxI&F!<FF+b5eBm8@8F7|%>3Eq+HiIG;cR=z*v-AH10@kj7xpvQeIe*89Pd~j9&
zqc2z;W(vGd+abHORw@0vo4M!K;<v~nusuju3iKl7Bifscw~jvyyY?E<o4rtV$j&-=
zybHcDsovu6B*V}V40`Ap{<wK9Wp&gtRsuUt0(u@iTkD4v_mB_ob3GnjB~B2;n>x|_
z{$e$B(>HwNPs^HA@dC<!i8@!tn5!kcb^2F0|4eNl`d22bUpsWXzxWa~(Af{l=LOpy
z?EAMgzQ1@G`QEO4c&>aZ$WQ(Ahb4JckXI$?W4!-;<t02^_A~O1&XCaDM}1sn$v0Gc
z^lW*W0}-dWb42+QFWxOD|DZh${YLE>;VQeGXM<-=GbI^-uG@hO$<PiR+lm*FkIoU7
z4<U8TeSz<o#3g6M18z^h>@%{TlqKOod>LdX*s6CrWY70}(bVqZ9hGa#ga@o%n<S6a
z&i?rs<P3H3)(o+sB&c7UyqTk0pW`HPDb@uIxS?O+Z(e1RswY0T$b=)v1m$gUO6@-A
zuzna`fuAG&SA1>P+>LZZd*(tF@&vt4KF^%B6WfLU-rXPZbx7IDR6hsYrC+b3&!~Q9
z^|{Plx~)F1xonxsbLuO)&gWYeBg5vs7&ue_l1tL#>yXvVZ$zs?CG(qbDw~fnf02C{
z9iZT%H&06Fd9E;?=MzXf1(*iJiJ#3?xV{+DJdAVlkvmfef0$+sdp$h50iQ<T05F;J
zjU`u2pYqNXru6Y$*#!Hxz;ha5e2<E=xjM+w?~#Z6zhvK)jyyi`@EoV_rP&ku@SRKS
zB)p@40%=E*&W$fSX07#Y%FX(4xFoE&myf%D*1vzUB>p49!Yc$GJIH@FZOHnI{N)C;
zR}TM!!fbbE@xQa~J{$aKn}YV_4d_1cu;yTe*@>OSztcVVx_lE%_3GC>dC?aOqT6q|
zkAu6;1|5c8G>yEY(EZ+UIH&UE%ZrU5H;ud-z+-AaKYUmtiEZ@fRRukxjAzih{xsCL
z<0<Z+p{!@vvpO(?^fWUz3w)D(I*Z0(>cy1zn6l$1D!Z>c7YFZa{Iai9UL|FlzT8uB
z%BTIlPr7Fq;+_Bo8Y%ZoWM&z4swd3aO7sg{8Dpc%xJo9pdDrL{xx(ksTexbR7L94W
zL43t)7m#NNx&(EYLYe0hHzffrS;w1_*jfB4w4Bn%J$xa)x>NVYwp+jQ=+-@TWNt)x
z%yC@pwP(!++?yzSio3J;8+=lbXWMJJzl|_>Zclo6@omJlg^y4Rmw{g$;j_WHf$Imv
zX}oJC%-NLooo2$cC*Sc~TR`yIGo0E9Ge^K@a%};=sFIIhMV9^5TxZkYI%1uL*)jSO
z^c9bVO_sh*|AW_D@W*%6>N(;&?VXQvALIR`-cMjt;GG0~7h>H}yeGdt=>VD=bTl~T
zE}$295_lQdhmV5f%Mq^N%J|5+I+WRWmgL>G{-8|Bcl(S!{=!WE8D&ob589V+Gj8kG
zS*&5R>u~T+MXI|$3U24~Tvv_XrF9hE!dJKkc#4KozTlVyumo5OYysrsEZJmnihHt%
zx$(eW@K*VjAHf%%&Ks9A75un>ex-FO#aB3%3unJBfvgdp;tRedIA?-+c#irv<)2g8
zmx_-~?3_HdZ|9tI&f!}!SD_1BjBeJaw&Sb-{NA6u{M6iH@=HK}Xb}pV-U{qRWlPM?
zvSqQIW#S3>XqMwsY+|?c8@IoI3F((XO9$NNb6t|aK4W$tW^5}&JFuDT(S88FcY~hF
zdAt4Kl6R8G_P*Wu2<;^s2j}zUIe*E1|4Z^Ed!f>Vu@8L?8?x3N%4ll%f%4<jk287m
zPW;YqFz!4Nr+(~p%!f1C@ALe*CA7;j#ku$9olG_?-eNvk7)Jfbg#A#TD?}3PqfBW2
ze6@Uz@;_qynGYR?^>(1+tyMXEQ|#g5SnT4--koK%V$_L!g|oroS>a^o-ohza!0%$5
zXdH68PEEQy$4vvjaNn4I`D1vvYn|8bPukD=+)q>wr-OAwH|yZDT891@mGA1b4$?zI
zofG7AEJ5E~nRoeqt`mP@w)`@@b?!A<=YC~A_sWO<%^o4Iy{D5F8_PVv%5<GQSo-_|
zp3{Ew)K`SB{08Bt!S|`-RLa9A<AsBEO^CWl-i?J0*nN=Y9xl4~p0A|+%+$s9x%M_^
z$82G3J9wWS;J2O5Z(PG15xWsMGk?auZw5;18Sf)+=9W$$b+!3<^&B4S%nf(Da-6GL
ztcJHD8Rq!3m-=xze!kVohl_I);FG<&Uw+A2?{YF%pGqC8<g2T1Du%F)NydI2{G+_j
z8Mt$t-lhFx`@H9sJcqxbcQ1R5IER*JN)HcAeG$G$fRDb(!+XWjbbrn>?u+yb==0ga
z-_kDV1_RYG_=d98=2~y9<~cadaaBjg|GA9)FpeEZvvK&Gbr10hv(h~Ba=#N3kD!OZ
z1M&x$KwDKO&>8x4eh=SC?%R=@5Z}qYr+e&Dy^(#XB=&%K+K#J^VXPru<4q*F`(Out
z>(c4MtOJ(O=l+3xb?QeNuN`ws!7)j`ijjRm?aW~Nj`&0CyUal`BaA6XwoD@~j(y+7
zS3ut>)ts-A^x!qewq5Mi+2Dk^XqDwrrI)VbxV8P2vF@Cq9raGgW#2XH?9*t^38Ec+
zAKtL|D&I=zraZ$j);!P|9Y0^?CHtfD(%B{Q5l~+<&;xqqrAu8S++E>*YT;^lSNldB
zXnYL5v7jwpn2kPY@fH5e(O((DnfV@epO9NSgtPH+rp;ylvSTynZ3psys^T*EIRZ(b
z4!9jq+e`q@5vphG#Ug#mw%3G&7q>U@qV-F*>8PVkhYk$?dFhNFXV`0w&cxh*@O}8D
zARCC@(OE5et~CqfKJzEFZ8AUJmEQT2+2W(|E_x?475|7gJe<7o&GL%!<9(Z73jJ{}
z^y~ZUgOZ7#;ml~^tn~rr@bamjWBOj0gAABg>3VGwOFTR-6z_>SeT&8khdRw0uunaN
z-|=^W`+yVe=c{B*L-VH6{d}_P%SYPUn{@s(xcvhCU+Lr@<oO!q?DL<N#2eDS5EhMc
zg}?Bx&vTVs%_M1qglD&j#8|^O>>JDxcZ7L0^KscGuoqP+K1rVAQ9hkM=l~B<KK>$H
z(fe1EUub-1;SR2{8)*+*MEx&?d;({ct#NIS@Upbo##r!LQF~)FcG!M}Em3JAl%;pd
z=>xk+uW~f!Qafm!#=g(H;!)|-(zU_yK@+db={@>w9xfZe#~5B^&4A~edH0UyrOGGR
z3l;Ni3a)UX4EgbF1b=5@w(xgc*8v*OWIMQ-z7ug{%mWh45820+jKNFZ9!2>tJMk{o
z6sqNa!5K6$o_7(4Y{Fi~H<5~=gy(A?$Cl<$uNd#d;)b&&ddRbj@NQ%zXA{D^o_)oB
z)4VE@+ReIH4|%W7BTK6)V)wl}mbI^#%h}H{*1#xZEOyvRz6GZ>#~5c9RrGao9uI9B
ztLvBlPoxi9q|3KBQx5dFit}x>@2V#kN`|?=vfre(^(v0_?p|l^wtn`$Qr_CUD?W~|
z&sjN{No$`Zc4+V<zw+3fyxWtLj-#{F^j*&i`s3I>ee0^{P=q-udtR|k@ck>{rFyYu
zJ=W|ltBma~i@Cd*|L!gWcka8n@8G_(tlaeEhN-<%J>!nh9?WkCG|!GLWIa#wTeTT&
zBEO}3z~?OF&8W<ag~iD8Sl=$rEP+R24`B~jk!QX#&yDL0z!mve>LF<R5M#WVS7G>O
zDR>WKzrZke#~~-S0a;AHLS9sYzv>Z7fj>C+m>q|``sv(A*$4REA7w~BkHub~y*aTI
z^)oyAn~0C`{R@9TOo4Ots*cXTlkd=X_n%WwKk0*~xpK~<-BX9YQ<z9TCIKYbbDH2=
z;>n%J@14ajW2<pEC&J{i`5URHct$p<wX(;ibf%;Hy3D{Sj5pweyul|4zGPj=`rT9z
zu5|APUm({-Uw))mnWH^i?Cv}p<X!w4@!O!i|C{CANSt#;;72payFJAaI7mOySz`h3
z8uE?B0P>FU&REJCn-lM9ts&suN8r!9ZNKn%cQ?Gd8y@Ana%9c1yh~m_??z&e6bIW4
zyvMRu;I-Q$e!JaGyWM?kyHU1nH`+`**kkVY+ii#CL(yTd-THdKlkyU@ow=JnqJBQ)
zV<uj+eCFE=9r`ZsGVa5dlHc&<TI`h4Nzg6f!Os55)ak`h$rsTd?Y`T2=Q^wNQS_xU
z-dTZND&}5g^{z5EJ4^gcn~Oi~{w=-(V$X<`4a?>azpMNS*r@tA7hrzE%4z1xk=(Fk
zSx)nWu?ch^%9f4jH2BEdH^Es5ynF7?>{+Q+9}=#YGp{}hqT2H!9u(hH;wM@e?>l7A
zF+hiq{vaC^w(5LbeT;Ofx5kGM_?GD%_YK~W|K>va)XJRRB`?&Y6$RN_MV~n3t8YmD
zhGXOp?@LEf{yH~J`8$lkF|Uk^pzA#8WhcWYMt-40XU^gs!(Y~>eH}brIArtfTh<@o
zuCy8QU4uO_z@4#!veBE&>-ffc-+T%6Q71Eo{^Z@eeLvw0moWv`^f9k$LB8Yri~Ixk
zF?Mc(&RU7C!+E^X3}tA~kZ9Bf?I$6J>^eVm3R5rYGc_gI>z|RNbqUeqEWS~D7V|*y
z1NwU5X2u+a<M58|op@dGfX;Tn=R#{E*y!v$EbP`H-&r3M4{@CY|B1$LbFR?=U<SN8
z1<=^9Gn1qnz!%%?*sgPO=!;?2$Y?*|kxx*T^3z#OIdly97zg^pnjbqRv50RAlCRPp
zjX7#xI|kBjj@Op#v7w&g74prO@{4#ybgzuVC-SXzTbU1|<D>sFRzpkp0G<h(njCeE
zsvbPYzVT~|XGr|Wm>%$n+R~(~?0L^gc>bgE1rd$#{TLl_v!k!!oD$Jd?LuC8^<_tP
zaep70J+s`bvp&ztPxEZ$sXb8YgL?M}VU7Q)GyM}eNPdau4`T-!5Pp}@e>7gq=NeNU
zg!S%RwHNOgcuQka*z_Q#*vBtixTg)qDLre2<3yJUqBZ3#v1fRA=e!1Z(to0QuLJtq
zcSwJp_FJh<P4-dpeM-;c%8zGO2gDD0s?sF6H`)At+EevWd&WtdA#H>;4W-xEi#)1|
zao&J*ES--b-^>w%W%T^CBH8m(hdueW{=9G3e~{ICXYI>N?+?dy&PUI?8J^WsQ;Unr
zhUXI0?R2#b>vWV86&}tRoSSETbMQfrXCJd?GRJ$q2~RyCeC7WSZmQoP&RhI^CndeT
zfo=?%x#+j7SFq=a^jdGq^h1w}O84@OV$nplZ^<Ir_}NcbG<)gi9n=-weu~D>1bxqB
z3%k(^Stl$Q+F>}~ang7t8jVPBUWz>fx>~X?Y|pjL@NJtEXP`ViIX5gzAMdTx9$UtL
z&Q{EEe?+uouOKuP-DJ06KV_~Wg=}H&m4&`eR_6%cXze;mBbyIC-1GF!18l?hIPvY>
z>Zfnfr|h}{^8@*iyS?bVS*52QDaz`w`}zh{?r^_cOY3;<g|bxk*WuK*zKTpw-?x(B
z+de7hwK=o}H~A@+CkPw(opZ@5C8HSQS=~lgGWKi_$+gmWWZ7W6OC5)6uYtAmWW(zB
zrD;1#(#AQDowNngb~`4!>-e-+m!vJt1HKq6uQc90NqpiY@vzVd^PxRX7>{l<7=NUh
zvv=VU;e4dI_b~Wd8RxQRHiU13+9`xQ<y`PFXJOkpS{W<2k?iOSzLR(a+n5_dE)lL&
z*x`Ht!t`k5`=V3BeqMX&mp6zn3}*=vUPYL?+i;RFwsjlE)%`u{Xv5bKZt=rc6NU$E
z{9?i{`{9Lzf9{7bBm9aVzLfAU{qS7E*njQ2a|loM!xs|9Zf)ad5`NJSPb2)2A3mS(
zPyO(@gn#3Q&msInKkO1_tg-ogiZDE6!zc%=3wq(x2{Y!~__2g9_rn-m-ea$!jX#C(
z#eP^a>TW+=L3oiLE+dSdY}1DbPxiw{krUVZ;g1R5<cI&2a35jG3CW01FYSq(2&ec)
zljddq*x{tELcZLf^An<`Zy)PbveWEGR~%Eo)>!p9(oL5wuMc}^A94bHU1N^kQy$2=
zg10~UvxRZUT*s5W%un}WC-MDa39li%g*^z+t1861A@Ydvttso{!#i}gXz&g^%^7pb
zzoWmRSKl(y8trH8cNLZYaLFw{f6YPh{T|GpyhG$I78{82u4FD_MgiGU7@o=I|MF|d
z7@k!o?#aFS`ETT+=&;ef9q1kMz1w#v-lsYC+QLFtXWE(vwJu&m+-Le0-Akt2+cm)L
zHxjqIBAnZOdROlLIp^eLBav;3G|%yVUT1I=wSO7eseWYkc8?3r4yXL6NwoEwWO2|2
z5Xiy{$On3l!QU;)_lE`~r=;)Ly(_ez&R7@C<@=#C_C)(p@}aacC<hrIF4LKIvXQ9m
z!+q2@j&36RZBlh#n-9m3!?Et}VEi!f#0==Dx$iV^v$osJYsHBQcf3|COE%^ztj!%;
zw(Ri<uUwPdSq$yvThG1A`a@Z4zuBz5#W>*L7tML~dA>gugRiPWG0vHcZDTA!mb=;f
z+5R|5e_=n~n}>7`R+-5<r%;|~6y_We(Jhjc?_zZxU*-pC3-W#QkYl#xl-}D{C0tkM
zWwVhS3uqXV-q2^;p86uopcVZQonE>$d!gbl9jerKz0uD^1L^qE>7{dIc-J|Ao|}SJ
z3EqWf(yK?3k24MZO}ImUhdA+=8GQwFE%d)vp*d|}^+tC`&f=8(C2b$*Xy85#J2U;u
z%vx2%PGj+Q4(zo4HgVyc=tV!JY{p9IIrNpN#;}Km^a^zLK3H`t^C9Zw>ps}sier=T
zS%&$pG5_F1nM=E=iTKP;X81pc`O@UQ)J=0D$6e9?>7z59Hs&G@y6r}InmrHsM#_p^
z-kcvjvpFA*Uy(Ztp6QNv$Bc`8@ONLMS+n`hQJjtIek0d8D&abQ*dg3`iXVRp@qXAL
z+&R*ZA4$9)b_jP?`tg;-`(cN0=LkQ31o3{@A>0}D<D<m;VTW+%a6f)H@qXAL+*#qr
zR}k-q9m1W%{P<zS`(cN0XSp9=PP`v>2zQqG@nyvOVTW*M#E*{<?}r`2onb#dOuQd<
z2zQ43_z>}a*dg5M`0)<$e%K-0NxN7&8{+*ivlW-II8WP&r|CM`F$$}_&T`lF$3xz;
z3S`AY(jDm!6-ORE7>2Jp(fP|0&mX?mgz;xwnA3Zf@B7?b2kmZRHCKo)G787{qC=*x
z&^)Hu=Z#y4A455#M>T_2B6pVC(%<EFi6`*24R~V}d1iB+moI`hys$&K^Atb+GUENP
zL%4IKAHRTjKkN|htn}mO6Yqx|!kr`h_)CfR!w%ujs2@L%ct7kA?i}vNUqZYeb_jP?
z`0;az_rnh1&S8H1XNdR14&lynKmKCk{jfv0v&@g5L%bh$2zN&O_}Rq!VTW*M*pI)6
zct7kA?hN_y7ZUG>9m1WCA3uwDKkN|hq+KkX<HY-6^etE8k1?q$ytbWBnjoCL=+#l$
z+uRW@<rk&D2%ZVjiEog<$M8-23HU~~Zj+k+E_(EP*z2u*xzgY>2Tz6IwF-EmmVJ#O
z<joQPn+%K%R-czlb5i&&p}+K249oS->&ZQM%fuXhwK>;C?k890BB`I{Ql@M0TL&l0
z10CQ$p9kZh#?RgD%ma}3;RN-TT*n_;_%NpBhh@H&v*U!T_?_Q;TjymWhY#r5w-P%s
z^0=3I5AW%n%NV<K?&P)f5vO8B;WN0<I+ZI5F6(^b`?BX~yse05&$$?XXqU4|Lb3Y~
zaW31Tu)8+r#@C&C$wk@Gr>(=EcV+kJbMNxz=J<i;&$yTUrO=)6Ft71ParZFSEZ@Q$
z8Mxnsa_6I)N0xLmrs40Mwd2Ht<%!)nCyU)1n~dU}>@{8GiJp!~VqH#Sh4T5mY;Ve!
zI_UmO+~04U+;H+c2Pm7;o!7c0W95V8@q2T~9CR=<RW@b9UD1k;ywP~Tm{x`!aXaat
zVSzYghUmuHTS8a+T?u3fdPm}*XWOA%d)6-VJ+%RNqAO+#eCzc+JJwd*P`FcLQsjmL
z->$xBJhbC%!gIoX*;%6D0et-jY1pwgSN<K=GL!4gRIcZ4fxq`=!!wanZlb>b63*5*
z4cqga#rWgS?auR@I?=||ne!%#e^x>V#p!!R<d-L}{DaU}bLk4|;)*6dox#_m@!o6u
ze+8ZaUG@GqkIQc|_u51Apo!!hpSGe=Sw%OrsfNbnWqNb6<vmMYXFLGSlFYTA?aHg&
zm8Z`12zWsEG46%iF>T*b()JxCZQrrvn6}sZ-Zx~tw%7f~=oAnB7uvppwjV(qdeBLo
zinWD_wyo9<w$*&vXf9`{g%jCXYNrZ(PAtFgt<I5_zOpty+}v<BdE7(0@51Ns!DiW&
zlkLcpzw1X&L4Kk4n4Lw=<9))!;2rlMdMk1vo`b(wFIL%=H+-Ux-D=~lzk%&@!sSWk
zIBo(y0*^ty0T<RO;E|2}7sDf$Ou|m})ozbZF6hcnq5Z`t@-bj<cyVS)yDIKapjidH
zq_$LF)Y<m;heFti9xk4?k$z5F2mGQwq_dh>SIkMjl#OO?3EwC`*^q+%sQdfLU;P_>
zlXVmHIr6jp((;Wx8}dQU1F-p>t-PR(ao6R-6`gta<!t_3(pMht%ZHczEdNNv$vqT_
z<aV8MO75X>ICn}8Jmz*!JZ1bnxfydG%gMh489tAGi%yvhpD`jhLpR)I?Wk_n;oLX$
zYt{hi^W~y(g!8?R>zhAgp98i|`b$R#_3Zi$>8$)AOr5t@AcOGDB~5i6e(x$L-4#Ka
zz1Lbky@2~EKQOEfd-GMv>Pf4aqh=&aRu#&UU&|o}@{-S{mureX(!se>@YOKNX3Yp0
zys|Lak^JDiz~gX~{CHb?v10d~PzImgg$$<c8M|!TO9t;%TXXLuytp{`CzZkAQWnUE
zf2SX+jUObR(l*!kib`d$c*~O$fgJYagcHbNXjn0&OY*kBe48@_S84y~c66D-Hrppx
z4c1@%Acx!x+dg^UF@2J>(9Z9Zvdg)?J&?B6co?GYVelQ2+4g)fE3^Mz^UV~rL1zEN
zmU&{CU1w#sPjg>p5Bm>f_GggUr*G-bv;VGGDz}%F&`t8|RdD#P$n5W{za+e|Q18z@
zF285VPx4Uom+U{b@2!9yLo%B|&zIRX$H?q+$g@;tKW6j%zb>;!9f#xBd>n)E`ajDn
zBWTa<^fC15LZFw3H(okMM*8i9jNEbp8EM<)OUKDb+UW1Vsg$4Bb1xYw`6&FXd_)dP
zR-TP~3gn~YC3?hzk}r~xdQN{HY$NrRUmcgX&XoAi%Eu|n>wi){R*=Ur@-apqiAg@{
z>^5|cc-EOM8R;S;>5sE4jXya)U25Z3eq!8u`#9P88tJU;MAw2IR(3u|9OVtl&Qy@b
zmz_(w-?7(|os(M^Om2;u$*uF;$*pcvbDO)qxxJ|_YTBD>8XIa_O-)NfTm3w@^|q$A
znk{a+rKP!Lo;z`J>qN7B+2Z7li_Nm6nPC<!PA;roVrH7!nx^yG+}b*~t(gqX_04W;
zdu_eDzM(N~7B{q{YulPzZlj#0^p=L!wscdQE!r!;Zk}tB4VkoCThrL+uCL*pI`esB
z&oX)cZUjBQ$?Mu18rvG0c*9~_mtNn{l&*6dnpB+I(CXH>t@UZ%-<ZB_b8}0b7uV$4
z+EBR`rSonKY1>+AYB%!!;A5pH@8dFC-`-T)*3jH!S~Ka|hMGp#FKTkDS6G16yiyWo
zZoR=wH8a;WG|g<SH<KIdOs1x#W>dN?-C~oqrrV4QLQU<Bjb`$UskRL$c)`58x;wji
zwxZjbc{Pnq?VIM|USrIYcQ9DhHnp`hdiO_k-`Ko4-QwNP{xbKinVQ<PcYnL?YZ^24
zHQxP8N?+Hop`p#Yuh8>MOGA@?zfAY-nM{!1Zr!hItZCZlr9YteH?-7b>b?63_I**t
zyRXyzmZ1Wk<i7JRGxc%|%!@2vG-uMbom%0jw)U2$hNcZ}^ZNDf^^31uw(zs=rsleI
z)O@zN-L0>=HSM;xHG@o@`-SFptuvy=ol@J}l6LFbHxYThSqu+Nnd}FYzsI~S8_mqR
z^sO^3QDMJKOZwJ^=Jr<QB6h58Z)t(;f?La-JQDjG^@5sB>l!w+^MaX7FSu!P-OaA+
znw9NMLe{vqM<-9Mom}UVRsmS<cD>n{F{@i^Hl*jd8yn!go2IwAtqmK*EIgl1kVf=F
zioDsqDbr9#1SQ`*W5x`)AZlNn&b#!Cw$`?qw)WPWO+(YIaAut{qd&qao7SaUEYHA4
z7U#xR<W2PC36&d^RCYG~Z2@&R(Z5V|b!*z4s5BGRV;j?!?&?1fT;v#(2xexwt#)Rn
zrP+4n8A0I6>u)g2+uLYG*K(d|*}Mf_p4}WZHSHUk&4LT2D~jNnR<pFRF};CmsGTh`
zLG{`iHl>@}+e~I&OWQm|&IY#@Db!|`UbV`I)KSybnOHFRzDEX|!;<CKT{#%voKYWj
zr%$d`ODh}ocWzzpNzg_c(r{K=t72Q*;QtNotu-y~O}uckS)Qz3xbo@~WEnkio>9HA
z^!mlV<ZG>OSl{Nh)z`GSn`)YFGmCt7^HHPABfK_HA=utbo<8ehgiZ7lrCHfIz1D3>
z-_nlIM5rOaS~j$AlE6d;tHDfD^M*!v8qT0wq?^~n14xz{<kYQcv#GhM0Z~h$^p<q3
zX>F@RW^R$ROPgEME$f<Fxi*;erkdJT64jCuoP}U)OmE3Fw<!0vhV{2`X>XF8YHDt5
z-eBs|>)JP%^!lX@o0?j;+<L>6i)z-jOEj6Q8I_j<HvlQ15oiOx1aty-0lmO3;17Yv
zfbRlN1Ah+u1Xy*<7(=hRqNdJWU*~f@Y~Z#tY|wq$5DHVgkQ#4t>-on%G}kq>w(7}w
z=bwL`SuL_`YG|s_YqzvF>*6*0P`W$LvxT*`uWM~<Xlu8k{>tT7X;@ju0Ab%^BrACu
z@G^v_rCT=AEyZl}=hJ9)cA(R6VQWBiV{>yxOx94dj)Bm|`Xh?lL{B#9raE;Y+qat1
zn;RL^%*0D4nu+HM^yl{5^#_;&oDW>8$0^`!pthzp&84o{{%KM;-Po|+UhI=}YfUY8
z>l^f^xrM*>X+smCw)(U#bhw5_uAA!_c)5NFxMQL@8_tGV>YDivR?3z?#3)O%zQO2q
z)CFEP_EqyGbBAH>VSkQeLtMO&?gVE(#2#{BCU6n(8DKuJ5V#Up3S0-Q1P=WX9_RPL
zTZBIc)Bx*&O+Xv)C7=tq6W9sd3)~Mp0(=Yj9`L8Y4}fQZ=Yc-pr@$+~uYlKqZ&1cx
za((Lij(Lmg0iYi^3=9BwOuyjr1>imzMFs9e)sb|pZArsfM3hGQ1D%bc(`DT0(@DX9
zPpYniu@!BmOOcu94stb;E#1;k3#&A?r|lzKMDwOhBWgqAZOFwYx-Tqj+P(3{j^A)j
zbIT@Vj%1k2fO4}rXZi(h+)Rzny6~deb1weO+)K<Rzf<^0YwJ-)=t?cNm_QQytcwI`
zLUp^XmGW%n)TGWPL`;iQTWXp%cnGR4o<KH85!>xha~S7?N=cqu$u$&n(;zZ8!#P1h
z<T3I~QfoT@H=F5O%=EOGzTQl)Gt+C$^mS%B6l*urH<;-g&Gc3?z0FMjqM2TArY|?s
zuQt<{ndz&{*$d2ka~W^m0(E&EG^cMMA^mQ8BUdEo^kyJUzBL35YCjWY&cqR4PUp(J
z&BVDf*Dx1x#V%tm=E{8CT*9@S>wK=*Ld@k{(fQ34T(K{kE4gA5H%qwUQfRK_%A$w4
zo~vvXE4Z>YZK}Dlj%~lefp53Dk^2!`KgU)64L5UTu5MC(d@a`~_Zzs52h;Uj&*0j?
zwTkOTu4i)H#B~DKTeyCTYdhCZbG?o0SzPbn>T>PmdN$XsTt{>L3fEJ)?&La#tNO}B
zC~*(>=Rk?wTqkk8pX+2Ovig3<oNFlqQv6VdTBX8T4!5c-syICZvDVaho3Gu9RRSUC
z$-P_Go8+ol3(i6D=Q2r`3m06b%j^Xgxc<<(V3yJBV!_Pz)|Q!#&CCvFwxU$eE4d%M
z9eQA+yjy}&B^J2DqvpDWOP3k@*UngAPUbi0<a9dtkg>KExvhTd&vNP-Zf#JMyY4pk
zi|LkTQ#uneo6?&!pGj}2uW4sGQwQxoI68s9-oHw-$jl-p_!q?gd)E(+R+~E0YECyD
z=Bxbs@Tm8%*YuiQ{PXfMq5psXoKQGYRz9p^cyvVN$WuneMxQ!n?6}iTAAd&Gnf8f)
zZ;p8~;ZvVJ%MC}4ePztpqeqX9KjQ?MeKPw`ly`jj$Dwl!ZY5}1TtU|+uR7D>b;`tZ
zCQUx~yea2Ty<pn(88aogozP&VeAMY_W#wmovQnRnDW!;gxr9RYeu!Z9HlUup@d#;y
z_77x}tA~CZgL1~{r%6;E_w(B0l;I;sL@Q&XP8~gN>=+Yr!k_$!aS>9V`t(VDAAIm{
zM~79Ibx4nmrnb)1)-x!X+U89t)Z8_rX*4l7rfch)O`3tytgn$e;w$y0zJ|%Rri?~2
zDr4n^@kU9L*<5ENl<XfXm|D`BhZ?K4o3?aon`vty^Y%?OtsBke8q{oK&n}t&_r{I~
zH$K34@HH>2^NiOn^GNY0yU`&!jU5|ieA6+H`)OtqPJKmWGv+gXScF?Zcq}#;#a~&H
z{(8bM<B+D`D#B|X^UAsv{kYQ4^BTghv+Anx>05+vztJ0u){y>V>?F$bzY*Sd)C;dy
zo|L8EM#66&^5Qdu8xMQocBNnKjdfolTydF)Ll@x#cX{t_Bb>v@RQZ3Ea8T}U!YLoO
z*w-1KhIwP>9}z!3?1djC9MI~NN5Fr!7ym8dMNj4V@DCi*;p6$o#Mk|k7yn&o+t%ZS
ze?WbARD17!pEMsAy!aTSYw17lUVmfu-&jV~p?`|wVAzqS(*JoC{9pHXq(|-J5g5q`
zJIss>kCe)A?2o8VMwTWKMWv~n>^Bkuobvw}0-$o7@K;%8)huhQRQnG82p)4k_#g;W
zhDh@75x`Vb{_j8lTOU-<<12jpeNgYgE37>jK1twz2Lgb)6m3+u|MKrY>H=1C|1anI
z|Mm+AE6pH`<`Mk2Gim$Bi;SII5mbT-6FKQm&!@;xdcGN&Coa5V(c&wwDv79BSBsV1
zun6n@dhIW`8@k3*$Nr`b{`~m!?eFXp{JaEH?Qh}<etJGs&`Cnam+zN4csW72ic0zM
zCn(lNrGf`bRwvEU>#NO*)k~{Q^~!}wv+#<Q)#i%TtISo&E6ue_mn}1^SFN07R$Y1Z
z4GLXol1q6|edWsQ%&O{ZuUb}Z7A;w}*eqI3E~~1SCr$OLYW`q8<j?ZeW;KS#HH(s~
z&6=xLea_ray>J<CCRZ-M%G|j0`bA63(&Z+3<4UvYv#Zo{<}beMm=}S+1pXFy75Fvq
zCh!jMTc7|O2L2xSM_|_X9P=++KL)~tD}a%}sle&L1mJ97GB6dG30w?Z3M>Q`151Ea
zo<SO;0J~N!HpaZam$4k%$)|xCz>k0An5(#^fX%>HfIkGD1bzU#1iT6K10MmgKc#$N
z2Cx9Q4p<9p0y=^FfNufM051UtfOmnTz$s5L4+bs+)&gGyb^_l9`heE~{XXJ4=4s}x
zz!ktvz!!imz&*hCfS&_z1MdQnXP^ymCJ+boTflWCupZa~Yy<WH&jb5`gTVg)qUbZ@
zf!V+!;0B-pxE=Tg@I3Gi@H=4q52-V7Gq4kQ3ivtjPe8@9v<+}EunMRHx`79Q?*qR8
z{uMa=&sZ4+ZUi<1cLI+9uK@1>k>_X|;40t?zyrXKfPFv#I087d*;&9Pz;d7-=mEX~
z{1A8<cndfL{3}rT=h*Rp&j8DSdY~0pZcRCwH_L#<&8CJn&5yCm4=xC59mBIXF^3*}
z!pcG|vv9LiX4{tbj5XKZ#^idFT^Afo$0AQdZCZKM)YWO;ZWac1rbd<)S<YZRqnS0E
zD=~lv_A$GD>DgZ~at3xQEem1vtYfjrmYr@j)y(Q^Hq>A^@K-mynZ8M?Ce}va)}@;o
zsL>S|H3AH-V79T52NpBmcwc804`K?M&Fw8<y{^6WHglCwz?9$G)@l~DG`F@+_us_)
zyYaYsa@*$Cl#pwwRyv2Mx71%K3T$m&=4~=JyUkb(*RxJ&sv(J1C1hx8vc_hu&??`y
z+cN3RSVFJ{R;RbH2rSfwkhHWU>$Js6D~v1^vCcvBdMFRBV6>*w8_i0lSkpDV^76rq
zNb3!iuIgdjZ)x5L78w?N&2=?x^@9r>u5V(jYi5b6$(qHnm3wI*V0&Ym<*AmmtTil%
zSd;q7fU<RzZChb;b2}~CT+4!=M+_O-hq!_^XEmAyVwj|MBgDM5rlHYhb=9C{9?~?(
z@~UMQT6%HG`gNO|-jr#(ZKzVMw{2S2+=vy)*3L~g*%hobivgn9Cis)(K~<(M-AX>#
ze<8V93KOx;(!lCL3#O!7Nxi5ZyK;JHt*_MHx-5MwPcF3e#|~9n-@-D_7kSBha1raK
zjlwjz6@l8!GUz?HbXb~QvZcALxwg5{t!rV;$Xk@IX=|&gt@p5Av}&nVO4@6gBd1F!
z6rkak7Vutr3pQn$g@Xw70H)Nca&1dPMwZ<x{WR`+EqX(lnkE(lKk-IwX=H07_F8qb
z_00V}mhx=aLC=ziVcEZpsr@G9Sy$6mQ-W?atBWnN?uqU}fA&(#M(K6QRu~K+(3F-B
zfii@*S=n%#(rvgAY&1!hfz*O})X>C&Dl27Vw(bioN9h$cUt8LvH6{pmT^i<YrM*<<
z!a5o48(3@g1kkFMO<Ldd?-pU&Xm4t$t+A_@Hib%ux9iMc6L~LQ2lqGBvzA0Ni2=!b
z<yEU#dc`YYy-b+$&wvD0R)`8d<Cz<@px|-8`mtTB3VbIlxhy+guP&k*f(}h5EQ0!5
zVKvl{-pZI3(pdbU!>jUv7(|$g4Pa%KEtOkMtt2{4)Ra!wY4wez2QG~b>so4%{0r@4
zt=HACzA-5Ck4-d#)R4q_VW{w$84?qN$<0EKAj(Ax*<yK8NpM+-cTABD2zcLNK&zwT
zons2~<tldTV3lv(ZB(yS?A*ix>Pdzsa<MXJU0Ph#R%4fGR#~oWwQ|mHo<T9(-kNS{
zHLH+6Y4~k$#1z$=o2IwgczB#8Nfs|Pmipri+1qvDI&+;bSFC{6U^mDwn-L9=0wH7D
z+Rtq8v2B(?k#|gVD=r|c0MmXxW;PSOF!bcu;e9aPb{dw3T9pAZurAZgqVy0_>uWYO
zFe)6I*Ftajc2D$BR`-lArRYU=oX1y3HoV)^zECh|$r?uG4NaCbPz?482IcF$9;{AU
z*SxvOl-##BkrUjiMcE*_uEp~@!O+;`v)j6KE#`eIy*-J#s(F3eW_TElg!nqxa4>Dn
zI<1~B8j7%Q*m|THU6D@f+Sji~9$9yZQYrNbx(VZ;u6_wLO7#iTiKIhmeCCz}ackBy
zs%y3JxK@E%+uJNb2Klii4PxSO7C&me)y>unV;VFbs*ij%7+3MuD2e1v5yC8KM%)h)
znjw~S5<6}^4@#86pjtE`&AR~_wU#_>YTm5I9elD1X`6PhN6=Zl1nE*ogVD46kx62u
z)vd*Q#X9L+FOlP}x$^p@YwRkMH`dyBMSt%>E3OZjdORmehyJBjNFfAEU-5<8(wWQs
z{<{Jnf*Qt?S}V<zB`-AK;A36q%#F6^`B7G^4)qoqrZ%mCW2N7N<)-Gz$idEdEioEF
zf&nYIw<8MPOsGwDMv<FI)RNW!1io|>q=^(yvwU+CEnX+(6v{z=F^7~L1|iGpOAycP
znISP|R<vX24rHB1H&GUWBW9~j&$Om^+m*dl>xJTRa=!w%DsRNOs<9afg~0Jri8j_3
z$6SjIo|LP>EpTFDf}GwUmCD62tI-O!W1e4V7B<$jpzTXBLmdr#H&hw4>-9B^foMt6
z*X0L8?l7XaCa}u)7@OkxOYw1NFCw_QQ`*`jH!|&QgU`G;_|!(OW^e>EH8$O;uEA1)
zDY+}QXINnxGt}~SOl(B~JO0594J~c$I6CR2A<Y9R3;)^?>X`T&8=B~ckcW(dp;HKC
zm=ZKdG$rNZN5vZ&(Zj4J<f+u&gvicGzrviW7kCiZ13U%%9QZZx*T9Fs?}6dZGnWN4
zUp}Af93TNK13n9^16qME0bc_i2mTEBH822}A2U}4rU91#R|Ccgg|y5Q*qO?X`<4F(
zzhVEAzl#6GKidHR#XoODH+`c|!207+Sr&A5{&#>UfscrI+<$gV*0KN|6ESonbEkfD
z6CslX^pgqrjz@>yn8y89?jOKISU=r=wd7vuFXg`H+j{D~|EZGq^?cHC_ZJ*@e<Alr
zSmH}2moApS%*lQMzV__0g`5K6gQo$X>@8y!3hA13&AJBTOe9#gaOHKg;?;|<TWZQ9
z70#)VvCcT>^zeA+45un&X0+BL&zL2e8Es5$&5V|2DZFOJ24)pAyx=;9pBdyb1GT!P
zVI5;u>&c7%#1r{#h{9TIc)A1Nnj14j^9c9)vFF03Q@wZZ=9|Z3v8P?2C*ChecLuk5
zJFIB6W5V+x(XD<;C-^iFq>GU*M!LB}#o9C^!EZxmU@yNV(0Iv0>|t^~@qa<N=W|b)
bnIK;2rUy4%gRFxxgGcS8yCk?NN%wyOp=)ng

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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

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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
F_`fu_8wCIW

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
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%0D;fr^ad
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

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;
-
-        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";
+  fetch = { file, sha256 }: import <nix/fetchurl.nix> {
+    url = "http://tarballs.nixos.org/stdenv-linux/i686/r24519/${file}";
+    inherit sha256;
+    executable = true;
+  };
 
-        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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
L(hHt6PoMt-$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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

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
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
ZkiRJLSif{Qi7H{zKMChbJ22Bp|37Hv+#Ub`

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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
a#=hbF+N;9HQrbBUw%IT2xoMF$&iw#E*Geh?

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
zcmdSCe|%ikdFTJkoslg6!dF5z0vs}9UH!oFz(5qLqzaix0u<sTvJv2XOH#!)#z|=F
z5Yi~S*>V}l;FPhXfFaISO{cPDoOF-{7(%v`XpJ#WN)o5*bm`U`X@LSwlh$cT;uObs
z-=BMDY+-Oxw)@9-{X*P(&pr2?=RD^*&+l{QwkuX%8H>fN{Lir}3!h@<wo*8HeaxEd
zPm`^dw750fB0DR3AAR6*ad&pbOn((&SuA?rLn}Rwt3Pj!S^o;N%F_E)e|PKp==0b9
zpK6vU6&(%!qRH&>AZ|<BQ!`(RZ~xwCQ<Z%q;BT7p=_;FvyY?4NF{=(gNxObL?k;W5
z{MBgFQvXZC*ObcN=zWs+o7+m?(ay;_2T!$;K4x|(H#lrIKAf;!^+$u4=e_)=@k0Z5
z4i|G<hSS|yOZODwKgxY+_^&RA+6n>_K3?<hP&kgsz;WI7q{ah`J=Z&TH!~K&T4xUj
zu00gI)v~o!_8|4nZg<=o{;J!ndOp>-pl5Ys@Ab=u>PN0|21aTu2v#??)UCGp*5}5o
z!}IGL<NZX+UFVp6C_ndDGA;o0jq3e8=&Mz|k%1iJ$hso~UmA|NiFVa1bPakjb3EV~
z1D<K%n+Bd~-~qo6g6GK)&l&K1az08pe&P1q@EqFHoV;**)TZNBw5v_Ez2^FH&!Hc;
zCzr3H-ZAP_TJmhoo!c|$X&$RA8P1{L)${CmRhj;U^9l`&e0Q`-bnp!Dr)RR%PsY>D
zr`~TWy-#Nf@pRi%++$wCI@F#0Z}T~hw}65Qo2iY;bH#)W6h%)4F49TnRkTE(*;1Rw
zX0<iLe7dvf5*!6}AzeNg81>V>Z|S5tUoG`xZFB6^V8*pAj`h&a{fUTHeiqWos^aPG
zMQu$6liwL_dSX@^l|~zW)W&_KHdtWAAaFgtnNGXLV$-^a<}AsaX?&-*-`-qd<vx1o
z<8q!4o}r)5y@`GzT)w`)a$hsw9&P&88TwiKCi*#jJmvO%+W*uU+Q0h$Li<VDA2~z&
zm;PU9f9jdhrrl>~|GYQRegXOn`Ams#w%J%y#&!j)Z|HO~=%b%DyFbX<?x5Sg67<+t
zgEjVNf!Wv|%T(HJXMo`s@rZ8AG)H?O%|$#TqPae3?o9JD^OvJd`_It!bEmcaZ=q-L
z%JSOVV!3=-PWbeb-r^%`vToWh*mn3u+!9{i8XAuv6Ve%zd|Hio^KKo4mn4(U1@Lcp
z3H<ZS^qZvJ{xiV;(3^mN6Z7NG;veuU+rr%RGdEM;0`}%Y{P$<|GiTPi-#)7!WTmUM
zk4#;{_tPFSEuAdHZ;ELwQ))AuANrc6?U0X;yutj;<_B5&7eDx~v-+RSclu}b|Lge9
z>HI*nRh}dD+0Ju$?H>AO)bHh#{mU8p{?Na%@6+kuVq=-t&_8{>5&cUxiZ-Y_tTm(c
zAQ%PHEoXqK^)#5yv?k&fZ%@^I)}A@I&TIBRo7bF6HpSu<-s$UQHeMzVf*1PVbcX(G
zPwW3zt((*5<K$e>et90UrT(5iLx0Dd*Ybe>lm5zm&9{Pk=;_g>Ajo-f>sWz~Q0v+p
zPcrfc^dtIOVsXi8bgIsx-u=ND;QFgK0oSiue_7zs`nz>jKeN~0W3&1>)B3wpJmyWT
zzcN0i4vaP(nAPv>b@!iV_517A-RtNnnK(JWee`iT&)+^nKmMEO=S=ie9?#LIMw^~G
zLq8kdL_epGr`-Ms?O#_H>2lJsX5;Gv|Bm)&ufGg^X#IWi4C82h6aAbCUsL->n_T2j
zG_FXdNq$Lo!Ov}*ReJjthVqFfmJLx4{rqusWoN>*Wj{deo2a9_mg~~+y)%*Ix|C;+
zE2`*3Ggpsm8}(bcuHm_dYah>RxMq27<J!fwoohGOEZ3D>ySVmn?dICcRd&Hj?#s4;
z^vu)e=tocf`Y~<&e{4*3|AsNG`TzNtM1v#fA8TgmAK87QO?~zRdf?a42OmW*d?aYI
zy+H=MG>MKSopB@jNi#O8XwtRsW%>uV48MH)ox|_83$P!*lS$a&%tdy#cd;$>e#_4B
zQnti%?3v6BHs4FzV()_}TOYP_;pNF1!7$IVi7a-j+1#zE?t0X*3-68Dg_k5OS*`bG
z&*f8fom|)YXW2)va|gYwb)q%&xyz9W7sfh6+wD?hL&ElDw%PSPw3Vxmy)P_Z9Lfx}
z<K!-nW${Ef$e5|H?RUoBA3iUS`O*O!n`77X>e?Ess8KyHHnmF6LEz+4vG-#;yNzl7
zr*}2x)3pBO{N_@-i(^T?8}uq;Z#<@0EV;@oo-2>(cnI5C|6eV+<ObTTq;0)lWLd^=
zx3Bw)D4%a@d-Z%)39gtu2`B0c>jXhX?qcvz72Dx5H}HbH{de<?;8>2FjM-C}h4iC3
z3FK@DvQ_0?wK!vQyb9~MF6yf)_fxZKjZx3~{$GNQaE^WwToqpb(XutzmMF*jnCEP5
zdVAIp-1rn$o899tVoqNT&hZvnUuD)k+xiCw@R_V*{?^j%x@|FAmze|HK``LGe0%Ag
zt9RG<`cCD)1s!>h{dZg8-#6Spc<=D}!2a^>+lH&{BQ@z{pS^}|lA@dOp;YruU1@(D
zxXNS94W*J@l;;NLSv0Tu-fTx8{XTtg%6WGHFU`z2kD%{SJ{^tS$-NL{L)v+WzJ;Sn
zXi?Ys<}=QmKiA%Nt*(D&6*a<ng-tQ9IbU?L%ibS;qvyC?=Y9md$E~wAJtA8}K9(9!
z@3Q@K!{<uqDBY9A*A>yL*&q7%SeE_<XRncpY~4IyuiKiM!X06CUyNDZ+Y)B@Q1tJI
zS|hBTkNcY$i(rlLl=DxmuQPpnYJF*4sNY*HS{F<0+S+tomUajHbM3P|x~~A<m~CfF
zp9paTjSe_G-^9GC-?J<Uj+}u7wifW50lauyvu@l{Nyy#?nWMoBZS+L%p3kSk`S0}g
z9J54|;7(5^WAklU#qyqc8Y^R7G<(d~=)Kvoe5w3S)vLB_xE{mrdrIHeeVjh$ZB6yS
zb?j>R%GL0d?5Z^HL!3qBo0n6s8h%1$`=j7P;kX(syF~PGNr?t7F5y*kr#TazPR-eX
z-x&Jf2ECt_zF*8*(f6s+_pA-@qO~8-;je?|F{IOY9zL-WfB1XmvpxoO1Jk-eeRCEx
z6wznSpF9!Kr^@HjZ<QTjT}_4aezC1>1MzN)>&S?8wO%zZqEmSLH2i)V{yq(VpN79r
z!{4Xj@6+&fe0~q&^NZ}mO~~@Ht&)6v9X`65cvWs~UN|cMJ9L_V!5+tNF?h%D3+U}G
zvO+SVIIwxRIrKL?7)Y0S&v~plY|{dIPCNIz2jy2?Hk83;-F`))-99M(UY%IZ+HLjk
z7;Xz~*`%{Ov}Mg%8rtcF_{DsSm)WE3S-yt{(T5`V<)@6>{PxtE&&K-x{1XlB{)Vmi
z^6;6)@#~pg<{j|n*<A0PR^^#p<sS-O@&fx|W}aQ0j)&{-fS0bD0e2mx_dn$Q)tBf!
zzE0-pX}``s7QU~k!#^CX^HOy;ftsiNmY$nzA#K#z3p`)#*U(=oxgMLhdvTh&YEy7H
z_EPiz3T9XfSNW08ac5Ci&DqR}zi6t8o$`6_{4b+T!etr1b+K;*GsxwG;Mt8m5m@YN
z!7*g^QDpYZ$n0m4(T9-P>Fqu+6!tuSZgrx{b~Xv`Kj2<?Z}$g>*WeR*``Oirj5p{t
zil_ToQ+c!Sj!*TX<JF1DjzMo3aymVdwXDBwxZ56V>cVG&f7D4gC*h^O(?dOMX2-RT
zM4B$ap<C}e4!+GLsV&Q#ZtUomx>eY^efVOGdGK=c;EfeFP}@acL695^>6QNVT=lBx
zB<oa|)pYwgXvE36mhF9~b+qZZ6&R%}3&sq3@$q@piT>-e1(mn^n}_Qdm&+PmwxBxk
zHgDYfA#0(P@4Edj41@m_pW}TB_@D)6A$9t%Z)ilmxuUOT-t}MaHA+t0!n-couLJ(9
z6?TY^w*&VGK7l%Pn->PZJluj_leSuKrT<0XOyuH>DOz`K<K?WqI=jvpv7N)|Eyx|<
zt;qn49q{nixT(w?%+LP99NXFa&A?|3A3#Q2f(-W11N^$IR<j)(PPNT}XT7v7VJ~O?
zC9rFeb%au~u2sF1`KMr}SI<8V?u7@Bd;bt@3$Jk-Z{8ae;Ac~XicqImmQ%ZXf*ia=
zeJq2o^t$O}(phNN_B@7cL|)V|H;sn^Xw*7b4;?G`mNv$Q(|*!9`jZZCk-%sCsxLlx
zXvr@cJ;_q+Wzo+UgRILtbdhDb3hS-a`1O4~JW1b`pKHKHDmfl!982mfSIqEE^E`q4
zm7MGk=S=*;$;l_s?r$M((YLzYA7PG1@a36%rRO$Y$DiJ{!!O$Xf#H?@y~A}@#P?^m
zf;Ikr^wF!)g+{DM-!-iJ3%umgbI?(jfa_Y;x0Cxs@ZMU{RgC*Nb`6lajdSfPH{Byz
zbsK*tmVgJEoAuVx-aO=M0{(CAJ3Xi2YM%AJ!`sJPU&>rRFkEwxv90-fEY<h*_*r&i
zgJaiJH`*VL&*MH$efbR1eQNva2J!V8?hgg|2Jl~<>br}%o}W7u{7yq)55RLCNdGh_
zEUvRJ$KYvRHhAAE!TPSikTF*?hWFiGzvix3OY$yzN8tBH<LK};=O==3#+S%l8qT@f
z7(EwvI@Wdj{|x-4j&(GceJ#X$ja|oFUFsl*8#T9+_=<PqA1>e@-j09x(2}n=e)Ytu
zdDa|LXPP?G)R{h)d8ZySL~UHs81g-LC)2cZcvsL`v(&nZ!nMo%me+6>Ypu@4n;xGF
z4`Q8Zjs9q0fVJBN-0O?YTocjN--|xkg3m(b_<{0$#IfWL(wY@-`)XYz6X1>0@Wg5O
z=QMnA8ooFUUz~<7PQx>&;f>Sq#%XwG=nGB8X2rBhzVg;bMw<?X?S3P8DwJ7fl24LT
zCYu{MRfX)4oGQnz<WK6KWltU5JBod^H)w}v`u0SyNp_Y0Wq8mRhd08j`{30*@bGSU
zbrxRT1~1=&tgN-2dqSIk`;<j`;}WkO9y1cF_BMIj8tX!y(&5w+kDP0XcK@A&tv|c1
zs@;F8>g|$6sXE2~*5>Qo9Jtz<U!K_lKc1@nMNr{s4bDMs_Ari=+l4=9N1!z+nY=^e
zgojgxE>JUZtmo+_wd2}4&$S(U^zD4;R{jI=&xE~*44AScbn-a-w+>q2e)@d)68EhC
zm-0UiX7J^WGoL$$j}!M>J-<4k{^!6~(AnIoRWCNSg6H$#vszONN@d4-o<tX1Pv7Gq
zFHhK&&_h=dy|So2i}a^{)nCk3H{NO2Eort&{2Oa?x6_7X{8F1Y6yfS>=ExbUVJ)Y6
zI${a#>tLbfXK3;@&-hP<&a+kaN-RmJ*6ijv9n#@5=xw#)-|K<%JnQ1UZw%D1Md4Q!
zl$E}r4t#h;5OjK@K_%rIs5@m({$AX2zqim*8+XJ8Hga{}&s-$D^cu5tn{hwa!=MPu
znK(PoJ{iIg&Z*m}BFdtE({7(+mtph~g}-u;5kij#i5qtgwpalhYaKMRp}85oP~XAq
zi4m-Wcb(<c+jrpShAq`S_*S0l?5tQSQyU9{XGSEOWJA?wp0VGw?=)l6r&F2lSZWhN
zOZ(0j>NgF6zk>T#dj_6Xbs>yuRg(Ku_S?WVHwMmPZq}^6ZX-BYm-q#J&ZD0?-i167
z-}myqn|bH2(z{gM2Igi4xmVf#a?qVOyE4Cg%_ooxcUgU=GM4HgC4qPTsspWc;1N2=
z$LuAqhCWifU!KwX11l2tv)WYh4(PeV`*Y%{={0@yF_>u${Mw`?CRkUc7|0XEKpvlF
zEl#rr(TN{HC*F%r{4hH4L+Hd0q7$ErkqA%ae^adQ%&hh8J~-O+_+V~0$@*;z{UQ(J
zBYBV*{v>OvC*Nw-L-Vlh(<8n~Czk%!W@k5Qt=)Ex)>@w<ee6HzKH2B=axb0d+$!-{
zbAq6Tb+X#U&bC_C+dOFHi8;|bXdan=OCvVJ68fGl>%||VEzzRN(r(rPUUd71S<er_
zmrv=(S@h!q<H3J;GOr>#8I1?OB0ipR{64!F*X!eh>1N-yGalAszS(v)RiK-j?LxLj
z{z&PtivOLCubDmg0>RJ7;1|G|aD^XfJHE}4DY8lS2E?mFJce;|){y91I7%N(I!XD`
z+p<o&kj3cDN(fAdZ^W$En-5P(Cw+7n^dWc?@Ub?sC%>&OeOqDgN$C4S@S)B{f;lmy
zb|PH)C0y+VR}X`$hp;6cJQ+h5zD|!9xQypS;2@vI_VmI}55brF8Pi6_kse`OzHjpX
z!(Z=5ukbc8_EzflfZH|TRlMFor(A)4-iG|D2hOG~uC=(U7;i!KrX9va-Rbm}tg|NM
z+0_ns+OvRmptC)-{9&{0Sz6-ZZ<n2vnUPGYfoBgdfbUk=`d+iXg4VzIxXSgcH4()G
zA7VW`$a;7!-Ji7oCg3Ihjrp#D&*tlp(UNyQI`!%EYZJ<0c_`@h?;hSrz6^MUj`qT%
z9}ed>eK70%5Is>e(8hZ`zsPe29c&a?9z##7hEHkjv{`lI-X)sXB;(EYwA$Gd;^Ahs
zyWr{gx8?J8CgkhZJGJ%Sq=QmFY3|TJVR!6g&8XcQ(D|!M?Pk$wr5CA==<0IOM$*D>
zjs=D<%(+kW5Urat)57UvPdqT%q<EEbcs35)1AZrw^&=%5JOU2(!WSM2mSZO=UY$M|
z@o(l8`smF!uUdTHtLQ+|d+Xf}$7&pF+&$({zDsqRSGkSoW!^tir^goGS3g3XyKAWP
zki+vXv(}J~Be)-dhWA3lug~8R9n)d>ugW$fU+>7zoW=+0GfzQ3Q7%iiINFpzhKQE?
zpuewTJG!>H=vo~AzvO1L=Iim}@J*yomHL>Z-7Ne?{$u%!p;L67Z?MKi6Iu&jI2o&-
z`Lj~K4E!MCnNzcP<~A>#@tsRUdWd`n>G0l1CdKcYVr@;~TdcCRuGYwU{xqkzq0jiC
zu92+`f?7}SRGx0`b3UPY&qVx0JQTQ2^3Xck77tY!J_Cm_OrOb5(lZO6r_;pIuZ}js
zdl{?79?1o*3EAZ7EmMZia!1;qvW=`4=o9~Df&8-yPqaJ=p2hoO*qX<JPUN}UD7vh7
zGry9jmvP>PZmGC#dUwH;E9KkRr5W&EhC}mEhV5qHEc2>#Va95tKW#BP0-prN;KPzf
z$r-^rUB7+I@Hw3)U%<*To^AZnY|}fMzM=I8%yaFUTG4g7S@wIOF3pPG7}oWj4dJ-V
ziF^XWZ_<hI`v_}p@AMnVD&g40AM)%hf5^74j5gg&n^Unzf)RV9>0s>9pb&d7@MF7z
zm*pG5Cvpg%$YZg+!DQ^=V0Y}HV0#R{yan7R3(lnY<Yd7XArts!dc+<Y)_4_DO@-sl
zI{!JA?V+vd2zF?tIct}N@F$&nFxvEPQ#h`Ib2#)*O%bCTYeGMD<l|V0-p`sRSMlMd
z&&6ch?!z~bbsLz|<3T6#`>(Mv_t(@vwjVsroOcpW%`?u@Qa_)GU0*9dg}(iCOyA1i
z{$%d=Vr$Wv_BY;2|M(VYyRhd&#2_`ce#)K^JlsEOJMP(y4446~1pb5|*nqrR>shsf
zo;eo!BjWJJ$S)=N(BT!SzZ`$ntJsnn^CY(WT<mXj%N2$_Q9vjEoW_l<P{SItMdO+G
zf{zh<bhsb?j!QlHkS4uB^t&!>+~3C!9rxzilS{704lf{olD0nMm|wesXO(4HzcK6U
z_3fqBO1_82dg>>M`tx0dbuw1PFFI>0i76qt-EFk-8+<pPXWcvYQS5;Wyq)$0e&jg5
zl}^_Zve^%Kex?##aaVl1?a$ky!HgfmKIJ?Kj{VsE(9HeQgOm*;gEihChqz}B>!Pt&
zVymEY)NZr;Sr0e*Y4~uZ?W`?;7wqR&u6xjR8J}Sxor7Pmiypz<V}=gekzvkz6JfdF
zzJFMM!}e&CWB)5rKlvnUTsRqnRys2D(_^;Y7tZ6>wc;$=(U_IDG~c><=5n9lzRJ34
zTimA|d?)Dg>wTtz@*H@YL;uG0X;l8Ge39kCx|R0a@)+$4XOqmabdn0bk-v<Xd01z?
zXkk(|%@XgU+&|W_!}~aW)VKZ2HtHRA%6ZIj4Ra)zt*S$@AlF0I5<@vsL7gfaJF>J<
z`c?5TmH@88WnJ(EvrW6YR{EdEXP33l#dZ&G0q52~-X)p+EI8labYa7vquYtzAE6!5
z(=z(1W<IN+Z~A1c<N0@mF`n@~tTphTB|oIngO}S8U=R<LA1W`Mx~<PiPiCP%#~ZhO
zHKOqav@1HPE9u%FFX`dsdVfT{lq-K#w!r*5s{2;H5zcBE^F6?GHt>{Tc?+<l>lB;c
z2`oOakT>f3CR-O+Y)foMaBrxy!w-Q)?Wrx{k-@mUN6#GJQ7zwMslW1j!5U*8=5ba1
zc6=jo?x#9B(Z>ddr#c3_+3i(QH`V+zY;<CY_FT=avGF~ca|e2nFCf)CW-8kb-foS3
z9bd{af=RyHA1h$nf5`gbQTz>W;wpNouzlxfj{9RfDJ$$rwY^|^u7Xa_f+pITzfG}S
ztmO(%<J4NpHhrn_UGfnzr<-Eq!y4a}c15k$nA*@csw=;7!FxwjD)}36**!<dYb>ut
zeVd_8wY6Mrq0j33R=cWJ?HMp!z?u?Gyw#>^1VhB5`=oC>-wx+A>0D^n^@^V_0cWZM
zt<<J7Qw|w{UPLS6>B!s?t)OSR>Bq7qS*3Sb`!A)ome}=STlJIw-T84awd8i&caho@
ztb)^kQ+U`E+c7-fI>WlRg13Hfkn%??<yYVre02B^PB53qhtF|!;QxY8as=M*AhV{C
zans1HY2?{7vTYjqHI4k5Mt)5r-=>jap^kMFpVcAstK=;E%^!<$Ez0?j=`DrO25Cmt
zmvhVIzqq8LIxzzd(4*0(tMQq{fulpu=-3JPm_vM`!!!JBzr<IUfVW9bH=vs;mVB#!
z4`aLqpNHyn`c-yIPjrv%g|7Owl1`0}CtMHc)b!Ko|1<gL7XGWAkgNkP^wcxwnM*I#
zSnALdXWOaLt<gJ!!k<QZ3--u)E73_M_m<ihigo4}6a38wjw-HojIpez(jN5lT0J#_
ziAbXj<d4$lD*QQB<dK>mZ%5|Ay9e?sdFI|*X#+*Gj(iXPYU<F>0QH>qIkvX8$2Rl+
z_4VM(MPw!V@gmO>XL(k&(3?}Wz&jeuhgVnOhc<T(eA|a2Qmj+fSAMyDkhOn+xmeST
zTsfP5^GWL_lDeiDesn#$uJ;z!gRYDCo_-nU2i#a<P4hXW_Z7r(_5N&I8P=<!-Xi8w
zb@A&RVG8(f?6_IqVa+Q##4BFiC%9RAvQCw)JEA%jysxqy$JJix`#j~?0ps3M#=P9!
zXWtF9Cii)Z!@9ZG;Lo$%NJ8`y>K!>y-T^*O;g5FtHkWUBgL=ZB-pxf<lMhngxjdgB
zh6b)$J$z$47g6ou(W*NWchMQ+_>EGTzp=hQIRL-hmv8r<%x4=qyyk{=-ieUDuNaKm
zPPe6btsM^vy(&{3y|1TD-FMPomgf}DY8SXidZ3Z*th+vFbGPWwo<Ilv8ut97fsfwZ
zkDk3rb|8BH8fewEfzZyuUh*Pc99!j2pxrG#a2K%Q3wyxj9{CaC&|aP0otJDN)|}Tm
zA!aia1Xp-ISud&P%{=e)Q<<@N()Jf556_QnhTn+i`#tYQj%Y0=(H;I7{Y~GhEEVdd
z27feLj-T;`!6E!f3%v&D?;=~^dC*_Ge-}K`+zjyv@gsb3euaHAj0q;}j*N6DVoAlA
z^+fTDe(4EzHmV;!=^w{xcs>;TQ$wo%#TYw$nB>3Nnw>)Tnrh>_x-V9dvq0?XoM6$h
z3xnW8ezP^7lb*_A?>!yz1@L>WM*CtIJ9iqFXFll6!}hGRJ$ppE>5-Y(v}G@7$@Jg{
zoZ?xvuk@GLw`$dnVoxz}oNVZCp#K50MLB%b#Omvs1S9sn+YsiWR1O>qrfRdy?L1qX
z(HuAN=kX3a=KgEYt@xdjW<2n&fkpP-5I$lvtJM}|xhGhA!ug*AGxV83m&SH;8yP72
z?+1&ITHO-8H-Aw(c_YZmD2AD^mGDaPh?-~cqsk|{$kRPuc<vL-L2h`8NK%BqE<bMj
zu@gGb?W7ARH>b=0*Kl4dbD<944SMy-E+%WR8D58ec%@(dHo>=gp3C?8HhP!H39cdJ
zzFk@w>J(M13B{m2dm-#g?N&9=F7bgH>w@Y8KXJIk{!9#gG+HNv$o*v#Kc|1i0L||7
zm$yA<zYJrMgW)*Z{X2(`F_!vdF6<|pOxUyDOWw<riO;c?22;s9xeg9CxL2A-f9Q_r
z2-=?nzbV1>H^dOA#J@zY${HpTc4KCNd0a1^aI8?9L1y9OW$k+tuYyCbZaq_fAk$Fy
zB#WqiLiWH?uEJdp<JS1wEPI~fwdw8R%Zt&k*Dgnw?jg=Q?4#jnKGDZVQgv^0G^d`e
zEoj^+_ZnMX*MYs(M>`)uH|uPEC-<_4^^DB(B0jzhzg1Vh+?ISiOYC0g=TnWY-3wp-
zLDNFp<{rBAXN}55I*k6H5z6Ms5|dHccSAkOcX*y&4*#h{=h652)<1fIrH)=sABV9$
zJ_X&aT@L>(ts~JO`I_j%jaJWoE{|`<o1Vu$Od$95&X4R8#rq~IOSF}QM<`~md<-A*
zNP#Wok(y<|v-B0^EjS)LZyKIA4G+X_{@OHr4?p4~_|^B~M|>DR;zQH$M*QlLoSmHI
z51K8<4}FOk8$PpA90%W_d=mHLFWQZd=qo{%{V3h+N2x%LpYC6lPr!!{Z<?+D(B5o+
z?4QC5;H#nUwV$>lzw0je@?_|TmCpnE*&*NS{(r4btbh;82Oz&HzN|gzq&XL$mnJEf
zFLn*FrWtUWavf(W@8yH7<qw+K6Z!?PJ?IA<JPr<`vHPX5Yi`TFnR32;GbP=?)rOqN
zAWIHyA8k4x`V?I9Tb_$;wg&vjPbQz3;s=T&wAtOVcbwm?4sHA}m*!*PJw9UI|DdFQ
zEtuuka&0V-ZS+y<$;Sjjp^>p^)&HwfePEf6d@&E<i+K=VOf&}JTJV?sTS?$<3+GBc
zyi@yaT;Rtp2;rB^tK(e@enI@L?ydBL&M_i8S@sm~i@$-7LhUZ)nf9hn#Yn!u_>#_L
zv&MHxcuzbIzoYclH)=QHz43`u==+Frh05cuFO6GcR$m$BsF^V`mQbITU$i_wnv2<U
zgU|k?pEC2sNNz6*$60{C?8xJL568*+bQPxwkOz#lps}XHvF<4Ll*W1i&%!fv?v=-@
zd3n{9os$jYK|j+yaUhKqKljP82Da?da=R5_yYUJ2CmW<qV{U%!m|vtF&9%n->*iMT
zP#%AoJ~Q`?HkDy)%iTfV557xaZ9})oK(pX4_%?lr9u&tq$i4jfhlz=y@8>0pThNR3
zJQ&96JMxW|tt+>=kv547H$BdGqXSXQK<%V`vqvb)5D%zfobc_TjNd^X>ov7W)&jif
zI^sd_^Hu!iwpp?xqZonkpxDkc`0q3x(SyoD-zL|84CQ8Sn_^|^_sjGl{6w&2i-NNp
zM~mREfZwh2xG&yAUA1`%j}Jpb550zlv`z}}q@Gzk=||f}o3xhYdsSR;4LIyZSInX-
z%12xF!OAZyIEfIu=>nV5khvDC^@R8Gx)<(02^{jx3eUn-JF$k3Q%1nRdn5R7Adgmb
zs4=Xi-Zz59p4t=cH4h(Fd$g;z)^M-5jo>ZgLHOyVTrnAxk5C)UB0K8Acaj(i^f)w^
z7-e}*+w7b$zIm0}CAU`Xc7%P*Fm29#4Q|fK#yZ-v@eX8owpZUv)*bnU;4nurE(og8
z>z#1lg1+(GYr(v;OLY_URfg>%+7*0)<A0Q5H!JDy{rI6ZSJl7^zOnam+XOTHg?{ZD
zuoI`~FX|^-t2*jWcvW0UeSRb8U=2IF^iH-fbIKa}8vOB5*6x{o)qS)0{UK;U_POF7
z&CI)O7TK8P_0>XN`^?>=O}~N8ueleT1HgGZ{zmB{f+G*C=hosIVVv*4f1$iVl{?l+
zZdP9pPR^ki_t<HkPfls7F7C*7$7UZ9{42mgGcnFucnNX9o<tb)9DolGqWg;vCnjV^
zk%!l7%n3GHtG*MTQeTRd2{)1x-Qaa}0Ns%11+=%&*199WC%?h7<Pd89TyU)KltZC%
zmn*bKe;uKJl;??Ue51PZz5H{H=CBewIQkAB;yvIBocG}?lW!p6&l&J~3ZGFdCBo?#
z{CCG|a60mZ$S+VSy=+Ut0vlj1JK@J2<a>s4uSh@Jrr=MdxDj}%ABy5e1^WqO5xy@j
z;al&dSHR2Mz~YxKKqsoA?5)=6Dkg@G$#Z9IV9uqYtqVh1PC9QbeXsX=2mOXJK{_dZ
z(fcg6F0({>ByGw+es<VKJZz(`)CTgjNAIPx39p)4`I&j9jmaG$e*=&EPs5|Wc`Y7K
z#r}m$hz(oqwf>{*$Y_)FpLAP6z8UDYoXc>3a76NDi_cg0Pd{6dIa+)2yDpUe;A4NG
zyE?Whw2L%<>OY#p*Y~ad&7R*@)+x$sLi3?{nH@7zen1=Wh*wSxNAg$sQFECO`35y_
z=!eLr8OxRCPI^6gNa(}6rZFmO^n6a3+vs@bTMv0P<|wbG#k~c8srb;oZFL+_AwQz>
z5+4Vj!tKerp`8%vDT?#T@9?!(#Ao*H)ZRq#S6~#~I+1Si#yJ<!xTF8O_Du6d%KvwL
zYwX);b1Z+!+jw5Kv4Z;tE~&6W^|H*jsa(7{+57<4{N7}8tG%23G)wG`>Sb-uShDT!
z$aC<qw~I%r>;Zf_6GyO@k0fpPk!JhKk&J!yNSpoHk*p0Svo@Zb3i8Jf23wCG3Wkn9
z8w?+x3AP-6Ir#kXqro2@|Ht6|+GD|8$LG*~)f=`yn8c1q9uMo~k5}4MU9#;d!3O|?
zNphaTcR`RZM7|O%3G!Fx*h|DiX53|&r^B(#vEs&L^Zljq+{ycAGUc(DJ#aH)-&jR^
z>g(08udT;lP)<)cPChIBbM2eWZ?R;Ezd88f1NMKkbyQeG^KNVFimvV1=(>!QkvUd%
z2|58dJxB|i!Q~d>e+S8(uLPF|!Q~6!(qiNdCyxf3kN+~b6MSqwPF@u;oRi=2JcuQ$
zvF|sH`vmoZVDrf_m*JaXeYx=e`nJu;_2}%9mbMqI3VBcmJ<sIJd};=N!<5Nh`wu1A
zwVO3go#|BFQ}}%LBX|!GZ<(q^FQlzq<S>|9kIihhek35rGYAeqgF6ea22;J#S>pDw
z%+=r~*QR{G7cxOGh;4euiYEC@vNPD@cMSWCqNm}2mrCxZoxyx6ISOok2>!8PJu%8%
z$dNzH!#v$ed)a%1vSXB0+2`{YQdU9PQOaJSYytI_QAU2U_an-VQsz?ce9GdKy-eAU
zD66F&ixOM%W$y*bUZ$*$dJ8FwQ8q)_3zW^_d8yr*Kf-g8_cN3Q!OPh3cf#+#iLdkX
z$kL~aQG4ISANcvaYu_pgjs?6Ij8!}f{shm*f~p3i%qW`y7e5Yc@eDY7PuR~l@z2iK
zRQFtD&OF9l1^!;hfH|+e=e@DHcBkuQH-h&$jPuT(SAqmNyK~s<awkKXztyFUA5nIU
zKO#(9Ss&nSOa3jCJNR&q@octmYnA2mXHzD>?osN#Lb+l)3v6pXo$Z6}?!y0ke>j(k
zY<H}(uO-%yT@cgz1@>|=vF3fT%1!B5!<yfXsjVvehhk#m`(u@BR>T@M{u%zHEsXWY
z#YErASmnm%SVP~|*zu4q?qb|ODjsFre~;hmD0>|$yIW$3o^IM-PWvwxkIQe8>>_V(
zz16dyssgy;#4(XsCHfj<3}eujAJUg-Q$8~28{H|A(aBl5kBCTf7_cVe#DDZGo*-Vg
z0$DHp16?<B44*N2&xqBqPTea|^&LC$2l4jU?Q_~2vQ8{Gv98r(FVS}{-<avPrf$V@
zpR~qIW2~uL{_;+1beF{%@IQO*RrXVIkQ20hJh)@zY<tQ*&YtpW(L9s%OUllo?3a`+
zD3zU{Y%XOdDAOJq)e9&~P^SIp&#|7=x5~>rO=F4v4UB*jbQ_IDIiTaLjhVQ7)V~PU
z_ONeiBzj&OR@d0I4(pSfdENof9QRV0o%o*nYR#T3oZfx{{H5#sFdst=NRP+QlX*47
z*;@a^iOP20uV|O74Ne?r_5JZy<Pdv@HsH&=QSE|@4sdamA1A&`&Or&j^|W=9pRk!;
zhpXmXeaG<at1LdN%%SWb@ad`Day?*RKJdobz7<Q6v5Kqa+A1l@jS!auQ#(eMqRXgG
zjIwjX`Q9;dPN~eHtd=r|dQluzwpwmPHg%k`g{67{bgH@hd;EV1aHZViID4I>|7bpx
zOQF8V%?;@(!gVKoM*Q&S(cG2hpi^i0fd2v7+`r-i{FrJhmlWLh`@(IF&eyP;3bE4j
zS*2&E^gOTh94|dfrm4Q>6x%X{v8n{4_;G!*6I$I*e(n^s5$&N8P8LFEy27u+epOd6
z125(43z2{K)Vp7@X3hFuM;{j}_RJTG3ADI78Mkbw3g%e&@eTdAS2}M?-5Brsded$p
zoM-uUmCww1P`%76bTkJ#s%)437MysgRW`TpA81Xno;+lX@+uVrJRWTH&q59!57v6W
z<evGc{w4P(xTnwR6Wj;f!#k=2?$uvQ_C|x(V!*A<&xS)VoKEkv^-<*rDpnHMgPBMd
zeJGIJoZPH@H1-IxF48{S7g)EGKeZjbO}eIZPI3^5sYkh+_(bR@8JEr*>Zr*+Q-0O6
z@~sks{?~A?N#|+%$WDDP7|Z%{S)P|=xeF|UNqK%rWVdAcq0dw_zJ;8aOT+l;H>MAL
z#=+nF#yoNo{UAHbS1>g=+GN<T-Lz9Bof^HKd-B^mR!|Q<I}`7j#bZzZ-sk&K@X!YC
zGJ=bC!hHmsgLVAJ)rp0@6~yLPuUoRv-q`SdV6L`AqhXT~d*Xh)=^WrDKb|<S;{478
zK2CB-Wyg)(^GD|@_s<y%_g$ff2)AGUWp!dM-w4iAxm*w88+onokPgi`F997^w6`?h
zh@D+<e;YmDf}1==Ppi-o6V1<?9o^+QWB?^tn~CP9%%;XXr`Ex)z&35Z0$PlFxy}l!
zZ@bC%wQ$Y6XiY>Y>c#)j`%-mR;6Www2fbD%*CWrByFW;L<`lj8;C<sPyf=fZesHzP
zo(THz&8)#U(}QoO8=p-Uo1^TX?H(9yT2S)Omi-+^@uMtY??Ty!GKc%4_)um7=OTPk
zz2ssv%3dh`B=SjMH^VzSi<dhQ4^ys`WQS`mdV=eDeveIIW3vZ4&%9qs8|3BmI2Ez%
zlH;uH0`vQarL$fFXkT@SOW`YWF6zK4Jf;{0@fKoI=mOaum1CQt8%Z}CKu^lL%G;Y_
zk4>s>6S8<6vT$vFBRq6pA@cbrtOEPKi~h%3xrYYU7pwSoJ}_hVc<H1$eIIy7(_QGQ
zj;+4*L)ca6Le>P^I$#q_EO=nMmpIPbXloh1fT<d9`@`5^t9ut%$3(_<4iT@pPWLUz
zPvNWadvqVdMUG?r_D#e#I_SHD_>Fs6hJ7FK(95c9H9FqvVuF|i`CvuGW5n;+Lr!_e
z#2nkSM0HZz-{z3#hHs>UF|3_9LL*hStkGg?FOqL1O}_m;;yhDH2b__omh5uQqaExX
z^vWGU-v|Dt=^DmId^?z3r}Tb$k?jZD<J0Ja;Q8fzOLn8;MC_mb)Me6puvM6Y{rQ&U
zdgqtuOyr^E9m*F_COftB9gaQ2J_eujN>Xk21MAEAgnK<YP&eN_$5=epU?b!I9=I1=
zUnmNnE7?C}u_YI^+Cz<^2YkehG4hEP*s7tO!KF*E51fl^>N?~uIUTviDWq(QeBuSr
zKm+X@Cs)d2UA44LS_)aefc^PZb`$#Li;UyRTG2w4U8#HafK1wcXm?fV%&`T)Rb^K}
zLr<@e>{Bj43O$4US<uR0>i{^`UaeH~Cf2#jTy16?oB3uZ*PYDSCg$)-=3@tScG+jB
zgneH8+hA=kF+JMIHFjL$K>v3RKVwgp{8`Vld$E>2^giyT3fnA!->k*mL7C!V2hi{O
zYCZQx`aHl|-?xI;p8E`W2!1&B=cso@{ue=^NAGQ{lKI}&sCG0TYBP)9Oy861(o<#I
z8W&iOeH*>N)R}LBmw4n&oz@;>+Sd33Y*Kx@0DNgKyt*Ce&YO6?gSk5lo_2w!sh(6_
z4}7WfB%acICp>9QE#R+;d#y2xB`%7?UxYiYp$zXhO%r_efIILCt}ozQauA_~!Qp8B
zmo%<0t@X~l*Sy18>K>KcuT`Hb!tWE8CD=EmAbq_*2^Y>mhaKopS@(wc7xG%Ozh64L
zM*ArqLoWUzNHjvop`UeSTrnKSX@|!IL2F}Ad?4RT*>d7K!t)fq;(6@#YjSHXwI$<t
z?DcJNtDQ?q?{-2z@C#%`lJ$X~uWF8$&YEezZo1ph$KqZCyk`#j2z!Hj%(CDk;nmj-
zgu1<WWqn<}f|AVUx>m>P8BZtU9~kb5ug|ZEi!M0p0-Gg{Orfl}hCjVu&->IC&)LMa
zCHV#B+jrN;KUv(wpWbgQy}z~e{^=8b@2$N19({?=X>7;YgR{b}0l({pypc|)JI=nt
zcnAEH*be*?{*u9WSzCYf7E2%Pv!>nP;ppMGcl7&la=haeHg$f$*%lkY?Qke3rsB#m
z)3}$}^I?vF`ca!|3z~+nIPIw|z2rz=4nE%wK9`Xrn(cM1x?Q*>M-<z{@y>+X@e*#M
zejN0{=V~<G6WDku_a{ytIP;P_L;CLnSAtKu2V3n0>TO0Y+~RDE@5-k#jpUa;zl8f@
zCHbbJxzv_$Z|7wjz)`|J3BMi$_RYY)3xD(!^zdcn3a{>q?;mc-JnxA9b$=q{JG+d!
z;Qq^ev!A%cV5SAWFI?dFubE@dUAi&8Z@9khc}Hi4Y>Yp-M`ab_*GFfN2XS%|)`oDW
zjy~svy05#MwY7>rzA4;l-tK#yjf30RYmDx_`&x88-?=1`&rZ}&XKhQ}^<jBSSk9q&
zj3vF>Y_WW?!16}8T0kA)ig<soV9|V@U;4hD_UgBMQt*PGdT{r>J*uNN)!zBg_td}_
zi5p*wp7IgVOzR3ef&ALHXJh=8q15iZ4mtNV8{<EnIL5rb!nv*<`#Y!yt*@P^U_GSV
zTO8L`U!=8+{6fZc6}#d;8B)BfEB^e%BGxc`q>(b_BnNGG=5LO7LH7fq``(-5S~EG;
zL>Knqdb_psPWc?ShVM2*>j`LmEaD}6*D`q@vUO@n#7lO-iz<NUiekM#67u&~e<>Q+
zRFr;m>p#6#ztP-8akeP#{A9SdC5lC&YY`)Vf*ASZ)972o)gPTk-y*)UcN%?5u~GEL
zQ}O3=41EN>Z4G*xQ}U&04~b$c8`0f3+X9{K_2(98-^s{l%YHT=-M3)kbAN!|iq2+e
zoMG-pC3z&$>4eY6<?9|X`=7j{?P<l!r03nu7|MFyR_-G`Z<+MGTFxs8^}I{LgT5{6
zdC!#EIHl)Rqvut7-j-F!p$i)EGl2KF=h#?=eXF(Jc6fO5lg>KnnfQ{Y2JRS6?f!4^
z74|ed=l&%L^d{xEr0PC}AXwI@IQTNYi}u2eXBwItocg*?B5R%^FJxV7>gf0Q_6Nm{
zz=2HPb3$?odok5Kj?OX8x*gBdFm`?Kg*^9D$dFaotbObkR^G@?^ta8>#3SeiJBF%k
z1NTp%s|^&T8(dwI9lt^Ql4JU&Nw@_ETi{dD3)#QoRoJI%r6(MRzCAZ*E!3Cpc0Ab7
zn8Ulsx>_*@8x^a5NPf_C(szD?oQ!m{;e$6<^MXHxH4`5~k43)5fn|WT(MfK8U#;GQ
zb6_37R*4UhUw|&yxq`EZ@R^#U_*X4ubzF(TP0WRtut%U4fvA`tvBum4)rOK>RsT0b
z8t|Pp^esBB2PdwrUon??(VPiy4cH^XbL!~6IBS`*j#lhr-tPnV<C#?Qd-AEYHf(7C
z*WcTd0>8>-WKHJ<FMed~{*KlpeNk3y=Uec`oNpUG7AzjRA)aHbkA}IqsmXm#YVvzd
zn5V{l{bS!J&hVKU)j!TW)F;0mPc?tqQGT=dzx<QpJ>;w-H-COvYUEn_zJ6joZPstU
z#x`+HP5wTz<vRF77P)xe#3ueCx%jF4t?{+_)Z~8)-%Iw~8vlKKt(xQ2&}>L|PBq^N
zH=-TQ`&V=Z2=k6TLfkDI`m@nTWhXlOiDw;St~GAq_j%d3BgvEJx%@dXd&QHq-n4I(
z^$cJ5x1Uv`c`V10%KTx|r?IEu4^smp!_C-p%7G^T7klm-L3uyk3h3d6xHEK|HHnPR
z|5I=+YqQ=-?S9ay-@Oys8*^TXWvwRU<&R)18+pQGj-JW=KTmO`je~cGdl|ndxtm1S
zf#z30ODT61G9?%8&y~+%nD_O`#i9QpU#hD)B46CCFXYH|^lN}^dL!^?FJ!&ji%fAQ
z)K-0=6?w1?{@Z(6oatBZ^(*@<<fo`(+)<o)5FIdzN8E7hD7lf2w-UN;#g_PGX?^b7
zgdaBePJ_ScEcSk%h5AKqcUvDc^qmH5Le7y`h(Blnw(MA*xU?(0m=&Py?tGP9o%iY%
z#!~pdV#HkV?Jp*OG;j7k&LnsrGUdJb1$Ob)CHCB6_MlUL(bih-#ZMMk^8+bzkgII&
z11qeGb-Bg$*o&UZ-a+40TW7Ubl#hRbwQPm2(9RaxnXmg*YC~<+v#tbHw8wnz16B3{
z{BA=l`VjiI*5Q?0ucDnU?8wg0=Pi9x^~F1-XM+2QZv|OmOxf54Ho@8+_nr)O@Ui?U
zyHNhr4s5VN+8QkOku&)V{DFE8ZrgjALwqXjE4g;@*T?)m27KLd!?x{c<#_`94nd0(
z7a;370~JqqN9*5`r!TxipYW~n-s)4n_VV18=hD9=@<&Oh*F0;!Z^MR_jwYL5ekiRy
zwFNy)Pu=hi{8!1i{PtzvTe+=r&O$3~-X>W@du2H&Ir&}fX({E6e2aU@Lh%mt7x=@K
z%(ZyEWQ}ai&G_kN@Zvn3*@v%2XOQ5NX;nTm^+LNwvO)9E7xK@w#cQZ9n^Nzw+cNU&
z;5S8vd@N5aXQ&=K8C#V3e*t?vhitl%@As2qnX8TH=tXSI-PCy+z2}aSZu4~h0=voe
zl3py8Sr0uOfF2HzSEP1jkI4?k4!1b;w1M^x>K=M}F_d+~@T`!Yur;D~2guEnUw1v<
zb@F`|fAUl8XpQJg{)sC}bae&r$Va=QL|6NYc(w3_jhTo16(7|+mF+Wh-q5zvT%N@o
zs$c1Ek&f00T<ch41J)%y4t+o}P;G?19p?3M?6_{;EdZbTwkN&;yd{PV*(!fC&&BnW
z2`1$aYtQf7&}k?O&r{LdUdOzOCpSYc@~zI!#R%a+AIr?r$86JRlk_CfhjPN?dlb#I
zL5Io}Q~tnvN^~Q7QEt$0@|?ha)Hsy`D;!kXvWuD}Lx5bl!2XtM+e9vK3Z2RDC8gXO
zz<*XC*eZ)(^cLlLP#3>T4L(cwsf*7wjx8;}nuES2ox?${4uIeF<cbVt8t?~3xLF(O
z#fm9(#e2g0O76Q$_i^r5mhOAG!U(a?wa4qV`tAG@t{5x6=P~rx*XI`=Vh?MQJ*?$5
zcIbCUo4U!X79N_}vs%ag)Sp*YCkp%~g8F5tVq@;$whtRkah&%g^cxS4hx$<=UcI<F
zQOW#Z57c&pC!KGuy<YMg@BDk#XNG(=%H96XJo;R(?&a^`xhS7?k@|ld_J<FcIeVHs
zBRsF3;Q4;3Jo+Y~Z}R8bde$)aymw0N_~D*OaB-|UF@k+RNUp5l7W|TJspQW17Iei3
z{?3FCPke^&ed?(%AD?rRXaZRO7QQODbY6k_)!t9Rx{wT>Q_o%b3eMNs3B9m3!}ovu
zQgz}s+ETp}A#V;z<8}H#-|vhz9cK+m7Z6QK2Pp50l3pNP0gB3}cZ+utV_=Sz57Ui3
zxfK27UC3nVcgponqtnQ?tXJL>d7GMpl*^`l)45C6z)vp0FSoi;w4`!9lSe)D6V4@I
zZH2b0XeFYPUoFF<(I5#dIy-#i=5^j~&JGvvPPdicniW`&J+s#1rkl0@yqt6RT3@#K
z`3vFsoKDW*so5-k!fbPlXvw`vWcDw@GsfJ;7I3Wnx9RAL{UkWF2C6;X<0fkSr*M7k
zQ=GE)MDV1C4o?ECLu`9(?L2&Ls-v=g%1*$0lE_wKh@oDd%~XbMRNFo}&-S>`klLuX
zbt^6@t!wSwKi}>^51Yc)Iol(wWHloZ9D!}SG!4N4ckWOS=e(?S_#r-qo}RpRd3FQ-
z|EjkKjOU{^mvjA+i`nbueWg@S?+IO23xh4m4ty0pGDo~)HF@z@QZ~SuB0f|A|73lz
z*9QG@7kPa52ao+jb;8@yM8DS*DW8@<hIi9Ppg-PEbNGh+4fi_VGG>Kd!~aSDOK7e=
zxQ)L+{?Qq?rOu(>K7JbIOT#;8Q++K1M(H8YA39(1I>nRMKr77c8Es_c9lmb<KR((d
zKFqhoG9Dq8u@|~OmAm`@0u5Biegl{9g64!9ttZX5&TV^~tVZRAwePA8>Ei#C1|ZH7
z4P1+?4*jo<OUc0194ZznnhMB;sIxoloh<R1q;$&l<}4!;NWJ!C!gQ9p>Zg;~wn<Lv
zrX9^`JO1G|zPX(1A?P6uJ<O(~#xu~-Qzbeo(@p}~(O%KxcS00`DR4LF{&X6uIRgz{
z{2Cg11V77O{4B4}VHO<;&-!<|PMF+yDj$3VIgefd|CF5f?S1H~Wqt5U?njXCMR>S=
zhX~lOk#3^j0@B>+UUe_0p7e_%&o`7}43i;WPhKPbe$zij>p}P4i)vp(KlRVCh3%=0
zUyu1WJ<!nYk8jQN?|`?g&1d?@^9;iE(2?r1Yi)V=oY+~)6U&%gK>70Q)5Kh^jQQmI
zgz=Z|&+~jI4YzD1PewW+>u<#al3_-UO{!<i>U%n4%gGV@3AqTV?tSEq;ZH}uOl6<6
zu$^p`rPNLqrfAD)XFj%y+G%+Ji}(Tc`3gBl`c`rE<(V7tS5LXiGoAL=#P{plb|B-%
z7(*xUcQB5wyk}SNhYpz}CnvdCa~-F=*ax5AGK<e|*}(6S$mhrUUW31@2U*t5yliKF
zM(l~e$1m1TOmh=FppW%0z07DkNxplxKQOHGsYt1(-}TrqyV-|$U$M%*vM1AjBfM>&
zud_<hg&EV?n>trk{K&%xF~`ZCC%%X848MS1RDLslTx9q?!wj6O^bN<$^shzVxMx^<
z$aLN)&qJC1Pc<IoTv5-~PB3Q^wdj6Jt#3l@*YQk#Y)<DapqJOSa79<<-iR`+#g<xM
z3&2)OeenaGH5jK~^`*6;a@C9ak9*lr-^mTH?C*dU1)uc54!<9HrFMXav9AM`^?9A=
zC!Z*A0rLQ`u467vl>=*7uCsXbuGVhM*K-y`H0B%gs!QApx{(iX%#}Vq`SEu&^`gUz
zeyc*f44~uWdexT3q<%ze5uTV2)`VbMo?K0itM5u@N+lBvZ7^?khyP0ORIlt!>?8jt
zf#0Khwb5I`bEf~(L+9H=HNLwTS|fJD`3?p>>CC>r`dM}2*^Y7Gmd-f9{5;Y~{Rzzn
zV;({_<5yeTleABR+iOq4AD-_C{KBvBsy}EIoZV8)^sg@AN@KsfR~|CpKS{%%i*1Hq
zIo^LjxI$ytL~5oppJu*@WuY&P0n27!xsjX_f_?ncbEaSUf=}mfj?IMMGhSrulk~T<
zcoS`DzT@~zBp=c?)&?F{NS_uy6hBzmKTw<#^J^klKf+!-_RNKSU&R`K&c}DLhx{S%
z?VvlZg@!q!5Pa)=Mu+#rF@OubnmNoM^V7+sb2a$m{2==Y?<kwr`*$I)SN30<Pd`>*
zT+ii1V?l5(`nt||`8oc(bMfW;)JbOzoAc{?lrJT}5$p(EVQkM{+NbSUGjV72L+&no
z^((>sVP6G@a`eRevB7pvr|6e=)6z>nqxXErUKV(9R0q1MRlNl3m~)0g->L9Kj1=4G
z>*RPO`4vB%rLrF1Vs2<5bf{-+Smr&)UXJLQc;wImo<*loeZjg7+dgVn_xNHO$f+Fq
zZjf9|taDiNa4x!x=8s(Ka31Fp_t%-b+j2S9zv!@XNVGVGY@Ei%n1L4cUgOF1XOO!!
zL+=U4m30)i)_#mk|1w|+eI?!(!gaE2Vgut5?ujQiX)Mqpyz1|A&F~`0lmzoAJ}Ugb
zk8i5%`r;B`iS|uiz&!0^-V@%ooYue<&_d;qV1fpKd*e_9>-s$Ub?gz~w9aw(T%?1P
z-)Yb61n)Aulid=H!DS59LvA!TjA2<g2IA^NYx#Zw<7u|dwW_;(<Q8~(w#G*{NcnMK
ziZhNb&tZQjzU`u9Ri^(V#RWFCTI~ymW%$c$I>P7E!-D-TVCj1uEHy(v{;BBX6g~yZ
zJDGFA!v1hJPz}_+8ydNr{@%$|u+4<u6ddsgofEVY-lAL}`HG3(Gmr9jtQ*?Qe5*Z!
zm*x0gG@x~aFO$2khihw&EjwFl2)zfp;QrvVVcSV3Sz1G6VW4JlJ~Dl4J~Sq1u~uU$
z<C;AQ&NYm03*(zZKccbnJI)#PcT@g8-lwyIS+qv{9R5`Go<VYk*TXa93+XG0hj3rK
zo;EaQt#!eswVmmIj=AfF$KI2R*}dFfTl|1vZSF(g9LUL^km-LO-|RZtcz!}MM|iBY
zb>v%g`HL8b;8*_|LpSm!^yADLhxq+LU@gP`GWTy0+?-XT?_@Ky_g_=InEg14{}8M9
z@hjD;f4v6=Xre2`L6zNGTt<76z39myUk=A?pDrqwg?r>$CppKr)cVbwIvlRW+#9aN
zs;+VGRq1dgI0S=au;_t(7SPApVW02hs<TYk`5)4%ay%k@$fqC~o5gO?SO$js@#UaH
z0K+=?{O00{LG2y75&SAIWPRQb=X!k+J%xS5Pq2^p@o97w_7OiyeDD$CgL{b&K1>|o
zA#9%qv3(-nX8|3xYzq&5c%Ao{en$&CIGq*kp<{NNmEW%~y+6Ht<*f1;=OKumlK5v1
z&GOIe#vk)6ewl-uAvVPsVvli#*d%9+Wj?I9!cO$0!XD)yVl%*V9d8{tr#?CRJL2Rr
zyv}D+#aUolhdbD}Rs)Z^&UAK>>&b7kg)`NqQ*h>t^Y*`E9@zi-LDq-bn}L2rpLdnM
z6HO(dyLZsvB;RVUI(&rwl%x64g!13yBVrwLoMhD3Z<hL!@1-W}$LyPm8OL_95B)uf
z1+g8&vR9m!Bc0o9bzX2OjuWT;7W_1eLb%MD>DSmdF1fPB_BK^RAKQts2o~w}??RWC
z4@&L*Bfgm^-|(8e{3dEE-R$E#G3V76G|ni86FZvqbn4wJrFZ2vn@eq~E#|UDcvsHi
zx8LHn+l_AHa`NVs(}-H|PMsemyuphc=99B@_Hvfa!<?n_5NGK;$XPlO9nElt4j-NT
zcND$aX6e=US#CuYIyC!(+{|x{Hif=O?7R{ABGD7&tDWtOd<ndW?lkU6#;u0SdxK_p
zCx6%vxUOgJj&Mb;wqK}c>OadBpQZQLT={i8?{M_q`>WFRQ0e-e()F3r^;@Ou!P50W
z>AJsk-B-F!m99^eu8)_l|D|+&taN>}bjA19{xJ8G3t3;#40s`CaO!tjVGiio>_@vT
z-u@Ntp}p4oxtbqu9p@_g+@a@K-1}3m>v;YXJy*rOKQ2B05!aXFaqml9*{|k(k*mJD
zm#gaCqw?G0q0HB_U_#J@FzNoTS@&CJ-EW?CpPO}mTj~Bkag|Q<A4}KIauuAPDP2EZ
zx_*kQ;Q1t1`5J#u<%ziWJGy4$-X}`WALFX_ZYo`GEM3J9RQ}P@^|wpc50|dLRk{j?
zYq%E<uj5LVyVuM06<}J;ReeL<VOt+4U00T_SC_7^yzu>%r7P4KK6h|c-b|M3ZCo$s
z>O+U>^EbIypW-9TTf1WT8t>an*SB#MO<uxPbA2&a%}1K6+G^pdwnW1!XYr^V^0|2C
zeZ8(hyfwvD@%FdsJ@cr(mxk}wwd(%dS@%n3-Je~$ujVQ|E-GCYmag+l*X_`!c<0;T
zXK9!d{1Lty(F=kqq!&GlezjL3qUGp}ARbQsJ3XG3xqh^%mbS~j;W~JM@<*g!?p1z(
z?}zz4#Bb5bzcDSHqglEHxo&;WqZf7!qKEc``?wU73h*JTGdEmI4^HE6W=+k+6@NRO
z_w2n+v4I?Ye<QdR8SbKc2nXC3Z$=LkjYtQ(6}w-0$gS{R`B&8b<G_H=1@ygk&1(F!
z$A0>Fv-DXW>l8Zq6gsEIT<=#q(tQVfrWcBkPCNVerT>+^*T}KP{lHuD_ndu@`!YPb
zS9v8cY3#xk{glR^49EZ4vIr*``0>;%eq6YAv}q8Z#cuo@1^gJ>mD_`_V++2HgTVP1
zK8{Iz9Q@`=QGF6?^Q2pwy|*a8e~R;9B43AW1@ds2OP#-(-admYSznuGYW+ISSfZYA
z8|Aqd;-aY+$lvbAH?4NeuFWHB*b|(^&;Ll{JaE%Ba36D}{Lx1mr;rgT;vUFA<lL0A
znQyE3R_}~_nx7II=1j&FS!m*ioI@>{`3!UR2c<Y4=S=`Rx!bPe-5lyjYl}CabIXRV
zLDt^D`vrV^b}9F!i~Gk!kGpj?_Sh2r{>5SF;V(<^?^k%gz4U&5>Al*}npli)e?4vE
z<FD0sw^DvH&zu1U%ZU%AlhUOs+U-9+!Z|es=Q3b)Y)N~ltMGhj`219(;zD|VQS^M7
zzC9GqyKudDXn_@KYN6Z1jPqjF4>&9i{EOB@0y`A>N^DMcJA~!RmN0bKDd3sn`~uNc
z{p9y~)mt3kOwbDIFjvsw7-iA#oRb?tF4TSDehy#U3j0uJ(Uoa%inCbNp6u>=^6k{d
zz;5|Ra<kg_6m5LE)W+HP{G;DVmpp$Q-3OxJU$(fnRKAz;a{DS5ZAed3t_SB*g}=WJ
z?Ksae=Av?$lG0sf!r%ANHEQqF|JT^I!+mz&;f=Qa@Fx4uhx={xuy0>J+=HHB$M$ut
zw9$N(jT~|93+(Z|`$*F6Inr#~j%4iKBW-ry5q^0Ewc=0kas4qd&O&XseK`*x@J_`m
z3t`{tt^C{cWgR)YdYwn#uh91^^!*Bbze3-y(Dy5}hmY!xVz=E{r2iuQAE*E0^naZG
zkJJBg`ae$p$Lat0QO*drV;x=6w}G2^JoWE%elz>`h7YZZe)spYXZU^18&2Z?*Z<CW
zxyRG{>!T0NrFdF**xpWf#ZLH8S5f>&>nq~TGjZ|c&eCs+j=+cdN_<GZRqaa>?~t!m
ze%6h&S4Z38E#fEmnrp-}$dd|l**LQbzscAh>EpSh+EY*o{VyAmjw~OP^h)=3oxeD?
zrzPXs5$GkUvzUmD$zJd>S6Uyr2m0MxWM7SRV06+1$?U_*l_Ou8_T^U?Z~8dx`?SyZ
z@G1Sy=NPtyGXad@{v5{fI(uqU$>(2SoI3BHzosPPWnbJL#j2;-ld3Vt?WGm^O@L;N
zmvLu$Mw_zus%HOoc(^AHxD&v2b}3&%a$0+@9zDa{{vEo0G-uJ=(tfDB0|T-ml97r_
z2tL78j-N9&@()hIGxEVV{yk^m*np|)48IZk)W5O+)9I<5y&IyXDsbV__vJkQr!$PP
zcv>H#H`yl<y`9nn%CxKN>HU@aDtutH>6$Z)<?c7p&*|-FX?H2}rhb%j{M*c*Xw-q$
zq#w&y8o}LH(qW=?Qil2T_R8=cegA0F|2P9)HvBu_Ew?{H`+swW_CN4{q5TZ)|MeN#
zzwAx4kBn?jCBI~cRt_T9;pzCm9sD-%=Wq}2=`!JTd@9aZ9&=%3^!v@<Jp)|sn}F-r
z&0mJT4xgc)pP}bQ-~W2P{JQaw|26wJmJhuzk^%ai<t=CE?|=L|`zzzGuhiFnJVQTI
zZ=#=Hhrgp&k2c+XhJJRviGEJU-w5r_AUmY9Yg|$ON=II~D9W`eu$I$Fvk&uI#PTyO
zU>#F$T6qZiZVr5z%m(PNC$GBKP%o9N#@E>q)>qwAJgTg(pIY;WPUFW0Jnf-;jm|rg
zeIz;fN!pc;3m;(*QN%}L1RT*3ky+}a&t~)b@_yTLe7Er42O8S_-CG@-%Q~5|-#_cZ
z1|t@BG+oue{&V(2%<)pqcp+^5y^HLo#p&+8*m-s*XS~c9-`txbcB&XHzbo8;F^241
z2QSk(<~N0PR960Xo_(IOWcb@q<+3_^Z>**dy)l_bue?2^_f+!p=uuZU%%#6~SqtZx
zwlq}QUA4M*?Jqf-*5izbPc(2}R9V9MSSa75-~C1DWXN?;@Gb5YLz#E)p&)xLK0nHy
zMt`dy=jQKv%^J4KC#G-o`*M1IC0M>SmD~wv-UG*i2F{$=&HO!`_p`*Gv-4u-a(+df
z&5IqQ-uF+GekY0Y@O|6M<l;9yz*z&Fhf%-v<~i%|scZ=IA7269_2>=d->TveSow>4
z+x;C|M`E+e!4+faQMvv!7Q1MjH=jSwYvIg`Il$?oCra-eN1uPXww}FyKMl`OyCW}O
zaTFK7qiD8aWO?=}<2ND~3)gDzc%a`FA(l*g9&;<6*o-Zv_ovgF^pKIOMw^HM)~2&l
z=(jq*pWZ`%)j0myzu<2iziK5u`bdA0T_t^3bSIiq`={tF%CE{?wa)Vg@hL-VIx9uz
z%ZL8swyeN7`S0}gs5MxjxCby*65}C027Wcyg?JFK?~Q9ZOGbeEG_;uQO}9<a){gK@
zkhD8vzI}5A{VcZ2D#LuEKY1?Vt!uFRWsjakThdYEyeD^{mRNA1QtgLx!hW>m7GUk*
zY?CasvjJTHG1nc%diOcW4e}DB@k+PVASPMAl%3S4vR95aZD;)^(W&@5<9VE)e^GF~
z_V=E&FTIQp=|jQ=`!%+ebv5!;Ge@t8_Tgy1CVYi4{MSSlT{pO`l6<HGt?!;zE@*<i
zm)WI)7rT%##_!`>a%RP=;=71Bwd$(xPmSq~^(T!lJ8OJ>^q;{$@B(&V8@__zwk7RJ
z{0MdE@h&`6aCZZDGyVnf&+s>#wnGE{6nOpX%kXot&pC{NS8AUHzH2AJ`O30;j{>`V
z_nfx@sLSrtIjWp>?55bqwIDnnOy{aC1O8=0^~9z*_p3*HoLiD{_^scQF7&b9w8lH{
zCjXIfcNX9{;Td7t7o+pW0`{#c-Yq-%r?jp7LY3<*Fzt(z-&<`m2Juvfv6JKTD6!*5
zrWq6T{`%jw(!4<m;lJ|w;x|jcMU)SzHKrU%osU(XOLIChnXZz(gB{c*c>|8v3lpBn
z?c!TG%XW~Hy^nnVu5dq*^qll|Y~$@&3-|YA`kZ(FIKmlf@KB09DVH<HF2Cgze#730
zX4VMjiSxTt@~LH=x2ZmHk+44RxlUl?fTNDg#rP0zfOg@l?4zjg2DMj<x)-V(8r!ef
zMbexGo&`gBPo-e0ci-mBz%w*g<?lDLA0-WpI=dt_at(c+J*3}Us%QUW{m3os!4#}D
z>_5td?H9xLr*u|Euks@MLK`m1w-@Y!MLY*wvJM}D@08_fGUPvcr}GmcIe2=Vh)0#z
zS9u;rI^?h0oM*prUT5lQ&54GU%e@pojO4HONtM?LzT64rMc^HopdK)slI0?Ra{H&&
zZ|>xrdz>MXp}$J4UE1}l!u`6nvZou|F}}|2)LgL7O}~@alVuNs-u>?Xig=j(zv5x4
z!`@ofg0oA0UGcL8@^w+JdHVlK^YpWjhpFzVb0EJ_I+Ia#Sp#7kzlsn1y7BbA=huy=
z^1dX$b&svx!@lxxJn#G!<6$9%<9SPIJnRF@oDDq)UU1Gjb;ze!+iQsf8Hab}aqD>-
zH0~gmkc}%ur;=lP=CfZ2+yA8!F4WHP5)Ooy()o(yIz{UMoVUXNGd907L)~49R|`K2
z=zA%1UZ#ULntRPZ=hU#pCKvv;hn{8g#mNo8enux@Y|N=SabO(iQ9tcOyF^2mE9%8M
zQGGpA{|I~Z!tZQJR42|=-$w1xb}irV7u64Yqd(>IjMZ9|a%t7h9fk1OIr)4%e5QKo
z{m#-Ay0Y+mp9*A38fuE$pMtweyBHfIhE5a&bIBoY<o7A3NMNEXbitae>NTQ!WDCk=
zNmFk4f8WhFI-f*so^QL*2l-|V%%3?a|Kqp6V>QY0lj?1V>LH6$$pMqTSpHXM8)G_a
zFjaSRSVS&!Sht2Y-K63b$O-m5oos_L)t_f~tzZs0ODFP+X2@L#&r8SK6X(yYtI&|V
z(GKHJR>RCeb((di`jQ{7!7cBnh;KI&-*)-UtSVyKMojw{yuOVXcP92kkmUEW>i8Y4
zqwxNh;Ul(bSyz=Ux!wBfyTo(kU%n9<4gFupE6#}7k+df-`zU2SmzU(hc8g7tJD9Kw
zwkGgZlL@r7lHWP8M~Q^;N8VMXe$U7_cUyTQI>(eTqLb-&lK9<v+QLo%Ee>_Yc39sd
zUAF0wt{&EhZQR>s{d>E}iQTaRzj-h5cXR}Ie;A{2ym#?^uY5h>H-)aKexd6ZXGJ_{
z3395JcI0nUn_Yb8UcB<K+FVJUx{Kd`7#ZC~W@nf6jnQwROZ9Ez4*D&0{Wg6H&tD{7
zE;}X-jN9n*6r88}>@C%uLtXW!x~eCBcl;cF+mHQzAsoOuDV^)$4;&V}mtiY4U;M#S
zaBKn&>S&D7cy@F>RT>YxB|Mj3xWZpQv5D(S#{W_K>*aCo6XbjJ@C;6dbq<(tqdt3W
z$M72R4U!iT$7bK##|fI3@uu-+E*=VDnX;Wh+r`6&&8_y5jAx;_-U(nY(2in?1#)&2
z_j#*y-fB0>$0>~`dl6@wg>oSp*R$ld1?-ovvJV~($88>XZs^KhELx>b-_8)%dT$%Y
zyQXaH=W+Uc%nCo}+vzFWHN6a6K4$k%YkzZk_e_|}n=X+5P25d5(tKtwVvRKCn5Btu
z4C?p$;Izv2fYV0$YyzLVx^({Gkr1c%cV#X<01V$btUlG>Ux42#`|jbW-<{G!>35vG
z4)t3g7uIKQi7n}5Us8Dv)mFANhw8IP8{Nz!JU*dz%Jl?ePpRG>;95f+y*GP1u(d+l
z`mIgq1zvQX?QY6m+;gP+;#EiH!NWAhO{I09KBn-!9wbljv*76vXXXEhw$sV1jfZ#}
zLuV_Em*3sew|VF+qM`e{Ze}h-%O~rA6WcTy(xPp=A9{bV>z+~_`r-Gozsm1re}&)9
z-ZA}{jh%#duJ~qB{O@XbT9)79<$Sy5L`?Q$Cd_}{RhVm=o0S{?v+%d*Bi@T|{KCH^
ze)dt@x16|{dlU2uKe;Da;uSOSF!2}h487yGsFrNt+TxyL^^ZO0$QIK1(&(5=bWLSG
zgO0wB-^wADL_NjsJnX(YY{H-ZkXS4_q1LQyIlVuZwmtTo;48uW=l4;Xcg4@gUNzh4
zzn$OG5HDgZlEvty<Jb+_Pp$W3BRWe;a!oSrUxTZ({tM(rH*=ODa&cU3H?<_SH{7p1
z4_~_G6djP?c+Q4n;Y=5Ds`f2`j}<set@#<&@lC+D+<nr%$-REVipg>7AA1t1;&}Tt
zM#|#$QO4l_$4kKRTtR-54SXj%vxmIQNybZlX46V+vtFLfULMhJC08&$%6HT!?}VnZ
z39bE2e6xl+%d=hR2e!BmU%&M3MV!xm1G!BbOT1z|Z3zeU@QRx$n+sf<_+GJ2@iO9w
z{4UsY_*sBAnIm3dwx0KqUbg|A=Rk%tBx*MS+Z^($p|^>fxSwwaR?Ch-MxCd3Dwmy}
z;HtHmx#$4zbpDa{QK??m)%aAe9_^`IuYOiN+J}xRy>fflX6U(1VH+y1v;*v=$uZst
zF7%xq;a6qLlh-3}{nGPu;C~r#<c23ho9utH_x6ENRoCACo->md0qX!EM2mU?Cokqj
z1{!P7sACckTiZrN#a7!u5`@Z2glMDJTc-h(+L)yHQhOht+i3zwZA^kMsIAo$DALy3
z($-pfOPka;sI^L~t=a<T`F!`8fq;7JeeUn~*Y6iR&dfRc?7j9{Yp=c5+H0@v^{M~Z
zZniGHb272r+2+1gqDd(<n8G@<;<hJ(YoOz^yJ!?`hQV{%r=odT<3svKO!^0N{M$YU
z{+bJue@mT>#W_F8L;eL^HS|Ms#$@8%)sHE*ZR9y>W(_(&=c?@A7FMnX@;rjqns)eb
zRT8-zH$DA|qn|=vf?DX4Lk^nR_(F)e>tKH}^hnf^%b>%`B<f}N%HjTrzQTEode~<-
zSGf&nvonAHXDyBE%#;1KTyZl{q_xzD$>~rmV7AHX7*M<?_LtT~$$!P3xVhMX(Zc+D
z7LZ3^tV3?jxhk)*h0eix+jvi(vQ^PPhR{uh&_RaKL59##hR{)l&{2laQHIb-hR{i@
z%@QYWs~Y=Py6wonB=&wC_Wpb2*;oGkk-7F+!)#C6QNBN|u=$L@H$isMOrG^}_C^=6
zmlb>_%Yj$??BDF*r>L%Ap9ANjP4xD$HqDxT(Ij)Hx2f%p&J!qih<ri#d2DWT=+Psd
z);e^(?8(Xmd=-x<FAuV<6U8&?p}TX&caHYmD^}n%#jr4;zvkCOP?$S(Kf^qqD_cr1
z1my+KL~r8n0vVq656Q3fVMBgC&PKqW<jljS1Rp~mG;ci;tty}M*<%$A-m9toh44#z
z*Fo~GI7j?Mc@@DqbAl)Cu$R(dAEm=SpiK$0$RQVtLoODFTrAEOKjv`uuk)bqIy&D#
zbLXJh4o{*xSYKTS`&1>TD~P919=o?g-Tg1p*I?i9X8arLiz?V#D*IXcQm5*>>pJ_b
zy}P+c-+!RkhT^2vr}mkiBGqmFy&46hyWa)RAv4Z<arM6wCsW<Ek9gl_(HmpXW;V~>
zgoeiHk&e{=ujoMsLhJiO=0q><YVUqSY?|rmQH+w}q=rpTKXLZR)oq<Gn#X%y(!Aj|
z!h);sbQxD4Vq6t4Zi2bPStmOgnyia67PSx1m}<&Z$KJ6yCnJRukrUJ4fj!9Ex=>9{
z`OaZ{L3Xd?I_b{9(wPe^`L@jC{cqFf=jiJ$&Yrm}R1JT0-z}fdi_DwyQ|zHX+f5I-
zmh66poSpo}E@y1sS;$a{K0_b%n=<`2=A1ayB(WBHuCjW!#9hEVoxpe5;3X{F-IS?r
z*So48`-0eyhKeloM(ON1&<wng|6<s=QFMSF$ZFOZ)b_T{WBZO>Z~G};?@E<dy%WLP
ziJ=<2pgo<ZgzBThv+n1DqvJxgQPqzf&VKINV)gfgP`pn4zX_Z?gC4ruZ0KB0{t=IT
z2-zS}&&Dtx==>_-@c`v&Y<!sONDs&i)!6qBpi?Smi4d=M)-p$_-51UJI~?Ah$JxEl
zn1@))j*y?fcCO;!{F_gNA7-3+oVg)IGmTN5v(VkIx{O)SEf^*D1b0QMpKr5&TX?yh
zvg$wiaOaBNnfz8fjo#VM8JQLy?&<yg@T2NbE(_uIlEb*&-Wg{vxN^!E(*R#J#9sI7
z>C=MlkEiNKI<G@&!;ft?N3Ysa44HA(ciPydVr)34$A3UEzxeq1K6Dl3p>O4zA@O;5
z-6`<lo1yzU-wbISMGF<HH#5}Tv&H&2y6+xqW-<3T>!^3#@urb}WU$}GSyu{wFrI<O
zS$D`+j$~|&cz1Z8$@*qVyoNc;Owc{agy4PV3F4Sx>gYamK~imA1y0J54SN29Uz@WB
z-WUgbz(hOBn_{B-fipi(^)_^2M*_=&?osMLbQp=xG%bF{I)L!_mlQ2Thu2c~_S46N
z_1ARYZ7=|zr9DeW#_kI0d=~nOH}G*4Ux#nyMb4_IK$Zl)O=7s<6U9p^_p#2bg&**3
zN8pv!6{CpZ*L;gSu=_|x@JgTBuwxB+tIXiNS9lk(A5L)o4LGZ)M{sUW!Kr$G?Z@*3
zA03X0Z<XgqJaoFn$@+d13eHdlAAPJJy^B{$z*UM@ZTo4y6C9FX!k6UW{?OyrW)w_C
zDVX-9U^<C%f=g}Tqb6RphZwtn7V=rEZGf}1kd3e3V^Y6I(&pH{AD?RH4<q`%W(197
z$A1J}XF`frccBYFuf9*G%7|~t{X~1+cfZNFzdm(ex{dDX!Uq{+E=JBt-a6~r4#jhj
z^>+l%?Aa>hQg-0I@H(AEJq;RRE6mX+wzS@j>buH_FZ5mV5dUwKIgE2i*LS+iV>{T}
z;Ub$nXcd8HTxeIucL!Lsu2sw$m&&tmGKaa-o<XlUPkXx*XR3SD-^rXh#2h@tygJ0Z
zI>fv?#JoGi{5r(^I>h`s#2jq(qh=@Y>1%HWG7w!xgRJLHCv_esc@$&yWjj2}w_pT*
zYS+1$IwSKW%6^!u9=klIdtBmK&iU#+olp6cD*28ML{9$Td{&*K6Zo7)<{0{FFSZyl
zOKsAn*w+`ID>%x`*KJ%JgPuLo7o!h4eJ6tdK-Y4*B@2a9_9n5<MmcqC?i_T?AP3G7
zzxi-j>sW#Vjzwlw;{yrWQY@qDXMY<xD-y}T57yR8Trl*O?bntZ!!yCmC-dJhEH9nB
z&7S{i&>^$&rK3}$0|t4LcCmgL<Q8Zsn+&hVO7AUtW(>L4W5zu5%m&7H*el^IjN{nT
zA0sDhp4mo?f&Inr-d&tOFpjeMvCNR3>)9^<IPw*oHf@wSt^ChE`3iX7qn<1iCjI7K
z&oisqzl?pM^LgUL;GG9<xYw)tG)A@OMR~piLlx(0N8y*|sZ$DK<U%s$nl3zuU(GU~
zN6t2QGs#6SA1BXx3yOQR7n#g7Ym)4B>tda1LL8r`%8=KR^Dye80B>r+-7{mds><W)
z<K7C)m8fi*4EiY87NlTf{no;z+;Ug38AJJHIP1OaGt?u!^);Rs13x(#E{?HYk!LdT
z6KsIL*7S~}Zs8_B9uCEUP0!&~aI+YEAI8lD?cuIUu%~D$d#`Mnh4k;fF3$I44%M3S
z25d(I?$`9Pr?l%W&T~~c?Xzl~x&faAo=dZ#c$7&Jqr0$cWE~mQp?j)>^+gMpe%n1-
z(=$yauy;{MK(`*+-Ph%s@TDp*n7V*z3b|iZeiP-4+0<1+e-7Fl8Y;84GyJhkvuSE}
zf%c5+x9~l{Z{;YW{GHIEt0+#SU~xgnE6xaMAMAM3gdZYF^4lG;5Nq)V;lV2CulY@D
zy28^QY(K#zJdghk^EiL$JtrDR@G-ucVBI%5Vy#c*l#eEF#D1rEG5LE~>)VG<csKrE
z<)m@(3rFz_XX6)UCnWyjhy7vv!<wh6%-7h{gD(tOkso~?z3LKhsI~Ryb2YD55ktO@
zxZ7P*rx81xaQ<TDx^a+o5y@q|3hNlx9iz>HI_=@sz0q2?atVl{{$12tO3t4zgxp-|
zwBzabKKtI}b+1}IGU3#+UfL{u5j(QN)O1K6EaSYmN;4Dr!QK_q%^8I?efx;L*EnfJ
z;LCrddVZ3E2N~b-*-(8%_>%vb+$7{X(LB8%2YFMZvf0=Hg6sRda~$_xHw&gu4%T*%
zO*tL%%bY~6w|$B+-kEeB9Z|RPo}iyqu&+8tebn>*)bl9%Cu@t|*}$b|KR*0kPG6O&
zMt83+X5OhAMVab*&_cmMwmt8&{xacC_w^}z{Wx?0<s8k%M^HY%dPou-X!RQ8Lf9K%
zjyl=m@86-xUEqFlcZ?hw!n@%4%HejE3vVv-dXjU_rI$|N-Hn}7+(PGk{9+l{IEuB_
z`+BDLL!3K5h(8h^sm?78x2Ecn&y@S{pUwc=*dBM$SKaM!-s(F!V+T2ts8b*J`VHfL
z=GS^9Zlm*(pTN(v5#9>=o=@Ma%)}1iX7ynh-R{2-PcEJi{a;7U$QQu8d56|NSf84!
zbMM6uhP|wkk>Z6ia%5MUI&g~Z$=a^?LhEdsUt^sOAC`DWIv4kxD=ojo&CkJ^#>zhB
z-8Rp!L#IWrVV^EOk34*_qqM(`cPi+k_J8J+|G12IUL>~;I*9b6a23x=AG_Rq)C`YP
zKL%5Eo}TK@A1t2Vk{)8|DE(3I%fArdS$nPJlbK+B1nyxxI354+FGb$oS@<F96g{T6
zXC9`LXfl#c`YnAentDHjcSN6bTTycg^5RkaOQKg(ieBpv(<>8uNVs^}|KeeKy$HS3
zW|2u+evHEFx0(gx7Nd)*9@o@V5YG@@#_u-b8r1&??N-@*5O-KT=r>bW7VhRs^JSVR
zU$!|~5!>J!-Ep038mX(z&h5w!_-|!l5C<`>@I3Uc2(*^m_$_jy$}E^;jN9ErTWYfj
zzHm)##Tl$is$5ErbpOZUHk^(tkW0#U#Aa`B$++NqHnh;#N|%=m7~~y2Pt!~1n#dQH
zhF|Aaru*>7i24usm)LP7yG8jOwP#o3O#Kj@e6w=8-rJOVM{_)FtPARO*6qS4nASn|
z<1b|2@#$skb5MWOSIgJM$#8+}T>NjfrW%~ZZT~A7Plh#n+N?8?>R6eX1x^Rw1ewT_
zt#88DQH>AasAYDk)%w@7s+YB|lZmAe-2?sE{oBYgWz0J&Q<*9Q94}YUmh>?``-J<u
zQ~eRYX`JfbS5x;ih9$e1XYl(yf#2^@{C->T`#pl+?_vCY58?NFaELjFwTD2zjivT&
zsy>}BRBC2gz6{P$S&jT2jAHZ3&%#)3J94(rMLJt3J2+ct_GHc$%06R)aLoBag?Up#
z%JrU~x5yNdtKG}HnplqdsLr1`;IHBgn<jgf&_TZE@?B>L9pXE4v^_hBb7jz-r2Di{
zeg{0Xwd@tv1Bihl9#cB)R^VzvS5XcN?Ey(})>vF?7T!DdoSIc#feZ_DQQ><(`nAC~
zL=0QMV#gx*w%9w}#aQT4JqP@5_z2yDbvD(h`8^%Olh#|Kz@c~!;!6(4IW2MJ>l`%y
zhCZxwR7BUXVLC94)ZN`BfB4-z)7oBIx6<>sH0O3Du@4u=%GcJL7_n+?ab_2jIZgBa
zIJ1@hUQO)JV3fMpgOUZ0Kh5`Uat}6;hi`+IOIxh^7vKxE{Xf9{1KdBJ`_fOd`BZt$
z7sP#mN1f%9U7-5LnwMc$#UfnYei3pYLK)>=9L;^^JbdC;x6k7K818e1R{`T^tn#$)
zN4|1agI8x>w)|J_4x0;Uhcy-a5LsSu?$>C~<4h6tgT1BGa?t^%%v&6aYP@hZLJ)^3
zxL$3SJd2oDXk)MK)0A|d79~PDL#Mnx&beC~SOW<9#F<>Y*WIo@M$qdG@1nPIuLt<|
z9`0krT^P!&D+v|2w?X|swV#@fy>OR?GCA+6z`eypXrG)N^u4D&;w}kgF5)~e_jc(2
z3UP$1EFL26=R=wGoC)T(v(_Ql+wkf4fFJcaPM@<27|<6-<}IXud%fSM@RK=PZ7&XG
znpFXwitEwgzTVljc}CHd=w;%`vG9drm4e)!8RTi-4E>|i#pC(K4^krFAK9}b`G<UR
z%nyy0$Mt>?=k(s^?5G|6rQ>(fyqrAw-Xg_<1#wP6e466)9w3HV{H*wve9jID;v6@l
zcN`t#Bv~Pukq;gv7e>mBkupQ)IUPQa?7xs18r$z9H|it<!q`)J$OQ0@t-Y#i0^d3N
zO8N=sUNyn*ZSX={*Kx?Nkuu`|?F*lh4YbjP+{lrvNXw11%n+O-WkwhBq8{5djj!fO
zjC16S*2ia~v$JMn_bTDj^y|>^5AT1(uoGVPPo>{x1LttDw)LfT=uHjY7fn;y-?63g
ziyO^S_CD)uuGR2_%HPPmh#V@@xnNAv^oMvv-ut^<%c^ZV!6fXwsPfaKbHRImWBql)
zThOagHtU*B(ep3<9Iu>pqvqHK@+)R~GoWWK^P}>Rux@1YP3ie}+0)?R@7CO+ym|O9
z<|-dxc_MDW*SH|Akk~1!!^NE<>d8;UuuDvLgn3dn(vN->@UimtErMUP_5{w@6ZH^l
zB@ePzvUvzR1%8xc?4@J*G5X<qi}q1xd2vF#=YInqE%-y{+Ax%$U*bdYB(Os}H=K^U
zwaon<{4F`HdInDl)}peAK@xqHhe5tQ^irZ4#zxvrCUUvDOm(ltFQRq=J~)QokwMjC
zGtk<kcel~vs&>h@NO3pko%C3K(mJ8mtPht%_RF^#!AGDq#RBYRa)tE<yl4K)vO0%J
zXON66&yT}@&G2XI2>#r4;=S<eBmO*W$~t&*HaxkO{wK_n<SKg<UflxEDqlBiOI^$t
z_auqG7{sngq;glb(W!+;*%dB!1-X}*XW0)*KaR>>3H}_*r<_~Mca@R8sI|26{l=6d
z>18)5R;-S=i+RLd#8|(L@y_YYWnuG&aq3LO46}CsR^e&nrY?U>^}JPBfW1+OtzvDX
z`uj)3Qf#rY6zt8zr=+;*`=IeA)+oQ_pB)ju1bYzIv$jP{)LR_=Qo9tN;V#J_>{RJu
z1A3--B<W_0s82CL`fKf}-4zb_nfl<hO~}>z;N6YH`))w~m7vRgv^KEUR=1%cvktYD
z7pw1-|5Nc7swR_jEM@yf%pg-%fEUFsm+wz-?#uJJ>RX=~yu3Ua$1Y#hIp#~Zl3&`G
zyei@v+<M~fltW+RKeI4DK8t+_;Sko?mk=ux^5bowysOrOhx5aUS@f}1xVRG?HQeCN
z8VM(H3fKjrM=C~&9CP|@s_-u`?x9}WA$)dUp{@L6n-kQ1+?UY2+vDu-$e(>&Xk`1w
zoVLc)5~;-XYrhzun*0<I>ZwkszVvtYUf4Lv>!??KB#zGFWsm<zVg9B^X?Sq_6wY+X
z-}Iyt0Y-SNVkC@smb}T#$;wlQOmAbSA-GtD{SblwYT?BQ@?Y{?&vk*fD0qtpXJn4D
zdXj75%QIP_aoi7lVj19ZW+FbDJ?XQ52xU&YD;uBKo8;U2%J}0><J|8$<hzq+A|c>5
z<6QiU<g7QA|B|&q%$WEuSzDPQKDpoL93QB4|IoIH6HH-(^GLvha4bI7+RnVGbM}m}
zWi(cLG6#@vidhQkd^F&{)(2~k?0XJ)%+&L&`O#GT(1W!3VC^c)oA)CR?}r!9gcqmR
z)+Eq4h@C<XO}DfKR<#ktzX2;SUdMYu44mGB=dC@WG1WbyPd&9^+b7{r^tyjY@_o*8
z!FZU=*hhZ#>VC+`SJKjlY+*dvHfoVE<QaN`JVTF?XK2e1a)>$LVdj8`m;)YU4%kfW
zd>~J|QuBcJ!RHr0ZlV)5u*S2hJ$se(LFI_&Or*AMbh+Vh&?cnfFVNqQ%*Vqyiq|HG
z1oH*@ytyg0Cv2E8Rmxcs==JPn3S_?ea%!qC#P8a^i0618oV>R`@7VcCbBX4ZX4<{`
zefFParrI!^F{M3XcD}-h4|J%b=acuVKT7>Sd7t`U`(;3n|4ID=<L@o%eV_WD`)|~L
ztZkGBZi>NC9rc$d66mqR>?0aBv+>U+TeAz0M|0896N*(Oz95_-`M|FeunQ&gWasey
z&}wKk1{+QGH=o2lWwNdyAA#(jctmAjjB)r7k@3Nvw?O|5@Ec3<*L&fY_a+RCQ!bFT
zodXu8M4k2$Wtg=&%3CG5BHPejv){e9Nc)P$QbzmV&~X_jxAdN%cM#4Av!j^UEaX#z
zCw^O%!eu(1B%5;LxnQqbwfDNUrx$kpvwcM{vi(cPlMIh-@NQ}g@>Qpw>2nZ$Acj7W
z#~iPiol0ntj?v+KyY{pmJ2)2ltW9V=+4_|$%|l)~MnwJYeO>;JdK({dpT2XpA1vIV
zvtCNE<pUeexm)Z0$D1j0kZi2~>DdBoU)gthR@>!U|H|a)tQ$dh?PUn}O$G=0zKZ$s
zOXytL!J78n?dY`Su5lhDhed*Q7vk#XY8^~v71K=qFK{RQxQ0Cd_4ZjYZ32t^o`PkZ
z<|M(wT2u^p`=onOj!)Im;019SVdkA{d;gJ&{l~VlXNsir=q{npS}O#9b`J?SW&Z!?
z=g$v-|M&=fOlRj6LkkyL%!U@=nS7KF`tfKmK9mPGkhL3p@ylE2qKe_tdc&C(Pc^+2
zoLk9SAM)0@J58fXbB8DTR0F5Rh~jw8NzqB=;^3BgnKOweOyPC+?x5}uBinVK*t^^)
z_COAo@a{3bG$zM0z667w>Avn=s%OLtF^}12YNHI*nX%ISSPF;QKOvtTd}8-cXfK6w
zO$xX4{qQ>MgcNRdPqqU1VqSQ6-sCzvhF9Hr>=@Sm%CsEb|Dk(}#vwB#J7mM1pm{cX
zA#p>4b#c=WV||t!NweUaC_K={Uds4f$z$xtt}^!cFn;rtd)G0y;G>ykf_LicIM;}|
zXH|RDbhS@Oz|QQy$WJsI#<(*T{x2aG!?AOE&w(ikvPcl@p?XEbTc9B?m`|nV7~KcH
z4<!H7_DYm~X}t$uS^JgH_IU7*4YUV6iVf>v-8hFNZ-Tn(!MWzIqvsaEaO`|JaQwYR
zdC)Z*Uc7e~bz)!e{e9=Zk@8(~Asbm-%)8pJ&`e!pfbB0<=k9$=IaJ}r&e`at$ZTx2
zjh#<iaGd!Oy2p2rmAq$t6oG8U9~wmuF+H_*j*oWp9a|xq;Q#DHW*lXY7)RLpWv#6B
z8`_kQhcmXzzQf!SVLtecxfSXgv&CEuC9}LPKK1*-)ctI7qh^~2pykKN@$zwUy=>Yu
zrSf*O?dmN2lDCGYu!kgJmSBx1#?ps9o6K-t$c*vgW@)Uo^*B@195y-iOH6L%B9qhn
z(@<{SVpHCl2#u~k-V{_m9U9fjDG7c@)9A{jrnLT<kng|V<TdXMmDhKMy!tPP%9%q7
znx6@cn$7d(51E4a(;@uf_^Z0x>+p${M@NNLBHN}$XNRWpeQI54s5I_`rgC2W3hPFY
zeKgq1SuDNy9?284^8hiejmWzu>At0v-R6nH2)y|M=fX4+H$H6pk1wOK6Tg~pq5V49
z>?M5SGIm5VM1B9`O}c-+`3m3nmK`c`Olw}YX-(O#1;jx4{spwr*jPIId2}l;R66@M
z^9Fiyd0hM^IJO<2&R%?bp7uXW&K@`=%-+Oss7SQpPv^%RI4|4W2+xueHg;p2^;qE4
zK4A5ufHhwEU8A<H?ey_zJ**^eeW(iDs4n45`n~Y>kiQ^DcoptAgU!NFUR)Xyj!NS^
zNWmjG%i|fLG+e*o{C2gg_D8n$6gkM%#*eJuZtH>H`SSbWJ2$oPOwAs$C-32G9C&BD
z?YE&0&Z{|KVWO^xS#Qsd`6=%Uo~iN0q0+i)XgDg=<%cp<xAMhLrT>D_(hZylKF+kI
zd^mI)?+P}RwRZD7GB$CKaTf}54IRPFa(_4~{uFPv4vtRo=jTn%;O<bqyXr81<~Cmg
zk7kAOr8kLBM_2wws1#ndJev1;{Ho&7uY}5JtAKGZY97ytyS|)u3+k?>+=jAd_85r9
zw{lN-z1!DbTG62v9`0!`q`fFPwYqpdn#@=Ft7rUnrN*!1##%cEZZ4ACxCi;6d~U|{
zzEydg^!EqeikiN+JY-3p>3=K1T=^0*1)ouo?vabR==c0CXAM!l)4&&HoY)U$6urT^
zTRr=#A4cX(QW-aHsGr=YPax9*8AIDc)H#&2^U2Zj=7Yl7mHpmue)kwSA5FnotN1e4
z4d4ZC!H8Z`DVTQvGtc`4^XtgQ|1QiH!Kwen!1Le;JPUU&coUv?T09#^xX1P?+La~Q
z+54989pJSOnce@^WB7#z@C$9iZ<NGubPqbp8v4<No+8|<?3Zl6T*swf=wfAC7~gRl
zbJbY(Lwu3~hkfSW1K8>M{(a<*!|&eI??HaY%;Q6f7m%N_5}Ihv)*M!6`gMku&1*5w
z^bM5{8sxFo;JKIRH05vinM02vpSqAOn<7qY(lG^HKX(`-PWjtUIpvA1*!>Boe0JO^
zpEr!7<h+lBOkUBU{u9iBuZ_i2|B$(H=ZW~CI3dprk1u^J(<zND3xW3#d5DRdAx<1P
zGSKDA2ma=?njeoXjeUwS7r<8@bDZ*lZBA)o7x3gdz^}7rSeI}^S!OV!we<va-tprF
zZ$b0JPQlJAoS!ikZe%YLa`z0Cd&eI?QRkfzgNxtscyG4ZMEu&fIu9&6o_*7Qvi_Y~
zp2_!}X^t!4^!5Uc!$s`-%R^slG(G*k{~_<d7e1tB%#C%K=D_E&2(ZdDH_pytjDMc_
z#?Y4?u>+sWKrRkbhCPkwMmJVwm;%->3W{H|>qDi{a>`{FyoMH9Ug?GwncjZz<vp<@
z4_MyD?-b{Z&iidHlS4OW+V;ewdPZzA>mBt*_gfcn)pPdPnGw_4oMl?)MNC2L8Dz%C
z3JNM;1Aq14Xb>Ibo9K>7+T3(Tx*pX*`}p7u?cd+;hquLy<9J2PhbFQ$roDFc@Ln_i
zy;l5t^{MeP#ri*xzKn7B{_q%whlk+dA$XX3J?IwQwea!~yo@Y(5T9-!1Eg#0LJoX|
z^C3i6$u!X!4ba=`FNj7tW5a_E(t9<A3yD*eKX;gN9x(hTFblQ<ca7Q2I=x^t&eleA
zfO$A?mhocj*I}Jg^MKCwQyksT{2E(tS|+IebiJByBnvE(`Co$Z+&p4D*N+&_t*P<6
zC^eo<<lW=>Yv4y?IxRQvkbFVbrpN8a7`N(MFm{{DW)TY|Ii(nHjo(`IwnEOAo6ETM
zu)p!oco(PEg0D~M5(`;p5g%9L51ofEXf}9?nf3U2`i7J<p)~J)&Xys5h<+V972ZI{
zR9s-I3xDAI)_s*x%vM?+{0nw>KnM1*RAv8G&ktOU-Z0ORZy?9_Pb(;Bon@vj>M#X6
zvqDn`?-!4UO4oM4<1;6ew%(4<m6#^l(|kF#_yqRL#E~^_I1NKV^eZ8&e*nW?^ccb8
zhj+qv%Cj0CYa-iX!c7dGBVU^@`FtxrRnZ3A<JUUEZ_oh$)&TR0){~FSDL?jSPEfx}
zV;yFvKL}?TsKy=^;1X{YVmGMXYpHj%>mX}BSiQey{U^<Hg3&nJ0-lR5gy&Wn$(!=Z
z3vAsk>)TgQzsh~k`eU4QrSg@0exJIEiNO}^$MU0i&t)#r{1Wh^%iK1={4!9~9C|lD
zz5yH~`SEqZ#eC?(Kg7(IVbfb%G~maEGS-xG>X~oElVz57kMtppbB*Bu@BcmccA0m>
z_v2&Wd-}ftU*!K`_+sw?U(Ye{ed9gglRxRb@V6&bHq8V7Q~Y)L@5bN190T7M-UB|(
zukQul!yf>?LFD1qiJHg4tQiG<-%3W5_^%kgGt7(o58Yd&b<qfNMRFWl-Rf30KP$Rt
z+TYE4Lng}HV7hCm3x7^vFUJ|fT6e{-NZby4G!hQ^liOG~Sw)Oq1UVHkZ(=jEr`10<
z5k<ZjC&ap>{A*|9YkHA=14XW5ZY++PI6kJFM4ibkUZZkmlpA(NC3=kNN0;&?ALS$c
z6=RI}ivD=jf;~E)V0KjlHip(Hj^txBjAQA}L0_Np6|-XKD{E2x*sxYUeGWKuuE__n
ztyRD9nZ~2)CWfOZjZf)@$%FS=eJ=yrNKbT$WkXlMchWud#0A-ANuZCjo|N5`!(8#?
zd13mqvGXzJNH1@ZDc~HYkeOYfeYqa6jjjxbgm>Xv<5sv99O=J*22V5v&+n;A@G$QT
z`6pymflFZ6ThRzSf<rKzH8E@yZz7l#5mR7ePiiVgvxD^!`LBTKSXlm9`&|bDe0)FE
ze$>jX2zvq>Q+h)qYsLxU#<Z_YJQ(qEc&0I#M_KYRMKrIurm>j4Z1#RJbLEZj=@k4(
z%*#VXXgg$qh_zNmOs?B#a^aDjyr;qC0y8?g25a4U7u@fKzcd|-t&AS<cm3nuqSI(I
zf-Fz-uymIj%~)Uycv)j5+iZr<jB^n<O7nCnex@ndr(+ls;%o8uvAjKnxXd(vs}AwE
zcw6(^<H9%mmBx4476UeXKm)7=9X)UA9gSVRb3gA2t`GXIa3OnIbqFT)P58_aF7w!x
z4Q!*`3^O_}13hGQqnGHCju0+oEEnX33CvW#d*mxWtWO5=;k{u^<6fWI|A9H+<;Q+)
z>i)jNlW#7U*bSfd$0*L6zqkGB#=mP_m}mF4ZEH8kl(^mjKE<L;MJLeM5S{U}^NhUk
z&^}%Ey~?Rx{S7moqba#KQeNaCBPB0(y%WfbwczGiczBGt4}0R>dCP*@^#8U!^5ayU
z69!j%8_z8uzVA%NHsjjQT8-abJif6PKWfxDkm>0hzN%B%k<C3~*1S@;#!v>1-`E>M
zCzd}+acQM7?N1v-k5jDPefW74Th~pfSSITSw?sn+R(q;P^%Z~*$$NZ>y~y{&Wd)sh
z#Nx_y_u^NM9+(8$sK?_S>}&K1@W?avz#J~8_tJm=Oui=H4)C=bdH*W-ilPUmWvl8=
zuPdeN17Ga}&>-#eSKc$p>)GI6cCvD!DL+~r^(qINa-*g5qDAoQbLP{Y%g}l9$UDs}
z=gl`YR%evmz+R?kLG%vdfU&tY$(MFlyEE8ba;4U0<J~29=su<W@T%#uoruqk`sY1T
z=!e=CmgdbhTE8y8XC-)H?LXJSj#=P<GxV(t@}-P7H^QDb692CA$_iMPd!k^x`Odf;
z^PQ8%o2oL#%FT~VFCcaWA5f$0HpRC{hRR3F0A;;vnAj1+Z!YZTDl(rdUK;$@h7z0u
z1fL!F+Bj3y%dRrye^rj;*cSGvKeAA{)36B|l|Rkf)Z>5?>%aCkbvu%s%I8wRy1UBg
zUcsgZ8P^XY*B@c-W*<AWu<HYnw&^>uW7S7O84mY*D|2el_e@Xq`8QAS4xF87swy%q
zUlZ5bSde!$w!Hea4c~+MHEe#O_wthTow#uNCHqW$a|V%338dJjOU)NdcgdN;{aX4=
zzVl}3tHt%iNF|(e`TcXrzF5-P#eK;oeJ?KtM+3C6sowlf&(|i2xvDKw|E3}@JhH`j
z(5fJMiM2Ni5|_~^aEHUwPiBvUABrqA5r>#S^_BgbPGn)J<k+SO_&*XRs4vrdV&+(A
z7=?!9QK`x_Pq6w@5OwfL?`<sIbOt%o)ZZ6G^V5Sq51Oy0`mBC-@LhdZd!@zHueysj
zn|&&?HVF^jf_wniX7!$`Ns4o7Xgrs84qcFGyx2DIwl_A(`sFwE7UbPxPQwm-@|=iy
z>?B};2c5x8PyS!Uu}Wq<HaUW9Sin3p2)6I*4e?xK>(F`FjmrNJA2il(<ek#W1?C<6
zw2Dd2Hk*2xZ}7nmhnZ&&u%Dds*j|V}c`|LWzesI`2KRaev4uu$Nahs8w$iTS={?Da
z;N6XUKU%H`Ztd4PFka^-Zakp!9`7oTnBI|Wi%?JSy&D-d@^4kUV-}W8!j}}_X(PX%
zMn@P%Zf1EkskMo7h~d>*#e~%F58Iet`OsFiD+ZUmRp3KwS`pjM=;$ijNGbAHUszYn
zDJ_1<ut&iD7Ow{I*kZ`qZB{nOFD*E<Hmc{NQvO-3E2ZzrXPeD_C+N|xGc})Q?^;Rh
zWqf6Wwr+5M54;WE_pN(M-L2T!3HFR{*t5r<l~d~KOyB#61xiHqU1Lo=AGEa!oT=?2
zzXeaaUBU8Of17P1f*)CX3-z9K<n-TYySA4=elREIE!5g_o_t;g-pGw^M^9=px#Z@P
zuB6ywy|3}B=xg~Fw6>Sat~_F8ZEW&?RbLK%56#^<vF+AR5v&oU>SNcKtq)&@?yJ6>
z;`M;3T!Etb#<H`)m--N4e4b%8(z4bbH(ENL3_qz)%KgyhuPLsCZf(RgB*^1aLVU{2
zW+5XpgYrM%`)cnz)~WN+9re!5#K>$tk@=W7JY;djU;)`n==b1Mhi49Zp{pxA*4+!h
zX90Z`4w#o}^{#9Xjq7w-z58F4PgppbywQ0Z;e+`RwOtLae@B0{PUAz{SA|RJJb`EW
zEtm>`M`iW>MV<@3DeiW1<J?j_Q8YyUY2L}iR}sN?=KE_r#WjkqrQo!He6}~6_2^8i
zEI%ap9ydMSXjbJ=Md^PAe762@8^BU2*{pWn;`2OW(bZqkBWhOdc|UrPd(P4!eWs%5
z;T%{~JOg@2pD~eu9zJ+T0Phs&;fGgyH=Bk=!GF_K;J|;RJ%svwBe)S>&N>PDpdVG0
zOUK;M2mvf?Y5X66R>4@v^s1mi)da^JI8$>`b))7Y(J%Bib2#^P&x4-}@C<saNgttU
zHwUQ-uBJwvi7guWSrO05X6PY!^!oridIC6hQ1=GrxrJtE1Wjf@le`f$$%Q640Zkf3
zlf(#`_|W0_6irNMJ#F_iiY6N4XPrblXV8}-@zjn+(Z{2$?X)HOXb<bnW&;E~^5;aI
zD(S4I?h539Y^0~GJ~WE+47K*{M0JigF&}l>L(cvf^4=U^&xA22vWITkMBNMY*Fawo
zue&2`%24#gD#e1e?3;m|jPVVeYA+PctkN@|{j}2k<Fz}O2L}8($lyiC&9HfSmnpw#
zLb)B$kto~p(u|@dnyaZp^R8l|4R&78M%+A>HKXXS%0a_8*S&#JGm84{o}KlbNa%IM
zLlFPDU~VWHq3uZ3=ou!v`JC0>o=P)jZR!*LaP;h+)NdLvs;iQ=&!uhsPV4yL=%gy)
zEB15wVb<Gtk!zljUAzIjg{z7$U(n0_A>o*NL*C`J%v0;zN28AmXZRbCukoBGh*1bd
zGpf8_kBubH+2CP)qJKU$^n2h^d(o7wF1(Ix8#~J8@Rd9dV9+_$Nzuc9hC1tpfY;6N
z^!*@ZF4FIt$)!dA82`@L8D`8T`dPtq`S;Y0?gy}?_ZGO8p6bJX=oY)Yw%uUgsPEad
z6QM6^JBDtx?}Y$ADm$Axi+_(VWKL~+TE`FY#hDtEFXr6}-nsNYMPnQHWcOTT6GJ9^
z3r2JTKk~;JMVFxW=bg9O<2OE{^uCHCab-v2B&c6FQ2pnm>KC5XuPo|UKUKflxrq8d
zk*Z(!N5*WtU%h46Zg=ew+|s|^zuq(7r(WTMy=(Xy0z3*A!ijA4>!1nx41TnYqJ`OQ
zX%jd9N=(1_UHwP5aCnzk=zorbJl?;4XMkhnX%r69eHX2JU!76Z1e^o#!Lj|{!uZ%i
z&J@voB+UiuPH?bqM?i1cec2=GRh@Ozxt}_D&)Npjck%8KI#ofZtDX+<Nmg(>HqtPv
zu5+j>``mZKcPxFxN22>Ev&Qn|ki{kAH5E6d{;B@~jRU^c?_>KN^jBkP5Mm6fZ@zft
z9(d)KDH)IjoFn@zKKd@tih)!2O^P<^_p$tMb$B;v(&JzfG&+Y^u=Ku)a%7O`TTDH&
z4@BqV&NA7ub;HP&*v}ihY;w0to>JC?qgmYB>(#ftz}ReRuRwPrKXG(z+dIs?J?)dw
zBTLb{Gl{`^=1cFi`=$*|Y(Y{nk&@Sx=~Z2lHNvUnH8`<jTrdT^`IO%d%{xcXTzf!9
z(&-oUKSBSG;53*E23{v8YxEIvXC;jrCGU7LVX~u}eLJs213b@;K84lzq+c0*)Q?5C
z_<2#za5sraH2R>=nkhDh_M5T>9gTXj^Fq;67{3#lKXQ?0nI-sYm`4&eHg0q@)4AwR
zzb^U}@Cbjz*O8wE%?AD#ytjkPIPxTFl9|js_MLnF_)g(xQ{_vdI+Gl`j<PYziS{mh
z*vfO^Nb}^^sblooOTgFlx%tYMofzk!ljRB)`ob7>9r`mwe}?GK5d9yb??d!!h&~O`
z{~=E8vty$!3SHqd)qNH9>eK4Y+)4AIcyQxcW{h}pG`uIBJrjRKT2`iI*-5~d4a}Oa
z))Chb)O9pJCZVy)voFCfdwmA7cmqD@jlT40jUTPG#qnp4JoD&)?fVAns}gMW@Z$eX
zJ+GwdQTu{%aSFy@j0C)qhfgLH9gk0${aftC4Cc8(x*}dN<{&s?Y!I^&capE&Q1~Eq
zDi$(qY9iY6;PZSGK7Zvpm;dpvzMCuFu;a<fPUwK2gZjaLdY%h>Nt(M7;HUWV>h{^-
zhYS3u-Gr$FNAti<J-8tbz;7mwztwyjSzXIH3dY1zW2O?=G-fia-)%$xoyfP-7~j}v
z=vEpt=tPWh;eMlq{fHl&wk%I1!0-QCuw=duEUQwmq-o=%Xd`)`u^?U)AC{hN#?--M
zgZvhZ@}Cu7esO!c|MqMF#<+ZI!h`lS$q!fFH3%&S&>5nN<Ml5>o&;mI-gyVP!dP`O
z7^6HxeopCl+i#AljDAx$^6<U$`^OK<SY*aMngas95nPJrRh#0Q_Op-h%_a09;F<I7
z80p}dct&eZ;v4aic!zx`@J{^*-g)==0+P$=ajNmjnId-1xSlp(TJv6WMa&PzDfm2U
zuK1tgbkhi&uGXCT9ynE*4}w$auo?@Bb*q}wkXV%B?>KZ7o-4t#r7v`Cg`UmkNyf&b
zjFBzub$f)d^Dw^F&Hh5>B8{Oiev19f#Twh$=dUc3-Y-90A3C$-G=9`b`Tn>OPiamp
zPa5+D_HLjzw=16{w80yFsi$Yxa=+Y-JMyWf%jYMabgtq4By`R&Iof0!NLR}*e%Si@
ziqQr0*%yfIz}Z1@DAUau?uuXEQIsG3tocY4tYT`C?Tpua_tL-z85<1GvU>(t%LJ}{
zJd>_G)50~gU3KVu^n7w(81q86e&^$pWOy^b#K-x5H}@K`JrYQW_0-!%xm8L0=;RS=
zHjd3#w}9WA4Uari{VG#V{rL$TwA@d(J890$_9ETqd44R{(fz79)m`}6W6EuyaXW~e
z^*8bkM6C|F!P-WAACm5}k?}11YZo+l!sgLg-wEA@pxY3%9fEd4(2lr~M~0x?5Of}b
z#*DqqjJ+dr=>&Wn=jKJsS@`kfyYNp~9jnAQm$s2LKWOd5r`%Z|ri}HIR9DDHr1b=?
z4ak;Gmm7x1B-^JXkPPrtC_1i+3Z_f$=fPLkLYMrt5$6X%J_Xv079Q|Jna}RKqLAly
zu02+k%U0?l_s_ggpvTN6w~u(Wjyylo8|p((`X+fw#S+dmU03^7VVt}_aq^s2k~7|k
z=2XSV8?V@Tm$T5NZ!98DP%&qt=W$+o<>hT1%8zD!ztF&#?Hzd&t{{OeJXy?Xl9rF8
zqlBy62{(B6b6;i9Dab7lHwRPCr@}Xe+!y4*ts^x~A&JPcPv>4>*E;L;ojE>7<?vOk
zdm~kD3*`jE&!M?!sqYEkVHJzmR3m-Hd6F{CjFT%R5BQzl%cj^V$vAR>THdJm(~P29
z;S0TI_E)oa{IgNR`PR&(uy2^0S~bxY)+^^xp8REH=hKHez7s=-y;wgtkK6<yaIpI2
zE4&|)oAO@xYo5jkZQh9;u3Q1cdwU0e0S-bv<X2)Xn0+4mfKT}q@Xtjxo`1n_V;b7+
zxCfRSH0CI;cUAwhFJ0lSp?(IBv11V1MKXh!S8oAj_lw`Do6jL^e8%P0-Zkf#?1)*|
z`ytM%v@oIT>72^{1Qx-jvnwN}4jNP=FXH$LC-;rx9b=|-=u`a;>@Vqv#^{|7vzMSe
zG3?+A`v&uZxwr}$pX!&^F5X5z_zd^-tWjlvQLw$MEbANl&<E0G)BP5{&Pw&2y3iGv
zcj*&lS@*B@63n~m=O8%7KhIjRVh=X-&t<*6j&=7d&3&EdC!O<%WlRt=*kZoTT6|Bx
z%la*2xc}@QD^GZ`zX=%g-Ah=HiklYEGsP3)f$`?E_*=qN`zGJuE#-U;@kWbc6M;?b
z3MQ>psNY4@CtW}=i5GRo%?8=r^#59mON|50{-chvy;pdjhlawX>L1*9gZE>84+GmU
za!%!1=*Pe-S9s?$*5yAFY<eae?ul*4K5{k+cIvn1?2xM=SMA>7Pt0YE+89>G_7LNK
zh_ODzxF2F{4>7KX7}MlmCXZl<Jc6M>o;8zaMeny-nB&g6)Yuw8CJ7$FDY+VF?#n*E
z+LI4s*OUg&9Xq3FHnK@F#m2c%)<t${pO@BU<jbnMyr#F3c~E(ozm<t?$h;ZUmtpJF
zI7c1zcAlp_#xAnn>DzVQ22XOGHL7rgyz2E6W)$6@H8xT~U6LKGI-5CMGhIBJU@R*a
zli^H}QLIS`P6MvW_Rc7Z9>%l$Z{)V)-bZxLg>Ko^(@UVYajL1u>!@aK(z~vyp3XRk
zz6w63ZD(&%NWP*I@$;+)7vrlcsN=vt#zvmmyRy)hcd2t!FeWvpibj_}BkegEBYMjJ
z2@fbYwA#@-5i_mO{R2J+U?G>nNA=Du-cfnIXU{WE!Jc_8C#eI|L|_8P@Ow?yGVn#-
zlAy1lIn(hCT7QxH9SUc7yI-DB^aL=<Z=v=CgZixgzrlUO-@j<g@;8tAMFX{g?6h^R
zeqlz@ul^pCL*7l7tW^FU51ml_5RX=~FV<o2S~c^N=3J+${hewL_U<!ofIr>abTGKb
z9&}sB>)311SMx@N=0DLoI-(BFuIW(S@=x0Osbg-cEzw1A#Q9Vm$|I@w^_zWYz%T*2
zI~~AO5vNb~*`yl^v(1FQUoiIw=e72JLB|-A1MS9Fy*=s?^rHgK=~ldH!m;Z_(Xmx!
z)Y~<BM&Z{LU+x;`Amd)Y%g6<$GFjx!kS=YabA+?pv^*&I5#ty+z?iW9DaH%B!z1Vp
z52HK0d!Jq%^Rw3Kql~lRlwP^Zj-7<r$=K1jqMxySjIrH}D<&iSLS5~TF`wyd?Fa0h
zE_;rewe5}Jd>iO3e=@6f9nVghQS`X&d!{!Po-wAno47OZUlY^bR&Y;VXL4@EdA7eH
zb}no671Vtze6ROqU(aCf)mW4*2=BFj4;(7q;UmDJc@??KKG<=d_*d_YBFFj2@+w<Q
zy^@!LEgE0#Ri9_F<<nx@T1Oo^U<vCA^esni3qIv6urUF=W5Br`Gw5#P7!$?3uix7b
z&M10Pwi+^{f%>3^xgrJkm}6j=01V{hWB*)cM^Ik?i(t5#I`=~}`;0l??AKXNH94kU
z`N1OW<4mBlA})Z{1;&e*r?+iYU&RYy?^=~j!MxOtAJv^vH4iuofh!T;;MJi&gz9ac
z-Y706?;?Inub86GXc&Hx4<k|)r@Z=RlHrP}dNvrYIA5Q@b+K|tTYMCBgu>`T8KP&z
z;zr}$gf_%RN1M!(j9bl1tj5`AoJY_3({VHK%8a5182jW0WM4)1kYvtj^h0u?G=)FO
zJgry0Vfz=*zcNMt35M7Y%LCQz9|0!iJ)SPuQhh%?)%O|HwU)l`0Z+o;pyi7ISA`>R
zHTf7^CBYLJDlE+MGyM)&S)1;dX<^eD+JojMJKsk-_5z=4GJhxhj~!9x@u@mDrFca3
zJY(fuMn}4j!tWr@<*Q8VgX#nF1-*~F^p*!B$cT)NAAVmpL}o`0-%ZkiH+mQ^3&>k7
zdv$ULvPV&JIWO`~H)TZ+-A4w+&~sT|OcDp69D9+Ddx2dsZ)3QykNS7mIikB?busqI
zdG;V@uWaV*m0(WZk8EIl8@)1+-&z|N4dtWEHnZCG%p=FH?g#f~9<#>4Jd3YTwnSi`
ziid-FIq)H&8G+kkWDAoZ{auhFKZA*q9~^j}1IKyv8=OqydEb8EpKT(Alem8n`2y4T
zN#3##t&H_=@}*0zhdUx&ml*jB7&3jnKc~>^s&OJ+(;Yq6K5d;#2Y#S+W0%Tv-_~PT
zt7P00hp~!Rl?yn`{cuM~^jh;P_M=Nqq5l(~c&+vSyWlJmo$N%+SnwOBEuE|Wko6;E
zQbs<lz{Z+`Y>|&^I4mE<uD8BdM6ToZIP2qi*@0bDpS8Y!wpnf0kBYO&g_`}OAA^6R
z+2ljbCLd}x`B1YS_V;IzGd1f$e>iKizdMT@OIh9h&kl}_EXnHWALU@zFppAK=k@2A
zG2qVAcYW%&^cMYg)4$gSzsW`1I}sak=89_OmFisL_K@FEudA-wD+G_4cZbi%&ziW{
zOyk)V=wGjds&fnV{gP^LZ)kFEx=qdVFNNYcBimh)^$<RUID3N^IK!!D${(!!HzyDm
zRgNhx_-t+*V9JVaCI+ZFhE7=*<&2(m-S!=K&^f`7x42j|+yL(<l?#l$O>+w8ne|Dn
zITL&1z2$!)NA|AXC$6gS75~v(-#j-xT^D`{uMylS$4dtG)OSMhX!;rJ_udwM>kKlj
z@yrYL6g6gT=*)K)z!z<_QB5AXnK`;QFZ5&)`AnQoU|zAOC)}8IA9Kmm&PLu3rC=9M
z)W4lsJ-+hV@k#EmE#dru=fbmiZ(gVx3~cY_+|R;;{<h0}fBU+6+uoz}@vXvn8EwgV
z<iRhA{#E&6fb+i2v(z5=i`;ff1@Ux+`aaKjv?zc7A@c`4iw$F6W_W6IFl(c4>A%)E
zYMbB0m|ej5dA{r>_0t_R+Rrkw>|<H?`6}y}+G3SIo;iqn@b=dBka-b1SmS4FZ+`U8
z&}tewOl`6xI>q^;9VgG1-K>5&Hcz=H{Xt`6KKFEfkMMDuV07c)b8lBk`~nju_e4qj
zMe}9uk9POjm^0-(E~)GxkJs?r{K}V{ha(x@y=$`2xwiKw*i%K`!~XKw2{W$l2P-aG
zlTlG#PfnWF3qtvIGeh~6-wv0fH|N*=h<iUZ;|71QqP%&SG5N8AG3NDx{P@R1j|hfE
z>{mlC@8>(wAP*Qb<Bm*o+Qj^wW8kUwf}8SZ6eZXrm%sDZD60kR2Lq;^J)AM@QsyQ4
zep*4qJizsnf|BA3&8vR0&Y0u_-&ft(#wt%Pov$h<M*i$?(ao~kRWF|pl+5lSM#H@{
zfA&jG{=7e0IOOAaPVaKAwDSK=SyW3u_kwSoHP(xrQRYMzZ3ro+v+qApFr|JoI6VFV
zBDsP(>)Xtq{ltU_a1lpGd|y_T>=W@~!j+$BZ^grr-xcM%wcx2bq;n7qIlj@$h&!mJ
zjhWOp6Fk&E(1@%kiEek6YCjr0A{)Fu9Gs<cw)V(J@GIEy!Co)UV+_th>rRR{4*E4Y
z`rVo}&_6G<L1P5jGtg;sU%{&nM@B=-F%^uV{)^V+RgnL`s)g^$V^R|RW%xPxJU@Dh
zQywB#Hfs|(-7>v-8P#3m@;=@?E?V21KYNMEuWKcTX4oMYlapUJ%4udi=jTlckD>49
zBCka2s5u^)e>?t>jE-{j=roUuzmr*;{7qTk@&~f+_Y+y)_Sa_h`dwL%*|Bm@*5j7{
z#rxuW$_`O>h_XYJ9ir?IWrsdSJCsGX3wP_mGd8$+fO#c@c_q@PdBl_`j%P!Nd-~mx
zeOps|i91vK<d{<;%vq6+Da0p5ithvW4)e$cFB89<r+c?GwttE?5{n|X?(#*0q5R@c
zz#ALdOYotRFAsl7UqSY5%i58q9aD<8hf3V-q5RgDLTm8za<4C+yp37WZtC7}yV`L=
zwPjyqJU2_maQ~+KYR}rRQHMMh)$NS=GQ~#l0=zeTStNS7DSvF3SW15Ly~KUPk-Zz|
ze6(K83y;;B3FI5jcR%Ws6yIU4MkYh^I}!uACck(?cpmsj6d!ND*N6Ms^P5k1`0QOo
z`)hbVe_#vkNKQ}VA_mtlAjtDS`pO3qv{mh701L92ybmT+AMP&N%sYy+Dsg||T*Nc+
zZ6Ke!!}CI`IWw&rKA+hIA1Cz;zUo9?&(*zoq4hoa?)tF!ah_@GO1R2bw?14SUV~iQ
z;PKg;aCLU%bA^JBXJDbN_p9VhReWU@ZHLV7ifk;Mk>9zd7hBT%2WN)l6aTa*tEcm6
z!N<5zPSHikYK^;e8woT#wUbXAp*c(AQgU=>dqHIuG<~{P?U%ThvEG=NEB)kn@;sMB
z?{>y99+>Mp6G_Yh#$`Tn$-qTeYE3MRFV_Xe40IFnL-l%m*ZeUI9K~i!uRaekpX>7-
zKL5dmj$!RX^o${NkRkMpA@qzP^o$|&j3M-lA@qzP^o$|&j6iqEW<3tQWf!)h{3=?D
zlkO&e%jZ}#kk6%x*lpLWYA>VQB=o}BmOkW;gm)$}9!kjVjSoI2-`#9v<6>i@_bLZX
zV9(F37VZYsw`3*b!Z|mBI?D-c?BSb>986SZnf%Hu>e$Qv`WIRIh){>d5WW-UA;r-j
zqMvF@^Gk-^qvK#FU4XwL&iY4IpYq&z==J$|HI96p$V89deZE<M%{LqkqX$0c*G2^^
zW7F2>*>;>ha=}MElWlc9`3KaN;=U_PxC6bZBkmG`dTQ7dA#<fia<8uteUs;XG0G@M
zpw|0k!>g~lFWg8rX^sCW^aOl~zSi{RYvB7(5&I*UO8QiO6mzWJ1!o;)^!p_4sSW7B
z{*eb+Pu<LVYKmUynp(%|+RU*)=<vnRr|X+zE8G<AirkFDYo)8P-$q3}@EXJ!M1dg>
zA8IA^JwrJ(!6nbAdm}o4_T}n~4CViu*(-SP3*~ShU2|6NO~Ay#^u2a%W$m@B176Gb
zz|XC@fA_c<MQ1piM;WSx_j@{}=T3Q&Gb~Lb=j{YKtig{Yokcp|Prp_}zWIi-TvHG3
zB2^jl17BeBmemzzYeR+N(d?YS9t*V-H?_Un|3(Z1<4*Ns2j#E_pjZCIdVIR_i3%TD
z_x?8JC}cD~=&KzQG4y(H1wI2jYF$%nBhi$9Bs+ya*)&z~xYkBg_l5Eo^QZ5kC*`5X
zv2iYeJ*9QZF}zzmTK3daeg=L7<P~<5;$XDCtNr@bWk<Jr#CEdwR3c%11FqG+_A)DO
zpde)fig(m@#6(%YHM!4%WBry~5?r!Pu)*xO)*6lcKf(!fl$Z7cH9{x(fHcn4-aguq
z4~U#~Me-5dM?6p-XWIquMP%bUyIIHh;@e{*%b2g90ftI=Wtq`AWr2TT99w!67Xd$G
zXLF_rYlm@cz6{Fmj&JamAqQ6fR6bgpA1UV(oOSb4WVp_QMvp9$f0H_aHBvPk5BxB)
zqo0IFh5IqorFuV!ue5^P65>^l^3n4*crpCARh(I={e|q?D~g+M6_uI$i)zicp>21+
z%e_D2Kg;90)+0y4TzNjWS&D~UcvIsghjj{_m*k(iI>tS8m(}EAo7@-YUX;&TKJ)kl
z-p)q&OlLZ#apmG)mrrEgYcq=GfG>m`x`Edb_{dguaZbft<?ym={#J+V={n>usMFk`
zIu4wQF9qMA`mA!gC!V7Z*!b8s&`#&ToePbGOX1`RctCBu`V-a)zz6;<^p7bWqJ<x-
z_Ntjjc0eD=<-pg_AYTLeh1-{%^5v-C>My_hrqU<%S^A6G=L}8j=TV<drcYYO5p49k
zL$C-A`~-bvzz8ji^P#0lI2D3HzCZ2f5N=i1vy9C@{*^Ukt4|el*tI6?*9wc%+Ct`B
z<Y_m)>S~K;^cG7C{D~I-PtnI5z6<w^g}D{<F~)_S+qa!Q#>_bIUENo~r<ZE;z$y3x
z!D%t;H`&D13ZL@NxMuPp_zvHfeDf!E=$@WU;`<irlK)S?<qu5zbJG2mERY{e{XZXH
zsc@is=UTt1$GqhNhue1?%dm`1D?85QncjJYx<xPG#z*ZQqTC_ycPNj`<)Y8%wv&;=
z)rI08aDmP_S^jK%DU<u?Kfc4sefz0L{m19Z?^QO>f%?aLp5PUogd>f`k^R$e!8+c;
zii`~KCLFdi56)Gd8`YD>M;gx~>rlICJcIL&XME*rtM168zZLL}>i-ApfRuw45zd&9
z-h+%pmqFePy`Nty9e)>3#orlZX%{lAJ|&}Fe8Tfa$gV}mu2%SeDe^H7o)RtN8be|6
zNrW*#{t;wK1?zP&*6TDj>lyR%tB=9|#yo-?>FHdObs9EB7Ji_Q6_BxrIr!V~N>9Jb
zGvfD{7sDO3_<*(6CmR5NTQu#PKbQMm)M@#f_<%RyZ?aB#z%~TjtoaA>xH&c7pxfX(
z+ss<kSR3EG`emJ;;yM@eo}GjEUQC%!@LPT#$#=>#=V-h;RlCNe)=2oi{a~;TqWgo~
z&rX#|j;%)baX7=%F!vvs58gfRB#<=0dVu0>PoiI%cOu}Y?t790+D{h7r*O2d{$%JV
zSti_S-cjG}cwrz2Ud=<b$f{s2(pU@TA^F9>iF~;Sd<Fe__nbw}OwMIa+POUKmz4cr
z;~A`6TxHJ<laEq(v^Yy7ur*e<pAv0qelwI5&e(h2ZBAJ`)Bd)+%v=h1j1O|Wb0$zR
zXPgSJBk?2Or^Z2go=&$Zyh$Hay`sJJ<nKqKRfF*RqbElTANy0Z%3T%xXt1_`pFI-s
zB<lv=lq?VOd26j2d16fHIM19CK?r1dqw>}eH=2yb<6#~&6c^S-L!;w0q1}=jdCG6|
z`Iz>j6vms`&pS%{+PpVXxw`_JbX)JM{+E&EJ5u;OLTim1*;DgUW2fFcN$l<^tQimk
z%Df*k6ImbF;$O+xJH%!XKRSqBs~ADeJ&N%{GJ#*Mw-O_3^#zT$i8Cc<AM#70b2*<^
z>w3g!gzhYq{#8bt!k6hY^P8jf?EL5oBOhJ?xzov)o;<<0b0j;CH($I=pOZ~;jxp2w
zn9mt|)trfZIpw<h^d3IEu9M7V$c^cJhw%5R{1|kPB;y^nhK`YrQnwacAYtP&sJ}~f
z`~%$aysr>A-$ZYa3=iZtXV<VEFTHk`zaW>fj~~pXJ^f8b&Z37}K2|?w6kSd~$l+F)
z-!+FlMRCf+yEUejcNttVu2};orUx7jfj`#cSOdpT4DQe|HC~U5`xit{^f>X6cxcv4
z{I>Y;rN?UTo#ci5o03P^FSOM}U)I+dQ=b&SiVro0lK%+!(2YFlm+xl{AQJeQ-wr>F
zPd>-n7f$=+lV*1~Wy?kI!$<HpNANdC9`W~wAM%I8oBdd1hhG_a+K)$e`m-ZH^y?x&
z@>hbhd66Ge*PYD8HSGt<!y-FaKB8D;D>~M8;+KuNH=OAW5SxIn5ZPG0?&0v({(SO%
zNw-yepU%L-hF+JU^*QD-?J03MyN8@mj(+Q0S6df0l8Y@T|Im8cJ_~u1Yl`P+osYdu
zNy?H(z6g75O|LN*cA<+*Af}D6(?tCZoH@9vS7o$zeaK%}r|;4&WHY90`K~{v&WsQ0
z+}2-p`K65SB>AJqd;4iq{Hr+Shl!KZIXbLYd-?3ag%8*1oL$9^m}%pKy#n-|9CqH6
zeck8^$?!n<xBbLjhnIqj@_}SnZTy5ft1iF1oijq5Z&0T(zp{34K4;GB{3raI{C<9&
zgAbUq=aE73k*q9y!>`Y^ZGoFV3NG}$35+k!)+zc8zm2Kw8f$KePO|;2?K;4m$~h$+
zuJKC7n*_YFt)F#%=Cs;m#4P}4c0UYrRbWFKVu_RwHi!FB_CRaQ?Pb14Z|?Yut$$np
zCe{E3pr!gDepOt!e9#rF&)L1t(CaK{bsqT@%gJGMj`<MhogEKt$9PL;3Fgt>HRe7`
z2l8TgS>}HBjn#4%-)dqgR+TBHNwJMfY}p+Z+2&h0yZlu=YhtY@Ik$YE-hA48c`h1j
z#fg+bu2H5B9Bd=bpB%6Q^^V?UUL(oiOJf-*_#ZTGmUsQbAD*D!%0;hF{9T+waVz>v
zLwnHPHOXvqd+OPzy5eT<#UZmKiI2;^7nE6&1YfpH`n>}7YmYHsKKvej+lv(gm6du=
z-#Hh(y#U{t_Kyp0*1UQ-JCn8>fo&_iUdv}SbIbPrJe~=DJrloXo8{g@`_2v6CimNR
zn)n^%`SIW<+w3eVbjb@>?1o1dzZlXpc#nQ&Tt3PAhwo`eC%L_#I3uiQj2p&E-dEWt
zI8k^A#>Y&2m&rQ$&0hBJvu)_Ro}u5>Wty!}duCTxYOLt@smNOB5bL7Oh?!{5vO*7t
zs?Kpd6R+-t?{|iGpvz>S+duBT`4`1N)_PX2M`o5=Ik13nEIho_@l(nVhPU}#L%fHr
z`a&Q3CZdYFi7+0Fd9j1@+vcJxcIlqzUbgycosWgL_3yHMi}(I-KKb2w6?`4gzLBxe
zX8Q!*+dbCqE@#|49Ntcy;`t`-tv7}Ezzf}4W6zjaTi_I|^&G8(L63IfAY>LK7(3{w
ztAVu^xw0UEUjiRRE&Ld<@K0o}mb_Ry=?ZTlwmrE|+J6Q-YtffR+q0b)K;svg-xzb?
zg!8r9^Cmy;J%zoN?sw3S1--Nx)qCK8n3H<?T+^%H<;07Wqo@popC(^e+_~yGWJ_FQ
zF-%N&&0N{cFIgOjuj=b052UkuuE#o3BI@N$;auqYsQMqsikhy!a>gTP4!4In^Uh;m
z{0V&Oxs7*%FQ+8ioRWdNo#V`4uI_WzZe~fc#mO{@+<a&#c@Vllagi7I>bdT5jv7AN
zu~zR@T+i?SELn%oYu_MeQ=w}`@LfglLq_mJM({&M@IyxMLx%A~hVes&@k563LxzKS
zvOW^{V>Aa#zmonW9|dd1(rx^!;H|VSC4F4;B0Ss6JO#hYmO7&Q1bS{T|LI+xcO0^|
zO`U~Tb;{;#8Bu3YUr>+c+CcZ4*}I=OSDjn?_Te}h#jYmJAi9zCsBB_a4e_q~(W~~M
zPYt6>?M9E<i4OG`{V?P_K}HZ0onS1sbzKeJ%acGP8JpBu;!)=QaW)1bVty5yiauuI
zr+7)z-9H)syX5WyaL<?^&iOLrsm@Nki@4S;bM#$vnK6m(FHlBhRqn4^+u^(J>5g<B
z?8e;2Kp!$+{w_S#1+5Zsa~{t;&cYc3&jiow&6jw-i5xLpLpQ13u6p$AapO|&J2wRH
zJ2tMvb)A3xP7u#Fp8W+$(*sX0;H<4Mem}*QWK@x(cbwv7Wg|@2yXZdnZ5cn^or;Of
zF`u>NCZP|OCykkF;l8VTG<_57#H5YWeZ@nlj;kJ59rf5Y)e+VIK&qeV_jGR~_a4I^
zGRP%6#p-tKWAXhQPw^X9l6QSKc1SqYuUf(7VlUY^#{^FNCpkav31VI!B|dZuHtQqA
zQans7#Y4nWJV-vq%|p=F>Sj^m9Q_m8V!r9Y9L7gX44QAkthYB*R3Swx@jai*r^i}?
z`Ex^KWod@-++hEDl`C6dIINg$hj?zu7YF!5(c`L4Fb%Q&%*iIi8NJN0@;8|3(+a}q
zOzen8CRKM0wst4wV;F4R;K^<(uY<1W{lwjS-l7-LkCV)k&m{Bfri6_7*jLH&ku0yP
z=XrzoH-Ax14Ze5H16g?=XFqczu+&Gx_@nTXRXXNl(<oP#PY&q(y3ZT#@qSP8Wq<Zu
zwIv=F?1QbypxNRzozpJ;YXh)#BbV_7;qwp1QhL8tptEK(E;W9l(DW0~Q+%2U|8O6B
z@<<%j1n87qEtz~|uVd2MWAqgrsV+4x75_<0c}VLPs<*sr7`sLG%OE=20Q)AM!pHfj
zA7_lF<3=?$$(=;Z9XWfb>m0tng&sbU?>Z-O2EQ}t|Cy$q*t2j|3w<m`Mpu}L#6?D`
z$jguYa97_axgRkt_?GIOQTQ6mi-+OOIQ#0tUT(An8#LjRMlaL(1JQ8<&#q{qyx!M2
zta^{N-Q2*B_xw6?4PjG7s!F3jLr%wYc+XM%5%6Ps3_A1|o8wVzjxE?6?;itLZ*A^K
zRTU8zRh8qcJ)H+0HMgA0iirHH3z2{4ivF}`#|O`Jzn=SXTb4Z}G4{n?-om_gSI6sG
zA2tcr@ZwObt>Z7ySMQ!>Y5!=a_Og^$YL5<aAQU-?`+DEMIn&0;Ciu;ITg4#siyfw0
zurDpWpGonPdC*WYQTDyoQ34y^V4rf<hID(zY1zv+6u!1!xOSbo^t{RVmXGJxk`KtX
zOyc$Ai&FW^@jolJax*Yc&rnI;#pX}s$5ws$tdU~hC3Rmu6JW!Rd;k4V!TgfuW5Gzp
z@K_%3-8S2d5&z{tGr^!S62!OFw&$kiP3>8`2|nQ^^K;+{@Xy}3YIL&0w4g8GPJ6Up
zVQ%e$9@PK7zJArE^#{g@pFa0upilXobcT!O$|K_^WY;B-6VXIiG1r1Ok6hDNKN`TK
zy7br7+OlGPLyIwsmn>e%M@z$srui+%u;mMvuUI<2#e`-z&tJK+yk*gf<=0)k$e8Bq
zn^r7XzLFBxUwhr+CSLJdmY1(=X<U9C-|=-G{Wtg1=F+(}1PN4yP7h_APA*`{t+G#4
zoIdUJSlK70#ZEut^ccTCa{6@pdz$W#sN&R9Cr_R-#q+#^f<h+6qy7+f@A@l6Vz?&O
zYGU*3vuHG$J!;gb!{rt&x#;sZwp{yZ<3zF%X8af8;_uW9mfW+5Pt|%oW;;?rJI@aP
z4rQGX9XoD(jxB7=vgX!#%dcx(yl__2%&RY$e}2s+4J-A?Esd2=DY}q~GpI#%Q3cEI
zihRv7S=o4eLJ_hp>QChxTMqhrRvz^Cb4B=`$5qA^=hE|6yAJxpT+edt<T}8$noH00
z7u|5s@7;9Jui&$atCs5`uDM)Say4=-;cDT!iEA}iJJ+3D_j0Z0>g9Tv>j|#yT+eVl
z%cXjC9pHOpWAHu7=N^9V<H}3jOP6!`UCb5Zs^p4u&F0ecIzH!d)pIT4YUa9$Yb{s$
z{UqP-9PvAS|AT%$#=C=DJGpjo?dBTh+Q+q@>uoM`-$6f{E6SC}<#H8s#keZD;#}$W
zX7hb6*Ogq2TuZoGxNhQF&DBeN>9XzozLV=-uJwAx^)S~HTsygTaqZ?B=Gw=#pX+Td
z18%apqFi}g>H1v07jwn9D!FR8>bS1tTEx}Nl`h-L_eAP<p6K#Fyw*}zz+M0U{~5i<
z{By&u6Z|{&$$R~-4-H2CtAD$*-~I3C^1sYJ^6v-PAMD@A8lKBO@^44>2m6<P-$-`-
zfBG-sf5~t2SNW^`HU2IBt^Qj7%l>WtSNwMWcE7{#^t=48`s@5V{5$=-{JZ_H`S<u=
z_y5iRU;e%R|Mvgg|AwFRzv*}TJ^p%sgTK+g&)?*K%fH|Mw%_YN;P?6c{(!&Pf6#x(
zf7pM--{L>&KjuH~f5-o>|AhZN|4E;7KFMCa)!*iC_kZB;@SpZ~`akr4<p0=z#{Uoh
zC;m_UUH;GfpZmY?pY?y~KSvhc-Ttrr|MY+3@9}@@|IQ!shyCCC&-*X<FZwU}FZ+A_
zef}T(SNuQvulj%TU-Mu0_xpeL|Kh*lzv=(g{~J-RZ~O1~fA|04AMg+QhtSY8TRV0p
zW2K)NESt;@qsX8z#vE@xL=<q8tZL)Tc#~r$m|WaZd7Kb<5*Z^VnUl>a=2Yh5d^6ch
zA#SI@6q4Pom<)O)XyRqe)2ExM#IZ~>)6GX%A3no;)SQX_Hv|9U*`|t&>*t#DOx(;j
z3rvG)G)-n95o(LfV)J=(jag!rnq_9WX*SoI6=tPrG1r;v$z<4SZXh@DXV?pUmHDjs
z9De-&oA>|4++_aMe9_!&66Q;$&8#x3%^Guyxz(&SUpBXyub6goyXi2UrptWQtTT6*
zJI!6@Zu2#BkNG-hX8$j9ule8R-_18n(tOi&n;x^?Y%m+meP)ySmbu@2+w__T2!ii7
z17<Vl`aEPFCZq2b^Qd{uJZ`>YzH6Q^-!o5|r|?01-)uG8%y#nwv%@@XcA6iWADJJU
zXUu<?pO~MTUFK)xXZ(eE*8I{uXMSaNn_rv%G`}%>%x}rdIAn&+@6Ge(1@oeL$-Hd#
zntkRE<`wft^Q!ridCk1e-pW6lznC}7o93_PZ{{ubU%q4hZvJ5on1d*DK6I#prdg)9
z<B^P|Xe_5rI`tI(+5er4WRP+<@^A67h33Lf&N9p9FEgJ!|C7+TY~<skzsH^UQ8&6W
zj{2Rb95eEFy!BsCJn}pHi+7wkslxt_51)O_?=P$S%va7{9DlCkh3CF_!~LK5hJVMo
z`&a)WzF_I@g}-Zm>cn4!?&xeO+I0S*X=l1$`0j_l_r}?8{p#S{i)+5w`mM))bkFTm
zPQK`>^FOkqXV%0QF23=kADy1}igWxQUtKr*6CZ85_u_y1<PX1l<89x)KKGn;pT5i7
zTyoF4Gp3%Old*nqZNYWss6YR_qkfu$BYz(azcF>s?U`iZKm1PIiJyM>NARTtT~dE3
zz4fr#n$lX|Ll0fnu<|p!AboY*_z9;nLT`qfIrob(dZ!8WVS`F+|4i|+#Y;}3IOJNk
zaPhLmEjOsO5q}{k9LdPc%06z?=rPBCDA0i?<W9^x@uUw=I{B1S-TcYrpFI7Ft3GX}
zcm;(;#ix~&mQDXi#Tg$x)0|y(&bjBs&#$hjojL1*k6rkQPt{#K=aRXXUUvDs&s_Q0
z&(+Ug(9n9rjsJ4fzkc!N#FyGutzL6WXV+KP-Erq#cYp2HFW>f+cJmF4HFN2*YnCnl
z!ZNpM#fs%CTvh<DYiMX%xzc>9xoO4xmc`4LxyzQfxcpeUxTU43(R^~byYjk*Mef4I
zOPXBXXk5Iasi9^0iW?3;X<o71)^Opn7An22nYY}PH>_-FTIx2;U$VqpxUBiQmZ?}X
zd<4xNezmdb`o#^l+WC!*D+I>*E3Uq7Y16V6SJso;vV6I_WcjkI&CJ%O1~)LEQdLyX
zZwz2+Y+Bi{VsSGdsoI7`i<dOIDUh00nmJ7?mtVJnHUOu2`HJ}~7B9KMy>8k3>*p_C
zGJnC6CQ~zinK}%h%NwxM+@(!R)wwz$VC72Tqp@k(Vi2JQ(@<7Z_!=Hq=vOphx2>Q=
z?cv_gm7vuH*R8z4%o6IFTItYAka7L|C5s!~h84>(0#h|CS-k9;V{pPxfEt1A3s)Zf
zGgZ(06u!({P_=aavK!px%}vWJW>&h3m!$~tUQYpKelv(_Ua?sHUc9`aWr<Ln>Xw;{
zB^zM)NGB{kXtK#d+dLn<E@@iW;#w>T8Ro(zOPa2pzr<bH)N~EVpWj%%d>I(G+!HXx
z5m?mim8N>d@@s&&d2utfLi-hq;TkvHFBiUXmoIc1moJ^a7zuc|04Tn036FxuE9Nf)
zsKdl=q+v^<`PVOB+z4qb36{-Y3Lm6d3T9Ce(0Z5`W?i?e;qVYxytH{qlUPxdO*6e6
z9B>k&`Y^(mG+p1cWTk*ydBf5L%a<%}fO*w3A!#X0J^yN0oGvu26q~p$H_+1y;i{I!
z3l}%7a96-_*V9PNB3Q9$iM#B&r3<)yRL?F_8}4-5{K^}aHQ+p0w)jR~3LbpKT{M4*
z08Re{J9rW<0*v>pu5QKhmgNo0m$;297UO=f)y{8encuL8I)J+7k_+9HEi0~TXt{1h
z)BkDj>|*0M>Ht1=lEz8-*arlC3EF&IW0m-PZmW_Sg6$@b63B<~1>y*y+}GN-@!jol
zdy8$T#6eQ1phAYeR0t~bDc~tcMeqU`5s82RxwNDp6*Y(m^#$p80ObLx{QfhucYDST
z3VlFGo@BhUGynO|fBv5{yR&wJK`|M2v{;$F#UivLfVe_T!oz+OwmE5G+}Q}9z!>>j
zQ2O^C#bjkz33vpeEj_>`XeF{wQLL?L(-l&^d{vN^^38mL-g7?sgz43_eV#SCVxU9#
zZj3Zkr<u54!v;dl3ADLc_S~A+TnHNTYARox7ZJ)>el2X`D&W%D!X^BmbP@USfJZaC
zoDbcChdPG{OnkybiEGmjaRB0QRkl$LBIaW5jt13gR72sl))|+~=%H6Dsg8^c=xMaw
zF9&rOIf(*-d-{0R4eMSJH7X{&qE$Kd!F(mM`YtAGZJU^c4r)GWMLZ)$Ayb16geImO
zPh1;KSA^nD3OGSHz;vhetYeRe-xUQwiSs6a<aJcRWz{?n19Zc3UUa|W7x2MLYC<>r
zwK*V)K__bT0;Pe57sezRJf9Yu=zyyU!wJFC#F$0dff57Pj<9D)-wR_`?@27lucOF%
z+R9Q#hw+4dtr&<Gkgy=^FDy}_egU5%GnNN^UV|PR20lgzB7#xD6IE;G8zQr;R@G3u
zJ1et}BZ)$<5vnXs$-}XA;;~31s11d>o*)x8{hCo28;(G4BhYE<Z8}b_qeKfh4A_M0
z(RyH!b(*yub^KsYbr{tNoSJq+nMNWVx-Gqnhi-ib(QLjdfw#BUgo*j?MvZP^Nus#+
zQW%k591x_j^U{(?8D7Qm<Y}ruSJO;@Hz-*grOy}x78@<G<WY(Hs0Jn^C@X-tx<o9j
z)4dqrhK<s}dgDp6!EAE@4Q55d$UQLm0^CtYyPb3oO}~e7;FJo{>@035)bX+#ZO#$2
zLSe0oxz__9uK=a-94!^7%*JrS$}Wsu#fal@^RuX<%Tws}*u!$fQ)L*@(YS^OVP1{p
z+bA>B3!$)10E4&P`808&B?(8#N_q+-)QJE$-(hgz@=zNa!5qspBo>wNv=AL)or6cc
zOU?xmYNsWOll9y)_&4qI@hv3;h3(jgBu*uCixn?l!}{T|td(Xa&zzibCCHl?tNRN7
zO+)Ba^YwDT$cX@PQdU*#yI9wDa`>#Z&|`i$?|vi-h%JOV?a%}-1Nl)Edx~(^=e2>^
zD(zXd`;;YyIH=Bw#CY@Weqe`e>~^!uGkb*{vfq=mS$(&sF6s9n-MY80cFUWT`uh8~
zk+$2kV_mxEKct<nGY$NY6LKqi6~buj?b7CD#s_4Xh85KPz!lELuQ-N=1e}v|G)O&W
za!`BcntL!69<=vn4QI4fSKE47*=aa2i3GfPDP$JCf;Gllip2b6J+2kM8+;YP1W&Qh
z@a0{Sz*l%@gzIE)QIh+LthfhLl}I+9@jcfRrrp(KrC1lv`Sjo#$+cK!M>m)XZ8uA|
z3FlZdmetwu$sAJpr3`p&1W^Sa<(Ki;-gq^^TPro;l;M-C70kS|lPr*;#W-kapW%n%
zfOU5}Kk@H^O)0Yv!`{kxT!}t5X%1Mslq%_wxMjWu(2TEJHQ&2%?rbBd8lnKrypw+;
zsm$S-yU7`wQemoS#v2<kSHGEwK3b}tIzAel7)5W8h+EJb4fD<{rb}x^!16!~I;OgZ
zZ*i+eoHA=uqd28e)>R95c@`s~EZ}5)su9_3W{k(`St``4BRz2tCFRH}M)TItRn5<P
zBJhNqm#TVv({Ay}(%phcBrOJWdN*Q7(9X~Bm7Y<pvm7wSWft&<B!bH%iZX{{!*UUR
z9bVkv{{thB6g$<Lo>IQbq>030urhUB%Q=|oiIb-$r}ysNYbuy-DjH5jZt77ak$N~9
zN@X52KU^t|c7B)%xkK;K1u-XWUhIG@>Yj_?gtjB|v_wBFkZqs=GyG!ouK8#^9IF?{
zN@Inwp|Q$XI5sxcSXj)SBUHkcdFeT9N3pv=5D;A@*b^U9l}eOO%TL#Ac!Blpg8&O}
zoDcPz^e^fDrEY&gotK@fXbAnpUqHK5Ym<@cQ7da9ZP;rThj|GdKj#{(v7f_vOr6c1
zoH=#j;?c9y)00Q}+d@MEZSVzky}!xfFZB|qTJYzhAPU7IWW2b2Xh<MRfftI8l}9oQ
zY!f@r0<-}o;Zw!Cga^A_D--v75ewcPUG5=jx2AK$c1?t7_wB<E+jVHjO%>xe<$^z!
z)n@Isej^gy7}+q-jE05hn!7y592uFoaDVo~k;1?!zWRHK;}hfkJ4?>)H|_s<i<br8
z{n#@vWXrq0^z2tBzJC0&`|$M3H~Y`8T>8ovZhvjxl?QJ8WzUEH`usQcyz;k&1KB5b
zZM)%KSzT{IcA%}x76-OCu*HEb4s3B?ivwF6*y6wz2evryx;em+AbmD4zTOET$3^a#
zHfvAT-{}Ba5^ke`{+o8`BRM{}@errAACwc@@9%e#XI<C|>mdiJUnE~A$7Q*?cJS-x
zX`3U<HIb#ydYaeIHA%n2jofQo3l^u~jq}~&W3ct(t*2-G{d)K$eY$+C&l#BL=JsHp
zqw_nsk`wT)9KW!Cu%F{7e^yTYjmlXYP)?iUWKX?~@?yU;zK0_#e6`Tp#b5c^E@jOx
zXZcC`@MX-G2Z2uk`xJSZ_Rj-1teoWxcpu_^L^-W5awV^lZ$3>KxD|d&={S9+PS9_M
za$fwfa`<JG&Z?&zmvJ-T&b(JS-=0^_A@HlIey2ixo&5O6f#J*L)+uPXMENq~QO{90
z=g_ynIR?&eD(5-M9QAVA-vRHOa&kX}mQ0^>n7-~c#{U`pcLMW&mR81<^UsUS`9);*
zC$1-B+3?*4b89oFseSPJB{R3H?}JA_Fy)r;>C?3H6^eZQE%KKB^;P)v2?OK)4*8%H
zga1&@419NgO#dHIcg66Vk60b&t;#up9UVKuIM30J-nWs%IPhi0Xzw<1$N<;=sd8SW
zzV#FEzY9FSKpx!RN1v(t85>&MQRLGC7h|>d_c^&=8d^9?=wzU;{W;o;%=0k!1^VBj
z4n4hkjQ;l`Z{}Bl{#EE)=9pCr{NvEO2F@JwT_dl2N;$`%IR}n9IwyS0fqVH0`hA~#
zjq%aBl^Nw6fH&iBFf`P`CAwHY%GmH+Y$5kNaK8m_iF)|m1n(Mj)K9}3=CuM3MXhd1
zU&d%LuWP{Ee1-Bh(>4XqbMWba@Bz9@!hdvFuH&D9mOlWCj^7s9E%iIg@VSj#R>{vO
z>Y%&+7*}|6-?PA5yluv;(?{%JYCHIl$5o*VI&+W0v)>!OaiG#!`K;mFE&8mz%)Q6h
z(8)1Q=hZXdCh-Y|<L+hdzhMsFqwd|%0T0>}h9@of*8U^7!Mg(8%g{Y8^JE?w_?Sb-
zG9o|d_*D~{Cc(F#3{A_I=>wnjoL`_0I@;Lx?d#wcSuw}Az@IkbudadTN#^=V`hkB{
z=#+#Uu3oic!Ry=&?$ObSH`6v(i#UTvVSArShh<K2H1h?Ome*z~-Q=*6O3OPmm2L!b
zx<RGA^2ON(564wn&Z~tg&3g&CTq-swYmhn4m!!i2?;_Ls2V<l;U(xUjyv2;)bO>R0
zPWRF*zW5%p$dk;u+HNu*#3;o_g&jBwe9^Ad<NLZ^Ja%C65qgYIY>2E*bkWI2Haf|9
zQGt^<vIZPk{o3WmrWjv}`xtJ8m_p_Qnr@2A^6XjQwn-E6Q+(kak0n(x+#{4@xB=h>
zHi0{mfOCLzfQxY?@jaG+6TNYP+ar^*DV~S$z>e#Ti(T_I@2vzvfs@<QWTBgRI0w+J
z1LylVC*4hPmuweKO~r7+ESutSXSo0SYp?NE%Ot@Uw@HoABq`>Jxs%@k(buB~G2FiZ
D7TJHh

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;
-
-        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";
+  fetch = { file, sha256 }: import <nix/fetchurl.nix> {
+    url = "http://tarballs.nixos.org/stdenv-linux/loongson2f/r22849/${file}";
+    inherit sha256;
+    executable = true;
+  };
 
-        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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
Q;iMFAf_Ocpk7@D#H|39Ke*gdg

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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
IUIxYcKSBOfCIA2c

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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%0A7W<?hR&1kvzb+_ulJ&!9ekuxQ
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%0DNnq
z`kHoyXF=ETU5_6aPO!s@KV$322iB`8m;ILDg>$il2jh?X-4wwCjnoUDtci2w$3|G9
zK7;p9UK0POAG2OBkxc=8hswf+`EtMTDL7R&>t$qvfBK%<N%_+#-`|7fm+vi!58@7s
zJ^?)f?Wu!)7lP-SvFnh3KJ;QvX0GJ6@*lsov>$srXBjUne;eBh^AzVOd+PhD=Ti<=
z)XSzcyMD<hdFKfZ!7O<KS-Jw4bMa@HRI=kO`s9@P>O+H>nxl-DC@g(zDfud`9Q8}X
z>{evj;2Taq`AF**_L?H&K{xv|;W0hmmz*zr4!o#w-t#&3ph$+EDc>3Eza6s&>0fYj
zudR!qtAmWY45b6Vdo>3AJfSSw@AvZyeCzyI^1t-Qsh=itU{p5m{|BG9qDP{w!p+`G
zVG6WScu_mG|9y&d*>=9kCzf7vJ?+*Rx!RL45neP|GN8!@z_fP&1ni3}4tyT92ZsGM
zk&@B&#81+m38HJie*YZbpsn`??_xf!MhyR~J1f|)qPjkyy%Vf0&z(9(+YTkQU*9DZ
z?aV|Det${4FVD(&A%0?hJ$p3|(XNYkRFuwpYo_)g4g5S}^11SFy%d}eyIkdG-_qaI
zHB6XCeUZxN<L_{ebCnNE{MbEfY1^>LI9jhdl~?`{<z1q4s7@3OY#*s)%tDvD9#EdX
zt#9KO4vmykufNWy2w<P`P0C8bQ6)5$7CtLa*e-mv-uLr-@^1LP@`X>{)O*QIgV6G`
z&^Kr9qJPb-6zzxmv1XyK>uZK@H%#N3PgiD%r=nN>urJLsKN0GAw^Tav-z^dUZrpV{
zzIOFLe1Y*Wt`dKSo#^pbwk&+A-y7Ep&sCbr(kqy=w%b{AY0}yBFHX@Mq_skKe;)he
zXy?GL;!64|tN)7dxumiRyNcG~lCQKsLUvK=&$?H(g7M(}ySBIdL;JQox{QI}<=d&m
zQFcUgH?TO3(>}9Jb8hSHDOt27GmMAMDs+w_-<D%v20S3pk@xM-m;MPnWY?&kP`(o%
zxIgE^;pbnPl)rmuQtohMQg{C~OL~Xjo|I|d5#emxzQ1Cx#TOQs&*GB!&bg)VjJ_Vp
zfxmjZ|EG8LnmzQpPxO}2e&}sHHjT7??~k&+k&}AfHwuumzHai2WR4Vkl(k-!FL@?m
zM(~_TIJqRtd4#EgbC`SagZsWoI%rU~jgpsAy^<3tuKZ~SogDgTYgT6#-zeNtR>`;}
zPbK_cxFvrCzk$bgMpARj-%g#mD<?Hi-(QqJa@`c{So=(7UsW1O_4*e-lQr-#XCpoz
zKOE4N=G6TD=4Z0>+&@1htNiEUEu2~VeEd6F*9rgN`JIv}=%nLp&IrmR?qCUJ_BoZw
zw^N>vcLT%a)Ia^x^+(<*r#<CW8E#<SGwe@d?IQkXd!-|809zUIPPKS%)u40**-w>L
z;2T<zI&a_<_AZ0Le5zS@9*}Nj3h-**facsx?#FR29eD-!f_Xgq@0)=)Lv@7pl^lw=
zzEjV@b5Fh%)U{CM!>i^L(r-oQJDus0Vf2<ha7yQ;2m3YW3@p&O(O)g>pNlWB^n~zu
z*{uliA08B~FAn;H6-Fc*I+zTc`BpdWOKvaq`##=-?iJPVmwopSRj&36YCdIsoX45m
zYTx8N&)Qfs|A3p**~f$&z31`xN#0K!x{EbEaix{?U-d0Tk`v3bU8La<XFuHq?e?c+
z-Bit<hez0_v4Xy3PaZb5Tx3TV#E+-V`u2N7=~V{wnoHZfz8CQ|fBx=2x(S^D`OhOA
ze2p|qs*6Ndl@Fbo8Ne9QqV`Kn8OoU?de?mJhQELe&|>g6>VA+*eMP(KG|!695BN6Q
zg?hfp?8I-)ERC|Z*@dm9{g2o)`$rm2MSH=yWC`XA=lyLe<L_rH%Vx8NJ9QWMI=OR@
z@%(3u?IFf?NzNqGO`diZxxc<s*~mKOhky^cwEP76LE?}#f;HZ*w}*0E+RW`PJ`+4K
z4$KB4dc)7IsIPtm+nmd14LPOiZr0X6!C#QPtba##lMf#KwAv0X_y(MK$3OgdxZm&*
z89c+<@&24oj!Hg!F_My59;MIF8!&ff=p2@k9o+{tC)4K1?3<p`_XhlFRV`(1-X(mM
z1JhvoTXpDJD_Q@heRIfto^Of0Dn5n$l!?qUCD^;5vA#Fhi&Z4Lx;NG4lMl_`5PYb8
zq>*f-IV}6$ss8v^n|YRe{lUO1e23^E_L*=N!N7x_Lno{}mAmFcfAT%v<szKje2Vvt
z&`U)6InDEYcjL#lUnBl6HlE2-A>SXZxqMoQ$M-RIA6|?9ro#E?;^M3|A}J*Uzk**p
zOg-$i5>7P_lkatnH=eVTzb`>Occ?z{vEMO;{mLl`JrVU3E{ShgDw}Z7Kbd{w+2cLw
z!ly)6%-<;k<2+aDL1XY$=Abn0T@^k7JfnYcrPzdzF5S!62=Zud!49-v{dX+KWxw#Y
zo4FkwK0aPkG@g&Y#JmJ<Z_bF#JN~v?wX%Br*7%9EVd$=r?|ax;Y2~|4!oyQ<j2{{q
zmb^XiKTX!ouGo(}C_V|EO1?Y$e%hKV8#rn2kgQP!A3QD1UhtBKkK4QLgM&`*sAqEc
z-RP3<^4)0WL+B>`)o-!jJcR7~7ynZK$@g6T;q=-239mei{16A%e5?DCV-d!C4*FvH
z6neQ=XX}?7cbvrzJ`T~hUqyz}y7Un99(F^<k!T^?c*1iw=M@qc(fP6i4;M?8n9}$6
z#hROo`(7RQXx}9tJ*7Uz7C0grEuCldrm>aAz4l9)EuV33`eLQ0ZIdY{JC4qZ_k}83
z=jKQ!I`HtZO0|tO^}$zn!JkN{=K<u7!|4|v_~c%9C3T$?Ua$^a0X_~3A8IdY#bb(9
zmX%3)#^WB0JO({y__(_GU<vJcm9}ax4{e{K^1<C>jQxLC`7<6yC;MRhLqgGyr}xr}
z@y(ut13woW&V_KG{!TxfHv2&QUh01^viRhs^|{UOQSXDozcc*f$8!PtjH4T`7<97#
zm*T73A2Z*DlMl=rZ98ze$`{<Blk@6xZ66Kup7~e~YOH(`Eup`ldu%E6(YDCpfhXJ#
zr8|&Lj&{ewHdmZzY7!3Wf7Z0Vw0_*XeUnPQKCo|<Ykn0z%Q?@prXp8moUbt(0cSQY
z`o`OtjWheEto}RYr7rn0$lt10@EV-pv(Me~ciI!%-&}Jew(Q5$PJ`!#NC|UhzUWkV
z-d%-!^cNQ&f_BpmbG`bg(PREeH}1-K-1ctL#}^+AaEadg)N{h~tGg~fF!0bp;lWFk
z{g9LY`PhEF7+e8g|Cc_H?{{S28_2c~x>0x@a*vUxD47=e=N+u+FN42TBWIvH9Jup%
z@4z?Stu*)_biILZNTX=WXoayx8x9Usk9+jhm~(2w-1-H@>f_x}mzLbW8@)lzFU1<G
zYHx_IlWvu@`ICE_@l1F5(C#b1#kZ;xXErxJ1HU-}kHIHnmDT~Qh3f;J^g)Fi_yC?H
zy-`H-*${Z;Tu)cw@b@H~g?tUJ(r8aMdN}$59o3^eYkWf|lx5#6m7SZiMuM{3*s=z!
zEXo{#PLs==qB4W>GVPx4kQwg)p0Mm$zk^=LxBnk4!Poyqc#hd?(4q95Ebq;kPJ7c!
zv+Qg)&b!yS$^F?2dIuKdJT>shG_6BSH%5p}!{|_ZxH1L~{fcuJT{HNS{U@?-s?8Ov
z^sSD8Jjt8&-!&UaD)!@S_Nu2(m?vI4V;7%JVXdz8(8Sn10MPzu{?&ggUmcU#sH=bO
zG4$2`K7)Y=@L#5^K3lh3dP?O19=1iBKL$0Q8&7{m^Kbi0gS1sL;Ip(n=)+?5q40uU
zA;bI(8oCcdAIPdMhxF1tTUw=q_A`cCx({0()_ZfkuUwB#%|#1#y-NGp!_Hat=*a8c
z_YU_LZ0e9s-0YC)k-v*>c<%T6Tz1XWg3n#A@!8knZk&7Bpw<_h>yPc_c7Of!<0J8o
zAHNsxePdF5@QoSqoo_6O55KV?zW0rL;``rtBL3JLN8$(GcrSkN_@wxu<1^xikMkjp
z;~V0~j^7hMar}w+yT^~jKREtgd_*wrJ`z8;`@Q&c_mTF#8Sz){TM|Ef--h_>_uUge
zdLR4a?>iDdcHevPH}|l&YR`=LJA0PI-`%qz{{EhO;vejJBL3l?Bk_?v@5N85tXF~S
zRp5FJxLyOU*MRFa;Cc<XUIVVzfa^8jIznAXfa?fw9RaQ*z;y(;jsVw@0Inh68Un6u
zq}>KwIM*EB23*^KYa4KF1FmhrwH>&&1J`!o+74XXfonT(Z3nLH|A}x7a$bO7v-N#+
zwb?2DGhkG?f-||?U<`gBS}HBL@?P|I$eYalKaZarOlPezXtp_YuD);ej!XSG)`1_0
z9?#;-@`1|G`(%1uGV=MiAxrypHOE?8iyGXlbuDePx|&_J*Bspx^V-_Iw&=!Kj_X_(
zCDyq`%WiVlR@E+Es~djTFI(y9)l6?wth1}7z0J$(D$LL8D#+k)%=XQ(&W?t{p0*8b
z?VH;QTU*+CdJEUL^^k96S9E=>EIqHwTdg8m+uPQA?H%0|u*O>*-V_xTW&DODT@9Tr
z9o>aZEv+$6$wQcu3hXK)HodSguZyr&?F?$ti}b>l&aQ=Cd#6{};5D>w+!$?Zw5R1>
zS2J*|^<ha*&u?kl)ZP#kgkF1F>lPZAPLY<jJt&a!>$Y^nyn5m(ZW?uUcwMpXY16$X
zYS`G`8S`4&xZUWN6J6Kd(@i}|AgKk(WvGbHkb7NEOKW#aTiAjwL&VCinAhD5IO?Ev
zJ?p23uf6VeuQS%s-r4ODZHZ^~bal>ZrGc&VezY?-OL-dC1wrA)XiHmBOIw5M>}gxO
zxxKS7*4yC<3&T5@dq%O#>&f81vo!5(v9$p@T_HU1x|PcoEUUU<k^0Bzr*`?u6$=*m
z_e-mnEn2qRsS>@<>nihFy1b~@*wPtm=x*=a;>R^a+uGW@y;yIop{G0ML8;NsEuOmG
zxtis*)vK1?vUb7p6)P4ksPmuK)+}0BwXCjsfpfQY72dY#wp>r;&*SgbSw(7LC!jgq
zC|>pY-3@l`=%I3eX!D|->w7lF+PZzX+BQX7TObjmRq{0CH302tvChq(-`w8SJ%7H+
zty{F>28FSW(S|O<MK@F}s3q)<b#7FAW6#EQ3TtX-b6x3X#kw12b#%7-Ei+gXPXXL(
z!-(*?wSB!IuQ5iCs!WCJW1T9O@;eGU+6%k7J6qb;clpoZ1Mfv+O4rsNYixmvl)tS#
ztU>pNCdPADOE2$u(@np`8oBRm@S$Y%uWRp$xqu7sh1HggG0+5kZ;o1_HUwJQI(oXx
zyl78%dm$k68hWW&vHXUbI=b$L8>*IJU$41&p^F8`xoDORTUU3(@|F0Gxz1R$G1j@Z
zwY|N=b#*sdo69|47gsc^Bih*&D}r2HO?Azp+PbQ`l_1(9LD!bH?r5(U>+ED8w#A~I
zUQZh|Y|UUeY>2gK)J}I^MtXVQ<?amW?e&=Wvg9&i;u}o?HIB^>I4&>h<*oDbgff@6
zxGe96vOJN1%d0-^-pjMTurzw#Rb-hKFZahzclQ>T1o@)n*Lj<p#r(j?2D;8?G|}#c
zW<AvBH6XYB#`N`T){tyW+aPJUMVsiMy)D|xpzB~bh{2C(brR-2YyQsw59~33zd&%s
zx}qAUF2>MP*c$6jZqq0XGX<vKrS;?-^FY2NJcMJ~I$i8Axvf3MSK2#bol%(2ne+XI
zEN<>r7R7M0q&kz~Os+2AV_|)XHn`7}=(lLsX%!{ImcYkp?K(Y6a-Og~4bx92mXPs}
zg)L0q^;@OSYdmY|Ybk$AQFnA5a*O7=X?b1K)R(O>i7uM?e5nQ&11+?46S!%)mD3b%
zj4>N;0oTpZo-Uu28E-*GA)C)wTAJX|%`uykVy!SYez8`?a;8Dle`YdwU9nb(&N&;1
zyz6P}ZV{n2w(DxMd`&%V4H`<ydl%R0)y}P11C21+FNfdsu}GPR9-*Rwi|2V<<>h)V
z<f?F&^KKq#81SqcNzX+R*B09>kXiN3eKNS-B|I4)nU{%lK834-tA?vLK5~Bt*AA||
zT!*+w`!&*it%R$dYbV#y_{i6@xhlDuxrVt8a-E2e{6QL5G1n@tL9WNRK8TO(CI4RX
z?<N1<16;@ABM&&Pe6AX<UatLI!1%yHu2;BT=NgHRd;=K2QOQNRZ>-|l$Mqd9(thJ<
zuESh!a=pX#KG%m_C*vdEOy!!)mBrP;MS1(EZ{H5C58@*a-o{0p50dYpY_6qTgItvP
za3)tP7iI6y<r?Oq%x_h2^>IDNbs|3UZR+?oWq!MutDB2--+qki5Z5uTce!Z8BaVwY
z9wFTy0@EXlxo+d?-~ygU_6G4!a!=kze#AvyrTq?dSjfGF3yCA|cc||>)b$<Ge}}sC
z&fcHknY`cmASn(QzMI8GzVG&O0q1wg``tIWKIA$XA9<8|9?j)i%mrMJ0@I_E^(cA&
z&~c?fPRTzF8<A>0R{<B)Xe0;eMJ956jw_Wbg)5h99M@#7NnEVZBbRV}fjlmf<tE2h
zxLlXwX2e%;SLCjW9CEW=PJBfQF>V2>v43?pyNJ8ht#zGlv!xnxJ1zXL_V>?7_qy&*
z{|AigcvldaZ|R<m+|JW|?hEc~?)&Z;x5xddD@Zw?xIb|JmpkZU?l}$_e8Iiw4!Qr~
z{^s=3#y-1mxR=71<k}-&i+l~(Db@ey3WD(O2|uK+FDBmjQ2n`^CK$umUl&GhkKFEl
z-~E2%J+S_8a!NOoG6uN*m)qwG-8J0(jO#t88o`a~h_4WAVNEWs()@q!l=~@ZrYep5
zgzEvWH<HVbM5y@zcid7;Q;Cs`$T@xrcfbDGn_s$16h>V9IDP$Y@O~*VUvR&OT;M*S
zT;bu<|K5(A8>GH1`K@bqf8xXF$EpV@?Ls#)nu_;1kqH(*Ei!pD-lc@Unc>YD!Yfkd
zTut=sF|TG6r_34?@moGzS#;HJndAS3<dKwdspBV1OiRz0H2HJqoSS*x=f9Bk#q%%7
zzVM=pr%b)%QZHxPWx08mPtPwXbQ9b}m%%7xV<%Uc%VHcp>9XBZ?jrXz_g4p_;wAUz
z+)s6v@GhHoC9c#>Vf4>*=eT)Xv)wqC&cDB<gfw>*Wpe(p`<(l0_cy#d&%I&!o+f=2
zsn6l*VmE`QLaqj$&T&`r_eysG&okY6djA~44b(V?e_6aySY&UNyO$EL<X@lbCobEy
zMm`_;LPY8Aww#@=#obQ)?ZjleN8O!p1m&CQ25?oL3LjE!7tx+e-9zqSx8HrsecL@^
zWvP8v0G)C^>HZj8e3SV9Mmw_I5zF@nZZDi;ulp`fe@Oh_x$%ZcwdcPF?NZ5{<w6SG
zJ>#A=TqxafxX(dS9dxPu{Y!Tk$b4MP;qLS9sQV$fzKWc>vfYKilkI+K_u079<+y3?
zGWzUeIPY{gaRDRRMIx4JmMe~MT4_?Ma}%kqrqolBFS>IvlolIQ*^vo`i*p&%lc0oj
zmuD@XNt&zR$4WcVrA97{Tm&D^qmQ#Am)g7JK33XH`uJSxJ=cBFoo{dp>Wg_k*L@Fo
zN1?td0nZ<kP8b^}cp~S4?=<>2q?`;esZ!s=Kof^|>aUNBi*>KxXsO%>xZuvmrIpIl
zm{KhlrCN4Mb?1}fGnGoZnOy(rr5Z$^p;YSrEnxlZrCQ4WWDEq@{fwmssi6VdC>zq8
zvHeO6H14M|XhpphZmz3z>lk}~%u}CxBr@Lp$kn+2>27pyM#eJ+PPn(36MyR7fr{6-
zuVA1nbt~Oww*@Y@)pfxUwlRKJAb<QEDdi)0#5iPt)L<n4yZaA!6XW5e`vw307?^f2
zQjfy-&UG7In`@_pufzZT8on|Q9&jzsUB(lhB>bkE&kXz?ls^?Y<`VcAZzCCQnfnf9
z9cFz0k$Zx;<;>XzBV6)n=C&^PAT65hYLPLXLiTyxJ?0)qZd%2g|B4&w^hmzj$w=L0
z9MYFp#F_ts_xHM6-0z9&F;;Jd53l3;GveQHzw2Iud#r}%sqF6~@x1D8b3btZ1r8#<
z^qgx%0(v)Smw4}5_b=`P<BM;(pHR-<GU}hDy~^JUY@Kl3e{}x@FZFRT<Obb#_o4eY
zxbOY$tH@Bl<Lcr5=eT<!>Bud^Znur)&m)0lMKX;?TmUcedG<L-W}HGD$wn^Ih__Vk
zufkNwZ2v8CUSyg(rc?&iYe*D8<$fHwI5Nfkz556EzXJ~b&+cE{uOc~a#C-y<y9^mL
zf-IVX3{nu87)f*EBA*NUI5IhME*vL4a!%y@NS^pk<Z_#{&T;2Pu87Qpt4BxSiOfjA
zb39ULJUPXn_UPkr^l?ZzRqkh2DpD{%(@lh>T8#dTwvtoR;g{foSRa>GDo<leRW4vv
zz)w7q{W*r=b1g=H&Ri-g7~cKom#P{+OR4U+g7vePs+9lP7*Ls?y;MK7Xi~j}Pk>wK
z7P;%(^>Qw9)m&e8OZXf9mO9h;-pTWw`g3pI<&4zuH*UN|PrqX3J%z<(b7s%F=ISq%
zl)Ap{J6!7R_KG}rGQfT>%t1K$obx|_NoID|l#9G+m!&}-k-QoCMLnBR?!2>q>z%H5
z^Ojv-z4NY?4c+9tlb=<*dgq;=JNJSwTzcMxUz~bzPHx7eTR6zk4Q*r4DveU{kDmp1
z*0R1BbnbWWyi>-Vjcu)Nt(7x@_lvHx^u%9zm8+}ay!Q5vJ370T$Lie;>xp&c6Yn(D
z1W37a@r^etb<;9Ro;#1a7A&m(GMtFV=IA=1gtuR5Xv9I`S`;DkE0-+gT}nzMg)y9x
zGHzVTng6AXW0684CF5rNcs=r)Fk#}vjEwa3i4(_<_wOf6oG^YuD&q0@i4(>}#-&ae
zA4y3~9Y3BD#*u&AxN)ia`Pm&Yyd6jBRyonEYTY$o;#X2q`s;pWWo6~%6%}*&%^UsA
z4}O*Ws_b{|wbw3KuwdcBMb}+--SvyBzx?GdFIlpb-wih`TeiHW=EfUuTw%Z3+Pb>B
zl`C($>86|YTV=mnZn^bVt$Ezt@xPCp=kB%j&-T$(P~6`7&u$Lsc5yYuzY_nLxLU3s
z#NQ!if<p%oS->oNDblUvw1z;w%nM~I_a}i=ScnAvynETbf^7Ca(&RM`rK@Xl9qvoW
za1XdmNLyD)Kb<F@<JQO8P?ySr$kGDc=klcsrN(!&8e^MgNombb8uT(uirrq+^Q|Z?
zjo4LMnp%82#d_=>n;Xl#z|IqGXh7raq0=W(!WPsLv-%oP^0lq)YT4M)I%;U5j*Za`
zJa23iAa>u0O+!{B(_AM#pjE^K(qk{s0yj=KTLl{Y&S=~En4h;f))`yd*xq2~pE7S<
zRJzE~T-~zup`A~*EnwT|Z0T;^80&6nkR~@!nui7@2!5=dyv(aFpYDxniO=vpU*=RP
z!s8=P-_M0!$F6<xk?*7HIn!n74g~2B5^{}A*MTXhJ3v$(2H6ISXaXEe2BQWo-&W~0
zU=oaC@#%Cq9tt5Y4>samemQr9eSH?LUhO##rDg%|q#yP2x}>`e^rPVuhfZRG30`4~
z^XaD|2<HV66&0ea4Cy}YO<rTg<uZiiHO>n{o}mPLwova2gZB#cK6nnoLSQAg(N9HC
z&%8eWS>`G=qOik5XPaR#=A-%YXj)4X?UEuGjhOVnQjB?d4cNg9hrZF+Cl6HiZ4es`
ztcRpX7wUc0;QRtlS>0U({hmVE(vr&H9ci2=0Ql9^&T;u5+bfVY-MQ%$sB&}<o-J+^
z&l$Y;+mhEcH?Y8Ke9kokT72ZC9bD)iUqWyA=h=jP@sXF|2QLqD-Ai0$eB_l(t|?qI
zx$21D%LTo?4E?<P3fGUg-ieR=1^0h>EIx9W_lKX0kGu*k{w4RXlJ-b3afGi^#;cV5
z>M-d^`vZn>7be8S@N|i1AA`{MabSCs^l!c!A9-ssSBW3@)@|HVrsCgR#XaS|MV)VY
zT-^b`Xzb}|ZNWkx^O_pHyhd39>;~Px8H_`=08Yw4V>q6nYDTGO+jv!5PpbsEpv;hA
zU=qMFAlfMgfCbZQ>TKWWCDN-n^2k25Hn7C2kAmB^v9?Xv7P@;n+tzl+Hg?!^0w!#1
zYunlzWh4mV3PbZrP3=|gviY8qdAyeQ3zjckdBd_=mv=>@vE7aq_>WmMp(F0i3!<<w
z=KDmncN$D#+kL_`3xtfPYr~ciqjbWDY^!o@@Is;;g(+dn4_~dtQvk!mdXhMw3n##K
z>xgaQl9iWwx?rEQ4gR6DJ?nhSv+gm|G*YY2pjkHQIRRK#0F#o-*qoRbx-jvzG;Q(f
zX9b2N-)TdBDt?~OjYBg{Q+rRFm~Mz$vj`Q2tuT9XtCx4>ij1DF7+mSfl^I=Ix(J2u
z3=q<qo_AHN|5kVQS~q%MSAD~x>z1#$p{njTvP~END0N5tqX`G%AEiIZH4^_Q<wrd4
zjDIw#KK{`;gTx(;f0Xe7&wcTaKDU_kk5Pqw0$*c2l9`@0vWe*>x~?_W#RS(uH}Xv1
zv~|aNF{?Mzfigl{BlXHp8cexiqh;$<`cLP_+h=`i`#Pw2G;f#~0IIL6wLD!7*eZWh
zZKCw{PB~~m{w<yDZE~UTEGtF%ejimUu9uv7t^A3&U%)+7g>fI^8U;ZjLxLnj;Js+K
z*U-~xqCr?_fp?c%J2#m3#}@LL%UE86x5f(Omzuh2`69He$NM4H)e&ughC7+m;4&I7
ze!TzS->+-$Zf37Rb#2{s)k_zV1p1xpYHF$}1zMMrPhm@&tdO;fm)<0C*W$2NZi=;f
z`FV{6aIAK(xn(`hR8$%3mMez1*lf}=FUS@H402#V?7?}*%>98~(QAw~sdR?3xd7D5
znSr1A_26<Pzpk<*Cm(xE#ObEU&G494(lgxR<;bA7)L0t=A1+6f#o)TKIDDscp-;~>
z#l`NLV&`tCs$RNa@uCG<45?oQgZ1xCi&oTDFK0cF{JiYC<>B+9Rf`s^tRuzR+PW3h
z%dRIL-<GcCwaqPEz6((3vy+IazJA&A6^mpM4f`Y3-o(B7V8QZbbt{%HwR=AuK4)~r
zBK_f4yNDDEYkk-fo+klpwJWc!UA$<i`e+3nDa%>Q1ujZ{**7eN7vE5`_U7d)7GAqz
zQPq-Kx3GEz?k3i3cm0axD{Ej7*DqauZCH0m7q!*58ea9Bd_T%dfFHbuG_<tJP~ny?
zSX(842$=?!R@G68?!&&|{)R=hwN=+MQ*gg*<qeBg$nS}J6>a^ZcB_ACs@PJ@Pku=Y
zs%k8(_Pc`nRdqDDs+yh}y{C0be=EL1^oFECjRDxemT*#yf3)rO_($6p#y{EtuiH_<
z^}Zi>H@xib`~CQBZxZh3BHY$Y`pKRd-2M57If!`;Mo-zT(JlsfC|dbGK>3=Rku9s%
z`NWUEpUn|ApTi{;lGVb^(atu;heeE;+d|G3r0Z$J2M^bsr0Aeb-!IHO-@0*3!@IGP
zaa7da$;>7jzxgzVAcoU0zGRJwIIRzq){hGW!{GULe6sW|Gwp&(u2o#ET-a6xzy3+6
z@bdlf?z>Ll6DJo3FrfLYqf=`fHE_%_1Ey$hm_A#H^)|#}jj^$76ba>{c{B%xnUHcC
zHn1AO#j2^beKYlho^4618r<dZ^NP0i;9~*9TF)%0dA5`Fk?#|6#jLy;g_nQD+A?-+
zbcWJGw-@Rfo7P^?GeBxCJ;0J!EhZwpXcLl~hX4m}ZRm{IBm*dlXp99B6zw*);JhS{
zDBmv#uMB1*rqM10dwl%hTuihrn_3Ka>$X@#ecANUiqt^n!ZSETxoEd0J46&ON+s+4
znGU|)*4|c_Ojmg1`9dd6@>7C9JkL~jQ)?7Q%m!q;E|=dRM^Sn0#h4WE_2BX@=koHk
zJZ3fM+~<%8YN-p?EG>&%ML>}AxX){Cw6($Nyv8+o4IcUU5%19>c~`e8xmy_crPOw}
zcTkNBLaiIzik>!&9ZREmN$D5iKckvNmo{XBaq5i$mU(J(BkkU7PznfSFl4p0?M-WM
zZ(p|-`s(fx>u@}&xvsYQ`UQ)ZF7&!Pqc$D{vlleLmt@z))^@b0*{%FR66oq_X!eM~
zhsL6mp}T?Ul5W5hs5uZ1%{yaOp`@42_SP~F-9pFu&JM3BinAPf&z6pII@VJ-6#=4p
zT=_L(x?z33WF`0;@%ga{n8`^9wA3s*HnaGL`r1u(vA(mtr$d0_8-x?&T4<=uTPELI
zde|hjFr}ptZdGY>6sp8G6#rK9ObX*EKH4fFeT(2($52%TCf>S2Pxzp}!EX8}nI!5J
zHvG~lMGXo1U2v5NodQ!YeDw_OcRV6WCbyd2>+Gg8I&gw&LjW{{>Jfa<v<<?GpE1B9
zQVpdr5(uCor2$h`8BGCg%p+<FPQ@a)0EZ4x<ykCu#=;~QU}qK~Rq`2rp$#caYU>UN
zPQ2LeTe^FEoe(|U(28fPm;*wS-~oxbtHCFkbMq5xL8+4fo;8=x3;bnAa$%$o){U0d
z$Hmzb2h-cyL=oWhQ)^kP5Q1PSD>*P++a&VXiq4<&g1iB1X=SDs?xUTZ(JdbSZtGa$
zx_Pvx;%sdSsqwVJZJpcHI7_%ZbNkMm@l$Ql5>5RtwHdC})+l(&nREN|W-=%?{KLMQ
zRzEH1Dvee17!}hIj2bU!4XI3XgM<co>5H(TOWt3WS5`Q8{)}1uN?SH}h8m_kR+n6)
zlV(S+!k-)T{&d<Q8-Cu<h+d9GK15_AXLA(IC*!#}P)XW-Yl}P<wN7biZD@`)Y~bmZ
z_8x!7g(B6k+_j@|IQh}SM0_2djo~AB6uVd#!+}|>K|FUBlg=z9;9h)Hm7!%ql<4Vz
zB#hJg`Uw9akTERY{KkVc@|g^7$?t1yHNP?EwBfQYax!244t$@%+FF$ypve~xgazW(
ziWJ41=pZq9?IAcVPf#pVabqie1|MQ#SiA7LrT$XL%9l<@^OJ~r;})DQCF@)HLAIcW
z60;&jxJ9d~>qw?~X7S1z3#*qA!}E<Rc|}+)xtg$U1+p+<)wL@u{#yBt^L(9FLWE0{
zkZ@(~3e2|E*Vis$_3A%gsZcKG3aggl?oViL|Ae)5ORifgAh_3DXCccIg|&6dt<Jhy
zEGo*ws?!gbuT;2l1q&g<RSRnDdDV5bx9a((I;+Lr;XZ$z;%=^9wqSA4)@rS*h^x67
z!JV-77TU6K(X}hJuF?W`#iF{EE0FO`odtn}<lCxsGb%KZoNcNZRVRfqUNhvG(1H0H
zHe@$+H*2+#Vr}5!zpkgLiJlB6ENH2#n*pzZsG_Bz6RbULn_JL;!2-H%Omsw1wDuaw
z+L#pGvW+2mL?#5ngwt{&#vjLH{kIb$oR!B)S2~GM>KuIuEXamueVz&ES|{YeVG^<=
zUh|TG*)y~yu}g&a@sD4BC;svOm^1eJtHu8F57K!5%Gh^5I6U_G^t@+#e*OOV$A3k6
zKX{j`nR0pl0rmdXFxTSIGXLty(fj`~nfrX+bE(|d_mgKQ&xg6XgSe-Oe=f)~CI0bW
z@8vqkb&Tu7_{V>f%|%{xuphs5fa^zG?{j@<`xPWKvNuZon|S8_Onb#_M8mWeu$JsZ
z_0jF+FDUS?EH1v<yRI`9^J?3hx>?J`yz7L1+cq`Rt8Q!12B)ivu4L_kA&6y1W&ULa
z*Ft`YZD_nKnw>wp0Ip~$JZc99M8l{A&(CF)_g&6Bh`!@<x|5J=GbQgVl(vj}Jm;qK
z3jK@PvRa(p8pfU2S<uGQ*?%DX!zE)VFBvcFmkP=c)(9$7^NBw@Yv!?yY;GNP7E|u&
zz3!RtH5z7G`mScJzj*`}{qyNP7`v=?7`XvZSEG+9r&)a!^Qfn*SrVI{uZ(fsiD;nJ
z2_Ea+zH)2S#1jgE_0!bwG18Im>2Hk|BEoUd(9Ui<=2p$Q+Av{kAXISow6*kx+T#S8
zP*pX08)92FMv=&EVP(Qp(8jfA%F8>ULQ*$?!{b>a6*kz4lm5Fazn*!RC17h$W6UG1
zc3(-{P}M=Ewc&m$+h3&w;IC`TMo_b%u$k>MWTT%e=9ORGCp8#2_L<Zs;ujS5E+|CM
zZEEle*=dk_*G<*6E31~473SWxXkm5T@)c!;w!N#re_D`cQ;W*`HR(6CC^0`OGhF9Z
z(gvPI$BOrLhFUDPHEQ#u<m^BjR+t>SF}l8`q0rY+hVPZdXnjmd@q6^#-Gx%G6o&j$
zb@>c2R;YZel?vG$B~i(2G_BDsg+46d?k;o=EQBp_s8|mKQ{@Rzt|d9!ynKot6R(a?
z=MafOsH+8iw%INeCo@9OVH#YCvZS9sJx>^SwmcybB-azhoh?t&f;|CS7<aZjNo`N$
z3F1!6;-p^><6^dd65F}rf)3S=O5w`lBscjlq?RyV)3^mB(Ax>T1RbtC)1fA4>9%Rp
zD=X&BHLiA9ZvFf#R_B!6rS}2}wMXH)n7>!>GUBca6qH7TmGderTUkJpqmSsRuE^wK
z-6#RsmtZdwuPMuG%-Gn)l9_wdblj4}n>LN{V=8##I@mI`Ka=`q!477z_+*D^({K0{
zijNe+$AcZIesPo`?h(q<q4h|5Z<AvaJSN#3C><9oNf;m{b~l6J(`6fNRAjm98~>?8
z{4Kh1UCa8O_MR^05PuyyhTpa`8a89>#|9_iM(YNj!zeEb{L}4LVIgufKz^b>{Qayx
z-)6<X5oV~ZeBy|5J-`kex*izMwRKo`L&vNuW?cb@zP+-iG4UM#)o|L_YtL=*U+MaT
zz5b>9y~AVE?0ttgE<a62NLb*?blg&WQ<vS>EH~LXq5G~4;ulB}o*1ii1#?Vjm#Ej8
zT5B(ppRAk}i)xnMLYaPD{$dCLaJ{NVd=!H+%JP=2T)Na#ZM8Lv7C6_-1Sk14AiG3Q
z2hkE+^IChnbz7Lzq<RQ%Et6C!%;CKo&sap5<Tn;D3PaF)zeVMVx=$CjM?pOc)PdXr
z&Wxvfs|!2WCNFlldaf<C)@bv)w?^``r3gb(M%UODem}XAkqX&@F%*U*YVFw6RdZ7<
zg%)lMCT89H`&m_wp6;-Mbk~!(>s0El*d2=P4erbQ$wKUg>4Z0ak}^=$sA()=e$}!(
z5g8_z+!KpxGPV%71+Wxx93P-5BXJ+R3hnIPYQNraFZ^oeH*2rur-!v*ZLrW=y=Ya<
z3X2B|4UGW5w6CxRP#NcjpN`GwCD3K^qDB$83R&GvQGX*~04?u3ZrZfQOFV{k3QiQz
zt%$B+NZM%AbuFFUy+YQRI*^KFGmw@d2tSqQ^gdTT#u&rUdM24Fn5!F_+bO6mwup+8
z0Avnk=H<PGf~l>sORzyQr}e$6P0)_~9Fhw{USK<X7d~JXYHz$hO$3BTm4;J^3W8T5
z6*RP3T>&W>=UW}}NU?JxRntNEB!Dbs^3-YsFcTk?y{)yAz$98ii8X6PRT8^6T7uQ&
zTn;+m4fBP;(6ruLjec>hoCp-LF6lXJp!79@Qz2DY4fq9VX&MfNMyj##m&l`|9#$6$
zeWXLz62Ko!&uT8O3Z+wRqJNd!01e+4MmLj%hWL`v*moT$%b;cTT{wPegUJI51!G%B
zr|Q-tEi<Tu2Yb!HOs3B+wHx0Xj^qeKN@x~%Q6V$A47Z`h++i#v0gB_6^;SclSBT7y
z9Nx1LAF0A1dW~s!`>fso4uPRkyh4a3Or|~Di8h5e6e|$k6;c-#H^J0{vOpoKD15Y-
zJM}<s;DOU&_fdZlrRX-V&5V<}Z^R_t+Om<`Wa9PpUaCX>I6eoVKS*B~T^DO=-mtN)
zqq}EQ@3jjSiyah(M|*Ie7&$#mQ4)?VBu$eN!UU2lLY%`$DO$H<HULejP9MG2%|R0F
z1oqo5ADrZSN{^m3w~%E{JAVGI=9VVGW})9a*VW$BiTgqjnv7v6QH#vA5sD}}b2R=s
z^fpsP5L#;m8&j;RvCvyh6JVRG)uX{Yq`ne?N<T-YR*gX+P!xl6M}kPL4Ea&2jUC<K
z+y^bW&wA)a`AzsCDQg!;8yXoZ^wk|*>MaVlG;3VX#%P!34hu=DdJAj$vk@OF2w(ON
z)u}K*kCVJ5KL&3#3QLJHwW3I`d<_Da#1EZHQCrRfD=?+SCyxftF4x~H?eA5%=qbVJ
zslmDJ4gbu=JM%*{u%%A)g)gmg4K5T3-fFD(Xcm`wtNXm*b`8)LB&znx%N61IrzYUL
zINAdFFeW{&_OzQlDdM#ER*Vu+{b(U;pp;;*ds6I~+HU*ce?yvtoM;_zS0c4n?)8gv
zShSp9#=Md5q}tfeMm1dTmtVV95~8>Ia^vyzk6y|RRsNGAPXFi%KZ?Eg_FmiXb)WR!
zqOffTj#Io(+<S%SqL>832%}S-57UTkB`Wik@#Bsjj?E#Tg(gnG9cL^Pi(DpBlrV$e
zmhm}--s-V0kw3)G8xY7yKEv`XBaa<MM7b7<uJ7pTQF)wpz|l#C{&6(0lMd5**bzz^
zLf~Ny_7xW5D9injOq<jS`q2&|vT+%*0c0y%ecO0k*ML*e`r9{j^$3<ihPYK2*0s8@
z%EPITsao;Zo9h^JpB`@Zw2syCRZlfA>sV8Zi9NMgS(<|TRpL2Jl|iQK5{m|9S`f}z
zJR~s#!H2K8!AVHM=xJakaqR!k090$&xOx-4r~5Ww6lV$cDnd5HFaykE?(#7RR_GTw
zAaHsMsLGI;o;9eI!U{&#6JDv8{5Ts7b8o6zx^fXmP>s5z`s>Le%fFl~ots;_Vl(aN
zB56CN&@=BaY;R&;u_y*~8&{iAhQvI-KoYHQ*%WK@i>Z>~rUhXgjxFCe0pq7@;Jgfg
z6J*j6Sx3tvvo3}T5nGmDiNWHpRgx`uoK-`gDX;&IN*R5Op;%*)=T#ZB{><EEB}nS_
zdfLoSBkIE(!f8!Ge@R<}YRj6igayql!hef%J~#|S&Bgj4uU*wHbPLrXS}Z$iSI?`K
z$(v4!hMg4FH`515@Z)BpGFeFk^;$9Jd)Gyk?pkR#qgo816uqM-)&~A$i1k(k3!ns{
zi!h?t4;nh#XX+lg!pGcb(vaT(Tb*!@@-rZxki5LWZ$`-E)GCB?lsrDP?KH-mb7Z=p
z3-PEk^Gs*MOiupl_BL|%iF!`%D0CdO5@m))zeDQ+*`Uly(sI$8KJ7Ntpj@5Pq~Iu&
z=wU96ro5Z(Q;wz7)(sW`hRUXP*6bL0!t>oYbxnlsd8{;prKbPP-<6PKy{{LZE@;#h
z{-brb9vgd5GHZDdI41;!C5jlm31nUomVu+iPFR{aiiB!b5;~O2@7&R>Nq6?1qq87V
z+`l<tNa+hPEl0!qhVIs0j=yWsRVd2%HKmav088T&x3d-yD20cQJdo0wRJVV-RK)57
zOq;_AlT+LL*Ra>qf0iRmm^4wTZ!}RQvUZ%F(;Ji3pWeb;BA}?xj*P0%Vn91*$A4!G
zPGLml8yQ1*JFVLp8Hvh+L8|TzDzolhvgnrDMK>mZ?G5vd)i0zk5J&RNVY4t0Qv!w*
z=%(??(dG?Rm(I^GR$P&Bf|{){QA3kADh2z%X~c?VLbw7RBJWJGltfP265_kiW-IT;
zo)~t<sGacVvnh%ZQ{RNkml3wo!I1++S)!<(PZhPY%^y_o8!N*vPQ>f`F2Y-cy0esb
zQv%K5jrDQJSCYuXG)X?=g%CG|$rItP&vyp$I6G~?bIwK{wTb$|8>?5H5OPy72H0AF
zOJkotse*=<PJ|nL6BF&|3X4gE|BuQ`lrnmA#&Pkf_60t4HU~)<uv}~(nCacT7;+N(
zU&&d8OLdZ4hd&c76On4Eq%CrdK3nmXV#_@9@3iU0t*|W?J`HF}MkSrhBc&|~y=Kl@
zpLG?J-)U9S3T@wzx4lSg8Ormd(hO4O*d8$kQ@$~)*g=#wTLC=(8JtZ$t^Ulv1uqwb
zlV*)iT=%6^idxNMG6$m<UK5NBf3j-BlhvRIqnWk4G3DEgZKZ^ozW}|0I7|yt<T0Y@
z8GLE&@6RsMD+*_RDWh8ode-4uhsF`9hI!r}oL0xpbRBOzDG=qH;uke7SBgz9H`L!u
z0|83uC$o&FCq*s_s~F8zP6Nf5dJ(^%Z(l-ZwzCp^hAV`cQym(RO}NAg_2#xqmWEgo
zq;)jkhJqR=a4E3SHb~(!)Gm)A+!oY2<RY66>6G;da&iGi6(S#0FzDAD?6hD7EC?me
zV5?9r^{{_aY`9&3FV1?OzlGZ~eA9_eTcZLz$&EIW7E-x7+fe0%wINPLds@5Cly<?w
z8l2Yyxy|pvF1!fk5sG$BvxdPd5J#(3ALGF-5yY>)N~;c>E0K4Tl8GEm>h>$Kg2ZG4
z!!}6AFF4AwMAq*7vI5#s<$ITnR%ImZH^u8R@(u)90QwX@W_m3}u_CX&XgWnP_5cpV
zW1H*pR||A33e9FOe^x<~^ckRlN@P_LG5ER1wmEohMi*by2(jxAwLpffZ)lWQq|G*R
zeT3V@x@W2*<hezM0k+mQzGN6q8HO3PG^`lz5WX{SG~3?W!xF>_LcJc$Pzh=j`?gZT
zY?M?-UC1&4U|mrrOR{Nd7Ze@MTe_g#)};PI$ISNKo=%@c!CJQ_Yl%n+i4*Jox^^}N
z%4K;&mruHdOT#*#7JMxbpOX{$^keH8zZ~!j&#2K_%^(T85xm%en~Bb+4L0NjZlWPG
zJy{X_m7ZVp85=XxdR%-(gK{iHr-5yy$iI}W(G=|id0Lhtx2)ZZ;egf9?dJ}JPE=H6
zgKl&>DDYN!cg8wNDM!Bs6l9_RpHHdPKA#kS>9MWYV&j?*TDwQzwXr-q!)wh6U7^ax
zr)D;I)q3W)p@HaAVaT0>m6xUmJ9avlO{}S58e>%q!ur;(={`j#&nCvlg!!<geljJ2
zZCXK)ls7GW-P$D<9j^8gOLE$8t6(Y+lQA~rQ!Q^a)_jndtBnu&VhDM9aD8DS@fovu
zw}`I>lS;UF@R(4Tve?0HRa;R;EH`QLN8k!*KN*O?kV2Hv5ETSo@j_xC?fN{wPGm<(
zb}%ui+Z%gC-7GJ~$%FHGgWQ(J`1L~HMwJ-9CP&Qz9HBw<j_v`!`W9A;;rf{6w!fT)
zIa(V6jFGsF;n~%Jzle<#Uk(!%!eK7<YQq!+7`!3kt(?uW5+oNeTC=}cGPzFWB~%!v
zO?S47Ld!aTjcKJK%0|=SB<7MG0**^GCgK*hO7?U}L62=XOx&czf!fxDwdh72PM#n`
zf0~fWJ<M^Pa)fZ7mM&kbJd+K4msx9wuaLL3hKb)^OOutA?w{IB*A^uBL6UAEtgq#?
z=Gc${`(8afO5T#Jox?s0^K_n;Co~&`@4HWXKU$`V6=x{1_p}@+azLb&XMb)AwW$8^
z7kmMDqtFGTJ?X>*(Tu;o&+m%)<W-NYXnKLE-$(UFAw`K}`3~<k_LAt~<|J~|U^xRd
z&h)Tw2OX!8687D6cqG%CHADS3+6N)sUKfrt_@ViE__9by1kgiRmK9=Rfk-9^zLox#
zgBjX!keIsa3#WU&M2Vfy29XV}B#ey?AT`iRH-XS!gd_xJe}eGI-R#3~v_PydO0l@a
zf$&9c`MR!l@T@7l7Prg#z;-=dOkx4Vf^S8Xm5FBH1nR|e!MZB(8M5&VrV`T>Qqt1p
z3#yhHh!S1RO2xv@z}+0KfI>W#Bca<E^)Z>KM5S91!Ni~~T2kcLre94*ft!slV@TN*
zdY-7~kor+evX_O`hVi@Q=6hq9WkL$(9qfjX(da_UUMCcw!4bP8F*w9AsCJCpRTvBD
zVU%}^*zIJ2Bz2WfQls*TWNnl23fZ(D)i$EUNgK9y5-AXgLyc9Pep@sh?H<SW=dWWs
zvCp#7Z(Emc<w#E(Bx^_yp&ZrY2F(akEK2ul9IY^T(Uh)5hu6eh7R0or%VS$SEQsh#
zZ@_J}g%3Cc!a@+=o!;Eu*>b0(?N*OtnS<y}=}bNxhcYJeHXmlmw?VSvwzjr((Pjb#
zjCSd#t7;ciS0}`iWy_X%`Rxr<Apu-ZNqVUC^kUJ$Rh}haXs?F=tbF@(i!TjG=ZsL;
z(#=r^!Z0(6Ki1CJWzyj=6(*qa%M<+?nG~{e52n*az8{5gjFv7_H-;-xU)%|V4^ds6
zmU)by_RW5I5>$X(;x3X$OV@^kAmeL$q}mp8Y*AtC#8=j8Te-C@tVw`Lj`XQ{i#VSc
z8#Aj`NXkj=$UQ#IYb=_WZe{rFVx4@BwJ@?KG?sgai@r@^bl#T(2BT0*kLwT?INd>J
zqhOUXDz(?kOsvmW1p4P(lbVwFoi#~q2o(ngN8n}(V6qI?`*jIoD~>vsWBu3y)7;3Y
z^(Sz(Gw_YHB3j#{QgvF}#N`9AXd|LY$bvw(QrUil0DGe*0xQJ6gu(DzcRPZ#mr(iz
zvI{SKS<9DOv>{NP7Zha$z$iAg;6MnWsVauD(M@5K-v>xiN&0;C4K#tU76?>Hi`h}5
zkr)+CZk0kvEIF`bBpSf`KvJZRx?ufYm@sF^RtY7w`-wcx9$=Z5OgjiDOh~3D2(;`d
zPelOMAo^OXPFOYdjM4!0$loTwN63_YiiH@pTZAgr+2#jYbfpzmZ!{WhogM<<4-AT8
zNcyNvnw-OyO0W)Tb2Ou`*P%DX)iu@mdsKp2{o$v98K{H}7T{zpBgzQ|W`0+JCW-3<
zKPH-Ja}~>ezW{{l1`dEApJ7lRoA7Y>HOmj&EwSe;P_SDgIY`1k(11!z4H00)Zyz+n
zEMdi&O0=PUeH(jM8Fa{|^sc?OasVb=k0$9MeEJTMr7j7-e?Y_i33K%OCI0C2*$HOk
z9=2vu=csnWgk5@;=8_0nHp^d<#Ii_+Lvv8@``_2ULWZH^mkk8Of7!d}YqJlAu$kG<
zTH@m}F~R4G?oow=8+X+o#^AsJ^@J-{ng*$xoMEM?0_Zf>8?Lgfw$N&&{-JT!VP@Kb
zwfh8UwOa`Z2>i1?#8&Lk50Q2P8ip(xXZtG-Yr87;n-Gl8V6losqE8X|xuxV6b2K4T
zvX9^0XZoy+-!1<)d+!6?*KytXJxU-2z?A)LQ#KPT@lP@!LK1%<NYS=TQ5OG;v?&rH
zAd8M^6CeN*FhKyq9}=`^hq2{U+pvi?Rd<yv<0z*(J!-4ns(aLpHmjc1IaT*4SthGC
z%vNm`N86)wqH~swnV3x!ixT_!-h1c0_X9vmPMmB`!XG)9_vX#qnYlA_=gyrwcM=K>
zd+H)^GDT$?3tuu|l$Y*aX`uwgFZZE4$XbYM0}BC*!Yp@eyvCWt;CoaRKMYdLZiX2m
zmfaR?gwU&OXodx3NV;lV$72>rJV)A2l+D>vlVnQmW+gNuqCw$w@spFel1?!n8QFnH
zFYeX>k=|W6+F0gX;HTiYilP_O3=I~Tv6;>#%z=7DS+TLHhAQ-u=Vj1eTfymnL%e21
zE!(0raFh-`k+f*rIpq)@4i+OL@)~i>1m+w!qDl)@o{_mg#aG<prLw}Ll1T<LRFune
z?uR$CJB%({W2$)13WG!G46n9FETAh>75QSYoxc}n($C2ol-&o=da<TV&6FC`0NNj_
zUyhaPVB`Fui3#=9R%NxW68}NkjY=9A11zGTb-(qs)QQ-DMPWgda)FLabW7gQk=5SO
znZXjD<`-qP=wFC_DkCe+2^>3;2KjLj`=kf4;1p2nXzM~}sO>Yi`tC(6@l6<$x?sa>
zPaSlMP@C~UR#Uj7MEgc)bc*}XeuElH*s#&%bg1A(ixrFr-yy{FUI7|HsZ)n9V)^7z
zQMm=_I^*twLs1Q7Vpz0{yknKPPSp_LzWOLqIlhf~R|3t0l3g1RUpPqA2-8d|s%S)+
zf$G&_zP1ajjM|sk^wl|W=EKWMK|Uq#ld4p1@`@$zcZqz(<`m$1>1ciRe(&rtTnk3X
z<U$M|73}Djy3nEW{#3w?Nkqe4W23;SBZ8$U3lMcI=9?mo2DQF>15s|{nzSO6##B-f
zFm#pCB!-<@ne<)C@F;Pgpv!(m64Z-V*=lFBi=3=0Fd><p4b^0qW7D?v#?hig(&f!=
zGGC9EaBGuJ)Lxp@i7hIsMTR@=(k?-kIDowhucC^gvu>gn>b&5}`8C!CoD>uJr0;T;
z$**op3!zdYC+R^em1B6DEGk*Tof~=ZRbCuCrytm^s4Z`VC_A@fDm0!fV#nqpA_6T1
zob`!@C(#iI8KoM~EEXlA5vh}H6~(BEjS82;RtN&yzpVOA3m~M0h*wM<Nfm}q1_hu3
z^lu3{GPv2cS%(E<ocOsxpZ<L_+4{rLkvX}Hnt~xCM6AA+;hNA3iIH-ncAiFs8jI-6
zxfQviCx<7o##TJ;Beb;uOB6Uz=h)cl8JbK3z_aRLe2CuAh=>7L&RIEVVq+X`t(5hF
zv?T6p)V`OpB}#mO;V)}Bs0$Fi8z#I5ohkbW)0Ua`v0)&ifnl(thGp5icWr$@U5y*M
z1S{3bs<u&B*G`4$bVVy95hQ8&KY8~GD<K4HDm0{6XsVKZ*!UT6GJ%l-n}cc%BVkVW
z=p(ju(IWkdN;h}XsR~qKbY|VgAs1S!P9lYsA-Ct^ldaJuu&(rJ&k5Ch8_!nL5`dEz
zNu}t@j#nc*l4D|jhwaK3)fG4(!k}olGJ3sCCRZ=v8qaPU!bQPApt0q{EVaz&1SCY_
zbHlI!?7L-!)0`5{4_iKiLtPU&p?oG~NQ#SI#Rj29QA0m;q?Cg)|8a!zBL2#`HyMbM
z;R@r;gFm^<(z=^{X5+7bWF*Z6FjlmAIXllJBFCt+o#@z=CUMzGLv9c&X<rdk)G2+g
zfNancVB}4|uq-gt7Q+m*WwA*1Dkbi-RLh(TM;&MZIKtSReUyX|)FHfd6hBS4)(;yi
zPEmv6rG_!=VB3hEIDxG!8*Pa(G=BJq7TidRY$h#Oap!}IoJ4sIQaw6zYKH(t$J1c3
z66uVNh|wGYS1)x&mCmc-rE&z7(g>#OkS>s(F^H7R=n`OAdxfBAK_w;7L^CJur-6y9
zsBDDpR|WIMtf$WD`(!ruw#1&9?%|{&6vj)Uf$IunNkEez_yD7e+DU-KqZNumCP1<Q
z0JlKx1Xvow5}hOv)G#ht3@|<sm9oB4wxkYpS@}{a_c1in@|FFNz&6$Kt~RG0^U46Z
zHYi$Bvzf%elaLwx*71p{5mR<bxKf#_JcCpC>VyZ5cG_gAc@rcQy~-x`{#xH{D_lfk
zWQ?_#DOr(fV_G0GKz1Q;bwvbcXVR{pvNxiRB9<~CnYvtsVTECVZ1@z?P*6rqXidt7
zIi$!J9Ef@}1F4CESVPMveXrO-%S5>kOEW$e8g5lYC<SW>X*21NS#9^WZ9Q9ii?SUn
z0NAl*<aLtE%~A15Wu=%^&{Ax=t40OcTr5~;Z6aDMeJzNr40{FpYuZ(&<K76(keL=Z
zg4!QYt@X(|V5Gu0D-!D4B1&<dV}U|CLsGP1Uwv$Dfra8mz_u(5%WA5Vl_GL0yIHDa
zDjeuRn|yx7Dl8F{Ld%pyzp5MMNp+wyw-lwaoXpa=_`;EcwYFqF)Yi=v^%~k5bO;8E
zVV%=S_W?%*y)22Y7ZTbEUH7@PB8GMWD&*DMfc_bSvf3T20euI8UQ6R!*NdK3&ZtFC
ziAm59n{aQM|7LFy(quCcSsOPM#L>DI1cf=H)Q^$v0J3y4F?O64s+d#fR1##BuCWzV
zc0*!mXSEcgS%>m9ih6<!h9Qqcp5nrZK(OZswNLYeFA4M}s|W`r9PGHmtW()MWu-TX
zAuQ673GGsk4~*y-x<N83WVJ4)f};HsGI!CrWS8Cm_&k%Qz=BR|O-6N{(D>rgPG6?B
zNRyzk?b;h~(}W{~Fo&A;2DN?&1;gmfF5{?9L!p9{v^5rjRqk%n+kA5=ZDT+*Q@%zJ
z>9i)BMq-ApAolotwaR{Y2#!Tr4N2l&4@zaxrb5X^q=seO8{DOx`6?%za%#7+<-Brl
z+5zF91w^UXq>!GI&s1TKK_eNS-<E!gS+VQLu%QY*Kaz@RR!ev`^IhRfRMZJGi+6Rj
zs1IaZq^8m)iRUhBAzaOB2nVi`{yHHPCYC^gB5pVYH^BxPf~=-)Nl~rI0P3ksYA!8`
zxzCE0nt#U@pJiwYAg}PHK>FxrE18^F3~FJ&sSt=s0HqTSNS4L&r8Y>cP`R9E_ZOld
z3>dDwM_P#!EgDXfSy_4EF1UV;L(dA{E}hyjpdn535+CU|i;`&-hoLi!ya}C3uf<TJ
z&jz+CkJPfCMr2S~sXS#GGikR>A_D|kshSCHvHez%H!rH1+n|wKxszyBvZBW*Vu9_`
z_}t{CAd&i@V1WFdG?hl<P-1P47}J1hakj!IQ~4l0>U?&<wkDfz9EqexJ6sML0SP(P
z#p0M^%UYd2LZ(pow&PgzzX~fP37^$Y)YZvN<YgO|zGD^f(_R%b`zQ)6NwOKR(}bek
zCoiq*Mky5s<@`*SZHAWHRLay!^?50Yshlo&vJxe>QpvT$!5lutLWyfkY!$^GyEVd&
zEfm}Kg>2F-g(wCj^?qX60-Pz}U`^ZdMymkH@iymn?5MH$>9S2U4h>2u9M;^Z%Sr>l
z!QmA_^2i?Q0B75u601aZJiebk%QmZaYH0VZ8ef_ZRaG?vYod9V%6MgDjscx1!_HQJ
zP6VCAI<+j)z?sXT!TPb0L4>5Dp{R+4J`igeJGp1rXK<V8XHl~8nM1w~YcPzg5}_Mo
zMsGzZrE@1LE^Z)f@WePO^jwN=BZ`nr@7dzeNDYZ?qs5OjC=NRp{i7T>WsqX?nOUJo
z<kNaD9X(=8V(y(owJZc!X8gI|RIExc6`r7FWbpReY2v|py`|WjK#)Jpc`Vvac9Kxt
z)w@B`yVauQ_S;9`wd(be!Ad&BR@G#@&Pi2YS-ZWZ#SIf8l9-{3O^nVs5o@_=W$ha+
zEs~~6M@Be3Ffy$(oJiab+1%$@-*#I|i?r-yyBbC!HFC>sD{HG(*4kTIVs#x8=1LZs
zZqVAuHX88I^QZ(hXlY4vKVq<%15)!VL9SoFvi8}}QmCPW&KS9EzEm!=E)b<(e>YKa
zO3}jVlI;s@ON@C&ck|(<yD7FBl+zkud@MbCj9Xe-5>$@ad)QaXu)VwYc-V<DECt;{
z+Jv<t?Fk~Lz!VXrP1f!~jE%R>Jcrprc~NyxwLyI9WB!eT--cU-Yros){+8Q$spGir
zOXx|#xA68A+=;tepm0#MqPG~R9@B40os3Z;-ddVJK4>gkWF;|ZZ0nmLAX=W%7#N0K
zF`u(VRr04;;2uJe-GuHir}M|TE0f0FqsC})AU^U;`Ox10qq);)p0Ws1Q7Rx>Sqi<h
zMtW)lpagDF?ayxbf0+jK$`=HyVZ>I3DLRNV2W0pRZp$p65z*k#x9I!B$T{ai@@;I5
z9Z7CP#U^z&Mp!HX8;r>rjuX35SA`w~TViW^k=;~An=#m)WO)wyT{RQS4_%^yNmJgy
zRv7Z#P+XHlSR9tf1qTD|uiPTEQflA!%@%wWORL+q#IB}+#so@m3;;}0G8Yo7eqMDu
zrongbf!-U+uO^^0U<#W;!wXDV66TOfP$|fSry3vgWfzq{I4zV~iZTm_=jmM-qU|wh
zXGyV+e2Oh`&Fo19j9X-E2*?P!E4ygwP+1I~8Ew%Cw$M>vc2c3pm0?p>Uf>PKCW8=O
zWK+%rdHQ4~#tdHS+mtJ@o&^I&vSLXt5DZ-jf!NKQ>_=E)Dny27gH$MMVp;=bO<Q-G
zATMdc^^&nH{4_{*t$ZL^q7WIdGEi<ALj|3qexb>43uZrz6;o13H)?yJ9u5QRHbci$
z=}KKD4BkTBL(pT1iiP0&x_i}SV~wQ6r<N`K3#*5Qd{uUgu(6|xQUR65Gp=(qt=bWl
zliE)sg5GZQ&FEk(bxG_eH)WY0tfE{7j;ZO!J$p8Ok=aKak#b=*qD|t+1-7NkMbn~H
z)v9F_m9L^sX-CyEPs7d_Jn|hspp#$L8B4_3>ePUx{^Zg__KrDSZzp1~q`YyD`l%bp
z(F97(5&`g?DUV}tDjnS@XJL+;s`RQ?6q1*a3c7Y0v!$wSB*51pzGDHFD7)ye_LQ;S
z1#f5h*dGI!mYhk<Xyqf3$qTG$8Q@-CyYm30HIWo4KZJn~;ltq35MCS*syq#pdI*S<
zxMcVJy+JWzNU8~X?^AFZT-H*Y95Z<3%mhHi4Q&c58$}D8MB&o0BcZ+6`)1KoA3tbj
z1stT54F@10;76h^udPfBsYe?fWppGP<#VZNLpO4+Ma4>uD_qxS;JNJ}IfSNEA?J(j
zlbf(cX`;|B7%CJgB*9G^?Ww#Co9&S-1OtW^`g+XrMmj?*Pbsjy$&WEsyN}gvf#S5g
ztkIQ()tWzip}`!(GczVqbMGn!<NzAdb^(X-(i%AWm&sE`um*}g&$J{NR%%N!RI8az
zLFH@FagJzy6+&X=P#G{@wF(^0(j%)kF@Uv)@il%+sO8=v3#XiGKNMTYmich4wkNje
ze9Xq4mx>=4qJ6AaxvmT+kY#aXW}=ewVMO?nyA-Tg(b7JNl&Vf@(Tb*s;n2sSN~2$7
zDh)OyC9;+Q;k3<i+AkOjD``Zu#d)PHn7H^HXczIfYedwKeYz+yKBh`TU5X0IG6(jQ
zlx0$wproP9qf!-C$;{S30ZE^F;8RqsVq})PaY4s@uCSEJ5{DA{55CkpkzV5fD}Avc
z3w<)9zQk0ADC2FK7tgF^D1m+uW#bUdg2vSJaU?`WuS12wsrkWliow(PU${9NhxS$!
z%gNWAcy?T=G2YgB#j-OZIxek<1-#yQ@wB@LN<51qo-c|$(Em#CoUl>C+ddy2@pKT{
zexcT$dQJ$h=cR!ufwSReGbK{f`u?uz+Ikm3$}z*L(5RvsnH$mOLn&uUvp@nH?Uc~V
zvcO+kqFAR?ToK7q&RCgui*7qFODr}RhiR}2<Q<+DkK=WwFw+?C$h>%C<5)2`!0x>w
z7VtJN5Kp7VpjG0HEf7y6Xl^{0mPM#}V;uNClmbG70tVM@+(3LZT)mN;LrGEP(?Gha
z(tkyn{bWppnm5MWrX4%`74c@~m6^3amMkM>5zj>v5o%s>Tv~5MyzY7MbQg<M$}EvO
zSHlEHpF>VXl*Cq9_e;8E^MDzU^hZ&vGn+b4IhW3xIh=J!iRbxDZpN3v!bn^dN*;no
z1K8|558}MyNlg<QGXC?u2OCcZhTz#o$bst0<g|poOtPv#a4z#eB`D^*+(0`NY$0>!
zMMd<xx~mKO)nagc*%v!$4auu7wkPj{Jd(`In!SUg?6ykcR%uyZ22??@Tsxqd%6>%;
zI64pB(UD3jqtG%+^g~f+8LMzo3aBEh*&-|U18cqMB%6uUrE+G~gpqTJm+PD&k=HE2
z1u!foVhS{zlvAoo8;nJ<n<b)0<Eh2kw(j}@iz?rauH2K!XQP`%p#&!#6*Sok1+*Cw
zI-HhpIu};i#;=qSE%me@5g`3!0-ZiCp|<8=Ulv>aW<0iHl=Z-#sWV!>m=H&+?484s
zmZVh*NkVk?N=hsQ^%5VdZ!{xK^~M<`5v=cAl(yF@8iHopr`zlq_*CNDzs7hYbEPs>
zvSsXes)A8bVL>`3cM>n%2q3tZDv(X{=CIfrc9udcEC-a5Xj6E_5};P@AXNg*DW8@Y
z`EGF?ow*r|EL)S?BnAE@s*r}mbexYB6#d}RSv{oN;MHSTJa9ItQpc@jUg}L!50|W4
z>zk1=$b!)u;5g#S{!?_T`gWSt&jH@VxEGI;cBRY47$37W5I`k77x0jmdO5A6Y0+dm
zP%2BbRl}mUQgW<-6<BiKaY4%v-Y>ji)WcF+78Ott?20|uY%F*9ZcK$*CKbZc>_w5Z
z-dmPICARy9epvjG{YK;5847AI?y>Sc*<x!chSq{w_a#D9k6sGF_NuyRVO_!307-y(
z@Svx#I{1m~+Z!Y<^$G!in!14jALbPpmX*Qq2vR@BP<Xl5Wc-=VOT}JxP%CTGSPutc
z4T>lTQ5;yPqLmV~da;5|$g!PYuUUx}gM`GCoivtxd<6|v*^FfIzG1><&v>nE^~ze?
znw4nl*4orR=}lv<jfFhaVTZ6x9I^Mt3h80SOxxO8!*0`ZG^qvJ{sW`ZD0Jh3BtbAy
zXflOXtKG{?FlH4{N9wB|MOW9Uo$<Z4Q_6mYHsKNk5phdqx%AZ!qG-(Ma>n8^Y0Ci|
zwp+%Akb5xySjx!JM08#j>0=334o-SFZYkD<u`nmLA1{W=RRNGZ%}HW#Qnr-1!KN%D
zt~g3yS={Blh?79Z+^gD12ugWq?0;+Ruglh%Dmj=F3%D32)%9&0i4h@U69%>(Ha5}d
zf)aSs3+?5xStyjZebFRd2F$u@A}_5SEF`pzUPBo{P+xt*caaN_u$bDvQ-4>-vdv`2
zqdKcs24=^kcqB?>&`Oee95iF@W;JSGNp&xF=T)V^4I8&iJJW8#!^CeTPF&m!7UqG(
zHiIT0G#en?Gn3X)d^H_~G1VHVDs9wDW>)cv^g3Eg)2er1pFZhDvR4-z3`E9p%dj`F
zTH`UPISICX|4La)A;)`aHnxFdjM3E!HC@dE(Ob%{1@ZFoI^ZA$m3f}Vnb)$K$|A6_
zRf{@X^IE-#S~j21Wm<qC$u3kQrj5}lC<#&>ODy_o_gbbA_@ijAl62|}RwA3$J=%8N
zzS@jNt53S+I^*`*JXFL|M{J4)3nZ{Ir<yd9R4RmH8gjMC`1VNRQ!;x6n-`0RLTgY_
zd`(6Tg{5?g-}7Qr_?dc@D+#^L{t&&B-pVG62^=JViitFV_I72GwL(MVxiWlLZ;wq8
zNiJ^sOgb?Sn-H663mtbhrozA^;Hq|_ELPthw<B+~Ik*pKw@rgY^+D~sBH*l4&XHz{
zu5vfvt}GIGFai%jDTS~$+%;OjGv!6h2X<V4x;V#nU`U<4;pmd6lC{%aF5pX+?!gQv
zWmWjCRf%WFa4C6LtwZ*SZ`IVby4GPggJ7m+D6Y0lJe?XMb`!NmB%y5aQH!mW{mq!;
z<K{xH(za^~iFCiNE411}x{B>kwKf;yp_`Q2ToxE$;0?cJ5w#sWs_i0rP8e%a(%2UA
zg{$q#BGAPMgHL1W);i(P_wtLa@#?|$ZCYd%AQ}uVnfO{=K}?u_y|UvBo^4@fynA7T
zmbeE@N!DY|iA&!&z`=*Z-pu`Bh*44NekAg8sfrz$1yT-PF+Ux0jbT%AlN|MW@AZk}
zmQl0?>TUyHgn^!3E?+9S9lCsO8ZF$<W{NW?p;QtLUojE-QdK*5m2^A*lIad#KAo(U
zXqTW*Cxs6m$G`(4jAB=Eow$5z!;B^hzbm+sX!44QG|AY80}C|tuqx>|d3WXBm|8^S
zLwlap9g&{PC$^HJ)_b_2YM2VylKN%YpS7ni$-<CZ^r7+7W?!YCGYjS=5@JIq8ebxk
z#<oB9uIaQOUKlyE@0!*L_QI)mzk6!4LueYaHSV0DRp+(Oy?<#S7^>4H>lGC4x-u+v
z&4v>nZ2L>Yj1GE?PbRWdM{<Zpd9iUr?^%sjvm1d~Q#PtvWwqK>XCq^iUSVr$9mt2-
z6L;P!z?7XLo_r%O)`Z+{I#fMRS!7F}Q~?&sc6?L^HcdCcvR$auLr#wtO5Ts657s>q
z{TwzfUL~)9=&^&dmnZUHtA%M3t4<<xF}r}2%1A0Oz~;LrDnhC-05l)WoIyD!;p*Dm
z0nx3>%tLYsQsc-==j&P1L@T?F7i2XGYkygQR#K_D%?G;vy~0eTm|`neU6sWh*3EnO
z?AUeh8Z>ccM^KwVB!!kN%cTmPO6fkEA{Tg?gOP;bl)y7`G32}CV<2~fMyb$*O4r<(
z-;8hU*uBehO_>?$O>HAMe2gzBl6uM99nqWIT5&3N0wD%S@r}_c5iD+svDt5l))d|6
z018=J?oF<)p&MvVYmB#@h8LNadVEgm5CeGn-FqTAnU|>x^s**ejV%d)A7YGge5_E_
zmANXdi1|oTDdNKY)rTHLi*W4nw*=I6+@+2+ty=w%>o#yBtC!gFtYqM9V%Zk4RIpNt
z--4?*>SP_=HnGW_?&(4i*0EC<^zI*%dRsi!$0s8SgjHt$CL;z+ZZ)8YXGJmsL}qJ@
z*YA}Go&RDv(5N|%H91nN2iz=-+?);*x+=fIMRg5OT3;47Q)n4UA=oA8`?3s7XjRI&
zMT4ffRP?p)OJ=69Vxt$@JA*Q;l%jn<LCYw&7-m{1bRtSrs&DJ8h1PjdnGm+BGQE^8
zWTZ(Q+m~^gBdQBHiAv$e%YL2~F$U9@F4&jSf@asoopxUlJ!6Npks%A24D*ZG3k7l1
z3--Da*}#C*v^2A22j(I<_a!k~Wf{a?q|~gWjU_oE#T6^YsVOWQ^p6@GlQ=YFuX5|)
zQ(7As&`S1#7n_`#zKQPjvLP+(dSJqp*gr%zGJ_N%q5f)R1a0fy9lf=VE;nMR?B}34
zEgvQ0gX&?}F`WZRQd5xE05ze=<jyNoa}{u$!nwt>sS#;Gr7Rs2ltI!dMpK~&UBS1i
z?9FQ%0#R5xd2y`E_aWyYjs=$$4ABuw(&MJ4Ps!QFOr6~)qtvikPBL^&LS*Hk5Ft)b
z&IZc_ClDhIosgYfxj@Czd8;~0rCk%wg5as=S@$t@9oEn5BjxaCRj%^$jE>QRx1KV3
zNM@L=?7}jRR}8U}V@B51K~z{Wmeve9%IX1*XeLWefErSDSj4Ml#VSQel|q3m2ga^b
zqX;VwkpOMiIM&Nd6ziHRkvxooRL=#u;K4SKZ}v+HBW_#U%|^?%QEO{bNya2GcMJMv
zKwm6lGNWc15mZeSht{)YIqan8pL({CS|Q~00wIN+z?c)ki4v{^9T+~OC))NDP!c^b
zeG1=_5&mpKF;w-LwF`(rUua$EG0FP$97kj<7%mUkleIqHD649w<_I&{1_`B18`&Zu
zlSiqOa!!E>Zh8;cwmo;)7Aii!ki`r~*-`w}27oA3oSU;E+n<C2ZWD-|um%J~uXF*J
z_jl`<CO5M4`>sx6iz93BqCwKIH|0S1GCwDZ0NQLyf^$`yySl6a`EJDt?T0?WTd_b(
zAx~MTm@%|LAp|taW?E({GW)b4eX}f(TvnD-zRHdKU{r19^jqu&joZ71*hvTk`?(~8
zlA3@ZT2Ldx=mpQ#qe^s&Bek6<;k8nuUUfX*VX`Sjq9tU|-s%ZDHYdgpr^S`!YstDD
z3rwMIV7yybGK9ek&8wC1k_>cdHc$`qI(hdfx(!KEjxK?^QhWPCxNK`H7Gl-Z-i+G&
z{eTwJyY9!3q}#RcOod(ep|W-*CM7z`UX3kmnI;Q<z+fUpGs7k^u^DFQOr_;fConq5
z;TxurjZY>qn970OAQ7%o3#f$e)W*eFmbrM}dQS_DW)0dmg|ttmWx{f}Rj`b>y^N^!
z+~p(6d@v>;;x-S10uG?qZoV({wJr037Gdg0|Ln*SZg`!-D5ZKf6xT%&VAa^eQst>W
zxL}Inpd06nS>Zy;h7J|yV=Skk#&kMn$4#H`bxZ|tEnM-^(Km+5_=;qr9n>6bOcSNk
zutkzd8i_`$4QE3{Y)~==T_O)_>XnLym3FF{#JD~o_~d5g9c@Tpm?<i0r%y~^NfX1X
za#}XTx0dusLsFWP{t443HcfEKLb)a6g#EHmVtIW8l&3{1MVm1A(%6D#NEc}i*asW(
zFTwhi=}h-#o|R&|X+QP|%Zrr2I!5FxsG|Kx>wZ3cew&q5nQBPHsFF0dp|aBrF)+8!
zMu2s;32Y+k{5u8nBP*4v&NL({tHO|}aQ0;}j#~WGkB@Q<H|wBz4TMqqN)1b>Ho>S}
zy#xl9xr>7uFtJd!hS4n$GMVjK;xQkT40;;HcNr8#wr`Zi!Nqo<k9nqU8`4e~`?w2H
zci|2(#=#_HA9`DWN#k0?0=|%VwtrKM_mK5ixYELcMl6anXLhzlzTYFM5+=~^QYE1x
zZR#Z)k;^<P2*@!_KbjMY^TuEBZBUUT8hmxvnzeQHOM_FKu4KX+n$_ikwt|y^pn@GL
zdkHJ&iG~kzV5oC_a`hT01nW`9Y<;GZfO(4TcjPNDK1Cle7{wHk)`r&I)H~`%54FRi
z8;Di2SbW{Ldy5W5(OdMS55>^{CcZEW*;nu3yivKjYizg%tS9gZ&*B=idD`Rq>Va#w
z|F5QVCbE$JSIv1-PdAhvl~ma(8c`HEEkM%Z#E~_xB9(lAK|{bOVNA(TX47Qa-+~FD
z#fc%cs}d=Vw;q|<b{HG+4AF9k0D`#|Q{7l>CS~%sOHVzG_~o?MAsef)rZrHbBX;{9
zOj)VF%Pm;L#Oqj%_2&n4FSM8#RjC}a(e5^l_*_X=aCc^4%*|8yuA5cLax&SL*sq`s
zm6_MHhizeG(^1KI*j%iusX-Hka6T#4JIvA2IARL+dwSxe)GnKHV1UXwNX8wsR^z~j
zl_aX+V&<?ct-~M+SEs8Ku;|}vM4^Cq$vQ;R1J(d7%g8|JRsW;7E5t8OBu<QWVhBjh
zMCZ3F=Qo61V-ejJn{}6H8&?CN`bR=)&_^+f8@cbYAtID&CzOfPM#-42J*nN?w&7-d
zHb5m!*_QIcI=i?IWoGbJ7R#O(rq)d(mi2OjBow5pudQ(^Y-YB#xNQ|7i$!nYx@qK*
ztGQ^}-yu$j89a0ip}Hj8zqBN<@#=AOk+=uw+`c^t-bz75H%ncCr#q}D{iUF>vNxRA
zPigiDO=e&x@KO*S`nYL5!!2nv+6H*TiC0rnP`f(v)#QL9d#z5>DIVWR5BY-~03>q~
zS+RvyT0NzT1A_Fnpj+akg<YG*v<YFheO;Pm04Tgp|C?k9<?bYK5K&5vIKMv>UBN(*
zTiF#<o9>=FG}zeSQ@<zs;=&@)C6FtT1FLEY_Y6WQb4n`Q71E{RTXZ;o%#%sT=Ibvn
ztN~~gQNR+06j*5siI5{FdUINigFu5onpo{j#`()4U+Q36EL<UJx7H_05mlts41$zi
z8)Q!$5K;YA%a~|Fp&mg6VlgH~8ge7*mqu6(hEG9CkrX1WoD>ey6GKSyL+=447M0Ib
zKN19kLc^)>NomKA>5?Rkg@z#()^Chd_<c-CE!Y)BxN3p&low?P8*X0~gO*#v(rovR
zZjRIL+G?$9T~B0b<_Nk?>FP+~VbmB+bPUBkZtlL{U#-kSYKV^02T@LFiRY%3N|B4n
zfEitBVgQo{q?cL;{q}hx`rn*D`cDECh@2~tv?^HFRS}hUstmZLW}_pAhNaf$M-fy?
z$Sops0|$nvpwmci2Ncgzr(MW07Q{jEf`tf3Sr23~L^%oLWeakGg0W=!uIiM`PK{;;
zy<Uctz7sZpDU#_%rJD$l{fCiAbe%vX7B6Ftfl#HM!dxT5Q*Co&Cp0UYw75jGpDd*w
z*7-bVd%Gg63Il9Cu#ZD93uJHLQn%CWqB+_LwUO1!mqu%8@!hgO5%$db-lbU9iPa#0
zPBO*nkS)t>#ZpX)jSS)PH8uHBOsCQ1s_1iq=9T39I@5q?9h+e2-hzAOFh6?Zxu1j_
z6U3=43>r1CgFIn=g8^ek8f|+``omlOY@r5U04OS<DT^yOQRDIgpzg-_P55vUV|n!1
z?7N~&sJ(xf$2lc7M(RhFr_rV>=UJ>+#L7hOn;}AWeN5xd1U<^Gl8`XN2(G7PzpA)h
zvBxRQ#zH?nCf0-yo1yv*VJ7D`Fq+UyBkVMzAuLJZgjuZDyC!&Xzpqc|0XDdNSH4Js
zOBYF_HK$FdbkqWjSNl)!1qqDSQ4M^Q^{K*iaM~gfK<my250#ge>D;U|E7KjqTuQ4e
zv|#yUszF7g_rSo?uM2?M18{yA25AJ4!6=*Fv6VBi&LzvSt+-FL024>fuyyR_?!709
zsSZmeDr{K_2!gR$3Qe4MY1po`r5u*U6gx@dqgjQ3z5|DBqq7$%aDjWa_VlDJbWP8;
z+ga5*F^svn6Y<<7zv%7ZX_!;NPh%6@ENdra4%!LX6Shy7V$%6P6d-}Rx<TX7DMA4`
z%`Fg(WM;?nE?Ltu8x^An2LVQGj-ZsQHg(3z4wo?nGJ8uCUo(fn3sGO6s7P^}kW=AU
zdD7q5EZ59rHlfrIg?TFE6QRps!0b<pG4ct;x3;AEE1~m36sat`r*XvvZ<dzc(0ME)
ziDH`a!d-5w)1E!0BCW37a*KgnQ=~N|2LC2XsHZiC7}3egK{;_^4wUHU4u>XlFe2Xz
zL9qfokTyH}?!J44O*?%z@lYVj3L*46{}?JiF-YB3RAuT&$%Fu#?bW}f$*kGkpr_}8
zTOei}46_YWy1bPO3<(ibF~Ka(38wW+s-8EGsXt613+28yaYM0CD{O;%hb_7tLTYPW
zk)>?Y#-8o_zp!<WMp?@jI6@=oPSrTGMwL{HYnwPW>SWk&XKvZZd<4m@C!R(+R=&7R
z%B69V#J5en6X@o>P(HQpZR>KQ1qE#v6&M(dt*Lu=?%sqp!R|d<uaIBjp%|vRphy-M
zOn|JNCwf3yjl#uOw)aV7SH&?^#&JBaT{1)4A`(>Hi8J{q%r9dW%}edf!eP@;>FgUg
zasxe$aC&z9^j3p4U(&5<OH`GV23&+&J1i)5moTo7KINR?NaB+Wd<MFGvrB*_3z`a6
zUAK{2nW%#;h6<H?(O|2c?2BpT*q|o7eRof<=GJ+*NwQN6M}z{bqV|5V+oRfkB!k5k
z7pg9&7p<oerhcVClZ-+#p|R_3#rKA1CD*dqx3_!>awBd9y>yK$nFhezC97UwQr%=A
z0Q+aigh`@V(9`P{Q2KZwo@2U>b!kEQ0(*cm37w6gLP{#wRl85NbS*aC<4jjei!D|r
z**RlGQ6O8z`l7L7+uhs84t$Aai+nrM$;j1Rx&hKCl^vEsNJ8G)u5lwyDzL0)s-RXO
z190EQ&D#z48$&Eu9T-ZInk&|PbDMzaGT`jkxq186&7W`Cu4+gbA6~lHs95Q3XNDDB
z+ekYCoYxE0!234t*xAj#=@mw<y1kE5XZoxp4lqz5deI1$j+OdVr5oKphQfsnrApxC
zD)ug=O1-{;ew7D6WPESjE(}rO3NFtI>}II;$6~~4?o@(tRoTH!I*)1$TkeWv(TG}x
zMa7*3Fss7Ia=byhdsesD*lYY4t(@Yl@i@MnBpE=+N_+;3SPyLRSPi!ds0h{mkq{9o
zm_6IK?%b)%rmoPUq3IaA>@KNK0s_phUY2r%Gyx$6Y9U_6a<y)$8dm69@)yzpxHV>;
zkpZ(*<_bu$Ga9(;(-xa;8JC(Ko`;SU?q`V#i`}w|$;|Y_{A8BdkunNzDk*Lm#M((x
z2wQR-@M9~C^=YIxj6o6dNhZOt*`q@GVy&1PW9Y@r+AS?r8_W##9q20<Pfs&Uq8@3q
z#dvNTVR3s(QgdjbAqq~dkMl7Du!eE2OiCHnmN89PC5~X;Cval1k)pV+VOiNZ<(*T$
zjgh*{)sB42T={#>IptWSOx@1cF@;brs#ew~@~+lO71F@c&VcD$(Syam`!Y!YEs<tQ
z%>z>{o6~Gi=uFU(hl)wOU<Ql_L-;-5+BY;*<$@j>s+W;F*RUPUud>Co9Hp(MD`yRf
z;n<u7|9v;D2ykJtFa+5xwoTh-ML+;n-VVg#Fx8;~<tqWDz|jcu<|t5KViZKH;1Cyv
z@QGl#!~nf_mMclNFa|4Qlt#v*42d#A3z7<%iAj@KJe5jpV`poYZ5+fRM&)RdcoE@~
z#!Nk=AV@SZ>tB<%aN`=w!cyWFU*b+D0nq$W0b&t+Y=o8wV?*@Z%3WlkiI>%LgBGLh
z%$iAeZ)!o6HRhCv8N)lAfx3NH%N{SB<>vWv=+p+a3bqUIDJd!-X8kRdqot6`n}OP(
z%*JAa&ts<h(MRGbG~9sf)&;d@ckD~%a;rK(kO4|sDOvqTQ?lwR$SK^9plD;2i@nu&
zlI<e<GOVi~ln66Pv@HBGfKw<f;0TD$6TJbfoA#Kn?(G0-Anqd*u0mbG4Ul9uc&fH#
z$DY&$6LhR%m~uyn)RjO<mxlq|^HzsTJXZ9rqJS}%TEs8LW!*abu9D5o#zZjs(8rgl
zQYs`_McAnK3sg$Q;W;1{?8KJ0pBOK@ahb5_c!4`Da#)ZN)yE^XGYIPZMXCw{>GoCN
z>f{g|_>k1U%hJy6+K#>}ccNrJa~qRuT*|$!);BReF<863%M}C~@^>m-6clX}kGtBe
zwujbDrTC1E_gegU{r|66{`x}Yx8qv#ieHc7+m*mHjAB(Q@k5RxtMP*4Xl`%#Ax6?)
zzI$g|;=U+#{v=i?SSOZx>5j9a1B&v>YLc&46BS6u#8IS{$d*;4cVPorj;@KBsbSQO
zV#2!1EZS>9#}#GPqLOm5-@_P1;CjeUX3Paa|0^I=8lsm9a7&lz)P|CRt@)uKF{op9
z^gVx6>NH(qctN8smNHJ!Dx{C<g-(zph?7H{0+CrMDral=VZYlxE!{(OZG4muT=9l|
z-&lp91g1^9X=0&@4OFd@`&J3a)T#pq$7d~G@F>`rQB@2~n2m~Rkh!g7E>Fm`E$oB<
zv6nH>uKWS#mJ|^iiJ(betd+Fol}r~Tj@qbGDwdxaFf7|`+5%*fRF;Ig7gGl8EX>Gv
z3ChjEMhOyIZEZH-ZDto(Ih8ENU`zr?WbKwJ4V#KqbSPNNVFUuZ4(W#>iRunE+dFNc
z5Ndli`qH+E5X9OjG|<rX0x=~w;MCI6+8?OfdoId6^7bPsOV&GnNC$t^9JY)wor1Jq
z-pH2w`jP2B8L;z_WevoFNQ&yQJizjvo22SMoO7!y->_7bv?}f-nJIg&$x_(1)IpJm
zlseLb4pquv(kx-1`MT4A6fzocJUycgB0no(O+tl2>nC7}{j$9v9TMOn<>3O!&|)K(
z%58FyGUi$tw?h<ULVc|zVYbUV-ueW(J}$ohf#6ePxovE5LEVb0s@N<jXes^Gx&tuc
z9veFmM2#wo=rD~AA&h!TI1Cx0`&nH>FH@AuQ0dh*xw4T0t!1?_4-*P8v!E#*Sqdv0
zCh0SQr|iZCgS&0_p8GcTcGldtG6I(6X<GBpy|vm5`WNC-4J!<Yn()B7)A)g}vVYI@
zC}twVz!VS|A}(zb@wB~2u_hBEu|=P>V7%Q|R&q9*=+5FLt*<H_rYsO_>9rZhR6tZm
zr@y#)!~~UBE0tp?so}Z)niN3QH4W7xJOrgR465#dE1UZ<WG2Bb^xxp6-9&oD4&)SZ
z^;Kfsieh;CpbnUth$|ot6l2LC*-{wQB<8*;xC@v#nS`e*q3~wgqpDlOCO^9-$)32d
z(EgyoDhBC;Gk$J~6?@wCL*USFvvXCBT3$-&64Huv6A_7WEv%i{C@bzO(kI8U!tI2L
z3@gRFUx+P;W(9NTiTKpMuyId=X*9Q`(r}upu_4vjjS*FQiP%7XQ8|=BRLFKwNqR7S
zjY2Tb!eyAuJ&vlR>J%4`X%rRJkpRim2x4d(obogD$ZP~!T>`KMX>c0Roh*^HIDNAb
z-OvGD9Rxb;p1-)YvBZ87llKba#ias?KQ^h6Dl;!nbt~^hC1OzajLHa6j*_w}nn5pH
z1EVQbo{$-QYDD*Ml}R961s?$ltRpy4v$25i8cjPZledFOE{wYssWh~BZzxm*DoTJ0
z<>zxzv|lk(nMP3AxvPz7f-h#2{zL5WAh(LB-V-A;co6N&*}14%mUXVOr%q;ptgn4)
z1@}FT(TQbkQzxfvgG%vX<p%f1X(PRl9-a6?_f*fpbq}taS$AaJ<ht2)bJBB&?g&;N
z#bXh_9a0I$D^e~6xOKJmsfa%_c6dw-NP!hg(QY$^q91T^B}Y9`rUNK^kHHf-b@#-k
z93APeW!XyH&FxeC&jNnrIy0s!WVT2bwSdg|J+TmnK01?5^+B~cvu3j!rv#=)MqL}1
z>@w5Jwe@9|?Ye*GPK8lM`>*nJKd|L)g>|kP7&K(^yt6yYxM|xy4GhCr5vH9nL=JXd
zMe+T68RC1NSvGO>3mIKc;^6}A!1j>HKz#GMRWnnQ{xDU%`qR+#fPdw|V6p8opgh$U
zrYTBO$hO{5k^Cf1D40++kzA|Aw_9Y_)$F++HGo4i<FF@54<pO$HdKddZL74ZCbCl7
zKTBOl;fW&|8uYTD#3VqPYMH2uFteb^2g?&gLv=MV*){diww}WTy%jp<-L@=}rAxgz
zj-)owE#ZRGw4b|w*XOhQy%%QfYX)zv(Rtbjz1}IkZ_atyQdlrp(O<p3CR`63lLl+2
z0|k+$;z(Q3>EV0diY!Y#6Q;{7aX~ih!tyi{=)%;Y*3K+PD|p_KhK*=&CHwu8EIZTm
z5;G<Qp2cXE-QIt2WMXo9b{lCsS0O;f$m>w_9pJdYiV<Xl%IH(dIm^a|wvtBoW_W_Z
z<5ZKnjE=jFUBi4j_y_#{!Lf;{gX^+jlC8k;jJ1-o{N7?!lTBVP+n=W3)8i5~aCbK_
zrH!C)_1gXEg>WotO%3hW$OyHz{YZ)wKD1v;5185o;sm_dqq1>8{m^jr`hlBuL;>Fg
zoeJRAowIZ&EZf%fL(`>X!Ziku%%w6#$8*w@sgAzAZGC^8vDNIJj7+b9jwpR=W{f`h
zwX_dd8>_9`9@@5f>y{n8>*{R}$=|(aU43Zq>t9#77W#H{#J?RJNT*w~Y~9eh(Xq)X
z+U{V~jJ7PTeW&i3CE57g0dW9EtbR~sD)4}o2(umA%cex&=*TX;)wcn+^D?e0!aL@C
zzmxa9L25D$RXVpVCqZCZXDYa$1wl8ku>*t1N+S{6_O*j8>QxFC`J&-<1XV*T8yuZj
zH%S}Sal@?ab)%XHslKUR2Fq6^wrTETs|B3ti}wfk5r(DHu1M|-MOrS|@l%v0?F!Rg
z_7pi}#ueen{B%=~R-g1{$#6Pb%da*YS`-r;iK211k$%J^=kkLz0&9IDE9{uuFX|wL
z85rfM;VY)~(lU^Js%Mwn5>xeB{ji@_7of|+DC(&W446t4TD8-UiRg~oZe_P)RyshC
zb`>%4^mDfZseNjb&eqnf$7X>d2jf)KZgJEefe^I#%5fBBZol-o=C&y#F!XaZ0cD%e
zUafBf_QBL>U5t3x8pxtJG8{2<sS-DOG5)CilY{L8ya{msz~DNl+vG9wuh493Imyu=
zq^1F0?;o=`^ds7xL#y7EGV605f<QTxf$T;h@2_brCaDqGFuopS3_UoDW6V6*7teaX
zl4DHT_lfYg<L{l5rn`T5QZ&I1CM2nj1Wb0Do-OP9>a)yGqZ4DZkP^m)(KfM&8naUc
zLt^EeJ#p!+*{5-*!hbmYC-I+)XMIoZv6yR}TL4B!`zVuc9c+91CgzqVjNR8bQl(j5
z)Pd_og`@Q%Y_Y>uuq~ej#v1JU1FSVY5LaR?iRP59bCt<st#yiY>fZ=qjUagZF#GA@
z@Qy>XgxBjvPaStfV!;$!>kY1_DvtDCutv`MTAxUKgp>y~{^!zS^_vvO=Ew59^8C2K
zy-ZviBj`i*ucI5Un^-pu$4>wHg;y`V^(g(r9DVH<o~pd3@Hzf35>N4e;f3&@<@sgY
zxl3>T;==_`(dWlBFdi*)GnKobXg@!F57kGJZeluH-NigFz1Fcqb)7R*`y4!4j5DMs
z9AxMp13y#jWt)_%3J|K!YvO-MTbZ{kvf#}P69*dRgVp8iyYVFm3L5w+zICpWT+O<E
zR;Z^aO?~wzr)&nwGReu>2gYkgE7IjZ#Hn2Hlf~^j@-fpg;PsRp;ds%^!w|H2*##q6
zW>bum(T;L5)_2ye-v`ai;?ft!a$M>{o@3);Tjc9v7Wr@-7OqQF^zLYZWN`@!eA4jo
zDOo`yN|r7%vFGB7j4V4kl4X8BMV4`$LzZ86VK#4m<AUJ^1=PvFPjHyEI+L_u;MrsU
z!7;ICC7z459^+}UKeL-qneth33E#sb2OZ-{d21mCT5W1$LJb#O4Qb6JMHDB|>M%xI
z_Ng$Vi?Gsk5N+C2`8rog_t{g&sx)((I-*UmDliJwcQNIp!Jv?*8KsuQW9GB9Gb|0W
zWFIpM@q9JiK6SUvRF+P9NY=3;O>i60x}-_ri6<ba2=lo<xT7Mj1NU_5Q52!0ed<=e
z*QNGEdTFJquKfomrn~X$5l~m><41H(ezy<YTH`tV_WGJGs=xYE^uFToJaIc$VPk@m
z@Co0QamL0L%n#p!UCjF02aqis(9ySo8AIY~JekhgD{o7HUx8!B9gkN)6~;5n{sCjm
z3<^Ns!z@MwXNT=vI<!P*M`f`9xG2cd<QN*|f>Sdp5n=w~v5eVOBI;^3AR=vX)SWaw
zBlw4bu&+QcbO5$>aLV#wO;s_WpfOZ6mJsENvXhh%n>Fcw-uxe@aS!t@+*}i3rwBXE
zJ2P;$D8inMcxt!i2zw^t9U*LSguNJHV}xC&^t_+N*N+~%2zb{h-`8;G2osIDHqyQs
zX{~(-C+)c=T+Z_hZb^hK$JY<aowaz{b1NgQrcHHSrCpDoU8?-_uHTG~<kNBW+}^cz
zbet6ZES2=`eJ9OsjmOfH3cKP>9-F;l+(JN4+!+Sq%0v1yZbPyMOjOVD3m(>E=;L%{
z7Wz}s$=N?)gCWcA;k){2Q7YqIs}cdm7MQG412))D8>Vu_*tZaaI59Od{vfb|uhdkc
zIn5_JALI@cIbXwEs5EA&cR#b=6wh!E3}Mr4)zH`X;h}-U$B+bi_s<~sVl}hD@oAeJ
zG*jrF1){PZ)yd@jPPiyHJpSO&ff-F5dXD(hCSF&V()kR-vy2$+Kj^yed^<EYv!8kH
z;1OGYF<Mw3YxSkf*+gNs_h&XUY)+C=H&nrd)`C5(laE>;^IVw&_gCjYEE-x}jD+uZ
z5-!c)WBrrr=gf2ajg{L^rIj#*$b`$VTACa6Y|Dg9dYP#{aGQseL~vZS)li(3a;wOY
z?>1ZQrzW~6O7AuUIZ>URIJ9396v4Ul*6-hlYr`$Wt;98jzcg?D<CA&oH@X#%=Tkgy
zkLSmDUKY<!<gE|A9?#F@turb9b9w8D6A}Ib@vYpzIg_^@xADgFt9k3}a}nna;%iJQ
zuk(59^lR~ak?^(t{Jm!2?~Ui><O_XK{O`39C(7`>E}qXu_<Ej2I}~R-X?yc)f3c0{
zz2y5ugb$L}#k}bSXxaBp5dVz`f0!~qNBA<rA0>QegrCk^zn=1XHgElw=%3(I$FHTb
zQO6S<5&jDK?u+Nw$?Mg4rj8Fi0{lDk=JQSD^`wWNUzWEXdpe$Lgb(Vu`b&Jy=;&Z}
zWQ6?y)~mxqv#e_mg@KEGhDY@|zG<qn>5lb<ZiYIT=EYB}sNY`ef;b{!8vg3&&grj-
zrb*VGpfZB!hUHFRwG>(Q#gkc+(HeNmL+n)tm8rv(42ZDmTZDy#5e`JWtZ$UnQpBR1
z^=&D>PIifdk`kHJGEnc(5|yP7aLf3c-&1^(PunQ=n%5C{S81eJSvF2gUfO?P0N&@&
zR}YV`o0y!MIl6J(z3U!W*S)T1-QIQE)@?RfT%rjz%EEP>HakcNLc)Gl1zOVymgXy)
z=hMsB_|$}0?1|BtDXshTz21+5AFk8Nb!O2zl&$_%94o>)vsQhh!?y(h!(C~#VL-cv
zOmi@kaKU5?d=t&GitrpKOSBH48K41X&rx-En04lh`U5ydEK^EWr}x&k;Wj&dTt2tp
zHdkhcL&-z@1Riwc2dvZn;`vK&y|vzbd+z3auzXk8LhdbO2PyomQ{}V4cmf!#=hFAf
z`Y#cOHQ!&nf_n}32JSrWO<d&r1C_J6d{_7nI(R=FVJCRc{rLyWd9LNn-&dEDuQ7EE
z{z?31{8RYw9N&K&KgWLpe*?~bd2{_49^hfJe!htw!83_YeE&7PCV&2emH47z2lD0*
zh>qmAfxP*~r|@gI!MyoDD4z{Dr4?;D>CbocIrwZSzwZ0AoPj@>U-#z|0bcRX6Ibx{
ze9=Mb`2xMof)C}*f57twMfoagC+c`o&xeWAY^CQVZ@F=;gU_Z2&%N}5^XX?CjKN%P
zrC0ps8&g)wYt+GKGkNnza|dtynDVh7oD4S^`5q8`RVNIvaOUsa9y+C`O**f)XDcca
zo3|^`)UeHu76}=J)~^{`2}f5=O;aD{S@roL-&oRE7l%)n(G$&ra|IP{=pW>dkFf%s
z&Jg_^X&>xt@45rV+49@3JrJ8f(}OZs06dayVd+`xR)tRubGo8`)Z+Kv*NsYTmaSs^
zuA27w+qTEz8Bd(O)n#hf1KX!owNKUCN5yC!yIteanKa)gF!?RHkdG;a9A&#;fIN*2
zayZjk&tqPJSinLYWxfID9aUE0=vbx?mKU(_;cI-m3VJ5CA?sSb=8m<W{M4uK{LIEp
zo40I*I#k1)S}Ke-95^;;S!bP{tNu>^SA9SBrH!~vxXrjNxb3)Y*~fMhzMJsfgzqMN
zH{rXtWuNR^oz+H941cAo{lF&D>-pFNU+L0|hg)z~8y@{iTi3zqZM}D`Y(I8j=z&dJ
zPbk0rx9!{5zhh+cz?Q-8i7y`CGubn>clH|^Yk%=P?ktjeZ7m=ZmI1Z8#!$wbF@CJh
zy1njaL<C1#EzF;TW`3>uu0=@oT^4g4Oqs^Q7($G&0*=3CX5~xVhVFI`!Lj8x#Bs_L
zZlz+3v8Jy}Z?}H<z+jylqbJ7+o8S(MQC0+XgIKJIIA+^FIWR0(bHnPX5c)Psv^v7O
zp&{e5(Q7(he0PwHZNgw_to~7M3uD_42B6+QRaXr&Q*K1GC5%*_WfolnFNLA4I`TE0
zS{<$Xyl(tgJ+U_s@A0~1*OTJr>!H%BdJLjgU|~^)!I>iy^(0Jz+St3HWy+tS8zb69
z;+tK%&F))OGRY#Qf=S}=UTuYVH|%3z&khvSC&pm~*%?p+Odi%+$-71BAC-!$%*A)i
z>Q&zjNtN$WrL>P1tyi?f-0%Ra^%RW6bP^|4--G|4?%w@|ImPN7v(iQVo3~@cvu>Jk
z>}N($js2sX+9ay>Pbhc2FhEF4rh0m>D`U=$Hz`}=H0!&?TNqy5G+~6t_Xf9&pYA^$
z3aNC`&q;NpAKQGzi09tpnW?e{S!T1tAk`JB$$N6BE`c)vBhz)wKo&MQ*?+7a+ZT>!
zt835{9rsHRn5(_>kdD<f%~y_RwlPz*426}!p?Z=Yo2+uow!>|RO-Xhc@9I6gPao%!
zV(FQ}UycphI(23YX)}8Tqm}VR*sPUX3~zmMMw^usg*1e#x7XR}8*pKsg$aB$-b6VH
zkN1z+9*lgaO^jn;+56b^u(B0wd*>X5p1DieMF{nw@zI8N-!ahl$wL%^Wm&`*#i~z_
zgBlr!^)v?_@UAL&2h#ZAIR>iAXnCb~Bh=;hX~U1dLji+Y>V154=7@-)J;w;(*+;gA
z$0#pg3{}d~Kx9ZKGGfKkGxUWu+5w{ldasoGU<JlO*n;6|A0)1wOJPca{#e-#R?;3C
z2RTNNynI0xm|d#xBG$1f13VX$_;(!+(n-JcS#`G|U&%v5NNm$#6`t?qdx;u_YY4^6
zVevROZ$64L<NA*F{;2Jk=s9&ho>LPjPLKy5?)Dx-M$bCiND&mTVTkZ<-Ar9BJ*$P7
z=P%?-KC=b?V!mYJ*}VA&&H0iCAH%;fUvl^a{!09ddGp2f`H~X~$KU!Wes{iP3v$mN
z4CYJ5PUBDKOMY%I{;7P)2y2%gJdrQisr1hRSKnXEmyBM(e+B;}KKV{QkBnnyzWCqV
zm^Z)GlrPzU+~Td}_%(d;-O!D{AzyNIJ^oJoH}L!NCDXI`v-y&re;EG}^3!+nn|Koc
znSAm8Bmaeb@&7?N-#U{oKCAav^ChRAz(1caxsUuVW|SBC%*CAaZTQr8WE6jGzT_C?
zxY(O7`Rc3q)NiyYZ+@G4U-KsK)A^Dk;NjxK`Qk?v?=(K;y7+9q<Y$)Szes(S;#1Gf
zz4&i{FTGy?U(W!Cd^bOZzcgR`8<gX1@_qPe{FV9Qe@y(hd-18y+b8nHzw{#h)A-Z)
zD*s;mbHHDgH@^eEzCDW%zP^3}zawA#|2>CKIVY*d+m!p7i@eiL+aJN-moNDScz9=+
za#G%RsK<Ta<DG{|FL;mUOFpG=@Hl%G|CxNr@zeM(<V)_P9PgX~&RYDl;Jpo>dTrd0
zH(#PY8;E~tS-xZw<-62DJ5ZlXYx5;{y@F49);*6;``z_2KIK@ibi?`LS;}*1HeWpS
zD*hw+;;)^+e>`72dJdm@56FKmU;GW)@e+7FK8SxdUp(H0|9ZZ7W*YxOzWDI6yoGi1
z;@N%pdA|6Y7x8b*7auu`4_=NvihpOmc<@>LE#PrEK6w5{8-8EDc;tEfiG1;im+`^-
zKrcS!dH4~0+V_awDbLBh_>||+i})|)i~qrC{8#eD2fOfTmv0Z_zX=@5v1n<&_-9GK
zh;n@ON&J=M^E&<(%16G7$bVMv`|`z)4B`*wi-*tQQ;s7_PdUD&?<&Vm{KxtJIR2B=
zhx``N&%a517SYeY-GqN8Up)P^#=d^5Rv~k#--p7DcJZ^~3>a*(^pJdtA3?Ir@uz!g
z9USMvG{mi0c73a+Z%uT*zGdZx$v;xSbfD?qKaKv`{z0yY!A8hv5;hODX0?{qoA<5g
z+tBve^>^QO;+BUx$n)kErk{$2>bjcrR9$|Dq=-2c!dL7Oz^@q1FLT!FT4f+(Nf}94
z{U$hV%p53lCp{{o*OFPbjU42gY}onH{{<tEzJF#=D$meDQ+;Nw!TQ1OU)Op)iO}nq
zqn$inHv_Zqk3o6EyaHM;QyD8EG=Je$v@aet!e?JpA?2RvzWeIgK5DsdGaHTMkFRYN
z_Vl<*&8HhJbWr#6wT4z#+@%!7tE+gK@|EJPrYZTKP>vlEX`0@!wmwZCI8esgTjeOe
zn;ui>6)UQ~ON{}oNXHfO%4~C8B^AHpn#!hsn5+!JE-9U4c%$6w3cCAbM0ZS@O}c{A
zB#7EakoAB%*NFFLJ9c&7-@9kCbP7%VeUi$rVgg@Pyk*&DSBABIx|zS5d-v?r%Y6bM
zpBGa?;aR!VjhWNQ09ZFI7U1c$1<GPdHk(Y*2$>60G81FK2>q-IORF`F7C>6ePV`H_
z<J_dro60wqoSL-ZZc$9I^^N4A<syxBCLPBa2dh%#D1HMjtvEp`cos%fnVT6jW>Wj7
z#ABOJ-GIP`6xOL>bOzz;j3=d@s!v^KwSect$TOViKV*s%<;q6wpygQEn_=9Gl8>Sv
zp~G<63$KqHtQUIDz^#VQjHLpLr?9bNe6$t>zHWr8w$nK2-7)Up2Bt@m{=sjEhmucW
z&_n~-JQr&Q8_K|A%``fLTFjQMJF~4lo3pKUMh4yTZCkQkL&roAvOQaSGq<fKJA=-h
z_jGU0dQ1wAu4?}QWQ)y@u;1|pAbGw{`!f4@TtqngO0(S--h2!DEI-@kahjhY{_F9~
zp3Bd!jpwuM#nj@NeU_7w%L@Jl!Xs_V(!BL&9`o>)HlCl2XZDPay&2D22#>Tal;`9l
z5k5^EWT=AKLYa%SkMaCWgsaR={(Rj;-a4VYs7uSUlv89@Y0m=lWIUha`C)%<We@12
zWW5c)yk*I21T4xIpLslQzV(7X|Mqi)pX2$OeDS|MlQ;j-b`SrzE5V`iC;lHb^Ss=j
z|7<;e@yoCK6Y8?PJ8x-S7CyM>X1;6%4}1HN1HX~C_Ax)UvVUeiI5EFFZymO^kANX-
zZp#;ccPa6h7k}$z-n;U}zfBohnIA704lQ0wtCmMUL%7m@41YR&$+lW~KN-GoeLe5O
zgM8sn=}zO<@Sh0(DSY<x{g>9_dP^+#t$kU>MppJQsOP1N-<!U4@sH)!;_^!u|KHbf
z)c^XW<y>Xk%Gx;B>UjSYr-1hxy+Yqu8bBzlpbW_Mku0n1xi#C@KAs_h%U0F*-~Elw
zPqZn2U_ye@tel?qOXQ`spM=8f`$7jhZiS$;apwBPP=3^Z#|B4-CU3f41b+a2e-!<u
z>v?X*^&dgkiN)Mu{QG*dY{RGF6E;ikg+p*R2(2C>{s{gEaSm_6(JKz`zzyP<4Gs_E
zh<}*)hY>6vA>I-4nIO&412_nUW)14_dfxiY7xC!_-?}kxzJd2|ErV|vB^*BIdiw3R
z;A5^o&-<JB7x2&Fzlnbl|04ctdCU7V;^p{FyuXCsjQ;{Y<M5kj@N@j9@ac!&q))$p
zIsWtbH{w5oU&Dt#JxBi&|MdPgeE85V;CyR2?;X6K#$Sp5M1I|$K@Yz93h(seZ&8m<
zrN6-YTKvcG@5Fx@pML$#vmGq3n15;3EZgg%_N;@MdHrYay5$6|dGm@s&7ZWViBcMj
z(a<EtylZojnRR0qVtkVG0nBVRm%9R(_8zqUOnVMP;J<3vCaK)cj4=g`W8&;<^op3!
z(8IPlNV3^=ZMU_51t0$Hdhrzaciqx)>xuQ~mR@@M=ij{a_Nivva$E=RuXI-Aur)er
z3$9V$hdtHdesozm9|k;*<M@0p<^_Q)L0Rp(=34DzOLfByKb<1GzSdHEpS|gi;>2$a
z{^xNLIs9k1e}p>CJGi%TKfqnU{W0zh+{?Hpa2ts78tx>~UbuAWt&`Gq&@Mv%)W8Vc
z8T~X)tC&AAEC%Dis0(TaIFloyl7uUEZ7T03aK#VtLN*~?M&3DCD70s@k>H-&Zr^Yd
z?^8$i>j;%?TyTCW>p@=M)4Mm@D!02g+q&zgvW=TRPdQv>wyB3QFpyp1%eg7WBC;;#
zy)63z&thbxw^&yoziouWjvuKXM8Smj&3hQH2<At`1GqXWd1jpVVLb2L%9vh_TZ6j;
zw>I0g@$*^F7k5#fP1)v+`1cX_{!Q7Ap0(LF%Ce*9j_h9Z*JOLlUkz`>sSy|w6O%}|
z%TKbuYKWg3s%uLadGshpTl^U;4M=`sA4u1Kgpes?1G0WrBAo7-7=}j3fQfU!oHxWk
zzVfhR^K$}`@}o^NWo6L5cLHq81!;zl1CAc!e*MVEn52HtrFa;0l_Ad1aA6b(l-V|z
z8WX_D)Q{q_tC!g^Xr38yYG(G`o&TL0nT6kHKoT}2ix2p0M;LF6jtv*?V#<>+gzJ7^
zY7~$YQCzL&FAaC224YxjZ~#?uC`YjB1M0-(_A3v=&lEsd)Jfl#Tg1KJ=tME!)0~A(
z#*sm)?6{kgfOrEVlU#Rtkh_7a&vk9{nEcSrl21wdkUh9bjPaMBybPx78|6W&JIby|
z6sPQ~#;v9H^8{X=#sns$qD+_G{{820FX7JOUc;TkL4W@JQXKT>-?!nqaO-i~alN?N
zyk*&&c}vc`l0*CRv$$7r%qKZ>M-H9NnL9qnyz;@NxIx@9c%H}cZ@j)0V@T*FYQ3~h
zD@`tc&`@I?gdtrt$_8!P%nq^vq!U8r%-TPyIrlg^-;BVT>17rwDD;zg@n>{+25l^z
zXP+Azx>ElvUGw00=aCUMgb$4jtf}37cdcvoll(wUz_V642rc4h?ljxULxXqKjtuV~
zGv&|51A|2xlc1ZD9XvKFH>~PR^;73nbln&I79ln(@%6Pky0QZU<B+7O0V=zB`^Fu+
zI*v@NG4|xh#A=lzVasa(mQ+#J>72d|rEEXr0d5?vRg_%;1x5THqKZYDcdsIS>$@9p
z%wylparC9{)^N;c-=#l&_s&ai{}JE*XdkW{w*{xLl{n)4(K4#ujLUH~+y>l9*kQbD
za80-$`R9yz?9wRA8i>Tr;AU}qvrF$}r*Mzqp2nTQoyEP1djt38rFRxJ<Cfz(F1>RN
z->-QccOLfw?iJic+*7C$O)*^<U0lW9209Lm_f-eq<;SMm)NuWd&NZu0;U~U2we9ij
z+`ND9-o06df8Xw1TTvYSVzzVRu6ys_c<)valy$-s-n+H8ckABX{X2KxyZ`=Oy?Zw9
z>e;!mck32?hmLb;^WE8)KTL@ixx!D#m$To#v758jo3#guR^(VMYdtb`h-0$h?{|nb
z76pVe*?g(%%e9*&jEZ-AiJEkpQYcU_z4P&Ba4+J{;lNofpW|x0ug7i24PN^5OMiZn
zZgJ_)vzt$5+57Zf{v%|0wj#ToKJ??4-u7784cR9Nzvf+jt@^(Bn)iQTZoH)mxOQ&n
zmEW&#_}tX+_Mhfu(UR+$Ti!=owr1~RC|#eupEX!BPVY<Y{aV5oqkVmyg=g7E<LLuv
zZdbo3)zUd(Wx6u`5^}o+7)s4zBKu(Wq3pxiGTP%Kb8`N1TFuMwfjM7P&X3LsD@&Y8
z{xLcdeZe)t%eAG2>d#VKwGN?hW#1Q3=W8qfuA$V6co!Y|;6nfCRhP0KlP0`=_x#IW
z*6&v~wE6qyu8iJE_<4UvZF78Jm3CfN9UNTcVfl5()*j^K^Qh}d%A5oWAWqX=m&t6x
z*eay@G06(0Cn!kiT|zVN;Y4P|@j=dS`xL0@RT|YZVlR+sVzGZxhIPxZExUUB2w7*X
zhdWP>cM|W?JA)779>vXuujf%*U%dC?Z|^jUq;<zcHZwTkYmX?1h#hO*i6hy@`?Bu)
zvd{I8W!r`hWcQ(yv2kJ&|9JMfnK9gGwh?vko}r0sH=O>i@uS%m4jT0^Kk2MFt7XnU
z_){-Dn?F7<G>8RqJ@*dJOnTt9$&rZH!`AbpJp)DQGg4-xQS6L(88NJ$W6<+)>N`$-
z#!lg&FOy5%jXy#-^-k~d$D#T16>t2`cpkp=&IB;V9>;I<unECCdFh=8Z^Q+>DxCB@
z_5$(Vz;y!;T#u8c_(r&%$DhSLkApsrpCfMMJH9;f-$%Yr621YyIr1mpv1#(20Ppay
z$A$Yzdk{uLA%}J_C4JgK-9v3*7^gj0Q?gD$6KP0yiSv!N8P^l-lY-Pv#dG_CT6@3t
zF4_;TYrk(@drz(Xr)%wB%-VOP*NH5}QC=yUJs(-sKDesg^6n@)v?;sZs_*wAFflo{
z^*5brWSv_WrQm@$_C1tZ?O8Xd92?9oz4H+Gd+6e&cTTJf2aZlG!__W{r6_-I>G8EJ
zGr#lx-fi_enM?8Ufb+;BINJD;Cvf2Q5&Fg>Px;v9w2qic;>C$lqzFp$4_?8M_kX?x
z_Z037?o}LNKi`4tPWpPuasjdkB;Y2D=$O)g1Os`?&26}qxGlJ^;Kp!2hkF$F-{FwC
z-2A(^@8bRh_g3EWi548Px=*aY-Hp2+*N>aReG~UfxL?QpbKJkd{a?8Mi2Fg_(ni|0
zn{b^t@@(tD?Z<r!N1C>Ojr-qm@cr$JaX*G5k9Oj<Q?~Y>#r-PoU*P^%-0$Itdkb)H
zp)R-FfdlR>z`W%M?kMi(ajX@P6}Q~-Tev^KeGm6`-m>B&xV5;?;l6}>5Jw&>ei8TI
z<9-wOJ2+%kE54t%bWolS;&=QM4moHC@j8IpaW-$cwF!3{ZUb%<hkWwZU%>rS+;8Ll
zZyY$d?Sr@u+$P)vjySjd2JUxpe~f!4Z@K*j+(z61+(Wqk3im(b{zKlf@&mXvxO;Iw
zjXQ*64Yl$g;hw>P^Ob*ydn<3LQ{H+f?jGDO9Bo`D&pP<7e+T!^aQ_QkD*e9R<JPmX
z-7Kt4E?_eSFPx3jG_nh80W$-`ewLB##I)IQy!aA5HQT{1&gA3_L%q05O>2p4$Ew{v
zGZZOM&t;0y?j`2A)JwCClZSjwV&*lt_sQ;dV~fj<9k?`Y6Vfv&C&isTf;Q)7%}j^r
zUBzOz+hU1hbls}Xlnn;9W!T8c1T1B~3370l1)3GAFoCkAC?qAcLo*n$n1TSR2xfL_
zD%(7X6(*ELETwjX=2VeaS(qttwu6HY)z@UoC{98+a3n@#A#D_`9I+NCvn#r&Pj)VZ
zfvJG2Ba>#=W-{xQ%>%<uS;*2<i5gLREj2ec%e59(<ZMSA*uWmdVRmRx0W<SM2FI^P
zD05f!rm{_w<A*7QP98%3QJ+S1iWM2eoNR2#`c3fjJV}w!<A6YpLs-W`SB5v@tBzzD
zm>ra)T&-}-3}ufGNFCWQEtM`dK{2|bUO`198bySv*dVj8@Ul(vJ+Ud;Ivvqouu4Ts
zZ;Aap=a1lArkU&$N{h34R=XP4m`cQt;rYSJfbcTe0$K%#RhU&4i5GE=!^(C@lS|u#
zlax_=XM@>hMEPSwqtRm%irhfZPJ~gTwKdL|9UmLOvZ@JuGyiZ0+W?~~e|i<#rn8;2
z!h+zsu>wA>Er~%6MpFc#fuqkD9|H!Z-rTbT3j(^+4IZw7w^WSCZAbLTq#nwsc0F*7
z3nX3i96uP(#I!Y3NNH(?IeGMt>45y)6uQf{2%H)npZ11T18O(AX!^=1XK&d%vl9Rq
z1RG&iC)HvIj*$H9Ol{c(dYRB=5qZK)7zG9J*t!SPyV?|860(7sLTt0sWn?KW&IDxL
zi0D{jdpE*H85B&N;ef0uDv6pF%~xv&jxn+k&v1}nQGI6Ppox7^Wbn%LO!__N{<ay>
zAd(xmN#`-J%t2!IR*UBIsQ2l1L{4R@3DsqRy=Plb+BX;|=&4Z`oh*({nSH@jKZ=nr
z3JQkZfTp3#j#=;0pb|DI4$Z1kr25;SD;rsg0@}6!5!8B*RX!0;9S0jbMA0^*kYH_N
zh8Ur6V@TLE3rO6cTageY!a8oW&ua62HqVNwqA^k@u|bKCWis#Y6k#c%XB!<Mf`X!k
zhOLUI3LA}V$PzUfl}$y{QBtyP_^b;wwbu``nh2rfa^wz9xX}1=Ga68mIe&VU^j*P0
zkM&9nE<zcjc?v3{vr$u74;>!$5<d_uN+ql#IF1u1TO>yw^C>uHCOTW#<GRl!KP4e7
z`pYrM2B?sIAGLJ=D?VGZ6hyKixLgfJ$qa}RlwTUTf+Ac+4`tm+a62~WN)`q91s9|n
zeXeKCIDfUO+e#*ag6SFr@G2t(40Hsxv@aM;EeSggM{lSBV|1@Hjqi$6Jq%JQ)}wvk
zr+j$Vh8m;Z=A0Bf$OeYYV#Prp6Ce+nol!I5X4JNaga2s5V`P!dvBtQ5&H^nMof1-F
zqt8~4AzR+SEl64$6K{n|xsr1QZz3zHu2C8~RPTcE)I4RJ=-i?pagpx)R-w1fOdCRq
z{%C4S>fvZ?p-f~=J~66Qf2BTJ9$~f)UDrw=DTRn^J5mD`+Y!yAOguC1Y2t*k*Q9FE
zgfuVvC-8dZSIjD^af>fKP+RVVfY2ES;``tlSutygtf2nH2@f44VFnQS+q-qwj=gqf
z)8}DJtJ%Rnu(#7cfeOt~m08%q%e*8(+)8%!r?gcD<rpw(CXircWabD14WUBzfQ`He
zGO}9MjD{J&3^r6dMzCpH3DIRo_&oYonnBWpmELVeVOt1BYcNybF(OS4X#%1_7$`|Z
zlWE_z`s<qW`%+p1+oba4tjCtZI_b-PC8T?1f_=lpwG;MJGp?VWs39s4hI_iVy5qpm
zD!Yu?2D`>T$+L}{_VljWvAZ|DZ<?V-w)@SVC&u_>I0wx|l$s2aW{*_)f1U$2)GxcA
z+7vUCMt1*bO&b?ILx;q`IX(2_v<t>vL)<D;x{)2sBih;+I1Ez^+Yd=qKJ+cvO9!+W
zGn%?`78OChxGo#pjP}yQmZHc)hnL0V21OV;Y;;)EAa4a;#8Vi(-vWVkKc)ext9lXR
z)Gx%eJmS7-rYu%gWv{aNRt6B}ejw2o!X}4?V#(NKVip)6HU&0(c>p~-hE$rCZRM5D
zg{TbOI)nu0ESZcJKymw-t<vEBxq1q4>@}$o6d%2b9Css*wRUG0?oQlJ+#qfmcM^9R
z_aqM4LFdc3H*gp7mQ|!*wG_7;$NF~_ddNTCjK3YX4@de{r*NcQ^#bk{-1)qvi*#M&
z+eN-zEB{kE;eg-Av%9jN&StZJoc&MP+3fp^KDelB(XK@(BOvqK%uRD!cXWr`2r4r^
z$^q8#v4cvewTlL;1Yf=`lD^zQ!X;@!uKRmiKHU9l$1iQV=863^y`MXy-|yV>8ZZ9K
z<t_T!o@~*Hjf+0E)V5Dn62yMk`})|&dN^z1t@-^mc}ss~iM-{%w&*+8{OYx*oBoN*
zl@*`8*AF~P{8uCX28;j8rXzM^8UI(75Vs9Cd+F_EeZ+sX3cprHB#Om*;?mp8Un1V=
zYP`0_c(yO51lk{ypMH7kn#UAY{iSd6(NB8?ZxOn5=i>dfcz-V570&nLUGXlxJiRaT
z_di`4?|RM9e^)${*5$2tyaxQ2c^7=8BfmdYI=w$1@3nZp5bwgJzMqfxweb!PEdBa;
ze=**-<Cpn0|A9n+q<`q)_}(4wqw&7i-)G<S_wxzf3wn=Vv4=+aDf6GxUW=~5@4&xS
zx_9_Z_~f-{ao+qXU@Tg~`v&~$uo>|*elzcsZBYyUPW)E<Ui|mr@55h;KZt)l{xJUg
z^On_*;(wU;3H%SBi`9&O1Mep&*F$;p$D8oK&K|wWv5fGO_&GjxUGzb|*^l=}c>f6g
zDg2+n7u=u3e+>WQ_>be)@K594g#QHoC-9%dZ^M5Iza3xoxEcQ${9E#t51hwe!TYoL
z9r(}T-<mi7*ehiGS>B(=U!ONGy?|fmy|LWa{prhu--SM97k)?H+@9m#O1u~FPvF0Z
ze+&Lg_)?RypZYEjs=M`XbmTVVi*|6f;)cO|(I)!bvRCs(5234e!$iL51mVlx$QNxS
z{DzbMe#0r^5A%K+AKlImt<4vGu8DXr=8Lv-7UPDe@<m^h?%gxtKNmjVE&S#1$;aM-
zZ~l4muK{PT`!~Gl{)d<IeKv3Ya1H+@;9ewrZ+_i*;B2R!e=?dc`ubye^GBM(UmCvB
zQI3zag-<y*?B)GV>Zg2^Ubs%bMg2U{*S8;Vf2TGFc<&Z*#P1z8fBM3Rzt2iJi15AA
z^TMANmBimS;r=Pf!g+sq+WkJAiRXP-MxF4bwk&^Qlle2*W`7^t>i%Qf&7XdAhrgff
zcK<}L`;X$;@AmYtfFJF>z?b<!iLRwD`8CZKQ&`?ydjoeK_h#OF6aC?)W?YV2jsu@J
zb>KKNbJLx;4Y=*NZX7tjsSh`do5r2MJ&Zerqup*gjibNagudiW&*GlPy@Y!i_bTpn
z+&SC@+{L{4W-A{3U@(=l;uo}rFr#Df&H8&h`z+%xnm^L7IX&QCS9yM4<@w{4=j$ua
z@2@<6pz^%D^890!=O3>;|77L47^j3SP2n1Y=~;e$?FMjhTeZCQS#6a!-wr*=prf~I
z{9FALt_b<H|C_w(Z&7~jndhnjdd{zX`SJN-zb&}cUlrFWe4#Ml{npA9A^C)zPtW12
zEYR47-(}#P>1&7u;iSxS^H?Y?@qTwsQq}h*4bke4c)#;zHGt=Z;F0#<ot+a;VWQOy
zKk}X1Udm%04jK~q3-QjZT_8MPAgmHpQ~wuf`D^$Iwz_K5cGpX4el0S&mN3;5Urs~k
zL-DCP6e8%od4lx`T1m0-rSMQ4CJO%R{HfWSUhw8mU7+dAUuTXBz!nbD?_JtGMZ4<%
zUBy6-ji&tCKNY>Z0UK?jyc-S2e<i>6{40bnCVZOr*Mx(-xf7c7{nsP>1n)+R@K5L0
z{>7_=Ur&7I<jyA}KJfpdEy9_nJH?9v=MPrq*Z$x!9tHm~!fhPjpU<y-O9Nctr+I(V
z<F9JYo32%VRXB6}s-+QL%dfSyjl!AtS1B*x-?lPuTJi{wD$lcekN8~?uK3RrzbnG;
zB>YjH75*aOcY62-P80rkgr6aNgNLsg%$siM;8}P(OZaGnKVAucmGCDb{7l}|{&K{J
z4_Rfj9=msK#8(-V?>WNHdHk-Xys6_%gkQ*;yOvt`br+t^n{Hpvv+8w`a6MDsuAO<)
zzuL<qaE><d-W%c5dDCZ}<C*wJmlA%$!ms<Y^Lf)fd4w+`{3(zBhZpju&#H|C=f=GG
z4=;Fl7x`{@F~Zx3FPP+;_vKBW5BwZmN%)%)zK?MA4Z&HPH?P(+@mJrNH|>mi>74v(
zZ?EhAbZOqyo#1RCyxZe1dp>Wve@npGN%(NUc_DB5a^US~FX1nF_?j$l`qJ8nzb|iI
z6Zx*`$ea2ejqpLjm6kQ+1>g^ykML2#Pg;2Mn#b~{>DMECn()&R{$}3vtx=wZ&l7p`
z9SWvit4`-lzwk<gKTNo{SMwd~^QNC$8R4f0S6zsI2YCDCS9$yi;5^2A)awrV&o93m
z;in0IGUC5N_!~Sc-zN!wEyB;`P5)$Xgg;GqwAU``TZBKGH?Pe-{#wGnb0^Pgm*)w0
zJT$M}kT?CB%Bk=d3E%GVe}ev5gr6b2H{ekIUwesXmFFzseIEYfkLFFkt}-b6Rl=iQ
zA7#A!x2lWazfSlmkH7Zmyy>3_rozt={%nL(-`@}p6@G#6*CHJJKc{>Zelc%0m2=4g
zth^q6tch@?1<%*l<ntr`v89Bo?ux%tK0k#oBRtBfwY~imek0+J>y7vuEY#z-5&m?9
zw^hPd68=Vn8=iO;oV9uLr#3|RKKc9<zMk+wy#RkgK0k$TA^Z`&;J+ZBpTc+Y{)}Gm
zUy{#H;k~?{(F?x%lzs}|$GexO`BN7?*un?%=1({49skBk_$cok5xzHXGLtTXGfjA3
zgrCTpj?{Qo_zA)v_VDjNnKunDkMM^Hcf4UAFK>ELWl;Q6gg@u;KTW@VSvXSoV}xJu
zaO`U|{Xk_<`02d)PQj#{cRrUlou7{ICwYHC;g|byesdY$`m5gwtMT5z$Fk-ZO#9_c
z-#*FMK0~~f1Zc@#{0Ljii<Z;HkFX8A^cDd;5VjL<cutt&Y;O!(_PpNn)*0&i?HGg0
zUiPr#`|_rTpSI`bH~KtmI<=qjm?iA6!qbnilRQg&Q2YpcgqO`l01t#chUY@q_(0fc
z9wnM6euQbPQoa)xQXpX}(}DCZpRi}~B#tP4gsE=RMF0<ky@=O6CoJmwko6UPLk_vt
z{MOl*z`+K4Zhqrc{0Tj$AMpfB;*a7-9&e<VN?V>IO!&IuPwUz`G34vV<D%s2S&3zb
z#Ql-n{li6@`1{fI@x9Ic(I)plv&H=rkC~7C7=ND-?tr^>sr!@9H->v3P?&zQpW^=4
zPq=^0#qi&BfA*~V8^TZVHtkgfbgtRI-}Q=o{XD#TufO?U?8jVaeBZuS@3O~o)xU~|
zzkmH8#_iSqe|7v{rGtNO=K;-qf0du?)+xR0(7FHhW$vF^E`RP%cE9F^E%YvXX$ytF
zTbS&dRpZF6UBf$e@2c<VIq^a1J^6$$SYFv_OK}$RWq)qLaO~wNT=v+i-(^S7!+$h>
z6}H3uIpc?9w=UjKnIG>dKKA$4`}e;aep#>S+4NlX=e9%oCVPr{#*SY2o1aSGJp9OG
z)%SOM29C`$DW2>Mrf2!GH`wq#r~k_ipvA+kUp3y`XW8|e8@AAU>c45+E)?f#*i{T%
z#lTezycY~4KH$B?{bAzBp6WvJWe0WPaKB$_p>KZ^VY26{d}QDDZz8|Ht~~y(@&P|8
ze95lzj|$e`1~{@O{kNeUSIck}16MKdw;uzt*R4{@o_n>li4Tyy`o{3TxqX4ge9L`-
zYWU@zvE#j6-`Fo`S}0DE2QWXjSv>5GyZ_B+7mA<4WDniqEr~ra?4|pA?0;Z?+}^P_
z?%}Z?gFSW+|Eu|ep`Yxu`;-4o<w{|)cb=Z*%RapO-)wW=@8Xa>cYpszghzd_*RJsN
zlYRE|d?jD@)vMoSm%Z_Q_?+HlcisJjzeYKc?7jQ<Bm3N+UU0oUzurfBJ^r_w+&}c9
z`$Mm~|K94axca63FT3>q9_?Q2cf~#$_T=sRyVid^>OH6a(O(5aze@ej`upYTZ}yli
zjmJAaSiD?)xQc<R7`Tdo3I;B_KU(ksm)l3boPNOE_=!K58$S2_z3T_4_+`1B4=CQb
zAEfd7oO}vCU{3he{n96|h_|cw`8$H2tNH;~`+1dqUZsP7ANzyVxuu!&{msL;(Rk;q
zfAa}F^F!UPDSVz6{oE6IOTG-ZT!Ea|#RkCjFX%bD?$>L1%Lnh&BmR2R(`)(QhHLzN
ziw^M+zFpApcj_P_ezy+k;rHs$A^yH*_xr*hZSnVs@TYb93EktD%y0SNtWH^x?nL;f
zmiqgn;h)w)MZP}~{xdqP$osQ8sEGeu?*8*S^vwGUI<bZS;)mUTNegP;&)net%O7$7
z>_^>yMTp@0t2*F_|C$ara_7l}PHOS~`i<_t5&pTK@b~lKU(f+a;=LLEMIEx_tY@3~
z*i*0B_YY+^xxegY_uDuOM!FAmwYk5(-Tj@nxW9LW`-2_s&)(|(soUIt{C4-BT<QMP
z(j^7nv*EuO{+aO4cKY{M-T(0ERrdbjr``Y18(P4kOTKos$2-5q{R=v60Njgf&Hr$d
zwBPfV4=??c`}wEcU#^Zrc<nRpuUzMT$6fBPUGM%D*{vpC_h;Q7yvP0N4emeuCHEiS
z=l+x7Kl^2WKl2s$UkU%*et&<n&-`W054pcA{Eid;e&^TS-xB`bZ`gb5=+EG%UyTPj
ze(Ltzg|nQowA^GCylY4hzDQl}z5EnE{hm$_I&+w}KBs0|=$F#qFH+OTPibDbVw$|=
zC$SaslfAe;9Q5GE*YPKC*suJ_lekB4kKs<^o-(Cl{=D;!vP$`wuQ$_0=A8O@+(o^I
zYt5VOexOC%E3dAb!izKs?m~Wot8aO8+lwhZ&zzZV<IHsX!-T1x4RHN^5jeO<IN@ye
zXIviCyzUL&>9=>Oo8WJp4*!h%n|6k;I`DnVUia^Hc}?@Zulf6S)rIfdH-z8k{^y$A
z-(_u{H}A4Gz<<-je=5q+d)D9YztR0KJ?;LNUvmE|8Xmy^O2qF!;qM0m?ty3gedv_?
z2cL8Q@EP~VBH!_+{Qbcv+&>oe4!y4Cub=ktQ+@9L7tg!@i}C&sBfo!m(!-PgOB4S7
zUq(LP3Ao>hdi`35fB&z;|8HLP_kX&@{r_RP`_Jrj|9_0|e;#;!_B9Xx7wf~1`abuB
zzyHf+;XmsBZ$>$O^OV2;tEk8GUH<;B1MY7HoHJ3Le;4t7?{Sa!`zPFgW!U}y^JV$`
zs{QL8?sk2Q;~yIH*bCX-J?FdPHq8ke$rpcTS-$vJ2P@(Bj7^IgZfy$B7ytSrJQLP@
zGGFrX?M3*KJ!X$Z?-~#CZ-S`hEgyId_lDl{)`_QZ&lYJ~KKgRrI>o(E)7;rK&3OMf
zwtM8dHVB4(*}a=Lud8+3yX*d2Yj<?6?SxKOLe_S!?u5c$4Ke&&#m3d1;3MT~Pq^9>
zuJ(khqu}Z&xH<~1j)JSB;OZ#&%Z-9qadb`%W6f5#adN3Sc5XYTxiTT^#5DRy);T#Y
z<LFuE(D43)lUVJ{I=Q9>o86s*?tOJ&l4py;B|(Zgb>RPR><n=b27)L$q=dFmu@~S9
z1n`(*a41YIh65lt08NmUh#m%s;41V42>zeWZZ=Iw_{rbSGH+Rmn-RM>%6OrJUiqk(
zFrp~>Q*14=hMPDM)OqSGTFV^87NX}`#I2<76B8!ZfD~JYJ(qT4p{>cvB;>zuZZXb_
z>>M~JqpjAfN}<%VCtH79lep>XAvrAaguVQ}Y}FaJzDW-E2Ura`w&pz7fNOqmn~1xE
zW6kXMLKxyQ;#zR{Z^|VBlV7vL-1a@cB!?x@dVIj`G0$MU?*;Dx%Pi)YqYkifH7?R6
hSA8_21GiFD7{jFJimT=L@Hzc$;q$yM5Ff+bxG&zJ>qP(n

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
zcmd3P4R}=5o%gvj157@I08@<+!bAp5ObpSc?j#dnMxz~=v>WY2qNVE~Xp=&pm$vx6
zW4)KTL!wQTeRpDF8#IZ*iiH(fXthNRAyl-a+PBnN7c16K=?aRwwCXO#ka>T<bMGXR
zkObNn-e-B9aPK|$eEh%8|LdH4CUQf?jfzDPL;ozofqNxGh&Eh{g;LQc-xUj|u!>wU
zO-$u`mZ6UP6Uw4C`6t9A;|=~tS%$^<6C(Yn5JhfOpUn5G*8S-wwjbl)6qMQgLYd@O
zQmWLvv~Vy-T+4<nIq{RK-TGt<?HBfBSegneM18Fg?nYr#J7+oETZ9tal2NK|xy-@$
zu^nF$esTGSesMC(Xlr@0d7rQ^<~v0=8nP>F%|}G~0$m7ihX^fnW>`GO7wwEjge{sc
z#DYd4d>z8&P7^jQ597`iwlC|poaFc3j`-1qP9aM2hU#aOg)$WP%0=Eld~h4!R$4KR
zj`8X+b{)ne4(=S0@nu~&RlDU$!bW&lhvj_FckGw%**EJD9@Ya)S!H^LMUGQnVdGft
zdSSzOCB#8bS+w0<yJ$P{V%<^jr4tw8F?zg-U<r2KxG1=-eo^qLpDzkNfcpmAfA8mu
zTI+;pwTda5=84IhR*FfjKNPl2*9+?=tFW}bD-;6{&_f9OzHO<kfKS<1o7yI?jj5e#
ziuFm}6Tbs_sXI%Eb4un8;H&`G^fGaM5w7+F_!|(_xdT_(OHV&-z2-U*Kb)W;+V+$P
zA)+p{y&^3fEf=<juMl?kK9SM%MPcLEC0;RwW6Azg-8-uCyoFkx#esLJDF6PP5U!~u
zJ4%+u<66GIQud!Bie!EJ)jQaSY;PBen&Ou5N&0q+bi9L{iFC9%hI_@JdwioNuD?gi
zxy}Jxrj>+<7x<34s@1o{w^_DBU)CoZQYb(1xSDq9j*`_vK|d#fn>R^5`u1)X4z*)m
z7_@My+U&4j{PtIBWOg|6;zzvS7kMmGsG-?mH^%X`i7Zv?cSQDo6jno-m3W_{t`x<=
zm2a*G&s{H|FZ2)DGvqA6cgl`>*X%H4i?nyR>r;2@+XCd7MXwF4t9be94Sw<FrQ^vB
z>#<!!N+2P71uSEKWu3V882zB%6Yec{b-7=@W2e#Qp_eA=)0j_b8SGnc46O5u-+xZR
zloHqtT3dYWl9tvOo&o1>zc_JKGESpl%9JpLG8FdZUYRxkoW>o0FXpVeem3duQ0wM}
z)yL+6-ml%1UuP5EJ)%5;AL-++Pd^#?(`R9Kk4+eO{p*KGa0=fZgXhC=esEvp=x36L
z?oJzI=(T$&AFbIoL3+G^u_@!D__UUN?u`na{0CeudP+bC9jxANCD$CUfzQ4UMdAv6
z)JvJ{R_vgq#T`YzEAQ&^ivwR<fcXpEr?cG<-@3&R--s9AN!~#g-1QgL4D;<@FOuWc
z20Gafbd4Q2G|4em-m%j!etoMf?-nuH2jn2pALR;twP4<?S=^anS*$}gx&p0~6<s4O
zFFI(@@QrOOXBpqQ>!;ex@}}f+!iRTd!?3;at>M0=E@xe{-K`^V?GP0bhvR{*3%&<h
zw2LzNoDyh@=x*WdN}@&5T)<duns8UDPv(cseigIb?#N@ZAA9rhgghQ^PnJgmk7?;r
zo|F1C`uW{+f%w2K%wq-me0riC>w;g;N`7?<dmtX)HG0lK5B9OX)D`Pz--9+TwS8XL
z`?zqUKel<c`9;`D$PKO{^1}}x%fG(Q4ZV$bn<7tq5ROHt%YHo{d?|{&^HErb&6Bdz
z0lPKV8b-a7tVcbA`zF-4$$A(o^6qEhadb-`<TXQ8rM$X0kNo174;NS=GaEz~=|-45
z+rDwY(*ylD_vF8GOfPgR;Ar#2h0-A5dgUHNUgIZO5AW=rKR_R6pW4Cts?{2X3}*Pn
zD>oVP7(cq81O4oY?_AJf6OrDJ!r-sH#A%~#SE!S<JnNI-F?G1q#cJBA9ctR~gdYBw
z^O5+fbC&GTRpLC@9+TJja?s!P0`MA7mo5w$`VjN8fj9z21vq6&xx~EEpW+;tRt!8G
zBg<yA8M5%(rvvf+Ev8&GfaX^A;R9U)@y~MbY{B)zgp9DBAzK&gQnt*w%eiLu_cgSE
zTz&Rja+{Gl|Kgoz>ipl%2OM)aKH6$#+dht$%-6bY)Xhap2!nbjY}5VkhACt2`b(U~
z_^-V^0nLp5HVX&k*63@&=|o@d`q?Mhm)Xz5vLDnPi}nT$vZZfl%$whwhJ4)vS%ZH1
z)t`&z!q$d9&EWi@KbEXxF^6>GM;(c_^?vd5J(MNjPCc0(%@JAd+ISpo>(LH%4I4T}
zyZg*`3fg6%er8bEF0T=~fcO*##hdGEtU?*1A32BJor<2Y`EFh8BTWq4d*^#P;cM0b
z2h17Bdlv0H@cI?}f_pI6(>V|QV&9+8w~I8Ja84Sw&4oFmnR2!>0(`w~qD(6bggt#i
zp?-#prt9tG?{794KF2Fx(z60PRja53ZJgA3oTuLQ_+gGa-n^i{O}Gud{Q7R<!MVqI
zOIzp{Z`{N=$GMDt&frh7?2*r;5#b|!-1XUZeGhB}<ldmw!EeHDv_fxQ8i@awDf_4P
zB+LF@*jUf;3Mb*Ao!1|u{^;2y^@pKnoAkY)G5jpN%f!2O!ZnU<mNHzDSK&0}#}%y=
zm3oTsH?0uV_mIDyJCpkU0%<jl48xuoaG{OV`<VCC;gp#XaY9SZ2O;95>Ed!ZCw-1E
zbS?D1;|bF8t$mKzTSpwNO;N|XR`>#t5vR#(`VG`4X3UaZ;TMw<J_O%cz?TrN@Fj$k
zb-mqU9qqfEV=Ljq)n~7QZ1`D5K1Ax@4SV+7v6KEqApW0w_)HnZ{VujK^g%ZGd|)Bk
z<+2^?nDzg0xNr1PpS=d{?im5AjAt09-PJ`ohpoIw(zC-VeKF1rPwk@JY~yJ}owpAa
zM(O|q=13s^ae|Isz905?Y#Dqed?Wpn>?foS`^875-uXXs{K9&40sKwR9$`c5_XOKT
z^8z~j_rZMF6!>^vjtBm)^^5M);FZpKzd-lWp1H;u=OD)cJ!<%V*q;-t_zXDj1MS&9
z$me0)Kl?`mcf)5H#>Xo08v~z@Bmef9iOa8U0xr@&Od8MZ|BjsoZTpRR&@t4%gafjW
zVd$8b?g7kFmd+e&t`oA_G72B*yC&fiBEJpZ_cy9vhyIF+3ix4$FO_7!I41g1N>b*Q
zW6X5pKK%s8HGIFhe)r3Fbs6*i)w}(|Qnt7cw49spjirp6V-2*|#Zms4l<$qW(pN6S
z74mJ7_|(+~RKi}@8wf{Mz6IXAvJ1AL-I%);JN;G4JN1pkU8T=Dcdar0E1yU`gfhNE
z`4hu_;wx{OG-2$5m|#*l{Y1<=>36a|`3u>%88m*yC*c4*)K7)*nM`<c0FNR2-J<*~
z@Z328JWD{&F7J<(VhLC6mxUY;wp?BtsXt#TAza`OY<afMIUKnUa|*JA`FD)<B-~3(
zxUc^$==IA+mV1uhu~W7M?4ZK|;#8PTKkCy<)qADAGW_o`$KAhgc-*<KCXZ{-`IrCb
zdq@NgdnEkc9}6j8dZMpJ69@P|ezE`V;l6;w7T|E>Z^N9cW?w#ot}p$DaAQuG{IODp
zDva4MUs@rr$nDJi7<y^nVlV2=3be?%*)H4(9(eZL)uo%f=Q!?qXSy*)@7snhJQd}8
zzj*m+_RaCAmx%}On-Ndp-3rQ@x5Mf%;Cfm5wBBy3P11F<$b_FJ^^bl$5M#gk?*lE7
zRg~4d&ColUw6hYn4oiUvC+xFuusv*csu4@~_C}unAnb{XLmWR4KP6)}_$<}%I}~^4
z%!bIzA4xiar$?B3FzEf#J_A0>I_N{jO_`A=K~wNv#<Y+Rzwk51lxe`AY=u7Pbgw`?
z*m*bfv>Ue94S%3S5g8>pjBjqp8>-)}nDg$XTj{%bAGf5N{6P#5k7K?L5D)N4jXWx2
z&m!afffPAM+myq=<x->U#nY_Ic9?6OXxqbQ;=yOg#wQY&Ze^>1+l#+4$7nUjFnO#L
z>+lN~)RQkF7qA++!*1r-Fb5zTMoz&ATzbES9HtF)b?TeplR?frn?-IQe&RViJJ3%C
zdFELmicq$N?{R&TW$_++4EMi^_t|68enS7CpUOb|!%G>97<E6CvG?h{Ctaq^QYha&
zDXEkRrKi@&wL$g@B6q$eeer=sr(E&4xCV8$4y>%n9k~6ZYhb0grsCymuJemu_@D=Z
zk~b^h<934gXYl9xMuR``e&}O$fgV3iy^QOBd1XxU?_UbU|9q)2N1Qd#4Tnh=_>h7&
zhWDg5<N>(~;Wc#s9Xm0XUgA60g=cwv^th3)K%Fe34s#WI6S@vQ&?l$q*RU?<jSfF2
z3g6}h`aST+UxB})=~3q^@Oj)hj!x#$T5=9~=_9dC_r5DyDN`}!iv8?oVxP!a4_o3Q
z9Hg%sc@5CC6}&jYzK9p_p`VmXyl_qUNz%75+6?(g^s_9I#?n9fusx{{`oK~b4%_#S
zt~TUSOrV?hwh!wyXD8(ca_1e@ZzZ4MlVm3P_KTmc055Zse3Js!VPB(spo7Cc!%Ogg
z#K){xcU;;}!tC(1i2-Rt+r`ItAC`7e3jmJ&nqRz7E9Yaks7~m|kv7xWW9Y{H`^L9X
z`x7y6LMQJwY^HT*-P;^T$oQJDkF=fpC&6YiCNli0+Ocd~_t%o>_c7_0ux%z>c_u9r
zW0xh_gCg(~GLe%Rh@afGxDWC$_ph-BFaC<-1>%4CmSGQi+7oh3Jp`N6iI{=$NR^a>
z4y7;hpPz+2x)6&nmS=^-4xM86z{m7Je|mf(L;opk0QzkB*T6IMd823_`8sVv&Zm@l
z-v)(x%WmrAEDu&~KtCBLO1(YlMdUAMHu%N07a8^9pMl38C))Tr;)l={zOU$$v||2p
z{wva!`o-L56ZP;u7|nrR4<Rq_6ArFjFsE<kTe3()=Dsm@hMHE1oXeX-ITs0slw;?8
ziT->;F-lGWaxg6@hu)zcj%Sco&^w!@oOQ&7p~Ls)m~&^l@x13#L#K;2lb_V-u!o8v
z_u!+UyK~@QDmGIOBLC!+_8IfsumKb1Msq5Leb9Y>2L5(;ib%=V#bo5DcVk>7C^AY*
z@=`-;iYQdYQU_^(wHWxy$EO2_`Gk!!Wx`So`cwqsA4vU}RIZ}j&<QDla0EFn@F?BH
zbNT}C)Z1<P<->ioz+Zfu@`bi#9A`LQ5V@nq-H*EPcN1}8&apuJw39p|%`ujw*$_?I
zN4LKWWBeTU54kb4Vc*cP8+GX0=b?MuIal-y=S>b3CC9Gao3D7nh+VIEov=1Vujrgu
zKVN2p?`-&e!@9T+a3<^GkEwS#&lzi&G3x=AQCG1n5w`~7$5Mu4*7u~};90V0cjN`w
z>K??FrI=5H2Mg&}P(}jre_IjhI8aDgBfOB)V#DWn{wnD!$z06yIeZuS;jv2gt<HIK
zhf(Lb64J+zV^N7*WjgYij4L~b;ibK~EXyyRyNJ0M(6oT>*pCr6y?5)#x{R6MyMZ>B
zbT{o2^>mQWo?hT8=gW!Tne#)+!jR8A!ta01H>?|z{C@a@u!#fgFPb+Z_AO_bv@_;7
ze(^7#Vy-6J87J$o-_dpkxUJ$l6K47d@;ND99F4<x@vp>bj4?i@FKg)a?wjDxJ7Bjc
z&l2vW`5@<3a{IC#z}yGe5KDj`F3xlJdx`a{?n$HIuI4jiA0v+bz_5WGLfYj7J{Z@G
zqknoeaCePOm$^<O&Wcxz8biu_qA$=YDVF|V;rWZD_vAqzo>)xW$Bd;vys0h%U*J(e
zA7~@4oOdU1g$_~<5@yEG@_HP;I%Ll;y6*IgpU8N|*RAZH*e~eXHojlb^^Yb^Oxry9
zC}OAGelhtl%gH}atr?Tb82*J%SWce+{)_5;T$w=je|iJk8!@kQ*e|&2EmMBFrh{j%
z4~;V-_I*LZ<*6MN`vL|d_I-bj5!0A!Ph<Ke&%QJ~ep2i^H2w=s=N|h$d(UuRW5vEN
z++gGye)_wS^qkZ}{ba<xlNz9Bpg%9GhJJZzaR~A-`>*kJo<CyvI>+xbe4U@|V&5E(
z`kmwRo_dlog5mf4%v_(etuf^0XJ0aOmTh_DZp1`h_(46GXF2eLqVR)O2)*<O{2=%S
z`m^wZ5K}e0k>m$m@d{)w^Uuta`!-m(eq;JUmP*fUQn!ZKM#fl(nG8SZs!2vY`a#MQ
zru}2wXTzLxN_Y_aa=nA`va}1xi}=N!%_dDZ$vPd@t%>pAL$%5F9m=7^c<cZ4LO3${
zMYOy4TZwvqy${tp>_eGxqF-F%OY}GFLtVBOK2#aXO&@CTb;Bkcll1m=4DL7R{p{NY
z?3NSKr=NrQYv{{N1Gn8qKCI31D(vRdMw@4v3_r`V+o<!bfq%DUtNHw#^vO3^TJ_=n
zvW$1nR8a<GoZibg-Lj6)^fP#EMj7ZvpH1o&%Hy!l_B?E(vYYi1IuZEFTt!5s|GO*C
z!0|og58yX;$DQQY$o$6h%5Z+;nIi`7%E_Vp26IM`56NfA;}`araLc^1w?o;F97mg6
zA4R_3FFyBDbc7G6qyxT$52&8$1HL0;dd^ka8Hqb`ps+U^4V(3|cIX^$Abv!~$;tML
z{7KZ8?U9#6J2M~pvpbD-kbi-X`G+d}{R#OWtR23yOSU<~hy3xc%<=@k%{8STKfB-&
z&<t}FI=+&1l3*Cq=F)Du>*r++`^7(f6F8Xb4fEjJe)bIYz}jpPXMgltIRAN%^*V2o
zFR+Gw4&!h5To0RLOFAUw3;aeM<_kmt+p->H#>z3EXMW1(M|-gbGL&23K7}2-$ZN<8
zatnXj%r#@;$hy=`z*YLkltc8zT$jps!}2$;2ICpF#K;?R9e``f7V1vcO~|m>J~OE;
z)(L)g1KQ^%{2}s>bTfR7dG*7zdlqX?SG*pDPy9UnWaK)S=YT(bFln#QPQ+YNuXg)H
zCgegumj;Q?rrN-Eyh|ZGo;@iQO|^k1@SM$O?k&P|jQ0tcag}@k4W3~+u9Duk-e=a6
z^AgV+&G(YNXt&jTFXsa9VehzSAPseqPkH(!IY&Zb3gE-Mefn9?9w&3F7FjNHBZs5I
z&v)!ZJ;>|fZ+iCp!xK9AW7v|zUjyB!ix+^O_Q+H4(f44lz?^to(zzpkjPWt)$@+u?
zviJn>Y~@-U<p0jZJCtwt?2X4!b`xZfes<=vzKl|?X{sHf5OZcrYz4-6?3mDT#X9HF
zg@AXVSK6#8=v#@UVLcRk97t<V-n?hD+rARk?)_?*It8(V5=#wiMZclC(}3TFm|4aK
zPs?>;FMa<WBQ|T8i}hVyT*WfEe*y9rEe%Nh$r!o`_n_IYV1IW;^h~bR+GF<ycGh7{
zO6n@a4-!|%JbW+73-$v!wgWcqlaliSK2R&3<@zq^5StTd03A%dy<@(iC*@v4g|OmX
z59W%IhXZVAYhfEnL*xAc!1bZot|F=YAj%W*MsZU4A(ZbKW1K#eZ;^Ad!%|a}jXimx
zKWCUYS-3|II5hAXywnkkl-CUivHpptOqy<&c{A9L<wLaWwq)X7A#WvZyOmRD$Gt7L
zz^->9M!y9yI&zxg3wU0I=P%&77|++>xeU+O;F<RFYHzpF09(U6-{<j;dB0+mtwWg$
z_inSk8}&2sd@Y`{aQ!>fsYD%?m7t96D^ONu_O%-P*@|&io8zv+^IANwGRIwsx*3q4
zO0>HR?`m+Z@pg*=zpxRmbtns={yKBqZ?Qefzk@oUv#7@X|3q0AuHQu&VtkP)d3Y&l
zD30<TSIUSI%MJiXagg_|vjX?wp1D%&|1kDAwq6`~7G*o-`%41P;GXLwqBS$H9rseM
zaP^{$eY)8e*CJdIuZvt<C*kVEbuzAmV+yX!7uazn3@MPUCvXoN@%9m1%cGt^i<Ey{
z@mx%uKpCJsQFk&<fQ%k9Y~{{x(dMCT74#0~^ZrXYm-WL!sFRKTLf(!+TV0!khxrU;
zQBQ`YblbdVxIcJt2!8^*m-}$_;?Ie{PS}z*Ak}f2dQahgUJvT?zI4gF0eRi#vde3u
zD^p%;U5x7#Pl`*9QF`1}EX#Xcv=@j^T#P*x&k|RKyym&8<+ahZ3i8=dHwaxpUry?Z
zZMT|pLO!oAZ-!s9?FKo2kcS1$Bt1C4(bms4oD-;%!*{YR?4B&I{~^oeS_$+F+e(|k
zd4;yp-mhQvDC%teQ&Rs4e;x9m9AiHb8-3QT`_SHMz!sP5^6QVj!18Tlw1wO#+a(P9
zf5JNVjZp{kge_m}U#@3uUBSI#-VJgM*wP9+hW9n{efe+MhtC)rYfEec-HNiS%zo1Y
z@wYakzFWRS-URQaj~)|v$56*Hteaez&p$eD_M4Sd4*LA)H)eYozX#&4?}I!ZN~+U_
zI&y7Kwnv<h^bRupqo$<sr9H;@l=YURdcg5VGH(F>WYX3|^G*536?JQp>h4C}g|biV
zFN6GWzb<6|_qRg!vDSK8t|d#`+R6F&qnFIOuJPuOxwgBz4*4j<2A!7n)AWIC@PVlR
zZGc<)0MXh&!-5B8-m!?|!!LXWdWJS<xr7J!;n{+A6_iC2UoYA)&*L`h=(0|?nNQS5
z=ZIY9TEX^*v9?q|+pDJ<>o4dd%j{z-$EEG0OvC2tgbQ#`w@9CkV=wMQ+u?jh5$M1@
zUi6E4NGHG8k|XIA64P-1IrAQRWQ*h%=+J<1m}lK+_QU%OgWiXc`?S~qk5ac8I-+*o
zGsxL1)GOdyrL_N$Ysw?~OUQpZ>Il3q7_wQk|5D$G%;+NQM@4<9|8Ngq=%OThzZ0@c
z-_!yawh|uFg76V%_*_37hVA_(jIs9IV0%K!KWX{b!S?=D$*>U?$iq*`7hktHf$<NF
z0prGD7>`!{6)@gl&ZWN+#&`cb28<gej2*&n!o1ytS;{B;Q8V65SN-CtCf0!*F!waV
z-^bkBjr|QV@*a4&bWI5G+(tNk@WK3|?M}INa+>^ayVdmBxNj~f`$YTa;k(nn$KJ3?
z`u1)SkC!;{{fE^OatlQ?%@dVeJHWM^Yb>}{X!CBP9tXcgb>cgM=se3BDKoel>!9(2
z%(w4F?9VtHesHn+=)ADHJ3p-c{_|nq<H`xSzP(2|iff8*k8*gyWWc>!d40kCq94z%
zdLMyIdquXME$HtE@(plfeaCyaX%X<vmTRF&<(_9yp3C}f)DP9axl>;+3JAZuli!Hg
za+nWuhp?W!L0MZS;HR;kxWAL{BOc`qwrzd~wi|7l9}^k)b1Yk!QHpCO=O+7;-?X3}
z_9SPx+eJg7|KxXNI&@Y<I70YdhVS_<0R#8`;aw*22cL5BosR>$gZJsCzN{f`3E1U$
zfWxfs7~@@{uQT6aT&^F~{XyhLdX4XKh(G1teQEqd@Y;g!jr@|=i?PQVbH6!aS=&6<
zQqz39C~AJpvZiUVu;aR_DFWJbh%Efs@t2Oj%-CbXiT1^yj~n;7xE3@I3am4oevUc{
z<Jd9YAY`ui1;_&A4C^q)URKIr<Mrb2N>UabqHIYShTH{H@ZFE_7HUhDhO6>2N;Tsf
znsC!ROGvj0cLcPe-1*w#uR|^@(RrfS-G?>5c}pFw$3->hNO@s?xByorY89^NN>T2`
zzBbK&>kf>w6aAE<ol9Gy@Y$98jPi2ScNy|5%C*3f9b=WDU5)0P#W7{SW7YX9%iPiH
zjd4p>#|Jp)v~L(=Ct%^+qL0G4g}uNh_rf>C+;aFH7cF%!B2UQpt6LcU9KO{7&Z-WZ
zG$cE7Ay*M&PDr_ePd353VYwRJF6kNa>||fm3FJBC!3o+V_<qJ7))C(i$o&!cegJs^
zbx%I@g6PV>PwKg6@-cUOd&G8p8*t|QUksiB2Jm;}{9g?GP~VvU{p%9ACgxrVWZ(QA
zpqlVP{!>l8W{X)N%T|#Uv!<`Y{G?oG;m?l0bo^yDzl)sFi=qg13LgET$VI&%{wncT
zL446S<=myM{OXx|p}#RZToO_weblsBSdX2$w#tcb2yLP;@&I_&CepQe0qALA*YX2l
z)mqK?3wyfbum5d4Pp=rCuj!Q&ybF%|?*D=31vc>Map*kQrZ06!J2MD63gV{QX6^^B
zHq6&7({{n9ipTk$SI{JP!F{HFykGKL=EG5+^<+QtihkJNa38c|*b`)%*%EclY>iD~
ze<(w}rpt}7X=~jp=Nq;Uvdi|-c{BIBQ;-XATEnUsT&v{?cUB7Kqf7dAN=e>)n_4Rh
zSvN5cNA5S@Jc+qwj3xa+>R<T6M>zI)`^}T*wCw9K`3;@}xk>t$5)X3?F{@$j%oycf
zmd~BJAAXaAG-4i;GKzb*(QcTAG1No36KxN$Ep$Y>J2JBcdU~7TAGVa}&?9x&CkGup
z{4H4Byn7NjN<AaLZD`@1jZu5Ulk7d#J%;T4bFlY^J|9;5Jz*{D`tT4wbC7#_RPwYa
zzg5on-26?Dfp+lk5o1o9J}Gk%&iuBS4e;qR>BCURkl(=D4}a8VtZ}z*qMrf%kzA)A
zbzErQ=MK$$)i0XgW_xo@%mEr4KtHErfCY7WAW!z@w*eP?VeVIHjvyv(gdgzE%pUyh
zfApQ12XNhpYYf-j`0MiGyDjpWHlA=s7th?-FbnN(!*@Tmut|$ylTw7ODKc{-zPCIo
z^Ksn!B5B|MsnkW-Cr`LIeoO<eBQy6KJb7pf`gFPRZ4~<j4_jEy@tPLTY;6TE@g8~>
zGCqcV<vxAx<2Ctra4&r^<On5i+K`8h;v0$Q!Jjw5pU*sDtn&@a8fXA`obFliIC4F9
z@Wqk;DEu<SW8_nU7bVUiUX%lt{am+zuX&Nl3y1H=Vy9WBpY$>K@KBY>gG{`SneP*P
zs0SPdA0Qtd;0m8YfYu{<fH^S41JKQb{Bi^_y4)j#wM&D(pJ*n1v)JcI+BR`NvLkZ*
zGkl9Sv-MGvmV|}0q%MwvKJ;0J^WUOqc+Q_FDu6zL52NhOnfVOx1zl&p?iQf;Bd}#}
zeLmcnH^0195ue+XBfrVG2y~wgzqi$+ixf{MaKl)Dp#poBzC&8$`oD0^!1deSZfQdu
zsE1fkxKNkZEVd)u&`$@!mlW{Bu4Y-o{3g9|K4cgBpI|d~n({<{S#dYcUxha5#=TSb
zV2&H|^@AM7_U`)mGRNT;KbX!r$$4ewaWfjS(WfrUTuFU$Umju;QA8gO_q1Csu6r4}
zuI&>%XC(IM`o*SA%*&hltJUnMjPnfko$(ZL%fNFA<jPL^aBrM@1@hp~o$emUSf9v-
zuHya$XXNr%hTnl6?jz#j62bh#XBu@sc>(${|HZf|EY}jdjeQSzHrATD!Fw4Ow^9!5
z9*m)bf5hPh@Y9_$6Y-1Tr>ghOBMgeVYBtvvFwUSb%Y<8JF8}mN_0F6(lJ%rt{1ew#
zN9f2T9pBR(MGT;ba^K?@9jJR3ynhU|=)R~6zKf8#_U?;zl3$DQtw3qx{58bIlXu-A
zd4<2cs1rHFK4B^C5mrycR*rTy@QJwr<o9VaFRI5g;`H=Wi1TwB7t5S7=Je!alo4Nt
ztvI?EIH$n>)A^iUfIhg!!FjKvjXjztGN8LeG?E_Tb5-q)i>g+83$dRpjJE0AV-^Lx
zYNjaUcjZkeQ^jrJXbo_in;xQ%9>qd<G*>uEmO^Kte8B_UpNG0ALxLa^>!T{(XG#AS
zSLA)yM9ccU`dpirWf9#Ec+z6N_Oup^Y3zvvoXpp4LR<p>&W(M&Tky^eID=KrQ|kef
zLroJqs`Bk+(c9B2tMV@S?t%uuDJqJz{F@7dqApt%fiQeJH)K5*Z8NE>8EY(f(1O_S
zKp|qCOuTo1p7tjAe$j}{OSp)WgcZ+`2mJzVITz!s>+2reStEcm;8c+}=C^mMm=z9+
z$%}{w^6KjziW{&SaDVdQe-F4%pPCqM(e=<fBjEnRe-pU96TuBRrr%zM`I$+2Q)cjO
z);$*-_S>ObFcxKo=RDLdfy_W|;71lWp{y$J&Gk*Fqvg#C6RxVf$%`OUwkFJ<K>VXO
z6YwDhDZ60ujPa3oC?kB)#WruP7xNQklv~O-Ww#0C+G<M}a{)B`>~+AEq%Won=$ME9
zJ@v(ukgt8pD!@CAzWB@Cz}+34i#dHebVdj|gLB&s9iJ-XnH$s_kp{o0s<oF@t-j>D
zTHejjd&`TO&_?PH*cI^0jX8e;bSMk1#2kn1fxbA*IZpq<khj02oX4^BQDd#;yc{0u
z&+X@NEJyNKaxO_ZI6aUw-c_Kn)VsuA$|~rV(7n{V+G^6RqKGm^y5S4}n<~C)<d;!K
z8bQv}85d!$LYJRBQ~uA=XQDs0r_5r$R~t6Yx(@Iq$?POQaQbg5v$pNNb{o$Gk}@ml
ziunkf(rK4AMX-kqwi7n4LQAPGtP($8M10T5e%(H?{VG`kdyKIl%db-pVC*FObzQRk
zauF`VK^Z43GCz0W;3=ON9zmbLfajh6AMl)hW+Hf!?9IjmTnQSf$Eyp2eSam-7DGqh
z4jTghg7dmI1$G2}l(Zu#mv&?>?MP|3YIQ~_?Fjvxge{3KPOnhY{Dr|3oTUUG1oBeW
z1bUs5%+Tk7Oi&)r-9`+MA0n#ud+V0q+cWr$w0n(@!H-952EQy_e}_6(l-2D`ufX^2
z?z&!ncY+w}eNTA(F|OreegX%?0rhU15myI8Hxe&J6?cS#wO;sd8Ku{G6=#V(9*4e7
z*S`1_wkz1wfmonE9+zizz$ew_Szzzu`<c&TJ;Vr%GfuES*41=Nn0477+i7l57!1L`
z1uUv{DZXW^7QS{R3vDwv24f7g-yZBl{g(mH98p+RF?msN3jQYjd{N|km5jYwWV`P8
zM%H0nKC>?C_`2hn!PLo%h->5locq!d$DXy3_0}KwN!Y9_4Byc$)KqI2`v^{&V_UR^
z7~A=q=gD*SU4k3~+purMCq0B0yc2qw$kd##IW(8QGSVo#P5JP-+eAh*-}Je0CC?bQ
zZUUcT;2Heg^ceUQi;J=tc+?DD#Ttd9+2j@Lf(~|EK|9Et&iGKVkM`RkXG1;$?oaA-
z1?)h22=y)6<^EH#chW=NJt9-TJFsp&_6g{F)2od=75_Acbx{v{FtNw>VeCx|3GBi8
zr~BAmpPOC{TreiiB$}JPDk$uW7?U98SOu7-Le6by&v*#&<X`0e0l)bC(})diW^BlK
ziTztJzKbyx<6!RXKrE~Sj^+A0>8lJ_{&y3`SdMX5aZF#gC;;wRX8+iW{ug)&_};B2
zK8R}uuGlA&h$lrk<H_d{>mjG+O~jMPfA3_hxYsA#>UU?~!?SbLz4^?`1erHb|Abtb
z4Y{(%#p^Ow?iQ~a@uAqCk8joyGk0;0_`1Y1xH4z9-4m7k5X`?Yzk|O5{1sup?8D5(
zcsF4Ecn)Gqyhnb~-i&p><`pt8ftc&hwamvLH<ycXY>@YgMBOOPA;JF9O6JJ$?T`lC
z$`RLcpAq6R__^p0IDd+FEATGYd_INeoA8{;=g1(xUpel>GvaKSBbVP&zX1F}m&zo%
z^qF+wSy;>=x_Azj`Zm@J6M4{V<Rc!FV`niZOj%@Z6R@N&0F2(<zyWic&oU=$*7tO>
zOwm~eI9!PwD(X3ha;2!tdZ>eVj`>oh5^Ipm!P=X<k%QVR%P=QqKH-T78=kj%ZlBo#
zA0G3e@lxg<Ad~PhX10<(xL?J0!2NCc4(m_)JLn&BE%yV<Zw3DG6Yk|R`e=}Q*C1oY
zI*x%ue{2}8e(1BB=Er8X;%{R!a)`{a1mgd(&CGMTDB}xIA9!u_Vf{3=-oS}DMc}QQ
z@O+8zpiV^+tcba1$~_Gjzc`78pC*kDJ`WyapR60{JXQ(%^E|-U6K$cRJ~q~%27A~J
z?{<41i5~>q2O&4cIWa!S>Y3-l^{KV9!|H?JH_o~u?{zEk@FAIh;@Uug<_d(hJHIM(
zKk)H>hyLtR4xyiMWgV_L@ywjD&N}JiJl_kM$GIJc*uMun@_^sWzhFMwso&8LbN1=r
zeJ<^VsYA^iiC7!GT~wlO1=nn#M?=xYq9D2&_A8}wM{62v-(pe8oQTX3@ZJwyTQi&k
zp*=+2BZKR`LwOLqM;@eQR34<BeQ9&B=FIV^d)lnvm(*+gF4B#A>C5820QbcuPN5(t
z7>7P^L}BNdmtdYFm@;k9$O~F!-Y*dEqkg4+<bGwY|JuFS8}rxqXX!#4^1uSV_pr~B
zkfb5M(E$y`0G<`dJoT+V!nK<=Wgxm(`s5s+bMgf8OhS)~;s<*{zqyFhJKU7bAZ<S2
zg6_qd@cWY&ffueSCvs3+5B6H%mty^Fw*0;^tSv5eY{Gto*j!6U3tYXU`5jS=amr0T
zFgIO<{^D-C?9++obm-DJbg4;`BX_e6=%Iifhz$XYA33lZ@CiN_cw>{fE1Ca+zl?I^
zux#KZXcy1I`*b-Lu8{R~(qR<dwvl+_TUV2R!1dUF4;u7+>u;t3^47^T0Is9~a%Dzd
z5PE?4+BEguFy#d}`|I9;{B}q^S%!DTQg(;<@y?&Hu59DJ1m<bMlj0hz2LnF0T94dX
z{hRB-!z{Eb$5?)uC+srz974YezexFl$xH0N9&n)!<3K5M-i`rB<cII_+$R^#t33Du
zbV6|Dv_aY->ZLF1BiGou9tVAaHFl+SI9ID|gf0+~2e`(r=v?0{sK=gPo4|fAISz3w
zz+9wmq8w*Jr_lG|zJ%qtQePdQena_kFV=vx>%RhB{#jMgO3d4pmu3W4PU%Oytl)i_
z_kPg#N_oa8_qS$vA5qfHXB+*UCeRyl*8pFaW1S+tm@nzXnfoQ6BaRyV_kRNT5_;nh
z?$4?>0OwBBt3;m_lFn_S6L2fk9e_o}m==s#kM|?T>=tXyF{7rv38A0F*sE}VE@M+R
zlE*H<*pLf3Pi+_<Yf93lXHxf*Hh53CxGrV|kIz`sJj4IOS{VH=`d;93P(2F&Ytr>$
z?eYM9us*p?fxXS94|Y(V-?&E{z!m$JM33o<?UugS9<g&l3iR4;u@yR(>t&tX$K>u2
z*`Cd~3djt;5x_V}KHBepXZmPiJ<E6x8Md71r=9*L=xF6y3V4!BTMxPyCE7$2z8d<#
ze&n}7gItaUp9}uj+rPqdrrZxE{js<AkVa?m$FK%sd9r&S)|eifXRPVMS5dnSTFEut
zOF<`hfM-8C3?3`{jWuYcE8$~7_QqM)S27I0C-OG^7x<|Bo|C#C-x<J;JYwE|7x$aY
z`+IQTYTk!&Z|IMM@IUrrPC?F<qSCmqmA*5x#VuwwJQSb#1bn%zr04n<e}efnkmt6>
zPcsgHzEQl0KO}!SrYhGN>GuixGx_?=?}5L?^Kdpz!f)d_JL}(NoO*v=q#bjgb~wU0
z97*_p^glVbw_-j@e+%!fGU}}V#GD6Cb4>cE{W0)MUZu||>P;G?1BSNP>>)bvxidCv
zh!%X_9=mji9(>*z%fxe=q>r(dEBi+O@D=IPVvq7m#=6(KC6osfuCEa;#G(y=xe{}x
z_<8Ugy09qWo2$n>;SwkM>7#6&J~p(6XP@BtKhjr+pIlF#bKMTQU9KB~4qmy2*NL`0
ziT3fK^Ba8KkWsGjh48KuI%T*HOe<_N-tjv!`fhS95Bx@-S?04k@=O9%1MDuGnU|UD
zUuq-Q!Taa~lK=Dp8DC%>+^%*(rWt1>uYo^ij7567#c-T)RXb?49ea`tSVqJdj4xmh
zpqCU|lKf{H{UWZ&W?xcI^%=BR<@bNUDIImT1Lscf|AwvM8hCdi<`BCPYqWa6L-_qI
z9%&b6HsC%X+w!a~>;<J?&vW)NP1vOWZ~Ff0ARh^tt{5%TjMMz0uF8~Y<ZdX_s@(I6
z{<4yAmGKDW6|lnoCSslV+MzLlBV~=ez#6)p_LXv^MWgtJ%&@QKT4^72T$UO8x>Ox{
zc#<{Dbyn^RryRj=xB>kn{CvBo&+zXl!`Q2mmCWZvpN!?pddxE$`;0Rix$gn7{ciWm
z^DFg8U>)bN5#O)hwV>VlA6~2nb1#to7;*qBufU#s{ZhyzZ0$o!B=4=3YV3(!PTv4{
z7wcA05uJyaq*meHzzQAjqbn`T=>u}_ViU?rR>x1FO?4B>u|IZs^m+^P(o?DeH!kwE
z$9tS9u=#nHIj{$;5_=n$tDT}q^CAz9HXLVYjv;>_a|F=6%eLIO$gM+Hfwq{d_mFSP
zw%jkv@LX#=znpl!l{_%YkS78UUSKW)?MXM(cguBbJmbE=px<B-=gXdbN|<&grYNt!
zwNL2*zU6NnQ4UbYHbs?nv8Yn*Z5L~S_Zr|vzed6RDlN}{iuoAe6OuU@l%bxXi$F7d
zuBC=`QC2WA?@~~#@3pMa-?4=BxMdam?{b4b+H^x--SSPu0c+q3@QfGcsLOe-34EUd
z@Xk*j0k7-e|5qFSqGdU7n$LTb--i23&HEbMU!*@~Su3CGMNzO`=FC1t-{sPVv^!&H
zb2Z;X{*IXKe33uP=iivmx8j}DrKo#3?w>Quzk>Uxlj>~7SRp>6T=t3ji2tP?eGWNL
z`JD{PGND&_jz9NL2I=?K?Zy5w>??vUbwxh-4EZsU+mI%|uc8igfCfP~a>ASP6~sLv
z$k-BljQUs}c^`P!!vA)19-H(}wXBOYW-^|!QBLt~;R(JkSs@r7;k^D^<=PkM5H#XV
zoDZ+#Jz%2V_pA^%c%rNeCrL-_g}h@ibeXpk`V+j+7Kt4V*wes0PYu0Fbwn?MZ;Uv=
zF7vJj=qG{iYl40DvXUC?GyfuT*^?}eZ-sD0z7qB$3p`dq17)Y3@iF%~S-8(66Xjvn
zNh%NXdkc43d{9lBx>j4Qv@lM?SU9IWzLPLF=7<|2-*_ubm|7Ka1NzC>m<oDb38yv1
ziu^9t<U8UgwdIwSt@{uwqCH`&3SiIi4c0<!b-%;?9%L=wVysu;ir+twvKOhxzJ#{H
z0TZX1{~tJU?gWwNmvH?;eqV@hbr1&w=GZ%yb)=Vir?s#NWg8w7x$td9<u(h}L59i^
zYX^<Fb<eYu6~t+x#4AK;ub|(|xjL;irP(#-O2ra+aHr7nZgUvx*Zq!#7{k{U?~}Af
zJH*73AV-KJa6X?7dx`kX9ZGu+=Q!V87qP4>?Zo$BkBVP#zAt#xvJB5w+&dRMYWo-5
zb03*w!J{d+Yff=_Ro;IMmTnW1pcfQRj}R~R77%{r#p4CJyp}F0cxL4v9?D+d^;Fm+
z0B;{;^4fTOQHbBWC^66Oczjt3^6l*hgr*&+lrTdUwOafhLmuSk-gn>dcmX3~vNEBI
z$R@}mY#Zgx+`pHhW1lC#?Ty@KaYP=emTM`<^Vl)3jz!vgD8JrF+g8p$H~a$Tii+0v
zO<k+vyBO#_tefqwl==-ec-c05*SiPn3VHnwJ;f4^cn?;Rhj`Dt^SXu3>x=$}SI2kL
zO2ujYWUMJi@t+QzijkK5=I(%^__+^i4PeE)O4JJuh)}Nn9oVnQFNS+JE0vKSeGneN
z{D}B}8$SJXD0jdqVy8Q6G6!-je;E)pv4I?(=gf2W{#WmuGR3ms`<TlYW1fWM9C%X8
z`-_9~6|!T)UdEy%TDW{|BEz@I&>fHq#x9Tx$coH?fJP7Yh)CKo0oojjeD_eLrwwZ_
zbFg3OzaX1!r1Rj~!q17x3qzhq7A_Xbiq*YwcS>)pX@vqi*>X8yC<Q-C_6d8bg1o(=
ztOA}P&iATXtg#55oBnMnd$APgzz4TVIR!tEvyS)ieGL2}?1158%4Fn$t<1|6&AHNM
zC$1&`6S@Wbr`(q0?FtcBZ(IBz+De|IpZ#8(=PB!63mdji32AxwUSqSe3iPM|jIupo
z@-|G4#~UxVSR3!MO$iD;yYa@s(^Yx6PF9qv)p~ZrzgZ`#0^efiT_283f?iqe2{+A;
zf82Cu{1n%CutzTgaCT9)OZtF&2=Ve_=;RLQp|)vHlyt!6Y@}X6F0v8E`E!Q;Hf2-V
zP&KWtko%fA*U{HW_=%2XJ@&H5FFy)v4h!}H+x=>Gh%$IJblWlcPJi5?t+NzvE)$l`
zS;AJe+Iel~fS6pBhwEYNH-~&ur&QUU*DeHaNvqB-k*eAI9l`fd2K`-^-`lFb*YBu%
zsy7yV*?FzLy0@i_x^W50U+#BwV*h$@3(CRYGT<7`>uu4N{?bur$9wU<qpqemhW##%
zI)87Ax~1Q-Srt=*_0DVSuIOzo!`?;x>%9oSe($LJ5!&Uw<^Y@-+R~pp>h3~$J;t5f
z+e*0WZp66I!GM1T_EtFnKh{6rcj$Mbe~z~W?SV_(eAGAb0WKG_Z}wZaiuKTMIqCtw
zI$LjR0!QGG$v$O&tIhtN0=&c<_!Dp94A^H4^+&weAMpYmh%f0t8UTl^q5goMgb(-;
zf8tI2i92w~9_kPH%Km_7GTsvB!|(?Z@J)>GWkdZ<jIV2`zlrg^e5k*P@y#9TZ(@9}
z9O`dkd<%y9n;2j0F*zsx77g_`F}~Lf^*1rT#Y6o~jPJEW{Y{Lod#JyO@hu(dZ({z!
z9-WgsWBt^m-^BQOhx(fs-|L3@n;75nq5dYu_r{_ACdSu4)ZfJXT{_g?#Q0VW^*1rT
zUmogjVtgwT{h7KdMm<G+r9*EG=_^&-Jk;OB_y(z4wY)2-m!-bdpMt(TQ(xUO)Srp(
zkgi(kyf$iwPKCaz`yzGll~Vr^z8`jpYU(L<CE$Cnw?*nJ<fEZaZ!`M4j`|tn{@f9r
zJW@}a`f9l<u=gOZ)KPc6q5q_Ap4Z#DY!7V3%H9^*8|c4(P{nnq2N|R;1<usVkv$l<
z9^*ovE{0FG;e*~*=v2g&>~of*E@1R2^=Urp(JpDg1v(Wv`VPWa*ADt3#%8~IJ79#4
zroM-rkanu>PTHr}B>lC#U!vag4$_ajpsrU1+F~qi=^q_Bcw2Wr`h(rjUk1Nmk7yh9
z??G25`0yjVU;2B8{v*Ifz8>q15l4gX*EsYVzDHjN*yc({G!69tANYpy_Z?B#RaKN?
z%xf?vz7vylxefPMI)Z8Si>h+*_r>}}JK-<wS|KuaA-}!zh{)WPBWCRKiHqT<RBp~S
z;x*cF>D$#dyGp)*d-yf<t+XpP6gH#{4l-s_r_>c9#=%)9iUt0}u|y0Nc_0K|H@>^%
zZs`*(mp-%;{dUUSRhF7zDU|UY?7lkL8rJ3qWQ<hhw3nfuqe1w-TI3Pn@ooH;mT<K`
zHCd;xGG~%vp--X(>8niElYJHW?iYAhTw18U_qb#8*Rf9|cd0|}F{=R$;HPk(lf(<O
zjV{?0B5etC6Ye)(A#BkAd_1&a8QV4S8SU5x{Y_>Y4SmV?=!@;hC-#H(_OrB4Jxlxa
zv$UUjmi8HEX+PsE?H%K_2ksY>28s5hBWXa~Ndt-h7sae-KIq}Unel*9wG{N>^HTV0
zSKzz{)=%)mq-nHvm)zskge&S~MZbaiq(A5>>Cfk3`e!G`ABX<V@!&W4ciCCmyUx=7
z^0TzhJxlv5&(gkNy!N1f;W^O%nhEG%bPn_{J`4S?Jq!Hq@!&V<UwW4IWoK!>=q&BM
zXK8=kS=yJ6*B<o0@f_&CbOQSO&w>6GXQBU>&jNqtc<`I_zxgcfgJ)@f%URl2pQZh6
zXKBBDy!N2~Kb(#Jom0deq(5~J^$zrj)FqnTB5gpGoo4~`J7|B|7j18{{)y(AZE=O2
zE8cu%d~hOt73l~u7i!@iP}sWHX|vom+R1M_wEwuqQTiR65AiAzOUON7UwU;??q)6W
zQI>@vtQTO<p!RRsYt@&P7X8730{4&6rV}6a$=|TNi|31EvQ9}3zPaBf3eEC`k@l^E
zIW6>IS%y8LdSgKm^G;grSHn2h;Gq7X-1C^~7k4$WKlEewi<@h+H00#acKu5~31_w2
zxUM|C3_h6}ndM-6`d#jo&G?O~T_N?c%W!6X{MFK%k&k%@`wozYXU-)M|M%Ss9u`xO
zgJQ1kd7N|DyP)~To6YAJ@cdkI?g9B>j6IwmhJ8O(a(l&V%n7@ZyTQA%#?<F_uy5pC
z`7HInnpU(!%fEUD@)u!#OM!gEiA@UfNbsvReFHfV*ptZjT9NOF@AsfB+NllLvlKz@
zC^82L7vw?sZKHP+u5+x?zrfgBkDqSB+67oIl6xc#T=w8x#nV~$+U)XoSMGl|ob{+;
zS^tZlgh?a!%1uR{dkq?qUZjt^zS-p$fB%KZqcU&gp5qzLk%8_`kB)CVA#2RR7<sa0
z7xG8=mY=+`K8gI%8sc5z6SJ6)s;YHftESz=-*L@geYS%<R~x^*3O=Ae<P4e1QCN>Y
z7xLKCXfHvZ9_0Ef$ZzD?XQ^}gc9`o3TrZGqvED4tf^zG?2lasO-N1hud5`u7Nk<Q0
zQD+~Nzg38_DwY8z;z4*k+W-q_dk+210i9*P9^^UE_p8X`P9yzr|3uPUa3QB$!TFHb
zL#uY@R=Vr2GJlJ2<xPOqx_*msW?tRxJZJ6bK6CtO>+gIN>mo;Y5kBxA`&Ex_X_#H{
zS~7f*cHjj3ASXwOGvPr!Ez;IX8Ob2MB9T8jz>5PD!u7m_tIU{#cRa_OWZhiQ8~(A!
zDaUVp@P#4TOk%E>a)hy_&nZzXlmkh_M#_x9`qI0f60U}<p*9x4hxrK}16I_*o}71o
z#~kpeI#yW+XFCq_@!hBS%{Xz3JhGGRw|h$Pd@ttvCghvj;x!ZEwp-#>Vc@pn?YhOH
zg1J{I55ObJJmaIxGfoP7-a?)cIY%Gnm!}u7O`ohsbd15@rwpZa2jYKx4!(NEvJmo$
z&(Kew<Wy&$Oym?#Jh*GJzU*H5>Ax=|pXNdjMecpvQRU1iox4Y|ECvpqwoOHh*&>hq
z(Gl7EzC-O2g`PdlF16ji1O4yooDDjmZ7>DvNbO>Wx~&gqU;c3$%H<g}qsp65K6#A#
z_n_Q9M)?Yqr;bs+1m$wS->CktM)}k+>R*a-Ip0RrS5Q9V%=$-;qg;MhJhJ|g-=O^B
zG3q~ua(R~AsQQ~xK5LBnjVPDvg`?_!3+35k)V~$w&N0e;D8Fos@;sEg#weeT^2^UG
z@B0+xxnq<cLHU(ql=q^%V2tuzD3`J{60g2ZC@&hLeiY@`j8R^T^5QYdZ$kOCW0aSm
zT%OlAYTO)@myS_C1?6RDmcR37lrI{i{7sa5$0*;2^6SPZ--hz?G0K}ze&ZPB_n_QA
zM)?YqFCC+N3Cb(RD8CxzUmm0UQj}MYQLdo;<}=Ixa2(~qG0J~~@>|9ze-7nxy?!M9
z|F9Y5w~bN15#`IrDE}79|6z>sTTw38-beNCL-`$J)X#&?_BUQVS?`<^ADok?SoquR
zRr#jh$vgr5PT1-O*Z}>hO|VyQe-e50q_n5Bjj#tedobSPS&w_@^U|wntNQCBkHF8N
z-4CVhMVnhE)aB1fT^=%Y`SR(yqVP;rw%-qXaS7qZo~R|f;`!USUufRnfcwNA12^sy
z`yVQCpV<Ep!#(#utTOs}yWNC^dorqN$FUD%6@6CYY>2DY7;t>G5wyX#o}!`wdn~YS
zjC0j)-GM9jbW}$pNqb*VR>Hk6C~rbJ-gCbz)&t}FfeX%+R@Obo{Uz9s@(T8r7{8&V
z9B}6-$>&S!d-h?kuiS$o>UFEI;e0FZDNFTsi!}@9!T%9l|Lb3iKL`FY@t1`^C;nXc
z%f(*-{)+Hdj6XO2%JApKUpfB#_^ZHQCH{i=tH$4Q{Dtth3V${DTLb)T3nR!qruDDI
ze)|86=Jz|XZ!ov+LF7$xu*W>V-?ibD{!H8#;XZf6Q~g=EFTj0S-BbMqxX;DCf5Ynj
zBHX)hU%BDI{$kuaald@S2mNl`XW@QTT>#(B<@c9w$nUSHTiqY5OY5)R5a<u#eP;BP
z{+j3q{cC*fmp{R{fqUOe@~(=hqki89G)cu?5F7a9gkMP?-=)vRw_f@2Q%#GxepFFp
zezSF*x8w4);OQFdwGq1A*c<KZxIBn`@7Vt+vKp~Zf<C(3&xA7M55w*>oQJSjo{Qy-
z)*xSoJ@E8hlfGxLVQ)P5#OrvMyeEDwU`snk*lzQ7%zyn%*yiuPfUxnbfODZ+4PbMR
z0bAAugzchHuoaxaQ`_W4Zd?4<ID^jx`Lu)Y;H@h*lDDq#d4e%Kinld9W2D3tKNwwa
zoYe*yaq;{@#z@dx%gYc0z&BPx^%r^7#+*0g*>ixkOd!6Fq*w9`MtR<0z4AugAMpJS
z>hioowSMYaS$8hZS;P4rQjc`c>*0P?@W6?FCma3F(i8pi9qLy2I_9-P=H&N)=P(~G
z@paE>J(I8V%Fh$c&X^Ct1#9&4upd-R8^z!8=B&@#aoNE$VZ5yKLcs{waF)wC&5K(B
zTk#mM*)AY#)6WsM%e@^rWAHYo<^sYt;~Zi8inqhbZ$?MyVdtwC5Vo1;2pf3n42=O>
z(S?EydaWo5-vV<(ac_fe*o*z0?Z$rZM1H|tUs!DTBsYHo`NV$7^lDtW7c^Oa8#)qx
z2)^B|mS=asCerrt`!VDEpY-Z8ahrR-?B5wW5-@)5{J@yK^E}aiEEq37PcWumKo~DM
zKQPWYU-N$~I%X!pC}59sO`FYgvP?g0%3$kU?8lZeEXL5CSqIJ&4SB{^vM;s<V_upB
zAN|Cn`67zPo-bp<=sHg@jzz;+=Lg2w`UQk>_9z&OC7-3<8Kxt34t0;38VK_{Qk=I^
z?CY9sJ5&G6di^}Xx^@)LL-e(vTV3?Ev^?bv<fT(14<HZNK1((8ue%`^Jo7f8M=7@n
zUu1;bQa>XO3y%T6<2=EChQFkh^&=OFbqHKJXIfJ(TEl!P^VHrwaeM=y2<GCATz%q<
z^7J)~PmpInY2tW@?HkZm`jUvLOM9d*`3(A;^H<=mpNadWnHLK8WsS~jwY(q8JrJ!a
z>1#^g0N&r1cvlS3pgo>Tx|BE-+Qb^fYfq9M+Tz=QZ+ZgXOxVL3cZ!kA-c);$%DN_v
z4)Gno758;y)<8Zih&_wZXLb@@xOX`bf1GYg=(4ma>$w-dX@w|4{9!{K#2=Zik@3eR
zr_K|7#?lpYlVF^R@e}&?&j}dUrbXg_ufVtAl8uHeD7mBHt3FTgouO|jW1yom2}aH>
z=V+U-HVyOYanercBVoI^>pa0$KT0pGiz0VHd5V0W>jM|B#X3qg=LqHMk={F}MnSVk
z8}`COmbl)6_r+R{h3DGZ*|sW#^Xo9jjBkUnhv@b@r;@(zBXTXUyb)`CTFz~bM$`vh
zS=tqpN9>D78T)|T#Di%#N9IBF-w{8`HA0TPiEE0;KP1M-8p!U_PR>;eZDvjqEh%pa
zT7Jf{6Fd)2pFD_f0}hU)<>%I3C|bIw%ky$)`r1Foxp-L;jN|efzeSLFrY>=uFaQ4x
zegm#~=LVOQ!*wHR=P15Vv@>$0gFU5J^Gwyj-E+Rc{Ocd3947V<J(BlS2r^e3X@lMB
z8f+<jR?0_F<l$<pXPrL5H9g9RXWOTYscPhUa)Y^+Y{xou2kv=hZuanca@NB(%5ibz
z7axVQey3R2C)d%{y_Y$-FVcPIt~KtLp9;C}>upotxyIq%a^zLNxcXL}6^(qajdLLK
zFz1dagRB-4ZcmTQzsYYUm@_UB(93|G`4FxlVhy<-d`NtQ5KgwuQfI?HL-*!VA7jlH
z-*G9-zoD&R*RUtSi#cbz&O74(=Hm&@p-r_M!<b97cR07}<bnsL#@(riqwLwcabDJd
zw|hn>=M(3eZx6nG3E_JeU6J1+lw#g+&C@StY=7YP?5?Ept8WQpl+L-vW>4&uW4-9=
zPY2|h=<Q1#(5smxzudK^H1)`<CGYpP)!`ZVxe{^~dGHYUW$I)nY|p*bm0BKtlN)C$
z5@t2i@5VWk&NJu1^!?{a-p<g;SkHF&+NbNwYOw}6)n6ECrEE+oW*#4~&riTE_0q6C
z8TNzHrVK6<SO*PT!@!^4r0g6ySEk!96zt6Zu0M%2vmYFTt)ASH{{yU#w_ExsQywS2
zGsbtH3w}U-igP27caD@SrSFu9GWu;9kO5Z}*LO=Sjs-0+HmJ|<m)H*PE6}EZ`(Gl>
zl<SP;+UNTnkdJE~Sd!f}S{BYG2c<3YEd0w8^!(dpVcPBsMNdN(rmY((3u3D&3s)py
z|J!9@>cEA9U7hAfKBK2HAB!u#_NhA)vO$^f?m0aWU7W3QF9CD3)IE)PQ&sxD@_xxh
zYSj{BeG6xWc-2cSSW6LJ$c>9<F1Rlh$}-G-`qbVo5ia4}g&yKO9e$7R-i-G}N$*{d
zsocmT)V)*jU1z%d?PE^~?EaFk7D9JfpriWm&8ru(hI*8<i#|rZ3b_wL*1MJU_-z;K
zWkP0AubTB<bzdUw>@;<XHSB8_G5wuvHJEy`oBo0p!rtk>!yne`h-1T3Q&nvVeBqR-
z-v!*c4Or`NzZV~9%oWzg8ezf0meOh$lQv;3V^fW=Zi0hBU5RlIX;(nsW4{vnQIB&k
z&(wR-M>_WNDDYh@)Lp3ev37aCqjlR<74J?4Cm+Fii&GW_UjbbM*r$ADwyN>_*j&UN
zsAKk#!9I9~A^Xwa&qg`+J~g-zkHwD_<6ASS>!-j*9Kg9Gsd&F6TjjU5uq6u4ei2_l
zTefM!J?-Ot--r)r5%^YVQy*+inTp>Xj~^!QBge2#*f&kqrEjm*0#?wZ3GZ<3_g27M
zro%pH`Tf|p#qSj@@Xw~It*NjlI3F1J9R<BkF8Cg73E&yFCFyIl`M?Qs)d)GFOjY@j
zUrPhtpgqnQ^p?Q(;mkp=uLEmX$n#e%nY?J37dkWFT8MEo$nRxd)K5_gsfWmW>L19C
zsedRxX@}2){>e?u;lEw~q`5ED95(b%>c`{gpS%R@f4lxkRWB6mBlS;e5ze7lg}A1e
z^5E-A&5Gy;g|{nJ#_T)`FgDj#&RCr~gTKE(y%S5Z`5`ODcbra~`SihO_>L0aVW!#q
z(R>@e6T-LtxHt8|iIR|_ur2*5`ulo{O@6!YYfIVA@qFzmPcVis`#cJGsG9`Oj0aq>
z?>yr#Jp_Bn^Uvh@N$?9Zx&AHBfoSA85QTofSTvpTEpfr`gadBrv+3Ek@>sUrkG-Q3
zW}H={xcjgVY>Cv9=?Oi^bEJbG*vr-)$2>kZb*-9)^XDhyywKi+&c*kdX<sQ+Q|@1j
z`4Pk!IGL)wdPh)*Yvu3H*yZn4$ufSgNxcHPgtgpTcTm4b-6ZFlo%F+8v->e$H^L7o
z#@q^OVk*w8!<oz}I1fJ!-?pb*^4$^V;AaQIIO{SP`GryMJFh_3UGCno>=k?2vL2p$
zZ7U+o8epu-tIO6FVr;;wPIm7AtoRK8aV_;B;Uav@t49ue6jrBPy@N6^bUsTr_tC{$
zLCXyCf#-O+A2WEyGn=6wx|$YaFBHzp#1(t_zW<x(V&iP-SmYeeLB~1MJYSmUOpiVf
z8n&zm>wl8BCHM`6k^sI<SdFv(AHZ4vI3E|eIOb}H&-%ysk)M9R^Ha+rhd;u;(|COS
z=@-Jauzl_j@=NB~{yZBUrlUyy?gi=t<~f9!@Uk8GnK%=h?I%1JTlQ<5iw#)Zq={cl
zaZ#=)-wC;byh{0t&V}A=%qU&<fVYrxuHjtVs@0!+-q5?Y@~S-8Y`Y(R!B@hneMuqb
zkRczoa>&Pi@&T~QIV$U>cnirFjvF-3mJULXgD=a;ml7{z3v}W9ATFeXhTno{x*g{b
zhklOVg^=e9(}ypMg2tpN=|-9*(~Ixf55E0@+<OZXeI=h!OdL_i4Lt!GOm^b=%GhvD
za-uyA-}ZJ)+6j3awU##NeC2=7$VmdW{Bwlu2Eaxid=zZ9qvuI4j|E%7Il_iBp>1R2
za-n+xuzq3of?RcuuvL0HtcTB}n|1pIgst!#VT%Da$mnRES~D&nY|QO0hukd~1!L0s
zP5Sb&*Kg97p9w3@+BrWw9xEqXbbeq|dM+T0SDz;s&)5E+vFLcsC>Y(GliXtm8^0X7
z*ft)&sY}@wEIu?cHvySFKYU*^DxVB^rfm+ypSc^?$8r58Z3Tv^My}~ITq|)sjjP|#
z{qnr*GR7z+-f8^JybSHie)GGDscKb#XES~1(yl;k62f;9OAtRfQ3t*uek-Md`8MYK
z7%w!{%DsQNC@aFV3(wpK=x5xB=PW#P|KD;vJMmoq5cUo>H)1U8Lwu;WKl7n&{aMZ1
z`U@Va?Js($vA_7C<NfaDCH>y!y#Dfs^7<>#zOuQtKZy33&Dbya&=Ty;>+P>;I^MtL
zIqX%$nOZvPtopK!_1#ICJLGxBcRF|QJbB|coh<ulgL#IKI?2C7#XGZn`#9w-<CG&-
z9J8NQ<CIs7Q(inydDb}Pwz12V6XTS>&firs@U2e5SLs^tJ$yri?`^B{jt#o8c93XK
zz9P?Hd>@m7eCK@7aT4gnH7Vq+@Vko{JR22$mmWm^D%glv@-7Sf=W7ai&Z(@!^O%h~
z%S-s(kED0f_#H|ab6;$$PDa~WwAFc*qvAq*F;@NbvFnSE$F469k5hmDIQ6%WQ@>@L
z`sz6KSB+D@Vx0QL<J8X@t3GJ!P(zuLwkpoerJR#@q;I6I((7wOUi}-Hm63Y${sCtt
zbc4)E<E&(y6Es*%UBGr4&P>DksaE66xsTWG*_Y;5;~tzhm)63w`kJC?<?0V`9w2`&
z`i;+rvA#1pHf!~ZqPrQ7K_AFivSh^+x&DcL$@o1oGcMy9KseW@#EV=O)|E{8Du6CY
zoa^J%zOh@bGchKBPmjFC6es1e30Il>5Lj1EjN!B9avT-Ed7`G=G&D|$6LnThDPaG4
z8gk?L@c|=d#rQ@J>qO!_q9IsnrK}gD??g^5m#~b41Nj}mK_6XPa=eiFEx>emeQ)7f
ztl_tOp_Vx)VFf;NeE|6(=G|qC03FMD1lsH?<atWuHQJt(u%eu>x{plB)oR>@Y*T`~
znD&jrweaN!`R%tVs*5ytWg+U}jMtkA(e@C=aq{;m<T^$w>I$Q-q$lf!aE2lG3EP1a
z+Nde01K6?mVNk2~<4iTg;W(pB3si@-@DldfRkARCvT&}jHsz$bO94me3go!njt}^n
z5O<qrI3edH7+-T-=m+{g2^=dKlPom9#autBF04OT*kJ4rEBGB^&K@<br%=nsCwe%?
zUz>7$SWP`v2pAMKL)>JXUH4-LbEfKlDTSH<yeX3h8T%Mx_=~Di@p~hHvs6dE4KR3u
zLIG{<%vD9ag=?2BL4CBBxwWv6v{Z$^2r|MkE3l?{$gJ;VeK{6>pJW00^WmGwvHH?R
z_2b<T?<>6x`N4;FA|Gbk7+LyT`s;R???j)-tBnf-;`AXHP~WMIfB`zwgkf}Fqhat7
zh6eyci-f@*X^CM?bMWJbd^o?WQz#EbmDW-x9Mgxz9hk59*1>ur5a0gI(r4rGTRI`X
zPMinPEDH5)N=!}9<@aR#{mK)Ojk$oq>cun9hQoSvnw!6KQZfm1=s3SW6V>`JFpp~B
z=N$KhgFWEY4+Qgv=}k)@&zN742hj)i2}YM7zmO*~s=TOk3D!sIk$Y^9Lm%U}3Rk4L
znQvw8SA9h(j5LHm%lKAvthoB`a;!>oEM<(b1~`Yzu`=&lg0r+nj?>3+IEMOv6r8IO
zA27#2Olk?uxq8k^kSQy5OV!o3_3Cu%_p|V<iiVq*OR3T`N`X@r=pff<)Jb<hF6}I{
z6Goo5=qZ5QZp{yCbt{eY?{RK*1hin=h=w!k@OxUM3-kTZ%QnxO;8%y2wAmS5h5Rhw
zBVDvI$Ue?n3_>sPjB$02zc6OQ{L+@-J3O3;wmIHYCBU=P>%$uQEy<PVeq^#Q_?-ic
z?U@@!zt#FHLM(d^b#w7s13gCnYL@IjQ=Q{3^u&>COM@PIyM%rBu%1_s?<VaCleQ4Q
zUy}+w=i>MZ>y$_E+vUDCr9dmltW>Qh`P((dx^0Rz%z37!oUG(LA}t9Ybs6-6v&1>1
zOC3>9d_Yf&55#8Ux0|7lv6jPc6_~F(rXD+0sYP-tBM-Wben0T=JW1ic541>gRxazM
z&N6hSHV3);uVD;B_c*1l!#(Kih~{F9RE&Z3f~G4$7wAyTBRPgU9dhuV6KDSX#ZmG(
z^!p-y>tsr9rB+Z>dCNb8Uj|OOlFnCRZiF6jlx_w54{R!o^<s{Eq!h-UQeqg#m0U-C
zAMY`TWZh=ec}0m~&Vk1R4a=5bT`<thoYjE454rrW$#uU1UFP!f8$rNH&WrDXhFm-8
zfUlHk?1xn|eej_=g%*N7sf9kl_x99*lzBD9Uxe?Py4=%nKLfu@(f2rVbp5BiyM!}Y
z|7w4_m-=_3p?|Nax+Mc^j4^!Aif_*s{1bTC(O-Zzqis39mCfBo{Vw(VW^1nbT{-3}
z);gA;9QK_1=Af%i2K(?^S1FJ;4RVZga@>#|=0RgAR;PB!tve#$qke)80Iu463%?8I
z8SQcC7V4xA1Mwfdsl(5R!pC@yeh1Gc)}uI^I4wrs#PCTz4ADo~vu{RqOquaSQ*=gf
zLmke}wBr26mMf;kR?H~c@FKq9c~`jVtjHfKGYX>fL=o21o%-e(MeFbXVOU=Y+JeUV
zeaI(HdJ*$7!|Q%sT(-6cYqhXNxSuCw`PbJtV*6&~qOHsugWvoOV4j<6hdi%xr(mu*
zsV4$&pzi|w?hWoYzkxAbSg+-`9;4{F!0s1U+`2G?Z`Hg4=PnB63#;RCuJeJPa!rRm
z0oI33xE=A&O4h{(Xp5rCjNFE4LfitsxN0@l((>Yi?q{Gs{^N113xV$kkb~bmy)QV$
zTgbV<n9cKR(Efj*-ala>4}Lq~l)emo9QA`6*Y3Izb7~9p;9JNE<NV?V>PGzD(XJcg
zuvh43wKYtgq^-VjEq{MY&S$q$h<bylGjNtVr%|Wh{c;><4o}z@=B3%!*R41&72_q1
z1$_`)a3ApZ&BzUQBA!UaT>twkvCl(T)NQ7Z23itl@J9NWIEU8KfPEEm+%ftj?ih2>
zTt7PqzVY{DF1tlX|0#@Xpi@K8cYpsleycXT!#p!U>`VcFKx@#!LOm7D0lynz7ti2v
zVXI%vzq?Gp9;Lk)R?#Q?P8-(Tke^=aXu&<&pVYxG72js7ZI3(jebf8gu&E{U<EP2*
zs=Slk<Tq)q?s;75(BPEvLdi$;OE??mVn4|TKVMXW^+@->89akNACP?e2Ik@FpD&`1
zNPAG_BwgY2y#fANQGaC;|Hi4SU91$M@6+JnK!Xi!>d)Rr{ZI5i33VY?L-hZEV^=4^
zacd#_1`WIm?#KMO96smYV@)_u^3$E9!wW|6ag2V558yNC0Go$C4|+O{y{3_ESQAzt
z_r6J8i8D*pG~W)b7O?^Nh`J}-y0XTzVp3P>W_gCH)zb+c)mz`-8On2AoEsL0S~o8o
zDHjJzk4ih+SvLrq3LBxmaI-_LnH_e|#X9`)$}5AS@=BihO5aRP=_#cBR^M9ci0IXo
zv`0;tZ|cjxbl}X4a@yJG4S0U<HHY?foHM@Vm(Z2)J(d{#Xn8$_{O#sQ+HTlW==9vz
z&`%%zr7kVy`Y`==`UYCwKg+X4nvYL<hU;DUz6!cD9+JN`(h)DBPN80+?#BEVD<JnF
z5sw#6f={o^z@CyB-lm-ChnsR{IHSJlhf6>U(t!5AdGmD068snZ?q1W18Cj_7hRhB?
z7iC56gWu9I#g94QRwpf$K05K%sx6Kt-;B(=HR1Gbn39RLa9dT#@*3J^ROMM-qb$<4
zVmybpeKKuSktY0=Wu1r<@a?32XJDP)SlB|_0=Tm<F9!4@GtBcUoST7<1?7&IVk1t-
zEzQV?ZML-GeA;y2lMZ;&F(+4GPSTzn55zY&qJBE$zz&&=^BkENp0&K|92<@+wz^tN
zOI@DLrTyKZO0=6vJA}OxQ@!ohEapc@Gx#0~^*{W?Q=E?ry%`GUQ_0f8O8h1*@)OnY
zhp@NOoM)itAuV(>d}GV*y3I30-PfQ?{_ZtL&UeAz`P8RN9nM+8;_k)VhCWz-o4>N;
z2IN~9;}+p}v~IcCq5aR>Bu#?{GD>gxBF_5qO+Tt#e4RtP1@v7p{iOQSD;?^8mhvnx
zOUc@JJo~%waeUK{H7V0itbbk{gw3+S9()`-GW`^2Z3q8~Be6rU^_Gk}l&{aO!x{b4
zPpx0x9Nw@H@V)r}efccpE=45%h=ac=7uoX&W!0}O!a8IGb?8697Ha#y6ISn;<yil{
zABIWSNZUWdj-PlMbS~!ieQFkDRpbh7(LXy7U+s+aV!ch7VI$4fUrXQqkkGR68+z?Z
zeKcqK3C}|~>*L7ulN<6d#zNr#{|-yeSzxiB2@8IgCujOmz+wR`$Ic%tA3Qt}EQBMf
zOg~Dx;4C03U^oWZPuD?L@HQQGk89#0x?=hX@D2M0g%$nLSBAU;UdScde++ww7=1cy
z()3eok2xsYLsm{;9-oBF+fe^w)H&tD8O)^_!is%6Co$&_MOVy_eh1{|5aS1oa|rSx
zcy^Ds?X;J$5C(6T6*6MYS{8y#4nkIM!F<2xyAJKzlZEQ+=N($05^Ll3QZ3EDL%SC9
zqM_2O<@<MFPGx9boW1;i+j|%Is;V>pd!Hmg5~7W5w4tExlpqNqAs}KxxFjM<43`K&
z@Sa0*LSnAwB#`JioD)C`-X@4+@xsM=8LgLLI<}(~6i4kJL}zI0pQ50R)jA@!rPV4{
z;Jn}8+I#1M*y+qWpZEWH-_M&5i?z?%>+-DUdDe4VYwwM}f<4E#HD?u5md<;Jio@27
z4(!3iu#JDBZ*Tqw-`=d<-?8F-a=yVA`5tm+qxEP7vOlzUabD!JE7C&4CZvVF!Fx%5
zX#5zvVlA=|8#8pqtUMD>JmYfooZ~B%Jis^Lxrd$kjN8{$Is;P?0RBmf^9pui^9<ws
z5dB4*{zin($jU=M#&otPL|@@a*~ahEZ+xR|S|esWey^Jjzf*_)7e`jvvTgIBk0Wn5
zpJm=#^|0jh1=wfbOyMj==AFo$^~jxBmha{8`S>6S1t;;L3i^Dg%l?Es!0vJM<3K+O
zzsC4c_&M^U<ln#>jvw`CdU?2NAAVGp<3~N7<M>gWp$rX8FRwV*&yP9-KML9MU-qLo
z>s9oH<k;l2&~NbvUzQ)WuRMHyetAI+_7AeY;Cp<BfcJv0=wY9I7dZW#n0w8B&LI%H
zDk>wV{z$uAXVfF3c8eb}Lp{`~qt4Rd9ijWszrX#G@4ix>?+iw!@9qeFJHI?Unz_-2
z`dMDzksR)M{Xa{5(j7zJCPWseD9%_o6@C3U@;eE6j2=}CNwGzptqNa)?T7AJp97r^
z`4YN!$KBQaSVCsEOSAPKaeW=-x5V8geIr`yTbCspzgXj~6TSsF1$k$qi_#QpV-2TD
z&WA7ITOuWt`@fm4I3(`1E#I5<c9gXiV=eonbBi|}xu1SVNVbNv#&F)teg2>CHK5ae
zUlzOf$HZ36`_^S!%2rkVg{7Pm7@D-L=<!pw>Akax8EJmv2hQ-~kNqn;CGHoY#H73~
zd^S%Xho>gV7TZzrIJU=Qth031**^47V%#s}r-eR?OB3EgyG#sbc65m0|Ah03p(|(J
z!k7FYEj+ILse%X4VL9M(6zBSYIb1&`&BzU%FUv`Ky1>PExb&a$x`!q`9epI}>ByQa
zOZe71m1I{4U!sR>DcKW|BfR6I9ysb)<A<;n@ts3^d52|&#x?%)?C4<N!A3m~yT-ti
zD0qsWD)Qi&>cR6-KX^_79@*Kzn<RKndAe)NDNjefH;c8c*h%aO?D3d+ZekPX#i4OA
z{<v)R2!|8#%|(kpl*R7JHne~S#?BWVIPW3*QZ!Ki!o6r6N;fgp9^~}_`MmV;OxHAE
z-(mLgEzv{t3D;S&7ZdefdU$6_xN=f{Bw7xS5l<V6Z4KPx)*zoO$3`$?)#0~j{SHN*
zZnFxo;e4`x>Bo&PASdv1phrg7{()jwQx;~k$MW0wJmhO)=wJ@<;Ys<(|5(M4glX`@
zYhi0rJ~SzgM2jugp8BXPwxJLl8~`8K`1ti)GmjCX9q(C7#6I(d$6TOiNBH*WpSQy6
zI?pa2DGS@d#3TBi6&`ohiklwn2z{`n+=)q?@gnw|o-fvOObt=!H??wxV90D*8^vZk
z?G4$8p@)mh(QA7ewov9jZD+UdwAa+<i;v}XE8ej)<FuUxtH-U`={s$YeEp*twOM*+
z%2BJ9Z!jdLAGNIXk2Ab)FPt$a>htuQg|0K>>wPOH`t4h1S>JvD96IrXcfUC{8h{_%
z_yO;_dtLW*c1`QCYm{|i_aNeh$UpSB@w=gmv03H2K^Hr8hT_cd6?<pMiu`qT)(FZ|
zMNj$N(4YtU=Mx_y?g(!?>;DjEnfON6Hy`RE?(r-!kiHnnH@7H8qVYxdP?GjAk^S^9
zJ0o0$KS$q!hrZumSf4mWG>qJoZ_U{Vj}v#&8B*E2;$`Bm2SiU@qu=&uue1<&={rmB
z4-`+DzN5&P+n8g(>0f<I_C#(mx;s-i(ApPVZofVK`hA1zZ+rK+=G<3?ceeOb4}ZE}
zcp)+++xUp`^9@|UGD5IuUKPly@EA8vF~<0pA5!lO^W9qJa55j<jBPt`nX!|G_3j%<
zKl0AWgm5MH!Am6OU$Di@-$v&i(LPexo>i`OZe+<Q&gc)uXJp>MqgbPlHOzNZVsFS^
zC>)7T+=Dz=jZax;Wa)@5%AyI1*-BOuf1tm0@;kp*%=glD7Meb)OdtEa_?KkST^WbE
zg_CYyT3f*&%lCXqT0x;NAw9Gmo!5rW{3Uu;G=%5+;mRg{%2_gW2k?paO8B;31?S5+
zr<@R;bw!$ZuHa1edEQM(7d|JKq-3r5m$<Z|cdf(~zd$#FD|q}kF(lu*j09q9DOu|>
z%(G(^3ul4<(ghu%N1w?H&-y}p0EwXwzF>dn)Ru+kpl2(YdyH?bgIAr2=3Hp1-l-X3
zKFI%lT07y3zQ_wDt}}aSky}2rie829H^v?vx5=k>WZH{%;X~~IXA?u!w`M|{@vnIg
z;4I5`w4idx&&y)#?}1kjMBfMhn_{t5`2WaPz8!?$_b%_3E9M>Jud=_qJG~%sOQlsP
zpPPAByu^9BjaH@XxA1iA+WI4$sZ<Qbfz_Pd%T7q;%xkKN4a;W5o;7ju8<@x0_{m9q
z^D_J0#5uzkVfV&=A^Y$)#ovpr;hRV?Viv#zjMl0Q&S$!?g`@pp+w(sITf^T5+ah3J
zB;Cz<Rnex4c?#Yx<}4Yp5ZhdEFU%P{EpjXCUh^+oKpcX3Tf{rCZ;IYQ_T``x9>R|s
zjh&C**Nw0hABZ0eA7nXv5WbdnrG5A^e1QBBA1ngzi-z{$U3?LG^b6wZDR$BQRzmmV
zDYjx!`u?K!4fwVl&sH2y9d}cl^bC4=$S=xb>(+@!wWb;0?4=uBueoKX*pe&Aw~r&Y
zZm_}==cnCMCq8rZmm|AAl;4pme%3mJe&!pNte0Z-t1|k{4Cg#!cr~0&j5PaH65qNq
zYnhm5&a-*qVXd{|?Xi7jv7;|XS+753trldYwMcGjO>2E#NL*v~gXX((hZW-{cAVDj
zSIl8hAPNt6$73T<rZxo``i^QW=C&Oy*y!UL@@?eTl0Qv;7WorSygb(Z!UI;d-q)r0
zE`7JnvQB?kzB=ayiW$RK^dh>9F(NO2(xG>cAsfyS-m!Tyse66op+g<2uQHvfr5xC-
zjf`W-E(f-@=NJRndgt|5#;)rdJK?7PWbE_4X6%f=Ha2rfl&pSWB>d1Lc^Na`mh7ss
z>{SoKH&J9~f|bg?RvL9vS5*=Fc!{&-)t2Iqx|dFQR#&{0$@MI*^Seeu6MYXbllMH<
z9dGGcW$F~HU(K26hv3TuzH$8!-~W3V|GV0<*RAH9Q>K-_zS^4j9JB;CcK7>M@wx=-
zLQj?h*I|8A5m@637#F$lUF{7iUMC)yWu*-g-9__We!({_v@NTm>Vs(pkJzOZRYxM?
zJNBZFgh!TjsQ&@qC=B&}2efk4QTE#o#E$5jxjAPiN(Y$t4(fZJd{e3bzInj-Tly|z
z6rO<Ii?(b3GvRjGSB2Sg6SOB8dAl^PdqnIAe2}6#v#f8`0c+-SUGOJ!_2AX_V_jY_
zG+<tt?6JI$UQ5hbWes87?aNsO9NW!zSw}(F)X-V!`O_;?<J51_b91pJW2aO^&>#B7
zZREo|%^TZ;^J=NA&EwCCFUPIYp1sZ=q*|fKL1fY=cb{kLnHlt87i%Z}Pib05;#c(C
zr-emx6U0NNEHWz(-q3rW;}%7+XP6`3kJNbq=YA#Q(vG>N7sP)fR&ka!y5tAEzZ3Wv
zzt9~!wE(_b4<Atv+WGX&K(lt$kGoDXJznteqq(^FIULR$#@-RnKC<pYNyG1sL~X6n
zbo#nleHGdcJoKL`Iy3geI?E;=(eM6zGJyUohIfYUAK5`%SbSyh&lqnMz0X;R=VM25
zHXAxTl(RX}Dma_@S=Kqw!@Mt*IMF)B#)nPMk8Z@5JR8|gKeXSPvl_Z>gn#(fC9n*G
zKAq5ZV)RTaL3|e3%=2pUFKFX_qdB$Uh1e0v8RDa-IQTnud1TXj!fmC-)_0IA&PM+1
zz=p){pJknvB>WZ|JXi~hc1R96c%{wQqL;w=dj{t=u%4p(!asORRqUR!E`3v0ys7a{
z<WHU{i7Tj@YtBA-d@4S8L2Gskw7GG(WM<~7gL5n!{t4T|(lR2H5B-Aup|Vc)>RSvw
zrvE8T??uu)SS#ZdC(^jCoi(e7zSOVI0jyd($BMjytUcDlyLX-U>eB8N!`H0m(AkIe
zj_9c+&m+Un>~Z{rO~`rr&^$s9=5(CMM=tDJU+CglLDnuXSFmnIO^FtdT?LO7JYc0(
zu5SC5@ay<n-&m{pM79hgetY~F{Z_1}p6-h`!Ba8(RBmJyJVs3H^SW%ywv&W|(li^p
zR5FY6d}*O7N9KgK<aEmJga@+L(6{y|)@G8gmc4FW%9=^hI#8d+)}+0zWz&j}6{DYn
zzb%_X`+I8=oVFVnQ}T^AhYdU$hx!_8&PvPPfIfHcA2IjQp^~lDjH~tJ%=grvGsgk4
z)LVBiyoj$U-x3{Jv}@{zY6IUKj4}t_nbE~s;2Gj$Z>o;U3bV%@mVF%Ag%5`umCj^6
zjD@EQB}YR6=2B_J&9Y9tUA}3-YC9F$#kpmj;zPs#tb=}a{Z8HCAFCeq;iXgO2<GR2
zum9Ti;N}~>DeikXkvFHB?_9GsBr|v~{;_Pq>gw~;U44$;KIP4jE6>z7-|Cfa>eVk^
z-;({}H{oKIl`Ppl0C(Vbi|WE}<-}S>NH&Xis9)WU4wz*Pe>SrEJyXW@9QZF^{B3Lq
z<V68>Skv|ttJoc5_#p2-_C+G&<-0Po8eS|1#!63SdN7J^`cAa_&1m4Xo()g?j-Gq8
ziekKng*kY<!(PP4nuC!6C*X7KNFy`S#c#&G=NqoKkHmh2e~hij_xi-oYpTWXeQUzw
zPcshp#qS!&)4}MsF7Zr7m2}F~4`oy8xA-SKl9-&UtED3i-Bwze8mG`U?^BhGO}#B1
zdlTMgEgx2#+*?24sxfJiRf~(U#is~<jcwqMUtDZ_ZeYisG;7Wq2Yh26J8Q0FL+my0
z+Qny2=#d=b<6<wSxiSR%Z`gS7mMPj|<B13C6X?(b52T6)lDE<`@BsW5%T*tajE`k#
zKS6xQoG#>B*2Nkde3Wx`s{H&OZ1|N{@!DzNpS5A$$u8c(w=?uW_Ls%JG&ZZ|;H)1j
z?R?HJvF|C|ysZ8N=ZW%t0IxXjtd(v)&*%i?cv<Yz?NhDPxUQ_S9g%m28+%{)1J2^`
z7~;)qkI2^0J6rX<O*-W%#BI~zwGp9YV-uu>bJ)+#<{5t4LH|ALW|i%rZbA#+kw!o0
zo84*RZPq2<bN;N(dB5*x{{H+ZoN68RlV3d^9fVimly!8I!K36$6kI_Qe0*^8#Z>qw
zNqi%F2H05V!*{v1L8j<`BJDT>lTcAL<aodF4hx6Qdbds&Y=Xz5wdAQ;?^<)tcjeQH
ze_-((X5ytqJ2YnE^*k5%bND-M)xokIM&EC8-f<3njBW#WiA6i`%VUB$*5lH#L%8Bw
z1u5VwLArzAiJ@qgcsEshkB%%%d{=9PXC^p9V@;9H0H67~AKfe&m6Sodl!$}pboD7e
zi79!{S){t{%^J}BzD}-c4o0@XFW3i0hZI!3#j~ts+d`YLqoPjSj{Z2?RJIKt=_ZXQ
zy7Ii`4Uy<!@eexV`0FaC>>2FQ4)=Kvy|+v6OBP=N_h1J%@CNwHb@}+~VCylkX?^0$
z!2^OVQ|lzUt1N^smm8}3sKbT_LY2eP%z8Nanmz2zPxMAlh*zWFel_wZL$CpV+8X>N
z;cUa%Rt7k~f0p%~?M6m}S7h{UnlCV5pC8}Fdg>Iu;rBM?m(s=ayu{CoOZZl+M<ZyA
zUKnzz<Q=?|Cfv9*LRa#fXB3~Rugs%cCeNg%@a$$HeWvj2C-F998+(i3Gex|8GFrml
z18h1YqmV~^Ybm`@I;&ud?<by~a_oe`kLlaKW}e_z^Dnty>nXjnpWggBITP)E0RQI!
ztEKxz{6(H+A?}pE&c`z@$jx;nyu;&WD{~+3RoGWz<?r)b1^ckG_B~+D+V`SWzVBUY
z@tZ#EVB!HAd{&FWz0bP7z-O(YuQu{Ta%_h|_b}(x1w7Z{txr#eV-t*!PNZIDl=vla
zgv6F4p9O8xHFwDkYy)E}K;x6)`yue03LSVaq1giw4P9U0%VWX|?~r~?bb@D6S)-X|
zjdoc>opn0s9_pCqap`|C>wF6|O95WdFU`E0JYpqqox=CUwNI^QN>hL@RdwLKWZI=%
z&+{addE?&Xj$7f$dF+-E%>U%N2p#0<ud>*Yha)$?*WvovKFLgMFZtD9N5efY_>g<Q
zCWg9!e%MC@mlH!b;6n^%jlZ0|w+I|+y};{fmB;`iH@Syi8B07$YX=`T$MN5oi|%tT
zb<N=3wPh=A#c%t*o2?A`^KD>FP|ru(4-IblJ^}rAbDhew+Qr4&t<_wogl_mv8sDE!
zj2t*zF1Z)k@?p7R%Fg#tK7DpQxF(rzZ*UHDPUL>}y`Wj-?Zf!XM&_(xt)-USYgLxq
z%r^w?|Bm#N@kc`U{swsz|4)%shpn-+85gg3&*5_7a&ORPcI5uUvNz0k5YWfZx_((!
zDD)C<C_@&*6AYoXoZ?=aH7r>ly5ZfYh~G(9Z;OoFtu;IGIq(b(^H1bq`Cg)*Y>Ciw
z2LIR-Uv$Z@EVPmLVc^9+z)zig&s5$wMtLN#zhm80VlPuAN8{Kdu`=zdSS+8UXO84A
zxjNSFr}IoqB6I*+v(N0>(wUKmviEkKV<lW~`z&aX>bD&lGp}t%?})x<o=9J72mF!B
z_hX8&Yf`Sa4gX%~_{K+!jCb+BAsPaH`~)X<9Y;LO$Wy+*^T&4C?5u$V&eI-Xykev8
zv8^I6pzAkUnQK-!b9d~Xqo<g4f$t$(sH7|QzWCdeZ6l_|H>EWu|9stC)87c<C*{1;
z!m&5e$D#QBcYj@M!n2*Eb65ju+D9vkef|Zw9bg-H_2iFC@4=sDKvVzhG7~o~eqQgU
z`=ehrYImgU<*1VSfHv|!T)OnPeGc~<vx6~j`noau)eBMY>J#f>6K8-A_Diijp}P1^
z`5z@wVjvqiBb*6-z|98gNVXHtp1h$NIZe4|XM1y#Z5+C(SLez<eDTDwyt=^TliV%L
zes4qpxp1*A!^BL#G7rX|R2KV4^!Qd;?BEgddh)~MFOzEz>k9H7@(0P;C$X+1-$Oo#
zd?z_)c@FL%&mw<@{5tZj<S&swN}f!<g&aM7aD!kB6W_(2v$nrzZQcK_b%gVC33{e$
zU6=KQ;vMoMLfdjWCU5clkd&xwf<oKKwoI-^A*al<h@o%KQmn!n$9uUbODw)O_OY>_
z@j;_}Gib$o&zW-@(dXzBe|^R0oO%24C24b`2^nj?ZTcTo{CrAUQ8A18b9|j0mOYtq
zib(5AtPO=dlv|`?%5=ShoZm%TxUM8c@yqDPeA_;1Ek$p3L)#~Ssiye;q#fji{H`U>
zFTUTW_bQAj+2qr^iSoG~3CulQr*n<m_URc98@ux8ENiId%$(v1xNhS*m%96?o62<#
zb$TejitD_R=Y5r2>$#aFyz^_1+uv;J+(p@9%8;K!HC`2CY$dPe{3LQ}sK#sI{zJ48
zUhB9%jJ;98bp!3ye=}tt<AWdOx?O#_{a??0%_pcnxxa^N{HwvTPj4vMbX;w=fmgk=
zucv_X!mR&PomUN=J*3Ucxu^XD*^wK#eg=FaqmOR|=gJ@D`*gCi(P3(z94c7O8H6tD
zE_8h|v4qpsfbTBo6k0aCqZS>IVT;bbv`})nVu6X!Gk@i~)?M^<)mj!|&aLnW=Yfz-
zi8|L2Vt<uySNJxJFn&uavN3@;YJ%hy=lB)h%{25aHvasW;!S)9=D*m_DrBnoBVz41
z60(jfUY9Ap?3>5XnSwD?nSLbHf!?7`BwexaV~?I}tgt;0=B_EgjPD|tqr|GjgW`SG
zez*9(AnNQ_>-~l3*Mk2}pU_k?^)BY`#t^3VAXDy&`i0v+ycmk#L5$W%Le8NtR+Ku=
z)kV&FsYB~U>ql#A#j7uMuA-gRPcb%l7kg;Z$Ico0xbAW5%o<PRzK?gD$d*ZrT>Z<A
zyfeAxJHer0AEn8b5G*U+-dc_f+#uMBH}U+1cx97sab(ku;>Zs6iP$HMSTA)%dbXBp
zed7~;V=^$H$BKD=Fu$wFN|1lWx%I=qeNKgS)@KD(Q(sWb9-O6yDzQz#U(prvixV=`
z9{b^C`Ihuia2>prVLSY$e!8xduVqhCA0`e*d%a&weMGMKi;+1ie*BBHk{|Ib2=vjs
zwZGIWn|}O}sS`QAL-6KnJcB2}d#{zRG1T_}c!ATvxZQ=9ekJEl25&um{>||6jcxU@
z0+`^}kMmBo^2blbmPtC88n&%-7G`fg9!j27Sc3g+XvjQ_UBz5QOSKd1>LYTz5C7n8
zii7LtKN~O~;TqV5cMl&Y;C-iu_qzWE-et!a+!IUrYq-}v@w9Mg=thim#gG4FaDm_R
z@&B7>XXXj~nvdw=&B>e3N!Q61Vol<^9frqc|NV8od*^T9yDk3(zI(^xyFbBq388`>
zW6xKkBRW_U@=LpmdhlJyYlm5jGYVN-*}KvtE2x_)xRDtn_}*wYZStvqn%dpNchI>P
z7um2?dqPtpXS{?TW=))IV_WxF$!aIL?Dj*P$n=w@K4|YV{p>&{oy|D(X=LF&RwcOd
zNuJW@Vsy*kg_T2&hla+bNuQu6?X^=lj}=1K*owjO+|c83Y4=dZSm~16lnq%pig!c|
z!cLRU30T(3n~be|QaK&kGEnwMx3OjhSw{A+dKek!$j>Q)tB|>sY)1#$JiAr-jpLk8
z(sReD-@S{q5H!yZrfOXj^L$ohJI|QdR$TE0D{;~GglXe8;}al17j5VL%k(84VvcsG
z>Q8C<HmA<EMY49wpTCjV|GUg*MCgN}4&66#)6w3&Z@gPuY56jML3(+`B?g8mT^U+q
zW}hj)_<6nuG}+pd(LtS|FLG}28^^)9rFVwqV=qguMBcHmgOKO%d?$@L#?i)BAM!(V
z{z>$JR=FFv##g)F#Y4dg>qglD`CY(|?fvKR`P!2$O;x*aHh3S(es(tRYNGu;Ii_tT
zctG!ev3TuO4xi=RVkOp|X)Vo|3a>qOkazSl_7rGZoL)d%TW5Fm{0uZlzxJc6`sY2?
zqN|=)7vJnY*sDhqC&N#9-vs}65|^~B!MWXB-@)0xVq)}{ByZiBY+13*ltBma=~4Sg
zx99-QBl^y7WUzQRF<bf;-5AA}(LM9MM10WK<%fmpP0V{%=sVV)@r#-Jm={wkEb&6T
zV;|uYjoV;&J^eQ9An8)pPs;h}ilxQm2Ur`18h*81eVk5NUg+#UJ|!F)I@bO1De)2Q
z+FbZJe-$@JaawR+2}}XS>L@GJ-iTr$-Z-~m528~)9f!?NOu+1?+=i{l{d|1TBejfG
z2t7jB6$b9<zTcPp6n>>Y&OIJ;={rR}PhmDV!~PM@=Dq#NN_Zqw@F|Y8j=ba!>_|*N
z@e#Sbfx3csaxprdM1Nlhm-um4xxN8qpR8W-;Nu-pe3WPLSGw>~cH^_iXAF0B@ocEi
z#QC6ET-TVgo%kMS>)9Q%-fet6Y<u~L>#i%?S(trIW{7=#&Bxml>F2XKF<-`q7t@Gg
z^Zw=o8(Dk8Yo?x+RzHh+BuD5cNzZvXdLH~8aP~P4oHy=f_>5=LXfsxR)HvsSa?Hec
zptZ`hucWh?+Uvw$I#5tKAXa&}V29%~qVL+HC-~Z&eToU@oYmGe#pEm2@;vaZAO1x!
zgH!fdc^-JX;_L5nHrYC(u$Z-p{R__7uTIY^1kYO6p`pX_)OUEsf&u3SXrn!Z1hw(t
zs#raEn)an4oJYXVGjN-|E_^+&j*G{h7fRqE_pFf@yD5q?Ch;@TUHfvk{+hnb*@<@_
zbK)2HjGL@n_+`YJh}Lild;ZQkQ2nAPaVX+D;yKxC^mC8+-K;y})Wn5=&Fs@8uD=?b
zZ!$7<*7P10>W;s3WZ2Y2_JyZl8xO^1B5qd}>q*iXHO*JJDU1F3ivr|F*gjHD*>_!>
zrSlC711t1Q46RTMVK}_V*)Q#>FxQjBAf5Ojest(wVoIFJgf<h47^et03@+d?gA3O0
zt;gx#tfiify|~zHaA9O5?IhFE>U*plnp>f>e0S*`>C8Vh@@s7D=ZVvw#hlH0wWd%v
z#gzpk3iwtg``6!vA582|{9xjc)Gxw+Qybb(<T{Z)Bzy25X^+oJ`3Pc7#PX6K?xn>$
ze3N~PmFkYCb#dF29xGPKnR&*k3=NI%$N}}p^v4#h<$ba@^L*;i*e*TWBVCMsF67=G
zohRh1QL4((X^Dl!R!nE*kh4?5*$4NA1|QrT&YsWrJ$Zj&HfIkx>mG>~@czT%yhxOH
zw9^J$`fhVz#`lP=j%+gYmux&k>$E#*E<$>Lhw$yn&BXO@aeWVb#eSmvS<%_6D;!G>
zD_+OE5<?+t4|M)YjFL8%_FIuNt<;;yymZFd&vgOU7n;}ydz|Dsl#Qj|e6E*s&E5y!
z&!av0hyp9FL}L~Z>Lb_tI;T`x?E51lkSAMCh(C3|&;@?sn}SMW(e61u#c0Z6Z$043
zdAp!85qbI6I?;>$61_Lme51E4_U4}rPvFNp>+V;(_||C>u$b@8yS%=$&}PkBiTXxE
zqUv>@O}wCsb8^Jz*@F?>Z-bNcMK=w3o;WCHt`p9wwNkAN+G%}NSo!9CXv{SqTyQ4S
ztl@OpWpQn6hDr;=kvOp%AC7V_(JK=zigutA*i&OX#YQaVkZ$}G3p;~7IPJF)*FIf!
z^)6cK?x4T)_3Sy`_iHNy_}ao%SL&QkC2O<Ai!EzkOY<{*!sFWWsz@5L&C>(mqM<Cd
zSMuOV@)qfBaIHC~ns<f`9rl!H18(CY@wQ@NKI-aO0b}2lV7Kwx3Udp+y=V3YY&Exy
z;?3T9iG3MX`t$D+UI&l(;Uh%T{p|gSri+pT)Aq9mw6Jv0idau#H*%vo^i$%F`_Jtt
zT6+{ZkZ@^i$B}N)JMybfI`I9{d3M$(T1hSzJUsOX@Mg+Rq3-o&-Lj5PsB;wl8buu9
z!{%tz(mlpWnPSbzC+9iYY4*-R=B$!$*8@B#vIC#@XUSWSJ!xg_OqynqPuPi0laA+^
zinI0+!|%$l(u&rC3*>=`E$_GDxK1qCfu6hhL)rVfPLyse>T!5NYYn?M6`bW#=G$-<
zYj1PD_7_Hke$De^teem-zB75&7f(qCaQ5ej<WAu<Bd4%U!22}T3-*cRr)&wXk&j<I
z#oSWpCq33<WO=Uo*0<heFGV)*D~5NlRi<U_S_=%+)9(mAGxJM4cAGVUv5pEau~_98
z@R2WkxOSj)Y`*$3ebS%wL-9u6qdE6m$qufj6%;U^UCcGI`8~z#N2q`LPQ`}!O#O4-
zE}7?fJ|!3b*t#$K0+<RS2L*>^d2md%Xqz}KJ$9QJXV%fPD>G{kF)sS=DCc~Ie|)WP
zV~^}<922!<qhS;0hXcmGJbKTxzPSUJ*3*uo(<(Fd3|?gBFFQ;eENb=y{RPkqzGoj7
z8m;v0j681rJo3&JY4TZ^cfgzTl%ARz;h^$AYL*sO#(x+ZT5z|%LsPp8{aJgwWgPlA
zlzc`DZG7O@tc%c~GTEYILnE%-tG0|Kds99!=lQLC11I<lS(oqSS@-gAZTY3_XFRHT
z8hD=f6`;Ga#HYeDd#Nb}KbvNYXLpizJ!1GV>!=k!Ar`Z;TpAa+xMct6_%@a8T01Q<
zvgsM&!S3yQlci@}2GVsnxB|ZL`G?Da&&PZ4#m9Z{Y_cAu4d?gzcp*IPney;t&cc`C
z_hCy%ZUD#kepqba-)MEXdZ=2wWq5_P#vBSFrSXsK3Rsrrpl6;$W4>FF*q^?Qc2sBF
zv_?}jUk_hLt;J@}$8M|5)V$$c#dEFD^26n#7xJ+Br^uV#$QbNq^SlspvC@@Eho@MP
z!^osWV3aSB*acp7=4J|K?Ly?^@PWWpBJ)YtdtRhBiyz^));D}YUuNG%wkUlaar?3c
z_7yRG(dQBPw11x?)Ti5Ds=4NjpphNG<Mqw6Ntv#FxkvV|_GjfUfQyNtqeUGVqosce
z)3kSC_HCcf=?JIK=!ne7cq;PXchd@O=;6v~o!NvB6N{pJV{ONmI=@+KXkTpk?myGS
z$QNtBSkIzzHskM!f%$k2D1Tf!XRecY{sCE=v(_@_{8S&F(0PO*@Jb^2=ne3GU;DVz
zyz^-qD?D{ys(fGk-aV0fh%wVw$izL*KCXDBZRuQt(H~Ls{Ig{GPi6o4N}=P#$c$fh
zJjdMK{jz+~(DPrk_a@vF^%%UQ6$~~u*~rLy8Bc{)eb?Abthr?AWbmu?oKIcf{Ry$y
z_)&^0W~YWT(|h4_-^*4xZU{OpaPHmVoblLXSy~JE3+=(vHo|S#e1%%SU%>%Bj-I&<
zC8YPpq{j#FeRHyrfvj<CaCGDo1uq!ewvoA+ef|^o0t@0}dn&6qgHjdSj9r<;dAecZ
zImSzza}VW}mQOgStTT1?a6buOb8}9THRxpZBCFGlKQ6zE>ta3QNnh;CF#kdE9V-9I
z+0&uuocg}Ar>Yyy9FwN=cLi&mc7^pPJGY8lFm26yNe&xY{V=DKb<$&=Yv%d!^?vp~
zUm@?ZQrACVrLBJvJBD)&@Z_hFo70guzJk!J?D4QhSZ^cjWawR2o*#<x?)O*7hv3Jp
zF3+!cboI1~M-rxmzc=IVis<TT;jtxqLk*%=LHWY$=vjJSePk792(VQ{7S9IXhCg+a
z*{9|Vp(#&MneK(+t@4Un>8p6g-Qh7Md&9}&_p)ZoE3D{QdVhOlO}~D4=Ze=)C=tH2
zoc)Jzae4W|X!I=BofR(Txov!<P(pmiD(1V2xvpZatC%bFHfK15n@DncamhWtES?RT
zD4&~me$K+CN{QTTv!CuuRbTL|?{Dc#b_P7ISc5OL<=neNFZA~Lekj1R_0J_tt9WAd
zG^6j{t8#EQ+P^n^@tfc*y$@%%n7NJ+Ui4hBJJ*y5<-ALyA(ZUm%Bs3MoJIRtZw|zj
z)84^3?^o)@RdPRES;gfQJ>ZsS<HOe9hAS5rCWi5!;WcAA@v%#e<cD_5&JWd-1}*3a
zt>s(u%s*5~`EFnz8Q&qCgohl-uegr#!OUeaxTsuQzOWwtsa!CC?uu`Cb8-0rUF`Bt
zA~>n1FBd1F+7oc%@LQVULl-CTd5X@}R_tIbd`RqxGsKsn#|!tC@IC;pWpDHTvn%m;
zV=1BN5uS<8DmK5j9Y1Pfh}=iV9}YcyBwuq59dhT${6am<lR10yJn0;Z2lDoRWsU>r
z9#22FXzjArkP&+4VB{uv8$IEcr>IQ#G~du_VB_7a;lc6va>v@tdgR@W9)6h9hvGf`
z=6-kRF;|8lKaA{P4TWwS*}-19iQO5QvUIqSDWU7gUAclx+2hKTtk4d#Z)_D+YMsQj
z82RxJ&}__%yB8gT{z)aQgTlQbtGsXBukBk4F75R!q~@6@*d!wseMBGjjJv~iZu_Co
z)RNqQf1JAMs@uDcC@a|*-=emmGY{mWla2o^UuG5a`K$6GDZN-elg{v!Jj?UynapXm
zksBX7a-&i>Pl<e3$#Z;#sgYxRljJJkz`y@n`u~aydC2SEx+^>g8S)@9<dN0Wgu`&w
zxh~!$bBBR9*0h;7yzsU2j*Ir;4E<V1+a%id$C)E*jr{4wxl`ugoV5mj><m3@=VxTP
zJP%CaGGtzlogWs@^DL%;^+V{YGfv3!@Fm0g*0yANKRMSsj#K80BROYi``?2z5(5?o
z)_tMj@v?Jlqr>X<p~pykd$&IihBoiZ|Eqks{TO@R$2vw<EB0?A+YTVxNQ2Nb2krcd
z2f;y<-@Aw39ZI6_pTd_z?EHmeDBn!|!OVZ~&--xjUzBePbLh_+j?AZ@SwBCS%s)ZC
zSsm>CIPy(0-a@{uEiMjOM!wDFTKc^sTzn)oT#J2JoS7dMZqDR=NTJO9zm;dh7xP@$
zpc2|IK$gUwHgw${TVv#nksmR_T9PA2yIpw_jqr?C$+p-|y_1YK(KmO;THZVq>v(Hu
zEc#YXY|UF`vF^9(V;kPOHMZrg$77GawL7-;twXVA_79Ei*q;;IxxXy7XMcTc-~L-;
zJ^LSzeYk&j?C}0WG4mYGy4|s7)*Xs%yOX+i=EPpUvn;mr&idGEcitM?bLZo+H}2dW
z+jr-o*n#y!V?FD0V(+gni+#AhKKAkYTVsdUKOXyZ{qES2^@n0dWgqMUu3f<ODsa6D
zT(1JxtHAXtaJ>p#uL9Srz_pvPb_3UL;MxsbyMb#raP0=J-7Z{Rz|{p@E2+B@xK;w!
zO5j=vTq}WVC2*|-u2sOb3b<AQ*DByz1zf9uYZY*<`X7WVI@C%KY-Ufxf2Dao>VE=8
z^(#30_v`r!_`*EPIc<yl2K=bBqJy!c(In@6lkj4?x3{tSY^RJE>)|N%WTVS3Q=i7B
zb)U6TAG+WFUfJ=_ZnyZ0#ZJRpIBgs0LQ)oqov_o!l8R%o;VGmeq=Hy%L^nAW_V85F
z#OYDXx|}qFR6;)&?Bu_Gf1`qv?NLFyE@-y~s@t2Y{Y`ClU6Z{m&>F03ZVKA@d4+lB
z+5V<#+rOlFSs+<WlS-Rf+S}}!x`qI8mr=p7c5{2%fRbcu$qjWa6DHfGqZ{p}<~F;k
zxv8dZX**+Z+1eVYYHR4UYnof_wpxa6Y4Er4qcI~nsT4S_Z?9_&*riQv=S~=_Z2Tkx
zz>Hcy^_%Tl|FVD`th*r)OipU9u_unTCz$)=?IoRUfuO3iwl~==t<5cg)`rfp=4M-M
zpwq5yZW`T|mz-4I+PuWS1PD5t+wCfU6I1DMAX!4CKuuj!UDHwu0*!spj!jMy7684u
zv8Aqo3VF7DL1!Q%*-9=2XUw8G7_3_YPTFeyZE8*9#+KGVFvzThtgK+R1N;(oqT8*l
z?JaGA>b&I3T|nA{Y96q2+m<b}n_JqTf#$=sM3%O|($>1RPMcW=+pB6#r@_4Bue7c-
z*cYhKakMb8wAJ6Jj{I$HfyNe~14qv7<Z6GL->zwGZnQ=IM*mWv4MHG8en#qrvUfP~
zfJ<M)15N(MKyu}%;OJzq5Nr>&)K%3rw+F#*R%0`i1RqWIC@2pBK|w<^xJ#~R?X=s2
z!m}Sx{K4iXC=xJZ*y@n!2HOJuYOuTjJauN+lXJ6^E%EDxfrdbvTJ~o<v0+_}UDsv@
zI_iRLpvBZ(R5E{V>D-GaLsm5colL2JyDWc8i@!C{1Vd)qHGaqhIXH;PIR9zeV0(*8
zU$ZXMhCe1%CGdM!L{qbwbD-4&&9>+DEf@z*+6jYpqrcN$qSoRaAP%_m;C?B%UAk19
zP~B|s*3^$B42NVHs)%{AHO)GBU9=i7m!LRLWD7dHsMWb75HRbd%JAysWOpKvEZ7pL
zs;jAkCBPgYHEIpO{DH9|sM^9@PBXhRz<3(aw6AJzZ>VOu+5U!x<|=<%zz#Guw=b==
z8v`&!XK%e3ehR5&FDSiu!OV*<vk?khUa)Y1y}Y)rf!TViNJ}m`8AOzO3$4n}dI{Q)
zPn<^8hPwKI1WR3Ouq}JC>Sm44wksrK)JuCCG^q6l;q=x(L!Dtb2ON!B<*#Dp!K2m7
z=~0dKm*ofTtu3u};#K+<62Jx1hFu$r>^At=Z&%mV)C9yu5U{Ei{N!bu(I;fvCH9i`
zrBJF@B7pl=SRb6S3aj9KaAU+^pd(P#-X^Ge2XAk3ret_q(yF@7AXT%WAKM`~H(G;%
zh8lO!b2TXaHh3euY>^8K)gly~(So(2klhqOMu_E%!14!SIA&b|CIGQ@bdU)(wfh^!
z+6x?+U{B0DcdS98S=)6@HO=A;;aR+qH6hz{piW9_jDVFypsh11l<*G#3+2&jDA?Wv
zo&!=d=oY$D58R@|v35-$(145z0Hp+1OLHsY&`2?u+21zVzAhMmXw}7<X<l<Hj6&;v
z5NkPTf&=D+ObAxB)-93F;GUU^UsY<_8`NHOa|d&gCDnsKVq$9GU`C?fzYM`)*a=jK
z8fqTwM1VDpMY|#1fLx4XG>E@iz%L1)^3;h@CM*l5V?$)=DRp5~UB96WmugW#uO-dg
zkU}*mF@26Tz0nl|buRaJI?K^nkN^2Pt2U}l`s)A2N*kc`jA}7!&sB7eE;j54XSD}m
zEVM$Psy?XM>d%qDno~8x&*d60BX!}ju~cJY=e3eyc}s4XU`P#@{GVLrX2tzKz04>6
zpIGML*(~#O|7Vu@gx+O-?*G5cdnL+$W0@PBJEOU&t+lx!cZLLKu&xoAB()|5JJ!ak
zZj;sI*aW72dCA<;8Fp^2u_IcWv>37Zv7Q1=Rh@RAwY9l*a&por>};b#jqJW);l(V+
za!00}L=-0{ohXZq4Pw?V%imstHBg@$M1lj0WA1qhzPXj2FLOK(dz1`Y1VVcdi`4ii
zSJpK6mm+JCp?$^`u1k}o9W$;Dv|eqR<km8$+CW2#ktoi8C~%asQL~LmIQmrQxz*I{
zlY6ErQW^8DuMnHjRK0<!9;9x^PF1hat5{FP`aq!n=;mjZaX%bGG?3kY4yOManmHZ1
zy`%n6&C9X)v7Kbo3Ss?BS0giX+h}Htzus1kx8OmAf-pvUulHaEtD;q~ty-$q`*V9n
z@&?<$G1^pvncCM=8}<qGRmLWAOkZrkCUj_9T@~D8I0p4&@aurLjHb+DNi!PI{X=(o
zB^Xx|AZP9}duiP=)UZqnBN1|E)2^YeD$vx|uDULWqu6N&n`_!+p?OZKeGYb?scC?{
z%o$Pct2g4`*fL1VU?cXb*G}9QurZZ^%vh~hgIIX7G$)*wpI`5QI^NF9vvUjk8ln0@
zm0@(_r%IcRr@HDDk{d8{Yy5OG;Lndq8Z=&U?s%sTrpedWDKyNEEmGICthpXK)40;n
ztz+S`8h?8OcC~TjWTOCt#}h_n_8ZzXY;TgwK6<Qu^0s{o;-sx_z{IERNr&xgDj*!T
za~3zi;~e!mk&Y=ZR%jaQYI_f4m;;&C*Avb^6EJRTFS|NY;RFW8=trtt?)uksw*>24
zZ87PvB8^NL3s2dVaAEF5Jg|VDxQC3cpxjV!le=u92G5<iY^;4wm19)>x8xb4YUCNs
zEuF1(@_MpnWZUBl3n%4H$j_fd_`<%V9Uf@Ha+Nh}5UmDA`g&eGq%@YWw+xDUqZk;2
zNC^yD{2W=Btm1LN-PnwG(y4wZ!^g+m*X;0x8gbX*R7nBXKbc)RW9HliGYv_`$^j$F
zz<{`;4eix|YSW41$ruFWj?c@_n+W#Wjm-2$XX$+{?0q0gj2lQ?pM<3afXnMxe~1Xj
z3?HiznUB4wv|`r0g%x(m+{@*c&o7x<ad{Dy+wfv=`QaGTRUJ;Vyj9TGN+?UA67?`=
z=KLA6Xi{=P>Fm;q%SFwLN-O5hT(H2tXx@ChrSg*b6{Ry4&Muj6moJ=OK5xNHm}Y_e
zjatJj{qbT}sBwNUQL)}pR1ATZYhB{{zNO>lX$WJWJ3<k5cI|w?rR!c7)(L&kC0_D!
z1ugjVcz!aCszpASUFBIUow}xMlhaMM%47j6m&-oGFV_GEPl18n=!5P^nL2e!``^Gf
zXZ-3;<Iasz?52iDm;pkq2G%v&znaKgRU7{M$@`;@Vgi2tZ$*$AHge{q{^s=sJ%Ffp
z@ZNY$(4EJ?apkX%LKn%~QRt!GOvb=xFPEcaJ1Ww{8q_y_2Xeq~n7j_drgu&kK^K_@
zW9_!i7VL^j0C9|k(WcIFXsEs&T)N&l$UX@=PoPt<wQ3HeVh%R5n{1OK+YBgupgC|%
z$~(7a@_0fhy0DkjwFSp1bV<Q^c@t_zjY9G)3smz{E6-%&nt{C0-W2GNTg`Nh+GSjs
z0W~KuO&0n&0H^fLsULr+&|wX8ztqL2c%oNVc<3~ub|6Ae+NTlb+;RKu2U9PCR5p3Z
z4f7f1;y~NNCYE|N;9FWopv}OdzPYp<7qU0<nKffRBGa)mkRH05Y?&bgP1TC)ct~j=
z!emyDe`#Hn-PGQ=1n$XlG>ziX%u%RA<QhRnWD)$ex@&Z)zjX-~qV2Cyz-Z>Yi|o3k
za5VDI;COQ1Fuk~Mu1~hwP0&sb^gtryK|Rf-4_`~$Wm7bx1jL+9yc63GV!(`uK3RI0
z-LyHePY;QGn((WbG`9VP3hVY7eJ;wD*CHGGn!4VA>pKjHRTHf{0iQ+5NyO7@{Vgyh
zl3Ecp*Q=jy+haU|HpUI+_Lpd;e@*^xK`?Xf1MsVu#)dYV5RRBJwCj~J8bV9P6G8*;
zviEUCX}N@@axyD7SNO&1;d<d*r|^ae7&836V#16P&XZfRYsjoCoS%k<7qC2JH%NGl
zhDe?%t$O|43Fo)B_;t_N_vBgu`Ype}w3pS%Z)0SWV;{?YHT}7^t+|G~nSWDToxj2S
z#{VLy-G;%GyTo)!+kRy-F-<+^BG;|dYmu9Kl7<d%=2jW!3YUUC5hpGzHLM8J(tyM-
zA_#qB<+V9VM>$>a+uy1@)t9q@bU*0{(lex&Nqb1|lMbi)#!_c&Dv491Urp-6`!j|G
zJ3INg7Y3?~d1P73xrunT>>KktM&%cDjJ2ISOqr1#pjy^lwT+a37lJ4%eoS?%jWse2
z+o-RIcFBfI#x>L}F&C4~nlZkxBV}CCF$!y}&k1%zJp-FcQ0FCoy=VN@Af+2ggkf1$
zsBHv{S)qynE+@9<N&*wI_sl=XCW9<Nl%WH&Y*c@;_{=cJSSRZ0gm?W7n6|E)ZoFTC
zj%t(z=x@h*YGqd{*+fUNzuZA&pg0bGqrYCkL_1Ie>$=-UCi?32Rg~OT*Ql7g+;V?a
zReP(#*?p1Ips~%`2=q~hK25l?7UMV2ntVN_+RpMUS%$4(tEfK6#Q;NitUdlb`=Y>-
z)^<N(Ky2mnj1itZX3Q9DH?v0}Dca1)PWV`I@2fP#2Rq-UO>*)~RA*})Q4WlJXHP{I
zKM3%PM-<;TTMK3rC6B<YT55Car27VrW#a7{m`Mao3+O@!U7JqH*R|uwIYf3mu~zml
za!u&dkOHNFw}winv1{AWJPz0Cce3kwN+}1&8B>RyE@2zO;@t)9tai353E5zuYY$7z
z0P9N)B}>kzPlcpC7uE?&gTTK1Br$_yfua#4rp-2o+1ipOGPkwc;9u&;9!YjLIy*5<
zo9b9&s$)1uN=;hXn8n68H*IqX*h*e9<`^$_?kui8IRlHfHdnV-$?S3c77tyJrFVOU
zW!}Q(7qey@PqKnwhv&6<W<us{Xg2uk0nqW<y(v3kWWQVNgiZQbp3M>MEE|b8C(tO|
z6-;8ltmVs>=h2f>kjJRm5V=IrB>V%oUl<l)ga=188V4=w;_}(mCQRDf8}=w$lO9-&
z+QT)Dgw`ROV=NJ~S8B+0LFv2&a&lXm5e2!hq}n=^*F4#zMhjuEuxa8lui#ND_6Gw&
z4C9mHTfUW41m=Nu!29FftZBI1+n`}^BjKDuWgTk62;Br?1-iDTBui=ogc;q1XPg@&
zJ7~@RC3Cgwo0^xKKG?;oW?M>o^0IKvYHKmu*}W{Lb?5S&=I-pW*%(EhtLMl+fbsl9
zXWtkw2!nv3x}_38+WIv1^1L$3S}^m{g)`^Qn0f8Y`Sa(^w=A5!k~!{=IWxU0%et_n
zqQtAycYW=gl8Z}cNH3Mn^X|%Cn7O!o=8TG&7ha2f$g{c&D=t`g(M8u@v~c!p)txbK
z?nR{+_tl?1eY(zJB<TDFx({8LJ3{8J6D1l|JsFd<YM`p>Rb~B(b?iZBF0e%9XXtN~
z@uN*YXdr~JF<R$TTtr-KeC`BR2~Oiu-O8E3o)kVmO9v+BAhh}8u!HOgdnp{)Lanj(
zmGnZWYE<>r&PE?UO}ng76Z6L7p2%2s+O{C!sE4W*T(FLsFKum6|L_qSOt_%ETi+be
zn9MF!ON)rC+T3UB(m0h)bNRp3in=u|ZL9T)OqqUo^M?I_nYH*;EWtN6=VcbY!I!!D
zvfm=k#w>c2&x^eui(S4Z7Q2FTG*|41#jd=H#F?3^UW>)9rrtGaq-SEWYbn3>C{N~W
ziN*Y!wOK-W6=!LxIdfA@-2ioKIES;el0^IK$m>VMVhs(kSR-{>K90q%XS`*k<+NYk
z6N`0(VzJJ2676oF{*4KwM+K;mJsFu_Q<Kx!R%2VOZ8@zC#v8JHpeBKI3Mq@!$x&>~
zzJ!@Pa=3>_9<B#-6_)SvV^+c`N34|WgFI2YE!CIzH0d?*TB>gx(LCpGNqbd2tI><Q
z=jCC`dH1RVEp4?pqtyt&pbfpalBNqbH{ga!mq0AM5wE^Zj&L}mwVl`^RCHL_^yu-0
zt&PYgGaB4x_^Xac>IrqO7c};j7;%m%*Ksu?$iRorTp4jBihJWyYJ@+=vEg(zm%gAp
zC{2R-<kqERd2?&Mx#g}5?2@`>$HDe^sIA$UMy>^2<XT%b2&g6gs`_4B`5Ts^<JxK)
z)z14%^-Tc36H-W-q-mtNq#9BS=@t@p@PwyG&y#*m+D|%2`ZCpb?hw+Mr1MB6qy?lU
zq*hWF=}yukq@R*@liniHcA}4TDv2>Co=ciesv^;5;%3s1NUxE8OZp<!cOGM$N4@ia
z?L0pzOuC!&FzKI3)IE=WCoz{v-y+fPB>J2*hjbaKp436Qi}V<2JL%s^Z<9Vt^_`za
z8bc}~T}on%^P5SxlI|rvN!mgBB?)*6s9!LiG>b&N0{Sg@n)E(T6DE`J3kqkGt|c{*
zZYTYa^c)Es6#g;QH#w2?T~axTI+MRodW!UKq<2Vv=1IT|(gma|N$sSKq!&ql;Hj~1
zl17szlP)GLCM_d%lfe0u7fAa_z&rI+(%Gau5;UI5m{Y;`)D@&VNDq4aKptMuUZtZj
z);x?$aa)rKhVi43oi{=pa|wQX$F>w7><y;%-a+4)9!h1uI%mV&V+0tac!&xt8q2A-
zMRi~qdmrk}UtKMm&njtMie|>{6MO5dl{J%dB??+LVo5ozjRz}>&apGq8>d!K?k)g<
zprs9WWA9mn?PTFNwv<(_>2O4V*;NOch_zbk%p3dy?e1~I0Og+KtF|ue1yVxA#EO@+
z2Rp5c1cDR(vt}5J*lnpW-w9LXr_A#{oR!K@>G!i~8Quhtv@UIL#6@;GH>YXLK3Wa&
zRjUG&aB2gSLqSqSgMx0qiUu0vy49)(bhw8b`+zjKr0alzs>Kh=8v-@pMOe^et<r{u
zz*1CFFc7G>6xzaM!@e>RC&&Km8(q^2S{JmkYr{#Rx|V=7$BzW|KsNz-Fkankq$pQ4
zgn^toAW+*n^3G+t1%gaf2TvH%i^4Oup@L(sHOnV+kYSG1^>PI?mmp`GPqjg&cZS8f
zh|zl4R}uAq5DKL)^rF9Jd>th0?3)xO!jfi!6(&ZD+ea|0U2IIdz6IgHWJIzs>24K@
zy$EvCJMJNbuu5UAHk~_b1;$3UL8~oJe<I=W@|;i}AvLuk$PZ0s6aR1E6sWKg>};y4
zZN)LUfkw`abJ1%Jg5Ucow6$5Yp~6YKD{pOXYp!Z;u&Y~%thAbLIXJ1~VP+A}Sb*zf
z)So%9)QdL{40p6rmm>om9DEd*UV+vHma3-A)@chK6id{p1EpE!V8-91Sn`Q2WEu4q
z1{<1PE*Al%i7~Dn()U~C90_ok&=COMS`?}rH__jy@l2exj|D1lYjj+(MKtjwfSgJ{
z_9N&si#P~Nn!|2h$W2ZPK1frbP1@HgM~f<qs<CvM6A7lymRzTEJs683Z5z}R9b|c!
zV~9bWN26LvHF=w?24^x0S{ubr?ynhm>A1ZF=Ol<s4Xs61L$%dQKBwUv)=M2*Oy1d7
z`ksH$0`FvFmD}N5gAaoRmnp5w{0;5$Z;+x|`I4Yu7{e1TH5Co3&ebNNW(YWtRZw{I
zH{z|2$g;Z?k_HjXdcK*wCpdLB78Zfc3APy87*zs^ngRhFdv+_argijkNh>iBtHj(E
z%@wieRTTp(<xv}yxI4fclTaYKuew#@90pb|xK9#F0#Oq-GIGF>bx2BJ6KFc7DBc+`
zm@A1JI(r47Y<)%tCxlsG+LLND?ZV2bG)^gqkwIrIaQRG<(IroX2NaG)YtUK%!)xQR
zSJ4XV%}pFDQ8_%W!x9c}xS9!OGsnuStvM)3ab>R{?B$o`hz(GI05Y_8JL|n|$kMym
z2NdfxgfT`v$V?|{(08X#2o5M0!w?s53YxGQ{A*0yJ|?d5bBw3c@I+r<C62Dg|NrVu
z?P;{Q5{y-3jDp_1HplhzD2eyR#)d%+7=yh$H9pr_!CIu%&C8pte!t}yu<DJ@@rtWC
zYTrV0+=3>T-8kZ|!?{LA8)>`1JGEiT2h=5W(As8kc*$#Q<g=MaAkZr5v;_YMc@#8?
zx1W^y3f=^<x2fqu14C7uw4TV&SI1>;Nf6hC{wh`A)^-lffRJ8(Yz>%mzgTT}@Xq?+
zl!^?3e)Ca~$egC>Ur0+3RBg@Dagts{qm)^sPFRH-{ZywnEl3D?mx7~#mgaIT-rhS4
zkhTGPE`rWjAV`;Lj09E|PMfrr#0pzDL~8V`12~pCSUhuX>0+}R<>+D4R`_>r1Oqtk
zM5^T4_pXCdnPIXl`ZsZfTc5dlX?ru<QD{OV&D13g>e?GwXq-r}7MYdj78$YHw^|@f
z6#)XIw!4DudLHEv@%n%$qeL3SQ&`?_qfuG|=6H;y!sS$I4M+h2FAD`}VyrjM#q{$0
z6aK8MCKNOKs8_Z(DV*i%oU1Jk4O>nACTsdHFZ@>d=FZskXYbM9y%)r7xz@%hnEvr=
z`g?swzGX%AyNCbyn||2Ii!+^^|5J74yJ0>LT$lKUr^x-cMv#abyqJRDf1x$&RJ(Gs
zZ&TdH`1=#?8>IU-sen&|(0f9q?pNG9c(d=S{#Eqs5O1~M&&zeKztp&CkEZ(0!oSP>
zkn}O>(^Ovyxl-m)CDluK@yvfoT3OU|%8YZ~{8qxU1K)n7zWzHm&-u|=7nct@C-HaB
ze0SI3Z;ZQT@7|oU-Tw1Z?yDaE`pv(ba>thBf_dAw&pvH`%d9;=`(HEH_ncKS|JY;K
zp8n($SH7`z_+{U}`(Ni@c5C}}!zS%)+Lsfly6==nmR^y1TIZR?Y2gD`KiIPQ#v9tM
zsd;_F$e;Aw|C`4bt$X11JN~}1yYSZ0JEr{I2XEiH^5HM%-(3B{Z=cV(a`8_;y66x8
z@>u1hf36L8JvlCS^<%%!Klh<0&-iFd!_ceWn9$h0=aZJvZ*RTq_?y?4mHw|u!)L$r
z`QR`A?P>eFueMM9`#(*NW_|YM#?4<o^V~(T&PV?E?zGQ7{cY^fj1RZHe(%TOJ-HKa
zZdsmxapR7u31!0yU%Bk5(JKc(K61wJ5qZ|sSH`?(w|?`EjsJeeylBVplt&&o`}OC}
z@ZECgTZ76zdnhq+PdH`Q>#ufv|M4NA%YL%;`qR7X+TXbSo%;1}?{A*JqhZNuAN;sx
z&zEu6Y`*A)E3UaRanYIKpD#F2Su^Lp{HoF`a^JXc*w9mo_nq<6Cm#OU_aCj^Z$CWx
z*cT6c&@=ai2ey_ySNY`8pNzb9)Q^61_no&qnKSN=hDjS%jY}>0-tSNO?4HN2{$yiq
z@rB(vH5>2x=*BTUPoMc8@3&j!2Pd7g_IIBbP5WePebMLFFT3q86UrAJ|76Z@ezxuK
zwf`Fa-G~1^ZTI-yvAs9{?`Lja_4CgACLWl){dfDm+;T--O3&{bUq5zv<sJK@)$@LK
z{tbzDPgt?*)|-O2JbBgfvaN^aC7g0u*(<5<UUc)Mf(tIr`MayE8*f?sV$IZrD~sR1
zbjH;SMx9x-DdWI7*<&|bhqJCZ^WsUv=3FpgU-_S>-?waR(G~Ug#h<?SoFQ-QUYGp+
z-_1Jpvcs{|)3*F2ZO`^O!`9z-*O~Kg9{I;{m!10O-<Lgm<jKa$qYW*;`c01giw{1U
z8aVXW@NIvn9X#|`qo4c9FF$z1_s+x7eQ#B7Y<_v<>(}l0&7QYkf8eu(U6qIadHb~6
zS3Dc*-u3jhpQLULKmHF-P5$x+Km788)BoX_9j`su`Sy+XO{)Ca=Fh{|-}&^FkKWyW
z(b;PzobjF8J{kIC*Vf#&o377)>FQg$@439}_PmP3$3HLM^^@YccYHAOl6hbL>Ee{P
zb7s80<Nh00hBG2FD(}X{nz!u5E05IPJoH$@#b;dNPsm>%cqKRUwEM~qo_@t;*Q5_?
z`QC_qjrnn#r=B<X8hho?GY4P!jRV6!K7aiqm!3QSxeunDwsHF8J<&Cp-`{h)ec9`i
zb5B3?UiKTGRlM@pIh`-o7X906IcI)*=SS9-y-$`u{ELP;-~9Es`rZ3~zby3L1G``R
zkIKEvJ{o!WAAkRw-=!aZc>9^3R&V*?7o%?u9{b?Fm)AaXEa~>np68>Jf3|e>m;3kJ
zyY1Hhy(xV6lJ(QJKKK3DlPUkWHT9n!zy6fLk4(t<^$$LoRJ-lzn#O0^Z+z>=ldg{c
zr_YO@=5=cIq&<j%2-4|YUX}kK33(IG?zwf4dy~jN=l7djzrpqE)cYB~uO&Z3*>5TP
z6Tg2<zL(!`bA2WE=5hTpsgX2|d!^)eka)wKZy$+qe2niqgLIfSRn++f*MCQyN6CBm
zeJ<r}lly*7p2P3Q$OGJ`Z5;LEp5?dl@#NQ#|08w3Bn>D1hWcHUkEUF(09RZyWxVCo
z`aP+LIyX}G1a$->@mBR8w~D-u^h2(hV_YKlA0q!1^$(CUPapNHr?~zec`1o~ax>p=
zlK+(YeDXK$Unu{A-`ly4r|fp}4AKi+f1h+6_rOJbEBU9C&nH!r1T*z4#<G6EwQvBw
z;^vTi)cpg$&*t6({Jx6o=gCj!H}ms#lU7nDoGd0kmESA4t{~q;oyWOO;CeYZ^YcNw
z_`f4h<K7a=vdJIhx32Hy-ospr7Mc%Z#Mf~DJ+6V<x1Vd~>Knpu@DMkQB%Cm=)kFFJ
zCclt2aU|wz0jIB>bPm7asd&Y_|Bdtv*Z)Wo&7!0T>2=aw^z|9#7n20<ZtBh;7v2Q#
zYm`IFcxV-$L^-&K6W{&|_qK3-0SSJx=24bOUP-%qDBHzvXdZVP`6HxPDTgM$X(T_t
zujC%>tro6N<N7A@Ye^%ye+}iglCI_&99dPAPbAS-oZ5n03%vQ@gE;1{xoP}3XdJhU
z^Z^Mz@O_8;FQjG?__Z#j?Pjj27Z0ATFm>+ZH}i@YoyL-%NBLZ?7m<T6D@vjd@oD^E
z(reuN7WseBPB{Dn_f)@<d<Er~leY1@hWqs-!51Qbmo%RwKCLEgq@1~1H*@_H>Qgtq
zhm_54`nG^K9=gSE<(}yBF=gODbdNhkTFGzPX+3IQKFZ@qkq&V0J$}c?|Bl~zTmzrh
zh*=+9ls(7w26A{OZY}p%lN!snn;e{2?{oc6T+ie_@c2@=-bDFflIC@XQ&)1s@Zz7i
ze-772DE}R4JqbMfZlMeu#(|IcACc2XTsH}t#{Gu-YshJ%b!K=En#KQu@)F96Np+-F
zet$+exQ+V<#{Y!h&u}gLH1qpkxt>CblHQ<9a2AlDlg5pEiR<svW*6y2?w`qT%HqGx
zJ#Z7xJk_s{c}iAU&^?~^;@>#6yPy2W<d>0O!+q#wHE>N`?IXo4=QraTIkk$id{QZi
zek?!vQ`CV+e19ZOrte>oFC(8s+CrV%NZ?-bO=~=!zT$ew>D%`XiT1wn+=u_-;<(nB
zPji1NW%J1yC;nN=9^yB6@?FpGSII?>-*Y{hq<P&<eg@?>`F*5Ju5X|mc;bb>a()jZ
zhyUYpNI&DA`j3*P^Lr%s2a%_c1FsKWlfDpbgzvb&rygzN_mF<g?>or@q_tdAC+;Bi
zgnzO)!B)xj!?Xtm-&qt2j$e|}Nz}8LU))x%1=DKsx2OkSS=W&_@mu{;?rS4IpZpi3
zA8~yXb#zUxag0p-9yxHw52EZw_Z~c8Rr9-*^5?l0EJwKBz%}CvRwKhMr#y+@tPN`d
zW$=TcKmEr;AGNn$q0VtqfK)^Ie9{$ML#ufBG;RfTM7vb-zva)@uhJ8J*Sy#&ZZ32?
z>7Unz+?Ul?Lv1emt8G%_F4>nFSC&F5wl1DAW3ruf@!W;k_PKcz^CnsSOD5(`$O8ra
z>imDB#GPqgu$I^?`v6v+c3U}+#}<Z_r}r3Gc^s?ZtcR5ssJ*s^w*UmJJRRT;T6xt@
zc3o8~*QQF)&6W^a$TR=3!EQEF`pEL1Uk#;-XgV0Cxr<yWk>ve(^gfLOubz1Ge%N)J
zSBX5qz5X`2Q_q*Y*i!1drz&25l8?HMOZ6pJQm+#8u!rB?pU1<aC~)gdD@Lss^ZP2V
z61g|-IIdMM9zPk_NCW5L)q~Y~>peuhhrXts<et~x6V%iC@cQ7g_xgf<^|n%vHJ$RZ
zD!6}Mn_2vJ`zveXjmO9n3t7?o=hd4>iSW-n%A(YZay^^m{dx5kQsCC(wyF2sH@r&D
iQ05o%!HnzNa{4>kSFiV;fvvaPH#@|2Rqt=NkN*qABD=Ey

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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%0Dg4
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
Lb0020d-?t!QLmjn

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
zcmV)WK(4<+T4*^jL0KkKSsYKc?*c>hfB*mg|NsC0|NsC0|NsC0|NsC0|NsC0|NsC0
z|NsC0|Nr7tAqe^EMS3f}zP?s$0SCN&j=8A@qg&4m_d9bbYq$>X26%Qz(QTBmfCW{!
z#gC_+iMAE6#8@rv=H2(bz-dbL9gOFvCu;z9%WSsIYpY?SOYCd23Mz^{Esw4zY*3L}
z(br#axz0}Qdl=hqTTVW;H@dr*$;+dA9J|JR-gP{w-jiz8Y`qRK?(E9#EmCY6L{g+$
zWvcah+`9D}KKtDcsX(9sXUobu`;B`&cisXkZS$U+IPNF4!oH7lciw$ltImPmn(R5*
zx2?j?>;?1P-E)1Ke4O{X<Lk9=XBX4wZ;erj?{V(Edu`@?eFhw1_tsw+l`5~h;@UpD
zqE)z+%m!HxgnN`d1>W3x#2ejRwz_+*t$SrllUy&Y^HCc`_H5qzQ0SrF;zjne&mPdZ
zs1G-|ZVSEl-(NrvdZ1NRDMCVuK%h+?``>+iYuBDuW7{R$J4R=`2N0DM9<;sO>Vicn
zpbUaiq>)e*0Yahx05@}z6p;Xm6siCK002-0Q;-IQBzML1-&=b7@2|C-^WJmgy1i!G
z?OjyNrdzc-Q!42a-r>^FXc~t5W3RsM;A}S<H{H)W;*GLH&rhSP=1}{%00T;(000E4
zfB-HHXT9D&hCZzM=e5Bh=l}qtkExy@@d4w}+#boS+pN#7J?VAH(OYJ+EU?fYCvN#1
z^FRTh0HKv{yMW~_5-0!wy7}7j@a8gWyzZLv^KCu$^by|dw6z0zV(Vw!vv+I?hoCwW
zls$Ksqs{L0__=z{Z+q@&eK+4+cn?4T0002mhLWbh%T(s9Cvo2Qr)u6*?g*C;opGrT
zdH`WWlAnEhykoe;eRlV~l}kq}jLWaM&%L_Ov=`T^@Y$bR;2pP3JnTA8VDjr&L0+&}
z2Afqn_-DHMUo$|v?g;6f9V=5{qj8IFx4v&YwvS^cQ~^kfSwXVh_e$zfN&pPz^g7W)
z9rx5w9+Cwl1pojPJ=?wPe2)MCo2Jmyb8DOcT3SF2jV|uAyx@BDhpi)2-Hz$ko*Ufe
zfk#CRR`0A=yf$Kzn`onbpl!Pf0npoTK9j!L_2Xaz*L8gD0a|UO0k&^zJ#x<+1G6sf
z000001vzNev<qqhz1`GRLa41!212M?2cEaQbj~lfiBh}XPhJ23$O3|?eVRl7`EURN
zfB-YO)v}0>y}D2vF~0Z39)JJ<2f04*JYBFlF0`EhRw@}~&$_w}SV(BxcHv(3;*|GK
zpHt|m2K1&BDO3PG_uJ2Iw<SmbRVN!K*?<oBv6j>#uJfKg`+N^R-tJXq0002erBI7%
zHE&~pP_r5i;p=sJ+X?|75}*YDB~1X;9rOwpw*Ud2`un^92!H@Pvk0mScaA(3``zFG
z4ZtSfPjCX5db4@U*t~4O0BYOby~EMBd%!-Pect=;PnkZNIiihGLWML?TYKlaMOW5S
z*fgtNoZ&v_0Ot1q000dE<Qu1+zI{8KZ+49r-nR;R-)@3Kp#oNb3mx`Xp8MZ<_W%Oc
zpH`vVm&@NC9`gp+cEG-}O8WX2jr1Oa@33#5bE!v3nx2nwS$J(h5~x1T1D)BY*Hm5)
zxEz5~-q3B&vkSc3uy@_S6n#719Uk|(_V@?Z_SXi+%r!J11keBghJXM7049u@00000
z00A;I#2Pdj00000O)vp8VHhJ2$ixi>jWh~)AqIi~hJpZ^00cAuCQURlXc_=UnGFI@
zCKE<XCQQ->5HOk(36s)jN$nW~(=w)Q5`LOY^n{<K9#P<$k03FrJxpyV^#Ic#LI^;B
zKnOH65H!iAlO|6@(dkq4(w?LAQ(~X#36$|C>YkcmPf7Zw)b$=rD1L=B^){x|Jeo#o
zXwU%BqeD+gp`+9^^*v0QZ9$-DG!Ih<5@{qN0RTV%CV&8^lO~2h1k+4Yz)wkqJWVv7
zg+C)x^on^6Ge(+|(dum^-cwINliG}l;G;$%vQKFzfRJgCr=l4&XvwubPg6|*i6RIQ
zpiKY~p&LO@0%+QXnq&rwpOo~#OsV)vdV4`VC#i^@RQw>)Pt#M=OiFuE=uBly@}Zfg
znx@TD^rmWlsk25?)jXqQ$%=ld<vli}9tAYUO%M_yAb=1814e)X001T?69F(xCV{4d
zB4&*Mm;_}{#4t=uOqv-qo~AS!0MRs_1n~e(GBB8G5cN;dFeaz}J|b*h?$2CHS8IE$
z{>#Qjr{U~>C+`06-_=_?q}g|#XRq|NKViV~x)>koqU$QR9d4tu>AgR1<7-^P?zq(-
z(V}sUo1XvItE!^$AJ^8}*Tc<$&k@Xn7{(T4VG};Wq(g{CScAeb9CRutH3<rH3zoQe
zeoMfT>C2Q>4Bjidy)FG3@AW0rA|WnZsN2|2lGi@@>_~;uL`NbdMImlFn>Affpg~MS
zuJ0i62PHY0qVJ&d(hui+@0!-CqMeCm#W8EMV^Sx(N5eX!O!c0Ok@jn5%aHcxO0KSB
z8KnQ>ls{+XeS7(Cwc&YHO+JNoydz9Q55ii3?B1BUQv6BXU4KQ9se%esb8$AjAjiU3
zFQ-y{T$yWNmDPRW+}>|JC9|VpnJZZ`Kal2D4f^rN=yRPc)l2eFqH8s@*kHk~BiAzZ
zDm{F?#Tw?)pfPhTRX&~aiyJ~(6TBhEB$1cV?GiPA*-big8gtsplc93?thz#f&l@bB
z6JiFwiUEzoAYcHHB=m_%sYn<Y!ciC)!jymk`4|`j8jXj0beL{x_-*6bbX>fyHtT!B
zbAVbJgMln^eJo0B^t#e5VuD|T$@CmrFIfAQoAMZ5H>n9PA)kw9Gw#0cm(*Hu8T*ZR
z{!|9X8ahuSl{!OAY-nh0FdG;#7=r{5MhHbgR7Dmb!?R=q7}{*jqt^LeMMA8`&sOE0
zWhRX-eo6YI$Gi$77AUb%SSW}q6jfCb5fx(uiv&mQIHoV>(*Av_8*Q*`?|qEjY#no0
zT3D;r$WgC0*QfCy#L?!SYX}QpVDPlMPa+#WI~5x9Y{J2v*ON8j>d&ZUqbuacXv$@T
zwMXN)d{OyULw@<);Q7fbZ{7OX2G;7o2i8R@G6NI@4a4tkqv<$Zj(BN`FPWOtsq0!I
z$RY4{Jm-0JUvOJ<I5=Uw8qvqRE@#A{@9@BF;NSNi3-<rBQF8y<B;)ZC9|2#xU%GKs
z1Kfayj))Ga)gfbCKT!)KwfSuu?;^1<?bo_iJ}g-BJS^E~8S>eQsl^=hL3?9tbl^(f
zyZ4IrJ`s+kZy@X3&Kr0HU3+Dwi(s#p3R*m-QJfvrC5h4NGTc;?lIJ02#S1Nhd<b{`
z51t27e5J*amrzGKUeRr%hXT*agdeIN4%V!9(h-AN<JM7e<=G_l4iSNo=^)J1>U@co
zHj-QdL-D>rl-^b5RfIo+z;B3BZ?(uBi2+hVPX+QYA_JnYE`*TSJ|pDUOLIMar^`=^
zl?LJ_lX<|<$JqR*TF=qJ7;xu&r6DHfi)c~&sr4S$+Wf9fZCc_Kv9uo^dO1jj2fXri
zq#FQ`93aSmNC2Lu0uO};?{n<<JjH`@blAM>Nc7LyG+?K%-pV`zw3G<kVwO>}M?~jI
zl9{T07n3_VU4S@A<wfSsY$qfGr8<%o6i{Nu3I@mo<rEPGSVl;UUF>)MiyxKaKzE*^
z)L?j=Fjd1sM$El*`yaU9U2Wq@ZpC23(@1_+#0ny^Ab_87YqJR`_K_>uK=pnlH;ngx
zh0wU@2$&>NpjU|$;O3V$NJ5}pSTh=EeS8m4s@ejwFo+XWY7iXlGEi)*M5BmckxrZ#
zMu}$F4d{d_DI^q=k`S?hpH<G!!e-HTOV095Xyk|Dq>!G<K*<7a+}Xn_qQI;nA$ay$
zWp}wL9DoKg&yK?xkSAhDa$r<6kPU9!xRQoQRzqe@kdqAgyI_C(oL-wYPx{mC1YeVA
z!383H3-s<O=ROUnc#%|D6j2zlRwAkbDheVaBLx;PP)0;l7AnL=09dHSRZ&G^0*I;h
ztcK!lm5=Kwk2d{9oS#36jQv7m;gd<AhK*T_bRgG;iHXzjwIy7@R5)G~&(({hT*$!o
zudbD%6+yhM#2KkQ%@hJn3>cSf-A35b!25md9lPAk31ehzI8^aqC9DpOu~C@w^}Z)g
z3+Fm+^{o(GZlDw@u-DD6D|?r6W%Uo}{%+0_-izex<Pu4FLeodj)n2y#6FMxsUt<!@
za7%{7S<X>qQw;s+=FXXwI%{B_yqnV<Rmdb8S#jD`_uS6^k0O1qoQ#lV4@0F4Y$_AQ
zW!@(ie#Z@*?0;+WS-t;4KkZoD?WxM2YQL)wta+owCT*qFgthK#AkVF0FyG6nJG~6E
z$k{y5f42<PhO)OZu$SC{t;%7HxoiJ(zmV#)<NUwhX>?B&S6a#md&?DSgml=lLrbIf
z5BuLoPu9BP9KAl<^Y-~F)K-C$?iP1U-TmqOrMx2#aps@zu`XRQ7$eecjTM8K^WU=o
z*I5c#e=E3m#IpIqS!M81z9~fTpepMLAlj^YGIl}*kfs@*ijkW^dO3=W;Ut||)thRl
zEcg@^)+4M?&+C=Y{v3|R*?B8aiY=(q@toT62=%nxfAYZjDb+}Q;F;B;-+%Exv;XYp
zY9nWIq+=Y7FvLI*cw%HS8VDZHE{|uei4v_^>n<e$(V%Dn(kE9|+Ej6{DSe#7waLMr
zyayR=PrBL=ZHKX(c+!C6)A~zPihD<^z3)MVwA^fstrag1_L8F)S359#82<?KTR_Gv
zA^W#hI~4z?#cGPN|F<QV7U2RE+<+w2d-g*{lL+w5n^aC8z{UXRa<l()$kMJp%YA^Q
zIUlhh{+EZIv?H#za@NSQA6yJ>S3=53vct&yiUP#_-u0%n_NKmXrk<AVBjw0gH9$U_
zYS0w)@O{c5@io7u9p%`%kc?=k-(i1&jNn<jHP{f_Kyz3G_z}GGvlxV^%~rKWDQ}DV
z{wF7%3cf+v@wyfwjA`xcZ(J}&QV6~utPnx1SeY4=*v_UQ;6xcjhJ^pu{VBh2_==Sv
zOQ;Mx)A1bc0QwG-l`=@0Mg4rgX9iS63$#9Tl|E*$H4Or^1PF}C5xp<HWZmSY*~-%o
zgJF+zUEfim*_zj5!G{y_0EmCOXWY1=HoV%yp9jW8@!T?(_AFEPo^ljUQstq2yc>L}
z8_<}>1Mzy*e{Iqqzpd}IR|GzdemdWGL*_xPeVX3?nZ3lvx}!sEWGEZMv_dt`nB}D*
zF_X#;Lv@^d6)JBR)U%4|j#`OO*NNuFUPaw`_|5YDp?1c&#VHJSr_`w@k+v&x`OD2Z
zRo^n)BNR3B7UqYBd5X&mdQqQIu!r(Stf!WE6L~|7s>%iGXb@hVoPc3=N#K#i;orpb
z>T-LvS8Nau{FQc*VlS~IXGJp=VN1GXnTxt^rfcA6pwZW~zIElXURNH8xB1-GovS#+
z)ibS(?Z{OW3Y4<ovAy%<c0E!n9^AKJ5}0*-%{dMKbTho$gLv1ZXxC#By@DZiU$gIj
zU#jm{Z`$wRlgp?TQ<4&{3Bd(Vm{(UTtC7vwSE}G9Ty(;4nxaCM#VIet-$vGWoaW5v
zbqabv-eunn38dhF#e)(Gn1FN=)g-&@<isl5-|CzS`>Rm<N8zN#+AHb2(>-gM;6kLx
z!9;6!u&Ro&(?yD!qxD+Ruhk)fmD+z&@>-1$=LgTJ@Xv)w0~UvOqxTLZw&Z#@34~#6
z9cYEo3VD5q)=<#`#g1_saG!PM(`S9R-Wuj^8=-RqaBxP5o1X=l;rn4l;vUny6kHj1
z4os=tJ`4f+(gnSTC9m{|HIWrA&4f+<O^$Bakm5b_1Q#X~l}E3N#UN%|9c)T324ZLs
z`9TI7o4l#E!w@iPWkak#e^=dW;kGKiVn<}fLd{^CdQBM)1{K?mXK7TV;Q6vAauJoz
zLX$Wkhk@AgYh{}zJK04S_Fdg3p{71-SHI~~AiYlGhoI(ov!%#*Ip%4s@4VTFh3{rD
zi1Y2k74}|Q<0mDo**e|9?GJ>31tOdA3v`t-?(OG5BLb6d%$V$Lv1d#0Ivi5B?QU@z
z0vbo0dD?DRbXXxO=#DU)Y2z6a3>Y#~1#eTd)TfmGR62O=*4tZle%k2=ur=}vAdoS_
z?kt-E&Gg10SKR{WJB&j@n53t3it^ueV9^kKv=|2SI15>^9xs>A)Ysm4^NoC&5<r+-
z5<x#urVd#cAp!yYDsIlx#(tMG^Ypy>N9bvskor&TzJ?3NuU%&(#Apl&AQsCXHSZwe
z&SVm_NSRqAE-bB^AX^a3fIwuA48wbS=AniUk6yVJBvB2)!1VTaAh!jXfJa0iFYg`(
zXRKEtd$A$GlPAz%frEypi(D;oWJ1AEbod5lRYwIBI--mqyX!rG<p|*e;q9u)y{w{i
zHH4Coq}9@Kvq%d$8`zPxzyDPD%$6+HbmfgkN03Gu9X7UG2VD9ZgE+OyFKF4CFz9#a
z8Zi@OZ<i$>KfQd%rSuYdoqUXYX<&s-w&Wg6ouEUrZky6rKs_bAJjw-UyE7;FV9_4w
zxeKaC-d<Yf;i3?)Ki{~HcY1<_mj@B>ydK6n+Hg+ESG=5peEN49G~?$?d3Py<-&OP0
z#IzP5{KJn#IqEuiKu38^1aMp)Ytid~^8edL3=E!G(X-I}$XD!k+jR043NV(Tb%BTS
zBhr)vVEsb``?l^$0=IDCj=utYWJ`~M@c~8f{l`-;cJQx{P05f^D0;gfqaN&Me0>X3
zobe>Uk`6tbO!BYAb~447FuowMkTs3vuJ*L-*@pPXiVFmBgG1*Sy6RQ?IHtQQRRd_6
zItfw4)XZ&~{3*d$A$kr&&|@x5!3K6vr#^XzI_HN^pZJ@a6m?FwH?S%l&#W-OdJ|;x
zwM7M46Rw3&=H6P&M`lqCzZ=7x^>!1Xy0ryGSF+U<SSh#QYvgFzSUGFd-kWlTdhcU`
zMDH`FEco4?*VrUJQeT%(<+6W2`WO7v(gNd9#4G-en;~4<@t-q3bNs|uRG*#vY8n1b
z>=G?cxypRIPu(XO?y#kzq!=PuR<$Y$Gka{Z8gDCJGeM>K5P9Ec`IEHCq-9~{%o=YF
zuDL9Cc<_(B`bbHA+^kQqd{5_R#`#_6f7JLY-{&=1U%z^-$l{EAza32rM|qc*xK%1?
zw5JHmLj*SGIgAWrYXO1Auq4h(UxOOWrIdMicj`xU8&>mp@nQQ9Ff$XMcgOIuYPT2E
z$wq>xY9Kz3#>%RfwERduUkR0^mpxsoM46`#xUHXK%yyPX%^OI^O5K8yZtNX(jTD*`
zY*qjEkFc?I_V@cWy>e2Z^7jakOA|EHKl-soSBTUuhIEN9)n}rn@n1Z<UnNIccWTCU
zjED2_pcua%Z$0c>>Y+CQ^vzAs`fuj)J>uihhBMG0{TF3~QSY?voE0LD4KHtgI#k^s
z+a7cd*KHm1KUtGNUsil3HmKYDABpS_JES8o8WbF_SF@>2^^v6YY@o8S2FYi6CB{3<
zi`)T?Rc@@1H>3HkbPt#f)|yEatYu0bytbn&X}gczIL+S6SB&1rSqhQ|_l76MD#feL
zrr`#WdL|x~@EPPffsYO@%O-6wZ(8)QzdaUc!Cx~>QfBoo8;B!>{X<_-uQ}+od(Qh2
z*ZZgl8YWHD{(I=!v4k3YO`4nd+1Ji$K3wYgU&Fr<V;Vg>^xX_90Qbyn8#Y`tZ_n!H
z5-mu|s(YqRVLZ2G-`4mD6?BIJMfj}oI7l{D%C;yo1r*@e*{1n#^;yU=!Yz8NFEp5n
z$<uAcW075|qv1Q|FD;L=`n?_WSlfKQN44k9Mvil&lI*EAft?IO<-a+~nJ6L}6h+<c
ze`ABB<@!&X@vDgefta3~+>>itG@Iwzy`R5|vxi9Xi!H>ksg+Et!jwfyacJ4W_~<~O
zK=QOPOhjkTZ_xdA?2n&#+CM)mqyR&oS;7r1DoSJ+WBM3;EOATYm--*pkS)x<M&0BC
zO^a#*I~s5IwAgE!_<l?+jaV*-*=?M=_#7H^-k|C<AidUzfS*E%6e*Sqq)k-d-J8;>
zK!8Ywdm^SF79l55!zh)>{>N5P26!iz$2dPFSg9SXQv=!Nl|^Y>5r!PbCZ<6}BREJP
z?|7ON*K3)f6Lkb{7*XTLy^|e6$yn*4QNCszFqPYE0aK!`UVgkHGL<#jDfk!VrN%=+
z!vil!&@gQ#JBFRaTS1{AWB7?IksOG`UCtxMjAIlYG!!Nlp4T57;M!&YI;D9Fq-aFD
ztyKihrRU#TPJdtKC%reYHd@2+TAjFDMZ68?!HYQj0eq-417J^E9I&yY=C?qrd~WQw
z(RWp-4wzJ^cnzff+GoGs>e$_%_YOjNHkLANNO{?^<rqDFmd62yFk{El+r-pikJ{LY
z;yt@6@=@PUI{&{bB?)V(e%|t1@N@FO#gq-#z8|8k=ZolnD}_}PX)J69O@sL=yu{NU
z&fRYIqLv8lAHrhB?N`Fh$eHy!3o2ZOz@{oT!uRw@e>~?)=&75Xf81*psaT%=v<0k(
zXKSDZ&3t#bqOv_yK7G#RaPgGZtjmse{TlG_8;MCWFiY2i4M(qF@p;5my7Co^FC#n@
zdz$ZeoM;(Hft)pzFzxw|<Qm2NM7=}!l`zJ~rgeOzm@%M2$a&4rYu}2;;aaTCxd*{u
z{v)P28aa5`HDoMfDuGiabVaMb-JY5RDzPn9BGrmV#vFZ<rv&xrJo<bL%$bk+gb86Y
zp0*DgJ#6)Ahs{~Sn)Wl)SqXf$PLb4CC&ub-Sr(J11+dfQH%PTIIymQ~p*Ti!@KH=!
zvAMDRL|WpU6-mH79khgzAdDoFiY54@qk6*p!mlAxR!W`$3gQN^Z1Tv6JNI8ZW$AEM
z3FE4T?vGwp_9vpNIf-^}=F=(!Y>P>Xs43b#4?X1wN2H^cz^i(GL;?Ov30zg!;m3&$
ztjqK3j`k+7VUU#}c<QdM2zYur#a5k+gmy17gdW*7aU*Q@Ob8;q^?FYF&$>+*j9g)g
z(tD$whxP-)NR?LFF&H25_IjDfax&w;ld4Y5waA4d)1VloEldJn%9a+Cbp{D;E03$R
z)Y((DnXIlV%t9up;%X0d47D--`15p=HjfGVar%l_b6Xci5%TQ%t31%$9KQo@uVbjR
zm#ad+q;5RuAnV&TgIxW?$FXxl)RDbei+6&+kaAR0=w2pk>!~sO1VPK<Yz$Jlv$L9h
zB(vt!yS+Rbto<#UeC=4vk0nY5*E|H*Vb|(4(fnT)|I95bKxBv+qfI9XQUR3L#*qD3
z>V%;L4x~L|fZ@FqoBd|?eyR^`7^vYp4lPRz)d>#mgby%RJ?aef{t6X%QEia4+B;@&
z@~o3%2G+Jd)_Bc&7K$sF$XfTGe}|vj#&tj7bE@jcPz6Rw$%R0MC&Xp(qpEyIz>^)C
zTRJZob-2$1*A4jbH#AufDsh!bBV~ngKLwIw0NQr^Z5(IDHs!b08;Izwm~J_qI{<AH
zr}DhEGO&Cv6NwB@4#uRFbebRyoZ5GT+I`**$kzoC4hsZ3*~?1R3J<iY;<95MdutJu
znK@0`cF!&?I~&g5%C5!BQI8~Do07+{c}l&VzIGMl%KKgb%%nxA$Xa0UrDUC{MoNkT
z4DqtC^U|6UfX3Sx97&!7>S~r1R&`s;H@lfkwBF^W9buS5g3c=zOF8)l(MALo2R(*|
zP|a=Sn=XPZIgBxCICKrInrl`w8d}l3sbjqw6C1UG8vT5d)pK@)u_l=F>A#zy;EE84
zXA+=vXgR%S=I`k;WBO-|({6C}apmIk>?+k-6&?2MM0>AuLcapT<uz?#1yI(rXc`*`
z+wCNs_NQ4y7d2Lm&PRhnfzs{x8o!%7eZ083VoN7?V_%X&w9wW)e&)2FS0sOoUP2lV
zZ(t?N&SLG3zjd$JuSG5#_)^XTp=jTiypZ<wjI1<gnD^C1|HSaN@6>++@jFEfYBH-d
zOmm!wjARR@_x!ni(n$P+KMkwaQSOwQyt5O6at?>03zC-Y<~V$v$4Fx<d3%e<nN1)V
zYkvfb2o?&&B?V1AETLm!JzaAF@YNzR)wS{h*wyc^hz-F93doFggu*f@CLK{RY{c7M
zk;rPnUQk4m4=|`E>Z@T{hd%kA2P-O}&<d0yef40cy8M1E>-sgMJblr#X1y&aN+sXq
znX*#~y(k4oRZ{0mr`$TVs>znw_zv)So+L6iCI34;o2gS`7M(^~5i*$PK>&UlTh?hn
zO+T~rtjK4@yIti0i`eS~-_pN#siol`xO)Qib`Mpwq7C=v=%X*^!iF~3+YJ5BnWXIR
z=c=|mH>1qP7I<%sO9wiBuU!#|LK>0)o3E`MEgXt4i10HU;)@$wYK0>q6`Z<CGBh}{
zA%v)6M(gh0!RdCbhThU^cKZ7HJi3Og5Tnw2+l|<o-L?e7he30ULND`y@k(nm^L&w~
zgvkv2qf9DPJBLt33PCun$Fsw?G-KoJ<eL5;`qv$HIgwsxj?OyXaAmBuTX$&-W(|f;
zO-vr+E=wl1ZLX%L?xSP-m!3whRR%HQ@y~$iiSK{5#K8YeHbBAy0|qZ@9)I3}nN$%%
zLE5+n0!cz;sBqvsC6ZVO4Yb@R7l$A@Ll-*`ewv4SIPD_kW&-3um}0u2<0rM$$63}A
z6CCJ|c}-f{G*z&Rj)f+4aoS4M=izTELfaVj;0cX*Sa;BDDrduoePAj&Kv{L-O9Jfb
zDBWZoO6~`~riOfw{q>a?l@u!tQRJ`%W@gdXr17#8rq4`xm$kAbwxo=dtD`IpT>zn)
z5fvJY45YT-mG&lq688<h6e`!JUNW2o>=cUJe}Vt3<WMq_89}9hbAr|qP-141HewC=
zDFW$>Daz>QfF!?rV3K4@8EBy8TCu=EKc}|Rg)&iBOdC0^M@%TXR~%$>@v+bntazyt
z8krvnwdIHi)T=k24sDzY3)F*R!A@?_=OQ8@`{MvRp|UiJs+GRiFF<wuZYydLFj-8G
zR`#tgA2DrH>1g1Fp0?Ma-r1`2*!seY@_J}0E4Si0+U^nFdIixf9Q?eHQ+bV~qrC&7
zrl=aFpxZxot7e!g5>9@v5o$-F%v{ZAsak-um#`C*AzI*$9>Z)Z8YK)Z5)d^nuL+zZ
zikQ|p>$h44y^itqeoCSUTJoBzeL^Hw#?`c{Nl-1yj1jGgO4^3#tkrAduDeZ&=MqRg
zWag_N4GfGyOo=iC7Tkj{>F`KKtKL`hTfo3|Ps$97p9C3BqabQD7PJqB`>9asyi8>Z
zZk@gb7k^$zl;Ue1pK&KV(cW4llHl=a>GN--;WTJ85VBvbIc$JfgfM7$*dXZS*Wg7G
z4!@SSC=?VljqgU+3UOT!`8<9%BAI$lCVlT;q<(eAU>?S#nYq^+!Ij$CB*w+TVSs6G
z?SrbJ9;XD#Od19<_8%T$W~F1^I-LtC+3%+1cMHj#4QceET(%*R69M)a&yN$j<9#!p
zV=5aatAT-G+7E+^M>b{qNWn?<={XT{%K);3IYeWSK^aJ=wk?Gm2f|p5w7yEq&TR9!
z=7ya#NRNS@2D(mNmpr_=d3`Z_w?}uKn8$IYG<afSJdPz1fu+>gM;_dCPJnyf`wmRR
zVZE|a;V^;&GVy<L0c-kM3B$bC`j-<&M-M;d9Ie(5$9#mcoxXoT&e)%{>FWjYmca;n
zv!Rl_Zt^Ji$Iw2J;?|cGRBAG?wT!GXBEdPc&FQ-BzGFUzkA_dKb;9lOYzz@pSt5JL
zAYj2aw}xf0yl+pq!9Bh^eW=2kqghmRv@n65DxqCPILb?9gv7pE*sD=pwzY8Sgz~p3
z#a&8rVxB5eL1M5V&M-o+!26vvb@IHQ1L6x#oUcj>$Y=SWig6s!(m}!TQ{<Szz@}ZP
zbT^v&8d%jS&9n!TNUmQ6>>x^p)hLfTRv$$C>k)`qGHoeAhlkyN?ZfaBZ=ZYDW%wDi
zZoY6M5~YE*bxlbqs!Verp=#}d#iY|~@5A_3+TA7Qcf*HSSZnFoL_##jgdoPLo=4^m
zP8iIMoQ}N41~Igt!%8FyQ(IxijF-<qs5~NtSSynnEp!2AS;ckOFu{rtZE6rUdyr)&
zQ%A*OHaWl#jUQrIA||O=%ypMiR9=5w4svt$$&TduoyEC~eDnncNiBYGRO_>}h=WbF
zyE2(aTE@u=!;7?sAw580Tw=)~FKJt-ZPigKs|kAgJE!Z$r=>)pXLC8WB^7GIT-~h_
zx$bFBjfDA9!{r_v-3$b<qbxpE7&d8|W#*NhRN(ZkA%QkD<Asdl$kZmkVXMtIl%xXe
z3?{x<4PNPMur&1>Nb*H@z-Ut834;@0AW3!1iQw<*BDj51=^tv)(c(v;{NW<xD9dHq
zp60n!=HPE=-H7y}v76^+cF<PGotH_h>eZsm;XTHzu(i?*xy4CTO|yXS-=vn9Jczed
zv7bi2X)nk_gq#AV$D*W2NhR=-?s~^JrVmI42!Q}bc7q&-6I`3j-j2ds2g|q{YWM2r
z|6e~Ze$Iu1r?5Ko9NJf^R1N+JoFlfe2q1xo2(5~XS?MzhF1R(qxNsD>+0PM*uj@UN
z$BzZgr8L_yLUE;sL7FflaH_Jd!Wjz+EG7&9F{c7B3@|m#eS`p*G3=Jl3>+9Uxl0oU
zIlc11CC|EU(TSBzClU;MeMD>)K0?2{dpcwEP1_o+fds9WRv8*W&TAUeg@}Oy1RQI5
zi@1|>z0G$KoL8-YEqv<kB3XM=+((bWgNf+y(`E>I;fYh_>tF=~N{S)~hND%9KxFEZ
zL`(=`O2c=y3wdsA`=4ho;;sAGb%q{&lue}0TtoGGdpnv{ELxmM<HXx{s1ok|&Mp=U
zJa<FUxUPeFzq+#N8J;?KC7blDx~r^dR~FifGc(M-eel_%DGA#gj5O4$O_f4p@Z2M6
z%O3{27G*0s*6ZS`yIxyjuZ+{<_=Gx+;_>(X3&}bAes*(qva^`4O9uFm5)C|nK=LXG
z9a78}(4^%-jgjg4imRMf#|<?Yl}8m`T7c@FAAh4kp5su#NMQhx6yYFm)rJb_te~Wk
z2R}>h@3AUArJzjRzz?t<dNFA9m9MMubwYQc{$tRnsSqKIq1!78x;Se`2msBUX=P+e
zXcm9*j^56l((C8At(H^bVbD&@hxK<IX}U4+(2X_$vX-G3RxF$O0LHA3u_cleX+ttu
z&7}+{IT>B6FHG|rt`+g@p?KHnC$$~8HaM0K-@H+SL3jorW_dsR525SS?mTrsvDQ_N
zl>>=gmy9Bmv!jijOu4Ibg*4k0VSIVy3WsB24RZ^ayFmm!`QLxLly}#>{{`viw-2{Q
zhyFPaYYTk9@*)iyH%p-4!Tgkujk%9Y)aZ#Y$SroE4Ra<@1xB5ADFVjChep3A-47o>
z4-ea8>N;Y7o75Yudx4#pi(34IX3kC?VrC~81JDKl7+{&mZQ>_zcT1f<A1O4kjvRL~
zM*?t29qd^&a+5}`L0b~>7>wbr#9pljhntP5L5yo6X;`|O$5U>-5dlI}>>4NV<tu2j
z6A`j0OkLmf#msHAVec`$t&HW$y4N0vP2j=_+RGY1fY~w_r8`+dFk)|3R`#MXW@KQ_
z$9~f~C@q|4E$@?8Q0#XmE2i@^&Tk`YccqNr`N%NSnd|Rf7M~3C>AuKB5Rj7CGNXeZ
zD|VQvwuyOo{Efg?1Pn5yC1HV~(#)z|*9|n$#5P_{l};0c!twSZiso*3hS8ImYkIr*
zmvwTqQM`~4WYZ)>vnQoUpG#rb&&oKmwGEU|c-wDdF1oe2)9SthpYiqW5d5ve;L&Be
zANuT<fW^m^KZjvP7!Gy#mc(~aNn6z_{Mzon)Tx5X^l<BRO^@2upJ5@NE#>TV?DTxr
z^=4ILpGC*pO>L~GxX8QZlPdVzd~CBe*1h@z;TNn=t-Ivkk<mT?#v)-V^?=Is_|e>c
zmXb2Aa_DVP0<&*a=-arCpczke{d%f-grolV=%{EC`1S<o$8(=h&5KZd0~;*>4=}T<
z_A+aH-HPef6wxnleOk9bra=uFH}W@k%JAa-2_X1+J?8lbZQqYb+I8Ar%HooPLwAxG
z9&lm>CpacwIQnUe(siJ>{EqK$vxYb);z!6(5FM`DP{S~GGgNW&7$FE=@fdyg6EBn{
zuh!-a?Qn(6T|18BwYUv>rQTyhMD><Uie;1;?q1+@G{>cRLSB4rW`&G*{KgxbHSu^3
zFrelmf*=n1K)X#MNUr&n<TwSka`iDz(Z$D#;>=5-YY$Ts)5Hm@ScDeWbsFf7H$#|A
zn$EEGo+FU*Bg+OLOaiH)<$(n=24H0kC0DX`ZM0ZB+dqYw;-ZtsE#si!)15nM26}dZ
zjic^ZjfRP9scUhrJ4O~)4`qtoDp{oSQNZ4`OrSl|?t8s>Q}$k<`)=Nk-m5d5bMC5|
zp};Kq+2u>F$Y9_KM1})-==i4JC+zbpq2}@HlTib2nJ~(&Nas`Rt1U^5m+3$o)+%J!
zh+c+}Dsr}`p5A0obDI$M;)m}=on_Tyd}c4a$K>xLL@M|l6wjyKn8`NZv$Y*d4L;E5
z3!(JT9zs8hja068G|#@6vrI98?{lEm4R?Jd`X>K9?ure(`>oV-L@a^8^vVW)x846L
zBKH}9Jr2&}#p%Qqq&+2}x;<Ad*SY=*&5&Te+3>MuV$(%2T!Q~Qe!>u1ffx<n54qM$
zB8HM*w_6~@3Sd}nn9(^@_*gUVovJ)At`V=krNs<8c?8F|;1J3j@*CImR>Ld?eRR$J
z9b8sw0jIpra35wz5u5xzeOMj*dtQy_g1x1K$jL+*DFtLXKb9v=GQI1b8s55nX-sWK
z(;8-&F%IOht6Mh}%nS>)kRcG#*C5a6KSoKx5ZYkN+%zTy(o5czsYhQyB#IwG1#JTn
zO1{=Uwn$63e@fpX?}KJfoWY{oyx{Te+{7m%9NwM^os7DwmBw$TYbjKtvryeiQzBFP
znT)q!&`^Zjwap#joglbbV8E%1#?j-GlF~Cf@8)&mFyne}Mu7cB;m@bNl>EJ#>k$FP
zSqn0QYm`#!K741AE6QT(?GLj|!fb>Fuxio;)r3Zolc~K>J*Qrta^QXCy5|qHzkFf3
z_$i)-{B?AB+oVzI5R!z_yKW7(4b$T~xa6-tSir0GS6nuh)vaDUdpw)GJbAe?bvB)k
z4NiYfln02@G9QU4v<{28GQ*nBe~(4nzmS+W*Hb%D3#b|AG#RkW3&lu!Gj21N&UqTV
z$ieXnitPNsyy1D&Bl+^<b<ca^CjE8?nDSul_74INSM5Sx2PPZmYodc87rkdFGzPU8
zSSbc<)nciPvH&G3i4=Z&>t<D3^)QQK$`TA79)br1P)dS>a8G&Q>*7y_&m!$KXRkxw
z_M6&oE_j{*kdUj;3*b6l1NHNcvCyMSI`XAcG0k=cg`C5Ki%U+V^DfgiS+A3>BIe%4
z(=D5MvSL<vllPJ#$7SBHIwRr6onD?e<DSjh&$Y8S)}1pauR)~4R~Xr^G1)q;zmIiT
z&3+E+22+b`VUS<2{o_-;(t_ZA=CDy7!JdVVS>6xL9|wo-7zBF(CW=89(>ZRVNP~4=
zw~Fry^@JTTt*QL3ygfhJPc~^A;s@+82MRZ@$OdD|&r;N3k1G&DiwI!^^e|&5Hmr-<
zAex_c{eMl-?)*}pYQ&E#eF*OVqr;F|tpfhE6w9AN@O+AVggGCxPwCF~8qX=!jC;9I
z=HO}cA0eHt>$v(H8aqC_dtKn*(*XY^?!o-fZwzY&V-O@0USkwiJ70if89a4SIxIr*
zA<*#=l0pOJpKR5S3#hzg4Q*562)G#iG)HXr)nU4|o1BiB@#m98O^DhwVv_7RpnGRF
zxT!*rGS1!I!|pN^4A&8Hd_0n-`kkB9txbdq#0@sFg^0|79>YA^*xyIC;Ssjp8e_4Y
z@RU}Jm%Go{o-$|bSTQMZik?#ui7sA6#KS#OxFEn>k$`}tH`%0xf=?8v$~~h2Nn>y1
zLC4_lCi`*9z4pIL`}g&uw*kplMCY259gxBsQwkgpp?nKtvu6^^WFef$JZzdi@#$=y
zpQa28hvM}@3GQ?Tp5g$eJV^Q{#AWC<IIS-Xd~**9&Q33@iaf3TnD94XrZ*B%j5Wv4
z`-j~=^yR@xxe>i&q4sCSum|9=0x2Qey#*+nT8XdEK{KS1Ncpj*7jAB7Zz<fV_xaX(
zwpx0s1U^8=@WxgP9%B|p0wrcWRtN{Mt8=+<aKR%tZV`T4+FL`x3MK}7ND%<|CkLv@
zZ}D^+`Yw;f)wfO6z7yvUgR`4Hj;ouwR8Vi8Xdp8%IJlEva?x?UzTX6ifTk*VZJh`^
z?f2)57>j};_m&rN`y2N`|GOvQ@!jHC7lvQj^s#jt1N>-JrT+!NxWZn7E6LB-W1~J=
z+&4v9<{4L)=c^+pbQno*H3OK#cwwgUH-W0w7`VvLbT{?4Zi{G1&fN&iFzKca;PysI
zD8^ukd6*oUF-gWjYQ)kEF@gF99xywNc}6xp4y(fgOE3!>Nu^DrjdY;jEU=K0nujp0
zw%8(_Wh8u<H6|7}k59AK@*W?>y+{B(mu{bf3e>ZhuPQe&sr77c0gWz57=E%az%XcJ
z5_GgMv$Y>akkDnwX(*5;duf+Ht@p8JlSPx85+;vz^jAnA*T-L|>Pmq`dpEFN!Wlkx
zIM(P4mMaW2)7QY-2z(|K!u}tJ;&<lntl@TtBMGh^V6sP+iySK^s)hhzjJvk41rDgr
zq;XB!lnI#%fHN>1d#5xPARYGz9ZM1-_r~1zd0Iz5<R7Ku>yCD?a)+~;_YH>_hecKZ
zRZ<sJ$xOlY8`R-I=8gP1>dZ{(F3aj_e~BOraGE^)K0e0}&9S%FJN-R%F}nJuuiDNU
zF945Y<J>W7hm<mAW^ar$0-+J>xq<w4sR^52sw9HGMbOaq8SDpy(a<1S6N(<$M&B}}
zp(c0Lj+l;LPcRquT^r+2Vm-C1r$&lTe-jPT(1Y*na*w>7pS>racuL}fBGf}Du8|}<
zOalfPf_65O$jlCsbugzUQnLw~IFu1)mN~Jd)w=RGuw#s%axx3)$eO3(w|1?i$7AaM
z(~-m%+j#0$Y2nhs9=>|^X5U=)&SnAM#I_ScRkY4~C2A0f*EgYnZS-Cp$-#7drqi~Y
z=j3w+6r_<ARBsqMhAOI2I1w)H_Y;Q<e4o3ZnJ}hF;Y^uo7q1Kmo;?{1gAoKr%X)AZ
zfNxF2W*4}Uo3L86n>M`VcPemO+Fhkakf^{)7?kJq_o_&P@(BVvmT7M<XrL1>pC422
zs8xVHIEWD5eXbyX0EVXQV|3XLxAUMcvP15$J&ZMwb3)*z(O`WM7(xziV%UqlP7fX<
z3o)?lrJLJ3pT1v@Ei!Gmmd-4EH$HI<038f~17PK{c+`XbfwDs^QOpl7SFWLgpgRY=
zHn_Dh*)BNoYjz$vT_h;U3t3CImp|EiYVMpcqDbVksw#{51bL3Tu#+G$w3J{ZwfIWA
zQX7s?{I93HK^%kwUQBVk`iU|N4`--)+aF8i?os5>kFzu`_q)PgA;rju4_n0dY2%w)
z#`WL5al0~v<sv-@%>AM#POE*x9z(I9d*z&l2Yu<*ISs5c@N$|s;T4J{MVUOF4rv%O
z9`+k<<(=m<n1=nSq%+IzH{@B`EzFY4B0QGZFyZ}`W-#2Ct;u6CRrmqfdvO1cl+Hn_
z`wsC1?QVzC6!9SYL(slahR8r*1QApa^D*n@ys8yKtXsZ4eLVf`_Q~U$Hj3#}{7rXw
zyE&w1b?(Z2K7+$wl-7D~7MK$oTEjIPu{FeJms>1a^L-+AJ<8uB!slF@>64%BN|#!W
zO*L4GV{a2q$P3rT(CsHz4|Smg4iT-5%75^0ZO=UY606%P4+~*l@wADts;z6hCu6Tl
zKJRTeyPI%-HGSWdegE-SaiNZ5+1jazBcG#E!qm{beq`@LK8nAdpk-P8EPK}uf(BpG
zJ<l4ipr{Zc8JEgfVmBfl%^FxR^W(c!&8ODW*6{Z3%m6+qiELWhuTYBMxEUs6K^fXN
zYug5S_p>q8+%mq%f*j)bPSo#jFL|-sbgU*|v4KgAG(K|;5yHz@H#hOB;xb_Jd>*VC
z9#yYRNDgQ?c#)u!QP2oG1Vtk@<^L$NY<*?RRVnz=dBZ#HRRIGS@MsM=Ng$CC>Y$NK
z^K6C>D|vOVL9@*8_1F#QBt|!PzJ5w=J?pxiH+SdydUX!dkr{0<m97gZE-2e^p(VZs
z8f**(Z3l6`h6Bz0n&-GNBbbxw<FTc{BK}Mf(I0et^9Ol|WWg5h{CE%u-FfbV`IaMr
z^d~+4uC{Ys9l@ZN;~MmtAyk!Ih6>_f=QoNb#^(23hE!+Re9yz@;m^kFl$v9Go-vKU
zW1l>`^2?DOmw`ENkksSmvz^gnMb!dccP*oL)JnFthY|!}Vuzz8rJ(T}-RYtmTe!a5
zf6Lf>-d?ff&t>7>tD)RF@lQu6r)Nd3db{`}l1`#%-g!|t3pOF4IZ8zBcBwmwZ6k{#
z%syKJFm0-JOt3Ir2WhMkCQ73GPObgBRpD7AfZayRnGNu?-V7%Y-}ZPm{GMdf4lFlb
zK)LsnI-5P-4)>X-caLv)s-|J;US?MF`=*@ZU`HS-q~Y8Kxp)|ucNKCm^dVIY@$a*>
z%p)RVQ}Oh?AD`>+4va;Q^{GFan2Q8O79Y2Dg%9eoT&B$XwNWCGj93aHj8%#(1&bC7
zBE&#aBO-vZ3l=FAVv3@I%964Q{Px8b6Y4GWS_>o@2?^U9mhb2JVsdW1snno({AMoJ
zB#Ej97JeHRhAx?{SER&Y;&i<(QX{WsW_6cXt_=~lIk#(^dz2B*9Ske)X+r^|U}a@l
zGgns}7iR=r&8p*RgQ*}dlvSOlp_v~E(wws92M{c-G>MMTs9?BV3K&1iygR&XHiYO8
zmKP+v8`w~@%19m>TC>yGXJWWyXLVAh5%(Q4UR?)jPo-z0lf~wx(bHv)*6BGExz}YJ
z@bb;n=}>;6gdxV<T(@M=P1}ZTLWKa&bC|vsKM}>bpHxQwJsl}{6qFsaz75<S?V!2Q
z;Klr{^b{CTe0r0#Lmok?l-VSsD(opcY5r3;xP~Kp5<ON&Ys_&MF{FlK{#?e!gM=X?
zy<jRnQ?I~#`||NRb`b>9s!Ic=-vi)I6=;qAoB?^0jcpYqg3mSKb7Q^edXs&GGdvCk
z23rY$!E!KKJcitCVd2rkb-frjcl>I`*bYRS%TlUIJ5g1$S)N2360ofw|3pGzw+yVe
zbsWqW3L+q(@}=edPjDA`w;N?XT1X$x^M}3)?M?5Td&p13!$dVQLpgd#$r%~(Z_f<Q
z*?Ug|7v?P7q6E@*;{Y7H#_G#`HID(X(jZ0gOafh9|CbEh2Jx(rRXKxUekY3-Ja9Aa
zbThFOJ><PdyfPl__S%(g*Ly<%+Us@{&5nTBzJV7gu|sZ-H-tm)abWT>_7X#Ex9;xh
z=T2g+Lo#-J6Nk(_5^{{UL9ZNoa3WQCuZ1*tl8&OYUACpW?6$yMk#N(5rHYn7Q+3J3
zOG~`VkR_{~_-RJR&^QcT1)h23!WaFS4n=U5V<Tdh(Q045Nr3rYx_bXttOz{${U0)U
zba!ym9|8d2W@dEIge)U4Y&=IS>H8;TiQ`@3ExVXnhfV|&+{W7?Gylq-ZJ_gPx$gmg
zs@=K8wA0y!G(!jlnY)b;*dX|z);@SM`lucceg_5SQuRZ_rxhd_YzpOQ7?leta$Nn7
zwXkil`wuR@sw95O^=)@|+H5g^y&BKASOnB-_AVdhre@QECjSnRcJb(@U%rZ9=znL0
zC^Z($ByrilGDZij8X2ubgdGfh2ol|LZ_t(p#%uE!e{Cv4r1%FU`VS^%nWmpj(sJo8
zs4y_?vBdujW0(<EBOk+nQ0nwx!94@Q+>24eSZP^+RzX0Vef5<K?&{{&q-cM5`rRY4
z8aVt$I(A6Nl@$=gL4Y?k*t?^M#kC*Fg9bQqf{x;ZF|pE7&}T20#o$M;h@q8(Z!4Az
zu|ttLi;UA0BMK*H#u&4Xm%snR)3&<jdl_X1KO1ib0zlAIi-Iy{GhmD+N;CfWQrR?8
znWAap=N@Ki0)$wU%O)&@VoQSBXd_W?myoLE3_v-@@5<ByR@wKJ>bHpJ=KmXc*?F#B
zAcI)rir)oEkv-$(Yo`uauGWfKS3iySbkJEaK5Qs<jk6NxJnt5ToT3PN^9Ad_-g6H@
zc0$tgqY_4(<8&D@Zpk1byXl7w*TA*6{2dv{dH&ZGgo$=<2c_dlw(&D?6118XvNF#>
z=6P0;8SljX8}2&jIyNtjFa`a0D@%CQTkF3!oHwho(z9P&aN;-ny-PN#1wDKTATvJ+
zr@rAF#*j{$L0+yCXMANRTAYVFX058~?W|Bp^Xm}mR4_^HJH}po>-u~5KKdQ+)9HTt
zM$Kr@C=&dhlM-Q_ItdWI!x8mIzuXIlQ*)yi7m48pab&8>M<Wwox2=a4M$r6EZ?)jW
z*BPE`dj9G;-A~y34}L$!bt7#Nw);#HVvQlzQ4o*-`$Qt{y)z>vr9Gb0^8=ye{pIv&
z8j<4~k{3fqp~YAmC8H9P)0N-J$$Tvw<a38fRREH0w)tEREjliWi>w~7HAZq?-ZJDy
zBv_xLxwx&}*9~)B<*3dDnsA84K;S<o&(uIUEGo~$Ec1#&I^z&z{~7Iaifc%ILQsal
zu|c6O5V>t70|AFeUVW~!Y&iY^U6H!4g|+N9xKp)v(dibi!R1#b`<O~gyl6Mxry4kI
z9gIbHot#K2DAVj~(8ma>cQ8Dp4UrFj1Rs9@1K`2R2pjVv2js;{iXOHcomAc;NU}O&
zZZJO~i~5)#`QI9{-ofIU4ecw@Y`soKZjLkEs$JqaSIZ!>l42--7rTmH<F_a6+1ya?
zW3?>DWs10<p4KdMh~<j2U_Uwj*?liB6im4D@`KnyW<2hqUTySk(0+HiPi=-CBO?jS
zV<ETZ{$nv<2>}CxQQ(0MHV<aD;O%=O@jc$J>atz{Hdj_dDX3O(o67w+z_!bx8N?z6
z)nVSqW3jqV7Z=B(w~;J$Sn1Ze16OS*NHFC<uoRq>Fkn<>sGz}&D2#g)s1-4dsimqx
zh2QdbC0d&`-;>DZ5OSz>Hm#pg6;;6SAr6Dv;qWub!?WssZuX}Kk!SgO*sH(Mo>eoA
zoLdO#x-t>0aA2z&oE+|2)jmCBWSl9Ea~TYn?d&1Yy9CY2*Jk2(&DcwpAWVIj4qwT1
z_|YmLFfN&j`KDW(m-FD41egOiJvwGcWp{u=tS$U?Fo+}b-Py=KhjI58^BgR-67C!v
z3yB>Ey?MEmS?<2ef>)-koksso>IWgMt8d?H6#(|F2JVgEHlbm@HOD=FJt5COx8~rs
zEw86`@GL?-I}$Rm7iiB3ubEF4Pz`~y!+h1uH$8^;uw^#i$#VD+y_ZpjpSplyMk|Oc
zp$r_R_EkN${NVL96wT_Nha;WTMmAi{D58g!;)(@3;)+ICg;s%6bQ2(mIBpfiRa*f@
z+q1WXuK1r+^jD9jP+`jQ2uRu_fu?uQeZte`NiQp|Yc?a<P{PgQ?7cK=e80os<k5q=
z_-eCjR@+E+53lT?0D3D61|&}r9A~`6QZM5(LX=zMt<Lv0!XxBa07F2$zX+kPRr|Zp
zGojJq>GLx0Uh}-&)_GnFaqc2`5J$V$N!!kpl6tT8*uAJ%z6oq8Jy%uaDa~(qhCi>{
z6=4o^18lTAc!{cE6)GkYpr7`5o}aSvV}Ik>Xd>$;40wz=+D7}W$&$J7frX@!Sr}Nz
za?oZg&`!e$1kulVSIgl*804(SZ2jdS1v&<faqoINOp!qnb+G#+l^~?{nf~$~;WW)K
zg-JU&r(sLYlfc7wsI=L2NP0T1Efz#41qyAA;I8BV`>2PZi}lmBqPuFR;~eja!f7Ps
zY7$84byYr!kx6h%oNh33NCS|g=Z7#|krnKW4B}OtncA|E528Q^BS0f>9lXS8j1{F)
z9}KTyS(y_YrrYB|c{O=ilinAf+pV+?Q%Mvj&`n&F#OJ`>*{PnlaPA}JGK{rE7S_9>
zjdIH1(yD7ZC%3BPt)ZY)kSBWZNFMr5Er{kJw<7@24gnq;6?pIl$345OIJy@4!y6lI
zw>|X8)SeB|dsqkI@+}kOQ;$q|V1F_>8_0%W^3pfnMpF>`yCO9g3iz_JaBr%IVh#15
z({x|zwS%7^9A}lE56j~+^N+(wL8hcV4}#!t2*8NNBsLgT3BSH9_M&l&B;mR5b~*~X
z$?qwm$<BrOrUu&^O<W@*MvF5W-7`yPTZ_D$o=gW(O^*8RqVMk9#8%Pbd?}bTAVQoO
z1LGSj!anNgKF#qEj9_k_Z)vR~{&%d!en_xxV7h0(p?`@9DQPy5$-kbPxGwfi@*>D@
zx+_Bq^?JFw-EWFmjm|_b;b+EYgXsK;-OL@h!&<uaqVyGnzj?k4?xKFg6vIUbSF<Qk
z!Vah+UMd8ToY?}R!<z^K!b7vRoo#fVcF$pTR?s9s$|Bw-5P5OwK@$ii$Qoc4f|-74
zXiM&3gov9kq+FwXX+G{J)s~NI{?`}2gq0!M^I&j`4(G&`CXf!tyva9UESs{33I~N!
zRtk7nL!e3fUqHD@9Mv?*%^>@)TKg`w(EH~P>a@P){pM)-xDS7ZlTO&{JPL|uww_c2
zyp`ftjeuGRo;Ecf84%{32-Da^Ft~ES<FRkqZT00}7I5Q@abpDMEQB#`F&iSIj1ll+
zHXt$x34}+kl{CQyB!u1lN<clNhiV66NODMWNKR=9iU@ThrX!qHr~v03kpl2<R6AfM
zGD*~shL9#QNm2wl-vzY_g<^)N@WCo7=z-MWr8r<O1VP3X1w>(Co%O$4g*!fSI85L0
z2siu!FfTR*{+{}_Yh51$>cXq=*eO5vF#bvh^;t34aU~fPKT96}^>haA_Na15u~g)p
z2zWo0Rv+g+9T&I7Nkmf7mUCbz!W!vV7Tj+2&7-jE?e64Vmzs*jyhT18h1A#%B=)i!
z43`0b(h!Ui++XNXq6D==^N1-k@LPLh*+DoTaHhvC)V8l|*<)hbXJOt(%WYYkE0esZ
zYrUa9$In_~YM3Go{6N_E(BkUCFt}&8_LV5mw}#H^H+SD}a&tUK4C{M4>4Ak>J65;5
z-aLbR&(V%sFVU?yo+fYxb1=lboY)5t$HjDN#&^wkO;5Che$y4&ex6KT=DNDBF0j+g
z#Btk~<$1Mlu7a-_4ftnhG^6R_dANr85fIDV&^L(s7_FeJi1@Jwu7HQ)M1L9>z`R<B
ze8>-%ie4$~pnZ7&=T$%6{BQ2t`Qn^DOgyS86t;MP5J3k$sUHBxJ(<j$T#~xJ2S0n!
zF2i0b5v(MK57s!UDlL|Tr=yn&tp^$t5P)jY7IlXPo>v5^0lf{uY0SDz;>VH0J$5RA
z0HK|u?~)Ek!zpr>^++wn6VHCo%p;Dofd?WOOf0LJ0)75e=7Z?ZlvWW9!fSj)`>27%
z@miyJ_s_;QeMAlM%?BG%+*wfP7X%pg8(@R3$;R^q^%bFUZzeF|b_9TTFp*cmkAoF_
zY*g|v!XbnJ)O60$5iJn<X(H#RslNV!?)042R;=-w>Yv`{m^_LAcJEK*RUz^X4dIwF
z3?bG%BS^}dtPMUvZ<>+(Hj6rG)ydYrYTlr{X_7Le3jSwLSyKDQVBKQDmUHhhFdJ|2
z*tcx<gWinf^w2=|W1Bxmd1pIApWp4xT^&5EGB@S5z-b)ek`~JhOp_WxDbk}^*Fiyz
z8|nJ6g-nCGuUAix6v&JA|EsY!7pP;PV21lbxsRM6v(ZL8SnA(d-9?&_2T;eai0plE
zc^rPmd{%Nh7!4aJ3j8#p2Co3^1{ODzi5}X59|b{noF+ngtF)y{vYlNqO8jgc_VgJW
zKAP;PXXnj){1+@d!PzhHXRosjK<)BNbbydS_+5U2MOtN+7WB658((!o&ce(d<>KLj
zH{&3NnSl(zQq#VfmSi*5cd%Nq?iiI~-f?ZRHA@S3PFWR4;vy1ASE*5!I;w-<ywYBG
z4@0l;9BOQ-8`~p$f*`_cPk_tQ@AP@==y$v<ADpA#HeiLmH;EneOb&+A6uMGE-!qKO
zG4(H*%#1aPV_n+X#xAzQ*R$C$_3xu;SkBdkS0~5+X425hvSf#JFR8g0#<kc2I|#t>
zOaOz2v6IBv?zTNrXPJTmzGUb4J+H>_u;ioc%WxP$rZ)NRM1tR6YA^9!W;+ze>!W$I
zLcHuTuiQi5O`vD8!&L?b&#V3^`11KOfRTu%@{P!+Ky_`vgA94Qd3()iZ0)F$yKYU|
zHld9Jg2icgGJ>9W#GWyJT%B|x?M9!QiQD3y+Rk3;)oTr>{2p8*gwEl>%h|tR-`@B%
zQdo1|-c3R9o%~o?m|oG(zsvbsJDYwF3N0={Qqu(m5^`cu^BR23qkXg0nrTkGC7VKk
zle99Zy_gY;Vn|X&eV-ySo(!{ih}sW@KQ$`1t9syZUi*`6+BWa7YfBf43+U1LP;V)%
zr(0!q&MTR|q%J#ijGke7WJ5uImq1W-%!Z-jnHJvXWvl?nNSA#Sm_#>BsJhwmYC)-i
z4Zq7s9;0W5^x%yBrJngULPrsx!tZX~Esiu(8E=LBZI$_KPHrl#9ODyIuWH4UaD8~5
z_L!{6ep6d%v@Rr5<Gp;~f5zz9Nm{bS`ljN;A^Q3+EQUkan754@c%8uK4NeS0wS^sK
z)#}(B?#`5vk#rF){J)Xl$Z#8S)jg4}D;;564`0Bo!J(!BgAv6oz5Ufg>O!cRa*<m@
z%xm|mEXdAN0LN%C(w`CaPoHdzxeT#2GV|4KQAlglizIW#M?gkR6TB{5151ju(kOK)
zu4~rfah&yRSQ&v22;?hn{p`@L7uGY5i^`W5ELaBN%ugW~7$0!ggx6;KmLord3#K!|
z^lcc-=M-8CYHv5Y&IH+Yo8vQhyzvpZZxy-i-sk9i2RW#x*FQL7u@$=a9?8A_uaWsA
z_F!WTiGW*XJhQVfh!192m8-z-lwRnvMr})%UMw)GfjOtsUUQRb(g+!so9buiPz+j6
znaMs51RfEY^5Bfy2(bySV`$OGe7rE)3N#UVG+@DjzPIe$b391DEzn8eGB&!zx4B1{
zZX2v?7_2mN5qCEjM4fH74>NWOnDPpJ`ZKQNGSXw$FhA98otOJ_<=+P%&OTN4cWQ=2
zZc`c$8Q2UjGvPJ${qpf*Bw^;<8%HN<4Y{W#&UuL3d)6G5iyK3BJLJ(Zeg_UP139UP
z_d+IPOt{sDxw7}L)epI>+-1;px5gsGfN(EF!!ug16ux@Z=_?d%={4rf@fCh25|qFh
z^X+rh6gq`fbsp2&t%o?*KETsr>ARaP4EQkN#SlgL8)NL^mx`1Sj?R-F7G`GJE?NAe
z<sTN*Iog`avEPwXBCQ`S-@j4i;!H}2{$^&3pbrB&5DGv|BgLH=)f_rlIO5wg%_ewa
z_eiS;dFR8j9bDgxMlaPTLtig~))|)RY;1$sGjCwT2GbmFRH`_QaF{(yl)EjtyP}og
zT??ygf5(FpTn4Os=N=J)-`YHb31XF4fdmAyO|-k}MLU)hB+;BT7BM+hH9*5ap)jWi
z;B8%5HDW5o_pB(@`fSYPYaT4I4wcO`dyhPyKcMGzb}cwKabz~w`dpV#d(IAHMGM;l
z#A4iXn<-gS!dwi2vATWwDEZhDgTv7o*^id&Jf5_3z+b9rB3`%1$&OFiVCSA%=;E|h
zUOFJWVAksT-D!Gt!~Tfla#e{J7ccHu>yYmP{Eq4HZE7v7`upbSvNNY-ZnsuMP$<UW
z4+M}tI}nvw7~L!bg8*fS0}i~5U?GUta)t(t*(+%xos!WKk*H_1I^A9-$EDuJJde!e
zId^IIUOjwUgfG2m2dRG@oR{qy4aTtVp)HP4%s60-8Y2TVMli8?9EN3<mDvzdBzcKc
z>7`E-XG3nz&aq@wz1I3M=XNhRz{_+2m8)E^7cq%8mi?pAv=V-)lv9Qf{3ai6;k^&Q
zOhjO~fOByJ;j$V;xL%jR(N4$n{#@MF_5ROQ7+5wXRzu@x%_I&?>h`D{k{#wwe#M#<
z=WK|bti}L-)(`qTo{wM4!POteiJ}guEAe7Cg1N_&J2|!vwNJVgC-vL@G!dkd9c&J0
z6^B+dD-!Pj8ZTi+RNUYl^(U9qxtmD#s=_(@j@x&}uWfw|foEBgWk%BRk$`;$4L{v{
z?yT=g^_*7#Sd2uF0d2^^k}%KMo-`LT3H6C^LaeakE>R!JC1t;Q#C<e@j<|1n;u#}L
zY3r$CRP+ITjn?X6tS%TBc<`m~8iAb7A@k%p_LpYRD;@;}J=_%PL()UBhm4L;1Ifgq
z9dQj4em7vo+HDJp)G;F!W?LDxUFQU@{hN0#3gUOxSXX?H-5Qq7_Ivo_@6Dg`Q)Ph<
zpIT#7os>_zTk<hY&I+Otk#bru7fv=}l3m9(R<6aVQHC^;Z;Ab~OGaIO#}Q2%7DY7k
z`to3d*Gxr?-5U%bD$g3(1A!R|vB7QMus(XpuazTs(Q_;+^A$y{N-JIo8*+gBh#QT+
z)BHA)hB-Hl4MPC5OtGk3+Lo))qiNoATUMwn579(ZhOEdMOcAO2{=MK{MRG&H>?sh0
zQz$6?bW!f@+RG{|h}vvjTN3YDO8Q1qK3yDHrF3v2>yw@kQt-BSEV<K#Z+nD+Rf%sL
zqTVEn3qTlLFi63IDH`_G>bM!42K4VjZ~JE-5#zGLs*j?7Vaj04Jct3ji#4A)F`bR}
zDOmN=vI<DD3J2!3_bDiV4+6h}zFrOa2~OOoqav=c>xt@ALp?k3X^J)0wlqeow4<XV
z3{oy;N*LLmjxn%_X6F;!dH*)K{zsd-;|2gA06PY%^bHwbi=rYPsmRfd(+#XOu6KMh
zXFR=Q6^7I`)s`4L3r3j40cgN_*!7r!pmR(V>K2O;jN^XO1<uH^79@j7Dy~R~5R1zU
z=5Br&kt8kqq5bE(nr#Z||0O=hMXs|zj@E2d4n_8FWtAaEud>F?6`FJ~Pzwhw5Xnqq
zjKJ>QAzVkVd$~_Mjj`bx$GY-C-D_=su{?k*gPMB1ha-&=!Pt0>EO;?KU4Yo$(E$J)
zOsf`FSlK(^`HZ$TYUB}=hdFpS-5v-;eX;@#j`BQ0=@}a&KP|A)mt47@1tB}qu{VyJ
zHI{<JZ1|P*cs@f=sZp7dpM5kfg{&!d#$<!F-&M$R2u9l1EDY)upbQK7uo{dDo-^Za
z{fZqn;tffudQ0}`?PAdcuoIu@_8(Pq`g^O}^_$T4r_7C95=O_<MV(fnvMqQ$+dJ=f
z;NTbZcVZ?A-{tx&>c*_XX42k{(tr%dM-$$CQo<Br#RhD<0zrn&{#QlIK#$V{SFZ^q
zyf_XDtKOY%uc37)`&-*B_F{-Q;!%-^><7bp&7sGw3PG3*%$PlITKcMhQ0ic4eQf=;
z&RVUAiLk7!HWL<sdF(kq>V?7H0>YqR&S_eq)n{w<8wnuG<GxZOYcXKeiC@#nebpU;
zA`oSUxQ#YdB5;1NR6O$N-WS`1i-eC%I&+&8)k%lRDZaogp*L<29W}%B-9MRRf!mkr
z(82IX^Go{Zt_Xl3n0cSX_+c4hS#QeYR=YUf#fj2#V2RwRq*dN&$QO-ujJI5Zr~_TK
zuCaHaoYa)S)@RaG<kS@rHKd3Y0uS*R)VXt==z}^My4M@2*ylTk#S=HnDh{5{Iid~6
z888^fZgA~;y}6D2f;Ehqd(&XGfR7eEI5%HI@Y`&<o?BSc3*BwqKti(b6o&OiDRUWD
zU8${WRJPAp@-+m?5Xn1ggc*$BaARuke#H^5nP3w}#F5Y{$6D-@O&J^Ic2>#w$x-sC
z%c~v*G%fFlLs?bxnw5l17YB|HnK@@aEazT`#Ki%Tn9kkbDOMukX{FRlr1V7ok%nv}
z7rNnB5=0(bS9sNgkd??uYA_hI`5LET^kVZe)-b{73~f@Bb0Ybt_52BMn-FgN2r$fB
zzom>t2?3C(hG+iN3KyAf&g?uRstM3?*!39K2teG_7QcYqVE5<4*z{ypY2Me6+AzHj
z&#QOXK_b^KPZ%;p6&8kpfF8D09tOZ@<K<_ZJsIVR|JN#n{>jt%Y^D2YUPAT#HQIXC
z%CAC<0xJAJCUd(3S3l?c@gRP96Zb!V{tn!EK8F#5zQ?_%ov%q{nKNgLF~C%%J`m(w
zhK1Y2A+e4bXOPdc<9%uSyA%=Q^!PvcYn^s=5%t_LW|*ID5EAuM1CU7=z$$NZXYC;8
zBY4QOEaB8Zx+4M9eO#K4Bb<G~_hWi2dE6>)e}=SG-R0R*?`nMLOJ8|i%lHm_IF_z2
z-LYQ{ig}5{<Z?Tj>GHk)L^7~{15X>3Q}1#+ju%nYwfca;yvZwAp*I~DCMEPkvB=$o
zF((C#c^p3PHH&7;7BhP(^IemJb7{Gz^LcAEIDjfFHU%|`9_Go6iwub;^hiL7Xoiyy
z>V+ZJ*_!K14?|cX1mc`zS?sC!s?FX^1@AS7Gh0B#{ac-vyk|*FpkYU+U8cuI(A)+9
z3J5B|fT)lVH%U+#B9aKQNWj^hrnCgZ3d?fRTu*v#(D@raMIqEXILvJ0^fb}bW2=id
zI=i~*qk1~^ladr7k&6&XCgT<okdX#KBC&!H1}p%jDX5|x@BffpK|~CKtGo5SZ`^D7
z!tE>blM6W=^=OF!y(mO6A&rP&WMKnn70x<uBMi_r_f+3}je8$qmuBn>n{K{c1$(FI
zY-PE86;y(#8fac0QI1*GaCjb`w-88pKR)M*GrSfv`;h|{8YUt_nLRAUqk9xLl+P*)
zP||6GDFX~Ry#8Asr;P0M7+(h^vBR%Y?8$Af8sDASsjGZuKp+Sjam4;)WeO<)VL2-h
z<T@QA(e*tkSAP0(V5q^1I!e!jn66XYd>UvxCoXz4rxc>27p9bPR7>CoH}-bdo*x6*
z?3pIeK!PyToy2YbE+-gF_w@%N8Uw7epnT7Nmps`;cR9?mK3=V*!&5H0=`jrp2-e~X
z6;g={4qTbujlORKQiN-8zHK>gXW01s&HfD<n~@EM3=NEmqG*G!yKmtq4l1M9Y$GQP
zJqQO4cfX1(V;rC=kRzDKFm#{@9PMqhuA|tp=T+Cf;Yi)epANZ+HlcXV$g<Yb+{9ad
z$UQ7BiWsokV2I)8KZ^=7s;k4G{^p9Fn1#i{QW8W(g;azuJesVJO}v}J=~SM=F#0T2
zildOlX!7|rk6yXXYE*q=J_;!_R*U5pJLpjl6ja0VuV)#OsWcOTI8SK9?9EWcb-ty{
zTmEHzA3TgIr@kgvrVE-BBENr&R?R*0%X@Ub#5ERn?9M3Fo`a#6-&Lsw{P#-K#*E}U
z6Fpy%awfzQVMGDPGRZ;?V|~S$c`F_bC|;vGCJf-ucDF+d7OgGBHOOk~3Ov?MaT40=
z|CW_0)&%+w6KN1DQ7Yd{UID1{z#0e&dIT4I`OyA`ZTiuVC>p}3V$~#vs37GJF;z$C
z8wWR(m3u>}$G^bKQJUSPqz}ZQot3rM7m)9+;&AD)KLan7bxli_xn#i~<eUshm;+k%
z{wkp9cfNks)2+7H&vZ>$@=y+-3{OHg^I4~n52HM~Ew)jt;;_5c^}Vf+1D7N?K``BV
zQJKslgYdB;*@?=Ql}216l#nUXzDP`1)-t^~{+Ir$ENV**<JjgG*2@n*#P7?3Gm~4=
z>bd+;r84A$MBM2ZXM|sQ$KB`ly51HX3xSu3r9=Ys%=s+-_Pj=|XWKNjngjJ(M1JPX
zti@%apBkELdddn_1@kQhY_coba=%@ndgf8r;f*2%zArTo-2kHzm)dRJqxILybm3vV
z827qwA!dwSUY8Ae@LxWmry#LH84g*2`tV<G835Y_{)qWq!?f=TyR_}^XZ;afFeFo}
z10%~)=LXZpK@WWs$prUNQ$R%?wkXpC-;UK-k=n6z*gHtc!>;yt5-#Kar~>^3-W3w_
z6S6)hpZ)#2E$`kO_@?}|%=6U+k7cBeV*p0rV>(F%>X{%I!Uk40+t019SBIyLK7)^m
zngTN+4;v0ENgio{f0Ib>nl-U=@_G&QEyfF<U|RTEA?c4#LZvIv@%nJyYTIz2Es#O_
z?E=4hSgnQ@Sz%@lo_g^I449txO`D^7Vb05&w-VbseA32#JR@Qw4|&0k$IA5exjl0?
z**5Rmiv^pK%BWVXj|2DpdeHUlb4SnA`2dq`-N)nT^<0am{5#Av8#=&qSOpB&G))4&
z3XTn?rD+@?t%#+gtUVDB({0M4TTY6+#3B?w)ITzM4M3%7DP7H;yK{(lm7M>D(aa(%
z<TQ4Ssx#JyT4ujr?RXjM)0)-Tn4zOtGtguP>3{(HOcv3(2Ja4iigXQL*X6S-IXFT;
zS)Q=}#A>`*ak)uDdC^7xOhMp_B!DtViP=Q&$f3Ol)5f5u{2;u@Dequ+kvenUclp^l
zJ+EE8*YrA{LoiO3jO=^(pS?Kw6ntoUZ;4OHf*qVbgjYEGh$h|*%XW6^@Y&93*4e?+
zF-j6OD;Q=w+#KGDfOo?S7;c&t1_4X%wywAw8E7tlzxn;F(OS3c5xB&H8Ue5b6gFIg
zmI`0MUH5Ma1{dkTlDkGW+>C=<Ig)8WX`C)JB)0$_;OHma9X&1V*u_(y(DgkN2MGcY
zh(Zt~dGfj4@2JpROoK+j(H?m5GQO?qM5kjQAjBVZ^#_R-A)@sjEEwcq0gMGh`&S(T
z1vD^KnS6r;GCK&Hh-(7@#(UmO?!yW2)ZzH^Da8e*K}oQ&zLa&|jDRj|SnfxKlpM$y
z@BX5OIf~xj#|Tj~Cs7pY>)$4ngJI;p1$c1T#GH*gWNR!Y>?@Aa1kwLys(u1;e0W$n
z(6bfYPBeL08W<JU!EvZp0W2^+rZ!b3!*C@|Q9NoAh*TZbPr!9~j|*-xtK-_oTRz(i
zXjP2$@jm0)@itHBJcy(Xj8-yToSm;<qyKA%_2;^C-_)z4Q<x#_AmV%vbKl0#S2a~k
ze%qf9yU~FBU-6bOpT!a&7^kqRVoG`sJ$~xGhu*D>-(TFv>auPd#y26;+)65Eba@@c
zMz7xTqQMhziRKVhU>MChW<Qi{9tWkc=+)ST@k#X&6v=C9w)2cp`sm>VBXNbd?mFE_
zJzOAODTw2$u2J%!?i5G?z;!c|y}o6q!3YS5i<rcJA7k^y1Tj1Pbr1C;^Xe9waY9kt
zPn+aUkIK}Gzn_`&cq_E`fQN#{G@^-asJbP$Ui3ewJJwRIU}6cz_ok~p7?446($yS4
z&#ewYD7aYrx?_hqV-PHAr7x81E-J-xlt)Er16XE=X-<6IYsFeoUT;~T1RYs23dexp
zWeuLg)=!;MjN3O)!+ljoA29~xfYvB$8%T-(f~~>!lz#OFW1afoqrcb29vmX{vx4jG
z9bgtN+V;CML94z6Neb_8s0>Vy#x^ANxVtBJ%g25z%h=G%_>ryW@>?{z=n#e{rqG21
z48QMM@v^+oPM?8&3`o4{@^`c}x;qT0YVrK|qInH{14jnAnB)P}-SoKME%Ls64Bg5o
zaiEUM2oMaT<4l7{l~Z+or7K)>DF*OrjMKM0o<6fO+;LUm=jqQJG)EcJoG}H;a7<ui
zK<py0l4pL0TX>|N1PQ`oZ)w_nMLn@MP7tdYhUKL4<Lz~uzo$YpKJ)yv<9$;HBoA=1
z?c+}$sbS;Mtb(xtWEEhbDIzn>8a<vlh$I$j?ynhvE5Q=McaiH~XVok-@XGf;H=SEB
zEJO}tV||h40hrewR#wvDHw-cCMU$+o0YRCW9yUc>_|1X`BOpjX2e~NZCV+GIu@C*K
zmR?{N?aq6MPbHuXwE1n%@MDM^z3lX8hIv%Wsw?<0erEN2c?c+gnj~_~IZw{zsXT~0
z_BJEx>1k7cwuq%5o0C#g3<Mv}I%_cvK!SK2SZ_H)OmHDpr>{4r@xb@^apGHYR+~3B
z^nX#mfiJTceOv6>8Qi=$^-b!o7hy-RJlLrhGWf;%xslt}Ud;05dPNZ%*QWK>V}CnX
zatz#`ms8Iz+00KZaeIT)7u1UAi{xo3S2S_7Y&%Pu(dy<Ktp+Vonu^97@84jDm~6Q2
zeiY(%&dW_zw(D}X*_owhy31!ONu1pFF=qP1DGfNp9MuN*rEty7)^q!wzP^0++_>Y1
z><^YN^U|U}$NmTB(aLF1q)?&udYdfduo72HBw9ld-Pc7IRuDs^*0pJ(nnPO~I9-c_
zY|#G`Hc#cJ$^Kr!yD4Jw6-CHVmX?Q3RS?dc#E6R%2F%-hEosO}_b`76vsSy=-^KW<
z=;u8C1RN~DApbu$i#r5A*#9@pGy=%1+&1hfnxb}7&vzJTh|R6sDLk*@;wex>qM;!p
zD7s&<(;k&m^2}#(*WUEHvGC=m&-9<`udtPHbX)RHmm$U>0`T+ptJ!Br?8kNPxzFqD
zwVgRypUvt&xvj-uAt7!}TD*KrT^bg&l(FFzSiR7?n-K&dV0S5`J^7~Pby6{~TjIvL
z{3`Uth79A~uLd=HVS@&C{dh|2;a18HOh%I(|8L)5*U078&r15MPymRWKuTUj?9*Nr
z$FX%nM2r?2U<rK37<6BnhL(FoOGq<`?y+FYkLc*>a2Oh3FIDGw)7RgMZA_D51O&0P
z%~*jkB@!r+boV5X!Bvq)dHv&;d%t{i<Bp#fot2=8#%?47jXdL1Gm*xzNLDgut*>xH
z&Uk*^tMlt30rie7j8hz=A|W?x_5eGNgVmP+$tq;U1sY&5R_VQ^5F;}YhA{A|Xws}m
z6xjxq$Rg*ne$GP`xm~yzT3)`6eOm4I&JT&ARTv(TYZIX4mC8%c-EsLGj@j?rbOUlI
zo|c9#n}9egy%*>6c<_o~J5!Ei`riMf<pM=Wz?>vFWF{d2imD_@uoce}TecJ)k3wx(
zMA=Yausm*dF1U@CP#RzvkTWdx%BDApQVy>)U_}667zS2hROzOVfdH0REocPOE|V`D
zK9n?!!XHcU*Y9A+BD{R1>iiV=bc#qoC+#_{0FFom{;T4_O>FzshKX8wtRBL*Xw1l;
z`kvOmx5z!%c*F}>MrJG+-WTrSck3c-2IxYYNCMZl{Pr_g27cnF(9hdnQJ(M2_||)m
zNa8*G+V-JwTWR^2TcM6fh6|Os650c+vpkQ#VK!?e7)Ztl!a)XYd!K7Sa!6wXLKYiR
z##RgR0Vl-zk8^|#Lpb1!{>ygIcE$)G0tf`GTaZLGX7^L`L5CRwC!xLT105n{YIKp0
z&9__<U5=h{$Osn~$1&tEA@w);F7NF2qPs>Jg%P$%yOV_0@^F)3gaDt)q$bKD95qCY
zRRmE5P)-`wPEZC+A|RtN2viY^1qQmwc%f1(`qbIZcBHnVprW|eV-_@{7AzHYmoW^;
zY0?m=Y6`Z(REsATP-NAv&19TBb0BT7Xyv`gD2(70H^t1_a@%3!Zdp-)zzWBxY9o#8
zzs0~3RtwL)Zk}I|xlW9CscVOfZ*GT@lB3O<aw1m<#xaJ`BnU&DfpK8~CXiclm9c*Y
zrU~;~X$WFen<g^wMO@3qUU^)h)VPk8M?xT%47tXuiIO<AI8pJ&0#0Vg1C)90BRe>=
z-0|UX_>o;lUkqP?>UexGE<MkHyav3lOhagxF7Ty69cypKO>H(8XC^tLtMRi#f_y=l
z^u;=qvN*EzbL95g<N6-pOaJ6hRTJB@<87}summjFF@Ei&cca<SR+S-=p%;nfel41P
z--e+TB~y5J_?p7nCKKD15WGv_3t5=kEb8jnIHL#2b|f|RWb)smy6ZB$MD6t1CVOsf
z3cm*V(D#sM;vgz$LB?PX&$iDy*P<Z6#_VWG0^%vAXd|7z`OQl2-6Fn*xd_#-H(#U4
zlNOg-D$gIFd<O=$t!ycPz>sKYT1ks>poRbhu!l|}g$e=banHV|-Sc|2DJnE-WVR9K
zKuRF958gS2H-=f?Q*QedL_H}xuN2<o-A@k?0s3(i+s>FZS}qqY`<)jv>-bh5`nhWw
zlu{h01{MI|gqHHW+SFA|q%n$)7}@GbA#v`41)ikZ%KS*VgJ+AyTt6>$%I|^haXN)a
zpbwh^TiTr9y&ipk?r%^kx9YZk2*6QC2LOlxlBztwm<G@ztLZoOppaFEqhj8$KeOom
zk1txd4a~DF%=>|)ALeVLVM|RCdBga-ojw&qAG5*s*=gEzR^AK^jF#-u*+6{~tuSOV
zK9GFnAGcW}zOii3EVjm82juyd>;PavBnpJg^O-rBU<4f0JOT->Wz;!(&AKZUKx(uX
z(gWD8f&j0=uKJ6P(Jg7U5AfQ#pr85I%w16`up9a8CSe<Ft4I(`I7W9J<seiP%phrs
z5)ZssCC|LC^v1@nab7LXbU@P)K<Yq4eqLT7Y<1bRP}>3PQxDnBVMdc!hN=aZpv7mX
z2nEzPc3qe?D%uck@v^zNs}~Crhe%){Ykeuwkg>tYI<C-I^?vu!<S7?-w(SkQ25md;
zu;xeu%T6<X6?p!z5C$^wAO~kaji$Ba*J0`Qwo;R-gb95a(5O73RCcvBw#KFkj??db
z>qRTCRuD-hCCez%L^PcQS^Ko0av}rDgZ`*s#6m<#5SOF%XV$ox`KlM*<w^FjJ-2sU
z-Tq)%4pziVL9}E~gAg%+_E?1~YUos&A?4r*Xz2K!#^anEm<16{)q;oXllxz#L!}9_
zDv}6+_t6w;AgBEOzn8J%;rCV_(&~1$AEk*>2Z!jozjOQDr_uL*f6Z|{mj6q({;bI_
zX!J36sA(IyAO_lT+>%Jar}Z|W>nQdiF(eJxLV6A|6B!DmJ!|W2nJ6)jx<ZA+tS4<k
zkBt1sTiJFPhSy)%+dV;W@O)ma%k&A^@pU^{Gh6*Wyl)%dpWwg1VN=xFse&>p1c*o^
zfgq%u`X2MgQ^VeTYky-S!?E!^*U0=sL;3CdHQXWf`d_bPHGI#92;G4eIAt(283I<P
zj;H`BlM^O+f&)gSPCmoZ^yc1!`Frx7ugbWc0x|-{2nr$+0ILSxXnWT}i#=wl!M;Ut
z&81*VXq;2V(&hG7O(^|5^Oe%MO_siDUjD1moS0YSdk{ns1K4^_UY%vWcgyP*$-P|Z
zi}d;agULs3{BI6B7nKi8fHkz>TMy4~4T{iu+*#1tY}@DfGLYH?Q{}V)VIn-OfPcjQ
z8{SfCL_?%XAfaMNB#yu!i6`dnrAaxU!R5L{d%h!Ii_xz+&p)Bk?VkKi#C?WBhytvH
z6=5WTfT6=ADzFwn*(x<WPCo_r?#Oa%RU1pRpaWGMyYcwoy8Tfkq9py<Af`uC%Sc=z
z1b78ja~c*Z=KFM~89EfhU0OpFx(%xO!6x1?*pvFrlBPr~8kyaVY<8xRgHs=8R4`Ql
zfh>Kl8#|wo{1R`t@!0Nkog#`DA{!2Q?x%}pdYRvYe;dcPY(S_VkMCcBfx1k~ZerIM
zVqCxH{>=x;kcfA4GAxn-@?dC-mQ*@4dE9SROU{k_8ZW=UU<0kaCXAXuP8c_WE#jZY
zH=vJuIdi2RWEb<`rf>uC;O?wfRR3WCDgfGFio_^jjdp~!4wrd5zN^Uer7m}~k!5F<
z9M65m>-Fk0J$+F%)|l<^>pUeRP)`HR(2AZm2$~>?<H9WXkRY>bgIY|$l)biWw4i5&
zm(R*bEM$TQtopzGe@(&cdw!p1bPv{u>5J%~4_EYPIaAMh{UUZ+CvA#;e9kJN`q0K6
zXRM&#-YLIUpB<GL!wwoVike6!KQe(@fXG@k6d3{EfXb-_CNQjpNFIQPs+h^I_$j_?
z<LC}-p1Kp$V)S~vyL3(&35tq|&8aL>HH1b%7uTef1NHwZ$YbWPF8;n4`2D(fF-Nu_
z<pecP8^21w)$VCcS^bG=2SjfP6g%iHaQ%3<@98=`RNf|XK<L4Ge8US)RaO}Mi2oG(
z_L2R`^O(!$X#?thXX$|Q5PxJc__FNoqdVl7r!O?eT~$uvPKCk@%3N<;r{d{4pF_WY
z^fq8_6PE313?31I5Fr)}6YYwEQ`kuYe&IarzYotT%~NSUfGy_PqN@9Crd~8dPJPwq
zp%LKwSLX-agy?fm^>!*6hx)0{Oq3@SI!(d=GS~x8Q$sqbRW?gRSa;V#rIsLSY3Y1o
zCW$-kzJNktKp(9x=ulbS0Nx5fcP~1jwn&Qe0K;B8Rp0jExgk24NDpm%VO21g6AOnm
zs7VTFlA4Ya$Xgz(l4Vyh11=jWcp@CQG5`+KW|IQIn=j#Uc;YN9-kG4eajT@Ps;W8i
z|E*6bvp#Vx13+n{3gSpA>f+CvW<eoO#!vtw55L8;_`lbAL!H@Z`oDXa;CfR?z*HKI
zaw&TVDQH8T!OXuTk0O1a*00F+KHr^i?au37K%j~Gr1W7j`f41>aD%tirM)O%r7kZo
zo1PE$e_ko+yEBX;HdpO$Eo=AJYc^V&1K4$0e`ZyOr%(m(sXgd9&~qH-A~}dwDwr7N
zBC!)P(4qoAz3TJNN|65pIb`40_r`ijhQ4YOq(DJb;G%UG0Z*B49{djer<z``WlWKR
zY<^P;@u3S4#B;6jkbT=QG-orB8RU*bYKr|sbbnV=EzSS5{R(_`Jki<L&FuCELmv|l
z^4g70;XmS!#7NcnQx&UK3CC>z3b*gr8mQx_bd`Na|JD1E`tB)+RIk55$}K}3+Z=6R
zty0iJ(<MCCrgNyk#%pP?U5roK*eg1X8}#RA@lLrrLO51nea5B?v9!Y3Jh=kezfsLM
zA?G8}emE5(E;1EMz@!R(u|phGc;g+Ie+Y>GAxYSj491|@uVnDJwq(qIFFe_`o;j+o
zYS`NJ07(JlP|S>XDbi;UcHO*vH6{<qu?hmb$|^)QY+!&mT<0snjHe%Y9hzI;xO?0W
zle5ds1PA-a(gqofg{Bn$=Tzducqj^*7~Tx%Nfd@e-g31XLBIJPt<y+yE4=Ym?E1Jb
zF}s^Ji&t#i>(vJ;BRI9Ffp=eT1LNr%zndc1zqos$ghRsR`_t`QQ}6-+VVZi{RH8q#
zPTB<)%Pw>N$UC>L!h_hh0&KQ_-s0%rbFhn=yX`rYThwvC;ZKXF$=ub{dRyFt<8hM;
zNNpsW%*3Ijf?5MrqxKp{L%_?(F3V>UdYe^q*2aIb(#i_A#TtrpB+r!1WwNj_uru2T
z2HOl+VM`8IrFPW-Z;JLk244#|bjYA6D45Yg@z;P&+1BqEr1P2F!gEa|QD@0zL%hhQ
z>9=`1oZnQ$Q#Uur7;0Cy(ZTfa*P?Je&kJHd!spy~RT<#dwln&Q#yG)598Iks>y+SA
z1|AJI@1jM{F?pBBRKL3Ffwaw}9(j(|;ik0=Y!6kJep74A4<7{k%b#y8nG6H-(x7uQ
z(;hWuldY)Zda8|k__4C{D4f$w(F7aKHW?X{-2L8LM2uEv(=R9X>ec5n&Z{t)-Mof>
zfy2Ou>SkAGCrXbB0H-nw#StU~YBd0?Rw9Wt_4O4BN$V`7O3v2N`On<m%bu<aOr@t7
zlH#Z$7TF6KRv%(wcDl}wR-jL^oz3VT!Y5x8kV=T}!2D>Y<m;da`qdST#5KD;D0VmL
zqoeh+V*x45Zx(xA(?=v^fH=TRZC=m$QM`x%q_=NNlW%u#BQ52?XJH^Qcr>cD3!1oN
zb$xm><;X)!RF-S~UfP6j5PDQmAV^`J%{;sPYHKVF4-b_=;Taw<na{KW_EQKTx8M2r
znVJQdmSQ?419CO(&tEDN^Dd5iwy10z)E8jm+NJ6#=~?xc^undcpI49wdj9ERItSkO
z(ufy-84K-B!NEREyB!{$AGMMKQbi&&$Bx!>n1xZ27!b>b4sDeQVT~Hb+bbIJUW}ba
z)D9Jz6kQ6_{tZ{>TvAL8rl6vOHYcwjK;o2PcvcW)ie97N8XnXJ%)=*_CbZe2VSBqV
z5V8*;{spymol8I+J&xnfrTqELNQ`V|h(j1>eGNs20Su25c=)t67a(pF=a*zh1b62L
z!|!RnDYxmvw^K1mO$L#f${#D(U`e`#*H>fpt!vhtT*}qcQc*hXvcu~<<|D%=X{*%t
zy@RmO8^2~9Vi*jITz3;Mz|S&o+O5FkhRbs0s;SqILp8WneH}+4KKVB&UNd>#hf>*Y
zHx#3cbQm?~Si885!11K;YO3IVxaI_dM+Y;ivnwxtL0-JDJlSdk?+jnd^9`TBV+;=N
zQ`+;uflD&xIX~tXbgW|z(*Ob<#E=3LG9h7sV6BKQr5m^C$#d;OF{OKh)I0=Q9SAHr
zPdN{g!u%_ZzHw^qFozhQp+lKsU9=u_c$4=HPmVW1ryHWZLu}-jxFK6HRP`E-*%Gti
z^GL9SW3RIYW{82d7ltMdcFLUe`dzQfdOKz_YaVS-McDAi7Ij`XmE*@872WT^{p~2L
zuW{H1T|fZq*)A|#G=G?(FVw&=#+L)uKx$<G!Ybi&iY5dpUQ&kN$IS+yf(RzT4dG0o
zU_yJxFf>A#J2pi|LuM3M&AIJ0H5kEQL_j9=psOOnY?Bw9+2z&12N>Z6e6#=srtn8N
z9i&az`^kCq@}a9hbZ33vc&E6Z@WMwL&gx)gswNQwt0@qV58dtM^_hO`QUMCdPM&>D
zogcb4)@q_l#|^_qd#4PgNSd~Lz1sW>LYuT51<^~5Xu(3GRRP{SGG14o1*_85w^RMJ
zDd24R7>iFpdJlIksx~xd;zC5C=8}YC+odQQ{~|HG=HG894MSQ4ek(g{D^gTAlf@$>
z6mkb3Z_GW}z$iX$kbF4m7;gn5ufj}4WrNXbHC_wx?EOgm^fqd(J$~wVhCUWe&qZN-
zM&k~M+=XA20uPLdga^irpcp_Tel$=j1M%S06Wc?xfT#Y%fEq#o|BpZom}3Q51tIX6
zJ747>33w^Vh>b;L4ROxZ`A`AMH@yMhL_5f)P(tw;16Q-&(Q!V69AT6{s{z#nafXjq
z@;|Zu+y}dfxex6}WEMm;L3RDHes#e2jxh5?P!5KF_DE<*t0KTz5AxDU(2(!Chz9LK
zC}{$+2Z1XT@KTmULZZJUg`zLI^Yp9H%7D=jDk5%zfQ*2!w!$otVTs8JpThsYOxhnO
z=T>o0!YNP+=g_u@mXa*z(gv6l^zS86uABWo8|8DmS3DjEyYYPkYvA@(a#8hg;DR9a
zl!~zLZ^3QOok~DC1cRHM2p`eusL*Kdi1eJ={^Q$H-`2Tfs!&xoR=P|+B$)kYS=n$C
z;ndip(Ei6TGtvgrm)qw2Xdg)`M)sy2?0|q!%CL=_%beJ~cVYK-n=C)AciiWufynyx
z)gSZscb{G#UA<~hcg*7@2|R){f|f%Vapt^_YfnvlFYxzJx;0n>13}N?^mM+bkzoPS
znPD7P9B8$y=6=Re$m?MC38MeGCQx4ek%kbp#)>i46{DD|`RgigpoBvD3f#R3hab5z
z&|&^nRR`Ri{-ydmZV=m~w)}NW`K|8SJk5Q6k5m@@%+?*vdHLW_Xl;-~WEwGW=&oYB
zyV?80T=%kz(HtPA61Y+TwkklBuqz~($OwgGtqRG82L8|HbN$zXo)oJ7dtBy7hc9vA
ze#@8tECUaZ?!-~*gg_Cfh#7Tm8}ASOTUba@lrmf1c=+<Z>MqN2SVb(dMb#IsU;ZyR
zrWBGi;*L_}98wl!yYj6k#An4yRE7KqO$B66N=bVqG`FQtQi;;7At=5=cuxwby<(nS
zfjCsfw3>QN!>Fk#1TKp1ro**OnG`eZ3-rBiB5BGAK`SCygp!~_0ZNS`;l&@3$@Ps@
zDr)AQuZ({AW7`yB4*^+~n5m~`w!h_C$fA-Qnt?V_sJg5@MGDFk_D|6ss(l;?NvyGj
zPjzcq8oK2ai%)iijc2t&IuQzNt7Jr$#e)#2oV&T;#*I-K2%9eI(Te$X@o8<OMyk4P
zw%oU}a-P)S2&D^oJc<P^rthHK=r7gk|04|xI%teqDp7?8sKp4!01*0jEl)oQ0bt1=
zAE%_O3~<_9D=3S($f>2P7_~o2y2|1!=+WJ`nB%t46GCIQ6l{xo$<w9PNRv+SdS`5i
zKZF+}5IizKBp?YS_+P@!A+4>I7aW9uGC~PM01P8!C{Dx)>$^#4K-nY_+p6dEn0R?=
z{I(Z&lg7Bp<|R+!dZ>|y3<!h-Lq^22y=`*9hhGgO(=|z`NscMr*H~5v(&jE7wSP%h
zl)HK#t94;(ZwaiXJ#F>cvE#;%m9w?Mqq(HTjY5)iq|Tg^LZ)vSQ{$fq@DGf9bCA4_
z(Xb3eDV~Vbbmd4R)<h5C6?95l<K*g+5rtuiM-vXJZI(mXHkMg8V#Q6c5e+QBff5j7
zfI!g!^4~pO{+pi?Ks=O&%UZ%1vg575iVjXpjO5$Hixh0v*Xne+)FL4L{fciih?~XM
z;@xQgO)FB~Q#E;QAm%wjrq<TeKqoX9cF$RQt|B0SoM6Cm104O$wmTnXck|}xKCG|v
z8Q*I&Ii=aknH+)i9s=THMx<a<ascjLO=<J9!;U2*24oQ!?#fHSb5w$<W~uUtQzE+G
zQTqR-j#kH6<NDtAfA{cw9v;K`|Ihx=W`Ey{_J3!bz8sH}+~?caby?20%!tJPS5N&v
zFSN`Gj~WCI2j}HnSMT^;@7?e<-Ve?2#p*a5_jR-OC$-XPn1QU-|7`a2#{cdwf8N@D
zeMgm|U+KzuJ|Euv-}~tQ@0aiUKDX8VKl@|(_!)nfLs6FQ`|VVm&w1B;KNrP<N%sfZ
zBVrw*6s&;N!kAk0NTa4{QllxN<S{X_AB>eGP?=={6k!C>DIixOh`}Qx6s$~?#PReN
zmd2Ogd`Uf=bNhdRX64N_O=;6(PO3~`6`Kr^+FCSr!jDcFnzC;fb2Y2JU@X})C}pH@
zN))ATj4`^)ciW9!jt(N}Du(pOOp{yK8r70YBs3sxxpvirl+}g^V>m)Wam3ps(<OJ_
z>r_Q63LqQ;wMaV&h5^<5MEkc3&ocq~-*4zWH97vD$oxO>c>XSNgY~TbLA(1LpUC-_
zZ-r{A2b_UYrAZIk<$}yYu>OCkLLY7YqL_iWf`-<DpT`;fmP}3AP+jk5xz)q_tpA_b
zv$t<ck8s1GAu$R2lqUiM?rbQB_n9J*NTlD)v%tv@5^rcx2mAZyQ}f@f-t+4E-^<V)
z<n3n&e%XXIiHQF#<OetLwYk1N_y4|GXEk0NakS2Lw$6Ey<o`2iQCk&*QyZWhcFN@b
z$MW9p&>$JYGv|&Z!J&3sFXk?o{2t<_{m)-3ra&MC+XG4w5CCP(uOv~TIz%IhS^j$d
zbJ+F%7%+ZcAy<H6vfD#vV=w4ilFld9KaWy~pw6MC4Zp6@!)Ck0*THya#<V@^PZK^X
z(ukA(1Rz!m76u_d*<=hzD$n*fxX3)|PwI41;8amMRie+mNm3lpKT@19)MP|c@sK(Y
z5B&50WsjXYvU$#Y-1-<AU~7W!LZW}~0=v$~>R;GT<$~gV8}s`#Vnh)1=Uo8nX3wP0
zL5J9|<Rbl(A&ZGvQ;Lox{cYwd3%27}iS0wL^Zk`T0N$`hlM>WgUe-Xs=*7tMJv@b4
z5ZXc9FjRk&`mNSc&_p8*k-JQz)AW6;*vr{(7BRJd+}3GDu_<}ssFeVG1{jkV0y247
zFOHRg(`uql<k^NkfS#lF&(3_PZpi#=AXt<AZo46hqX1BXli0LeVJiS3@gpEqhl<#z
zg@s5ctJO+HL|800Lb5D}c?<n3G|${8s*v4==%5M*LVFC8x2C7DVB7REv+810SrE?>
zn+V|ohD%Qw+#gzST{{voga<Rm!|J{-Q*ZENd!h$E*wR7Upu;=-ryzd|gd*#M{uYYe
zFICVTTC40L`roGtS>f;_>c0V=`||uh)uFV~yRyL2C4ks^KEh0Y)_dRY8z1j@U(!`a
zvugrdfW%*juI^51S5B#W<q&{@)gG*{3#BdQm}&GS1-oNmr1$*vXnj+u?sS=T7rJY7
z%G}%|_MJWF>$ua=J;U>PP{vQ|r`ZS}rvLkQczW~UIn(x~*Oz6;yAVBT`Vt5)qG%8x
zL4sxfZtK9x_aB+v@6qV=Jp9#iUlca~d{hd|riVtK0SKLKzMGa)^FB;Y3={pF&p#z!
z`Pf*|_VWV$CQ+UOVn0sUgxw+Zj6UH%=>7fwbvqurU~<3qu&?D>2AR~B(Cits($B2_
zmsYg`MwMn8(9QctzG9{UCM1?C1+TD(tFyG{*ew*sFH>C`Z%O-D+_82D^KUEb27T^N
zP4wx)-h57X<lmCiY_R;zEO?eRSprxNST!W?V9$IiU?SzCEYwyq5m*BT3#;8}f1BuW
ztiVi=DvofHm@s8d49oWJ+JZ1Fkd*eY7NWSwG|U}H_SsqVkJ!C%)jK`ak|;yKBE0s`
zP3UyOFvy6Ld8&Dh0B=V}RdgOKX^y1TAW80I)({^_$VJnB>ZDntN<n+4W=Jf1E*Kmw
z+!GjLSI+z>z2afnyf6D=fUe#yS~IO^bZt*Zi|bP9Kf-)0J~P0b9280&tTfo5!&W&L
znen~uo6@MTw7srOIQE=WMk*N85OIha@xx(?HxZCQV&kYV-hfnN|8LFr8=uZ>#Li<2
z+IYxwXJZg)K#Qk7ZF=~cEjXpR_nce#wv=YWDE|h4cpy^*1Y5#D8r@iyfcVi|G$SP-
zKr^q+|CF^BaHPcY-gveUpUcAl5DUTpFC|85I=52;0&Mb>0$<&Lx??mLRcackNInc*
zuHf4J_%<}-Rhl=)zuAj;Z&UiNI_K45%^(oaEe#x<jpU@ZX$fk0rvg@r;GKugbFso(
zR}9m|3AE*G43*aui>9OnMjqG;_(xoQaXSQXB7&5^yHkeQ^0nl&zX`b$gA)xWV<>QK
zHElQdW*f4S6Y#zk-V^#Vaw(hGak!cPrcALp*=oCTASXI%G~@{Vl>EcsGOj`}fYQ_t
zCn^*9_`+$>AfSxKRsupUG(bON$L_4i>b9lEobF&@S<vKJ8Q~*dn6+Fh*t~`u&R1zW
zt*S;X6@`uxE@C?t7?_PWe7DuSbI@#@{C=yD=}EAndt<tCXosQTs3h6!Lu3Qvq&Q~C
zamUzUD<?;<o9Z4DF6dgqhjj=zT=lqUmH6RrXh3e5ZuxOzG^dx6l&-7g_VyNSvt^`9
z05dUoEe5vxJzh67sYVrJ(dJ|mO}@Y0clIP4D|!sTz!<Qijd$Y37hSfw?*yH`lf}90
zGab(2hPML2?+qC26sMjqv?#XRG&>+$r;3mbHmErS6&W-`WD$0NU~Qo*G~(!PJF1@(
z`~Hm259-`*L2v_&098P$zuFwsZ@S*)2p-0d`gmIE-kDWA4lcLdFa5gzybi;`yxDN=
ztYd`?SjE<C<Dh<G7{y!XfA{aV`ujTd^>BXv;U?8)yxJ_?`aH{7eG3pad!H`<uK2n;
zn$D}TiPnE_^9Q_;Yzlg`Sr$QvRS*LBsTabSu;%klG~71X4iUdd*$hMgD#*sPBbA+}
z`zH^R!}WB*{V|C-*^c3nu{G4H4b81=*{9*zYYTpSdQIRR()QbOAN=3l#C1vAXLLqv
zWANvl|Hf85vy?5`&xk(Z39oMT9z}ZlV|}Z2_%0>C-}W6tG|e{r<YW9K3;HZL(TK~J
zIC@5^F3fcW)+4>RI^mNJ`}512>QKa;+I^ibvgBajTl?tWMmYNptcWUdKBuy<Se{Vv
zw7tATaU_aaiG*$OK0S;em=RoH8=V?MIDRY-ar`t1^&*;dY%SI6cKl!Jb>8pfcm|Fb
zgA@KNSZwQ$HICG}E@Ue(oHrry+&{o#-?WXNQwynJy3PbWjh=<6(*$I3f#Ads;)&nH
z$9uf*`jGu2==q;(`zI>gAhR@a7><e{C5Za$-ZGAk9-}8b62TH}$J*|owU)894Boq1
zZ5dhYG(zEZk=A;zv)1^v>3pAir_Uah{*zp>%z0mn|6T8%#f<D8!(3*gc0e0bGMeCa
zk_&!xF`+5~dH6PuZv^@=OHVlysUOvfYlxT;Um4$0+6|!~7l8bj1>)_7^g;BH4cRl?
zvNnSJ+f$q$p#-NI8qiP`ToyxwoP>L;2uZ{vDfY5IwV)PRQ}ZCQCeif`xsN!2He|^*
z0*8h}FfLWt#b4m%kQ{$y`V;>j`mRr-Jo-HcRT`dvA{&2^5>1QER<3Ar#E6is9n{1E
zcmzP9+T2_HP!%%NVD{`8c7pSBZP4_)9}CUfXl!!7{fG27Bt90^sO)?-4Y(r;()wQ?
zL`@fJLlp)Xs2Vf?V;`2Lo2k<KpP_Hw`<wD6lX>IhbSibeSGoMt<&@Y*{DRWtvl?%o
z4PdCgG1w{A%#Fv{<8zN%O8@X8X9V|NWXgM%vkdHMN-i5fRkuR0K?rD4JXusxe@ktl
z^`06Nb8(bNQvZ$hXZN@Df31}{?g(XV(t+IJt&~daKt?f!CppyM>g3SUHo=G6-aK$m
z1Squ&LnBC0v=E?*uPPf?G-7d%C!%78Gu+|Lwx~)U5IO!NM;#_-6{{r<XGRwI^SMJo
zn&Em`rXx>AZE8{I((t)JyiA(FrkLo^(m{&>AgT)HjQ9!pA9vN9JV4<hF;OY-wJ+dX
z15h^JYg~2rekXO{wGV`cB!U+sg8-VI2?dEXHk-+{n#~7D%7Ks-G4zQ41)>TajdHf{
zLJ42Dv-KP3I%{;N`R;N3<1pgWM@5DNG-q}#jU60wAfi!`2{`*#N_U(jKeVc?qFZVs
zDEr}w^MCo&UkA0nHmXoV2^4!~Mvk_=_yde|ws>7nN8Y&(=$S-3^6QlnN(fQ#A_OF9
z>F<L$ig?^b|D`QkN=VTz{52SiRM9nsZfaTunG(E9jns3e5O|d19qjhLYX@%*t_)H{
zZq7n-{3wY39JiGEXQ;GWy4~w8A-kuCd|S~ZMR!F=OVJp`is+v5Yh5-F(JsQlW0DF1
z(~HVN;2VVZDmP+8c)RTzN1%+t{%x${l}5-u`d220d2jDxv5e5jiu5hERmjIj5W!%p
z2#&er%N}%>IK`$y+gKt=AVE$c_95G9N}xQ@MqNC)sCsTDDHxO}iHkC!#AOb+53ar)
z+xA;&U@eYy*Eo>3cO|EOnV9JH1S14zSJEDB-)z37X%J+iPLa2SHe;tXteJBlvWr<N
zROn)Az4yH68bH`j&Ef?%^<w5&hZLBZVWqLGnSMCLMDFP6T(Tz%YNt-(L<ld3hz9yQ
zMRa_=6ThInWJ~D?=Zb!bNJP07_2;BX9Wx>ANf!{$(K<BaYU0mK0f_NQ+bPqB8xX<{
zj*Gbj5i-h&lw$)+@DG_JPXHNH(lQ+SQi59ky0*e)M}z!NbFw=e9q)C{hdZkas^NWp
zj>Dd4WBY8^6m(u*p&b+!pIq2h-I0vtN!sKe`cS&rau!v7PQ3v-Qttx9Rx7saagabz
zL_;RBWX)SuQFPT+RhjN{V8{>F_qDpKv9Kk~%*DdR^Tn7&M+swyEFg%C54rDF-$}&!
zxlTFqG5+5(*x$tH`A0AFJfGat#m3M4dw%w!|4aAS-)k&sxNDfj<I)F6fv;`!JL$R9
zc_#u+wE6DCvV4C|oFHz?{|y7t<w!*|!2TnTrjz#nR8w?6)*05xj6Z11LlA<54&*sM
zmVwa8vo}<W?tSIPX`3PMb!M68G*8EfW*2KFW+fx^z90PN-ntIhxP^pe?CIJ*6JJ;R
zWpns5wscz0J_)7@;T6y@3qg?%R4Mz!KOvjE?STNRwI}Y9X^<UKPcb}s(}LyT(k<a=
z<!V#RK(v0fREl6upJPec#BOK{6mX<QCVd8Uj*$V(Mzm_@Bc7~lx-+Gaht`Lh;rZ_`
zefrjP`yOEjUUl7zSYjCCIqz#0HBzm%Hr$M`qxr;DQeSSw0UwT8K?%QPti2&2*dwm;
zf(5~}xyo=_aKk{c1ea?w8IK886*Y@2g9Ilmo*nBS{Hn{5hGRNL%|4}5#igs}-A+ac
zv$>ZIHUt<M|6_mudjAVS?(;OV{*QC)p$}buJ}kWr;NWU(<kOL}0?0;nGQ{Es1#(B#
zd8f^*ifaK;QCiPw|2z(pMbtaj)NTv9#+~|c{eCA+{wt#46sWXjF|Uk)JGlvxY`TXr
zWh@?P`?AAyRU!1KJykKdln#{;U-FOTJW>CpEA5pa;UHd@>%)P!+f*G2Vnq;I3I%T%
zW0gxM*RU*6(rjkRWny&DyWO@asK_AUhG(MIcI<6AU2HRA)Z0)NgDZ`pgiwn+>^5XD
z=9B{&2~aoOXqB?D1<Fw<YD7H_eg8V&8gCQ&$Oi+n|17@6lW;hK5-@@Kl14%w=pVW}
zbhb+qNGXXg#pkD;GFUvML}iEws=E%q=u<H7L3R3+$)*;>sG3Mgs6-0_FIq5n6NGKH
z(ql+l5u>=w^Y%7kN`}B?(NT(9tru1rxj(;6s?`_)x4XkCMo##UvEGY@8^;0|j{XSc
zWUB_!gAf@6R7LBuj94Mkl!A*88NIS9u>>92D6{4=iYi4I=(FtEktg--Ir7X`!)17@
z(&ORd7CRd7>V2yXI%ieoIwq~K$cSo|Gf^pZfM+f87%s-bH!}*+V2C3biBZHyC6HuU
zl*+}Ci4jyTQ+&nKM(YV*TUcn^GiY_~D0KAD7YK$7C_^bJ%9Bm495m!DlEvzc8t^`L
ztQ+V)<nXi4Tn>NpX?t$2&uO=4ZIUsNhM<)rB1YPm4Y3WJQu7jgpN@E>_wajcRO4YV
z@aVXGWmQ!L0*MB3A_2^L<`s2yO<J|*N^}&X1eGy!wSy_7TU+FxC+)B7^vW^n{7zZw
zd~E-6koMRt|0rQD;walco$6c_{q=>~gKAZ!6)(vDGbb;*l3DjGCk#;)SWXZt6c6_D
zn1NLxP$>77f0KN#)p4()6G!Jd$|=oFYcYDfmxHIe-(SWU2j}>&2cu8{#~Fr}zGP)n
z%gM~VzwM({pE1iQZd=HZpwbOc9+Z5YwttgfgUaS+s5|ey>yPng?s~Z*AY_w6qLaIV
zEAWUUB4In(tJaxx_29p3bbkEf?fIR5xcki&M{z8I3iaSCuUFds4x9k#MOA#y9VUMd
zzAORSK}?{a`S^<XaFA756dd2-p8jn`_eVqEc3p2<k>GCV&H^3>iBAnspb1fb-vkf>
z7?6Pr%%1GsrA`FzBn3t!9f$sV3n~BY*7n0Msrw}fIi>}ope#WOo{WMBeMEAmCUm|x
zx%T&GnBShVR0wS){#3D;%B)boHPy%7MZ`^KKaQ%rf~wtD>S6e;vT=Lw==zwQHoM4c
zWq;h;rq|IKRBG#C3a_Wyvld`Qq!|DKnFBHis{#ua3l<6~5rUCOEC~`v+*KhoRF9eA
z*@fOb>9j~eNfJO069Ltpcg1K1%oKuzQD7*r7TN~VZB(xq($SwSbZcGFJ^nmezj-@m
zm-#Ik*4#^M6h;Dz76OVz1Yr@8Nfk(<!D7V$7z#xQvI`=R6j(uE3JV1yfH4#nNU#)8
z6=4)2tQJ8?vIv5#B7&(EKou2&gcd9!iz2{MDx)B=V-;9MkWdx~z=|lUD5}Oq1VRb`
z#Db6%QbA-G$e@TpNTg6$jDp1hU?`vpvPF_CM3GfU3lTkAEO|5lSSrYj0R_IrCi8zi
z2-=)D_t5S?EZ2e(e|dhGTh|^0Ifug`gg5W7I=s9JHQ<LV$Vz*rNmPBRzx8{M42jx&
zgvjCsN4}r5mLJ!9{53tZ%pp=D)}gu|4#O|PBz_~abob)(-aT`6rOQugizS%-qRa`7
zlaw&TO7WFgErsx@(QGEj&$PIOlq9fqh2`d&=X^knVf6Cs)x3NnWME-1;1T*B%z9y(
z$Y<`IwsFSdx||Rf3>;}9L1decjuziPHPvPNQo$y*_*jQK^#{UCG@KX_?Q=08c;m-P
zJF&Bj7|&VxwQbs*iW<~uH(>I#_CGYBNIEew=Q+iTY!RAG?iNDWlnEqgr%3C0fdR5W
zL#?<h3xs5VP<ehdJr<4RCKew@B;>;tDCU_9S{kH>mAz2Ss_5;+=4jL{W)V#V3{Emh
zJ*Cj7E2I`zoIvzsQjs2p18KZY<wuczuUJ!($2JfK!+6~_bL>QA$z@Yf-Z$++y=y0e
z*%{k7*;g4X_j=ZAznmBwZ9%~vY}?0dJ=c+o+K&^^za3mw1lNr!h`1TF!~^9*v`_z&
zl4b>ruWqNt1q^B2N-U*NWD7diQ`)YA?suLY7mUwRM`Yo36~P(?wta=3r!bqXTxkLi
z8Sk-0XI)9kh01yw>y@Pk*Z|8GKqGN*qI}9|jdO?p;mRJL0j%vhjLL}R6OjlUAmmLd
z+B+JhNwTR+*e}YO39cjiyl)(10}Idoj6rrJKjezlNLQvOl>;RC23T=G$<+FqWq)dE
zj%|(^8z9#Xi`F6@UsWyADf$R<5TU%NLMwX_^PT2p!{15~;o&prRlm}U?qJ)KDZ1^R
zjzA@cCxoL^vVdx(Zi2O^mmRBq+0t>A!NRzTu&BVJA7q9|UnOJggWh-IbKMd#$jmUm
zyRC(h*L=KK!;YsENoss=(jmuD$Pcs;v2=b>x8kZcQu96*scnw#{wJ-IL6~w|C7iI|
zb9{U=eqMuAxabaiRQPbPID$Rc`<X|B*BS7sKXC~)uzU@X^LIX~Aeb+%V_n=<mTCIM
z#p#ztUYqb2<E?h;u2(8rlQ8lyK->a_)}`4mXb=^m%VD<JdXhe{xHY^?O{P#oC8EQI
zjDs74+c*D}!K%wOW$bdFn!vImd~T%^cJMRTXeQ1%S`e|{h=J7P&v&P;K8<-D^RNa=
z)PX+Mdz^USR`1P48$2B0HmF1Ni>0>6JBY>Ib<4z7Muu*pN1qV@16qZ^xG)b%)vEBV
zy0&rE;znPKJYioozH^b+52=U4F*T?d6IvmFgAlG`;c{a<W)^f%Ewb(ln>U4ZblG6q
zR@Aau9_!vd*2}Hrl1?G!JA-JhDus=zfQSV2>$FnPr}f9H$a(R@0b?!~o+w?8y;YsX
zqs;4QNB}SoNsOLzjqAMVK1N46a9vQsT*f2v`dZsyq?uF1jgXPN)%D)wgL0z2kd3lw
z0KnFX^XXmflfC1`?Y51oAa4qpP9N6(=G*q8-P?~@LuY5++1AxxwCAMJuP+wl7y)_y
zGx83yGL$d;pH=+R)|7CEI6nB7=;U|?&XFRmXrj|~P%Ir1;YLbd#9)UhlM{T{&26U6
zw6X6NYY{ZGn`DVe9(-YdX1u_-?PNqor`f{?=gh72yK-hhJq#DKGSxRPR<sgw8K~$u
zLD`!=8rC(=S(&7SXj?U5G_s=<t~zo9H#ott$>vDptj8bv#wz+lKHpIw!;iS_^loc*
zGhLa!wz_A_k1ZOe0O(dT6^0ND4;irS8qiylUKP>K341kxwox0Vc-t9>LJgFcLBZ0s
zX}ajuD*?$NzJ%?rV+Wc)b&>TShvI^32^3QjHqS>gIQrHf-gTpOKv7hSnl2DuGVtpP
zBtXo8k+$5d)li_pIwzUt*>(a{b6lJl$cTzvi*rL3iw%rAvoTHYLvt@^e@?4mIlmq0
z+~T-xzR5CSw|67qy9289vY3a5!aI7`W|`{6T&JMcz=xBpnNCK~Xm#H+4A*xvoe1V?
z48sUu81T)*WZ0@4ya9}eU4^Ge6c0bX<-ZKOn>Q`uL<ib309$sVLDb&+2Oj?Gu^$e4
zjC$iencmygF|d#^9H&~WpD?V@6L1>FE@P(pEN{;36;7XOc~JO?dh;uNpMCW2Rh`=e
zSFfzXt<@0*3xtaijJx}&2`r>7)Pmwdb<DnO-im8l-!+4!6|}7kp`WN~`K;Tb(@cIB
zzOf+0A6dOj#&I%zxonRy5?xX6EuDLhXQ})Qt>H@W_=j+*YugWmHc|vcgVod^K?H&_
zu?iOfJC(>T^F6~NX^nXLaDL|#w4fd7=Eu(Zm$yB4#eDP$_*9RIPZAB_ukOe3Ahv{w
z?x0a9L_kqLo9O>&K|Hph?RK{Mauyx+OG}-q^8_MI7(?<omO7P-(gsBJ&BJgTy3L;-
z6RPOBVJ0a^A4dVE{(DpR!g8Y9EcOL_7?6_jIN0=PJoe4{BCTtiC3qs!1;={rCJdFf
z!FwYQaqcXK?O38i-MwZ6Hxew7e@f6F%prd3NB250Y8tBT?G~3|-|u&-x9E&5w#Uvu
zY?~H6jGl3~pkOeIBEbjXq~qFN|L1q`?@{vSo5^kt9|hDRj)flhn3vc395EGA5>sI0
z6*7#^OGkPpCW@AoEvwjv%H|(;<na=E%z%CZ5~Rdb^%!j-17HoHSoF+HzA%|FsG9Lg
zPOfXQVcTb>V%rvPZD|-hc{n_xHrIXkeojRU<9_@hWJUsCW<x+&#szOMX19w$(JR5+
z^SC3r-BykqbDkbq7@sa6YQ255mqr|&F&-mari3u2MRRKHh?zv!rmY5M<kjfFTfNRz
zYnM;Iy<{Mm^9DhsVdM_{RuhfK4vEt5M(aaTF%CafG2Cnj@$N}_{U=G7C6BaO0?bG0
ziY3w=mxQ4NXrZvj$=AabSzg28^mYz9SsuW0dd91^8wJS)h_0KSMC9$D=LLAV6g!mR
zQJH$13L2<HnOpupVCr^IbsjUYc9S6HxHzGYbH07KrwQD?#u0?4#X%o^GC5N>YL{;D
z)Af#p{2rrbn64qGjl&J|FCNasVc$ma;9cx%9bU}i$pA+Z1$DFL8|a|*jRytNBcPZ>
zjR&;;$Tc5&_VIAFc*xr$NISt9-yNo7J$NAH@*}H2BCN524tpoRy!OtFo0`yJkr3XS
zTxm$o@X~3(+EP_B+2t`Xx$v`XmsvHoXRyl?ArE@h$<q&sRUnBf?dkeV8poPJ3`$ZN
z@&MVshG4;%y$ynow`D=ZsKFR~2BXo_Yo3A-dKN;)$}~$!>ZB}Mm7zl)hRy><egw#N
zJ<M@maNjMVX2q(;VV@o%(lz=?2D&n2kZ<WkJuunY+y~eHb}_l@4Xw&z@G$3%`YWx*
z5b*)PF{zo_fZ?CR*6=0LvNA9jW*~4HQDnq8<zGxMsn5|}cS#tzF$DpQwl-*ksM6xJ
zkD$mKX*Q3W!r|n5T39x;ynLk?*_(*=8>I)%wb-4RkAFy><D*>cF;pP0H=2jHk6{MP
zRMo9ScU|z5xdEsjC9UBfeP4)PWJ^agKId<55q)?#`3Udof-mxl{aFj4U#0LV(i)i$
zPvSwY%Nu)Llup*Ra(!8ePHHVjrO`zsh-NIQop@E9y*A()Xe~6-gb>XU0iA?_4}Y4O
z1EUrQL`COoTb?Tr?~Se*9icuU293kh1QVeI84MtN+RG1&-(fUgb=9vm1Q*=1=<~zp
zT4=aGQK@yT7Fi~}r3yP;RfIAWP{Itv$0rFRc2v)oqS=7IW19Q#GlO1-T<du;EEGtv
z6X8;^iXMVksE8`5<YiIQ0<jf>B0-E}@a#8XF@n}Uxp0V{8&OqanHld1$wyBhK;s9D
zyA1<s7w;b=OCq;9=RK$FD9iEhUBF{g<y2Z3T-Go{@1<&%Mo`{i$y7UB;XIn4d&mG#
z#*^K+*$lHGc}SGkN;)jx$)96=b-XAHM7%K)5iqZ~-Dk3_*MiZ!Sk9MYW^CUVklO~s
ze*`zGKxL>oMLHCT?get$SV)Yp%gYn=X4!5?(>CtDiKVIs0s<-}QEB5Dfcfv{*z!l<
zL+!qcSo7h*qtN(TmTxhl%v}a*sI!H5oJi5w98#H~7&Rh|Jhqm@=C9SB9U|6jz6a36
zJZj^T?Th9(6sJ*@Yc7j8t_a5qEO*jysc&@o&FS}p1}*^<`hl9vZ!Y&~C{dC|LL9Hi
znA;<0-085hQ5C*;ph3m)P|<>>cKEsYD)#2<4MJNbxB_GARE(gcj2O+-zAQlEv@o3Z
z&pLs(UV5#m9ka9Z*l&#PatAh`Ym2fMv#GmzDJQHB)+xSDHYFO<GbLc6gj$XgXnPHO
z87==lbe1(I2;W?=qYaAZnx1#a{$BLpIyqcP)nuz<jAAiyha~3+NdT)FGr_TpsM>>p
zFRyk}AS@y$Oh_cny6IG}9oF{P85oj8hwyRi6sTLcq2;wqP(-!^^7=Oen(_;6HkX#d
zLy;S2iH-8lq&IOai?YFC1RRxQ2MsI{gQxDP%!g0S$jDh5DvMNfq%;VA+z8<lo?bE|
zLDu7A8$)xH$a9W2fq{K$s7lAwXSJ~))(vx8LK%cG4<CFg;(Rm1eyV-v_6Hw<r>*Uf
zVQXB<`PF34dXnbXS+OxD$&S5I@m-DVj5F2Fs5-kE$U_RA{V^u}(U9SYAG{$0fMboG
z0b2Q)@-;P(UOp0bqhjnT5^VOonbbEh(`1TAJZvP*&SN_K4x2M8tQqHqq?ccqI`?Z{
zbfT9R9IWVDjS7Si+~&0aJnd8DeKn7iR|b8k0?9jpAhFx=-4XFRh~MLYV^TI9PsKgE
zM!rSQdO!m=l6YH4ku$&S_RfCG%a22m=^Z$pC+lxHIkT>#mAo<L-(*h7e8m>3YHd=1
zhF6X@e2dmFAsnWVt<N8c%o@o|u#zUWh@lSXdwe<6mYe#NF;*&~_rDnyJ|B)gO4`tp
zJzH<EjZuJ>(N1v?ce>Ygj<v8N^VlS9K97UBVWQ5e0W|Q3aMznNkgXs$EwP8x1F;11
zl$PMh*o6%OsYOD80Tk|taw8QjBvh2nAksxUxIxvpg+gS&M7dXMlM@o=*{yAk(aSQj
zNr>G$ZM9|1&QK+fwPVV*s@82`M;MV}C+U3zK=!=VSQ~QCz!^EwOB-mSPRpd5<}9({
zt0tLX#aijh?rMzAxZVbjx_9oz{#vHbh4<{^P?#>`_*ldyf!=ztBa^vpEIyBjEIw|N
ze9x6*Y?h_wA(SR<w~nwqJlJ$WAR!YZB08+ebc7!t0agt~NQ)p6&ZHm*0c0B%m}0VP
z3CoN0M5-q(*~{g7fAa0WlOF2xCmxz|>95u55x=gw-Iun#N@g*>id5_A+kZOwn`}(%
z*93VVla|?7V*`@Fq^r#iy-gyq9~Ua+<9gF|+PRU*IvQd-T*gmce^Ad^*SWW@?QO(n
z1~;p9RhPn=hM_ANO###u)!0c1goJNI+>!3Sr$c&aj;o(>G`dNOTTWA|;Zn?Ze4F^l
z1$a8gh5`#w=XoE!wtnPJNh8ulNx&2aW;XVcNT0x`l=#e8!!e8Fr6GC+BQi5Bm}8}U
zz{_RYc<rY|lP(tQ`Wgxcdr<O)EDxOEf!s3HGoMBu9gO^usAJU|rglPg;2t0vT-i3(
zy+i5#n4X#07F4z`0xG0+fwp${`pVmb$4ceaCt>r9-@DVO5xMQ>8@@h=VG-U82*Fd_
zEcNHK>qZxjA;CSz8z9niR_y-%*k|!GT~!#$5K$XR5D?;M$gPm4QF?(u$U7P3aO>s`
zi<&1xvczLI&^YnCFklN3*hMuKF76^1Db{5&uKcz?C@3I#kvUKoj>}9py=OKUn-}^V
zO_9*ub9CpL$yw`087jN<eSBD(Ce!yVv8FXnM%lFC<?+E&lri9j6HD-yt^^KbJ&FQC
z35bEe!vknsed!&0mX9EWM_{v9e^G+gM{W!sWqx;%5U!d_5-E=?&KU}`nE#~-!X`ZZ
zYmPSN4tSx4`9tTC;q<6?m+#Osz|+M?WJx6T=Bz_KEbxR9L}fWgCOygB<4|K*6x4h8
z+C4`n9*;|`jGkcZt+zz>tO*DMTH=#J6`5RqG1N|p!IGEHS1uB%P2fdyC|Ako)`cuv
zKYpft+kpeYPY7^y{o~Ut-Zdn7EOr1$&UxQ6-_WkIGIl7E-zLh>YQWbGB7EORc$3(3
zlfBMaO_1E?qO2K<MLOq%<C(`@+qn2=_hHdO`bPLZ&JcsPK!QzA#C=Z>Yvx~t@89Lr
zKYpdQK}5NBORn?MZOGsA*H4e4e0YblGU!Q8p+0BEocajw85laG9mBZ<#s-Z@H_=;R
zbBG;6Nzt=TP77bl$`h|#HJKOO<Eb+zhj4f6;v1Ntivy*aS>k9N930YphRZuT$Ij*7
zX}-`lcG!5WrcX^x^xmIf5nH#qK-yt>pPiD5TH+@gmQvxy0qe^7&(jgVt~&3iP$R&*
z{LevI1+>yK=QD#o>-Y7KUNU|aJ3uZpG6=>@HEk9=1$mI}(M_SYq$`Koa|6a)DDjbi
z9DtXpdA$2zYDSQA#}6`-)?;`=YY8#TM>5S4a0akdf!fy^q2VhpGu3n#AirAX#nD`C
z#XKLHDmn%*f=;@wVNA|yB=&=?tU)8Z*TOL4$JahvBawWOp}MV$Jt;3KL6pe;lczl1
z#C?L=-*>+<kQp4iIp{`+;2sjaR<kr&+sn<D+<oQ6_N@u)yjD+GA2sxS0EJy%x~a+p
zShr_glkA5F&50Tm7kJ#-+6(-@3_lCH!f;T*nM2HSI(2&Npn>1lOKk03j)ks!bdjDy
z?lwF)cN8&ZAsify;|4*29*TC42rQ!;gmz<m4vHG)V!^iHn2tszSV?Rh_nU0AGL8+m
z2ntRDFOvuwAd!X`2G&m3PnY`W+u4D?O`Lf00xaEKKtrU1n|GS-={5^N4K72F&o5D(
zH?+kJooA5!V9}pj#|>6jK$ou-ZM?nAMWLS27D8EIZKF2NUd;AaZcLLgvtrwAHr1Gs
zqcswvau`7n-%H<d1Bj`MRq?{q4#uV+CvN{9{_It(``?SlwFA53R?|)1CBVgoEixG2
zhRp1BsqCnf%o`USDoN`Y4;X?F`JL4H>uq%%{$w`BMS@|i;vhdz;LDe@Acwg<6l*+;
zKYPsxO`a|1eR@Y6PpeoOfPC5;5)21G+Kno5+soao+i9tI*k@m%vf;yUo(xy$G1S>c
zj6vZuq5+Rgx?&usWnCDV70F{Pf;?zoNVqeX6nUDUQ2Nn8oVv(|#61@Gjt(Og>&tZ_
z52BsUY=YP=+)RYvvm(w~Ae`(X=iWlM;$Pn{VxDW$-}RfGzaQOfI*WLD*Vy4s1w$7W
zIcsNCyd}a=bTJt=0uM))cL$?QX0cX=qagFqyR}{pc$uV429ryIv9adOB5(s<TFC{A
zV8%|)mCUNf(XhSZtWLF|rL2(G$QxX!`lOdwkgWn#4AjTeo`CR2Q(7M2aifws;WZ|u
zOGAgov8sM3{hqQb>uHVdW3Axg;7&d`gKRF%I=5h36yaDc8IL0~y8_tHl1!;^^!hQ`
zd>d8@I9{+<KAEjYez6S?&CeL`rMwJ7y4&Hb-ol?`<7%Asn2TVG4WZ$K4#yxyWkhsd
zvyY6f)~s`<f({G5M5^ZA$Pt3`9b+OuTK4vPI|0%kkt?=*)h;Rdxe#}ECFX<&1Sl~R
zA>HO+PjkGgJO$IkKb9q`eckuWZSt+mmg}+lK4BQ|Dydn(cOtl#>+ju+9s;dmMI}EK
z_&{1oCgHPt!wM|#t{-tNz2X>HapAXqG4^8*ACL_+Nv`F&g3B(sH!XH}9<=ag`Cbxq
z*ri7YCs`dD)yxJBdxvKS8y)mUZ_%sm(Oye7q@d&qE)RiV*Qyh(+hZZ*>*%|Z4z^B?
z_=ccWru63kV|N#medV@(9FVULGbn8fUwCj#G!{o^f*j^U*v6<xn0In@);)%0V-JDb
zecJG3BHrWYr2RfN-Yot9wda9V{C&Hm<x)GYy?Wtq*i?YQy{}pT2n2qgWx`gw-Toh;
zzE4x`4v`x8AJ?dO!@H0Hy0Ri<Ue1P1WP|DoY-L<1byqKt;bxHJ)@vos-e(n)Md;p@
zy!ULZ+BJ;C_-?s@jk$dMH@kE`tid)>9psQQQjeEAI5>Ud9FaT`1F4H8h#KJ{0|Dt*
zA}hJ>+H@<hp#uhdDT>PSAwKB{zq-}1#jnm54l%SxtabBm8+eTGjPHL}%A=GvNa2w2
zZ<6)jy7IpujBjowYXQmHCg@Sj&svu=;~r25>^F_t&w*?0GrUiEf*gW)ArM_6j>W;1
zym7ty25p>g%j_|`#*>04VLL<_hm6b?A_xkO|FrWD5+l2|HW0Q`op0f8HzTE(AzaC-
zI$+5Xb5N+2FGu%PgB)D5GKLFOgfANn8IG2TrznsT%6q{0WP4BS2R(N6bou`ndeXc|
zm9)m2Ktl!&@WHCR<rtzMYWrBMAkDShIW>(+MO@Q0uM-ShA<JN>);AL_j@#Ecb?@9*
z2Vz;{eoRv^*n&zANty`GqhjTAS_WiBxk5R4@op^Q!1LC|V(W|w?bGc3H1s62TIwJ^
zJEyaG=wDn^AsB&yhZVmGxsf3k@c4(q^oSWCZO0iLnJh*;IO&{xHPhKkt#;BatPI}c
z<YT_ty>MaN^fPEs4n?{&T)_@itdQ6the`-Z11o{{UBHbIldq%I#p~HnGQ?!nPrRda
zlU%IE-!9xvo4;=y#(JTIHtwkQW2d*)Xu8><YjJ8~(DUM;0SJ#8QecEmsl(p`X$Ks>
zL@v@;&eJbFM>12kHr?1doGx?A=SX$tG9;!l3WpDrNd#gcOvHXQK?1l_XAac#Ub++p
zYYz9-pYJrZc*a)|qI$%e$5HIZ4}P<j5Uq~ASVO~Zex2haBc;<w>o6*S&|*A6Anl8D
zXjy$|Cx}cSih(Ey@h<{p!hrDQH?mOl0^B;@>;b1!FPV*#$>PKCV(xBJN;OVHm;mM(
z#k8}T2#C}H?-7_%UX*MkLy{mA?%<*n0{L5*lOY}Va3XgGhNcsT+=tsYL>~=zYq_#8
z4jXMzouzWy_2{;-mu!>D?(4q|i9anai<7q}&@!?vuy912o;#@wkG*w>%RD-~k-urU
zzLA0$=9zlAfr+PuUTypx`=h;ZUhLf9>tSypfDSlS=I-Zw2XwLJ&m36W5h>9`J{HF^
zZxwTEhxb1N=17_D-+)LXJT0JC56ixJ$KmFI4-T>OE%y2M-NiV6S9zJ-j>aJ)U|{0~
z6o8vTF){|ZuU(3zV#tG^rhBQ<WTn<rjnk3o(_vWt$;pnw>zKfBcCt<wu`&YHtH6F0
zRUbE+pqr%%qb^e7fEIA~yl9PWj)2>Wuy-Ssxemc3(U}IUPt4sdbOYiKI~F1S+xf%Q
zd~0zNE9LRe#0@)Z+p!+<=Fo@B-Z%Ll5C?S<ny@Md*Gfc@ubI|dL0aO-LFCb3OHn3w
zSybO3@d!vFbaomlVSz-ts*H9BlDhh@x40*`gPXFtaD$F%K7SLedvFH?3TVrY4SUM?
zVVRkjI@W}8YZ!rnzdWBv5#<Y~Lvw5#4ie=FwFbtc*8*h$`DK^k#xb97)3ihNjFH7;
z!^gDyy_4mK5<74<A`gvyW-T!{4qSP1zgHbywwSQ~-iMfMMZa4UzH{{FGdnFzp58-y
z_DSEPYB=WFsJkC2f(R4st;xp*`Z%yg!IEiJ>eSUb&M=LyUjqg{xIhlG7%17Ch10DZ
z$T-FVXJY%DsA}F{*Y=&ORfE&&tqbwg3(w@<Prj&5#7|9a1o~C<PzXERb<G3hVNTuO
zC1f6O<=)=3by1GR{KnYZ1W*OggF|`!HesnSJFA+zMXbCG9f^SM3kfJ}BZ!^S&ab@N
zv7IzmwX<c(%g2hk=GaJB*Hs4b280rJ9nPV~Ttndl5@N#N)*g?Lc0<WH&#?0hA$gO+
z!hDcRMDd*q#~#f@&bx)697*<PheSf_)HypIlwTzChvQiF_xXr;x-YGxcZfskAiDOt
zndJjeLukmNuu`<bsCzcUTI##7KE~v{XG3d5$<@lLs;ev7nXY=s+<LK=qZs6uye09e
zrsrP~t(2u?qUa1#xtHPK#^Wc|i4?IKvte*$ih~;C5tWL`y};M2tp>LR%pOJzg--^U
z!}rq&M#F-5TeQ92P4j>`Hd8T7;`V0H919K9n&TTOTN>S~Dr;UZdQvqr0b0u~LT>AB
zSgm36nEMiFRqR(@QA!rX?{!ToJ?+A|$^un{0L%hhNa+NNk(;%y0zNuhUmp|a&+zrx
z27(BJrM-ZND9+7xwJ#<E4IU0&wiwPYTA`Y`<;1wuD-mHMlv`<y#AFyj&P0l-M8Wv+
z?nq_wA?N2@(MNV&ob{g45Suf~p<}Mv6Yd?a)1N=a3u4ZTdOBE~*y$1R_jZvCDiZ=n
zJwkE^ookDoh;!U{16+PEtcvJB+{eJA=Xrei1Ozbzy^hS@CtNS6K5Z7|tTSBuZB4U*
z;vrFl%-u|>?tsMzH_eKW_TvMDDWj<#y!y2Q26+s@i^6qCaAVZ`O}8y?fw;39c~{Y$
z`PbD+tVob}4ieWB9+9%64L!dwzt+&6py%b+FWm1up-wKwh#7@`K#!YZNi5pIWcV-c
z_H;d?<>;&B3oYJY@5f#&J;#9P*si3atJKw(2f4gyJrj)MVvG)&DRI&w8tf|1CPB_z
zaH4H=?bg8eO?WaSG3uB(1cC^(q0>3!twhIdITO-<OFD!HE7(vZ-W&%~;0pQHo*Y=R
zFC?|$s)IN(MaX-K{Qdi-bcEJo3|PF(a@3R<ZFWcwcGtJ%f!OWs;fn*?N`rA6MD8e2
zLI{|gXP|@Bg_9R?&D`ZGnK&XPNrKt1F)O$O%F|P35V4os!p3CY_vqpB1IRfov;Fh7
z#>y-Z2wj1>7IcsyOSy{|)q1Nq_!7R8kb5cSbak0TbubSkNa~lYJifKOZN_h{Tf3xd
z1H#`hOSKQYK%4a2?kUalG_ANyPX(omLP4GOgbxS?q81{$Q%Qk|bnSrqN3~mvj?s@!
zc&i6UY(nC!Z3Kxv$$c#!9%kZ<ybWB9<uV3%m$*U56n23IjBc`Bi+c8Z>V7HpO!gQS
zG-i1xc(ck@mj=s%=Oko}xEAD!bo7WK^7RK1r;`L8kG62x>Y1AaYdu|<V6%`pAPpEJ
zL;((f1Geho-)?82JZw3<q~e_tFmuks5H^2p>{(l<-0jY%LWJ$dNaAmFV)H|!YkrAt
zc7ZEe@S!2Wj64`9U2^6D->`ep*0B2Hx$9CLv965!Kce0E-L6nyS-b9I!11>8qk8F4
z%s7Zl4u0yOcJW>(SS^K?J|RbUOYO+6v3gU)Y5MK8@3w|9n^A9^D(N>jo!zs9DI1Hy
z+{SZIbH;es=e11s97jv+;-(utAaT&qvLkLlbb!xVM2zn^>US$b_dADD;qIDqzS!#F
z3{^yA?E5|AZB+?(J8K&RDe%F7Q@vF+D-aC~1YZYj-y)4X_&xJa$4%c>OdVTdcm?9Z
zLEmw$vd|<h7IVIJ#F5e!wth7k6+3Hzu&v~Ewu$3wjO5;FY|i-w-rd>BY-bgof!5QS
z+jG;1z2ql;H+ifb0fGP<PSarwoFK6;H?FZMXQ<FR4^w%PmwFUhm&>r4x#wZ7tsZXt
zw#4VR9k)}nnu+1V$!!Y0A^2Ew4;Wb{2A<i$??bjS2HEhD51vMn-@GlS5vO}w+RPQ6
zvjd$cI$vKfH#0n;vB#YB&56R}mBXg$SO&#(%p*o;lNUpcjWk#vrN*-kpB<zO7@Sp%
zklO%Q5DPOfAcbCQ7VFEVBVb1<t9p5eslc*P5de#@ma1Xsbr9nu6dODEQPan)96`G7
zagL(7^r;y<^x2bUoX;BgeDdAh+I(}^JUQ6-Bfq&b$e>sNOE3WmKCNb~I%Dvpbb63{
z4&IDQ4U7=dK*OYICi4*1TVl+$m|>qBcV5N!!5B*t$MF9IMEm$uN=srFo%WcW6XOcb
zXK{)|H$&1p-ycZ&pCQWQg##;hSib#7fz_Z!IrsAqC$-Kx0=dA%$2%M&HR<Iy={eO!
zk*6@-#$E9HM)>98MMzmgpiKI=5)kENnI}OX3b?J~j(G@bi$SoGv<*Epb8kQ$j)|H!
zXO7|CB@){nNZV2!y_aw(6fsVGS#04oB{#}_yPsN&)@YH~cJJb+rZaITL{Ps?&(z}^
z=A8<I(kH4EmiYAb9)WK<^=+5Ju<xHO=wBVGS_V+0F#A7s)lm`?q#tXGV2zngX<Of$
z8u6_1T5+4v?<%pE79}4`)eYahcHC~w(t!g2ZGP6asTj%=c`BMnp2usMhW86oisCfh
zp*5BCJl`HS&lrx`W#<OE?blLIBR%_d+Pa<ynnABUdAn8dp1R1Gj}JD^JGNl&SA;u-
zZi3ruy)0;r1KI^vZQ%5xce@=vS-Z=O)Lu~D9`wu{kO2UAf?Z>dH5~cwBubdXkYwdW
zlqRrNRNlwDZE%EH1|tyKAUb#uQ4AlliPsl;nVpO`Ve-LhF=5-w-|$7oeI)oy3to17
z2v?R*l$&TcCM}Ya>hWvrYjoa^69W;{wSariP~%}a%ns${g;c+ynE>;NkfvCGCJ+>R
zg%jp4CD2DB?fM)>N#4=adqunIoDL2y0j?#uI3&A@lz|veOIfqCqkXXDwN6^!S%qUM
zXoM#s*4-fvHqH0jd9^SWNTiOMDZeY`yGSSyv9`TFqq{)l9oBMWtXFJ5zll4H%{e5p
zI*-ik--RJr7C4LFUOncnt#o6>mwwbQOYaSq>JDgcvS-jpBzB1qH7_2~7WLf`j=5;A
zW+8EyHBJ}Q%HxDQwn8P=$`YwrghU#c9$O~e=Be%o`_dZw!BAU7Y2zn$>e$@;(_Kb5
z8*C4%l;uA!)04H1yLm479Q(W-4Wujph?3tZh#`-9f!QU--n_{qbSGi2o6uwvBdrU#
z7Z118%T#H%iV#SPPCf-v_VO#&jrdvXXKK{?yeDjRJTTr?{CR5t*K%<Jr8wOY8^YOb
z#Kduxmgm#74}PiiSZ<>-SxH$2X<r+|;cRI=#h&|xYqwJ@!ruhmAbqV5qk_qcTiHfB
z+{yBg|1X-aS;d964-2OHvI37=!=6aNW(E}&vdDnqNnp~8OE<U0!OCr3pDEo0Dq%YS
z1QXpKPiYjfJHmlgW@cLve^*bf?-33(a9e{~hjgq0=Q}_$yu0je5)72&H4#~3a^R5b
zk4p05;++yR1|v2FD2Om`o~%!_>x?5;Ln|38ZJ_6M)bY#dYoCJ{BK|7tiS-!Y91qe)
z<BNV<gOd^K*My85ivL<#B8GBh_k?;a^n3l7s8S9+3HR?q(cnTHU7l<)YFi|TtA}0#
zTDsx9sMw2~1?PF4fH2V7fy<p>4DxlmB)&$)Mm)|i-a6)C>Eb4)xx`d5JCr+`<#^+U
zn2ZpTh}ppWAF-SWMBusnE+@{9wJoW?_2qg<L<t1WIB^7lw0s>WwmYaGEaI3bK#~gx
zeLHKLm#JdjxW>}Nd~few>v0iu{=te4>pLTv&Z2mJFx13jz_Ik5D)cP?gnBlT1??ZE
zVwM3{-iH5~3B`ptDrE;KDR}xg90XF+<Hz9TUGxf%Q`u2yk^%hFv+rm&MDKh4m6PoB
zQXbr3xkVkY`)S|8@Vq^A-GW{K-{;cjA3OADE$;o_<-WVvd+t`g_edEUZECcAv;BK2
z^>WwCU}>;DYZA0A(J26}1S&o=jYEfhtwmPfaHw;>*V|{*Gbia#EQusnd2+eIC^nZ$
zA-lV!udht{lc=_CzRJ?IjNf#0Tq({`rnCgecz<Jk^uF07c5FLC(X^BS*lK4qoIhfY
zN%P3J=3)7xiczM-M9JSO0)BV8#IQ)uXXx{i&4swJ6bVyNdkLoS=6`;q<Xw%a{@jU&
z?+RX4pY+qSYbRZ%&u&upqfWiV8$bXgxEeLy=EqjNwm7W|vBTd<asf0^BI|7_<2tOj
z<-XR0S-FnwJeCNph|F}iL}MWHVPJO{X5Cv!uBT*7CvR<rgf_{fQ9wXIUjS|G$fK<$
z7(UVqV_TF1p#zP2dJI3E!Fsnk`_$AF=V@ry`Ius7<Wp=EqI=zLR=1#eLHm?X;`>*q
zHgpf5#_DS=tnU{sw=+INcyJ$_QiYzd!1rT#j2xBC<TwGXOhoOy`+(SIQ$_h!@Uel1
zB!{mIVh_rcf4aUW@_a8<Z~@2XQddHO{kR{I1^y1(8+z)a@qHIg&ySdU`Yt+sf*GPQ
zjXHe<E<nSkAaA}#Xn}|I^pEyz|3{j#gf=@fzZwx%vC_|v>Gmy2a2oVX4$s^|$iv$(
z`-YK`;_Ci%hvhLJr4ZhMw1E7`f1U@>@Td%bMu93SobR{mES>&;+LQ&qFV)Hk8ite~
z)8g##K4o@44};@+zs$3c|Lp=a9+Eu}Kp4g_G;z5q!Z3Yf*>(DjM6{8?7JHn=@+<5>
zJ!79g#TIc%4_<BfP<vRKYL*y=8C`?M3x)c%^s1_4VIcBmOHRW=+TGg^UOLAVwA<}d
zO}eC#3omYFu74<Ch=7b40A?_7Iv2<GY?%Rw!Tp(Yft5y7{%(r|j|;WGk7w09llV2{
zIuBIC-BU?|8pfeWo?(CaWjqyO>^S0ZpXjE)2E(m4NO_2|NwOLoO2hamue(6`FWfnW
zJ|E=&h5IkqpE*y-1fbim(0_fx?i0vB$^rYwwl~$0{;_fTaKwy~5BQ{GM_v9ib(!a^
zy`SUhsr<jo8tlmWcc)2{P81W8$XnC8_E9cdeBk%{X`%5fsr0>FolMl=wTdAIOkF-;
zLZx_H?`1$aeulC7U()@?GwC?g+=u>9XZt_0pfWymQX&JF6NOH6Q6T8B|K87={teL=
zwE<TOg<x18Mz}$Q5nx1yKmQ7RyBuivK%6h&FO=m8q<YQY@~xh@s9=Bd$M#uQu7Peu
zZ0YsYcJ8j6&c$@mjRnpoPDgOaPCNP)K+cS$9Y)ac0rR=sLhA@c7r~~ugNJ-ezGX`D
zW_RO`>DG0oxApP8*R==J+Gyun3_YL40dm3V9A)VAL-W1||KAts=h*SaHu&JyVUWht
zI-%mp*>^ghJ4?>^pG&d$dia(r<|q1N?foyWu_wnMRPp3a{v}L1|EpxeCGST^@@T>-
z{W;PB^mvc~?^$DCrTVd||7*G|*3)%ILiy&3jBGM63#%f4co6$m5bSpNxBWH-F;9Qz
z^27OV*<c&rnn%TcmEvXM7=3R~xgx^Mj55p^p0m7Z2iSfT05OJes2gGhM~mjtyb*fu
zUrH4K^|{b$jycohW>HUT0M!7I@HsSvv7~VzGE8Tn!w|$e*-)64)2)Y`&pnvHHbBt9
ze}`0p<3|rYi3;GP;G)~pgW9xLZV}I3Q(r|@HAM#rw4Jb_1Z$a3kMm!X_uluc?S6KA
z&ihD!9vf<ZDf%!F!N`b+=Lfq$LJ41IjoYZ9DsnLYpZ1^M%kZ?Fj5Zp{`!|e*2x6qC
z1biukw;_9{+u2$k=C$;2d*}5U@$Y~k6z28FG&+I@WR3{I>+{}4{(oMTPu^3Doc<P*
z_B9HC2m3DvcjwM#Vjt@2M*q-FceUN_&ZotXdmoo==Mbe`<7cjg6pAM=*jjHoUuCw>
zZN@=l9j*@Pf@y}3{<jB3Z7Nn9O@u3vaa3J}si>ewJ6J=S-{(tgO7sTsN9Lixkm-nR
z*J%E?dTH%W-n*|l!f-)a^b)@BM;_`fLoZ-r3*il*ENzYHOe)NFI_<I|3bVs#D8?um
zY+rmxcFZ$Ui)n88BXbk-Njwu+nzeb1D4mT&lSn#mNdSn*P~aS*G=36Dhw4Y|rRS_X
zKAB%zxaOl<q(8ETYpb?@qglF-*JE}L;aGKgPK&Uxo#<z~E`2{Xya^$soN3Gez&-CA
zVU8(%uZJkThcnP&`#od^F}{)tG<ee#m@qLT`)RwL&-K3kn%j0L8DrQO9!?z6jf6Sv
zjCy+S-E68)ZO_b}*{&C9v+J?s`d#0(-?9-T=Kz5ifdvTf!MldiH11g@O=W*Tkey3S
zC+_gt_lgxItM$mxauQJur?%o^3$%9I9o^-&>|RXw_>Mjd)w0(EZJ)Kv!&QW2z&4J0
z+h>5zV=ZA?ww#=rQk1qPVw&ROIuE#I$`<TeWw+51<>zw}@8a?(|6<-!mXD<JJTQ`T
zyy<z<@$&Tbd&!mJ(zM!eOKq~*J`H1*f+kkm(zD<78_z0i@(K38dUK5ZzP~o@WBe7l
zC8k+$EE#3+lne}0MOe-)Mh6C-y@Zp_H+tEjP*lf3fl4?Ef%((Giuw6`b#})0XTy2L
z*JY#kA-gp|{+PH$HvPB0kZo?5RjXd_pKw-SJ8pg!D`FY&z03kA)mUKZ`@gRIoI6-{
zzQ_B0t;0$eiqpB(t1OBaSpkZrn~OwozdkfSnGhX4vQ8GX+V?tKf93mMGhUg&D?1kf
zq=wQ>p`0a!AFlWB`8DkGz5EyXj6ZAlKf~bDPyc;J-W)%CL@-VfiQch|rSutPqQk^S
zOklpR#`u^|RRW_;?lhnntNdLLLp@P<QEFE(Ls<A+$%dhXj2k)}K9W+SR%V0!&%kMN
z9)_3lA2JVtWOZ-Q@wviG;s&14`j)Wj6S)Ht3PbN*C*OR_(8KBydDc(3*zB-d?RxvL
zwTXsdiDV4FdnkhiCriE4|Ai5u_ze|d$u8q+(i(d)1d|`TvR69)KY!nSPxJmy(*ASS
zbEAaC9L{KZe-h>fEN5(g;rMyy;ACeE;RrB<J*PR~B0Jv>jgWn;kUqEkC`_XtM*vPq
z3GS+(Ap%uG`}cFP;fMwK|C1<@jA0<+?EPMi104Sw39#Xr^`$~AJz^1sJd2kY_;;Z;
zTo6V!EJU~lTM_VfQRzQW@A3Itx^_9d(d;+(AML*d@;LU*VUlQN*ia^tGePHvS<Q<G
zb923N3_dvd)btj~(21*!csMYq=c3RAB#?7lw0HX6%W?Q-6^$g8^9)~si`%&Mm?z&H
zGOk76=7mPa4K~GPzZ>st&!WyoZVz?FXSSrCd#bTX#?q4+ek-{;ii_7)LSF}|QG<>;
z*&v~|Ezye^LLbevI*E}+CxO*|Jy$~PJ4gru7@av(-Fs@>(Z^+ReN2jueSs(`F$$&T
z!2yy`j}ph6^)|ofxU)waz4`j?UYoK1SvrvTL*i8-kII#jVM#(cUfao3#ujb_f0F#2
zgbpMF2m}Uf?h?c@Ham|J+wDrw@YsA=51v7SN)rd*)`4{*v~WsHXa?qz8dai@ir*st
zuQ||r?|Y}%{f<xTW5e^Z{_fukrv1>-vC?-}Th9GpF+EfEQ>mJH_`H3WeU^t7^pq5Z
zl>}rB*X`;bs-YJ{O+T;ycB^p2tlCx?(@{0Zf-Hdtl`+3$;fL8`1`AX&ALjEm(r}sF
zD<A-0K%l=|>FR02Kl^(Qh5_WTs}89$=8>h4Hc5l=E<V4r!h*Ge7z4UI;fp78<A3kN
z(*dzIm+ySJk$T_ci}6M0$XMbPdhV%Iv6fgtFc#E51}*n}C8}6AK)MkLHR?JqJY(OL
z)wdOLRkN*O4GpVVy=L19c)rJ*lf>QRQ;EGO%e;Vh#nU6r5=Vv!sxDJLH`lBAmQck^
zM<=|5BnqHqIWj^50)|sq$ZT3@aSHRGph$l)8v&E;Ykk}HuVwp_f)HW#KI=+N%A@yM
z!kSb;p{NfV*wc&dxzq57gZ#Y>|7t&5`TO6cHrPdbV8$UOEF*feeow@r>Nx1|!iqH7
z-VdJB)P3*1_#`2uF7WOl2}6$%KBD0k=z3RE_c}Z3)=1l8x^H`%#k1h!f^TTTS3+$4
zCqqlC5I;H#tam3n!~WZUyV2%vKd+ZxRn=d!K!rf3F_x@P>r*UK6X+HZg9M|WhpvdS
zfgs{Zu96l7EV7E*xgiYFt@n%+xpvY=7;0kT-LaWvauIu2p#xu;{TTi~>DFjI)IRbi
z`Zac}O;=Nr<5so$^mDf}7NE?4w|T9y^!Jt?9A9_Kg{qP7MQ_!`lN0mY@~fH4;#11b
z!J7;BH$|<Idc9g-NpcXNDuL)!9{r^~NLHo+K+P=5>bvT>bhIYBGYI_33b$1kCnB|4
zOc^i!-65K206AZ_p%$>}M7u5N6L{A*{xEv~=#2hvfi`hD%4_=#`7WpYOa0NKeTz?x
zYc8St?%=wAgS66f`KPq&;74Z!BU@2TdU})Au>!_DuG#rrm|g-RA-f7B1q*_cf!&YS
z`v>Un2kiBSsiSLA&vo1DXb@0~&lKT0Wq8}YFQ?{~v0Kke(qpT*z}R<F@tpggFN*)#
z^f@j6JJ$V(9<^c2)2d}xZIAtzxas^~ufX2k(xMu$PttQ}+3j7QVH%n*@j~BzuZEu8
zES(;WYrvr|5BR8hDCe%4!>x+u>Ar8#0b1ftxA)b&aP@9ccNTqBkE3vH4JUJukZw6=
zOOjr<XXudhI<66Ts0pG9s7W{6LY%aEWTJd+Y%3or$)ob-S@HO~TJ<XT5MM;idunG&
z924gwsNc~0|Ha@_kRoT(<vM&$4B!2=C5Qte2IblnKth0%YDP&!@!MZR3C~8hqvu|9
z<|IdhjQs1kzqolS!;Y8FqQnWc;pN}1n5-B;o{w(%^-Uvl6Xx+ZUOxTnek)V!&e9}$
z=q>o<L4oZ1P9KnEz#+ee>4W$>CVRbbKlEJgzh5{2xKQ+9iJmT4-%jlPj|^5bvI%2d
z-t7n81N<9CJvTvmcHoNduUn^q)5<vpSqdF*-Y!Qf`8#{k_^`#;J9^LPvk7JifH#^`
zBN_n4)t&_W`hqY#hQ_r_ol{&A;>MH>FxE^jC#i{G4dX0x7>)+yU}fgWICYM2eG#{Q
zcevX+1a`j04+e{z6JlzfWe%Rf_3*b%aG*ck*T+BYx!G(!@vn-?v`b6jbKatzkG`_?
z{1M;cj`p#PW(O=--Y?&Uz<(?8difF3v|7Ym(Av=TS`A!Kms-Gum&cXRyV^3esx_nN
z;-5pesY(Yet6p9lWh^)zQEed{6Kp(5mnhw?();S{C@i@f?J1NswpZIK>$U6qLyKe!
zA=!;upw(#S|C$%-dhhnx=&P#N4WkEL3eV2}3n@k$@4CKK8sRXgRt9^@Lqm)O`04c;
zru$NVaSwmD{9g}Wj)mA6G1VJF(nn0G*>mgAUY;)Et$$zh|3L9h%${RW-Oxy<JyFgx
z*+fL9ThS|wD<wckAtQkfB1~=ZlPM`dA0Pvivz!OI*z}mgfP3TSb-SO%VJ&3SSczxh
z+gW)WFZ2^KL|ZE|nllw?Gcw@}%x)OQ<(AuQw%djYnS*=Ip`z-{ZVk0o;N~qYRkqwD
zQ!;^t%3&LnwQaUG;c}AP!OUBMnUeuCDU&d8GG<U3s=0u<nTBRzb22QKGF!E}49wNH
zP%{>RZbg>Z)|gy#2?xYy$^P%p|F6;h2h{(I`MxgKiA4GBH&k$f!~svpfRY46NK7;#
z2}jyUho6!8V|%n+Y8Nx|-yiO#`xQ3m0hcp7L~89_V##4^z|=m3=M>6;k#`P@3w1{=
zh_UQ@uELc4tt{E7Dzl(uGWk%Ys<Is##3_#4l`?q<tO{70811T==7UK?lo#nqM|lt(
zR6v`{uM+LnSbA?qsEP-sISZ%S#M@|&p~OX4vkn92b;;PCl-rW2$T=Tk6x=vXCL@Pp
zQ)P>N$}<QjsPwjacQObE1HRECp*%S3oY_5w42+0P;NO;#M_9z~AmnE$`!iv($>L_c
zbA0nT89O>sGD#;BmB7u1g#ZihfUqWHG`CR$Oo5QL8CvPHYJ_Km8totJU~%V<0$i&?
zmnhoZXn9V{>tbcSy*QA#>ixHn*fqpFy>$0$hF}Lgl1OPdxZeaZ&N~APo`C_%By==0
z_6(HH9EVX2Ni`+lX5(#l*MX^bdM|+y(X%?zMlx;D&=?_G4t*d~z6=mD5&}pYdIB0E
zByWX!;xZTG-1(n+Rh58Yd6Y_~61yP?x~T*OS%}}GF`bkQx<)-V4Z<KB3%V^@0uu(5
zI67CpMnSghk{8p{?5Q1-l<OVWB8jI@4aq2#9t<ZdL8d&+SCJbRg$DyjL1K}Nd*E{%
zjUeAoFY?dd^Z5ThkDa&q%I8g}kNv!^7PWDr^QDA%$wmj_IH)sqmKG>zt7E3bCaSmv
zP;gZ?=;u?VpNnR@6wJP1)Hp=oQrP)Ef;*<=nCVy3ePO1*e*EqKav;ke7Yf@tyi@Ue
zEj5#%(FCu>#7XK=V~@vmh=B?VUq=l1kmnu&Jh@gYtGkV?H|o=7U~HG!BT~B52jqlF
z9!q<vedqd{Jqe&U5Z8$0iRo@=_LyO$7D;p$xDVv7r?t=H<MDNV?Qn8hl&8kY{${?(
zL(Kg=Ydijwpd%|aHq(n@ityPm!>WR)dkQz{QM~UQKHH6PQ0w@PwHE}QkfDEbT_4?b
z`CilDeWN=FJQolPEX+ZUdYO15f)Ba*58vwB%YF{E!JKYM)$oGz&zSM@y4M|bFTV@u
z+R2l8T`<0PZ1KGJt4h<VKS9_8RR?(F6Vbs@0vXvQmPe1$`#<vH%fsaIQ{v{lUKR59
zaW6CfNBXd57Oh!!xAe4X)ZnP|+1)nqGCNREjZ<Sd&7+2;96PO_=+@^r*Vn|sZ|`!b
zPa8qxs>f~R@$%<UoLK5L89dGIz|#5&?<RMds?Uciqa<*3IV0~~ZeUIG(`o#w`j3H`
z)EKH^$okm6;OeTjl$xEHA%y1h`V22-SWG%H?c3U;!$XkhRwG)Kx(rM4v}ZFv0~$6;
zqhe*JBgIs#^n3;DS#xXb?l{+)?#E8i-bVG8z4oIJ3YR`Ve-X8RYn(jr>LTCZbntul
zkHz#*!R?R2*E!#@8_LcNR9n~VPB3E!<#h^yD=$i}9%NQk`JS<lLKw%UZ)q48=ku-o
zdHA=@5HQCg8@1-PaP@(w-&m4X<S*E+H5{IPXU(@t(wZR~wg}-XbWZm3&)$ga@%TpM
zRGc3Zzfscnes*Agkk@D7a5{==i?cd-hC}mC98Y3%D&`IShj7u_beGMHzJ*pO=zx$i
zh^|AU8`{#dRdixH3cax?sX7nVF(vQv#XW=kKa5jLS7LTH6_PHkiW;^32Z7_mSfysA
zkL|E{G7YY7P3*1l*6o|CYsp6&hH_sW_7~8S=T<bRR?_}+I1+s$q1oMw&Ag$89{z7P
zG&K}DM<w{W?y{uxnq6Zjqr|XU7}f3B-iG8zvz-v&Fkq~h?;#UIr#W+QRiJOFck9J<
zW%hZNwDk0}u10e#t>VvSHzY1jst87_t8XrmjiNSUxwlr8!Y-l{a>KZW2Phiu0F4C7
zjCa7?dPV$L#uzR<I-t3{$t1+gPBt&2vzxDxV`+o7?0cNm2uJI4o2dhq_i;j@wfES@
zZh`tgJSv9xUVe^chyG~c*wd-Tg$h;ezxGNs=I$(m3SkoW{m*^>jw<G#-KN|q&uV<R
zZ?t>#DnKp>Ul2igq-rj^IEE7NBB+IBsazHIOdwSx-~uZ@Mv?l~=x7SX^F9iC61YMa
z&)?H(8()UhX*gP0I(awR)ox{*8T|e6)frCIUu5=S#tdlO4*hw>l=SChbV1SwW^J9K
zIBTyvW8@rT&I`yl!Q6+6yF+zioEvs4O@=c<px-&WVWS$cRx)PJ4B*d;p}+$=FNW-1
z0hc$NM~sgFZ@;m4eH%jGumN(zF3cl^t<mmp=2Kya@v(J}x81^*sKw*3!fBk-EgE2&
zWm&-I4gt*S^~{_rc}Xs)`Id)ESbX)~d!pwi-k##!s7kpa<3u2)8aj-ZQb*Qzu(2+b
zb-AMQI6d&!rJ@6*mh3SOnWlyVJ(QzS!=u8=g9C04I09gawqyfxx4h9JnnYoU4pn4R
zXvOaB!vgz>w+h6H4o4!?iuO7kn0)-e`viRo0r~(juw607;-`_#X$Td&)1V*T^*6yy
z7Uw<9^d`5F8Kz!icPTCNo}mRQg5%xNQ2jW}HnG3iG+t|`i|6x<UNhx=eYK|d*TL)G
zM|*grhr0Ox40ZjMp`d1nMd=h2oo7IXi^|?fXZcA#==#0Si&mr9>a|m+ei-i<rTpg+
zCD`<-vL~F__UVJ)^60<%z6)7z9?HQqQ=-;AQ$JNg)8D7PUaE-an;sJ(B)C+4NjMWC
zp2Ub93`SEPdo5W!Z`51bZJ&Uz)j|cS2?XUq)K5HxU3i7nch_k{*j`!47%DYzR<!V*
zIS0yhES~G@>Q+{B%V=z={{AGl8YJul^j(Bju2hGFdk-?A#p~6H4EaG6ekBVRuPfG~
z&O)qKotL_1U8M^P2fqllLy(mMwi(t_tUzWc#)ln2PATG6KC8i62Tj&iv=ZlDvPdFu
ze9eM^QVNoQjO0Z7xW9#PZ1qQU$mX&m_OG--D&~vExHxj8@JGv0H8@mpsq|kWRfNCD
zfVUv@Z)@JtTqoH7)4a{<EL(~mV53u*(J+wqr`ylF|7cX*tpc6d87w~o2Q^oLqqD}T
z&B9Ypdn@zAhkF0fn^R$bJp~gU-E^jAw!xPEJ;re`UNxPT)pU;Zs^aNREw7VElUYPQ
z7N%Q?$FBz%>{E&?Wgn=VYNj<CNlY@;J7=#H_A{ihCl!r4Xr<FBg+(^&-LYko5^3^+
zwJ29Sh-G1E-7^+(GWce!oqrPr<~%z1`j7G#_wv!;1ldfiN^GUW7aj%o<;%@xV)Swk
z2CU}0lkI-b&9$Afc@j`!f+S^=n_EV$i}&kS!`D!)##}G3qCoysmo6EHa5HljR`y0)
zVCJfXe2%@5<Sh0YS5^m@i7E{r2NUR^rzn6I_Ss;Dl@|(xo$gTxsJ^C7uAuA@uSkaE
z#Bechk1&>ER?34%tyT$_sg2P(`yJJW%Oo_^vGX`v?ppui7{$H8r25A5Pt02Wc2(dx
zy&>dd3|;MO`4CPjGI<8oFjpF!#U!zsf-}!oc#r{odj%0OQ$@6Xc$z1aC9^avX~fiR
zGWW3>tOYiTBr%%{SK9k((i4<W8@z{~vDN2yjK+i>kc?36wGQCW<33{^OvQ2rDtmxE
z_sT&Y7Li72D|d;9Yxs7YeM4iTVmB47wjh)ndl%alsEPqq)2a~y@!b-ZH*N>a5iwk{
zDu_hN9e7c!<vqhKXgeoS$R5swpEb(V-cmlhH$z$r)T-NCYl3Sc#u*^wZ$4?*vwny}
zc*)@{YmBlcG|E@86>%-#$ywT%ca_$&Y96&6{jF`W)T4^LjCy9VG<52+FqKATda;&$
zHbRV8BrdhQdDtglj0mq_HYV-E`Y5N$T5FeYD>n%VRaPI^YM_!RC{*PE?{MRY8{O}k
zZtLRSMvd98pqk&0+Ig;LH*bR9mnFDsqh-HUF?+^#3oouum#pJ&zCLH=apfnq;(vJ0
zy+(W#-f}o~6trD_O6$<4kJIN1*DA6o4$zbF@#vtY2cbBAWqH4J@19ot)lIy$g<DO(
ze`f^{-rg;fx|eHXSvtk2yzg@JqC{wQaOA_nuAO%l-lByToxAH=PPRO^%SN)W@g+am
zVOV$Xu5J@9GTfeT%ShGxk0gFgbuMy~eXu?26?1NFUteE8!LXg8VyS8JC|KC!zHi4&
zQ|MDW*lBjj%x5?}TpeE%gQ3hp>N+NQ?T*`hmWK0zjjq|`xBE5K&T)9V-R-i=9!t9&
z>Uh|AHr4jIy1NY)cSn=DynhMt;aBMFQ3nd+NvVU)lJ1K2*QR~W-_+8key<A#Mtk@D
z>PjtcGw0+*x0@FN3B(0plH&?}Vv!J(sIv)eR1+$(B{(f?T!lX?sidQP@tpplxGF?B
z*55^Ynf9x;OT1#^TVw3fTUI}VW3a2z#OJ5K8k4r(4Yhr2$`$YS8%1g)jav?BE-fF@
zXE+#7BJ|TXbWLjYGqO-DCf4lnZ1okmvzXh!yr|96$eAM!@A6@7VU)wXT;k;$i+sIC
z-mOc@{v+FWGd8Dw`E~SrI{pIr?apRzKe|^Zw!ofJG!(O;Y%`eL^K`d&xE6q?WpS!<
zE)P|MO_aDsZnZ{iu<Y<Gawn+t@ON$QGA*%}Z$C)PSoqt?IxPHcE`}VnYNu_nFs<_3
zVVp6oakHEmYi}vB-J&m_hsxr_%G*Bea@d+IM@grz$V<!AAW@V`Eov;#dBhEwBN)R%
zS7mnoEq03ev5%d7ZBpH7J*2V0#;DHETr~{l6|!=1?70%<-Q};=tk+yh=kT%Bq>&>7
zXth;bUqG>Xn)&cv=aGQEZS(5a+4U_=qUbl5ne0NLreB|`+XXPNboFty`paCan+g_n
z)yz3tn7*W~fk~av=<lhoc)4Cy1YB(XMK<(7uv|jS(`iV?HoS~3dRw(GsOhk8^x1e@
z8hpz4*s$}IFjvQ*^E<iFVQ%%t+SF6+w!1u+7l5}FRofR_8+;_!?}D!v*n$Wp-Fxn(
zot9@Aam2)Loy^2_*K;x<NqmJI5cE4}K}YY2cKPk|-W(0;?@`ZPMdzqKUCH`a$V;h^
z^FhqgHN0a?)Xg7l5{YP2x!orzm0>)C2c4#Q1$c9obnjH;HnT~C3d^75bvpI5&uHP<
zD{8ZmS3<S69F)uG)^a#{!qu>=oL6qB&$O19g<MW9ck9m5bduOz^=kIju&DypJptLS
z7x%Wa+`3J}vD6PD#~OQeC|K7!0L;cXSUl<x2{pIXm5bfDya4*mrS8h!rJ*`>xv&mF
zN^20^WBT=GJ+FVnnRRzr8tOaS%4iW{X3RDjsD^y0+~3y6W{JupUwM?HwfMU@`PYG?
z+kPy(SGyl4DIE-Zy=|t4Uo^Sf-wU7NbLC*Gb!_M(z9>T0=_RL=Qcr8}dEPnY7j)pP
ztg%iVNVt%@3W-mT0&E&ql%EXrZL?{APf{hyQIstaso008yx1Yz^!T#b?YZ<k-bufS
zm-y1wW43ZH1KqIBraR!w{zn}u>8(2bO^ua{_@d?AquiXKfddleV1Zc-;&PR6Q%yUl
zR*zLJ^ht2Vf+06_{d+Tp8#~k9xmulb=@{+0S{tI)Zoo@ngFk9u?d3b+Yt<Xmn4j|f
zm<8-;zO=IdEc({AqQVmIqPIl`h6>6radM4gvZBJ;z=Z7TPJK#SX;2n&#_8sPbt~*C
zFDKI`y4u38G0`ZP6(p_%>Q06pP`Y^#>q*8f@RieK)#BJ#N@j8MH%G&+abwkDbddJa
zVNtCC67es0v1deHd|q<q6rz$@$8K6t{e&f;yK7o}rF6!$mz4DQ>piQg*GLx*D#cO`
z4`Y-_#gZ7Zd1)tclbvg8&@}Bc_TS?5^I*VKgqi8JC)1syio_ch=2@=lZFYxwrpz}J
zi-l@9T8-4Up;gD!bF{S7P-y1U@%1sXdMD?-DOBAI>75-k;EL@IRX2Jr6=s6!n=2}!
zk`^q=3Ws@l?W{R^Dy}|?dxJYU=5I?!DQD^nYiX|?%|HywQ(nz5V-{mf&b-1)(d%e*
zb?QUNhApu1)=}Hdq-3%R9Jkr3w()aPV%a|^Lp`PDWt>s%n?({jAE8Y@7Q!uuJHmp$
zM9Vt9nZ|{NN(750b<dAmWp2>Ay1wOhHtupC+g3R>(Hg@$i;thJ+}B^}Z!7pUa^@MC
zwY15kQT%b=Q&aDcVQ|L!8+Eza{JOopBS&i+DbR2e(omA?*CLG56)NjH+J`49FK0O@
z=d9)`y0M=vhXot-tj<|y{Qli$2SEK7+jSm@I(*kdn$_p7o9HdhI592SO+GH;D*SJS
z^vz|Wf;ArbQDTr*s<~O6=<DOtxW475ERVINTFi6WdLTDlHol&&(QQ$qK%;blUmn^L
zc@_x1xxv+E8?cOSEmV~+A81J{y?P#@L^S_1V6~ds9FoWibcG!o&E}g8Sxuqp>Pdqe
zJ8xejT*Fma$D1riaGhbndU(bi3>;`&_3T%>Tm**UVa(&!QmY#7noe7O-9DB@o)!$V
z&s}xTM_SvY+i}*@Sm8TQMNZN1W2!xGBihu+v?2awYHdqZJLbw}?5#Z599gW=98@JV
z+~2>b#qRe;`76H@UjU!ecE{&RlLL!k_<g9cBgW*Q!6uv1MnEuURXUCchOPO?CsD{0
z2e^Nqu7aqbE?hogm+W{}8x6IHf6DN!7)Ip2<45q}qKJgH89O@i2XN2$Fq3O0Er@~x
z7FcrQVhGuA&6gEcD^7*ePQMy(%ouUaIDeZ@S50|+mYxH2B&xv0VY4bR!0*&8TI_9V
zHr9+P3y-@$qxflk?CzSK(^>k?qRLCx$G?ri;HksvpaT^kFuL(cB*1*HZ}^>wQt$5c
zvW+%rG#KA6tAQGfige7;sAQ2Cpb)qG^K^X06o(&N&%&&NHPTKV7h*tvuP4#tRQEkp
zidY(kVTdA>gWGAEj!+r*UUQ@EH}&N6S3P+g6T#2v7pa5NP794Mck;dOEOhiu=$+Vr
zISdd2VKj%wS`vhVS`;+GtC8$`d&cHG&y;Z(m`w&RG%*jpV=QS8Jj<Xy*G9oUNyZ-q
zsCDYaQ}uter{*X2pPazoioWe9(K<uDwJ>G*RCX|02_}LQ>!+Ym1MPh8`|c)HU-{qP
ze4p6dUjYctm0|B$BSl^oiDGQ%U(?UanzO`d5F9>ig<EA_Upe4!R=4~4yJU_UaPyi4
z@AJAX7FJUsTql-KLF~a9QV#+F<aUq@4WRo<M(q4fQr#ojtBgG!sNnVk1OHFwQZKI7
z8L|iwJ-qlLI5-qx`Vavij-n<0H6;ayZ}M?*?6o{f>RqKn<2(fX=H~>%z5_sW4nUfI
z7M&sHiv3)8`L&AZ{fmd|Yg*pZkswGp;PscfoxuQmt4d#uECnYcj+1;bC=?rk<cd)S
zJ#R&lI-yTKuX|Q7v_Rk+BChwG^5S*ZtJsjr0tXyZ<d(~H`6cp(v6%sD6{=e^23D?L
zhm`$`eg5%{Pj@G^@jZX5QR;nMC!e#~1^~t|9R(&*RvyPoP7CMCWrcUqfS0pr0gPj1
zb$Mjfg$;_gQ1_XxI&hc5)nr>_W4nY;Lg21X4C5x*&Z+Jd#9YRWqYv>}<zmC55wLe5
zi3ux`p6fny7K_6dbu!tzYe44;R>OG<K#I8))+ISQ7@WCu*Js)4Ba*Sl8#h|Svy4R<
z48ruUsV!RD$ZLHp(fbj*)ZcHn+ZZpa>z<ly&@VcU=DTO4K8XZTu<(@`ebIoK%m1KA
zCHWc9JOLOO;?iAeQ*zr6d#72Z=*rtoJgzIcf4%fMH>2V9pK<U$<J$aU)TwPOi!P7&
zzmVBC@VkcZ?RzXEuqCzF`Np&MB0T9K3jgal+>syRWsvymQ+_k3AUdf)eB1&H-sz2w
zOjjIY+R7duO-XUB>I6wlTI`XwEf*K=Yx^$6#hGI{{XKmDZ`=LrES@F?PU`~~1@wEt
z033YCNJ<EdVn{dzDZAlKFU<74m*yO0DM=*Y>-vL(h`gV#!l~V1U$?Xje5}vk>&Mi7
zt<R|uPc(_jPNeE_SWbk-;!*AYYP|2`(~LK~+4C%J5%%8#gDA2Z&BmM|j;bD^0LCWd
zCY>KrT=B8v)$KSm%nBI&PMrttd>rg!Ip4d({@PXgMp~-?Esm3>ouhy>X<NmmaIgxr
z97b8^Bk;fB2gQ9R9<%(9Ppb$hb$t8O$g@coN$I-P7PI$QqwCgYwnV95QIv4XGK~k0
z%J3qiD*09VD8zbm10;-N9E^5<$IJD8|C3k#IOA!1%3abV_<hCEmVbqPdx?pCi4lQ`
zR7NqcyEB0qfrcLQpAV|+CY*m{Mha2K{lDAy{!cUKTefoY0l+yQ)#C{-NC|+zqX1s>
zXTjKIkkE6tnq(Re?)&7{!`W)kcAa^|8GsQH2W}@KI7fZ))Ym<~iLJ^!!l@tMw)M0X
zedO-*>dxqCwp$IKMdm@)b3Fguw2!FM|12pls%c4TK4LSbKD=8e6lK!2-bO`6MUDPL
zjF@>h=LcNI9xcE+w&!23ZnbeT#uUaHlXz7TI?V7J8q7>ptbNyh&35s9ZPBfhHf@c4
z6f#|#Jp#?G0_>Un4I&!#O*XLGsTi2)8K!{4Rai(9P+-6@O~FC+{IxoQ9=eke5VTE2
zO|;>&qw*^5w4*KM^|L=if%lEV2j6#!tUn9yyJET-i<Z+rTW~HEVZHB0p8va6#GY?9
zy7->2O}wja;S;_h_uqOiXP50Ma2=AAd(nI|{I4M{7eNaLE)-Lze_HkJLaj_L{t)&N
zS@6Hbv+T99Ce%CKH(Dr?w1Oh{&-k~Jo~s|hLlwBCqj%%7JLs~qU(Ek6KXa$m_2kaZ
zTOs9BGxDD|xdCT+2V$E=WObnaHm47Rh&}RMitC##M)_4?0Qy<}N>lmP-h_oN{x!7~
zk+2^93_Kvc^|I>cSKeFowA%W3dmTG?PmJ0JO*O81lzwb9)7Ec4EdRkszi!9uyu7Kh
zg}v2wM}h&n8ek6}JZ%TblgG@s!Iyz0{z_8H<(Io4_2s&x8f?}0fut(AU=jNBwYBoE
z(TYKZS*tUnk@lA6zp@vMu&?7synx-K$k4a9jbuT41%`nTczwQ4JNVS4ZTl#Cqa<G?
zUZd}+-rO|BG#Y%I#w{z~<RmEDVYDPGoEn)5)Wdra2|@n0iSCZ!`JaBSuc&csMV2AU
zE0_sX&LIn{lY>_cU1HS5qf@Z<w48-p&RY2{U8mg6tmP3NPu!#VEEH{SE4lSEwz57(
zC6m=Gi(8qix_aQOQ!1|WA_IcV!Pc5N^#l+Kq!E+0hn}^23RHHf5Y4)OO7=Ugu3qU#
z8)h>ZbL|lv+vl^rm@CL2Gh3Bevid8osJ;$<P|5G=>MPF+QG=R-fnSu3F)@){MAC!p
z<%BnaT<s?Tg>=t7J*(fI{d!M4`BBf)MauH<J*fIkP0bv2Bor5qWK)VJbkuB7Es~hK
z!8}b&<Lxn7RXL}^3>|P(Xk4{`9$l(@rJf~PgB$3hdf|Rf;*Jb0Vdv>EoP_TOO10cW
z)<18a)=hD>Rj$^wr23kvj-6S^ylzn8TeOv3e4Peb#Sa=)YM*LKkWQA|?ms^Fjl^x7
z{hW-XJBh17EY^D=7;%Um(R9e3`YA7Nj(K`IoD>#Zo5i267tr!3k9Q7{@Xbw!5yI!S
zNoqZ+&62EVs}{+=t6yWec%=(ts|m@-r-8(seVsh!g8Yb<`4tW5C|#lU-Kl#E3#h6L
z<u*l1dHkIS$zHP)C&1m%&`@V6*80EPMplz<yj{f6lD!y>)URP-S64+w=1g}tGu*o7
zwK6iMyW66Qh8~~wip9gpa;5BK2{g{Ksj_PH&7LAO`n06Xa~MF4x{Y2S*eqi_t7)*h
zHn>}D8u!o}=YS#^P@|-dfF$X9LDdyd^<UG6v7p83{5cj*CWQp$ZY5Q0AsAbkg&7l2
zX5wBjxOD;K2?`3T%QSjW{2HwC=HC*Sgv@}j0w4oMnh+P0wcIxEm6+=M|8GBKM#k$y
zG38s12nA+y0AOL7C(0t}Q2FZI>^HxQpZ+~okNx)&{MCHwiHu79P;Q7Lljg_W!qM8V
z&#N-7MQl4&biXZ*<+}<q=W)e5JS_^puQ7Rlx_HGESg?lF%{}rc*IzlgQvwz~y=~TW
zEi<R?J8icXk2PFndTLS<h~#L8gt$18lCge?LdH>*B}~kjSSp~mYmv%D#~FgOTH3Ch
zTq{zkl+0~ya+qZ+ZKm_u&*)|YJW85!JDD_;MS00Z!?d7@domrK2i19Jg7ZiSF*1X~
zU6$!wO*G51r(10@ZEVKs)T)KTAi;)8L%{ZHE-{<N`WdC7KTz`qW$|xRn;@!_R_<5Q
z?W@qxTGU1(M)7m>|BdLOOFLs75Z<G{kj%BS6Ozop@dZV%N{uA~%SU8L$?BJ(x0g<$
zZ1lFS*w37UHv$1YS!vSeM1IhU+4nqmcXV=9DU2d+YkRFQ?nP1vSOHpaDTw3@;o$C^
zGKW*g{3f~M!ZSV(Kj!)iIviW}bcUCCDHPjKiegyl&fQ?V_l{7(MW)dZaQ~B!uiV?4
zU5n3oQ-#*9Giguke&_ooEX^hVwnH1YnF?9PI{b(7{ojk%|Ev1`PhEu7Vm({OvjfY&
zeFY5^AnFo?XyiP&y?R>lRRiraH`_@3WNeXXxEkHZZ7opfBYfYNBPUy&6i5Um2rp?;
zk-09}cZ7^dqdp&1VZ%TR;GKtu)PofU1u`<kP)=YvR6^<wVu_x@Pj%lj36%(M5)r-9
zy+>oSd@f6WGsJ)b<Cc7;xQt|%U#U2#D`gKWJEy982O6F#$x?aajeglk0&&3P6w(9I
zetPn^?6&=90Q<hJM%N5ez(**D<LmX-Tsu`wp}LHV6v}aJjAO07S%A9rr!q3|{=bJU
zXyxizUT+43Dh3Cui<m+chjq|8mu51P#xK<0%s3CP&l!wzez)A+$3!gYt+0Bp&z|0Q
z%*k_S2xEx-caItWQtgROKC(2Pjbhg8d9J>7t68<J$1v`m%KdLc<5fv>yj>Ef*t3Ov
zjNFW84g7RIqe~*H=~rD?1ybPyf>9~9QBK2?D!3YRv#CK98Hk4|ivI3beyjY8%m}t6
zn4o+~%m@?Je;Qo1uX@^f)^u%GF4A4k;69{T+B*9RefwQ+i29wlugT={*PQ5-@m3}(
zDt;r|qM)<#COj#TAM7a(m{(c`+8AUM&C@f6@*z1Alm+VAfNsR>5voGc(L*^eMo}eq
zIXma~lA#C>+oyVxNG<FbsVeepr9y5_Y8wH5t@d2ct%+Vz_FdWVvy$ZSSP_a=i^o9j
zX1{g=3XxEtiwM(0=DG$D+{5tPm3GRr&&Ore^h{NFl;a?hxi4x(B>#Rc#?h|{P$fM*
zUwl@G4@pQ~Uq1pbOSG(ENQ(FZ6{!&s6NGXiRaHe*RaIQIRZ&${RaI40cePc0UGp_R
zX8+5rP0eTTo_f;s?&R4&_v{&h9|#h%Vvh7#X?={(*ELm%5I~2n?q!-NvP7`mBlX=v
zMmupZB@#&`RaI42@6R_sWwz_K`zorcx)1JtWHe^J2KvV>wyLVCs^Q`G>T61>s;a80
zs;a80s;a80s`V1T%}SkW2-DK^wu|+;8Ua#-L<oLT4&7EnA$R|M35@e(!x=v<(VP6`
zfj6$7MJu$)<0w=8S=*gV{3fKT8HlU3*lAkPY-!Z1Zya)uv3lh09M2{WUXM48o$;y$
zEl+2-rKrYx9tQ>xm}1^xpO_&qgA8?&jLME3p#Xx%>!XLF@@>UybByuActh|Z21~%u
zNDnDp_m@sUrWDS6CHYzAdtO4!$jZ_=0P$ozvSc5}A>e*q-2>sEccfwd2wKoM_ez+I
z4qC;IA>X=*WpC8uihz|Cr8uZb_<4QLL2$CSzL~}p`>l?HB@*8Ofw8FSIy?LA$8hdB
zLu~VA=v$i`4b(Q;-M(w>G3TERi`w?Fw{}b!@1B}J3LF`bx!(25&*h-I*Zlqq8t!6f
zJ#BD<p7dbeK%mRAWp>_W940((oP@(64K4XUi}SwzU^+1$8&XtYUSu|mI?ny<m}H#I
zYTv2p>&4c4mQdx^wv^jtj5l8M)K-n1gzCyQhsbHOcEEcOdws|jy(5CuKek^|D)KPu
zd=EJ*^ZDrNnqK$Ai`n_44WlDd3v<_P&0mE2nxN|o5)|cOt~lTjrre4&04>OYZ6{I;
zoQ?g9n)TT@hCxq><H%WjBB!lTM@v~*o<5%;JLWU5*t}-N_8r{2xf(QUR+X6KcUi0v
z*ly966ho=xUFWh;0ALSS*z9;aZ~%BF_n1O&!uabmw-Pl|@qAR^49=yQb{C!YFSk2F
z$clqxT=BosCzu&S8Hxx0unrRaza=q9(g;DxiOeR>4O#@sql1+>C3U1PhSA2&9s3Mi
z7{|h!X!x*cwX57fZDoM<IVU#WZgdL80by#<Vef_rhLe9*pGtaMXQGQ;Xk~N1>?H-|
zARY)`BQ{BgR)~HVPfTan`M7q!=fM7qX3@p%dY8TrCF<pM!#*-=^Z&U58n8>sm(Ts%
z?tkF5<$dmftY=MjNa0v{DbkQp^f;Qnqu2i56!r%Dv1}PB9>O-{3^XOuDPz4)Kbuh>
z8Ntj%1pxg8_YQm(75uwMvvm4LK25O?r(rAbl5{3NP2&38(!Z@k*GV=_Dn&#Vpe!r%
ze#-)HRoocv5Rl!AN8h*cF1PZOH51Z6cqNGKN+HBj*Z{^(ZBLP`!L2&KE|`p6+!{<;
zw2zSx1<f1Q1TdBj!#{<K9k6#cdJaDOoV3w*?0MV{wvp*=`L#7OcYD3bJCnGBq<K7w
z;yciF1n(3@HA5C}0>jj{?PcwG#|(yX-Usf#Rt=A_5bGJnX!g34UAQvUpWlhhKwprO
z!ysQR0#*2*aHXZcr76~o8J>oCkZS@WtaO4Z^;dEh(;|^&*~vw1HXwk{A?Nhize=y6
zoUP;~ATjb&%iW5NT2dd({!i&LaGI<J2sXhxkT}3ZagT_5|8CAL&ZhgrL;98dMvgyw
z+lMQ$!1CRn!A^HF`t~l*&zRBjd#~-C_;osPzE!DFUho5xQV2>O*57%TQBg9@{EJ$}
zUlg*3PIyWbT5*&h=%Iz{u#b71J|nEJb7C%io@0W=y1w^bYl1G;kG{R$w4l0FAwNvQ
zB1}73Za(Rt6s#(vU>%|$z{`>&kUB;%-$*RlOctL1somCwtB!h;Jj|2&UdMuQ>s6zM
z(b4o;zPf>94uz;^8<htRkQ;b?<kKg+l6oDUM;lVTCA^%J*&kj62F6AI8k{yH)*a~w
z;E0KH=nAk~TXeRsU1MU#F$>v;kL7cZ8WgICIqQ6+D;h=VE15R1hH3mfJIa$*3}MKd
zF{45Nh!r{JzG=dqvI57Bvhe9QitGHtGcEKFWoe;7R;Om?U%+rLTf+}ffW|>R9^Dxn
zNIvgjmV{=N2_j-KfKbnXGeKWGv&03O*<MBECSNA&7e#>$dR1rAeW*f}MnJ+KEt<MQ
zm!x<`1aJ&R_&v@)L+mTl6Sc>SauU(KCYV?x#oPOwZ+Gv`)a`I1bL~YZj=Z*fqw;?t
zEhTF3gc|nD>zKfRrFfmzKBwtt1Bd=SYe*Fx=ydS<?B^NRz_+hZ?_ljk>YTZ#$Z;=Y
zIe^f;>>SUr|Cu*ihNJe6CL+G#bxSR9n41ji%_~X0!jLeb94zqWctY_`@K-JnFgqH5
zU-``vC9oFpC3+t-1X*Vz7en1wk7G#(jEjM=NX(4E_&BULlRdvZzWvbiB$Wq93wA>O
z8@$IInn-n&&y_+#&>kRK@dm=nT@GUFhI21WCz3$|dU<p}Pbv&iLqEM~W|kNV+h}~+
zTW{OdSGK@{CmhBf%!X|q`j>@QIC@L-qzHO`r#N2PLMN8y{CVG2_y;7&bA8vM&C>UK
z9FDhJjy9KLpnx&(xddi4Xw0qa^prUN!e)mqQ6Gpiz6vED{vT_|g=2%KrEc#2nee9C
z;y#f-xrGwN^j9DKnOU!rA%Z>|p<Ib!;ux&?%UEpxSvyKDfK4q?!B?(0dN9}XeC3WO
z-gq--(0%Rv?}_PgIu#-dmL6jk_Iq>550rN3LDE+FHRfPAb?7;>+`Un3w(BtR@m{)9
z{FXuLy8CQxbZ=7w1d_4E2VWLt^rQm^@p;m+B;yy0VmS!fd*UxyD#Cc3a|%y9rE`?!
z61GCJR1Zp_zJ&uZqC15i4qzZVdWNw!YJoDxKB=nGA1oHX8pEfIlmpwHVj~cZ$VEV4
zHTWwQw`x`5)em4OgEK|Nk|2eDjfQFG9y2~1yfNbpPrO%9?Tt-K9;MkQPfJsLn7S49
znP|xwZMhu_n8s4E){4kQEvmkX6Y7sh`QN&_c{sLbvA!G6hte`g_*!wC_>pt*N1xHg
zIxqOE!5YPQd&Gs9`Gbes)cs(A0fRa0<U!NNxs~;#D;Z3sbGCzOmjj@#+B-{|vg)pK
zSwD)M@BV(&Z9eLjxH6?=CoW-9Jn{nPhJVIrErvH|9YbgCqFFC&6m%UR=`|iB7+IW8
zwPkHc@-}4lGJldWND69>LIm<1L0Z{U7zlT76&GqSjIkL~GOLjgvqw*hu=5p_FfD3F
zF$bLi02FdmrA)CIBo1N#i|AvU_WzycM0i>DUdTQ|1wL^$o{8+e*2QESUfbaQ=X1=n
zqvsc8A)6EeQ|Tioa(EKCFSsw1rHdPm1oZ`spE&?#BRwrfbXvj&IqD--GGh%f&I|x?
zcC)Df#=nTBx0(0toLy$05(uHsZEU2TfJ>(6`n_)5A}h{wlSujA))bEvxr~m!48%Ik
z{B$&>{<f+LtZE~#Om6u^R4hP<<mF!4olIa^psV^ImQ-t2vJAs!)>WL`;R{j?M=_l=
z1c?e5kjkmMEZ#O@RK1Vmew5Q}y6ei72IAYz+q~CyeWy$2xAaX_e%0n`gwyqVR<cVi
zB=rTXDk9Vo$Y-<XG(ybX{HW>;POdUT$Ci8?d(332rTv|h6G5<-V<)x4+ur|y_Tkc(
z(|!3-xL_fg9WuR&n5!+tP!5E`^WI(JpLJ^2s_akESsmrHjw53_2m}zFL`I)l^I~=%
z1FrwxzoYr%-OIy3bQ79`l>$^dxgWcAlF~`{?IJ%_{Du3%Hzc3dE<W#R(w5qxen}AC
z`9ujTRO_U5X=uB0(*MYG#xyb_D{u~PnFc|K5AU%*+1^jSx`Pnyn(h@t*ETcuHg~XZ
z*JMt)Ao^gXIUHC^ex-pCJ|M88VF9F|AK6ugmdvnU%lsw=Z?(`LNQj81R2^b5d5w95
zDIWr+0*Ho&uP!j{47dCT5wrfc5#$O0^>JFnjC)%TWXa>GKw`5^hr9E<eeT_I-foD%
z3U)!I2w-UE`SYt`&td30XyW=a&Tjt(&RNI%+&sJ235jcj2Z?2%jS->($cD{_c6>N)
zPqO%)OSUFXbEx;Ni%6(OB<B6a{w2=h6X8FzDQ<d95)Cml&IaG6x-r%^&F4xN^SvF{
zV92`<_t5TNA=6us-_zkno|ELo&1r{2%?pOceS9!N-Si{~$H3!aT%`CrP{0tF#Mm|u
zq2TsXdAeCVZ)I`~?G9vyz}oxmI$(bKDXbzvPKXC|#|#r`3lL5>?>v=W_?@E4%D+P|
zu^1SM$p2wL#TRgVr{Bi)5;(OF!NT)j^VFp7sgLVLCHN~KX)+^COcLqm@n4BS;<B8x
z(FPRgqbp^;o3Litjbua1fO(}9OU^y>bC-)og582=NSM-lvQsLjO!Z*G(_5MzBugmF
zF!p@bRy0GB!@}1nV=TL%ihir$v%($?^kvHv6x!yRZ-bdYgU~baT8~HEWcB$KFjR;?
zK;hAClJ=5`jff#t2Ffb}9TDY;ZWfy}b}!*(3hZ4lfwL&2>5L9{ifE963AXLC@L($5
zeE#_vk`&vXl{c2}Us!#R@=%;IzFYgGcerof>Z4>WYB{>#S}IM_iX8^kTEN%mdY)R5
z_^!c<mP96W$PV4_>{7w%!OX>anH%a_!AC`rprXq~Yjc;5{U|IC1~QObR#c?Fe77--
zb+l|jT}Gb!x|fklw37Qbho2zQO8Mgm8B&m;#2*BR{N}2T(v5nhq6|yC5clp)d!KxD
zScV_*XS{T&b1T8Y#pqU)uH1qiYBRO7OrXt}=M&^iw6t`BRn3^GeLNnT4vx};wu)mB
z>08Lq9>NTZ<kQvBP)LhgKe4o<&%s=a-__1`*U5tADb%cen1NAl>a4M7#WpP>`XIPI
zT$Un$yg^W*vSE%!*mfDtlR~)k5fx9sNa;`g|8+0*_5R~cca0sEj?03INlB462_qVP
zNX*%_aLWi3P#i#c<*bz9V7SVP=W=&gOsH8hig;q5xohT1@Arp$-rR>X@G}z7mlefB
zB`Q?7>GKsCNDVTs(JGfgv_{(VjggP@>Rvu?w2ow_?@I6za_Q&>Fk$+TR~ZVhRL&_X
zzf7f!zCLNE8?k!ls@G7yR+VRuPTQn&Ee$&KxW105gQ;ZSW=)Rl%6gk^53-%E8`+5)
z3yns0W`h34iZda&)(4QB0y34SKhzy<D@ND$CeY7jdhE&Y&vu`4&!@D9eoQ;HH7&Kl
z5q{yndhda2)Jxbttx-LFzf|43F)!b#UP?7Qta6$yd^)}>E7E4+<+f9=dOX6c>+eps
z(U&P|=2w*8hRGY<0D;qGCQ7towhQ84bq7C1P0Ha*Q9cv=uZYyDn!KH1KP}7&@Ti3P
z)ao$Ng}OEI0%KvzwPo#iuGtcc!iIQyYD6ghYAW2E$XL+M6%7od<@}t+?;t&Okh0=i
zhm{8H@wJQvQk}_evXleWuU*B8!A8!=^dx?V<?FVNdBfEg;1H#4?9|U3KS4!jg`Z&G
zrB$;q!dS&fk>jw!C!9PbN#HD-lF~5Hc($_jPH0+ob_^5@g&ao19)uUj<Xf+~n00fU
z&UZZW2VC`hx7^Q`@7rU!h_;z8xHRaZOX~_PdqJXAd39;LrqfdN+xZRYaH|_{C7aUg
zqfP5-mti%r19e&0Sxlj=H6}f$!%K5=$3cbI!J(lm9xyxA+Cv#!k_BsvqdHY2HD_c=
z%_%6WYt%p#<!-`vNlV0%0u+t7OF7{jViFSZ?qQ=S^;~)A>{1yTmAtPG(&4jvy=x-8
z(T@Scu;*J|tNTOvTdF2;i9!v+%kRlT+9)c@s}c-WvQ!Qcc=vy@XbY$K&n}?1cW1(!
z)LcFU2W#tdGM+OdFRiGdbhEmb!ei#kJTOna(8-dU>O;IDi>>^UG`QMZb-3`LU_K|i
zJ4BKL<O|F81!EN2YZ*;`9K$7HTcmrZVptSsK3f#<1}z$yw;w$`vEedBsOraMulEn~
z`|X>mo}?Zh#$&x0Z%5<wB@AfSu#|ld`GVCdln#0>S7E7TdVtx#A1bO<r&&cWQ=QY<
zZ*!NNpdQA7x;m9CDyYkvBH3aqg(WYhue9zmRtZYi#h1RcJFZ!!Wt2t69vjYY48vW+
zXO;$BjAaZFyFX~D)n|=bWdx#E9wil@wp4>lqFsX!zqR9_8(Ru2S+;`*2rej$M$Rjg
zcyN<CMkZQ8u1I=BJH3A%hEL1sJU=04eLd#=r|%_5Tve0M`97`|$7x>U!@xD$MZHkY
zhw(p7O1iW2ZY_{6aKYk>cQx;_zf-@Vf`PXXCGy$x`4Cv!c0g${R|FC>ANWACC-2DK
zj~lm>Rsh6Qdf)e|vhrTO3_k}k+6>cW_4%$`%=Q-xNak9E4a$|v*vDG^2X7{COVmX;
zJ<tO0`(E-=LMNIY1f-0t5t}xLTRKLed$k5RxYOlUos<<8ju@Ey7{Cm*B!KN<_pjx3
z&+VHydnOdJOZ`;gTYdJT{$8nib&giqZhikZmh;38!VyBZT0l$e-r!&Lm?NLTEFgBL
z@j-_86erhhNCt+oR4K3asg<4tMV%BPQ*W)+gdPPeAq;#=uv4&o9$vES`8fU$6Wn-l
zk}L~Vbx^!Y^%Yc_xYI#1;sY{NPjYSwi8{>Cg0#lk3AZ~J5+69~usPpzZ`<#-o0htA
z?3d=!)WCms_B2Vbx_Ejko;&5h4bmSQSAv)ae>wjX52JT^heei!ja#S8Tq=w_mS|e!
zB8G!0d3w%ncWH~>^ew-<>T9+XHePlGTKASX!1a85_lr>$#+si^LC&UFt(-1Nm9jLK
za~M_fu&!WbQrtpZV6=Y8Hms*8K_I>3oEVAg+A_L&mzAcaW3K5KM^UStr3__oSAEc+
z=&30lErN6EtBDZ|2tnMH;(iKeT4*y#);w+cfqJIv^N4|gC!)%ASb2PE4z~W;r4$FZ
zv&&iIFDgL=?3ogwq^KT$SKg?Zv+Jc@(zviChDwgjb(Css25%%GwHr^DCKqdW{EvpU
z_fr(Ve=_v`&&B0nJ&4nka>RUmZW(mb(q5G#J~Tk_<9+|30`c<?MZr5T*V=XQ;OIy5
zda0}p3G&fS7juuBe%5V5OJSVFCSm<&bbggP4JU7^&Z{-2hoc%PN#7Doq^z<v6-mxU
zQoN_*tmA5P4&QRc;XeV}JUbt~z~_wq*10pptvcA;tT6k6bu)2u+CpX>e3Y`Vkn*uT
zzi~D^Gqq9B4E7tMru1{`;NNXuk5+5x(1rF3O#IXivjU3Mr5C^I=&Stgx5E4fUN-BY
z=T2+W?Clvk0m}aMApj(S=VIz;d=@UJL@rDGc8|IH*f-1!ezWIE>fhOB+X25=)=I$p
z34#v4qeU#dDW{hGG55%amictexZG>2oAx)%b?yi4NXrD&SdwDB-_{`1JSvO^+daoT
z;&<6Mw=+PKKJ^@UmnaZijQ!C&S+W-5ir%J~VO_QDt*0q205v3GXKwg$mspPOnvpZI
zRg0mUH>O->g{5OjFk?Hy&i$2E{L6hw;CH+8*dJNeUwsIX<-XKuQB7gAF}^2r-}<l0
zvtQP%7%)|}^BfKR_J2hu$*B+PFoEHVZ_)pT94CJJeSP>723FSo<YU)qH>29MeS3vU
zt*c}XD`4=jc9<uAV7?;ucQ7zyudAqW)>H~V!+P!^SrWxzgw7$h(W7o^oqqyVgqeA1
z*E=o5h_c|?tC^`1Rp}y82i0ok>km2SLUCC-hQ;p-f3jHeud-<#Bi*K9=2tl`4PZ1H
zQqi|%MYXceBVxJ?>@gcL@AuHY;eqNsw-?TFH1P0vLP9T<kZ|7L7us&?QUsuaghK~4
zDP5*pX+*4484xQhulSX9@>aP`yZFvINdDfswng3Y@Mmu8w@TK{U2Sb^`i)mbPqTp@
z?n4hA3?6z)0P?0`zqq;~Q&e(z7V)XFPG6qMdiV2hA9r;ZRnV(=Hnt2z=(-x5WXQ7;
z$|8?cv~HA8rj4nrrZd|E!;>1AO<wx_eM7~n$f<J&K;l=TY`z)-+;-kSK3**w%WAo`
zRFNIVCGqg88I+?rjRiv;D)4$4kDt~tX)@YgtD(W8p-mROs@tt%)}nO?zVX_>+8-%l
zb1_%>dzI=j&z-M&S92h*9Yrx=u?kB9>Z(gPc_vkdO{0Adro9^sI##IiE#yG03XVj?
z@+R-?waq5xCj+XX&?=?7#1_{S_7tbjuRV0JilDHEDo&|KBwMr>>fcD{Bd)@eGi<1w
z{pr$^iaOL$PnQ~+p;<_ol++>Q+ieu948@38RytOgcMaw18=0(enx!I3dVnWBNg!sa
zb<stzZF?RiPd~%{kaQbnIw_HeL^R?SaMECMFc~@L3Xy??A`0p}N!T5`v{o^>Y13`b
z_+bEBK%~D>fl3~uBU@9BP;z(?d}=(hW=g2ag~rym1`xgij}Uh7IowZBd1Efl@~ULK
zEv9Yz@H6hc(%+v!48SZNm;qnH8IvG-(#~Pe@^=_xkJlW-?(R;2K>EXu0cw4d>9hJt
z^_CZOGh1qAMI7dkd(7Vknsjj=ibV?3p==$qSeEC1Sgd{V>2>XQE;af;mqW?cdCLe*
zo{aP4{{6po!+Q^z#E8!%?cem*HdQtQNb@JzSMBw>zLD4d@b!egqL6u?CX;n&^JBt!
z+f(U__$D#7wz}HHCgh5Tep#n?NAG(6@{c9Neb4hZiFNKhrhWG@8~{tfU2pqg2veF^
z{zqH)1DqQ?a~+(gFUd)=EP!4(V6yfcaqfhLiq|I(Qf|#kC=z*VYFSX;iJ<gV#Gn~Q
z#a6Svc;xCEWyQjbw(<WWfR+IKK5^9qEwq5<b9zw82J_K=fSISQ8yX4)8&bp7_c1>1
zCwHr3t^5#whuQB>(`0tzzZDu*T-+;RF+GDq?%gFX?)J|AF27IG{q>kL2Q91#{Qtz{
zN;u6}_84i)e>z1Cu%MhIDmC-)g&3syiQ?+FP!h`(OdDyTJ7gmtW94V|S`Ujte&F+i
z)99~u-_d)nhOVZTKU~YmL=%$N#EqaR3q?OJ7QevwKZ)jU{&v1M>&$O_FW5uD=vX-u
zk{42!&1xBJ3)N#{FC<EKY#J87CVAV*zwOKbwjq@<6c~Lf2mh23u@)q!x#iaG)m`)T
zRNJsJC>#U7(c<w8=LAh??mCZ&`4dxiTdlE8R>s}WC1dPQwzA`VZ^JG}D&xm?uY6}E
z5OBtPMmz3W0=+(aNwV&C3zG}2yFq}cUa?|GWo6c)ljl;jG{h>4-zkVr5U!{~EQHUL
z7lk9ru<v)gH{gNa{b$BNZq-j#1~QrO_nBbS2i1!xMqt5oOjY@H#rytRZ%rX6%VN>h
z(>Z@RmP)@!<Yd8dsOA`i1a?U1<QyQ33k1L?qdCa{@1gbC%bz%NWBb;?Sd5Doc2)u^
z3PmPbAB*_DXX>BJ_uIhW5s4IkLNw~L!iGhQ@!9@fQISzUP?bg<o-EGws0eqk!&;@n
zh7F)ysYXSLMkqK?)}eh!9s(-uYS&oqXF3?DG<H1>-Y)Y~(e3w#vFA%X_mk%FzIP5c
zvK&rMN-Za)sO1{$fi&7EEriRtM2&c~_6rQ52aDXD19|N-fc;~a>pBcC7ejbmW*S8J
zP#lf2h07-{v@P^bKC-V${j~-V?1Pes5rIL14KR&>hjmuHQ|)9Tz^^!7{gdkKdpnN1
zd)B>^zH*vOp3)GJZwx-*urrsF+^Nb&q&-qh{|efu;{Ai%9OF@v*6ZW_G}NEfwv-fD
zrHYJ11&D%;63E0VB_E^7h=zRuXUb^L`1-%7VTso1eMfWS`UdB@|A<{hv^g`H$^o?f
zs_HaJg8=|OUm0*Egk`cI=Y0Imx5?*pCN>{gNx!6H=UCa$L(TWUq`kKf=n9GTQH>Ty
zz}gciaZnAuq&clf(a|2IOJeVG$A#WSAA;e7wiP@V4C^~t3g_=BgAXdx$cQ@b8z6$7
z`8Hb$A0y{UNCl)I4nW8RU^~r`?mzvlyE*WXq*k;SYg14UkPX^eb^5GTdH*?JKVAb%
zVez;AU2$zd=86$i0p}r)L^iMSIw%Y_P~bJ(d>{4Z4@7tm-+=_XX830e(w}{$5IZ#6
zhT$Lwd1lWDNpod|WeliUSRU$huve27OTNr}V}w;L<EH`%XL$GX6l?T8*R}P3UkR09
zjfu3bK;-%xlmW^n0RVHpL~fo`_lsK)11uhBqmBs<30`{r{GNn3hAx!NoAk8N?%1$2
z9!um|!JpcED!_AfTrMv*6tua~!N-E$WN#Vk@gE26xYbAU=7Dg%)RU_4%q$&#A5Qc$
z{mp-L@_)(Cpil^+-mm2C=;g#pByrI+;<mSyDH3O-g4%iiGv)eQFSh?Gm*v*q%@EV4
zt91Ul*6PUC2%?Dc<q)0ElPIIpZ%6ZX!%OYIK;U}&Q^BIJMDa4D73-(VL%Yqe4c*aT
za!HwLqGQ?R=i6j$JB<t6<xiey_G|87(AB2XLi{GX2lIYxY;z-n#3Iwa(on-cSpY$q
zJVWoUT)gI%=&ie&wyb%dMQ2^(^g6iXzt#EzH`nN&Ge-{==H5wq7^b5(;#6u39#k6(
zPAr9J`l!#$MENNtKn!4>;+;v=03i77I#BbO!#|dke>E?#+xv-@(%61m^7`(d5wq(!
zcIVgF-C0b5U^^iY9SLv7{&J$(W5_V|L9$_9W29)PU**(-tNKde?l6l7o@shGeyUBp
zw=)%@hBoTXXXD3J&u)7=kg7lWMhWV%O*HZ4ntd+pk$*SW!?i`vevDDJy>rapdSu5-
z3%9yd4xX{IGUMphfv(k!`?iNTgS1(zLqWDx?4YoYL9&`g0x<wDFFMSAuV~uBc^R@2
z2zg1i2N59`!h`gn??cVQL{GGj3=X8u4{tJto+B1)#amo#a0Tkf>sYuBtmi(29NVET
z&khT|#dEt@b#Pu2)qa&1`N_g=KbFiNuTD(wr2kQe{I2QKz>E(oF9gJE)7ecKIAckw
zSp<J<VYKx%*{C))xJ@N37%e9S3Fx^WpG)w=u!w8oHP<m!hAu2~{3uIFh~YC)tS=LW
za2TbB9|RZtuNqbt>#TtOZL6k@E?mdNc{ZaHIo}=we`F)i+XnTbyE{EB&?+#whG*(n
zie-zd7#@0Gd{9(mUFvys!ANiU<NVhDHABXAV`Dw7n}_jl!*LbgdKuZ>lU;UfuE=~m
zp|c^gJ^KLGhVIv!k0<K=Z>{}*E>z$9d{K%!G{5@Xd)hHQyM2zVGBFsV%?k0#!x(-V
zZkQ=z5uGC=XoJ4=O_-`k>6v)thM6Mz+X)n~aGxJ+&XHrf4W}XmVFU;PnGnSW5%>FB
zZmGL|lRF&2EK3C{xrg8%5QuS|RVY1k=C!MK4z7~TTjoq2cdUe{=r|+&@z3S^?CNY=
zjcLzjT5EBYHbdjeBZ3Ar(gyVKnnXEybQnx6nFdImUR*$-l3n^zfb~O!6m*Bk@qd&i
z0>q$R9YN7mW8nIU8SUUcm9vR(j)DQN5t70{`4JPwgVMhJp5plP*6H6*&zbCfT~Tx7
zv~$7U{><8C+Av$sI}|r<7t=)lB^BmBFyQa$a&!mO>AV9s?Qlo-?Xt*KmugK)AH|br
z?TRi_RyCKlEIPhU9QLE=es|^kY9Q}kHfmp@K&<L&Zysr}Y7~QrICi(dfX_%qzP*<^
z55ep6P-Idd$aIWeVYgIEoXMXJ3)~!jHyW>9EHR?Iv;5qY%*vw3dR9`PB}g}Ao#UpN
z${R>bg-w7%Xh7HtMSGfFV#<^}k=_wM(?xqBA9+xZY42nk`1G(#Yr|JT2?m2R_j`y$
z&b%I96a5_8;6;n~I)&QR5*E!JLLc7iVw8<RDpd&)(Vx>EOGgegb;#3?o3*!k`9**e
zPH@QsB#4exqy#Em!Y@^?vF+4}^Z00L@b6yoqbI4f+v#2SFqd3K=RUZ}-MV;0I)8C9
zo<mfBRVnv}64VkKkbz(LsW&##mBl9G)%>WFnD^HGoE;Q9rq#~*ksP+@4tv9`;6CgV
z-6(!B{GRON_-p4{rz~18toAai5wLdduANDx5B15~$qE7X6#gQV`Ydg3#}_^3;$dyB
z-K`^P$X$?<Kqxu*$m0XmWaTIfWx%?|Kpv=Fef8@DQeK|`?H86*nU7N6=lk6!AczzB
z!UqX`gn!C^#0%s5f3OMngQx5v`HFOsqz2@MrA*(Cf9S(Q?zCr(wOKVsEhc4!vorj+
zcFB&swc?`_RzJ^2=pt4uFk+V$kZQ<W8~Sc&tmMZelR2oas>LA*;rU<xO}6OK={b42
z&pTz4^%}&G+gn#ezC9zA%!=x*_r50!ZuH#IS>=0wn%naJMQ&(&IZB%^>^q@&aoh8X
zXDK5>>)B^>@3Y>yTd*#9-40i+si!B!U|*z&!ms2-X%8G$3eozHsvPFHjwy4xgaapb
za0l$mozL_B?IKF{Zs0GQsr2P31J$XdOA_QslA!uI%`D~v>Q%!GEAay`3>wo9)@Y10
zLG(n78paCndMWs##ep0AH4$oC`d=W4tEwV^IZ7}n6Q7Re_;=T3Ny5nIm<}N7f%Xg(
zOc-b9AWe0s`uz{Wu%pSra4!AE@(ac}f(sxaze<i0Kzu)$PserpJIzWxuJ4e)FR<x&
zk;dvGdgb>S!<)`ANwDr$`aBfyuR?%_>6~a&2rWd0-}dPS`Cgi-2!9EL6B9)<3$J5Z
zO=<KuLqEE88&fik25ybmLDcY5@mJ~MlgH>B#oxz8mcj~n6<*=}n$V+c5@r4hcL=K;
zA)pOT-SYbn=}75|bON+L#dQ5Tnz-t_%ti7ysO@8)&#ncFTF|g&cNKwEqF6hw?rO&e
zq5j#!1aGd$omi@K;r#kShS2j#AbhNE>omVa;|uy({i%q9)Q``LAeYKRsX*`N{+CGS
zZ;x#ANRuo6vGit5h%Oa+sv!Q&Ie8<~ga=tnB@DX-<Pb;Nd}dBa*d6YJFyxs{iPA5r
zrT>DKFn^Qb;Owb~|DVwPj}u!1&1H&T1J3em%lWG!LEkk20ZCONI(mQZdsKC(m%taT
zRMWOR_30|RYKw1Gy8l_Y+2+V=);{-*nz2D+iA?u7=~IFa1Dddc5oT~SA<i)WA?S2u
z&!?I*@_9ABfnIVrPm%roZ`^#E{&V&I)BUosF}6OigTq1+vJQn#p&SAo_nN09DYfsf
zD7u<G9@>kB^imde%ntbA&BN-te=>=#*ERXSKQE`>dl^}8u=kNIZ0NN*L#Pe**aOf_
zF@H&x*bGcy1Cfk9`dZ5UbqbvYrp3{F`XqUeUaJd*8Ty=MRz}e0BN`rTW&Mx4q|EZ*
z<vm!rHK`+bet!Eyx<!<!3Pcu>j>C|`tg&C8QG)JHVS$Y;%6w*<z5Uy!v)0U`C#6JO
zriZ!Nh`nCZvVhY<ISjpgzSnKu(ZU(cO&oHH<bv{7Pik4quf4HIRF`nHZ15p1bNOl$
zR;L=l!cVf))r_evT3t$Na$drM0_P)q#p~EhmapVirmxz3pV7y#4Q;$ynzFnWCZC|@
zN9n$oyn|`1M}EjjBAl2Feof6NeB^}!guw$2e2gEE3zJJ`kdfZ`<<a=uc-a5dihi?x
zfx&)(=VF#4J6Z~1k{e?7yeJJ<r@Dl27#$lfb}~L32*K_>^hj<n!1`gBb9LB?Jej{Q
z59H>w*S0s#7#Hcn#?s<H5r$^7J4S0eeFPW~*wImmdtQzuhJC9f33{?XFR^818CqW9
zqKq`$4jHW8NIcy3{l-@M)156I(g&W4$H}VHTHAA^`f+$j3;594HNVAZ>=~@Yd)S2D
z^{w+uah_Yy!(HKMG^rd`xGY6*!5U1BszMBGQK=iAG#l1^^S6u7bo4vMzAp|ArG~3p
z)&_^2#*C7tTq;=tQv`AttGa|39~V***l7j^_I?&B9^%dH_`DvEU#PB)5RZ2L^`rQ8
z_p)SS@w%N78zp+V3m*y~T!w5H8D!<ZRMATzZkks72rlwGFK7R{m1dh4C!d0O7<$@n
zIcDvFc4!Rkdhfr38^YDhZ3gX|RodL5-!pXmpR0t8=2+?RpI@}0-m=g2cylea&0-;}
zrbS`jhrjyR{0?vI_M#?W4lVR5jIo@D<E4f}Z=Ur4wT<JRwnM>X!?mNO)$i}>e0&zH
zuJ_G&o(6Ug14cG&xqP;JH*Wu#CpyiBj1R~1V?!@!)?(ISzT(0Q{r^)ZReT=TMk(L4
zzh#A)90ze4+-efeebcayLh9^hcA=eP)?)o%S?lEI9=_xwgzfxqZ6zKqp4k?rXsanZ
zoC*cad)`DM<Dr4UnO9MP|5p#D>pCthE=K!rdd3bk(xXqTg)<?1yB|ZF{r>y?46aZ$
z%%e`+7(-jIgHeH+2q0ix;h=GrJ{0{fa$-K$mDsh?C^yoMC#j!7o{-G4a5xxed`1wc
zQXs|=CNRay>hq**db5Z$*@jbILBh#k9u|6r8cfAK;su=>DAmk$9Rex!snl7{LE_0l
z669mUktwjyKYyt;|JLYbKF=RP?DKz&qalVE^icur<xr+adNW|@!#T(iIi*ALNed{b
z0XUvgecC&<g{6$>->R+Eh|`Z(9Q*#({c2?(qpT!x2*%Qr>$u3S1=6dz#jQ}OU?Q_b
z#0~C0T(+a5*Z*YveV;Si>iQawdY%Vk+IGDL%dgscuj#BubcwsnEDp1%|4RX=FTtRD
zt?q7*$J2HmkBR&K%ueH9U-)(ZlTF%J_+2g(afC)14cW{zl;_m)aS`8=y5ob96+=zP
zF*M*p6$gF+BRp5<$Mg;l+9M=_D!(H+yxueT{8Y#_vMz~hBYsE(O_GSwqcHrBjn-K;
z`d93OV3$yiW0!0LgQii0cR9r9Vcp70ba~I^zjj|{`Rp`RzrNOtbn-cnzFvsB*bTcU
zcenTU6dx#&<<bwRhBJ06`2-az3B3c3Abdz(2_gS%N7BQq6UId0ivFZ;I@rGIC&7mG
zP##_q*ILZ2H}5dP%WK)&9<8OkX@8@tg;u>ktod@hwz6)$e@#F?h<5L8_ZZffKZ|*$
zxx`0bpU1-w#s5Ybh2M1wYG8HAyN``XG|O;7HbVUmQd87s{@-2=F{l1N@Rh#)O<S~k
zI6rH|#j?!iSMLk$u63~=RI}A!@S<)k^l#zz)W4XsL2anY@}zzzt@;09$M8jq?Y`;%
z-VTD;vMj*g*ZQQW!`g*Ej==oNg^&JI1n#F$lI92ch*`7<avV?|R6%D8`Yrq^pCDuW
zCf$B++K8+`a`eBazJ*ls`5ydH{$Xw7=D!`V`*L`XmH(>^By2@@tb;@K4P1z3M0fm0
z!M&_7Rv-1c%WH0^Qqz&PLIwj3FE~LNF;4rRhe-~upYood{xsu}5e%mfR)7@q``>zv
zh3vi#qyBt+J1@@Y>3JHz#jhB;j;kp)Q84FdP&rPYFQT;mo`~_z3<;K;$9hS6(%2gl
z=1Ctt3EJ;(R%FVLDPu?;3aeTNMtQ*h=!h=!#ia{D?~4vLwm}xq$b=S!-*a&@55aQV
z0@T<`rfr-H5;kz#M|q1A`jd{}Gh;EhA^|NbQ?2I=>K>j%=D-vo4^8dIT+Q~_JI6*4
z#xK34V@~f0t!jltQlNdZPeFRF%Mu{eY*X%kTV~rP*nQT5U%Ex+n4l`eZrUN8TU2Mi
zsa|rU>3)~p{=Nu~o7a2(r^lyicio~7>;Kx|rGSS3RhSqU!|_MNk?acIWnb1vsi#q7
z)>>8Au1HaQkZHWfOU>$gb>HecFBUHayST7{8Twi!2?)JH3QTDi6Rf~lQz!utF#;bt
z^IZMJm2_?O&L8I;htBV)kH}}VW*zyD_Fyr4s|xh_WM}%w?dZkrRjGDngd6dYe?90-
zZ|bRLJs^mFFOZuXeG5CWiD!6;=I&DN$sM7yv1%?>9huI}EF5bXJ4cc35ZSt8p5^iW
zAB*}}<b2(t!SoXy`Jcp)Q%yikTf{1IT)HA^$#6~n)fNCG*8veI!NP>OK9NH7sdJ%m
z^!#yA^V8b8LEn7?s)ocOGNoK1!>t}ne3rFrD6$LqF5c#v+Rt*A<dpkSHbaN4<>&1B
z9ezaRx5Z3AQX~dBPkQ1{uC-6-tFmfLKhr3N9F`Z-1F&m|`})9Ux-!-;YrOZ62bj-g
znJY5WXtr<gJ-OdlHNfJWa59^|ZBVOh&-p*2o5js93*d5-xYro!quy`W=r1}$nCTo{
zzXr9lG0-$tcU*!eLv1^3-*=oGUcNpj=<l~}!FGDt-4L8{+nib70bw)v>#o<(%4+s}
zuAA<^yD^MoFq+v>-+g_19gAo+7&H(!u9(Wr=ucx+;hSPZTLM(R#Lb3!OSnB{n3c;<
zxAi^WgDfoEjHp3_h2$<EPOxHwEp7_*Q@nYi1%PJY%LB1zlM>$@F^sg$UV|!7!z)dc
zHgw2&d>O{#B~gQHea5j;qzpGzEUvaGlGUvoM$^-~Q(sG41iC?*#wJ;O@3mmg#a_HL
zw0F1HCZnqxd1z&MX@w1Cr7Wbiv6m~1i2iIAU@p6iJUYLxi)E(4|KdE{<!OxGiHRZu
z<s*>;B!D@A4)ZnmyNjy7Bgn^{`+Zo_G?+HAb)B!Fq0)PtD-Djv7xn+~r}g`uf4D`x
zNDGnuZ-?SWj$a`nj)NJ=4yAzFRiZ73k4wOf`K=u!h{4nx8YV+A^y8s!BcY5G^YHn_
z-8-}+dQt8uY(+3|YY`6Xth`%#*eo$`qGUU&gkS~)X=H4&yeb)z<Umj`-P=cxyueZy
zo=Kc=mb%>=ZZ$wsO*EgW-(|ty@Mzi{`RTRX4)YHCEv6w88~2SP9HmN^t=S|#7oV{#
zv77ryY-yYE5jS_0+v6Ls&F?YIo*q3E6}a3PaPN!N8b0}?lGMca;a2<@WLEI94YRUW
zSVOU7+esx^X5g-#3kbI}l!8Xv(fVF2{om@rbJ{K4ijh>-5Jk|Zr;Kwk+4LtI>1vrR
zWIqKnz3&TQ^4tHTwY~gw+a)}{TnHI<mV6^9d4-bJoOk3E;Vi$#4+F(TvURK~LUDXN
z;rvgp=0}|$^()WbWJyoANX<HUcCf#n4DM4c8O6Ux{BnZcVZ1^-;>vsnHVkn4F<9Sw
z6@I1);Sc7ac3)(Us4lnQVhZqns9|LE5Kd*wlar@_kf&GMd2pZl@cU)iN7C(w{AQaG
z?Rn175sq=N_<MWms_%vutG>9&x%%kCvTEOus{I?dTN@&cE8A*AkflFIXLFTJW@@FD
z8CIVqlhrS!q+6M9>tQ{E6%iM{_j0t$(@Em4XLvRqrT2hMKl0{W+}7KNn7@6CRc`4?
zY1nO2tfJc*bIHjg@UzbQj0!d0m8L^%u~l<UEZc?`6#Ygme8159c&qz;0iRl5VsN~M
zwVw>e>6A}9hy(zL0rv6vAMaI9)fD&+(Z8=jUO)NesU(Nb@`)NdfZDFgJY6bOT#~E>
zfK{a3DxlRWD^)uZ|Fqi~f-;8hTM;vT$LoQR@4ct!*!^x*tz_`(_h;;)R#u%lTKdP<
zIiKT({>^2C#;G?DAk8QRj<@X2+2s>|pI-B$>}kxi;jcYETdI3zpfzbx5q&J8zGCZs
z+MT9OXk&l3dHX7ywUI&kX<sPb-K&)@XQ~!fS>KakL6TodRf|)FSjz^f*0zgMmA&dd
zc<k0KW%;#QyPR%RjH6BE<nLYqOCbJy^T2JTARa9I*YtTrt8K_EI2t5RDeEGmeqDP?
zSyoonZvM@7VRp4g7FCd=;=P4C>tSq?Vj5H;l*WC7--QlnGQiK~e=Y1W{E8$ZcdFF?
z9P_W&Eou-qr>iLt@UiCD+`bavOi`foQLj2)Wh7ieoX?-mGCDkkXz3tbOphmg><T>=
zZ8eV;zuZ8lkqu@#c-4HX>#wxhxY5x{Rl3QM>S`IvE+N)l{>h47y*_ToQs0dBeJ+iQ
zjOOmeml?T5;XANBZyKix!#?|*UU;k<r3KCV_|!~UlO0*wrM|LAws`Rv2tFPm#S+Rt
zZT(V}lO8`Tj5+T-ePm=fO4h^8R%u&+KP4yAb%yiCcZ1H{FE;MtJ6+2<DxbYcnWW}r
za<cLyI^AvZdRbKtnd3}dGN<eRhtosgtBr?Nv<!UTLD4A1oJ3jW8TQk^MLjmng?U^^
ziE}X&+NiN~bbNkwe0K9OlZB&rhGJMIq8;;y+NpJ+TCz6Fx>c>}j!tV|6}*f^u|Fb<
zmiio6`Aw>-<HWJW!J?s2!`o@5)xZ5Pw5mH#MbCD)EUQmReKD-AvQ&wh8c8_t&(UI_
zsqpgGTs2-1t+vwVKTF9At`#9(i6y|&)FVxES(aYKt=;5yXmRyW7gt(%oCXmMt|}8!
ze7*Y5z59QCX_^+N5urwfX1%lGS>{HC7WYfk*Uy_o@=4a9`}oM=sBE^IM?EiK9rNS9
zAb4)lX7{+PNXxUOPD$puPp63{RR2Cb+U>WRs*}3tweRe=Zns=1oJM0c+FP`y>5bm0
zTWl^Wxm#H^KZXm<-7(-#kgU+j)jKG{v!=DL&@F>K$z8u|nR`_8utdUnro}~8j-3Xk
zjkSHhv7}fM+Due-u~p}~SZL{6yrOkft3t;T%_5rLbDnEb^5rhBsX~#&wdlF{U-GRT
zsaJ1$UZKpo)}C%EkJ-J^<*cF&;<k#;L_PkFySZjrYkHYDnp(wlH*pZ7<!z=Ti_&dW
z!Leok5zHK-ExU~tLEf|ZxLpHtDb^YWcp0baZD4O*mtMBM6_RQb4(=|l|0k_^WdnVM
zgCbknSOHb&xYHJ`d3Bbxq~d4Wq_Sb|g1Q!=NEWB3q<hp`RX`><uhtvN>Yx3MgonRo
zUj6@Jzspf>YuThNY+9%sek4e*Fd0ulg%_qsq`LoH_475K@@w2$?o18a0^?zqvyPm4
zXEW7jr!A$NjJ=;^n0(tzO4?e=oHu;eWEJUB7XQ14g2jg}Y4%#E>y_OuuW^AN3r}G8
zv#rY2T~b)%W~S_@xsh{D-p8)pYeef@L}DcPk9alRlgYdqciHEV)N@UW@FUTY@M$B|
zYA>v#cN;Ev@G{k2A1)Lf?r#bH=U+ju;W~+|4fkA(Z=$}we%DE>$~KSBPpDCy1ym+7
z`gNf7Ir={fL%hnz5bWi2&`|TJg9xq;%9a!7Q&^*=8kcmPKP2!R&gp30wS2RB(zb`Z
zY(8s%{hY^Lp{B*^G<lkrog95tbv9p7ld`p@i``7vY%sVvEf?*irDESzX_pyjItg6m
z>B^`}$wlmCt#a0pw3adDu-`0`sM433TUuCpI|c1>?M3bsh^L3C)@JXyb*I=T2xCXb
zmHLx|!|zqFgFlJWW&2)+vtMtSD&6CK9TZnjg@~<K-M7C+YT7DU`7oK%OWfqP8l48&
zS33Pg&CU|qSey*EJAyf-p&|6W?IPc8pRKB*>XXNR<ZMqX;deLW&&u|zXs_}i>T~Y7
zsHp4pG}cPI)gLZWUR*t0DhK+ESCw5m3to`Ucb$ur?_S}+>5ih9nq(l9s{gF0ReG<f
z8~%HH`z2qwF8(!(p}w|Oi!ToSD`_ki=$gIXe;A`<n7elO79-T2D9h%5XVS2ncTp8I
zBV*>ODIUwVtY$r30Ep5n<EIp(ZWLcWPgHf67(p4mQU&A^Sqdr;NlF<}PM<)Pvqw-O
zw1FtWJxZb{8Ckdq)zt21ZC&IOfT+IG9p=+@PdL4!57%q#u?>s!@<A<Pw|4`BOIJMB
zc)os{?6IL<tk?P~z}=`T+LavUq@sTTCA531D|>KBwppXN$1SPPQRXW7uhvg5J=>i<
zWrNMsUZ$FC*?M1zWI1<4K_C2<F;@t5j<ye@lhV3Am!SXBrJvG4BPcmH5e4;sBcjiO
zbczE!k=QjeBN>$y5F!IzpOD6wXsqF}raccIv+Kcz-W@dh^e48C!n;)@*c&+)tp#66
z?pzPIYTH@vIjk`=ARHOVVh)+Kca96fsp#v-wb{UXpOXUT8_mvH-W5Y)4`{<SF7a9T
zyq%ia1^N?<LUsluwAT{@f2czF<`D<;9hirvYH|hQ=8B~!czanu7eaO@MNI5sqNkR@
zg0jO#ImglbJ~qy{8?bMs{$$}k1KXwl_>VHDBBeXb>%q7fao)E!A+s$A%8ddVE?!UF
z{dWQHSyVIU_t-#Jg^pwM9fM{>L_|bI*vpW)o<*zq5@gTxAJO;<Ls%kv;3?8;YlOoZ
z$f3oWEMP#-)m;WD#YD0a5<wPHwh0;E{3;L~WT}ZV&Io?fpn#fVQMmXK4HIb9Q$DXc
zqv7<T^D!J~Sd12^!TVpv3|Oi#tnKReiWtwK&K9W}c-T^*QLwce;COJ#G+9?l%fmgX
zUs_$YHE2tGOnNzRcn|2Om+|)2qu(_#0|O?)Fu+6KF|vqUhBzy+YCjO<Zs1Q}W)(1O
z80N(}M{ZwLMnj*V<qByp-NAy7e%7n&-^YCAfSUtlh@P?_Y3w!A?{DID9+#@WYk}b7
z?Iu##J#9@L<wRy)(N*GF^Xzz778Z7yobHA6cv}bc^M>n0{=L^^=OIn8d)75F28Ls?
z*U>F{{Y5Uy7Fn6^HSn5yGUg>)uPSx)6sDG=7?R=F%Ffr-<#p4taTuRa%=$X$vm#Ei
zgGqq?s!Ypm6@&+tIV-3XmY0p%T3AfCqJ564vKdu{Y$;orY|bqB^o=G2tE-DeYa}~o
zIa{i^RTPR{M73SzwFhYyT2<wQS@9jDxU`)r6m_jC?c>qtA;+|Uc2$0HHo8^KlsI)Z
zZpnojH8m^iIu#7eiC*k!sv?R!!l<`)w#^C!$ap1`8B^0l)*wqx7ZW6)lbV=;Mu3Dt
zAvH<0OECFk(buYBrtDc7!DiQXOd`C<x!0kK<;~$^K=F&YsY~6S1{YGUUo9>NlVymb
z(lDL$?d+gwtCG``v3{yfjxan_uRARdN(!K#9SR&_6Aal`Oi<0VcN&Uao~Akg`97b?
zv;Eq<cmaV$*bsyF!ZCJf642U1VAJ2p&p%>W`=8hMIWUF;;Fs&L77@iX)1-n3<Z>{3
zsX2#SK|<P2t{&n<E`v{dFepDBJO9Z7;Qd3=425)W_p)237-S)dvAgh2lQrF1Zrv_#
z@_ofc4s+=r>?8P9oGL({lVt#>;E$HmvO=q+YeEbWiWFVif9HqU>v}&_EAtm1yzT$x
z#DfJ`f*+io`Yq9vI4h;nLzhaY_a!eXj<RPToczhJA$36cX$V#atRN_U@x@8>Qb8e6
zQR34go*>O?{mqD-Zqw+`-|wVZ<te^<PsmR_)6YU8%JL;c>iRemLXsj61_&B`qaaP{
zHQlB%248I_4!bQ_s>A40`ET(5ZDcq@wTB_)!vTP2Rf;Cqh7n(HN=~N_-%!|pr~79M
z^6A2PoOZzo#%u@h5CVoG3Xzn<;{Kl7|2gkJ;j?ca?eyOEAUAkNhcesxDY8{~U>T_9
zIgCJ)N?`XBzWn{hut_njt_NsBpi^s3G#=eM?&~Q{I-ZC!A%Y-ye~R@9QwdZcS+Csk
zR$MLnbr~zq9bg`~y%xjE5C{C#^t}zvsgKEx+VAx_MP{|aqI(Ju40b8fS3m|rRkA4I
zgH|K-CUr5Aaq@-?aE3)Y+#e(T{E-&%{vmLehQ$3#;cA@5EXICM_wC?z*&~e@G8+b?
zFSX&;W!ADWp|P~s*hiB<*l8Md-`TN_!#ohafT8LE2Z+l#l4)IeG{u_?246+5Eie`5
zW*J6NQAQKH!QO{~6$rEK83m|{EJa8dl#>z>LKpU))?$-PsEuV**;NtT+YDwjn=rb5
z;iHPm$>;Z7Ly{bPI}MyAML(m;y89hgN7=ud{yzWr+Hr8Z&!HMjSC${YJ)$6==A;xK
zC+cVy?{28r(4F-Y!PQrto6$X3Mlt<4Z&d;G;qA2Hr$hSFu=eTHP=~99?>rw5YU{j1
zJ)Vm+cb@a!cX^Cjc@O5wk<JIzvP2c3!JjK4U@;)?^`qaN)IU>aI0_8@j35H+YnYc>
z#d(sMGtq*PH%Dveh_bv3EJ;tX$A;@4zOdx*p&ET#QA>Z4BlC&t>zY?Q@iY4WRyWik
z7#uiczk>A*qLj>J_gOF+d%4$&)<LYtCe&OQl8|*00brwoS=c%kk2N{=-sxw)>}8SD
z#9$ftxoizilxOtg?tRcP8i-x%c0;{*06;v0``mF5<y(*$WZcc~kpx)f$%xDGfCKFo
zG_00LE7|E4O5SH!bqG=sfSEK0$S}g)t~o*G{LUHuY=fcbq;l4RcTW0)eMTgIMU4X`
zw2Rscx;6~V{o)M1T+U}&oAaOF(QWus)0#Ch?c(@--rpkz>+RC8V{2idw)hOGBEeQk
zj99Di|02T%9%EVe`^q1b!|~AmfAFkTI74y#^j}Gb^L-jk=kz=tb{ibU-#Cy*;j)Q~
z@hE_nbWEqsaYqR2U(<f7pHtpPp!!~leq+`XZgPk2S$~w&|GVNYN4b<mU&&5cKz&O;
zK{`r6@WgKzK;7{e+%bg4TViX!n6rOBjZUxneP`!$A4j8KKbV_ujGu4!88Ybg+a;;B
z)K{DCD76|R6a`$cU7V2EB8&)DBf6?P1Pi})0E5GrEKt>QGSWoFl)o?IB?+VQ4)Xgz
zy7k-9y{ySYF0cHk){W!~qrsw;MjQI*kOmO}(K;Uw=DVrsI4PJPuN+D+QXi1r<!n1>
zu?8|2)-qw>=P2xK?PheoZtORz;2a(rv{Z;JNAiZdOG$>feOi9Xv7@MikQ(b<&*~!>
zZ69VSb2YNwyqdyLxY|Fch+ok`c4QVbApNS*%xQ}m#d~q}Z*g31Kh#f<Kd~9ri@c1E
zSoWyT>6@@?Sngl%FZDe1Ay-KUH-fb^l2%$)NU*G@nEJcox?akZRiZ1=pdf-Gm@IVH
z@Kg$>sq!3sOJ_)R0<2Dz6Yuk$9&_~8e*f?F+WT35HQXED*_@XUgqVw>dF165R3P?+
zq)O-_Sf|P9Rhlqxu2%`9Jp_9c$vH=5@(%RqFD$DWJbfzBpanCb7m8U;1BGlq0>*WH
zqBkG;UWz|V<}7R!Oy3j%=i{0~#9su*^JBr0f*<*h*Fd#x?4vvut^JmajVkz_t_*i=
zfHd?S=kSc7kQZcXW^exTZxa$m`A4(MX{ObwhlAI&k*_LsmPLUt76Jfto;@nD9I{mQ
zZBu`u%vC;B^|Ja6Ot#YFPjlCCI&Rs!nNM=!U$?##n<{VRvyZ>0-?L=adlw`1G{?g8
zc2R$)cgf|$%aXojvGzVa#s4_?n11(E?t7dSVpq=9(s>`+HHO_bdfvUB4piUuS%#Dk
zd#5QWE<^Vq?{0-gVn`s*(Jtc!-6X#Vzp)}oOD>@xOcY@UIgix8#{W`(NhqI3s-74j
zV>I|xs+fWx<-ew(hlz_%agMAo_h_17km@-f^^9<Xt)`N8Q9(N#e^S0Eku}xC7SH0I
z3y43QTm5zy^XI+)Y0He=W5`=N>b9-LwVb<72hfh5h=n^<=p05*PiK~fpW3aQ0G*Gd
zemW&urC&4jjqEib9O2SI1CsedLbUI4Q|CLlzB<b{F={67TVq{eMLBsmw{IT6kRm}*
z{sM?GQg#xOub(X`fLN)1>0(|bS@<7J6sWnxVt!X!F8M4~J3cEI^g|mT6_a8fMT}b0
zHv5h4_p;Wx1Us^>75MzQF$I-xH4Z8_JJZc4oRjXzRujVM-rgm3BNc^7)DYg*x_u!;
zS&pXGxq-(%|1lTFOP6D`kc(=-?RTp8FYGFGs!utISHx`mbk}nY<GQ{(1#}kcNulR?
z!P(R#cf2M0ZAhEFXZT9$OC?M{bL+3`A6mM`(%Y~}TNss(8D^QSH3}{oP}$@?z9ph5
zFMarX>c*cdIeQ6eG@f}Uqhe&PdcDkvt3snoQ=7l1e86Y&5}>wpPcERiuS{_*>+@hi
zXEes@MqP^c?he9EYS&lO%UR?C>7=5H;SUo_UDe{GK2&&9R+g)~*T10x=Ql?3hXPa@
z+{ZzZ13IIK+dm5_^uLW8YNJ_u#WpHJDkrZReM_(BUa^;m(i$Q4>$={$H@%P1|J@=!
zR9jCs9!pg`oo|Q#f2sWc_U!#V_!|rmLurXN0-waTmWaWEA`5L|k%<@)dQIM}9ZhP{
z_^=t|FBGJs%_~Rxw@G_nzTu*L+4+A>`G5JbeMsyk!nyE!%n@Ocqm#mg`)+hEHPl5k
zF|yCA8_BBqw8iv=e#Z$F7B?d}&bbn~ude9kA)XEAviz`YKS}b2mLn(W$a#lui`j_H
zj~hoD^tI(bDl~0D+xzdz#iQ}ooR;Z1omZ-;9$lQ1O|Sj<x}p!PY$Nk==`-uIF`M%<
zW%+xt2w$z#Txc&0$tbboQfbTKkS#-3e?vXTPk^u)jY8xaIBiyP)MXBYP(nAx{zW4q
z2n(W@Bt@vfXNyh$;6`Q}jD{a6%NK1QgUhg~_%AyxvI8?Yj`o!rT=VOmd*L=d+s^zh
zj>`hZ`;Dz@sa&zzeFkFqUW;u}FU$2EEThhM?hhUH?DKEg==KtR2d!n_An<BENJch|
zeGV4CrSch&49y-TmoIjx3KJ#4An5{#Su=zUxg@g$ZCEWwA7k|P(HHS%#&VguSOX3g
z_=!Qo>o+Ljbw?0UBd(~YqTGGB(b^Kq5mlFGJ<hIYG+T4_^sJh!|BV&JNL)z$9ECe1
zQp{dS19cE#^-ru-9Qh8Xq&y-wVp;p^q&y+8m~bQ%^5@rvfKrabtRO1k%_eVO2`iUs
zOqImj%Wr#<m1Y%fuzZ*DI#}6!EWYwhjh?fgp^^D68{g~Cc+}qrrzC*cD+`oBRuB&3
zQdMH9BPWPRF-CA*apkHh%EH|1H*X`g$Bj(9e*Ec@>Qjpl^~x9azQ2er4Np+=&O6FC
zm?bkJ*k-UVrmQLn$p<3)36i|k91qf52Gw07)UQ7fkA!oO=5yy*P_EMLrmAk#k2K&7
zF@D|g?Yq;MJsbXSa7r^U_RNpR#V3Zt12uZ6Jq?fz_^n_6I1!)iLCa&$!k@wHVB<AT
z`Z=B^oatuiXXmqa&UmMv`1e(6zTvJ1oP;3CIf-2tpht^L5#so^zeIax577?QCKcR%
zbSRS;jG-As8-MroDsA4I&_ctIIus6bpWpoG=;HR@ri03DPtxY2BLe1oUpE?LeqU&P
z@dpB0SEd7mD>c3c3Aiu>xRM7j(LI>Ru~=cG{2UH&GL~?|4*<6NX<=#cR`)dy?!w9x
z;kYN3Ot}bT$V{vV38gSdK@fse3_ZdbwG-h{x7U4s&;P%-Pn7@j9rsOa?~VU^dxh_M
zu5o;rdY_I$*JlH-aRXJJ4j!*>8;k9<rG>u8;VT+PGQ;Z1wCX>;!;xHef6=bhk1ri@
zbh1VXuP6Onf+bM}W1f}EIjC!&hC9W}+VDHHeXA=T={$C`Nj2k)3W#V4rJ)lWxQq6`
zp0F$;%-rl5{-|Hj`n=$fL2CZj+|Iq5CSF^ut*NBd1A8KC(@SH3tK*850}Gpqu6S8>
z=z1EJ;q)c?mXDnJJ3o1Wk_sLa3$8`Ldm{wehMeHx_Z2<AHueR~8|*9I$e_9pY|AMG
zYwx~|s-eQJU2-;9k-bp_q{25D2Waac$`E-{y1JeMIr1DWcPCd0?=Q)9ZG*cWd#2cS
zT?-6R(Q;)g8doo)YjY!P)9Q}Oq4z+yCCX)%ua!ZnN-sIbH!!6}l;#`e)M^h$)aa(H
z`v;h`IPvN!;7yE3+^bk?Qne|J5zR_SAfjy23K@l6HPT6suKYxk+ICD}X*Oo*!cU6B
z-tw^hV+o`>bzp8<q&YPz3l!;f-lm34k_vlSbKLc0hq|@^>dD%MK9-piZmKev%~AFj
zuIdBoAnJ}#4$do#OHS$PH%K(#nGC+~6w%e9x>##8_Y^BOGOYhN#nRFS#%8RIxsH3F
ztcNRN4m-J;%@8$KXgnBRyLZBqL)|!enXtge86+1hh^s;k#<H;_cC0$4mMIKKcOklS
zVm>USo#cUxJw09-0*OTS&@qQ55b+`B`@0l8jMF-wmHm1LO91z2(GpjuEDcihBqbbV
z(nuOXWo2+cs>x#W8QF8(>mVB+<NOHk3woQ5+sp5^JD(%ycM+HPdCn!O&r&pHyIxj3
z8N5f=DVcs90L+9MUHPf!EJwT0*1yN_d6+y+)<%gaydg$+rH4K|$e7*W&<TtvVsTtm
z7(kc@u=OAxJNz>Pt}v_CcpyNu*NwC=7OO91N~?D*V`xR^ZeXE8tq7kH7zAP8<1iZ9
zW^+-P066r!azDoCuDCoumq*KhU>s5CMag<_sRpV}XEU*f+<6ZAGU9U%3}XP3T8+!*
zVUKk;j!UokUQ?a2KOz%g8-_wek1xK=@$=vEw-zh!ZXTcU;RQ{tg9Nk00mhuIVj3X;
zA`y%(NWh4Y^cWctbpa;$QbTJ&s8dV=pqm7?rUQS2()l}dr~>~kCA~wY27{LHv0`f^
zLJt7|2dL>n41oZJxor!*C8|&1ZW4oKbWlYab|37Sn690N+4`??+Udb++UidwOsKk+
z4rO2s63ktVOa<SN57mR?m}f~~sk?015PIK`XxhtOUHM$<Y2CSR2@8nRX<c@oGB`)E
zBlz626VLsJ5Xi<Rpi#$A5{K7)ub$&*V_p>>tZ<7z&W<$EDmg<IZ$glW<U3vjOA#y^
zI^FaZTfw)T-$L7S$LM)QI7U>c*Jvk=C!}p4`)a4VVzi#V+aS+KQXE84Ab3^WucB9B
z(#5T|<!ozQ5GP^DG_z3x2Nuf{M+d7)6LxW(V_MZ9XxfF1rvD$OFq{>PeBn{gIT*Dt
zILrft$(T6I1Dd}(X=$2o0hh&m=V7E#Y<j;<x-wHdXQET7m4T%5yb6fJwh-at0#o7P
zJGm5|XR_|^IxLWcg|e+n*_Ysvz7;E3qRo;Sv=??_w~4_kX=*&$GC~e5E4SOm!&HY!
z<Nja0;Zn&dIf_Bl!F!i{0~rZ-Y)5G%WlQ&VsJq^n!D+O_XF=3VoBgV7edfNe#Yl3M
zBlOWGgem}nC<??w<}_=GXs@)`8J}Z*<;dF%j?`Uhn81%d`~fk8()?*C?zgLS016?p
z_tY7MZ~YjM7SbV_jT(h!NM_FW>`t3EpI7szwRqY%&r1^4of)9UMAtP(<R7b7UkTXn
z+L+>WyUE-G@P`Fiq8emGfN%W;A(eyjw}0cd{#(EDv9i|<VW;wR+d$-xYk$vbb1dH@
zDCM8Oty`Jgdg#fO9Zj`WL12(dz9&M2rzvE*i3NxcX3yiOU&!0<C|JE}<YaJ8$j_;O
zVh7G<vWs4Ev+o!gV!!V?y>_3s&DH*PyoRbOF@EQ@^il2M20Fgukww$@UnMoCV?D2}
z$lfaYWW!Rk5fSaNs(oApVY6_dNx!|~dah59&$06>A?X|K@ca)CAG)+HIlBF(zqL6Z
zr1ew>%4&%}E6SXi@Eb->lQcvGLxmKx6||_|^+F6!b|~E!_Ck0jL;I{N6ltLHw%d%x
z%*W9n(c-xo@J;qJ=!ks|?W27^M9c@;48KOHv7Piv^h|3ofNlV^r;E!*XD&5ycuPf}
zDdlSj09u+tO5+V+t!)>}<c6tb5Fc4dp*aaZAlo67u>=KTEE`$t=G5Y8<jHB5m8`XO
zu7ei6C8m>6;&P~!8yc(xdlB!Ytg}B+S@MW2`XmT1E@!#p=BPCvGpu~v&+GoCQ^V$Q
zw)yKzkVF^=W|ej5RY^eH_j?;$0T;sB8{T!#g+7IOj+MN|LaHfSRLy2~O~2l*bvT?R
zn$tqxF}$=3!_lxvgGr>sQ)!EIa7z^&IY7i_K@bDs6aum!1MqK4uDT>L94#7raTKAm
zVHv5Eo+F-9!i4UfdKvK|%S<7Kpw;FqSJ_>b$EO^f>{km%O7ofTKrQP@0hap`E=?q3
z7CB9J*`PB{Cmb-WjpvA_ntNrd7`>;U$KZ7xJC}2%pO(qh?{1Q2YXLySl{t`+SyBxn
zR@4>@B`B;ch5J#ZJ_mVRmQ<M9r)OQ|+Ok`V@M?fCW_BS2&V*GMR$qf!HeMG1;|+r~
z$J%QJfxpzsHZ<C8j2dHT-J14isnu|P=MEE#2)&B1QD$2TC*mda>1L>~_H*TXTAKn3
z-tuzKk;~&}E>zEU7hxFbA_$<OZDF5zOu7Pr033_lK1~4a%pZo2eIC6lgQC>1EBOek
zv>;cENxNvtskhQvdi43GYVsUBuT=$%(*DM4Jnp?$Wm@m}TuW!C>n60;J#S}t{=Uej
zohT%TNSr{?Nr|*eu%Qb_bK0l=DY%5H<kL5AYR2ZnbU6UOcIjAwYuMrlfGs)*Jt9WE
z(GU<`afIL?4c5N9qD8AM_r0x#lbnbs@4DZ_4IIOIuUhYWi<{D={Es1e%)qR(K^1L<
zoq^MuAgx)?U=F}WV>*z8ut*5ARK_<;BIu>~B9x3|5B;RLM^{muD+ZjF1q|(ZjLayk
zwJK6njq0hKQmN%ZjlehDXwsx{u>R-l&-VCMuP+en%fp2RR*4Jk&UbG6`HPbGyQ9v~
z-IXgf9?tW8=GAFsVvH_u+`(4t36NDYfrk+$k|dI!>Bb#Rv$-5bAG|xsSE7<u(^Ix5
zJivGiCx;1fn$>0%@e%wIay}ozsD>41I(_cD2y7qs9<yNDG6)wz66TdkLrX`v=!PG<
z_;A?NX8o?6m>MRGztCXb;_h(pOye#s?{V;1W`g3<)OEvxCVTT3)I%<%BL9S+gV4@L
zQPD2I{uznmAt?c2Dy9soTdk{1LJE3tGL3#zA4mDS>pKH}9S)C8_c$!rTJ0MJzCOYz
zqAL^_u?9r|QV1ZyNGLHG5MnYciji2X6i|y5j6{hQj8Tk5A~BJOp%jde^BN*3qJt4e
zCZ#JPVA|pvTT&>73~sjF<*pf8004u8wSEsLJBMPSOX_WEj~5CE-tFAbw6j1qB%z2)
zm|4W<&ysi8i!6_k`@i}1AJJ!V+H){_9-BJtecwslBJuawr?%b(;M;8!V2HJlz5@*)
zemf62kTIJm$Uc?G!lcJ>((26&+0QbQOc@15fwBIDZe;H~nTZXMsIVg$9B46T^%+@b
zX2;Ee=6x63PC#P1qKYgxIWoxmw4)Yk_T?Bkub-b;16vd3D&~LMAeHhrzq`e$WBl)@
z_}@mIBMbiuIwSEg?NGU+Tbe+Q16}+&a>fubs%i`=nGaPtD^!rh*Gchg{sw+lnA`3m
z4l=;TRqeB=ePySrI2UX+U0O_61Q0JtDd+i$svj!BiGn!exPX^{jhP)M>zb=pd>_l$
z^-!t=$M4Q)<^mZUlFR4t)B={0?^zeR|DK=b&FJ1ocpW2$@Ciu@l|G7ePl0+^r|1;A
zH;og=?s>OA-}wJ{4LiNZdT5Ft$d0w*Y><Uu$ILlgXxV-9ZrY&0OLHwm9+~UM(xJJT
zgW?^rr7?_SJ-ZwxO_<-gP6nAvG1+vOJsb7~`o|FuZ+S^1oibi7#<#ko#h^G!U-=xm
zjomLl|2Y)TGcIy=s(+8o==gM8Ir(~^#1eMS;=FjC{q>V#mm1n0m>a*b8iF_C|9W0D
z0H#hW09R*hKL+pn+x(rU!x>2Y^-O^qK4An}@;X>X8Zk@YvK7sp>~NAYNDf3^IQclG
z;aJcI<xfE{pMd57v;~Q_Y0mm?qG|5m%w;j^;5hnerGL0K5NlOsE5G&LYJGRN;`9n_
zI^QrQYmmg<$gCa8puole`C$#W!#zve_a9fw34mx&sVYy}LIRYCY2XaQ>`R{V=mvXD
zD8SMkeO{N3ZMfxT@#L`$1rB4FfFd+-+=hGpfA>Q0I`uQy_&)ZB7Qy)NdMvc=H+A82
z{zuW+_`8nkuKQ`N-D`Ze`EK?lUvGP;+tk*VinSvaN-kb9wn#8ZB8#Jvsz@k69F;=}
z==^ROPjA)t*BC4vl6Q1MBA6V9PKHv-NBkol<bD6+qp0qBoZx3jwKfSE3$DyJS8xqZ
z5}EwqdEE?>@ZYu_)>$0Tcg-r97W*AD@y;**tO+|QlNHaR8a$e*I0@(O9K=@bT)?r>
zLP|tyN@bKvPx92#>;-+UnDajkY#z?-A&0d!|ML$CJj@kRzKXkiRc2pQ<3bg4kDLt2
zSuM4eJi%k{Vbw3V{;m%n4~sTX!Efn}PX9&HD~3%sPwj!u$Vx{KixwnBK)<?vr#%2%
zK%>7{f#2m$XuOqp_+Fmg{4g46Eo@J*q-92$D6r`ur|y0aL!o6rT?t$c183#qVg7RY
zBE--wH2^-gdlDnU`?3nA4t^rNy}Qb4EYrKXD2{x&5NK!V-YoJR(4J{8M|dJG7;jN3
zB&qPLH5jim8V@_)!4v(@fgQmmKH0{*O@EoH+4>oyFE0MR5a?TsG+_uLC6qMtaEEWs
z8tizPa<2ZYFh&Udhp-LM3MEn&u#RSA1B_1}GCeNRtMS)Y8Gi%K{X&`ZzVm0fss76>
zoJ{vGr*vf;Fs!9c6%X_fIT&X<440OW&7b8ovsrQ#bd4B*+-naCwDZm><)-MNG*5yA
zT_2+{=u=G5j$p9^mr0H{=xV1*b~f9rs5VFwbWrt+un0DIy{}WP1-h~Wly17bMg@*m
z6|hd0Zda=4TPq)Iz1$m;7R>fxX?-ug%O;dDnlMLzf8X*tQqGZ^nWI(9|MBshj*K`Q
zoodr}4`T;xb1-QeYOId_tNJMQxm00{45Y_CzS?oe!WwW#LcoZQV;JBsgo7a^V|m;1
z|EKjF9J#ux{UbNy-qi~Az<VmJQ=1aB919%CTmoRkz-PSKt6mw;1BK1|^sm1n{a5XK
zN6r5KyYgQ#52T4q%7>aiA8Yx&f3u5u$>li80fK4Ud)+z~BQ7$6*k{f}0TF`a0m$TX
z0R(~-Dk4u^`R`NVZ2Z4L<9-sx{4#p4-<r?gud0G5TXmo7@{w8^)nVDKD})mSUYv}R
z|1TP&t1*WMuQ_3y%re#5r~cpF$9G!Z<5bf|cYd>3z5Zk?ejon@5HFO0CI`b&KgDQL
zX`6k_v1;mTV`{_J!Kyvx*#b#HzmDPC^Y<F)0pIuJ%X}(5m7;GCAy)K8uifD%Ic2Fx
zRUbsl*6D$?C#Y>EI3jQLdnzKGj533(9mhw!A-(s{7Ll~4<u3^qOh&6qLoVh9v*JA-
z+nqkkZ2u5|)FZ2NjA^Igkl_H~3CKBv(gH5(eG-hV7pPSfoJ^V(G+!l0!f%cb<bEca
zR@+xF%)tzu&bwUm5Rwr=^TgwaT57(_KS8bG&#eY{WBYeXrLW4@pb-Q(aM7$30HAef
z3McTR<X{{-K*B$#yPoot_bZ}gTo@~M#ewV@!Fsa?*k`kAgrA&bwPW|w0x;47_OrVC
zI1z^Ejzm<KE_b)^FQXzobmQ?lZ{4!1eGoN;>G$XDcQi9StzEC9{(s`Kzb?fo+pQ_R
zR<p!)&p}-QK6#&&TT3W=Px(Lw?e#n#IV;8al$|ixBeHkA><v7dyQ#orbM0BjIx7UY
zL4{Sy>-wgw9@Y@DH0xCSN+8yNy)0VA0!V;Rig8qu2by?XY?fyG?v_#1nh!Y6ek4OV
z`EeZ^N3Tia*JHg|C$o7_n>rtyIeNnXS3UC2&UmB3q&RQQ(X?+X@>#s+|5nbkf6eq7
z{9H?Hz18x*w~I2(&iboH9}$@1Ndm+C``-$+09Uj?j7C9#bc{u~@;Ke6wd*Qr1Zj8x
zY2V>JSs35tfHJo^9wvSUf0n(SfA!==rK-<<2tLQxmJ1K<$d3{82+gi^R;j|#CQ7!5
zzOQ83vP(X48*AmELD>QO{<qZP$DYV!nII_8OC!F++uNN_L4c9!rR7U#Qt<0=PMCvM
z5Qfn)?`c^YGD2&H-T2cHgg`c@vE$;HVu-69SyAW{(Qy_Vr)PQo$1gkah~9<vj)L)b
zJC;)4ulLKstxuY9+lW9xBScw2!UiTehcG!bKz9_6)MwkNBP%=0qhZyFU>GfjhLMPi
zpRA=Zz!YW#INr>M^|MbDIHP|ST@_k9wmMe^Oyz|b4Wk1p*48MiSeXWhz)Ua7*%s<G
zAN4v<gCCjPn{B^Td}~T~?Y3}Iu+1`j22{Q+m04X4O-EJ!RlucUI)VvS5WVVToO2A1
zCLJ?4aVf@ZuR|n6bV7MLZ<S>S&sST{@V%zPG4w`P+0uL7!c<p9wPk%+U})CntfE3l
zfqAF?h+PKFm_)SlelZO{h~tDK5rQNbG05Pk>r(`o{_P~hh9FdetWcGfHH#vW6^O)7
zs}SEIrx92{SOUHq$E$Sg(kO~-!xID;1QJ>nZ%Y8hX%$%$pLb6l^Kd;B;gMjEG?YX_
zc~YGe{M4VOB+XjNi2ufvWIWI77xK5`-RRHa76jXCI|hDqX6z*WiW?>(y*AduC8UaP
z`Sg?Jv&ezE6@mJEulJs8JZ$&IckxHsg99{vXBro9?o02Z$m}f5e<xw|TGUyad<|bP
zy%<r{?Di@4{<I>89D5!QtJ((WpE{5T6o=+mP*DXB!L(T*vQGmG{CrTTF+&5S={~)N
z1CzlgN7y_Q7~&eR!Hi>9)$U%Bvel8?`n*$GiWBb-FsjE-w3_Wn%N=V2*VDW3iz~|0
zzDhIeJMqHdtdyG>=RTLJ=xHo0VZXJeX)Ta`MhgH8V;F&b!-orjTB0%t81#NN2L8_0
zqR%7f_u!b(rq?f_TkjIJ*S3|?HLN{U)7Q|eFNlu&n`hp7P46dc44^z#8ZfN!-lMM}
z7w#NS44D0!<DkH5NDEC;#?SofW3O;#WGxK}F9pL*qfbj~%uw`<tL#%--UKh}(~K<3
zW@#Hj$;{5r5C|eA%B1#V{STI-4cH>p_>7!TEk|GOnGQydHI=5tuPU5_fYG>OKQ)zq
zMg17HNQ%%d!*RditG;y3R=T47GiALJKA+NqXZwG<>Cq#m4?6;e0l@bv06k(n7T(vP
z^`E)zdt4{J49D?DJFokJA{X%3hiCpQpc&$5CrVv{7@N8NAX0EcRTcbPUIAa&b_IZG
zM1Sc!B}ynX1Vv^;G!#HeHj4lxBJ?Z?%m!=$4*$`B_6P6ZlFe;}gzg9>4py^C4giQh
z^mqfNWMFFcFkHdZldhgLo=`CR61B)iqK>TL^9iBIL=eiZ3uOlVZ#EbGatIR<3V?xz
zB32X@79g#rfvQB?|JlikEJ?*y+fLweWb$TZA<+RsDv%U5>gvf)5mS%IrH3W^TNd9$
z8v_Q@X?{yk(Au)>czM$U^!9<t{&E$F!YHaK89wHgG6$tfEJ+CzB=XU4f;J-vs73em
zyM%1GGKaZH6<MSzZ(%`5D5fx#G|K5045Gng76<Q;*&(tT2190)g9#$YNQ7e?eD38M
zZ;y9g^yOd3|353a`oGVi{{&+Wj8SQZ$DJh%A`pKLI%9}n4sYec(0DMue66?YdM5lA
z-t6A&qkp1bN6<ip4M1SH4s!iU87odWn(=*DYQQ#dJPH&os6a3pvZY+${fGwd`uS+h
z8(%`)ZPAwPxMtegvZvW6JQdr6gO%P#lB0IkgNdOA(v;bjWg2Og@XXW>?gzyPwE+3C
zDsx}(_MeBjD1{KBQuetsCIu3SCCb_qq3|Ttb6B}E^AFHZvPc{oCGA#wB>fbc*1O$_
zI+{GcbLF#bww!(RH3GgSJ1OWV#vRWU4g1rsD1t>~SUncSh$4S!l`AQhm02nntSF)*
zASyXB*@dOB7p*9mmN9}Nim(dVzi`RpWQUOt#F<X%g6z#q)j|>sgk)yAG`4CcB`Z@`
z)Np!DGTYNYXkoID&?sobT)AOyJ)QdQj3Gr?-GhQ4s53C>y$CxudliNr746KBY6kir
z?!I++X9GXBZ%K#kKq)3Bk!2c1M1q3B5Jn^pb7eD7Ezye=sXPX~YqLPEW0N5>F$BRY
zl}r*BH^PR4T~qzZ4=}&$@ef%!3DDFrBEq10OffLlV5T8j!%Khp{Rijxwe03DLZ=U#
zwmTPFZ2)$p;4Z<{GKW!N-P77)@a-wmW(C=SCd5F9qi%#zG@{DrYG4NsSe>&(NM;OD
zoDrBAWPvCW)7}S}@FoMbw=MBlX#fh~Lzi=1%_f_VJ^@h@P9hs3;i@<vDg_b*5P34g
z1OV8bPEC=dH+pf<KVYbe#M6W?3azFpQMS-vHn?m+g3L$(iC{Ynu8d-}+)vI!X*u*0
zrCFK2n0c%f7z+Urkwzk-$M)1Ju|*_VB!)l}$U$NkC5Cmp;iQydEGF-VmhCf22^ctV
zH33E$2&6|OipEGVSg`N1ibOKcBVu5Ls<2ROWUfI5F!MbVI_EjT58g6SoX}FR1Yoi-
zO2VrKBvMHv0wP57@KB;CVFjdu3`LOx$_%Jr3(`*57zPMr_F@`Piz5Vmprw|{xtn`_
z{6=^~wC3*&LwjrpklCc@z%bAZ)(X8Fb7{^fS|>S*ZQiqpc%L6<E}bk+wurNPNQ(u1
z`0{I&r7GNuNEm>+ipwBv8q93Nc?zruC)qXP{MWJcyDq$(sina+OO&|T3JKyj3o^hj
zNiGg7*M_b}YEaTe?OS^hT0q#wXBi9$b};(G3>6hiXk!m>FxOfrgVN~;SwmZcv#-lu
z1=CR`&o43BZxz<%p-rh6MI<2tF!#wQBLwU=PRHB8xkl2p+SW!djPp749zM#Yr4UIf
z9!6p!<QNK265DEzr<jQsDM?{qS?i`aq^(&{L{f-Yo(HSa0Oirpz5c<6Jk3K{)LYlP
zI$F;_<KZwxf{HuNFIm=|oYe473lal(unp=I4T5QjAR*0RurVdwq)2C!_Z}P4_$-?w
zicEASEJ+pth$XNVN`#|WMW|G<V92CUQ9(#6Yyn{^+A1suxNyTjZZrrERtdvg4m6+%
z)E*r?)Rylf3$mNGotE54YDQd-HWW1Cm6)JB^8~RDDe_^RfOoSqh=^)&Ckj}Q#K<`)
z%QQ<D3IYMk!y%Y#5JXezC{+n~1!W1GI{{KR0DHxQ69E27bV<3^ojmVBN=}V#;MvoX
z<-{wNwqu4XRfR>3w%7%S7L3F<90wW+*4^S;#l$z<x@RQg&!Nc<N|WCbOAsGWHIZ*7
zim#{e+%ui4J-oHb@?-!l(16$&a~k+eO(Ofvgdl(mju+u24>S`qJ4{&EELjvJzlSM4
zC%~{aL#9t%6j-9dG&?A=?0Ay_(h|7Gg#sMPWF(6WkUV7ZnzvCAeQRwCEMSjS!x0fK
zA_`3t6Pid818IYZ6hHCu_5NSloZr#v{Jz^Z-$(nMhHpgk$ffuD8Sm%=DWgcx>eL7s
zbyP)50rD+5-mu-;3_O)-*f1ieL~1~XSX)1r4c|MD#P+V`)l-ar5@D4w+#6<wMhS)l
zSI>Ll>i#lFqjW%5v499Dn;NefOgVi9Gg*k#NLD$ejLP%pK(V%iBkbQfo*2pKFcS3$
zMb;u2SSl4*k_OHE09;}y$N_V?DF(y|04Z0!n-T^WM|+1wj5Omlw;eTAFiEh4kCY6J
zU+Q)TKzDvuDS<de0w^0YjDnO%qzb|dSa+ck6Q>D4*pADAoo4fMk53%L`B8PFq1}mP
zF9gEQph#g9(|kC5)tS*;foQIKL8{0=XLP9uQ1=)%187*-c`rsym5_$W1wwSN1Em6{
zQqQv<53hat=wv!?s8WR<@?e;O`97v-=+p8qR5kneJAhBB_ASeY2~qKQ+-o#c2rc;j
zv3Rfa8S&Vby8?|a&5Ory;}4fOu?1-uO4Sy760#~9(xf|xkJ@gw(wVXZL^R-CV&QUQ
zN4Suv=?rJi@swz)s+JfpgXk*+cfTvo@0vP-14bqo2k#RJ=Y99?CzFHQz@nled3EQC
z;ld8VNxEb7?=lIF@4aUaEptkoJ~IpQ885^dG9#wxhr>)t>sM^p$<fT@&Yv71*?~62
zAF8l$t8r(CLfnBwZ<a(_-Zg2EJmo-dtfH2(wT<0cN#t7vnBzIVnK3%mUgYc{4TK{H
zMFv4UBtdvXc0#ZYwoVux9qDBmHp9~!-Z`Yw&mS}uWCc)_j3%;4m<o9at>V5;2;mUK
zyl#VFKfw-9=y|NrPJui~LZYmS5r_)|r3#8g2$6&&LJfD;&EjB4o3;#1D>g5b?}N(0
z0*yrqR)JkWoO1ekqpzYX3+XMC8k7r8cxg1QiWG9<TIOOojt*OxWVDpR3q&B<1O!}Q
zQZnkNS6876B%AEnyxS9Oq?mYj=<G{GGMDiFM$nVJ->}3FIfvBh(eCT&1E8X{qg3s(
zsoCIE4MLVG`TiaD`e<fy=6adu<#Lp@v`To!%EYe2j!j~Pv@<ZBTEt8?+Urp*wwDAr
z!%4ZU@tu$h1f9j3ii*RYvJ)3CS0e4>Lt~?P4&IWGAag_}%yJCj#z5naVUwiQ!3&g;
zs8K;vOt^-VNrH<smn)ROab{Q#dt-i2^V7VCxnVC=?>LoYCxGNnDjGw@&j)&shZcZ|
z4bm(f)B?`!Az2`#)f_QTA8k=hu?HBhG6`^np(D}F(O?fTIHoXJ5Z~dD*=IPmp<x0*
zT37?04mUO)8ZezSush--2yB^IPE5uDx=1VyB)bh3IY1cJeMz=pp^VaMomoLKf`sRD
z5$s`7vCIrQ=|(DN1hLP@XIWTmIiW$G+GJBw!bEOi9o&URhz;4RuzGhlSe9g(!oo#G
z3`-47gDI`Va=xYe9b5PqK=YHHPGlO12m{fI6$Dwdi5WO-!~(RO##sfCXG<WdXhOjX
z!C=!^1!CevRfD0aBd#DhM3TuyAa$6E^o}PXNI>g<FL@BD>E9oAk%3$9=brwO6`DZU
zQ7h$Pf>ud0iHUefRtp7&q+!YQokmRoYL<VZHbVwOcaX)wgk3Nt7(o^=Sqw>43d8+$
z!Tc1jjq_A}I;Cd1{e~XHwDjp=+s7xFr-7%4Aj!#-#CvaenqX~g%nl*LiPL92=HL&Q
zx943eV0|6>oXQqqqv$T$FLQ>{&EPT#gtYR1cjVmz@UTz90%-2*Tnj~X!RSP{FKw`h
z7mY+K)KFJ@-14qC#4=_^S~NDgR#k-8u9DC!f<yuse#d)kmOcF`@RJRmhjiUK?5LA#
zdYUFXp_6)64x>+-@uq1!%LsS={*|(`mVgCOP$Lm-L5O2rNUiWEdv~)(!H#fN1(1JW
zqwZRt(4Hho^;3bJG{iPhoH6O1m4BD|?)M!|j&DD`r=Q8+_y>ag?Xdh=?zFYPPLY>i
zxbZ7mrL55mM(v|B0um)6dyD$Nee!)jt@RgA!tUF4f(d5YHjTu|a>-M;B(!^w^C1aL
zF5lpb>F>KV!m`hpWC{Gl?-P{AHHJ8CjAI&xV6l0r#jmsA^xyW<(|R>fj*#)Plfddv
zZuA_I?BgrS8eD=|cc2{icp%`+p@LRx8Hue1S#wk<=3IgevKL9M?tu&oLPU=gQ2Xzc
zeEhTnk?U#^p|aChLJ7H@Yg=QZ5_J^J*7Q14XzOb#BuA8`isxaNqVR8VBC4ZGW^)*5
zM0FGht|l5pxQHY`EL1x|1e3lW6)etKfi|pg0~|ORQlYXDc4Rh1+tTNMAu0}`&x+o6
zISt;)fXkVMIl9%;N~cqkhN23frL@}dtwV9v+HC1L*)~&hiz0$RBW60G1T@NW_Eai&
zEZnh~6)s&xHr2@V?{NZYhB8haBEeKnH@GGhwBJ{AM#k0}5i0}izTZZWhNHc6NQcC`
zNJNCUm@dfFjtGtl1hKG@L|w~x0@bL=gBfX=ijd>awT5wMn^SWZ3)I6#syab;!eSGa
ziwwIVgOb;l#$(^NdL1{Gvqb|Y=3yZ!7iP_CR`LyqY+jmlrnuUR97IJaVzG#c1+=Ab
zM-4dZrmit$<b}4f8=;v%;nN|Eeq&;aJ3G5*g@{2A=9T2yx}vPZm8NZza7`s>r~<?m
zZX_!a3)_<wSCSk%R;#SrUM~#sBiJ5igPGQv<lc%(;^k1sJv=N>dphfiZ;h4R(4A;q
zifPWv!!hGU*qr>FvqA5<2(||!1hZrojGUNhkSakyt_&0k#fk+~(r*U@(3Di035>x5
z9(u6to01nHH*=2kF=DQf9a7TTj`#aHGe!7Jv+i7Lw^&&p;IUEX)5<s@=3>#LBJvSl
z@Vfe1<sH=_Y&>mtjy{YV4$QWgmJ&}P3YsVcD#!ytV%l@qYLnju40Sfal}ys0dEDQh
z%j-Sd_K|QrBKdz5IrR~3$@IvOk+&14OQW802n-3zpg*prHr9}~MFa)`hCl|ddVcrs
zu!q<(8v+Db`Kd+(S&0kS!DSDtDr$gZd}3M;RF8|VR}A5?TK4eP_XP22Br~&SNHoGs
zL17O7e!(?p+S=w|VpK;m%tJ7tnT8o^wwad#;gc1{EVR9F?nP$QA4`;@c6jUCHBAn+
zBsp!qqp@~#TkKOwtH;p2Oq~L-izXjg^70!ywVQU#jMv6tlo)ZTe$CAr$bil?wAhq7
zO*Yk&A}$Ax6eQR)tsecARg%lf9TG)-%uU#xw67k0rGtJNo}R-_-ko4^X<XLvSF%Cq
z*@aH@Cx2s?2y~fAK@{&7sl&pTYE?masQO8otUo7f-|K<X1V}$xz%hzN6z+XDVhh{|
z*xk18Y!W*~DJcOj_4@;MIg@j5MB%zOcFbldl?CNNlTvi1l0)_#vRO2Mb3+pu1Mv{7
ze+ab~XdTzQhoZ1V=SdEY>^#7TsI2{f#XneE1ED!XuEJ}HJmfrDh(O(@chK-P>V4OO
zn$;?`94zx$Ico6Dkln=bXBi!>SQv;QR>g)irr@q5TFU7P5N__=cCCBVlE7mI?51n~
zQZYyta-(I7);tX^@tH8dkJEg%E)zc@&c05u*ECh5uXq|yJtMFZP=0|w>Dh{D+#Q_?
zKGB@6j9>wZD)$0>^|%ID<*@3_FvX_%J`MD%3YRo@$H1Wl8TBiXWJ+;(Y&JS|HHza{
zy^VAvlMwgdh=`Nj`*2(Fl${UaEa%zw*XKO{as7V0^VtjC%Z~pD3&6uGkm2Riv>Gg5
zjxzM?RgX4%|152n$lTn^+=ZL0Fs3xpfkp-eu0*=!L&XHC!xcSuS_8h&V$YoXFy?mF
z^35bIws!{$I)N~T`y>kobZH_1AQ7o4${_=dR1EQ#76Fv0^H(B-<!FHl0-Ve(s^>F-
ztDAt&6DlE~Nrcyi2~mp%h>5VlhCo{eQ|;gP0Dvb8>npDAetOX91o@3A<j>&t?{Rby
z3`l^M2<{+Eh;byG3Wu56HqU;moD8eX!jOf#xY-+)sgfubCWd@49vG*Ifgyo6x6F33
z+r?-od&98Xsuss`*UHX$#-}wE4H^pYfCD9jmcyaqdSZ)(J2p({SlZpL$ldl^ij9~c
zIiR~M5(Lh`xXD9pq`=rtdq+H>zUizHN?(0pOF_(eT*{h)NgR~D;6`@G80rkFnz-MY
z>J)DQAPGIlDBjD7SyM9N8~n_fx?5&2DYcTY_bjz#JPs7>Bu22<1+AB13xRzAC!iS`
z$i1u=8zrYU<0MW}9bwx5y53*{OBzfx;9h;~lZ58&y)o<RC~R6OZJcF-Bvm*{bl_WV
z7?oT$!(q}U;F}n6hU_JpDLK;+`;EESUKdL5sRnm6pT6Ir19=GU>@$kneDW{98QW@X
zu%H9YhM~_p_16!_9cP~9WCtK%e$p##`NvL<FU1LchXDeWbH_`@DOR53O%;WUwg<py
zPiD<+-Cc9FZVm|DO7FXqy0O(}H6aiIE_XEW>?#1!0l>sz(P3kao_9=oGR!h!K-ngD
z$a91lI%_2G$5e&A2Nv7mw!EpbJZpUhhaz65u{KV6%uo(BXF{Q@reNlQka@;9VQ5Q&
z3MB=Xd@&9%M7SK+&3f(%?M8JX2$a|$MD>d!M}gA=gWw26^==%sqolX1r@M-6-^#Jv
zdYs2ef+(Pg9(PW4HB~m%E>3aLIrZd(&cl;asCb}t+9-}6ql$cKqR`-u9iOH*f&pYj
zH$;f3b{XTL-@h3ni~u(*8t55;y6qyF&r-{Pn<R7IvQwu)`Utbr4}&Wc$8qEfLj@9Q
zFpeH}$6A2vY({8a;)xDM#0?nOP9d)ev!e1HOQe}MbaU6cSjjZ`$k^}E!-d>r97MJ4
zw<8;{7Vbc17|<!QXo0;QL{XwhRQbfgI7>;Ix~OzF-%Yf20+78+>E9MAhB)L*G?t^$
z@d6AER-COCauPz6+`Dg>X*z(q!?Aej2bnu+1&kJ}=VArrutTPio0*C_NV+{zJY@oD
z3h23beu6gTvSf~NZaN%ompiodfqBr>4Td)ag&|hUgsrea+zhw^z#|n71@)X52oOtX
zwgzBvk+_;-Mu-$zO9~)X0t!?R5oO96v@$Uc_yS(tXw@M3Ksf*jEhGSB??O73YC10{
zY<83w4fUpWW*V5-Y>1a2Iba%HWUxdCmfu%AEmSriWE>lYXCxirv^Z%LK?E?w0+`ul
zCnc&DjtM*wn%f$I)0?6*O$MF=UuXg{Xy6!5<C38g&Ccje3+D{Cx70UHf*nYMO<OpD
zLl1yt!=&yrv(+~D5Nt~6r94PyEZ54QF&N_CriL(k6ajU*6?O$ADYkA7<X2r(M$YBX
z%co2YyNw*=B68?C+W8pKlp$1NhT*bkkU=n5u|yC$4Uo~q%trIgL1Q<zBzFQfm;{Xw
z12i)YW<fetxPfKOw4H>w?`c&$VjoCl%u_{>szXk}=+rX+i!&kyz{nKShY?ZZ;N<q(
z4vFo){TuMBYPTF>V>7P`m)Ud`(=oLaFluD#`t-+n$EL94$0U@TWu(riIeFRALajqY
zbO1zJm`^bV9$bSlMgTHf&nObsL=b~8*-a{A*yh#j%5vX2B}AO1G#xWya+9(a5J(`A
zgE&N!rg<aw<Ll=}(5&Gnk-miKPf6_$XbgGZY%OfIQtS?UTyLp%b6X47d93CW-UT+t
zHK|!}UCN6?uK4EUh{N!;YMxxYnmcTTZ28`5p*zI~EJ?J9EO5%o1&i7tHbA1ZqJ%P+
z&E}fBMQo}rE{J9m3|Q6z1MvPo_VydxK(`a8r~KQPS9WBUa4{gc*SKPXpi0cDkjAb&
z(?E)*Y!RIgO>bj^p&7)`5u1TD41~as=tJzk`+aB}5`6BuB{$B)yE^)o-J~j_#8X<%
z-57UtS+F2P0!dN<L@LTvAP9g?29q9&J>Uf&<DK$#yZB#Sca?Se9P0i4Pg9#!Zf!xu
zU+%2bdrg_p$YO(q0R?-sZMMNOZ}0E4omp&cg^?K+d=?cLLn_Qj;iPqQRx<<oNeCO@
zC)n^{2EA%xK-;PSsiafd1nGl_Y~)R)huT9yC(tSV!yQF;s{e4;AvJa6**3mFHG#g6
z2#|A!7iO7yNCpfLLPvxOF&yJsLE(rko}FZz!%5!$1uz_=;HCvNt!NWS<^Zx{L5V}8
zv717TsH>_)3AzG-Eu<?5uI8;sLlspOLsRroEWmYct(L%w8+?<y>2!!)t}yC{ebJwy
zy>P5|W#jJsj{ENTIgp%#_&9eH_HH1RWir-N$P+BOs~eO#M`3>4PUtO;yDXm5-CUYu
zwb=p%&lRbPe&oPDM7g`h<8b2dX;!iVkh`NtQ1Ve?VjOBT=;g!2RVxO;q7)I5>5EBn
z2cHq$06dmWXF8Vvk(oiya-Et7O{b}hIMSBZBWZgWM%)N5B1<|5v%r)(9_vntjA6nZ
zMqfN;%&noQuwj`rucM*`O?Av-?*v8|soSIxf1`@T23y$6jpg!MwurDwltq+4L?Q^-
zuyJ9eyFrA2M94V+Aj}!_czKjCAa<Mwv$0o!sc<T;p_K~~;RObvf;3o{gaejhSeShZ
zH4AGC7ToV3FwR^>*$-E16M>-t8h<B#P`=1_*ci^keKg9GaG-8p0^fdO=7euBF)7AN
zmjajo_6!6eF)Ym02(o<%oq_=ZP63B6PY;9LniWmfru%JTOzJQ)VO5A_HVe=~mIezB
z;6NFfVjPbm7&il6S>@cGQf#Xb7eh;Gc>~7Gv=mWol@NzZCloMQiud*-I?)B4ehJ_F
zdZuV+HTBq|&WRudmP34uB6NeKM&~n=Ar`X08ITAXH|r=5I4WZ`ih}$OFIKNs=vWd+
z5)leIURI13L=toW<gYpv!t&K}9(J8iLOlsmf<_fo(dZ>Gv50aI<GLle9TZUM%MT|$
zM{k;feJDNTa7!>^0s-JMBTXuT=(N#89{S=Sf+j3`Q3DNGhcZY?99nkr;&)T4((mye
zo&0_NAaf@q7DZA3r%3~#K6UKsS}u;B!P=0l7&SD4k6>$B?a5uX%9Rb7G_5lh4hl*g
zR_57*Gh;QWWkT<CB*j{_v_W=4m^DyZhB0Zw1@;DM&LG=Jn45f#<Ek|m%s?owFApm8
zBS`sg9X%OBtL9j-QpQ&cnL?#;nokL|)uFblB}(e!jzPExk|uHd{j{;43eQ6Ern1Be
z9#z3jjp#wEj;uHX<aQmo%5LJidf&LZxpyYENEgwt=PcpVvXOKu*u*HKK}l$7XSr1q
zQxec18V1}u>uU~g2L}N)cEB`3Ry$#dQ!iHrqgY`}Rbr4Zhln>GR<$*4HUuSrjF+oX
zHOgg&YpuPLiOp3<os?AK_;)0FHs`l}AU<C<VF&2&3%F*?FtGFDp{Oq&cOVj6GZ+Dh
z7DSOo5LggN1>89oI~P{ndhd6BV;>w$B$a#Bv*2c=cjQDiG9x&V3k3^4n+@UcK&Y&&
zN;*1mN;ao<5HaUhK4OH}834orK@KVoo`n#Ab1gzdOscA)flA%_bP+k6up0=BKczvS
zP&&AKBOufSMLBjd;qdar7jC7bfJ60rj-2%8Q(&gcafpGL6%iblxM_&s*g&BODHQd*
z*3<x1H~=bwa1*WWC<+!bAYmoEv=HUCpfKP#P)K0yV~(iqQbEZN0u2}t$e1H%+`JRI
zYdJ*$7cE<y6h#w6Hj)|4(INwhPK*R0BxRqJ)F~=RO~NJG2Z3P#hUOEywn;20XuOfs
z%c4>Uam76uddxEnto5mGElbd0DG3r7Sz)#yu(7GD#t9;>!0KX+oOQYrc1W>V6j5Y0
z*Ga9eJ(w5{=XH>k356mCdBe>`-pCGa+*dsYFv&C#fOYWFS(3R>M?ev4v^8j`8?FxO
zYC~Xz<tfa9!6frj+hJIGVgXeLk>Bm-)p|3g?N+<(q2ggpOo%9?)iDSfuCmc&(H-#a
zD+9|Bia?DWnm@_t=c%o(<-^Xq6XK|ZoXN0wh+xJf7|HyU6o6C~bV(0YkXZsY0D*!B
zn6nIv^xQwQk7++OF$z#jE3>e$Aa|$zk%^3vF#Wx}2UrOS+beH#Q5mMzU<imCc6U3&
zBeg~(WssER@GlfvYUa{;QNz3r5Y$_}<yej-^aYIX2F9VRV}ezIM!{mLBI8@dz(uuN
zt@3JtCiS%fEMeMN_6Qy})MFEYk-g1<FNS@HBS|tF&iRcFF;F%FPNWQNT3Fh>m~ds3
znW=~>#Jmc4;schL((4=!7G*XEn-64lIJ_J*`=X-fyuhP7gGr=khYeI>yKh06g2}Y9
zA|XBjJ<pv+G1>9Xdq-|%`FqdPo+^48-g+p3U=$@w@wQ@i=4Q;M<%4IhR%&6Q21{a@
zvvESeb);5Dn!r<B45WmFiIGN-qI4#7(i+ce40?5$GkdMt3K|dNCh*7z#GIv6M2iix
zx0F=`MMeuE9<O#27-PUOOf^cPMT-tZAOq<$Z}N4iG6|vrZiRp&e|v8pnMj<F?yzXR
zchGQMo0K+7o8<Do>@=p$1zfX+)Gtd$V@4v1-XOC#)EsXvD7#RB2A*Err*;SkNU(!`
z5cC8#(G74j0g)6ZC<eWKHjo{v2e!H-#c`BI79&6-2*b9_zAeQJY+GS08o*~1BuGSI
z5xc#xmwYe{9}-RlSPqX<aTqZIoGQbLsm!M^Oh+)z5RNw<?{iNA&Okx2%Z6peVQ?F)
zF51RHB&(dXE?2hj)d;@?y*4KoZ*bt#cTAT~TsfT+Jx;~66W93QC>X#uv!k-L0dC4r
z^CM`~d`KN92zIdwidkN<*0HfRE?~%PWI}`+#~OM#KJU+Z&7NOtrQ&4U!*>gL^!~2f
z`dT-$;on~4T|=Q?E7H`%?S{6w0b=b?d3!Jp5RU`RN=U>&sElJ6_7t%x<B}XCuCO8)
z?|mLxyyWV_)@*h?JLO(H;o$-zB?vM|B52KR_pmRS$7b@glN-w96@--=G$mFTkf;<(
zTUOF(a^ocYwqqAeCYdp<DJe!lwW2p<CN5b^N+YTQl`&GVsan9TVu&>&QL4m^Y-K2b
z230X!BQcqRD5(}kAc(Y}nc&IGzteW*vB)q3pRCjGo8Ri4^?^}>DeUe91^fs?+s?ob
zmsuZFpRUAYn4%&vivXxpEBkhR2r_p;2z`EsR-4vz5@?#29T;?r#E@iaDW)rCMT&B?
z0c867XY8fBS~USc5QthUs!+x#PGP!E-meIJwO}9Ve@@PcvoLH%LyZOn7rAL;nFkvh
zcIJl2g2SCjy#)@sD?}4^q8xGZu`Z4v;Sek^@IE<}&2gy7;WqQ_HcLQWk91--6w@yd
zDgsE4q=H<6uce1u1q~DPb<*hCXj?$Bp)_|l*7st|zlHGT5RGPxEX#z6%Ai4msjm9+
zaHyl3)uP;}x~!!gK1i8dM_f%W-E8k}cOZAr<j4oKl2!l<1ME<hASiUgO^V~N*m7$N
z5NO<J!su1EibT;R_;cgbA&3_=v7>~sTrmSr9dUlm2L9xQ0umr75g2nkeBg24p1-P6
zRG~==@w{BX=(HyfhY@0mELlrM1r%7a>$Al$7z+f4>mxWo_R!>U&KC}@nLcZ|#fz||
zrGO~_vt0#`jfZeZ4^tLW4_ny8Oixv0(jc=g3b~gREA{^@g*^v-x6j$zGT(|X*!r68
zzXh+SdHR1Z1p?O?d^s?*t{Mi+HW@9RpiYIB1?)wP3F;&QvJe&!h$#_+7A%UfWcHY1
z8I};n0gXr%g1`cZy!<J=L^QzDzgi->gff9pb2`IFSg_jj^Zp6|YLH`F(P41_l2<Fl
zeFDK?`3}RYNhnW2?djhGZYIqEMN}CU4JlamSy-yS39%4XD#d`hva+elOo#Y_sg*SP
z<(MLfoiK(S+;|6skw(xi{q3RioReK$L^Fgy8rbof%UI1QNlw7jJaTX2xvB)3yk)`U
zW@`}PY~m&`2^AwoI-y9|GL2NK<MQ+BmKh8vF$<{(2CA<x*#XE**L);3hdroA(Rw#|
z1!&R-l*G{WpsglhFXF2Mh6A$!$DQ>3u>av5f%D-rf>pbh_g&i@xNagS;mhKRW3Kr+
zLebGy>tlj51t~u#kpH_=hr2^SEB8&FkF-P&1EZ~Hm6Gl4`M<yA|GWR^*YI@pdVAlO
z#`b4-c>BzsO=0KAI-XBgm8#10S#JuF4MVu9sOKNqSy_^r5@x&+jSLa9M+aSEMV>w_
z)L_!?J$(qI+pB-l^Yj|+1HIg(V<oq|))LELEQ+KmLZD+MN`+Pmv}l5|WrY<*f(VK%
zTWnS_f{YkOEJb241qBI~sIgJ46k8hzg#%%C?at+yChOG;?LWSiD_bxT&-L;uHbcu0
z#EG7K6(F7DY8xt_M~jXZFd#|HpDKKBX_H6hUcC-s%>DX5b?VJN1J?ctGyw-ngDNwm
z7zoo7*M~a_M;!`~a>ot(t8OV)Wnt>DZm|%Hjqo~^TV(mp&qQS{GU0@`N@&OgU}F)4
z)PkSCp0-?6LhU=5EP?l^8}*kSQ2zx*WLY4vSSYeVU@FP`yJU+1C*R5~6sb@Ogok?*
z1x%Bqf%MDn{R%r+6QPPlg2=K(fmtd=1rZdBBC3L{kw8&o7AyuL!DL1Vk|`8~tc75(
z6cmV(C<_(~Ah3!NNfrwru!|tDSPBAyFj*8)MT#oG767D*5K=)%3IeD>Rap>_0!0}a
z6iE@0Spq>83m}3E76BNj3Z#)q77HSgf-zVNB9Kxn1(esnoYWt}wYH##;TDX0S!-Y{
z{euaNHSAeo+B?u`v=~73(ipIo1AM<n7NKfuYfO!}WvHd4Qmq<G8rw*{{Gp1{l|f9x
zW=b_o%rGRHh$#c(urB6}?G0tjmM-@~xj8#HbhCgKA=eC8N~xu5Y~N}eZO86s{cmRf
zFl0gq^(-<y1W?e%!>|uT)Fq1~Mos(0hk7s-Rf@(kL=i+r3=tM0ilTxD#exVii4;Ty
zA}9)?2&jt!0|h}~V=Bf}ASV1be_vp!;d0z>bX;$Br=1e-Aodkdb+Nh!Ite5_MD)VH
zj)r;&eOCt{_7X{~kSRpPO|Z3=hz9nrs~nx;A;Vbm1UEHB2@2~qFIhr9FN@gtygU-3
z%tP`}td5^Y3HS-mWqEI`SK()B4C0v3DA0{f&0BV!w!Tb!$K^VYqo+PiiJG<$vss^E
zZ2@AF)r=XD_8`VV2M7oY9DZ^-4kUjJS)O9NJkxHoj?v5fD8qr@?M9W+bKZ09qWT^z
zSkLzTF=#rpwSiF_pnAV7t5-M98h4DS%fewFf7$<go0o-4%X6nV6zXiRU+O+T6I<9b
z>vR65B-3RSFtlY>bg^Q^VOiZ$7x6L&P;_$jaF{9f{u~~*k(;?7*L*X#;%*+|{H30j
z3zc+5x^ZnUtg`r-NMju!q*dzhy5+{R%?50Q|A*T2*n7LgBp6J@nKKdqr;ChTn?_z;
z^*@*Y-ZwwbFfYxV&X{k0zu(9B+`NZhJ^2aw_(_k~_}cVnKOfIjFx6lH;i%jE!{PNm
z$!<;|@qVO``b2r(B~si~$m?v%Hd+)WA#xfuIPkwNcaw}45!{0$k_3^5H`#?P<0Odt
zjp3wZ15@w*kY?;tL_alwvo{SzEvC=Hbe`!3C4~*!noM^#`ez;r;t$Wdo5*rV7?Fwp
zV$hwq%$g7#6jt1E09dXR#FB-f-HGe!!%hKMLiRxhD@#MXF)q&%fWd}Le<Y?r3OfQ&
zVGCPt0{j?a#}Yl1)sgSBue3E*(vA)M<)ps_a$Dj+u1Uqw!7&06H;(H=qgmzD4h^oP
z(H;0mmVhb(nBo|L(8Kp>iiiv#_V2mYBE(6L_)a_9FM4$Fh`8D%V-OT$Ii^EeJdTYm
zZB3H0>oJ*TWDdjE^Un;|5IlSpEIUCzzXNI;+JG8$NM4B%=8!8Oq!42@LTF}~NmxaY
zJbkc}@}75YT>@!>v0}_S-ic!%_!;3PO+1rstzd5M2zDW?(uYb&k|OjDT*?H28Ny7W
zXlkSY+M&zl>gLmo$wu*hTv~_<1uprJLMo{MPz4}4WE71;rJy#579z4LCTfWR;7=5W
zH!gx_L%pzuq!21D3>u1aq8<c9q@Ro;2-el##)Bp+29RhFz}P8OX94V2Do1G8tb-XK
zp*LU^m5`Mp!BmQZ9@jUDE6Ycj04R32Qc<&}E*%>;l}lL^U@#P4HGq1FF(;(RPHB$T
z`mC&v7Q$-7bk>XNmjuNtP`gktQ3+T|)=H3-i>Z_%=*nlJ%bFA0UA?a;mQHKVZk9{)
zaX5#bmxxggD9!_kQATs~JB$4mReUK}RT#6ESA3=PKNgl{@3QMND^5Kl_<l}~I9B+j
zjq^NRcG^}aO_Xq@qD3odV2R;om}!tfJa{^7XxcWV#7U)cUcY$)4b6;OJ2bMiZiMSu
zQ$s6-nlTT8oiFB`m74jm_ySCu2(*$W*PMvw_wTTP^r)O5Vt4oEcJZ+EUBzTf8%7-2
zryB&rw;W5zlniY9*pUAJkc!)$oiUnD9HoX|7OBMYHY0)3KyfJbJ76u(YP@r*0Cgi%
zPH(I5cd?yb3ioIXiN_1O9nZOq=m%ui)bSY)B_-ZhOh~VMjT@1^{YUos8%7o5o|e!H
zL1u1=3t|fA5!j6xEFv=k!PjaKIhB^@RSz3Rb%bDu1&PK8BeVtG7Zm-t>L&+KZ>#U$
zQMGRwXatafj&YzViQz0`HTF~BY<;^HCW4u_P2NHq&T3eCZ27^?(dwR$tv!*}fs$^A
z!elD35Lic_yWc}4rVW;h3fPcaMT8c@KocYk<p$}>Q=A*-`=G`V*#ND?_vT<6s7MJQ
zLP!x(Fa;!4kp?LhU?~(?BEmpWf}*klk|#wg0xV((fffKF2^c^t0II+cL{L<KuoeQs
zBO;!OvPFP*y3%TzdH2Sca`Rq^+(V`xa}>I!L6nH?)JSxh>Uw9O2>DU9he2WBVbXiU
zuuEI&+cSs(@Dd6FfG%RN@%pyqP?<b{8$+ofgeSjxyMc(P3<fb3Rbr_6EU*C-Sfm6M
zRAhoNPX(Y<m1JV16jc%|L(WN6L4!3)M1*20!2lK{Rgyv?Hp(m*jAcraDFI<n(+MGn
ztQeh43iwh_k<bwB6kxE5u~vD;eFm!~X}w(_y33k)ltNON4YPQWi-BQ(6`~{QvWz>$
zeU9yD1}{gM)7o@jGRasktmVug$2)MxnMveK8Rj930~y|7$%B?hFD}{|cTZ?$FgmZG
zIo9;ySvazq?l?S>9Udqsvl!Y8>y3&qV1zhZ-y9fXfc7yY6(7IlG`7JhN{griBKg41
zh7IZ9c0>$d^5--~*~{8cUL!5p%tZ#peJie`(D;56V4Q?c2Rq8PWb-VpIik#pnyA21
z)i4+4L|ja-iB+o$k>lZnB1fOJu^n>;j10*U0A);Lr^b<%?cn8qpU3}hyzDUF-1xOC
zc}sK$_c&RJehx@DK-zfS28BogU0~P(E$+{8v@*4P?{?IXRl!TsnED4<;51_x;Eips
zccK&S$Qbt0_uZW(od-Xe-0E~^BF1$p7BodN_3pGE?`KFvlfcwQjACuTaz94t^<ykG
zsYoI)GmXI7sDY3W(ImMm4bgZ!*H&*^NVAHp@p;Xi;C%E9nNw%9IT<i!A%)vpI71}?
zv6@&6xdA5K%^KrjqfSK9#MeE;V^e^CF*LC`)@)amc}u^*IKV0cA_ic0jC{@VdjCez
z$zHl`#J5`D2uL4GSPXROz5>o**hlneeIi3}?&T+~zv}RxUEnJ5i150aYBx!ggAO87
zA_<gGk8XG0+SfOoHZ&d%&hz<vGy3>G-!hD^5KVw8YTJm2u{j72n&$^I7enj@NOi{$
z+lVer2c0OuRzzBmSzwYeRRmHogr}Iio4|KFOfLRy4l+Q}*iU`N$C~9D2O*M8AoHP3
zJbxp=!jOWy!KITJ@<XeMS-g8h&*z&?L$NC-VpNI_PeaF@?*|h;9~_kItva$GoI%nM
zZ~_tx{YU2iou<zNX@VbsEm=Nv^XNozC%jn+KVK$=`lPEVLQ_vtwKhb2Rnij6gpvV)
zJMs>S2e3Zh<R6tb0^SHUoz;a2w8g5+jXn&Z5zRW)YzwP^<=&Li1>GL5ntF@0%ol;v
zgMtP?%c)XIvd0a(KS###eOJ{#gHz1>T$(thsorQtlPuGX4@zYQW@aER479e^+ZZT`
ztzckjv3xAJT^W~Jgv24?VGSe&h$NcU$b0r;7>l5{iUEN#X{JF%^P0?TWRfLIPt+L-
zV4F3;N0zE<Ov)66MqJA#N)%PDGcq}nnTd%pIHtypwt#A96Eh^}WT@e=<C6479JmVT
zq8E!W14F!ABDPbN<$$DaU|*-&W>Mtr%Ug2fW&%6i*@|JlLmX(@tU)c?icLB~hXuG@
zuCx<TG*a-FQrR3f#z;-{X_Bx9dkL^6+Q{K@?}Z$tVN-0OBb8;s{;SRDoZcF}=V-By
zx3Jp8AoE4c0_G3jmKbIPP%_R0(1y}+nVPo@+0AK9+^kU<D1nB}`a^nUKyTo)j)8JU
z9_O%BN~g^uO-u(~L6n39q$scaTm?(=l1sDvzoZaqYvX~k5wLAtq48N6@k>1&lOuI8
zOzt_&v}0}I5supf6oIuc`q^!a0?jN262bYA+<L!`{UQ;bUwC@;1OFHL!ejWpmkx}!
zG-}4)U62jl@tzsZKo`hR1D!y0=^Yd#yK^ZRr>24FfVFh~Pj`YNrybbWVNkn$!$iH}
z8pV*UR5x9kO@HM4pV7zmrKFDJgkW$)*vJ?I+Y=pzg`mn5gWIgw&5YJjnXMBFlxV3j
z7m>X2GyCs{lMr2f_=F;uLMV2_@;&Aj3N9mRq#fF*BM;Q2L4tyKr7)wm2F}}7p-P6?
zwnAG;a__YqOD38Mi*T^67}I@Kx%B&NDw8&WQWnso6gXy#DDO(FBv3Y?OK2*M8>XuP
zcS55Di-C0+j2JN4fK&~w3`xJt)(qWj7?qTDN{B8%MFe8-(F&JUMG#3QZ;KTgDx5?R
z(1H4zt%KhT3q4!SRKukPb0>Q!74GS?A{0stSPKZK5)Cl}`uyC$!a*<-LmWir2bOV`
zbU;&uXGrj{IZ~?>f{KDKfeNb_<qyAyH^N*)K?M-#MNsdZwjYFOj27@OGb@8K$T34l
zTUwUT;N#z7Mp201Hkm9m#-~aq5F25-n}pQ(upM9#-g$6M)a32b9ZV0|wG@HW!m6xM
zQ?8PNhcA<B4-^5SA$~fdNOCuZB<1CBGIne}jwV=!$Qq$hHfS%!b=DeWIWX8qJ{o#B
z`q<hMEDg{rZ2{E;xoO3^gft)mgbIkGWT9YrVs4m>V-ebirD#l1tP+LI^97rsz7^h<
zY*|$VLycydj<CTnFvNmG`ySMU|I}eLsJ~!U6_n!&PJmaM1&kO$g|@0)RFMe|X}7%f
zaUti^Uzl(K+<EZ?RQ$BG@Y4%rSrA`7l~hF{qQw#_F^VF^Srt@$fH`^RufR_|iy`KD
z<ye1}=hIp*8<<qhQiA#<{NHTIZN-W$b*BPjA&Al)cd;nZ!9lsHQ^+*Aw9tXId_hp$
zl^|Mx%9$k!UL(bVpKrFk7T#*zUHs$9%Pee#IA$iTiWC}T9E69VJs_JXz!ET10MO7B
zfIgS4(czGqkh0JugOKxyq>80)y|Y_<m}AIgrfSw{5e^{VBst(n5eeK|xww$-UGNeE
z)SyCGkp9SLz9~!*HgVgFoLw~4G^!^ds_`tj$^yWs#Jz-six4RwAqbdqK_fDt%1tI*
zV6v)6dV9SbpOw=c7}2fR_6753IwJ%h25p`0f8+MuPsjSdO3$BV{lnBTMtF`2(F#rr
zAY;>Lg-1Hxa<u&Tif}wAwIU%*Ske_bULCzj)D3S&qqaamN~<04rm3O{RF%A+ne}@4
zUCk?bG5T6j`fpKYYVxy=lGfu$S2SvCmimgE{zA~fI3+@s?8D_7pHzG81T&T3O#1C!
zdJg-i3qw}T<BvvCX3?}}GNxUwLl7He4NQ&9SP+jMo|h+Azq_z{m_OU|elJCtS1EEB
zFd@s&N@t|ifY6A5BO0iHF}zRx?|-V5pOP(hQ~2^b$f8X*qx*B7|6!^7AIXYr;6L}7
zC_|P;A~m!P#b~F8OLw(f%~f9&pljJ%;g}9ta7#c&i=+hzARAeR*E2>x$8hHo1cZuU
zQoHdDKtbikqMDaXY4o(TZB%fI)Kli@uxsJmw{YHoFx5tsS<i<ic5%abaZ%D~BxC~s
z13{@)K=^z@{t5J2=mlaZ&5%-&Q)*RXB22bL%OQ>;2~>^CS!qhjBB~6;s+TfX1xBG*
zmoS)sj7D2QV8mdsD+?=A@ECIt0}(`%nfM6;^=fb|wM-?Mg-U2BblEzd_-#8b)X%r2
z2#`fO*|M<qcPx08X~bOHq>$SUNqRJ{HY%z{5=CaGS{OMIV-ysdlUX7%9wDBZXe+Un
z?e_Y(?n0_S$scI#5qdGVDA3Gx7S-u^L;?|8XOA*p!#ujC?kXv`Kz4JD96CZ9l~51G
ziODAi8zV+Ulc5DJghDDh&FBH><mrBAWY}b1aoq#MG$<$$i9nQ`<snSqF(9&k1Wunq
z@bK^=igPzO!vCkst(^a3VM|E^O4MEesbNnGI(j#y@jDZZ_17B8L+p>Kss4Y1f7^AR
z{<-oGWeW<-?|(tU2|{2M@jlx2wbUtR)0#UJgg~+3sJds;JDX<b5|igEGtN8!Q$Vc0
zhm3McmQ;bQT!jf%;37<0RHYKrGZvPZ{p~7_X~>MFT)CTX-FMhGH!-EkmNMWB!yylI
z;MTP^rLn=MMW&mpn25H87onCiYgBSJq*-0HQC7BPNeXK<g^^7yZaQg%rnP6<?WpFZ
z-+8mER9eZlTFl0QL15bqRg$1M;B4H{_|BwxQ$_~JOx-ji5(sT*Yzww#b)k*lSUQ7P
zO@j=~DQOJKYkRI6tG=~^5Zo#na9CaRQ(Nttwv$B22+SIYtVX$GDFYY~8$qU-jut}4
zODfG=Ih$CsW*S3$D50sL4a~)N*2Y6rqlv9;w7Oy$N(q$5Y(A4L8LeHRsfe>RW}OpJ
zvR4F06Ig2{bxg{<?y_kn+M&W(5OgI}YYVis2Q7&h<tVCFa!n?gtjjJ!rNKZ_Q6X4W
zYhCiZZMOSNn7d_}mco-7%9DJ_HL4XsDlD5hX<3rgZ7h1fd71L5_@(6vAj}q-nQ2oH
zW)#a8FmorTwsbO$K;aA=YAMZxsWMwSP}Zq5AXKO*4YFojWkEn(PPCakAeIK1XIGhK
zL0(L;5QvD+02_4io^^(^rw@jR&z}&mL%W}SI%O=aStA)juWwzNjo;p#%BU>(Y&SwE
zb*JqaF`Ka&vld^6t&LBS%E_i8d^3y1G%Y@ib?e;2X2l!&i_*aPe~<DEF_TO?b@Hxw
zWS$Po(#hg-{E8dwc&`Q-XmBGGtg=yoYBP;lpqM$#HpD$d1%$9XsKKz=EIx+<UM{&^
z3|$t|v1T%`ti-8UV3QzHg-9r$D=;96J0&Sfin`jFlv0BV`ss`|t<sFlp|IjZ5)pKn
zl|eaSb7x_}gq4srl(ibOS!5K@=^T}2B^3#bsggxxtigu{t<}Uf2NLa#9MrTlfuYsO
z4SDz$8r5MGS7wGua5RZFur}0)ZG}r#t+v&*t0)#K12L1+%!?I*BBG2{5Jih0V$n#j
zQXv#kQGyInWC2A{6jW3eMS~ueTzVn^0NZN@g>$&xrwE7$hc@2QReoa!qcS3oMBOCr
z<xZ49=YpatqQw{4!=EpsI+z^TiKENZD6E}D#5jheKyPYwWx-<F-~kZh)>5U3B8ea>
z$SRT|$Ow`PA`pnkk}m89l1Ys4k_Ip?c+d(-gEWxI4DfJkFf2`AE(?%U2c_5-Q%_06
zkXbYx^#;%xNDh3+>lv~wl`8{b0T5}4izdBtNFaF85F&&<pMACfavI10A;}R0L>@zA
zo<7w8Qg*c{$$V1ULwl#w%NG`584P-qRC;qBp<D__D4l#67mn0{SS%4yVuS@zU^c)O
zpjZP-SrTWSBg+5<nlv<(k!F+*O?E2=#wO*)OtcJ1h`C!T3nWkmASISk2-O89kdk8)
zr)0nfmjq-7b9izYz-_)Fm6Bs^0~#c#qf0W_3m9Nf*(Q~OlL%r`OhD3@%8*rJh=elG
zA(2ojOh`VxnXwBn1hJUxCE3veXQ1qc($JyFk|_~m1z52irW>+JHiME04S0NHFoqj#
zL4@U{3}M3s76$}}%&-?zmBzYFTvBhcEQ3&7qtR<LHf2!Q#@PU|fIy7JL<)^?3;EbL
z`=hLzOdPyfiR^pUyE6@D7^a$xTtf_$S-(#{jw#LF^JKlPR-kL=F~3~H8!3(gvP_@R
zi`L4Z+m6;lbmK({q!ndhQhVQ8ohz0TT`dt%pYJ`1$pK8ovPqk34YJ^q7@#7sMCeSy
z%E`N-mnn&)!&fL35@{m)#!MIvnx+gnm?@J9u)z>gY_^(7$>f1zu<4rH1ttT-h#4n6
zo^<0jqI~;#ss`e2Bst!UIvUh-FoB6Vq%_LHVhgh;LSkNf8|oY)#7J(2i0RQ7F5ks@
z;iM2qF&jZjnxI-vnOl)eFG%TvXo@#uHG~9~Xd`y@avy>s>4wmlfyRP^t8UcL!N<_u
zY%PH6?7fQIyF7bMR+GC2gWYJ>=Y)iri9kXVUxDpV1NqDVR1%PyC4uCJn5|;K?}(fL
zZQkq43hWB!oHC#ru#g%d+w6}oC`vS;MO9EOu|yCoVPW_vg(-$J5cBSroIsHWd|t{(
zqadLoC`cg41>WL<5#0j)!(}^DguR|eBT2|=5gntrgJHhpVIkK_?-vaRARp_tj3G$~
zbH!T8NKqMS2GvBF;W`ccG`^%P26>!DkjL4O7gFN`7)EcPYat+YxSQ?Rl1fR%op=&x
zErT3Z1xY1IfmIY5P_oi%H^{YGB;`e@*mqzav|#{J3jsxfgbrgn(sZDCtT^I_LwpoE
zTo@fm_sjsulg2V~WQG7F6b^)}Ij{<W8EK~?P7+B9sUk8(kw^-N2_8%;GDUzQzK#VX
zLPkY|0z}%Jel()Nsvz^mEJcYVIiM`&BJu%{4u&ejyBnlv2e^nl$Q%5+Rl^X*2Du}{
zD)6Fw8!AJcprsmWk_GSQZfpJ0(`~xWu3JFYQ~>8acc~bI$Q^qA?~tPNPmG2PF$nl7
zs1=+5a6`@z7D6JbMPRTbks%f^0x%N37LheX0NepEC!@U}#GDcgkmwm>6cK=+i91>~
z%^MpCIe^&A3EsF4B|Yv^2Gdo*j7$??DhLY!Nem&a&1)hHI{fk5_&#RxHT3`=50yO~
z>mQh+Eod!bRVqODu62eON}xRCP$w@u%m@)kEL9?`6e7Sp88OB5EriB=)0c;xk}QU~
z?{V-5#wdwvYKnB+_Vv=bXlpGRAefSwYM`PTYE-cWBN?U|%0@Y9GTKD8>5GgN5LoW!
zAxb*1xRiEITUSVx-zH-A;ppXNo>qd)woOuqixx<rHK3T?>0^{yzVWc#rjH*Koc6;4
zV<(}bgj8ARleLf*LUWRZo_{UI%iEc9`u3WRGZza(RE}WCTBVp+D~o3(3%X1ma$q_^
zJ+zV1h+u&Q*##YlXm?%Qx=G54I-ow91wgUTqM$63DPqBh#z>$lbXg{nN_WnHMgoyk
z1%R`sQgoBQ$P^A`TIq@~)ZWRl;I&{UOHO4a|9>b6k);JtVuD6wjD^w~n`p)yyNNgZ
zsyv-ENU{obAce@7MW~3+By8)#K~Owd*0Y?Y0gPE9z@(fs11EYn<nw4Ll0cCn=cPk9
za3GrJP!HpbfW#4zK^P#4peTs3Q3WE97{o;+RU*O@ti<FNPVm}z)6A_D2GA)>6|pb4
zZN)G%5p60e2*p%t6k^>TcbW$bV-E4bl!FnFAYV`$(2!XNWD}i-G)~#MjnNNR2KQN+
zn1f8yH#kGh190&u(BzT_G$yub6T54Z*crbE8Mbd+TM;VFA$Hi!n_Z=49|4jZ9aJSr
zHhWJ3PcyjaIj3S_oB=%6ftwv_CSLYR))oy)fX`4$toL*%!g^qo*4YK!l3g>rD9&sy
zW*KP|t!o6q2z#NBn@wti6Br1}m;;ai#x(F@GG<OE8rqvnaG~uonP1+`{$s9TwiRvj
z+Q<{-sJ#r5La1-*WVuLAE@{a-s>iNYP3qno+kwI`_`S0nKc=HcIJ#gC*E{s5`yX@o
z^<(s-kIX;8jQ>aRW0%2H*Z$$h@ZV<|O0c_}T-E=dD&BNwH^<X5!^#QrZz<<bsUY5Z
z3?G1oL0DeIi754|SZ8cBeij<6)w6Ofq4?**^ga?(;|>O>-MXokH#WO495>n<yG_=E
z2}Fh(xpusBjEkDb9_gl-E1l~SUd{mMomi9q`_cA`68KEdvS)I9ElvNu^V;TBpQ^k)
z$6=o>43909Bg*~1-ta!QEA+37uXP5?5DlP)kQBpH@9vB_W>3Jg=g!{e@O~dl>GIo@
zYeYbsI8g@1yvX<45*iq3E8~yHu<&lWe6H(?yIKOQZnpBHgJHH-Hq-4RvTX4r55roC
zpvLM{2Ag&(>wq4aBhL0fdPa`fi^s+2W~~^xq#!v0Tg)zcmKL?rrwk>fAkca@>UHW!
zdr#Q)(ki>%qi5&|zXhVVTfl7>IF^sL#*+k`KXI*WXz**5Ayn1qT`N6TDBvu8j*fHV
zb_XI0tZ1rgg`k9l0VF)1u!uq*;f#v}j21-&6ckYqRaKE^&LGSTlF0+6eUs9M%Q`=0
z=@NVLZP5Vq#Z@&}bm~=9k8bpeq*z8sk_lnsB9uUcPDL9`rn9N+dz|)efDHS2G`MY?
zdL)&Rk#KogXOK5s4LI)3&^3S!=6>@g@PUZMN6oXLysB~}JaF5hg&%5_jGax8A=$xB
zhN?x~%?%dP+X!F>+{p-#kw~x<n$$KJ2&p<a?EQFlPSDpR2w~<gRcAJbw8KHIcd4wq
zhG3Iyz{iH7?r>s5B;g@3nq)3m#ui5@xPjqAWDPMpJJ8y$Y%bh}_h56LE%;J)kt7&O
zA{->;(g;xYn3(v@A-fZLDZuSQjv}Fp?3!KJ6PO`A$oSCjt0Xo+zEX<~L`%VuJD}pF
z)<C>nEDYf0cXfk>0eHY%L}fD9Ho-*}DUu9*e89=t9ygz})_Ek*Xb^U#k?t8#@>ABr
zxh`jy3=~{oB1pJF8i)jpg7z_4D71{+O@Q;f9lf)*9ez|;q!`G85kwupUl>Z*_<#NG
zxHwkh8xP>*@%;{k#j*?I&ccftg$*9@8rZlQqnII+tVp1Mfkt!VlZGPvi9^rmamT;-
zel>^P;h#=fqtQ&u!|b3Rho1T{V8kOdRFVd+q;in|ndAPS<@&z$(sBfv2&gQ^s(*Yc
z@oed~=zYJO%7X~YS}*dQCj(-V`<lArqGiulswOqQm-DYv&gr*09J~MMLvS@0R2tkl
zQNZ6{7!=tH-Q8$%jQ-BO_kEdU8}WA$Iap7%d*%70Vj<1hQ7_>_Rci+kTvH?T(=M|h
zEzzy=Em5YNo{o*>JJ$NA*msj?`kzakg#r;IMT91f$e_YMckwa*H%I05JBK_Dqv)vc
zu;X{safj;qJ}w-3S%PU|ID`Y?#}KhjSu!{xBM=8G57tvkJ3md76h5;?2M)c(qXk7e
z+N=g9n(WvtV6lc4utsJV8E<cs;Ca7FZNh@`EG!XF_cp{8g3NijX=2Q>iy5Y|j;TmD
zS(6fbZc^1#UA4ADAeP8hEKRJB>zjxv{zalNREVmmv5}1aHIi4FR!xvvO4-Gth=@4L
zY$~-h;e{z%1!4&p#tyBTTViTj!lhE(T$p2dp@WP=NL31rDkzAcz;eK-BaLHjU^b<)
z!xB~^pewbM8KxMRGgC3lNy}N4w`*}(wWvC#I3ThhiXw?=NFz0Mga*)20;NULRxCsj
zOo>>q7n>$X!yT-sqACnf5e!O`YFOG<40oke77Wt5r6-X!lnPs<g%F4#h_i&M!!0he
z5X!Qo)s$6{Vj!3CvO|;1*rYh6lYW|0cX@Qy+tfHQ_6s6=h$9FY4ucy@QLx!{KeBd)
z4U_}npNpCW2W*>n*+WD}?L@435S-Z-1Q7vA1yDspesi)0G9Ry(y~~#UHVHCYm>m}s
zRb+tl?0(bYceghE^gbIoY6}U}d~s4LtWp`_@rcF>>=wfSe8DA6Mpj@nSdgPx{3OAc
z$e}i5GYV5bPb}PBuhu*2-KBQHyIp43)V5UF$#s-;x}}tKY1W*<rdnN4(~4@BTFY><
zm{T@!HL6o<K@r17vQ%NJ*`&rbZGL9>yY0GK7CVFIcuTD!(cGn>Wli?-KP5Z}l@vX!
zP};5(91z|Ild1>f#znIinYS4s(g+=Xq8*7<jA110>9Kp82UcG3cA1sC5z?uxl*cW*
zWiaXeZ%^${U#hdIg%GUt0rZbi;%A3xzELzN9Yqd8O)%|rl_v23Sg_-0r;vsnlY~+r
zFdp#Os=!q(;m0};S9!v-c0f4;(`wd=u@sRL<Py*lM0G}?iW;~n;M{?fpfYvCaPH+!
zv?WQ<l{yovs>4WrN;yQ|fb@+-c*v3jND@VXzY>_1L5wtVXLx5r3}=k&-sK`gWYTqr
zqgb+=3^!pLVY$%4rC=Am5c6}QK-^+J=Y<YJS^{qU-ypD$5ux09nXDYJ5VQHM0jPe^
z$Pok**&qpKEz!G-iWS9igb@lm*kP63(UVCNrh&nbcgfczy!IRZJo@*bYNAA_9S}kd
z3(ijnGpnn3V-U^^$q`*J02@Hm!s!5)l2LRjLSrC7fPaf&tVI+;MS_u#bs7n|&5IU8
z(Ci9gNIoO*v=h1TKpq$>Wbf~XKav4349ru8296X^-GV{kIyffQFocSb)06{)JtsC9
z32Zmeu%>JRMF|xn7(_#<nXSq`ItL<7F`y|VZpDxkfPWlFqR1>H)?EqUT2N_Xfm)16
zX$@t9#Ue0<m}vtLF$tNf!C9KQGC~?5G?X>+4ILV>P4hDYDU8G@kwzjkK~dV$Vp^4C
zVQj3n#aPnILc>XNQG5AFcbW_|fh!4EG`q}!l1MnqVxuC;GFB9{62onY-49EwFgKDA
zIAPiA8r0?>i(|EN<9+K!DUzDaV{|hT=xY|G3^NP`GOLC$w&p2ytTakp3y9Dfq6q~U
zQve!{KBgWHk=lMYO;fAQTzCwcQJ8BNy1V34-5KS3iGj8H4Oa%Gcl`Z;QmzluX7g*D
zkgfP6;&pvzJxa3j(UhlNvzyk<w5d)WGgvJ8$@4rvov3;n_c<5Lr*p96w*C`5OEZ@e
zgM?cU_Hi)fxhRh-mK6-vYev6^Z6bDe!WdtEUL9=V1Q1n0&f$a*2jT<zJrw&abJ8RY
zn{ApnOnH3N{Eoi6>A|%&kbEcDlG>;OtIYN1g85GEf{U3TOa#wqfC3A`1mWLk8^E&k
zg4-B_67x$y;wngBE>H&!d$F9f<B{$$AQkbZ4W>I=<^u81Tku~BwQBsA1F;)O(nuW<
z^xI%1$5&U#SekuKQ&(r0)as{Eyg|n2ZDOD$yX;2OF%AeWHvau7mnVu<r*kB7u?ovm
zpejdKY`_z)H1JqXENJMk$qz_@BdTIH30O;nED|amx*d$^G2sC9m;Q61y91%%leGYN
zBR#iaaM^T8VU6BF+CmSc6($_Sz6&5pqsK9}FFR!tMn?mqqF9!2chkiuJ$m;*fnflt
zX7wQTmkp@dan^XWHlkTL?&`0dh1kIq+%}>?Nv$jr6bGkI12c&OGQOE%k_H9uh1yfF
zg3pw>RwQ>lSV0A0@NLG>sEI5_`d&t8-H0bG;_f_qblmYL2rz=$`p7WJXe<=&vG?m5
z^Le9uXH4k}kcQCyI_!@TW@|Z-+9lBcDFFBlE)F9drvS8qP(xG2l+~A3g0NkjMFYE@
zL!Q<>w6!gGaPD)8cu0tJJoYhBb{l7HJ7vOPz%n6;X&qcc_1f<On?8h|2XT%IOXzfW
zYMXFT1&X-=JS4ih1cykWySs^e?ISuuILB;vnr#*e(3+P5Y@rsNiESzKQ-CvpLc6;>
zOy(m6z`+3$SYi}93SC^t)w8^j3M43E2$rNE!6qr_7YRdz3ht~vF1u!P7g2+P7YRpx
z?&2EM2kC{Oy=D=!DF*~)BT)w+&zhzh*KIhy_FUlzv;ps!q26hkg9Hl)vkdR3C7y`u
z+n0E0*nwd57Mp?u7RJUl5`>P%>YO{SwbVGC>|X?p4RO3<qX^Y`vNyq>jQ}>nXa$%Y
zc)I|?NrV9=JeT0~ETksbhptyO?1=CmrbFH>;s)s!@Hqp6=;N$}R^iKrnRgtZQOX{;
z81rIF^mSnp8JI5rE%%=iIVKNRbK7vJ3~ddI=a=ATE(5sWg<F(;QS)73iX!^RcE(8C
zh&1jI1{2cQh`V|;W;Zbc5J-n2qblV?)e_*6<)t7=1kBF{MQNm2JCQC3!wxb#0`KXZ
zmuH6#+<D6oNo>HKk|Yz;z4S@gWrc`zbO4qxYA)c+nW=^ed8kaNchk~pXV@?%j4yJz
z_!#ZOUIsGM3u%Bh3aeXxo}l>*hRCD35%P4DE?!Ewg(j1rAzvzQG9ekghFqJEle5w4
zu`N4OfNox-ysh7C6%Z;Ml3XgN#vqJER7F(;=2>C}5H8#RTp;2m9J3J~rw&F4PcL;v
zWWci~(lOY#m7LWAvo2sU3NTA`HD(<Ym=i=qU`7nVqKE~BqmWPl&9H1nA%0HB%1!vE
z3|(<T@Jb^2a3@1v2O{CCOsaEgpHA^OH9fb>+N4-WvOV4Fgjff9D$t~aVl2}LR<TwF
zm;}2X)E3-OO5BnY9lWAk;G8iNy@Hj;On}B7iw>_5L*1d%)*j)4!Ut;>IAN10!onIz
zVUBZP2Wkf<MK4WRBFG8^@j&!Vv0$38Umr(>0r57(3NY(&CAjm;lNN>@_TfPzK@h05
z7u3ON;wWAyBJ;KBK^teN)|_^(vNt#09Hd;KzF!dFx+IF2?--mnSrb8`NExDXrS?b~
zb`+X7*wC*}Nx_Fl6q6W3j?W_&2!&CS3k4^f#ge207%W69s7<-Oo=LgaWU)jQVyszO
zh(uFK(W|4ZVwEC5zI7gY##WE7jR5g!5|M#{0}?7;5DQpFHPA+umUxES(lCj*_xco6
zseS|s_By;R1d0H?TOAx&R#rr|z3qh+SCx>ez!)+lG{;Q80c*&}?wt(9GIEKw8n-ra
zH!@LC6_C$1o^uU+#IWm$3A#x-SbnGSPVaTCAR8bDCP}v<g4$5^-(=S7f!qlICOIIQ
zlI0wT@DNIXLL<izDTt90A}kLQZsM>EOA$pBo_UgI6H25|L<I#)Cm`KKod^{3j;s{p
zk8+%(kTSg4Qdh>ERNFS$!saVeV{BcGwzlgv4uLSibPg0v$|I%AP{4_GqT<m(&1+g&
zhNx2)R_0r)BfOXiLIP@SH8ruAyO>vf%eJL5S(#lUn#~DxQ+Z`I0Tql=Tre9&8Ag#^
zJQpC#b8nho3lj~QGsqlFtIbE6a>`rl(ph+5@*<OPMA~m=l?0Q6ty6_F+^esUtC+di
zkfN%ZH=<}A{C6U5L_f&NLzSW+yqI5ePox*UL)h=j+1Sp8+fui$D(EnJ+}C8u{Kj<k
zSvY5n1J(qbr&A^(u|f2B<9P*whU`Q`)=LyW#6S%uYNxRr^KG!<EMOH#VnY01{eN%m
z{~!3ef8Kr9YeG~ZkckF(3>+9hjz$7803s+ZpyXohCSXdlfs*SnzA&zh$0-%v9A~tC
zgZZ`Q@*m6@ib%5WBUrl3X9F6n7O+43bNq*+(Z^F(GjOkRzS6wxG5J4u|CP15-+gqM
z<8HP0RHKydX0qxrGCxE2U%DfR8KcJ22+VQ3ac=bxD2bASJaMc<#;6yqK5>^97@Cxl
z3Es&20`{pVIx<Mgz=#Y`$0u;yX7@$&@Gs5OcYpJL7lVL@C~wzpTVxGI)i~7E-UoEA
z5=Wa6RajATKUc(NJmBP3Ozkaa%0}g<9)0%Fc&(}-(QY;rMrreVA&Ps@suyANt$h`>
zMe&WYc>@4e5*y3`0Gue$6QaW?<4_gQ&WqcaWJ8q}ZkS#%GMpH1wN3P!ypx-nhnxtM
z+ZwTlR9zFBbC{IjGo<4vWXTnkQDMNWOPFFfLwzhT)CU$IOL_(dXl^VR$>GtCq4lY~
zwJm{7D)~E5n|hHYt_NJhf<fjJq{Ecq!B*{vl7<HP&_)#ODBwjX5VM_hnwrtXlm-|b
zq=(pz_)meMrC6BKs)R_A>{|sn1Ew}=5RBvTVfqytG_BuhD1w#<-()TH1MF$7`kln!
zWs0kwG#u{y?>LJuV;CIXxe{E3oeWT6Pm!k=Bw_b_Z0`(Mknmqb5KjvBLbC3wOKm<2
z+sE0A3$xRGpCY*(3NMn*cX!@GkjX<7>2>KB9VkOv?Eu07Z>oT#f?YiR9AZT9dndtx
zgeVsv#iu=J^p>i|;xQmB0Gqm`KvwaI$1K>a$e40jh;Wl8X+_9E^zRK7t<3h^+!%pf
zUP~|m$;7_hK+R?u8@-d2-1SllI8Rw^+BckUmH_0eTXz}|ZP3p5knpnjkPEqO3nCnf
z5?H+#IZD$|#Rn3m1p~317B&!!V;U|h?^HzUB#aTzi&sJ0u6HeAhRaWkR@v%cgFJD3
z;)uA)p^OKb8{%MHLqr-vNQVTZ$e@_gLZcSyB1&6B%uZ4;+Ce@tdrUe|l$1;3rm99%
z-h-wKH2EjAJ|=m~K@xD;WGso5Ah9442pomAL(?HS##}q<-zqmq^oyP2qeohZGVFDX
zoDB|3IyYel?nt=}cB*G>7i!F%@e<Nq1Z5~^a8#FYNbFxtEFX6kAc)v)$9|>t&<t+V
z2szmyxh1%Gk#<6)oFcP{ho?B|C$qu}9jmS*<sKf{=(!NHp%v6Dx+FuM5?6`mJ^Lop
za!CzLKmfC|>6znGKwQL-LJ$a9s)>bWhDroVR)#L(2A)*mZHXCQoxa({8fdk!5<-}R
z8QT?U-APXoRO&W)4h=M~g7mGKVzlMzm(7S~7=qxo{K5CV$7$&Hiti|VV_l)Eaeuw>
z9L53lOom3Jnt`oBO&8=Ln<(3I=4zAPsz^nYmAJA@3y=85!ycfb3QATbYQTV37wpYc
zj|$ZK5D?{^C;5BoYX0Yu{WRcTn_Y>9qZDb9fg8q>K-eOkY!uwqbk^Nb&HdW6*}(x-
zDYPk;+Z#N`IRRKQ2E=wi(d@73Fu0gyL)3`k#mXdrbeUnWpmB5%?#9rgY-wq2qY|w-
zcaHe_9F2}dlfE41B<E<cK~@zuZcAAxf-8`vOr^G^Vk1PWQ8P0sLWm)zh@%7$`!+*E
zmeyimW++@shBGCUm5`-&YA(W5#493*<6;Ja!)r51Gy#AV0R)zy!G*PUay$GdsPLI0
zXzZLtmy$`O(<%}ZzL-!lwy|w6)RA~)c#|PE4Am1DB5{mhI~5QiMhTa)!xBM~MhrrD
zhr^7EQ%@&MT8AyT$n|#+@Ez2Lc(muxof2RWFlQ;Tr0%Yjc_ES$5DlX^#92yJ-aBhJ
zQKo*~W-vsTpn#x*kr5Ht$%Kj}skv>&jrS=`w8JepZyKr0L%zZqKFhfAGwgYs&H$a<
z>IpE>)8Dz@wDI?t9k!|CO3bv9vcmD1jgFezOs0_T*E6%`r0RN_`B~U{o>lfb3Qn-S
zm+1AZ)lFqsWz2-`LTMpcDAf{a3}GV_`<o@%)@5j9%2gBk2v%=w6j({UHq9YM8@+kH
z_a$F?mxahED{v1(6nCP7$%>UXBT)m&!W9B(1HkxG&OjlvBv2y7f`p%FkOHzmP$vu|
zD+Pjrz`+8rk_tprh9n`)0vy;ZBpDFAbVVuxCJ|Mr5+D)^B#2o-C5HVOn`_jvT)Apm
zC^D8SOi(Pf3#Gy%h#ag8<h@!F!Bu4qoqa0h5!nQ4up|^j1F<CpJG|r?8PBF2Fq5U)
zxV*W7ggx9=#~ssxMpQ`X5~Bz_6~OaII0Bns1~=<DS_4W=1P!r7&ha-5=MzcR!Gc60
zf-)$ouvz6p$C87M=jj_&T(;V}z!jE~cmz<ABZ0qANFEYm7f*JFSB#N%At$F4TnJ$W
z+=qV*6nEv9jv{xr!pL*HBd2_|Eoe2W7g$UnC@jXl3v$+zY%W1cB|$)KYf2*0H0fw%
zp;uPSoe7vIqA>)J1b54UyCw*4tBjUQMJ%<2CarOZqY73Q)E3Ip#8oO4YS~3x8xTxN
zTQenyxP?S}_U!8gS!J!qE@o7vq*lrm!8db3t?8y{N0~}nD5%B31lr_N3iUZ{)~S@s
zM*;7WP1tVs&q2#sRuW)9!uUJ|_fYEjEW$g4?Uan0u2MPg^W78);M>2^;R0}y9jPF&
zgsp%ih%VKOQ4~9P0<I)?0z7FKc>{_7(z=Hg-wO+9C)n3vx>m!4pf4AII?XgL+-L_+
zkRllP%j~8_kdP!o5mpdb1Y)R(1c0ijD5$K6k_00Y5)?@0C~NVH#h~CxBxxdrBa+nd
zGi2eGv>v)cW^gqoGAw|guz}_6+z62FbvdxC(4sJmu$o{T8xS>+*DZs6r=H%Hvy&F6
zBq-7C=BJ;Bo^G2PXKz`?=C-EjaI&U6A|8vc3ZnSAGdE)3M7xB1kPmi<2B;a3_f0M(
z(#TUNBLpG~xK0bFcS+SgV_QB9IUD)3kmxq2D>0E^A1S0XLZn4P_NQHg5KzqJ>TW|V
zCq>;M2T7gHPEeCMOafqI1T)0ru-pXb&@+~FkaFelQnRnahAd8*<mB|rY!Fs2auuFm
z#|o_KH~}KXw`S?{+zt(BjGZ(SW=NmI_?Q>j!BEuxIiK2Td`XLX$&_Pjsp;b*QxW<x
z68zM{8g9#E_-_Zk)77D^t!KyV`fa``Qk7}R0>xEevD#(+Zgrfz+}>x;v=*ingbX<E
zvu2N0s-VCT0}YT-sG$fW2nhxN`l#69>poBAU^^ekU=Q#4KR4>){M_!_^z`44_iXl7
zR`R|c{$F|fsC-pzss}K&G*pBIra6ydM=}JWdMv!=41^B3A*6+Y^ij|fqwgUjZmMrE
zobTp&yY_CCDN{}27f6Pvz`K61$sr_>6SUfTz;sVb1GBM4`o9b4X!f6_iG&8?xjZ!b
zPY2T=ZS?X7C9S|gx;!v^5lv8J2_`G@;)H@&BA#Ld<#RJfiUIafNd@KU5ZLYvAd)F0
zA$7CN`|ToNaPRYvWx+>SR}smzyP^l?K*3W+0gB6;mB<+M;l-hiKfx1^$;1u#-9oUW
zu%p}soPt4(I%Y{P8d`RBdt+iZUNvhDEnrIqZrvxIdU9^3&x{z*vS%S~C+w+CIF)S*
zyvU+(gieFB1=(wFM$nL1>K3uUrmn7`P-co`(eE@(km)<5<v9mqA^E8y?1F$p1nr+q
ztPP@yD<a7dK#^e-HnbFis)E5`F#swHB8wIviVGr=e(!oh?B0UNhuDyKFrYIrln-IB
zb&*{~!6PJ1>zwF4ZFQ~}G{Czg5;VG?`WAH{)T)y@=_)|RNr*zGBnrr&j8Z8(G*TSU
zA*{PAP=PA}MIc23X9Pw;hk2xj*(BB*IRn0T&J!SMIYf~|c1h5{^;iJyNGy`3kPTBd
zP&00DhBPJ(Gm`-f-31n_FIOv#riB$?*G?meZLy7@wSv}Il?TS)9`{)>V9I{E6-D1H
z(^*9lp=|*pEErKnL<XQDh?s60I(SWd&Jy<{NFBsdFbNfq5=b1K%+h3#Girkv21&9c
z0ML-wY{KGR%ERpb{93z8ZlB1ePHyV1*U-FnJ8<GkvY{_`WmjWDch#Z#{d`PITmg0O
zf-w=1`&H@!W)h@IoIHtIU^VCrC@AX*eLMZnZ;z@0#`Qsv*#ATy>dX=_Rs;!2$pVc-
z8|hqwN~`V;niNAiRmm|pOc@;)vUhDVN^f(0iPD}_@CoFjCz(CL+#O@U!64o|eV>^u
z8)8vDGzT^xQp5aS%1=|W$Ie9R$T7_)&$))u$|Z#{l<KCF8NSrr+F}ACF=4W7kgl}Z
zk=7s<X`&EDERh&Js2^1zYF%Us$rLKGvI+(agshM@?}SStx8(G9Wb*A2Rv1w2rSlL?
zB!XaPk(0%}QIj%QQJ4pZep;w375wgfldpc<INONWR0fMx3@i*MCQ4{bAOS^~XaFn)
z-0X4z(lVxz1|s}W#EE5DH2f<hmQS)e%7IY*D{r=7O8Zt;d%p~&#_j9HpW64G?(hl5
z${xER!YYEswM8Vg>f4o<tEMn7jagL5nHe`AX`CFhI6WDqh&2y;7pL|3wgL4J#v<Aa
zBuUpSZ8YDY_j9<aVi18OFckP+pLh-3gM#{kEz8J7vM?A_fORmDRF%`OxTwhyg24<R
z9UO&gvtogGfXJ+X1b{*)k`7}Wl_vOXQh~xM$P2b9(8vlBV;I3eI$sh@NU&MUoDo#i
zy*L*znpGrKvJ^;?1cJ^w6IUoSS=k3TNRE}f5RgoGIY5t?(ByV-LrIN{6Jr>?@r#9?
z2xM!{A6bsg=e6J2$?HF$>A2M%KQ|7o<5bb0=Arafd_4zAQAMWosb)DO7!Qx3BS|~o
z1Z}K_1PlZO0xmjv#~QE`PjC0$kKljt@sF#UfArb!|MQcRx6@{|twk0Rh0muKX)QDa
zS*R^vsXrTQKk8lUezlsFJ!Gp&UVdf+`q^J&Z^orwLw<?fJ^#*^vGlI}I`6rwc&vNx
zonu4H12Jd7eGiZQ4pW?PXA@v#(~-PAKd$Q+5zE{vg+v!c5Bhl2)AQ1(SFKA8Oh#Xw
zUaJFdFU-IcM(2YhenA6%P5Vp!X^=_UU(iB|A@$kJsvr5hp70wNXqM>3g;3`iZO8#O
z*IrNWq#hnBTFy1x>yD}F3t)o*Vus*45P~k?PyXl^2qf>Z4$`H}e_vAQ&R{?Oygbne
zV!a>~`XU&CM<$3kv<)JhT4EWNVjQ$<ZF0))%dc_b!)7O|vJHqQ0v*8jQwJLSZ-MBD
z6RGQ2=DHYHgS_|q>vF>-5OP&72kf)V4e&7|1f&TVNP--J1HqWCc@q;b8#bEZTrst7
z#mZpBux>{y!&0EED-H%D7?Y30+8mv@IJ?}%iC{^PVrCuSBpigrqTmmRb)o6TY+l-C
z(1FXlSq5@9m}chsh9odT>Ii2Yx`t@eGHKA7EDO2u+RaT^sB#R3v!1Xq<?X$V@-t!+
zNFf{*xR#oI-KG(NS&8qOqc}O!f){)%ybN@29|_#XD>5Y*JHCh@-B<XK8Cq=X5v_3d
z1ba`19%3;D8P&PKeG*`e>`5q#!A5DtfaHkRc0@&0NhUIYsc(ie>)QNVjCzL~XLore
zb>C<A>BiB%C%%@|I|#H+q7csgyAO&Y^^iOjgsWCvF~3RD7A!)!R&`M73UScpLmx->
z^}G)k*CM)E&*)Df*+!W4Sg1PD|18A*$g4_?CGyfRS38q(YRaNK$MaD9iYdhEb(Cdx
zK3O>3+^w6HEpd`k+f+^e%u5-TB!KX{l^V`0-!u<`(&Do>_gzep;$+tz#jOg@#)El=
zRtfnhfHQMs&jGn0Iyem+i8JS{bF6+3O4E*9Y3w6~1K`mFD^EtD9FJ@>S*?f2q3O>a
zF3xRjZ=Gfv+aa>ft!|;AIZtl`ULqm9kBpw+@OyF%hy;W<%n4|JVj@Sz{h0<gkt9LX
z4J&hsn(h*l5-7&na(zX+i(H^}J2nCy?-_UapC{#0aU5>7#`W9EvnqQf^FM#L)vc-<
zyBxq`lM%?W?t(-gK?t7SKAcXtuDotT(AZiL<Tr8LTVs+uJ1C{NK1M!@9+R;bmASuH
zFIXvyQepG=3(kEfRqE~6i8b;N;P?^dE=PH$E74pzn3pS1R&QHz+|V(DZippJYh$lS
zgpRzvT!e2tamFJSemQ-4xMX@57!Ezhc7g0?*QRCAjvb>uJbQTSjYZDKzvJE`b=-U6
zaC#uF$`3o3hd7BZIQBdfJKaQZOeN_qMq=NXzBPg9hD85wu8~+sQ_ODadU;gES269X
zffNsaxbAy_Kyk&p1A;htcCR}Esw3aFXlJW?E+@R>wq+H}sB_ApaCP^-tU=+^Mnx?<
zjt~{>g_7=vX+_#@c7ByabV>;J{WsIk-Ji_=A$_fVU+MpyKkE2(zZE;4d%Fk0kuQN>
z)Vn)_f$u6I&M0J60h<_y3|t%ebk<qz8>&PwhqLe*Jt<r4ktPfcC13#`UN-nMpMvMS
zWPppJ{t*T?g9L<1!@Yae26o0)0RSIlY(?6W^ft@b`bh}R^hoH@85|v9x%4%;#hu2y
z_#8NZ&+(x`ClE-3-iN;RA`9=80O2A#UhG4d2`P>poQxU5&@qGL<GI$`ojS3Se8tR;
z^ucd<fFm=UT?Jl821N9Dxs+U@%sF|?%k)56hkPk(Aps7b)SMD<q$eo>X%MKC@oB`=
zZwo;zQ?`oTXd0r1Ng#P=Fnhe!u;{rn;cvCBysPn3$3V8JS2ICkq5(tBd8L9SXAzTD
z?~G(|7#-PePd$6z#l;K(U1)MU#is+4nTv_S0uL$%5@odZ@1P%kj_1z2<=Z?Sy}Yh*
zSml`J$VaG>$9UN16y9_&Fc-n&tiuAO2RQJ7#4dU(@A8bEc{!}(t`NduMX(59+z=TS
zVB0l#$28YrFAQ<ru(&G3XT!U4hw=N7E?EQMnHMOR^gKoEhPrJ2%8K6K{yW@gA>J(w
zzGoYDyf*aqXKs4wJrJ6V8eRrbcmh4EY;BD;A*MH^(@^5+dD71m!a2F;J(^@K@IcjR
z-1qz@lMy6QN#}nns-Ih^sRcnrks`%pn;>+5L}(0Y0$x#rr~JO3^}nWjl9Z(>Pa3BG
zP^SjcnnvE#8#HLb92&b>)1h`8k&?Lqm@r@&phP*EcFb_|k;l4;%`v>D3zeqz3^5ZO
zMW~=b_Dz-HQl0faHn^PGniQ3R$M^X2k*TDsa{B_C$>h<h+vpXF%edr^y&^Qc>eBkF
zSgE@9b;z)m8CkCJw6+;j6(wY8=7?z1u(QtJY)5X}nzcqRZrP-oWIPq$AQ+V>Hq_my
z%1tCyb!Ho4tpjbV8qIOLI`yM1wN_DW!47>SMSElP&Enakg2;^eGBg)YE8ovU+ZY23
zB9jTzFsf(*B6soHfNa>|RfVeyLtd3s*1D05frstvl|;rHta=5}yX2CUT-ggSJl$=I
zVy*rM+G9+@wm<QIY1t~iVEYZJg;s8-(f$Sp;O7Rr`%lcyF@AN`#BT%!1lGBW_xIuW
zeHr<)5v6o-sOsk&7>pk};=BzXd%AfauA7`35vY_EB;In7(GYypRcc=LbK5g(9Xa7I
z{Hga882fw0_UWD<E2E-7xO;v8mX2Q;p-=Sln!RW|^gsSx!=4bIFC{A!2Ibf1vsuoY
z@gpr}D=O6Cw&JuMZWTHKrAOnOAS8iWD@L;q=s7N`v0PAC87z)gp9(k~SYYak27~M8
z>HRnges(?c2PaC9M8}SPI_Z*$`EKIl4xI$Vhi={+@e|GmhO3P8k!@qn<5-^zd%jh6
zWH=$kB9uUK9Pr(VBy8w89QL00f*6R?Vt?PpO-~{WZ`%ksYCIscXGjTZAY$BGhjC>C
zM6ro!X8@l-fck;voH(ID9H(>&2h|?sK=SQ)cvl5Aa1<m!gFcwzl(P~#;md~ZBd9r*
zmwex*_UlwAdfm@)T_j=SUQ+ePN3GDoOOuWBFr%y5A_5u}A^eB;j}W<B*a$&PME@MV
z#`|>d;)bl?X%1JeJIK9A*#~yO1q8g$LH=DK28$9m^Lr+^ImbB?yS{g<2WTm_DTvW*
z77y^a@PHt(zIy~ahoFyqj&Fk`*3Z%Q^+tOk|Ay|dgcW6oqOwRv3ib)%!}w@&2fNz>
z25>3k*mjoqIr4iu(<H!L_~phj<)Q64XIK>&VS+(A-UAXQnA*9hE>=keHXO%p7Y);M
z>Uhf>AX^497o5Dt-Y+8^Wkx5s=Jy@u=#FebWGap@Z7XeD9K#@W1528K%w%$gZ8Qjx
zBfN(q{o1F$Rlm39LXX;=Z|RZa&~{vd3eS61d#4xm`PBH!c&C3596z!vJ=`dwy^+KN
zt?*o9K0`=Vnqesm$VsoH7I3Z&Je|!9bP_=%5lqEZV_REob~Wmh$LCJGEIf8^MxZ9i
z?Z{I5o`wk+5e$$7LIBdi5ESd~%oZ7<m?|+gOv|elQboZk3IfQDXqCCO)1VqQ7i`-_
zf>+jNM{TK)NUA+F(}@;oDHIAmQWSBX2c`2}r^eA8PxA4$*|JECgg7K<;*%Q9s;k?V
z`zjES+@=^pNOs$b*cjwU*N-?#g6}#Ma%9*VpM<W=__459I7>^jFAiDiWTin1R+N6K
zk+p-rb&tmx#yt_wp>2753dGBU2Z?v7sJY6J@a7V8SmjvCry`Ld{U*brGK{nr4xt!v
zE{Bg|NBDg{SY_9tAuBt;3M}m>Q&}Jn;pTmoUz+18GMobEwx~hWD|7NIQgbL}a{o)|
z{)fQ+H<dXPao13+RG@txh(-pOrRuUCw&K0Ui1>vPXo?S{-(~GAj|jvBto?4bKHl&k
z17`_W^=8v+oC0@RlspknVrEHo4hmL;35RGWq{xW^Aqj>SdX(5wI_3X@5*0uounkIP
z$aiVU8JRRi5ptC{MqDK5P?~xk&1va`;M~4xVIn+@NYUPgK|AeX!NX7%70MC;!3%=%
z1%NYmi2=df0tlgQF>!>F#DFJZfa0uMjECADgrTEu@{PemFffW0{OYkA8`6?;WZT7E
z5q1=bSZR@$!%d7CHAWVHqcf^{A;K6_5DN%HIh&cOknd!W4S-oOc#TWh6aheo3Bni$
z7mD6O7`LT{B2)(s3y=#CBv^{fI}mW4)-%0cXE;p^KuI%TvXM8T!D}E|L7l^f+LV{I
zDV!7pMoN(IJdKYx4mUZp{m;71XrXU9T&#i&K@RX}I%ZD>;;?2GbrV@_#1_iboX%6n
z7TbpUK~n)=y7#}q>bjq&({C*9!CqR9?lX!5cEn?I(oO)EdjeEbC|M)!$!-DfE7%l7
zMkYdm;p(tFsA3*OmGD0`-&BwapHh&-K9vBe1Ao5Dkf|c04go4bP9K-G+t}YHG<Ue0
z??_b3Kuo(UDt$WuJOIf?c4JEu3tc*26O;Vjv#p+Z)*9s?=IkTloW-}!T*lK``Ktkg
zpMW*kdgFg~BnQS~5FGHth+vL$(*CT5koevH&_B#c6;=ZTAg4hO4^lwdT{>e6g8*Yd
zScE}M6dExOv+~a{wUgUt(eLMRNnoFvzuHI!rX%<n|0jo>;r~u<kEZqC`sh3SC^RuW
zC>X~OL+9gb9TiJ)U2*W~dBrIOJ__t*o@*oLeVU&ceDRHvztErn5%K6jf;+m#&<;ci
z>~Ho_P&rmEOxo`ne(T;@OPFRhv1Fe?g&;Kg(_yl(7i&*P|Lj$xcV~}xqtdkBZKLP3
zg9Ax<k1$8M5dMO}Z}I*%T#cAn#6F+C{obP6e-PR)n5#GQ$w9;0-06_4WG);0T89o!
zEZaiq|9eu#F^?-)b5l21%%)_Jw&O|Lf(}aq*4jVDm4e4#y~xb?eiPD~J=yv#|LgS*
zdewcE6gdhf!l=$cwGgP{iHcP#-Ysf3WMUNbs-N&9%+y)ip37zidF$Ugt7#hJ(uiT_
ze9o$><M<#~+E_BmKtUS8&bLkRv*hH@4}7_Wc>@uWqne~2iXI8H#BwjtM=*VO_y_Y~
zooC#ytLSVcb-OxCO{RU(a7L}csiN+ts4=ti5C3!%v-Q|Lg5A6)<UOJ^ARrmgu>KX9
zwG5zutw_zwP~MV}jJ-p*pI4bn8WFzeaj*N}2>*-9J5lTwp_?+fT7Q4qT$}COl0Lq_
z=WFme<NYu0({cFQCedc+kpm_BusS=yLJ%Y*oAl{PU@)dHG03q^Z+O8Y9RdI1P>eay
z#M?ex`!ta_{2k;g%!{QDdDr_xdz1Jbc>&^?3~;puljf)A>1z=mO8jME?9B)C&xqO$
zA;bhKbBg^IR^~i&2_-S}7JUaL)eTPjb+u3EmgnD!yU1if9Gr4on9`S;d$+B7!i+k(
z>0;^EOT$#$&R}d6bfUu`f(C^z`_+OqIdZz_)qt`2Tjgi1p4PYCfw?617=HCCLUo~c
zECmG*q)1eP$ShetIuf88FbawQdkV=|r>4M#a8HkxIL%_(0nv@%l0U}~JFor@p9ck6
zx96U{lGQ^|4J1yd7iVXDZ8mVEY#ca$nO{HMbq?z{+Hl-NA{he^RQp@v%iHD2h26>9
zs%bZ9<FjTo9y71nK+O4_-qC^M1Igq$B1t1>TRMEAP$3;t)hxve0P5&O63DAd3U^Qo
zS_qOsj07;0QqzP)ltI}+cqLL$W9=ohxOyp_4@nUSup?6bXxbsx6Li3ckt_*xA<9UB
zZUi{t#kfGU5?G|gCFf4;nCx@Lsw;GgOGqXljy7>IlNHP0k}QOliZYlcguxO=Aad-l
zPK(+q-`r2h@~W=%I}$7>O7_5}zL)FS2@#%K-sab3kpR?&*FtYAc}JRsPcr)@N%LU$
zbnU|bRkl(<Qwr+ZMd5&ILh-NF7WE%IB|rh!x6GF_=kvLH|7yy*o;}mxbAgLHN~F^y
zFfHsMBLM=^nLbs!4gm!FX#hxa2hnauxWz>zw*5w41fluZ%r#;YvdiO@CqLUk`QvxB
z10TC_g6Zd^IU6*w<m>c9;?eS06Nr#@mKb2jx`%t4yUKhEjCL~~`T_YLPDaK1PlF;6
z&xA%og0bft3o(pFr@T%r=o2dmX^MuE;EuMr@&@sGN5Qb){cg7U9|mIvfJUhHQQdOs
ztZ=(W^K2J7k$&r1J1)PUOw(tm%X!8klAySCAI>?Hn$~R%Rn1u<7c#men9;H!!}c&K
zkg|r#67T5skfFj@TI1F{5tW3W%4hI9A79S%rz=xE++F-K`7g7*jwD0?(%k%1=hdk6
zrtZ@_EvB|@(!J=``j<TV+bg?PZfjvVMU(dXS4^s}>gT8;$dL%jLak`}%h-SK=XnF(
zST+Tft>`<=W!`$PkJ`FBI0eQ(Rxb49I0K)JoWM8#w*}Dy8qFR*!l!}j|8D`y8Sxtb
zTTAj;`OM^gTs~i6N^KlVB%jv)4JsSfcMShG*n<|XIVY=*Yult(CSM*YI0!#3iXETx
zL62sBwtxBQXH0_d3MfM+U;C}&zpTLim?r+VmGHo}3#xONZd3tDg2*3eT*}|)O0WI!
zKTk){|Bse4y2FQ(4{k>4<#ric{XvZqK2Hl5UFAm~xAM<-w{4;Z$R}v`&2Gp)+bkr5
z5DGZ?D_|@v&}G8MF0TUdIG@|)wO$ju?ZR9l1Yt6^MIS+D+HV(DnP`9wL8X`l6>yAB
zIZ}~pIN;EWr(x?g)~{#u%m=UE_qk`U7Ff4i8GqZSQUB0OkXAgTRh|X~V%oKU!IagQ
z34lzS_B~BR_9YJgS^vITflk{bgnu+33`<os^zOi-mjiIpXCYB4Sq*~p#$uM1p_W3H
z(Ad+c>J@@ag4Gy@YPZ)s>nI^~(IjeipU1<5H`lO5bSI&^?5&Iia~J#xiDz41F%H?$
zpMhef@j6r}Sx8H{DVBp3RXTo{@2af7eI#C=DmUMA1Fw9uiR>REgNGb&xhIuh^?kGd
zocHwn%YV7T^BVE}ttp0nHpaWN(3-&=q>7XzU0dsF^UrgCcD)hDB(-Z)MXih<=-(r0
z{3SwBN}7h-jEw(qzeHN@#qUVe$BwQ=FS6G|k21QOaaWqx%C5p?JFD)OR}%ItT7uW!
zotX5O6@uE|G2bxpbNTs<Ro}r_`M!47dZy1=dW%<Y=Gt$)3AOKwMbxqtzJ1dc2MW5S
zY_98FDh~{d^FICs)oGL-E;iFuC-d%MUo7j))f36?%h1`5mFnSMBs&COqN!OJ2hca4
zZUti}SzfNM%E?vfmJO>feE-SMX`bevwZnhNgdqYlghc8NU|Jl_T6+0(@y~32?_*Ku
z%QhVSURNunnO{F<iYv^c$L}%k`)DcWZFAThST+^;=woU9v{$Lo6~wd8cIBAV_H@F#
zg$mCzVqOZvG^^8Ntk~}CIsMzSHLhW$hY*txB+-^0!eum2#0lh;^-8!D-QMeyfKhk6
zy#5CxCfo|VuNFTNW$U<VG9rR8o6x{jTqSgn*h42H1;kk7lmsAYkg;t)&Y)&{jRt2Q
zK?6TysL0Ri>+*PtN2dkOGNQ4tbdNFe*~XsdHqOA=r!=*GdMVgR>Miuk<RP5iLfce7
zW5;eoCw*U+j+@1$MT22pRr=jlU%!+Cg$B}NFRh_w-|d;0&Opmy9kF?k7b6ixJZeh1
zULKYz*TVa7@C<#ZQi&#?uSR1_&bO7j($0^@v%1$=ZfmsNZ-qz1VpV+EFpR8YNg^Tw
z(B}jIAWM<!0tgjSa)AKHEkh}OecIV|v<Vw`LbTvvJmY74ol}e`FqDSJwmoylwr$(C
zamTi8+qP}nwrzWFb{`fGn>0<^v`HVDllJtS|GU59YbO3mWXA$^eyilXcO+NgkRHU8
z;jB8z-=>Kwi*)f(z?#Xl&32W`k{ndY+{nS3c{X8!Cq6npg#u;qt0w}gLfv%tPx!+3
ztPvD93A=E4!4@v#^X0btIr&!3oG^$<SNMf;`5_2<fMZ<}(G|zj`Ma&?@8^MP7J5vR
zLxpf8rRdEg&^Z8prm8|pn%4vZ1cl|AG3t*g9l*5mv6{sK;$y~CdcIK0TM-uYeL;A~
zsKI?$FGFcRtP0Bm4rn8c1xSM^w^$Rlm4)gT%o3zX(WlRceEg6Uh&}u|e$l$2vG=X2
zfosu9t1_60>YP>M2?7&3?^;sO*rYJSBbb62yo;{?tSE!LJunekx5Qf+zhb?V3C3I8
z^r!B*u}ru_p@l>{sDBBYJk!kr<3f9r_aa%kFLD7Y#L$##c=Z!_<G__K{WE!Kp){!=
zgj0<jvjXEzZxp}Bv+7Z$H&}HMVR3K$b;pUUc{(Nw3&p2Sh13(5Wt_GmuRc8ki^Ezk
z_-3NDEAH^_hozk<7c#kMU*K*DZ5YD9Or%v|aNwxtXA>N+ap}@go$LgUpX-MtN42L?
z#Kp(#4!SDDLyr)LlgrgEgH(><sQdgHLI-vH-MpKaK|fq1Kyb*<PqdkKe0-LHMqcsk
zQf;W(DkeP4txBnBR8Av<^(xE@205yVmwm+&xIcw=G-CbnUIS{*@<(d#ruVQBnn9n9
z%`WETM#1UXQQ@mbzKi>Yub%}Yu@Euy>aj%&%3;W+&M81;&U+aSZ6q(1wmy;)a;^KP
zk{P2P3ET5+tqTH^_)prT+7pNdX;5p#3G?Xmkr0^VNWB`FteX_T9bb727_FibSO$v~
zalBYdpGW6ttj1|422{lMYqHX+uZd8EJ3}0h%+<OfF(fH^TI^~Gs6H&BC;eQkOFe>9
z(OwplzjSzVC{moGRg7K4j4uAKhwltq#I)*|(N)t3I6Dac@Jv7r{v$?j+uxt@Q2Ykt
zQZH9%|IeCbI;P7=a90-*^1wJL*+$Z!vCmP^*nb=y)e>?4w~H)=?A`EXyN|L*?&*Jr
zquqk7k>K9D4I3x-azNWROnL&qk024Tr)4G(&0xN8>}g3x!is^}G!G?n=lwQuWQxrU
zxHEgz6Yu_BFq{}nLv-es7w<E?LQCc!0`FhuT3FQ~7>pQZL;;aMd*2`<zjLaSW7K5R
zkld$RT>To~$?cPv)VtiaEe9APK+4KbM7di2s`MiHl{~Ogc+a(tAf<93_Q+-GmE0Qh
z!@U9;{WJw`Q>U*F8k;LzTIfFmCwDp1V$AK&b7)6SS!e1*mWVz}@!Eh{15=YN$|k<w
z@1BkUtu|tjeTxn7J>f0+*Vp!bPo29H9&w96SXdZ_i;Zu!96j}8r9|^A^nNRgH=TDp
zNWyO8lYMHan9Ery36NNc?c2!AEZRF9?6R%|_dZ_qKH2n1z=Pg)E?j0r4HJ1v*=|@h
zONabVtJrlxBd#><e1_^CHP&eD$7hO)SM2@K`Ip9gNA^m0w#EH+Vj^X|JDZj6wjQAb
zvwylFoBA-Ap`KUR>X!tS6M<{?g;fr{vkCl>pSj)1Q}bG%$sXx`$Q10wZ_ysvA1ZsZ
z_QYv@;ELTId29=pP-@4_%1|5}r&<3&V%ub<WTor1VX`-%ibMqN8F~P5R_*yP(O^zy
zk_~2WYeu(tkc*~<7+lyfq>Ba|WhR6SR5M>v!Utzum0l%$D~q)LLn|6b8rKzEf@hvI
zL`s9MjNIX~-Rb$MSv4iI2HEbii<qB~>_bXevB3o^m+2vE+|-Psp32AHP|4<hemAQU
z8_KL!^&Bq|$RqNmadFe19goCPnZ;+DU9OP*_49_T%@+JB_y{^sqIFDy3T4(cYw5oC
z@OzA^nQs_-#2m|YjSreoR?*7rNw?|-3bsuTb^1oNl<Y^!L@I!%A!<Ly^t2Li6h);>
zN#c`e*x5JrH7vYKz2gUb&HiF<#q5nT0|-E{D#h$S=V7XK1R_fygz_?8l_EP5Zj&Ji
zK5$~{rCQA^cag0cddeC7`(yLGT2dtMK9YGyC}9r;8Ba_4v%4o*36L*dY@8M^j(EHU
zREL##%M*mDbsYN+_eaIFVsS`^BfA7E4epNrIG};7E#l3m(Qu@qMpeAv`t*2|?T*tC
zJzT=Ey!uzAOuAE0pT6s2PtJBGkg&sOq~Y9{`(cznhSUjm=A??8L?}YsS*`5vv;;|u
zuRMtfdo8gHC)uU3uWoi2@Qv8r$V{+2hLZ*wlTD1li`%)LKb0-3+kz$V;?M(5&A%*c
z``bg0s`NgrMceY{8XteEd+WTzX1UOXSc`g=Q@?x01Z$tl&B_SFEcrDKWG#e}V_7%X
zf`C-G2AWh&dQLzRB6IgZ9i>!s_?quhndh{fA??gfW+@*HTc5m(GdwQ>Z_}`R^Y-SB
zAS5$3pL~UXeVf!Dws?QzFF6=nWEP<opO7U2QCr`vrwS-_e{D^%%;-+$_6`y^j%5*J
zhH-?)z=0%Y=q9BKp1`!QBx^6Ro;UM176<78`sRTrrY`xSp9w1sC6-*dDOgf8P;2~_
z+#<7plM31s?D5s7<6bvd^L-bp(kb%}^zJmSd6=es&c8*LIPH1(1ETm@Ar}5cKKzTL
z4P*UiQN=(v*Qgj4n;3o+S0_E?73$6Od%q$$wYm-XvYJO$nhthf=eyu}V(^3fmR0i&
z81_VR$GOmV+<6Q^o>CEJ;K2>0>ZqwGk7TPAy}6l)64J(U9Loo~N-{nHgNn}=s7&Tm
zOUN%|;LyW1{BY90;iJruuAXQo>uway#~ls}0zoGMW0_TU(?N9rc^aoXy7Wkl?+mO-
z7qBEMGKy1774u<5A)@bKCOe4>H{XD6Zxa_tgMtBC_z6sN;^rcjs+*Ebt4#WfW$Ka^
znjy<gS%p{jr_fm9nR2OGaaH#_5_>saY0#x3HBAoSViMe694MxYnnGYswlU8$=A@DJ
z${=LpWfuJAukfwZE#~Y9X64mt?ioBL!)zCKd!{0I#kcGzW{4D<3eq=V&sOVJGVEK)
z8{X}mTZ-b>b}Q_>ST;vi28@$MBLX&c%1INx9~Z%N_4<@9LVuiTRWj>U-B?K6>lbJS
z7QfRHs;rEC=<OU^a>n;qm?5+-Z64G;KRcnt_5?ZI$k!67>96=ICCa){b8u8sV+W~8
zs?SYz3-DBLz{6&Cz>pds!j?X%CiI4UdTmHUqm|53b94zqDnULX1{hJcP*re(g9|xB
z2S-C4K5qN!hgW7qi*C5F%EY8*OaixzFRMAdY)yM@nisi$BTp%1oc1RxmMw7MBsP+x
zu6ARk1<hR&n1n(<N59ervYFq;!Tr2-6g)mFwu}<PAy7$^M_Gn`m_ND$^Isk*&D_f`
z5FB1(!^zUI9CY}e844O>pO|E|+fIF+(|BK>!HWy@8L}H;pUw*GEFn-`(1yB%Wl_~i
zp`^IFX399xp+D?VT_w&ikjue4FZ2BdORcRqqL#<r<>Xrlke$;SQ{^{p0kE6|3%7<d
zsZvtf_-3UHw^6p7kyk#xXI8NO+gFJB1dRMn{v}+W#KUPnBCXYE6u^jK05tmuOj$rr
zbaKLgTF$Yb#0!}@nc&V_`l_zHGw6W_b7^M<mHrt8;Y5^e#>Lg*q0riNj^bLRUX|~Z
zq-zn-%M@d#D&qnsNyL0quAse0lT2<l;y15T-=iCA&bZ9(hM+t-9<+MS$%zqJZMhPV
zBu3U5)UkN)&u98j3o!n5><AE`MIU8oA5>zB=mM9JASX87HYK5$4!9li4b7Zlvc$l8
zu@B21udsF<JJ?}Hb30&`uI#3(@)_D!=S>jzDQa7e(*9X6JJiDh9`W8s_Q_m)l?1Qx
z%QMO>LReH6l&GlD7xYZuE)Ad(P!-3y>V`f0O2Bdq(Zs+)AypB%UKic<<($%VLmd&!
zWl3mah~n&+F*2aQoQVxu(fFOw<BEGBjUo+2ZY65KWZr4xmEbC`4>`1ow^+iYqJE8#
zwL;0mN@+k2Nvo2Pg()G}Tr}@(s(q%|+vd2fZD8$~%fSTAetyK_$s1BiC~qR9D>>TU
zU^@k+&XKLvr_?NRChIbyD<jlibtA<qGP7_v&9r#UcQz^l6;cGb;=F0q;>UWD9tnl9
zSgm@4GuB3RmMOU_e=brB8Avb(626V0%l?YjDhx27TpubR(Z!)QXB0rPWgEp1?ebxo
z^tyjtlA_?;Z#xVH7DrkrUGhB*4d=`h|MN(7F-TZ?u&lLKhkEkJ`6J<)K1S|+!>+=l
z#iJOlzVp;VBMHwWSM<wmPLi|55{*1A#ls@AIF;vl=~{wW^zFSY9S--6?pB9p+{u_G
zg^#Or@4hkn)b5Ge;*>>Rx=BLfw?=!$EqjRt=y-`^z;MSDTyYjPf%N;Sji_a>RlYGX
z;b?3%ryxdIIS>HW@H2zoFuylxP?VXGFXl}m92%Ru>HJ~w%-yQ*F(@SP^WLm~D^HSz
zU706cdvgDv5ZI#%4(tmk?`Tux(3#~;HDn(ftt`yQj(lx;{(vW8jeH-AY+9PX{j<8I
z+f4D5(6&g$Sun)rEXYJ*H#)z9OHCO?X|=EZ6{Zo>>zvmS{8o6?5)ryy<`ey8zQ9H4
z6P<O+@zZ5}nrM`@t-MNX_dsb$Syjzn#_}tr!KB-EiwI6%vrO<(tTIUH9<EXl`G7<E
z^-_kVbxuf52oPl=htJ<&qpKw(+y2Gx2Sx^NP#F@5Dl{<-1q4lQ=W>H4;!_j#na#{;
z$hZuHOKijnfxY02Rg~T^&bvLsP!f<*JoBRU{bN~V8&~JoLAS~{veAVG@xD)V2Jj@j
zDe$N_4nGt5-i+F97|qYE@yo*tVw4SD4Z-GH&DFv={rQQjI#JeP4!!!i<fz%BStIp)
zZ)sSoIS7~;qJa5H1wWx>R<|E-7FH+oZnbkB#;9IP$b>qsVDRs1hQl{Ctz>1r4(<at
zsLMWEZQNDLO7FlyU7Z;haO=K9R=ajJ{`^(5@=}sfFn>uGyNRbeE}kla`$YbMX6azr
zXzA`a&J0PFN(QZ%$fHe#xRcc?<c{@PsE3AqZ0M{FH`whlE%Z_UI-VYY#hfA5&S`q&
zCX1`i${wg8uSyA;#5pVQ5uzew0w-K?tjyZ;@JO4sY1AgW)0ox68OLtsyQoFA#7YHS
zd7`bb;7D2z@36%EBo_aI)sDug^6%v>LPA3gxo-FmOhwPEr&TtTiJ4fpf`vs80F;J+
zXiuRsv}?$~qK0T2i=;UEk}~9Zz%7Usgww#Y;1FE=We+|y%awXa-ou*pG>&dZl`Z8|
zIm!?Dr~g<`Rgd_|0}O%gXk?9>-h5w4$sm{8_2zMDCB{0f$}KlrT6_wS8>LM~(GYXk
zYE^SritwK{w_BQ?<tY^P3(7g}q0stxc7i^Cyzt#H;uD}_3cZb$lt7{jL2WST=V3CE
zVg3({=rP7{`6a@9i~So%PN?Y*EB17Q39A8dG}zr?g)J`Fz-*Q#(rMs~0!7Q78#znN
z^U=|+Nh7u=DH#o(?nl=-i#a*g#1#1#YxCv$ypTX#-yvTx8b#LYVu2k!`>n{sXi$M3
zCaHIBIT!<P?eklDjA}U)$&6)XBr7|M<#`6f<!n$OY`+>pY>?ZfGQko>o}i4s2~*;F
zUPGP^LYnqbxVt1wo6w9kL*{JPk)dIl0%8NPv+GYZOQnX|oxx-*vT>b1JWbm!VO*f`
zY(CkEM=h1ok+q>s;8lxF%4@ye%IRJ;9$GvgS8%*fd{da$$cXV$2=@hTP6LceW)W||
z*}6TjK=Bq0b*81rv}AU^VaiPMaqXX`)Az-}C8yIF>zWsY24-h{-p%`(GMa7>I1oiJ
zffOQHB8){As9s?mud2)UKVH_Av~~?HaE6H}1ppj|c6rdnOv1oZ<4YygU7=dM-N5F3
zSZdpqQ#&uu1|<6M!p?D@Xx9Q@CD$5Ke&wQ@<ZUYICQEDI7t40mDR!u`ch!&v-b%WW
z-ZR&UN<UKRPC7P1PtYF3+QnGZ5kpjegUlP6C&^VLcc65HD_W5>J&Brwckh)vX{kS?
zK>Dl8w1H*AaZQJmipm3F8d|1*3~@!cTL1kif=o+@#1JbmV{V$-*fYv4Z#tofvmE1O
zMe{J0plc+sH|#&sTfaUnLxW|?dhV#ZW-t0Z?I1fZRvLS7FB|EdJzX2Y-$-{E9iD0y
z=D%vDG#cj`apL=CSB&Hgkil>h^u!j8)9Yko=wsIIH`{B6$Y&qmQ2uNek?JcnC1VTR
zAXV^EtZ$hihjsLbLpq^0;Ut!a^MMmFzL_KDgigm&xwcBh2(dXht!(JgEm~>7(Xbd*
z)qpV*7<v0dD~NB}EY$@{%%9&r(RK4g)t%WFhC|$WP_S^Q2t!{%+Kn*v-Pt>+LAENM
zmLEvWY*STqIO$7gw#aIpHYuwHV=;Lrm7(a>c)m`qQ?9t(B65w-N#3@6<BJ_$-99sV
z{?Pg?Z1>XR5(&x>tun`g61B7BZ8xPB7zE3%e|1%pc*7_|sgWui2cM*i(2$+QoTM1V
z<u-&bx^JYWa>7JSJcQAdZ0Q|#m2q~EY^IBh7v!xx4>#O5+P}zKuLl*uWh*n-=OjNQ
z66ZshgA?p4td~bKuHWilB_s8_27Lfeyq0;5f=4WlplJc?yHkWWiRZVOWN@Bda4#Zq
zPA5Xal_-*_(rEDc49LI~6Nw?yZn54}WiRE_dR;_ud^@DpI43@Ic42y>(d0^2(c}a=
zn_y|ZeO0ZP;iYuQkp3;LXwl@lfNyoTJezNR<_%P#dvr@*TXtP(pv$UI?VPN8seX2^
znh8#c=6@N_FybB$AW`Fpbt!;BnK`9esj$Q6REOTD%IJA`Z_=~1?DO~4l5$J_a}(o3
zqY2I@Wh<wZ?H^Q)EfeA|nOjj;EEZ5Uu4+cX!oLhgBqmx=0u#b+3ZS$wKF_S5QC73!
ze6_W%SnF>en6aO0Y_~V0OQ4Q;ws9uqst;2rm6$dicLI0^({(IhQ52_=Hg++EvUyx2
zVu)NCrf|{3So-j4$=az5XSzzXg%|BC-_mFlKnd176MPMenk4H5p)u7-F&hcpxVfo2
zRysUN=g5OQB8<DG|7G%K4I|Ge$^lfuV}ZRUF&=R`o&v#I(?O`EITL3z%*E6q!uZR3
zZFu4+GG}r*tPFWcrljZ1vR_MqA?eu6m=z;6f{>I}6b|dmQlV#%MS;*3XL`0IX=_6!
z#bkFIcZ`3&s=VoTM|5#*j0;HRUHvjmy6e_M#_V540PIhh7r`G<Ag2XmUmy~;4oL~X
zNKh@bJfvVro^KxUUdb9BoKUAoUXsS1d&?;lX#lcr$=pz^0ADPapLvWjf{JutNQ;sT
z(n1}KqzS&fK@<kMJY)S&*bWhCYXv~-Xbey|lemy?&vjk`Z5_}!u!?|O8iH9FG`?;G
z$4YhZQXSixGJdU3+s+=ENE3mY8L{fIu&19s9NA>bI?#d0B*8@4?9eiuV4xtW&@?yj
z3AxaQhq26YM#Dm`U?P<YJPoqBjqHb?jNX8FKLMm)d`X@Ik=P$<oFoh+&6*x%L4a4f
zAQW!}$)IeEf#5ZhAp1oT5&zPXIyzfWHPf*fCntn`$~a0<=#D^PRjj;OK|B+>F3qB1
zS>GhI{b%AKqt2Ag@+&-^jWE4JTAEyaNK~~BP0JX{7x)81-*2o*nQ+>jy;4*~MO_fi
z5tAT>o#h*?<_J8MZB<I~X;N=y;fifqOZDDx7b)9&#>}KFT>neyAwB0=oN0TY(9~xI
zo_{9%Cf+AdeuV|OCg7rxJ6#ef!6PR%UzN{njV_R^vZx}5z`5n@+L@E}vnO+?T+g`H
z*U~$&-Yc=SN7)Ls#FxWe*Tb#3waN_*(-&}i;kwN@<rUn5EwXc9k4Siur}(z?wUSEP
z!!X$wzrbdO<opq|U-un)e}BlLoieAJ4EbJm<}QgM>r^qiNN6`<n~PygSc`1W!9=jU
zppKC1+fqC9RKL;i6CS&<^G01*zgbTE7YeA|K^G4fOH%)WCOM~AMe@e@;mM0SkqO;d
z*MruLy#J3Z%Y<4#M<+Ro19Bv461IiU^6;(^g_Z4CNxriR*JI!#QaH2ZAFuxB;jx$z
zFrAO8h1UcmQk<ieMw#$$&Xz#Xi1#AXPvmDgN0qy)j}juSb$pKen=V({3hTYT(`p37
znpnIP!+#ksER5AE0g{p2fv32f*<jwMc0HTsuv{)<J(SY_JYOiOWFth^aC8PPPFk)s
z5;o1u=ai@$rF!6YISH<?mfP#1eF1rCV68TU@l^k!&8j3N6FHQVFN{re%VdF{%9dti
zm6&W$hxd3-=!8qa7E3O!9}zan(QETqpWe$lPpHYvS85zfG;5J*11?|IU{(%~T{!=e
z*1!u8>3T*#k0P~l8UFgKg=XF`r!BmApn2j5MYY#SdGG^uaA3qB&4`A7-tz(4H2;{J
z*sP2A>2M#ltBh0P*bJy}+CDP7r|eZT7R(knrkLR!h;T97!1V;v<|}lQFXXo)BNrM_
z_Zpw46SJaBDhjGDx`yJ!cMdPemDR}7^+-TMNA%=&&Q}Bh#+m_E-@^SRS<vTI;cjKq
z?|*D82liA)2p-jjn0jR#s#{Yl&wdi29x^*&^WO&(C?A^9NoK90M4^(CM<U8puB^tI
ziAaIzzPqBZGU4&c9gOG8<yFaTH8V~F{9YXZMG~O-RGDmac7kB&qiy*sE4%$N_`~fn
z!fc3}8?5UVj%D2~R*rnqE;iz*|5Ve}qQwcW?$_1(?gPH}c!z)w1(9<@UiwWha>Kk&
zAUJuq-vIFke$f}eQPeA!DYw|8!~M`|>e9*m>KN}Zu%om(SN$pwD+c#6-IL9LFPJ>3
zcYUPhIuC|1uyvV0((~_~N}$5d%99#Z15s^eP#Pi2uTjajB_(4#9?vw@t#y`>Sce+l
zRQZZT-1G>=(P>$Bjg0QPxv+T*R{meju^bqzDU}tG_SDS<#bLkaXKhS6hR0W&9Gm1T
zaRt|fBTdc8kp?{$s6PqU7v<AjJZzmrY5em$xKC)DVwS|cZlj$tnbBNsYXxCu9ny52
zZ4I+R>5GZcM<idU#mYNVp2D3Io|VC^SI^1G&S*8_Qw!M1N>IHv@Fk5K79Qmd){RJs
zq}7?Y%}AvCiq;#d%aI?|!Yj156?Rp1$&S9h85J@@Jj=pVQHmN$1HHD9se!}kIVP{Z
za2aj$DN&2?2=8y%lT8y;wMTWYMo|yI0jh}>1xmf;8tcKBt6H9@KFmgUs9c*896OvD
z)ZX~v!bLYZQLrsWI(R+5=D)a7JNEmX|Hvs|rxGyPXAtzI$JSVY-@zL#Xc`tDSl&K)
zC&uq%8dDn$cq*M$mSZnTA>KCQi|UjQja;6qPu@}3Y29M9-Y2pPFr=_t;UQ5%jn1&k
z7M@fc?<mQFwZj9rplqPKwKPV!$7X1;rK3qZ6Xspi8cHUsTbtsUY@Bli1y}ehgvA=)
zTHnDCfJ%r^W`k0)vDj#I@Q&#fn(0nT(`D60wQ9P#w8XI8pbm8`%h(^AO?O8&3R#5}
zle`d^+`^`f${lB|5i=o}0%Mz2GMtYD%F9M|Hz%U4H6@v54BKEbsVS5=X{FO52J6cx
zauq;xPD|+;7v^nNwf>%L`0OwH<<_Fv10~5qWQ$ZQCwVfK1@JuU=SK$_IS$@`54~J(
z0KHEMxe2aBv0)|g{CgGN<4ih>lxDwkIbx60{Jp?G45{Mf`f?r$Ieq&w)eZ2CpYff)
z5F=*fUKK2v24C-!pYd|*elEP^!aj;Dnp{s_hFY+6B0l1ilO~7PR%!?UYww=smcaCr
z!S12kr<xX282lYc2*505O$bTQS8h+1PLD^Yvj!$%(MyosxI0B&T*YrcR^##5%wqdS
z$MuDetqUAI&)Two^@paOdsUQr6{b;4Q0An%_mmvlbQFX%D|6>*+D~2;9xZ5-MG|@?
zpQ=@(4!>w=6aR@Nv_yg-Pmqqt-mrVsST$%BRBJlCU@^JARMY{5DyBo*C__1J6e9!{
z*{d1QI-)B4YPjKP7@oRvT*^YrM0ay3*x%P@>S77JPdyX%5sQ+9@97i)Fb09{F`>uG
zpkNk|h{r(i3VC&fvtQx*+?JG_;~yd?;y0^Vd3_+bh9?OX87Y-F3yRNMQE|qk*g)QM
zlC<7yUb4lOy}`GZBV0X!ywIc~4@bl0&(m4WJ#U-ZD@n4LHYB#LJzq=f_qE_$bL#`=
z=*};NuS?m>jWo0+pbMF;&_FU*Ol68mO*;Z2zbL<=V(~)0Du0|<-Q)=r4GDKNEjqV!
zYuQt&YOYTtm6SCza~52l$#hCi9V*T&|1G3aEVY6yZ9{0Zk3~kns;}4p<=AL`K>Q+D
z?Ql&Zn-tkx+YTCY^F`?~rmfg1dshcCV6)N^5zEjgaE9eF7`!kUL?W80=pvq}4gvH3
z0rOA<{-(1LxN?zG7i{(jCTOUrEoA>YBSO8uGHh(w7@91-ve)#5{iU<HECWR`9rb>!
zDb40Y1d1sbRh_)#Qlq%z-tZ+`i&c_K<=Z-^c<DuHLuM2SRk2f5S-H(ysTU2ompOQF
z&L#7b^*#QiVS~n$(uz|py|%6eL9F6oow;Q2#&C(ct6x&E{{Z{rm|-LJhCLw^)%_9<
zYdutUeja8L@oDTh!HzkZJk)d)rj{&r@QeGZdnB_{Vc$Ly1XQ=5oxu84?}S_Y>Q&Ug
zW8#6k(d3&lir|E{lo7wV35<DO0nrz!d;LorCOQ7X1KI-BzWhXUog;887A-QmI;EQx
zq?y04{!)fEV^04~t*LEmkHPXWLi;UTxt=8;RDBoaS0lav$5XY};N??hr!`_T^ZD2@
zx~G|HyMic_m5En^GGK7g{o$!x1Hj;?TJEeIODJhLvvcthp+L7-j!e@xVQy|G$%9r`
zGMOLq#y7=eB&3t53aRw8l5uT~tNZAj(|7*5_5I3`<-Dr%e~Qb$bO}kt|5=fra?CiE
z|L?K?Gv&X!A}X5yYvF%SBLDB^|J(Y{y;#1ZE`J-ZB`<%kAK6x}<-nVSsxGGrW%`$p
zKsA&A%jM9tuHDCbs=jx5g57|%x>`*yYB~7lK?kq2g^<c<Mno|P6ZF=*;>638oK`VC
zV_7T_GJ#bv>?!ehY0+Yj%@T9u^S3Y$m0jtkKQ42?-0c@6YhS4$a>11dDsI6`t;tWC
zy`ZVg{)j76gT6*=^`}YjDBW%Yt}IVH=5`s;a_@M9Q@-}m8q_irj=SXyo3ue5@feP<
zdPnL8uz&<_{f&=aSav8mY7%%B-lv2=GBD{ivtnv#)=3O-A2mh7cy%^_-3HqHyi_uu
z8@~D6%Kw#B9rEUXz#{IBHL3GX&OGx;TooftCz*iuqmr{7ld(mjJ-E%8x$UB8bwB0o
zzR9<)SjQC|zJ$7P#EQ7KmYVsbsCNEb(&fEu@)+B=)G2s6)I+0fKMsir8V7l6&dPx!
z2}u6vO2`1-h-}oLDB6Hdkaaf>GF&4@o`qdjW)uJnpH`SMO-0`TKH)L|=Iq-?YTr)z
zM$a^=FGvWi$9SGiz=BU1kLnq8%?p>v-Z*8a1Fpur<0tbIID4SMN$81;1Z5&MKevPy
zy5R9<1)VOH$eP)(c2*3TRcUo7Ki7v8>lCC-_=KwAM;K)ugXS~Hc}-o}J{LN*a$<Ey
z3#9PrINdVow7e&?$UA${B|C8Kwe<R+kmE4A&9^6+5G{|VlmIv&#2?sr${iFyGjie{
zzp}2=E&r_<GpVY|71_GHre%Nzmffmdi7vXlqjTn40bu;SS>UTQ`vs0dC+%}{0T2MR
z0H0qO@57Zh#lX_v66vcK`)Ig21&ie}r^VvS9Hc4&qGtRi%8$>_zf0ZJO*ufOCy7B5
zJ&LkSR{UKH+Iv+D*(mW-H}e2vpsL27UGmHgcg<YE%iT9jkF0K*nl=PK)^Wo7B|3fd
z8o$I3`UA7^SOmne4eE4<KQ6{o!8dl+Jm+38wz&C4`_n2lF<hP!JAWT<?cmJDskq~J
zlk<C|av{P@DaheRAUK$-hbL<a{ETnCQ)t_FT#^0q!uekPWdv9jKVxjjHhzknQ(Wge
zcitb(7}M5&7odow4Yv|&FBIEU_UTD0f{yN~GUQ43daeH?JJcD@898`jNGhf!As}+j
z(T4O4=_jN&Q7z3q#T6qo+VS)7Qg~J#^iLoOxOsferhTZ>#`6S6AcHXD9fF`i7l)e>
z1%}93a;nn@V9r==zhRkScf|iJ2@Vd7M^e4i24WLU7uR3a8Bto_2x|{Z4Y9<P_IADS
z@C*$eg$P5=-!jkrj>X6fBw>&+UEd1|E9EoA<8~4@s`uO}-7X6t4#Ia7LWmsI_d=Ov
zW+eAc55HXtRSI~knjaPb0fHpmGedmIt&<_qxa0N3S1dZp46WiHXGvzGq`bV;+v6e*
zHicRAhR!m{O-6o{Wk?u2+c*IsYCP+sUTH_<>(P%3Bj2qo_%#Gv4)qsu^{a6derEh>
z2Dz1*fds*lkjH81EmYWbWT8=H;Ndf4o8;BtrgGlkP*k7y-G$rMOk*fMphrz4rMUd>
zjU-y9Wv{pvl*g9ZqzW)p@fB4eZ=>X7{ELp~KddyS=Jh|Cn?ee|FUh9beetNg0G1So
z0gdtb>XPK-@?c)`S;n`z;i(6)VRx}vWbJ9Y{J|vIJ;`9sPne;_MWHkj(Uo%1ME#1m
zR^Idj$I-kcr3A3EVy-kPF;B2gvwRL>)8F<uE_Z>wfwW-K34a>qlI!!hMO?0|-A<2I
zO?7qYUIBuLiizXf_<j|us%OzU?zZq?cXEwNa$L|Q4d)kyE_0YzPQb4(Zx$#^CGH}@
zljQ@E=Qf@h)aqxii1CEgnCsvcGLsGA!tg5Rh%kG`)(4W8WtNCrhaMR^=M4Xum3}wT
zx?~ZcWZ|06M0W$92h3+qjC8NE6VnIEJ2>S@h?^xQ=dJprM5{%$1J$cW9b&sjM_Vq8
zS;vkDBsGt2ghj3C36(~%%&zQ^Yhx@lp6ybi<c&GELx?V4Y}!ZhpBw9+*v8n%hUHr$
z$v(}6I6y|izem`?T2czCUUg-ry$VK@4G}GUTS}_^<{cHexxR^D^E63zlFSN&IPgq+
zlOkEK1<OyOn0d86AEa$4=m*AU5Zg7*1T$is9G5DkOD%q`YYRHJ%y%GrFY)Cv!Hyc`
zfNjys)ipFw(s)+N?kQ+3NhD1*P9G6%@e?e;Md+X7Z;h*gjfF)JtY0-0L+p{F6ABO$
z$SLMxf>iSnY45@b<AmiCdmLJ$s#+6(Be{vA3=h4uPDKia;vc$)T+&K-i(=(<k#Fsc
z%pF!33FwGa|8gkHRsO!vBXoc7s1Z7j1e;i_i@N{p%4U+7q98vzo^m!({YY&|9+Nz^
zEV~8MZY-dC71-ReaFfxvU(F&VrhoLtjL_NAL2+Xq5uzaB=0lx}VOCB;(|W-yoeX1A
z<>PF++98`{R@)?LvHl?Uo8>FvKC-5OZ_P*TZx7UN+q!qxHwMCf(WwU}EgIUuMmLT0
zH$nUpD-w?qg%U3t3oGac10oz!Q4d7aFG5iiB`D<ehH9A;4+|qNsKlTgV2BVg6t5RC
zLd8T;;8!6WtEi|`KrzBZM1vARAsiCHh*S2p8y7KF2`hktA{<taC?GHEg<BFp5O~xi
zgeV*0(@aJ*iap9T@qV3r-S%DkyxqKCfNiKX2x{R05yHmSYBA2K-M}jTtg-z)%v}u(
zTmh0W(T@wP!U%$TKfHeHn#TA{Wb+Jc8GOfZ>VR@7JTR<#A7_z01BTYz9+UAG42DKQ
zLbrfg)y4Nk7dU^UYeA8*0+|Q`LSIR`x-90|SCQaNee3Cq{ot1j{HlaD2dD>$7bXTl
z;s^MHN{kXO=st$jfhzG62!&0^MNdriY^!&^oS<T2j3Qt8K@wv6#lid!yGPsb3;y{;
z5sxWpe(0b3i@(2o_*472?VjpNxm$a2gt6y^*8w!@ftSPV7sQ~J>KV}tFbxv|s>Fs?
zfsfO>)1HwT+F6rRaP4){5e|Scn<-qn*$;B3N81*l*6`?P>RNw>5bGA%!8QG{9E`x5
z*>X0du258CZma3LxKduZt7;CW{|+=+d|Gav4I7UL6lt3?zClhZH$k|QpZ@O8F2h*u
z#TV${#JBDh30ySFc+`jd<kW=^_h}gaSB^@SkH*xMvmyZwPZYqMm_n|9{fsgg)nf)x
zeo68aX&=;uFzF#-9)wR~qT@ZNx_CXGwWWTh3WlogdPP+WX&b=Mqm!2xCv8fuuePk#
zSDvouQlCs6hRLcH%3z8NC3JODAvxu>AX9<0Ue--j%w+_q{M4M#!k$o7eic`Zqb2K;
zTM23aygfX3hd2F<rZpG$noP>>;?~Bup+>Byz3((0NyrI;ugcY;NO7(;#co#%Sr|ZB
ztS^(q(`_M@^;}(sq;7mbICKJbBNW<FPMP|a9pK;^x?($;t|(LTRn<FQcv&iro%}*M
zRy0dmZ2*;q)nok=!8Q4BFCjqK2w-CtA_l?hmqZ+3hsgH~tz7@3ugwP02_*}Kz~tXe
zFYT84T31K_K-6!IP+}OY&~n3i^GLu56x)<R0o{($8)D2VQvV&fu?xEglyT)NLa<9q
zBx1IBZ!R*dtHVFj(%cUl<8|dk%Y~H-iZp^q9fz+Kw=l4+1V$KemxnvuA%3h9JOlI!
z`f0Nsl1lfBvmp39<P)=<(ns_w_R{gisqDVQyIMfj97!r7JU=y96jGMaHWfaRDiM^Q
zc1;Rq%0Tmm0RdtEfVt!wHud#Q8;NFp%BHWIKDQH}wOh}<+0JeIyR`1U#fcA}k&dBu
z5#$xr@(P9lktirCU?YnjBag*31WjHkJt?|uaLp-XwnxuS&p(;3e9zK0y5DkF><?jv
zWj2Cvn%yp;aW-IPnIHb%U>YL*m!Rfm&3e)80i++Zc}isn0z&^R7g>l%gHfSyEM#0~
zRNmj#((dCWb=5$)YNfO-x(-K-6@oCe{e?}GN&@>kvpnselP-<W^wT}C1N&U?!!P_V
zyL02bZ}IT-gNA^DFjuq@kI$0Z`QMYan^_*oTJv}g9J_=te&lo%h9@O8p*qgV#!BnZ
zcm#ZkHT$3F-C2>?&t5V3Zy&OcYQB&&4vFtgZmaud6WFd-DLcP!Qz0W@3x6=1PEy~(
z(d_Qdcsg5ZYMR9jNr0lPHF@805hMngxDouzh}%B-FLM8lJVyLJK2LP2=1(~}_jjk0
zM35C2qI>!Jy1K()?Rp)@pQiEigg$a$p<2$d#*T=ycTy<t(oa_3#bCiE7NS8Pj7Fz#
zF=b+`Qh317ax0l?!Lvf^tM!>~ohzAaK9G<8R;BlxCwI5M+cUF?haSI5wm*EHH{9@F
z%8x`oFMpzt-lly#r8GhV_{vWA{>JPE#oM&`Gr4xfu-M*F*cZSW9oU^s=iIr>K+k~0
zWA7i7l0g9cfxmz}fE&DKQyr*H7LrNp(rGO=V*I^x)+WV+Fq}KxAXZ^PIyL$J4bENA
z3m{S)Pg6osI=bmG|9u^HEN%Po-OTfyap$YwjU3R@=%|!^P@~FZTqG-<IsK6Iecn@C
z?LVwMQCm_ypQ01flX|JUf`I|rFU$_?P&w=$W(W@V2S5fPcE$@py2|7$%>opzFPLJt
z{qtOIm>Lt>kU+hx7jiU#9mpLeksupT4n)LYQzUK-7|+NT4xxn}rMo_fH@w?32A9GI
zM?DmFn2;3v;}R!0v?H6th|iZ_RX{4h{iq1ww*L20Wd9krnyz^4tX=RUds;+oU_}eO
z-g)G~L}~rT6R#A#boE^&@bI0J?V+<I$G+-)SL^T&%ylZ6);9I*V};sHEFF4UxT6<(
zr$xlUCF#@W1XY)1d`C;!mC0<#sq)tSGN@^5V8X_stl9D^&47-!dM;HvtPzT@>G4ky
zy@@Y&21I0Kx6Wal)Y!w4!zHV+e!`z+b$-&Ph)}#%-Vwp*N}oUbv`229!x{QI@A4!X
z6<@6Kw0khj!Da!o#|wUEA(|rPI*@jKZ2WsWtn9E&0wzT@;Yb-XtbJMOm5&PqT?#Ii
z2bWA4*QHc-FBO>dGd<HhCC@okiA0P)I?U?BJc-kVmd>TQ9379He>)|5yerCFl6&Gm
zZ{o$0Y8Lu~-65rPfL&XkEA}RFpI<`B+}T?6d9tRDPzh<BEB56lL(Hg<=X7+oMRc9b
zn7~ot_72qQ-6E!OLIzQxM=D(K%%2$@6pFx1G~^v(HPR}!l@v_WJ>D-J4@N{$+@CkF
zu8(I__bWbVh>fANSH^dldZU(;EW(!N9_{ed#Q!QeWe3*T8g242DctPV<imwB$c1#p
zj-StZTb(7Qgno0-L5jU7(w*N9Gz+Y~hPBr&;+-PZJXXJHSENt0uNw+w))x%Mx~5bB
zWhCFZWfB(q+SsE7LPK%L>ouCC6z2=jGG5bU=VUJX;0?z^p?EsJ;0aNZSPwoXE0IkQ
zA^ur3mgHIO`MCrlm91o0Y0a&f6sStI36$wiD|XZk3R|pY*3I<5_izFPYWU?5rw`%L
zu(e0}uJGU<7JZ<bkn^V!%Plow%=Au*rsF8D04P+{c<tfj7Al5d87*8V&##jm<L6UZ
zuzbD%BG`8S7EF=6qxrfpb<2Fccl_uzd-`FWNzRz+TjGw2^h6$+R(5krZ;yUJ?NSmi
ztq^_Vdo`LGyLy4^MZnxlqM;b>iTeK7;$jZ6Kg=7k5(!IrRHHK8#I^cCuBp`i^5We@
z-&F77sCq_67JB=_F=N^4F^Zivy;TkIK*D^U%0g*Ox8#+p2(~|F%<@>Sb7+xw3bw^a
z&ao}><FYG<Fn+`O_+94P>N&Y{wB@Prdm!<kFi4fHIBaQq^9aNyq~{3fi?aPCAR84D
z)<8u3Cx0hM-XI`IE%akMI=ai22t9u{rm-q_Id~Vwv^jO*C4D!*ZeYTMv~Td5E^Q*B
zJ2LC{G+>}eff2z98=YUTQp2iF0<4<FDK-J3y*uA{a&z-?Yc8&<-raoj%=V<F;H&FH
zn|%t}=z<u9I-W3Tx(EG45#enXTYNyXu*g8xGWqVN(_<R@d{6Nfw;5dhYw=Y1{%pJ`
zH!aok^5!aO+dg9rc?-^+e@g>uqSik%!iH=OjG?SI`r`xXhoKQYuv^~Xqa%?bhy>Wj
z<>ln7YcOR1QdR)LF>5)eqf0aU%-onLzRRFF6X*+spFTZ&1@X-@tJhGuu=?zx-nG(*
za#zjJ2)#s`UQhTVn=5Vk_%}o*di$%#%c;PNWz7^YxiaVZgpktk+EWhtk){3!Y}xUk
zZZ1*@tHP=4F{ozK-E66ExFS&sh~$WcU;=tElC$bt5Rcp{wG>#Ef5{Zm&vOZiL0vWL
zFd!$}l9ot-uG@F>=7YUQ*<9Hrsp+;rO`x#qT-U_=ceE<={MhTZd3P_<gzI3<KOZ6i
z*j}vtfLL1D0ou0%ay41YDiVkT9B~iLbw};%B;45kFXZD}gh}8EWWWa2IDNJFnOnPy
zQS)8z_V)_}>R=QhmTo|Q2rJWK{m<oPI?hxMU-BJ^jt(+vs$n`rJ)$4{xzfZq?>jYt
zka-Gu&0NW!4qMV~w~I_uXSov+zCq(z(5)9f2D-x0gWvZHxjz&HXg&yn2#z2iW>e?~
z^sY?qHa;9voKxN&>z)#4z=J1N4-T5RQ^NxSrHDyEr5)9roHiwE<Oj003!HpTuJ}cs
zX+%(65;U*1Cdp#N13Ns~eADM5*-Z8r74KUuwTnAkfr0Ip<r?K)mzTx2AbcwEE1)yh
z3S0PX@`RQGKnQTQa<?9-ewwb4!C{O-LvC)-fiXe8Ob_F4>ZT>Pe2!V4)C#Ty-@aWh
z{*W=1Vz8*&i4kA+U$a4K<=0I<Wku-bsk!zXhA|TNaKZp1l)>;#BnIkQraWW`>o2;@
zUkPFY+X-DmQ-X+XpIoxOB#qDwUC_U;b83|fK5*P*)jqe#HC8$2oHk;u?>)YqRG@oT
z`b$1xfp|E<82b4W9e3Z|z8hD6KlIF!rM|Cnos)M?m55&I??>wv#cvWwCB=EFimSfj
zI6~BY@o1|(!1c#|hcn$V6^WI89c7;`;W%JkKe{`8%0#v2;6o{VC4sxHew&@anbGHM
zw$8l{qx-@Ld!9dX-f!mcw8_Q~5n&F-XhwAl6s<gpY6=u5REE?%MDKxd4dKwVTGoxb
zgg-8BpW-y6ghF?-i7`l|VI0UQ9w~{+w$&khH!NX>ln!fze!CR`k)LsWYbYbrHct$2
zya)N5*Nw5E77z^lBE%80KQvb0{>~ni+K%PHVT!H8?S12)c2VK$_yPjLj?0|CJufZ2
ztXv!r)=(D(M;kgx_iYm&dkQ9t6$6A*GvghAMG_L$FJ3{1l7BB?eaXG+O>T0i?Pd0r
z+SY_RC_Hd^w@yZg{Z(<e--|WiV|?4$|E}qXdY*f}p_j*_5Oqx~Jy>vMs?WAQiU60|
z1<oSDM5eKtLpEAqG`Q*g6i0wau_FM0(=`w!BA4S=?4Fujf5qv%`};WinNf(?dD3U@
zWVJTic{0bt8vVC{Gg{ehQq}(0o}Ha5xS=AALX-vt*D8g{h#Uh^6Gix^#aVDfQDWLd
z-NcY4rZdPnEKGm^Un?gAS8$vObc2328s~eWPli|r?>aFx$?<BfP3O8p$paX<SQM~(
z<;6E4eel<BpgD5;St~mz@UKopGz>F-Sp^J7gekgKK|c<*-qBy*UFy-K5hdtTZQq7U
zXHJ!MwA??-P7o4QAd^%cR<XV#-XhJey!~VL+bk~Zk0K`=i>y=+qbHl$q5FHo5n-Kb
zkD`svuNq%04KBk2#!T?iM5xbGQ!4Ufh=3k4VfcodtB&EN+w4p~Gjeu(FPq;JUb4N1
zf(3nQp=DDHdA)yXz)`Fn3Mg8#TN<P5esVE>PiB0JY3u}dem*~WZRpynxn{qR{D)}<
zQy%1q4GY>n?a$(TLPP;`;kqv8<s^zhAj?8WNohS1qpr(Lg{gQTTV-U4Ueq^WTtkhP
zt||Meyo-Nq1IbboVInnY7op3xJLzr4%LejCj+mcd=m@ri)N$ZY&ou9KncBb85*5Pr
zeV_rZu{p)L!TdhxB+3k7P9W6vmEdq>{}S!2N{0@)AFZshUb40QZXL5@df1=}l%ZfN
zq(}%RdZo?q#E1%<^7L#>jk0fe?6mG;96wYz8Ms%Q&QJ2wdRL&HSzpm9@w#%mZQ^1$
zv@gTU#Ka`TnPG!7px280>0_{%5fg+{v3^(7@Orzyxgb{<@OpJVVvMqwE*h`&jfzXZ
ze?F6}d6Dhj*Iuf1`c%`qqHub9yx1-5KE~yL^Iuv+R}UK7$rrb&2zomT^oIED%=pq~
z&JY$Rc%#MAv)FS~#9zOl*jZq8Q%!oWUwlqlnb7{DX#9Lw@br@bO_fa^g>jVfQYL7S
zT3#=StAG&VE<9V~ugT<9BKX~s>}2DInuk=2b!5xTc?lEJrRVkzYOOIJb%riaB&JTG
z0%#aeeKF?eNXzf(x@`%<M~J>713|__2fhA`6hH`S?c)zskQR(3o7f-z^SF3U^_BAT
ztA#r~>398P-?1xbtp&{geTC;={A#Vb|8Q9Rj^&N!JZ_7oVMupiSAii&TayGuuFnO8
zthBjB`Ul9*XB@m0bi=9$L@hpu(YC`t3w)JZzAZ$@3~wL32m|lX8_Oh4K!)pJ2md9H
zoV6kgg}Io+fu9J_n13S0Ulq|I3)aDr0c-Jyb;lK{wDefXYWH3BnHRQ#-87D;F<0R-
zAIJq3#u&Uoa~&{E9pLtf(mmJ<@n7t(>T`Q_!DqsWCJvaf#6JcvrM&gpA1^TL%~d&0
zBW^C_kVW-tFg%WFPp}gkf4D;|A6k~mcRZVrP7G`KyvX=sUi$ew1SAL%jv=Ksv%k5N
zK$%YKca+@Vg<`aG5>j2@U(W-i-OksnC}bkI0Kh@|$|EHL1@Xw|ub^P)W;))UVgrYc
z4dr{v>L(+ljX4$f?K7nu3-3H>U}s_T!{Mbe$YCR>q~!sARw#5bs)MYo;!U-Kg^CY7
z8=Z(71Lu!j$Pd->&ha=kx+X{%7UVE{n!?FJKv<l?lXHF9aIcORSJ$5;(>T$Tl+@)n
zLu~+pVa^qG@A64HdqI=o=v+1#82V4xmgUS{ALK~NFpBgO$}Gfac<r?NBFRKG_K5&N
zSTu4=1%+IdpSxgUS0i?o>gAMc=`U2)yd?%gK9PiJ%bFd<H|E!!tU}PA=Is0d4L&R5
zo0SHV&b!_7OewNDYBu^KmGT2`whTk8I3O)RoSZAFy;BE#(;`8cSCHfy&l8+vxzTz$
z26k)1>oy}Hvw#Kt;11adAV2=UioA+9OIeC3yLO*jz^!<H7#>aX$@h|*{;X9l=7wW_
zo2^=vC<rj-%HMc5>mFQa9I`bN?X$!NTaipcP3-sTyC8Kq&(N3boZc+WMN$+@Ven0;
z>iVI9G1<dVQ=tduPRQs(i3bD~)wUC#D#3t<rouDqz3_#H#X6?mq!a0%Es*{u(u%|>
zyc0rH!VwRVnE+LnEVP?B@$aq1m0PDN%m?8WI9{D9qfy(4Vnh1J5<1nPT0uFue1Jw0
zYkROdxGlQ;<$dWSX=vLUCNC87<p^wntu;V8(=nq^w#E2RXX~zZeS2I%INic05exKa
zjR$-e=N6z`>%?Ljmvz)Ii<ICU>CGJ&>Rfl>x$XaEy+aT5#aTDx&`Ub-CROa%e$D-O
zkPJ^)r=(azVaN0p2`xQ0oX+HOf6{GSF7hU2#d+ZIFp??BwD2MG{>`a;`h*F^Xdl~Z
zoxinJu;K_?nvhn?Rxz=GGHmt$0WG^!4LdOnc&`@0Mq2MEv3bdqYAg4%Gd-@AhN({0
zN=9(Bp&s10*%ynwmTw#*2s6nso^Lb~95`DMmO9FmnX5|EP`X-~)oM7at6rk%J0q1U
zU%lMalf)O6pe?LRSLczYp~*PzP_XZ5mm-Wuzj4m-WOMi7xmv{au|1}B=DWEw)KX;K
zGv&Z(p<L-zZ*GSzjQl|HC%Qi0EXs5Vw_=5oPwW~Q*{Aa!EJ$k-^EaNwVL`!;JkA+f
zb<0lHtmhQR=ss*p$7UHVk|W8Q4T+&<@T#!@6OZ{|+907+ohkFw%~$=HnP|5h!u#wi
znJ=NHEhHOPl7EQzo^fR;j?F7raIvv-(P3ZDpSvbO{Kuc&IaWgrTUul>CTE>i<5KJ%
zOlBpX#2KHcweY!#rR~#5J>vwNN<Ej1P@}30DRTd(`Bz$l^4{FYZlS07Uc}p8d=K;&
z4gS#LrVNM`A547Nkg@0sHs=w==C9F|x`{F0?ow+{Ai(rV&8IKcW^9c4{^NY!!$z=c
zi@-rn>hiB68^K(@$k>Q`7WHtJw+x+r0CYF!6PA+N2SN;CuYx-lJ!~<#v&FWYhT!Xq
zE<Qf^gYV|<<Eo@hGwpCXf-m7fMM0cORaJ5vB_g6AnFSR8b0aqPoi)%9cb3xUJiM#j
zNSSIL5q;rh3Nquf@lZsLsVf@q4si5v96!6L#q>LUn5{7F2t?IFQVRHc21PUeUf;Bs
zix+xXc_8s@Ot{V@$|UHrjc(GQQTDrT{YL84Y$Nu`C&e$(aTT^@vZQc@5YM~bvi*%U
zp*BMcs}+KG>%mZx9@7ug59)R&+nn%8T~XusmB%+)j^$v(3-9Q~+}u=P4~okyZPP^g
zn7#gzODyrIN(aZI7~bf~m)1@oDL}0{H<csze*jlNsK4VP%kI4FE^a*CHc$2LzVs^V
z8F}qH{<F8!>=}-$86LjRp{!TlIm6<nAjQgLUSd%EZ}VDyclFoX^ctK0tE0<1o9O)M
zz5O<`L-lxGzw_AqKDK_BXK(ZS6&H4xi0)^c5dl<KRmU<Adh1|x5^v6sNh4N(D8>9N
z4`S$5m%o97%&EfpUH!Q!=FNM4Eo<L=s|Ww5*>l!sZiws+QHbBHw4FovZM=A5IVwgm
z!a2eR<OMiTmudDtdEuVURHB(N2K|e`XrH5tQrm@rVXhF$;kz+8-fq-VlL1T|j!)kG
z4}!#CXaB_J3Kt$wInC-7zE9H9j=z+hk3tc57Su#Kh%*tX)COmtR9YD!oQ9+PpIU`K
zxDf*=59Hxj`aY;_rC6<QJ|NiKh14^E<~~bMj;On8q&A;j(}++((Ohv7z~*`EAFt|;
zxpgPuGhwfIRdVJVVo59lk9Piklq!v;U}xO>E52l(GS$1^^q)^YBaHR#^{*@RJK2*j
z(2{<0hMP<~YvX2{pLHAxt&Rc06VseXLSaN%DLV&56{A%r2SJt5f6e8Kd8<oz&|#`X
z9tlTSB3r9R)c3G(es;Wwyk#Ca+2<mTU|!;VY{N~Bh9-rDt}_e|fc?t0IhILw`lO8G
z-z&^hSBb8B-Tk~8MW-_v(VF-zI?|-?qSSYP#C&59C!2TOl|Pu&Kf$~-0J5nLkV$M#
zJ#vNd)+&;tI0t+}%?%O=s6OM+P6aLE1m**5O0-I(2%%?;Y))8E1-U@$e>|UCM4(co
zX4AbPvdWy^B8OWu`bK;9C<2!)#ZO70bq+5H9OZNXm(7Jn)-q5Mg%V1!!tJ>)Sm5bl
zxyFC0=tfX^9C(ZC$`v*i6m=@9uFB;iNGtE3PJu-6mJ>nNSX#P?eGa*piwVI8{nRLu
zlpM@Bav)82t0czw2x+$~AOiS~JSi?`hRGQBRIbc=j-r;oBi(Yo*K#GW!1T}cp7(FT
zcoo0HKKQ;0#3=YVQwF{{%nWYo5U!u%^2ftMrdF^H>qaG*!Qjad9dQ`On`?s_`jesN
z_!>Tur({58U$m*Kb{Af(^)^x{yr~8Z+?S$*8-By)60YA*=-ulVt>v_8!qOj?;CxR9
z=X{?_x5&SXs*P5cu*s#-S{cQs1^3K?mV^gFy18wSz4Yn*zvb2R`-&AW9DX0v)KzwJ
z`kK{y4-Ze~VQw6hCR+Xi`4id#6vtHyytcDP9On#u$ahRS<`rkMiIoi_jxl#p6fG`k
zgIQ5Zs3~JhbeW1>vi)9*oLbXtb}#<zH{IQ1f#>~JYIDy=KbTA4PKuj4I9|4n!w5d=
zzb|h4noP0jTTeS)Ii3Z!kmBXCBg|IONe7kbsHh*s_q)QB-Zig921!mUXYuyOQo91v
z8_}Eu<IHoKr$w95+0CzmPTIdCba^m+!;zGj^5{gcMP_7=cZ1vfolc{3UUw@_^EbI>
z8i%j!Y9CgAZ*s&bHFg^6uq-?4TJlS8Vf=rYs~Np^HZ;mv(Ac6D=8L48oS{=F_bpIr
zb$Sp_BObxhRP>5wzBR4PD_R||Fj)lwh>Q#zBLaOfAC#6)RRb_yUrlm9L+-weRED*2
z=x8tL+9YH_Mk0!=LIgT5;<$39MHLPZv7Ikc7;J?_X4cv&DLKx>x(_idz)mnX#kU-C
zEY`2Zo-4lmXLd&H{2m3<iiZe@X&eouGJ%X{PhPD_^b3ktrlnB)DkV(fM@qi68QfM^
z`$v$k_&Lx(x>KrH$$${3cy!L^?R~8m{z74gg~tsM<oW$}TaO=~jS3U@82kLExyP^k
zrL~_%@_b#}?D>rldin_lv^9_7V9a5ez90QR)1tbUL>&y>N*LxjZ!MMJP^$}HEdTt{
z*l7%DAB#Qj+<y<^eGgTSsBJUBj=6_SKVHO)%dUkCKx?oSSXLi3-jw;<9v{5%QYfmp
zlwhDDBQ`7x7|1b^1Wt^g7=m$ZLTn+dg#{5}Dj*24kWgbC?4mG5QFf%O06vsT3aca8
zxl9<y6{3S^N?KJdD8_J+$>!#SaImLXsZkeZ$g*0Z+jWx=#I1sexP@Z!N(w5fB1MrA
zQJoIiQ=*lN(`7|ssIf&x#Q_9DF_<`>kaKt$I^8lrbOL=a7{)&8e{TyVl+AB`?9Bg*
z>HVIA_apWFPwA80{TV(t5|lQxU$QQv8CeRPTP~x-;C(ke->=g6KYrt$hXeRw!STND
ztNNW5y_*k}5z>fBC#hcNo+sSx9Q}}s?x810j)9FPKJ-g4LJ~lP1U1OV)YT@5*TZMh
z$M|h<&8c1!qoG)f79uGXP*xI5w3FzPuwy=JB^ePmLXnW!m59ZWilQPhk|`oZ;_1O5
z7A%Vq0XC&zu?&<Am=gp<RU*Jxv0$i*MS!Bnu&g0i!Gba=0Y#A*iU=Y=SrtKp0bqk5
zN?QS9DzdVmBO)<itYX1YkwI1gTEIkAV+eyH!0@u5jErO#gt5~qEFyrh5`4xY4MvtF
z7$|~@!liR4vN4#*qx;Hz>xw9;B7(sf@j|e+!9_$Aiv<Z4MTn@!qnSeyNU{q6Mmn-&
zGQmi&iYO|mpbD{M795bMv4lmCQ58fmWUTHQ#Ug+ziUSc6VoItcQY>PMfQTrJ7APo+
zf`W#cDn%m2kwIcHRz(3AMS_bFAmx>akz$NQV#SLL8n(enSt5%C79z$X3lSoaSPBZN
zEQrXWF-2G?F;Ep0R9W<?SPCN)5MZa$r(20Ml8B^HU{RwMD5@-m)T<E@1r`b@qNG6;
zQB+W40b;BcBBFu{s;E9g?eHctD(JLP6%<$~vMQ>AD-?=|peRL%k4=?}2zbz`BE=xH
z#D`KT4Dr|%k}N2aVpMv~$19Zl3ygRm?;xz*?ys+e>7z=}n>W~Lx?!E_oz;4Ecj?^2
zy)QPWBt#TaD6v&!f|4T$uvrBbMFdE(R9LZMiz0%^N5&Jw6LFi2AXtzTI}%m~Geb4#
zl-k&0zJB&UVdi1wLxkU*`)K#w^mtRJJX=Dr(hN4U75^QVQKz53Y%^`H#)nxnh|6lI
zj1*WXD#1l8ohS-EoilEDeYZMv{nz<=(K(C`@D4NrW+Z_sHiOUKWqLoy=IdZMH76G8
z>M%e9ae&>lUAf(G7GijeLKX00NGzOx%zFR*kdUq-1L{->U=V_BLQC3|HTMJC=$<s=
z_I+Qv6V-^sl3O5FRHa}RB9T@MSlePM0xU)dioq2lY@;HGiYg^!g<`Bwf$cICiU6dk
z1%*Wjq%3O26(wb1dThi~2mb>n<uXqyRe+_Wm%aC<;qQ-k+aDU#ZfZg1edo87Et7?$
z&Hjw*!S_ae=X3E<`Msx^u$O}PQRhK<@jreb;IQ?D4G{qhP23sG|KIvwwMy#jV&k~$
zbm>zMDuPI$eLC~KM*9OnegB&x>wH`y_Wh5SXSLr+CzI_VOEJ!Bc$KDK#*|rYvmGvv
z+n`j@MNz}nOw3LTYP{JUWmC1?cX5Vkd|Z4-;Bq`wP`wiFcD)yOfqBWPJtP~R(nHe=
zqmD65622ruNFFhLU(o4Li2VTp{dAOVd4#npR<j4F-PJ;8Cq68MP*^{(jXyNnuwTLY
zyYmbwPkj@5$NKd!#m9}Q^;>Qdp^}>4&_`E8fEGn!71tw8|D89@)c((b;4!a^Mj{{x
zhNExJf491taw0!+TvV3~O+hdSN}fNnX|K5={`%ZBYJ@!+6#~gp>-EVU58D9qbGP~d
zm^b>A2lfE}h_}OO5DAp)10?1fOxp7b!?AFoHF|;vMyMjGvKwoSwgRsdI&T<&E9&er
zDnY!b9cz8@U!oa_Zp(xI(S`*FqR#x*(gKmAt8P08d^MsWKY!WArT49bEG#Uuj=4tQ
zGO<Gr0?J(018AuPY_UwTj~;rfuDi47k4>oZH5p#lpzbfa&Zp<-DR%y*fBbnByqoSt
zSEKR%c~p0v4}mvw+L`wEs)agF)yeD;O-!}g23B8x25l&~i&6Ie{%$BoLHZwlnf%|m
z!ifx;ftE^h3HxvE@%CPC*2uw~4Pqc8A~Avs6;Xo53b7SYK~zLwDvU-dqCr%v!hgu=
z|A+pbqpbXQv!AnX@;`0-HFnNh_i?|Kqq@8eh^1dqkeUBIR-<C8v7Kq0T^Ig!KLHU`
zAozxHU{hmVF`ciQJDzzmKQ<J}5gpH(?xCUd{K&T0ZXluM_tq+)Rint%AOGF<heGj2
z3*goqJp-h}6i*RA@)vqzQOaEQhqL_(u_n*cJGl1_lU_glGXFfTB;^<gKTG{cN*LCg
z7%Q@@^SdQ2`eZ;h2uNI_pn;4GU<ljKL(rJ_;t{A$VYd6t63@kt^Xiv{1*V{!z<uUb
zQsH64NC!Y6#XwLXhoF8kE~Z?pmvT*|%p>t@jvkjhv(}OUInFG1mCDhVLhKUY?7#CW
zu$@J=u&~IJJkaZ7S{JzF;*SOr7(!z&(O6d{k!j&nmLFSYvxSbZzty^#G@XPWvCt%`
z|7vnIfB<8Rev7R2IX<ViobWF022j8dAYS1e;W~qReSR28nYqrb{=Zy@kup2%I$^ST
ztFP|-o4mE>rTjggO{qb0Fb1b17|;O&ToI4ve$E^y5tcBSl-Xf-enul%;_y7(3`KUI
zs;`-)_v87#f7jR)$i~o-joXpP#`N(hkYfb?{6R=irP87B<3~&aQ8(FP**aMZA=j>+
z`|pd8cJYFRV+b&jgjNewEie>8;j_-@eJtN`7{LfAC=p@MWrhMGMHN9vSFYaGYk`1?
zTI|0zyBpsNOv~fGsfDozfWQ1^*^JNNXUAnMWOK2R{hGyf)MhCeYU46q0oY8Ltn2UF
z;L*so;MQmY8p?N0M0PNGgX=U=1mvD1t-A?ihS0oBPqV;n*FW{+0+^Ijr@NpL^Wo|J
zFX_EjR0jq)!q>Y$DI%%}ZJzHZRWIP*?$+a$hDbZk<nz!+$415T<u}AB($8_#(((4|
zvL+k^M5kzs6*`zEJUwC59iOSyCgXbnpu1;+Q82+|c`(d^E5kU1bbk)>W%@@qm;1Xb
zoThr-%c876cR*1`174}N`-E!tE|)l{H&P{ng#QD7tuJz@_}m^WujRL2|JIm4QTvKC
zh7V&^lJ%4M|I?ptR3pq-fD!?co_$1u+7hNwWrT$e358T60IFW9e@mSIKVI6Wef?V+
z=Lcnyw9|A@zc72!K<PiPN$<$9v)H12oq?_=tL0@`a??O!Fv?q<QZrYzJnX2W|G%Wp
zV**6&nuqT$d<NL@SpM>7_bUaW=g-?Fx3?CL)u~FT8GZoc*Zjvt|H9`*^fJ+BTRPsS
zy5DFxs;&)d50!8jC=`7w?_BX9h>srrdtIlxas4PexAujd%3_K5q1qH69!S-1q52&s
z!<p+7ALQbs;b<$NC)f`Ej64hBqO%qp?uV`GJgOXoM5+8dFXgYT@S@Aq>{?gjJdz*L
z2WNdF_f2~x_g6RKxht$D+Nz~;Z^cYqB<so6PEMJLBNy1G#;c#w|Fyoi=jQ3U{)&8u
zzAQk%iHEmHOfVvY#V{^PPJ`-EDQM^eAe96m5y9L-vdt|Dkv02#7(dd9R-1<ECazZw
zAl4eLvd44*lp7p%`ftyz|9`Ki^0l4Ia4@>z4~>SY7a#Yn@u+CU2d7?yV;w(4Z(IKO
zIt?n6jQl<K@acZ*+a1N%k&WyAkBdQ(fnn+L3;Z`T&Yy^jdYB@OB!i&eNygIad|ucE
z=M(O@k8{@6RXn-({-N<YPC5T>zWC~1F#+>~l-MO%4X)9ikMP6~K;!N-(v#h%OA{jK
zzMtn-VD&frmR@t8{_ooV!$l{i42XmVd@*B(dKAf=Bo_?t5O>`+V&m1gn06|sv!Xr<
zbxc*QsaV9>3;d=sk@6HBQ;SeRUF4wiE1vI}TE9X_q&j7$tou1hKK&^7VR>A?AB){Y
z;QlnsGg_Y_1ok-bmRVDrKR=w4=R#@AQ+|a8xAdNrvWf@(3DYgjk_V2`9(ixzZelMH
zoWJ-zgZCz;CrtGO%BVCtKh^UlJWZ5XUx#r{*N=|LeF*+eeJ~=RWnX*QuBGB<PiC*C
zZL<kOq_BjUk3k%WR2CV+_`Krk)sxa;W1NqzW=~Dbr~53&tNuE8_n9@F$NCw&o^oNT
ztiVIg$#W3@AL{qLZ-=F~1D=G(hqtpgaP#it%cEijZW-|BoNPJXB7B>w|M%kdeTVmM
zJ3mq~*;nI{-+#*orZDij%gFukbBS76jfZc%%ER;;X763EMLoBPNfXsq>HQzSLxT7G
z$e$;JU?&KMd1)1YQ$ey3z_nj)*u^3Q^o|I<`WFEyBH_J$_==o~v5t0>T?&5>ud-2>
zTG^#6`Cd}Kyxb@^4}T`eJOl_6qC_2ZXbMRnM7uqRI=oO-q#vB+sQ<ngl8hTW_OJIp
z{#VWf5&f}Z0V-TpN?jlBwk)z0JC7jQD^z}-3yd|hZr&>;pUK-rbmK=q8C^6&Tt}AP
zK5wl;<~NwM5ulQr5Q;S+9(p5{7n0xCceEJ2bR&45*uF)i+xm04y*!DAdW;w;snbxw
zX{PPvn9P)5B$bw_!7y7Gb5EJy?oSbMI)3Bvzm0>4$v%tzw9P`p`=D-&B%>sVhfg;W
zG2LZsdmZn;r17il!O9%p&|>49%bHs7(4A*?+alqyon})%bty}MNmSyva}%KIe%8v>
zVqI@M>!$HvZD}=7kfpFVJxRrKgDJ<XTK9USVGGRM>Afb@aN_a)^LfKy{~7Zn)GU^H
zq-|jF>$Q*AdT^TvqlD+3_mr2{+hpgLf{`puc^5~rWz7!oxq~X$>lJl#B$#a-aRi{^
z<3jOuLETsToGT$eSL^rw8=IFR>)35k-#sQ@VV_Y_#ZeD`CDnE%GYK>bfour^>Zt4a
z%P!*gPA)7;4f{{gYqg8R_&Z+vxrems@C;|UH@+LxsGCYSVHi3Z91Q^F+%<`7W2wrb
z<M-~rXKiP121okT{C@g*c`=jzCHL+$Y5=v81&hm1z}2TOIltccP%`?4p?{5ZYD&*b
zsFT=fXuj|3?)E;9>-W4$DL<{+&#jt2NQM0=>A?|z`rAew;Hva?JjO^7Vgkd^9M1~Z
zVNmHP9Wyot#(D|$q6h+Dysauto&Jvl=mvp;DIZ0F06luft_W727xE61ul`;~3ZkmN
z->`3r>;BOYpo&PjjbMo=xTW^WZVHI_R#VMSMDZxAZjlJulMbZK{hx(amHWBP)lUVb
z!?BqOc=F9<xxd3Mm|lYWte;!?^^WHK*mjO}-Tvnj+;%P0+B=4&6XU7JK=l9LJMd2P
ziFJogKs|=qC5&IlaD<L@=+%BSbUr*S+*;`jhS(?wJ?RJ}a|5ZG``gbm+{IHpm&pUs
zwq6stA|PS*KjP9irQ_6p9UjZr^#4!om7US{7&z2h-{z;85>x*}m$>ljT!g1b`1Aj}
zzwy|MtHC}WZ1j5u>qu|D@Tx!}(EgL6KJK-|DJbH?(#XK%VO~YbwHh+)VbXv5vv>J<
zdE73E8iIj(4ZX5<hJFvr;<m_k3xDmzDUbYq@m$0@&b_NW#`gUsiUJ~LDCU8=yWZMI
z1);<N!1_Fr&MiwXgCMcA|Iq$lj~eg&{M&5J>2Vwfdh_4!xWl%{dj*^cCiIN^v{Ac9
zR&7Ok8*NrGw8l2rF_!gACxf^Ci8UR!b9VlB1Nb^Q7j~cP(t6rUKeNWROsXIUHXQyM
zVGsnLxG4yk3EeX!a_x^_{~z^#@p~WL@P~<taFqm7zG&?HEq%HB-MsEohv+F{jj*C1
z8zI9%39+^j>-k^u{U84KEVl_6OdK<f(V908*Rur<e-AyL&dIU1)<zJ}*qHLnnR1cE
z;&E;HTwnN~C*pi(zw$mzJ|ESG(2Ytz!e!!`Oh~YDlvFH;v}Ow`IXZ|w6~+@cN%4LE
zxYWpFgH!`$Yj|+EE<#YY-bd#1Q@CK|LE}v*3x$4!xj?XqIdTDh*DdyK)6qTRuKA;?
z_0*oyk^OM?7kfwZwjcs}=xpd51_RFX(o^DN-czDe#_)UXhe+}=#Ou^j^*zOLxEMSt
z_1mn`H=&LIX|NAd!elUwqNfkk+|MBch|1lkXWfvuj!yIE{QvX%9`~xpQitk9I<v>Z
z?5R@;MwG?OvgGL*p7O{V7;9hCxeeJ-5kN@mC{!jR1N(;(WJ(Q0LmZ%R@Cbok-I3gm
zWfcZ7HlTh$#(*Ia7m-st^?%t8B_+r1F1~9AV)U99(5Ms$qiBD#o%N#l-zVvP5131L
z-<$Y--(#PI^X^^$=gX1a)5V(0^k&pVs?ZHA9a;D__2W(1^SN#~_e5X4!RO3JJD-_9
zI`|}KKascTA`s0aOG99IJU=;wkKG?TZNATbQYdp`v49+s1w~be!C(TyD->2RNd<ta
zDI&p6R)k{!L_||bC@Ug@DkusufQqb&B9LN`Rw?^xOi6<nEMSWSL|}r!L1GB9EP|0D
zii$x*5EYC>f{|7zuof%@ixoj)ibVy8fypWYFhxWZR8k5Eh%8lN#2BC`A}JL?Vydha
zNP`hoRgn>lQDCqY5=f*JcBK&B(PU9oVuFzoV2ngr6ct4USYEnoR2EN@XsSgKkr)dT
zi$sbFqRAUVRx0qqu^6JjRxoU1V@K)#z652^0q8b2%sSoCcc<F?&EB@Ao|6j+rrsa=
zeh@;Hq}<Ui{alan*P<T)+ik`i2xhBs>haa8sim3UewEZ*Rxd@Du(JnW7#0o&Uq{3)
zM>dm)V?$#bK*kJhwx4tEz3;Xlo@cgEeYS7({8!9O;NOQ_V}lB$uGs%K$Ji>jT#KbS
zi>7o^B*7vl36gO>Cb7z5<~@^oa4zw8S7XDEE0-o)lvTDFq^oL2NJVq(_P-kQI?n&#
zdnJed7-VNB7J>jUg`7aanV?PZ?A9q(hn{P|e)BG!BSeEXhXW@tvl;U7GX^HxeJdlJ
zaXN4lq@N#&r8`9G^Btd$YkM%QP{qff$rS)IAZ#<$oBeA#rhjo5+x{30b!~A4DERf)
zm4|5WxvOzQ8ip`W5vV@Vrx|QLM>RUto|7vq27nR~kBr21sqd|QwPW8r#DJ%{?*F6R
zWK>ar&uCE?rJ(=AaAM51DHNoYfmsw_D=JwkRT4$5YAjk~aVZu>EL5P8MS^U?nAAq2
zYYK%DX0+(k;r^%D?a`wJiLcZtkjOWm>l_ach;t}L89@FRqb!i2CT|}6Dg0QEUy*!a
zx&2>T?J569AKkm)b@c`_=0Jb7Vm1TUXZwiP=%1_RK`{dwO{t^lePxAvW?DPh500H}
z`u=C^mFI8Z@V@T9{JQ1EGn1;xN`<C5$_AkyadWX&V^((O11)H8z*e?{z31tbl=GhL
z9+~Ww4G5tHJ|8!@R*I}#uSedg@3z{%v+e&|ah()5UcXroJSLlZf#{Gys$qW=$$+W~
z9U6NY|HG=Z^DNa9KMma1`SC`+0u^6J9-4XQS8a4#=cY}4yO4gI3Xe0))*7DU5i0bx
z;C`2#_+KmU1Ll2)RO*906saNTzq|fWLzDcyQzJJ&<m`N<7&<geZVR3h9BdZ|dsw;?
zR=W%_6E0IaE9JX981a|hL60f_lH!=2UbxOv6#!jFw4qr5A7ZIjSg-w-Rbc!Iqd{Sq
zrDm+GR4HX*s>a&d@fSa%{$HFkW5g!K;$k@3q*ojpmv`*`QyvSRZo2_>)w%(A-Kf#;
zcjl^`H)1kbnGnNr%n@P>Gk2C-nyqVeiGjafzU@&zv%RYSk*s6(+8^&eKZFt{c)ZJ;
zPlKlGJNDuK8;&M>>c#B5Jqmlzy^+{<-rRqzt~!73?ajCLbEw2x=G#&JJ713Hd!wED
ze>_Ltrxg94^j0|j-AST-uYCJuM~H)s{uaUok3e;iN%UZN`fi26@p#$XR3yf1o9B8i
zxApcNM_9bXDY2lVWPUl!hdoV+EoMoPqys~xK1_^SIwBn@&NRyc2RQg|QagniyH@eG
z7GL=OGpUyTn#<I`Em$2s<8>(8ugf=nR=aVxJ?PKzzUTi>apb<|(X0HD!Fi8<AHP;T
z-++0Xvj-Cz(pi#;(37vM(D|?yGF_T_3Q%k);l}^mam_n+Uhi~-_if%ZgphoXlkj%K
zZ~FQF^!t2Q<wwu@nMuu+uXxu;{5J%l$OORv_cZ4+PJWCx@h}*u*Q3?>JLEF8MIut?
zw(F_`uBQ**{u{ln3jAnsJ07Gy{k?qz1!NdNL;Ca&dKYN+tL|zRUSY!RAN`_AEmRF4
zJfk{x={aAYosU=yWGJwyh(N|L8DD4k=581Z7Vo8y&~L7^^)q{Bdz#v=#jQ5k%Yb3{
zRQkC!zvs;9wDwwd+mknU<T|Y}){AIi=XCuqr|nJkS@>Ul8veI4*Z0vWy&cX)Z|ci?
z8~mqxWs<|m`aC*~N25)bu>6}m0f$?^`KdpqV;I2JHeFUY2>V}i&x`4C_4HIN0!T@p
z-q&y&)ArF7467e`Vz(J4;?0|-m>sgMMJ&37atJPzm-OFhcgNT~ul(^%FoV8xF4><p
z+hM+Ae12QUhYmR4FYNLs>*s!WP%)<}s;;cCqDe|5x+Iv^R{F{;#t5Ktt=oL_bleWv
z;k@5h$7^AoQ=IJhj;Eix@G5FBIqw-wD<rm}`x+kNrlQ)~xTe~Vy<8quS`eT;E;lYf
zuj{SAwm}|WuBcMb=NtQzAp~Y7+F?WoQmC9KovA{#`5vL-z-GF}P{EEn9LLFAA8G`+
zsoBOe>EpM<&+;SFaofUwt@lpy2<Eo`9;DI=KIDH2e~pIy5+6jS_%JF<86B=#e!HqG
z90|#NdrJr#HF?PA&FT0buiE^N41P=P*J56kuVs#9$xTo>Arzz1I5`>U2P|j;j?j=~
za+ilQi7G>#He=Jg{_4bMn%owBiN4ih{A<qb8|r6$yI6?&Ka~)foZ5QiV06R?GDswX
zPK^i1pg_JjQBaUvuN~?Y16RlLJWkWK@}Y6LzSpDU>N>mZ_VwRl?aqfuO<NdcCRHz*
zFYOC;RYtux;&|d&s9bHNjw+e3(e$sZwhfm~#C&56(0ztm7&%@zeZR?wsu`;mMi-g0
z3U$B!@_n_BB~a<|M?6F(j6uU-LM|X+UT4K3-FSJ517G%La3gWn1*HUOpy@k!9faTB
z8;L#0wz;t>3ZI=p`3rw=U45(gjR)~P?^6M`kL8)I2pLF+>nQ}W#T<mT8%(;o$e$LK
zSg4t0)>CauhYepJhnE}!vI`<6Ar52OF!@X)E|1##1R9j){plX`&BXAuy${9TLDh_A
zKE>{v3M;5kX!muvyD`;y!_wvtPsbKkgMExK^K$>z^bdcBhC6TB+;w{mr%Cgyr6nC<
zW1Pk!A_EAs2LRzE>3OJ4mI2kMP{%D{&Hk)U;g=cQ|K`j-_0t1;H8aqNAcYP&QG5U5
z+V>kZ^`D9U7=NCkHwKK4rXJ2eWf76k7{dQo68$}Nr4$;SI9of<@v60{(wU@utg5I7
zeVYaTBZwDux$Qf5{t({fU-W~rd_2Jc*W<uJq!<x(|8r05>RMYpyy!3YoeyQ#>a(ny
z`ETi<yZiFU`Xi{VCqsMuH1w|cA9e4;w|SB0XPAI9!K43+xy2_{$@TTM9jm?e!?oAl
z_!uY!ooo(lgYelGM|bpw29v+bq_DWuS~j#Uy>++0>i6U~b2bdLK=1hZK<lJq0VL*J
zn+NP#Ki|_&JJf*N+1hnko&GJ)<BcJY$O!-QC*ZBYB64L%7CA*mM+XNsevs^{as{7s
z|6Ov33ZM0~)_m>?pWdtLTCF&3v9XGGYdh|j`fv2HDP)Gqt^ZkK$VK3T*jIbUw+9$c
zsb3F&&S8FE#oC?KKOrlTn)G&poIV>$R*=Dq^VBvH60s{E%Tx)Vg4Mi&Kn62}v`m%X
z?HS%5cQudg>DvrEXPp!S50Xc3)B1mNN6gLlf5#I?<~%m5^_(B8*J--{pBkIqDCOIC
z-z_g!*Dc|CAMWp!3pe<=3w=zh^!=}14_2j#ES%@GamMnN2=1{?7t(482rOUI*;m((
zoArG{msgi^{ta_5UqvuE9OQ8P<a3`qMnVeCtGj<I)?WTgN9^`qx8Qy0NBiRb+)|*8
zp%}l#VWRNhyJFAo{uljOH4Ui>ymH1Ps|`g#G?p(cnthW{*^ub?R~?WYsh12Q{}G0x
zjcla>|9;mg$xH*OA=b~odlRpUaN`dTfNUTfrVQ?ZDKE#|Z)I+2INWE<k4INOaPZba
zQ;)Q9u0zCal_a1eV_`pXmtU1!e=~b+hRgQ$w3px)q<|zO5hc}6fBfqI+4H|}*z_6S
zdS7n2>!jI!R2_bq4k~C0B>+Wv&io0YC02&n&HR)>85@7zu3bUDSR5qv(!Dpqw$(u{
zFUZH?cnGD-?B8e&X7?9g)U&13`e3y0J5Qsog}d@OE$`Sge=+(0pYyuzbbI|A&He2k
zx%>Xu#@)+@ocSlR{|fGJz1`GhsWTS-hPOf7cNz@;qvk!}c9G5dekmWzqm#XdTlZfm
zSOTBW=wT2pYB_#xbGabb_J$Gt$!oB98G;`eL0&am#V)6j-agP|bZZZ*GY6G&<UdUn
zBngnqd^21_t=j#!u$dz&28!~iwAfU-p=J`9kb+JJdCA{1{F~KaSX=*gHsy}7&qn$R
zsf0v&Gb->5|81-kinenR%A%{NeKl0xEm%4l+&LQhzu&!ory-<y!Qpg0DW7}C_#toy
zTA*xd^F6CPEUA8q{xHr=`(Jxir|}0DxA-ISKn9He!4l@98~_yZk6BT6od)e-xpBUY
zV6`$@LBgYrMUS8Au)a2Y?N-<1Y&nQ<WG%o_bKfHa*Zeo}tjt%F`-IV(@tDIXZp7fw
zU59Fnq!l64%pIhyw{FkLv4b1UcNRD9W9dupTgi%O<}m7w;hY(Wq~XZ^hn9xBONo;E
z{~FmFIF<bm!OXNIZY&%b7sQTp1_bd9QX>PamJ@2dBUO9KAC-rw>%O<lzW%Ds(x&s|
zXm<<=P1M-;bU0@*<ofSZ&wV?8gP;AK4szf+XT~sqZ7IR2YcM|CAL+}zi!aLWzJIm&
zHIC>v7tm=(^7nRD7~Q?yyeQa?cNX75rzJ$*pPaMLf6bN@Cv3)Kt($P?0Ve?9;N^6K
zpvnEd9nVGacK!ALqvXb~Z$DE@h^|H*DyJWU>T$gf7<n0-ZSc(UeIK?tCK)jh9Q^9O
zh1b<#Q&Vr7s?|!yfzj>E6-|T@%7b%)0#WiOlT02K8qK4ITGGi^d8p}e{|t?LVwG=z
zjbTYnX>{?U=#H;&q6RgX_5Qd`Zl<_kGpzRMgN0?S<NOV+cklxp{(_%IsDvZAX$Wxx
z8*Eb$nbmXM=ZxEK67*A(3}Y6hMAldw-7$)ZB9Tc1Gg)x7nXO}?me_uiF~K(2%*3)`
z|F?AF7+hR$ER8v29gPy`0OxHccsUZ}ax_1<|7ExFbGWq2=Bz}($;d`j_#QoVqJ1^q
zA%u60SGB9ob0Zn)Ox{@63o<))BrA$^<e-T_bCg4ax9nBCv+C)dra3bkghoi(brT?a
zFTUum=MuA_wmYUnf5{%<^07m9__IHW-(RsxvP^%^C?Lc}s5m(gWZ`nfvAy%s7SwI~
zzr)@qxs0;lr<cKmm#KaGVTA^}tE-1bLOlFMu%mr5A@U=4i*+}=7L4m;<x>OUwkxr7
zpR;eG@_AhkI8@;_K6d#AGtJVI<24Ps`QJok&!6{XbsTnZ*6X>P=VcG`ZvN#tgT4f4
zktX`zPt*Umlp{kGh1BMJ>i@ObAHTEw{$32)&WE1-4!`8;X)&IKi&m`%`2_8Q--a%5
zK)>%KEw>H92X7U;t!Tal+&Qz$8lch7#X#z@^}WRx8sgSEF|o5lnz%Zs$Z#4nbgz>R
z2s6RziB<4hRG$XI5my;Wc&6BYQzdouM;f0eiWFO-;AY$A{Jtgzl38oY_3QgGV3S)<
zSNnEw8qJ`-`}1y~Rl{ofte}`;XJqt~HeSnUP7i6Z$@li4*JA+d{V6d6A-2>O;bt<3
z$i)Q%EitICEGeFs_pWPmC*$SB(jTUk-q8BC&pw<cX~q4OsFN5dv+RJ8wC|Q*&5JX%
z(JaEGxDVqT+=O*$0WZE?j(|Y=Se79Dvz&p5jDSX`Fjcv997p%{kF(hH96R5()%?;t
zBeH6$uf*r<QFtdZ<^I2!LlD;XZ22^f8>V~y_LgGj>nI5ra9<;Z({(80_TOH48j8Wa
zaksP#Xucv6pbz{{m+IbrSGEl1LqV_f>AKr56NP0*{I)%FbhRgJJm}o#X)73%`A#9j
z6gc`Yqt8L@zIGYv9`~E;ug2?Bz;h|x6r69@{&tD8pE?dKpr!}?lZWx3Rn_ySMsEuJ
zmXLL=0kJm-YnIO{v*o6lZM8^uKTF$wWKY<DJyXuGZFn%di0J#tiYmD)F-lK^XNg-x
zgXshoTLDX?CCZP}7?8$RkQIidMBNi-GD{zxRjNw$^lvP*`Z#Ddn>#AOTnQ+cUOp^W
zVTEohZocb15Bz>Yqe$`FY1W@BmY{D0>tH(de%pap$x}SA-&cs|(<k~r*L8H>XHj^*
zlZisRRpP_hRsSB7&h5Pyo@GWAr&p@|8G7z>qyASHPc;5yUT+;$dmr{#K8b6-C1kT(
zi~Kz<S4l_Aqmlg{xAM*Nd}sXt1Y$QOK|X4NNe}Oy_))|vQ{R8@6K-w~@7r+v)brVD
zPxGjS_?cEi=n)74=j6TdJVNk(4j+oA(a)iCC_h>ut~sM25Bnrz`C-46=NkVGIN;-y
zk67!O<EwNEn{!bA)eUeQ?ER;%EE)an^V4-~F3+jP`8xC}yB&XtlJ00Ic@m-p@4HEI
zdLU&KN>lZa_O$d_Z$D~Fe$!6o{j*n4Eynh7VUh`<dfP%p_T9xeY#G61BghfiG<v@z
z-?skME7JK=<;Zz`{cB5oV#rZKKhNT!3Y>nfv(Vt_R%{dgI~;_2zN$53m13WuBh0=-
zXE^8-IDfiz{)7FW&K+a`tO%h-Llsqh7HHPLx&D4&U5mpH2|q`XkkjD8?!Zv2IS(q(
zF$suikhdkp7$plyQytvEs;07;ofv4=jD<^W!T<Z0R2W&Yn_;2IKHl0*wKvSR=s{z(
z!&dD<V?y?5&KcgT=_U)D00B;bf*?`AFaQ`5iPqZ05+m|D)-Szyo}@o&*!eAU6mCqO
z<Kxz1BjdzR$C5{|MQ7d5x|sWDBOWc~-y6`_vAng5+Y6|44M`k=VVr!#k^IiGI$vw%
z|IEg7IluGhjNF>-P10@1JtD6(R3QINVZss`BY3|N|8JD9w3C7&ra8<+J5MHpN1?i;
zXYx@p)jRSCWUbUf3h2NDAjC+z1_m(PLGX2$SNDVnS2D?aJ{=DBJqsm13}`-^jrX^*
zZ~hBt0_*QW>fh^rx674_+Y#Bf`SHC>#*^0b-qroJmHXWF+4<QuQ#gB`2d(FO-@|{s
zxzXwWMJ*rvq@iw_Qe@!wpvFC^WQzD00~h8lVKa7nP#zdYANtTRjZZMU@-D4jL^F)f
zqewEKS^B?Y=-HS<%KMV#NQj81EQ-=e{)`2pETjRRGcxKuvPjY`moTX@I9wVLMGya)
z=fhN25GcM)@0aO29w(9H>}+e1;~hfW0y!uM=c2BC1^Q1>T+`FE%KxrlVFRo7bLdKs
zEe5kI?Q-dF71>X0<@O*Q!pf2XX^QsZr_1u-vO$GGcc{+SohE79Q=oeHXc}UnY#%S!
z?>NUTowHnai;JE9MEqHeOl0S^eOh-lqWAxE_W7Pal3HCY=2o-7xjU%9$Hd1SEMXWB
zVi*w67A#bx832_dM@>3o{A#OT@>^{nYLKx>6Z+-QPnxOl`G;wems#++`>D_SerNaI
zvLoJt;?PT_VspRrM3&Fp*Ji+4Klqk(0y{_z5rdrxsm<5Gy$_gOt@xv_pWgNUrY6*7
z)-I^$`^ZNJPu(C6rEKy6@^F?@Oc1K40a6;Jxg7y!GEw>n=M2&GmrhTkIAqi}3%}?)
zi;BE_y_@jSbRWK_`_;MKM({WLh%JoQ$gdUe^XUic_M@}DML4@U08u*$feA=hJy18V
z3@A#O=G)iv8f<^(K~r5F^&M*y?Jgid<S7U9dK4U7U4$Iff4<OY!#6WQ5gZ@aoW;wQ
zx*ktF{3hH8iUjapI$E|5l6o}XN*rcA=lX3QyZNe=8{I#7^B7Gp?|;i}KTqgO@Hcx}
z0?>$@&q`Oko7}+>V=ElJN-1NcD(-`$*zb37$Yfe_uThPdA64)Pk>b!zGC+E7`3?PV
z(eY>+o-}{6LotFfDgBXzD*!S@V?OBtKh!We>u=Ein{GXhoQL+%)58u*kgQsT5K;<M
ztPZ`i4IJ#1-I}xonA9o?jKmI?BQ%dz(+8thD2f%>dbqj%&BWM$v-egVjNsW=obvIl
zXsHb{4Y0YC%WYiCjFl3w=%qsoI<CSFiF8o?E?P9{o$N4~mL1s}4)fXnH73mHdh)=C
z#)AYxkYoI$k`oJZKnWgb^St4(^anrJk3$pCEGLCin=ZNid-9~@bvK)~d!7Vl86$bN
z94Ck4g?8scI?lRsQeeprv*_d9BrDEzy(<ZKVzFcT#?}8<hjSj(jlv(}FxKL$+eRNh
z`hR2V|8D<{Z0Q<auLcwysAIYb*RQdXjk*3!5kikj4`1kY>a6h;ebuMT%fQ15&ATH}
zf*?iIkOwK{t+egdNE*h6$<T7YRo}^M#y^4V;PpRwUf(wT@<mAjpIa-u_&>(V2Ny~1
zaXYA1ofg-c`>F6h7hj$KKF9L;zYLKufEC}XptMd(jbx_Gv5IIgz;1GX{xtEBf2&4k
zvYyfK`b{C=9bY3?&twF|MeHBu%JWhwr(6OSsnQ_3la3@0g&zm|!%nlL*nP|l@GfZs
z?7YybEABT>es4ktf{gCcaEVRExkzYda_7y6dp_4(y=JFJ(lRSmI=`snykSo3#!$d4
zL2@_m!Nwm;<nCN9oxJ$I&KGQwbt1nQ`QNelbMZN5C$s#0Cj-L0`1gCJA}+S$%s;!;
zH}@R&JS$rf<Mx-oasQFJfPnMa{QgDVHaD%G?8F8<BJ+C^<D|;6yv_Ghx0<3wM*Db2
z4a-N}G`FpDRq#O(n+l1z85_k+u8iw{0=K+LoG0o6AaU~^^0SrhWcr*&7b5^{FRSs*
z{7P7}S|IA4(@oEs@F_#e%ZgBnFyBA#4o?TJ?doXpqU^E5-h1`_FM;&=<WyE(r+?CQ
z=<~WB4<8Z*58KS4^#70D!GysJD1K+twQGL4%fY?zYcoEd70+YYr}Z7w_F26qvm^hQ
z@VQsF#8k=!qa1}{U3?`~bLwAt#|K+R)t7g+(Wa}whsn-1A9VCDD$Nz76ZFtR2(sjo
zRVZ|jkT&F@7$A$ZfUMi_yBbuhEm&XBlf0WG9Qq&XZ|XSrKlzTfj*SFQ{Y;Xl<+2iL
z2#YP3O%z|I`CkW(dXDJUmF4Ib7j6H@>)8IA{;RTX^dv+R_3jx4l@V$RX@zfLdIX9r
zQ>l_~xX|4Tlm#}s*^*>uLUv}@Y|aKEe79~#d8p-jng4ml386V=E?AYMr7UkNkV`lu
z@7knEL?cwq4k3W%1A#ltGeHc;`KSXzBtbfaWE|iaO8ia%7D!<8h)d~F=uTBp`1jfl
z2Zcw>rtdktc7ywK)sw8$p#($m5%-m-`)M_BE7D7BA;r`|DH}}YBDrP5CHdd>f2$#C
zKb!HJn%I6&4FDiJuTVnC9Y`c^Sh>A2jHVxSbiX;vuqxCCP;vwLoN^Fz5FrTXFzu^8
z-`p5ieaPT3RJi`FB#p4||8HHtquqa92LH}zDQ&>#W$^y>Y_>dnx7_4uJ+Fqfdq0_O
zKl^U`G1%a5zN=@})lTMi94(h6T*u#~?YVjHTlGTGW^{f{Z?gxh<?ZNw_IruRHUR<A
zlA4qMp77v$U~2Up@^b`XL{G7gzh`#+5AItktcI1Hx6}Sn5&6HDVzMAIIPjc$W;d$@
z4UYI-oX2;w6VSk|;X?9%qy2bS8;zj&A<{En=tg8S?h9LIMvmUv-*Ky7&Xp7Ke0}HG
zRC-Ea_`<YvYbcxx__DTplbN4G3rlIZ=rp#fl^OrI&y!JZ9WT=W>9#rJ!B8RYV&`>N
zTJQz~9*s9&-Sj>WZ)cLt>RdPA>?i!hY!ae_x*^=+C$EWH<&_cL6No5OU1`us#}vAh
zq^JY#e#*pAvuqT4k3zAom!DAsWOMrj=pce9J(XL{!h(v@F~bRDGX*j{xyX=f<C@Gf
zh7cLGK9ZZ~^8vYDH{a-KZwzWs(0zz%^gQwWY2NNH)6RDpUbns0#hmU%{UEZU%Y5EP
zV9Oxi<HeuPy^;IY`kr$A3E$u7&tCPIeG6Q_Pf=0t*1rML9KKoB^yi^*?4r#f@(qp@
zqxVlq$CO}aQkuPewsHq12X|5v<>mnBjr(+!dkaq7XJwPD;zX1U<o`b2<7B%J%az59
z3=m>i5IJ4G@L%A<1H5RdP=NLCaA@9EHptR@_3ii_tk8dk;qPpN)Zp4{e#DG#O@Lm<
zbP5^~+gS&V<FvXCsy$SnolXab1Nf|fpLr6X0V1OzA~qoukwG3+p=op`r{U91$h)Q)
zwq|A4PlIQ}r%U8rQs+<kRwY==0pNHhvVvHoV}b#pU{r@t&5{_v(<(#Oc0y=mblSi%
zDl8s~X=W6KLM$LGo1|D6G95**4Ol9>;wI@jdaiFsh@6tvG^8253k+;+r3zWar&WfM
zV1}X`YU&6oI^KuUFBfb59q>C{u!2Z6D1f?V<xra@ja20UI^p0KkaDO2v;ekR4bw`P
zqtCKfY(4@hPru!ZjJ*~Pkf*%#H2pMd?b`RsqNVczML8(a*E%=J3%)-3Do1aJ%tECf
zC#c*1&sX5yO085PNQ&Q6{*SjyL=1o+$!#KtB**tVzJYlj0=h(oI+{}i3}hYa!-Dw-
zPJG;b(|97E<fv;B*r6}>zvIN9ZN|UUwV|#-VaRluV*r+qXHz7QKkI%>|8(~K9SPJL
zUtx!Df(`$gv?kbqD#92no&+DmG0!j&sK7vaFVyPkMfwa%1Hk(>zd>fGyg)lTd*CWo
zJ_twB5)(qb=^V0%SS3;jHy`uwLJi&!+Y~axDMp${2RH2PBSinduU)^G$(k)6i~n#f
zl)iob^*t&SIPg*Pmr=^KSlA>hl{nv!5DU(4#PoI^j+c4gunfi@=SJP%=tum=_N>mI
zg>MH@ed8n;ZR9bQrs|RZi&qn%hB+E%EbA1~%Pf<i!)$@&Yw33bbLhnM@@xiyyC!>m
z8xB@~%dDMmn5==j_R-ipPn>0_A8D24QQN`W$CvzH{`w5E%#VLJtkKBV>EszC^5jpW
z%BJLm0!MkA!^L!w6W*ms@LI?$21Mf1#)riH?vL+i|D4PJBOm#%9UEdRZLLpF&DW#i
zH$Kbyn%U*E_UKo?Lq;0ayl-)aMuS%sll_r*^putdY`qL3LE?yPF-$o3NWcUU0yS4*
zH(}Iv5R!NL1o$p;HeKPBXZYT9y`qM7KUv3mM#lUvLNlGWOoYQcGL0wDX&s~0aX!%i
z$U~9MOEfZKA|PsGgOAUmT&i-o{Myo~^I2q!Rd-5=rmrlFRDq+F5XLqhO=cn)YQt}P
ztr{bi1|;KDBvC;T85L9)+;N<=2f%SqSVcIrME9)uxO`S(!<l7|$+CzdqZmaZeCsO2
zhnR=QaN^O0v>v{ksAOb3w^=I`SV!x#4)PprI&i5Xo6_|)uub^r*tOp^EO|G+kAeVg
zil?-VLd<O!;a<}VrA7RzMWWn;-TS_ii5K@<&)Wku`R}GXL{IsV5ns**2o#T4$uzYg
z5=C7lP%x;2f4<MLRaJj!ehTS@kTx@XI=kI_ZXm&&TOXsRs)j-(y-q|4oVdqDh^seY
zNwWb+e{y-v3|P*T2vB{Lg=CnLZZcy%P+%DK_1{lHK>>SP+qPtfB$9SA60nM*m2ma4
z9>Q$HPj_Kf08G(9|Ip;;?6_n?O44^ASZ>8UEW~0&n{@@o2Tg9<7HT9Ym4V%F7g$jH
z4y(}U+n~-FsXBJJqS^)LnT&T#8c#k`NW)fp4n>Y9=uAD{LPN3HBsx+R4z?J`6PFm|
z(o_{>%SiBDSRz^|!7E;#Il6(8X4t4zgXz<)VDrS4G72gt{$6>TZITR&op;|&9=6~1
zUblB{^|PL-830s8>{cOIA!G-*rISh2;HV$*y22IL9J)5x+pl{2Q(G*6n1+TC>N5A(
z3&${1Bt3-(&HR4L25u0Zp~j(%SjA9ux|dT&*~)9zpc{8LO-npEm@x5Ymp_ve`bqLT
z^n~PZ#qI6G4TvV2+OR!&N$^KY+Rg{eL@*AHQZ~qZEq|eH_rwkB0GIp(_!=_83C~`>
zuO-pIzqie_56hjOBXeIOh<|1$fqhMp&Y#qwZjvSzTxg^ZUO2;YinNScu5Pk=n<U~v
zUGx`?wc6x_1`HPc2{|th`1Kz{JZIThmxjRQ?{hZ!B=XR2j#;|Q(WktOl%}?}>g<M1
zyx34*fbO3tphQ50Q5G~~s={nR6ba{fB)Y*yVqjZEV^!Yl&m3=MT#le(4t?&6z;p}F
zno)?G$2C(_zS+L@Cxs;cF{7Hm-85s`&#y$SYv2BlE@kWq=F*sGGwZ-8)Y9T}x9H6?
zaFV%+#sV9|8Hu4(643($1n!A!=08NzT{y%eC7G~GF-$5o8@nXhrs}oJWKsWw-eKpq
ze87Te@*n_hU;FD=Po9Mng8!@gFJ#O-#5va2JDw`U7H^0UOEWMP5W&J<)(V5nfU&Ws
zQSXkDl|RE3(ntBCr!mOlq)Z@{6GRhUHpPk!V+-X0A5s9T5ik2Vt1at~y)s&XLjbz{
zV`NC;MDtL2<ldSf)KTVW>olKf9h@0dWvg$L<5`R)WS*)h6_C;#hI;4|l6~{X&b-(1
z%9!klr0o4{ns(reOtD0l#b`m-w2x-e4L>gz!LRFoP3z7di|lzit~c5CYOCOBG@YZw
zJ^Vfb*wnoojN_2ueby-bgM*NJ$PSPY$ubIVzxJV{y+CFU!IhscJMrT)$Dd68XWCW!
zVtnYxm|pFqLur<i8lrT>P<YIjl3srVyr$^t=6#>X_kKFb^^NQ)Cs$Hf?(1mi=u=p1
zEGufPUyC~P+5ekAoA9%3we|gIIrv?aJ6M}Yy+m!b74#W*)VI{qt}ZSvFD`CwZf~!H
ztvh2~Sv_FF&ePRaL0AAbnPv84Sf);%#ZfK8*<8iDp#FvB&SRc&?d6Ttrd&e;1r`m2
zSl86C;LmMu$;O)v=+6<KSYcBp?7LDh3fxMEVpWypl(VD4w8X=BXxTg)`skJFt4!6r
zd<te+u7z&R-7Al<EXuwYq{b9Ui=@t2UEffr$wiNee``|-OcyG$a1(h=5k$r->QD)1
zufVtya&vAQfs&V7Ra0k_!K0*lw2{L8O&3_2{#K^q=Ul!dcj~IDO~XlyJLmy!Xh1p!
zT>gg7k&AcA>?vPKguR3-da|{tfM_(wrHyN8kCIZ-n-Y?tdME|~(l&6KF#`f4WhMsB
zm5(n&xyO#4#4E-iY!Jq=_J0Sg#H(g#56XdfJB}0%?dtRC%7=>^kpwX>_?_*Zy8wN!
zzo$m9fE183ewodcW0L2B%Od(W7QbjoluiT)Z)$$pBQKl&>Yqgsr>5_HPE+V%JZa@f
zRO=p;O=nZf#A_Yir)7Vh_n1zlfdTgc2>z1WP_=-`anm!iQm92Lc%lh_3ug*%GjOU|
ze=t8w;UJ{Jc^x|9OhEj#ScBZ#W_N`AMhjH?-tl7npYZCK%3<Kdj2*+Of1tR&M_JB(
z!{WNW7O{Si9bb{NsbGgtGC6zQjBSy-M#3!qS}t5x-q$8vnufNGTb0vB<qencN~1eK
zf%420A!&sf^^u0hWFsGA^FDrYpW<GUmbkGL@H&mGOkc#(tuWh+Tx38Vvlfbz9KNS7
zjAq~Ibla`fk`zywxzOC@E!aHBLex|F|10NHi<@Lido0U{nTLR$)YU_&&83GOfsu-~
zz>UD_GjMpJ&a$S({~MLSxA#TyO>eyZ-kbgE`anFxbMV84m<<j6T1~YesTjf=)Ik1U
zX?!esZKi9?%>x|(0qJluObhszP+I`XQk{|UDT^KT)h2mHiDg4o@I;jaAyvygU0IGu
zJj5J}BAtAZX3HKj5G*1Rs(Sf2fkF~VLqK_ww~bMHlni&dL{BcFuE&gfRaO}*NNi(h
zZEopS%F9CBJO+pt;2=O^CK4bpb9gU+&da8<nyoRW%xr^Z^|!HV)y%TlJ5fqNk&t#V
zEjysO4FWneFk#^L8{a3{dEV39`CjJ-pvG)6e!?*kfZ@>Nad=7&cWKV=Hom;7a{u_d
Mk}1N3fZ~0(c-6Z;d;kCd

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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
T{(tIM|KjdQrwS4f>X$G8a~^+W

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> {
-- 
GitLab


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 3773/3789] 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";
 
 
-- 
GitLab


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 3774/3789] 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; };
-- 
GitLab


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 3775/3789] 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;
+
   };
 
 }
-- 
GitLab


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 3776/3789] 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=''
-- 
GitLab


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 3777/3789] 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 { };
-- 
GitLab


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 3778/3789] 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
-- 
GitLab


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 3779/3789] 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
-- 
GitLab


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 3780/3789] 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
-- 
GitLab


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 3781/3789] 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)
-- 
GitLab


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 3782/3789] 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
   };
 }
-- 
GitLab


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 3783/3789] 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 ];
 }
-- 
GitLab


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 3784/3789] 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";
-- 
GitLab


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 3785/3789] 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,
-- 
GitLab


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 3786/3789] 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 );
 
-- 
GitLab


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 3787/3789] 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 = ''
-- 
GitLab


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 3788/3789] 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
-- 
GitLab


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 3789/3789] 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;
-- 
GitLab